diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c3762c0e9161..97c56043cadd 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -34,7 +34,6 @@ jobs:
     outputs:
       macos: ${{ steps.detect.outputs.macos }}
       web: ${{ steps.detect.outputs.web }}
-      go: ${{ steps.detect.outputs.go }}
       agent_session_web: ${{ steps.detect.outputs.agent_session_web }}
     steps:
       - name: Checkout
@@ -55,7 +54,6 @@ jobs:
             {
               echo "macos=true"
               echo "web=true"
-              echo "go=true"
               echo "agent_session_web=true"
             } >> "$GITHUB_OUTPUT"
           }
@@ -110,7 +108,6 @@ jobs:
               {
                 echo "macos=false"
                 echo "web=false"
-                echo "go=false"
                 echo "agent_session_web=false"
               } >> "$GITHUB_OUTPUT"
               exit 0
@@ -325,9 +322,6 @@ jobs:
       - name: Validate CI change area filter
         run: python3 tests/test_ci_change_areas.py
 
-      - name: Validate release attestation retry guard
-        run: ./tests/test_ci_attestation_retry.sh
-
       - name: Validate Python R2 appcast upload guard
         run: ./tests/test_ci_r2_upload_python.sh
 
@@ -423,27 +417,6 @@ jobs:
           GHOSTTYKIT_DOWNLOAD_RETRY_DELAY: "1"
         run: ./scripts/download-prebuilt-ghosttykit.sh --verify-only
 
-  remote-daemon-tests:
-    needs: changes
-    if: ${{ needs.changes.outputs.go == 'true' }}
-    runs-on: ${{ vars.LINUX_RUNNER || 'blacksmith-4vcpu-ubuntu-2404' }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-
-      - name: Setup Go
-        uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
-        with:
-          go-version-file: daemon/remote/go.mod
-          cache-dependency-path: daemon/remote/go.sum
-
-      - name: Run remote daemon tests
-        working-directory: daemon/remote
-        run: go test ./...
-
-      - name: Validate remote daemon release assets
-        run: ./tests/test_remote_daemon_release_assets.sh
-
   web-typecheck:
     needs: changes
     if: ${{ needs.changes.outputs.web == 'true' }}
@@ -1820,7 +1793,6 @@ jobs:
       - changes
       - workflow-guard-tests
       - ghosttykit-release-check
-      - remote-daemon-tests
       - web-typecheck
       - react-apps-check
       - diff-sidecar-check
@@ -1842,7 +1814,6 @@ jobs:
           needs = json.loads(os.environ["PREFLIGHT_NEEDS"])
           required = ("changes", "workflow-guard-tests", "ghosttykit-release-check")
           allowed_routed = {
-              "remote-daemon-tests",
               "web-typecheck",
               "react-apps-check",
               "diff-sidecar-check",
@@ -1858,7 +1829,6 @@ jobs:
 
           outputs = needs["changes"].get("outputs", {})
           routed_outputs = {
-              "remote-daemon-tests": "go",
               "web-typecheck": "web",
               "react-apps-check": "web",
               "diff-sidecar-check": "macos",
@@ -1883,7 +1853,6 @@ jobs:
               "routes: "
               f"macos={outputs.get('macos')} "
               f"web={outputs.get('web')} "
-              f"go={outputs.get('go')} "
               f"agent_session_web={outputs.get('agent_session_web')}"
           )
           for name, data in sorted(needs.items()):
@@ -2414,7 +2383,6 @@ jobs:
       - changes
       - workflow-guard-tests
       - ghosttykit-release-check
-      - remote-daemon-tests
       - web-typecheck
       - react-apps-check
       - diff-sidecar-check
diff --git a/.github/workflows/cloud-vm-env-audit.yml b/.github/workflows/cloud-vm-env-audit.yml
index f1481c86880d..d05b8c325efc 100644
--- a/.github/workflows/cloud-vm-env-audit.yml
+++ b/.github/workflows/cloud-vm-env-audit.yml
@@ -1,8 +1,8 @@
 name: Cloud VM env audit
 
 # Guards against deployed-env / code drift: the 2026-08-26 outage shipped code
-# that assumed CMUX_VM_DEFAULT_PROVIDER=blaxel while production still said
-# freestyle, and every Cloud VM create 503ed for two days with nothing paging.
+# that assumed one CMUX_VM_DEFAULT_PROVIDER while production still said
+# another, and every Cloud VM create 503ed for two days with nothing paging.
 # This audit pulls the real production env and fails when the default
 # provider's image value is missing from the image manifest, so drift is a red
 # workflow on merge (and daily) instead of a user-facing outage.
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 3d8201e17572..8949695878be 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -381,7 +381,7 @@ jobs:
     if: needs.decide.outputs.should_build == 'true' && (github.event_name != 'schedule' || github.event.schedule == '47 8 * * *')
     # Sign and notarize on the same macOS 26 lane proven by stable releases.
     runs-on: ${{ vars.MACOS_RUNNER_26 || 'blacksmith-6vcpu-macos-26' }}
-    # Start the standalone helper submission before remote-daemon preparation so
+    # Start the standalone helper submission early so
     # Apple's first wait overlaps useful work; finish it before the final DMG.
     timeout-minutes: 60
     env:
@@ -457,12 +457,6 @@ jobs:
           chmod +x "$wrapper_dir/create-dmg"
           echo "$wrapper_dir" >> "$GITHUB_PATH"
 
-      - name: Setup Go
-        uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
-        with:
-          go-version-file: daemon/remote/go.mod
-          cache-dependency-path: daemon/remote/go.sum
-
       - name: Derive Sparkle public key from private key
         env:
           SPARKLE_PRIVATE_KEY: ${{ secrets.SPARKLE_PRIVATE_KEY }}
@@ -547,7 +541,6 @@ jobs:
           {
             echo "NIGHTLY_BUILD=${NIGHTLY_BUILD}"
             echo "NIGHTLY_MARKETING_VERSION=${NIGHTLY_MARKETING_VERSION}"
-            echo "NIGHTLY_REMOTE_DAEMON_VERSION=${NIGHTLY_MARKETING_VERSION}"
             echo "NIGHTLY_DMG_IMMUTABLE=${NIGHTLY_DMG_IMMUTABLE}"
           } >> "$GITHUB_ENV"
 
@@ -629,52 +622,6 @@ jobs:
             cmux.nightly.entitlements \
             "$APPLE_SIGNING_IDENTITY"
 
-      - name: Build remote daemon nightly assets and inject manifest
-        run: |
-          set -euo pipefail
-          # Build with --asset-suffix so manifest download URLs point to
-          # immutable, build-specific asset names (e.g. cmuxd-remote-darwin-arm64-2362248028801).
-          # This prevents checksum mismatches when a newer nightly overwrites
-          # the shared "latest" assets on the release.
-          ./scripts/build_remote_daemon_release_assets.sh \
-            --version "$NIGHTLY_REMOTE_DAEMON_VERSION" \
-            --release-tag "nightly" \
-            --repo "manaflow-ai/cmux" \
-            --output-dir "remote-daemon-assets" \
-            --asset-suffix "$NIGHTLY_BUILD"
-          MANIFEST_JSON="$(python3 -c 'import json,sys; print(json.dumps(json.load(open(sys.argv[1], encoding="utf-8")), separators=(",",":")))' "remote-daemon-assets/cmuxd-remote-manifest-${NIGHTLY_BUILD}.json")"
-          APP_PLIST="build-universal/Build/Products/Release/cmux NIGHTLY.app/Contents/Info.plist"
-          if [ ! -f "$APP_PLIST" ]; then
-            echo "Missing nightly app Info.plist at $APP_PLIST" >&2
-            exit 1
-          fi
-          plutil -remove CMUXRemoteDaemonManifestJSON "$APP_PLIST" >/dev/null 2>&1 || true
-          plutil -insert CMUXRemoteDaemonManifestJSON -string "$MANIFEST_JSON" "$APP_PLIST"
-          # Also create unsuffixed "latest" copies for the release page and
-          # any tooling that fetches the generic asset names. The manifest's
-          # downloadURLs still point to the versioned filenames (intentional:
-          # the live manifest is used by the client-side checksum fallback
-          # which only reads sha256, not downloadURL). The unsuffixed copies
-          # are convenience aliases and don't carry build-provenance
-          # attestation (attested versioned files are canonical).
-          for platform in darwin-arm64 darwin-amd64 linux-arm64 linux-amd64; do
-            cp "remote-daemon-assets/cmuxd-remote-${platform}-${NIGHTLY_BUILD}" \
-               "remote-daemon-assets/cmuxd-remote-${platform}"
-          done
-          # Regenerate unsuffixed checksums with generic filenames so
-          # `shasum -c cmuxd-remote-checksums.txt` works against the aliases.
-          (
-            cd remote-daemon-assets
-            shasum -a 256 \
-              cmuxd-remote-darwin-arm64 \
-              cmuxd-remote-darwin-amd64 \
-              cmuxd-remote-linux-arm64 \
-              cmuxd-remote-linux-amd64 \
-              > cmuxd-remote-checksums.txt
-          )
-          cp "remote-daemon-assets/cmuxd-remote-manifest-${NIGHTLY_BUILD}.json" \
-             "remote-daemon-assets/cmuxd-remote-manifest.json"
-
       - name: Embed nightly provisioning profile
         env:
           APPLE_NIGHTLY_PROVISIONING_PROFILE_BASE64: ${{ secrets.APPLE_NIGHTLY_PROVISIONING_PROFILE_BASE64 }}
@@ -757,31 +704,6 @@ jobs:
           # installs to migrate onto the unified nightly appcast.
           cp appcast.xml appcast-universal.xml
 
-      - name: Attest remote daemon nightly assets
-        id: attest-remote-daemon-nightly-assets
-        continue-on-error: true
-        uses: actions/attest-build-provenance@a2bbfa25375fe432b6a289bc6b6cd05ecd0c4c32 # v4.1.0
-        with:
-          subject-path: |
-            remote-daemon-assets/cmuxd-remote-darwin-arm64-${{ env.NIGHTLY_BUILD }}
-            remote-daemon-assets/cmuxd-remote-darwin-amd64-${{ env.NIGHTLY_BUILD }}
-            remote-daemon-assets/cmuxd-remote-linux-arm64-${{ env.NIGHTLY_BUILD }}
-            remote-daemon-assets/cmuxd-remote-linux-amd64-${{ env.NIGHTLY_BUILD }}
-            remote-daemon-assets/cmuxd-remote-checksums-${{ env.NIGHTLY_BUILD }}.txt
-            remote-daemon-assets/cmuxd-remote-manifest-${{ env.NIGHTLY_BUILD }}.json
-
-      - name: Retry remote daemon nightly asset attestation
-        if: steps.attest-remote-daemon-nightly-assets.outcome == 'failure'
-        uses: actions/attest-build-provenance@a2bbfa25375fe432b6a289bc6b6cd05ecd0c4c32 # v4.1.0
-        with:
-          subject-path: |
-            remote-daemon-assets/cmuxd-remote-darwin-arm64-${{ env.NIGHTLY_BUILD }}
-            remote-daemon-assets/cmuxd-remote-darwin-amd64-${{ env.NIGHTLY_BUILD }}
-            remote-daemon-assets/cmuxd-remote-linux-arm64-${{ env.NIGHTLY_BUILD }}
-            remote-daemon-assets/cmuxd-remote-linux-amd64-${{ env.NIGHTLY_BUILD }}
-            remote-daemon-assets/cmuxd-remote-checksums-${{ env.NIGHTLY_BUILD }}.txt
-            remote-daemon-assets/cmuxd-remote-manifest-${{ env.NIGHTLY_BUILD }}.json
-
       - name: Upload branch nightly artifacts
         if: needs.decide.outputs.should_publish != 'true'
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
@@ -790,7 +712,6 @@ jobs:
           path: |
             cmux-nightly-macos*.dmg
             appcast.xml
-            remote-daemon-assets/cmuxd-remote-*
             appcast-universal.xml
           if-no-files-found: error
 
@@ -827,7 +748,6 @@ jobs:
             cmux-nightly-macos-${{ github.run_id }}*.dmg
             cmux-nightly-macos.dmg
             appcast.xml
-            remote-daemon-assets/cmuxd-remote-*
             appcast-universal.xml
           overwrite_files: true
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d070936a3355..68eabaa00e3f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -227,13 +227,6 @@ jobs:
         if: steps.guard_release_assets.outputs.skip_all != 'true'
         run: python3 scripts/ci/sanitize-xcode-source-packages-cache.py .spm-cache
 
-      - name: Setup Go
-        if: steps.guard_release_assets.outputs.skip_all != 'true'
-        uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
-        with:
-          go-version-file: daemon/remote/go.mod
-          cache-dependency-path: daemon/remote/go.sum
-
       - name: Derive Sparkle public key from private key
         if: steps.guard_release_assets.outputs.skip_all != 'true'
         env:
@@ -336,21 +329,6 @@ jobs:
           ./scripts/verify-diff-sidecar-artifact.sh "$DIFF_SIDECAR"
           [[ "$SDK_VERSION" == 26.* ]]
 
-      - name: Build remote daemon release assets and inject manifest
-        if: steps.guard_release_assets.outputs.skip_all != 'true'
-        run: |
-          set -euo pipefail
-          APP_PLIST="build-universal/Build/Products/Release/cmux.app/Contents/Info.plist"
-          APP_VERSION=$(/usr/libexec/PlistBuddy -c "Print :CFBundleShortVersionString" "$APP_PLIST")
-          ./scripts/build_remote_daemon_release_assets.sh \
-            --version "$APP_VERSION" \
-            --release-tag "$GITHUB_REF_NAME" \
-            --repo "manaflow-ai/cmux" \
-            --output-dir "remote-daemon-assets"
-          MANIFEST_JSON="$(python3 -c 'import json,sys; print(json.dumps(json.load(open(sys.argv[1], encoding="utf-8")), separators=(",",":")))' remote-daemon-assets/cmuxd-remote-manifest.json)"
-          plutil -remove CMUXRemoteDaemonManifestJSON "$APP_PLIST" >/dev/null 2>&1 || true
-          plutil -insert CMUXRemoteDaemonManifestJSON -string "$MANIFEST_JSON" "$APP_PLIST"
-
       - name: Run CLI version memory guard regression
         if: steps.guard_release_assets.outputs.skip_all != 'true'
         run: |
@@ -516,32 +494,6 @@ jobs:
           fi
           ./scripts/sparkle_generate_appcast.sh cmux-macos.dmg "$GITHUB_REF_NAME" appcast.xml
 
-      - name: Attest remote daemon release assets
-        id: attest-remote-daemon-release-assets
-        if: steps.guard_release_assets.outputs.skip_all != 'true'
-        continue-on-error: true
-        uses: actions/attest-build-provenance@a2bbfa25375fe432b6a289bc6b6cd05ecd0c4c32 # v4.1.0
-        with:
-          subject-path: |
-            remote-daemon-assets/cmuxd-remote-darwin-arm64
-            remote-daemon-assets/cmuxd-remote-darwin-amd64
-            remote-daemon-assets/cmuxd-remote-linux-arm64
-            remote-daemon-assets/cmuxd-remote-linux-amd64
-            remote-daemon-assets/cmuxd-remote-checksums.txt
-            remote-daemon-assets/cmuxd-remote-manifest.json
-
-      - name: Retry remote daemon release asset attestation
-        if: steps.guard_release_assets.outputs.skip_all != 'true' && steps.attest-remote-daemon-release-assets.outcome == 'failure'
-        uses: actions/attest-build-provenance@a2bbfa25375fe432b6a289bc6b6cd05ecd0c4c32 # v4.1.0
-        with:
-          subject-path: |
-            remote-daemon-assets/cmuxd-remote-darwin-arm64
-            remote-daemon-assets/cmuxd-remote-darwin-amd64
-            remote-daemon-assets/cmuxd-remote-linux-arm64
-            remote-daemon-assets/cmuxd-remote-linux-amd64
-            remote-daemon-assets/cmuxd-remote-checksums.txt
-            remote-daemon-assets/cmuxd-remote-manifest.json
-
       - name: Upload build artifacts (dry-run)
         if: steps.guard_release_assets.outputs.skip_upload != 'true' && github.event_name == 'workflow_dispatch'
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
@@ -550,7 +502,6 @@ jobs:
           path: |
             cmux-macos.dmg
             appcast.xml
-            remote-daemon-assets/cmuxd-remote-*
           if-no-files-found: error
 
       - name: Upload release asset
@@ -560,12 +511,6 @@ jobs:
           files: |
             cmux-macos.dmg
             appcast.xml
-            remote-daemon-assets/cmuxd-remote-darwin-arm64
-            remote-daemon-assets/cmuxd-remote-darwin-amd64
-            remote-daemon-assets/cmuxd-remote-linux-arm64
-            remote-daemon-assets/cmuxd-remote-linux-amd64
-            remote-daemon-assets/cmuxd-remote-checksums.txt
-            remote-daemon-assets/cmuxd-remote-manifest.json
           generate_release_notes: true
           overwrite_files: false
 
diff --git a/.github/workflows/tmux-corpus.yml b/.github/workflows/tmux-corpus.yml
index 2516b8c12605..321b55ebb493 100644
--- a/.github/workflows/tmux-corpus.yml
+++ b/.github/workflows/tmux-corpus.yml
@@ -1,13 +1,8 @@
-name: tmux corpus
+name: terminal nightly
 
 on:
   # Temporarily manual-only beginning 2026-07-13 to pause automatic CI.
   workflow_dispatch:
-    inputs:
-      fuzztime:
-        description: Time per Go fuzz target
-        required: false
-        default: 2m
 
 permissions:
   actions: write
@@ -18,42 +13,6 @@ concurrency:
   cancel-in-progress: false
 
 jobs:
-  remote-daemon-fuzz:
-    runs-on: ${{ vars.LINUX_RUNNER || 'blacksmith-4vcpu-ubuntu-2404' }}
-    timeout-minutes: 30
-    steps:
-      - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-        with:
-          persist-credentials: false
-
-      - name: Setup Go
-        uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
-        with:
-          go-version-file: daemon/remote/go.mod
-          cache-dependency-path: daemon/remote/go.sum
-
-      - name: Run deterministic tmux corpus tests
-        working-directory: daemon/remote
-        run: go test ./...
-
-      - name: Run tmux corpus fuzz targets
-        working-directory: daemon/remote
-        env:
-          FUZZTIME: ${{ github.event_name == 'pull_request' && '30s' || github.event.inputs.fuzztime || '2m' }}
-        run: |
-          set -euo pipefail
-          for target in \
-            FuzzTmuxCompatArgParser \
-            FuzzTmuxRenderFormatSupportedSubset \
-            FuzzTmuxSendKeysTokens \
-            FuzzConsumeWebSocketLease \
-            FuzzNormalizePTYSize \
-            FuzzWebSocketPTYControlFrame
-          do
-            go test ./cmd/cmuxd-remote -run '^$' -fuzz "^${target}$" -fuzztime "$FUZZTIME"
-          done
-
   terminal-nightly:
     if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
     runs-on: ${{ vars.MACOS_RUNNER_15 || 'blacksmith-6vcpu-macos-15' }}
diff --git a/CLI/cmux.swift b/CLI/cmux.swift
index 74756a50769c..fe78bb8c0057 100644
--- a/CLI/cmux.swift
+++ b/CLI/cmux.swift
@@ -4294,7 +4294,7 @@ struct CMUXCLI {
     // never pins an image id unless the person passes `--image`: a pinned id
     // that drifted from the web deploy's manifest failed every create with
     // `vm_image_config_error`.
-    /// `--size` spellings → memory in MB. vCPUs scale with memory on Blaxel.
+    /// `--size` spellings → memory in MB. vCPUs scale with memory.
     private static let cloudVMSizeAliases: [String: Int] = [
         "2g": 2048, "2gb": 2048, "small": 2048,
         "4g": 4096, "4gb": 4096, "medium": 4096,
@@ -4597,7 +4597,7 @@ struct CMUXCLI {
             return nil
         }
         let normalized = trimmed.lowercased()
-        guard normalized == "e2b" || normalized == "freestyle" || normalized == "daytona" || normalized == "blaxel" else {
+        guard normalized == "e2b" || normalized == "freestyle" || normalized == "daytona" else {
             throw CLIError(message: """
                 vm new: unsupported Cloud VM service override.
 
@@ -5861,11 +5861,15 @@ struct CMUXCLI {
                 let (nameOpt, rem1b) = parseOption(rem1a, name: "--name")
                 let (windowOpt, rem2) = parseOption(rem1b, name: "--window")
                 let detach = hasFlag(rem2, name: "--detach") || hasFlag(rem2, name: "-d")
-                // A machine comes with its screen: new machines boot the desktop image
-                // (xfce + noVNC) unless the person asks for a shell-only box with --base.
-                // --desktop stays accepted for scripts written against the old default.
-                let base = hasFlag(rem2, name: "--base") || hasFlag(rem2, name: "--no-desktop")
-                let desktop = !base
+                // No provider ships a desktop image right now, so a bare `vm new`
+                // asks for a shell-only machine; requesting `--desktop` anyway fails
+                // closed with a server-side image config error rather than silently
+                // handing back a screenless box. Flip this back to desktop-by-default
+                // once a desktop image lands in the manifest.
+                // `--base`/`--no-desktop` stay accepted for scripts written against
+                // the old desktop default.
+                _ = hasFlag(rem2, name: "--base") || hasFlag(rem2, name: "--no-desktop")
+                let desktop = hasFlag(rem2, name: "--desktop")
                 let (sizeOpt, rem3) = parseOption(rem2, name: "--size")
                 let memoryMb: Int?
                 if let sizeOpt {
@@ -5891,8 +5895,8 @@ struct CMUXCLI {
                         vm new: unknown flag '\(unknown)'.
 
                         Known flags:
-                          --base            shell-only machine (no desktop)
-                          --desktop         machine with a screen (default)
+                          --base            shell-only machine (no desktop, the default)
+                          --desktop         machine with a screen (no image available yet)
                           --size <2g|4g|8g|16g|24g|32g>
                           --name <label>    display label (the id stays the address)
                           --image <image-id>  explicit image override (normally omit)
@@ -5930,8 +5934,8 @@ struct CMUXCLI {
                 }
                 if let normalizedProvider { params["provider"] = normalizedProvider }
                 // Size is independent of the image/provider override. Providers that do
-                // not expose sizing ignore this optional field; Blaxel uses it for runtime
-                // memory and the backend applies the plan ceiling.
+                // not expose sizing ignore this optional field; providers that do use it
+                // for runtime memory get it, and the backend applies the plan ceiling.
                 if let memoryMb { params["memory_mb"] = memoryMb }
                 // The persistent per-machine home is keyed off whether the *person*
                 // overrode the image/provider (`imageOptRaw`), not the CLI-injected
@@ -5943,8 +5947,8 @@ struct CMUXCLI {
                     providerOption: providerOpt
                 )
                 // The persistent-default create sends no provider override: the backend's
-                // CMUX_VM_DEFAULT_PROVIDER decides, with Blaxel as the default. An explicit
-                // provider remains available for deliberate rollback/provider experiments.
+                // CMUX_VM_DEFAULT_PROVIDER decides, with Freestyle as the default. An
+                // explicit provider remains available for deliberate rollback/experiments.
                 if usesPersistentDefaultCloud {
                     // Every new machine is its own persistent computer: the backend mounts a
                     // volume derived from the machine's generated name, so `vm new` mints a
@@ -13061,7 +13065,7 @@ struct CMUXCLI {
         logVMTiming(
             "base.open",
             vmID: (response["id"] as? String) ?? "?",
-            provider: (response["provider"] as? String) ?? "blaxel",
+            provider: (response["provider"] as? String) ?? "freestyle",
             startedAt: vmCreateStartedAt
         )
 
@@ -13071,7 +13075,7 @@ struct CMUXCLI {
         }
 
         let id = (response["id"] as? String) ?? "?"
-        let provider = (response["provider"] as? String) ?? "blaxel"
+        let provider = (response["provider"] as? String) ?? "freestyle"
         let image = (response["image"] as? String) ?? "?"
         let base = response["base"] as? [String: Any]
         let generation = (base?["generation"] as? Int) ?? (base?["generation"] as? NSNumber)?.intValue
@@ -13151,7 +13155,7 @@ struct CMUXCLI {
         logVMTiming(
             "base.reset",
             vmID: (response["id"] as? String) ?? "?",
-            provider: (response["provider"] as? String) ?? "blaxel",
+            provider: (response["provider"] as? String) ?? "freestyle",
             startedAt: vmCreateStartedAt
         )
 
@@ -13161,7 +13165,7 @@ struct CMUXCLI {
         }
 
         let id = (response["id"] as? String) ?? "?"
-        let provider = (response["provider"] as? String) ?? "blaxel"
+        let provider = (response["provider"] as? String) ?? "freestyle"
         let image = (response["image"] as? String) ?? "?"
         let base = response["base"] as? [String: Any]
         let generation = (base?["generation"] as? Int) ?? (base?["generation"] as? NSNumber)?.intValue
diff --git a/Resources/Localizable.xcstrings b/Resources/Localizable.xcstrings
index a993948edc46..0089e7886571 100644
--- a/Resources/Localizable.xcstrings
+++ b/Resources/Localizable.xcstrings
@@ -193763,7 +193763,7 @@
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "cloud machines vm virtual machine persistent computer sandbox plan upgrade fleet blaxel"
+            "value": "cloud machines vm virtual machine persistent computer sandbox plan upgrade fleet freestyle"
           }
         },
         "ja": {
diff --git a/Sources/Cloud/NewMachineModel.swift b/Sources/Cloud/NewMachineModel.swift
index b6b65e18730e..4cbcd128e2c7 100644
--- a/Sources/Cloud/NewMachineModel.swift
+++ b/Sources/Cloud/NewMachineModel.swift
@@ -48,7 +48,10 @@ final class NewMachineModel {
     let imageKinds: [VMImageKindOption]
 
     var name: String = ""
-    var kind: VMMachineKind = .desktop
+    /// Defaults to a kind the backend says it can actually serve (see
+    /// ``selectableKinds``), so the sheet never opens preselected on a kind
+    /// whose create can only fail with an image config error.
+    var kind: VMMachineKind
     var memoryMb: Int
     private(set) var isCreating = false
     /// The CLI's output when the last create failed; nil once a retry starts.
@@ -92,8 +95,21 @@ final class NewMachineModel {
         self.imageKinds = imageKinds
         self.launch = launch
         self.memoryMb = Self.defaultMemoryMb(planId: plan?.planId)
+        self.kind = Self.selectableKinds(imageKinds: imageKinds).first ?? .base
     }
 
+    /// Kinds the sheet offers: what the backend reports it can provision, and
+    /// every kind when it reports none (an older control plane that predates
+    /// `limits.imageKinds`, where refusing to offer anything would be worse).
+    static func selectableKinds(imageKinds: [VMImageKindOption]) -> [VMMachineKind] {
+        let servable = VMMachineKind.allCases.filter { kind in
+            imageKinds.contains { $0.kind == kind }
+        }
+        return servable.isEmpty ? VMMachineKind.allCases : servable
+    }
+
+    var selectableKinds: [VMMachineKind] { Self.selectableKinds(imageKinds: imageKinds) }
+
     var isBaseSetup: Bool {
         if case .base = mode { return true }
         return false
diff --git a/Sources/Cloud/NewMachineSheet.swift b/Sources/Cloud/NewMachineSheet.swift
index f94f6ced2b5b..a199cbb979e7 100644
--- a/Sources/Cloud/NewMachineSheet.swift
+++ b/Sources/Cloud/NewMachineSheet.swift
@@ -61,7 +61,7 @@ struct NewMachineSheet: View {
                 label(String(localized: "machines.new.kind.label", defaultValue: "Kind"))
                 VStack(alignment: .leading, spacing: 4) {
                     Picker("", selection: $model.kind) {
-                        ForEach(VMMachineKind.allCases, id: \.self) { kind in
+                        ForEach(model.selectableKinds, id: \.self) { kind in
                             Text(kind.displayName).tag(kind)
                         }
                     }
diff --git a/Sources/Cloud/VMMachineKind.swift b/Sources/Cloud/VMMachineKind.swift
index 1be3ae4efef4..38579466860a 100644
--- a/Sources/Cloud/VMMachineKind.swift
+++ b/Sources/Cloud/VMMachineKind.swift
@@ -4,8 +4,8 @@ import Foundation
 /// plane happens to deploy for it today.
 ///
 /// Clients request machines by kind and let the backend map the kind to the
-/// image its environment supports (`BLAXEL_SANDBOX_DESKTOP_IMAGE`,
-/// `BLAXEL_SANDBOX_IMAGE`, or the deployed manifest default). Pinning an
+/// image its environment supports (the provider's `_DESKTOP_IMAGE` selector,
+/// its base image selector, or the deployed manifest default). Pinning an
 /// image id on the client broke every build whose id drifted from the web
 /// deploy's manifest (`vm_image_config_error`), so the id is never sent unless
 /// a person passes `--image` explicitly.
@@ -16,11 +16,16 @@ enum VMMachineKind: String, CaseIterable, Sendable, Equatable {
     case base
 
     /// The kind an image id implies when the backend did not say. Older
-    /// control planes omit `kind`; their desktop images carry a recognizable
+    /// control planes omit `kind`; a desktop image carries a recognizable
     /// name, everything else is a shell box.
+    ///
+    /// Only VNC markers count. `devbox` used to imply a desktop because one
+    /// provider's devbox image bundled xfce + noVNC; the shared devbox image
+    /// every remaining provider boots is shell-only, so matching it here
+    /// published a Desktop surface for machines with no screen.
     static func inferred(fromImage image: String) -> VMMachineKind {
         let lowered = image.lowercased()
-        return lowered.contains("xfce") || lowered.contains("devbox") ? .desktop : .base
+        return lowered.contains("xfce") || lowered.contains("vnc") ? .desktop : .base
     }
 
     /// The kind a backend payload describes: its explicit `kind` field when
diff --git a/Sources/SettingsSearchAliases.swift b/Sources/SettingsSearchAliases.swift
index fbf1b5f2ef4a..2e2b7055fa78 100644
--- a/Sources/SettingsSearchAliases.swift
+++ b/Sources/SettingsSearchAliases.swift
@@ -16,7 +16,7 @@ enum SettingsSearchAliasIndex {
         case .mobile:
             return localized("settings.search.alias.section.mobile", defaultValue: "ios iphone ipad mobile pairing local network permission sync")
         case .cloudMachines:
-            return localized("settings.search.alias.section.cloudMachines", defaultValue: "cloud machines vm virtual machine persistent computer sandbox plan upgrade fleet blaxel")
+            return localized("settings.search.alias.section.cloudMachines", defaultValue: "cloud machines vm virtual machine persistent computer sandbox plan upgrade fleet freestyle")
         case .networking:
             return localized("settings.search.alias.section.networking", defaultValue: "iroh relay relays server fleet provider region custom self hosted private network tailscale vpn direct peer")
         case .sidebarAppearance:
diff --git a/Sources/Surfaces/CmuxTuiSnapshotParser.swift b/Sources/Surfaces/CmuxTuiSnapshotParser.swift
index 4f1f9637a226..0250f9099ffd 100644
--- a/Sources/Surfaces/CmuxTuiSnapshotParser.swift
+++ b/Sources/Surfaces/CmuxTuiSnapshotParser.swift
@@ -254,8 +254,11 @@ struct CmuxTuiSnapshotParser: Sendable {
 
     static let desktopPort = 6901
 
+    /// Fallback for callers that only hold an image id. Prefer
+    /// ``VMSummary/resolvedKind``, which honors the backend's explicit `kind`.
+    /// Only VNC markers count: see ``VMMachineKind/inferred(fromImage:)``.
     static func machineHasDesktop(image: String) -> Bool {
-        image.contains("xfce-vnc") || image.contains("cmux-devbox")
+        VMMachineKind.inferred(fromImage: image).hasDesktop
     }
 
     /// The VNC display of a desktop machine (`display:1`; the key is the daemon's content id
diff --git a/Sources/Surfaces/CmuxTuiSurfaceProviders.swift b/Sources/Surfaces/CmuxTuiSurfaceProviders.swift
index b0b9eae3f1cf..33a006338970 100644
--- a/Sources/Surfaces/CmuxTuiSurfaceProviders.swift
+++ b/Sources/Surfaces/CmuxTuiSurfaceProviders.swift
@@ -221,7 +221,7 @@ final class CmuxTuiSurfaceProvider: SurfaceProvider {
     func refresh(force: Bool) async {
         let machine = self.machine
         var resources: [SurfaceResource] = []
-        if CmuxTuiSnapshotParser.machineHasDesktop(image: summary.image) {
+        if summary.resolvedKind.hasDesktop {
             resources.append(CmuxTuiSnapshotParser.display(machine: machine))
         }
         guard isAwake, let client = VMClient.shared else {
@@ -235,7 +235,7 @@ final class CmuxTuiSurfaceProvider: SurfaceProvider {
         if !resources.isEmpty, catalog.snapshot.resources(on: machine).isEmpty {
             catalog.replaceResources(resources, on: machine, info: info)
         }
-        if CmuxTuiSnapshotParser.machineHasDesktop(image: summary.image) {
+        if summary.resolvedKind.hasDesktop {
             prefetchDesktopEndpoint()
         }
         async let stats = try? client.stats(id: machineID)
@@ -526,7 +526,7 @@ final class CmuxTuiSurfaceProvider: SurfaceProvider {
             name: summary.preferredName,
             status: summary.status,
             image: summary.image,
-            hasDesktop: CmuxTuiSnapshotParser.machineHasDesktop(image: summary.image),
+            hasDesktop: summary.resolvedKind.hasDesktop,
             memoryMb: stats?.memoryTotalMb,
             diskMb: stats?.diskTotalMb,
             linkState: linkState,
diff --git a/cmuxTests/CLIVMTransferTests.swift b/cmuxTests/CLIVMTransferTests.swift
index 19053e9f9d31..211892d0bf24 100644
--- a/cmuxTests/CLIVMTransferTests.swift
+++ b/cmuxTests/CLIVMTransferTests.swift
@@ -312,9 +312,9 @@ extension CLINotifyProcessIntegrationRegressionTests {
             case "vm.list":
                 return self.v2Response(id: id, ok: true, result: [
                     "vms": [
-                        ["id": "impostor", "displayName": "agent-pool", "status": "running", "provider": "blaxel", "image": "blaxel/base-image:latest"],
-                        ["id": "pool-1", "displayName": "agent-pool", "status": "running", "provider": "blaxel", "image": "blaxel/base-image:latest"],
-                        ["id": "user-vm", "displayName": "my precious", "status": "running", "provider": "blaxel", "image": "blaxel/base-image:latest"],
+                        ["id": "impostor", "displayName": "agent-pool", "status": "running", "provider": "freestyle", "image": "cmuxd-ws:tooling-20260509f"],
+                        ["id": "pool-1", "displayName": "agent-pool", "status": "running", "provider": "freestyle", "image": "cmuxd-ws:tooling-20260509f"],
+                        ["id": "user-vm", "displayName": "my precious", "status": "running", "provider": "freestyle", "image": "cmuxd-ws:tooling-20260509f"],
                     ],
                 ])
             case "vm.stats":
@@ -385,11 +385,11 @@ extension CLINotifyProcessIntegrationRegressionTests {
             case "vm.list":
                 return self.v2Response(id: id, ok: true, result: ["vms": []])
             case "vm.create":
-                return self.v2Response(id: id, ok: true, result: ["id": "fresh-1", "provider": "blaxel", "status": "creating", "image": "blaxel/base-image:latest"])
+                return self.v2Response(id: id, ok: true, result: ["id": "fresh-1", "provider": "freestyle", "status": "creating", "image": "cmuxd-ws:tooling-20260509f"])
             case "vm.rename":
                 return self.v2Response(id: id, ok: true, result: ["id": "fresh-1", "displayName": "agent-pool"])
             case "vm.status":
-                return self.v2Response(id: id, ok: true, result: ["id": "fresh-1", "provider": "blaxel", "status": "running"])
+                return self.v2Response(id: id, ok: true, result: ["id": "fresh-1", "provider": "freestyle", "status": "running"])
             case "vm.exec":
                 let params = request["params"] as? [String: Any]
                 let vmID = (params?["id"] as? String) ?? "?"
@@ -462,11 +462,11 @@ extension CLINotifyProcessIntegrationRegressionTests {
                 case "vm.create":
                     // Hold the create open so both processes are provisioning at once.
                     Thread.sleep(forTimeInterval: 1.0)
-                    return self.v2Response(id: id, ok: true, result: ["id": machine, "provider": "blaxel", "status": "running", "image": "blaxel/base-image:latest"])
+                    return self.v2Response(id: id, ok: true, result: ["id": machine, "provider": "freestyle", "status": "running", "image": "cmuxd-ws:tooling-20260509f"])
                 case "vm.rename":
                     return self.v2Response(id: id, ok: true, result: ["id": machine, "displayName": "agent-pool"])
                 case "vm.status":
-                    return self.v2Response(id: id, ok: true, result: ["id": machine, "provider": "blaxel", "status": "running"])
+                    return self.v2Response(id: id, ok: true, result: ["id": machine, "provider": "freestyle", "status": "running"])
                 case "vm.exec":
                     return self.vmExecOKResponse(id: id, stdout: "\(machine)\n")
                 default:
@@ -550,8 +550,8 @@ extension CLINotifyProcessIntegrationRegressionTests {
             case "vm.list":
                 return self.v2Response(id: id, ok: true, result: [
                     "vms": [
-                        ["id": "pool-1", "displayName": "agent-pool", "status": "running", "provider": "blaxel", "image": "blaxel/base-image:latest"],
-                        ["id": "pool-2", "displayName": "agent-pool", "status": "standby", "provider": "blaxel", "image": "blaxel/base-image:latest"],
+                        ["id": "pool-1", "displayName": "agent-pool", "status": "running", "provider": "freestyle", "image": "cmuxd-ws:tooling-20260509f"],
+                        ["id": "pool-2", "displayName": "agent-pool", "status": "standby", "provider": "freestyle", "image": "cmuxd-ws:tooling-20260509f"],
                     ],
                 ])
             case "vm.exec":
@@ -614,7 +614,7 @@ extension CLINotifyProcessIntegrationRegressionTests {
             let status = call < 2 ? "creating" : "running"
             return self.v2Response(id: id, ok: true, result: [
                 "id": "brave-otter",
-                "provider": "blaxel",
+                "provider": "freestyle",
                 "status": status,
             ])
         }
diff --git a/cmuxTests/CmuxTuiSurfaceProviderTests.swift b/cmuxTests/CmuxTuiSurfaceProviderTests.swift
index 6d5a6dbef02f..64ad019e209e 100644
--- a/cmuxTests/CmuxTuiSurfaceProviderTests.swift
+++ b/cmuxTests/CmuxTuiSurfaceProviderTests.swift
@@ -227,8 +227,8 @@ import Testing
         """
         #expect(CmuxTuiSnapshotParser.listeningPorts(fromSocketListing: ss) == [1337, 3000, 5901])
         #expect(CmuxTuiSnapshotParser.internalPorts.isSuperset(of: [1337, 5901, 6901]))
-        #expect(CmuxTuiSnapshotParser.machineHasDesktop(image: "blaxel/xfce-vnc:latest"))
-        #expect(!CmuxTuiSnapshotParser.machineHasDesktop(image: "blaxel/base-image:latest"))
+        #expect(CmuxTuiSnapshotParser.machineHasDesktop(image: "cmux-xfce-vnc:latest"))
+        #expect(!CmuxTuiSnapshotParser.machineHasDesktop(image: "cmuxd-ws:tooling-20260509f"))
 
         let display = CmuxTuiSnapshotParser.display(machine: Self.machine)
         #expect(display.id == SurfaceResourceID(machine: Self.machine, kind: .display, key: "display:1"))
diff --git a/cmuxTests/MachinesPanelModelTests.swift b/cmuxTests/MachinesPanelModelTests.swift
index e996aa905177..a15abdaf25b7 100644
--- a/cmuxTests/MachinesPanelModelTests.swift
+++ b/cmuxTests/MachinesPanelModelTests.swift
@@ -13,9 +13,9 @@ final class MachinesPanelModelTests: XCTestCase {
     func testSnapshotMapsSummaryFields() {
         let summary = VMSummary(
             id: "noble-wren",
-            provider: "blaxel",
+            provider: "freestyle",
             status: "running",
-            image: "blaxel/base-image:latest",
+            image: "cmuxd-ws:tooling-20260509f",
             createdAt: 1_787_400_000_000,
             base: nil
         )
@@ -23,7 +23,7 @@ final class MachinesPanelModelTests: XCTestCase {
         XCTAssertEqual(snapshot.id, "noble-wren")
         XCTAssertEqual(snapshot.displayName, "noble-wren")
         XCTAssertNil(snapshot.label)
-        XCTAssertEqual(snapshot.provider, "blaxel")
+        XCTAssertEqual(snapshot.provider, "freestyle")
         XCTAssertFalse(snapshot.isDesktop)
         XCTAssertEqual(snapshot.activity, .ready)
         XCTAssertEqual(
@@ -35,9 +35,9 @@ final class MachinesPanelModelTests: XCTestCase {
     func testDesktopImageDetection() {
         let desktop = MachineSnapshotBuilder.snapshot(from: VMSummary(
             id: "noble-dolphin",
-            provider: "blaxel",
+            provider: "freestyle",
             status: "running",
-            image: "blaxel/xfce-vnc:latest",
+            image: "cmux-xfce-vnc:latest",
             createdAt: 0,
             base: nil
         ))
@@ -45,24 +45,28 @@ final class MachinesPanelModelTests: XCTestCase {
         XCTAssertNil(desktop.createdAt)
     }
 
-    func testBakedDevboxImageIsDesktop() {
+    /// Regression: the baked devbox image used to read as a desktop because
+    /// one provider's devbox bundled xfce + noVNC. The shared devbox image
+    /// every remaining provider boots is shell-only, so a name-based desktop
+    /// would put a dead Desktop row in the machine's surface list.
+    func testBakedDevboxImageIsNotDesktop() {
         let devbox = MachineSnapshotBuilder.snapshot(from: VMSummary(
             id: "vivid-heron",
-            provider: "blaxel",
+            provider: "freestyle",
             status: "running",
-            image: "sandbox/cmux-devbox:latest",
+            image: "cmux-devbox:devbox-20260828b",
             createdAt: 0,
             base: nil
         ))
-        XCTAssertTrue(devbox.isDesktop)
+        XCTAssertFalse(devbox.isDesktop)
     }
 
     func testLabelDrivesDisplayName() {
         var summary = VMSummary(
             id: "noble-wren",
-            provider: "blaxel",
+            provider: "freestyle",
             status: "running",
-            image: "blaxel/base-image:latest",
+            image: "cmuxd-ws:tooling-20260509f",
             createdAt: 0,
             base: nil
         )
@@ -217,9 +221,9 @@ final class MachinesPanelModelTests: XCTestCase {
         let created: Int64 = 1_787_400_000_000
         let summary = VMSummary(
             id: "noble-wren",
-            provider: "blaxel",
+            provider: "freestyle",
             status: "running",
-            image: "blaxel/xfce-vnc:latest",
+            image: "cmux-xfce-vnc:latest",
             createdAt: created,
             base: nil
         )
@@ -246,9 +250,9 @@ final class MachinesPanelModelTests: XCTestCase {
         let created: Int64 = 1_787_400_000_000
         let summary = VMSummary(
             id: "noble-wren",
-            provider: "blaxel",
+            provider: "freestyle",
             status: "running",
-            image: "blaxel/xfce-vnc:latest",
+            image: "cmux-xfce-vnc:latest",
             createdAt: created,
             base: nil
         )
@@ -315,7 +319,7 @@ final class MachinesPanelModelTests: XCTestCase {
         let created = now.addingTimeInterval(-86_400)
         func machine(_ id: String, createdAt: Date) -> MachineSnapshot {
             MachineSnapshot(
-                id: id, provider: "blaxel", image: "blaxel/xfce-vnc:latest", isDesktop: true,
+                id: id, provider: "freestyle", image: "cmux-xfce-vnc:latest", isDesktop: true,
                 activity: .ready, createdAt: createdAt, label: nil
             )
         }
@@ -332,8 +336,8 @@ final class MachinesPanelModelTests: XCTestCase {
     func testSnapshotPrefersServerFreeAccessExpiry() {
         let now = Date(timeIntervalSince1970: 1_787_400_000)
         var summary = VMSummary(
-            id: "noble-wren", provider: "blaxel", status: "running",
-            image: "blaxel/xfce-vnc:latest", createdAt: Int64(now.timeIntervalSince1970 * 1000), base: nil
+            id: "noble-wren", provider: "freestyle", status: "running",
+            image: "cmux-xfce-vnc:latest", createdAt: Int64(now.timeIntervalSince1970 * 1000), base: nil
         )
         summary.freeAccessExpiresAt = Int64(now.addingTimeInterval(-60).timeIntervalSince1970 * 1000)
         // Local window math would say 7 days left; the server says it already closed.
@@ -341,9 +345,9 @@ final class MachinesPanelModelTests: XCTestCase {
     }
 
     // MARK: - Cloud tree
-    private func machineSnapshot(id: String, image: String = "blaxel/xfce-vnc:latest") -> MachineSnapshot {
+    private func machineSnapshot(id: String, image: String = "cmux-xfce-vnc:latest") -> MachineSnapshot {
         MachineSnapshotBuilder.snapshot(from: VMSummary(
-            id: id, provider: "blaxel", status: "running", image: image, createdAt: 0, base: nil
+            id: id, provider: "freestyle", status: "running", image: image, createdAt: 0, base: nil
         ))
     }
 
@@ -356,7 +360,7 @@ final class MachinesPanelModelTests: XCTestCase {
         remoteWorkspaces: [SurfaceRemoteWorkspace]? = nil
     ) -> SurfaceMachineInfo {
         SurfaceMachineInfo(
-            id: id, name: name ?? id.rawValue, status: "running", image: hasDesktop ? "blaxel/xfce-vnc:latest" : "blaxel/base-image:latest",
+            id: id, name: name ?? id.rawValue, status: "running", image: hasDesktop ? "cmux-xfce-vnc:latest" : "cmuxd-ws:tooling-20260509f",
             hasDesktop: hasDesktop, memoryMb: nil, diskMb: nil, linkState: linkState, linkError: linkError,
             cpuPercent: nil, memoryUsedMb: nil, diskUsedMb: nil, remoteWorkspaces: remoteWorkspaces
         )
@@ -539,7 +543,7 @@ final class MachinesPanelModelTests: XCTestCase {
 
     func testCloudTreeSleepingAndBrokenMachinesShowOnePlaceholder() {
         let asleep = CloudTreeNodeBuilder.nodes(
-            machines: [machineSnapshot(id: "quiet-owl", image: "blaxel/base-image:latest")],
+            machines: [machineSnapshot(id: "quiet-owl", image: "cmuxd-ws:tooling-20260509f")],
             snapshot: SurfaceCatalogSnapshot(machines: [machineInfo(.cloud("quiet-owl"), linkState: .asleep, hasDesktop: false)], resources: [], projections: []),
             localWorkspaces: []
         )
@@ -606,7 +610,7 @@ final class MachinesPanelModelTests: XCTestCase {
             ]
         )
         let nodes = CloudTreeNodeBuilder.nodes(
-            machines: [machineSnapshot(id: "m", image: "blaxel/base-image:latest")],
+            machines: [machineSnapshot(id: "m", image: "cmuxd-ws:tooling-20260509f")],
             snapshot: snapshot,
             localWorkspaces: [CloudTreeLocalWorkspace(id: local, title: "cmux90", isSelected: true), CloudTreeLocalWorkspace(id: other, title: "notes", isSelected: false)],
             includeLocalMachine: true
@@ -715,14 +719,14 @@ final class MachinesPanelModelTests: XCTestCase {
 
     func testMachineSubtitleNeverShowsTheFreeAccessCountdown() {
         let active = MachineSnapshot(
-            id: "warm-owl", provider: "blaxel", image: "blaxel/xfce-vnc:latest", isDesktop: true,
+            id: "warm-owl", provider: "freestyle", image: "cmux-xfce-vnc:latest", isDesktop: true,
             activity: .ready, createdAt: nil, label: nil, freeAccess: .active(daysLeft: 3)
         )
         XCTAssertFalse(CloudTreeMachineRowContent.subtitle(active).contains("3"), "expiry is plan chrome, not a machine fact")
         XCTAssertNil(CloudTreeMachineRowContent.inlineFact(active, style: .compact))
 
         let expired = MachineSnapshot(
-            id: "warm-owl", provider: "blaxel", image: "blaxel/xfce-vnc:latest", isDesktop: true,
+            id: "warm-owl", provider: "freestyle", image: "cmux-xfce-vnc:latest", isDesktop: true,
             activity: .attention("locked"), createdAt: nil, label: nil, freeAccess: .expired
         )
         XCTAssertTrue(CloudTreeMachineRowContent.subtitle(expired).contains("Locked"), "a dead row still explains itself")
@@ -773,7 +777,7 @@ final class CloudTreeScopeAndSignatureTests: XCTestCase {
         XCTAssertEqual(VMCapabilities(json: ["snapshot": false, "fork": false]), VMCapabilities(snapshot: false, restore: true, fork: false))
         XCTAssertEqual(VMCapabilities(json: ["snapshot": NSNumber(value: false), "restore": NSNumber(value: true), "fork": true]),
                        VMCapabilities(snapshot: false, restore: true, fork: true))
-        let summary = VMSummary(id: "m", provider: "blaxel", status: "running", image: "sandbox/cmux-devbox:latest", createdAt: 0, base: nil)
+        let summary = VMSummary(id: "m", provider: "freestyle", status: "running", image: "cmux-devbox:devbox-20260828b", createdAt: 0, base: nil)
         XCTAssertEqual(summary.capabilities, .all)
         var declared = summary
         declared.capabilities = VMCapabilities(json: ["snapshot": false, "restore": false, "fork": false])
@@ -785,11 +789,11 @@ final class CloudTreeScopeAndSignatureTests: XCTestCase {
     }
 
     private func info(_ machine: SurfaceMachineID) -> SurfaceMachineInfo {
-        SurfaceMachineInfo(id: machine, name: machine.rawValue, status: "running", image: "blaxel/xfce-vnc:latest", hasDesktop: false, memoryMb: nil, diskMb: nil, linkState: machine.isLocal ? .notApplicable : .connected, linkError: nil, cpuPercent: nil, memoryUsedMb: nil, diskUsedMb: nil)
+        SurfaceMachineInfo(id: machine, name: machine.rawValue, status: "running", image: "cmux-xfce-vnc:latest", hasDesktop: false, memoryMb: nil, diskMb: nil, linkState: machine.isLocal ? .notApplicable : .connected, linkError: nil, cpuPercent: nil, memoryUsedMb: nil, diskUsedMb: nil)
     }
 
     private func machine(_ id: String) -> MachineSnapshot {
-        MachineSnapshot(id: id, provider: "blaxel", image: "blaxel/xfce-vnc:latest", isDesktop: true, activity: .ready, createdAt: nil, label: nil)
+        MachineSnapshot(id: id, provider: "freestyle", image: "cmux-xfce-vnc:latest", isDesktop: true, activity: .ready, createdAt: nil, label: nil)
     }
 
     func testTreeShowsThisMacByDefaultAndCloudOnlyStaysOneFlipAway() {
@@ -846,7 +850,7 @@ final class CloudTreeScopeAndSignatureTests: XCTestCase {
 /// `nodes` actually renders.
 @Suite struct CloudTreeEmptyDecisionTests {
     private func info(_ machine: SurfaceMachineID) -> SurfaceMachineInfo {
-        SurfaceMachineInfo(id: machine, name: machine.rawValue, status: "running", image: "blaxel/xfce-vnc:latest", hasDesktop: false, memoryMb: nil, diskMb: nil, linkState: machine.isLocal ? .notApplicable : .connected, linkError: nil, cpuPercent: nil, memoryUsedMb: nil, diskUsedMb: nil)
+        SurfaceMachineInfo(id: machine, name: machine.rawValue, status: "running", image: "cmux-xfce-vnc:latest", hasDesktop: false, memoryMb: nil, diskMb: nil, linkState: machine.isLocal ? .notApplicable : .connected, linkError: nil, cpuPercent: nil, memoryUsedMb: nil, diskUsedMb: nil)
     }
 
     private func terminal(_ machine: SurfaceMachineID, _ key: String) -> SurfaceResource {
@@ -854,7 +858,7 @@ final class CloudTreeScopeAndSignatureTests: XCTestCase {
     }
 
     private func machine(_ id: String) -> MachineSnapshot {
-        MachineSnapshot(id: id, provider: "blaxel", image: "blaxel/xfce-vnc:latest", isDesktop: true, activity: .ready, createdAt: nil, label: nil)
+        MachineSnapshot(id: id, provider: "freestyle", image: "cmux-xfce-vnc:latest", isDesktop: true, activity: .ready, createdAt: nil, label: nil)
     }
 
     @Test func emptyDecisionMatchesWhatTheTreeRenders() {
@@ -890,7 +894,7 @@ final class CloudTreeScopeAndSignatureTests: XCTestCase {
 struct CloudTreeMachineInlineFactTests {
     private func snapshot(stats: VMStats?) -> MachineSnapshot {
         var machine = MachineSnapshotBuilder.snapshot(from: VMSummary(
-            id: "troll", provider: "blaxel", status: "running", image: "sandbox/cmux-devbox:latest", createdAt: 0, base: nil
+            id: "troll", provider: "freestyle", status: "running", image: "cmux-devbox:devbox-20260828b", createdAt: 0, base: nil
         ))
         machine.stats = stats
         return machine
diff --git a/cmuxTests/NewMachineModelTests.swift b/cmuxTests/NewMachineModelTests.swift
index d74f3a8e8f5f..322855afd294 100644
--- a/cmuxTests/NewMachineModelTests.swift
+++ b/cmuxTests/NewMachineModelTests.swift
@@ -39,25 +39,35 @@ final class NewMachineModelTests: XCTestCase {
     // MARK: Kind
 
     func testKindInferredFromImageWhenBackendOmitsIt() {
-        XCTAssertEqual(VMMachineKind.inferred(fromImage: "sandbox/cmux-devbox:latest"), .desktop)
-        XCTAssertEqual(VMMachineKind.inferred(fromImage: "blaxel/xfce-vnc:latest"), .desktop)
-        XCTAssertEqual(VMMachineKind.inferred(fromImage: "blaxel/base-image:latest"), .base)
+        XCTAssertEqual(VMMachineKind.inferred(fromImage: "cmux-xfce-vnc:latest"), .desktop)
+        XCTAssertEqual(VMMachineKind.inferred(fromImage: "cmuxd-ws:tooling-20260509f"), .base)
         XCTAssertEqual(VMMachineKind.inferred(fromImage: ""), .base)
     }
 
+    /// Regression: `devbox` used to imply a desktop because one provider's
+    /// devbox image bundled xfce + noVNC. The shared devbox image every
+    /// remaining provider boots is shell-only, so inferring a desktop from the
+    /// name published a Desktop surface for a machine with no screen.
+    func testSharedDevboxImageIsNotInferredAsDesktop() {
+        XCTAssertEqual(VMMachineKind.inferred(fromImage: "cmux-devbox:devbox-20260828b"), .base)
+        XCTAssertEqual(VMMachineKind.inferred(fromImage: "cmux-devbox-20260828b"), .base)
+    }
+
     func testResolvedKindPrefersBackendField() {
-        XCTAssertEqual(VMMachineKind.resolved(kind: "base", image: "sandbox/cmux-devbox:latest"), .base)
-        XCTAssertEqual(VMMachineKind.resolved(kind: "DESKTOP", image: "blaxel/base-image:latest"), .desktop)
-        XCTAssertEqual(VMMachineKind.resolved(kind: "bogus", image: "blaxel/xfce-vnc:latest"), .desktop)
+        XCTAssertEqual(VMMachineKind.resolved(kind: "base", image: "cmux-devbox:devbox-20260828b"), .base)
+        XCTAssertEqual(VMMachineKind.resolved(kind: "DESKTOP", image: "cmuxd-ws:tooling-20260509f"), .desktop)
+        XCTAssertEqual(VMMachineKind.resolved(kind: "bogus", image: "cmux-xfce-vnc:latest"), .desktop)
         XCTAssertEqual(VMMachineKind.resolved(kind: nil, image: nil), .base)
     }
 
     func testSummaryResolvedKindPrefersServerKindOverImageName() {
         var summary = VMSummary(
             id: "noble-wren",
-            provider: "blaxel",
+            provider: "freestyle",
             status: "running",
-            image: "sandbox/cmux-devbox:latest",
+            // An image whose name says desktop, so the server's `base` has
+            // something to override.
+            image: "cmux-xfce-vnc:latest",
             createdAt: 0,
             base: nil
         )
@@ -138,13 +148,39 @@ final class NewMachineModelTests: XCTestCase {
 
     func testSelectedImageFollowsTheKind() {
         let kinds = [
-            VMImageKindOption(kind: .desktop, image: "sandbox/cmux-devbox:latest"),
-            VMImageKindOption(kind: .base, image: "blaxel/base-image:latest"),
+            VMImageKindOption(kind: .desktop, image: "cmux-xfce-vnc:latest"),
+            VMImageKindOption(kind: .base, image: "cmuxd-ws:tooling-20260509f"),
         ]
         let (model, _) = makeModel(imageKinds: kinds)
-        XCTAssertEqual(model.selectedImage, "sandbox/cmux-devbox:latest")
+        XCTAssertEqual(model.selectedImage, "cmux-xfce-vnc:latest")
         model.kind = .base
-        XCTAssertEqual(model.selectedImage, "blaxel/base-image:latest")
+        XCTAssertEqual(model.selectedImage, "cmuxd-ws:tooling-20260509f")
+    }
+
+    /// The sheet must not open preselected on a kind the deployment cannot
+    /// provision: no provider ships a desktop image today, so a desktop
+    /// default would make the primary button fail with an image config error.
+    func testKindDefaultsToAServableKind() {
+        let baseOnly = [VMImageKindOption(kind: .base, image: "cmuxd-ws:tooling-20260509f")]
+        let (baseModel, _) = makeModel(imageKinds: baseOnly)
+        XCTAssertEqual(baseModel.kind, .base)
+        XCTAssertEqual(baseModel.selectableKinds, [.base])
+
+        let both = [
+            VMImageKindOption(kind: .desktop, image: "cmux-xfce-vnc:latest"),
+            VMImageKindOption(kind: .base, image: "cmuxd-ws:tooling-20260509f"),
+        ]
+        let (bothModel, _) = makeModel(imageKinds: both)
+        XCTAssertEqual(bothModel.kind, .desktop)
+        XCTAssertEqual(bothModel.selectableKinds, [.desktop, .base])
+    }
+
+    /// An older control plane sends no `limits.imageKinds`. Offering nothing
+    /// would be worse than offering both, so the sheet keeps the full picker.
+    func testUnknownImageKindsStillOfferEveryKind() {
+        let (model, _) = makeModel(imageKinds: [])
+        XCTAssertEqual(model.selectableKinds, VMMachineKind.allCases)
+        XCTAssertEqual(model.kind, .base)
     }
 
     func testMemoryLabelsReadInGigabytes() {
diff --git a/daemon/remote/.gitignore b/daemon/remote/.gitignore
deleted file mode 100644
index 2fb02329ee31..000000000000
--- a/daemon/remote/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/cmuxd-remote
diff --git a/daemon/remote/README.md b/daemon/remote/README.md
deleted file mode 100644
index 64b22e15f37f..000000000000
--- a/daemon/remote/README.md
+++ /dev/null
@@ -1,203 +0,0 @@
-# cmuxd-remote (Go)
-
-Go remote daemon for `cmux ssh` bootstrap, capability negotiation, and remote proxy RPC. It is not in the terminal keystroke hot path.
-
-## Commands
-
-1. `cmuxd-remote version`
-2. `cmuxd-remote serve --stdio`
-3. `cmuxd-remote serve --stdio --persistent --slot <slot> [--persistent-lease-port <port>]`
-4. `cmuxd-remote serve --persistent-stop --slot <slot>` — internal authenticated slot teardown
-5. `cmuxd-remote serve --ws --auth-lease-file <path> [--rpc-auth-lease-file <path>] [--listen 127.0.0.1:7777]`
-6. `cmuxd-remote cli <command> [args...]` — relay cmux commands to the local app over the reverse SSH forward
-
-`serve --ws` is explicit opt-in for cloud VM images only. The normal `cmux ssh`
-code path uses `serve --stdio --persistent --slot <slot>` over an SSH exec
-channel. That stdio process is only a proxy to an authenticated per-slot daemon
-with credentials and logs under `~/.cmux/daemon/<version>/<slot>/`, so remote PTY sessions
-can survive local surface close, local reconnect, and app relaunch. The persistent
-server never opens a public listener; it accepts only a per-user Unix socket under
-`/tmp/cmuxd-remote-<uid>/` and the slot token.
-
-When invoked as `cmux` (via wrapper/symlink installed during bootstrap), the binary auto-dispatches to the `cli` subcommand. This is busybox-style argv[0] detection.
-
-## RPC methods (newline-delimited JSON over stdio)
-
-1. `hello`
-2. `ping`
-3. `proxy.open`
-4. `proxy.close`
-5. `proxy.write`
-6. `proxy.stream.subscribe`
-7. async `proxy.stream.data` / `proxy.stream.eof` / `proxy.stream.error` events
-8. `session.open`
-9. `session.close`
-10. `session.attach`
-11. `session.resize`
-12. `session.detach`
-13. `session.status`
-14. `pty.attach`
-15. `pty.write`
-16. `pty.resize`
-17. `pty.detach`
-18. `pty.close`
-19. `pty.list`
-
-Current integration in cmux:
-1. `workspace.remote.configure` now bootstraps this binary over SSH when missing.
-2. Client sends `hello` before enabling remote proxy transport.
-3. Local workspace proxy broker serves SOCKS5 + HTTP CONNECT and tunnels stream traffic through `proxy.*` RPC over `serve --stdio`, using daemon-pushed stream events instead of polling reads.
-4. Daemon status/capabilities are exposed in `workspace.remote.status -> remote.daemon` (including `session.resize.min`).
-5. Persistent SSH terminals require the `pty.session.persistent_daemon` capability before cmux will restore a saved remote PTY session ID after relaunch.
-
-## Persistent SSH PTY daemon
-
-`cmux ssh` uses one persistent daemon slot per CLI-launched SSH workspace. The
-slot name is generated locally, validated as `[A-Za-z0-9._-]{1,128}`, and sent
-to the remote daemon bootstrap as `--slot`.
-
-Remote slot files:
-1. `/tmp/cmuxd-remote-<uid>/cmuxd-<slot-hash>.sock` authenticated Unix socket for stdio proxies.
-2. `~/.cmux/daemon/<version>/<slot>/auth.token` random 32-byte hex token, mode `0600`.
-3. `~/.cmux/daemon/<version>/<slot>/daemon.lock` single-owner lock.
-4. `~/.cmux/daemon/<version>/<slot>/daemon.log` lifecycle and crash diagnostics.
-
-PTY lifecycle:
-1. A local attach creates or reuses a named `pty.*` session in the persistent daemon.
-2. If the local surface closes, the stdio proxy disconnects and its attachment detaches, but the PTY process and bounded scrollback remain in the daemon.
-3. `cmux ssh-session-list` calls `pty.list`; `cmux ssh-session-attach` creates a new local terminal whose startup script calls `ssh-pty-attach --require-existing`.
-4. `cmux ssh-session-cleanup` calls `pty.close` to terminate a persisted PTY session explicitly.
-5. Sessions with no attachments keep their last-known size and are reaped by the daemon idle TTL.
-6. Closing the owning workspace sends an authenticated slot-shutdown request, waits a bounded interval for the daemon lock to be released, and removes the relay's shell-state directory. As defense in depth, a daemon launched with `--persistent-lease-port` observes that exact `~/.cmux/relay/<port>.slot` lease, but retires passively only after the observed lease disappears and both stdio connections and live PTY sessions are empty. A detached live PTY survives lease loss until it exits or is closed explicitly. Older callers that omit the flag retain the prior behavior without unsafe broad lease scanning.
-
-### Persistent daemon diagnostics
-
-Persistent-daemon logging is always enabled. The current log is
-`~/.cmux/daemon/<version>/<slot>/daemon.log`, mode `0600`. It records daemon
-start/readiness/stop, authenticated connection lifecycle, PTY attach/detach/
-close/exit, channel or PTY-operation faults, and process-level stdout/stderr
-occurrence and rate-limited aggregate byte counts. Arbitrary process output is
-discarded rather than persisted. Faults are recorded as bounded codes or
-categories rather than raw error text. Tokens, commands, terminal input, RPC
-request identifiers, and raw process output are never logged.
-
-The log rotates at 2 MiB. `daemon.log` is the newest file, with at most two
-older generations in `daemon.log.1` and `daemon.log.2`, so one slot uses at
-most approximately 6 MiB of diagnostics.
-
-## Cloud WebSocket PTY transport
-
-The WebSocket PTY transport is locked until the backend writes a short-lived
-lease file. The baked image contains only the daemon binary and service command,
-not user secrets or provider API keys.
-
-Lease file shape:
-
-```json
-{
-  "version": 1,
-  "token_sha256": "<sha256 hex of client attach token>",
-  "expires_at_unix": 1770000000,
-  "session_id": "optional-session-binding",
-  "single_use": true
-}
-```
-
-Client flow:
-
-1. Connect to `/terminal`.
-2. Send a text JSON auth frame first: `{"type":"auth","token":"...","session_id":"...","cols":80,"rows":24}`.
-3. After `{"type":"ready"}`, binary WebSocket frames are terminal input/output.
-4. Text frames after auth are control frames such as `{"type":"resize","cols":120,"rows":40}`.
-
-Security invariants:
-
-1. `serve --ws` fails to start without `--auth-lease-file`.
-2. Missing, expired, wrong-token, or wrong-session leases close with WebSocket
-   policy violation before a PTY is started.
-3. Successful single-use leases are consumed before the shell is spawned, so a
-   replay gets `no active lease`.
-4. Provider traffic auth remains separate. E2B images should be created with
-   `network.allowPublicTraffic: false`, so E2B requires
-   `e2b-traffic-access-token` before the daemon sees the request.
-
-`workspace.remote.configure` contract notes:
-1. `port` / `local_proxy_port` accept integer values and numeric strings; explicit `null` clears each field.
-2. Out-of-range values and invalid types return `invalid_params`.
-3. `local_proxy_port` is an internal deterministic test hook used by bind-conflict regressions.
-4. SSH option precedence checks are case-insensitive; user overrides for `StrictHostKeyChecking` and control-socket keys prevent default injection.
-
-## Distribution
-
-Release and nightly builds publish prebuilt `cmuxd-remote` binaries on GitHub Releases for:
-1. `darwin/arm64`
-2. `darwin/amd64`
-3. `linux/arm64`
-4. `linux/amd64`
-
-The app embeds a compact manifest in `Info.plist` with:
-1. exact release asset URLs
-2. pinned SHA-256 digests
-3. release tag and checksums asset URL
-
-Release and nightly apps download and cache the matching binary locally, verify its SHA-256, then upload it to the remote host if needed. Dev builds can opt into a local `go build` fallback with `CMUX_REMOTE_DAEMON_ALLOW_LOCAL_BUILD=1`.
-
-To inspect what a given app build trusts, run:
-1. `cmux remote-daemon-status`
-2. `cmux remote-daemon-status --os linux --arch amd64`
-
-The command prints the exact release asset URL, expected SHA-256, local cache status, and a copy-pasteable `gh attestation verify` command for the selected platform.
-
-## CLI relay
-
-The `cli` subcommand (or `cmux` wrapper/symlink) connects to the local cmux app through an SSH reverse forward and relays commands using the v2 JSON-RPC protocol.
-
-Cloud VM images install `/usr/local/bin/cmux` as a symlink to `cmuxd-remote`,
-so `cmux --help` works before a user-specific SSH bootstrap has written
-`~/.cmux/bin/cmux`.
-
-Socket discovery order:
-1. `--socket <path>` flag
-2. `CMUX_SOCKET_PATH` environment variable
-3. `~/.cmux/socket_addr` file (written by the app after the reverse relay establishes)
-
-For TCP addresses, the CLI dials once and only refreshes `~/.cmux/socket_addr` a single time if the first address was stale. Relay metadata is published only after the reverse forward is ready, so steady-state use does not rely on polling.
-
-Authenticated relay details:
-1. Each SSH workspace gets its own relay ID and relay token.
-2. The app runs a local loopback relay server that requires an HMAC-SHA256 challenge-response before forwarding a command to the real local Unix socket.
-3. The remote shell never gets direct access to the local app socket. It only gets the reverse-forwarded relay port plus `~/.cmux/relay/<port>.auth`, which is written with `0600` permissions and removed when the relay stops.
-
-Integration additions for the relay path:
-
-1. Bootstrap installs `~/.cmux/bin/cmux` wrapper and keeps a default daemon target (`~/.cmux/bin/cmuxd-remote-current`).
-2. A background `ssh -N -R` process reverse-forwards a TCP port to the authenticated local relay server. The relay address is written to `~/.cmux/socket_addr` on the remote.
-3. Relay startup writes `~/.cmux/relay/<port>.daemon_path` so the wrapper can route each shell to the correct daemon binary when multiple local cmux instances or versions coexist.
-4. Relay startup writes `~/.cmux/relay/<port>.auth` with the relay ID and token needed for HMAC authentication.
-
-### Protocol and flags
-
-All relay commands use v2 JSON-RPC. Flags map to JSON params via `flagToParamKey` (e.g. `--workspace` → `workspace_id`). Boolean flags (`--focus`) accept `true`/`false`/`1`/`0`/`yes`/`no` and are sent as JSON booleans.
-
-Environment fallbacks:
-- `CMUX_WORKSPACE_ID` — used as `workspace_id` when `--workspace` is not provided
-- `CMUX_SURFACE_ID` — used as `surface_id` when `--surface` is not provided
-
-### Migration notes
-
-**`new-workspace`**: The flag `--working-directory` was removed. It was accepted by the old relay but sent the wrong param name (`working_directory` instead of `cwd`), so the server silently ignored it. Use `--cwd` for the working directory. The flag `--command` is now supported: it sends the command text to the new workspace's default surface after creation.
-
-**`send` / `send-key`**: The `--text` and `--key` flags were removed. Both commands now take their argument positionally, matching the Mac CLI convention: `cmux send "hello world"` and `cmux send-key ctrl+c`.
-
-**Window commands**: Prior to this release, `list-windows`, `current-window`, `new-window`, `focus-window`, and `close-window` used a v1 text protocol and returned plain-text responses (e.g. `window:abc123` per line). They now use v2 JSON-RPC and return JSON. Scripts parsing that output will need updating.
-
-Browser relay behavior:
-
-1. `cmux browser ...` inside an SSH session controls the local cmux browser through the authenticated relay, not a browser process inside the VM.
-2. The remote CLI supports the common automation commands: `open`, `navigate`, `back`, `forward`, `reload`, `get-url`, `snapshot`, `eval`, `wait`, `click`, `dblclick`, `hover`, `focus`, `check`, `uncheck`, `fill`, `type`, `press`, `select`, and `screenshot`.
-3. Commands that target an existing browser surface default to `CMUX_SURFACE_ID`; `open` defaults to `CMUX_WORKSPACE_ID` so agents can create a browser pane next to the active SSH terminal.
-
-Workspace group relay behavior:
-
-1. `cmux workspace group <sub>` (and the `cmux workspace-group <sub>` alias) maps to the `workspace.group.*` v2 methods, with the same subcommands and flags as the macOS CLI: `list`, `create`, `ungroup`, `delete`, `rename`, `collapse`, `expand`, `pin`, `unpin`, `add`, `remove`, `set-anchor`, `new-workspace`, `set-color`, `set-icon`, `move`, and `focus`.
-2. The group id comes from `--group <id>` or the first positional argument and accepts UUIDs or refs such as `workspace_group:1`. Like the macOS CLI, `add` and `set-anchor` require explicit `--group <id> --workspace <id>`.
diff --git a/daemon/remote/TMUX_CORPUS.md b/daemon/remote/TMUX_CORPUS.md
deleted file mode 100644
index ee025cbc72a8..000000000000
--- a/daemon/remote/TMUX_CORPUS.md
+++ /dev/null
@@ -1,47 +0,0 @@
-# tmux Corpus Port Map
-
-Pinned upstream tmux commit: `a9ba7b8ecbe1d107aa716f52d53c99ea1a00cf11`.
-
-This map records how each selected upstream tmux regression or fuzz target is represented in cmux. It is documentation only; CI confidence comes from executable Go tests, Go fuzz targets, and the macOS terminal-renderer tests in `.github/workflows/tmux-corpus.yml`. The daemon and tmux-compat rows marked `pr` run on pull requests touching `daemon/remote/**`; the terminal-renderer rows remain nightly because they need the macOS app and GhosttyKit.
-
-| Upstream source | cmux layer | Status | CI lane | Port note |
-| --- | --- | --- | --- | --- |
-| `regress/am-terminal.sh` | terminal-renderer | adapted | nightly | Autowrap belongs to Ghostty/cmux rendering. |
-| `regress/border-arrows.sh` | tmux-ui | not_applicable | none | cmux does not expose tmux border arrow indicators. |
-| `regress/capture-pane-hyperlink.sh` | terminal-renderer | adapted | nightly | OSC 8 hyperlink capture should preserve Ghostty behavior. |
-| `regress/capture-pane-sgr0.sh` | terminal-renderer | adapted | nightly | SGR reset semantics belong to terminal rendering and replay. |
-| `regress/combine-test.sh` | terminal-renderer | adapted | nightly | Unicode combining width belongs to Ghostty/cmux rendering. |
-| `regress/command-order.sh` | tmux-compat | ported | pr | Command splitting and sequential dispatch are covered. |
-| `regress/conf-syntax.sh` | tmux-config | not_applicable | none | cmux does not parse tmux config files. |
-| `regress/control-client-sanity.sh` | tmux-compat | adapted | pr | cmux exposes JSON-RPC and tmux-compat commands instead of tmux control mode. |
-| `regress/control-client-size.sh` | remote-pty | ported | pr | WebSocket PTY resize control frames are covered. |
-| `regress/copy-mode-test-emacs.sh` | tmux-copy-mode | not_applicable | none | cmux does not implement tmux copy-mode key tables. |
-| `regress/copy-mode-test-vi.sh` | tmux-copy-mode | not_applicable | none | cmux does not implement tmux copy-mode key tables. |
-| `regress/cursor-test1.sh` | terminal-renderer | adapted | nightly | Cursor wrapping and reflow belong to terminal rendering. |
-| `regress/cursor-test2.sh` | terminal-renderer | adapted | nightly | Cursor wrapping and reflow belong to terminal rendering. |
-| `regress/cursor-test3.sh` | terminal-renderer | adapted | nightly | Cursor wrapping and reflow belong to terminal rendering. |
-| `regress/cursor-test4.sh` | terminal-renderer | adapted | nightly | Cursor wrapping and reflow belong to terminal rendering. |
-| `regress/decrqm-sync.sh` | terminal-renderer | adapted | nightly | Synchronized output mode belongs to terminal rendering. |
-| `regress/format-strings.sh` | tmux-compat | adapted | pr | cmux supports a deliberate tmux format subset for agent shims. |
-| `regress/has-session-return.sh` | tmux-compat | ported | pr | has-session success and failure are covered through workspace resolution. |
-| `regress/if-shell-TERM.sh` | tmux-shell | not_applicable | none | cmux does not implement tmux if-shell. |
-| `regress/if-shell-error.sh` | tmux-shell | not_applicable | none | cmux does not implement tmux if-shell. |
-| `regress/if-shell-nested.sh` | tmux-shell | not_applicable | none | cmux does not implement tmux if-shell. |
-| `regress/input-keys.sh` | tmux-compat | ported | pr | send-keys token translation and literal passthrough are covered. |
-| `regress/kill-session-process-exit.sh` | remote-pty | adapted | pr | PTY process exit closes the WebSocket session normally. |
-| `regress/new-session-base-index.sh` | tmux-indexing | not_applicable | none | cmux workspace numbering is not tmux base-index configurable. |
-| `regress/new-session-command.sh` | tmux-compat | ported | pr | new-session command dispatch to the first surface is covered. |
-| `regress/new-session-environment.sh` | remote-pty | ported | pr | WebSocket PTY startup environment covers UTF-8 and truecolor identity. |
-| `regress/new-session-no-client.sh` | tmux-compat | adapted | pr | Detached creation is represented by focus=false workspace creation. |
-| `regress/new-session-size.sh` | remote-pty | ported | pr | Initial PTY rows and columns are covered through stty output. |
-| `regress/new-window-command.sh` | tmux-compat | ported | pr | new-window command dispatch is covered through workspace creation and surface input. |
-| `regress/osc-11colours.sh` | terminal-renderer | adapted | nightly | cmux should preserve Ghostty truecolor behavior instead of tmux default color assumptions. |
-| `regress/run-shell-output.sh` | tmux-shell | not_applicable | none | cmux does not implement tmux run-shell. |
-| `regress/session-group-resize.sh` | remote-rpc | ported | pr | Smallest-client resize arbitration is covered in the remote session coordinator. |
-| `regress/style-trim.sh` | tmux-status-style | not_applicable | none | cmux does not implement tmux status line style trimming. |
-| `regress/tty-keys.sh` | terminal-input | adapted | nightly | OS key forwarding is covered in macOS terminal tests. |
-| `regress/utf8-test.sh` | terminal-renderer | adapted | nightly | UTF-8 rendering belongs to Ghostty/cmux; Go covers UTF-8 env and byte-safe command paths. |
-| `fuzz/cmd-parse-fuzzer.c` | tmux-compat | ported | nightly | Go fuzz covers supported tmux-compat argv parsing. |
-| `fuzz/format-fuzzer.c` | tmux-compat | ported | nightly | Go fuzz covers supported format-string expansion. |
-| `fuzz/input-fuzzer.c` | remote-pty | adapted | nightly | Go fuzz covers PTY control frames and send-keys tokens; full escape rendering remains in Ghostty. |
-| `fuzz/style-fuzzer.c` | terminal-renderer | adapted | nightly | Style and color parsing belongs to Ghostty/cmux rendering, with better truecolor expectations. |
diff --git a/daemon/remote/cmd/cmuxd-remote/agent_launch.go b/daemon/remote/cmd/cmuxd-remote/agent_launch.go
deleted file mode 100644
index ff6fa530a043..000000000000
--- a/daemon/remote/cmd/cmuxd-remote/agent_launch.go
+++ /dev/null
@@ -1,770 +0,0 @@
-package main
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"strings"
-	"syscall"
-)
-
-const claudeNodeOptionsRestoreModuleScript = `const hadOriginalNodeOptions = process.env.CMUX_ORIGINAL_NODE_OPTIONS_PRESENT === "1";
-if (hadOriginalNodeOptions) {
-  process.env.NODE_OPTIONS = process.env.CMUX_ORIGINAL_NODE_OPTIONS ?? "";
-} else {
-  delete process.env.NODE_OPTIONS;
-}
-delete process.env.CMUX_ORIGINAL_NODE_OPTIONS;
-delete process.env.CMUX_ORIGINAL_NODE_OPTIONS_PRESENT;
-try {
-  const fs = require("node:fs");
-  const path = require("node:path");
-  fs.unlinkSync(__filename);
-  fs.rmdirSync(path.dirname(__filename));
-} catch {}
-`
-
-// runClaudeTeamsRelay implements `cmux claude-teams` on the remote side.
-// It creates tmux shim scripts, validates the inherited launch surface, sets
-// up environment variables, and exec's into `claude`.
-func runClaudeTeamsRelay(socketPath string, args []string, refreshAddr func() string) int {
-	rc := &rpcContext{socketPath: socketPath, refreshAddr: refreshAddr}
-
-	shimDir, err := createTmuxShimDir("claude-teams-bin", claudeTeamsShimScript)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "cmux claude-teams: failed to create shim directory: %v\n", err)
-		return 1
-	}
-	// Resolve the agent executable BEFORE modifying PATH (so the shim
-	// directory doesn't shadow anything). Matches the Swift CLI behavior.
-	originalPath := os.Getenv("PATH")
-	claudePath := findExecutableInPath("claude", originalPath, shimDir)
-	if claudePath == "" {
-		fmt.Fprintf(os.Stderr, "cmux claude-teams: claude not found in PATH\n")
-		return 1
-	}
-
-	nonLaunch := claudeTeamsLaunchIsNonLaunch(args)
-	launchContext, err := agentLaunchContextForInvocation(rc, nonLaunch)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "cmux claude-teams: %v\n", err)
-		return 1
-	}
-	if !nonLaunch {
-		if err := configureClaudeTeamsShellWrapper(shimDir); err != nil {
-			fmt.Fprintf(os.Stderr, "cmux claude-teams: failed to configure shell wrapper: %v\n", err)
-			return 1
-		}
-	}
-
-	configureAgentEnvironment(agentConfig{
-		shimDir:        shimDir,
-		socketPath:     socketPath,
-		launchContext:  launchContext,
-		tmuxPathPrefix: "cmux-claude-teams",
-		cmuxBinEnvVar:  "CMUX_CLAUDE_TEAMS_CMUX_BIN",
-		termEnvVar:     "CMUX_CLAUDE_TEAMS_TERM",
-		extraEnv: map[string]string{
-			"CLAUDE_CODE_EXPERIMENTAL_AGENT_TEAMS": "1",
-		},
-	})
-	if restoreModulePath, err := ensureClaudeNodeOptionsRestoreModule(); err == nil {
-		configureClaudeNodeOptions(restoreModulePath)
-	}
-
-	launchArgs := claudeTeamsLaunchArgs(args)
-
-	argv := append([]string{claudePath}, launchArgs...)
-	execErr := syscall.Exec(claudePath, argv, os.Environ())
-	fmt.Fprintf(os.Stderr, "cmux claude-teams: exec failed: %v\n", execErr)
-	return 1
-}
-
-// runOMORelay implements `cmux omo` on the remote side.
-func runOMORelay(socketPath string, args []string, refreshAddr func() string) int {
-	rc := &rpcContext{socketPath: socketPath, refreshAddr: refreshAddr}
-
-	shimDir, err := createOMOShimDir()
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "cmux omo: failed to create shim directory: %v\n", err)
-		return 1
-	}
-
-	// Resolve the agent executable BEFORE modifying PATH.
-	originalPath := os.Getenv("PATH")
-	opencodePath := findExecutableInPath("opencode", originalPath, shimDir)
-	if opencodePath == "" {
-		fmt.Fprintf(os.Stderr, "cmux omo: opencode not found in PATH\n"+
-			"Install it first:\n  npm install -g opencode-ai\n  # or\n  bun install -g opencode-ai\n")
-		return 1
-	}
-
-	launchContext, err := agentLaunchContextForInvocation(rc, omoLaunchIsNonLaunch(args))
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "cmux omo: %v\n", err)
-		return 1
-	}
-
-	// Ensure oh-my-opencode plugin is set up only after a real launch's
-	// inherited surface identity has been validated.
-	if err := omoEnsurePlugin(originalPath); err != nil {
-		fmt.Fprintf(os.Stderr, "cmux omo: plugin setup: %v\n", err)
-		return 1
-	}
-
-	configureAgentEnvironment(agentConfig{
-		shimDir:        shimDir,
-		socketPath:     socketPath,
-		launchContext:  launchContext,
-		tmuxPathPrefix: "cmux-omo",
-		cmuxBinEnvVar:  "CMUX_OMO_CMUX_BIN",
-		termEnvVar:     "CMUX_OMO_TERM",
-		extraEnv:       map[string]string{},
-	})
-
-	// Set OPENCODE_PORT if not already set
-	if os.Getenv("OPENCODE_PORT") == "" {
-		os.Setenv("OPENCODE_PORT", "4096")
-	}
-
-	// Build launch arguments
-	launchArgs := args
-	hasPort := false
-	for _, arg := range launchArgs {
-		if arg == "--port" || strings.HasPrefix(arg, "--port=") {
-			hasPort = true
-			break
-		}
-	}
-	if !hasPort {
-		port := os.Getenv("OPENCODE_PORT")
-		if port == "" {
-			port = "4096"
-		}
-		launchArgs = append([]string{"--port", port}, launchArgs...)
-	}
-
-	launchPath, launchArgv := resolveNodeScriptExec(opencodePath, launchArgs, originalPath, shimDir)
-	execErr := syscall.Exec(launchPath, launchArgv, os.Environ())
-	fmt.Fprintf(os.Stderr, "cmux omo: exec failed: %v\n", execErr)
-	return 1
-}
-
-// runOMXRelay implements `cmux omx` on the remote side.
-func runOMXRelay(socketPath string, args []string, refreshAddr func() string) int {
-	rc := &rpcContext{socketPath: socketPath, refreshAddr: refreshAddr}
-
-	shimDir, err := createTmuxShimDir("omx-bin", omxShimScript)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "cmux omx: failed to create shim directory: %v\n", err)
-		return 1
-	}
-
-	originalPath := os.Getenv("PATH")
-	omxPath := findExecutableInPath("omx", originalPath, shimDir)
-	if omxPath == "" {
-		fmt.Fprintf(os.Stderr, "cmux omx: omx not found in PATH\n"+
-			"Install it first:\n  npm install -g oh-my-codex\n")
-		return 1
-	}
-
-	launchContext, err := agentLaunchContextForInvocation(rc, omxLaunchIsNonLaunch(args))
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "cmux omx: %v\n", err)
-		return 1
-	}
-
-	configureAgentEnvironment(agentConfig{
-		shimDir:        shimDir,
-		socketPath:     socketPath,
-		launchContext:  launchContext,
-		tmuxPathPrefix: "cmux-omx",
-		cmuxBinEnvVar:  "CMUX_OMX_CMUX_BIN",
-		termEnvVar:     "CMUX_OMX_TERM",
-		extraEnv:       map[string]string{},
-	})
-
-	launchPath, launchArgv := resolveNodeScriptExec(omxPath, args, originalPath, shimDir)
-	execErr := syscall.Exec(launchPath, launchArgv, os.Environ())
-	fmt.Fprintf(os.Stderr, "cmux omx: exec failed: %v\n", execErr)
-	return 1
-}
-
-// runOMCRelay implements `cmux omc` on the remote side.
-func runOMCRelay(socketPath string, args []string, refreshAddr func() string) int {
-	rc := &rpcContext{socketPath: socketPath, refreshAddr: refreshAddr}
-
-	shimDir, err := createTmuxShimDir("omc-bin", omcShimScript)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "cmux omc: failed to create shim directory: %v\n", err)
-		return 1
-	}
-
-	originalPath := os.Getenv("PATH")
-	omcPath := findExecutableInPath("omc", originalPath, shimDir)
-	if omcPath == "" {
-		fmt.Fprintf(os.Stderr, "cmux omc: omc not found in PATH\n"+
-			"Install it first:\n  npm install -g oh-my-claude-sisyphus\n")
-		return 1
-	}
-
-	launchContext, err := agentLaunchContextForInvocation(rc, omcLaunchIsNonLaunch(args))
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "cmux omc: %v\n", err)
-		return 1
-	}
-
-	configureAgentEnvironment(agentConfig{
-		shimDir:        shimDir,
-		socketPath:     socketPath,
-		launchContext:  launchContext,
-		tmuxPathPrefix: "cmux-omc",
-		cmuxBinEnvVar:  "CMUX_OMC_CMUX_BIN",
-		termEnvVar:     "CMUX_OMC_TERM",
-		extraEnv:       map[string]string{},
-	})
-
-	// omc wraps Claude Code, so configure NODE_OPTIONS restore module
-	if restoreModulePath, err := ensureClaudeNodeOptionsRestoreModule(); err == nil {
-		configureClaudeNodeOptions(restoreModulePath)
-	} else {
-		fmt.Fprintf(os.Stderr, "cmux omc: warning: failed to create NODE_OPTIONS restore module: %v\n", err)
-	}
-
-	launchPath, launchArgv := resolveNodeScriptExec(omcPath, args, originalPath, shimDir)
-	execErr := syscall.Exec(launchPath, launchArgv, os.Environ())
-	fmt.Fprintf(os.Stderr, "cmux omc: exec failed: %v\n", execErr)
-	return 1
-}
-
-// --- Shim creation ---
-
-const claudeTeamsShimScript = `#!/usr/bin/env bash
-set -euo pipefail
-exec "${CMUX_CLAUDE_TEAMS_CMUX_BIN:-cmux}" __tmux-compat "$@"
-`
-
-const omoTmuxShimScript = `#!/usr/bin/env bash
-set -euo pipefail
-# Only match -V/-v as the first arg (top-level tmux flag).
-# -v inside subcommands (e.g. split-window -v) is a vertical split flag.
-case "${1:-}" in
-  -V|-v) echo "tmux 3.4"; exit 0 ;;
-esac
-exec "${CMUX_OMO_CMUX_BIN:-cmux}" __tmux-compat "$@"
-`
-
-const omxShimScript = `#!/usr/bin/env bash
-set -euo pipefail
-case "${1:-}" in
-  -V|-v) echo "tmux 3.4"; exit 0 ;;
-esac
-exec "${CMUX_OMX_CMUX_BIN:-cmux}" __tmux-compat "$@"
-`
-
-const omcShimScript = `#!/usr/bin/env bash
-set -euo pipefail
-case "${1:-}" in
-  -V|-v) echo "tmux 3.4"; exit 0 ;;
-esac
-exec "${CMUX_OMC_CMUX_BIN:-cmux}" __tmux-compat "$@"
-`
-
-const omoNotifierShimScript = `#!/usr/bin/env bash
-# Intercept terminal-notifier calls and route through cmux notify.
-TITLE="" BODY=""
-while [[ $# -gt 0 ]]; do
-  case "$1" in
-    -title)   TITLE="$2"; shift 2 ;;
-    -message) BODY="$2"; shift 2 ;;
-    *)        shift ;;
-  esac
-done
-exec "${CMUX_OMO_CMUX_BIN:-cmux}" notify --title "${TITLE:-OpenCode}" --body "${BODY:-}"
-`
-
-func createTmuxShimDir(dirName string, tmuxScript string) (string, error) {
-	home, err := os.UserHomeDir()
-	if err != nil {
-		return "", err
-	}
-	dir := filepath.Join(home, ".cmuxterm", dirName)
-	if err := os.MkdirAll(dir, 0755); err != nil {
-		return "", err
-	}
-	tmuxPath := filepath.Join(dir, "tmux")
-	if err := writeShimIfChanged(tmuxPath, tmuxScript); err != nil {
-		return "", err
-	}
-	return dir, nil
-}
-
-func createOMOShimDir() (string, error) {
-	dir, err := createTmuxShimDir("omo-bin", omoTmuxShimScript)
-	if err != nil {
-		return "", err
-	}
-	notifierPath := filepath.Join(dir, "terminal-notifier")
-	if err := writeShimIfChanged(notifierPath, omoNotifierShimScript); err != nil {
-		return "", err
-	}
-	return dir, nil
-}
-
-func writeShimIfChanged(path string, content string) error {
-	existing, err := os.ReadFile(path)
-	if err == nil && string(existing) == content {
-		return nil
-	}
-	dir := filepath.Dir(path)
-	tempFile, err := os.CreateTemp(dir, "."+filepath.Base(path)+".tmp-*")
-	if err != nil {
-		return err
-	}
-	tempPath := tempFile.Name()
-	defer os.Remove(tempPath)
-	if _, err := tempFile.WriteString(content); err != nil {
-		return closeTempFileAfterError(tempFile, err)
-	}
-	// Set the final executable mode while the descriptor is still open. This
-	// prevents a close-to-chmod window in which another same-UID process could
-	// observe or replace the temporary file.
-	if err := tempFile.Chmod(0755); err != nil {
-		return closeTempFileAfterError(tempFile, err)
-	}
-	if err := tempFile.Close(); err != nil {
-		return err
-	}
-	if err := os.Rename(tempPath, path); err != nil {
-		return err
-	}
-	return nil
-}
-
-func closeTempFileAfterError(file *os.File, primary error) error {
-	if closeErr := file.Close(); closeErr != nil {
-		return fmt.Errorf("%w (also failed to close temporary file: %v)", primary, closeErr)
-	}
-	return primary
-}
-
-func ensureClaudeNodeOptionsRestoreModule() (string, error) {
-	// A predictable shared /tmp directory would let another same-UID process
-	// tamper with the module before Node loads it. Retain this randomized,
-	// private directory through the returned path for the launch lifetime.
-	dir, err := os.MkdirTemp(os.TempDir(), "cmux-claude-node-options-")
-	if err != nil {
-		return "", err
-	}
-	restoreModulePath := filepath.Join(dir, "restore-node-options.cjs")
-	if err := writeShimIfChanged(restoreModulePath, claudeNodeOptionsRestoreModuleScript); err != nil {
-		return "", fmt.Errorf("create Node options restore module: %w", errors.Join(err, os.RemoveAll(dir)))
-	}
-	return restoreModulePath, nil
-}
-
-func configureClaudeNodeOptions(restoreModulePath string) {
-	existing, hadExisting := os.LookupEnv("NODE_OPTIONS")
-	if hadExisting {
-		os.Setenv("CMUX_ORIGINAL_NODE_OPTIONS_PRESENT", "1")
-		os.Setenv("CMUX_ORIGINAL_NODE_OPTIONS", existing)
-	} else {
-		os.Setenv("CMUX_ORIGINAL_NODE_OPTIONS_PRESENT", "0")
-		os.Unsetenv("CMUX_ORIGINAL_NODE_OPTIONS")
-	}
-	os.Setenv("NODE_OPTIONS", mergeNodeOptions(existing, restoreModulePath))
-}
-
-func mergeNodeOptions(existing string, restoreModulePath string) string {
-	requireFlag := "--require=" + restoreModulePath
-	const memoryFlag = "--max-old-space-size=4096"
-	cleaned := cleanedNodeOptions(existing)
-	if cleaned == "" {
-		return requireFlag + " " + memoryFlag
-	}
-	return requireFlag + " " + memoryFlag + " " + cleaned
-}
-
-func cleanedNodeOptions(existing string) string {
-	tokens := strings.Fields(existing)
-	if len(tokens) == 0 {
-		return ""
-	}
-
-	filtered := make([]string, 0, len(tokens))
-	for i := 0; i < len(tokens); i++ {
-		token := tokens[i]
-		if token == "--max-old-space-size" {
-			if i+1 < len(tokens) {
-				i++
-			}
-			continue
-		}
-		if strings.HasPrefix(token, "--max-old-space-size=") {
-			continue
-		}
-		filtered = append(filtered, token)
-	}
-	return strings.Join(filtered, " ")
-}
-
-// --- Environment configuration ---
-
-type agentConfig struct {
-	shimDir        string
-	socketPath     string
-	launchContext  *agentLaunchContext
-	tmuxPathPrefix string
-	cmuxBinEnvVar  string
-	termEnvVar     string
-	extraEnv       map[string]string
-}
-
-func configureAgentEnvironment(cfg agentConfig) {
-	// Find our own executable path for the shim to call back
-	selfPath, _ := os.Executable()
-	if selfPath == "" {
-		selfPath = "cmux"
-	}
-	os.Setenv(cfg.cmuxBinEnvVar, selfPath)
-
-	// Prepend shim directory to PATH
-	currentPath := os.Getenv("PATH")
-	os.Setenv("PATH", cfg.shimDir+":"+currentPath)
-
-	// Set fake TMUX/TMUX_PANE
-	fakeTmux := fmt.Sprintf("/tmp/%s/default,0,0", cfg.tmuxPathPrefix)
-	fakeTmuxPane := "%1"
-	if cfg.launchContext != nil {
-		windowToken := cfg.launchContext.windowId
-		if windowToken == "" {
-			windowToken = cfg.launchContext.workspaceId
-		}
-		paneIdForToken := cfg.launchContext.paneId
-		if paneIdForToken == "" {
-			paneIdForToken = cfg.launchContext.paneHandle
-		}
-		paneToken := tmuxStableNumericId(paneIdForToken)
-		fakeTmux = fmt.Sprintf("/tmp/%s/%s,%s,%s",
-			cfg.tmuxPathPrefix, cfg.launchContext.workspaceId, windowToken, paneToken)
-		fakeTmuxPane = "%" + paneToken
-	}
-	os.Setenv("TMUX", fakeTmux)
-	os.Setenv("TMUX_PANE", fakeTmuxPane)
-
-	// Terminal settings
-	fakeTerm := os.Getenv(cfg.termEnvVar)
-	if fakeTerm == "" {
-		fakeTerm = "screen-256color"
-	}
-	os.Setenv("TERM", fakeTerm)
-
-	// Socket path
-	os.Setenv("CMUX_SOCKET_PATH", cfg.socketPath)
-	os.Unsetenv("CMUX_SOCKET")
-
-	// Unset TERM_PROGRAM so apps don't detect the host terminal and
-	// override tmux-compatible behavior (e.g. opencode switches to
-	// light theme when it sees TERM_PROGRAM=ghostty).
-	os.Unsetenv("TERM_PROGRAM")
-
-	// Preserve COLORTERM for truecolor support in subagent panes.
-	if os.Getenv("COLORTERM") == "" {
-		os.Setenv("COLORTERM", "truecolor")
-	}
-
-	// Publish only the socket-validated inherited routing identity. Invalid or
-	// incomplete ambient fragments must not leak into the agent process.
-	if cfg.launchContext != nil {
-		os.Setenv("CMUX_WORKSPACE_ID", cfg.launchContext.workspaceId)
-		os.Setenv("CMUX_TAB_ID", cfg.launchContext.workspaceId)
-		os.Setenv("CMUX_SURFACE_ID", cfg.launchContext.surfaceId)
-		os.Setenv("CMUX_PANEL_ID", cfg.launchContext.surfaceId)
-		if cfg.launchContext.paneId != "" {
-			os.Setenv("CMUX_PANE_ID", cfg.launchContext.paneId)
-		} else {
-			os.Unsetenv("CMUX_PANE_ID")
-		}
-	} else {
-		for _, key := range []string{
-			"CMUX_WORKSPACE_ID",
-			"CMUX_SURFACE_ID",
-			"CMUX_PANEL_ID",
-			"CMUX_TAB_ID",
-			"CMUX_PANE_ID",
-		} {
-			os.Unsetenv(key)
-		}
-	}
-
-	// Extra environment variables
-	for k, v := range cfg.extraEnv {
-		os.Setenv(k, v)
-	}
-}
-
-// --- oh-my-opencode plugin setup ---
-
-const omoPluginName = "oh-my-opencode"
-
-func omoUserConfigDir() string {
-	home, _ := os.UserHomeDir()
-	return filepath.Join(home, ".config", "opencode")
-}
-
-func omoShadowConfigDir() string {
-	home, _ := os.UserHomeDir()
-	return filepath.Join(home, ".cmuxterm", "omo-config")
-}
-
-// omoEnsurePlugin creates a shadow config directory that layers the
-// oh-my-opencode plugin on top of the user's opencode config, installs
-// the plugin if needed, and sets OPENCODE_CONFIG_DIR.
-func omoEnsurePlugin(searchPath string) error {
-	userDir := omoUserConfigDir()
-	shadowDir := omoShadowConfigDir()
-
-	if err := os.MkdirAll(shadowDir, 0755); err != nil {
-		return fmt.Errorf("create shadow config dir: %w", err)
-	}
-
-	// Read user's opencode.json, add the plugin, write to shadow dir
-	userJsonPath := filepath.Join(userDir, "opencode.json")
-	shadowJsonPath := filepath.Join(shadowDir, "opencode.json")
-
-	var config map[string]any
-	if data, err := os.ReadFile(userJsonPath); err == nil {
-		if err := json.Unmarshal(data, &config); err != nil {
-			return fmt.Errorf("invalid opencode.json: fix the JSON syntax and retry")
-		}
-	} else {
-		config = map[string]any{}
-	}
-
-	// Add oh-my-opencode to the plugins list
-	var plugins []string
-	if raw, ok := config["plugin"].([]any); ok {
-		for _, p := range raw {
-			if s, ok := p.(string); ok {
-				plugins = append(plugins, s)
-			}
-		}
-	}
-	alreadyPresent := false
-	for _, p := range plugins {
-		if p == omoPluginName || strings.HasPrefix(p, omoPluginName+"@") {
-			alreadyPresent = true
-			break
-		}
-	}
-	if !alreadyPresent {
-		plugins = append(plugins, omoPluginName)
-	}
-	config["plugin"] = plugins
-
-	output, err := json.MarshalIndent(config, "", "  ")
-	if err != nil {
-		return err
-	}
-	if err := os.WriteFile(shadowJsonPath, output, 0644); err != nil {
-		return err
-	}
-
-	// Symlink node_modules from user config dir
-	shadowNodeModules := filepath.Join(shadowDir, "node_modules")
-	userNodeModules := filepath.Join(userDir, "node_modules")
-	if dirExists(userNodeModules) {
-		target, _ := os.Readlink(shadowNodeModules)
-		if target != userNodeModules {
-			os.Remove(shadowNodeModules)
-			os.Symlink(userNodeModules, shadowNodeModules)
-		}
-	}
-
-	// Symlink package.json and bun.lock
-	for _, filename := range []string{"package.json", "bun.lock"} {
-		userFile := filepath.Join(userDir, filename)
-		shadowFile := filepath.Join(shadowDir, filename)
-		if fileExists(userFile) && !fileExists(shadowFile) {
-			os.Symlink(userFile, shadowFile)
-		}
-	}
-
-	// Symlink oh-my-opencode config files
-	for _, filename := range []string{"oh-my-opencode.json", "oh-my-opencode.jsonc"} {
-		userFile := filepath.Join(userDir, filename)
-		shadowFile := filepath.Join(shadowDir, filename)
-		if fileExists(userFile) && !fileExists(shadowFile) {
-			os.Symlink(userFile, shadowFile)
-		}
-	}
-
-	// Install the plugin if not available
-	pluginPackageDir := filepath.Join(shadowNodeModules, omoPluginName)
-	if !dirExists(pluginPackageDir) {
-		installDir := userDir
-		if !dirExists(userNodeModules) {
-			installDir = shadowDir
-			os.Remove(shadowNodeModules) // Remove symlink so we can install directly
-		}
-		os.MkdirAll(installDir, 0755)
-
-		bunPath := findExecutableInPath("bun", searchPath, "")
-		npmPath := findExecutableInPath("npm", searchPath, "")
-		if bunPath == "" && npmPath == "" {
-			return fmt.Errorf("neither bun nor npm found in PATH. Install oh-my-opencode manually: bunx oh-my-opencode install")
-		}
-
-		fmt.Fprintf(os.Stderr, "Installing oh-my-opencode plugin...\n")
-		var cmd *exec.Cmd
-		if bunPath != "" {
-			cmd = exec.Command(bunPath, "add", omoPluginName)
-		} else {
-			cmd = exec.Command(npmPath, "install", omoPluginName)
-		}
-		cmd.Dir = installDir
-		cmd.Stdout = os.Stderr
-		cmd.Stderr = os.Stderr
-		if err := cmd.Run(); err != nil {
-			return fmt.Errorf("failed to install oh-my-opencode: %v\nTry manually: npm install -g oh-my-opencode", err)
-		}
-		fmt.Fprintf(os.Stderr, "oh-my-opencode plugin installed\n")
-
-		// Re-create symlink if we installed into user dir
-		if installDir == userDir && !fileExists(shadowNodeModules) {
-			os.Symlink(userNodeModules, shadowNodeModules)
-		}
-	}
-
-	// Configure oh-my-opencode.json with tmux settings
-	omoConfigPath := filepath.Join(shadowDir, "oh-my-opencode.json")
-	var omoConfig map[string]any
-	if data, err := os.ReadFile(omoConfigPath); err == nil {
-		json.Unmarshal(data, &omoConfig)
-	}
-	if omoConfig == nil {
-		// Check if user had one we symlinked
-		userOmoConfig := filepath.Join(userDir, "oh-my-opencode.json")
-		if data, err := os.ReadFile(userOmoConfig); err == nil {
-			json.Unmarshal(data, &omoConfig)
-			os.Remove(omoConfigPath) // Remove symlink so we can write our own copy
-		}
-	}
-	if omoConfig == nil {
-		omoConfig = map[string]any{}
-	}
-
-	tmuxConfig, _ := omoConfig["tmux"].(map[string]any)
-	if tmuxConfig == nil {
-		tmuxConfig = map[string]any{}
-	}
-	needsWrite := false
-	if enabled, _ := tmuxConfig["enabled"].(bool); !enabled {
-		tmuxConfig["enabled"] = true
-		needsWrite = true
-	}
-	if tmuxConfig["main_pane_min_width"] == nil {
-		tmuxConfig["main_pane_min_width"] = 60
-		needsWrite = true
-	}
-	if tmuxConfig["agent_pane_min_width"] == nil {
-		tmuxConfig["agent_pane_min_width"] = 30
-		needsWrite = true
-	}
-	if tmuxConfig["main_pane_size"] == nil {
-		tmuxConfig["main_pane_size"] = 50
-		needsWrite = true
-	}
-	if needsWrite {
-		omoConfig["tmux"] = tmuxConfig
-		// Remove symlink if it exists
-		if target, err := os.Readlink(omoConfigPath); err == nil && target != "" {
-			os.Remove(omoConfigPath)
-		}
-		data, _ := json.MarshalIndent(omoConfig, "", "  ")
-		os.WriteFile(omoConfigPath, data, 0644)
-	}
-
-	os.Setenv("OPENCODE_CONFIG_DIR", shadowDir)
-	return nil
-}
-
-func fileExists(path string) bool {
-	_, err := os.Lstat(path)
-	return err == nil
-}
-
-func dirExists(path string) bool {
-	info, err := os.Stat(path)
-	return err == nil && info.IsDir()
-}
-
-// --- Node script resolution ---
-
-// resolveNodeScriptExec checks if the target binary is a #!/usr/bin/env node
-// script. If node isn't in PATH but bun is, it rewrites the exec to use bun
-// as the runtime (bun is node-compatible).
-func resolveNodeScriptExec(binPath string, args []string, searchPath string, skipDir string) (string, []string) {
-	if !isNodeScript(binPath) {
-		return binPath, append([]string{binPath}, args...)
-	}
-
-	// node in PATH? Use the script directly.
-	if findExecutableInPath("node", searchPath, skipDir) != "" {
-		return binPath, append([]string{binPath}, args...)
-	}
-
-	// Fall back to bun as a node-compatible runtime.
-	bunPath := findExecutableInPath("bun", searchPath, skipDir)
-	if bunPath != "" {
-		return bunPath, append([]string{bunPath, binPath}, args...)
-	}
-
-	// No node or bun; exec the script directly and let the OS error.
-	return binPath, append([]string{binPath}, args...)
-}
-
-func isNodeScript(path string) bool {
-	f, err := os.Open(path)
-	if err != nil {
-		return false
-	}
-	defer f.Close()
-	buf := make([]byte, 64)
-	n, _ := f.Read(buf)
-	line := string(buf[:n])
-	return strings.Contains(line, "/env node") || strings.Contains(line, "/bin/node")
-}
-
-// --- Executable resolution ---
-
-// findExecutableInPath searches the given PATH string for an executable,
-// skipping skipDir (the shim directory). Takes an explicit PATH to ensure
-// we search the original PATH before environment modifications.
-func findExecutableInPath(name string, pathEnv string, skipDir string) string {
-	for _, dir := range filepath.SplitList(pathEnv) {
-		if dir == "" || dir == skipDir {
-			continue
-		}
-		candidate := filepath.Join(dir, name)
-		if info, err := os.Stat(candidate); err == nil && !info.IsDir() && info.Mode()&0111 != 0 {
-			return candidate
-		}
-	}
-	return ""
-}
-
-// --- Claude Teams launch args ---
-
-func claudeTeamsLaunchArgs(args []string) []string {
-	// Check if --teammate-mode is already specified
-	for _, arg := range args {
-		if arg == "--teammate-mode" || strings.HasPrefix(arg, "--teammate-mode=") {
-			return args
-		}
-	}
-	return append([]string{"--teammate-mode", "auto"}, args...)
-}
diff --git a/daemon/remote/cmd/cmuxd-remote/agent_launch_classification.go b/daemon/remote/cmd/cmuxd-remote/agent_launch_classification.go
deleted file mode 100644
index b7f1cd51ef98..000000000000
--- a/daemon/remote/cmd/cmuxd-remote/agent_launch_classification.go
+++ /dev/null
@@ -1,420 +0,0 @@
-package main
-
-import "strings"
-
-var agentInformationalOptions = map[string]bool{
-	"--help":    true,
-	"-h":        true,
-	"--version": true,
-	"-v":        true,
-	"-V":        true,
-}
-
-var claudeTeamsInformationalOptions = map[string]bool{
-	"--help": true, "-h": true, "--version": true, "-v": true,
-}
-
-func claudeTeamsLaunchIsNonLaunch(args []string) bool {
-	return claudeTeamsInformationalInvocation(args) || claudeTeamsManagementInvocation(args)
-}
-
-func claudeTeamsInformationalInvocation(args []string) bool {
-	for index := 0; index < len(args); {
-		argument := args[index]
-		if argument == "--" {
-			return false
-		}
-		if !strings.HasPrefix(argument, "-") || argument == "-" {
-			index++
-			continue
-		}
-		name := agentOptionName(argument)
-		if claudeTeamsInformationalOptions[name] {
-			return true
-		}
-		width, recognized := claudeTeamsOptionWidth(args, index)
-		if !recognized {
-			return false
-		}
-		index += width
-	}
-	return false
-}
-
-func claudeTeamsManagementInvocation(args []string) bool {
-	for index := 0; index < len(args); {
-		argument := args[index]
-		if argument == "--" {
-			return false
-		}
-		if !strings.HasPrefix(argument, "-") || argument == "-" {
-			if argument == "agents" {
-				return claudeTeamsAgentsJSONInvocation(args, index+1)
-			}
-			if allowedSubcommands := claudeTeamsManagementSubcommands[argument]; allowedSubcommands != nil {
-				return claudeTeamsManagementSubcommand(args, index+1, allowedSubcommands)
-			}
-			return claudeTeamsManagementCommands[argument]
-		}
-		name := agentOptionName(argument)
-		if claudeTeamsManagementDisqualifyingOptions[name] {
-			return false
-		}
-		if (name == "--debug" || name == "-d") && !strings.Contains(argument, "=") {
-			// Claude's debug filter is optional and accepts arbitrary strings. A
-			// following command-shaped token is ambiguous, so fail closed.
-			return false
-		}
-		width, recognized := claudeTeamsOptionWidth(args, index)
-		if !recognized || claudeTeamsInformationalOptions[name] {
-			return false
-		}
-		index += width
-	}
-	return false
-}
-
-func claudeTeamsAgentsJSONInvocation(args []string, index int) bool {
-	sawJSON := false
-	for ; index < len(args); index++ {
-		switch args[index] {
-		case "--json":
-			if sawJSON {
-				return false
-			}
-			sawJSON = true
-		case "--all":
-		default:
-			return false
-		}
-	}
-	return sawJSON
-}
-
-func claudeTeamsManagementSubcommand(args []string, index int, allowedSubcommands map[string]bool) bool {
-	for index < len(args) {
-		argument := args[index]
-		if argument == "--" {
-			return false
-		}
-		if !strings.HasPrefix(argument, "-") || argument == "-" {
-			return allowedSubcommands[argument]
-		}
-		name := agentOptionName(argument)
-		if name != "--json-path" && name != "--log-file" {
-			return false
-		}
-		if strings.Contains(argument, "=") {
-			index++
-			continue
-		}
-		if index+1 >= len(args) {
-			return false
-		}
-		index += 2
-	}
-	return false
-}
-
-func claudeTeamsOptionWidth(args []string, index int) (int, bool) {
-	argument := args[index]
-	name := agentOptionName(argument)
-	if claudeTeamsInformationalOptions[name] || claudeTeamsBooleanOptions[name] {
-		return 1, true
-	}
-	if name == "--tmux" {
-		if strings.Contains(argument, "=") {
-			return 1, strings.TrimPrefix(argument, "--tmux=") == "classic"
-		}
-		if index+1 < len(args) && args[index+1] == "classic" {
-			return 2, true
-		}
-		return 0, false
-	}
-	if claudeTeamsOptionalValueOptions[name] {
-		if strings.Contains(argument, "=") {
-			return 1, true
-		}
-		if name == "--prompt-suggestions" && index+1 < len(args) &&
-			(args[index+1] == "true" || args[index+1] == "false") {
-			return 2, true
-		}
-		return 1, true
-	}
-	if !claudeTeamsValueOptions[name] {
-		return 0, false
-	}
-	if strings.Contains(argument, "=") {
-		return 1, true
-	}
-	if index+1 >= len(args) {
-		return 0, false
-	}
-	if claudeTeamsVariadicOptions[name] {
-		end := index + 1
-		for end < len(args) && !strings.HasPrefix(args[end], "-") {
-			end++
-		}
-		if end == index+1 {
-			return 0, false
-		}
-		return end - index, true
-	}
-	return 2, true
-}
-
-func omoLaunchIsNonLaunch(args []string) bool {
-	return conservativeAgentNonLaunchInvocation(
-		args,
-		omoManagementCommands,
-		map[string]map[string]bool{
-			"github":  {"install": true},
-			"session": {"delete": true, "list": true},
-		},
-		map[string]bool{"--mdns": true, "--print-logs": true, "--pure": true},
-		map[string]bool{
-			"--cors": true, "--hostname": true, "--log-level": true,
-			"--mdns-domain": true, "--port": true,
-		},
-	)
-}
-
-func omcLaunchIsNonLaunch(args []string) bool {
-	return conservativeAgentNonLaunchInvocation(
-		args,
-		omcManagementCommands,
-		map[string]map[string]bool{
-			"team": {"--help": true, "-h": true, "api": true, "shutdown": true, "status": true},
-		},
-		nil,
-		nil,
-	)
-}
-
-func omxLaunchIsNonLaunch(args []string) bool {
-	if len(args) == 0 {
-		return false
-	}
-	if !strings.HasPrefix(args[0], "-") || args[0] == "-" {
-		if agentNestedInformationalInvocation(args, 1, nil, nil) {
-			return true
-		}
-	}
-	if args[0] == "team" {
-		if len(args) < 2 {
-			return false
-		}
-		switch args[1] {
-		case "--help", "-h", "api", "shutdown", "status":
-			return true
-		default:
-			return false
-		}
-	}
-	return agentInformationalOptions[args[0]] || omxManagementCommands[args[0]]
-}
-
-func conservativeAgentNonLaunchInvocation(
-	args []string,
-	managementCommands map[string]bool,
-	managementSubcommands map[string]map[string]bool,
-	booleanOptions map[string]bool,
-	valueOptions map[string]bool,
-) bool {
-	for index := 0; index < len(args); {
-		argument := args[index]
-		if argument == "--" {
-			return false
-		}
-		if !strings.HasPrefix(argument, "-") || argument == "-" {
-			if agentNestedInformationalInvocation(args, index+1, booleanOptions, valueOptions) {
-				return true
-			}
-			if allowedSubcommands := managementSubcommands[argument]; allowedSubcommands != nil {
-				return agentManagementSubcommandInvocation(
-					args,
-					index+1,
-					allowedSubcommands,
-					booleanOptions,
-					valueOptions,
-				)
-			}
-			return managementCommands[argument]
-		}
-		name := agentOptionName(argument)
-		if agentInformationalOptions[name] {
-			return true
-		}
-		nextIndex, recognized := agentIndexAfterRecognizedOption(args, index, booleanOptions, valueOptions)
-		if !recognized {
-			return false
-		}
-		index = nextIndex
-	}
-	return false
-}
-
-func agentManagementSubcommandInvocation(
-	args []string,
-	index int,
-	allowedSubcommands map[string]bool,
-	booleanOptions map[string]bool,
-	valueOptions map[string]bool,
-) bool {
-	for index < len(args) {
-		argument := args[index]
-		if argument == "--" {
-			return false
-		}
-		if !strings.HasPrefix(argument, "-") || argument == "-" {
-			return allowedSubcommands[argument]
-		}
-		nextIndex, recognized := agentIndexAfterRecognizedOption(args, index, booleanOptions, valueOptions)
-		if !recognized {
-			return false
-		}
-		index = nextIndex
-	}
-	return false
-}
-
-func agentNestedInformationalInvocation(
-	args []string,
-	index int,
-	booleanOptions map[string]bool,
-	valueOptions map[string]bool,
-) bool {
-	for index < len(args) {
-		argument := args[index]
-		if argument == "--" {
-			return false
-		}
-		if !strings.HasPrefix(argument, "-") || argument == "-" {
-			index++
-			continue
-		}
-		option := agentOptionName(argument)
-		if agentInformationalOptions[option] {
-			return true
-		}
-		nextIndex, recognized := agentIndexAfterRecognizedOption(args, index, booleanOptions, valueOptions)
-		if !recognized {
-			return false
-		}
-		index = nextIndex
-	}
-	return false
-}
-
-func agentIndexAfterRecognizedOption(
-	args []string,
-	index int,
-	booleanOptions map[string]bool,
-	valueOptions map[string]bool,
-) (int, bool) {
-	argument := args[index]
-	option := agentOptionName(argument)
-	if booleanOptions[option] {
-		return index + 1, true
-	}
-	if !valueOptions[option] {
-		return 0, false
-	}
-	if strings.Contains(argument, "=") {
-		return index + 1, true
-	}
-	if index+1 >= len(args) {
-		return 0, false
-	}
-	return index + 2, true
-}
-
-func agentOptionName(argument string) string {
-	if equals := strings.IndexByte(argument, '='); equals >= 0 {
-		return argument[:equals]
-	}
-	return argument
-}
-
-var claudeTeamsManagementCommands = map[string]bool{
-	"auth": true, "auto-mode": true, "doctor": true,
-	"gateway": true, "install": true, "kill": true, "logs": true,
-	"mcp": true, "plugin": true, "plugins": true, "project": true,
-	"rm": true, "setup-token": true, "stop": true,
-	"update": true, "upgrade": true,
-}
-
-var claudeTeamsManagementSubcommands = map[string]map[string]bool{
-	"daemon": {"logs": true, "status": true, "stop": true, "uninstall": true},
-}
-
-var claudeTeamsManagementDisqualifyingOptions = map[string]bool{
-	"--background": true, "--bg": true, "--continue": true, "-c": true,
-	"--fork-session": true, "--from-pr": true, "--no-session-persistence": true,
-	"--print": true, "-p": true, "--remote-control": true, "--resume": true,
-	"-r": true, "--session-id": true, "--worktree": true, "-w": true,
-}
-
-var claudeTeamsBooleanOptions = map[string]bool{
-	"--allow-dangerously-skip-permissions": true, "--ax-screen-reader": true,
-	"--background": true, "--bare": true, "--bg": true, "--brief": true,
-	"--chrome": true, "--continue": true, "-c": true,
-	"--dangerously-skip-permissions": true, "--disable-slash-commands": true,
-	"--exclude-dynamic-system-prompt-sections": true, "--fork-session": true,
-	"--forward-subagent-text": true, "--ide": true, "--include-hook-events": true,
-	"--include-partial-messages": true,
-	"--no-chrome":                true, "--no-session-persistence": true, "--print": true,
-	"-p": true, "--replay-user-messages": true, "--safe-mode": true,
-	"--strict-mcp-config": true, "--use-system-ca": true, "--verbose": true,
-}
-
-var claudeTeamsOptionalValueOptions = map[string]bool{
-	"--debug": true, "-d": true, "--prompt-suggestions": true,
-	"--remote-control": true, "--worktree": true, "-w": true,
-}
-
-var claudeTeamsValueOptions = map[string]bool{
-	"--add-dir": true, "--agent": true, "--agents": true, "--allowedTools": true,
-	"--allowed-tools": true, "--append-system-prompt": true,
-	"--append-system-prompt-file": true, "--betas": true,
-	"--dangerously-load-development-channels": true, "--debug-file": true,
-	"--disallowedTools": true, "--disallowed-tools": true, "--effort": true,
-	"--fallback-model": true, "--file": true, "--from-pr": true,
-	"--input-format": true, "--json-schema": true, "--max-budget-usd": true,
-	"--mcp-config": true, "--model": true, "--name": true, "-n": true,
-	"--output-format": true, "--permission-mode": true, "--plugin-dir": true,
-	"--plugin-url": true, "--remote-control-session-name-prefix": true,
-	"--resume": true, "-r": true, "--session-id": true,
-	"--setting-sources": true, "--settings": true, "--system-prompt": true,
-	"--system-prompt-file": true, "--teammate-mode": true, "--tools": true,
-}
-
-var claudeTeamsVariadicOptions = map[string]bool{
-	"--add-dir": true, "--allowedTools": true, "--allowed-tools": true,
-	"--betas": true, "--dangerously-load-development-channels": true,
-	"--disallowedTools": true, "--disallowed-tools": true, "--file": true,
-	"--mcp-config": true, "--tools": true,
-}
-
-var omoManagementCommands = map[string]bool{
-	"agent": true, "auth": true, "completion": true, "db": true, "debug": true,
-	"export": true, "import": true, "mcp": true, "models": true, "plugin": true,
-	"plug": true, "providers": true, "stats": true, "uninstall": true, "upgrade": true,
-}
-
-var omcManagementCommands = map[string]bool{
-	"ask": true, "capabilities": true, "config": true, "config-notify-profile": true,
-	"config-stop-callback": true, "doctor": true, "help": true, "info": true,
-	"install": true, "postinstall": true, "session": true, "setup": true,
-	"teleport": true, "test-prompt": true, "update": true,
-	"update-reconcile": true, "version": true,
-}
-
-var omxManagementCommands = map[string]bool{
-	"agents": true, "agents-init": true, "ask": true, "auth": true,
-	"cancel": true, "capabilities": true, "deepinit": true, "doctor": true,
-	"explore": true, "help": true, "hooks": true, "hud": true,
-	"list": true, "reasoning": true, "session": true, "setup": true,
-	"sparkshell": true, "status": true, "tmux-hook": true, "uninstall": true,
-	"update": true, "version": true,
-}
diff --git a/daemon/remote/cmd/cmuxd-remote/agent_launch_classification_test.go b/daemon/remote/cmd/cmuxd-remote/agent_launch_classification_test.go
deleted file mode 100644
index dbe85d1db7da..000000000000
--- a/daemon/remote/cmd/cmuxd-remote/agent_launch_classification_test.go
+++ /dev/null
@@ -1,110 +0,0 @@
-package main
-
-import "testing"
-
-func TestAgentLaunchNonLaunchClassification(t *testing.T) {
-	tests := []struct {
-		name       string
-		classifier func([]string) bool
-		args       []string
-		want       bool
-	}{
-		{"claude management", claudeTeamsLaunchIsNonLaunch, []string{"--verbose", "auth"}, true},
-		{"claude import starts a session", claudeTeamsLaunchIsNonLaunch, []string{"import", "codex", "--dry-run"}, false},
-		{"claude background management", claudeTeamsLaunchIsNonLaunch, []string{"logs", "session-id"}, true},
-		{"claude daemon status", claudeTeamsLaunchIsNonLaunch, []string{"daemon", "status"}, true},
-		{"claude daemon stop with config", claudeTeamsLaunchIsNonLaunch, []string{"daemon", "--json-path", "/tmp/daemon.json", "stop", "--any"}, true},
-		{"claude daemon host", claudeTeamsLaunchIsNonLaunch, []string{"daemon", "run"}, false},
-		{"claude bare daemon", claudeTeamsLaunchIsNonLaunch, []string{"daemon"}, false},
-		{"claude Agent View", claudeTeamsLaunchIsNonLaunch, []string{"agents"}, false},
-		{"claude agents JSON", claudeTeamsLaunchIsNonLaunch, []string{"agents", "--json"}, true},
-		{"claude all agents JSON", claudeTeamsLaunchIsNonLaunch, []string{"agents", "--all", "--json"}, true},
-		{"claude Agent View all", claudeTeamsLaunchIsNonLaunch, []string{"agents", "--all"}, false},
-		{"claude agents JSON prompt", claudeTeamsLaunchIsNonLaunch, []string{"agents", "--json", "prompt"}, false},
-		{"claude ultrareview workflow", claudeTeamsLaunchIsNonLaunch, []string{"ultrareview"}, false},
-		{"claude tmux management", claudeTeamsLaunchIsNonLaunch, []string{"--tmux", "classic", "doctor"}, true},
-		{"claude informational after prompt", claudeTeamsLaunchIsNonLaunch, []string{"prompt", "--version"}, true},
-		{"claude informational after forward subagent text", claudeTeamsLaunchIsNonLaunch, []string{"--forward-subagent-text", "--version"}, true},
-		{"claude uppercase V is a launch", claudeTeamsLaunchIsNonLaunch, []string{"-V"}, false},
-		{"claude command-shaped value", claudeTeamsLaunchIsNonLaunch, []string{"--model", "doctor"}, false},
-		{"claude background command-shaped value", claudeTeamsLaunchIsNonLaunch, []string{"--model", "logs"}, false},
-		{"claude ambiguous optional value", claudeTeamsLaunchIsNonLaunch, []string{"--debug", "doctor"}, false},
-		{"claude session routing", claudeTeamsLaunchIsNonLaunch, []string{"--resume", "doctor"}, false},
-		{"claude tmux prompt", claudeTeamsLaunchIsNonLaunch, []string{"--tmux", "doctor"}, false},
-		{"omo management with mdns", omoLaunchIsNonLaunch, []string{"--mdns", "models"}, true},
-		{"omo session help", omoLaunchIsNonLaunch, []string{"session", "--help"}, true},
-		{"omo unknown session command help", omoLaunchIsNonLaunch, []string{"session", "run", "--help"}, true},
-		{"omo session list after global option", omoLaunchIsNonLaunch, []string{"session", "--log-level", "WARN", "list"}, true},
-		{"omo github install after joined global option", omoLaunchIsNonLaunch, []string{"github", "--log-level=ERROR", "install"}, true},
-		{"omo run help", omoLaunchIsNonLaunch, []string{"run", "--help"}, true},
-		{"omo run version after prompt", omoLaunchIsNonLaunch, []string{"run", "message", "--version"}, true},
-		{"omo run help after option value", omoLaunchIsNonLaunch, []string{"run", "--log-level", "WARN", "--help"}, true},
-		{"omo session delimiter help", omoLaunchIsNonLaunch, []string{"session", "--", "--help"}, false},
-		{"omo session delimiter list", omoLaunchIsNonLaunch, []string{"session", "--", "list"}, false},
-		{"omo session unknown option list", omoLaunchIsNonLaunch, []string{"session", "--unknown-option", "list"}, false},
-		{"omo github missing option value", omoLaunchIsNonLaunch, []string{"github", "--log-level"}, false},
-		{"omo run delimiter help", omoLaunchIsNonLaunch, []string{"run", "--", "--help"}, false},
-		{"omo run help in option value", omoLaunchIsNonLaunch, []string{"run", "--log-level", "--help"}, false},
-		{"omo run help after unknown option", omoLaunchIsNonLaunch, []string{"run", "--unknown-option", "--help"}, false},
-		{"omo github install", omoLaunchIsNonLaunch, []string{"github", "install"}, true},
-		{"omo github run", omoLaunchIsNonLaunch, []string{"github", "run"}, false},
-		{"omo ACP service", omoLaunchIsNonLaunch, []string{"acp"}, false},
-		{"omo headless service", omoLaunchIsNonLaunch, []string{"serve"}, false},
-		{"omo web service", omoLaunchIsNonLaunch, []string{"web"}, false},
-		{"omo management with port", omoLaunchIsNonLaunch, []string{"--port", "4096", "models"}, true},
-		{"omo management with hostname", omoLaunchIsNonLaunch, []string{"--hostname=127.0.0.1", "models"}, true},
-		{"omo management with mdns domain", omoLaunchIsNonLaunch, []string{"--mdns-domain", "local", "models"}, true},
-		{"omo management with cors", omoLaunchIsNonLaunch, []string{"--cors", "https://example.com", "models"}, true},
-		{"omo command-shaped port value", omoLaunchIsNonLaunch, []string{"--port", "models"}, false},
-		{"omo missing cors value", omoLaunchIsNonLaunch, []string{"--cors"}, false},
-		{"omo real launch after mdns", omoLaunchIsNonLaunch, []string{"--mdns", "run", "hello"}, false},
-		{"omx first-token management", omxLaunchIsNonLaunch, []string{"setup"}, true},
-		{"omx operator command", omxLaunchIsNonLaunch, []string{"ask", "question"}, true},
-		{"omx first-token help", omxLaunchIsNonLaunch, []string{"--help"}, true},
-		{"omx team api", omxLaunchIsNonLaunch, []string{"team", "api", "claim-task"}, true},
-		{"omx team status", omxLaunchIsNonLaunch, []string{"team", "status", "demo"}, true},
-		{"omx team shutdown", omxLaunchIsNonLaunch, []string{"team", "shutdown", "demo"}, true},
-		{"omx team help", omxLaunchIsNonLaunch, []string{"team", "--help"}, true},
-		{"omx nested team help", omxLaunchIsNonLaunch, []string{"team", "resume", "--help"}, true},
-		{"omx bare team", omxLaunchIsNonLaunch, []string{"team"}, false},
-		{"omx team resume", omxLaunchIsNonLaunch, []string{"team", "resume"}, false},
-		{"omx leading option dispatches launch", omxLaunchIsNonLaunch, []string{"--scope", "project", "setup"}, false},
-		{"omx operator after leading option dispatches launch", omxLaunchIsNonLaunch, []string{"--scope", "project", "ask"}, false},
-		{"omx informational option value dispatches launch", omxLaunchIsNonLaunch, []string{"--scope", "--version"}, false},
-		{"omx delimiter blocks informational option", omxLaunchIsNonLaunch, []string{"--", "--version"}, false},
-		{"omc management", omcLaunchIsNonLaunch, []string{"doctor", "conflicts"}, true},
-		{"omc team api", omcLaunchIsNonLaunch, []string{"team", "api", "claim-task"}, true},
-		{"omc team status", omcLaunchIsNonLaunch, []string{"team", "status", "demo"}, true},
-		{"omc team shutdown", omcLaunchIsNonLaunch, []string{"team", "shutdown", "demo"}, true},
-		{"omc team help", omcLaunchIsNonLaunch, []string{"team", "--help"}, true},
-		{"omc nested team help", omcLaunchIsNonLaunch, []string{"team", "resume", "--help"}, true},
-		{"omc team short help", omcLaunchIsNonLaunch, []string{"team", "-h"}, true},
-		{"omc bare team", omcLaunchIsNonLaunch, []string{"team"}, false},
-		{"omc team resume", omcLaunchIsNonLaunch, []string{"team", "resume"}, false},
-		{"omc team launch", omcLaunchIsNonLaunch, []string{"team", "1:codex", "review this"}, false},
-		{"omc real launch", omcLaunchIsNonLaunch, []string{"start a team"}, false},
-	}
-
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			if got := test.classifier(test.args); got != test.want {
-				t.Fatalf("classification = %v, want %v for %q", got, test.want, test.args)
-			}
-		})
-	}
-}
-
-func TestClaudeTeamsVariadicValuesNeverBecomeManagementCommands(t *testing.T) {
-	for _, option := range []string{
-		"--add-dir", "--allowedTools", "--allowed-tools", "--betas",
-		"--dangerously-load-development-channels", "--disallowedTools",
-		"--disallowed-tools", "--file", "--mcp-config", "--tools",
-	} {
-		t.Run(option, func(t *testing.T) {
-			args := []string{option, "/tmp/value", "auth"}
-			if claudeTeamsLaunchIsNonLaunch(args) {
-				t.Fatalf("variadic option values were classified as management: %q", args)
-			}
-		})
-	}
-}
diff --git a/daemon/remote/cmd/cmuxd-remote/agent_launch_context.go b/daemon/remote/cmd/cmuxd-remote/agent_launch_context.go
deleted file mode 100644
index 19fbca0feb93..000000000000
--- a/daemon/remote/cmd/cmuxd-remote/agent_launch_context.go
+++ /dev/null
@@ -1,153 +0,0 @@
-package main
-
-import (
-	"errors"
-	"os"
-	"strings"
-	"time"
-)
-
-const agentLaunchContextTimeout = 5 * time.Second
-
-var errAgentLaunchContextRequired = errors.New("launch requires a live cmux surface context")
-
-type agentLaunchContext struct {
-	workspaceId string
-	windowId    string
-	paneHandle  string
-	paneId      string
-	surfaceId   string
-}
-
-func agentLaunchContextForInvocation(rc *rpcContext, nonLaunch bool) (*agentLaunchContext, error) {
-	context := inheritedAgentLaunchContext(rc)
-	if context == nil && !nonLaunch {
-		return nil, errAgentLaunchContextRequired
-	}
-	return context, nil
-}
-
-func inheritedAgentLaunchContext(rc *rpcContext) *agentLaunchContext {
-	return inheritedAgentLaunchContextWithTimeout(rc, agentLaunchContextTimeout)
-}
-
-func inheritedAgentLaunchContextWithTimeout(rc *rpcContext, timeout time.Duration) *agentLaunchContext {
-	workspaceHandle := strings.TrimSpace(os.Getenv("CMUX_WORKSPACE_ID"))
-	surfaceHandle := strings.TrimSpace(os.Getenv("CMUX_SURFACE_ID"))
-	if workspaceHandle == "" || surfaceHandle == "" {
-		return nil
-	}
-
-	result := make(chan *agentLaunchContext, 1)
-	go func() {
-		result <- resolveInheritedAgentLaunchContext(rc, workspaceHandle, surfaceHandle)
-	}()
-
-	if timeout <= 0 {
-		return <-result
-	}
-	timer := time.NewTimer(timeout)
-	defer timer.Stop()
-	select {
-	case context := <-result:
-		return context
-	case <-timer.C:
-		return nil
-	}
-}
-
-func resolveInheritedAgentLaunchContext(
-	rc *rpcContext,
-	workspaceHandle string,
-	surfaceHandle string,
-) *agentLaunchContext {
-	if context := agentLaunchContextForSurface(rc, workspaceHandle, surfaceHandle); context != nil {
-		return context
-	}
-
-	// A surface UUID survives moves between workspaces. Relocate only that exact
-	// inherited surface from structured state; never substitute global focus.
-	surfaceId := tmuxTrimIdSigil(surfaceHandle)
-	if !isUUIDish(surfaceId) {
-		return nil
-	}
-	payload, err := rc.call("surface.list", map[string]any{"surface_id": surfaceId})
-	if err != nil {
-		return nil
-	}
-	workspaceId := stringFromAnyGo(payload["workspace_id"])
-	if !isUUIDish(workspaceId) {
-		return nil
-	}
-	return agentLaunchContextFromSurfacePayload(rc, payload, workspaceId, surfaceId, surfaceId)
-}
-
-func agentLaunchContextForSurface(
-	rc *rpcContext,
-	workspaceHandle string,
-	surfaceHandle string,
-) *agentLaunchContext {
-	workspaceId, err := tmuxResolveWorkspaceId(rc, workspaceHandle)
-	if err != nil {
-		return nil
-	}
-	surfaceId, err := tmuxCanonicalSurfaceId(rc, surfaceHandle, workspaceId)
-	if err != nil {
-		return nil
-	}
-	payload, err := rc.call("surface.list", map[string]any{"workspace_id": workspaceId})
-	if err != nil {
-		return nil
-	}
-	return agentLaunchContextFromSurfacePayload(rc, payload, workspaceId, surfaceId, surfaceHandle)
-}
-
-func agentLaunchContextFromSurfacePayload(
-	rc *rpcContext,
-	payload map[string]any,
-	workspaceId string,
-	surfaceId string,
-	surfaceHandle string,
-) *agentLaunchContext {
-	surfaces, _ := payload["surfaces"].([]any)
-	normalizedSurfaceHandle := tmuxTrimIdSigil(surfaceHandle)
-	var matched map[string]any
-	for _, rawSurface := range surfaces {
-		surface, _ := rawSurface.(map[string]any)
-		if surface == nil {
-			continue
-		}
-		if stringFromAnyGo(surface["id"]) == surfaceId ||
-			stringFromAnyGo(surface["ref"]) == normalizedSurfaceHandle {
-			matched = surface
-			break
-		}
-	}
-	if matched == nil {
-		return nil
-	}
-	paneHandle := stringFromAnyGo(matched["pane_id"])
-	if paneHandle == "" {
-		paneHandle = stringFromAnyGo(matched["pane_ref"])
-	}
-	if paneHandle == "" {
-		return nil
-	}
-	paneId, _ := tmuxCanonicalPaneId(rc, paneHandle, workspaceId)
-	return &agentLaunchContext{
-		workspaceId: workspaceId,
-		windowId:    firstNonEmptyString(payload["window_id"], payload["window_ref"]),
-		paneHandle:  paneHandle,
-		paneId:      paneId,
-		surfaceId:   surfaceId,
-	}
-}
-
-func firstNonEmptyString(values ...any) string {
-	for _, value := range values {
-		if result := stringFromAnyGo(value); result != "" {
-			return result
-		}
-	}
-	return ""
-}
diff --git a/daemon/remote/cmd/cmuxd-remote/agent_launch_context_test.go b/daemon/remote/cmd/cmuxd-remote/agent_launch_context_test.go
deleted file mode 100644
index 7c339e0cce31..000000000000
--- a/daemon/remote/cmd/cmuxd-remote/agent_launch_context_test.go
+++ /dev/null
@@ -1,325 +0,0 @@
-package main
-
-import (
-	"bufio"
-	"encoding/json"
-	"errors"
-	"net"
-	"os"
-	"sync"
-	"testing"
-	"time"
-)
-
-const (
-	agentLaunchTestWorkspaceId = "11111111-1111-4111-8111-111111111111"
-	agentLaunchTestPaneId      = "33333333-3333-4333-8333-333333333333"
-	agentLaunchTestSurfaceId   = "44444444-4444-4444-8444-444444444444"
-)
-
-func TestInheritedAgentLaunchContextUsesCallerSurfaceWithoutGlobalFocus(t *testing.T) {
-	socketPath, recordedRequests := startAgentLaunchContextSocket(t, true)
-	t.Setenv("CMUX_WORKSPACE_ID", agentLaunchTestWorkspaceId)
-	t.Setenv("CMUX_SURFACE_ID", agentLaunchTestSurfaceId)
-
-	context := inheritedAgentLaunchContextWithTimeout(
-		&rpcContext{socketPath: socketPath},
-		time.Second,
-	)
-	if context == nil {
-		t.Fatal("inheritedAgentLaunchContextWithTimeout returned nil")
-	}
-	if context.workspaceId != agentLaunchTestWorkspaceId {
-		t.Fatalf("workspaceId = %q", context.workspaceId)
-	}
-	if context.surfaceId != agentLaunchTestSurfaceId {
-		t.Fatalf("surfaceId = %q", context.surfaceId)
-	}
-	if context.paneId != agentLaunchTestPaneId {
-		t.Fatalf("paneId = %q", context.paneId)
-	}
-	for _, request := range recordedRequests() {
-		if request["method"] == "system.identify" {
-			t.Fatalf("managed launch consulted global focus: %v", recordedRequests())
-		}
-	}
-}
-
-func TestInheritedAgentLaunchContextRelocatesMovedSurfaceByStableId(t *testing.T) {
-	socketPath, recordedRequests := startMovedAgentLaunchContextSocket(t)
-	t.Setenv("CMUX_WORKSPACE_ID", agentLaunchTestWorkspaceId)
-	t.Setenv("CMUX_SURFACE_ID", agentLaunchTestSurfaceId)
-
-	context := inheritedAgentLaunchContextWithTimeout(
-		&rpcContext{socketPath: socketPath},
-		time.Second,
-	)
-	if context == nil {
-		t.Fatal("inheritedAgentLaunchContextWithTimeout returned nil")
-	}
-	const movedWorkspaceId = "aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaaaaaa"
-	if context.workspaceId != movedWorkspaceId {
-		t.Fatalf("workspaceId = %q, want moved workspace %q", context.workspaceId, movedWorkspaceId)
-	}
-	if context.surfaceId != agentLaunchTestSurfaceId {
-		t.Fatalf("surfaceId = %q", context.surfaceId)
-	}
-
-	requests := recordedRequests()
-	foundRelocationLookup := false
-	for _, request := range requests {
-		if request["method"] == "system.identify" {
-			t.Fatalf("moved-surface relocation consulted global focus: %v", requests)
-		}
-		if request["method"] != "surface.list" {
-			continue
-		}
-		params, _ := request["params"].(map[string]any)
-		if stringFromAnyGo(params["surface_id"]) == agentLaunchTestSurfaceId {
-			foundRelocationLookup = true
-		}
-	}
-	if !foundRelocationLookup {
-		t.Fatalf("moved surface was not relocated through surface.list(surface_id:): %v", requests)
-	}
-}
-
-func TestAgentLaunchContextFailsClosedForMissingOrStaleIdentity(t *testing.T) {
-	t.Run("missing pair does not open socket", func(t *testing.T) {
-		socketPath, recordedRequests := startAgentLaunchContextSocket(t, true)
-		t.Setenv("CMUX_WORKSPACE_ID", agentLaunchTestWorkspaceId)
-		t.Setenv("CMUX_SURFACE_ID", "")
-		rc := &rpcContext{socketPath: socketPath}
-
-		if context, err := agentLaunchContextForInvocation(rc, true); context != nil || err != nil {
-			t.Fatalf("non-launch context = %#v, err = %v", context, err)
-		}
-		if _, err := agentLaunchContextForInvocation(rc, false); !errors.Is(err, errAgentLaunchContextRequired) {
-			t.Fatalf("launch error = %v, want %v", err, errAgentLaunchContextRequired)
-		}
-		if requests := recordedRequests(); len(requests) != 0 {
-			t.Fatalf("missing inherited pair opened socket: %v", requests)
-		}
-	})
-
-	t.Run("stale surface never falls back to focus", func(t *testing.T) {
-		socketPath, recordedRequests := startAgentLaunchContextSocket(t, false)
-		t.Setenv("CMUX_WORKSPACE_ID", agentLaunchTestWorkspaceId)
-		t.Setenv("CMUX_SURFACE_ID", agentLaunchTestSurfaceId)
-		rc := &rpcContext{socketPath: socketPath}
-
-		if _, err := agentLaunchContextForInvocation(rc, false); !errors.Is(err, errAgentLaunchContextRequired) {
-			t.Fatalf("launch error = %v, want %v", err, errAgentLaunchContextRequired)
-		}
-		for _, request := range recordedRequests() {
-			if request["method"] == "system.identify" {
-				t.Fatalf("stale inherited identity consulted global focus: %v", recordedRequests())
-			}
-		}
-	})
-}
-
-func TestConfigureAgentEnvironmentClearsRejectedRoutingIdentity(t *testing.T) {
-	for _, key := range []string{
-		"PATH",
-		"TMUX",
-		"TMUX_PANE",
-		"TERM",
-		"CMUX_SOCKET_PATH",
-		"CMUX_SOCKET",
-		"TERM_PROGRAM",
-		"COLORTERM",
-		"CMUX_AGENT_LAUNCH_TEST_BIN",
-		"CMUX_AGENT_LAUNCH_TEST_TERM",
-	} {
-		t.Setenv(key, os.Getenv(key))
-	}
-	for _, key := range []string{
-		"CMUX_WORKSPACE_ID",
-		"CMUX_SURFACE_ID",
-		"CMUX_PANEL_ID",
-		"CMUX_TAB_ID",
-		"CMUX_PANE_ID",
-	} {
-		t.Setenv(key, "stale-"+key)
-	}
-	t.Setenv("PATH", "/usr/bin:/bin")
-
-	configureAgentEnvironment(agentConfig{
-		shimDir:        t.TempDir(),
-		socketPath:     "/tmp/cmux-agent-launch-test.sock",
-		launchContext:  nil,
-		tmuxPathPrefix: "cmux-agent-launch-test",
-		cmuxBinEnvVar:  "CMUX_AGENT_LAUNCH_TEST_BIN",
-		termEnvVar:     "CMUX_AGENT_LAUNCH_TEST_TERM",
-		extraEnv:       map[string]string{},
-	})
-
-	for _, key := range []string{
-		"CMUX_WORKSPACE_ID",
-		"CMUX_SURFACE_ID",
-		"CMUX_PANEL_ID",
-		"CMUX_TAB_ID",
-		"CMUX_PANE_ID",
-	} {
-		if value, present := os.LookupEnv(key); present {
-			t.Errorf("%s leaked rejected value %q", key, value)
-		}
-	}
-}
-
-func TestAgentLaunchRPCSocketHandlesMultipleRequestsPerConnection(t *testing.T) {
-	socketPath, recordedRequests := startAgentLaunchRPCSocket(
-		t,
-		func(method string, _ map[string]any) (map[string]any, bool) {
-			if method == "surface.list" {
-				return map[string]any{"surfaces": []map[string]any{}}, true
-			}
-			return nil, false
-		},
-	)
-	connection, err := net.Dial("unix", socketPath)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer connection.Close()
-	encoder := json.NewEncoder(connection)
-	decoder := json.NewDecoder(connection)
-
-	for _, request := range []map[string]any{
-		{"id": "first", "method": "surface.list", "params": map[string]any{}},
-		{"id": "second", "method": "pane.list", "params": map[string]any{}},
-	} {
-		if err := encoder.Encode(request); err != nil {
-			t.Fatal(err)
-		}
-		var response map[string]any
-		if err := decoder.Decode(&response); err != nil {
-			t.Fatal(err)
-		}
-		if response["id"] != request["id"] || response["ok"] != true {
-			t.Fatalf("response = %#v for request %#v", response, request)
-		}
-	}
-
-	requests := recordedRequests()
-	if len(requests) != 2 || requests[0]["method"] != "surface.list" || requests[1]["method"] != "pane.list" {
-		t.Fatalf("recorded requests = %#v", requests)
-	}
-}
-
-func startAgentLaunchContextSocket(t *testing.T, surfaceExists bool) (string, func() []map[string]any) {
-	t.Helper()
-	return startAgentLaunchRPCSocket(t, func(method string, _ map[string]any) (map[string]any, bool) {
-		if method != "surface.list" {
-			return nil, false
-		}
-		surfaces := []map[string]any{}
-		if surfaceExists {
-			surfaces = append(surfaces, map[string]any{
-				"id":       agentLaunchTestSurfaceId,
-				"ref":      "surface:1",
-				"pane_id":  agentLaunchTestPaneId,
-				"pane_ref": "pane:1",
-			})
-		}
-		return map[string]any{
-			"workspace_id": agentLaunchTestWorkspaceId,
-			"window_id":    "22222222-2222-4222-8222-222222222222",
-			"surfaces":     surfaces,
-		}, true
-	})
-}
-
-func startMovedAgentLaunchContextSocket(t *testing.T) (string, func() []map[string]any) {
-	t.Helper()
-	const movedWorkspaceId = "aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaaaaaa"
-	return startAgentLaunchRPCSocket(t, func(method string, params map[string]any) (map[string]any, bool) {
-		if method != "surface.list" {
-			return nil, false
-		}
-		if stringFromAnyGo(params["surface_id"]) == agentLaunchTestSurfaceId {
-			return map[string]any{
-				"workspace_id": movedWorkspaceId,
-				"window_id":    "bbbbbbbb-bbbb-4bbb-8bbb-bbbbbbbbbbbb",
-				"surfaces": []map[string]any{{
-					"id":       agentLaunchTestSurfaceId,
-					"ref":      "surface:1",
-					"pane_id":  agentLaunchTestPaneId,
-					"pane_ref": "pane:1",
-				}},
-			}, true
-		}
-		return map[string]any{
-			"workspace_id": agentLaunchTestWorkspaceId,
-			"surfaces":     []map[string]any{},
-		}, true
-	})
-}
-
-func startAgentLaunchRPCSocket(
-	t *testing.T,
-	respond func(method string, params map[string]any) (map[string]any, bool),
-) (string, func() []map[string]any) {
-	t.Helper()
-	socketPath := makeShortUnixSocketPath(t)
-	listener, err := net.Listen("unix", socketPath)
-	if err != nil {
-		t.Fatalf("failed to listen: %v", err)
-	}
-	t.Cleanup(func() { _ = listener.Close() })
-
-	var mutex sync.Mutex
-	requests := []map[string]any{}
-	recordedRequests := func() []map[string]any {
-		mutex.Lock()
-		defer mutex.Unlock()
-		return append([]map[string]any(nil), requests...)
-	}
-
-	go func() {
-		for {
-			connection, err := listener.Accept()
-			if err != nil {
-				return
-			}
-			go func(connection net.Conn) {
-				defer connection.Close()
-				reader := bufio.NewReader(connection)
-				for {
-					line, err := reader.ReadBytes('\n')
-					if err != nil {
-						return
-					}
-					var request map[string]any
-					if err := json.Unmarshal(line, &request); err != nil {
-						return
-					}
-					mutex.Lock()
-					requests = append(requests, request)
-					mutex.Unlock()
-
-					method, _ := request["method"].(string)
-					params, _ := request["params"].(map[string]any)
-					response := map[string]any{"id": request["id"], "ok": true}
-					if method == "pane.list" {
-						response["result"] = map[string]any{"panes": []map[string]any{{
-							"id": agentLaunchTestPaneId, "ref": "pane:1", "index": 1,
-						}}}
-					} else if result, ok := respond(method, params); ok {
-						response["result"] = result
-					} else {
-						response["ok"] = false
-						response["error"] = map[string]any{"code": "unexpected", "message": method}
-					}
-					payload, _ := json.Marshal(response)
-					if _, err := connection.Write(append(payload, '\n')); err != nil {
-						return
-					}
-				}
-			}(connection)
-		}
-	}()
-
-	return socketPath, recordedRequests
-}
diff --git a/daemon/remote/cmd/cmuxd-remote/agent_launch_shell.go b/daemon/remote/cmd/cmuxd-remote/agent_launch_shell.go
deleted file mode 100644
index 2f17d20b46a0..000000000000
--- a/daemon/remote/cmd/cmuxd-remote/agent_launch_shell.go
+++ /dev/null
@@ -1,124 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"os"
-	"path/filepath"
-	"strings"
-)
-
-const claudeTeamsShellWrapperScript = `#!/bin/sh
-set -eu
-
-original_shell=${CMUX_CLAUDE_TEAMS_ORIGINAL_SHELL:-/bin/sh}
-shim_dir=${CMUX_CLAUDE_TEAMS_SHIM_DIR:-}
-
-case "${1:-}" in
-  -c|-lc|-ic|-lic|-ilc)
-    shell_flags=$1
-    shift
-    # Claude Code passes login mode as a separate token when capturing a shell
-    # snapshot: "$SHELL" -c -l <script>. Fold separate shell options back into
-    # the command-mode flag before selecting the script argument.
-    while [ "$#" -gt 1 ]; do
-      case "$1" in
-        -l|-i)
-          shell_flags="-${1#-}${shell_flags#-}"
-          shift
-          ;;
-        *)
-          break
-          ;;
-      esac
-    done
-    if [ "$#" -eq 0 ] || [ -z "$shim_dir" ]; then
-      exec "$original_shell" "$shell_flags" "$@"
-    fi
-    shell_command=$1
-    shift
-    original_shell_flags=$shell_flags
-    case "${original_shell##*/}" in
-      fish)
-        shell_command='if test -n "$CMUX_CLAUDE_TEAMS_SHIM_DIR"; and test -d "$CMUX_CLAUDE_TEAMS_SHIM_DIR"; set -gx PATH "$CMUX_CLAUDE_TEAMS_SHIM_DIR" $PATH; end; '"$shell_command"
-        ;;
-      csh|tcsh)
-        # csh-family shells reject combined login/interactive flags. Their
-        # command mode still sources the interactive rc file before this prefix.
-        original_shell_flags=-c
-        shell_command='if ( -d "$CMUX_CLAUDE_TEAMS_SHIM_DIR" ) setenv PATH "${CMUX_CLAUDE_TEAMS_SHIM_DIR}:${PATH}"; '"$shell_command"
-        ;;
-      *)
-        shell_command='if [ -n "${CMUX_CLAUDE_TEAMS_SHIM_DIR:-}" ] && [ -d "$CMUX_CLAUDE_TEAMS_SHIM_DIR" ]; then PATH="$CMUX_CLAUDE_TEAMS_SHIM_DIR${PATH:+:$PATH}"; export PATH; fi; '"$shell_command"
-        ;;
-    esac
-    exec "$original_shell" "$original_shell_flags" "$shell_command" "$@"
-    ;;
-  *)
-    exec "$original_shell" "$@"
-    ;;
-esac
-`
-
-// configureClaudeTeamsShellWrapper makes the managed tmux directory part of
-// Claude's shell contract. Claude invokes CLAUDE_CODE_SHELL (falling back to
-// SHELL) to create a snapshot after login profiles have run; the wrapper
-// prepends the shim inside that command, so a profile that rebuilds PATH cannot
-// evict it from the captured snapshot.
-func configureClaudeTeamsShellWrapper(shimDir string) error {
-	currentShell := strings.TrimSpace(os.Getenv("CLAUDE_CODE_SHELL"))
-	if currentShell == "" {
-		currentShell = strings.TrimSpace(os.Getenv("SHELL"))
-	}
-	wrapperDir := filepath.Join(shimDir, "shell")
-	originalShell := currentShell
-	reentrant := filepath.Clean(filepath.Dir(currentShell)) == filepath.Clean(wrapperDir)
-	if reentrant {
-		originalShell = strings.TrimSpace(os.Getenv("CMUX_CLAUDE_TEAMS_ORIGINAL_SHELL"))
-		if originalShell == "" {
-			return fmt.Errorf("managed Claude Teams shell wrapper is active but CMUX_CLAUDE_TEAMS_ORIGINAL_SHELL is missing")
-		}
-	}
-	if originalShell == "" {
-		originalShell = "/bin/sh"
-	}
-	if !filepath.IsAbs(originalShell) {
-		return fmt.Errorf("SHELL must be an absolute path, got %q", originalShell)
-	}
-	info, err := os.Stat(originalShell)
-	if err != nil {
-		return fmt.Errorf("resolve original shell %q: %w", originalShell, err)
-	}
-	if info.IsDir() || info.Mode()&0111 == 0 {
-		return fmt.Errorf("original shell is not executable: %q", originalShell)
-	}
-	if !claudeTeamsShellWrapperSupports(filepath.Base(originalShell)) {
-		return fmt.Errorf("unsupported SHELL for managed Claude Teams snapshots: %q", originalShell)
-	}
-
-	if err := os.MkdirAll(wrapperDir, 0755); err != nil {
-		return err
-	}
-	// Claude's shell discovery accepts bash/zsh paths and gives
-	// CLAUDE_CODE_SHELL priority over SHELL. Give the wrapper an accepted name
-	// regardless of the user's real shell; the script still translates and
-	// delegates each command to originalShell below.
-	wrapperName := "bash"
-	wrapperPath := filepath.Join(wrapperDir, wrapperName)
-	if err := writeShimIfChanged(wrapperPath, claudeTeamsShellWrapperScript); err != nil {
-		return err
-	}
-
-	os.Setenv("CMUX_CLAUDE_TEAMS_ORIGINAL_SHELL", originalShell)
-	os.Setenv("CMUX_CLAUDE_TEAMS_SHIM_DIR", shimDir)
-	os.Setenv("CLAUDE_CODE_SHELL", wrapperPath)
-	return nil
-}
-
-func claudeTeamsShellWrapperSupports(shellName string) bool {
-	switch shellName {
-	case "ash", "bash", "csh", "dash", "fish", "ksh", "mksh", "sh", "tcsh", "zsh":
-		return true
-	default:
-		return false
-	}
-}
diff --git a/daemon/remote/cmd/cmuxd-remote/agent_launch_shell_test.go b/daemon/remote/cmd/cmuxd-remote/agent_launch_shell_test.go
deleted file mode 100644
index c177365a34ff..000000000000
--- a/daemon/remote/cmd/cmuxd-remote/agent_launch_shell_test.go
+++ /dev/null
@@ -1,292 +0,0 @@
-package main
-
-import (
-	"os"
-	"os/exec"
-	"path/filepath"
-	"strings"
-	"testing"
-)
-
-func TestClaudeTeamsShellSnapshotKeepsManagedTmuxAheadOfRebuiltPath(t *testing.T) {
-	if os.Getenv("CMUX_TEST_CLAUDE_TEAMS_RELAY") == "1" {
-		code := runClaudeTeamsRelay(
-			os.Getenv("CMUX_TEST_CLAUDE_TEAMS_SOCKET"),
-			[]string{"start a team"},
-			nil,
-		)
-		os.Exit(code)
-	}
-
-	socketPath, _ := startAgentLaunchContextSocket(t, true)
-	root := t.TempDir()
-	home := filepath.Join(root, "home")
-	agentBin := filepath.Join(root, "agent-bin")
-	profileBin := filepath.Join(root, "profile-bin")
-	for _, directory := range []string{home, agentBin, profileBin} {
-		if err := os.MkdirAll(directory, 0755); err != nil {
-			t.Fatal(err)
-		}
-	}
-
-	snapshotPathLog := filepath.Join(root, "snapshot-path.log")
-	resolvedTmuxLog := filepath.Join(root, "resolved-tmux.log")
-	originalShell := filepath.Join(root, "zsh")
-	writeAgentLaunchTestExecutable(t, originalShell, `#!/bin/sh
-set -eu
-if [ "${1:-}" != "-lc" ]; then
-  echo "unexpected shell argv: $*" >&2
-  exit 64
-fi
-shift
-PATH="$CMUX_TEST_PROFILE_BIN:/usr/bin:/bin"
-export PATH
-exec /bin/sh -c "$1"
-`)
-	writeAgentLaunchTestExecutable(t, filepath.Join(profileBin, "tmux"), `#!/bin/sh
-exit 0
-`)
-	writeAgentLaunchTestExecutable(t, filepath.Join(agentBin, "claude"), `#!/bin/sh
-set -eu
-"${CLAUDE_CODE_SHELL:-$SHELL}" -c -l 'printf "%s\n" "$PATH" > "$CMUX_TEST_SNAPSHOT_PATH_LOG"'
-PATH="$(cat "$CMUX_TEST_SNAPSHOT_PATH_LOG")"
-export PATH
-command -v tmux > "$CMUX_TEST_RESOLVED_TMUX_LOG"
-`)
-
-	command := exec.Command(os.Args[0], "-test.run=^TestClaudeTeamsShellSnapshotKeepsManagedTmuxAheadOfRebuiltPath$")
-	command.Env = append(os.Environ(),
-		"CMUX_TEST_CLAUDE_TEAMS_RELAY=1",
-		"CMUX_TEST_CLAUDE_TEAMS_SOCKET="+socketPath,
-		"CMUX_TEST_PROFILE_BIN="+profileBin,
-		"CMUX_TEST_SNAPSHOT_PATH_LOG="+snapshotPathLog,
-		"CMUX_TEST_RESOLVED_TMUX_LOG="+resolvedTmuxLog,
-		"CMUX_WORKSPACE_ID="+agentLaunchTestWorkspaceId,
-		"CMUX_SURFACE_ID="+agentLaunchTestSurfaceId,
-		"HOME="+home,
-		"PATH="+agentBin+":"+profileBin+":/usr/bin:/bin",
-		"SHELL=/bin/sh",
-		"CLAUDE_CODE_SHELL="+originalShell,
-	)
-	output, err := command.CombinedOutput()
-	if err != nil {
-		t.Fatalf("remote claude-teams relay failed: %v\n%s", err, output)
-	}
-
-	resolvedBytes, err := os.ReadFile(resolvedTmuxLog)
-	if err != nil {
-		t.Fatal(err)
-	}
-	resolvedTmux := strings.TrimSpace(string(resolvedBytes))
-	wantTmux := filepath.Join(home, ".cmuxterm", "claude-teams-bin", "tmux")
-	if resolvedTmux != wantTmux {
-		snapshotBytes, _ := os.ReadFile(snapshotPathLog)
-		t.Fatalf("snapshot resolved tmux = %q, want %q; PATH=%q", resolvedTmux, wantTmux, strings.TrimSpace(string(snapshotBytes)))
-	}
-}
-
-func TestClaudeTeamsShellWrapperKeepsFishIdentity(t *testing.T) {
-	fishPath, err := exec.LookPath("fish")
-	if err != nil {
-		t.Skip("fish is not installed")
-	}
-
-	root := t.TempDir()
-	shimDir := filepath.Join(root, "claude-teams-bin")
-	profileBin := filepath.Join(root, "profile-bin")
-	configDir := filepath.Join(root, "config", "fish")
-	for _, directory := range []string{shimDir, profileBin, configDir} {
-		if err := os.MkdirAll(directory, 0755); err != nil {
-			t.Fatal(err)
-		}
-	}
-	writeAgentLaunchTestExecutable(t, filepath.Join(shimDir, "tmux"), "#!/bin/sh\nexit 0\n")
-	if err := os.WriteFile(
-		filepath.Join(configDir, "config.fish"),
-		[]byte(`set -gx PATH "$CMUX_TEST_PROFILE_BIN" /usr/bin /bin`+"\n"),
-		0644,
-	); err != nil {
-		t.Fatal(err)
-	}
-
-	t.Setenv("SHELL", fishPath)
-	t.Setenv("CLAUDE_CODE_SHELL", "")
-	t.Setenv("CMUX_CLAUDE_TEAMS_ORIGINAL_SHELL", "")
-	t.Setenv("CMUX_CLAUDE_TEAMS_SHIM_DIR", "")
-	t.Setenv("CMUX_TEST_PROFILE_BIN", profileBin)
-	t.Setenv("XDG_CONFIG_HOME", filepath.Join(root, "config"))
-	if err := configureClaudeTeamsShellWrapper(shimDir); err != nil {
-		t.Fatal(err)
-	}
-	if got := os.Getenv("SHELL"); got != fishPath {
-		t.Fatalf("SHELL = %q, want original fish path %q", got, fishPath)
-	}
-	wrapperPath := os.Getenv("CLAUDE_CODE_SHELL")
-	if filepath.Base(wrapperPath) != "bash" {
-		t.Fatalf("wrapper shell name = %q, want bash", filepath.Base(wrapperPath))
-	}
-
-	command := exec.Command(wrapperPath, "-lc", "command -v tmux")
-	output, err := command.CombinedOutput()
-	if err != nil {
-		t.Fatalf("fish shell wrapper failed: %v\n%s", err, output)
-	}
-	if resolved := strings.TrimSpace(string(output)); resolved != filepath.Join(shimDir, "tmux") {
-		t.Fatalf("fish shell wrapper resolved tmux = %q", resolved)
-	}
-}
-
-func TestClaudeTeamsShellWrapperSupportsNonPOSIXLoginShell(t *testing.T) {
-	tcshPath, err := exec.LookPath("tcsh")
-	if err != nil {
-		t.Skip("tcsh is not installed")
-	}
-
-	root := t.TempDir()
-	shimDir := filepath.Join(root, "claude-teams-bin")
-	profileBin := filepath.Join(root, "profile-bin")
-	for _, directory := range []string{shimDir, profileBin} {
-		if err := os.MkdirAll(directory, 0755); err != nil {
-			t.Fatal(err)
-		}
-	}
-	writeAgentLaunchTestExecutable(t, filepath.Join(shimDir, "tmux"), "#!/bin/sh\nexit 0\n")
-	if err := os.WriteFile(
-		filepath.Join(root, ".tcshrc"),
-		[]byte(`setenv PATH "${CMUX_TEST_PROFILE_BIN}:/usr/bin:/bin"`+"\n"),
-		0644,
-	); err != nil {
-		t.Fatal(err)
-	}
-
-	t.Setenv("HOME", root)
-	t.Setenv("SHELL", tcshPath)
-	t.Setenv("CLAUDE_CODE_SHELL", "")
-	t.Setenv("CMUX_CLAUDE_TEAMS_ORIGINAL_SHELL", "")
-	t.Setenv("CMUX_CLAUDE_TEAMS_SHIM_DIR", "")
-	t.Setenv("CMUX_TEST_PROFILE_BIN", profileBin)
-	if err := configureClaudeTeamsShellWrapper(shimDir); err != nil {
-		t.Fatal(err)
-	}
-	if got := os.Getenv("SHELL"); got != tcshPath {
-		t.Fatalf("SHELL = %q, want original tcsh path %q", got, tcshPath)
-	}
-	wrapperPath := os.Getenv("CLAUDE_CODE_SHELL")
-	if filepath.Base(wrapperPath) != "bash" {
-		t.Fatalf("wrapper shell name = %q, want bash", filepath.Base(wrapperPath))
-	}
-
-	command := exec.Command(wrapperPath, "-lic", "/usr/bin/which tmux")
-	output, err := command.CombinedOutput()
-	if err != nil {
-		t.Fatalf("tcsh shell wrapper failed: %v\n%s", err, output)
-	}
-	if resolved := strings.TrimSpace(string(output)); resolved != filepath.Join(shimDir, "tmux") {
-		t.Fatalf("tcsh shell wrapper resolved tmux = %q", resolved)
-	}
-}
-
-func TestClaudeTeamsShellWrapperRejectsUnknownDialectBeforeReplacingShell(t *testing.T) {
-	root := t.TempDir()
-	unknownShell := filepath.Join(root, "unknown-shell")
-	writeAgentLaunchTestExecutable(t, unknownShell, "#!/bin/sh\nexit 0\n")
-	t.Setenv("SHELL", unknownShell)
-	t.Setenv("CLAUDE_CODE_SHELL", "")
-	t.Setenv("CMUX_CLAUDE_TEAMS_ORIGINAL_SHELL", "")
-	t.Setenv("CMUX_CLAUDE_TEAMS_SHIM_DIR", "")
-
-	err := configureClaudeTeamsShellWrapper(filepath.Join(root, "claude-teams-bin"))
-	if err == nil || !strings.Contains(err.Error(), "unsupported SHELL") {
-		t.Fatalf("configureClaudeTeamsShellWrapper error = %v", err)
-	}
-	if got := os.Getenv("SHELL"); got != unknownShell {
-		t.Fatalf("unsupported SHELL was replaced with %q", got)
-	}
-}
-
-func TestClaudeTeamsShellWrapperRejectsReentryWithoutOriginalShell(t *testing.T) {
-	root := t.TempDir()
-	shimDir := filepath.Join(root, "claude-teams-bin")
-	wrapperPath := filepath.Join(shimDir, "shell", "bash")
-	t.Setenv("SHELL", "/bin/zsh")
-	t.Setenv("CLAUDE_CODE_SHELL", wrapperPath)
-	t.Setenv("CMUX_CLAUDE_TEAMS_ORIGINAL_SHELL", "")
-	t.Setenv("CMUX_CLAUDE_TEAMS_SHIM_DIR", "")
-
-	err := configureClaudeTeamsShellWrapper(shimDir)
-	if err == nil || !strings.Contains(err.Error(), "CMUX_CLAUDE_TEAMS_ORIGINAL_SHELL is missing") {
-		t.Fatalf("configureClaudeTeamsShellWrapper error = %v", err)
-	}
-	if got := os.Getenv("CLAUDE_CODE_SHELL"); got != wrapperPath {
-		t.Fatalf("re-entrant wrapper was replaced with %q", got)
-	}
-	if _, statErr := os.Stat(wrapperPath); !os.IsNotExist(statErr) {
-		t.Fatalf("re-entrant wrapper was unexpectedly written: %v", statErr)
-	}
-}
-
-func TestClaudeTeamsShellWrapperDefaultsInitialLaunchToBinSh(t *testing.T) {
-	shimDir := filepath.Join(t.TempDir(), "claude-teams-bin")
-	t.Setenv("SHELL", "")
-	t.Setenv("CLAUDE_CODE_SHELL", "")
-	t.Setenv("CMUX_CLAUDE_TEAMS_ORIGINAL_SHELL", "")
-	t.Setenv("CMUX_CLAUDE_TEAMS_SHIM_DIR", "")
-
-	if err := configureClaudeTeamsShellWrapper(shimDir); err != nil {
-		t.Fatal(err)
-	}
-	if got := os.Getenv("CMUX_CLAUDE_TEAMS_ORIGINAL_SHELL"); got != "/bin/sh" {
-		t.Fatalf("original shell = %q, want /bin/sh", got)
-	}
-}
-
-func TestClaudeTeamsNonLaunchRelayLeavesUnknownShellUntouched(t *testing.T) {
-	if os.Getenv("CMUX_TEST_CLAUDE_TEAMS_NON_LAUNCH_RELAY") == "1" {
-		os.Exit(runClaudeTeamsRelay("/tmp/cmux-missing-test.sock", []string{"--version"}, nil))
-	}
-
-	root := t.TempDir()
-	home := filepath.Join(root, "home")
-	binDir := filepath.Join(root, "bin")
-	for _, directory := range []string{home, binDir} {
-		if err := os.MkdirAll(directory, 0755); err != nil {
-			t.Fatal(err)
-		}
-	}
-	shellLog := filepath.Join(root, "shell.log")
-	unknownShell := filepath.Join(root, "nu")
-	writeAgentLaunchTestExecutable(t, unknownShell, "#!/bin/sh\nexit 0\n")
-	writeAgentLaunchTestExecutable(t, filepath.Join(binDir, "claude"), `#!/bin/sh
-set -eu
-printf '%s\n' "$SHELL" > "$CMUX_TEST_CLAUDE_SHELL_LOG"
-`)
-
-	command := exec.Command(os.Args[0], "-test.run=^TestClaudeTeamsNonLaunchRelayLeavesUnknownShellUntouched$")
-	command.Env = append(os.Environ(),
-		"CMUX_TEST_CLAUDE_TEAMS_NON_LAUNCH_RELAY=1",
-		"CMUX_TEST_CLAUDE_SHELL_LOG="+shellLog,
-		"CMUX_WORKSPACE_ID=",
-		"CMUX_SURFACE_ID=",
-		"HOME="+home,
-		"PATH="+binDir+":/usr/bin:/bin",
-		"SHELL="+unknownShell,
-	)
-	output, err := command.CombinedOutput()
-	if err != nil {
-		t.Fatalf("non-launch relay failed: %v\n%s", err, output)
-	}
-	loggedShell, err := os.ReadFile(shellLog)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if got := strings.TrimSpace(string(loggedShell)); got != unknownShell {
-		t.Fatalf("non-launch relay replaced SHELL with %q", got)
-	}
-}
-
-func writeAgentLaunchTestExecutable(t *testing.T, path string, content string) {
-	t.Helper()
-	if err := os.WriteFile(path, []byte(content), 0755); err != nil {
-		t.Fatal(err)
-	}
-}
diff --git a/daemon/remote/cmd/cmuxd-remote/agent_launch_temp_test.go b/daemon/remote/cmd/cmuxd-remote/agent_launch_temp_test.go
deleted file mode 100644
index c131505c36cc..000000000000
--- a/daemon/remote/cmd/cmuxd-remote/agent_launch_temp_test.go
+++ /dev/null
@@ -1,34 +0,0 @@
-package main
-
-import (
-	"os"
-	"path/filepath"
-	"testing"
-)
-
-func TestEnsureClaudeNodeOptionsRestoreModuleUsesPrivateRandomDirectory(t *testing.T) {
-	first, err := ensureClaudeNodeOptionsRestoreModule()
-	if err != nil {
-		t.Fatal(err)
-	}
-	second, err := ensureClaudeNodeOptionsRestoreModule()
-	if err != nil {
-		t.Fatal(err)
-	}
-	for _, path := range []string{first, second} {
-		t.Cleanup(func() { _ = os.RemoveAll(filepath.Dir(path)) })
-		if filepath.Dir(first) == filepath.Dir(second) {
-			t.Fatalf("restore module directories are not randomized: %q", filepath.Dir(first))
-		}
-		info, err := os.Stat(filepath.Dir(path))
-		if err != nil {
-			t.Fatal(err)
-		}
-		if mode := info.Mode().Perm(); mode != 0700 {
-			t.Fatalf("directory mode = %o, want 700", mode)
-		}
-		if _, err := os.Stat(path); err != nil {
-			t.Fatal(err)
-		}
-	}
-}
diff --git a/daemon/remote/cmd/cmuxd-remote/agent_launch_test.go b/daemon/remote/cmd/cmuxd-remote/agent_launch_test.go
deleted file mode 100644
index 5cb212196a40..000000000000
--- a/daemon/remote/cmd/cmuxd-remote/agent_launch_test.go
+++ /dev/null
@@ -1,35 +0,0 @@
-package main
-
-import (
-	"os"
-	"path/filepath"
-	"strings"
-	"testing"
-)
-
-func TestOmoEnsurePluginInvalidJSONErrorDoesNotExposeUserPath(t *testing.T) {
-	home := t.TempDir()
-	t.Setenv("HOME", home)
-
-	userDir := filepath.Join(home, ".config", "opencode")
-	if err := os.MkdirAll(userDir, 0755); err != nil {
-		t.Fatalf("failed to create user config dir: %v", err)
-	}
-	userJSONPath := filepath.Join(userDir, "opencode.json")
-	if err := os.WriteFile(userJSONPath, []byte("{"), 0644); err != nil {
-		t.Fatalf("failed to write invalid config: %v", err)
-	}
-
-	err := omoEnsurePlugin(os.Getenv("PATH"))
-	if err == nil {
-		t.Fatal("omoEnsurePlugin returned nil for invalid opencode.json")
-	}
-
-	msg := err.Error()
-	if strings.Contains(msg, home) || strings.Contains(msg, userJSONPath) {
-		t.Fatalf("error %q exposes user config path %q", msg, userJSONPath)
-	}
-	if !strings.Contains(msg, "invalid opencode.json") {
-		t.Fatalf("error = %q, want generic invalid opencode.json message", msg)
-	}
-}
diff --git a/daemon/remote/cmd/cmuxd-remote/cli.go b/daemon/remote/cmd/cmuxd-remote/cli.go
deleted file mode 100644
index 4cf4700d062e..000000000000
--- a/daemon/remote/cmd/cmuxd-remote/cli.go
+++ /dev/null
@@ -1,1327 +0,0 @@
-package main
-
-import (
-	"bufio"
-	"crypto/hmac"
-	"crypto/rand"
-	"crypto/sha256"
-	"encoding/hex"
-	"encoding/json"
-	"fmt"
-	"io"
-	"net"
-	"os"
-	"path/filepath"
-	"sort"
-	"strconv"
-	"strings"
-	"time"
-)
-
-type relayAuthState struct {
-	RelayID    string `json:"relay_id"`
-	RelayToken string `json:"relay_token"`
-}
-
-// commandSpec describes a single CLI command and how to relay it.
-type commandSpec struct {
-	name     string // CLI command name (e.g. "ping", "new-window")
-	v2Method string // JSON-RPC method name
-	// flagKeys lists parameter keys this command accepts.
-	// They are extracted from --key flags and added to params.
-	flagKeys []string
-	// boolFlags lists flag keys whose values should be sent as JSON booleans
-	// rather than strings. Accepted values: "true", "false", "1", "0".
-	boolFlags []string
-	// noParams means the command takes no parameters at all.
-	noParams bool
-	// paramKeyOverrides remaps specific flags for compatibility aliases.
-	paramKeyOverrides map[string]string
-	// defaultParams are applied before flags/env fallbacks.
-	defaultParams map[string]any
-	// positionalKey is the param name that receives positional arguments.
-	// All positional args are joined with a space and assigned to this key.
-	positionalKey string
-	// repeatKeys lists flags that may appear multiple times. Their values
-	// accumulate in parsedFlags.repeated rather than parsedFlags.flags.
-	repeatKeys []string
-}
-
-type browserCommandSpec struct {
-	method                string
-	flagKeys              []string
-	allowPositionalURL    bool
-	allowPositionalScript bool
-	allowPositionalKey    bool
-	allowPositionalQuery  bool
-	allowPositionalValue  bool
-	useWorkspaceEnv       bool
-	useSurfaceEnv         bool
-}
-
-var browserCommands = map[string]browserCommandSpec{
-	"open":       {method: "browser.open_split", flagKeys: []string{"url", "workspace", "surface"}, allowPositionalURL: true, useWorkspaceEnv: true},
-	"open-split": {method: "browser.open_split", flagKeys: []string{"url", "workspace", "surface"}, allowPositionalURL: true, useWorkspaceEnv: true},
-	"new":        {method: "browser.open_split", flagKeys: []string{"url", "workspace", "surface"}, allowPositionalURL: true, useWorkspaceEnv: true},
-	"navigate":   {method: "browser.navigate", flagKeys: []string{"url", "surface"}, allowPositionalURL: true, useSurfaceEnv: true},
-	"goto":       {method: "browser.navigate", flagKeys: []string{"url", "surface"}, allowPositionalURL: true, useSurfaceEnv: true},
-	"back":       {method: "browser.back", flagKeys: []string{"surface"}, useSurfaceEnv: true},
-	"forward":    {method: "browser.forward", flagKeys: []string{"surface"}, useSurfaceEnv: true},
-	"reload":     {method: "browser.reload", flagKeys: []string{"surface"}, useSurfaceEnv: true},
-	"get-url":    {method: "browser.url.get", flagKeys: []string{"surface"}, useSurfaceEnv: true},
-	"url":        {method: "browser.url.get", flagKeys: []string{"surface"}, useSurfaceEnv: true},
-	"snapshot":   {method: "browser.snapshot", flagKeys: []string{"surface", "selector", "max-depth"}, useSurfaceEnv: true},
-	"eval":       {method: "browser.eval", flagKeys: []string{"surface", "script"}, allowPositionalScript: true, useSurfaceEnv: true},
-	"wait":       {method: "browser.wait", flagKeys: []string{"surface", "selector", "text", "url-contains", "load-state", "function", "timeout-ms"}, useSurfaceEnv: true},
-	"click":      {method: "browser.click", flagKeys: []string{"surface", "selector"}, allowPositionalQuery: true, useSurfaceEnv: true},
-	"dblclick":   {method: "browser.dblclick", flagKeys: []string{"surface", "selector"}, allowPositionalQuery: true, useSurfaceEnv: true},
-	"hover":      {method: "browser.hover", flagKeys: []string{"surface", "selector"}, allowPositionalQuery: true, useSurfaceEnv: true},
-	"focus":      {method: "browser.focus", flagKeys: []string{"surface", "selector"}, allowPositionalQuery: true, useSurfaceEnv: true},
-	"check":      {method: "browser.check", flagKeys: []string{"surface", "selector"}, allowPositionalQuery: true, useSurfaceEnv: true},
-	"uncheck":    {method: "browser.uncheck", flagKeys: []string{"surface", "selector"}, allowPositionalQuery: true, useSurfaceEnv: true},
-	"type":       {method: "browser.type", flagKeys: []string{"surface", "selector", "text"}, allowPositionalValue: true, useSurfaceEnv: true},
-	"fill":       {method: "browser.fill", flagKeys: []string{"surface", "selector", "text"}, allowPositionalValue: true, useSurfaceEnv: true},
-	"press":      {method: "browser.press", flagKeys: []string{"surface", "key"}, allowPositionalKey: true, useSurfaceEnv: true},
-	"key":        {method: "browser.press", flagKeys: []string{"surface", "key"}, allowPositionalKey: true, useSurfaceEnv: true},
-	"keydown":    {method: "browser.keydown", flagKeys: []string{"surface", "key"}, allowPositionalKey: true, useSurfaceEnv: true},
-	"keyup":      {method: "browser.keyup", flagKeys: []string{"surface", "key"}, allowPositionalKey: true, useSurfaceEnv: true},
-	"select":     {method: "browser.select", flagKeys: []string{"surface", "selector", "value"}, allowPositionalValue: true, useSurfaceEnv: true},
-	"screenshot": {method: "browser.screenshot", flagKeys: []string{"surface"}, useSurfaceEnv: true},
-}
-
-var commandIndex map[string]*commandSpec
-
-func init() {
-	// Apply per-command overrides from cli_overrides.go onto the generated specs.
-	for i := range commands {
-		ov, ok := commandOverrides[commands[i].name]
-		if !ok {
-			continue
-		}
-		if ov.paramKeyOverrides != nil {
-			commands[i].paramKeyOverrides = ov.paramKeyOverrides
-		}
-		if ov.disablePositional {
-			commands[i].positionalKey = ""
-		}
-		if ov.defaultParams != nil {
-			commands[i].defaultParams = ov.defaultParams
-		}
-	}
-	commandIndex = make(map[string]*commandSpec, len(commands))
-	for i := range commands {
-		commandIndex[commands[i].name] = &commands[i]
-	}
-}
-
-// runCLI is the entry point for the "cli" subcommand (or busybox "cmux" invocation).
-func runCLI(args []string) int {
-	socketPath := os.Getenv("CMUX_SOCKET_PATH")
-
-	// Parse global flags
-	var jsonOutput bool
-	var remaining []string
-	for i := 0; i < len(args); i++ {
-		switch args[i] {
-		case "--socket":
-			if i+1 >= len(args) {
-				fmt.Fprintln(os.Stderr, "cmux: --socket requires a path")
-				return 2
-			}
-			socketPath = args[i+1]
-			i++
-		case "--json":
-			jsonOutput = true
-		case "--help", "-h":
-			cliUsage()
-			return 0
-		default:
-			remaining = append(remaining, args[i:]...)
-			goto doneFlags
-		}
-	}
-doneFlags:
-
-	if len(remaining) == 0 {
-		cliUsage()
-		return 2
-	}
-	cmdName := remaining[0]
-	cmdArgs := remaining[1:]
-	if cmdName == "help" {
-		cliUsage()
-		return 0
-	}
-
-	// refreshAddr is set when the address came from socket_addr file (not env/flag),
-	// allowing one stale-address refresh if another workspace has replaced socket_addr.
-	var refreshAddr func() string
-	if socketPath == "" {
-		socketPath = readSocketAddrFile()
-		refreshAddr = readSocketAddrFile
-	}
-	if socketPath == "" {
-		socketPath = defaultCloudCLIBridgeSocketIfExists()
-	}
-	if socketPath == "" {
-		fmt.Fprintln(os.Stderr, "cmux: CMUX_SOCKET_PATH not set and --socket not provided")
-		return 1
-	}
-
-	// Special case: "rpc" passthrough
-	if cmdName == "rpc" {
-		return runRPC(socketPath, cmdArgs, jsonOutput, refreshAddr)
-	}
-
-	// Commands with specialDispatch=true in cli_overrides.go have dedicated
-	// handler functions for client-side logic the generic path cannot express.
-	if commandOverrides[cmdName].specialDispatch {
-		switch cmdName {
-		case "new-workspace":
-			return runNewWorkspaceRelay(socketPath, cmdArgs, jsonOutput, refreshAddr)
-		}
-	}
-
-	// Browser subcommand delegation
-	if cmdName == "browser" {
-		return runBrowserRelay(socketPath, cmdArgs, jsonOutput, refreshAddr)
-	}
-
-	// Workspace group subcommands: "workspace-group <sub>" and the canonical
-	// two-word "workspace group <sub>" both map to workspace.group.* methods,
-	// matching the macOS cmux CLI.
-	if cmdName == "workspace-group" {
-		return runWorkspaceGroupRelay(socketPath, cmdArgs, jsonOutput, refreshAddr)
-	}
-	if cmdName == "workspace" {
-		if len(cmdArgs) > 0 && cmdArgs[0] == "group" {
-			return runWorkspaceGroupRelay(socketPath, cmdArgs[1:], jsonOutput, refreshAddr)
-		}
-		fmt.Fprintln(os.Stderr, "cmux workspace: only the \"group\" subcommand is supported here. Use list-workspaces, new-workspace, close-workspace, or select-workspace for workspace operations.")
-		return 2
-	}
-
-	// Agent launch commands
-	if cmdName == "claude-teams" {
-		return runClaudeTeamsRelay(socketPath, cmdArgs, refreshAddr)
-	}
-	if cmdName == "omo" {
-		return runOMORelay(socketPath, cmdArgs, refreshAddr)
-	}
-	if cmdName == "omx" {
-		return runOMXRelay(socketPath, cmdArgs, refreshAddr)
-	}
-	if cmdName == "omc" {
-		return runOMCRelay(socketPath, cmdArgs, refreshAddr)
-	}
-
-	// Tmux compatibility layer (used by agent shims)
-	if cmdName == "__tmux-compat" {
-		return runTmuxCompat(socketPath, cmdArgs, refreshAddr)
-	}
-
-	spec, ok := commandIndex[cmdName]
-	if !ok {
-		fmt.Fprintf(os.Stderr, "cmux: unknown command %q\n", cmdName)
-		return 2
-	}
-
-	return execV2(socketPath, spec, cmdArgs, jsonOutput, refreshAddr)
-}
-
-// execV2 sends a v2 JSON-RPC request over the socket.
-func execV2(socketPath string, spec *commandSpec, args []string, jsonOutput bool, refreshAddr func() string) int {
-	params := make(map[string]any, len(spec.defaultParams))
-	for key, value := range spec.defaultParams {
-		params[key] = value
-	}
-
-	if !spec.noParams {
-		parsed, err := parseFlags(args, spec.flagKeys, spec.repeatKeys)
-		if err != nil {
-			fmt.Fprintf(os.Stderr, "cmux: %v\n", err)
-			return 2
-		}
-		// Build a set of bool flags for O(1) lookup.
-		boolFlagSet := make(map[string]struct{}, len(spec.boolFlags))
-		for _, k := range spec.boolFlags {
-			boolFlagSet[k] = struct{}{}
-		}
-
-		// Build clientOnlyFlags set so they are accepted by parseFlags but never forwarded.
-		clientOnly := make(map[string]struct{})
-		if ov, ok := commandOverrides[spec.name]; ok {
-			for _, f := range ov.clientOnlyFlags {
-				clientOnly[f] = struct{}{}
-			}
-		}
-
-		// Map flag keys to JSON param keys (e.g. "workspace" → "workspace_id" where appropriate).
-		// Flags listed in boolFlags are coerced to JSON booleans instead of sent as strings.
-		// Flags listed in clientOnlyFlags are skipped — they are consumed client-side only.
-		for _, key := range spec.flagKeys {
-			if _, skip := clientOnly[key]; skip {
-				continue
-			}
-			if val, ok := parsed.flags[key]; ok {
-				paramKey := flagToParamKey(key)
-				if override, ok := spec.paramKeyOverrides[key]; ok {
-					paramKey = override
-				}
-				if _, isBool := boolFlagSet[key]; isBool {
-					switch strings.ToLower(val) {
-					case "true", "1", "yes":
-						params[paramKey] = true
-					case "false", "0", "no":
-						params[paramKey] = false
-					default:
-						fmt.Fprintf(os.Stderr, "cmux: --%s must be true or false\n", key)
-						return 2
-					}
-				} else {
-					params[paramKey] = val
-				}
-			}
-		}
-
-		// Forward repeated flag values (e.g. --env KEY=VALUE accumulates into a list).
-		for _, key := range spec.repeatKeys {
-			if _, skip := clientOnly[key]; skip {
-				continue
-			}
-			if vals, ok := parsed.repeated[key]; ok {
-				paramKey := flagToParamKey(key)
-				if override, ok := spec.paramKeyOverrides[key]; ok {
-					paramKey = override
-				}
-				params[paramKey] = vals
-			}
-		}
-
-		if len(parsed.positional) > 0 {
-			if spec.positionalKey != "" {
-				params[spec.positionalKey] = strings.Join(parsed.positional, " ")
-			} else {
-				fmt.Fprintf(os.Stderr, "cmux: %s does not accept positional arguments\n", spec.name)
-				return 2
-			}
-		}
-
-		if specUsesParam(spec, "workspace_id") {
-			applyWorkspaceEnvFallback(params)
-		}
-		if specUsesParam(spec, "surface_id") {
-			applySurfaceEnvFallback(params)
-		}
-	}
-
-	method := spec.v2Method
-	if spec.name == "notify" {
-		method = applyNotifyCallerEnv(method, params)
-	}
-	resp, err := socketRoundTripV2(socketPath, method, params, refreshAddr)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "cmux: %v\n", err)
-		return 1
-	}
-
-	if jsonOutput {
-		fmt.Println(resp)
-	} else {
-		fmt.Println(defaultRelayOutput(resp))
-	}
-	return 0
-}
-
-func workspaceGroupRelayOutput(resp string) string {
-	var result map[string]any
-	if err := json.Unmarshal([]byte(resp), &result); err != nil {
-		return defaultRelayOutput(resp)
-	}
-	switch result["operation"] {
-	case "dissolved":
-		return fmt.Sprintf(
-			"OK operation=dissolved kept_workspace_count=%v",
-			result["kept_workspace_count"],
-		)
-	case "closed_workspaces":
-		return fmt.Sprintf(
-			"OK operation=closed_workspaces closed_workspace_count=%v",
-			result["closed_workspace_count"],
-		)
-	default:
-		return defaultRelayOutput(resp)
-	}
-}
-
-// runNewWorkspaceRelay handles "cmux new-workspace" with full flag parity to the
-// macOS CLI: --layout (JSON object), --env (repeatable KEY=VALUE), --env-file
-// (file of KEY=VALUE lines), and --command (post-create send+return).
-func runNewWorkspaceRelay(socketPath string, args []string, jsonOutput bool, refreshAddr func() string) int {
-	flagKeys := []string{"name", "cwd", "description", "focus", "window", "group", "group-placement", "group-reference", "layout", "env-file", "command"}
-	repeatKeys := []string{"env"}
-
-	parsed, err := parseFlags(args, flagKeys, repeatKeys)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "cmux new-workspace: %v\n", err)
-		return 2
-	}
-	if len(parsed.positional) > 0 {
-		fmt.Fprintln(os.Stderr, "cmux: new-workspace does not accept positional arguments")
-		return 2
-	}
-
-	params := make(map[string]any)
-
-	for _, key := range []string{"name", "cwd", "description", "window", "group", "group-placement", "group-reference", "command"} {
-		if val, ok := parsed.flags[key]; ok {
-			paramKey := flagToParamKey(key)
-			switch key {
-			case "name":
-				paramKey = "title"
-			case "group-placement":
-				paramKey = "placement"
-			case "group-reference":
-				paramKey = "group_reference_workspace_id"
-			case "command":
-				// handled post-create; do not send to workspace.create
-				continue
-			}
-			params[paramKey] = val
-		}
-	}
-
-	if val, ok := parsed.flags["focus"]; ok {
-		switch strings.ToLower(val) {
-		case "true", "1", "yes":
-			params["focus"] = true
-		case "false", "0", "no":
-			params["focus"] = false
-		default:
-			fmt.Fprintf(os.Stderr, "cmux: --focus must be true or false\n")
-			return 2
-		}
-	}
-
-	if val, ok := parsed.flags["layout"]; ok {
-		var layout any
-		if err := json.Unmarshal([]byte(val), &layout); err != nil {
-			fmt.Fprintf(os.Stderr, "cmux new-workspace: --layout must be valid JSON: %v\n", err)
-			return 2
-		}
-		params["layout"] = layout
-	}
-
-	// Build env dict from --env KEY=VALUE pairs and --env-file lines.
-	env := make(map[string]string)
-	for _, kv := range parsed.repeated["env"] {
-		k, v, ok := strings.Cut(kv, "=")
-		if !ok {
-			fmt.Fprintf(os.Stderr, "cmux new-workspace: --env %q must be KEY=VALUE\n", kv)
-			return 2
-		}
-		env[k] = v
-	}
-	if envFile, ok := parsed.flags["env-file"]; ok {
-		data, err := os.ReadFile(envFile)
-		if err != nil {
-			fmt.Fprintf(os.Stderr, "cmux new-workspace: --env-file: %v\n", err)
-			return 2
-		}
-		for _, line := range strings.Split(string(data), "\n") {
-			line = strings.TrimSpace(line)
-			if line == "" || strings.HasPrefix(line, "#") {
-				continue
-			}
-			k, v, ok := strings.Cut(line, "=")
-			if !ok {
-				fmt.Fprintf(os.Stderr, "cmux new-workspace: --env-file line %q must be KEY=VALUE\n", line)
-				return 2
-			}
-			env[k] = v
-		}
-	}
-	if len(env) > 0 {
-		params["env"] = env
-	}
-
-	resp, err := socketRoundTripV2(socketPath, "workspace.create", params, refreshAddr)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "cmux: %v\n", err)
-		return 1
-	}
-
-	// --command: send text + Enter to the new workspace's surface.
-	if cmd, ok := parsed.flags["command"]; ok {
-		var result map[string]any
-		if err := json.Unmarshal([]byte(resp), &result); err != nil {
-			fmt.Fprintf(os.Stderr, "cmux new-workspace: --command skipped: could not parse create response: %v\n", err)
-			return 1
-		}
-		surfaceID, _ := result["surface_id"].(string)
-		if surfaceID == "" {
-			fmt.Fprintf(os.Stderr, "cmux new-workspace: --command skipped: workspace.create response missing surface_id\n")
-			return 1
-		}
-		sendParams := map[string]any{"surface_id": surfaceID, "text": cmd}
-		if _, err := socketRoundTripV2(socketPath, "surface.send_text", sendParams, refreshAddr); err != nil {
-			fmt.Fprintf(os.Stderr, "cmux new-workspace: --command send failed: %v\n", err)
-			return 1
-		}
-		keyParams := map[string]any{"surface_id": surfaceID, "key": "return"}
-		if _, err := socketRoundTripV2(socketPath, "surface.send_key", keyParams, refreshAddr); err != nil {
-			fmt.Fprintf(os.Stderr, "cmux new-workspace: --command send-key failed: %v\n", err)
-			return 1
-		}
-	}
-
-	if jsonOutput {
-		fmt.Println(resp)
-	} else {
-		fmt.Println(defaultRelayOutput(resp))
-	}
-	return 0
-}
-
-// runRPC sends an arbitrary JSON-RPC method with optional JSON params.
-func runRPC(socketPath string, args []string, jsonOutput bool, refreshAddr func() string) int {
-	if len(args) == 0 {
-		fmt.Fprintln(os.Stderr, "cmux rpc: requires a method name")
-		return 2
-	}
-	method := args[0]
-	var params map[string]any
-	if len(args) > 1 {
-		if err := json.Unmarshal([]byte(args[1]), &params); err != nil {
-			fmt.Fprintf(os.Stderr, "cmux rpc: invalid JSON params: %v\n", err)
-			return 2
-		}
-	}
-
-	resp, err := socketRoundTripV2(socketPath, method, params, refreshAddr)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "cmux: %v\n", err)
-		return 1
-	}
-	fmt.Println(resp)
-	return 0
-}
-
-// workspaceGroupFlagKeys lists the flags each "workspace group" subcommand
-// accepts. Every subcommand also takes --window to target a non-focused window.
-var workspaceGroupFlagKeys = map[string][]string{
-	"list":          {"window"},
-	"create":        {"name", "cwd", "from", "window"},
-	"ungroup":       {"group", "window"},
-	"delete":        {"group", "window"},
-	"rename":        {"group", "name", "window"},
-	"collapse":      {"group", "window"},
-	"expand":        {"group", "window"},
-	"pin":           {"group", "window"},
-	"unpin":         {"group", "window"},
-	"add":           {"group", "workspace", "window"},
-	"remove":        {"workspace", "window"},
-	"set-anchor":    {"group", "workspace", "window"},
-	"new-workspace": {"group", "placement", "window"},
-	"set-color":     {"group", "hex", "window"},
-	"set-icon":      {"group", "symbol", "window"},
-	"move":          {"group", "to-index", "before", "after", "window"},
-	"focus":         {"group", "window"},
-}
-
-// runWorkspaceGroupRelay handles "cmux workspace group <sub>" (and the
-// "workspace-group" alias) by mapping each subcommand to its
-// workspace.group.* v2 method, mirroring the macOS cmux CLI flags.
-func runWorkspaceGroupRelay(socketPath string, args []string, jsonOutput bool, refreshAddr func() string) int {
-	const subcommandHint = "list, create, ungroup, delete, rename, collapse, expand, pin, unpin, add, remove, set-anchor, new-workspace, set-color, set-icon, move, focus"
-	if len(args) == 0 {
-		fmt.Fprintf(os.Stderr, "cmux workspace group: requires a subcommand (%s)\n", subcommandHint)
-		return 2
-	}
-	sub := args[0]
-	flagKeys, ok := workspaceGroupFlagKeys[sub]
-	if !ok {
-		fmt.Fprintf(os.Stderr, "cmux workspace group: unknown subcommand %q (%s)\n", sub, subcommandHint)
-		return 2
-	}
-
-	fail := func(format string, a ...any) int {
-		fmt.Fprintf(os.Stderr, "cmux workspace group %s: %s\n", sub, fmt.Sprintf(format, a...))
-		return 2
-	}
-
-	subArgs := args[1:]
-	closeWorkspaces := false
-	if sub == "delete" {
-		closeWorkspaces, subArgs = takeStandaloneFlag(subArgs, "close-workspaces")
-	}
-	parsed, err := parseFlags(subArgs, flagKeys)
-	if err != nil {
-		return fail("%v", err)
-	}
-
-	params := make(map[string]any)
-	if win, ok := parsed.flags["window"]; ok {
-		params["window_id"] = win
-	}
-
-	// The group id comes from --group or the first positional argument.
-	// takeGroupID consumes that positional so later positionals (e.g. the
-	// rename name) are still available.
-	positional := parsed.positional
-	takeGroupID := func() bool {
-		if gid, ok := parsed.flags["group"]; ok {
-			params["group_id"] = gid
-			return true
-		}
-		if len(positional) > 0 {
-			params["group_id"] = positional[0]
-			positional = positional[1:]
-			return true
-		}
-		return false
-	}
-
-	switch sub {
-	case "list":
-		// No parameters beyond the optional window.
-
-	case "create":
-		name, ok := parsed.flags["name"]
-		if !ok && len(positional) > 0 {
-			name = positional[0]
-		}
-		params["name"] = name
-		if cwd, ok := parsed.flags["cwd"]; ok {
-			params["cwd"] = cwd
-		}
-		ids := []string{}
-		if from, ok := parsed.flags["from"]; ok {
-			for _, id := range strings.Split(from, ",") {
-				if id = strings.TrimSpace(id); id != "" {
-					ids = append(ids, id)
-				}
-			}
-		}
-		params["child_workspace_ids"] = ids
-
-	case "ungroup", "delete", "collapse", "expand", "pin", "unpin", "focus":
-		if !takeGroupID() {
-			return fail("requires a group id or --group <id>")
-		}
-
-	case "rename":
-		if !takeGroupID() {
-			return fail("requires a group id or --group <id>")
-		}
-		name, ok := parsed.flags["name"]
-		if !ok && len(positional) > 0 {
-			name, ok = positional[0], true
-		}
-		if !ok {
-			return fail("requires --name <name>")
-		}
-		params["name"] = name
-
-	case "add", "set-anchor":
-		gid, hasGroup := parsed.flags["group"]
-		ws, hasWorkspace := parsed.flags["workspace"]
-		if !hasGroup || !hasWorkspace {
-			return fail("requires --group <id> --workspace <id>")
-		}
-		params["group_id"] = gid
-		params["workspace_id"] = ws
-
-	case "remove":
-		ws, ok := parsed.flags["workspace"]
-		if !ok && len(positional) > 0 {
-			ws, ok = positional[0], true
-		}
-		if !ok {
-			return fail("requires --workspace <id>")
-		}
-		params["workspace_id"] = ws
-
-	case "new-workspace":
-		if !takeGroupID() {
-			return fail("requires a group id or --group <id>")
-		}
-		if placement, ok := parsed.flags["placement"]; ok {
-			params["placement"] = placement
-		}
-
-	case "set-color":
-		if !takeGroupID() {
-			return fail("requires a group id or --group <id>")
-		}
-		// Omitting --hex clears the color, matching the macOS CLI.
-		params["hex"] = parsed.flags["hex"]
-
-	case "set-icon":
-		if !takeGroupID() {
-			return fail("requires a group id or --group <id>")
-		}
-		// Omitting --symbol clears the icon, matching the macOS CLI.
-		params["symbol"] = parsed.flags["symbol"]
-
-	case "move":
-		if !takeGroupID() {
-			return fail("requires a group id or --group <id>")
-		}
-		if v, ok := parsed.flags["to-index"]; ok {
-			n, err := strconv.Atoi(v)
-			if err != nil {
-				return fail("--to-index must be an integer")
-			}
-			params["to_index"] = n
-		} else if v, ok := parsed.flags["before"]; ok {
-			params["before_group_id"] = v
-		} else if v, ok := parsed.flags["after"]; ok {
-			params["after_group_id"] = v
-		} else {
-			return fail("requires --to-index <n>, --before <group>, or --after <group>")
-		}
-	}
-
-	// Forward the SSH caller's workspace/surface context so methods without a
-	// group id (list, create) resolve the caller's window instead of whichever
-	// local window is focused. Group-id routing still wins server-side, and
-	// subcommands that require an explicit --workspace have already validated
-	// it above, so the fallback never satisfies a missing required flag.
-	applyWorkspaceEnvFallback(params)
-	applySurfaceEnvFallback(params)
-
-	methodSubcommand := sub
-	if sub == "delete" {
-		if closeWorkspaces {
-			params["close_workspaces"] = true
-		} else {
-			methodSubcommand = "ungroup"
-		}
-	}
-	method := "workspace.group." + strings.ReplaceAll(methodSubcommand, "-", "_")
-	resp, err := socketRoundTripV2(socketPath, method, params, refreshAddr)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "cmux: %v\n", err)
-		return 1
-	}
-	if jsonOutput {
-		fmt.Println(resp)
-	} else {
-		fmt.Println(workspaceGroupRelayOutput(resp))
-	}
-	return 0
-}
-
-// runBrowserRelay handles "cmux browser <subcommand>" by mapping to browser.* v2 methods.
-func runBrowserRelay(socketPath string, args []string, jsonOutput bool, refreshAddr func() string) int {
-	if len(args) == 0 {
-		fmt.Fprintf(os.Stderr, "cmux browser: requires a subcommand (%s)\n", browserSubcommandHint())
-		return 2
-	}
-
-	sub := args[0]
-	subArgs := args[1:]
-
-	spec, ok := browserCommands[sub]
-	if !ok {
-		fmt.Fprintf(os.Stderr, "cmux browser: unknown subcommand %q\n", sub)
-		return 2
-	}
-
-	params := make(map[string]any)
-	parsed, err := parseFlags(subArgs, spec.flagKeys)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "cmux browser: %v\n", err)
-		return 2
-	}
-	for _, key := range spec.flagKeys {
-		if val, ok := parsed.flags[key]; ok {
-			paramKey := flagToParamKey(key)
-			params[paramKey] = val
-		}
-	}
-	if spec.allowPositionalURL {
-		if _, ok := params["url"]; !ok && len(parsed.positional) > 0 {
-			params["url"] = strings.Join(parsed.positional, " ")
-		}
-	}
-	if spec.allowPositionalScript {
-		if _, ok := params["script"]; !ok && len(parsed.positional) > 0 {
-			params["script"] = strings.Join(parsed.positional, " ")
-		}
-	}
-	if spec.allowPositionalKey {
-		if _, ok := params["key"]; !ok && len(parsed.positional) > 0 {
-			params["key"] = strings.Join(parsed.positional, " ")
-		}
-	}
-	if spec.allowPositionalQuery {
-		if _, ok := params["selector"]; !ok && len(parsed.positional) > 0 {
-			params["selector"] = strings.Join(parsed.positional, " ")
-		}
-	}
-	if spec.allowPositionalValue {
-		applyBrowserValuePositionals(
-			params,
-			parsed.positional,
-			browserSpecSupportsParam(spec, "value"),
-			browserSpecSupportsParam(spec, "text"),
-		)
-	}
-	if spec.useWorkspaceEnv {
-		applyWorkspaceEnvFallback(params)
-	}
-	if spec.useSurfaceEnv {
-		applySurfaceEnvFallback(params)
-	}
-
-	resp, err := socketRoundTripV2(socketPath, spec.method, params, refreshAddr)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "cmux: %v\n", err)
-		return 1
-	}
-	if jsonOutput {
-		fmt.Println(resp)
-	} else {
-		fmt.Println(defaultRelayOutput(resp))
-	}
-	return 0
-}
-
-func browserSubcommandHint() string {
-	names := make([]string, 0, len(browserCommands))
-	for name := range browserCommands {
-		names = append(names, name)
-	}
-	sort.Strings(names)
-	return strings.Join(names, ", ")
-}
-
-func browserSpecSupportsParam(spec browserCommandSpec, paramKey string) bool {
-	for _, key := range spec.flagKeys {
-		if flagToParamKey(key) == paramKey {
-			return true
-		}
-	}
-	return false
-}
-
-func applyBrowserValuePositionals(params map[string]any, positionals []string, allowValue bool, allowText bool) {
-	if len(positionals) == 0 {
-		return
-	}
-	if _, ok := params["selector"]; !ok {
-		params["selector"] = positionals[0]
-		positionals = positionals[1:]
-	}
-	joined := strings.Join(positionals, " ")
-	if allowValue {
-		if _, ok := params["value"]; !ok {
-			if joined != "" {
-				params["value"] = joined
-			} else if text, ok := params["text"]; ok {
-				params["value"] = text
-			}
-		}
-	}
-	if allowText {
-		if _, ok := params["text"]; !ok {
-			if joined != "" {
-				params["text"] = joined
-			} else if value, ok := params["value"]; ok {
-				params["text"] = value
-			}
-		}
-	}
-}
-
-// specUsesParam reports whether any of spec's flagKeys resolves to paramKey
-// after applying flagToParamKey and any paramKeyOverrides.
-func specUsesParam(spec *commandSpec, paramKey string) bool {
-	for _, k := range spec.flagKeys {
-		resolved := flagToParamKey(k)
-		if override, ok := spec.paramKeyOverrides[k]; ok {
-			resolved = override
-		}
-		if resolved == paramKey {
-			return true
-		}
-	}
-	return false
-}
-
-func applyWorkspaceEnvFallback(params map[string]any) {
-	if _, ok := params["workspace_id"]; ok {
-		return
-	}
-	if envWs := os.Getenv("CMUX_WORKSPACE_ID"); envWs != "" {
-		params["workspace_id"] = envWs
-	}
-}
-
-func applySurfaceEnvFallback(params map[string]any) {
-	if _, ok := params["surface_id"]; ok {
-		return
-	}
-	if envSf := os.Getenv("CMUX_SURFACE_ID"); envSf != "" {
-		params["surface_id"] = envSf
-	}
-}
-
-func applyNotifyCallerEnv(method string, params map[string]any) string {
-	if method != "notification.create" {
-		return method
-	}
-	workspaceID, _ := params["workspace_id"].(string)
-	surfaceID, _ := params["surface_id"].(string)
-	workspaceID = strings.TrimSpace(workspaceID)
-	surfaceID = strings.TrimSpace(surfaceID)
-	if workspaceID == "" || surfaceID == "" {
-		return method
-	}
-	params["preferred_workspace_id"] = workspaceID
-	params["preferred_surface_id"] = surfaceID
-	delete(params, "workspace_id")
-	delete(params, "surface_id")
-	return "notification.create_for_caller"
-}
-
-func defaultRelayOutput(resp string) string {
-	var result any
-	if err := json.Unmarshal([]byte(resp), &result); err != nil {
-		trimmed := strings.TrimSpace(resp)
-		if trimmed == "" {
-			return "OK"
-		}
-		return trimmed
-	}
-
-	if relayResultIsEmpty(result) {
-		return "OK"
-	}
-
-	switch typed := result.(type) {
-	case string:
-		return typed
-	default:
-		encoded, err := json.MarshalIndent(typed, "", "  ")
-		if err != nil {
-			return "OK"
-		}
-		return string(encoded)
-	}
-}
-
-func relayResultIsEmpty(result any) bool {
-	switch typed := result.(type) {
-	case nil:
-		return true
-	case map[string]any:
-		return len(typed) == 0
-	case []any:
-		return len(typed) == 0
-	case string:
-		return typed == ""
-	default:
-		return false
-	}
-}
-
-// flagToParamKey maps a CLI flag name to its JSON-RPC param key.
-func flagToParamKey(key string) string {
-	switch key {
-	case "workspace":
-		return "workspace_id"
-	case "surface":
-		return "surface_id"
-	case "panel":
-		return "panel_id"
-	case "pane":
-		return "pane_id"
-	case "window":
-		return "window_id"
-	case "group":
-		return "group_id"
-	case "command":
-		return "initial_command"
-	case "name":
-		return "title"
-	case "working-directory":
-		return "working_directory"
-	case "max-depth":
-		return "max_depth"
-	case "timeout-ms":
-		return "timeout_ms"
-	case "url-contains":
-		return "url_contains"
-	case "load-state":
-		return "load_state"
-	default:
-		// Hyphenated flag names map to underscore param keys by convention.
-		return strings.ReplaceAll(key, "-", "_")
-	}
-}
-
-// parsedFlags holds the results of flag parsing.
-type parsedFlags struct {
-	flags      map[string]string   // --key value pairs (last wins for duplicates)
-	repeated   map[string][]string // --key values for repeat-allowed keys
-	positional []string            // non-flag arguments
-}
-
-// takeStandaloneFlag removes a valueless --flag before value-option parsing.
-// Tokens after -- remain positional and are never interpreted as flags.
-func takeStandaloneFlag(args []string, key string) (bool, []string) {
-	found := false
-	pastTerminator := false
-	remaining := make([]string, 0, len(args))
-	for _, arg := range args {
-		if arg == "--" {
-			pastTerminator = true
-			remaining = append(remaining, arg)
-			continue
-		}
-		if !pastTerminator && arg == "--"+key {
-			found = true
-			continue
-		}
-		remaining = append(remaining, arg)
-	}
-	return found, remaining
-}
-
-// parseFlags extracts --key value pairs from args for the given allowed keys.
-// Keys listed in repeatKeys may appear more than once; their values accumulate
-// in repeated rather than flags. Non-flag arguments are collected in positional.
-func parseFlags(args []string, keys []string, repeatKeys ...[]string) (parsedFlags, error) {
-	allowed := make(map[string]bool, len(keys))
-	for _, k := range keys {
-		allowed[k] = true
-	}
-	repeat := make(map[string]bool)
-	if len(repeatKeys) > 0 {
-		for _, k := range repeatKeys[0] {
-			repeat[k] = true
-			allowed[k] = true
-		}
-	}
-
-	result := parsedFlags{
-		flags:    make(map[string]string),
-		repeated: make(map[string][]string),
-	}
-	for i := 0; i < len(args); i++ {
-		if args[i] == "--" {
-			result.positional = append(result.positional, args[i+1:]...)
-			break
-		}
-		if !strings.HasPrefix(args[i], "--") {
-			result.positional = append(result.positional, args[i])
-			continue
-		}
-		key := strings.TrimPrefix(args[i], "--")
-		if !allowed[key] {
-			return parsedFlags{}, fmt.Errorf("unknown flag --%s", key)
-		}
-		if i+1 >= len(args) {
-			return parsedFlags{}, fmt.Errorf("flag --%s requires a value", key)
-		}
-		val := args[i+1]
-		i++
-		if repeat[key] {
-			result.repeated[key] = append(result.repeated[key], val)
-		} else {
-			result.flags[key] = val
-		}
-	}
-	return result, nil
-}
-
-// readSocketAddrFile reads the socket address from ~/.cmux/socket_addr as a fallback
-// when CMUX_SOCKET_PATH is not set. Written by the cmux app after the relay establishes.
-func readSocketAddrFile() string {
-	home, err := os.UserHomeDir()
-	if err != nil {
-		return ""
-	}
-	data, err := os.ReadFile(filepath.Join(home, ".cmux", "socket_addr"))
-	if err != nil {
-		return ""
-	}
-	return strings.TrimSpace(string(data))
-}
-
-func readRelayAuthFile(socketPath string) *relayAuthState {
-	if strings.Contains(socketPath, ":") && !strings.HasPrefix(socketPath, "/") {
-		_, port, err := net.SplitHostPort(socketPath)
-		if err != nil || port == "" {
-			return nil
-		}
-		home, err := os.UserHomeDir()
-		if err != nil {
-			return nil
-		}
-		data, err := os.ReadFile(filepath.Join(home, ".cmux", "relay", port+".auth"))
-		if err != nil {
-			return nil
-		}
-		var state relayAuthState
-		if err := json.Unmarshal(data, &state); err != nil {
-			return nil
-		}
-		if state.RelayID == "" || state.RelayToken == "" {
-			return nil
-		}
-		return &state
-	}
-	return nil
-}
-
-func currentRelayAuth(socketPath string) *relayAuthState {
-	relayID := strings.TrimSpace(os.Getenv("CMUX_RELAY_ID"))
-	relayToken := strings.TrimSpace(os.Getenv("CMUX_RELAY_TOKEN"))
-	if relayID != "" && relayToken != "" {
-		return &relayAuthState{RelayID: relayID, RelayToken: relayToken}
-	}
-	return readRelayAuthFile(socketPath)
-}
-
-// dialSocket connects to the cmux socket. If addr contains a colon and doesn't
-// start with '/', it's treated as a TCP address (host:port); otherwise Unix socket.
-// For TCP connections, refreshAddr is used only to recover from a stale socket_addr
-// rewrite, not to poll for relay readiness.
-func dialSocket(addr string, refreshAddr func() string) (net.Conn, error) {
-	if strings.Contains(addr, ":") && !strings.HasPrefix(addr, "/") {
-		conn, connectedAddr, err := dialTCP(addr)
-		if err != nil && refreshAddr != nil && isConnectionRefused(err) {
-			if refreshedAddr := strings.TrimSpace(refreshAddr()); refreshedAddr != "" && refreshedAddr != addr {
-				addr = refreshedAddr
-				conn, connectedAddr, err = dialTCP(addr)
-			}
-		}
-		if err != nil {
-			return nil, err
-		}
-		if auth := currentRelayAuth(connectedAddr); auth != nil {
-			if err := authenticateRelayConn(conn, auth); err != nil {
-				conn.Close()
-				return nil, err
-			}
-		}
-		return conn, nil
-	}
-	return net.Dial("unix", addr)
-}
-
-func dialTCP(addr string) (net.Conn, string, error) {
-	conn, err := net.DialTimeout("tcp", addr, 2*time.Second)
-	if err != nil {
-		return nil, addr, err
-	}
-	setTCPNoDelay(conn)
-	return conn, addr, nil
-}
-
-func isConnectionRefused(err error) bool {
-	if opErr, ok := err.(*net.OpError); ok {
-		return strings.Contains(opErr.Err.Error(), "connection refused")
-	}
-	return strings.Contains(err.Error(), "connection refused")
-}
-
-func authenticateRelayConn(conn net.Conn, auth *relayAuthState) error {
-	reader := bufio.NewReader(conn)
-	_ = conn.SetDeadline(time.Now().Add(5 * time.Second))
-
-	var challenge struct {
-		Protocol string `json:"protocol"`
-		Version  int    `json:"version"`
-		RelayID  string `json:"relay_id"`
-		Nonce    string `json:"nonce"`
-	}
-	line, err := reader.ReadString('\n')
-	if err != nil {
-		return fmt.Errorf("failed to read relay auth challenge: %w", err)
-	}
-	if err := json.Unmarshal([]byte(line), &challenge); err != nil {
-		return fmt.Errorf("invalid relay auth challenge")
-	}
-	if challenge.Protocol != "cmux-relay-auth" || challenge.Version != 1 || challenge.RelayID != auth.RelayID || challenge.Nonce == "" {
-		return fmt.Errorf("relay auth challenge mismatch")
-	}
-
-	tokenBytes, err := hex.DecodeString(auth.RelayToken)
-	if err != nil {
-		return fmt.Errorf("invalid relay auth token")
-	}
-	mac := computeRelayMAC(tokenBytes, auth.RelayID, challenge.Nonce, challenge.Version)
-	payload, err := json.Marshal(map[string]any{
-		"relay_id": auth.RelayID,
-		"mac":      hex.EncodeToString(mac),
-	})
-	if err != nil {
-		return fmt.Errorf("failed to encode relay auth response: %w", err)
-	}
-	if _, err := conn.Write(append(payload, '\n')); err != nil {
-		return fmt.Errorf("failed to send relay auth response: %w", err)
-	}
-
-	line, err = reader.ReadString('\n')
-	if err != nil {
-		return fmt.Errorf("failed to read relay auth result: %w", err)
-	}
-	var result struct {
-		OK bool `json:"ok"`
-	}
-	if err := json.Unmarshal([]byte(line), &result); err != nil {
-		return fmt.Errorf("invalid relay auth result")
-	}
-	if !result.OK {
-		return fmt.Errorf("relay auth rejected")
-	}
-	_ = conn.SetDeadline(time.Time{})
-	return nil
-}
-
-func computeRelayMAC(token []byte, relayID, nonce string, version int) []byte {
-	mac := hmac.New(sha256.New, token)
-	_, _ = io.WriteString(mac, fmt.Sprintf("relay_id=%s\nnonce=%s\nversion=%d", relayID, nonce, version))
-	return mac.Sum(nil)
-}
-
-// socketRoundTripV2 sends a JSON-RPC request and returns the result JSON.
-func socketRoundTripV2(socketPath, method string, params map[string]any, refreshAddr func() string) (string, error) {
-	conn, err := dialSocket(socketPath, refreshAddr)
-	if err != nil {
-		return "", fmt.Errorf("failed to connect to %s: %w", socketPath, err)
-	}
-	defer conn.Close()
-
-	id := randomHex(8)
-	req := map[string]any{
-		"id":     id,
-		"method": method,
-	}
-	if params != nil {
-		req["params"] = params
-	} else {
-		req["params"] = map[string]any{}
-	}
-
-	payload, err := json.Marshal(req)
-	if err != nil {
-		return "", fmt.Errorf("failed to marshal request: %w", err)
-	}
-
-	if _, err := conn.Write(append(payload, '\n')); err != nil {
-		return "", fmt.Errorf("failed to send request: %w", err)
-	}
-
-	_ = conn.SetReadDeadline(time.Now().Add(15 * time.Second))
-	reader := bufio.NewReader(conn)
-	line, err := reader.ReadString('\n')
-	if err != nil {
-		return "", fmt.Errorf("failed to read response: %w", err)
-	}
-
-	// Parse the response to check for errors
-	var resp map[string]any
-	if err := json.Unmarshal([]byte(line), &resp); err != nil {
-		return strings.TrimRight(line, "\n"), nil
-	}
-
-	if ok, _ := resp["ok"].(bool); !ok {
-		if errObj, _ := resp["error"].(map[string]any); errObj != nil {
-			code, _ := errObj["code"].(string)
-			msg, _ := errObj["message"].(string)
-			return "", fmt.Errorf("server error [%s]: %s", code, msg)
-		}
-		return "", fmt.Errorf("server returned error response")
-	}
-
-	// Return the result portion as JSON
-	if result, ok := resp["result"]; ok {
-		resultJSON, err := json.Marshal(result)
-		if err != nil {
-			return "", fmt.Errorf("failed to marshal result: %w", err)
-		}
-		return string(resultJSON), nil
-	}
-
-	return "{}", nil
-}
-
-func randomHex(n int) string {
-	b := make([]byte, n)
-	_, _ = rand.Read(b)
-	return hex.EncodeToString(b)
-}
-
-func cliUsage() {
-	fmt.Fprintln(os.Stderr, "Usage: cmux [--socket <path>] [--json] <command> [args...]")
-	fmt.Fprintln(os.Stderr, "")
-	fmt.Fprintln(os.Stderr, "Commands:")
-	fmt.Fprintln(os.Stderr, "  ping                      Check connectivity")
-	fmt.Fprintln(os.Stderr, "  capabilities              List server capabilities")
-	fmt.Fprintln(os.Stderr, "  list-workspaces           List all workspaces")
-	fmt.Fprintln(os.Stderr, "  new-workspace             Create a new workspace")
-	fmt.Fprintln(os.Stderr, "    --name <title>          Workspace title")
-	fmt.Fprintln(os.Stderr, "    --cwd <dir>             Working directory")
-	fmt.Fprintln(os.Stderr, "    --description <text>    Workspace description")
-	fmt.Fprintln(os.Stderr, "    --focus true|false      Focus the workspace after creation")
-	fmt.Fprintln(os.Stderr, "    --window <id>           Target window")
-	fmt.Fprintln(os.Stderr, "    --group <id>            Workspace group to place into")
-	fmt.Fprintln(os.Stderr, "    --group-placement <p>   Placement within the group (before|after|...)")
-	fmt.Fprintln(os.Stderr, "    --group-reference <id>  Reference workspace for placement")
-	fmt.Fprintln(os.Stderr, "    --layout <json>         Pane layout JSON object")
-	fmt.Fprintln(os.Stderr, "    --env KEY=VALUE         Environment variable (repeatable)")
-	fmt.Fprintln(os.Stderr, "    --env-file <path>       File of KEY=VALUE environment variables")
-	fmt.Fprintln(os.Stderr, "    --command <cmd>         Command to send to the new workspace after creation")
-	fmt.Fprintln(os.Stderr, "  rename-workspace          Rename a workspace")
-	fmt.Fprintln(os.Stderr, "  close-workspace           Close a workspace")
-	fmt.Fprintln(os.Stderr, "  select-workspace          Select a workspace")
-	fmt.Fprintln(os.Stderr, "  next-workspace            Switch to next workspace")
-	fmt.Fprintln(os.Stderr, "  previous-workspace        Switch to previous workspace")
-	fmt.Fprintln(os.Stderr, "  last-workspace            Switch to last-used workspace")
-	fmt.Fprintln(os.Stderr, "  current-workspace         Show the active workspace ID")
-	fmt.Fprintln(os.Stderr, "  move-workspace-to-window  Move workspace to another window")
-	fmt.Fprintln(os.Stderr, "  equalize-splits           Equalize pane splits in a workspace")
-	fmt.Fprintln(os.Stderr, "  list-panes                List panes in a workspace")
-	fmt.Fprintln(os.Stderr, "  new-pane                  Create a new pane")
-	fmt.Fprintln(os.Stderr, "  last-pane                 Switch to last-used pane")
-	fmt.Fprintln(os.Stderr, "  join-pane                 Join a pane into another")
-	fmt.Fprintln(os.Stderr, "  swap-pane                 Swap two panes")
-	fmt.Fprintln(os.Stderr, "  break-pane                Break a pane into its own workspace")
-	fmt.Fprintln(os.Stderr, "  resize-pane               Resize a pane")
-	fmt.Fprintln(os.Stderr, "  list-panels               List surfaces in a workspace")
-	fmt.Fprintln(os.Stderr, "  list-pane-surfaces        List surfaces in a pane")
-	fmt.Fprintln(os.Stderr, "  new-surface               Create a new surface")
-	fmt.Fprintln(os.Stderr, "  new-split                 Split an existing surface")
-	fmt.Fprintln(os.Stderr, "  close-surface             Close a surface")
-	fmt.Fprintln(os.Stderr, "  focus-panel               Focus a surface")
-	fmt.Fprintln(os.Stderr, "  refresh-surfaces          Refresh all surfaces")
-	fmt.Fprintln(os.Stderr, "  send                      Send text to a surface")
-	fmt.Fprintln(os.Stderr, "  send-key                  Send a key to a surface")
-	fmt.Fprintln(os.Stderr, "  read-screen               Read terminal output from a surface")
-	fmt.Fprintln(os.Stderr, "  clear-history             Clear scrollback history for a surface")
-	fmt.Fprintln(os.Stderr, "  list-windows              List all windows")
-	fmt.Fprintln(os.Stderr, "  new-window                Create a new window")
-	fmt.Fprintln(os.Stderr, "  close-window              Close a window")
-	fmt.Fprintln(os.Stderr, "  current-window            Show the active window ID")
-	fmt.Fprintln(os.Stderr, "  focus-window              Focus a window")
-	fmt.Fprintln(os.Stderr, "  notify                    Create a notification")
-	fmt.Fprintln(os.Stderr, "  jump-to-unread            Jump to first unread notification")
-	fmt.Fprintln(os.Stderr, "  dismiss-notification      Dismiss a notification")
-	fmt.Fprintln(os.Stderr, "  mark-notification-read    Mark a notification as read")
-	fmt.Fprintln(os.Stderr, "  open-notification         Open a notification")
-	fmt.Fprintln(os.Stderr, "  workspace group <sub>     Manage sidebar workspace groups (list, create, ungroup,")
-	fmt.Fprintln(os.Stderr, "                            delete, rename, collapse, expand, pin, unpin, add, remove,")
-	fmt.Fprintln(os.Stderr, "                            set-anchor, new-workspace, set-color, set-icon, move, focus)")
-	fmt.Fprintln(os.Stderr, "  browser <sub>             Browser commands through the local cmux browser relay")
-	fmt.Fprintln(os.Stderr, "  claude-teams [args...]    Launch Claude Code in teammate mode")
-	fmt.Fprintln(os.Stderr, "  omo [args...]             Launch OpenCode with cmux integration")
-	fmt.Fprintln(os.Stderr, "  omx [args...]             Launch Oh My Codex with cmux integration")
-	fmt.Fprintln(os.Stderr, "  omc [args...]             Launch Oh My Claude Code with cmux integration")
-	fmt.Fprintln(os.Stderr, "  rpc <method> [json-params] Send arbitrary JSON-RPC")
-}
diff --git a/daemon/remote/cmd/cmuxd-remote/cli_overrides.go b/daemon/remote/cmd/cmuxd-remote/cli_overrides.go
deleted file mode 100644
index 85e90baf0de5..000000000000
--- a/daemon/remote/cmd/cmuxd-remote/cli_overrides.go
+++ /dev/null
@@ -1,69 +0,0 @@
-package main
-
-// commandOverride describes relay-specific behaviour that cannot be expressed
-// in the system.command_spec JSON and therefore cannot be generated.
-// The generator produces the base commandSpec from the spec; init() applies
-// these overrides on top.
-type commandOverride struct {
-	// paramKeyOverrides maps a CLI flag name to the JSON param key sent to the
-	// server when they differ (e.g. "--name" must be sent as "title").
-	paramKeyOverrides map[string]string
-
-	// disablePositional clears any positionalKey inherited from commands.go,
-	// making the command accept the positional value only via an explicit flag.
-	disablePositional bool
-
-	// defaultParams are params always included in the RPC call even when the
-	// corresponding flag is absent.
-	defaultParams map[string]any
-
-	// specialDispatch marks the command as having a custom runXxxRelay function
-	// in cli.go. runCLI dispatches to it instead of the generic relay path.
-	specialDispatch bool
-
-	// clientOnlyFlags are flag names handled client-side that must NOT be
-	// forwarded as RPC params. execV2 filters these out before building params.
-	clientOnlyFlags []string
-}
-
-// commandOverrides is consulted by init() and by runCLI for dispatch.
-// Add an entry here whenever the relay needs to deviate from the generated spec.
-var commandOverrides = map[string]commandOverride{
-
-	// --name is the CLI flag; the server param is "title".
-	// --command, --env-file, and --layout are handled client-side by
-	// runNewWorkspaceRelay (post-create send, file read, JSON parse).
-	"new-workspace": {
-		paramKeyOverrides: map[string]string{"name": "title"},
-		clientOnlyFlags:   []string{"command", "env-file", "layout"},
-		specialDispatch:   true,
-	},
-
-	// Mac CLI shows "title" as a positional arg; relay accepts --title as a
-	// flag instead, so positional args should be rejected.
-	"rename-workspace": {
-		disablePositional: true,
-	},
-
-	// new-pane defaults direction to "right" when the flag is omitted, matching
-	// the Mac CLI default.
-	"new-pane": {
-		defaultParams: map[string]any{"direction": "right"},
-	},
-
-	// --panel is an alias for --surface that maps to surface_id.
-	"focus-panel": {
-		paramKeyOverrides: map[string]string{"panel": "surface_id"},
-	},
-	"close-surface": {
-		paramKeyOverrides: map[string]string{"panel": "surface_id"},
-	},
-	"new-split": {
-		paramKeyOverrides: map[string]string{"panel": "surface_id"},
-	},
-
-	// --target-pane maps to the server param target_pane_id.
-	"join-pane": {
-		paramKeyOverrides: map[string]string{"target-pane": "target_pane_id"},
-	},
-}
diff --git a/daemon/remote/cmd/cmuxd-remote/cli_relay_test.go b/daemon/remote/cmd/cmuxd-remote/cli_relay_test.go
deleted file mode 100644
index c4b60ce86786..000000000000
--- a/daemon/remote/cmd/cmuxd-remote/cli_relay_test.go
+++ /dev/null
@@ -1,438 +0,0 @@
-package main
-
-import (
-	"encoding/json"
-	"net"
-	"os"
-	"testing"
-	"time"
-)
-
-// receiveRequest reads one captured request from the channel with a timeout.
-func receiveRequest(t *testing.T, ch <-chan map[string]any) map[string]any {
-	t.Helper()
-	select {
-	case req := <-ch:
-		return req
-	case <-time.After(2 * time.Second):
-		t.Fatal("timed out waiting for request")
-		return nil
-	}
-}
-
-func params(req map[string]any) map[string]any {
-	t := req["params"]
-	if t == nil {
-		return map[string]any{}
-	}
-	p, ok := t.(map[string]any)
-	if !ok {
-		return map[string]any{}
-	}
-	return p
-}
-
-// TestBoolFlagCoercionFocusTrue verifies that --focus true is sent as a JSON
-// boolean true, not the string "true".
-func TestBoolFlagCoercionFocusTrue(t *testing.T) {
-	sockPath, requests := startMockV2SocketWithRequestCapture(t)
-	code := runCLI([]string{"--socket", sockPath, "new-workspace", "--focus", "true"})
-	if code != 0 {
-		t.Fatalf("new-workspace --focus true: exit %d", code)
-	}
-	req := receiveRequest(t, requests)
-	p := params(req)
-	focus, ok := p["focus"]
-	if !ok {
-		t.Fatal("expected 'focus' param to be set")
-	}
-	if focus != true {
-		t.Fatalf("expected focus=true (bool), got %T(%v)", focus, focus)
-	}
-}
-
-// TestBoolFlagCoercionFocusFalse verifies false is sent as JSON false.
-func TestBoolFlagCoercionFocusFalse(t *testing.T) {
-	sockPath, requests := startMockV2SocketWithRequestCapture(t)
-	code := runCLI([]string{"--socket", sockPath, "new-workspace", "--focus", "false"})
-	if code != 0 {
-		t.Fatalf("new-workspace --focus false: exit %d", code)
-	}
-	req := receiveRequest(t, requests)
-	p := params(req)
-	focus, ok := p["focus"]
-	if !ok {
-		t.Fatal("expected 'focus' param to be set")
-	}
-	if focus != false {
-		t.Fatalf("expected focus=false (bool), got %T(%v)", focus, focus)
-	}
-}
-
-// TestBoolFlagCoercionInvalidValue verifies that an invalid --focus value
-// returns a non-zero exit code without sending a request.
-func TestBoolFlagCoercionInvalidValue(t *testing.T) {
-	sockPath, requests := startMockV2SocketWithRequestCapture(t)
-	code := runCLI([]string{"--socket", sockPath, "new-workspace", "--focus", "maybe"})
-	if code == 0 {
-		t.Fatal("new-workspace --focus maybe: expected non-zero exit")
-	}
-	select {
-	case req := <-requests:
-		t.Fatalf("expected no request to be sent on invalid flag value, got: %v", req)
-	case <-time.After(100 * time.Millisecond):
-	}
-}
-
-// TestNewWorkspaceParamNames verifies that --name maps to "title" and --cwd maps
-// to "cwd" (not "name" and "working_directory").
-func TestNewWorkspaceParamNames(t *testing.T) {
-	sockPath, requests := startMockV2SocketWithRequestCapture(t)
-	code := runCLI([]string{"--socket", sockPath, "new-workspace", "--name", "My WS", "--cwd", "/home/dev/code"})
-	if code != 0 {
-		t.Fatalf("new-workspace: exit %d", code)
-	}
-	req := receiveRequest(t, requests)
-	if req["method"] != "workspace.create" {
-		t.Fatalf("expected method workspace.create, got %v", req["method"])
-	}
-	p := params(req)
-	if p["title"] != "My WS" {
-		t.Fatalf("expected title='My WS', got %v (wrong param name?)", p["title"])
-	}
-	if p["name"] != nil {
-		t.Fatalf("unexpected 'name' param (should be 'title'): %v", p["name"])
-	}
-	if p["cwd"] != "/home/dev/code" {
-		t.Fatalf("expected cwd='/home/dev/code', got %v", p["cwd"])
-	}
-	if p["working_directory"] != nil {
-		t.Fatalf("unexpected 'working_directory' param (should be 'cwd'): %v", p["working_directory"])
-	}
-}
-
-// TestRenameWorkspace verifies method and params.
-func TestRenameWorkspace(t *testing.T) {
-	sockPath, requests := startMockV2SocketWithRequestCapture(t)
-	code := runCLI([]string{"--socket", sockPath, "rename-workspace", "--title", "devbox"})
-	if code != 0 {
-		t.Fatalf("rename-workspace: exit %d", code)
-	}
-	req := receiveRequest(t, requests)
-	if req["method"] != "workspace.rename" {
-		t.Fatalf("expected workspace.rename, got %v", req["method"])
-	}
-	if params(req)["title"] != "devbox" {
-		t.Fatalf("expected title='devbox', got %v", params(req)["title"])
-	}
-}
-
-// TestJoinPaneTargetPaneParam verifies that --target-pane maps to target_pane_id.
-func TestJoinPaneTargetPaneParam(t *testing.T) {
-	sockPath, requests := startMockV2SocketWithRequestCapture(t)
-	code := runCLI([]string{"--socket", sockPath, "join-pane", "--pane", "pane-1", "--target-pane", "pane-2"})
-	if code != 0 {
-		t.Fatalf("join-pane: exit %d", code)
-	}
-	req := receiveRequest(t, requests)
-	if req["method"] != "pane.join" {
-		t.Fatalf("expected pane.join, got %v", req["method"])
-	}
-	p := params(req)
-	if p["target_pane_id"] != "pane-2" {
-		t.Fatalf("expected target_pane_id='pane-2', got %v", p["target_pane_id"])
-	}
-	if p["target-pane"] != nil {
-		t.Fatalf("unexpected 'target-pane' param (should be 'target_pane_id'): %v", p["target-pane"])
-	}
-}
-
-// TestNewWorkspaceRemovedFlags verifies that --working-directory is no longer
-// accepted. It was previously accepted but sent the wrong param name
-// (working_directory instead of cwd) so the server silently ignored it.
-func TestNewWorkspaceRemovedFlags(t *testing.T) {
-	sockPath := startMockV2Socket(t)
-	code := runCLI([]string{"--socket", sockPath, "new-workspace", "--working-directory", "/home/dev"})
-	if code == 0 {
-		t.Fatal("new-workspace --working-directory: expected non-zero exit (flag was removed)")
-	}
-}
-
-// TestNewWorkspaceLayout verifies that --layout parses the JSON value and sends
-// it as a nested object, not a string.
-func TestNewWorkspaceLayout(t *testing.T) {
-	sockPath, requests := startMockV2SocketWithRequestCapture(t)
-	layout := `{"splits":[{"direction":"vertical","ratio":0.5}]}`
-	code := runCLI([]string{"--socket", sockPath, "new-workspace", "--layout", layout})
-	if code != 0 {
-		t.Fatalf("new-workspace --layout: exit %d", code)
-	}
-	req := receiveRequest(t, requests)
-	if req["method"] != "workspace.create" {
-		t.Fatalf("expected workspace.create, got %v", req["method"])
-	}
-	p := params(req)
-	if p["layout"] == nil {
-		t.Fatal("expected 'layout' param to be set")
-	}
-	// layout must be a map, not a raw string
-	if _, ok := p["layout"].(map[string]any); !ok {
-		t.Fatalf("expected layout to be a JSON object, got %T", p["layout"])
-	}
-}
-
-// TestNewWorkspaceLayoutInvalid verifies that non-JSON --layout returns exit 2.
-func TestNewWorkspaceLayoutInvalid(t *testing.T) {
-	sockPath := startMockV2Socket(t)
-	code := runCLI([]string{"--socket", sockPath, "new-workspace", "--layout", "not-json"})
-	if code == 0 {
-		t.Fatal("new-workspace --layout not-json: expected non-zero exit")
-	}
-}
-
-// TestNewWorkspaceEnv verifies that --env KEY=VALUE pairs are collected into a
-// dict under the "env" param.
-func TestNewWorkspaceEnv(t *testing.T) {
-	sockPath, requests := startMockV2SocketWithRequestCapture(t)
-	code := runCLI([]string{"--socket", sockPath, "new-workspace",
-		"--env", "FOO=bar",
-		"--env", "BAZ=qux",
-	})
-	if code != 0 {
-		t.Fatalf("new-workspace --env: exit %d", code)
-	}
-	req := receiveRequest(t, requests)
-	p := params(req)
-	env, ok := p["env"].(map[string]any)
-	if !ok {
-		t.Fatalf("expected env to be a map, got %T: %v", p["env"], p["env"])
-	}
-	if env["FOO"] != "bar" {
-		t.Fatalf("expected env.FOO='bar', got %v", env["FOO"])
-	}
-	if env["BAZ"] != "qux" {
-		t.Fatalf("expected env.BAZ='qux', got %v", env["BAZ"])
-	}
-}
-
-// TestNewWorkspaceEnvBadFormat verifies that --env values without '=' return exit 2.
-func TestNewWorkspaceEnvBadFormat(t *testing.T) {
-	sockPath := startMockV2Socket(t)
-	code := runCLI([]string{"--socket", sockPath, "new-workspace", "--env", "NOEQUALS"})
-	if code == 0 {
-		t.Fatal("new-workspace --env NOEQUALS: expected non-zero exit")
-	}
-}
-
-// TestNewWorkspaceEnvFile verifies that --env-file reads a file of KEY=VALUE
-// lines (ignoring blank lines and comments) and merges them into the env param.
-func TestNewWorkspaceEnvFile(t *testing.T) {
-	f, err := os.CreateTemp("", "cmux-env-*.env")
-	if err != nil {
-		t.Fatal(err)
-	}
-	t.Cleanup(func() { os.Remove(f.Name()) })
-	f.WriteString("# comment\nHOST=localhost\nPORT=5432\n\n")
-	f.Close()
-
-	sockPath, requests := startMockV2SocketWithRequestCapture(t)
-	code := runCLI([]string{"--socket", sockPath, "new-workspace", "--env-file", f.Name()})
-	if code != 0 {
-		t.Fatalf("new-workspace --env-file: exit %d", code)
-	}
-	req := receiveRequest(t, requests)
-	env, ok := params(req)["env"].(map[string]any)
-	if !ok {
-		t.Fatalf("expected env map, got %T", params(req)["env"])
-	}
-	if env["HOST"] != "localhost" || env["PORT"] != "5432" {
-		t.Fatalf("unexpected env contents: %v", env)
-	}
-}
-
-// TestNewWorkspaceWindowGroupFlags verifies that --window, --group,
-// --group-placement, and --group-reference map to the correct param names.
-func TestNewWorkspaceWindowGroupFlags(t *testing.T) {
-	sockPath, requests := startMockV2SocketWithRequestCapture(t)
-	code := runCLI([]string{
-		"--socket", sockPath, "new-workspace",
-		"--window", "win-1",
-		"--group", "grp-1",
-		"--group-placement", "before",
-		"--group-reference", "ws-ref-1",
-	})
-	if code != 0 {
-		t.Fatalf("new-workspace with group flags: exit %d", code)
-	}
-	req := receiveRequest(t, requests)
-	p := params(req)
-	if p["window_id"] != "win-1" {
-		t.Fatalf("expected window_id='win-1', got %v", p["window_id"])
-	}
-	if p["group_id"] != "grp-1" {
-		t.Fatalf("expected group_id='grp-1', got %v", p["group_id"])
-	}
-	if p["placement"] != "before" {
-		t.Fatalf("expected placement='before', got %v", p["placement"])
-	}
-	if p["group_reference_workspace_id"] != "ws-ref-1" {
-		t.Fatalf("expected group_reference_workspace_id='ws-ref-1', got %v", p["group_reference_workspace_id"])
-	}
-}
-
-// TestNewWorkspaceCommand verifies that --command triggers two follow-up calls
-// (surface.send_text and surface.send_key return) using the surface_id returned
-// by workspace.create.
-func TestNewWorkspaceCommand(t *testing.T) {
-	// Custom mock: workspace.create returns surface_id; other methods echo normally.
-	sockPath := makeShortUnixSocketPath(t)
-	requests := make(chan map[string]any, 8)
-	ln, err := net.Listen("unix", sockPath)
-	if err != nil {
-		t.Fatalf("listen: %v", err)
-	}
-	t.Cleanup(func() { ln.Close() })
-
-	go func() {
-		for {
-			conn, err := ln.Accept()
-			if err != nil {
-				return
-			}
-			go func(conn net.Conn) {
-				defer conn.Close()
-				var req map[string]any
-				if err := json.NewDecoder(conn).Decode(&req); err != nil {
-					conn.Write([]byte(`{"ok":false,"error":{"code":"parse","message":"bad json"}}` + "\n"))
-					return
-				}
-				requests <- req
-				var result any
-				if req["method"] == "workspace.create" {
-					result = map[string]any{"workspace_id": "ws-1", "surface_id": "surf-1"}
-				} else {
-					result = map[string]any{"ok": true}
-				}
-				resp := map[string]any{"id": req["id"], "ok": true, "result": result}
-				payload, _ := json.Marshal(resp)
-				conn.Write(append(payload, '\n'))
-			}(conn)
-		}
-	}()
-
-	code := runCLI([]string{"--socket", sockPath, "new-workspace", "--command", "claude ."})
-	if code != 0 {
-		t.Fatalf("new-workspace --command: exit %d", code)
-	}
-
-	create := receiveRequest(t, requests)
-	if create["method"] != "workspace.create" {
-		t.Fatalf("expected workspace.create, got %v", create["method"])
-	}
-
-	sendText := receiveRequest(t, requests)
-	if sendText["method"] != "surface.send_text" {
-		t.Fatalf("expected surface.send_text, got %v", sendText["method"])
-	}
-	sp := params(sendText)
-	if sp["surface_id"] != "surf-1" {
-		t.Fatalf("expected surface_id='surf-1', got %v", sp["surface_id"])
-	}
-	if sp["text"] != "claude ." {
-		t.Fatalf("expected text='claude .', got %v", sp["text"])
-	}
-
-	sendKey := receiveRequest(t, requests)
-	if sendKey["method"] != "surface.send_key" {
-		t.Fatalf("expected surface.send_key, got %v", sendKey["method"])
-	}
-	kp := params(sendKey)
-	if kp["surface_id"] != "surf-1" {
-		t.Fatalf("expected surface_id='surf-1', got %v", kp["surface_id"])
-	}
-	if kp["key"] != "return" {
-		t.Fatalf("expected key='return', got %v", kp["key"])
-	}
-}
-
-// TestSendPositional verifies that send and send-key take text/key as positional args,
-// matching the Mac CLI convention (not --text/--key flags).
-func TestSendPositional(t *testing.T) {
-	t.Run("send", func(t *testing.T) {
-		sockPath, requests := startMockV2SocketWithRequestCapture(t)
-		code := runCLI([]string{"--socket", sockPath, "send", "hello world"})
-		if code != 0 {
-			t.Fatalf("send: exit %d", code)
-		}
-		req := receiveRequest(t, requests)
-		if params(req)["text"] != "hello world" {
-			t.Fatalf("expected text='hello world', got %v", params(req)["text"])
-		}
-	})
-	t.Run("send-key", func(t *testing.T) {
-		sockPath, requests := startMockV2SocketWithRequestCapture(t)
-		code := runCLI([]string{"--socket", sockPath, "send-key", "ctrl+c"})
-		if code != 0 {
-			t.Fatalf("send-key: exit %d", code)
-		}
-		req := receiveRequest(t, requests)
-		if params(req)["key"] != "ctrl+c" {
-			t.Fatalf("expected key='ctrl+c', got %v", params(req)["key"])
-		}
-	})
-	t.Run("send rejects --text flag", func(t *testing.T) {
-		sockPath := startMockV2Socket(t)
-		code := runCLI([]string{"--socket", sockPath, "send", "--text", "hello"})
-		if code == 0 {
-			t.Fatal("send --text: expected non-zero exit (--text is not a flag; use positional)")
-		}
-	})
-}
-
-// TestPositionalRejectedOnFlagOnlyCommands verifies that commands without positionalKey
-// reject unexpected positional arguments instead of silently ignoring them.
-func TestPositionalRejectedOnFlagOnlyCommands(t *testing.T) {
-	sockPath := startMockV2Socket(t)
-	code := runCLI([]string{"--socket", sockPath, "new-workspace", "unexpected-positional"})
-	if code == 0 {
-		t.Fatal("new-workspace with positional arg: expected non-zero exit")
-	}
-}
-
-// TestNewCommandsMethod is a table-driven smoke test verifying that each new
-// command sends the correct v2 method.
-func TestNewCommandsMethod(t *testing.T) {
-	tests := []struct {
-		args   []string
-		method string
-	}{
-		{[]string{"next-workspace"}, "workspace.next"},
-		{[]string{"previous-workspace"}, "workspace.previous"},
-		{[]string{"last-workspace"}, "workspace.last"},
-		{[]string{"equalize-splits"}, "workspace.equalize_splits"},
-		{[]string{"last-pane"}, "pane.last"},
-		{[]string{"swap-pane", "--pane", "p1"}, "pane.swap"},
-		{[]string{"break-pane", "--pane", "p1"}, "pane.break"},
-		{[]string{"read-screen"}, "surface.read_text"},
-		{[]string{"clear-history"}, "surface.clear_history"},
-		{[]string{"jump-to-unread"}, "notification.jump_to_unread"},
-		{[]string{"dismiss-notification", "--id", "n1"}, "notification.dismiss"},
-		{[]string{"mark-notification-read", "--id", "n1"}, "notification.mark_read"},
-		{[]string{"open-notification", "--id", "n1"}, "notification.open"},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.args[0], func(t *testing.T) {
-			sockPath, requests := startMockV2SocketWithRequestCapture(t)
-			args := append([]string{"--socket", sockPath}, tt.args...)
-			code := runCLI(args)
-			if code != 0 {
-				t.Fatalf("%s: exit %d", tt.args[0], code)
-			}
-			req := receiveRequest(t, requests)
-			if req["method"] != tt.method {
-				t.Fatalf("%s: expected method %q, got %v", tt.args[0], tt.method, req["method"])
-			}
-		})
-	}
-}
diff --git a/daemon/remote/cmd/cmuxd-remote/cli_test.go b/daemon/remote/cmd/cmuxd-remote/cli_test.go
deleted file mode 100644
index 87284a15dbaa..000000000000
--- a/daemon/remote/cmd/cmuxd-remote/cli_test.go
+++ /dev/null
@@ -1,1394 +0,0 @@
-package main
-
-import (
-	"bufio"
-	"crypto/hmac"
-	"crypto/sha256"
-	"encoding/hex"
-	"encoding/json"
-	"fmt"
-	"io"
-	"net"
-	"os"
-	"path/filepath"
-	"strings"
-	"testing"
-	"time"
-)
-
-func captureStdout(t *testing.T, fn func()) string {
-	t.Helper()
-	original := os.Stdout
-	reader, writer, err := os.Pipe()
-	if err != nil {
-		t.Fatalf("pipe stdout: %v", err)
-	}
-	os.Stdout = writer
-	defer func() {
-		os.Stdout = original
-	}()
-
-	fn()
-
-	if err := writer.Close(); err != nil {
-		t.Fatalf("close stdout writer: %v", err)
-	}
-	output, err := io.ReadAll(reader)
-	if err != nil {
-		t.Fatalf("read stdout: %v", err)
-	}
-	if err := reader.Close(); err != nil {
-		t.Fatalf("close stdout reader: %v", err)
-	}
-	return string(output)
-}
-
-func makeShortUnixSocketPath(t *testing.T) string {
-	t.Helper()
-	dir, err := os.MkdirTemp("/tmp", "cmuxd-")
-	if err != nil {
-		t.Fatalf("mkdtemp: %v", err)
-	}
-	t.Cleanup(func() { _ = os.RemoveAll(dir) })
-	return filepath.Join(dir, "cmux.sock")
-}
-
-// startMockSocket creates a Unix socket that accepts one connection,
-// reads a line, and responds with the given canned response.
-func startMockSocket(t *testing.T, response string) string {
-	t.Helper()
-	sockPath := makeShortUnixSocketPath(t)
-
-	ln, err := net.Listen("unix", sockPath)
-	if err != nil {
-		t.Fatalf("failed to listen: %v", err)
-	}
-	t.Cleanup(func() { ln.Close() })
-
-	go func() {
-		for {
-			conn, err := ln.Accept()
-			if err != nil {
-				return
-			}
-			buf := make([]byte, 4096)
-			n, _ := conn.Read(buf)
-			_ = n // consume request
-			conn.Write([]byte(response + "\n"))
-			conn.Close()
-		}
-	}()
-
-	return sockPath
-}
-
-// startMockV2Socket creates a Unix socket that echoes the received request's method
-// back as a successful JSON-RPC response with the method name in the result.
-func startMockV2Socket(t *testing.T) string {
-	t.Helper()
-	sockPath := makeShortUnixSocketPath(t)
-
-	ln, err := net.Listen("unix", sockPath)
-	if err != nil {
-		t.Fatalf("failed to listen: %v", err)
-	}
-	t.Cleanup(func() { ln.Close() })
-
-	go func() {
-		for {
-			conn, err := ln.Accept()
-			if err != nil {
-				return
-			}
-			buf := make([]byte, 4096)
-			n, _ := conn.Read(buf)
-			if n > 0 {
-				var req map[string]any
-				if err := json.Unmarshal(buf[:n], &req); err == nil {
-					resp := map[string]any{
-						"id":     req["id"],
-						"ok":     true,
-						"result": map[string]any{"method": req["method"], "params": req["params"]},
-					}
-					payload, _ := json.Marshal(resp)
-					conn.Write(append(payload, '\n'))
-				} else {
-					conn.Write([]byte(`{"ok":false,"error":{"code":"parse","message":"bad json"}}` + "\n"))
-				}
-			}
-			conn.Close()
-		}
-	}()
-
-	return sockPath
-}
-
-func startMockV2SocketWithRequestCapture(t *testing.T) (string, <-chan map[string]any) {
-	t.Helper()
-	sockPath := makeShortUnixSocketPath(t)
-	requests := make(chan map[string]any, 8)
-
-	ln, err := net.Listen("unix", sockPath)
-	if err != nil {
-		t.Fatalf("failed to listen: %v", err)
-	}
-	t.Cleanup(func() { ln.Close() })
-
-	go func() {
-		for {
-			conn, err := ln.Accept()
-			if err != nil {
-				return
-			}
-			go func(conn net.Conn) {
-				defer conn.Close()
-				buf := make([]byte, 4096)
-				n, _ := conn.Read(buf)
-				if n == 0 {
-					return
-				}
-				var req map[string]any
-				if err := json.Unmarshal(buf[:n], &req); err != nil {
-					_, _ = conn.Write([]byte(`{"ok":false,"error":{"code":"parse","message":"bad json"}}` + "\n"))
-					return
-				}
-				requests <- req
-				resp := map[string]any{
-					"id":     req["id"],
-					"ok":     true,
-					"result": map[string]any{"method": req["method"], "params": req["params"]},
-				}
-				payload, _ := json.Marshal(resp)
-				_, _ = conn.Write(append(payload, '\n'))
-			}(conn)
-		}
-	}()
-
-	return sockPath, requests
-}
-
-func startMockV2TCPSocketWithResult(t *testing.T, result any) string {
-	t.Helper()
-	ln, err := net.Listen("tcp", "127.0.0.1:0")
-	if err != nil {
-		t.Fatalf("failed to listen on TCP: %v", err)
-	}
-	t.Cleanup(func() { ln.Close() })
-
-	go func() {
-		for {
-			conn, err := ln.Accept()
-			if err != nil {
-				return
-			}
-			go func(conn net.Conn) {
-				defer conn.Close()
-				buf := make([]byte, 4096)
-				n, _ := conn.Read(buf)
-				if n == 0 {
-					return
-				}
-				var req map[string]any
-				if err := json.Unmarshal(buf[:n], &req); err != nil {
-					_, _ = conn.Write([]byte(`{"ok":false,"error":{"code":"parse","message":"bad json"}}` + "\n"))
-					return
-				}
-				resp := map[string]any{
-					"id":     req["id"],
-					"ok":     true,
-					"result": result,
-				}
-				payload, _ := json.Marshal(resp)
-				_, _ = conn.Write(append(payload, '\n'))
-			}(conn)
-		}
-	}()
-
-	return ln.Addr().String()
-}
-
-// startMockTCPSocket creates a TCP listener that responds with a canned response.
-func startMockTCPSocket(t *testing.T, response string) string {
-	t.Helper()
-	ln, err := net.Listen("tcp", "127.0.0.1:0")
-	if err != nil {
-		t.Fatalf("failed to listen on TCP: %v", err)
-	}
-	t.Cleanup(func() { ln.Close() })
-
-	go func() {
-		for {
-			conn, err := ln.Accept()
-			if err != nil {
-				return
-			}
-			buf := make([]byte, 4096)
-			n, _ := conn.Read(buf)
-			_ = n
-			conn.Write([]byte(response + "\n"))
-			conn.Close()
-		}
-	}()
-
-	return ln.Addr().String()
-}
-
-func startMockAuthenticatedTCPSocket(t *testing.T, relayID, relayToken, response string) string {
-	t.Helper()
-	relayTokenBytes := mustHex(t, relayToken)
-	ln, err := net.Listen("tcp", "127.0.0.1:0")
-	if err != nil {
-		t.Fatalf("failed to listen on TCP: %v", err)
-	}
-	t.Cleanup(func() { ln.Close() })
-
-	go func() {
-		for {
-			conn, err := ln.Accept()
-			if err != nil {
-				return
-			}
-			go func(conn net.Conn) {
-				defer conn.Close()
-				nonce := "testnonce"
-				challenge, _ := json.Marshal(map[string]any{
-					"protocol": "cmux-relay-auth",
-					"version":  1,
-					"relay_id": relayID,
-					"nonce":    nonce,
-				})
-				_, _ = conn.Write(append(challenge, '\n'))
-
-				reader := bufio.NewReader(conn)
-				line, err := reader.ReadString('\n')
-				if err != nil {
-					return
-				}
-				var authResp map[string]any
-				if err := json.Unmarshal([]byte(line), &authResp); err != nil {
-					_, _ = conn.Write([]byte(`{"ok":false}` + "\n"))
-					return
-				}
-				macHex, _ := authResp["mac"].(string)
-				receivedMAC, err := hex.DecodeString(macHex)
-				if err != nil {
-					_, _ = conn.Write([]byte(`{"ok":false}` + "\n"))
-					return
-				}
-
-				h := hmac.New(sha256.New, relayTokenBytes)
-				_, _ = io.WriteString(h, fmt.Sprintf("relay_id=%s\nnonce=%s\nversion=%d", relayID, nonce, 1))
-				expectedMAC := h.Sum(nil)
-				if !hmac.Equal(receivedMAC, expectedMAC) {
-					_, _ = conn.Write([]byte(`{"ok":false}` + "\n"))
-					return
-				}
-
-				_, _ = conn.Write([]byte(`{"ok":true}` + "\n"))
-				buf := make([]byte, 4096)
-				n, _ := conn.Read(buf)
-				_, _ = conn.Write([]byte(response))
-				if n > 0 && !strings.HasSuffix(response, "\n") {
-					_, _ = conn.Write([]byte("\n"))
-				}
-			}(conn)
-		}
-	}()
-
-	return ln.Addr().String()
-}
-
-func mustHex(t *testing.T, value string) []byte {
-	t.Helper()
-	data, err := hex.DecodeString(value)
-	if err != nil {
-		t.Fatalf("decode hex: %v", err)
-	}
-	return data
-}
-
-func TestDialSocketRefreshesToUpdatedTCPAddressWithoutPolling(t *testing.T) {
-	staleListener, err := net.Listen("tcp", "127.0.0.1:0")
-	if err != nil {
-		t.Fatalf("listen stale: %v", err)
-	}
-	staleAddr := staleListener.Addr().String()
-	staleListener.Close()
-
-	readyListener, err := net.Listen("tcp", "127.0.0.1:0")
-	if err != nil {
-		t.Fatalf("listen ready: %v", err)
-	}
-	defer readyListener.Close()
-
-	accepted := make(chan struct{})
-	go func() {
-		defer close(accepted)
-		conn, acceptErr := readyListener.Accept()
-		if acceptErr != nil {
-			return
-		}
-		conn.Close()
-	}()
-
-	refreshCalls := 0
-	start := time.Now()
-	conn, err := dialSocket(staleAddr, func() string {
-		refreshCalls++
-		return readyListener.Addr().String()
-	})
-	elapsed := time.Since(start)
-	if err != nil {
-		t.Fatalf("dialSocket should refresh to updated address, got: %v", err)
-	}
-	conn.Close()
-	<-accepted
-	if refreshCalls != 1 {
-		t.Fatalf("refreshAddr should be called once, got %d", refreshCalls)
-	}
-	if elapsed > 500*time.Millisecond {
-		t.Fatalf("dialSocket should fail over without polling, took %v", elapsed)
-	}
-}
-
-func TestDialSocketFailsFastWhenTCPAddressStaysStale(t *testing.T) {
-	ln, err := net.Listen("tcp", "127.0.0.1:0")
-	if err != nil {
-		t.Fatalf("listen: %v", err)
-	}
-	addr := ln.Addr().String()
-	ln.Close()
-
-	refreshCalls := 0
-	start := time.Now()
-	_, err = dialSocket(addr, func() string {
-		refreshCalls++
-		return addr
-	})
-	elapsed := time.Since(start)
-	if err == nil {
-		t.Fatal("dialSocket should fail when the relay address stays stale")
-	}
-	if refreshCalls != 1 {
-		t.Fatalf("refreshAddr should be called once on stale TCP failure, got %d", refreshCalls)
-	}
-	if elapsed > 500*time.Millisecond {
-		t.Fatalf("dialSocket should fail fast without polling, took %v", elapsed)
-	}
-}
-
-func TestCLIPing(t *testing.T) {
-	sockPath, requests := startMockV2SocketWithRequestCapture(t)
-	code := runCLI([]string{"--socket", sockPath, "ping"})
-	if code != 0 {
-		t.Fatalf("ping should return 0, got %d", code)
-	}
-	req := receiveRequest(t, requests)
-	if req["method"] != "system.ping" {
-		t.Fatalf("expected method system.ping, got %v", req["method"])
-	}
-}
-
-func TestCLIPingOverTCP(t *testing.T) {
-	addr := startMockV2TCPSocketWithResult(t, map[string]any{})
-	code := runCLI([]string{"--socket", addr, "ping"})
-	if code != 0 {
-		t.Fatalf("ping over TCP should return 0, got %d", code)
-	}
-}
-
-func TestCLIPingOverAuthenticatedTCPWithEnv(t *testing.T) {
-	relayID := "relay-1"
-	relayToken := strings.Repeat("a1", 32)
-	pingResp, _ := json.Marshal(map[string]any{"id": 1, "ok": true, "result": map[string]any{}})
-	addr := startMockAuthenticatedTCPSocket(t, relayID, relayToken, string(pingResp))
-	t.Setenv("CMUX_RELAY_ID", relayID)
-	t.Setenv("CMUX_RELAY_TOKEN", relayToken)
-
-	code := runCLI([]string{"--socket", addr, "ping"})
-	if code != 0 {
-		t.Fatalf("ping over authenticated TCP should return 0, got %d", code)
-	}
-}
-
-func TestCLIPingOverAuthenticatedTCPWithRelayFile(t *testing.T) {
-	relayID := "relay-2"
-	relayToken := strings.Repeat("b2", 32)
-	pingResp, _ := json.Marshal(map[string]any{"id": 1, "ok": true, "result": map[string]any{}})
-	addr := startMockAuthenticatedTCPSocket(t, relayID, relayToken, string(pingResp))
-	_, port, err := net.SplitHostPort(addr)
-	if err != nil {
-		t.Fatalf("split host port: %v", err)
-	}
-
-	home := t.TempDir()
-	t.Setenv("HOME", home)
-	t.Setenv("CMUX_RELAY_ID", "")
-	t.Setenv("CMUX_RELAY_TOKEN", "")
-	relayDir := filepath.Join(home, ".cmux", "relay")
-	if err := os.MkdirAll(relayDir, 0o700); err != nil {
-		t.Fatalf("mkdir relay dir: %v", err)
-	}
-	authPayload, _ := json.Marshal(relayAuthState{RelayID: relayID, RelayToken: relayToken})
-	if err := os.WriteFile(filepath.Join(relayDir, port+".auth"), authPayload, 0o600); err != nil {
-		t.Fatalf("write auth file: %v", err)
-	}
-
-	code := runCLI([]string{"--socket", addr, "ping"})
-	if code != 0 {
-		t.Fatalf("ping over authenticated TCP file relay should return 0, got %d", code)
-	}
-}
-
-func TestDialSocketDetection(t *testing.T) {
-	// Unix socket paths should attempt Unix dial
-	for _, path := range []string{"/tmp/cmux-nonexistent-test-99999.sock", "/var/run/cmux-nonexistent.sock"} {
-		conn, err := dialSocket(path, nil)
-		if conn != nil {
-			conn.Close()
-		}
-		// We expect a connection error (not found), not a panic
-		if err == nil {
-			t.Fatalf("dialSocket(%q) should fail for non-existent path", path)
-		}
-	}
-
-	// TCP addresses should attempt TCP dial
-	ln, err := net.Listen("tcp", "127.0.0.1:0")
-	if err != nil {
-		t.Fatalf("listen: %v", err)
-	}
-	defer ln.Close()
-
-	go func() {
-		conn, _ := ln.Accept()
-		if conn != nil {
-			conn.Close()
-		}
-	}()
-
-	conn, err := dialSocket(ln.Addr().String(), nil)
-	if err != nil {
-		t.Fatalf("dialSocket(%q) should succeed for TCP: %v", ln.Addr().String(), err)
-	}
-	conn.Close()
-}
-
-func TestCLINewWindow(t *testing.T) {
-	sockPath, requests := startMockV2SocketWithRequestCapture(t)
-	code := runCLI([]string{"--socket", sockPath, "new-window"})
-	if code != 0 {
-		t.Fatalf("new-window should return 0, got %d", code)
-	}
-	req := receiveRequest(t, requests)
-	if req["method"] != "window.create" {
-		t.Fatalf("new-window: expected method window.create, got %v", req["method"])
-	}
-}
-
-func TestSocketRoundTripV2ListResult(t *testing.T) {
-	windows := []any{
-		map[string]any{"id": "alpha", "ref": "@1"},
-		map[string]any{"id": "beta", "ref": "@2"},
-		map[string]any{"id": "gamma", "ref": "@3"},
-	}
-	addr := startMockV2TCPSocketWithResult(t, map[string]any{"windows": windows})
-	resp, err := socketRoundTripV2(addr, "window.list", nil, nil)
-	if err != nil {
-		t.Fatalf("socketRoundTripV2 should succeed, got error: %v", err)
-	}
-	if !strings.Contains(resp, "alpha") || !strings.Contains(resp, "beta") || !strings.Contains(resp, "gamma") {
-		t.Fatalf("socketRoundTripV2 response missing window IDs: %q", resp)
-	}
-}
-
-func TestCLICloseWindow(t *testing.T) {
-	sockPath, requests := startMockV2SocketWithRequestCapture(t)
-	code := runCLI([]string{"--socket", sockPath, "close-window", "--window", "win-42"})
-	if code != 0 {
-		t.Fatalf("close-window should return 0, got %d", code)
-	}
-	select {
-	case req := <-requests:
-		if req["method"] != "window.close" {
-			t.Fatalf("expected method window.close, got %v", req["method"])
-		}
-		p, _ := req["params"].(map[string]any)
-		if p["window_id"] != "win-42" {
-			t.Fatalf("expected window_id='win-42', got %v", p["window_id"])
-		}
-	case <-time.After(2 * time.Second):
-		t.Fatal("timed out waiting for close-window request")
-	}
-}
-
-func TestCLIListWorkspacesV2(t *testing.T) {
-	sockPath := startMockV2Socket(t)
-	code := runCLI([]string{"--socket", sockPath, "--json", "list-workspaces"})
-	if code != 0 {
-		t.Fatalf("list-workspaces should return 0, got %d", code)
-	}
-}
-
-func TestCLIListWorkspacesV2DefaultOutputShowsResult(t *testing.T) {
-	sockPath := startMockV2TCPSocketWithResult(t, map[string]any{"method": "workspace.list", "params": map[string]any{}})
-	output := captureStdout(t, func() {
-		code := runCLI([]string{"--socket", sockPath, "list-workspaces"})
-		if code != 0 {
-			t.Fatalf("list-workspaces should return 0, got %d", code)
-		}
-	})
-	if !strings.Contains(output, "\"method\": \"workspace.list\"") {
-		t.Fatalf("expected default output to include result payload, got %q", output)
-	}
-}
-
-func TestCLINotifyDefaultOutputPrintsOKForEmptyResult(t *testing.T) {
-	sockPath := startMockV2TCPSocketWithResult(t, map[string]any{})
-	output := captureStdout(t, func() {
-		code := runCLI([]string{"--socket", sockPath, "notify", "--body", "hi"})
-		if code != 0 {
-			t.Fatalf("notify should return 0, got %d", code)
-		}
-	})
-	if strings.TrimSpace(output) != "OK" {
-		t.Fatalf("expected empty-result command to print OK, got %q", output)
-	}
-}
-
-func TestCLIRPCPassthrough(t *testing.T) {
-	sockPath := startMockV2Socket(t)
-	code := runCLI([]string{"--socket", sockPath, "rpc", "system.capabilities"})
-	if code != 0 {
-		t.Fatalf("rpc should return 0, got %d", code)
-	}
-}
-
-func TestCLIRPCWithParams(t *testing.T) {
-	sockPath := startMockV2Socket(t)
-	code := runCLI([]string{"--socket", sockPath, "rpc", "workspace.create", `{"title":"test"}`})
-	if code != 0 {
-		t.Fatalf("rpc with params should return 0, got %d", code)
-	}
-}
-
-func TestCLIUnknownCommand(t *testing.T) {
-	code := runCLI([]string{"--socket", "/dev/null", "does-not-exist"})
-	if code != 2 {
-		t.Fatalf("unknown command should return 2, got %d", code)
-	}
-}
-
-func TestCLINoSocket(t *testing.T) {
-	// Without CMUX_SOCKET_PATH set, should fail
-	os.Unsetenv("CMUX_SOCKET_PATH")
-	code := runCLI([]string{"ping"})
-	if code != 1 {
-		t.Fatalf("missing socket should return 1, got %d", code)
-	}
-}
-
-func TestCLISocketEnvVar(t *testing.T) {
-	sockPath, requests := startMockV2SocketWithRequestCapture(t)
-	t.Setenv("CMUX_SOCKET_PATH", sockPath)
-
-	code := runCLI([]string{"ping"})
-	if code != 0 {
-		t.Fatalf("ping with env socket should return 0, got %d", code)
-	}
-	req := receiveRequest(t, requests)
-	if req["method"] != "system.ping" {
-		t.Fatalf("expected method system.ping, got %v", req["method"])
-	}
-}
-
-func TestCLIV2FlagMapping(t *testing.T) {
-	// Verify that --workspace gets mapped to workspace_id in params
-	dir := t.TempDir()
-	sockPath := filepath.Join(dir, "cmux.sock")
-
-	receivedParamsCh := make(chan map[string]any, 1)
-	ln, err := net.Listen("unix", sockPath)
-	if err != nil {
-		t.Fatalf("listen: %v", err)
-	}
-	t.Cleanup(func() { ln.Close() })
-
-	go func() {
-		conn, err := ln.Accept()
-		if err != nil {
-			return
-		}
-		buf := make([]byte, 4096)
-		n, _ := conn.Read(buf)
-		var req map[string]any
-		json.Unmarshal(buf[:n], &req)
-		receivedParams, _ := req["params"].(map[string]any)
-		receivedParamsCh <- receivedParams
-		resp := map[string]any{"id": req["id"], "ok": true, "result": map[string]any{}}
-		payload, _ := json.Marshal(resp)
-		conn.Write(append(payload, '\n'))
-		conn.Close()
-	}()
-
-	code := runCLI([]string{"--socket", sockPath, "--json", "close-workspace", "--workspace", "ws-abc"})
-	if code != 0 {
-		t.Fatalf("close-workspace should return 0, got %d", code)
-	}
-	select {
-	case receivedParams := <-receivedParamsCh:
-		if receivedParams["workspace_id"] != "ws-abc" {
-			t.Fatalf("expected workspace_id=ws-abc, got %v", receivedParams)
-		}
-	case <-time.After(2 * time.Second):
-		t.Fatal("timed out waiting for close-workspace payload")
-	}
-}
-
-func TestBusyboxArgv0Detection(t *testing.T) {
-	// Verify that when argv[0] base is "cmux", we enter CLI mode
-	base := filepath.Base("cmux")
-	if base != "cmux" {
-		t.Fatalf("expected base 'cmux', got %q", base)
-	}
-	base2 := filepath.Base("/home/user/.cmux/bin/cmux")
-	if base2 != "cmux" {
-		t.Fatalf("expected base 'cmux', got %q", base2)
-	}
-	base3 := filepath.Base("cmuxd-remote")
-	if base3 == "cmux" {
-		t.Fatalf("cmuxd-remote should not match cmux")
-	}
-}
-
-func TestCLIBrowserSubcommand(t *testing.T) {
-	sockPath := startMockV2Socket(t)
-	code := runCLI([]string{"--socket", sockPath, "--json", "browser", "open", "--url", "https://example.com"})
-	if code != 0 {
-		t.Fatalf("browser open should return 0, got %d", code)
-	}
-}
-
-func TestCLINewPaneDefaultsDirectionAndForwardsExtraFlags(t *testing.T) {
-	sockPath, requests := startMockV2SocketWithRequestCapture(t)
-	code := runCLI([]string{
-		"--socket", sockPath, "--json",
-		"new-pane",
-		"--workspace", "ws-1",
-		"--type", "browser",
-		"--url", "https://example.com",
-	})
-	if code != 0 {
-		t.Fatalf("new-pane should return 0, got %d", code)
-	}
-
-	select {
-	case req := <-requests:
-		if got := req["method"]; got != "pane.create" {
-			t.Fatalf("expected pane.create, got %v", got)
-		}
-		params, _ := req["params"].(map[string]any)
-		if got := params["workspace_id"]; got != "ws-1" {
-			t.Fatalf("expected workspace_id ws-1, got %v", got)
-		}
-		if got := params["direction"]; got != "right" {
-			t.Fatalf("expected default direction right, got %v", got)
-		}
-		if got := params["type"]; got != "browser" {
-			t.Fatalf("expected type browser, got %v", got)
-		}
-		if got := params["url"]; got != "https://example.com" {
-			t.Fatalf("expected url to be forwarded, got %v", got)
-		}
-	case <-time.After(2 * time.Second):
-		t.Fatal("timed out waiting for new-pane request")
-	}
-}
-
-func TestCLIListPanelsUsesSurfaceList(t *testing.T) {
-	sockPath, requests := startMockV2SocketWithRequestCapture(t)
-	code := runCLI([]string{"--socket", sockPath, "--json", "list-panels", "--workspace", "ws-1"})
-	if code != 0 {
-		t.Fatalf("list-panels should return 0, got %d", code)
-	}
-
-	select {
-	case req := <-requests:
-		if got := req["method"]; got != "surface.list" {
-			t.Fatalf("expected surface.list, got %v", got)
-		}
-		params, _ := req["params"].(map[string]any)
-		if got := params["workspace_id"]; got != "ws-1" {
-			t.Fatalf("expected workspace_id ws-1, got %v", got)
-		}
-	case <-time.After(2 * time.Second):
-		t.Fatal("timed out waiting for list-panels request")
-	}
-}
-
-func TestCLIFocusPanelUsesSurfaceFocus(t *testing.T) {
-	sockPath, requests := startMockV2SocketWithRequestCapture(t)
-	code := runCLI([]string{"--socket", sockPath, "--json", "focus-panel", "--workspace", "ws-1", "--panel", "surface-1"})
-	if code != 0 {
-		t.Fatalf("focus-panel should return 0, got %d", code)
-	}
-
-	select {
-	case req := <-requests:
-		if got := req["method"]; got != "surface.focus" {
-			t.Fatalf("expected surface.focus, got %v", got)
-		}
-		params, _ := req["params"].(map[string]any)
-		if got := params["workspace_id"]; got != "ws-1" {
-			t.Fatalf("expected workspace_id ws-1, got %v", got)
-		}
-		if got := params["surface_id"]; got != "surface-1" {
-			t.Fatalf("expected surface_id surface-1, got %v", got)
-		}
-		if _, ok := params["panel_id"]; ok {
-			t.Fatalf("did not expect panel_id in params: %v", params)
-		}
-	case <-time.After(2 * time.Second):
-		t.Fatal("timed out waiting for focus-panel request")
-	}
-}
-
-func TestCLIBrowserOpenUsesOpenSplitAndWorkspaceEnv(t *testing.T) {
-	sockPath, requests := startMockV2SocketWithRequestCapture(t)
-	t.Setenv("CMUX_WORKSPACE_ID", "env-ws")
-	code := runCLI([]string{"--socket", sockPath, "--json", "browser", "open", "https://example.com"})
-	if code != 0 {
-		t.Fatalf("browser open should return 0, got %d", code)
-	}
-
-	select {
-	case req := <-requests:
-		if got := req["method"]; got != "browser.open_split" {
-			t.Fatalf("expected browser.open_split, got %v", got)
-		}
-		params, _ := req["params"].(map[string]any)
-		if got := params["workspace_id"]; got != "env-ws" {
-			t.Fatalf("expected workspace_id env-ws, got %v", got)
-		}
-		if got := params["url"]; got != "https://example.com" {
-			t.Fatalf("expected positional url to be forwarded, got %v", got)
-		}
-	case <-time.After(2 * time.Second):
-		t.Fatal("timed out waiting for browser open request")
-	}
-}
-
-func TestCLIBrowserGetURLUsesCurrentMethodAndSurfaceEnv(t *testing.T) {
-	sockPath, requests := startMockV2SocketWithRequestCapture(t)
-	t.Setenv("CMUX_SURFACE_ID", "env-sf")
-	code := runCLI([]string{"--socket", sockPath, "--json", "browser", "get-url"})
-	if code != 0 {
-		t.Fatalf("browser get-url should return 0, got %d", code)
-	}
-
-	select {
-	case req := <-requests:
-		if got := req["method"]; got != "browser.url.get" {
-			t.Fatalf("expected browser.url.get, got %v", got)
-		}
-		params, _ := req["params"].(map[string]any)
-		if got := params["surface_id"]; got != "env-sf" {
-			t.Fatalf("expected surface_id env-sf, got %v", got)
-		}
-	case <-time.After(2 * time.Second):
-		t.Fatal("timed out waiting for browser get-url request")
-	}
-}
-
-func TestCLIBrowserSnapshotUsesSurfaceEnvAndForwardsOptions(t *testing.T) {
-	sockPath, requests := startMockV2SocketWithRequestCapture(t)
-	t.Setenv("CMUX_SURFACE_ID", "env-sf")
-	code := runCLI([]string{
-		"--socket", sockPath, "--json",
-		"browser", "snapshot",
-		"--selector", "main",
-		"--max-depth", "4",
-	})
-	if code != 0 {
-		t.Fatalf("browser snapshot should return 0, got %d", code)
-	}
-
-	select {
-	case req := <-requests:
-		if got := req["method"]; got != "browser.snapshot" {
-			t.Fatalf("expected browser.snapshot, got %v", got)
-		}
-		params, _ := req["params"].(map[string]any)
-		if got := params["surface_id"]; got != "env-sf" {
-			t.Fatalf("expected surface_id env-sf, got %v", got)
-		}
-		if got := params["selector"]; got != "main" {
-			t.Fatalf("expected selector main, got %v", got)
-		}
-		if got := params["max_depth"]; got != "4" {
-			t.Fatalf("expected max_depth 4, got %v", got)
-		}
-	case <-time.After(2 * time.Second):
-		t.Fatal("timed out waiting for browser snapshot request")
-	}
-}
-
-func TestCLIBrowserWaitUsesSurfaceEnvAndForwardsOptions(t *testing.T) {
-	sockPath, requests := startMockV2SocketWithRequestCapture(t)
-	t.Setenv("CMUX_SURFACE_ID", "env-sf")
-	code := runCLI([]string{
-		"--socket", sockPath, "--json",
-		"browser", "wait",
-		"--timeout-ms", "1500",
-		"--url-contains", "/cloud",
-		"--load-state", "networkidle",
-	})
-	if code != 0 {
-		t.Fatalf("browser wait should return 0, got %d", code)
-	}
-
-	select {
-	case req := <-requests:
-		if got := req["method"]; got != "browser.wait" {
-			t.Fatalf("expected browser.wait, got %v", got)
-		}
-		params, _ := req["params"].(map[string]any)
-		if got := params["surface_id"]; got != "env-sf" {
-			t.Fatalf("expected surface_id env-sf, got %v", got)
-		}
-		if got := params["timeout_ms"]; got != "1500" {
-			t.Fatalf("expected timeout_ms 1500, got %v", got)
-		}
-		if got := params["url_contains"]; got != "/cloud" {
-			t.Fatalf("expected url_contains /cloud, got %v", got)
-		}
-		if got := params["load_state"]; got != "networkidle" {
-			t.Fatalf("expected load_state networkidle, got %v", got)
-		}
-	case <-time.After(2 * time.Second):
-		t.Fatal("timed out waiting for browser wait request")
-	}
-}
-
-func TestCLIBrowserAutomationPositionals(t *testing.T) {
-	sockPath, requests := startMockV2SocketWithRequestCapture(t)
-	t.Setenv("CMUX_SURFACE_ID", "env-sf")
-	code := runCLI([]string{
-		"--socket", sockPath, "--json",
-		"browser", "fill",
-		"input[name=email]",
-		"dev@example.com",
-	})
-	if code != 0 {
-		t.Fatalf("browser fill should return 0, got %d", code)
-	}
-
-	select {
-	case req := <-requests:
-		if got := req["method"]; got != "browser.fill" {
-			t.Fatalf("expected browser.fill, got %v", got)
-		}
-		params, _ := req["params"].(map[string]any)
-		if got := params["surface_id"]; got != "env-sf" {
-			t.Fatalf("expected surface_id env-sf, got %v", got)
-		}
-		if got := params["selector"]; got != "input[name=email]" {
-			t.Fatalf("expected selector, got %v", got)
-		}
-		if got := params["text"]; got != "dev@example.com" {
-			t.Fatalf("expected text, got %v", got)
-		}
-		if _, ok := params["value"]; ok {
-			t.Fatalf("browser.fill should not send value param: %#v", params)
-		}
-	case <-time.After(2 * time.Second):
-		t.Fatal("timed out waiting for browser fill request")
-	}
-}
-
-func TestCLIBrowserSelectDoesNotMirrorValueToText(t *testing.T) {
-	sockPath, requests := startMockV2SocketWithRequestCapture(t)
-	t.Setenv("CMUX_SURFACE_ID", "env-sf")
-	code := runCLI([]string{
-		"--socket", sockPath, "--json",
-		"browser", "select",
-		"select[name=plan]",
-		"free",
-	})
-	if code != 0 {
-		t.Fatalf("browser select should return 0, got %d", code)
-	}
-
-	select {
-	case req := <-requests:
-		if got := req["method"]; got != "browser.select" {
-			t.Fatalf("expected browser.select, got %v", got)
-		}
-		params, _ := req["params"].(map[string]any)
-		if got := params["surface_id"]; got != "env-sf" {
-			t.Fatalf("expected surface_id env-sf, got %v", got)
-		}
-		if got := params["selector"]; got != "select[name=plan]" {
-			t.Fatalf("expected selector, got %v", got)
-		}
-		if got := params["value"]; got != "free" {
-			t.Fatalf("expected value, got %v", got)
-		}
-		if _, ok := params["text"]; ok {
-			t.Fatalf("browser.select should not send text param: %#v", params)
-		}
-	case <-time.After(2 * time.Second):
-		t.Fatal("timed out waiting for browser select request")
-	}
-}
-
-func TestCLIBrowserEvalUsesPositionalScript(t *testing.T) {
-	sockPath, requests := startMockV2SocketWithRequestCapture(t)
-	t.Setenv("CMUX_SURFACE_ID", "env-sf")
-	code := runCLI([]string{
-		"--socket", sockPath, "--json",
-		"browser", "eval",
-		"document.title",
-	})
-	if code != 0 {
-		t.Fatalf("browser eval should return 0, got %d", code)
-	}
-
-	select {
-	case req := <-requests:
-		if got := req["method"]; got != "browser.eval" {
-			t.Fatalf("expected browser.eval, got %v", got)
-		}
-		params, _ := req["params"].(map[string]any)
-		if got := params["surface_id"]; got != "env-sf" {
-			t.Fatalf("expected surface_id env-sf, got %v", got)
-		}
-		if got := params["script"]; got != "document.title" {
-			t.Fatalf("expected script, got %v", got)
-		}
-	case <-time.After(2 * time.Second):
-		t.Fatal("timed out waiting for browser eval request")
-	}
-}
-
-func TestCLINoArgs(t *testing.T) {
-	code := runCLI([]string{})
-	if code != 2 {
-		t.Fatalf("no args should return 2, got %d", code)
-	}
-}
-
-func TestParseFlagsRejectsMissingFlagValue(t *testing.T) {
-	_, err := parseFlags(
-		[]string{"--timeout-ms"},
-		[]string{"timeout-ms", "url-contains"},
-	)
-	if err == nil {
-		t.Fatal("parseFlags should reject missing flag values")
-	}
-	if got, want := err.Error(), "flag --timeout-ms requires a value"; got != want {
-		t.Fatalf("unexpected parseFlags error %q, want %q", got, want)
-	}
-}
-
-func TestParseFlagsAllowsSingleDashFlagValue(t *testing.T) {
-	parsed, err := parseFlags(
-		[]string{"--text", "-n", "--command", "-lc echo hi"},
-		[]string{"text", "command"},
-	)
-	if err != nil {
-		t.Fatalf("parseFlags should allow single-dash values: %v", err)
-	}
-	if got := parsed.flags["text"]; got != "-n" {
-		t.Fatalf("expected text -n, got %q", got)
-	}
-	if got := parsed.flags["command"]; got != "-lc echo hi" {
-		t.Fatalf("expected command -lc echo hi, got %q", got)
-	}
-}
-
-func TestParseFlagsAllowsDoubleDashFlagValue(t *testing.T) {
-	parsed, err := parseFlags(
-		[]string{"--text", "--some-content", "--body", "--flag-like text"},
-		[]string{"text", "body"},
-	)
-	if err != nil {
-		t.Fatalf("parseFlags should allow double-dash values: %v", err)
-	}
-	if got := parsed.flags["text"]; got != "--some-content" {
-		t.Fatalf("expected text --some-content, got %q", got)
-	}
-	if got := parsed.flags["body"]; got != "--flag-like text" {
-		t.Fatalf("expected body --flag-like text, got %q", got)
-	}
-}
-
-func TestCLIHelpFlag(t *testing.T) {
-	code := runCLI([]string{"--help"})
-	if code != 0 {
-		t.Fatalf("--help should return 0, got %d", code)
-	}
-}
-
-func TestCLIHelpCommand(t *testing.T) {
-	code := runCLI([]string{"help"})
-	if code != 0 {
-		t.Fatalf("help should return 0, got %d", code)
-	}
-}
-
-func TestFlagToParamKey(t *testing.T) {
-	tests := []struct {
-		input, expected string
-	}{
-		{"workspace", "workspace_id"},
-		{"surface", "surface_id"},
-		{"panel", "panel_id"},
-		{"pane", "pane_id"},
-		{"window", "window_id"},
-		{"command", "initial_command"},
-		{"name", "title"},
-		{"working-directory", "working_directory"},
-		{"title", "title"},
-		{"url", "url"},
-		{"direction", "direction"},
-	}
-	for _, tc := range tests {
-		got := flagToParamKey(tc.input)
-		if got != tc.expected {
-			t.Errorf("flagToParamKey(%q) = %q, want %q", tc.input, got, tc.expected)
-		}
-	}
-}
-
-func TestParseFlags(t *testing.T) {
-	args := []string{"positional-cmd", "--workspace", "ws-1", "--surface", "sf-2", "--unknown", "val"}
-	_, err := parseFlags(args, []string{"workspace", "surface"})
-	if err == nil {
-		t.Fatal("parseFlags should reject unknown flags")
-	}
-}
-
-func TestParseFlagsCollectsKnownFlagsAndPositionalArgs(t *testing.T) {
-	args := []string{"positional-cmd", "--workspace", "ws-1", "--surface", "sf-2"}
-	result, err := parseFlags(args, []string{"workspace", "surface"})
-	if err != nil {
-		t.Fatalf("parseFlags should succeed for known flags: %v", err)
-	}
-	if result.flags["workspace"] != "ws-1" {
-		t.Errorf("expected workspace=ws-1, got %q", result.flags["workspace"])
-	}
-	if result.flags["surface"] != "sf-2" {
-		t.Errorf("expected surface=sf-2, got %q", result.flags["surface"])
-	}
-	if len(result.positional) == 0 || result.positional[0] != "positional-cmd" {
-		t.Errorf("expected first positional=positional-cmd, got %v", result.positional)
-	}
-}
-
-func TestCLIEnvVarDefaults(t *testing.T) {
-	// Test that CMUX_WORKSPACE_ID and CMUX_SURFACE_ID are used as defaults
-	dir := t.TempDir()
-	sockPath := filepath.Join(dir, "cmux.sock")
-
-	receivedParamsCh := make(chan map[string]any, 1)
-	ln, err := net.Listen("unix", sockPath)
-	if err != nil {
-		t.Fatalf("listen: %v", err)
-	}
-	t.Cleanup(func() { ln.Close() })
-
-	go func() {
-		conn, err := ln.Accept()
-		if err != nil {
-			return
-		}
-		buf := make([]byte, 4096)
-		n, _ := conn.Read(buf)
-		var req map[string]any
-		json.Unmarshal(buf[:n], &req)
-		receivedParams, _ := req["params"].(map[string]any)
-		receivedParamsCh <- receivedParams
-		resp := map[string]any{"id": req["id"], "ok": true, "result": map[string]any{}}
-		payload, _ := json.Marshal(resp)
-		conn.Write(append(payload, '\n'))
-		conn.Close()
-	}()
-
-	os.Setenv("CMUX_WORKSPACE_ID", "env-ws-id")
-	os.Setenv("CMUX_SURFACE_ID", "env-sf-id")
-	defer os.Unsetenv("CMUX_WORKSPACE_ID")
-	defer os.Unsetenv("CMUX_SURFACE_ID")
-
-	code := runCLI([]string{"--socket", sockPath, "--json", "close-surface"})
-	if code != 0 {
-		t.Fatalf("close-surface should return 0, got %d", code)
-	}
-	select {
-	case receivedParams := <-receivedParamsCh:
-		if receivedParams["workspace_id"] != "env-ws-id" {
-			t.Errorf("expected workspace_id from env, got %v", receivedParams["workspace_id"])
-		}
-		if receivedParams["surface_id"] != "env-sf-id" {
-			t.Errorf("expected surface_id from env, got %v", receivedParams["surface_id"])
-		}
-	case <-time.After(2 * time.Second):
-		t.Fatal("timed out waiting for close-surface payload")
-	}
-}
-
-func expectGroupRequest(t *testing.T, requests <-chan map[string]any, wantMethod string) map[string]any {
-	t.Helper()
-	select {
-	case req := <-requests:
-		if got := req["method"]; got != wantMethod {
-			t.Fatalf("expected method %s, got %v", wantMethod, got)
-		}
-		params, _ := req["params"].(map[string]any)
-		return params
-	case <-time.After(2 * time.Second):
-		t.Fatalf("timed out waiting for %s request", wantMethod)
-		return nil
-	}
-}
-
-func TestCLIWorkspaceGroupList(t *testing.T) {
-	sockPath, requests := startMockV2SocketWithRequestCapture(t)
-	code := runCLI([]string{"--socket", sockPath, "--json", "workspace", "group", "list"})
-	if code != 0 {
-		t.Fatalf("workspace group list should return 0, got %d", code)
-	}
-	expectGroupRequest(t, requests, "workspace.group.list")
-}
-
-func TestCLIWorkspaceGroupDashAlias(t *testing.T) {
-	sockPath, requests := startMockV2SocketWithRequestCapture(t)
-	code := runCLI([]string{"--socket", sockPath, "--json", "workspace-group", "collapse", "workspace_group:1"})
-	if code != 0 {
-		t.Fatalf("workspace-group collapse should return 0, got %d", code)
-	}
-	params := expectGroupRequest(t, requests, "workspace.group.collapse")
-	if got := params["group_id"]; got != "workspace_group:1" {
-		t.Fatalf("expected positional group_id, got %v", got)
-	}
-}
-
-func TestCLIWorkspaceGroupCreateMapsFlags(t *testing.T) {
-	sockPath, requests := startMockV2SocketWithRequestCapture(t)
-	code := runCLI([]string{
-		"--socket", sockPath, "--json",
-		"workspace", "group", "create",
-		"--name", "My Group",
-		"--cwd", "/repo/path",
-		"--from", "workspace:1, workspace:2",
-	})
-	if code != 0 {
-		t.Fatalf("workspace group create should return 0, got %d", code)
-	}
-	params := expectGroupRequest(t, requests, "workspace.group.create")
-	if got := params["name"]; got != "My Group" {
-		t.Fatalf("expected name, got %v", got)
-	}
-	if got := params["cwd"]; got != "/repo/path" {
-		t.Fatalf("expected cwd, got %v", got)
-	}
-	ids, _ := params["child_workspace_ids"].([]any)
-	if len(ids) != 2 || ids[0] != "workspace:1" || ids[1] != "workspace:2" {
-		t.Fatalf("expected trimmed child_workspace_ids, got %v", params["child_workspace_ids"])
-	}
-}
-
-func TestCLIWorkspaceGroupBareCreateSendsExplicitEmptyMembers(t *testing.T) {
-	sockPath, requests := startMockV2SocketWithRequestCapture(t)
-	code := runCLI([]string{"--socket", sockPath, "--json", "workspace", "group", "create"})
-	if code != 0 {
-		t.Fatalf("bare workspace group create should return 0, got %d", code)
-	}
-	params := expectGroupRequest(t, requests, "workspace.group.create")
-	ids, ok := params["child_workspace_ids"].([]any)
-	if !ok || len(ids) != 0 {
-		t.Fatalf("expected explicit empty child_workspace_ids, got %v", params)
-	}
-}
-
-func TestCLIWorkspaceGroupDeleteDefaultsToUngroupMethod(t *testing.T) {
-	sockPath, requests := startMockV2SocketWithRequestCapture(t)
-	code := runCLI([]string{"--socket", sockPath, "--json", "workspace", "group", "delete", "workspace_group:2"})
-	if code != 0 {
-		t.Fatalf("workspace group delete should return 0, got %d", code)
-	}
-	params := expectGroupRequest(t, requests, "workspace.group.ungroup")
-	if got := params["group_id"]; got != "workspace_group:2" {
-		t.Fatalf("expected group_id to survive safe delete routing, got %v", params)
-	}
-}
-
-func TestCLIWorkspaceGroupDeleteForwardsExplicitCloseIntent(t *testing.T) {
-	sockPath, requests := startMockV2SocketWithRequestCapture(t)
-	code := runCLI([]string{
-		"--socket", sockPath, "--json", "workspace", "group", "delete",
-		"workspace_group:2", "--close-workspaces",
-	})
-	if code != 0 {
-		t.Fatalf("explicit destructive workspace group delete should return 0, got %d", code)
-	}
-	params := expectGroupRequest(t, requests, "workspace.group.delete")
-	if got, ok := params["close_workspaces"].(bool); !ok || !got {
-		t.Fatalf("expected close_workspaces=true, got %v", params)
-	}
-}
-
-func TestWorkspaceGroupRelayOutputReportsRemovalImpact(t *testing.T) {
-	tests := []struct {
-		name string
-		resp string
-		want string
-	}{
-		{
-			name: "dissolved",
-			resp: `{"operation":"dissolved","kept_workspace_count":2}`,
-			want: "OK operation=dissolved kept_workspace_count=2",
-		},
-		{
-			name: "closed workspaces",
-			resp: `{"operation":"closed_workspaces","closed_workspace_count":3}`,
-			want: "OK operation=closed_workspaces closed_workspace_count=3",
-		},
-	}
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			if got := workspaceGroupRelayOutput(test.resp); got != test.want {
-				t.Fatalf("workspace group output = %q, want %q", got, test.want)
-			}
-		})
-	}
-}
-
-func TestCLIWorkspaceGroupAddRequiresGroupAndWorkspace(t *testing.T) {
-	sockPath, requests := startMockV2SocketWithRequestCapture(t)
-	if code := runCLI([]string{"--socket", sockPath, "workspace", "group", "add", "--group", "g1"}); code != 2 {
-		t.Fatalf("add without --workspace should return 2, got %d", code)
-	}
-	code := runCLI([]string{"--socket", sockPath, "--json", "workspace", "group", "add", "--group", "g1", "--workspace", "ws1"})
-	if code != 0 {
-		t.Fatalf("workspace group add should return 0, got %d", code)
-	}
-	params := expectGroupRequest(t, requests, "workspace.group.add")
-	if params["group_id"] != "g1" || params["workspace_id"] != "ws1" {
-		t.Fatalf("expected group_id/workspace_id, got %v", params)
-	}
-}
-
-func TestCLIWorkspaceGroupRenamePositionalName(t *testing.T) {
-	sockPath, requests := startMockV2SocketWithRequestCapture(t)
-	code := runCLI([]string{"--socket", sockPath, "--json", "workspace", "group", "rename", "workspace_group:2", "New Name"})
-	if code != 0 {
-		t.Fatalf("workspace group rename should return 0, got %d", code)
-	}
-	params := expectGroupRequest(t, requests, "workspace.group.rename")
-	if params["group_id"] != "workspace_group:2" || params["name"] != "New Name" {
-		t.Fatalf("expected positional group id and name, got %v", params)
-	}
-}
-
-func TestCLIWorkspaceGroupNewWorkspaceUsesUnderscoreMethod(t *testing.T) {
-	sockPath, requests := startMockV2SocketWithRequestCapture(t)
-	code := runCLI([]string{"--socket", sockPath, "--json", "workspace", "group", "new-workspace", "workspace_group:3", "--placement", "top"})
-	if code != 0 {
-		t.Fatalf("workspace group new-workspace should return 0, got %d", code)
-	}
-	params := expectGroupRequest(t, requests, "workspace.group.new_workspace")
-	if params["group_id"] != "workspace_group:3" || params["placement"] != "top" {
-		t.Fatalf("expected group_id and placement, got %v", params)
-	}
-}
-
-func TestCLIWorkspaceGroupSetColorOmittedHexClears(t *testing.T) {
-	sockPath, requests := startMockV2SocketWithRequestCapture(t)
-	code := runCLI([]string{"--socket", sockPath, "--json", "workspace", "group", "set-color", "workspace_group:4"})
-	if code != 0 {
-		t.Fatalf("workspace group set-color should return 0, got %d", code)
-	}
-	params := expectGroupRequest(t, requests, "workspace.group.set_color")
-	if got, ok := params["hex"]; !ok || got != "" {
-		t.Fatalf("expected empty hex (clear), got %v", params)
-	}
-}
-
-func TestCLIWorkspaceGroupMoveValidatesPosition(t *testing.T) {
-	sockPath, requests := startMockV2SocketWithRequestCapture(t)
-	if code := runCLI([]string{"--socket", sockPath, "workspace", "group", "move", "g1"}); code != 2 {
-		t.Fatalf("move without a position flag should return 2, got %d", code)
-	}
-	if code := runCLI([]string{"--socket", sockPath, "workspace", "group", "move", "g1", "--to-index", "abc"}); code != 2 {
-		t.Fatalf("move with non-integer --to-index should return 2, got %d", code)
-	}
-	code := runCLI([]string{"--socket", sockPath, "--json", "workspace", "group", "move", "g1", "--to-index", "2"})
-	if code != 0 {
-		t.Fatalf("workspace group move should return 0, got %d", code)
-	}
-	params := expectGroupRequest(t, requests, "workspace.group.move")
-	if got, ok := params["to_index"].(float64); !ok || got != 2 {
-		t.Fatalf("expected integer to_index 2, got %v", params)
-	}
-	if params["group_id"] != "g1" {
-		t.Fatalf("expected group_id g1, got %v", params)
-	}
-}
-
-func TestCLIWorkspaceGroupUnknownSubcommand(t *testing.T) {
-	sockPath := startMockV2Socket(t)
-	if code := runCLI([]string{"--socket", sockPath, "workspace", "group", "explode"}); code != 2 {
-		t.Fatalf("unknown group subcommand should return 2, got %d", code)
-	}
-	if code := runCLI([]string{"--socket", sockPath, "workspace", "group"}); code != 2 {
-		t.Fatalf("bare workspace group should return 2, got %d", code)
-	}
-	if code := runCLI([]string{"--socket", sockPath, "workspace", "rename"}); code != 2 {
-		t.Fatalf("unsupported workspace subcommand should return 2, got %d", code)
-	}
-}
-
-func TestCLIWorkspaceGroupListForwardsCallerEnvContext(t *testing.T) {
-	sockPath, requests := startMockV2SocketWithRequestCapture(t)
-	t.Setenv("CMUX_WORKSPACE_ID", "env-ws")
-	t.Setenv("CMUX_SURFACE_ID", "env-sf")
-	code := runCLI([]string{"--socket", sockPath, "--json", "workspace", "group", "list"})
-	if code != 0 {
-		t.Fatalf("workspace group list should return 0, got %d", code)
-	}
-	params := expectGroupRequest(t, requests, "workspace.group.list")
-	if params["workspace_id"] != "env-ws" || params["surface_id"] != "env-sf" {
-		t.Fatalf("expected caller env context to be forwarded, got %v", params)
-	}
-}
-
-func TestCLIWorkspaceGroupRemoveStillRequiresExplicitWorkspaceWithEnv(t *testing.T) {
-	sockPath := startMockV2Socket(t)
-	t.Setenv("CMUX_WORKSPACE_ID", "env-ws")
-	if code := runCLI([]string{"--socket", sockPath, "workspace", "group", "remove"}); code != 2 {
-		t.Fatalf("remove without --workspace should return 2 even with env set, got %d", code)
-	}
-}
-
-func TestCLINotifyUsesCallerEnvForCloudBridge(t *testing.T) {
-	sockPath, requests := startMockV2SocketWithRequestCapture(t)
-	t.Setenv("CMUX_WORKSPACE_ID", "env-ws")
-	t.Setenv("CMUX_SURFACE_ID", "env-sf")
-
-	code := runCLI([]string{"--socket", sockPath, "--json", "notify", "--title", "Done", "--body", "Build finished"})
-	if code != 0 {
-		t.Fatalf("notify should return 0, got %d", code)
-	}
-
-	params := expectGroupRequest(t, requests, "notification.create_for_caller")
-	if params["preferred_workspace_id"] != "env-ws" || params["preferred_surface_id"] != "env-sf" {
-		t.Fatalf("expected caller env target, got %v", params)
-	}
-	if _, exists := params["workspace_id"]; exists {
-		t.Fatalf("workspace_id should be rewritten to preferred_workspace_id, got %v", params)
-	}
-	if _, exists := params["surface_id"]; exists {
-		t.Fatalf("surface_id should be rewritten to preferred_surface_id, got %v", params)
-	}
-}
diff --git a/daemon/remote/cmd/cmuxd-remote/cloud_cli_bridge.go b/daemon/remote/cmd/cmuxd-remote/cloud_cli_bridge.go
deleted file mode 100644
index 299d90d1ae1b..000000000000
--- a/daemon/remote/cmd/cmuxd-remote/cloud_cli_bridge.go
+++ /dev/null
@@ -1,304 +0,0 @@
-package main
-
-import (
-	"bufio"
-	"context"
-	"encoding/base64"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io"
-	"net"
-	"os"
-	"path/filepath"
-	"strings"
-	"sync"
-	"time"
-)
-
-const defaultCloudCLIBridgeSocketPath = "/tmp/cmux-cloud-cli.sock"
-
-type cloudCLIResponse struct {
-	data []byte
-	err  string
-}
-
-type cloudCLIForwardTarget struct {
-	server    *rpcServer
-	requestID string
-}
-
-type cloudCLIBridge struct {
-	mu       sync.Mutex
-	nextID   uint64
-	servers  map[*rpcServer]struct{}
-	pending  map[string]chan cloudCLIResponse
-	listener net.Listener
-}
-
-func newCloudCLIBridge() *cloudCLIBridge {
-	return &cloudCLIBridge{
-		servers: map[*rpcServer]struct{}{},
-		pending: map[string]chan cloudCLIResponse{},
-	}
-}
-
-func defaultCloudCLIBridgeSocketIfExists() string {
-	if info, err := os.Stat(defaultCloudCLIBridgeSocketPath); err == nil && info.Mode()&os.ModeSocket != 0 {
-		return defaultCloudCLIBridgeSocketPath
-	}
-	return ""
-}
-
-func (b *cloudCLIBridge) start(ctx context.Context, socketPath string, stderr io.Writer) error {
-	if b == nil {
-		return nil
-	}
-	socketPath = stringsTrimSpaceOrDefault(socketPath, defaultCloudCLIBridgeSocketPath)
-	if err := os.MkdirAll(filepath.Dir(socketPath), 0o755); err != nil {
-		return err
-	}
-	_ = os.Remove(socketPath)
-	listener, err := net.Listen("unix", socketPath)
-	if err != nil {
-		return err
-	}
-	if err := os.Chmod(socketPath, 0o666); err != nil {
-		_ = listener.Close()
-		_ = os.Remove(socketPath)
-		return err
-	}
-	b.mu.Lock()
-	b.listener = listener
-	b.mu.Unlock()
-	_, _ = fmt.Fprintf(stderr, "cmuxd-remote cloud CLI bridge listening on %s\n", socketPath)
-	go func() {
-		<-ctx.Done()
-		_ = listener.Close()
-	}()
-	go b.acceptLoop(listener, socketPath, stderr)
-	return nil
-}
-
-func (b *cloudCLIBridge) acceptLoop(listener net.Listener, socketPath string, stderr io.Writer) {
-	defer os.Remove(socketPath)
-	for {
-		conn, err := listener.Accept()
-		if err != nil {
-			return
-		}
-		go b.handleConn(conn)
-	}
-}
-
-func (b *cloudCLIBridge) register(server *rpcServer) func() {
-	if b == nil || server == nil {
-		return func() {}
-	}
-	b.mu.Lock()
-	b.servers[server] = struct{}{}
-	b.mu.Unlock()
-	return func() {
-		b.mu.Lock()
-		delete(b.servers, server)
-		b.mu.Unlock()
-	}
-}
-
-func (b *cloudCLIBridge) handleConn(conn net.Conn) {
-	defer conn.Close()
-	_ = conn.SetDeadline(time.Now().Add(16 * time.Second))
-	reader := bufio.NewReaderSize(conn, maxRPCFrameBytes)
-	line, oversized, err := readRPCFrame(reader, maxRPCFrameBytes)
-	if err != nil {
-		return
-	}
-	if oversized {
-		_, _ = conn.Write([]byte(`{"ok":false,"error":{"code":"request_too_large","message":"cloud CLI request exceeded maximum size"}}` + "\n"))
-		return
-	}
-	response, err := b.forward(line)
-	if err != nil {
-		_, _ = conn.Write([]byte(fmt.Sprintf(`{"ok":false,"error":{"code":"cloud_cli_unavailable","message":%q}}`+"\n", err.Error())))
-		return
-	}
-	_, _ = conn.Write(response)
-	if len(response) == 0 || response[len(response)-1] != '\n' {
-		_, _ = conn.Write([]byte("\n"))
-	}
-}
-
-func (b *cloudCLIBridge) forward(request []byte) ([]byte, error) {
-	targets, responseCh := b.reserveRequests()
-	if len(targets) == 0 {
-		return nil, errors.New("no cmux app is attached to this cloud VM")
-	}
-
-	dataBase64 := base64.StdEncoding.EncodeToString(request)
-	sentTargets := make([]cloudCLIForwardTarget, 0, len(targets))
-	var writeErr error
-	for _, target := range targets {
-		if err := target.server.frameWriter.writeEvent(rpcEvent{
-			Event:      "cli.request",
-			RequestID:  target.requestID,
-			DataBase64: dataBase64,
-		}); err != nil {
-			b.forgetRequest(target.requestID)
-			writeErr = err
-			continue
-		}
-		sentTargets = append(sentTargets, target)
-	}
-	if len(sentTargets) == 0 {
-		if writeErr != nil {
-			return nil, writeErr
-		}
-		return nil, errors.New("no cmux app accepted cloud CLI request")
-	}
-
-	defer b.forgetRequests(sentTargets)
-	var firstRoutingRejection []byte
-	var firstResponseErr string
-	pending := len(sentTargets)
-	timeout := time.After(15 * time.Second)
-	select {
-	case <-timeout:
-		return nil, errors.New("timed out waiting for cmux app response")
-	default:
-	}
-	for pending > 0 {
-		select {
-		case response := <-responseCh:
-			pending--
-			if response.err != "" {
-				if firstResponseErr == "" {
-					firstResponseErr = response.err
-				}
-				continue
-			}
-			if len(sentTargets) > 1 && isCloudCLIWorkspaceRoutingRejection(response.data) {
-				if firstRoutingRejection == nil {
-					firstRoutingRejection = response.data
-				}
-				continue
-			}
-			return response.data, nil
-		case <-timeout:
-			return nil, errors.New("timed out waiting for cmux app response")
-		}
-	}
-	if firstRoutingRejection != nil {
-		return firstRoutingRejection, nil
-	}
-	if firstResponseErr != "" {
-		return nil, errors.New(firstResponseErr)
-	}
-	return nil, errors.New("cmux app rejected cloud CLI request")
-}
-
-func (b *cloudCLIBridge) reserveRequests() ([]cloudCLIForwardTarget, chan cloudCLIResponse) {
-	b.mu.Lock()
-	defer b.mu.Unlock()
-	if len(b.servers) == 0 {
-		return nil, nil
-	}
-	responseCh := make(chan cloudCLIResponse, len(b.servers))
-	targets := make([]cloudCLIForwardTarget, 0, len(b.servers))
-	for server := range b.servers {
-		b.nextID++
-		requestID := fmt.Sprintf("cli-%d", b.nextID)
-		b.pending[requestID] = responseCh
-		targets = append(targets, cloudCLIForwardTarget{server: server, requestID: requestID})
-	}
-	return targets, responseCh
-}
-
-func (b *cloudCLIBridge) forgetRequest(requestID string) {
-	b.mu.Lock()
-	delete(b.pending, requestID)
-	b.mu.Unlock()
-}
-
-func (b *cloudCLIBridge) forgetRequests(targets []cloudCLIForwardTarget) {
-	b.mu.Lock()
-	for _, target := range targets {
-		delete(b.pending, target.requestID)
-	}
-	b.mu.Unlock()
-}
-
-func (b *cloudCLIBridge) deliverResponse(requestID string, response cloudCLIResponse) bool {
-	b.mu.Lock()
-	ch := b.pending[requestID]
-	if ch != nil {
-		delete(b.pending, requestID)
-	}
-	b.mu.Unlock()
-	if ch == nil {
-		return false
-	}
-	ch <- response
-	return true
-}
-
-func (s *rpcServer) handleCLIResponse(req rpcRequest) rpcResponse {
-	if s.cliBridge == nil {
-		return rpcResponse{ID: req.ID, OK: false, Error: &rpcError{Code: "unavailable", Message: "cloud CLI bridge is not enabled"}}
-	}
-	requestID, ok := getStringParam(req.Params, "request_id")
-	if !ok || requestID == "" {
-		return rpcResponse{ID: req.ID, OK: false, Error: &rpcError{Code: "invalid_params", Message: "cli.response requires request_id"}}
-	}
-	responseOK := true
-	if raw, exists := req.Params["ok"]; exists {
-		if typed, isBool := raw.(bool); isBool {
-			responseOK = typed
-		}
-	}
-	var response cloudCLIResponse
-	if responseOK {
-		dataBase64, ok := getStringParam(req.Params, "data_base64")
-		if !ok {
-			return rpcResponse{ID: req.ID, OK: false, Error: &rpcError{Code: "invalid_params", Message: "cli.response requires data_base64"}}
-		}
-		data, err := base64.StdEncoding.DecodeString(dataBase64)
-		if err != nil {
-			return rpcResponse{ID: req.ID, OK: false, Error: &rpcError{Code: "invalid_params", Message: "data_base64 must be valid base64"}}
-		}
-		response.data = data
-	} else {
-		response.err, _ = getStringParam(req.Params, "error")
-		if response.err == "" {
-			response.err = "cmux app rejected cloud CLI request"
-		}
-	}
-	if !s.cliBridge.deliverResponse(requestID, response) {
-		return rpcResponse{ID: req.ID, OK: false, Error: &rpcError{Code: "not_found", Message: "cloud CLI request not found"}}
-	}
-	return rpcResponse{ID: req.ID, OK: true, Result: map[string]any{"delivered": true}}
-}
-
-func isCloudCLIWorkspaceRoutingRejection(data []byte) bool {
-	var envelope struct {
-		OK    bool `json:"ok"`
-		Error *struct {
-			Code string `json:"code"`
-		} `json:"error"`
-	}
-	if err := json.Unmarshal(data, &envelope); err != nil {
-		return false
-	}
-	if envelope.OK || envelope.Error == nil {
-		return false
-	}
-	return envelope.Error.Code == "remote_cli_workspace_denied" ||
-		envelope.Error.Code == "remote_cli_unscoped"
-}
-
-func stringsTrimSpaceOrDefault(value string, fallback string) string {
-	value = strings.TrimSpace(value)
-	if value == "" {
-		return fallback
-	}
-	return value
-}
diff --git a/daemon/remote/cmd/cmuxd-remote/cloud_cli_bridge_test.go b/daemon/remote/cmd/cmuxd-remote/cloud_cli_bridge_test.go
deleted file mode 100644
index eb698a9fd7e0..000000000000
--- a/daemon/remote/cmd/cmuxd-remote/cloud_cli_bridge_test.go
+++ /dev/null
@@ -1,114 +0,0 @@
-package main
-
-import (
-	"encoding/base64"
-	"testing"
-)
-
-type testCLIBridgeFrameWriter struct {
-	onEvent func(rpcEvent) error
-}
-
-func (w testCLIBridgeFrameWriter) writeResponse(rpcResponse) error {
-	return nil
-}
-
-func (w testCLIBridgeFrameWriter) writeEvent(event rpcEvent) error {
-	return w.onEvent(event)
-}
-
-func TestCloudCLIBridgeForwardsRequestThroughRPCEvent(t *testing.T) {
-	bridge := newCloudCLIBridge()
-	server := &rpcServer{cliBridge: bridge}
-	server.frameWriter = testCLIBridgeFrameWriter{onEvent: func(event rpcEvent) error {
-		if event.Event != "cli.request" {
-			t.Fatalf("event = %q, want cli.request", event.Event)
-		}
-		if event.RequestID == "" {
-			t.Fatal("request_id was empty")
-		}
-		request, err := base64.StdEncoding.DecodeString(event.DataBase64)
-		if err != nil {
-			t.Fatalf("decode request: %v", err)
-		}
-		if string(request) != "ping\n" {
-			t.Fatalf("request = %q, want ping newline", string(request))
-		}
-		response := base64.StdEncoding.EncodeToString([]byte("pong\n"))
-		resp := server.handleCLIResponse(rpcRequest{
-			ID:     "response",
-			Method: "cli.response",
-			Params: map[string]any{
-				"request_id":  event.RequestID,
-				"ok":          true,
-				"data_base64": response,
-			},
-		})
-		if !resp.OK {
-			t.Fatalf("cli.response failed: %+v", resp)
-		}
-		return nil
-	}}
-	unregister := bridge.register(server)
-	defer unregister()
-
-	response, err := bridge.forward([]byte("ping\n"))
-	if err != nil {
-		t.Fatalf("forward failed: %v", err)
-	}
-	if string(response) != "pong\n" {
-		t.Fatalf("response = %q, want pong newline", string(response))
-	}
-}
-
-func TestCloudCLIBridgeSkipsWrongWorkspaceResponses(t *testing.T) {
-	bridge := newCloudCLIBridge()
-	deniedServer := &rpcServer{cliBridge: bridge}
-	acceptedServer := &rpcServer{cliBridge: bridge}
-
-	deniedServer.frameWriter = testCLIBridgeFrameWriter{onEvent: func(event rpcEvent) error {
-		response := base64.StdEncoding.EncodeToString([]byte(`{"ok":false,"error":{"code":"remote_cli_workspace_denied","message":"wrong workspace"}}` + "\n"))
-		resp := deniedServer.handleCLIResponse(rpcRequest{
-			ID:     "denied-response",
-			Method: "cli.response",
-			Params: map[string]any{
-				"request_id":  event.RequestID,
-				"ok":          true,
-				"data_base64": response,
-			},
-		})
-		if !resp.OK {
-			t.Fatalf("denied cli.response failed: %+v", resp)
-		}
-		return nil
-	}}
-	acceptedServer.frameWriter = testCLIBridgeFrameWriter{onEvent: func(event rpcEvent) error {
-		response := base64.StdEncoding.EncodeToString([]byte(`{"ok":true,"result":{"delivered":true}}` + "\n"))
-		resp := acceptedServer.handleCLIResponse(rpcRequest{
-			ID:     "accepted-response",
-			Method: "cli.response",
-			Params: map[string]any{
-				"request_id":  event.RequestID,
-				"ok":          true,
-				"data_base64": response,
-			},
-		})
-		if !resp.OK {
-			t.Fatalf("accepted cli.response failed: %+v", resp)
-		}
-		return nil
-	}}
-
-	unregisterDenied := bridge.register(deniedServer)
-	defer unregisterDenied()
-	unregisterAccepted := bridge.register(acceptedServer)
-	defer unregisterAccepted()
-
-	response, err := bridge.forward([]byte("notify\n"))
-	if err != nil {
-		t.Fatalf("forward failed: %v", err)
-	}
-	if string(response) != `{"ok":true,"result":{"delivered":true}}`+"\n" {
-		t.Fatalf("response = %q, want accepted response", string(response))
-	}
-}
diff --git a/daemon/remote/cmd/cmuxd-remote/commands.go b/daemon/remote/cmd/cmuxd-remote/commands.go
deleted file mode 100644
index d7eeb56c74bd..000000000000
--- a/daemon/remote/cmd/cmuxd-remote/commands.go
+++ /dev/null
@@ -1,228 +0,0 @@
-package main
-
-// commands is the relay's command table. Each entry maps a CLI command name to
-// a v2 JSON-RPC method and declares which flags it accepts. Relay-specific
-// behaviour (paramKeyOverrides, specialDispatch, defaultParams) lives in
-// cli_overrides.go; init() in cli.go applies those overrides on top.
-var commands = []commandSpec{
-	{
-		name:      "break-pane",
-		v2Method:  "pane.break",
-		flagKeys:  []string{"pane", "surface", "workspace", "window", "focus", "no-focus"},
-		boolFlags: []string{"focus", "no-focus"},
-	},
-	{
-		name:     "capabilities",
-		v2Method: "system.capabilities",
-		noParams: true,
-	},
-	{
-		name:     "clear-history",
-		v2Method: "surface.clear_history",
-		flagKeys: []string{"surface", "workspace", "window"},
-	},
-	{
-		name:     "close-surface",
-		v2Method: "surface.close",
-		flagKeys: []string{"surface", "panel", "workspace", "window"},
-	},
-	{
-		name:     "close-window",
-		v2Method: "window.close",
-		flagKeys: []string{"window"},
-	},
-	{
-		name:     "close-workspace",
-		v2Method: "workspace.close",
-		flagKeys: []string{"workspace", "window"},
-	},
-	{
-		name:     "current-window",
-		v2Method: "window.current",
-		noParams: true,
-	},
-	{
-		name:     "current-workspace",
-		v2Method: "workspace.current",
-		flagKeys: []string{"window"},
-	},
-	{
-		name:      "dismiss-notification",
-		v2Method:  "notification.dismiss",
-		flagKeys:  []string{"id", "all-read"},
-		boolFlags: []string{"all-read"},
-	},
-	{
-		name:     "equalize-splits",
-		v2Method: "workspace.equalize_splits",
-		flagKeys: []string{"workspace", "window"},
-	},
-	{
-		name:     "focus-panel",
-		v2Method: "surface.focus",
-		flagKeys: []string{"panel", "workspace", "window"},
-	},
-	{
-		name:     "focus-window",
-		v2Method: "window.focus",
-		flagKeys: []string{"window"},
-	},
-	{
-		name:      "join-pane",
-		v2Method:  "pane.join",
-		flagKeys:  []string{"target-pane", "pane", "surface", "workspace", "window", "focus", "no-focus"},
-		boolFlags: []string{"focus", "no-focus"},
-	},
-	{
-		name:     "jump-to-unread",
-		v2Method: "notification.jump_to_unread",
-		noParams: true,
-	},
-	{
-		name:     "last-pane",
-		v2Method: "pane.last",
-		flagKeys: []string{"workspace", "window"},
-	},
-	{
-		name:     "last-workspace",
-		v2Method: "workspace.last",
-		flagKeys: []string{"window"},
-	},
-	{
-		name:     "list-pane-surfaces",
-		v2Method: "pane.surfaces",
-		flagKeys: []string{"pane", "workspace", "window"},
-	},
-	{
-		name:     "list-panes",
-		v2Method: "pane.list",
-		flagKeys: []string{"workspace", "window"},
-	},
-	{
-		name:     "list-panels",
-		v2Method: "surface.list",
-		flagKeys: []string{"workspace", "window"},
-	},
-	{
-		name:     "list-windows",
-		v2Method: "window.list",
-		noParams: true,
-	},
-	{
-		name:     "list-workspaces",
-		v2Method: "workspace.list",
-		flagKeys: []string{"window"},
-	},
-	{
-		name:      "mark-notification-read",
-		v2Method:  "notification.mark_read",
-		flagKeys:  []string{"id", "workspace", "surface", "window", "all"},
-		boolFlags: []string{"all"},
-	},
-	{
-		name:     "move-workspace-to-window",
-		v2Method: "workspace.move_to_window",
-		flagKeys: []string{"workspace", "window"},
-	},
-	{
-		name:      "new-pane",
-		v2Method:  "pane.create",
-		flagKeys:  []string{"type", "direction", "placement", "workspace", "window", "url", "focus"},
-		boolFlags: []string{"focus"},
-	},
-	{
-		name:          "new-split",
-		v2Method:      "surface.split",
-		flagKeys:      []string{"surface", "panel", "workspace", "window", "focus"},
-		boolFlags:     []string{"focus"},
-		positionalKey: "direction",
-	},
-	{
-		name:      "new-surface",
-		v2Method:  "surface.create",
-		flagKeys:  []string{"type", "pane", "placement", "workspace", "window", "url", "provider", "renderer", "working-directory", "focus"},
-		boolFlags: []string{"focus"},
-	},
-	{
-		name:     "new-window",
-		v2Method: "window.create",
-		noParams: true,
-	},
-	{
-		name:       "new-workspace",
-		v2Method:   "workspace.create",
-		flagKeys:   []string{"name", "cwd", "description", "focus", "window", "group", "group-placement", "group-reference", "layout", "env-file", "command"},
-		boolFlags:  []string{"focus"},
-		repeatKeys: []string{"env"},
-	},
-	{
-		name:     "next-workspace",
-		v2Method: "workspace.next",
-		flagKeys: []string{"window"},
-	},
-	{
-		name:     "notify",
-		v2Method: "notification.create",
-		flagKeys: []string{"title", "subtitle", "body", "workspace", "surface", "window"},
-	},
-	{
-		name:     "open-notification",
-		v2Method: "notification.open",
-		flagKeys: []string{"id"},
-	},
-	{
-		name:     "ping",
-		v2Method: "system.ping",
-		noParams: true,
-	},
-	{
-		name:     "previous-workspace",
-		v2Method: "workspace.previous",
-		flagKeys: []string{"window"},
-	},
-	{
-		name:      "read-screen",
-		v2Method:  "surface.read_text",
-		flagKeys:  []string{"surface", "workspace", "window", "scrollback", "lines"},
-		boolFlags: []string{"scrollback"},
-	},
-	{
-		name:     "refresh-surfaces",
-		v2Method: "surface.refresh",
-		noParams: true,
-	},
-	{
-		name:          "rename-workspace",
-		v2Method:      "workspace.rename",
-		flagKeys:      []string{"workspace", "window", "title"},
-		positionalKey: "title",
-	},
-	{
-		name:     "resize-pane",
-		v2Method: "pane.resize",
-		flagKeys: []string{"pane", "workspace", "window", "direction", "amount"},
-	},
-	{
-		name:     "select-workspace",
-		v2Method: "workspace.select",
-		flagKeys: []string{"workspace", "window"},
-	},
-	{
-		name:          "send",
-		v2Method:      "surface.send_text",
-		flagKeys:      []string{"surface", "workspace", "window"},
-		positionalKey: "text",
-	},
-	{
-		name:          "send-key",
-		v2Method:      "surface.send_key",
-		flagKeys:      []string{"surface", "workspace", "window"},
-		positionalKey: "key",
-	},
-	{
-		name:      "swap-pane",
-		v2Method:  "pane.swap",
-		flagKeys:  []string{"pane", "target-pane", "workspace", "window", "focus"},
-		boolFlags: []string{"focus"},
-	},
-}
diff --git a/daemon/remote/cmd/cmuxd-remote/main.go b/daemon/remote/cmd/cmuxd-remote/main.go
deleted file mode 100644
index 758136b4ee33..000000000000
--- a/daemon/remote/cmd/cmuxd-remote/main.go
+++ /dev/null
@@ -1,3228 +0,0 @@
-package main
-
-import (
-	"bufio"
-	"bytes"
-	"context"
-	"crypto/rand"
-	"crypto/sha256"
-	"crypto/subtle"
-	"encoding/base64"
-	"encoding/hex"
-	"encoding/json"
-	"errors"
-	"flag"
-	"fmt"
-	"io"
-	"math"
-	"net"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"sort"
-	"strconv"
-	"strings"
-	"sync"
-	"sync/atomic"
-	"syscall"
-	"time"
-)
-
-var version = "dev"
-
-type rpcRequest struct {
-	ID     any            `json:"id"`
-	HasID  bool           `json:"-"`
-	Method string         `json:"method"`
-	Params map[string]any `json:"params"`
-}
-
-func (r *rpcRequest) UnmarshalJSON(data []byte) error {
-	type rpcRequestWire struct {
-		ID     json.RawMessage `json:"id"`
-		Method string          `json:"method"`
-		Params map[string]any  `json:"params"`
-	}
-	var wire rpcRequestWire
-	if err := json.Unmarshal(data, &wire); err != nil {
-		return err
-	}
-	r.HasID = len(wire.ID) > 0
-	r.ID = nil
-	if r.HasID && string(wire.ID) != "null" {
-		if err := json.Unmarshal(wire.ID, &r.ID); err != nil {
-			return err
-		}
-	}
-	r.Method = wire.Method
-	r.Params = wire.Params
-	return nil
-}
-
-type rpcError struct {
-	Code    string `json:"code"`
-	Message string `json:"message"`
-}
-
-type rpcResponse struct {
-	ID     any       `json:"id,omitempty"`
-	OK     bool      `json:"ok"`
-	Result any       `json:"result,omitempty"`
-	Error  *rpcError `json:"error,omitempty"`
-}
-
-type rpcEvent struct {
-	Event           string `json:"event"`
-	StreamID        string `json:"stream_id,omitempty"`
-	RequestID       string `json:"request_id,omitempty"`
-	SessionID       string `json:"session_id,omitempty"`
-	AttachmentID    string `json:"attachment_id,omitempty"`
-	AttachmentToken string `json:"attachment_token,omitempty"`
-	DataBase64      string `json:"data_base64,omitempty"`
-	Message         string `json:"message,omitempty"`
-	Error           string `json:"error,omitempty"`
-	Seq             uint64 `json:"seq,omitempty"`
-}
-
-type rpcFrameWriter interface {
-	writeResponse(rpcResponse) error
-	writeEvent(rpcEvent) error
-}
-
-type streamState struct {
-	conn          net.Conn
-	readerStarted bool
-}
-
-type stdioFrameWriter struct {
-	mu     sync.Mutex
-	writer *bufio.Writer
-}
-
-type rpcServer struct {
-	mu sync.Mutex
-	// closed prevents an asynchronous attach from becoming owned after the
-	// connection teardown snapshot has already been drained.
-	closed         bool
-	nextStreamID   uint64
-	nextSessionID  uint64
-	streams        map[string]*streamState
-	sessions       map[string]*sessionState
-	ptyHub         *wsPTYHub
-	ownsPTYHub     bool
-	ptyAttachments map[string]*wsPTYAttachment
-	frameWriter    rpcFrameWriter
-	cliBridge      *cloudCLIBridge
-}
-
-type rpcRequestDispatcher struct {
-	ctx              context.Context
-	cancelConnection context.CancelFunc
-	interruptRead    func()
-	server           *rpcServer
-	ptyAttachSlots   chan struct{}
-	// Request cancellation is separate from attachment lifetime: completed
-	// attachments remain connection-owned after their request leaves this map.
-	ptyAttachMu       sync.Mutex
-	ptyAttachRequests map[string]*rpcPTYAttachRequest
-	asyncErrors       chan error
-}
-
-type rpcPTYAttachRequest struct {
-	requestIDKey    string
-	sessionID       string
-	attachmentID    string
-	attachmentToken string
-	cancel          context.CancelFunc
-}
-
-func newRPCRequestDispatcher(
-	ctx context.Context,
-	cancelConnection context.CancelFunc,
-	interruptRead func(),
-	server *rpcServer,
-) *rpcRequestDispatcher {
-	return &rpcRequestDispatcher{
-		ctx:               ctx,
-		cancelConnection:  cancelConnection,
-		interruptRead:     interruptRead,
-		server:            server,
-		ptyAttachSlots:    make(chan struct{}, maxConcurrentPTYAttachRPCsPerConnection),
-		ptyAttachRequests: map[string]*rpcPTYAttachRequest{},
-		asyncErrors:       make(chan error, 1),
-	}
-}
-
-func (d *rpcRequestDispatcher) dispatch(req rpcRequest) error {
-	// PTY allocation can block inside the operating system. Only pty.attach is
-	// allowed to overtake the otherwise-serialized request stream; both frame
-	// writers serialize the resulting concurrent response writes. Before
-	// reading the next request, wait only until the attach has reserved or
-	// selected its hub generation so a following pty.close cannot overtake it.
-	if req.Method == "pty.attach.cancel" {
-		d.cancelPTYAttach(req)
-		return nil
-	}
-	if req.Method != "pty.attach" {
-		return d.server.handleRequestAndWriteResponse(req)
-	}
-
-	select {
-	case <-d.ctx.Done():
-		return d.ctx.Err()
-	case d.ptyAttachSlots <- struct{}{}:
-	default:
-		return d.server.frameWriter.writeResponse(rpcResponse{
-			ID: req.ID,
-			OK: false,
-			Error: &rpcError{
-				Code:    "unavailable",
-				Message: "too many PTY attach requests are already in progress",
-			},
-		})
-	}
-
-	attachCtx, attachRequest, registered := d.registerPTYAttach(req)
-	if !registered {
-		<-d.ptyAttachSlots
-		return d.server.frameWriter.writeResponse(rpcResponse{
-			ID: req.ID,
-			OK: false,
-			Error: &rpcError{
-				Code:    "invalid_request",
-				Message: "PTY attach request id is already in progress",
-			},
-		})
-	}
-
-	reservationReady := make(chan struct{})
-	go func() {
-		defer func() { <-d.ptyAttachSlots }()
-		defer d.finishPTYAttach(attachRequest)
-		if err := d.server.handlePTYAttachAndWriteResponseWithReservation(attachCtx, d.ctx, req, func() {
-			close(reservationReady)
-		}); err != nil {
-			select {
-			case d.asyncErrors <- err:
-			default:
-			}
-			d.cancelConnection()
-			if d.interruptRead != nil {
-				d.interruptRead()
-			}
-		}
-	}()
-	select {
-	case <-reservationReady:
-		return nil
-	case <-d.ctx.Done():
-		return d.ctx.Err()
-	}
-}
-
-func (d *rpcRequestDispatcher) registerPTYAttach(req rpcRequest) (context.Context, *rpcPTYAttachRequest, bool) {
-	ctx, cancel := context.WithCancel(d.ctx)
-	request := &rpcPTYAttachRequest{cancel: cancel}
-	request.sessionID, _ = getStringParam(req.Params, "session_id")
-	request.attachmentID, _ = getStringParam(req.Params, "attachment_id")
-	request.attachmentToken, _ = getStringParam(req.Params, "client_attachment_token")
-	request.sessionID = strings.TrimSpace(request.sessionID)
-	request.attachmentID = strings.TrimSpace(request.attachmentID)
-	request.attachmentToken = strings.TrimSpace(request.attachmentToken)
-
-	requestIDKey, hasRequestID := normalizedRPCRequestID(req.ID)
-	if !req.HasID || !hasRequestID {
-		return ctx, request, true
-	}
-	request.requestIDKey = requestIDKey
-
-	d.ptyAttachMu.Lock()
-	defer d.ptyAttachMu.Unlock()
-	if _, exists := d.ptyAttachRequests[requestIDKey]; exists {
-		cancel()
-		return nil, nil, false
-	}
-	d.ptyAttachRequests[requestIDKey] = request
-	return ctx, request, true
-}
-
-func (d *rpcRequestDispatcher) finishPTYAttach(request *rpcPTYAttachRequest) {
-	if request == nil {
-		return
-	}
-	request.cancel()
-	if request.requestIDKey == "" {
-		return
-	}
-	d.ptyAttachMu.Lock()
-	if current := d.ptyAttachRequests[request.requestIDKey]; current == request {
-		delete(d.ptyAttachRequests, request.requestIDKey)
-	}
-	d.ptyAttachMu.Unlock()
-}
-
-func (d *rpcRequestDispatcher) cancelPTYAttach(req rpcRequest) {
-	requestID, hasRequestID := req.Params["request_id"]
-	requestIDKey, normalized := normalizedRPCRequestID(requestID)
-	var request *rpcPTYAttachRequest
-	if hasRequestID && normalized {
-		d.ptyAttachMu.Lock()
-		request = d.ptyAttachRequests[requestIDKey]
-		d.ptyAttachMu.Unlock()
-	}
-
-	sessionID, _ := getStringParam(req.Params, "session_id")
-	attachmentID, _ := getStringParam(req.Params, "attachment_id")
-	attachmentToken, _ := getStringParam(req.Params, "client_attachment_token")
-	if request != nil {
-		request.cancel()
-		sessionID = request.sessionID
-		attachmentID = request.attachmentID
-		attachmentToken = request.attachmentToken
-	}
-	// The identity cleanup closes the race where the attach completed and left
-	// the request map just before its timeout notification arrived.
-	if d.server.ptyHub != nil {
-		d.server.ptyHub.detachByID(sessionID, attachmentID, attachmentToken)
-	}
-}
-
-func normalizedRPCRequestID(id any) (string, bool) {
-	if id == nil {
-		return "", false
-	}
-	encoded, err := json.Marshal(id)
-	if err != nil {
-		return "", false
-	}
-	return string(encoded), true
-}
-
-func (d *rpcRequestDispatcher) takeAsyncError() error {
-	select {
-	case err := <-d.asyncErrors:
-		return err
-	default:
-		return nil
-	}
-}
-
-type sessionAttachment struct {
-	Cols      int
-	Rows      int
-	UpdatedAt time.Time
-}
-
-type sessionState struct {
-	attachments   map[string]sessionAttachment
-	effectiveCols int
-	effectiveRows int
-	lastKnownCols int
-	lastKnownRows int
-}
-
-const (
-	maxRPCFrameBytes                        = 4 * 1024 * 1024
-	maxConcurrentPTYAttachRPCsPerConnection = 32
-)
-
-func main() {
-	if shouldRunCLIForInvocation(os.Args[0], os.Args[1:]) {
-		os.Exit(runCLI(os.Args[1:]))
-	}
-	os.Exit(run(os.Args[1:], os.Stdin, os.Stdout, os.Stderr))
-}
-
-func shouldRunCLIForInvocation(argv0 string, args []string) bool {
-	base := filepath.Base(argv0)
-	if base == "cmux" {
-		return true
-	}
-	if !strings.HasPrefix(base, "cmuxd-remote") || len(args) == 0 {
-		return false
-	}
-	return !isDaemonEntryCommand(args[0])
-}
-
-func isDaemonEntryCommand(arg string) bool {
-	switch arg {
-	case "version", "serve", "cli":
-		return true
-	default:
-		return false
-	}
-}
-
-func run(args []string, stdin io.Reader, stdout, stderr io.Writer) int {
-	if len(args) == 0 {
-		usage(stderr)
-		return 2
-	}
-
-	switch args[0] {
-	case "version":
-		_, _ = fmt.Fprintln(stdout, version)
-		return 0
-	case "serve":
-		fs := flag.NewFlagSet("serve", flag.ContinueOnError)
-		fs.SetOutput(stderr)
-		stdio := fs.Bool("stdio", false, "serve over stdin/stdout")
-		ws := fs.Bool("ws", false, "serve terminal PTY transport over WebSocket")
-		persistent := fs.Bool("persistent", false, "proxy stdio to a persistent per-slot daemon")
-		persistentServer := fs.Bool("persistent-server", false, "run the persistent per-slot daemon")
-		persistentStop := fs.Bool("persistent-stop", false, "stop the persistent per-slot daemon")
-		persistentSlot := fs.String("slot", "", "persistent daemon slot")
-		persistentLeasePort := fs.Int("persistent-lease-port", 0, "relay port whose slot file leases the persistent daemon")
-		listen := fs.String("listen", "127.0.0.1:7777", "address for --ws")
-		authLeaseFile := fs.String("auth-lease-file", "", "required lease JSON path for --ws")
-		rpcAuthLeaseFile := fs.String("rpc-auth-lease-file", "", "optional daemon RPC lease JSON path for --ws /rpc")
-		adminTokenSHA256 := fs.String("admin-token-sha256", "", "optional bearer token SHA-256 for HTTPS lease installation")
-		adminEd25519PublicKey := fs.String("admin-ed25519-public-key", "", "optional base64 Ed25519 public key for signed HTTPS lease installation")
-		shell := fs.String("shell", "", "shell path for --ws PTY sessions")
-		if err := fs.Parse(args[1:]); err != nil {
-			return 2
-		}
-		if *persistentLeasePort < 0 || *persistentLeasePort > 65535 {
-			_, _ = fmt.Fprintln(stderr, "serve --persistent-lease-port must be 0 or between 1 and 65535")
-			return 2
-		}
-		if *persistentServer {
-			if *stdio || *ws || *persistent || *persistentStop {
-				_, _ = fmt.Fprintln(stderr, "serve --persistent-server cannot be combined with --stdio, --ws, --persistent, or --persistent-stop")
-				return 2
-			}
-			if strings.TrimSpace(*persistentSlot) == "" {
-				_, _ = fmt.Fprintln(stderr, "serve --persistent-server requires --slot")
-				return 2
-			}
-			if err := runPersistentDaemonServer(strings.TrimSpace(*persistentSlot), *persistentLeasePort, stderr); err != nil {
-				_, _ = fmt.Fprintf(stderr, "serve --persistent-server failed: %v\n", err)
-				return 1
-			}
-			return 0
-		}
-		if *persistentStop {
-			if *stdio || *ws || *persistent || *persistentLeasePort != 0 {
-				_, _ = fmt.Fprintln(stderr, "serve --persistent-stop cannot be combined with --stdio, --ws, --persistent, or --persistent-lease-port")
-				return 2
-			}
-			if strings.TrimSpace(*persistentSlot) == "" {
-				_, _ = fmt.Fprintln(stderr, "serve --persistent-stop requires --slot")
-				return 2
-			}
-			if err := stopPersistentDaemon(strings.TrimSpace(*persistentSlot)); err != nil {
-				_, _ = fmt.Fprintf(stderr, "serve --persistent-stop failed: %v\n", err)
-				return 1
-			}
-			return 0
-		}
-		if *stdio == *ws {
-			_, _ = fmt.Fprintln(stderr, "serve requires exactly one of --stdio or --ws")
-			return 2
-		}
-		if (*persistent || strings.TrimSpace(*persistentSlot) != "") && !*stdio {
-			_, _ = fmt.Fprintln(stderr, "serve --persistent requires --stdio")
-			return 2
-		}
-		if strings.TrimSpace(*persistentSlot) != "" && !*persistent {
-			_, _ = fmt.Fprintln(stderr, "serve --slot requires --persistent")
-			return 2
-		}
-		if *persistentLeasePort != 0 && !*persistent {
-			_, _ = fmt.Fprintln(stderr, "serve --persistent-lease-port requires --persistent")
-			return 2
-		}
-		if *ws {
-			if strings.TrimSpace(*authLeaseFile) == "" {
-				_, _ = fmt.Fprintln(stderr, "serve --ws requires --auth-lease-file")
-				return 2
-			}
-			if err := runWebSocketPTYServer(context.Background(), wsPTYServerConfig{
-				ListenAddr:       strings.TrimSpace(*listen),
-				PTYAuthLeaseFile: strings.TrimSpace(*authLeaseFile),
-				RPCAuthLeaseFile: strings.TrimSpace(*rpcAuthLeaseFile),
-				AdminTokenSHA256: firstNonEmpty(strings.TrimSpace(*adminTokenSHA256), strings.TrimSpace(os.Getenv("CMUXD_WS_ADMIN_TOKEN_SHA256"))),
-				AdminEd25519PubKey: firstNonEmpty(
-					strings.TrimSpace(*adminEd25519PublicKey),
-					strings.TrimSpace(os.Getenv("CMUXD_WS_ADMIN_ED25519_PUBLIC_KEY")),
-				),
-				Shell: strings.TrimSpace(*shell),
-			}, stderr); err != nil {
-				_, _ = fmt.Fprintf(stderr, "serve --ws failed: %v\n", err)
-				return 1
-			}
-			return 0
-		}
-		if *persistent {
-			if strings.TrimSpace(*persistentSlot) == "" {
-				_, _ = fmt.Fprintln(stderr, "serve --persistent requires --slot")
-				return 2
-			}
-			if err := runPersistentStdioProxy(stdin, stdout, stderr, strings.TrimSpace(*persistentSlot), *persistentLeasePort); err != nil {
-				_, _ = fmt.Fprintf(stderr, "serve --stdio --persistent failed: %v\n", err)
-				return 1
-			}
-			return 0
-		}
-		if err := runStdioServer(stdin, stdout); err != nil {
-			_, _ = fmt.Fprintf(stderr, "serve failed: %v\n", err)
-			return 1
-		}
-		return 0
-	case "cli":
-		return runCLI(args[1:])
-	default:
-		usage(stderr)
-		return 2
-	}
-}
-
-func usage(w io.Writer) {
-	_, _ = fmt.Fprintln(w, "Usage:")
-	_, _ = fmt.Fprintln(w, "  cmuxd-remote version")
-	_, _ = fmt.Fprintln(w, "  cmuxd-remote serve --stdio")
-	_, _ = fmt.Fprintln(w, "  cmuxd-remote serve --stdio --persistent --slot <slot>")
-	_, _ = fmt.Fprintln(w, "  cmuxd-remote serve --ws --auth-lease-file <path> [--rpc-auth-lease-file <path>] [--listen 127.0.0.1:7777]")
-	_, _ = fmt.Fprintln(w, "  cmuxd-remote cli <command> [args...]")
-}
-
-func runStdioServer(stdin io.Reader, stdout io.Writer) error {
-	return runRPCServer(stdin, stdout, newWebSocketPTYHub(wsPTYServerConfig{}, io.Discard), true)
-}
-
-func runRPCServer(stdin io.Reader, stdout io.Writer, ptyHub *wsPTYHub, ownsPTYHub bool) error {
-	writer := &stdioFrameWriter{
-		writer: bufio.NewWriter(stdout),
-	}
-	server := &rpcServer{
-		nextStreamID:  1,
-		nextSessionID: 1,
-		streams:       map[string]*streamState{},
-		sessions:      map[string]*sessionState{},
-		ptyHub:        ptyHub,
-		ownsPTYHub:    ownsPTYHub,
-		frameWriter:   writer,
-	}
-	connectionCtx, cancelConnection := context.WithCancel(context.Background())
-	defer func() {
-		cancelConnection()
-		server.closeAll()
-		_ = writer.flush()
-	}()
-	interruptRead := func() {
-		if closer, ok := stdin.(io.Closer); ok {
-			_ = closer.Close()
-		}
-	}
-	dispatcher := newRPCRequestDispatcher(connectionCtx, cancelConnection, interruptRead, server)
-
-	reader := bufio.NewReaderSize(stdin, 64*1024)
-
-	for {
-		line, oversized, readErr := readRPCFrame(reader, maxRPCFrameBytes)
-		if readErr != nil {
-			if asyncErr := dispatcher.takeAsyncError(); asyncErr != nil {
-				return asyncErr
-			}
-			if errors.Is(readErr, io.EOF) {
-				return nil
-			}
-			return readErr
-		}
-		if oversized {
-			if err := writer.writeResponse(rpcResponse{
-				OK: false,
-				Error: &rpcError{
-					Code:    "invalid_request",
-					Message: "request frame exceeds maximum size",
-				},
-			}); err != nil {
-				return err
-			}
-			continue
-		}
-		line = bytes.TrimSuffix(line, []byte{'\n'})
-		line = bytes.TrimSuffix(line, []byte{'\r'})
-		if len(line) == 0 {
-			continue
-		}
-
-		var req rpcRequest
-		if err := json.Unmarshal(line, &req); err != nil {
-			if err := writer.writeResponse(rpcResponse{
-				OK: false,
-				Error: &rpcError{
-					Code:    "invalid_request",
-					Message: "invalid JSON request",
-				},
-			}); err != nil {
-				return err
-			}
-			continue
-		}
-
-		if err := dispatcher.dispatch(req); err != nil {
-			return err
-		}
-	}
-}
-
-type persistentDaemonPaths struct {
-	slot      string
-	root      string
-	socket    string
-	tokenFile string
-	logFile   string
-	lockFile  string
-}
-
-const (
-	persistentDaemonAuthMethod    = "daemon.auth"
-	persistentDaemonReadyFDEnv    = "CMUX_REMOTE_DAEMON_READY_FD"
-	persistentDaemonAuthTimeout   = 5 * time.Second
-	persistentDaemonSocketDirFile = "socket-dir"
-)
-
-var errPersistentDaemonAuthFailed = errors.New("persistent daemon authentication failed")
-
-const (
-	persistentDaemonStartupTimeout    = 5 * time.Second
-	persistentDaemonEmptyIdleTimeout  = 5 * time.Minute
-	persistentDaemonEmptyIdlePollStep = time.Second
-)
-
-type persistentDaemonServerConfig struct {
-	emptyIdleTimeout time.Duration
-	acceptPollStep   time.Duration
-	slotLeasePresent func() (bool, error)
-	slotLeaseRemoved func()
-}
-
-func persistentDaemonPathsForSlot(rawSlot string) (persistentDaemonPaths, error) {
-	slot, err := validatePersistentDaemonSlot(rawSlot)
-	if err != nil {
-		return persistentDaemonPaths{}, err
-	}
-	rootBase := strings.TrimSpace(os.Getenv("CMUX_REMOTE_DAEMON_ROOT"))
-	if rootBase == "" {
-		home, homeErr := os.UserHomeDir()
-		if homeErr != nil || strings.TrimSpace(home) == "" {
-			return persistentDaemonPaths{}, errors.New("cannot resolve remote home directory")
-		}
-		rootBase = filepath.Join(home, ".cmux", "daemon")
-	}
-	root := filepath.Join(rootBase, persistentDaemonVersionComponent(), slot)
-	socketPath := persistentDaemonSocketPath(root, slot)
-	return persistentDaemonPaths{
-		slot:      slot,
-		root:      root,
-		socket:    socketPath,
-		tokenFile: filepath.Join(root, "auth.token"),
-		logFile:   filepath.Join(root, "daemon.log"),
-		lockFile:  filepath.Join(root, "daemon.lock"),
-	}, nil
-}
-
-func persistentDaemonVersionComponent() string {
-	trimmed := strings.TrimSpace(version)
-	if trimmed == "" {
-		trimmed = "dev"
-	}
-	var builder strings.Builder
-	for _, r := range trimmed {
-		if (r >= 'a' && r <= 'z') ||
-			(r >= 'A' && r <= 'Z') ||
-			(r >= '0' && r <= '9') ||
-			r == '-' ||
-			r == '_' ||
-			r == '.' {
-			builder.WriteRune(r)
-		} else {
-			builder.WriteByte('_')
-		}
-	}
-	component := builder.String()
-	if component == "" || component == "." || component == ".." {
-		return "dev"
-	}
-	if len(component) <= 64 {
-		return component
-	}
-	digest := sha256.Sum256([]byte(trimmed))
-	return component[:48] + "-" + hex.EncodeToString(digest[:4])
-}
-
-func persistentDaemonSocketPath(root string, slot string) string {
-	socketBase, overrideSet := persistentDaemonSocketBase()
-	if !overrideSet {
-		socketBase = filepath.Join("/tmp", fmt.Sprintf("cmuxd-remote-%d", os.Getuid()))
-	}
-	digest := sha256.Sum256([]byte(root + "\x00" + slot))
-	return filepath.Join(socketBase, "cmuxd-"+hex.EncodeToString(digest[:8])+".sock")
-}
-
-func persistentDaemonSocketBase() (string, bool) {
-	socketBase := strings.TrimSpace(os.Getenv("CMUX_REMOTE_DAEMON_SOCKET_DIR"))
-	if socketBase == "" {
-		return "", false
-	}
-	return filepath.Join(socketBase, fmt.Sprintf("cmuxd-remote-%d", os.Getuid())), true
-}
-
-func validatePersistentDaemonSlot(rawSlot string) (string, error) {
-	slot := strings.TrimSpace(rawSlot)
-	if slot == "" {
-		return "", errors.New("persistent daemon slot is required")
-	}
-	if slot == "." || slot == ".." || len(slot) > 128 {
-		return "", fmt.Errorf("invalid persistent daemon slot %q", rawSlot)
-	}
-	for _, r := range slot {
-		if (r >= 'a' && r <= 'z') ||
-			(r >= 'A' && r <= 'Z') ||
-			(r >= '0' && r <= '9') ||
-			r == '-' ||
-			r == '_' ||
-			r == '.' {
-			continue
-		}
-		return "", fmt.Errorf("invalid persistent daemon slot %q", rawSlot)
-	}
-	return slot, nil
-}
-
-func ensurePersistentDaemonDirectory(paths persistentDaemonPaths) (persistentDaemonPaths, error) {
-	if err := os.MkdirAll(paths.root, 0o700); err != nil {
-		return paths, err
-	}
-	if err := verifyPrivateDaemonDirectory(paths.root); err != nil {
-		return paths, err
-	}
-	socketDir := filepath.Dir(paths.socket)
-	secureSocketDir, err := ensurePersistentDaemonSocketDirectory(paths.root, socketDir)
-	if err != nil {
-		return paths, err
-	}
-	paths.socket = filepath.Join(secureSocketDir, filepath.Base(paths.socket))
-	return paths, nil
-}
-
-func ensurePersistentDaemonSocketDirectory(root string, defaultSocketDir string) (string, error) {
-	if storedSocketDir, err := readPersistentDaemonSocketDir(root); err == nil {
-		if verifyErr := ensurePrivateDaemonLeafDirectory(storedSocketDir); verifyErr == nil {
-			return storedSocketDir, nil
-		}
-		if removeErr := removePersistentDaemonSocketDirMetadata(root); removeErr != nil {
-			return "", removeErr
-		}
-	} else if !errors.Is(err, os.ErrNotExist) {
-		return "", err
-	}
-
-	if err := ensurePrivateDaemonLeafDirectory(defaultSocketDir); err == nil {
-		return defaultSocketDir, nil
-	}
-	return createPersistentDaemonFallbackSocketDir(root)
-}
-
-func ensurePrivateDaemonLeafDirectory(path string) error {
-	if err := os.MkdirAll(filepath.Dir(path), 0o755); err != nil {
-		return err
-	}
-	if err := os.Mkdir(path, 0o700); err != nil && !errors.Is(err, os.ErrExist) {
-		return err
-	}
-	return verifyPrivateDaemonDirectory(path)
-}
-
-func verifyPrivateDaemonDirectory(path string) error {
-	info, err := os.Lstat(path)
-	if err != nil {
-		return err
-	}
-	if info.Mode()&os.ModeSymlink != 0 {
-		return fmt.Errorf("persistent daemon directory %q is a symlink", path)
-	}
-	if !info.IsDir() {
-		return fmt.Errorf("persistent daemon directory %q is not a directory", path)
-	}
-	if !daemonDirectoryOwnedByCurrentUser(info) {
-		return fmt.Errorf("persistent daemon directory %q is not owned by uid %d", path, os.Getuid())
-	}
-	if info.Mode().Perm() != 0o700 {
-		if err := os.Chmod(path, 0o700); err != nil {
-			return err
-		}
-		info, err = os.Lstat(path)
-		if err != nil {
-			return err
-		}
-		if info.Mode()&os.ModeSymlink != 0 ||
-			!info.IsDir() ||
-			!daemonDirectoryOwnedByCurrentUser(info) ||
-			info.Mode().Perm() != 0o700 {
-			return fmt.Errorf("persistent daemon directory %q is not private", path)
-		}
-	}
-	return nil
-}
-
-func daemonDirectoryOwnedByCurrentUser(info os.FileInfo) bool {
-	stat, ok := info.Sys().(*syscall.Stat_t)
-	return !ok || int(stat.Uid) == os.Getuid()
-}
-
-func readPersistentDaemonSocketDir(root string) (string, error) {
-	data, err := os.ReadFile(filepath.Join(root, persistentDaemonSocketDirFile))
-	if err != nil {
-		return "", err
-	}
-	socketDir := strings.TrimSpace(string(data))
-	if socketDir == "" {
-		return "", errors.New("persistent daemon socket directory file is empty")
-	}
-	return socketDir, nil
-}
-
-func createPersistentDaemonFallbackSocketDir(root string) (string, error) {
-	for attempt := 0; attempt < 8; attempt++ {
-		raw := make([]byte, 8)
-		if _, err := rand.Read(raw); err != nil {
-			return "", err
-		}
-		socketDir := filepath.Join(
-			os.TempDir(),
-			fmt.Sprintf("cmuxd-remote-%d-%s", os.Getuid(), hex.EncodeToString(raw)),
-		)
-		if err := os.Mkdir(socketDir, 0o700); err != nil {
-			if errors.Is(err, os.ErrExist) {
-				continue
-			}
-			return "", err
-		}
-		if err := writePersistentDaemonSocketDir(root, socketDir); err != nil {
-			_ = os.Remove(socketDir)
-			if errors.Is(err, os.ErrExist) {
-				if storedSocketDir, readErr := readPersistentDaemonSocketDir(root); readErr == nil {
-					if verifyErr := ensurePrivateDaemonLeafDirectory(storedSocketDir); verifyErr == nil {
-						return storedSocketDir, nil
-					}
-				}
-				if removeErr := removePersistentDaemonSocketDirMetadata(root); removeErr != nil {
-					return "", removeErr
-				}
-				continue
-			}
-			return "", err
-		}
-		return socketDir, nil
-	}
-	return "", errors.New("failed to create private persistent daemon socket directory")
-}
-
-func writePersistentDaemonSocketDir(root string, socketDir string) error {
-	file, err := os.CreateTemp(root, ".socket-dir.*.tmp")
-	if err != nil {
-		return err
-	}
-	tmpPath := file.Name()
-	closeOK := false
-	defer func() {
-		if !closeOK {
-			_ = file.Close()
-		}
-		_ = os.Remove(tmpPath)
-	}()
-	if err := file.Chmod(0o600); err != nil {
-		return err
-	}
-	if _, err := file.WriteString(socketDir + "\n"); err != nil {
-		return err
-	}
-	if err := file.Close(); err != nil {
-		return err
-	}
-	closeOK = true
-	return os.Link(tmpPath, filepath.Join(root, persistentDaemonSocketDirFile))
-}
-
-func removePersistentDaemonSocketDirMetadata(root string) error {
-	if err := os.Remove(filepath.Join(root, persistentDaemonSocketDirFile)); err != nil && !errors.Is(err, os.ErrNotExist) {
-		return err
-	}
-	return nil
-}
-
-func persistentDaemonToken(paths persistentDaemonPaths) (string, error) {
-	if token, err := readPersistentDaemonTokenFile(paths.tokenFile); err == nil {
-		return token, nil
-	} else if !errors.Is(err, os.ErrNotExist) {
-		return "", err
-	}
-
-	raw := make([]byte, 32)
-	if _, err := rand.Read(raw); err != nil {
-		return "", err
-	}
-	token := hex.EncodeToString(raw)
-
-	file, err := os.CreateTemp(filepath.Dir(paths.tokenFile), ".auth.token.*.tmp")
-	if err != nil {
-		return "", err
-	}
-	tmpPath := file.Name()
-	closeOK := false
-	defer func() {
-		if !closeOK {
-			_ = file.Close()
-		}
-		_ = os.Remove(tmpPath)
-	}()
-	if _, err := file.WriteString(token + "\n"); err != nil {
-		return "", err
-	}
-	if err := file.Close(); err != nil {
-		return "", err
-	}
-	closeOK = true
-	if err := os.Link(tmpPath, paths.tokenFile); err != nil {
-		if errors.Is(err, os.ErrExist) {
-			return readPersistentDaemonTokenFile(paths.tokenFile)
-		}
-		return "", err
-	}
-	return token, nil
-}
-
-func readPersistentDaemonTokenFile(tokenFile string) (string, error) {
-	data, err := os.ReadFile(tokenFile)
-	if err != nil {
-		return "", err
-	}
-	token := strings.TrimSpace(string(data))
-	if token == "" {
-		return "", errors.New("persistent daemon token file is empty")
-	}
-	return token, nil
-}
-
-func runPersistentStdioProxy(stdin io.Reader, stdout, stderr io.Writer, slot string, leasePort int) error {
-	paths, err := persistentDaemonPathsForSlot(slot)
-	if err != nil {
-		return err
-	}
-	paths, err = ensurePersistentDaemonDirectory(paths)
-	if err != nil {
-		return err
-	}
-	token, err := persistentDaemonToken(paths)
-	if err != nil {
-		return err
-	}
-	if err := ensurePersistentDaemonRunning(paths, token, leasePort, stderr); err != nil {
-		return err
-	}
-	conn, err := dialPersistentDaemon(paths.socket, token)
-	if err != nil {
-		return err
-	}
-	return proxyPersistentDaemonConn(stdin, stdout, conn)
-}
-
-type persistentProxyCopyResult struct {
-	stream string
-	err    error
-}
-
-func proxyPersistentDaemonConn(stdin io.Reader, stdout io.Writer, conn net.Conn) error {
-	defer conn.Close()
-	errCh := make(chan persistentProxyCopyResult, 2)
-	go func() {
-		_, copyErr := io.Copy(conn, stdin)
-		if unixConn, ok := conn.(*net.UnixConn); ok {
-			_ = unixConn.CloseWrite()
-		}
-		errCh <- persistentProxyCopyResult{stream: "stdin", err: copyErr}
-	}()
-	go func() {
-		_, copyErr := io.Copy(stdout, conn)
-		errCh <- persistentProxyCopyResult{stream: "stdout", err: copyErr}
-	}()
-
-	first := <-errCh
-	if first.stream == "stdout" {
-		return persistentProxyCopyError(first.err)
-	}
-	second := <-errCh
-	if firstErr := persistentProxyCopyError(first.err); firstErr != nil {
-		return firstErr
-	}
-	return persistentProxyCopyError(second.err)
-}
-
-func persistentProxyCopyError(err error) error {
-	if err == nil ||
-		errors.Is(err, net.ErrClosed) ||
-		errors.Is(err, os.ErrClosed) ||
-		errors.Is(err, io.ErrClosedPipe) ||
-		errors.Is(err, syscall.EPIPE) {
-		return nil
-	}
-	return err
-}
-
-func ensurePersistentDaemonRunning(paths persistentDaemonPaths, token string, leasePort int, stderr io.Writer) error {
-	if conn, err := dialPersistentDaemon(paths.socket, token); err == nil {
-		_ = conn.Close()
-		return nil
-	} else if shouldRemovePersistentSocketAfterDialError(err) {
-		_ = os.Remove(paths.socket)
-	} else {
-		return err
-	}
-
-	executable, err := os.Executable()
-	if err != nil {
-		return err
-	}
-	logFile, err := os.OpenFile(paths.logFile, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0o600)
-	if err != nil {
-		return err
-	}
-	defer logFile.Close()
-
-	readyReader, readyWriter, err := os.Pipe()
-	if err != nil {
-		return err
-	}
-	defer readyReader.Close()
-	defer readyWriter.Close()
-
-	serverArguments := persistentDaemonServerArguments(paths.slot, leasePort)
-	cmd := exec.Command(executable, serverArguments...)
-	cmd.Stdin = nil
-	cmd.Stdout = logFile
-	cmd.Stderr = logFile
-	cmd.Env = append(os.Environ(), persistentDaemonReadyFDEnv+"=3")
-	cmd.ExtraFiles = []*os.File{readyWriter}
-	cmd.SysProcAttr = &syscall.SysProcAttr{Setsid: true}
-	if err := cmd.Start(); err != nil {
-		return err
-	}
-	_ = readyWriter.Close()
-	_ = cmd.Process.Release()
-
-	if err := waitPersistentDaemonReady(readyReader, paths.logFile); err != nil {
-		if conn, dialErr := dialPersistentDaemon(paths.socket, token); dialErr == nil {
-			_ = conn.Close()
-			return nil
-		}
-		if stderr != nil {
-			_, _ = fmt.Fprintf(stderr, "persistent daemon log: %s\n", paths.logFile)
-		}
-		return err
-	}
-
-	conn, err := dialPersistentDaemon(paths.socket, token)
-	if err == nil {
-		_ = conn.Close()
-		return nil
-	}
-	if stderr != nil {
-		_, _ = fmt.Fprintf(stderr, "persistent daemon log: %s\n", paths.logFile)
-	}
-	return err
-}
-
-func persistentDaemonServerArguments(slot string, leasePort int) []string {
-	arguments := []string{"serve", "--persistent-server", "--slot", slot}
-	if leasePort > 0 {
-		arguments = append(arguments, "--persistent-lease-port", strconv.Itoa(leasePort))
-	}
-	return arguments
-}
-
-func shouldRemovePersistentSocketAfterDialError(err error) bool {
-	return errors.Is(err, os.ErrNotExist) ||
-		errors.Is(err, syscall.ENOENT) ||
-		errors.Is(err, syscall.ECONNREFUSED)
-}
-
-func waitPersistentDaemonReady(reader *os.File, logFile string) error {
-	done := make(chan error, 1)
-	go func() {
-		line, err := bufio.NewReader(reader).ReadString('\n')
-		if err != nil {
-			done <- fmt.Errorf("persistent daemon exited before readiness signal; log: %s: %w", logFile, err)
-			return
-		}
-		if strings.TrimSpace(line) != "ready" {
-			done <- fmt.Errorf("persistent daemon sent unexpected readiness signal %q; log: %s", strings.TrimSpace(line), logFile)
-			return
-		}
-		done <- nil
-	}()
-
-	timer := time.NewTimer(5 * time.Second)
-	defer timer.Stop()
-	select {
-	case err := <-done:
-		return err
-	case <-timer.C:
-		return fmt.Errorf("persistent daemon did not become ready; log: %s", logFile)
-	}
-}
-
-func runPersistentDaemonServer(slot string, leasePort int, stderr io.Writer) (resultErr error) {
-	paths, err := persistentDaemonPathsForSlot(slot)
-	if err != nil {
-		return err
-	}
-	paths, err = ensurePersistentDaemonDirectory(paths)
-	if err != nil {
-		return err
-	}
-	token, err := persistentDaemonToken(paths)
-	if err != nil {
-		return err
-	}
-	lockFile, err := os.OpenFile(paths.lockFile, os.O_CREATE|os.O_RDWR, 0o600)
-	if err != nil {
-		return err
-	}
-	defer lockFile.Close()
-	if err := syscall.Flock(int(lockFile.Fd()), syscall.LOCK_EX|syscall.LOCK_NB); err != nil {
-		return fmt.Errorf("persistent daemon slot %q is already running", paths.slot)
-	}
-	defer syscall.Flock(int(lockFile.Fd()), syscall.LOCK_UN)
-
-	daemonLog, err := openPersistentDaemonLog(paths.logFile)
-	if err != nil {
-		return fmt.Errorf("open persistent daemon log: %w", err)
-	}
-	routeProcessOutput := shouldRoutePersistentDaemonProcessOutput(stderr)
-	stderr = daemonLog
-	var processOutputRoute *persistentDaemonProcessOutputRoute
-	defer func() {
-		if processOutputRoute != nil {
-			if closeErr := processOutputRoute.Close(); closeErr != nil && resultErr == nil {
-				resultErr = fmt.Errorf("restore persistent daemon process output: %w", closeErr)
-			}
-		}
-		fields := []string{"status", "clean"}
-		if resultErr != nil {
-			fields = []string{
-				"status", "error",
-				"error_category", persistentDaemonErrorCategory(resultErr),
-			}
-		}
-		logPersistentDaemonEvent(stderr, "daemon_stop", fields...)
-		_ = daemonLog.Close()
-	}()
-	if routeProcessOutput {
-		processOutputRoute, err = routePersistentDaemonProcessOutput(daemonLog)
-		if err != nil {
-			return fmt.Errorf("route persistent daemon process output: %w", err)
-		}
-	}
-	logPersistentDaemonEvent(
-		stderr,
-		"daemon_start",
-		"version", version,
-		"slot", paths.slot,
-		"lease_port", strconv.Itoa(leasePort),
-		"pid", strconv.Itoa(os.Getpid()),
-	)
-
-	_ = os.Remove(paths.socket)
-	listener, err := net.Listen("unix", paths.socket)
-	if err != nil {
-		return err
-	}
-	defer listener.Close()
-	defer os.Remove(paths.socket)
-	_ = os.Chmod(paths.socket, 0o600)
-	logPersistentDaemonEvent(stderr, "daemon_ready", "socket", paths.socket)
-
-	signalPersistentDaemonReady()
-	config := persistentDaemonServerConfig{emptyIdleTimeout: persistentDaemonEmptyIdleTimeout}
-	leaseRemoved := false
-	if leasePort > 0 {
-		config.slotLeasePresent = func() (bool, error) {
-			return persistentDaemonSlotLeasePresent(paths.slot, leasePort)
-		}
-		config.slotLeaseRemoved = func() {
-			leaseRemoved = true
-		}
-	}
-	err = servePersistentDaemonWithVerifierConfig(
-		listener,
-		persistentDaemonFileTokenVerifier(token, paths.tokenFile),
-		stderr,
-		config,
-	)
-	if err == nil && leaseRemoved {
-		if cleanupErr := removePersistentDaemonRelayShellDirectoryIfUnleased(leasePort); cleanupErr != nil {
-			return cleanupErr
-		}
-	}
-	return err
-}
-
-func signalPersistentDaemonReady() {
-	rawFD := strings.TrimSpace(os.Getenv(persistentDaemonReadyFDEnv))
-	if rawFD == "" {
-		return
-	}
-	fd, err := strconv.Atoi(rawFD)
-	if err != nil || fd < 3 {
-		return
-	}
-	file := os.NewFile(uintptr(fd), "cmux-persistent-daemon-ready")
-	if file == nil {
-		return
-	}
-	_, _ = file.WriteString("ready\n")
-	_ = file.Close()
-}
-
-func servePersistentDaemon(listener net.Listener, token string, stderr io.Writer) error {
-	return servePersistentDaemonWithVerifier(listener, persistentDaemonFixedTokenVerifier(token), stderr)
-}
-
-type persistentDaemonTokenVerifier func(string) bool
-
-func persistentDaemonFixedTokenVerifier(token string) persistentDaemonTokenVerifier {
-	return func(provided string) bool {
-		return persistentDaemonTokensEqual(provided, token)
-	}
-}
-
-func persistentDaemonFileTokenVerifier(initialToken string, tokenFile string) persistentDaemonTokenVerifier {
-	return func(provided string) bool {
-		token := initialToken
-		if currentToken, err := readPersistentDaemonTokenFile(tokenFile); err == nil {
-			token = currentToken
-		}
-		return persistentDaemonTokensEqual(provided, token)
-	}
-}
-
-func persistentDaemonTokensEqual(provided string, token string) bool {
-	provided = strings.TrimSpace(provided)
-	token = strings.TrimSpace(token)
-	return provided != "" &&
-		token != "" &&
-		subtle.ConstantTimeCompare([]byte(provided), []byte(token)) == 1
-}
-
-func servePersistentDaemonWithVerifier(listener net.Listener, verifier persistentDaemonTokenVerifier, stderr io.Writer) error {
-	return servePersistentDaemonWithVerifierConfig(listener, verifier, stderr, persistentDaemonServerConfig{})
-}
-
-func servePersistentDaemonWithVerifierConfig(
-	listener net.Listener,
-	verifier persistentDaemonTokenVerifier,
-	stderr io.Writer,
-	config persistentDaemonServerConfig,
-) error {
-	hub := newWebSocketPTYHub(wsPTYServerConfig{}, stderr)
-	defer hub.closeAll()
-	var activeConnections int64
-	var idleSince time.Time
-	var slotLeaseObserved bool
-	var shutdownOnce sync.Once
-	requestShutdown := func() {
-		shutdownOnce.Do(func() {
-			_ = listener.Close()
-		})
-	}
-	for {
-		now := time.Now()
-		var acceptDeadline time.Time
-		var slotLeaseMissing bool
-		if config.slotLeasePresent != nil {
-			present, err := config.slotLeasePresent()
-			if err == nil {
-				if present {
-					slotLeaseObserved = true
-				} else if slotLeaseObserved {
-					slotLeaseMissing = true
-				}
-			}
-			acceptDeadline = now.Add(persistentDaemonAcceptPollStep(config))
-		}
-		activity := persistentDaemonActivity{
-			activeConnections: atomic.LoadInt64(&activeConnections),
-		}
-		// Counting sessions takes the hub lock and scans the session map. A live
-		// connection already prevents automatic retirement, so inspect sessions
-		// only when their count can affect the decision.
-		if activity.activeConnections == 0 {
-			activity.activeSessions = hub.activeSessionCount()
-		}
-		var emptyIdleExpired bool
-		if config.emptyIdleTimeout > 0 {
-			if activity.isEmpty() {
-				if idleSince.IsZero() {
-					idleSince = now
-				}
-				remaining := config.emptyIdleTimeout - now.Sub(idleSince)
-				if remaining <= 0 {
-					emptyIdleExpired = true
-				} else {
-					idleDeadline := now.Add(minDuration(
-						remaining,
-						persistentDaemonAcceptPollStep(config),
-					))
-					acceptDeadline = earliestNonzeroTime(acceptDeadline, idleDeadline)
-				}
-			} else {
-				idleSince = time.Time{}
-				acceptDeadline = earliestNonzeroTime(
-					acceptDeadline,
-					now.Add(persistentDaemonAcceptPollStep(config)),
-				)
-			}
-		}
-		exitReason := persistentDaemonAutomaticExitReason(
-			activity,
-			slotLeaseMissing,
-			emptyIdleExpired,
-		)
-		if exitReason != "" {
-			logPersistentDaemonExit(stderr, now, exitReason, activity)
-			if exitReason == persistentDaemonExitSlotLeaseRemoved && config.slotLeaseRemoved != nil {
-				config.slotLeaseRemoved()
-			}
-			return nil
-		}
-		if !acceptDeadline.IsZero() {
-			setPersistentDaemonAcceptDeadline(listener, acceptDeadline)
-		}
-		conn, err := listener.Accept()
-		if err != nil {
-			if isTimeoutError(err) {
-				continue
-			}
-			if isClosedListenerError(err) {
-				return nil
-			}
-			return err
-		}
-		atomic.AddInt64(&activeConnections, 1)
-		go func() {
-			defer atomic.AddInt64(&activeConnections, -1)
-			handlePersistentDaemonConn(conn, verifier, hub, stderr, requestShutdown)
-		}()
-	}
-}
-
-func persistentDaemonAcceptPollStep(config persistentDaemonServerConfig) time.Duration {
-	if config.acceptPollStep > 0 {
-		return config.acceptPollStep
-	}
-	return persistentDaemonEmptyIdlePollStep
-}
-
-type deadlineListener interface {
-	SetDeadline(time.Time) error
-}
-
-func setPersistentDaemonAcceptDeadline(listener net.Listener, deadline time.Time) {
-	if deadlineListener, ok := listener.(deadlineListener); ok {
-		_ = deadlineListener.SetDeadline(deadline)
-	}
-}
-
-func minDuration(a time.Duration, b time.Duration) time.Duration {
-	if a < b {
-		return a
-	}
-	return b
-}
-
-func isTimeoutError(err error) bool {
-	var netErr net.Error
-	return errors.As(err, &netErr) && netErr.Timeout()
-}
-
-func isClosedListenerError(err error) bool {
-	if err == nil {
-		return false
-	}
-	if errors.Is(err, net.ErrClosed) {
-		return true
-	}
-	return strings.Contains(err.Error(), "use of closed network connection")
-}
-
-func handlePersistentDaemonConn(
-	conn net.Conn,
-	verifier persistentDaemonTokenVerifier,
-	hub *wsPTYHub,
-	stderr io.Writer,
-	requestShutdown func(),
-) {
-	handlePersistentDaemonConnWithAuthTimeout(
-		conn,
-		verifier,
-		hub,
-		stderr,
-		persistentDaemonAuthTimeout,
-		requestShutdown,
-	)
-}
-
-func handlePersistentDaemonConnWithAuthTimeout(
-	conn net.Conn,
-	verifier persistentDaemonTokenVerifier,
-	hub *wsPTYHub,
-	stderr io.Writer,
-	timeout time.Duration,
-	requestShutdown func(),
-) {
-	defer conn.Close()
-	defer logPersistentDaemonEvent(stderr, "connection_closed")
-	logPersistentDaemonEvent(stderr, "connection_accepted")
-	if timeout > 0 {
-		if err := conn.SetDeadline(time.Now().Add(timeout)); err != nil {
-			logPersistentDaemonEvent(
-				stderr,
-				"connection_fault",
-				"phase", "auth_deadline",
-				"error_category", persistentDaemonErrorCategory(err),
-			)
-			return
-		}
-	}
-	reader := bufio.NewReaderSize(conn, 64*1024)
-	writer := &stdioFrameWriter{writer: bufio.NewWriter(conn)}
-	if err := authenticatePersistentDaemonConn(reader, writer, verifier); err != nil {
-		logPersistentDaemonEvent(
-			stderr,
-			"connection_rejected",
-			"reason", persistentDaemonAuthenticationFailureReason(err),
-		)
-		return
-	}
-	logPersistentDaemonEvent(stderr, "connection_authenticated")
-	if timeout > 0 {
-		if err := conn.SetDeadline(time.Time{}); err != nil {
-			logPersistentDaemonEvent(
-				stderr,
-				"connection_fault",
-				"phase", "clear_auth_deadline",
-				"error_category", persistentDaemonErrorCategory(err),
-			)
-			return
-		}
-	}
-	if err := runRPCServerWithReader(reader, writer, hub, false, requestShutdown, func() {
-		_ = conn.Close()
-	}); err != nil {
-		logPersistentDaemonEvent(
-			stderr,
-			"connection_fault",
-			"phase", "rpc",
-			"error_category", persistentDaemonErrorCategory(err),
-		)
-	}
-}
-
-func persistentDaemonAuthenticationFailureReason(err error) string {
-	if err == nil {
-		return "unknown"
-	}
-	switch err.Error() {
-	case "authentication frame exceeds size limit",
-		"authentication frame is invalid JSON",
-		"authentication method is missing",
-		"authentication method is invalid",
-		"authentication token is invalid":
-		return err.Error()
-	default:
-		return persistentDaemonErrorCategory(err)
-	}
-}
-
-func authenticatePersistentDaemonConn(reader *bufio.Reader, writer *stdioFrameWriter, verifier persistentDaemonTokenVerifier) error {
-	line, oversized, err := readRPCFrame(reader, maxRPCFrameBytes)
-	if err != nil || oversized {
-		rejection := fmt.Errorf("authentication frame read failed: %w", err)
-		if oversized {
-			rejection = errors.New("authentication frame exceeds size limit")
-		}
-		return writePersistentDaemonAuthRejection(writer, rpcResponse{
-			OK: false,
-			Error: &rpcError{
-				Code:    "unauthorized",
-				Message: "persistent daemon authentication required",
-			},
-		}, rejection)
-	}
-	line = bytes.TrimSuffix(line, []byte{'\n'})
-	line = bytes.TrimSuffix(line, []byte{'\r'})
-	var req rpcRequest
-	if err := json.Unmarshal(line, &req); err != nil {
-		return writePersistentDaemonAuthRejection(writer, rpcResponse{
-			OK: false,
-			Error: &rpcError{
-				Code:    "invalid_request",
-				Message: "invalid JSON request",
-			},
-		}, errors.New("authentication frame is invalid JSON"))
-	}
-	if req.Method != persistentDaemonAuthMethod {
-		reason := "authentication method is invalid"
-		if req.Method == "" {
-			reason = "authentication method is missing"
-		}
-		return writePersistentDaemonAuthRejection(writer, rpcResponse{
-			ID: req.ID,
-			OK: false,
-			Error: &rpcError{
-				Code:    "unauthorized",
-				Message: "persistent daemon authentication required",
-			},
-		}, errors.New(reason))
-	}
-	provided, _ := getStringParam(req.Params, "token")
-	if !verifier(provided) {
-		return writePersistentDaemonAuthRejection(writer, rpcResponse{
-			ID: req.ID,
-			OK: false,
-			Error: &rpcError{
-				Code:    "unauthorized",
-				Message: "invalid persistent daemon token",
-			},
-		}, errors.New("authentication token is invalid"))
-	}
-	if err := writer.writeResponse(rpcResponse{
-		ID: req.ID,
-		OK: true,
-		Result: map[string]any{
-			"authenticated": true,
-		},
-	}); err != nil {
-		return fmt.Errorf("authentication response write failed: %w", err)
-	}
-	return nil
-}
-
-func writePersistentDaemonAuthRejection(writer *stdioFrameWriter, response rpcResponse, rejection error) error {
-	if err := writer.writeResponse(response); err != nil {
-		return fmt.Errorf("authentication response write failed: %w", err)
-	}
-	return rejection
-}
-
-func runRPCServerWithReader(
-	reader *bufio.Reader,
-	writer *stdioFrameWriter,
-	ptyHub *wsPTYHub,
-	ownsPTYHub bool,
-	requestShutdown func(),
-	interruptRead func(),
-) error {
-	server := &rpcServer{
-		nextStreamID:  1,
-		nextSessionID: 1,
-		streams:       map[string]*streamState{},
-		sessions:      map[string]*sessionState{},
-		ptyHub:        ptyHub,
-		ownsPTYHub:    ownsPTYHub,
-		frameWriter:   writer,
-	}
-	connectionCtx, cancelConnection := context.WithCancel(context.Background())
-	defer func() {
-		cancelConnection()
-		server.closeAll()
-		_ = writer.flush()
-	}()
-	dispatcher := newRPCRequestDispatcher(connectionCtx, cancelConnection, interruptRead, server)
-
-	for {
-		line, oversized, readErr := readRPCFrame(reader, maxRPCFrameBytes)
-		if readErr != nil {
-			if asyncErr := dispatcher.takeAsyncError(); asyncErr != nil {
-				return asyncErr
-			}
-			if errors.Is(readErr, io.EOF) {
-				return nil
-			}
-			return readErr
-		}
-		if oversized {
-			if err := writer.writeResponse(rpcResponse{
-				OK: false,
-				Error: &rpcError{
-					Code:    "invalid_request",
-					Message: "request frame exceeds maximum size",
-				},
-			}); err != nil {
-				return err
-			}
-			continue
-		}
-		line = bytes.TrimSuffix(line, []byte{'\n'})
-		line = bytes.TrimSuffix(line, []byte{'\r'})
-		if len(line) == 0 {
-			continue
-		}
-
-		var req rpcRequest
-		if err := json.Unmarshal(line, &req); err != nil {
-			if err := writer.writeResponse(rpcResponse{
-				OK: false,
-				Error: &rpcError{
-					Code:    "invalid_request",
-					Message: "invalid JSON request",
-				},
-			}); err != nil {
-				return err
-			}
-			continue
-		}
-		if req.Method == persistentDaemonShutdownMethod && requestShutdown != nil {
-			if err := writer.writeResponse(rpcResponse{
-				ID: req.ID,
-				OK: true,
-				Result: map[string]any{
-					"shutting_down": true,
-				},
-			}); err != nil {
-				return err
-			}
-			requestShutdown()
-			return nil
-		}
-
-		if err := dispatcher.dispatch(req); err != nil {
-			return err
-		}
-	}
-}
-
-func dialPersistentDaemon(socketPath string, token string) (net.Conn, error) {
-	conn, err := net.DialTimeout("unix", socketPath, 2*time.Second)
-	if err != nil {
-		return nil, err
-	}
-	if err := authenticatePersistentDaemonClient(conn, token); err != nil {
-		_ = conn.Close()
-		return nil, err
-	}
-	return conn, nil
-}
-
-func authenticatePersistentDaemonClient(conn net.Conn, token string) error {
-	return authenticatePersistentDaemonClientWithTimeout(conn, token, persistentDaemonAuthTimeout)
-}
-
-func authenticatePersistentDaemonClientWithTimeout(conn net.Conn, token string, timeout time.Duration) error {
-	if timeout > 0 {
-		if err := conn.SetDeadline(time.Now().Add(timeout)); err != nil {
-			return err
-		}
-		defer conn.SetDeadline(time.Time{})
-	}
-
-	writer := bufio.NewWriter(conn)
-	request := rpcRequest{
-		ID:     "auth",
-		Method: persistentDaemonAuthMethod,
-		Params: map[string]any{
-			"token": token,
-		},
-	}
-	data, err := json.Marshal(request)
-	if err != nil {
-		return err
-	}
-	if _, err := writer.Write(data); err != nil {
-		return err
-	}
-	if err := writer.WriteByte('\n'); err != nil {
-		return err
-	}
-	if err := writer.Flush(); err != nil {
-		return err
-	}
-	reader := bufio.NewReaderSize(conn, 64*1024)
-	line, oversized, err := readRPCFrame(reader, maxRPCFrameBytes)
-	if err != nil {
-		return err
-	}
-	if oversized {
-		return errors.New("persistent daemon auth response exceeded maximum size")
-	}
-	var resp rpcResponse
-	if err := json.Unmarshal(bytes.TrimSpace(line), &resp); err != nil {
-		return err
-	}
-	if !resp.OK {
-		message := "persistent daemon authentication failed"
-		if resp.Error != nil && strings.TrimSpace(resp.Error.Message) != "" {
-			message = strings.TrimSpace(resp.Error.Message)
-		}
-		return fmt.Errorf("%w: %s", errPersistentDaemonAuthFailed, message)
-	}
-	return nil
-}
-
-func setTCPNoDelay(conn net.Conn) {
-	tcpConn, ok := conn.(*net.TCPConn)
-	if !ok {
-		return
-	}
-	_ = tcpConn.SetNoDelay(true)
-}
-
-func readRPCFrame(reader *bufio.Reader, maxBytes int) ([]byte, bool, error) {
-	frame := make([]byte, 0, 1024)
-	for {
-		chunk, err := reader.ReadSlice('\n')
-		if len(chunk) > 0 {
-			if len(frame)+len(chunk) > maxBytes {
-				if errors.Is(err, bufio.ErrBufferFull) {
-					if drainErr := discardUntilNewline(reader); drainErr != nil && !errors.Is(drainErr, io.EOF) {
-						return nil, false, drainErr
-					}
-				}
-				return nil, true, nil
-			}
-			frame = append(frame, chunk...)
-		}
-
-		if err == nil {
-			return frame, false, nil
-		}
-		if errors.Is(err, bufio.ErrBufferFull) {
-			continue
-		}
-		if errors.Is(err, io.EOF) {
-			if len(frame) == 0 {
-				return nil, false, io.EOF
-			}
-			return frame, false, nil
-		}
-		return nil, false, err
-	}
-}
-
-func discardUntilNewline(reader *bufio.Reader) error {
-	for {
-		_, err := reader.ReadSlice('\n')
-		if err == nil || errors.Is(err, io.EOF) {
-			return err
-		}
-		if errors.Is(err, bufio.ErrBufferFull) {
-			continue
-		}
-		return err
-	}
-}
-
-func (w *stdioFrameWriter) writeResponse(resp rpcResponse) error {
-	return w.writeJSONFrame(resp)
-}
-
-func (w *stdioFrameWriter) writeEvent(event rpcEvent) error {
-	return w.writeJSONFrame(event)
-}
-
-func (w *stdioFrameWriter) flush() error {
-	w.mu.Lock()
-	defer w.mu.Unlock()
-	return w.writer.Flush()
-}
-
-func (w *stdioFrameWriter) writeJSONFrame(payload any) error {
-	data, err := json.Marshal(payload)
-	if err != nil {
-		return err
-	}
-	w.mu.Lock()
-	defer w.mu.Unlock()
-	if _, err := w.writer.Write(data); err != nil {
-		return err
-	}
-	if err := w.writer.WriteByte('\n'); err != nil {
-		return err
-	}
-	return w.writer.Flush()
-}
-
-func (s *rpcServer) handleRequest(req rpcRequest) rpcResponse {
-	if req.Method == "" {
-		return rpcResponse{
-			ID: req.ID,
-			OK: false,
-			Error: &rpcError{
-				Code:    "invalid_request",
-				Message: "method is required",
-			},
-		}
-	}
-
-	switch req.Method {
-	case "hello":
-		return rpcResponse{
-			ID: req.ID,
-			OK: true,
-			Result: map[string]any{
-				"name":    "cmuxd-remote",
-				"version": version,
-				"capabilities": []string{
-					"session.basic",
-					"session.resize.min",
-					"proxy.http_connect",
-					"proxy.socks5",
-					"proxy.stream",
-					"proxy.stream.push",
-					"pty.session",
-					"pty.session.token",
-					"pty.session.persistent_daemon",
-					"pty.write.notification",
-					"pty.resize.notification",
-					"pty.attach.cancel",
-					"pty.input.seq_ack",
-					"cli.bridge",
-				},
-			},
-		}
-	case "ping":
-		return rpcResponse{
-			ID: req.ID,
-			OK: true,
-			Result: map[string]any{
-				"pong": true,
-			},
-		}
-	case "proxy.open":
-		return s.handleProxyOpen(req)
-	case "proxy.close":
-		return s.handleProxyClose(req)
-	case "proxy.write":
-		return s.handleProxyWrite(req)
-	case "proxy.stream.subscribe":
-		return s.handleProxyStreamSubscribe(req)
-	case "session.open":
-		return s.handleSessionOpen(req)
-	case "session.close":
-		return s.handleSessionClose(req)
-	case "session.attach":
-		return s.handleSessionAttach(req)
-	case "session.resize":
-		return s.handleSessionResize(req)
-	case "session.detach":
-		return s.handleSessionDetach(req)
-	case "session.status":
-		return s.handleSessionStatus(req)
-	case "pty.attach":
-		return s.handlePTYAttach(req)
-	case "pty.write":
-		return s.handlePTYWrite(req)
-	case "pty.resize":
-		return s.handlePTYResize(req)
-	case "pty.detach":
-		return s.handlePTYDetach(req)
-	case "pty.close":
-		return s.handlePTYClose(req)
-	case "pty.list":
-		return s.handlePTYList(req)
-	case "cli.response":
-		return s.handleCLIResponse(req)
-	default:
-		return rpcResponse{
-			ID: req.ID,
-			OK: false,
-			Error: &rpcError{
-				Code:    "method_not_found",
-				Message: fmt.Sprintf("unknown method %q", req.Method),
-			},
-		}
-	}
-}
-
-func (s *rpcServer) handleRequestAndWriteResponse(req rpcRequest) error {
-	resp := s.handleRequest(req)
-	if !rpcRequestExpectsResponse(req) {
-		return s.handleNotificationResponse(req, resp)
-	}
-	return s.frameWriter.writeResponse(resp)
-}
-
-func (s *rpcServer) handlePTYAttachAndWriteResponse(ctx context.Context, req rpcRequest) error {
-	return s.handlePTYAttachAndWriteResponseWithReservation(ctx, ctx, req, nil)
-}
-
-func (s *rpcServer) handlePTYAttachAndWriteResponseWithReservation(
-	operationCtx context.Context,
-	attachmentLifetimeCtx context.Context,
-	req rpcRequest,
-	reservationReady func(),
-) error {
-	response := s.handlePTYAttachContextWithReservation(
-		operationCtx,
-		attachmentLifetimeCtx,
-		req,
-		reservationReady,
-	)
-	if operationCtx.Err() != nil {
-		return nil
-	}
-	return s.frameWriter.writeResponse(response)
-}
-
-func rpcRequestExpectsResponse(req rpcRequest) bool {
-	// Only selected PTY attachment operations use JSON-RPC notification
-	// semantics; all other id-less requests still get a response for compatibility.
-	return !rpcRequestIsPTYAttachmentNotification(req)
-}
-
-func rpcRequestIsPTYAttachmentNotification(req rpcRequest) bool {
-	return !req.HasID && (req.Method == "pty.write" || req.Method == "pty.resize")
-}
-
-func (s *rpcServer) handleNotificationResponse(req rpcRequest, resp rpcResponse) error {
-	if !rpcRequestIsPTYAttachmentNotification(req) || resp.OK {
-		return nil
-	}
-	errorCode := "unknown"
-	if resp.Error != nil {
-		errorCode = persistentDaemonDiagnosticCode(resp.Error.Code)
-	}
-	if s.frameWriter == nil {
-		s.logPTYEvent(
-			"pty_notification_fault",
-			"operation", persistentDaemonDiagnosticCode(req.Method),
-			"error_code", errorCode,
-		)
-		return nil
-	}
-	sessionID, attachmentID, attachmentToken, badResp := parsePTYAttachmentIdentity(req, req.Method)
-	if badResp != nil || strings.TrimSpace(attachmentToken) == "" {
-		return nil
-	}
-	detail := "PTY operation failed"
-	if req.Method == "pty.write" {
-		detail = "PTY write failed"
-	} else if req.Method == "pty.resize" {
-		detail = "PTY resize failed"
-	}
-	if resp.Error != nil && strings.TrimSpace(resp.Error.Message) != "" {
-		detail = strings.TrimSpace(resp.Error.Message)
-	}
-	s.logPTYEvent(
-		"pty_channel_fault",
-		"session_id", sessionID,
-		"attachment_id", attachmentID,
-		"operation", req.Method,
-		"error_code", errorCode,
-	)
-	err := s.frameWriter.writeEvent(rpcEvent{
-		Event:           "pty.error",
-		SessionID:       sessionID,
-		AttachmentID:    attachmentID,
-		AttachmentToken: attachmentToken,
-		Error:           detail,
-		Message:         detail,
-	})
-	if req.Method == "pty.write" && resp.Error != nil && s.ptyHub != nil &&
-		(resp.Error.Code == "pty_input_queue_full" || resp.Error.Code == "pty_input_seq_gap") {
-		s.ptyHub.detachByID(sessionID, attachmentID, attachmentToken)
-	}
-	return err
-}
-
-func (s *rpcServer) handleProxyOpen(req rpcRequest) rpcResponse {
-	host, ok := getStringParam(req.Params, "host")
-	if !ok || host == "" {
-		return rpcResponse{
-			ID: req.ID,
-			OK: false,
-			Error: &rpcError{
-				Code:    "invalid_params",
-				Message: "proxy.open requires host",
-			},
-		}
-	}
-	port, ok := getIntParam(req.Params, "port")
-	if !ok || port <= 0 || port > 65535 {
-		return rpcResponse{
-			ID: req.ID,
-			OK: false,
-			Error: &rpcError{
-				Code:    "invalid_params",
-				Message: "proxy.open requires port in range 1-65535",
-			},
-		}
-	}
-
-	timeoutMs := 10000
-	if parsed, hasTimeout := getIntParam(req.Params, "timeout_ms"); hasTimeout && parsed >= 0 {
-		timeoutMs = parsed
-	}
-
-	conn, err := net.DialTimeout(
-		"tcp",
-		net.JoinHostPort(host, strconv.Itoa(port)),
-		time.Duration(timeoutMs)*time.Millisecond,
-	)
-	if err != nil {
-		return rpcResponse{
-			ID: req.ID,
-			OK: false,
-			Error: &rpcError{
-				Code:    "open_failed",
-				Message: err.Error(),
-			},
-		}
-	}
-	setTCPNoDelay(conn)
-
-	s.mu.Lock()
-	streamID := fmt.Sprintf("s-%d", s.nextStreamID)
-	s.nextStreamID++
-	s.streams[streamID] = &streamState{conn: conn}
-	s.mu.Unlock()
-
-	return rpcResponse{
-		ID: req.ID,
-		OK: true,
-		Result: map[string]any{
-			"stream_id": streamID,
-		},
-	}
-}
-
-func (s *rpcServer) handleProxyClose(req rpcRequest) rpcResponse {
-	streamID, ok := getStringParam(req.Params, "stream_id")
-	if !ok || streamID == "" {
-		return rpcResponse{
-			ID: req.ID,
-			OK: false,
-			Error: &rpcError{
-				Code:    "invalid_params",
-				Message: "proxy.close requires stream_id",
-			},
-		}
-	}
-
-	s.mu.Lock()
-	state, exists := s.streams[streamID]
-	if exists {
-		delete(s.streams, streamID)
-	}
-	s.mu.Unlock()
-
-	if !exists {
-		return rpcResponse{
-			ID: req.ID,
-			OK: true,
-			Result: map[string]any{
-				"closed": true,
-			},
-		}
-	}
-
-	_ = state.conn.Close()
-	return rpcResponse{
-		ID: req.ID,
-		OK: true,
-		Result: map[string]any{
-			"closed": true,
-		},
-	}
-}
-
-func (s *rpcServer) handleProxyWrite(req rpcRequest) rpcResponse {
-	streamID, ok := getStringParam(req.Params, "stream_id")
-	if !ok || streamID == "" {
-		return rpcResponse{
-			ID: req.ID,
-			OK: false,
-			Error: &rpcError{
-				Code:    "invalid_params",
-				Message: "proxy.write requires stream_id",
-			},
-		}
-	}
-	dataBase64, ok := getStringParam(req.Params, "data_base64")
-	if !ok {
-		return rpcResponse{
-			ID: req.ID,
-			OK: false,
-			Error: &rpcError{
-				Code:    "invalid_params",
-				Message: "proxy.write requires data_base64",
-			},
-		}
-	}
-	payload, err := base64.StdEncoding.DecodeString(dataBase64)
-	if err != nil {
-		return rpcResponse{
-			ID: req.ID,
-			OK: false,
-			Error: &rpcError{
-				Code:    "invalid_params",
-				Message: "data_base64 must be valid base64",
-			},
-		}
-	}
-
-	state, found := s.getStream(streamID)
-	if !found {
-		return rpcResponse{
-			ID: req.ID,
-			OK: false,
-			Error: &rpcError{
-				Code:    "not_found",
-				Message: "stream not found",
-			},
-		}
-	}
-	conn := state.conn
-
-	timeoutMs := 8000
-	if parsed, hasTimeout := getIntParam(req.Params, "timeout_ms"); hasTimeout {
-		timeoutMs = parsed
-	}
-	if timeoutMs > 0 {
-		if err := conn.SetWriteDeadline(time.Now().Add(time.Duration(timeoutMs) * time.Millisecond)); err != nil {
-			return rpcResponse{
-				ID: req.ID,
-				OK: false,
-				Error: &rpcError{
-					Code:    "stream_error",
-					Message: err.Error(),
-				},
-			}
-		}
-		defer conn.SetWriteDeadline(time.Time{})
-	}
-
-	total := 0
-	for total < len(payload) {
-		written, writeErr := conn.Write(payload[total:])
-		if written == 0 && writeErr == nil {
-			return rpcResponse{
-				ID: req.ID,
-				OK: false,
-				Error: &rpcError{
-					Code:    "stream_error",
-					Message: "write made no progress",
-				},
-			}
-		}
-		total += written
-		if writeErr != nil {
-			return rpcResponse{
-				ID: req.ID,
-				OK: false,
-				Error: &rpcError{
-					Code:    "stream_error",
-					Message: writeErr.Error(),
-				},
-			}
-		}
-	}
-
-	return rpcResponse{
-		ID: req.ID,
-		OK: true,
-		Result: map[string]any{
-			"written": total,
-		},
-	}
-}
-
-func (s *rpcServer) handleProxyStreamSubscribe(req rpcRequest) rpcResponse {
-	streamID, ok := getStringParam(req.Params, "stream_id")
-	if !ok || streamID == "" {
-		return rpcResponse{
-			ID: req.ID,
-			OK: false,
-			Error: &rpcError{
-				Code:    "invalid_params",
-				Message: "proxy.stream.subscribe requires stream_id",
-			},
-		}
-	}
-
-	s.mu.Lock()
-	state, found := s.streams[streamID]
-	if !found {
-		s.mu.Unlock()
-		return rpcResponse{
-			ID: req.ID,
-			OK: false,
-			Error: &rpcError{
-				Code:    "not_found",
-				Message: "stream not found",
-			},
-		}
-	}
-	alreadySubscribed := state.readerStarted
-	if !alreadySubscribed {
-		state.readerStarted = true
-	}
-	conn := state.conn
-	s.mu.Unlock()
-
-	if !alreadySubscribed {
-		go s.streamPump(streamID, conn)
-	}
-
-	return rpcResponse{
-		ID: req.ID,
-		OK: true,
-		Result: map[string]any{
-			"subscribed":         true,
-			"already_subscribed": alreadySubscribed,
-		},
-	}
-}
-
-func (s *rpcServer) handleSessionOpen(req rpcRequest) rpcResponse {
-	sessionID, _ := getStringParam(req.Params, "session_id")
-
-	s.mu.Lock()
-	defer s.mu.Unlock()
-
-	if sessionID == "" {
-		sessionID = fmt.Sprintf("sess-%d", s.nextSessionID)
-		s.nextSessionID++
-	}
-
-	session, exists := s.sessions[sessionID]
-	if !exists {
-		session = &sessionState{
-			attachments: map[string]sessionAttachment{},
-		}
-		s.sessions[sessionID] = session
-	}
-
-	return rpcResponse{
-		ID:     req.ID,
-		OK:     true,
-		Result: sessionSnapshot(sessionID, session),
-	}
-}
-
-func (s *rpcServer) handleSessionClose(req rpcRequest) rpcResponse {
-	sessionID, ok := getStringParam(req.Params, "session_id")
-	if !ok || sessionID == "" {
-		return rpcResponse{
-			ID: req.ID,
-			OK: false,
-			Error: &rpcError{
-				Code:    "invalid_params",
-				Message: "session.close requires session_id",
-			},
-		}
-	}
-
-	s.mu.Lock()
-	_, exists := s.sessions[sessionID]
-	if exists {
-		delete(s.sessions, sessionID)
-	}
-	s.mu.Unlock()
-
-	if !exists {
-		return rpcResponse{
-			ID: req.ID,
-			OK: false,
-			Error: &rpcError{
-				Code:    "not_found",
-				Message: "session not found",
-			},
-		}
-	}
-
-	return rpcResponse{
-		ID: req.ID,
-		OK: true,
-		Result: map[string]any{
-			"session_id": sessionID,
-			"closed":     true,
-		},
-	}
-}
-
-func (s *rpcServer) handleSessionAttach(req rpcRequest) rpcResponse {
-	sessionID, attachmentID, _, cols, rows, badResp := parseSessionAttachmentParams(req, "session.attach")
-	if badResp != nil {
-		return *badResp
-	}
-
-	s.mu.Lock()
-	defer s.mu.Unlock()
-
-	session, exists := s.sessions[sessionID]
-	if !exists {
-		return rpcResponse{
-			ID: req.ID,
-			OK: false,
-			Error: &rpcError{
-				Code:    "not_found",
-				Message: "session not found",
-			},
-		}
-	}
-
-	session.attachments[attachmentID] = sessionAttachment{
-		Cols:      cols,
-		Rows:      rows,
-		UpdatedAt: time.Now().UTC(),
-	}
-	recomputeSessionSize(session)
-
-	return rpcResponse{
-		ID:     req.ID,
-		OK:     true,
-		Result: sessionSnapshot(sessionID, session),
-	}
-}
-
-func (s *rpcServer) handleSessionResize(req rpcRequest) rpcResponse {
-	sessionID, attachmentID, _, cols, rows, badResp := parseSessionAttachmentParams(req, "session.resize")
-	if badResp != nil {
-		return *badResp
-	}
-
-	s.mu.Lock()
-	defer s.mu.Unlock()
-
-	session, exists := s.sessions[sessionID]
-	if !exists {
-		return rpcResponse{
-			ID: req.ID,
-			OK: false,
-			Error: &rpcError{
-				Code:    "not_found",
-				Message: "session not found",
-			},
-		}
-	}
-	if _, exists := session.attachments[attachmentID]; !exists {
-		return rpcResponse{
-			ID: req.ID,
-			OK: false,
-			Error: &rpcError{
-				Code:    "not_found",
-				Message: "attachment not found",
-			},
-		}
-	}
-
-	session.attachments[attachmentID] = sessionAttachment{
-		Cols:      cols,
-		Rows:      rows,
-		UpdatedAt: time.Now().UTC(),
-	}
-	recomputeSessionSize(session)
-
-	return rpcResponse{
-		ID:     req.ID,
-		OK:     true,
-		Result: sessionSnapshot(sessionID, session),
-	}
-}
-
-func (s *rpcServer) handleSessionDetach(req rpcRequest) rpcResponse {
-	sessionID, ok := getStringParam(req.Params, "session_id")
-	if !ok || sessionID == "" {
-		return rpcResponse{
-			ID: req.ID,
-			OK: false,
-			Error: &rpcError{
-				Code:    "invalid_params",
-				Message: "session.detach requires session_id",
-			},
-		}
-	}
-	attachmentID, ok := getStringParam(req.Params, "attachment_id")
-	if !ok || attachmentID == "" {
-		return rpcResponse{
-			ID: req.ID,
-			OK: false,
-			Error: &rpcError{
-				Code:    "invalid_params",
-				Message: "session.detach requires attachment_id",
-			},
-		}
-	}
-
-	s.mu.Lock()
-	defer s.mu.Unlock()
-
-	session, exists := s.sessions[sessionID]
-	if !exists {
-		return rpcResponse{
-			ID: req.ID,
-			OK: false,
-			Error: &rpcError{
-				Code:    "not_found",
-				Message: "session not found",
-			},
-		}
-	}
-	if _, exists := session.attachments[attachmentID]; !exists {
-		return rpcResponse{
-			ID: req.ID,
-			OK: false,
-			Error: &rpcError{
-				Code:    "not_found",
-				Message: "attachment not found",
-			},
-		}
-	}
-
-	delete(session.attachments, attachmentID)
-	recomputeSessionSize(session)
-
-	return rpcResponse{
-		ID:     req.ID,
-		OK:     true,
-		Result: sessionSnapshot(sessionID, session),
-	}
-}
-
-func (s *rpcServer) handleSessionStatus(req rpcRequest) rpcResponse {
-	sessionID, ok := getStringParam(req.Params, "session_id")
-	if !ok || sessionID == "" {
-		return rpcResponse{
-			ID: req.ID,
-			OK: false,
-			Error: &rpcError{
-				Code:    "invalid_params",
-				Message: "session.status requires session_id",
-			},
-		}
-	}
-
-	s.mu.Lock()
-	defer s.mu.Unlock()
-
-	session, exists := s.sessions[sessionID]
-	if !exists {
-		return rpcResponse{
-			ID: req.ID,
-			OK: false,
-			Error: &rpcError{
-				Code:    "not_found",
-				Message: "session not found",
-			},
-		}
-	}
-
-	return rpcResponse{
-		ID:     req.ID,
-		OK:     true,
-		Result: sessionSnapshot(sessionID, session),
-	}
-}
-
-func (s *rpcServer) handlePTYAttach(req rpcRequest) rpcResponse {
-	return s.handlePTYAttachContext(context.Background(), req)
-}
-
-func (s *rpcServer) handlePTYAttachContext(ctx context.Context, req rpcRequest) rpcResponse {
-	return s.handlePTYAttachContextWithReservation(ctx, ctx, req, nil)
-}
-
-func (s *rpcServer) handlePTYAttachContextWithReservation(
-	operationCtx context.Context,
-	attachmentLifetimeCtx context.Context,
-	req rpcRequest,
-	reservationReady func(),
-) rpcResponse {
-	var reservationOnce sync.Once
-	notifyReservationReady := func() {
-		reservationOnce.Do(func() {
-			if reservationReady != nil {
-				reservationReady()
-			}
-		})
-	}
-	// Validation and other errors before the hub owns a generation still need
-	// to release the serialized request reader.
-	defer notifyReservationReady()
-
-	sessionID, ok := getStringParam(req.Params, "session_id")
-	if !ok || strings.TrimSpace(sessionID) == "" {
-		return rpcResponse{
-			ID: req.ID,
-			OK: false,
-			Error: &rpcError{
-				Code:    "invalid_params",
-				Message: "pty.attach requires session_id",
-			},
-		}
-	}
-	attachmentID, ok := getStringParam(req.Params, "attachment_id")
-	attachmentID = strings.TrimSpace(attachmentID)
-	if !ok || attachmentID == "" {
-		return rpcResponse{
-			ID: req.ID,
-			OK: false,
-			Error: &rpcError{
-				Code:    "invalid_params",
-				Message: "pty.attach requires attachment_id",
-			},
-		}
-	}
-	attachmentToken, _ := getStringParam(req.Params, "client_attachment_token")
-	attachmentToken = strings.TrimSpace(attachmentToken)
-	if attachmentToken == "" {
-		return missingPTYAttachmentTokenResponse(req, "pty.attach")
-	}
-	cols, ok := getIntParam(req.Params, "cols")
-	if !ok || cols <= 0 {
-		return rpcResponse{
-			ID: req.ID,
-			OK: false,
-			Error: &rpcError{
-				Code:    "invalid_params",
-				Message: "pty.attach requires cols > 0",
-			},
-		}
-	}
-	rows, ok := getIntParam(req.Params, "rows")
-	if !ok || rows <= 0 {
-		return rpcResponse{
-			ID: req.ID,
-			OK: false,
-			Error: &rpcError{
-				Code:    "invalid_params",
-				Message: "pty.attach requires rows > 0",
-			},
-		}
-	}
-	command, _ := getStringParam(req.Params, "command")
-	requireExisting, _ := getBoolParam(req.Params, "require_existing")
-	inputSeqAck, _ := getBoolParam(req.Params, "input_seq_ack")
-
-	hub := s.ptyHub
-	if hub == nil {
-		return rpcResponse{
-			ID: req.ID,
-			OK: false,
-			Error: &rpcError{
-				Code:    "unavailable",
-				Message: "PTY hub is not available",
-			},
-		}
-	}
-	attachment, attachmentCtx, sessionDone, err := hub.attachRPCWithReservation(
-		operationCtx,
-		attachmentLifetimeCtx,
-		sessionID,
-		attachmentID,
-		cols,
-		rows,
-		command,
-		attachmentToken,
-		requireExisting,
-		inputSeqAck,
-		notifyReservationReady,
-	)
-	if err != nil {
-		s.logPTYEvent(
-			"pty_attach_failed",
-			"session_id", strings.TrimSpace(sessionID),
-			"attachment_id", attachmentID,
-			"require_existing", strconv.FormatBool(requireExisting),
-			"error_code", ptyAttachErrorCode(err, requireExisting),
-			"error_category", persistentDaemonErrorCategory(err),
-		)
-		return rpcResponse{
-			ID: req.ID,
-			OK: false,
-			Error: &rpcError{
-				Code:    ptyAttachErrorCode(err, requireExisting),
-				Message: ptyAttachErrorMessage(err),
-			},
-		}
-	}
-	if err := operationCtx.Err(); err != nil {
-		hub.dropAttachment(attachment)
-		s.logPTYEvent(
-			"pty_attach_failed",
-			"session_id", strings.TrimSpace(sessionID),
-			"attachment_id", attachmentID,
-			"require_existing", strconv.FormatBool(requireExisting),
-			"error_code", ptyAttachErrorCode(err, requireExisting),
-			"error_category", persistentDaemonErrorCategory(err),
-		)
-		return rpcResponse{
-			ID: req.ID,
-			OK: false,
-			Error: &rpcError{
-				Code:    ptyAttachErrorCode(err, requireExisting),
-				Message: ptyAttachErrorMessage(err),
-			},
-		}
-	}
-	if !s.trackPTYAttachment(attachment) {
-		hub.dropAttachment(attachment)
-		s.logPTYEvent(
-			"pty_attach_failed",
-			"session_id", strings.TrimSpace(sessionID),
-			"attachment_id", attachmentID,
-			"require_existing", strconv.FormatBool(requireExisting),
-			"error_code", ptyAttachErrorCode(nil, requireExisting),
-			"error_category", "connection_closed",
-		)
-		return rpcResponse{
-			ID: req.ID,
-			OK: false,
-			Error: &rpcError{
-				Code:    ptyAttachErrorCode(nil, requireExisting),
-				Message: "RPC connection closed before PTY attachment completed",
-			},
-		}
-	}
-	go s.ptyAttachmentPump(attachmentCtx, attachment, sessionDone)
-
-	return rpcResponse{
-		ID: req.ID,
-		OK: true,
-		Result: map[string]any{
-			"session_id":       strings.TrimSpace(sessionID),
-			"attachment_id":    attachment.id,
-			"attachment_token": attachment.clientToken,
-			"replay_bytes":     attachment.replayBytes,
-			"attached":         true,
-		},
-	}
-}
-
-func ptyAttachErrorMessage(err error) string {
-	if errors.Is(err, context.Canceled) || errors.Is(err, context.DeadlineExceeded) {
-		return "RPC connection closed before PTY attachment completed"
-	}
-	return err.Error()
-}
-
-func ptyAttachErrorCode(err error, requireExisting bool) string {
-	if errors.Is(err, errWSPTYStartOwnersSaturated) ||
-		errors.Is(err, errWSPTYStartWaitersSaturated) {
-		return "unavailable"
-	}
-	if requireExisting {
-		return "pty_session_not_found"
-	}
-	return "pty_start_failed"
-}
-
-func (s *rpcServer) handlePTYWrite(req rpcRequest) rpcResponse {
-	sessionID, attachmentID, attachmentToken, badResp := parsePTYAttachmentIdentity(req, "pty.write")
-	if badResp != nil {
-		return *badResp
-	}
-	if attachmentToken == "" {
-		return missingPTYAttachmentTokenResponse(req, "pty.write")
-	}
-	dataBase64, ok := getStringParam(req.Params, "data_base64")
-	if !ok {
-		return rpcResponse{
-			ID: req.ID,
-			OK: false,
-			Error: &rpcError{
-				Code:    "invalid_params",
-				Message: "pty.write requires data_base64",
-			},
-		}
-	}
-	payload, err := base64.StdEncoding.DecodeString(dataBase64)
-	if err != nil {
-		return rpcResponse{
-			ID: req.ID,
-			OK: false,
-			Error: &rpcError{
-				Code:    "invalid_params",
-				Message: "data_base64 must be valid base64",
-			},
-		}
-	}
-	writeStatus := wsPTYInputWriteNotFound
-	var seq uint64
-	var hasSeq bool
-	if _, provided := req.Params["seq"]; provided {
-		parsedSeq, ok := getIntParam(req.Params, "seq")
-		if !ok || parsedSeq < 0 {
-			return rpcResponse{
-				ID: req.ID,
-				OK: false,
-				Error: &rpcError{
-					Code:    "invalid_params",
-					Message: "seq must be a non-negative integer",
-				},
-			}
-		}
-		seq = uint64(parsedSeq)
-		hasSeq = true
-	}
-	writeResult := wsPTYInputWriteResult{status: wsPTYInputWriteNotFound}
-	if s.ptyHub != nil {
-		writeResult = s.ptyHub.writeInputByIDWithSeq(sessionID, attachmentID, attachmentToken, payload, seq, hasSeq)
-		writeStatus = writeResult.status
-	}
-	if writeStatus == wsPTYInputWriteSeqGap {
-		return rpcResponse{
-			ID: req.ID,
-			OK: false,
-			Error: &rpcError{
-				Code:    "pty_input_seq_gap",
-				Message: fmt.Sprintf("PTY input sequence gap: got %d, want %d", writeResult.got, writeResult.want),
-			},
-		}
-	}
-	if writeStatus == wsPTYInputWriteQueueFull {
-		return rpcResponse{
-			ID: req.ID,
-			OK: false,
-			Error: &rpcError{
-				Code:    "pty_input_queue_full",
-				Message: "PTY input queue is full",
-			},
-		}
-	}
-	if writeStatus != wsPTYInputWriteOK {
-		return rpcResponse{
-			ID: req.ID,
-			OK: false,
-			Error: &rpcError{
-				Code:    "not_found",
-				Message: "PTY attachment not found",
-			},
-		}
-	}
-	return rpcResponse{
-		ID: req.ID,
-		OK: true,
-		Result: map[string]any{
-			"written": len(payload),
-		},
-	}
-}
-
-func (s *rpcServer) handlePTYResize(req rpcRequest) rpcResponse {
-	sessionID, attachmentID, attachmentToken, cols, rows, badResp := parseSessionAttachmentParams(req, "pty.resize")
-	if badResp != nil {
-		return *badResp
-	}
-	if attachmentToken == "" {
-		return missingPTYAttachmentTokenResponse(req, "pty.resize")
-	}
-	if s.ptyHub == nil || !s.ptyHub.resizeByID(sessionID, attachmentID, attachmentToken, cols, rows) {
-		return rpcResponse{
-			ID: req.ID,
-			OK: false,
-			Error: &rpcError{
-				Code:    "not_found",
-				Message: "PTY attachment not found",
-			},
-		}
-	}
-	return rpcResponse{
-		ID: req.ID,
-		OK: true,
-		Result: map[string]any{
-			"resized": true,
-		},
-	}
-}
-
-func (s *rpcServer) handlePTYDetach(req rpcRequest) rpcResponse {
-	sessionID, attachmentID, attachmentToken, badResp := parsePTYAttachmentIdentity(req, "pty.detach")
-	if badResp != nil {
-		return *badResp
-	}
-	if attachmentToken == "" {
-		return missingPTYAttachmentTokenResponse(req, "pty.detach")
-	}
-	if s.ptyHub == nil || !s.ptyHub.detachByID(sessionID, attachmentID, attachmentToken) {
-		return rpcResponse{
-			ID: req.ID,
-			OK: false,
-			Error: &rpcError{
-				Code:    "not_found",
-				Message: "PTY attachment not found",
-			},
-		}
-	}
-	return rpcResponse{
-		ID: req.ID,
-		OK: true,
-		Result: map[string]any{
-			"detached": true,
-		},
-	}
-}
-
-func (s *rpcServer) handlePTYClose(req rpcRequest) rpcResponse {
-	sessionID, ok := getStringParam(req.Params, "session_id")
-	if !ok || strings.TrimSpace(sessionID) == "" {
-		return rpcResponse{
-			ID: req.ID,
-			OK: false,
-			Error: &rpcError{
-				Code:    "invalid_params",
-				Message: "pty.close requires session_id",
-			},
-		}
-	}
-	if s.ptyHub == nil || !s.ptyHub.closeSessionByID(sessionID) {
-		return rpcResponse{
-			ID: req.ID,
-			OK: false,
-			Error: &rpcError{
-				Code:    "not_found",
-				Message: "PTY session not found",
-			},
-		}
-	}
-	return rpcResponse{
-		ID: req.ID,
-		OK: true,
-		Result: map[string]any{
-			"session_id": strings.TrimSpace(sessionID),
-			"closed":     true,
-		},
-	}
-}
-
-func (s *rpcServer) handlePTYList(req rpcRequest) rpcResponse {
-	if s.ptyHub == nil {
-		return rpcResponse{
-			ID: req.ID,
-			OK: true,
-			Result: map[string]any{
-				"sessions": []map[string]any{},
-			},
-		}
-	}
-	return rpcResponse{
-		ID: req.ID,
-		OK: true,
-		Result: map[string]any{
-			"sessions": s.ptyHub.sessionSnapshots(),
-		},
-	}
-}
-
-func (s *rpcServer) ptyAttachmentPump(ctx context.Context, attachment *wsPTYAttachment, sessionDone <-chan struct{}) {
-	defer s.untrackPTYAttachment(attachment)
-	if attachment.cancel != nil {
-		defer attachment.cancel()
-	}
-	for {
-		select {
-		case <-ctx.Done():
-			s.logPTYEvent(
-				"pty_channel_closed",
-				"session_id", attachment.sessionKey.sessionID,
-				"attachment_id", attachment.id,
-				"reason", "connection_closed",
-			)
-			if s.ptyHub != nil {
-				s.ptyHub.dropAttachment(attachment)
-			}
-			_ = s.frameWriter.writeEvent(rpcPTYExitEvent(attachment))
-			return
-		case <-sessionDone:
-			for {
-				select {
-				case frame := <-attachment.send:
-					if err := s.frameWriter.writeEvent(rpcPTYEventForFrame(attachment, frame)); err != nil {
-						s.logPTYEvent(
-							"pty_channel_fault",
-							"session_id", attachment.sessionKey.sessionID,
-							"attachment_id", attachment.id,
-							"direction", "daemon_to_client",
-							"error_category", persistentDaemonErrorCategory(err),
-						)
-						if s.ptyHub != nil {
-							s.ptyHub.dropAttachment(attachment)
-						}
-						return
-					}
-				default:
-					_ = s.frameWriter.writeEvent(rpcPTYExitEvent(attachment))
-					return
-				}
-			}
-		case frame := <-attachment.send:
-			if err := s.frameWriter.writeEvent(rpcPTYEventForFrame(attachment, frame)); err != nil {
-				s.logPTYEvent(
-					"pty_channel_fault",
-					"session_id", attachment.sessionKey.sessionID,
-					"attachment_id", attachment.id,
-					"direction", "daemon_to_client",
-					"error_category", persistentDaemonErrorCategory(err),
-				)
-				if s.ptyHub != nil {
-					s.ptyHub.dropAttachment(attachment)
-				}
-				return
-			}
-		}
-	}
-}
-
-func (s *rpcServer) logPTYEvent(event string, fields ...string) {
-	if s == nil || s.ptyHub == nil {
-		return
-	}
-	logPersistentDaemonEvent(s.ptyHub.stderr, event, fields...)
-}
-
-func (s *rpcServer) trackPTYAttachment(attachment *wsPTYAttachment) bool {
-	if attachment == nil {
-		return false
-	}
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	if s.closed {
-		return false
-	}
-	if s.ptyAttachments == nil {
-		s.ptyAttachments = map[string]*wsPTYAttachment{}
-	}
-	s.ptyAttachments[rpcPTYAttachmentKey(attachment)] = attachment
-	return true
-}
-
-func (s *rpcServer) untrackPTYAttachment(attachment *wsPTYAttachment) {
-	if attachment == nil {
-		return
-	}
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	key := rpcPTYAttachmentKey(attachment)
-	if current := s.ptyAttachments[key]; current == attachment {
-		delete(s.ptyAttachments, key)
-	}
-}
-
-func rpcPTYAttachmentKey(attachment *wsPTYAttachment) string {
-	if attachment == nil {
-		return ""
-	}
-	return fmt.Sprintf(
-		"%d:%s:%d:%s:%s",
-		attachment.sessionKey.kind,
-		attachment.sessionKey.sessionID,
-		attachment.sessionKey.anonymousID,
-		attachment.id,
-		attachment.clientToken,
-	)
-}
-
-func missingPTYAttachmentTokenResponse(req rpcRequest, method string) rpcResponse {
-	return rpcResponse{
-		ID: req.ID,
-		OK: false,
-		Error: &rpcError{
-			Code:    "invalid_params",
-			Message: method + " requires client_attachment_token",
-		},
-	}
-}
-
-func parseSessionAttachmentParams(req rpcRequest, method string) (sessionID string, attachmentID string, attachmentToken string, cols int, rows int, badResp *rpcResponse) {
-	sessionID, attachmentID, attachmentToken, identityResp := parsePTYAttachmentIdentity(req, method)
-	if identityResp != nil {
-		return "", "", "", 0, 0, identityResp
-	}
-
-	cols, ok := getIntParam(req.Params, "cols")
-	if !ok || cols <= 0 {
-		resp := rpcResponse{
-			ID: req.ID,
-			OK: false,
-			Error: &rpcError{
-				Code:    "invalid_params",
-				Message: method + " requires cols > 0",
-			},
-		}
-		return "", "", "", 0, 0, &resp
-	}
-	rows, ok = getIntParam(req.Params, "rows")
-	if !ok || rows <= 0 {
-		resp := rpcResponse{
-			ID: req.ID,
-			OK: false,
-			Error: &rpcError{
-				Code:    "invalid_params",
-				Message: method + " requires rows > 0",
-			},
-		}
-		return "", "", "", 0, 0, &resp
-	}
-
-	return sessionID, attachmentID, attachmentToken, cols, rows, nil
-}
-
-func parsePTYAttachmentIdentity(req rpcRequest, method string) (sessionID string, attachmentID string, attachmentToken string, badResp *rpcResponse) {
-	sessionID, ok := getStringParam(req.Params, "session_id")
-	if !ok || strings.TrimSpace(sessionID) == "" {
-		resp := rpcResponse{
-			ID: req.ID,
-			OK: false,
-			Error: &rpcError{
-				Code:    "invalid_params",
-				Message: method + " requires session_id",
-			},
-		}
-		return "", "", "", &resp
-	}
-	attachmentID, ok = getStringParam(req.Params, "attachment_id")
-	if !ok || strings.TrimSpace(attachmentID) == "" {
-		resp := rpcResponse{
-			ID: req.ID,
-			OK: false,
-			Error: &rpcError{
-				Code:    "invalid_params",
-				Message: method + " requires attachment_id",
-			},
-		}
-		return "", "", "", &resp
-	}
-	attachmentToken, _ = getStringParam(req.Params, "client_attachment_token")
-	return strings.TrimSpace(sessionID), strings.TrimSpace(attachmentID), strings.TrimSpace(attachmentToken), nil
-}
-
-func recomputeSessionSize(session *sessionState) {
-	if len(session.attachments) == 0 {
-		session.effectiveCols = session.lastKnownCols
-		session.effectiveRows = session.lastKnownRows
-		return
-	}
-
-	minCols := 0
-	minRows := 0
-	for _, attachment := range session.attachments {
-		if minCols == 0 || attachment.Cols < minCols {
-			minCols = attachment.Cols
-		}
-		if minRows == 0 || attachment.Rows < minRows {
-			minRows = attachment.Rows
-		}
-	}
-
-	session.effectiveCols = minCols
-	session.effectiveRows = minRows
-	session.lastKnownCols = minCols
-	session.lastKnownRows = minRows
-}
-
-func sessionSnapshot(sessionID string, session *sessionState) map[string]any {
-	attachmentIDs := make([]string, 0, len(session.attachments))
-	for attachmentID := range session.attachments {
-		attachmentIDs = append(attachmentIDs, attachmentID)
-	}
-	sort.Strings(attachmentIDs)
-
-	attachments := make([]map[string]any, 0, len(attachmentIDs))
-	for _, attachmentID := range attachmentIDs {
-		attachment := session.attachments[attachmentID]
-		attachments = append(attachments, map[string]any{
-			"attachment_id": attachmentID,
-			"cols":          attachment.Cols,
-			"rows":          attachment.Rows,
-			"updated_at":    attachment.UpdatedAt.Format(time.RFC3339Nano),
-		})
-	}
-
-	return map[string]any{
-		"session_id":      sessionID,
-		"attachments":     attachments,
-		"effective_cols":  session.effectiveCols,
-		"effective_rows":  session.effectiveRows,
-		"last_known_cols": session.lastKnownCols,
-		"last_known_rows": session.lastKnownRows,
-	}
-}
-
-func (s *rpcServer) getStream(streamID string) (*streamState, bool) {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	state, ok := s.streams[streamID]
-	return state, ok
-}
-
-func (s *rpcServer) dropStream(streamID string) {
-	s.mu.Lock()
-	state, ok := s.streams[streamID]
-	if ok {
-		delete(s.streams, streamID)
-	}
-	s.mu.Unlock()
-	if ok {
-		_ = state.conn.Close()
-	}
-}
-
-func (s *rpcServer) closeAll() {
-	s.mu.Lock()
-	s.closed = true
-	streams := make([]net.Conn, 0, len(s.streams))
-	for id, state := range s.streams {
-		delete(s.streams, id)
-		streams = append(streams, state.conn)
-	}
-	for id := range s.sessions {
-		delete(s.sessions, id)
-	}
-	ptyAttachments := make([]*wsPTYAttachment, 0, len(s.ptyAttachments))
-	for id, attachment := range s.ptyAttachments {
-		delete(s.ptyAttachments, id)
-		ptyAttachments = append(ptyAttachments, attachment)
-	}
-	s.mu.Unlock()
-	for _, conn := range streams {
-		_ = conn.Close()
-	}
-	for _, attachment := range ptyAttachments {
-		if s.ptyHub != nil {
-			s.ptyHub.dropAttachment(attachment)
-		} else {
-			attachment.closeNow()
-		}
-	}
-	if s.ownsPTYHub && s.ptyHub != nil {
-		s.ptyHub.closeAll()
-	}
-}
-
-func (s *rpcServer) streamPump(streamID string, conn net.Conn) {
-	defer func() {
-		if recovered := recover(); recovered != nil {
-			_ = s.frameWriter.writeEvent(rpcEvent{
-				Event:    "proxy.stream.error",
-				StreamID: streamID,
-				Error:    fmt.Sprintf("stream panic: %v", recovered),
-			})
-			s.dropStream(streamID)
-		}
-	}()
-
-	buffer := make([]byte, 32768)
-	for {
-		n, readErr := conn.Read(buffer)
-		data := append([]byte(nil), buffer[:max(0, n)]...)
-		if len(data) > 0 {
-			_ = s.frameWriter.writeEvent(rpcEvent{
-				Event:      "proxy.stream.data",
-				StreamID:   streamID,
-				DataBase64: base64.StdEncoding.EncodeToString(data),
-			})
-		}
-
-		if readErr == nil {
-			if n == 0 {
-				_ = s.frameWriter.writeEvent(rpcEvent{
-					Event:    "proxy.stream.error",
-					StreamID: streamID,
-					Error:    "read made no progress",
-				})
-				s.dropStream(streamID)
-				return
-			}
-			continue
-		}
-
-		if readErr == io.EOF {
-			_ = s.frameWriter.writeEvent(rpcEvent{
-				Event:      "proxy.stream.eof",
-				StreamID:   streamID,
-				DataBase64: "",
-			})
-		} else if !errors.Is(readErr, net.ErrClosed) {
-			_ = s.frameWriter.writeEvent(rpcEvent{
-				Event:    "proxy.stream.error",
-				StreamID: streamID,
-				Error:    readErr.Error(),
-			})
-		}
-
-		s.dropStream(streamID)
-		return
-	}
-}
-
-func getStringParam(params map[string]any, key string) (string, bool) {
-	if params == nil {
-		return "", false
-	}
-	raw, ok := params[key]
-	if !ok || raw == nil {
-		return "", false
-	}
-	value, ok := raw.(string)
-	return value, ok
-}
-
-func getIntParam(params map[string]any, key string) (int, bool) {
-	if params == nil {
-		return 0, false
-	}
-	raw, ok := params[key]
-	if !ok || raw == nil {
-		return 0, false
-	}
-	switch value := raw.(type) {
-	case int:
-		return value, true
-	case int8:
-		return int(value), true
-	case int16:
-		return int(value), true
-	case int32:
-		return int(value), true
-	case int64:
-		return int(value), true
-	case uint:
-		return int(value), true
-	case uint8:
-		return int(value), true
-	case uint16:
-		return int(value), true
-	case uint32:
-		return int(value), true
-	case uint64:
-		return int(value), true
-	case float64:
-		if math.Trunc(value) != value {
-			return 0, false
-		}
-		return int(value), true
-	case json.Number:
-		n, err := value.Int64()
-		if err != nil {
-			return 0, false
-		}
-		return int(n), true
-	default:
-		return 0, false
-	}
-}
-
-func getBoolParam(params map[string]any, key string) (bool, bool) {
-	if params == nil {
-		return false, false
-	}
-	raw, ok := params[key]
-	if !ok || raw == nil {
-		return false, false
-	}
-	value, ok := raw.(bool)
-	return value, ok
-}
diff --git a/daemon/remote/cmd/cmuxd-remote/main_test.go b/daemon/remote/cmd/cmuxd-remote/main_test.go
deleted file mode 100644
index 7c7c4f1a96ba..000000000000
--- a/daemon/remote/cmd/cmuxd-remote/main_test.go
+++ /dev/null
@@ -1,3323 +0,0 @@
-package main
-
-import (
-	"bufio"
-	"bytes"
-	"context"
-	"encoding/base64"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io"
-	"math"
-	"net"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"strconv"
-	"strings"
-	"sync"
-	"sync/atomic"
-	"syscall"
-	"testing"
-	"time"
-)
-
-type notifyingBuffer struct {
-	mu     sync.Mutex
-	buffer bytes.Buffer
-	notify chan struct{}
-}
-
-type authErrorWriter struct {
-	err error
-}
-
-func (w authErrorWriter) Write([]byte) (int, error) {
-	return 0, w.err
-}
-
-type persistentTestFrameQueue struct {
-	mu     sync.Mutex
-	frames []map[string]any
-}
-
-var persistentTestPendingFrames sync.Map
-
-func newNotifyingBuffer() *notifyingBuffer {
-	return &notifyingBuffer{notify: make(chan struct{}, 1)}
-}
-
-func (b *notifyingBuffer) Write(p []byte) (int, error) {
-	b.mu.Lock()
-	defer b.mu.Unlock()
-	n, err := b.buffer.Write(p)
-	if n > 0 {
-		select {
-		case b.notify <- struct{}{}:
-		default:
-		}
-	}
-	return n, err
-}
-
-func (b *notifyingBuffer) String() string {
-	b.mu.Lock()
-	defer b.mu.Unlock()
-	return b.buffer.String()
-}
-
-func waitForRPCResponseID(t *testing.T, output *notifyingBuffer, id float64, timeout time.Duration) map[string]any {
-	t.Helper()
-	deadline := time.NewTimer(timeout)
-	defer deadline.Stop()
-	for {
-		for _, line := range strings.Split(output.String(), "\n") {
-			if strings.TrimSpace(line) == "" {
-				continue
-			}
-			var frame map[string]any
-			if err := json.Unmarshal([]byte(line), &frame); err != nil {
-				continue
-			}
-			if frame["id"] == id {
-				return frame
-			}
-		}
-		select {
-		case <-output.notify:
-		case <-deadline.C:
-			t.Fatalf("timed out waiting for RPC response id %.0f; output=%q", id, output.String())
-		}
-	}
-}
-
-func startPersistentDaemonForTest(t *testing.T, token string) (string, func()) {
-	return startPersistentDaemonWithVerifierForTest(t, persistentDaemonFixedTokenVerifier(token))
-}
-
-func startPersistentDaemonWithVerifierForTest(t *testing.T, verifier persistentDaemonTokenVerifier) (string, func()) {
-	t.Helper()
-	return startPersistentDaemonWithVerifierAndLogForTest(t, verifier, io.Discard)
-}
-
-func startPersistentDaemonWithVerifierAndLogForTest(
-	t *testing.T,
-	verifier persistentDaemonTokenVerifier,
-	stderr io.Writer,
-) (string, func()) {
-	t.Helper()
-	socketDir, err := os.MkdirTemp("/tmp", "cmuxd-remote-test-*")
-	if err != nil {
-		t.Fatalf("create short socket dir: %v", err)
-	}
-	t.Cleanup(func() {
-		_ = os.RemoveAll(socketDir)
-	})
-	socketPath := filepath.Join(socketDir, "rpc.sock")
-	listener, err := net.Listen("unix", socketPath)
-	if err != nil {
-		t.Fatalf("listen unix: %v", err)
-	}
-	done := make(chan error, 1)
-	go func() {
-		done <- servePersistentDaemonWithVerifier(listener, verifier, stderr)
-	}()
-	stop := func() {
-		_ = listener.Close()
-		select {
-		case err := <-done:
-			if err != nil {
-				t.Fatalf("persistent daemon exited with error: %v", err)
-			}
-		case <-time.After(2 * time.Second):
-			t.Fatalf("persistent daemon did not stop")
-		}
-	}
-	return socketPath, stop
-}
-
-func openPersistentTestClient(t *testing.T, socketPath string, token string) (net.Conn, *bufio.Reader, *bufio.Writer) {
-	t.Helper()
-	conn, err := net.Dial("unix", socketPath)
-	if err != nil {
-		t.Fatalf("dial persistent daemon: %v", err)
-	}
-	reader := bufio.NewReader(conn)
-	writer := bufio.NewWriter(conn)
-	writePersistentTestFrame(t, writer, rpcRequest{
-		ID:     "auth",
-		Method: persistentDaemonAuthMethod,
-		Params: map[string]any{"token": token},
-	})
-	frame := readPersistentTestFrame(t, conn, reader)
-	if ok, _ := frame["ok"].(bool); !ok {
-		_ = conn.Close()
-		t.Fatalf("persistent daemon auth failed: %v", frame)
-	}
-	return conn, reader, writer
-}
-
-func persistentTestRPCCall(t *testing.T, conn net.Conn, reader *bufio.Reader, writer *bufio.Writer, req rpcRequest) map[string]any {
-	t.Helper()
-	writePersistentTestFrame(t, writer, req)
-	for {
-		frame := readPersistentTestFrame(t, conn, reader)
-		if _, isEvent := frame["event"]; isEvent {
-			enqueuePersistentTestFrame(conn, frame)
-			continue
-		}
-		return frame
-	}
-}
-
-func readPersistentTestEvent(t *testing.T, conn net.Conn, reader *bufio.Reader, matches func(map[string]any) bool) map[string]any {
-	t.Helper()
-	deadline := time.Now().Add(5 * time.Second)
-	var last map[string]any
-	for time.Now().Before(deadline) {
-		if frame, ok := dequeuePersistentTestFrame(conn); ok {
-			last = frame
-			if _, isEvent := frame["event"]; isEvent && matches(frame) {
-				return frame
-			}
-			continue
-		}
-		frame := readPersistentTestFrame(t, conn, reader)
-		last = frame
-		if _, isEvent := frame["event"]; isEvent && matches(frame) {
-			return frame
-		}
-	}
-	t.Fatalf("timed out waiting for persistent daemon event; last=%v", last)
-	return nil
-}
-
-func enqueuePersistentTestFrame(conn net.Conn, frame map[string]any) {
-	queue := persistentTestQueue(conn)
-	queue.mu.Lock()
-	queue.frames = append(queue.frames, frame)
-	queue.mu.Unlock()
-}
-
-func dequeuePersistentTestFrame(conn net.Conn) (map[string]any, bool) {
-	queue := persistentTestQueue(conn)
-	queue.mu.Lock()
-	defer queue.mu.Unlock()
-	if len(queue.frames) == 0 {
-		return nil, false
-	}
-	frame := queue.frames[0]
-	queue.frames = queue.frames[1:]
-	return frame, true
-}
-
-func persistentTestQueue(conn net.Conn) *persistentTestFrameQueue {
-	if queue, ok := persistentTestPendingFrames.Load(conn); ok {
-		return queue.(*persistentTestFrameQueue)
-	}
-	queue := &persistentTestFrameQueue{}
-	actual, _ := persistentTestPendingFrames.LoadOrStore(conn, queue)
-	return actual.(*persistentTestFrameQueue)
-}
-
-func writePersistentTestFrame(t *testing.T, writer *bufio.Writer, payload any) {
-	t.Helper()
-	data, err := json.Marshal(payload)
-	if err != nil {
-		t.Fatalf("marshal test frame: %v", err)
-	}
-	if _, err := writer.Write(data); err != nil {
-		t.Fatalf("write test frame: %v", err)
-	}
-	if err := writer.WriteByte('\n'); err != nil {
-		t.Fatalf("write test newline: %v", err)
-	}
-	if err := writer.Flush(); err != nil {
-		t.Fatalf("flush test frame: %v", err)
-	}
-}
-
-func readPersistentTestFrame(t *testing.T, conn net.Conn, reader *bufio.Reader) map[string]any {
-	t.Helper()
-	_ = conn.SetReadDeadline(time.Now().Add(5 * time.Second))
-	line, err := reader.ReadBytes('\n')
-	_ = conn.SetReadDeadline(time.Time{})
-	if err != nil {
-		t.Fatalf("read persistent daemon frame: %v", err)
-	}
-	var frame map[string]any
-	if err := json.Unmarshal(bytes.TrimSpace(line), &frame); err != nil {
-		t.Fatalf("decode persistent daemon frame %q: %v", string(line), err)
-	}
-	return frame
-}
-
-type eofWithPayloadConn struct {
-	payload  []byte
-	readOnce bool
-}
-
-func (c *eofWithPayloadConn) Read(p []byte) (int, error) {
-	if c.readOnce {
-		return 0, io.EOF
-	}
-	c.readOnce = true
-	n := copy(p, c.payload)
-	return n, io.EOF
-}
-
-func (c *eofWithPayloadConn) Write(p []byte) (int, error) {
-	return len(p), nil
-}
-
-func (c *eofWithPayloadConn) Close() error { return nil }
-func (c *eofWithPayloadConn) LocalAddr() net.Addr {
-	return &net.TCPAddr{IP: net.IPv4(127, 0, 0, 1), Port: 0}
-}
-func (c *eofWithPayloadConn) RemoteAddr() net.Addr {
-	return &net.TCPAddr{IP: net.IPv4(127, 0, 0, 1), Port: 0}
-}
-func (c *eofWithPayloadConn) SetDeadline(time.Time) error      { return nil }
-func (c *eofWithPayloadConn) SetReadDeadline(time.Time) error  { return nil }
-func (c *eofWithPayloadConn) SetWriteDeadline(time.Time) error { return nil }
-
-func TestRunVersion(t *testing.T) {
-	var out bytes.Buffer
-	code := run([]string{"version"}, strings.NewReader(""), &out, &bytes.Buffer{})
-	if code != 0 {
-		t.Fatalf("run version exit code = %d, want 0", code)
-	}
-	if strings.TrimSpace(out.String()) == "" {
-		t.Fatalf("version output should not be empty")
-	}
-}
-
-func TestWrapperBinaryDispatchesIntoCLI(t *testing.T) {
-	if os.Getenv("CMUXD_REMOTE_MAIN_HELPER") == "1" {
-		separator := 0
-		for i, arg := range os.Args {
-			if arg == "--" {
-				separator = i
-				break
-			}
-		}
-		if separator == 0 {
-			t.Fatal("helper process missing -- separator")
-		}
-		os.Args = append([]string{os.Args[0]}, os.Args[separator+1:]...)
-		main()
-		return
-	}
-
-	sockPath := startMockSocket(t, "PONG")
-	wrapperPath := filepath.Join(t.TempDir(), "cmuxd-remote-current")
-	if err := os.Symlink(os.Args[0], wrapperPath); err != nil {
-		t.Fatalf("symlink wrapper path: %v", err)
-	}
-
-	cmd := exec.Command(
-		wrapperPath,
-		"-test.run=TestWrapperBinaryDispatchesIntoCLI",
-		"--",
-		"--socket", sockPath, "ping",
-	)
-	cmd.Env = append(os.Environ(), "CMUXD_REMOTE_MAIN_HELPER=1")
-	output, err := cmd.CombinedOutput()
-	if err != nil {
-		t.Fatalf("wrapper invocation failed: %v\n%s", err, output)
-	}
-
-	if got := strings.TrimSpace(string(output)); got != "PONG" {
-		t.Fatalf("wrapper invocation output = %q, want %q", got, "PONG")
-	}
-}
-
-func TestRunStdioHelloAndPing(t *testing.T) {
-	input := strings.NewReader(
-		`{"id":1,"method":"hello","params":{}}` + "\n" +
-			`{"id":2,"method":"ping","params":{}}` + "\n",
-	)
-	var out bytes.Buffer
-	code := run([]string{"serve", "--stdio"}, input, &out, &bytes.Buffer{})
-	if code != 0 {
-		t.Fatalf("run serve exit code = %d, want 0", code)
-	}
-
-	lines := strings.Split(strings.TrimSpace(out.String()), "\n")
-	if len(lines) != 2 {
-		t.Fatalf("got %d response lines, want 2: %q", len(lines), out.String())
-	}
-
-	var first map[string]any
-	if err := json.Unmarshal([]byte(lines[0]), &first); err != nil {
-		t.Fatalf("failed to decode first response: %v", err)
-	}
-	if ok, _ := first["ok"].(bool); !ok {
-		t.Fatalf("first response should be ok=true: %v", first)
-	}
-	firstResult, _ := first["result"].(map[string]any)
-	if firstResult == nil {
-		t.Fatalf("first response missing result object: %v", first)
-	}
-	capabilities, _ := firstResult["capabilities"].([]any)
-	if len(capabilities) < 2 {
-		t.Fatalf("hello should return capabilities: %v", firstResult)
-	}
-	var sawPushCapability bool
-	for _, capability := range capabilities {
-		if capability == "proxy.stream.push" {
-			sawPushCapability = true
-			break
-		}
-	}
-	if !sawPushCapability {
-		t.Fatalf("hello should advertise proxy.stream.push: %v", firstResult)
-	}
-	var sawPersistentPTYCapability bool
-	for _, capability := range capabilities {
-		if capability == "pty.session.persistent_daemon" {
-			sawPersistentPTYCapability = true
-			break
-		}
-	}
-	if !sawPersistentPTYCapability {
-		t.Fatalf("hello should advertise pty.session.persistent_daemon: %v", firstResult)
-	}
-	var sawPTYWriteNotificationCapability bool
-	for _, capability := range capabilities {
-		if capability == "pty.write.notification" {
-			sawPTYWriteNotificationCapability = true
-			break
-		}
-	}
-	if !sawPTYWriteNotificationCapability {
-		t.Fatalf("hello should advertise pty.write.notification: %v", firstResult)
-	}
-	var sawPTYResizeNotificationCapability bool
-	for _, capability := range capabilities {
-		if capability == "pty.resize.notification" {
-			sawPTYResizeNotificationCapability = true
-			break
-		}
-	}
-	if !sawPTYResizeNotificationCapability {
-		t.Fatalf("hello should advertise pty.resize.notification: %v", firstResult)
-	}
-	sawPTYInputSeqAckCapability := false
-	for _, capability := range capabilities {
-		if capability == "pty.input.seq_ack" {
-			sawPTYInputSeqAckCapability = true
-			break
-		}
-	}
-	if !sawPTYInputSeqAckCapability {
-		t.Fatalf("hello should advertise pty.input.seq_ack: %v", firstResult)
-	}
-
-	var second map[string]any
-	if err := json.Unmarshal([]byte(lines[1]), &second); err != nil {
-		t.Fatalf("failed to decode second response: %v", err)
-	}
-	if ok, _ := second["ok"].(bool); !ok {
-		t.Fatalf("second response should be ok=true: %v", second)
-	}
-}
-
-func TestRunStdioPTYWriteNotificationDoesNotEmitResponse(t *testing.T) {
-	input := strings.NewReader(
-		`{"method":"pty.write","params":{"session_id":"missing","attachment_id":"missing","client_attachment_token":"token","data_base64":"YQ=="}}` + "\n" +
-			`{"id":2,"method":"ping","params":{}}` + "\n",
-	)
-	var out bytes.Buffer
-	code := run([]string{"serve", "--stdio"}, input, &out, &bytes.Buffer{})
-	if code != 0 {
-		t.Fatalf("run serve exit code = %d, want 0", code)
-	}
-
-	lines := strings.Split(strings.TrimSpace(out.String()), "\n")
-	if len(lines) != 2 {
-		t.Fatalf("got %d frame lines, want pty.error event plus ping response: %q", len(lines), out.String())
-	}
-
-	var event map[string]any
-	if err := json.Unmarshal([]byte(lines[0]), &event); err != nil {
-		t.Fatalf("failed to decode pty.write error event: %v", err)
-	}
-	if _, hasID := event["id"]; hasID {
-		t.Fatalf("pty.write notification should not emit an RPC response id: %v", event)
-	}
-	if got := event["event"]; got != "pty.error" {
-		t.Fatalf("first frame = %v, want pty.error event; payload=%v", got, event)
-	}
-
-	var response map[string]any
-	if err := json.Unmarshal([]byte(lines[1]), &response); err != nil {
-		t.Fatalf("failed to decode ping response: %v", err)
-	}
-	if got := response["id"]; got != float64(2) {
-		t.Fatalf("response id = %v, want ping id 2; payload=%v", got, response)
-	}
-	if ok, _ := response["ok"].(bool); !ok {
-		t.Fatalf("ping response should be ok=true after pty.write notification: %v", response)
-	}
-}
-
-func TestRunStdioPTYResizeNotificationDoesNotEmitResponse(t *testing.T) {
-	input := strings.NewReader(
-		`{"method":"pty.resize","params":{"session_id":"missing","attachment_id":"missing","client_attachment_token":"token","cols":100,"rows":30}}` + "\n" +
-			`{"id":2,"method":"ping","params":{}}` + "\n",
-	)
-	var out bytes.Buffer
-	code := run([]string{"serve", "--stdio"}, input, &out, &bytes.Buffer{})
-	if code != 0 {
-		t.Fatalf("run serve exit code = %d, want 0", code)
-	}
-
-	lines := strings.Split(strings.TrimSpace(out.String()), "\n")
-	if len(lines) != 2 {
-		t.Fatalf("got %d frame lines, want pty.error event plus ping response: %q", len(lines), out.String())
-	}
-
-	var event map[string]any
-	if err := json.Unmarshal([]byte(lines[0]), &event); err != nil {
-		t.Fatalf("failed to decode pty.resize error event: %v", err)
-	}
-	if _, hasID := event["id"]; hasID {
-		t.Fatalf("pty.resize notification should not emit an RPC response id: %v", event)
-	}
-	if got := event["event"]; got != "pty.error" {
-		t.Fatalf("first frame = %v, want pty.error event; payload=%v", got, event)
-	}
-
-	var response map[string]any
-	if err := json.Unmarshal([]byte(lines[1]), &response); err != nil {
-		t.Fatalf("failed to decode ping response: %v", err)
-	}
-	if got := response["id"]; got != float64(2) {
-		t.Fatalf("response id = %v, want ping id 2; payload=%v", got, response)
-	}
-	if ok, _ := response["ok"].(bool); !ok {
-		t.Fatalf("ping response should be ok=true after pty.resize notification: %v", response)
-	}
-}
-
-func TestRunStdioNoIDNonPTYRequestStillEmitsResponse(t *testing.T) {
-	input := strings.NewReader(`{"method":"ping","params":{}}` + "\n")
-	var out bytes.Buffer
-	code := run([]string{"serve", "--stdio"}, input, &out, &bytes.Buffer{})
-	if code != 0 {
-		t.Fatalf("run serve exit code = %d, want 0", code)
-	}
-
-	lines := strings.Split(strings.TrimSpace(out.String()), "\n")
-	if len(lines) != 1 {
-		t.Fatalf("got %d response lines, want ping response: %q", len(lines), out.String())
-	}
-	var response map[string]any
-	if err := json.Unmarshal([]byte(lines[0]), &response); err != nil {
-		t.Fatalf("failed to decode ping response: %v", err)
-	}
-	if ok, _ := response["ok"].(bool); !ok {
-		t.Fatalf("no-id ping should still emit an ok response: %v", response)
-	}
-}
-
-func TestRunStdioNullIDPTYWriteStillEmitsResponse(t *testing.T) {
-	input := strings.NewReader(
-		`{"id":null,"method":"pty.write","params":{"session_id":"missing","attachment_id":"missing","client_attachment_token":"token","data_base64":"YQ=="}}` + "\n" +
-			`{"id":2,"method":"ping","params":{}}` + "\n",
-	)
-	var out bytes.Buffer
-	code := run([]string{"serve", "--stdio"}, input, &out, &bytes.Buffer{})
-	if code != 0 {
-		t.Fatalf("run serve exit code = %d, want 0", code)
-	}
-
-	lines := strings.Split(strings.TrimSpace(out.String()), "\n")
-	if len(lines) != 2 {
-		t.Fatalf("got %d frame lines, want pty.write response plus ping response: %q", len(lines), out.String())
-	}
-
-	var response map[string]any
-	if err := json.Unmarshal([]byte(lines[0]), &response); err != nil {
-		t.Fatalf("failed to decode pty.write response: %v", err)
-	}
-	if eventName, _ := response["event"].(string); eventName != "" {
-		t.Fatalf("id:null pty.write should emit an RPC response, got event: %v", response)
-	}
-	if ok, _ := response["ok"].(bool); ok {
-		t.Fatalf("missing pty.write target should fail: %v", response)
-	}
-
-	var ping map[string]any
-	if err := json.Unmarshal([]byte(lines[1]), &ping); err != nil {
-		t.Fatalf("failed to decode ping response: %v", err)
-	}
-	if got := ping["id"]; got != float64(2) {
-		t.Fatalf("response id = %v, want ping id 2; payload=%v", got, ping)
-	}
-	if ok, _ := ping["ok"].(bool); !ok {
-		t.Fatalf("ping response should be ok=true after id:null pty.write: %v", ping)
-	}
-}
-
-func TestRunStdioNullIDPTYResizeStillEmitsResponse(t *testing.T) {
-	input := strings.NewReader(
-		`{"id":null,"method":"pty.resize","params":{"session_id":"missing","attachment_id":"missing","client_attachment_token":"token","cols":100,"rows":30}}` + "\n" +
-			`{"id":2,"method":"ping","params":{}}` + "\n",
-	)
-	var out bytes.Buffer
-	code := run([]string{"serve", "--stdio"}, input, &out, &bytes.Buffer{})
-	if code != 0 {
-		t.Fatalf("run serve exit code = %d, want 0", code)
-	}
-
-	lines := strings.Split(strings.TrimSpace(out.String()), "\n")
-	if len(lines) != 2 {
-		t.Fatalf("got %d frame lines, want pty.resize response plus ping response: %q", len(lines), out.String())
-	}
-
-	var response map[string]any
-	if err := json.Unmarshal([]byte(lines[0]), &response); err != nil {
-		t.Fatalf("failed to decode pty.resize response: %v", err)
-	}
-	if eventName, _ := response["event"].(string); eventName != "" {
-		t.Fatalf("id:null pty.resize should emit an RPC response, got event: %v", response)
-	}
-	if ok, _ := response["ok"].(bool); ok {
-		t.Fatalf("missing pty.resize target should fail: %v", response)
-	}
-
-	var ping map[string]any
-	if err := json.Unmarshal([]byte(lines[1]), &ping); err != nil {
-		t.Fatalf("failed to decode ping response: %v", err)
-	}
-	if got := ping["id"]; got != float64(2) {
-		t.Fatalf("response id = %v, want ping id 2; payload=%v", got, ping)
-	}
-	if ok, _ := ping["ok"].(bool); !ok {
-		t.Fatalf("ping response should be ok=true after id:null pty.resize: %v", ping)
-	}
-}
-
-func TestPersistentDaemonRejectsInvalidSlot(t *testing.T) {
-	for _, slot := range []string{"", ".", "..", "../nope", "bad/slot", strings.Repeat("a", 129)} {
-		if _, err := persistentDaemonPathsForSlot(slot); err == nil {
-			t.Fatalf("persistentDaemonPathsForSlot(%q) succeeded, want error", slot)
-		}
-	}
-}
-
-func TestPersistentDaemonPathsUseShortSocketPath(t *testing.T) {
-	rootBase := filepath.Join(
-		t.TempDir(),
-		strings.Repeat("long-path-segment-", 4),
-		"daemon-root",
-	)
-	t.Setenv("CMUX_REMOTE_DAEMON_ROOT", rootBase)
-	t.Setenv("CMUX_REMOTE_DAEMON_SOCKET_DIR", "")
-
-	paths, err := persistentDaemonPathsForSlot(strings.Repeat("a", 128))
-	if err != nil {
-		t.Fatalf("persistentDaemonPathsForSlot returned error: %v", err)
-	}
-	if strings.HasPrefix(paths.socket, paths.root) {
-		t.Fatalf("socket path should not live under long daemon root: socket=%q root=%q", paths.socket, paths.root)
-	}
-	if len(paths.socket) >= 100 {
-		t.Fatalf("socket path length = %d, want < 100: %q", len(paths.socket), paths.socket)
-	}
-}
-
-func TestPersistentDaemonPathsIncludeDaemonVersion(t *testing.T) {
-	rootBase := filepath.Join(t.TempDir(), "daemon-root")
-	t.Setenv("CMUX_REMOTE_DAEMON_ROOT", rootBase)
-	t.Setenv("CMUX_REMOTE_DAEMON_SOCKET_DIR", "")
-	oldVersion := version
-	defer func() { version = oldVersion }()
-
-	version = "v1.2.3"
-	first, err := persistentDaemonPathsForSlot("versioned-slot")
-	if err != nil {
-		t.Fatalf("persistentDaemonPathsForSlot returned error: %v", err)
-	}
-	if !strings.Contains(first.root, string(filepath.Separator)+"v1.2.3"+string(filepath.Separator)) {
-		t.Fatalf("root %q should include daemon version", first.root)
-	}
-
-	version = "v1.2.4"
-	second, err := persistentDaemonPathsForSlot("versioned-slot")
-	if err != nil {
-		t.Fatalf("persistentDaemonPathsForSlot returned error: %v", err)
-	}
-	if first.root == second.root {
-		t.Fatalf("root should change across versions: %q", first.root)
-	}
-	if first.socket == second.socket {
-		t.Fatalf("socket should change across versions: %q", first.socket)
-	}
-	if first.lockFile == second.lockFile {
-		t.Fatalf("lock file should change across versions: %q", first.lockFile)
-	}
-}
-
-func TestPersistentDaemonSocketDirOverrideUsesPrivateChild(t *testing.T) {
-	rootBase := filepath.Join(t.TempDir(), "daemon-root")
-	socketParent := filepath.Join(t.TempDir(), "caller-socket-dir")
-	if err := os.MkdirAll(socketParent, 0o755); err != nil {
-		t.Fatalf("create socket parent: %v", err)
-	}
-	if err := os.Chmod(socketParent, 0o755); err != nil {
-		t.Fatalf("chmod socket parent: %v", err)
-	}
-	t.Setenv("CMUX_REMOTE_DAEMON_ROOT", rootBase)
-	t.Setenv("CMUX_REMOTE_DAEMON_SOCKET_DIR", socketParent)
-
-	paths, err := persistentDaemonPathsForSlot("override-slot")
-	if err != nil {
-		t.Fatalf("persistentDaemonPathsForSlot returned error: %v", err)
-	}
-	socketDir := filepath.Dir(paths.socket)
-	if socketDir == socketParent {
-		t.Fatalf("socket dir should be a private child, got parent %q", socketParent)
-	}
-	if filepath.Dir(socketDir) != socketParent {
-		t.Fatalf("socket dir parent = %q, want %q", filepath.Dir(socketDir), socketParent)
-	}
-
-	paths, err = ensurePersistentDaemonDirectory(paths)
-	if err != nil {
-		t.Fatalf("ensurePersistentDaemonDirectory returned error: %v", err)
-	}
-	parentInfo, err := os.Stat(socketParent)
-	if err != nil {
-		t.Fatalf("stat socket parent: %v", err)
-	}
-	if parentInfo.Mode().Perm() != 0o755 {
-		t.Fatalf("socket parent mode = %o, want 755", parentInfo.Mode().Perm())
-	}
-	childInfo, err := os.Stat(socketDir)
-	if err != nil {
-		t.Fatalf("stat socket child: %v", err)
-	}
-	if childInfo.Mode().Perm() != 0o700 {
-		t.Fatalf("socket child mode = %o, want 700", childInfo.Mode().Perm())
-	}
-}
-
-func TestPersistentDaemonSocketDirFallsBackFromUnsafeSymlink(t *testing.T) {
-	rootBase := filepath.Join(t.TempDir(), "daemon-root")
-	socketParent := filepath.Join(t.TempDir(), "caller-socket-dir")
-	if err := os.MkdirAll(socketParent, 0o755); err != nil {
-		t.Fatalf("create socket parent: %v", err)
-	}
-	unsafeTarget := filepath.Join(t.TempDir(), "attacker-dir")
-	if err := os.MkdirAll(unsafeTarget, 0o755); err != nil {
-		t.Fatalf("create unsafe target: %v", err)
-	}
-	unsafeChild := filepath.Join(socketParent, fmt.Sprintf("cmuxd-remote-%d", os.Getuid()))
-	if err := os.Symlink(unsafeTarget, unsafeChild); err != nil {
-		t.Fatalf("create unsafe socket child symlink: %v", err)
-	}
-	t.Setenv("CMUX_REMOTE_DAEMON_ROOT", rootBase)
-	t.Setenv("CMUX_REMOTE_DAEMON_SOCKET_DIR", socketParent)
-
-	paths, err := persistentDaemonPathsForSlot("unsafe-socket-slot")
-	if err != nil {
-		t.Fatalf("persistentDaemonPathsForSlot returned error: %v", err)
-	}
-	unsafeSocketDir := filepath.Dir(paths.socket)
-	if unsafeSocketDir != unsafeChild {
-		t.Fatalf("precondition failed: socket dir = %q, want unsafe child %q", unsafeSocketDir, unsafeChild)
-	}
-
-	paths, err = ensurePersistentDaemonDirectory(paths)
-	if err != nil {
-		t.Fatalf("ensurePersistentDaemonDirectory returned error: %v", err)
-	}
-	socketDir := filepath.Dir(paths.socket)
-	if socketDir == unsafeChild {
-		t.Fatalf("socket dir still points at unsafe child %q", socketDir)
-	}
-	if filepath.Clean(filepath.Dir(socketDir)) != filepath.Clean(os.TempDir()) {
-		t.Fatalf("fallback socket dir parent = %q, want %q", filepath.Dir(socketDir), os.TempDir())
-	}
-	info, err := os.Lstat(socketDir)
-	if err != nil {
-		t.Fatalf("stat fallback socket dir: %v", err)
-	}
-	if info.Mode()&os.ModeSymlink != 0 || !info.IsDir() {
-		t.Fatalf("fallback socket dir should be a real directory, got mode %v", info.Mode())
-	}
-	if info.Mode().Perm() != 0o700 {
-		t.Fatalf("fallback socket dir mode = %o, want 700", info.Mode().Perm())
-	}
-	storedSocketDir, err := readPersistentDaemonSocketDir(paths.root)
-	if err != nil {
-		t.Fatalf("read stored fallback socket dir: %v", err)
-	}
-	if storedSocketDir != socketDir {
-		t.Fatalf("stored socket dir = %q, want %q", storedSocketDir, socketDir)
-	}
-}
-
-func TestPersistentDaemonSocketDirReplacesInvalidStoredFallback(t *testing.T) {
-	rootBase := filepath.Join(t.TempDir(), "daemon-root")
-	socketParent := filepath.Join(t.TempDir(), "caller-socket-dir")
-	if err := os.MkdirAll(socketParent, 0o755); err != nil {
-		t.Fatalf("create socket parent: %v", err)
-	}
-	unsafeTarget := filepath.Join(t.TempDir(), "attacker-dir")
-	if err := os.MkdirAll(unsafeTarget, 0o755); err != nil {
-		t.Fatalf("create unsafe target: %v", err)
-	}
-	unsafeChild := filepath.Join(socketParent, fmt.Sprintf("cmuxd-remote-%d", os.Getuid()))
-	if err := os.Symlink(unsafeTarget, unsafeChild); err != nil {
-		t.Fatalf("create unsafe socket child symlink: %v", err)
-	}
-	t.Setenv("CMUX_REMOTE_DAEMON_ROOT", rootBase)
-	t.Setenv("CMUX_REMOTE_DAEMON_SOCKET_DIR", socketParent)
-
-	paths, err := persistentDaemonPathsForSlot("invalid-stored-fallback-slot")
-	if err != nil {
-		t.Fatalf("persistentDaemonPathsForSlot returned error: %v", err)
-	}
-	if err := os.MkdirAll(paths.root, 0o700); err != nil {
-		t.Fatalf("create daemon root: %v", err)
-	}
-	invalidStoredSocketDir := filepath.Join(t.TempDir(), "invalid-stored-socket-dir")
-	if err := os.WriteFile(invalidStoredSocketDir, []byte("not a directory"), 0o600); err != nil {
-		t.Fatalf("create invalid stored socket path: %v", err)
-	}
-	if err := os.WriteFile(filepath.Join(paths.root, persistentDaemonSocketDirFile), []byte(invalidStoredSocketDir+"\n"), 0o600); err != nil {
-		t.Fatalf("write invalid stored socket-dir metadata: %v", err)
-	}
-
-	paths, err = ensurePersistentDaemonDirectory(paths)
-	if err != nil {
-		t.Fatalf("ensurePersistentDaemonDirectory returned error: %v", err)
-	}
-	socketDir := filepath.Dir(paths.socket)
-	if socketDir == unsafeChild {
-		t.Fatalf("socket dir still points at unsafe child %q", socketDir)
-	}
-	if filepath.Clean(filepath.Dir(socketDir)) != filepath.Clean(os.TempDir()) {
-		t.Fatalf("fallback socket dir parent = %q, want %q", filepath.Dir(socketDir), os.TempDir())
-	}
-	storedSocketDir, err := readPersistentDaemonSocketDir(paths.root)
-	if err != nil {
-		t.Fatalf("read stored replacement socket dir: %v", err)
-	}
-	if storedSocketDir != socketDir {
-		t.Fatalf("stored socket dir = %q, want replacement %q", storedSocketDir, socketDir)
-	}
-}
-
-func TestPersistentDaemonSocketDirReusesStoredFallback(t *testing.T) {
-	rootBase := filepath.Join(t.TempDir(), "daemon-root")
-	socketParent := filepath.Join(t.TempDir(), "caller-socket-dir")
-	if err := os.MkdirAll(socketParent, 0o755); err != nil {
-		t.Fatalf("create socket parent: %v", err)
-	}
-	unsafeChild := filepath.Join(socketParent, fmt.Sprintf("cmuxd-remote-%d", os.Getuid()))
-	if err := os.WriteFile(unsafeChild, []byte("not a directory"), 0o600); err != nil {
-		t.Fatalf("create unsafe socket child file: %v", err)
-	}
-	t.Setenv("CMUX_REMOTE_DAEMON_ROOT", rootBase)
-	t.Setenv("CMUX_REMOTE_DAEMON_SOCKET_DIR", socketParent)
-
-	paths, err := persistentDaemonPathsForSlot("stored-fallback-slot")
-	if err != nil {
-		t.Fatalf("persistentDaemonPathsForSlot returned error: %v", err)
-	}
-	paths, err = ensurePersistentDaemonDirectory(paths)
-	if err != nil {
-		t.Fatalf("ensurePersistentDaemonDirectory returned error: %v", err)
-	}
-	firstSocketDir := filepath.Dir(paths.socket)
-
-	nextPaths, err := persistentDaemonPathsForSlot("stored-fallback-slot")
-	if err != nil {
-		t.Fatalf("persistentDaemonPathsForSlot returned error: %v", err)
-	}
-	nextPaths, err = ensurePersistentDaemonDirectory(nextPaths)
-	if err != nil {
-		t.Fatalf("second ensurePersistentDaemonDirectory returned error: %v", err)
-	}
-	if filepath.Dir(nextPaths.socket) != firstSocketDir {
-		t.Fatalf("second socket dir = %q, want stored fallback %q", filepath.Dir(nextPaths.socket), firstSocketDir)
-	}
-}
-
-func TestPersistentDaemonTokenConcurrentCreate(t *testing.T) {
-	root := t.TempDir()
-	paths := persistentDaemonPaths{
-		root:      root,
-		tokenFile: filepath.Join(root, "auth.token"),
-	}
-	if err := os.MkdirAll(filepath.Dir(paths.tokenFile), 0o700); err != nil {
-		t.Fatalf("mkdir token dir: %v", err)
-	}
-
-	const workers = 12
-	var wg sync.WaitGroup
-	results := make(chan string, workers)
-	errorsCh := make(chan error, workers)
-	for i := 0; i < workers; i++ {
-		wg.Add(1)
-		go func() {
-			defer wg.Done()
-			token, err := persistentDaemonToken(paths)
-			if err != nil {
-				errorsCh <- err
-				return
-			}
-			results <- token
-		}()
-	}
-	wg.Wait()
-	close(results)
-	close(errorsCh)
-	for err := range errorsCh {
-		t.Fatalf("persistentDaemonToken returned error: %v", err)
-	}
-	var first string
-	for token := range results {
-		if len(token) != 64 {
-			t.Fatalf("token length = %d, want 64", len(token))
-		}
-		if first == "" {
-			first = token
-			continue
-		}
-		if token != first {
-			t.Fatalf("concurrent token mismatch: got %q want %q", token, first)
-		}
-	}
-	onDisk, err := os.ReadFile(paths.tokenFile)
-	if err != nil {
-		t.Fatalf("read token file: %v", err)
-	}
-	if strings.TrimSpace(string(onDisk)) != first {
-		t.Fatalf("token file = %q, want %q", strings.TrimSpace(string(onDisk)), first)
-	}
-}
-
-func TestPersistentDaemonRejectsBadToken(t *testing.T) {
-	stderr := newNotifyingBuffer()
-	socketPath, stop := startPersistentDaemonWithVerifierAndLogForTest(
-		t,
-		persistentDaemonFixedTokenVerifier("good-token"),
-		stderr,
-	)
-	defer stop()
-
-	conn, err := net.Dial("unix", socketPath)
-	if err != nil {
-		t.Fatalf("dial persistent daemon: %v", err)
-	}
-	defer conn.Close()
-
-	reader := bufio.NewReader(conn)
-	writer := bufio.NewWriter(conn)
-	writePersistentTestFrame(t, writer, rpcRequest{
-		ID:     1,
-		Method: persistentDaemonAuthMethod,
-		Params: map[string]any{"token": "bad-token"},
-	})
-	frame := readPersistentTestFrame(t, conn, reader)
-	if ok, _ := frame["ok"].(bool); ok {
-		t.Fatalf("bad token auth should fail: %v", frame)
-	}
-	errObj, _ := frame["error"].(map[string]any)
-	if got := errObj["code"]; got != "unauthorized" {
-		t.Fatalf("bad token error code = %v, want unauthorized; frame=%v", got, frame)
-	}
-	select {
-	case <-stderr.notify:
-	case <-time.After(time.Second):
-		t.Fatalf("persistent daemon did not log authentication rejection")
-	}
-	if log := stderr.String(); !strings.Contains(log, "authentication token is invalid") {
-		t.Fatalf("daemon log = %q, want invalid-token reason", log)
-	} else if strings.Contains(log, "bad-token") {
-		t.Fatalf("daemon log leaked the supplied authentication token: %q", log)
-	}
-}
-
-func TestPersistentDaemonLogsAuthMethodRejectionReason(t *testing.T) {
-	tests := []struct {
-		name       string
-		method     string
-		wantReason string
-	}{
-		{name: "missing", wantReason: "authentication method is missing"},
-		{name: "invalid", method: "daemon.unsupported", wantReason: "authentication method is invalid"},
-	}
-
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			stderr := newNotifyingBuffer()
-			socketPath, stop := startPersistentDaemonWithVerifierAndLogForTest(
-				t,
-				persistentDaemonFixedTokenVerifier("good-token"),
-				stderr,
-			)
-			defer stop()
-
-			conn, err := net.Dial("unix", socketPath)
-			if err != nil {
-				t.Fatalf("dial persistent daemon: %v", err)
-			}
-			defer conn.Close()
-
-			reader := bufio.NewReader(conn)
-			writer := bufio.NewWriter(conn)
-			writePersistentTestFrame(t, writer, rpcRequest{
-				ID:     1,
-				Method: test.method,
-				Params: map[string]any{"token": "good-token"},
-			})
-			frame := readPersistentTestFrame(t, conn, reader)
-			errObj, _ := frame["error"].(map[string]any)
-			if got := errObj["code"]; got != "unauthorized" {
-				t.Fatalf("auth method error code = %v, want unauthorized; frame=%v", got, frame)
-			}
-
-			select {
-			case <-stderr.notify:
-			case <-time.After(time.Second):
-				t.Fatalf("persistent daemon did not log authentication rejection")
-			}
-			if log := stderr.String(); !strings.Contains(log, test.wantReason) {
-				t.Fatalf("daemon log = %q, want reason %q", log, test.wantReason)
-			} else if test.method != "" && strings.Contains(log, test.method) {
-				t.Fatalf("daemon log leaked the supplied authentication method: %q", log)
-			}
-		})
-	}
-}
-
-func TestPersistentDaemonReportsAuthRejectionWriteFailure(t *testing.T) {
-	writeErr := errors.New("test auth write failed")
-	reader := bufio.NewReader(strings.NewReader("{\"id\":1,\"method\":\"daemon.unsupported\"}\n"))
-	writer := &stdioFrameWriter{writer: bufio.NewWriter(authErrorWriter{err: writeErr})}
-
-	err := authenticatePersistentDaemonConn(reader, writer, persistentDaemonFixedTokenVerifier("good-token"))
-	if !errors.Is(err, writeErr) {
-		t.Fatalf("authenticatePersistentDaemonConn error = %v, want wrapped write error", err)
-	}
-	if !strings.Contains(err.Error(), "authentication response write failed") {
-		t.Fatalf("authenticatePersistentDaemonConn error = %v, want response-write diagnostic", err)
-	}
-}
-
-func TestDialPersistentDaemonBadTokenWrapsAuthFailure(t *testing.T) {
-	socketPath, stop := startPersistentDaemonForTest(t, "good-token")
-	defer stop()
-
-	conn, err := dialPersistentDaemon(socketPath, "bad-token")
-	if err == nil {
-		_ = conn.Close()
-		t.Fatalf("dialPersistentDaemon succeeded with bad token")
-	}
-	if !errors.Is(err, errPersistentDaemonAuthFailed) {
-		t.Fatalf("dialPersistentDaemon error = %v, want errPersistentDaemonAuthFailed", err)
-	}
-}
-
-func TestPersistentDaemonAcceptsRotatedTokenFile(t *testing.T) {
-	tokenFile := filepath.Join(t.TempDir(), "auth.token")
-	if err := os.WriteFile(tokenFile, []byte("old-token\n"), 0o600); err != nil {
-		t.Fatalf("write initial token: %v", err)
-	}
-	socketPath, stop := startPersistentDaemonWithVerifierForTest(
-		t,
-		persistentDaemonFileTokenVerifier("old-token", tokenFile),
-	)
-	defer stop()
-
-	if err := os.WriteFile(tokenFile, []byte("new-token\n"), 0o600); err != nil {
-		t.Fatalf("rotate token: %v", err)
-	}
-	conn, _, _ := openPersistentTestClient(t, socketPath, "new-token")
-	_ = conn.Close()
-}
-
-func TestPersistentDaemonPTYWriteNotificationDoesNotEmitResponse(t *testing.T) {
-	socketPath, stop := startPersistentDaemonForTest(t, "good-token")
-	defer stop()
-
-	conn, reader, writer := openPersistentTestClient(t, socketPath, "good-token")
-	defer conn.Close()
-
-	writePersistentTestFrame(t, writer, map[string]any{
-		"method": "pty.write",
-		"params": map[string]any{
-			"session_id":              "missing",
-			"attachment_id":           "missing",
-			"client_attachment_token": "token",
-			"data_base64":             base64.StdEncoding.EncodeToString([]byte("a")),
-		},
-	})
-	event := readPersistentTestFrame(t, conn, reader)
-	if _, hasID := event["id"]; hasID {
-		t.Fatalf("pty.write notification should not emit an RPC response id: %v", event)
-	}
-	if got := event["event"]; got != "pty.error" {
-		t.Fatalf("first frame = %v, want pty.error event; payload=%v", got, event)
-	}
-	ping := persistentTestRPCCall(t, conn, reader, writer, rpcRequest{
-		ID:     2,
-		Method: "ping",
-		Params: map[string]any{},
-	})
-	if got := ping["id"]; got != float64(2) {
-		t.Fatalf("response id = %v, want ping id 2; payload=%v", got, ping)
-	}
-	if ok, _ := ping["ok"].(bool); !ok {
-		t.Fatalf("ping response should be ok=true after pty.write notification: %v", ping)
-	}
-}
-
-func TestPersistentDaemonPTYResizeNotificationDoesNotEmitResponse(t *testing.T) {
-	socketPath, stop := startPersistentDaemonForTest(t, "good-token")
-	defer stop()
-
-	conn, reader, writer := openPersistentTestClient(t, socketPath, "good-token")
-	defer conn.Close()
-
-	writePersistentTestFrame(t, writer, map[string]any{
-		"method": "pty.resize",
-		"params": map[string]any{
-			"session_id":              "missing",
-			"attachment_id":           "missing",
-			"client_attachment_token": "token",
-			"cols":                    100,
-			"rows":                    30,
-		},
-	})
-	event := readPersistentTestFrame(t, conn, reader)
-	if _, hasID := event["id"]; hasID {
-		t.Fatalf("pty.resize notification should not emit an RPC response id: %v", event)
-	}
-	if got := event["event"]; got != "pty.error" {
-		t.Fatalf("first frame = %v, want pty.error event; payload=%v", got, event)
-	}
-	ping := persistentTestRPCCall(t, conn, reader, writer, rpcRequest{
-		ID:     2,
-		Method: "ping",
-		Params: map[string]any{},
-	})
-	if got := ping["id"]; got != float64(2) {
-		t.Fatalf("response id = %v, want ping id 2; payload=%v", got, ping)
-	}
-	if ok, _ := ping["ok"].(bool); !ok {
-		t.Fatalf("ping response should be ok=true after pty.resize notification: %v", ping)
-	}
-}
-
-func TestAuthenticatePersistentDaemonClientReadDeadline(t *testing.T) {
-	client, server := net.Pipe()
-	defer client.Close()
-	defer server.Close()
-
-	requestRead := make(chan error, 1)
-	go func() {
-		_, err := bufio.NewReader(server).ReadString('\n')
-		requestRead <- err
-	}()
-
-	start := time.Now()
-	err := authenticatePersistentDaemonClientWithTimeout(client, "token", 50*time.Millisecond)
-	if err == nil {
-		t.Fatalf("authenticatePersistentDaemonClientWithTimeout succeeded, want timeout error")
-	}
-	if elapsed := time.Since(start); elapsed > time.Second {
-		t.Fatalf("authenticatePersistentDaemonClientWithTimeout took %s, want bounded deadline", elapsed)
-	}
-	select {
-	case readErr := <-requestRead:
-		if readErr != nil {
-			t.Fatalf("server failed to read auth request: %v", readErr)
-		}
-	case <-time.After(time.Second):
-		t.Fatalf("server did not receive auth request")
-	}
-}
-
-func TestAuthenticatePersistentDaemonServerReadDeadline(t *testing.T) {
-	client, server := net.Pipe()
-	defer client.Close()
-
-	hub := newWebSocketPTYHub(wsPTYServerConfig{}, io.Discard)
-	defer hub.closeAll()
-
-	done := make(chan struct{}, 1)
-	go func() {
-		handlePersistentDaemonConnWithAuthTimeout(
-			server,
-			persistentDaemonFixedTokenVerifier("token"),
-			hub,
-			io.Discard,
-			50*time.Millisecond,
-			nil,
-		)
-		done <- struct{}{}
-	}()
-
-	select {
-	case <-done:
-	case <-time.After(time.Second):
-		t.Fatalf("server auth handler did not return after deadline")
-	}
-}
-
-func TestRPCDispatcherPTYAttachCapacityReturnsUnavailable(t *testing.T) {
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-	output := newNotifyingBuffer()
-	server := &rpcServer{
-		frameWriter: &stdioFrameWriter{writer: bufio.NewWriter(output)},
-	}
-	dispatcher := newRPCRequestDispatcher(ctx, cancel, nil, server)
-	for i := 0; i < maxConcurrentPTYAttachRPCsPerConnection; i++ {
-		dispatcher.ptyAttachSlots <- struct{}{}
-	}
-
-	if err := dispatcher.dispatch(rpcRequest{ID: 1, Method: "pty.attach"}); err != nil {
-		t.Fatalf("dispatch over-capacity pty.attach: %v", err)
-	}
-	response := waitForRPCResponseID(t, output, 1, time.Second)
-	errorObject, _ := response["error"].(map[string]any)
-	if got := errorObject["code"]; got != "unavailable" {
-		t.Fatalf("over-capacity pty.attach error code = %v, want unavailable; response=%v", got, response)
-	}
-}
-
-func TestStdioRPCStalledPTYAttachDoesNotBlockHealthyAttach(t *testing.T) {
-	hub := newWebSocketPTYHub(wsPTYServerConfig{Shell: "/bin/sh"}, io.Discard)
-	t.Cleanup(hub.closeAll)
-
-	const healthySessionID = "transport-healthy"
-	if _, _, _, err := hub.attachRPC(
-		context.Background(),
-		healthySessionID,
-		"seed",
-		80,
-		24,
-		"sleep 30",
-		"seed-token",
-		false,
-		false,
-	); err != nil {
-		t.Fatalf("seed healthy PTY session: %v", err)
-	}
-
-	openPTY := hub.openPTY
-	startEntered := make(chan struct{})
-	releaseStart := make(chan struct{})
-	hub.openPTY = func() (*os.File, *os.File, error) {
-		close(startEntered)
-		<-releaseStart
-		return openPTY()
-	}
-
-	stdinReader, stdinWriter := io.Pipe()
-	output := newNotifyingBuffer()
-	serverDone := make(chan error, 1)
-	go func() {
-		serverDone <- runRPCServer(stdinReader, output, hub, false)
-	}()
-	t.Cleanup(func() {
-		_ = stdinWriter.Close()
-		select {
-		case <-releaseStart:
-		default:
-			close(releaseStart)
-		}
-	})
-
-	writePersistentTestFrame(t, bufio.NewWriter(stdinWriter), rpcRequest{
-		ID:     1,
-		Method: "pty.attach",
-		Params: map[string]any{
-			"session_id":              "transport-stalled",
-			"attachment_id":           "stalled",
-			"client_attachment_token": "stalled-token",
-			"cols":                    80,
-			"rows":                    24,
-			"command":                 "sleep 30",
-		},
-	})
-	select {
-	case <-startEntered:
-	case <-time.After(5 * time.Second):
-		t.Fatal("stalled PTY attach never reached PTY allocation")
-	}
-
-	writePersistentTestFrame(t, bufio.NewWriter(stdinWriter), rpcRequest{
-		ID:     2,
-		Method: "pty.attach",
-		Params: map[string]any{
-			"session_id":              healthySessionID,
-			"attachment_id":           "healthy",
-			"client_attachment_token": "healthy-token",
-			"cols":                    80,
-			"rows":                    24,
-			"require_existing":        true,
-		},
-	})
-	response := waitForRPCResponseID(t, output, 2, time.Second)
-	if ok, _ := response["ok"].(bool); !ok {
-		t.Fatalf("healthy attach behind stalled attach failed: %v", response)
-	}
-	if strings.Contains(output.String(), `"id":1`) {
-		t.Fatalf("stalled attach unexpectedly completed before release: %q", output.String())
-	}
-}
-
-func TestStdioRPCPTYAttachCancelStopsInFlightStartWithoutClosingConnection(t *testing.T) {
-	hub := newWebSocketPTYHub(wsPTYServerConfig{
-		Shell:          "/bin/sh",
-		SessionIdleTTL: time.Hour,
-	}, io.Discard)
-	t.Cleanup(hub.closeAll)
-
-	const healthySessionID = "cancel-keeps-transport-healthy"
-	if _, _, _, err := hub.attachRPC(
-		context.Background(),
-		healthySessionID,
-		"seed",
-		80,
-		24,
-		"sleep 30",
-		"seed-token",
-		false,
-		false,
-	); err != nil {
-		t.Fatalf("seed healthy PTY session: %v", err)
-	}
-
-	openPTY := hub.openPTY
-	startEntered := make(chan struct{})
-	releaseStart := make(chan struct{})
-	var releaseStartOnce sync.Once
-	hub.openPTY = func() (*os.File, *os.File, error) {
-		close(startEntered)
-		<-releaseStart
-		return openPTY()
-	}
-
-	stdinReader, stdinWriter := io.Pipe()
-	output := newNotifyingBuffer()
-	serverDone := make(chan error, 1)
-	go func() {
-		serverDone <- runRPCServer(stdinReader, output, hub, false)
-	}()
-	t.Cleanup(func() {
-		releaseStartOnce.Do(func() { close(releaseStart) })
-		_ = stdinWriter.Close()
-	})
-
-	writer := bufio.NewWriter(stdinWriter)
-	writePersistentTestFrame(t, writer, rpcRequest{
-		ID:     1,
-		HasID:  true,
-		Method: "pty.attach",
-		Params: map[string]any{
-			"session_id":              "cancel-stalled-start",
-			"attachment_id":           "stalled",
-			"client_attachment_token": "stalled-token",
-			"cols":                    80,
-			"rows":                    24,
-			"command":                 "sleep 30",
-		},
-	})
-	select {
-	case <-startEntered:
-	case <-time.After(5 * time.Second):
-		t.Fatal("PTY attach never reached its stalled allocation")
-	}
-
-	writePersistentTestFrame(t, writer, rpcRequest{
-		Method: "pty.attach.cancel",
-		Params: map[string]any{
-			"request_id":              1,
-			"session_id":              "cancel-stalled-start",
-			"attachment_id":           "stalled",
-			"client_attachment_token": "stalled-token",
-		},
-	})
-	writePersistentTestFrame(t, writer, rpcRequest{
-		ID:     2,
-		HasID:  true,
-		Method: "pty.attach",
-		Params: map[string]any{
-			"session_id":              healthySessionID,
-			"attachment_id":           "healthy",
-			"client_attachment_token": "healthy-token",
-			"cols":                    80,
-			"rows":                    24,
-			"require_existing":        true,
-		},
-	})
-	healthyResponse := waitForRPCResponseID(t, output, 2, time.Second)
-	if ok, _ := healthyResponse["ok"].(bool); !ok {
-		t.Fatalf("healthy attach behind canceled start failed: %v", healthyResponse)
-	}
-	if strings.Contains(output.String(), `unknown method "pty.attach.cancel"`) {
-		t.Fatalf("PTY attach cancellation was treated as an ordinary RPC: %q", output.String())
-	}
-
-	releaseStartOnce.Do(func() { close(releaseStart) })
-	deadline := time.Now().Add(5 * time.Second)
-	for {
-		hub.mu.Lock()
-		_, starting := hub.startingSessions[persistentPTYSessionKey("cancel-stalled-start")]
-		_, published := hub.sessions[persistentPTYSessionKey("cancel-stalled-start")]
-		hub.mu.Unlock()
-		if !starting {
-			if published {
-				t.Fatal("canceled PTY start was published after allocation returned")
-			}
-			break
-		}
-		if time.Now().After(deadline) {
-			t.Fatal("canceled PTY start did not finish after allocation returned")
-		}
-		time.Sleep(5 * time.Millisecond)
-	}
-
-	writePersistentTestFrame(t, writer, rpcRequest{
-		ID:     3,
-		HasID:  true,
-		Method: "ping",
-	})
-	ping := waitForRPCResponseID(t, output, 3, time.Second)
-	if ok, _ := ping["ok"].(bool); !ok {
-		t.Fatalf("RPC transport stopped after canceling one PTY attach: %v", ping)
-	}
-	select {
-	case err := <-serverDone:
-		t.Fatalf("RPC server exited after PTY attach cancellation: %v", err)
-	default:
-	}
-}
-
-func TestStdioRPCLatePTYAttachCancelDropsPublishedAttachment(t *testing.T) {
-	hub := newWebSocketPTYHub(wsPTYServerConfig{
-		Shell:          "/bin/sh",
-		SessionIdleTTL: time.Hour,
-	}, io.Discard)
-	t.Cleanup(hub.closeAll)
-
-	stdinReader, stdinWriter := io.Pipe()
-	output := newNotifyingBuffer()
-	go func() {
-		_ = runRPCServer(stdinReader, output, hub, false)
-	}()
-	t.Cleanup(func() { _ = stdinWriter.Close() })
-
-	writer := bufio.NewWriter(stdinWriter)
-	writePersistentTestFrame(t, writer, rpcRequest{
-		ID:     41,
-		HasID:  true,
-		Method: "pty.attach",
-		Params: map[string]any{
-			"session_id":              "late-cancel-session",
-			"attachment_id":           "surface",
-			"client_attachment_token": "timed-out-token",
-			"cols":                    80,
-			"rows":                    24,
-			"command":                 "sleep 30",
-		},
-	})
-	response := waitForRPCResponseID(t, output, 41, 5*time.Second)
-	if ok, _ := response["ok"].(bool); !ok {
-		t.Fatalf("initial PTY attach failed: %v", response)
-	}
-	waitForHubSessionSize(t, hub, "late-cancel-session", 1, 80, 24, time.Second)
-
-	writePersistentTestFrame(t, writer, rpcRequest{
-		Method: "pty.attach.cancel",
-		Params: map[string]any{
-			"request_id":              41,
-			"session_id":              "late-cancel-session",
-			"attachment_id":           "surface",
-			"client_attachment_token": "timed-out-token",
-		},
-	})
-	writePersistentTestFrame(t, writer, rpcRequest{
-		ID:     42,
-		HasID:  true,
-		Method: "ping",
-	})
-	ping := waitForRPCResponseID(t, output, 42, time.Second)
-	if ok, _ := ping["ok"].(bool); !ok {
-		t.Fatalf("ping after late PTY attach cancellation failed: %v", ping)
-	}
-	waitForHubSessionSize(t, hub, "late-cancel-session", 0, 80, 24, time.Second)
-
-	writePersistentTestFrame(t, writer, rpcRequest{
-		ID:     43,
-		HasID:  true,
-		Method: "pty.attach",
-		Params: map[string]any{
-			"session_id":              "late-cancel-session",
-			"attachment_id":           "surface",
-			"client_attachment_token": "replacement-token",
-			"cols":                    100,
-			"rows":                    30,
-			"require_existing":        true,
-		},
-	})
-	replacement := waitForRPCResponseID(t, output, 43, time.Second)
-	if ok, _ := replacement["ok"].(bool); !ok {
-		t.Fatalf("replacement attach after late cancellation failed: %v", replacement)
-	}
-	waitForHubSessionSize(t, hub, "late-cancel-session", 1, 100, 30, time.Second)
-}
-
-func TestStdioRPCCloseOvertakesStalledPTYStart(t *testing.T) {
-	hub := newWebSocketPTYHub(wsPTYServerConfig{Shell: "/bin/sh"}, io.Discard)
-	t.Cleanup(hub.closeAll)
-
-	openPTY := hub.openPTY
-	startEntered := make(chan struct{})
-	releaseStart := make(chan struct{})
-	hub.openPTY = func() (*os.File, *os.File, error) {
-		close(startEntered)
-		<-releaseStart
-		return openPTY()
-	}
-
-	stdinReader, stdinWriter := io.Pipe()
-	output := newNotifyingBuffer()
-	serverDone := make(chan error, 1)
-	go func() {
-		serverDone <- runRPCServer(stdinReader, output, hub, false)
-	}()
-	t.Cleanup(func() {
-		_ = stdinWriter.Close()
-		select {
-		case <-releaseStart:
-		default:
-			close(releaseStart)
-		}
-	})
-
-	writePersistentTestFrame(t, bufio.NewWriter(stdinWriter), rpcRequest{
-		ID:     1,
-		Method: "pty.attach",
-		Params: map[string]any{
-			"session_id":              "close-stalled-start",
-			"attachment_id":           "stalled",
-			"client_attachment_token": "stalled-token",
-			"cols":                    80,
-			"rows":                    24,
-			"command":                 "sleep 30",
-		},
-	})
-	writePersistentTestFrame(t, bufio.NewWriter(stdinWriter), rpcRequest{
-		ID:     2,
-		Method: "pty.close",
-		Params: map[string]any{
-			"session_id": "close-stalled-start",
-		},
-	})
-	select {
-	case <-startEntered:
-	case <-time.After(5 * time.Second):
-		t.Fatal("PTY attach never reached its stalled allocation")
-	}
-	closeResponse := waitForRPCResponseID(t, output, 2, time.Second)
-	if ok, _ := closeResponse["ok"].(bool); !ok {
-		t.Fatalf("close pending PTY start failed: %v", closeResponse)
-	}
-
-	close(releaseStart)
-	attachResponse := waitForRPCResponseID(t, output, 1, 5*time.Second)
-	if ok, _ := attachResponse["ok"].(bool); ok {
-		t.Fatalf("closed pending PTY start unexpectedly attached: %v", attachResponse)
-	}
-	hub.mu.Lock()
-	_, published := hub.sessions[persistentPTYSessionKey("close-stalled-start")]
-	hub.mu.Unlock()
-	if published {
-		t.Fatal("closed pending PTY start was published")
-	}
-}
-
-func TestStdioRPCShortCommandStartsExactlyOnce(t *testing.T) {
-	hub := newWebSocketPTYHub(wsPTYServerConfig{Shell: "/bin/sh"}, io.Discard)
-	t.Cleanup(hub.closeAll)
-
-	openPTY := hub.openPTY
-	var startCount atomic.Int32
-	hub.openPTY = func() (*os.File, *os.File, error) {
-		startCount.Add(1)
-		return openPTY()
-	}
-
-	stdinReader, stdinWriter := io.Pipe()
-	output := newNotifyingBuffer()
-	serverDone := make(chan error, 1)
-	go func() {
-		serverDone <- runRPCServer(stdinReader, output, hub, false)
-	}()
-	t.Cleanup(func() { _ = stdinWriter.Close() })
-
-	writePersistentTestFrame(t, bufio.NewWriter(stdinWriter), rpcRequest{
-		ID:     1,
-		Method: "pty.attach",
-		Params: map[string]any{
-			"session_id":              "short-command",
-			"attachment_id":           "short",
-			"client_attachment_token": "short-token",
-			"cols":                    80,
-			"rows":                    24,
-			"command":                 "printf 'MARKER\\n'; exit 0",
-		},
-	})
-	response := waitForRPCResponseID(t, output, 1, 5*time.Second)
-	if ok, _ := response["ok"].(bool); !ok {
-		t.Fatalf("short command attach failed: %v", response)
-	}
-	dataEvent := waitForRPCEvent(t, output, 0, func(event map[string]any) bool {
-		if event["event"] != "pty.data" {
-			return false
-		}
-		encoded, _ := event["data_base64"].(string)
-		decoded, err := base64.StdEncoding.DecodeString(encoded)
-		return err == nil && bytes.Contains(decoded, []byte("MARKER"))
-	})
-	if dataEvent["session_id"] != "short-command" {
-		t.Fatalf("short command data event = %v", dataEvent)
-	}
-	exitEvent := waitForRPCEvent(t, output, 0, func(event map[string]any) bool {
-		return event["event"] == "pty.exit"
-	})
-	if exitEvent["session_id"] != "short-command" {
-		t.Fatalf("short command exit event = %v", exitEvent)
-	}
-	if got := startCount.Load(); got != 1 {
-		t.Fatalf("short command PTY start count = %d, want exactly 1", got)
-	}
-	exitCount := 0
-	for _, line := range rpcEventLines(output) {
-		var event map[string]any
-		if err := json.Unmarshal([]byte(line), &event); err == nil &&
-			event["event"] == "pty.exit" &&
-			event["session_id"] == "short-command" {
-			exitCount++
-		}
-	}
-	if exitCount != 1 {
-		t.Fatalf("short command exit event count = %d, want exactly 1; output=%q", exitCount, output.String())
-	}
-}
-
-func TestStdioRPCDisconnectCancelsSameSessionAttachWaiter(t *testing.T) {
-	hub := newWebSocketPTYHub(wsPTYServerConfig{Shell: "/bin/sh"}, io.Discard)
-	t.Cleanup(hub.closeAll)
-
-	openPTY := hub.openPTY
-	startEntered := make(chan struct{})
-	releaseStart := make(chan struct{})
-	hub.openPTY = func() (*os.File, *os.File, error) {
-		close(startEntered)
-		<-releaseStart
-		return openPTY()
-	}
-
-	stdinReader, stdinWriter := io.Pipe()
-	output := newNotifyingBuffer()
-	serverDone := make(chan error, 1)
-	go func() {
-		serverDone <- runRPCServer(stdinReader, output, hub, false)
-	}()
-	t.Cleanup(func() {
-		_ = stdinWriter.Close()
-		select {
-		case <-releaseStart:
-		default:
-			close(releaseStart)
-		}
-	})
-
-	writer := bufio.NewWriter(stdinWriter)
-	attachRequest := func(id int, attachmentID string) {
-		writePersistentTestFrame(t, writer, rpcRequest{
-			ID:     id,
-			Method: "pty.attach",
-			Params: map[string]any{
-				"session_id":              "disconnect-stalled",
-				"attachment_id":           attachmentID,
-				"client_attachment_token": attachmentID + "-token",
-				"cols":                    80,
-				"rows":                    24,
-				"command":                 "sleep 30",
-			},
-		})
-	}
-	attachRequest(1, "owner")
-	select {
-	case <-startEntered:
-	case <-time.After(5 * time.Second):
-		t.Fatal("owner attach never reached PTY allocation")
-	}
-	attachRequest(2, "waiter")
-	writePersistentTestFrame(t, writer, rpcRequest{
-		ID:     3,
-		Method: "ping",
-	})
-	ping := waitForRPCResponseID(t, output, 3, time.Second)
-	if ok, _ := ping["ok"].(bool); !ok {
-		t.Fatalf("ping behind same-session waiter failed: %v", ping)
-	}
-
-	if err := stdinWriter.Close(); err != nil {
-		t.Fatalf("close RPC input: %v", err)
-	}
-	select {
-	case err := <-serverDone:
-		if err != nil {
-			t.Fatalf("stdio RPC server returned error after EOF: %v", err)
-		}
-	case <-time.After(time.Second):
-		t.Fatal("stdio RPC server did not return after EOF")
-	}
-
-	close(releaseStart)
-	deadline := time.NewTimer(5 * time.Second)
-	defer deadline.Stop()
-	ticker := time.NewTicker(5 * time.Millisecond)
-	defer ticker.Stop()
-	for {
-		hub.mu.Lock()
-		_, starting := hub.startingSessions[persistentPTYSessionKey("disconnect-stalled")]
-		_, published := hub.sessions[persistentPTYSessionKey("disconnect-stalled")]
-		hub.mu.Unlock()
-		if !starting {
-			if published {
-				t.Fatal("PTY session was published after its RPC connection closed")
-			}
-			return
-		}
-		select {
-		case <-ticker.C:
-		case <-deadline.C:
-			t.Fatal("stalled PTY start did not finish after release")
-		}
-	}
-}
-
-func TestStdioRPCAsyncAttachWriteFailureInterruptsReadLoop(t *testing.T) {
-	hub := newWebSocketPTYHub(wsPTYServerConfig{Shell: "/bin/sh"}, io.Discard)
-	t.Cleanup(hub.closeAll)
-
-	stdinReader, stdinWriter := io.Pipe()
-	t.Cleanup(func() { _ = stdinWriter.Close() })
-	writeErr := errors.New("async attach response write failed")
-	serverDone := make(chan error, 1)
-	go func() {
-		serverDone <- runRPCServer(stdinReader, authErrorWriter{err: writeErr}, hub, false)
-	}()
-
-	writePersistentTestFrame(t, bufio.NewWriter(stdinWriter), rpcRequest{
-		ID:     1,
-		Method: "pty.attach",
-		Params: map[string]any{},
-	})
-	select {
-	case err := <-serverDone:
-		if !errors.Is(err, writeErr) {
-			t.Fatalf("stdio RPC server error = %v, want async write error", err)
-		}
-	case <-time.After(time.Second):
-		t.Fatal("async attach write failure did not interrupt the stdio read loop")
-	}
-}
-
-func TestPTYAttachmentPumpCancellationDropsHubAttachment(t *testing.T) {
-	hub := newWebSocketPTYHub(wsPTYServerConfig{
-		Shell:          "/bin/sh",
-		SessionIdleTTL: time.Hour,
-	}, io.Discard)
-	t.Cleanup(hub.closeAll)
-
-	ctx, cancel := context.WithCancel(context.Background())
-	attachment, attachmentCtx, sessionDone, err := hub.attachRPC(
-		ctx,
-		"pump-canceled-session",
-		"pump-canceled-attachment",
-		80,
-		24,
-		"sleep 30",
-		"",
-		false,
-		false,
-	)
-	if err != nil {
-		t.Fatalf("attach PTY: %v", err)
-	}
-	server := &rpcServer{
-		ptyHub:      hub,
-		frameWriter: &stdioFrameWriter{writer: bufio.NewWriter(io.Discard)},
-	}
-	if !server.trackPTYAttachment(attachment) {
-		t.Fatal("track PTY attachment")
-	}
-	pumpDone := make(chan struct{})
-	go func() {
-		server.ptyAttachmentPump(attachmentCtx, attachment, sessionDone)
-		close(pumpDone)
-	}()
-
-	cancel()
-	select {
-	case <-pumpDone:
-	case <-time.After(time.Second):
-		t.Fatal("PTY attachment pump did not stop after context cancellation")
-	}
-
-	hub.mu.Lock()
-	session := hub.sessions[persistentPTYSessionKey("pump-canceled-session")]
-	attachmentCount := 0
-	hasIdleTimer := false
-	if session != nil {
-		attachmentCount = len(session.attachments)
-		hasIdleTimer = session.idleTimer != nil
-	}
-	hub.mu.Unlock()
-	if attachmentCount != 0 {
-		t.Fatalf("hub attachments after pump cancellation = %d, want 0", attachmentCount)
-	}
-	if !hasIdleTimer {
-		t.Fatal("pump cancellation did not schedule the empty session for idle reaping")
-	}
-}
-
-func TestPTYAttachmentPumpReleasesLifetimeContextAfterSessionExit(t *testing.T) {
-	attachmentCtx, cancelAttachment := context.WithCancel(context.Background())
-	defer cancelAttachment()
-	attachment := &wsPTYAttachment{
-		sessionKey:  persistentPTYSessionKey("completed-session"),
-		id:          "completed-attachment",
-		clientToken: "completed-token",
-		send:        make(chan wsPTYOutgoingFrame, defaultWebSocketWriteQueueCap),
-		cancel:      cancelAttachment,
-		persistent:  true,
-	}
-	sessionDone := make(chan struct{})
-	close(sessionDone)
-	server := &rpcServer{
-		frameWriter: &stdioFrameWriter{writer: bufio.NewWriter(io.Discard)},
-	}
-
-	server.ptyAttachmentPump(attachmentCtx, attachment, sessionDone)
-
-	if !errors.Is(attachmentCtx.Err(), context.Canceled) {
-		t.Fatalf("attachment context error after session exit = %v, want context.Canceled", attachmentCtx.Err())
-	}
-}
-
-func TestPersistentStdioProxyReturnsWhenDaemonClosesFirst(t *testing.T) {
-	client, server := net.Pipe()
-	stdinReader, stdinWriter := io.Pipe()
-	defer stdinWriter.Close()
-
-	done := make(chan error, 1)
-	go func() {
-		done <- proxyPersistentDaemonConn(stdinReader, io.Discard, client)
-	}()
-
-	_ = server.Close()
-	select {
-	case err := <-done:
-		if err != nil {
-			t.Fatalf("proxyPersistentDaemonConn returned error: %v", err)
-		}
-	case <-time.After(time.Second):
-		t.Fatalf("proxyPersistentDaemonConn did not return after daemon side closed")
-	}
-	_ = stdinWriter.Close()
-}
-
-func TestPersistentDaemonPTYReattachSurvivesClientDisconnect(t *testing.T) {
-	socketPath, stop := startPersistentDaemonForTest(t, "reattach-token")
-	defer stop()
-
-	conn1, reader1, writer1 := openPersistentTestClient(t, socketPath, "reattach-token")
-	sessionID := "persistent-rpc"
-	attach1 := persistentTestRPCCall(t, conn1, reader1, writer1, rpcRequest{
-		ID:     1,
-		Method: "pty.attach",
-		Params: map[string]any{
-			"session_id":              sessionID,
-			"attachment_id":           "a1",
-			"client_attachment_token": "token-a1",
-			"cols":                    80,
-			"rows":                    24,
-			"command":                 "printf 'persistent-rpc-data\\n'; sleep 60",
-		},
-	})
-	if ok, _ := attach1["ok"].(bool); !ok {
-		t.Fatalf("first pty.attach failed: %v", attach1)
-	}
-	readPersistentTestEvent(t, conn1, reader1, func(frame map[string]any) bool {
-		return frame["event"] == "pty.ready" && frame["attachment_id"] == "a1"
-	})
-	readPersistentTestEvent(t, conn1, reader1, func(frame map[string]any) bool {
-		if frame["event"] != "pty.data" || frame["attachment_id"] != "a1" {
-			return false
-		}
-		payload, err := base64.StdEncoding.DecodeString(frame["data_base64"].(string))
-		return err == nil && strings.Contains(string(payload), "persistent-rpc-data")
-	})
-	_ = conn1.Close()
-
-	conn2, reader2, writer2 := openPersistentTestClient(t, socketPath, "reattach-token")
-	defer conn2.Close()
-	attach2 := persistentTestRPCCall(t, conn2, reader2, writer2, rpcRequest{
-		ID:     2,
-		Method: "pty.attach",
-		Params: map[string]any{
-			"session_id":              sessionID,
-			"attachment_id":           "a2",
-			"client_attachment_token": "token-a2",
-			"cols":                    100,
-			"rows":                    30,
-			"command":                 "printf 'should-not-run\\n'",
-			"require_existing":        true,
-		},
-	})
-	if ok, _ := attach2["ok"].(bool); !ok {
-		t.Fatalf("second pty.attach failed: %v", attach2)
-	}
-	attach2Result, _ := attach2["result"].(map[string]any)
-	replayBytes, _ := attach2Result["replay_bytes"].(float64)
-	if replayBytes <= 0 {
-		t.Fatalf("second pty.attach replay_bytes = %v, want positive scrollback size", attach2Result["replay_bytes"])
-	}
-	readPersistentTestEvent(t, conn2, reader2, func(frame map[string]any) bool {
-		return frame["event"] == "pty.ready" && frame["attachment_id"] == "a2"
-	})
-	readPersistentTestEvent(t, conn2, reader2, func(frame map[string]any) bool {
-		if frame["event"] != "pty.data" || frame["attachment_id"] != "a2" {
-			return false
-		}
-		payload, err := base64.StdEncoding.DecodeString(frame["data_base64"].(string))
-		return err == nil && strings.Contains(string(payload), "persistent-rpc-data")
-	})
-
-	list := persistentTestRPCCall(t, conn2, reader2, writer2, rpcRequest{
-		ID:     3,
-		Method: "pty.list",
-		Params: map[string]any{},
-	})
-	if ok, _ := list["ok"].(bool); !ok {
-		t.Fatalf("pty.list failed: %v", list)
-	}
-	result, _ := list["result"].(map[string]any)
-	sessions, _ := result["sessions"].([]any)
-	if len(sessions) != 1 {
-		t.Fatalf("pty.list sessions = %v, want one", result["sessions"])
-	}
-	session, _ := sessions[0].(map[string]any)
-	if got := session["session_id"]; got != sessionID {
-		t.Fatalf("pty.list session_id = %v, want %s", got, sessionID)
-	}
-
-	closeResp := persistentTestRPCCall(t, conn2, reader2, writer2, rpcRequest{
-		ID:     4,
-		Method: "pty.close",
-		Params: map[string]any{"session_id": sessionID},
-	})
-	if ok, _ := closeResp["ok"].(bool); !ok {
-		t.Fatalf("pty.close failed: %v", closeResp)
-	}
-}
-
-func TestPersistentDaemonReadySignalAllowsImmediateDial(t *testing.T) {
-	socketDir, err := os.MkdirTemp("/tmp", "cmuxd-remote-ready-*")
-	if err != nil {
-		t.Fatalf("create short socket dir: %v", err)
-	}
-	defer os.RemoveAll(socketDir)
-	socketPath := filepath.Join(socketDir, "rpc.sock")
-	listener, err := net.Listen("unix", socketPath)
-	if err != nil {
-		t.Fatalf("listen unix: %v", err)
-	}
-
-	readyReader, readyWriter, err := os.Pipe()
-	if err != nil {
-		_ = listener.Close()
-		t.Fatalf("create ready pipe: %v", err)
-	}
-	defer readyReader.Close()
-	readyFD, err := syscall.Dup(int(readyWriter.Fd()))
-	if err != nil {
-		_ = listener.Close()
-		_ = readyWriter.Close()
-		t.Fatalf("duplicate ready fd: %v", err)
-	}
-	t.Setenv(persistentDaemonReadyFDEnv, strconv.Itoa(readyFD))
-	signalPersistentDaemonReady()
-	_ = readyWriter.Close()
-	line, err := bufio.NewReader(readyReader).ReadString('\n')
-	if err != nil {
-		_ = listener.Close()
-		t.Fatalf("read ready signal: %v", err)
-	}
-	if strings.TrimSpace(line) != "ready" {
-		_ = listener.Close()
-		t.Fatalf("ready signal = %q, want ready", strings.TrimSpace(line))
-	}
-
-	done := make(chan error, 1)
-	go func() {
-		done <- servePersistentDaemonWithVerifier(listener, persistentDaemonFixedTokenVerifier("ready-token"), io.Discard)
-	}()
-
-	conn, err := dialPersistentDaemon(socketPath, "ready-token")
-	if err != nil {
-		_ = listener.Close()
-		t.Fatalf("dial persistent daemon after ready signal: %v", err)
-	}
-	_ = conn.Close()
-
-	_ = listener.Close()
-	select {
-	case err := <-done:
-		if err != nil {
-			t.Fatalf("persistent daemon exited with error: %v", err)
-		}
-	case <-time.After(2 * time.Second):
-		t.Fatalf("persistent daemon did not stop")
-	}
-}
-
-func TestPersistentDaemonServerExitsAfterEmptySlotIdleTimeout(t *testing.T) {
-	socketDir, err := os.MkdirTemp("/tmp", "cmuxd-remote-idle-*")
-	if err != nil {
-		t.Fatalf("create short socket dir: %v", err)
-	}
-	defer os.RemoveAll(socketDir)
-	socketPath := filepath.Join(socketDir, "rpc.sock")
-	listener, err := net.Listen("unix", socketPath)
-	if err != nil {
-		t.Fatalf("listen unix: %v", err)
-	}
-
-	var stderr bytes.Buffer
-	done := make(chan error, 1)
-	go func() {
-		done <- servePersistentDaemonWithVerifierConfig(
-			listener,
-			persistentDaemonFixedTokenVerifier("idle-token"),
-			&stderr,
-			persistentDaemonServerConfig{
-				emptyIdleTimeout: 500 * time.Millisecond,
-				acceptPollStep:   25 * time.Millisecond,
-			},
-		)
-	}()
-
-	conn, reader, writer := openPersistentTestClient(t, socketPath, "idle-token")
-	attach := persistentTestRPCCall(t, conn, reader, writer, rpcRequest{
-		ID:     1,
-		Method: "pty.attach",
-		Params: map[string]any{
-			"session_id":              "idle-session",
-			"attachment_id":           "idle-attachment",
-			"client_attachment_token": "idle-attachment-token",
-			"cols":                    80,
-			"rows":                    24,
-			"command":                 "sleep 60",
-		},
-	})
-	if ok, _ := attach["ok"].(bool); !ok {
-		t.Fatalf("pty.attach failed: %v", attach)
-	}
-	readPersistentTestEvent(t, conn, reader, func(frame map[string]any) bool {
-		return frame["event"] == "pty.ready" && frame["attachment_id"] == "idle-attachment"
-	})
-
-	closeResp := persistentTestRPCCall(t, conn, reader, writer, rpcRequest{
-		ID:     2,
-		Method: "pty.close",
-		Params: map[string]any{"session_id": "idle-session"},
-	})
-	if ok, _ := closeResp["ok"].(bool); !ok {
-		t.Fatalf("pty.close failed: %v", closeResp)
-	}
-	_ = conn.Close()
-
-	select {
-	case err := <-done:
-		if err != nil {
-			t.Fatalf("persistent daemon exited with error: %v", err)
-		}
-	case <-time.After(2 * time.Second):
-		t.Fatalf("persistent daemon did not stop after empty idle timeout")
-	}
-	requirePersistentDaemonAutomaticExitLog(
-		t,
-		stderr.String(),
-		persistentDaemonExitEmptyIdleTimeout,
-	)
-}
-
-func TestRunStdioSlotRequiresPersistent(t *testing.T) {
-	var stderr bytes.Buffer
-	code := run([]string{"serve", "--stdio", "--slot", "slot-without-persistent"}, strings.NewReader(""), &bytes.Buffer{}, &stderr)
-	if code != 2 {
-		t.Fatalf("run serve exit code = %d, want 2", code)
-	}
-	if !strings.Contains(stderr.String(), "serve --slot requires --persistent") {
-		t.Fatalf("stderr = %q, want --slot validation error", stderr.String())
-	}
-}
-
-func TestRunStdioInvalidJSONAndUnknownMethod(t *testing.T) {
-	input := strings.NewReader(
-		`{"id":1,"method":"hello","params":{}` + "\n" +
-			`{"id":2,"method":"unknown","params":{}}` + "\n",
-	)
-	var out bytes.Buffer
-	code := run([]string{"serve", "--stdio"}, input, &out, &bytes.Buffer{})
-	if code != 0 {
-		t.Fatalf("run serve exit code = %d, want 0", code)
-	}
-
-	lines := strings.Split(strings.TrimSpace(out.String()), "\n")
-	if len(lines) != 2 {
-		t.Fatalf("got %d response lines, want 2: %q", len(lines), out.String())
-	}
-
-	var first map[string]any
-	if err := json.Unmarshal([]byte(lines[0]), &first); err != nil {
-		t.Fatalf("failed to decode first response: %v", err)
-	}
-	if ok, _ := first["ok"].(bool); ok {
-		t.Fatalf("first response should be ok=false for invalid JSON: %v", first)
-	}
-	firstError, _ := first["error"].(map[string]any)
-	if got := firstError["code"]; got != "invalid_request" {
-		t.Fatalf("invalid JSON should return invalid_request; got=%v payload=%v", got, first)
-	}
-
-	var second map[string]any
-	if err := json.Unmarshal([]byte(lines[1]), &second); err != nil {
-		t.Fatalf("failed to decode second response: %v", err)
-	}
-	if ok, _ := second["ok"].(bool); ok {
-		t.Fatalf("second response should be ok=false for unknown method: %v", second)
-	}
-	secondError, _ := second["error"].(map[string]any)
-	if got := secondError["code"]; got != "method_not_found" {
-		t.Fatalf("unknown method should return method_not_found; got=%v payload=%v", got, second)
-	}
-}
-
-func TestRunStdioSessionResizeFlow(t *testing.T) {
-	input := strings.NewReader(
-		`{"id":1,"method":"session.open","params":{"session_id":"sess-stdio"}}` + "\n" +
-			`{"id":2,"method":"session.attach","params":{"session_id":"sess-stdio","attachment_id":"a1","cols":120,"rows":40}}` + "\n" +
-			`{"id":3,"method":"session.attach","params":{"session_id":"sess-stdio","attachment_id":"a2","cols":90,"rows":30}}` + "\n" +
-			`{"id":4,"method":"session.status","params":{"session_id":"sess-stdio"}}` + "\n",
-	)
-	var out bytes.Buffer
-	code := run([]string{"serve", "--stdio"}, input, &out, &bytes.Buffer{})
-	if code != 0 {
-		t.Fatalf("run serve exit code = %d, want 0", code)
-	}
-
-	lines := strings.Split(strings.TrimSpace(out.String()), "\n")
-	if len(lines) != 4 {
-		t.Fatalf("got %d response lines, want 4: %q", len(lines), out.String())
-	}
-
-	var status map[string]any
-	if err := json.Unmarshal([]byte(lines[3]), &status); err != nil {
-		t.Fatalf("failed to decode status response: %v", err)
-	}
-	if ok, _ := status["ok"].(bool); !ok {
-		t.Fatalf("session.status should be ok=true: %v", status)
-	}
-	result, _ := status["result"].(map[string]any)
-	if result == nil {
-		t.Fatalf("session.status missing result object: %v", status)
-	}
-	effectiveCols, _ := result["effective_cols"].(float64)
-	effectiveRows, _ := result["effective_rows"].(float64)
-	if int(effectiveCols) != 90 || int(effectiveRows) != 30 {
-		t.Fatalf("session smallest-wins effective size mismatch: got=%vx%v payload=%v", effectiveCols, effectiveRows, result)
-	}
-}
-
-func TestProxyStreamRoundTrip(t *testing.T) {
-	listener, err := net.Listen("tcp", "127.0.0.1:0")
-	if err != nil {
-		t.Fatalf("listen failed: %v", err)
-	}
-	defer listener.Close()
-
-	done := make(chan struct{})
-	go func() {
-		defer close(done)
-		conn, acceptErr := listener.Accept()
-		if acceptErr != nil {
-			return
-		}
-		defer conn.Close()
-
-		buffer := make([]byte, 4)
-		if _, readErr := io.ReadFull(conn, buffer); readErr != nil {
-			return
-		}
-		if string(buffer) != "ping" {
-			return
-		}
-		_, _ = conn.Write([]byte("pong"))
-	}()
-
-	eventOutput := newNotifyingBuffer()
-	server := &rpcServer{
-		nextStreamID:  1,
-		nextSessionID: 1,
-		streams:       map[string]*streamState{},
-		sessions:      map[string]*sessionState{},
-		frameWriter: &stdioFrameWriter{
-			writer: bufio.NewWriter(eventOutput),
-		},
-	}
-	defer server.closeAll()
-
-	port := listener.Addr().(*net.TCPAddr).Port
-	openResp := server.handleRequest(rpcRequest{
-		ID:     1,
-		Method: "proxy.open",
-		Params: map[string]any{
-			"host":       "127.0.0.1",
-			"port":       port,
-			"timeout_ms": 1000,
-		},
-	})
-	if !openResp.OK {
-		t.Fatalf("proxy.open failed: %+v", openResp)
-	}
-	openResult, _ := openResp.Result.(map[string]any)
-	streamID, _ := openResult["stream_id"].(string)
-	if streamID == "" {
-		t.Fatalf("proxy.open missing stream_id: %+v", openResp)
-	}
-
-	writeResp := server.handleRequest(rpcRequest{
-		ID:     2,
-		Method: "proxy.write",
-		Params: map[string]any{
-			"stream_id":   streamID,
-			"data_base64": base64.StdEncoding.EncodeToString([]byte("ping")),
-		},
-	})
-	if !writeResp.OK {
-		t.Fatalf("proxy.write failed: %+v", writeResp)
-	}
-
-	readResp := server.handleRequest(rpcRequest{
-		ID:     3,
-		Method: "proxy.stream.subscribe",
-		Params: map[string]any{
-			"stream_id": streamID,
-		},
-	})
-	if !readResp.OK {
-		t.Fatalf("proxy.stream.subscribe failed: %+v", readResp)
-	}
-	select {
-	case <-eventOutput.notify:
-	case <-time.After(2 * time.Second):
-		t.Fatalf("timed out waiting for proxy.stream.data event")
-	}
-
-	lines := strings.Split(strings.TrimSpace(eventOutput.String()), "\n")
-	if len(lines) == 0 || strings.TrimSpace(lines[0]) == "" {
-		t.Fatalf("proxy.stream.data event output was empty")
-	}
-
-	var event map[string]any
-	if err := json.Unmarshal([]byte(lines[0]), &event); err != nil {
-		t.Fatalf("failed to decode stream event: %v", err)
-	}
-	if got := event["event"]; got != "proxy.stream.data" {
-		t.Fatalf("unexpected stream event=%v payload=%v", got, event)
-	}
-	dataBase64, _ := event["data_base64"].(string)
-	data, decodeErr := base64.StdEncoding.DecodeString(dataBase64)
-	if decodeErr != nil {
-		t.Fatalf("proxy.stream.data returned invalid base64: %v", decodeErr)
-	}
-	if string(data) != "pong" {
-		t.Fatalf("proxy.stream.data payload=%q, want %q", string(data), "pong")
-	}
-
-	closeResp := server.handleRequest(rpcRequest{
-		ID:     4,
-		Method: "proxy.close",
-		Params: map[string]any{
-			"stream_id": streamID,
-		},
-	})
-	if !closeResp.OK {
-		t.Fatalf("proxy.close failed: %+v", closeResp)
-	}
-
-	select {
-	case <-done:
-	case <-time.After(2 * time.Second):
-		t.Fatalf("proxy test server goroutine did not finish")
-	}
-}
-
-func TestProxyStreamEOFPayloadIsNotDuplicatedAcrossDataAndEOFEvents(t *testing.T) {
-	eventOutput := newNotifyingBuffer()
-	server := &rpcServer{
-		nextStreamID:  1,
-		nextSessionID: 1,
-		streams: map[string]*streamState{
-			"stream-1": {
-				conn: &eofWithPayloadConn{payload: []byte("tail")},
-			},
-		},
-		sessions: map[string]*sessionState{},
-		frameWriter: &stdioFrameWriter{
-			writer: bufio.NewWriter(eventOutput),
-		},
-	}
-	defer server.closeAll()
-
-	resp := server.handleRequest(rpcRequest{
-		ID:     1,
-		Method: "proxy.stream.subscribe",
-		Params: map[string]any{"stream_id": "stream-1"},
-	})
-	if !resp.OK {
-		t.Fatalf("proxy.stream.subscribe failed: %+v", resp)
-	}
-
-	deadline := time.Now().Add(2 * time.Second)
-	for strings.Count(strings.TrimSpace(eventOutput.String()), "\n")+boolToInt(strings.TrimSpace(eventOutput.String()) != "") < 2 {
-		remaining := time.Until(deadline)
-		if remaining <= 0 {
-			t.Fatalf("timed out waiting for proxy stream events: %q", eventOutput.String())
-		}
-		select {
-		case <-eventOutput.notify:
-		case <-time.After(remaining):
-			t.Fatalf("timed out waiting for proxy stream events: %q", eventOutput.String())
-		}
-	}
-
-	lines := strings.Split(strings.TrimSpace(eventOutput.String()), "\n")
-	if len(lines) != 2 {
-		t.Fatalf("expected exactly 2 stream events, got %d: %q", len(lines), eventOutput.String())
-	}
-
-	var first map[string]any
-	if err := json.Unmarshal([]byte(lines[0]), &first); err != nil {
-		t.Fatalf("decode first event: %v", err)
-	}
-	var second map[string]any
-	if err := json.Unmarshal([]byte(lines[1]), &second); err != nil {
-		t.Fatalf("decode second event: %v", err)
-	}
-
-	if got := first["event"]; got != "proxy.stream.data" {
-		t.Fatalf("first event = %v, want proxy.stream.data", got)
-	}
-	if got := second["event"]; got != "proxy.stream.eof" {
-		t.Fatalf("second event = %v, want proxy.stream.eof", got)
-	}
-
-	firstPayload, err := base64.StdEncoding.DecodeString(first["data_base64"].(string))
-	if err != nil {
-		t.Fatalf("decode first payload: %v", err)
-	}
-	secondPayload, err := decodeOptionalBase64(second["data_base64"])
-	if err != nil {
-		t.Fatalf("decode second payload: %v", err)
-	}
-
-	if string(firstPayload) != "tail" {
-		t.Fatalf("proxy.stream.data payload = %q, want %q", string(firstPayload), "tail")
-	}
-	if len(secondPayload) != 0 {
-		t.Fatalf("proxy.stream.eof payload = %q, want empty payload after data event", string(secondPayload))
-	}
-}
-
-func TestPTYRPCSessionReattachListAndClose(t *testing.T) {
-	eventOutput := newNotifyingBuffer()
-	server := &rpcServer{
-		nextStreamID:  1,
-		nextSessionID: 1,
-		streams:       map[string]*streamState{},
-		sessions:      map[string]*sessionState{},
-		ptyHub: newWebSocketPTYHub(wsPTYServerConfig{
-			ScrollbackLimit: 4096,
-			SessionIdleTTL:  time.Hour,
-		}, io.Discard),
-		ownsPTYHub: true,
-		frameWriter: &stdioFrameWriter{
-			writer: bufio.NewWriter(eventOutput),
-		},
-	}
-	defer server.closeAll()
-
-	attachResp := server.handleRequest(rpcRequest{
-		ID:     1,
-		Method: "pty.attach",
-		Params: map[string]any{
-			"session_id":              "pty-rpc",
-			"attachment_id":           "a1",
-			"client_attachment_token": "token-a1",
-			"cols":                    80,
-			"rows":                    24,
-			"command":                 "printf 'hello-rpc\\n'; sleep 60",
-		},
-	})
-	if !attachResp.OK {
-		t.Fatalf("pty.attach failed: %+v", attachResp)
-	}
-
-	ready := waitForRPCEvent(t, eventOutput, 0, func(event map[string]any) bool {
-		return event["event"] == "pty.ready" && event["attachment_id"] == "a1"
-	})
-	if ready["session_id"] != "pty-rpc" {
-		t.Fatalf("pty.ready session_id = %v, want pty-rpc", ready["session_id"])
-	}
-	waitForRPCEvent(t, eventOutput, 0, func(event map[string]any) bool {
-		if event["event"] != "pty.data" || event["attachment_id"] != "a1" {
-			return false
-		}
-		payload, err := base64.StdEncoding.DecodeString(event["data_base64"].(string))
-		return err == nil && strings.Contains(string(payload), "hello-rpc")
-	})
-
-	listResp := server.handleRequest(rpcRequest{
-		ID:     2,
-		Method: "pty.list",
-		Params: map[string]any{},
-	})
-	if !listResp.OK {
-		t.Fatalf("pty.list failed: %+v", listResp)
-	}
-	listResult, _ := listResp.Result.(map[string]any)
-	sessions, _ := listResult["sessions"].([]map[string]any)
-	if len(sessions) != 1 {
-		t.Fatalf("pty.list sessions = %v, want one session", listResult["sessions"])
-	}
-	if sessions[0]["session_id"] != "pty-rpc" {
-		t.Fatalf("pty.list session_id = %v, want pty-rpc", sessions[0]["session_id"])
-	}
-
-	detachResp := server.handleRequest(rpcRequest{
-		ID:     3,
-		Method: "pty.detach",
-		Params: map[string]any{
-			"session_id":              "pty-rpc",
-			"attachment_id":           "a1",
-			"client_attachment_token": "token-a1",
-		},
-	})
-	if !detachResp.OK {
-		t.Fatalf("pty.detach failed: %+v", detachResp)
-	}
-
-	lineCountBeforeReattach := rpcEventLineCount(eventOutput)
-	reattachResp := server.handleRequest(rpcRequest{
-		ID:     4,
-		Method: "pty.attach",
-		Params: map[string]any{
-			"session_id":              "pty-rpc",
-			"attachment_id":           "a2",
-			"client_attachment_token": "token-a2",
-			"cols":                    100,
-			"rows":                    30,
-			"command":                 "printf 'should-not-run\\n'",
-		},
-	})
-	if !reattachResp.OK {
-		t.Fatalf("pty reattach failed: %+v", reattachResp)
-	}
-	waitForRPCEvent(t, eventOutput, lineCountBeforeReattach, func(event map[string]any) bool {
-		if event["event"] != "pty.data" || event["attachment_id"] != "a2" {
-			return false
-		}
-		payload, err := base64.StdEncoding.DecodeString(event["data_base64"].(string))
-		return err == nil && strings.Contains(string(payload), "hello-rpc")
-	})
-
-	lineCountBeforeClose := rpcEventLineCount(eventOutput)
-	closeResp := server.handleRequest(rpcRequest{
-		ID:     5,
-		Method: "pty.close",
-		Params: map[string]any{
-			"session_id": "pty-rpc",
-		},
-	})
-	if !closeResp.OK {
-		t.Fatalf("pty.close failed: %+v", closeResp)
-	}
-	waitForRPCEvent(t, eventOutput, lineCountBeforeClose, func(event map[string]any) bool {
-		return event["event"] == "pty.exit" && event["attachment_id"] == "a2"
-	})
-	emptyListResp := server.handleRequest(rpcRequest{
-		ID:     6,
-		Method: "pty.list",
-		Params: map[string]any{},
-	})
-	if !emptyListResp.OK {
-		t.Fatalf("pty.list after close failed: %+v", emptyListResp)
-	}
-	emptyResult, _ := emptyListResp.Result.(map[string]any)
-	emptySessions, _ := emptyResult["sessions"].([]map[string]any)
-	if len(emptySessions) != 0 {
-		t.Fatalf("pty.list after close sessions = %v, want none", emptyResult["sessions"])
-	}
-}
-
-func TestPTYRPCCommandUsesPOSIXShellForConfiguredLoginShell(t *testing.T) {
-	if _, err := os.Stat("/usr/bin/false"); err != nil {
-		t.Skip("/usr/bin/false is not available")
-	}
-	eventOutput := newNotifyingBuffer()
-	server := &rpcServer{
-		nextStreamID:  1,
-		nextSessionID: 1,
-		streams:       map[string]*streamState{},
-		sessions:      map[string]*sessionState{},
-		ptyHub: newWebSocketPTYHub(wsPTYServerConfig{
-			Shell:           "/usr/bin/false",
-			ScrollbackLimit: 4096,
-			SessionIdleTTL:  time.Hour,
-		}, io.Discard),
-		ownsPTYHub: true,
-		frameWriter: &stdioFrameWriter{
-			writer: bufio.NewWriter(eventOutput),
-		},
-	}
-	defer server.closeAll()
-
-	attachResp := server.handleRequest(rpcRequest{
-		ID:     1,
-		Method: "pty.attach",
-		Params: map[string]any{
-			"session_id":              "pty-posix-shell",
-			"attachment_id":           "a1",
-			"client_attachment_token": "token-a1",
-			"cols":                    80,
-			"rows":                    24,
-			"command":                 "printf 'posix-shell-ok\\n'; sleep 60",
-		},
-	})
-	if !attachResp.OK {
-		t.Fatalf("pty.attach failed: %+v", attachResp)
-	}
-	waitForRPCEvent(t, eventOutput, 0, func(event map[string]any) bool {
-		if event["event"] != "pty.data" || event["attachment_id"] != "a1" {
-			return false
-		}
-		payload, err := base64.StdEncoding.DecodeString(event["data_base64"].(string))
-		return err == nil && strings.Contains(string(payload), "posix-shell-ok")
-	})
-}
-
-func TestPTYRPCRequireExistingFailsMissingSession(t *testing.T) {
-	server := &rpcServer{
-		nextStreamID:  1,
-		nextSessionID: 1,
-		streams:       map[string]*streamState{},
-		sessions:      map[string]*sessionState{},
-		ptyHub:        newWebSocketPTYHub(wsPTYServerConfig{}, io.Discard),
-		ownsPTYHub:    true,
-		frameWriter: &stdioFrameWriter{
-			writer: bufio.NewWriter(io.Discard),
-		},
-	}
-	defer server.closeAll()
-
-	resp := server.handleRequest(rpcRequest{
-		ID:     1,
-		Method: "pty.attach",
-		Params: map[string]any{
-			"session_id":              "missing-session",
-			"attachment_id":           "a1",
-			"client_attachment_token": "token-a1",
-			"cols":                    80,
-			"rows":                    24,
-			"require_existing":        true,
-		},
-	})
-	if resp.OK {
-		t.Fatalf("pty.attach require_existing unexpectedly succeeded: %+v", resp)
-	}
-	if resp.Error == nil || resp.Error.Code != "pty_session_not_found" {
-		t.Fatalf("pty.attach require_existing error = %+v, want pty_session_not_found", resp.Error)
-	}
-	if sessions := server.ptyHub.sessionSnapshots(); len(sessions) != 0 {
-		t.Fatalf("require_existing created sessions: %+v", sessions)
-	}
-}
-
-func TestRPCServerCloseAllLeavesSharedPTYHubAlive(t *testing.T) {
-	hub := newWebSocketPTYHub(wsPTYServerConfig{}, io.Discard)
-	sessionKey := persistentPTYSessionKey("shared")
-	canceled := false
-	attachment := &wsPTYAttachment{
-		sessionKey: sessionKey,
-		id:         "a1",
-		cols:       80,
-		rows:       24,
-		send:       make(chan wsPTYOutgoingFrame, defaultWebSocketWriteQueueCap),
-		cancel: func() {
-			canceled = true
-		},
-		persistent: true,
-	}
-	session := &wsPTYSession{
-		id:            "shared",
-		key:           sessionKey,
-		attachments:   map[string]*wsPTYAttachment{"a1": attachment},
-		effectiveCols: 80,
-		effectiveRows: 24,
-		lastKnownCols: 80,
-		lastKnownRows: 24,
-		done:          make(chan struct{}),
-	}
-	hub.sessions[sessionKey] = session
-	server := &rpcServer{
-		nextStreamID:   1,
-		nextSessionID:  1,
-		streams:        map[string]*streamState{},
-		sessions:       map[string]*sessionState{},
-		ptyHub:         hub,
-		ownsPTYHub:     false,
-		ptyAttachments: map[string]*wsPTYAttachment{rpcPTYAttachmentKey(attachment): attachment},
-	}
-
-	server.closeAll()
-	if got := hub.activeSessionCount(); got != 1 {
-		t.Fatalf("shared PTY hub session count = %d, want 1", got)
-	}
-	if len(session.attachments) != 0 {
-		t.Fatalf("shared PTY hub attachment count = %d, want 0", len(session.attachments))
-	}
-	if !canceled {
-		t.Fatalf("shared PTY attachment was not canceled")
-	}
-	hub.mu.Lock()
-	delete(hub.sessions, sessionKey)
-	hub.mu.Unlock()
-}
-
-func TestRPCServerUntrackPTYAttachmentKeepsNewerReattach(t *testing.T) {
-	sessionKey := persistentPTYSessionKey("reattach")
-	oldAttachment := &wsPTYAttachment{
-		sessionKey:  sessionKey,
-		id:          "same",
-		clientToken: "old-token",
-		send:        make(chan wsPTYOutgoingFrame, defaultWebSocketWriteQueueCap),
-		persistent:  true,
-	}
-	newAttachment := &wsPTYAttachment{
-		sessionKey:  sessionKey,
-		id:          "same",
-		clientToken: "new-token",
-		send:        make(chan wsPTYOutgoingFrame, defaultWebSocketWriteQueueCap),
-		persistent:  true,
-	}
-	server := &rpcServer{}
-
-	server.trackPTYAttachment(oldAttachment)
-	server.trackPTYAttachment(newAttachment)
-	server.untrackPTYAttachment(oldAttachment)
-
-	server.mu.Lock()
-	tracked := server.ptyAttachments[rpcPTYAttachmentKey(newAttachment)]
-	server.mu.Unlock()
-	if tracked != newAttachment {
-		t.Fatalf("tracked attachment = %p, want newer attachment %p", tracked, newAttachment)
-	}
-
-	server.untrackPTYAttachment(newAttachment)
-	server.mu.Lock()
-	_, exists := server.ptyAttachments[rpcPTYAttachmentKey(newAttachment)]
-	server.mu.Unlock()
-	if exists {
-		t.Fatalf("newer attachment remained tracked after untrack")
-	}
-}
-
-func TestPTYRPCPumpEmitsExitWhenAttachmentContextCanceled(t *testing.T) {
-	eventOutput := newNotifyingBuffer()
-	server := &rpcServer{
-		frameWriter: &stdioFrameWriter{
-			writer: bufio.NewWriter(eventOutput),
-		},
-	}
-	sessionKey := persistentPTYSessionKey("replaced")
-	attachment := &wsPTYAttachment{
-		sessionKey:  sessionKey,
-		id:          "same",
-		clientToken: "old-token",
-		send:        make(chan wsPTYOutgoingFrame, defaultWebSocketWriteQueueCap),
-		persistent:  true,
-	}
-	ctx, cancel := context.WithCancel(context.Background())
-	sessionDone := make(chan struct{})
-	done := make(chan struct{})
-	go func() {
-		defer close(done)
-		server.ptyAttachmentPump(ctx, attachment, sessionDone)
-	}()
-
-	cancel()
-	waitForRPCEvent(t, eventOutput, 0, func(event map[string]any) bool {
-		return event["event"] == "pty.exit" &&
-			event["session_id"] == "replaced" &&
-			event["attachment_id"] == "same" &&
-			event["attachment_token"] == "old-token"
-	})
-	select {
-	case <-done:
-	case <-time.After(2 * time.Second):
-		t.Fatal("PTY attachment pump did not stop after context cancellation")
-	}
-}
-
-func TestPTYRPCTokenRejectsStaleAttachmentControl(t *testing.T) {
-	eventOutput := newNotifyingBuffer()
-	server := &rpcServer{
-		nextStreamID:  1,
-		nextSessionID: 1,
-		streams:       map[string]*streamState{},
-		sessions:      map[string]*sessionState{},
-		ptyHub: newWebSocketPTYHub(wsPTYServerConfig{
-			ScrollbackLimit: 4096,
-			SessionIdleTTL:  time.Hour,
-		}, io.Discard),
-		ownsPTYHub: true,
-		frameWriter: &stdioFrameWriter{
-			writer: bufio.NewWriter(eventOutput),
-		},
-	}
-	defer server.closeAll()
-
-	attachOld := server.handleRequest(rpcRequest{
-		ID:     1,
-		Method: "pty.attach",
-		Params: map[string]any{
-			"session_id":              "token-race",
-			"attachment_id":           "same",
-			"client_attachment_token": "old-token",
-			"cols":                    80,
-			"rows":                    24,
-			"command":                 "sleep 60",
-		},
-	})
-	if !attachOld.OK {
-		t.Fatalf("old pty.attach failed: %+v", attachOld)
-	}
-	waitForRPCEvent(t, eventOutput, 0, func(event map[string]any) bool {
-		return event["event"] == "pty.ready" &&
-			event["attachment_id"] == "same" &&
-			event["attachment_token"] == "old-token"
-	})
-
-	attachNew := server.handleRequest(rpcRequest{
-		ID:     2,
-		Method: "pty.attach",
-		Params: map[string]any{
-			"session_id":              "token-race",
-			"attachment_id":           "same",
-			"client_attachment_token": "new-token",
-			"cols":                    100,
-			"rows":                    30,
-			"require_existing":        true,
-		},
-	})
-	if !attachNew.OK {
-		t.Fatalf("new pty.attach failed: %+v", attachNew)
-	}
-	waitForRPCEvent(t, eventOutput, 0, func(event map[string]any) bool {
-		return event["event"] == "pty.exit" &&
-			event["attachment_id"] == "same" &&
-			event["attachment_token"] == "old-token"
-	})
-	waitForRPCEvent(t, eventOutput, 0, func(event map[string]any) bool {
-		return event["event"] == "pty.ready" &&
-			event["attachment_id"] == "same" &&
-			event["attachment_token"] == "new-token"
-	})
-
-	staleWrite := server.handleRequest(rpcRequest{
-		ID:     3,
-		Method: "pty.write",
-		Params: map[string]any{
-			"session_id":              "token-race",
-			"attachment_id":           "same",
-			"client_attachment_token": "old-token",
-			"data_base64":             base64.StdEncoding.EncodeToString([]byte("stale")),
-		},
-	})
-	if staleWrite.OK || staleWrite.Error == nil || staleWrite.Error.Code != "not_found" {
-		t.Fatalf("stale pty.write = %+v, want not_found", staleWrite)
-	}
-	staleDetach := server.handleRequest(rpcRequest{
-		ID:     4,
-		Method: "pty.detach",
-		Params: map[string]any{
-			"session_id":              "token-race",
-			"attachment_id":           "same",
-			"client_attachment_token": "old-token",
-		},
-	})
-	if staleDetach.OK || staleDetach.Error == nil || staleDetach.Error.Code != "not_found" {
-		t.Fatalf("stale pty.detach = %+v, want not_found", staleDetach)
-	}
-	freshDetach := server.handleRequest(rpcRequest{
-		ID:     5,
-		Method: "pty.detach",
-		Params: map[string]any{
-			"session_id":              "token-race",
-			"attachment_id":           "same",
-			"client_attachment_token": "new-token",
-		},
-	})
-	if !freshDetach.OK {
-		t.Fatalf("fresh pty.detach failed: %+v", freshDetach)
-	}
-}
-
-func TestPTYRPCRequiresAttachmentIdentity(t *testing.T) {
-	eventOutput := newNotifyingBuffer()
-	server := &rpcServer{
-		nextStreamID:  1,
-		nextSessionID: 1,
-		streams:       map[string]*streamState{},
-		sessions:      map[string]*sessionState{},
-		ptyHub: newWebSocketPTYHub(wsPTYServerConfig{
-			ScrollbackLimit: 4096,
-			SessionIdleTTL:  time.Hour,
-		}, io.Discard),
-		ownsPTYHub: true,
-		frameWriter: &stdioFrameWriter{
-			writer: bufio.NewWriter(eventOutput),
-		},
-	}
-	defer server.closeAll()
-
-	expectInvalidParams := func(method string, resp rpcResponse, expectedMessage string) {
-		t.Helper()
-		if resp.OK || resp.Error == nil || resp.Error.Code != "invalid_params" {
-			t.Fatalf("%s response = %+v, want invalid_params", method, resp)
-		}
-		if !strings.Contains(resp.Error.Message, expectedMessage) {
-			t.Fatalf("%s message = %q, want %q", method, resp.Error.Message, expectedMessage)
-		}
-	}
-
-	expectInvalidParams("pty.attach", server.handleRequest(rpcRequest{
-		ID:     1,
-		Method: "pty.attach",
-		Params: map[string]any{
-			"session_id":              "id-required",
-			"client_attachment_token": "id-required-token",
-			"cols":                    80,
-			"rows":                    24,
-			"command":                 "sleep 60",
-		},
-	}), "pty.attach requires attachment_id")
-
-	expectInvalidParams("pty.attach", server.handleRequest(rpcRequest{
-		ID:     1,
-		Method: "pty.attach",
-		Params: map[string]any{
-			"session_id":    "token-required",
-			"attachment_id": "same",
-			"cols":          80,
-			"rows":          24,
-			"command":       "sleep 60",
-		},
-	}), "pty.attach requires client_attachment_token")
-
-	attach := server.handleRequest(rpcRequest{
-		ID:     2,
-		Method: "pty.attach",
-		Params: map[string]any{
-			"session_id":              "token-required",
-			"attachment_id":           "same",
-			"client_attachment_token": "fresh-token",
-			"cols":                    80,
-			"rows":                    24,
-			"command":                 "sleep 60",
-		},
-	})
-	if !attach.OK {
-		t.Fatalf("pty.attach failed: %+v", attach)
-	}
-	waitForRPCEvent(t, eventOutput, 0, func(event map[string]any) bool {
-		return event["event"] == "pty.ready" &&
-			event["session_id"] == "token-required" &&
-			event["attachment_id"] == "same" &&
-			event["attachment_token"] == "fresh-token"
-	})
-
-	expectInvalidParams("pty.write", server.handleRequest(rpcRequest{
-		ID:     3,
-		Method: "pty.write",
-		Params: map[string]any{
-			"session_id":    "token-required",
-			"attachment_id": "same",
-			"data_base64":   base64.StdEncoding.EncodeToString([]byte("missing token")),
-		},
-	}), "pty.write requires client_attachment_token")
-	expectInvalidParams("pty.resize", server.handleRequest(rpcRequest{
-		ID:     4,
-		Method: "pty.resize",
-		Params: map[string]any{
-			"session_id":              "token-required",
-			"attachment_id":           "same",
-			"client_attachment_token": "   ",
-			"cols":                    100,
-			"rows":                    30,
-		},
-	}), "pty.resize requires client_attachment_token")
-	expectInvalidParams("pty.detach", server.handleRequest(rpcRequest{
-		ID:     5,
-		Method: "pty.detach",
-		Params: map[string]any{
-			"session_id":    "token-required",
-			"attachment_id": "same",
-		},
-	}), "pty.detach requires client_attachment_token")
-
-	detach := server.handleRequest(rpcRequest{
-		ID:     6,
-		Method: "pty.detach",
-		Params: map[string]any{
-			"session_id":              "token-required",
-			"attachment_id":           "same",
-			"client_attachment_token": "fresh-token",
-		},
-	})
-	if !detach.OK {
-		t.Fatalf("tokened pty.detach failed: %+v", detach)
-	}
-}
-
-func TestPTYReplayIsChunkedBelowRPCFrameBuffer(t *testing.T) {
-	const swiftRPCMaxFrameBytes = 256 * 1024
-
-	sessionKey := persistentPTYSessionKey("chunked")
-	attachment := &wsPTYAttachment{
-		sessionKey: sessionKey,
-		id:         "att-chunked",
-		send:       make(chan wsPTYOutgoingFrame, defaultWebSocketWriteQueueCap),
-		cancel:     func() {},
-		persistent: true,
-	}
-	replay := bytes.Repeat([]byte("x"), defaultWebSocketReplayChunkBytes*2+17)
-
-	if ok := enqueuePTYReplay(attachment, replay); !ok {
-		t.Fatalf("enqueuePTYReplay returned false")
-	}
-
-	var joined []byte
-	frameCount := 0
-	firstTwoEventBytes := 0
-	for {
-		select {
-		case frame := <-attachment.send:
-			frameCount++
-			if len(frame.payload) > defaultWebSocketReplayChunkBytes {
-				t.Fatalf("replay chunk length = %d, want <= %d", len(frame.payload), defaultWebSocketReplayChunkBytes)
-			}
-			event := rpcPTYEventForFrame(attachment, frame)
-			if event.Event != "pty.data" {
-				t.Fatalf("event = %q, want pty.data", event.Event)
-			}
-			eventLine, err := json.Marshal(event)
-			if err != nil {
-				t.Fatalf("marshal pty event: %v", err)
-			}
-			if len(eventLine)+1 >= swiftRPCMaxFrameBytes {
-				t.Fatalf("event line length = %d, want < %d", len(eventLine)+1, swiftRPCMaxFrameBytes)
-			}
-			if frameCount <= 2 {
-				firstTwoEventBytes += len(eventLine) + 1
-				if firstTwoEventBytes >= swiftRPCMaxFrameBytes {
-					t.Fatalf("first two replay event lines = %d bytes, want < %d", firstTwoEventBytes, swiftRPCMaxFrameBytes)
-				}
-			}
-			decoded, err := base64.StdEncoding.DecodeString(event.DataBase64)
-			if err != nil {
-				t.Fatalf("decode pty event data: %v", err)
-			}
-			if !bytes.Equal(decoded, frame.payload) {
-				t.Fatalf("event data did not match frame payload")
-			}
-			joined = append(joined, frame.payload...)
-		default:
-			if frameCount < 2 {
-				t.Fatalf("frame count = %d, want multiple replay chunks", frameCount)
-			}
-			if !bytes.Equal(joined, replay) {
-				t.Fatalf("rejoined replay length = %d, want %d", len(joined), len(replay))
-			}
-			return
-		}
-	}
-}
-
-func waitForRPCEvent(t *testing.T, buffer *notifyingBuffer, startLine int, matches func(map[string]any) bool) map[string]any {
-	t.Helper()
-	deadline := time.Now().Add(2 * time.Second)
-	for {
-		lines := rpcEventLines(buffer)
-		for _, line := range lines[min(startLine, len(lines)):] {
-			var event map[string]any
-			if err := json.Unmarshal([]byte(line), &event); err != nil {
-				continue
-			}
-			if matches(event) {
-				return event
-			}
-		}
-		remaining := time.Until(deadline)
-		if remaining <= 0 {
-			t.Fatalf("timed out waiting for matching RPC event after line %d: %q", startLine, buffer.String())
-		}
-		select {
-		case <-buffer.notify:
-		case <-time.After(remaining):
-			t.Fatalf("timed out waiting for matching RPC event after line %d: %q", startLine, buffer.String())
-		}
-	}
-}
-
-func rpcEventLineCount(buffer *notifyingBuffer) int {
-	return len(rpcEventLines(buffer))
-}
-
-func rpcEventLines(buffer *notifyingBuffer) []string {
-	trimmed := strings.TrimSpace(buffer.String())
-	if trimmed == "" {
-		return nil
-	}
-	return strings.Split(trimmed, "\n")
-}
-
-func boolToInt(value bool) int {
-	if value {
-		return 1
-	}
-	return 0
-}
-
-func decodeOptionalBase64(value any) ([]byte, error) {
-	encoded, ok := value.(string)
-	if !ok || encoded == "" {
-		return nil, nil
-	}
-	return base64.StdEncoding.DecodeString(encoded)
-}
-
-func TestGetIntParamRejectsFractionalFloat64(t *testing.T) {
-	params := map[string]any{
-		"port":       80.9,
-		"timeout_ms": 100.0,
-	}
-
-	if _, ok := getIntParam(params, "port"); ok {
-		t.Fatalf("fractional float64 should be rejected")
-	}
-
-	timeout, ok := getIntParam(params, "timeout_ms")
-	if !ok {
-		t.Fatalf("integral float64 should be accepted")
-	}
-	if timeout != 100 {
-		t.Fatalf("timeout_ms = %d, want 100", timeout)
-	}
-}
-
-func TestRunStdioOversizedFrameContinuesServing(t *testing.T) {
-	oversized := `{"id":1,"method":"ping","params":{"blob":"` + strings.Repeat("a", maxRPCFrameBytes) + `"}}`
-	input := strings.NewReader(oversized + "\n" + `{"id":2,"method":"ping","params":{}}` + "\n")
-	var out bytes.Buffer
-	code := run([]string{"serve", "--stdio"}, input, &out, &bytes.Buffer{})
-	if code != 0 {
-		t.Fatalf("run serve exit code = %d, want 0", code)
-	}
-
-	lines := strings.Split(strings.TrimSpace(out.String()), "\n")
-	if len(lines) != 2 {
-		t.Fatalf("got %d response lines, want 2: %q", len(lines), out.String())
-	}
-
-	var first map[string]any
-	if err := json.Unmarshal([]byte(lines[0]), &first); err != nil {
-		t.Fatalf("failed to decode first response: %v", err)
-	}
-	if ok, _ := first["ok"].(bool); ok {
-		t.Fatalf("first response should be oversized-frame error: %v", first)
-	}
-	firstError, _ := first["error"].(map[string]any)
-	if got := firstError["code"]; got != "invalid_request" {
-		t.Fatalf("oversized frame should return invalid_request; got=%v payload=%v", got, first)
-	}
-
-	var second map[string]any
-	if err := json.Unmarshal([]byte(lines[1]), &second); err != nil {
-		t.Fatalf("failed to decode second response: %v", err)
-	}
-	if ok, _ := second["ok"].(bool); !ok {
-		t.Fatalf("second response should still be handled after oversized frame: %v", second)
-	}
-}
-
-func TestProxyOpenInvalidParams(t *testing.T) {
-	server := &rpcServer{
-		nextStreamID:  1,
-		nextSessionID: 1,
-		streams:       map[string]*streamState{},
-		sessions:      map[string]*sessionState{},
-	}
-	defer server.closeAll()
-
-	resp := server.handleRequest(rpcRequest{
-		ID:     1,
-		Method: "proxy.open",
-		Params: map[string]any{
-			"host": "127.0.0.1",
-			"port": strconv.Itoa(8080),
-		},
-	})
-	if resp.OK {
-		t.Fatalf("proxy.open with invalid port type should fail: %+v", resp)
-	}
-	errObj, _ := resp.Error, resp.Error
-	if errObj == nil || errObj.Code != "invalid_params" {
-		t.Fatalf("proxy.open invalid params should return invalid_params: %+v", resp)
-	}
-}
-
-func TestSessionResizeCoordinator(t *testing.T) {
-	server := &rpcServer{
-		nextStreamID:  1,
-		nextSessionID: 1,
-		streams:       map[string]*streamState{},
-		sessions:      map[string]*sessionState{},
-	}
-	defer server.closeAll()
-
-	openResp := server.handleRequest(rpcRequest{
-		ID:     1,
-		Method: "session.open",
-		Params: map[string]any{
-			"session_id": "sess-rz",
-		},
-	})
-	if !openResp.OK {
-		t.Fatalf("session.open failed: %+v", openResp)
-	}
-
-	attachSmall := server.handleRequest(rpcRequest{
-		ID:     2,
-		Method: "session.attach",
-		Params: map[string]any{
-			"session_id":    "sess-rz",
-			"attachment_id": "a-small",
-			"cols":          90,
-			"rows":          30,
-		},
-	})
-	assertEffectiveSize(t, attachSmall, 90, 30)
-
-	attachLarge := server.handleRequest(rpcRequest{
-		ID:     3,
-		Method: "session.attach",
-		Params: map[string]any{
-			"session_id":    "sess-rz",
-			"attachment_id": "a-large",
-			"cols":          120,
-			"rows":          40,
-		},
-	})
-	assertEffectiveSize(t, attachLarge, 90, 30) // RZ-001: smallest wins
-
-	resizeLarge := server.handleRequest(rpcRequest{
-		ID:     4,
-		Method: "session.resize",
-		Params: map[string]any{
-			"session_id":    "sess-rz",
-			"attachment_id": "a-large",
-			"cols":          200,
-			"rows":          60,
-		},
-	})
-	assertEffectiveSize(t, resizeLarge, 90, 30) // RZ-002: still bounded by smallest
-
-	detachSmall := server.handleRequest(rpcRequest{
-		ID:     5,
-		Method: "session.detach",
-		Params: map[string]any{
-			"session_id":    "sess-rz",
-			"attachment_id": "a-small",
-		},
-	})
-	assertEffectiveSize(t, detachSmall, 200, 60) // RZ-003: expands to next smallest
-
-	detachLarge := server.handleRequest(rpcRequest{
-		ID:     6,
-		Method: "session.detach",
-		Params: map[string]any{
-			"session_id":    "sess-rz",
-			"attachment_id": "a-large",
-		},
-	})
-	assertEffectiveSize(t, detachLarge, 200, 60) // no attachments: keep last-known size
-	assertAttachmentCount(t, detachLarge, 0)
-
-	reattach := server.handleRequest(rpcRequest{
-		ID:     7,
-		Method: "session.attach",
-		Params: map[string]any{
-			"session_id":    "sess-rz",
-			"attachment_id": "a-reconnect",
-			"cols":          110,
-			"rows":          50,
-		},
-	})
-	assertEffectiveSize(t, reattach, 110, 50) // RZ-004: recompute from active attachments on reattach
-}
-
-func TestSessionInvalidParamsAndNotFound(t *testing.T) {
-	server := &rpcServer{
-		nextStreamID:  1,
-		nextSessionID: 1,
-		streams:       map[string]*streamState{},
-		sessions:      map[string]*sessionState{},
-	}
-	defer server.closeAll()
-
-	missingSession := server.handleRequest(rpcRequest{
-		ID:     1,
-		Method: "session.attach",
-		Params: map[string]any{
-			"session_id":    "missing",
-			"attachment_id": "a1",
-			"cols":          80,
-			"rows":          24,
-		},
-	})
-	if missingSession.OK || missingSession.Error == nil || missingSession.Error.Code != "not_found" {
-		t.Fatalf("session.attach on missing session should return not_found: %+v", missingSession)
-	}
-
-	badSize := server.handleRequest(rpcRequest{
-		ID:     2,
-		Method: "session.attach",
-		Params: map[string]any{
-			"session_id":    "missing",
-			"attachment_id": "a1",
-			"cols":          0,
-			"rows":          24,
-		},
-	})
-	if badSize.OK || badSize.Error == nil || badSize.Error.Code != "invalid_params" {
-		t.Fatalf("session.attach with cols=0 should return invalid_params: %+v", badSize)
-	}
-}
-
-func assertEffectiveSize(t *testing.T, resp rpcResponse, wantCols, wantRows int) {
-	t.Helper()
-	if !resp.OK {
-		t.Fatalf("expected ok response, got error: %+v", resp)
-	}
-	result, ok := resp.Result.(map[string]any)
-	if !ok {
-		t.Fatalf("response missing result map: %+v", resp)
-	}
-	gotCols := asInt(t, result["effective_cols"], "effective_cols")
-	gotRows := asInt(t, result["effective_rows"], "effective_rows")
-	if gotCols != wantCols || gotRows != wantRows {
-		t.Fatalf("effective size = %dx%d, want %dx%d payload=%+v", gotCols, gotRows, wantCols, wantRows, result)
-	}
-}
-
-func assertAttachmentCount(t *testing.T, resp rpcResponse, want int) {
-	t.Helper()
-	if !resp.OK {
-		t.Fatalf("expected ok response, got error: %+v", resp)
-	}
-	result, ok := resp.Result.(map[string]any)
-	if !ok {
-		t.Fatalf("response missing result map: %+v", resp)
-	}
-	attachments, ok := result["attachments"].([]map[string]any)
-	if ok {
-		if len(attachments) != want {
-			t.Fatalf("attachments len = %d, want %d payload=%+v", len(attachments), want, result)
-		}
-		return
-	}
-	attachmentsAny, ok := result["attachments"].([]any)
-	if !ok {
-		t.Fatalf("attachments field has unexpected type (%T) payload=%+v", result["attachments"], result)
-	}
-	if len(attachmentsAny) != want {
-		t.Fatalf("attachments len = %d, want %d payload=%+v", len(attachmentsAny), want, result)
-	}
-}
-
-func asInt(t *testing.T, value any, field string) int {
-	t.Helper()
-	switch typed := value.(type) {
-	case int:
-		return typed
-	case int8:
-		return int(typed)
-	case int16:
-		return int(typed)
-	case int32:
-		return int(typed)
-	case int64:
-		return int(typed)
-	case uint:
-		return int(typed)
-	case uint8:
-		return int(typed)
-	case uint16:
-		return int(typed)
-	case uint32:
-		return int(typed)
-	case uint64:
-		return int(typed)
-	case float64:
-		if typed != math.Trunc(typed) {
-			t.Fatalf("%s should be integer-valued, got %v", field, typed)
-		}
-		return int(typed)
-	default:
-		t.Fatalf("%s has unexpected type %T (%v)", field, value, value)
-		return 0
-	}
-}
diff --git a/daemon/remote/cmd/cmuxd-remote/persistent_lifecycle.go b/daemon/remote/cmd/cmuxd-remote/persistent_lifecycle.go
deleted file mode 100644
index 146d588d05c9..000000000000
--- a/daemon/remote/cmd/cmuxd-remote/persistent_lifecycle.go
+++ /dev/null
@@ -1,268 +0,0 @@
-package main
-
-import (
-	"bufio"
-	"bytes"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io"
-	"net"
-	"os"
-	"path/filepath"
-	"strconv"
-	"strings"
-	"syscall"
-	"time"
-)
-
-const persistentDaemonShutdownMethod = "daemon.shutdown"
-
-type persistentDaemonActivity struct {
-	activeConnections int64
-	activeSessions    int
-}
-
-func (activity persistentDaemonActivity) isEmpty() bool {
-	return activity.activeConnections == 0 && activity.activeSessions == 0
-}
-
-type persistentDaemonExitReason string
-
-const (
-	persistentDaemonExitSlotLeaseRemoved persistentDaemonExitReason = "slot_lease_removed"
-	persistentDaemonExitEmptyIdleTimeout persistentDaemonExitReason = "empty_idle_timeout"
-)
-
-func persistentDaemonAutomaticExitReason(
-	activity persistentDaemonActivity,
-	slotLeaseMissing bool,
-	emptyIdleExpired bool,
-) persistentDaemonExitReason {
-	if !activity.isEmpty() {
-		return ""
-	}
-	if slotLeaseMissing {
-		return persistentDaemonExitSlotLeaseRemoved
-	}
-	if emptyIdleExpired {
-		return persistentDaemonExitEmptyIdleTimeout
-	}
-	return ""
-}
-
-func logPersistentDaemonExit(
-	stderr io.Writer,
-	now time.Time,
-	reason persistentDaemonExitReason,
-	activity persistentDaemonActivity,
-) {
-	if stderr == nil {
-		return
-	}
-	_, _ = fmt.Fprintf(
-		stderr,
-		"cmuxd-remote persistent daemon exit time=%s reason=%s active_connections=%d active_sessions=%d\n",
-		now.UTC().Format(time.RFC3339Nano),
-		reason,
-		activity.activeConnections,
-		activity.activeSessions,
-	)
-}
-
-const (
-	persistentDaemonStopWaitTimeout = 5 * time.Second
-	persistentDaemonStopRetryStep   = 25 * time.Millisecond
-)
-
-func existingPersistentDaemonPathsForSlot(slot string) (persistentDaemonPaths, bool, error) {
-	paths, err := persistentDaemonPathsForSlot(slot)
-	if err != nil {
-		return persistentDaemonPaths{}, false, err
-	}
-	if err := verifyPrivateDaemonDirectory(paths.root); err != nil {
-		if errors.Is(err, os.ErrNotExist) {
-			return paths, false, nil
-		}
-		return paths, false, err
-	}
-	if storedSocketDir, err := readPersistentDaemonSocketDir(paths.root); err == nil {
-		paths.socket = filepath.Join(storedSocketDir, filepath.Base(paths.socket))
-		if err := verifyPrivateDaemonDirectory(storedSocketDir); err != nil {
-			if errors.Is(err, os.ErrNotExist) {
-				return paths, true, nil
-			}
-			return paths, false, err
-		}
-	} else if !errors.Is(err, os.ErrNotExist) {
-		return paths, false, err
-	}
-	return paths, true, nil
-}
-
-func stopPersistentDaemon(slot string) error {
-	paths, exists, err := existingPersistentDaemonPathsForSlot(slot)
-	if err != nil || !exists {
-		return err
-	}
-	token, err := readPersistentDaemonTokenFile(paths.tokenFile)
-	if err != nil {
-		if errors.Is(err, os.ErrNotExist) {
-			if stopErr := waitForPersistentDaemonStop(paths.lockFile); stopErr != nil {
-				return stopErr
-			}
-			_ = os.Remove(paths.socket)
-			return nil
-		}
-		return err
-	}
-	conn, err := dialPersistentDaemon(paths.socket, token)
-	if err != nil {
-		if shouldRemovePersistentSocketAfterDialError(err) {
-			_ = os.Remove(paths.socket)
-			return waitForPersistentDaemonStop(paths.lockFile)
-		}
-		return err
-	}
-	if err := requestPersistentDaemonShutdown(conn); err != nil {
-		_ = conn.Close()
-		return err
-	}
-	_ = conn.Close()
-	return waitForPersistentDaemonStop(paths.lockFile)
-}
-
-func requestPersistentDaemonShutdown(conn net.Conn) error {
-	if err := conn.SetDeadline(time.Now().Add(persistentDaemonAuthTimeout)); err != nil {
-		return err
-	}
-	defer conn.SetDeadline(time.Time{})
-
-	request, err := json.Marshal(rpcRequest{
-		ID:     "shutdown",
-		Method: persistentDaemonShutdownMethod,
-		Params: map[string]any{},
-	})
-	if err != nil {
-		return err
-	}
-	writer := bufio.NewWriter(conn)
-	if _, err := writer.Write(append(request, '\n')); err != nil {
-		return err
-	}
-	if err := writer.Flush(); err != nil {
-		return err
-	}
-	line, oversized, err := readRPCFrame(bufio.NewReaderSize(conn, 64*1024), maxRPCFrameBytes)
-	if err != nil {
-		return err
-	}
-	if oversized {
-		return errors.New("persistent daemon shutdown response exceeds maximum size")
-	}
-	var response rpcResponse
-	if err := json.Unmarshal(bytes.TrimSpace(line), &response); err != nil {
-		return err
-	}
-	if !response.OK {
-		return errors.New("persistent daemon shutdown rejected")
-	}
-	return nil
-}
-
-func waitForPersistentDaemonStop(lockPath string) error {
-	return waitForPersistentDaemonStopWithTimeout(
-		lockPath,
-		persistentDaemonStopWaitTimeout,
-		persistentDaemonStopRetryStep,
-	)
-}
-
-func waitForPersistentDaemonStopWithTimeout(lockPath string, timeout time.Duration, retryStep time.Duration) error {
-	if timeout <= 0 || retryStep <= 0 {
-		return errors.New("persistent daemon stop wait requires positive timeout and retry step")
-	}
-	lockFile, err := os.OpenFile(lockPath, os.O_CREATE|os.O_RDWR, 0o600)
-	if err != nil {
-		return err
-	}
-	defer lockFile.Close()
-	deadline := time.Now().Add(timeout)
-	for {
-		err := syscall.Flock(int(lockFile.Fd()), syscall.LOCK_EX|syscall.LOCK_NB)
-		if err == nil {
-			return syscall.Flock(int(lockFile.Fd()), syscall.LOCK_UN)
-		}
-		if !errors.Is(err, syscall.EWOULDBLOCK) && !errors.Is(err, syscall.EAGAIN) {
-			return err
-		}
-
-		remaining := time.Until(deadline)
-		if remaining <= 0 {
-			return fmt.Errorf("timed out waiting for persistent daemon ownership release after %s", timeout)
-		}
-		wait := retryStep
-		if remaining < wait {
-			wait = remaining
-		}
-		timer := time.NewTimer(wait)
-		<-timer.C
-	}
-}
-
-func persistentDaemonRelayPath(leasePort int, suffix string) (string, error) {
-	if leasePort <= 0 || leasePort > 65535 {
-		return "", fmt.Errorf("invalid persistent daemon lease port %d", leasePort)
-	}
-	home, err := os.UserHomeDir()
-	if err != nil || strings.TrimSpace(home) == "" {
-		return "", errors.New("cannot resolve remote home directory")
-	}
-	return filepath.Join(home, ".cmux", "relay", strconv.Itoa(leasePort)+suffix), nil
-}
-
-func persistentDaemonSlotLeasePresent(slot string, leasePort int) (bool, error) {
-	leasePath, err := persistentDaemonRelayPath(leasePort, ".slot")
-	if err != nil {
-		return false, err
-	}
-	info, err := os.Lstat(leasePath)
-	if err != nil {
-		if errors.Is(err, os.ErrNotExist) {
-			return false, nil
-		}
-		return false, err
-	}
-	if !info.Mode().IsRegular() || !daemonDirectoryOwnedByCurrentUser(info) {
-		return false, fmt.Errorf("persistent daemon lease %q is not a private regular file", leasePath)
-	}
-	data, err := os.ReadFile(leasePath)
-	if err != nil {
-		return false, err
-	}
-	return strings.TrimSpace(string(data)) == slot, nil
-}
-
-func removePersistentDaemonRelayShellDirectoryIfUnleased(leasePort int) error {
-	leasePath, err := persistentDaemonRelayPath(leasePort, ".slot")
-	if err != nil {
-		return err
-	}
-	if _, err := os.Lstat(leasePath); err == nil {
-		return nil
-	} else if !errors.Is(err, os.ErrNotExist) {
-		return err
-	}
-	shellPath, err := persistentDaemonRelayPath(leasePort, ".shell")
-	if err != nil {
-		return err
-	}
-	return os.RemoveAll(shellPath)
-}
-
-func earliestNonzeroTime(a time.Time, b time.Time) time.Time {
-	if a.IsZero() || (!b.IsZero() && b.Before(a)) {
-		return b
-	}
-	return a
-}
diff --git a/daemon/remote/cmd/cmuxd-remote/persistent_lifecycle_test.go b/daemon/remote/cmd/cmuxd-remote/persistent_lifecycle_test.go
deleted file mode 100644
index e407dedf412e..000000000000
--- a/daemon/remote/cmd/cmuxd-remote/persistent_lifecycle_test.go
+++ /dev/null
@@ -1,627 +0,0 @@
-package main
-
-import (
-	"bufio"
-	"bytes"
-	"errors"
-	"io"
-	"net"
-	"os"
-	"path/filepath"
-	"strings"
-	"sync/atomic"
-	"syscall"
-	"testing"
-	"time"
-)
-
-func TestPersistentDaemonShutdownStopsSlotWithActivePTY(t *testing.T) {
-	socketDir, err := os.MkdirTemp("/tmp", "cmuxd-remote-shutdown-*")
-	if err != nil {
-		t.Fatalf("create short socket dir: %v", err)
-	}
-	t.Cleanup(func() { _ = os.RemoveAll(socketDir) })
-	socketPath := filepath.Join(socketDir, "rpc.sock")
-	listener, err := net.Listen("unix", socketPath)
-	if err != nil {
-		t.Fatalf("listen unix: %v", err)
-	}
-
-	done := make(chan error, 1)
-	go func() {
-		done <- servePersistentDaemonWithVerifier(
-			listener,
-			persistentDaemonFixedTokenVerifier("shutdown-token"),
-			io.Discard,
-		)
-	}()
-	serverExited := false
-	defer func() {
-		_ = listener.Close()
-		if serverExited {
-			return
-		}
-		select {
-		case <-done:
-		case <-time.After(2 * time.Second):
-			t.Errorf("persistent daemon did not stop during test cleanup")
-		}
-	}()
-
-	conn, reader, writer := openPersistentTestClient(t, socketPath, "shutdown-token")
-	defer conn.Close()
-	attach := persistentTestRPCCall(t, conn, reader, writer, rpcRequest{
-		ID:     1,
-		Method: "pty.attach",
-		Params: map[string]any{
-			"session_id":              "shutdown-session",
-			"attachment_id":           "shutdown-attachment",
-			"client_attachment_token": "shutdown-attachment-token",
-			"cols":                    80,
-			"rows":                    24,
-			"command":                 "sleep 60",
-		},
-	})
-	if ok, _ := attach["ok"].(bool); !ok {
-		t.Fatalf("pty.attach failed: %v", attach)
-	}
-	readPersistentTestEvent(t, conn, reader, func(frame map[string]any) bool {
-		return frame["event"] == "pty.ready" && frame["attachment_id"] == "shutdown-attachment"
-	})
-
-	shutdown := persistentTestRPCCall(t, conn, reader, writer, rpcRequest{
-		ID:     2,
-		Method: "daemon.shutdown",
-		Params: map[string]any{},
-	})
-	if ok, _ := shutdown["ok"].(bool); !ok {
-		t.Fatalf("daemon.shutdown failed: %v", shutdown)
-	}
-
-	select {
-	case err := <-done:
-		serverExited = true
-		if err != nil {
-			t.Fatalf("persistent daemon exited with error: %v", err)
-		}
-	case <-time.After(2 * time.Second):
-		t.Fatalf("persistent daemon did not stop after daemon.shutdown")
-	}
-}
-
-func TestRunPersistentStopUsesSlotControlPlane(t *testing.T) {
-	rootBase := t.TempDir()
-	socketBase, err := os.MkdirTemp("/tmp", "cmuxd-remote-stop-command-*")
-	if err != nil {
-		t.Fatalf("create short socket base: %v", err)
-	}
-	t.Cleanup(func() { _ = os.RemoveAll(socketBase) })
-	t.Setenv("CMUX_REMOTE_DAEMON_ROOT", rootBase)
-	t.Setenv("CMUX_REMOTE_DAEMON_SOCKET_DIR", socketBase)
-
-	paths, err := persistentDaemonPathsForSlot("stop-command-slot")
-	if err != nil {
-		t.Fatalf("resolve persistent daemon paths: %v", err)
-	}
-	paths, err = ensurePersistentDaemonDirectory(paths)
-	if err != nil {
-		t.Fatalf("create persistent daemon directories: %v", err)
-	}
-	token, err := persistentDaemonToken(paths)
-	if err != nil {
-		t.Fatalf("create persistent daemon token: %v", err)
-	}
-	listener, err := net.Listen("unix", paths.socket)
-	if err != nil {
-		t.Fatalf("listen unix: %v", err)
-	}
-	done := make(chan error, 1)
-	go func() {
-		done <- servePersistentDaemonWithVerifier(
-			listener,
-			persistentDaemonFixedTokenVerifier(token),
-			io.Discard,
-		)
-	}()
-	serverExited := false
-	defer func() {
-		_ = listener.Close()
-		if serverExited {
-			return
-		}
-		select {
-		case <-done:
-		case <-time.After(2 * time.Second):
-			t.Errorf("persistent daemon did not stop during test cleanup")
-		}
-	}()
-
-	conn, reader, writer := openPersistentTestClient(t, paths.socket, token)
-	attach := persistentTestRPCCall(t, conn, reader, writer, rpcRequest{
-		ID:     1,
-		Method: "pty.attach",
-		Params: map[string]any{
-			"session_id":              "stop-command-session",
-			"attachment_id":           "stop-command-attachment",
-			"client_attachment_token": "stop-command-attachment-token",
-			"cols":                    80,
-			"rows":                    24,
-			"command":                 "sleep 60",
-		},
-	})
-	if ok, _ := attach["ok"].(bool); !ok {
-		t.Fatalf("pty.attach failed: %v", attach)
-	}
-	readPersistentTestEvent(t, conn, reader, func(frame map[string]any) bool {
-		return frame["event"] == "pty.ready" && frame["attachment_id"] == "stop-command-attachment"
-	})
-	_ = conn.Close()
-
-	var stdout bytes.Buffer
-	var stderr bytes.Buffer
-	code := run(
-		[]string{"serve", "--persistent-stop", "--slot", "stop-command-slot"},
-		strings.NewReader(""),
-		&stdout,
-		&stderr,
-	)
-	if code != 0 {
-		t.Fatalf("serve --persistent-stop exit code = %d, stderr = %q", code, stderr.String())
-	}
-
-	select {
-	case err := <-done:
-		serverExited = true
-		if err != nil {
-			t.Fatalf("persistent daemon exited with error: %v", err)
-		}
-	case <-time.After(2 * time.Second):
-		t.Fatalf("persistent daemon did not stop after serve --persistent-stop")
-	}
-}
-
-func TestPersistentDaemonShutdownRejectionDoesNotExposeRemoteMessage(t *testing.T) {
-	client, server := net.Pipe()
-	defer client.Close()
-	done := make(chan error, 1)
-	go func() {
-		defer server.Close()
-		reader := bufio.NewReader(server)
-		if _, err := reader.ReadBytes('\n'); err != nil {
-			done <- err
-			return
-		}
-		_, err := io.WriteString(server, `{"id":"shutdown","ok":false,"error":{"code":"internal","message":"private remote detail"}}`+"\n")
-		done <- err
-	}()
-
-	err := requestPersistentDaemonShutdown(client)
-	if err == nil || err.Error() != "persistent daemon shutdown rejected" {
-		t.Fatalf("shutdown error = %q, want generic rejection", err)
-	}
-	if serverErr := <-done; serverErr != nil {
-		t.Fatalf("serve rejection response: %v", serverErr)
-	}
-}
-
-func TestRunPersistentLeasePortValidation(t *testing.T) {
-	for _, args := range [][]string{
-		{"serve", "--stdio", "--persistent", "--slot", "slot", "--persistent-lease-port", "70000"},
-		{"serve", "--persistent-stop", "--slot", "slot", "--persistent-lease-port", "64008"},
-		{"serve", "--stdio", "--persistent-lease-port", "64008"},
-	} {
-		var stdout bytes.Buffer
-		var stderr bytes.Buffer
-		if code := run(args, strings.NewReader(""), &stdout, &stderr); code != 2 {
-			t.Fatalf("run(%q) exit code = %d, stderr = %q; want usage error", args, code, stderr.String())
-		}
-	}
-}
-
-func TestStopPersistentDaemonWaitsForSlotLockWhenSocketIsAbsent(t *testing.T) {
-	rootBase := t.TempDir()
-	socketBase, err := os.MkdirTemp("/tmp", "cmuxd-remote-stop-lock-*")
-	if err != nil {
-		t.Fatalf("create short socket base: %v", err)
-	}
-	t.Cleanup(func() { _ = os.RemoveAll(socketBase) })
-	t.Setenv("CMUX_REMOTE_DAEMON_ROOT", rootBase)
-	t.Setenv("CMUX_REMOTE_DAEMON_SOCKET_DIR", socketBase)
-
-	paths, err := persistentDaemonPathsForSlot("stop-lock-slot")
-	if err != nil {
-		t.Fatalf("resolve persistent daemon paths: %v", err)
-	}
-	paths, err = ensurePersistentDaemonDirectory(paths)
-	if err != nil {
-		t.Fatalf("create persistent daemon directories: %v", err)
-	}
-	lockFile, err := os.OpenFile(paths.lockFile, os.O_CREATE|os.O_RDWR, 0o600)
-	if err != nil {
-		t.Fatalf("open persistent daemon lock: %v", err)
-	}
-	defer lockFile.Close()
-	if err := syscall.Flock(int(lockFile.Fd()), syscall.LOCK_EX); err != nil {
-		t.Fatalf("hold persistent daemon lock: %v", err)
-	}
-
-	done := make(chan error, 1)
-	go func() {
-		done <- stopPersistentDaemon("stop-lock-slot")
-	}()
-	select {
-	case err := <-done:
-		t.Fatalf("persistent stop returned before slot ownership released: %v", err)
-	case <-time.After(50 * time.Millisecond):
-	}
-	if err := syscall.Flock(int(lockFile.Fd()), syscall.LOCK_UN); err != nil {
-		t.Fatalf("release persistent daemon lock: %v", err)
-	}
-	select {
-	case err := <-done:
-		if err != nil {
-			t.Fatalf("persistent stop failed after slot ownership released: %v", err)
-		}
-	case <-time.After(2 * time.Second):
-		t.Fatalf("persistent stop did not finish after slot ownership released")
-	}
-}
-
-func TestStopPersistentDaemonHandlesMissingStoredSocketDirectory(t *testing.T) {
-	rootBase := t.TempDir()
-	t.Setenv("CMUX_REMOTE_DAEMON_ROOT", rootBase)
-	paths, err := persistentDaemonPathsForSlot("missing-socket-directory")
-	if err != nil {
-		t.Fatalf("resolve persistent daemon paths: %v", err)
-	}
-	if err := os.MkdirAll(paths.root, 0o700); err != nil {
-		t.Fatalf("create persistent daemon root: %v", err)
-	}
-	storedSocketDirectory, err := os.MkdirTemp("/tmp", "cmuxd-remote-missing-socket-*")
-	if err != nil {
-		t.Fatalf("create stored socket directory: %v", err)
-	}
-	t.Cleanup(func() { _ = os.RemoveAll(storedSocketDirectory) })
-	if err := writePersistentDaemonSocketDir(paths.root, storedSocketDirectory); err != nil {
-		t.Fatalf("record socket directory: %v", err)
-	}
-	if _, err := persistentDaemonToken(paths); err != nil {
-		t.Fatalf("create persistent daemon token: %v", err)
-	}
-	if err := os.RemoveAll(storedSocketDirectory); err != nil {
-		t.Fatalf("remove stored socket directory: %v", err)
-	}
-
-	if err := stopPersistentDaemon(paths.slot); err != nil {
-		t.Fatalf("stop with missing stored socket directory: %v", err)
-	}
-}
-
-func TestStopPersistentDaemonRemovesStaleSocketOnlyAfterLockReleased(t *testing.T) {
-	rootBase := t.TempDir()
-	t.Setenv("CMUX_REMOTE_DAEMON_ROOT", rootBase)
-	paths, err := persistentDaemonPathsForSlot("missing-token")
-	if err != nil {
-		t.Fatalf("resolve persistent daemon paths: %v", err)
-	}
-	if err := os.MkdirAll(paths.root, 0o700); err != nil {
-		t.Fatalf("create persistent daemon root: %v", err)
-	}
-	storedSocketDirectory := t.TempDir()
-	if err := writePersistentDaemonSocketDir(paths.root, storedSocketDirectory); err != nil {
-		t.Fatalf("record socket directory: %v", err)
-	}
-	paths.socket = filepath.Join(storedSocketDirectory, filepath.Base(paths.socket))
-	if err := os.WriteFile(paths.socket, []byte("stale"), 0o600); err != nil {
-		t.Fatalf("write stale socket: %v", err)
-	}
-
-	if err := stopPersistentDaemon(paths.slot); err != nil {
-		t.Fatalf("stop with missing token: %v", err)
-	}
-	if _, err := os.Lstat(paths.socket); !errors.Is(err, os.ErrNotExist) {
-		t.Fatalf("stale socket still exists: %v", err)
-	}
-}
-
-func TestWaitForPersistentDaemonStopTimesOutWhenOwnershipDoesNotRelease(t *testing.T) {
-	lockPath := filepath.Join(t.TempDir(), "daemon.lock")
-	lockFile, err := os.OpenFile(lockPath, os.O_CREATE|os.O_RDWR, 0o600)
-	if err != nil {
-		t.Fatalf("open persistent daemon lock: %v", err)
-	}
-	defer lockFile.Close()
-	if err := syscall.Flock(int(lockFile.Fd()), syscall.LOCK_EX); err != nil {
-		t.Fatalf("hold persistent daemon lock: %v", err)
-	}
-	defer syscall.Flock(int(lockFile.Fd()), syscall.LOCK_UN)
-
-	err = waitForPersistentDaemonStopWithTimeout(lockPath, 50*time.Millisecond, 5*time.Millisecond)
-	if err == nil || !strings.Contains(err.Error(), "timed out waiting") {
-		t.Fatalf("wait error = %v, want bounded timeout", err)
-	}
-}
-
-func TestPersistentDaemonPreservesActivePTYAfterObservedSlotLeaseDisappears(t *testing.T) {
-	socketDir, err := os.MkdirTemp("/tmp", "cmuxd-remote-lease-reap-*")
-	if err != nil {
-		t.Fatalf("create short socket dir: %v", err)
-	}
-	t.Cleanup(func() { _ = os.RemoveAll(socketDir) })
-	socketPath := filepath.Join(socketDir, "rpc.sock")
-	listener, err := net.Listen("unix", socketPath)
-	if err != nil {
-		t.Fatalf("listen unix: %v", err)
-	}
-
-	var leasePresent atomic.Bool
-	leasePresent.Store(true)
-	leaseChecked := make(chan bool, 1)
-	leaseRemoved := make(chan struct{}, 1)
-	var stderr bytes.Buffer
-	done := make(chan error, 1)
-	go func() {
-		done <- servePersistentDaemonWithVerifierConfig(
-			listener,
-			persistentDaemonFixedTokenVerifier("lease-token"),
-			&stderr,
-			persistentDaemonServerConfig{
-				acceptPollStep: 10 * time.Millisecond,
-				slotLeasePresent: func() (bool, error) {
-					present := leasePresent.Load()
-					select {
-					case leaseChecked <- present:
-					default:
-					}
-					return present, nil
-				},
-				slotLeaseRemoved: func() {
-					select {
-					case leaseRemoved <- struct{}{}:
-					default:
-					}
-				},
-			},
-		)
-	}()
-	serverExited := false
-	defer func() {
-		_ = listener.Close()
-		if serverExited {
-			return
-		}
-		select {
-		case <-done:
-		case <-time.After(2 * time.Second):
-			t.Errorf("persistent daemon did not stop during test cleanup")
-		}
-	}()
-
-	select {
-	case present := <-leaseChecked:
-		if !present {
-			t.Fatalf("persistent daemon observed an absent initial slot lease")
-		}
-	case <-time.After(2 * time.Second):
-		t.Fatalf("persistent daemon did not inspect the slot lease")
-	}
-	conn, reader, writer := openPersistentTestClient(t, socketPath, "lease-token")
-	attach := persistentTestRPCCall(t, conn, reader, writer, rpcRequest{
-		ID:     1,
-		Method: "pty.attach",
-		Params: map[string]any{
-			"session_id":              "lease-session",
-			"attachment_id":           "lease-attachment",
-			"client_attachment_token": "lease-attachment-token",
-			"cols":                    80,
-			"rows":                    24,
-			"command":                 "sleep 60",
-		},
-	})
-	if ok, _ := attach["ok"].(bool); !ok {
-		t.Fatalf("pty.attach failed: %v", attach)
-	}
-	readPersistentTestEvent(t, conn, reader, func(frame map[string]any) bool {
-		return frame["event"] == "pty.ready" && frame["attachment_id"] == "lease-attachment"
-	})
-	for {
-		select {
-		case <-leaseChecked:
-			continue
-		default:
-			goto leaseChecksDrained
-		}
-	}
-
-leaseChecksDrained:
-	_ = conn.Close()
-	for checkedAfterDisconnect := 0; checkedAfterDisconnect < 5; {
-		select {
-		case present := <-leaseChecked:
-			if present {
-				checkedAfterDisconnect++
-			}
-		case err := <-done:
-			serverExited = true
-			t.Fatalf("persistent daemon exited before its slot lease disappeared: %v", err)
-		case <-time.After(2 * time.Second):
-			t.Fatalf("persistent daemon did not continue checking its slot lease after disconnect")
-		}
-	}
-	leasePresent.Store(false)
-
-	for absentChecks := 0; absentChecks < 3; {
-		select {
-		case present := <-leaseChecked:
-			if !present {
-				absentChecks++
-			}
-		case <-leaseRemoved:
-			t.Fatalf("persistent daemon retired while its detached PTY was still active")
-		case err := <-done:
-			serverExited = true
-			t.Fatalf("persistent daemon exited while its detached PTY was still active: %v", err)
-		case <-time.After(2 * time.Second):
-			t.Fatalf("persistent daemon did not continue checking the absent slot lease")
-		}
-	}
-
-	reconnect, reconnectReader, reconnectWriter := openPersistentTestClient(t, socketPath, "lease-token")
-	reattach := persistentTestRPCCall(t, reconnect, reconnectReader, reconnectWriter, rpcRequest{
-		ID:     2,
-		Method: "pty.attach",
-		Params: map[string]any{
-			"session_id":              "lease-session",
-			"attachment_id":           "lease-reattachment",
-			"client_attachment_token": "lease-reattachment-token",
-			"cols":                    100,
-			"rows":                    30,
-			"command":                 "printf 'replacement command must not run\\n'",
-			"require_existing":        true,
-		},
-	})
-	if ok, _ := reattach["ok"].(bool); !ok {
-		t.Fatalf("reattach after slot lease removal failed: %v", reattach)
-	}
-	readPersistentTestEvent(t, reconnect, reconnectReader, func(frame map[string]any) bool {
-		return frame["event"] == "pty.ready" && frame["attachment_id"] == "lease-reattachment"
-	})
-	closePTY := persistentTestRPCCall(t, reconnect, reconnectReader, reconnectWriter, rpcRequest{
-		ID:     3,
-		Method: "pty.close",
-		Params: map[string]any{"session_id": "lease-session"},
-	})
-	if ok, _ := closePTY["ok"].(bool); !ok {
-		t.Fatalf("pty.close after lease removal failed: %v", closePTY)
-	}
-	_ = reconnect.Close()
-
-	select {
-	case err := <-done:
-		serverExited = true
-		if err != nil {
-			t.Fatalf("persistent daemon exited with error after its final PTY closed: %v", err)
-		}
-	case <-time.After(2 * time.Second):
-		t.Fatalf("persistent daemon did not retire after its absent lease and final PTY close")
-	}
-	requirePersistentDaemonAutomaticExitLog(
-		t,
-		stderr.String(),
-		persistentDaemonExitSlotLeaseRemoved,
-	)
-}
-
-func requirePersistentDaemonAutomaticExitLog(
-	t *testing.T,
-	logOutput string,
-	reason persistentDaemonExitReason,
-) {
-	t.Helper()
-	wantActivity := "reason=" + string(reason) + " active_connections=0 active_sessions=0"
-	for _, line := range strings.Split(logOutput, "\n") {
-		if !strings.Contains(line, wantActivity) {
-			continue
-		}
-		for _, field := range strings.Fields(line) {
-			if !strings.HasPrefix(field, "time=") {
-				continue
-			}
-			timestamp := strings.TrimPrefix(field, "time=")
-			if _, err := time.Parse(time.RFC3339Nano, timestamp); err != nil {
-				t.Fatalf("persistent daemon exit log timestamp %q is not RFC3339Nano: %v", timestamp, err)
-			}
-			return
-		}
-		t.Fatalf("persistent daemon exit log line %q has no time field", line)
-	}
-	t.Fatalf("persistent daemon exit log = %q, want %q", logOutput, wantActivity)
-}
-
-func TestPersistentDaemonSlotLeasePresentMatchesExactRelayPortAndSlot(t *testing.T) {
-	home := t.TempDir()
-	t.Setenv("HOME", home)
-
-	present, err := persistentDaemonSlotLeasePresent("target-slot", 64008)
-	if err != nil {
-		t.Fatalf("inspect absent relay lease: %v", err)
-	}
-	if present {
-		t.Fatalf("absent relay lease reported a matching slot")
-	}
-
-	relayDirectory := filepath.Join(home, ".cmux", "relay")
-	if err := os.MkdirAll(relayDirectory, 0o700); err != nil {
-		t.Fatalf("create relay directory: %v", err)
-	}
-	if err := os.WriteFile(filepath.Join(relayDirectory, "64008.slot"), []byte("other-slot\n"), 0o600); err != nil {
-		t.Fatalf("write other relay slot: %v", err)
-	}
-	if err := os.WriteFile(filepath.Join(relayDirectory, "64009.slot"), []byte("target-slot\n"), 0o600); err != nil {
-		t.Fatalf("write target slot at another port: %v", err)
-	}
-	present, err = persistentDaemonSlotLeasePresent("target-slot", 64008)
-	if err != nil {
-		t.Fatalf("inspect nonmatching relay lease: %v", err)
-	}
-	if present {
-		t.Fatalf("matching slot at a different port satisfied the lease")
-	}
-
-	if err := os.WriteFile(filepath.Join(relayDirectory, "64008.slot"), []byte("target-slot\n"), 0o600); err != nil {
-		t.Fatalf("write matching relay slot: %v", err)
-	}
-	present, err = persistentDaemonSlotLeasePresent("target-slot", 64008)
-	if err != nil {
-		t.Fatalf("inspect matching relay slot: %v", err)
-	}
-	if !present {
-		t.Fatalf("matching relay slot was not observed")
-	}
-}
-
-func TestPersistentDaemonServerArgumentsCarryValidatedLeasePort(t *testing.T) {
-	withLease := persistentDaemonServerArguments("target-slot", 64008)
-	want := []string{
-		"serve", "--persistent-server", "--slot", "target-slot",
-		"--persistent-lease-port", "64008",
-	}
-	if strings.Join(withLease, "\x00") != strings.Join(want, "\x00") {
-		t.Fatalf("server arguments = %q, want %q", withLease, want)
-	}
-
-	withoutLease := persistentDaemonServerArguments("target-slot", 0)
-	if strings.Contains(strings.Join(withoutLease, " "), "persistent-lease-port") {
-		t.Fatalf("backward-compatible server arguments unexpectedly contain a lease: %q", withoutLease)
-	}
-}
-
-func TestPersistentDaemonRelayShellCleanupPreservesReplacementLease(t *testing.T) {
-	home := t.TempDir()
-	t.Setenv("HOME", home)
-	relayDirectory := filepath.Join(home, ".cmux", "relay")
-	shellDirectory := filepath.Join(relayDirectory, "64008.shell")
-	if err := os.MkdirAll(shellDirectory, 0o700); err != nil {
-		t.Fatalf("create relay shell directory: %v", err)
-	}
-	leasePath := filepath.Join(relayDirectory, "64008.slot")
-	if err := os.WriteFile(leasePath, []byte("replacement-slot\n"), 0o600); err != nil {
-		t.Fatalf("write replacement lease: %v", err)
-	}
-	if err := removePersistentDaemonRelayShellDirectoryIfUnleased(64008); err != nil {
-		t.Fatalf("preserve leased shell directory: %v", err)
-	}
-	if _, err := os.Stat(shellDirectory); err != nil {
-		t.Fatalf("replacement owner's shell directory was removed: %v", err)
-	}
-
-	if err := os.Remove(leasePath); err != nil {
-		t.Fatalf("remove relay lease: %v", err)
-	}
-	if err := removePersistentDaemonRelayShellDirectoryIfUnleased(64008); err != nil {
-		t.Fatalf("remove unleased shell directory: %v", err)
-	}
-	if _, err := os.Stat(shellDirectory); !errors.Is(err, os.ErrNotExist) {
-		t.Fatalf("unleased shell directory still exists: %v", err)
-	}
-}
diff --git a/daemon/remote/cmd/cmuxd-remote/persistent_log.go b/daemon/remote/cmd/cmuxd-remote/persistent_log.go
deleted file mode 100644
index 436c8218e544..000000000000
--- a/daemon/remote/cmd/cmuxd-remote/persistent_log.go
+++ /dev/null
@@ -1,233 +0,0 @@
-package main
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"io"
-	"net"
-	"os"
-	"strconv"
-	"strings"
-	"sync"
-	"syscall"
-	"time"
-)
-
-const (
-	persistentDaemonLogMaxBytes = int64(2 * 1024 * 1024)
-	persistentDaemonLogBackups  = 2
-)
-
-type persistentDaemonLog struct {
-	mu       sync.Mutex
-	path     string
-	maxBytes int64
-	backups  int
-	file     *os.File
-	size     int64
-}
-
-func openPersistentDaemonLog(path string) (*persistentDaemonLog, error) {
-	return openPersistentDaemonLogWithLimit(
-		path,
-		persistentDaemonLogMaxBytes,
-		persistentDaemonLogBackups,
-	)
-}
-
-func openPersistentDaemonLogWithLimit(path string, maxBytes int64, backups int) (*persistentDaemonLog, error) {
-	if maxBytes <= 0 {
-		return nil, errors.New("persistent daemon log size limit must be positive")
-	}
-	if backups < 0 {
-		return nil, errors.New("persistent daemon log backup count must not be negative")
-	}
-	logFile := &persistentDaemonLog{
-		path:     path,
-		maxBytes: maxBytes,
-		backups:  backups,
-	}
-	if err := logFile.openLocked(); err != nil {
-		return nil, err
-	}
-	return logFile, nil
-}
-
-func (l *persistentDaemonLog) Write(payload []byte) (int, error) {
-	l.mu.Lock()
-	defer l.mu.Unlock()
-
-	if l.file == nil {
-		return 0, os.ErrClosed
-	}
-	if len(payload) == 0 {
-		return 0, nil
-	}
-	originalLength := len(payload)
-	if int64(len(payload)) > l.maxBytes {
-		payload = payload[len(payload)-int(l.maxBytes):]
-	}
-	if l.size > 0 && l.size+int64(len(payload)) > l.maxBytes {
-		if err := l.rotateLocked(); err != nil {
-			return 0, err
-		}
-	}
-	written, err := l.file.Write(payload)
-	l.size += int64(written)
-	if err != nil {
-		return written, err
-	}
-	if written != len(payload) {
-		return written, io.ErrShortWrite
-	}
-	return originalLength, nil
-}
-
-func (l *persistentDaemonLog) Close() error {
-	l.mu.Lock()
-	defer l.mu.Unlock()
-	if l.file == nil {
-		return nil
-	}
-	err := l.file.Close()
-	l.file = nil
-	return err
-}
-
-func (l *persistentDaemonLog) openLocked() error {
-	file, err := os.OpenFile(l.path, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0o600)
-	if err != nil {
-		return err
-	}
-	if err := file.Chmod(0o600); err != nil {
-		_ = file.Close()
-		return err
-	}
-	info, err := file.Stat()
-	if err != nil {
-		_ = file.Close()
-		return err
-	}
-	l.file = file
-	l.size = info.Size()
-	return nil
-}
-
-func (l *persistentDaemonLog) rotateLocked() error {
-	if err := l.file.Close(); err != nil {
-		return err
-	}
-	l.file = nil
-
-	if l.backups == 0 {
-		if err := os.Remove(l.path); err != nil && !errors.Is(err, os.ErrNotExist) {
-			return err
-		}
-	} else {
-		oldest := persistentDaemonLogBackupPath(l.path, l.backups)
-		if err := os.Remove(oldest); err != nil && !errors.Is(err, os.ErrNotExist) {
-			return err
-		}
-		for index := l.backups - 1; index >= 1; index-- {
-			from := persistentDaemonLogBackupPath(l.path, index)
-			to := persistentDaemonLogBackupPath(l.path, index+1)
-			if err := os.Rename(from, to); err != nil && !errors.Is(err, os.ErrNotExist) {
-				return err
-			}
-		}
-		if err := os.Rename(l.path, persistentDaemonLogBackupPath(l.path, 1)); err != nil &&
-			!errors.Is(err, os.ErrNotExist) {
-			return err
-		}
-	}
-	return l.openLocked()
-}
-
-func persistentDaemonLogBackupPath(path string, index int) string {
-	return path + "." + strconv.Itoa(index)
-}
-
-func logPersistentDaemonEvent(writer io.Writer, event string, fields ...string) {
-	if writer == nil {
-		return
-	}
-	var line strings.Builder
-	line.WriteString("time=")
-	line.WriteString(time.Now().UTC().Format(time.RFC3339Nano))
-	line.WriteString(" event=")
-	line.WriteString(event)
-	for index := 0; index+1 < len(fields); index += 2 {
-		line.WriteByte(' ')
-		line.WriteString(fields[index])
-		line.WriteByte('=')
-		line.WriteString(strconv.Quote(fields[index+1]))
-	}
-	line.WriteByte('\n')
-	_, _ = fmt.Fprint(writer, line.String())
-}
-
-func persistentDaemonErrorCategory(err error) string {
-	if err == nil {
-		return "none"
-	}
-	if errors.Is(err, context.Canceled) {
-		return "canceled"
-	}
-	if errors.Is(err, context.DeadlineExceeded) || errors.Is(err, os.ErrDeadlineExceeded) {
-		return "timeout"
-	}
-	var netErr net.Error
-	if errors.As(err, &netErr) && netErr.Timeout() {
-		return "timeout"
-	}
-	if errors.Is(err, io.EOF) {
-		return "eof"
-	}
-	if errors.Is(err, net.ErrClosed) ||
-		errors.Is(err, os.ErrClosed) ||
-		errors.Is(err, io.ErrClosedPipe) ||
-		errors.Is(err, syscall.EPIPE) {
-		return "connection_closed"
-	}
-	if errors.Is(err, syscall.ECONNRESET) {
-		return "connection_reset"
-	}
-	if errors.Is(err, syscall.ECONNREFUSED) {
-		return "connection_refused"
-	}
-	if errors.Is(err, os.ErrNotExist) || errors.Is(err, syscall.ENOENT) {
-		return "not_found"
-	}
-	if errors.Is(err, os.ErrPermission) ||
-		errors.Is(err, syscall.EACCES) ||
-		errors.Is(err, syscall.EPERM) {
-		return "permission_denied"
-	}
-	if errors.Is(err, syscall.ENOSPC) ||
-		errors.Is(err, syscall.EMFILE) ||
-		errors.Is(err, syscall.ENFILE) ||
-		errors.Is(err, syscall.ENOMEM) {
-		return "resource_exhausted"
-	}
-	if errors.Is(err, syscall.EIO) {
-		return "io_error"
-	}
-	return "unexpected"
-}
-
-func persistentDaemonDiagnosticCode(value string) string {
-	value = strings.TrimSpace(value)
-	if value == "" || len(value) > 64 {
-		return "unknown"
-	}
-	for _, character := range value {
-		if (character >= 'a' && character <= 'z') ||
-			(character >= '0' && character <= '9') ||
-			character == '_' || character == '-' || character == '.' {
-			continue
-		}
-		return "unknown"
-	}
-	return value
-}
diff --git a/daemon/remote/cmd/cmuxd-remote/persistent_log_test.go b/daemon/remote/cmd/cmuxd-remote/persistent_log_test.go
deleted file mode 100644
index f57d3bf0b7f7..000000000000
--- a/daemon/remote/cmd/cmuxd-remote/persistent_log_test.go
+++ /dev/null
@@ -1,408 +0,0 @@
-package main
-
-import (
-	"bytes"
-	"encoding/base64"
-	"errors"
-	"fmt"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"strconv"
-	"strings"
-	"syscall"
-	"testing"
-	"time"
-)
-
-func TestPersistentDaemonLogsConnectionAndPTYLifecycle(t *testing.T) {
-	const firstAttachmentToken = "secret-token-must-not-be-logged"
-	const secondAttachmentToken = "second-secret-token-must-not-be-logged"
-	const firstCommand = "sleep 60"
-	const secondCommand = "exit 0"
-	const terminalInput = "terminal-input-must-not-be-logged"
-	const requestID = "request-id-must-not-be-logged"
-	logOutput := newNotifyingBuffer()
-	socketPath, stop := startPersistentDaemonWithVerifierAndLogForTest(
-		t,
-		persistentDaemonFixedTokenVerifier("lifecycle-log-token"),
-		logOutput,
-	)
-	defer stop()
-
-	conn, reader, writer := openPersistentTestClient(t, socketPath, "lifecycle-log-token")
-	defer conn.Close()
-
-	attach := persistentTestRPCCall(t, conn, reader, writer, rpcRequest{
-		ID:     requestID + "-attach",
-		Method: "pty.attach",
-		Params: map[string]any{
-			"session_id":              "logged-session",
-			"attachment_id":           "logged-attachment",
-			"client_attachment_token": firstAttachmentToken,
-			"cols":                    80,
-			"rows":                    24,
-			"command":                 firstCommand,
-		},
-	})
-	if ok, _ := attach["ok"].(bool); !ok {
-		t.Fatalf("pty.attach failed: %v", attach)
-	}
-	readPersistentTestEvent(t, conn, reader, func(frame map[string]any) bool {
-		return frame["event"] == "pty.ready" && frame["attachment_id"] == "logged-attachment"
-	})
-	writeResponse := persistentTestRPCCall(t, conn, reader, writer, rpcRequest{
-		ID:     requestID + "-write",
-		Method: "pty.write",
-		Params: map[string]any{
-			"session_id":              "logged-session",
-			"attachment_id":           "logged-attachment",
-			"client_attachment_token": firstAttachmentToken,
-			"data_base64":             base64.StdEncoding.EncodeToString([]byte(terminalInput)),
-		},
-	})
-	if ok, _ := writeResponse["ok"].(bool); !ok {
-		t.Fatalf("pty.write failed: %v", writeResponse)
-	}
-
-	detach := persistentTestRPCCall(t, conn, reader, writer, rpcRequest{
-		ID:     requestID + "-detach",
-		Method: "pty.detach",
-		Params: map[string]any{
-			"session_id":              "logged-session",
-			"attachment_id":           "logged-attachment",
-			"client_attachment_token": firstAttachmentToken,
-		},
-	})
-	if ok, _ := detach["ok"].(bool); !ok {
-		t.Fatalf("pty.detach failed: %v", detach)
-	}
-	closeResponse := persistentTestRPCCall(t, conn, reader, writer, rpcRequest{
-		ID:     requestID + "-close",
-		Method: "pty.close",
-		Params: map[string]any{
-			"session_id": "logged-session",
-		},
-	})
-	if ok, _ := closeResponse["ok"].(bool); !ok {
-		t.Fatalf("pty.close failed: %v", closeResponse)
-	}
-	exitingAttach := persistentTestRPCCall(t, conn, reader, writer, rpcRequest{
-		ID:     requestID + "-exit",
-		Method: "pty.attach",
-		Params: map[string]any{
-			"session_id":              "logged-exit-session",
-			"attachment_id":           "logged-exit-attachment",
-			"client_attachment_token": secondAttachmentToken,
-			"cols":                    80,
-			"rows":                    24,
-			"command":                 secondCommand,
-		},
-	})
-	if ok, _ := exitingAttach["ok"].(bool); !ok {
-		t.Fatalf("short-lived pty.attach failed: %v", exitingAttach)
-	}
-	readPersistentTestEvent(t, conn, reader, func(frame map[string]any) bool {
-		return frame["event"] == "pty.exit" && frame["session_id"] == "logged-exit-session"
-	})
-
-	logged := logOutput.String()
-	for _, event := range []string{
-		"event=connection_accepted",
-		"event=connection_authenticated",
-		"event=pty_attach",
-		"event=pty_detach",
-		"event=pty_close",
-		"event=pty_exit",
-	} {
-		if !strings.Contains(logged, event) {
-			t.Fatalf("persistent daemon log = %q, want %q", logged, event)
-		}
-	}
-	for _, secret := range []string{
-		firstAttachmentToken,
-		secondAttachmentToken,
-		firstCommand,
-		secondCommand,
-		terminalInput,
-		requestID,
-	} {
-		if strings.Contains(logged, secret) {
-			t.Fatalf("persistent daemon log exposed sensitive request data %q: %q", secret, logged)
-		}
-	}
-}
-
-func TestPersistentDaemonLogRotationIsSizeBounded(t *testing.T) {
-	const maxBytes = int64(220)
-	const backups = 2
-	logPath := filepath.Join(t.TempDir(), "daemon.log")
-	logOutput, err := openPersistentDaemonLogWithLimit(logPath, maxBytes, backups)
-	if err != nil {
-		t.Fatalf("open persistent daemon log: %v", err)
-	}
-	for index := 0; index < 12; index++ {
-		logPersistentDaemonEvent(
-			logOutput,
-			"rotation_probe",
-			"marker", fmt.Sprintf("event-%02d-%s", index, strings.Repeat("x", 32)),
-		)
-	}
-	if err := logOutput.Close(); err != nil {
-		t.Fatalf("close persistent daemon log: %v", err)
-	}
-
-	for index, path := range []string{
-		logPath,
-		persistentDaemonLogBackupPath(logPath, 1),
-		persistentDaemonLogBackupPath(logPath, 2),
-	} {
-		info, err := os.Stat(path)
-		if err != nil {
-			t.Fatalf("stat log generation %d: %v", index, err)
-		}
-		if info.Size() > maxBytes {
-			t.Fatalf("log generation %d size = %d, want <= %d", index, info.Size(), maxBytes)
-		}
-		if info.Mode().Perm() != 0o600 {
-			t.Fatalf("log generation %d mode = %o, want 600", index, info.Mode().Perm())
-		}
-	}
-	newest, err := os.ReadFile(logPath)
-	if err != nil {
-		t.Fatalf("read newest persistent daemon log: %v", err)
-	}
-	if !strings.Contains(string(newest), "event-11-") {
-		t.Fatalf("newest persistent daemon log lost the latest event: %q", string(newest))
-	}
-}
-
-func TestPersistentDaemonFaultLogsExcludeRawRequestDetails(t *testing.T) {
-	const attachmentToken = "fault-token-must-not-be-logged"
-	const command = "fault-command-must-not-be-logged"
-	const terminalInput = "fault-input-must-not-be-logged"
-	const requestID = "fault-request-id-must-not-be-logged"
-	const rawFailure = "raw-failure-detail-must-not-be-logged"
-
-	logOutput := newNotifyingBuffer()
-	hub := newWebSocketPTYHub(wsPTYServerConfig{Shell: "/bin/sh"}, logOutput)
-	t.Cleanup(hub.closeAll)
-	hub.openPTY = func() (*os.File, *os.File, error) {
-		return nil, nil, errors.New(rawFailure)
-	}
-	writer := &captureRPCFrameWriter{}
-	server := &rpcServer{ptyHub: hub, frameWriter: writer}
-	attachResponse := server.handleRequest(rpcRequest{
-		ID:     requestID + "-attach",
-		Method: "pty.attach",
-		Params: map[string]any{
-			"session_id":              "fault-session",
-			"attachment_id":           "fault-attachment",
-			"client_attachment_token": attachmentToken,
-			"cols":                    80,
-			"rows":                    24,
-			"command":                 command,
-		},
-	})
-	if attachResponse.OK {
-		t.Fatalf("pty.attach unexpectedly succeeded: %+v", attachResponse)
-	}
-
-	notification := rpcRequest{
-		ID:     requestID + "-write",
-		Method: "pty.write",
-		Params: map[string]any{
-			"session_id":              "fault-session",
-			"attachment_id":           "fault-attachment",
-			"client_attachment_token": attachmentToken,
-			"data_base64":             base64.StdEncoding.EncodeToString([]byte(terminalInput)),
-		},
-	}
-	if err := server.handleNotificationResponse(notification, rpcResponse{
-		OK: false,
-		Error: &rpcError{
-			Code:    "pty_input_queue_full",
-			Message: rawFailure,
-		},
-	}); err != nil {
-		t.Fatalf("handle notification failure: %v", err)
-	}
-
-	logged := logOutput.String()
-	for _, event := range []string{
-		"event=pty_start_fault",
-		"event=pty_attach_failed",
-		"event=pty_channel_fault",
-	} {
-		if !strings.Contains(logged, event) {
-			t.Fatalf("persistent daemon log = %q, want %q", logged, event)
-		}
-	}
-	for _, secret := range []string{
-		attachmentToken,
-		command,
-		terminalInput,
-		requestID,
-		rawFailure,
-	} {
-		if strings.Contains(logged, secret) {
-			t.Fatalf("persistent daemon fault log exposed request data %q: %q", secret, logged)
-		}
-	}
-}
-
-func TestPersistentDaemonProcessOutputUsesRotatingWriter(t *testing.T) {
-	const helperEnvironment = "CMUX_TEST_PERSISTENT_PROCESS_OUTPUT"
-	const pathEnvironment = "CMUX_TEST_PERSISTENT_PROCESS_LOG_PATH"
-	const stdoutSecret = "process-stdout-secret-must-not-be-logged"
-	const stderrSecret = "process-stderr-secret-must-not-be-logged"
-
-	if os.Getenv(helperEnvironment) == "1" {
-		logOutput, err := openPersistentDaemonLogWithLimit(os.Getenv(pathEnvironment), 512, 2)
-		if err != nil {
-			t.Fatalf("open helper process log: %v", err)
-		}
-		route, err := routePersistentDaemonProcessOutput(logOutput)
-		if err != nil {
-			t.Fatalf("route helper process output: %v", err)
-		}
-		_, _ = fmt.Fprintln(os.Stdout, stdoutSecret)
-		_, _ = fmt.Fprintln(os.Stderr, stderrSecret)
-		if err := route.Close(); err != nil {
-			t.Fatalf("close helper process output route: %v", err)
-		}
-		if err := logOutput.Close(); err != nil {
-			t.Fatalf("close helper process log: %v", err)
-		}
-		return
-	}
-
-	logPath := filepath.Join(t.TempDir(), "daemon.log")
-	command := exec.Command(os.Args[0], "-test.run=^TestPersistentDaemonProcessOutputUsesRotatingWriter$")
-	command.Env = append(
-		os.Environ(),
-		helperEnvironment+"=1",
-		pathEnvironment+"="+logPath,
-	)
-	var output bytes.Buffer
-	command.Stdout = &output
-	command.Stderr = &output
-	if err := command.Run(); err != nil {
-		t.Fatalf("process-output helper failed: %v; output=%q", err, output.String())
-	}
-	logged, err := os.ReadFile(logPath)
-	if err != nil {
-		t.Fatalf("read process-output log: %v", err)
-	}
-	for _, secret := range []string{stdoutSecret, stderrSecret} {
-		if strings.Contains(string(logged), secret) {
-			t.Fatalf("process output exposed sensitive content %q: %q", secret, string(logged))
-		}
-	}
-	processOutputBytes := map[string][]int64{}
-	for _, line := range strings.Split(string(logged), "\n") {
-		if !strings.Contains(line, "event=process_output") {
-			continue
-		}
-		fields := map[string]string{}
-		for _, field := range strings.Fields(line) {
-			key, value, ok := strings.Cut(field, "=")
-			if !ok {
-				continue
-			}
-			if unquoted, err := strconv.Unquote(value); err == nil {
-				fields[key] = unquoted
-			} else {
-				fields[key] = value
-			}
-		}
-		byteCount, err := strconv.ParseInt(fields["bytes"], 10, 64)
-		if err != nil || byteCount <= 0 {
-			t.Fatalf("process output byte count = %q, want a positive integer: %q", fields["bytes"], line)
-		}
-		processOutputBytes[fields["stream"]] = append(processOutputBytes[fields["stream"]], byteCount)
-	}
-	for _, stream := range []string{"stdout", "stderr"} {
-		if len(processOutputBytes[stream]) == 0 {
-			t.Fatalf("process output metadata missing stream %q: %q", stream, string(logged))
-		}
-	}
-	info, err := os.Stat(logPath)
-	if err != nil {
-		t.Fatalf("stat process-output log: %v", err)
-	}
-	if info.Mode().Perm() != 0o600 {
-		t.Fatalf("process-output log mode = %o, want 600", info.Mode().Perm())
-	}
-}
-
-func TestPersistentDaemonProcessOutputSummaryBatchesReads(t *testing.T) {
-	startedAt := time.Unix(100, 0)
-	summary := persistentDaemonProcessOutputSummary{minimumInterval: time.Second}
-
-	if byteCount, emit := summary.record(10, startedAt); !emit || byteCount != 10 {
-		t.Fatalf("first record = (%d, %t), want (10, true)", byteCount, emit)
-	}
-	if byteCount, emit := summary.record(20, startedAt.Add(100*time.Millisecond)); emit || byteCount != 0 {
-		t.Fatalf("second record = (%d, %t), want (0, false)", byteCount, emit)
-	}
-	if byteCount, emit := summary.record(30, startedAt.Add(999*time.Millisecond)); emit || byteCount != 0 {
-		t.Fatalf("third record = (%d, %t), want (0, false)", byteCount, emit)
-	}
-	if byteCount, emit := summary.record(40, startedAt.Add(time.Second)); !emit || byteCount != 90 {
-		t.Fatalf("interval record = (%d, %t), want (90, true)", byteCount, emit)
-	}
-	if byteCount, emit := summary.record(50, startedAt.Add(1100*time.Millisecond)); emit || byteCount != 0 {
-		t.Fatalf("pending record = (%d, %t), want (0, false)", byteCount, emit)
-	}
-	if byteCount, emit := summary.flush(startedAt.Add(1200 * time.Millisecond)); !emit || byteCount != 50 {
-		t.Fatalf("final flush = (%d, %t), want (50, true)", byteCount, emit)
-	}
-	if byteCount, emit := summary.flush(startedAt.Add(1300 * time.Millisecond)); emit || byteCount != 0 {
-		t.Fatalf("empty flush = (%d, %t), want (0, false)", byteCount, emit)
-	}
-}
-
-func TestPersistentDaemonProcessOutputRejectsClosedTargetDescriptor(t *testing.T) {
-	const helperEnvironment = "CMUX_TEST_PERSISTENT_PROCESS_OUTPUT_CLOSED_FD"
-	const targetFD = 1
-
-	if os.Getenv(helperEnvironment) == "1" {
-		if err := syscall.Close(targetFD); err != nil {
-			t.Fatalf("close target descriptor: %v", err)
-		}
-		stream, err := routePersistentDaemonProcessOutputStream(
-			"stdout",
-			targetFD,
-			&bytes.Buffer{},
-		)
-		if stream != nil {
-			_ = stream.restoreAndDrain()
-			t.Fatal("routing a closed target descriptor unexpectedly succeeded")
-		}
-		if !errors.Is(err, syscall.EBADF) {
-			t.Fatalf("route closed target descriptor error = %v, want EBADF", err)
-		}
-		duplicate, duplicateErr := syscall.Dup(targetFD)
-		if duplicateErr == nil {
-			_ = syscall.Close(duplicate)
-			t.Fatal("routing failure reopened the closed target descriptor")
-		}
-		if !errors.Is(duplicateErr, syscall.EBADF) {
-			t.Fatalf("duplicate closed target descriptor error = %v, want EBADF", duplicateErr)
-		}
-		return
-	}
-
-	command := exec.Command(
-		os.Args[0],
-		"-test.run=^TestPersistentDaemonProcessOutputRejectsClosedTargetDescriptor$",
-	)
-	command.Env = append(os.Environ(), helperEnvironment+"=1")
-	var output bytes.Buffer
-	command.Stdout = &output
-	command.Stderr = &output
-	if err := command.Run(); err != nil {
-		t.Fatalf("closed-target helper failed: %v; output=%q", err, output.String())
-	}
-}
diff --git a/daemon/remote/cmd/cmuxd-remote/persistent_process_output.go b/daemon/remote/cmd/cmuxd-remote/persistent_process_output.go
deleted file mode 100644
index c6280bc1b2a7..000000000000
--- a/daemon/remote/cmd/cmuxd-remote/persistent_process_output.go
+++ /dev/null
@@ -1,209 +0,0 @@
-package main
-
-import (
-	"errors"
-	"io"
-	"os"
-	"strconv"
-	"sync"
-	"syscall"
-	"time"
-)
-
-const persistentDaemonProcessOutputSummaryInterval = time.Second
-
-// persistentDaemonProcessOutputRoute keeps process-level stdout and stderr on
-// the same rotating writer as structured daemon diagnostics. The persistent
-// server is a detached child, so routing must be owned by that child rather
-// than by the short-lived stdio proxy that launched it.
-type persistentDaemonProcessOutputRoute struct {
-	streams   []*persistentDaemonProcessOutputStream
-	closeOnce sync.Once
-	closeErr  error
-}
-
-type persistentDaemonProcessOutputStream struct {
-	name     string
-	reader   *os.File
-	savedFD  int
-	targetFD int
-	drained  chan struct{}
-}
-
-type persistentDaemonProcessOutputSummary struct {
-	minimumInterval time.Duration
-	pendingBytes    int64
-	lastEmittedAt   time.Time
-}
-
-func (s *persistentDaemonProcessOutputSummary) record(byteCount int, now time.Time) (int64, bool) {
-	if byteCount <= 0 {
-		return 0, false
-	}
-	s.pendingBytes += int64(byteCount)
-	if s.lastEmittedAt.IsZero() || now.Sub(s.lastEmittedAt) >= s.minimumInterval {
-		return s.flush(now)
-	}
-	return 0, false
-}
-
-func (s *persistentDaemonProcessOutputSummary) flush(now time.Time) (int64, bool) {
-	if s.pendingBytes <= 0 {
-		return 0, false
-	}
-	byteCount := s.pendingBytes
-	s.pendingBytes = 0
-	s.lastEmittedAt = now
-	return byteCount, true
-}
-
-func shouldRoutePersistentDaemonProcessOutput(stderr io.Writer) bool {
-	file, ok := stderr.(*os.File)
-	return ok &&
-		file.Fd() == os.Stderr.Fd() &&
-		os.Getenv(persistentDaemonReadyFDEnv) != ""
-}
-
-func routePersistentDaemonProcessOutput(writer io.Writer) (*persistentDaemonProcessOutputRoute, error) {
-	stdout, err := routePersistentDaemonProcessOutputStream(
-		"stdout",
-		int(os.Stdout.Fd()),
-		writer,
-	)
-	if err != nil {
-		return nil, err
-	}
-	stderr, err := routePersistentDaemonProcessOutputStream(
-		"stderr",
-		int(os.Stderr.Fd()),
-		writer,
-	)
-	if err != nil {
-		return nil, errors.Join(err, stdout.restoreAndDrain())
-	}
-	return &persistentDaemonProcessOutputRoute{streams: []*persistentDaemonProcessOutputStream{stdout, stderr}}, nil
-}
-
-func routePersistentDaemonProcessOutputStream(
-	name string,
-	targetFD int,
-	writer io.Writer,
-) (*persistentDaemonProcessOutputStream, error) {
-	savedFD, err := syscall.Dup(targetFD)
-	if err != nil {
-		return nil, err
-	}
-	closeSaved := true
-	defer func() {
-		if closeSaved {
-			_ = syscall.Close(savedFD)
-		}
-	}()
-
-	reader, pipeWriter, err := os.Pipe()
-	if err != nil {
-		return nil, err
-	}
-	closePipe := true
-	defer func() {
-		if closePipe {
-			_ = reader.Close()
-			_ = pipeWriter.Close()
-		}
-	}()
-
-	if err := replacePersistentDaemonFD(int(pipeWriter.Fd()), targetFD); err != nil {
-		return nil, err
-	}
-	if err := pipeWriter.Close(); err != nil {
-		_ = replacePersistentDaemonFD(savedFD, targetFD)
-		return nil, err
-	}
-
-	stream := &persistentDaemonProcessOutputStream{
-		name:     name,
-		reader:   reader,
-		savedFD:  savedFD,
-		targetFD: targetFD,
-		drained:  make(chan struct{}),
-	}
-	go stream.drain(writer)
-	closePipe = false
-	closeSaved = false
-	return stream, nil
-}
-
-func (s *persistentDaemonProcessOutputStream) drain(writer io.Writer) {
-	summary := persistentDaemonProcessOutputSummary{
-		minimumInterval: persistentDaemonProcessOutputSummaryInterval,
-	}
-	emitSummary := func(byteCount int64) {
-		logPersistentDaemonEvent(
-			writer,
-			"process_output",
-			"stream", s.name,
-			"bytes", strconv.FormatInt(byteCount, 10),
-		)
-	}
-	defer func() {
-		if byteCount, emit := summary.flush(time.Now()); emit {
-			emitSummary(byteCount)
-		}
-		close(s.drained)
-	}()
-	buffer := make([]byte, 32*1024)
-	for {
-		count, err := s.reader.Read(buffer)
-		if count > 0 {
-			// Process output is arbitrary and may contain terminal input, commands,
-			// or credentials. Record rate-limited byte summaries and discard the bytes.
-			if byteCount, emit := summary.record(count, time.Now()); emit {
-				emitSummary(byteCount)
-			}
-		}
-		if err != nil {
-			return
-		}
-	}
-}
-
-func (r *persistentDaemonProcessOutputRoute) Close() error {
-	if r == nil {
-		return nil
-	}
-	r.closeOnce.Do(func() {
-		var restoreErrors []error
-		for _, stream := range r.streams {
-			if err := stream.restore(); err != nil {
-				restoreErrors = append(restoreErrors, err)
-			}
-		}
-		for _, stream := range r.streams {
-			stream.waitForDrain()
-		}
-		r.closeErr = errors.Join(restoreErrors...)
-	})
-	return r.closeErr
-}
-
-func (s *persistentDaemonProcessOutputStream) restore() error {
-	err := replacePersistentDaemonFD(s.savedFD, s.targetFD)
-	_ = syscall.Close(s.savedFD)
-	if err != nil {
-		// A failed restore may leave a pipe writer open. Closing the reader
-		// guarantees shutdown cannot deadlock waiting for the drain goroutine.
-		_ = s.reader.Close()
-	}
-	return err
-}
-
-func (s *persistentDaemonProcessOutputStream) waitForDrain() {
-	<-s.drained
-	_ = s.reader.Close()
-}
-
-func (s *persistentDaemonProcessOutputStream) restoreAndDrain() error {
-	err := s.restore()
-	s.waitForDrain()
-	return err
-}
diff --git a/daemon/remote/cmd/cmuxd-remote/persistent_process_output_darwin.go b/daemon/remote/cmd/cmuxd-remote/persistent_process_output_darwin.go
deleted file mode 100644
index 003f501b4aae..000000000000
--- a/daemon/remote/cmd/cmuxd-remote/persistent_process_output_darwin.go
+++ /dev/null
@@ -1,9 +0,0 @@
-//go:build darwin
-
-package main
-
-import "syscall"
-
-func replacePersistentDaemonFD(from int, to int) error {
-	return syscall.Dup2(from, to)
-}
diff --git a/daemon/remote/cmd/cmuxd-remote/persistent_process_output_linux.go b/daemon/remote/cmd/cmuxd-remote/persistent_process_output_linux.go
deleted file mode 100644
index b55c2d839c44..000000000000
--- a/daemon/remote/cmd/cmuxd-remote/persistent_process_output_linux.go
+++ /dev/null
@@ -1,12 +0,0 @@
-//go:build linux
-
-package main
-
-import "syscall"
-
-func replacePersistentDaemonFD(from int, to int) error {
-	if from == to {
-		return nil
-	}
-	return syscall.Dup3(from, to, 0)
-}
diff --git a/daemon/remote/cmd/cmuxd-remote/persistent_proxy_test.go b/daemon/remote/cmd/cmuxd-remote/persistent_proxy_test.go
deleted file mode 100644
index 88acc7184396..000000000000
--- a/daemon/remote/cmd/cmuxd-remote/persistent_proxy_test.go
+++ /dev/null
@@ -1,152 +0,0 @@
-package main
-
-import (
-	"bytes"
-	"io"
-	"net"
-	"os"
-	"path/filepath"
-	"testing"
-	"time"
-)
-
-func TestPersistentStdioProxyCopiesDaemonFramesThenReturnsOnClose(t *testing.T) {
-	listener, socketPath := listenUnixForPersistentProxyTest(t)
-	defer listener.Close()
-
-	serverDone := make(chan struct{}, 1)
-	go func() {
-		defer func() { serverDone <- struct{}{} }()
-		conn, err := listener.Accept()
-		if err != nil {
-			return
-		}
-		defer conn.Close()
-		_, _ = conn.Write([]byte("frame-one\n"))
-		_, _ = conn.Write([]byte("frame-two\n"))
-	}()
-
-	conn, err := net.Dial("unix", socketPath)
-	if err != nil {
-		t.Fatalf("dial unix socket: %v", err)
-	}
-	stdinReader, stdinWriter := io.Pipe()
-	defer stdinWriter.Close()
-	stdout := &bytes.Buffer{}
-	done := make(chan error, 1)
-	go func() {
-		done <- proxyPersistentDaemonConn(stdinReader, stdout, conn)
-	}()
-
-	select {
-	case err := <-done:
-		if err != nil {
-			t.Fatalf("proxyPersistentDaemonConn returned error: %v", err)
-		}
-	case <-time.After(time.Second):
-		t.Fatalf("proxyPersistentDaemonConn did not return after daemon side closed")
-	}
-	if got := stdout.String(); got != "frame-one\nframe-two\n" {
-		t.Fatalf("stdout = %q, want copied daemon frames", got)
-	}
-	select {
-	case <-serverDone:
-	case <-time.After(time.Second):
-		t.Fatalf("server did not finish")
-	}
-}
-
-func TestPersistentStdioProxyKeepsPumpingWhileDaemonStaysOpen(t *testing.T) {
-	listener, socketPath := listenUnixForPersistentProxyTest(t)
-	defer listener.Close()
-
-	serverRead := make(chan string, 1)
-	serverCanClose := make(chan struct{})
-	serverDone := make(chan struct{}, 1)
-	go func() {
-		defer func() { serverDone <- struct{}{} }()
-		conn, err := listener.Accept()
-		if err != nil {
-			return
-		}
-		defer conn.Close()
-		_, _ = conn.Write([]byte("daemon-ready\n"))
-		buffer := make([]byte, 64)
-		n, _ := conn.Read(buffer)
-		serverRead <- string(buffer[:n])
-		<-serverCanClose
-	}()
-
-	conn, err := net.Dial("unix", socketPath)
-	if err != nil {
-		t.Fatalf("dial unix socket: %v", err)
-	}
-	stdinReader, stdinWriter := io.Pipe()
-	stdout := newNotifyingBuffer()
-	done := make(chan error, 1)
-	go func() {
-		done <- proxyPersistentDaemonConn(stdinReader, stdout, conn)
-	}()
-
-	if _, err := stdinWriter.Write([]byte("client-input\n")); err != nil {
-		t.Fatalf("write stdin pipe: %v", err)
-	}
-	select {
-	case got := <-serverRead:
-		if got != "client-input\n" {
-			t.Fatalf("server read %q, want client input", got)
-		}
-	case <-time.After(time.Second):
-		t.Fatalf("server did not receive stdin data")
-	}
-	select {
-	case <-stdout.notify:
-	case <-time.After(time.Second):
-		t.Fatalf("proxy did not copy daemon frame")
-	}
-	if got := stdout.String(); got != "daemon-ready\n" {
-		t.Fatalf("stdout = %q, want daemon frame", got)
-	}
-	select {
-	case err := <-done:
-		t.Fatalf("proxyPersistentDaemonConn returned while daemon stayed open: %v", err)
-	default:
-	}
-
-	if err := stdinWriter.Close(); err != nil {
-		t.Fatalf("close stdin pipe: %v", err)
-	}
-	close(serverCanClose)
-	select {
-	case err := <-done:
-		if err != nil {
-			t.Fatalf("proxyPersistentDaemonConn returned error: %v", err)
-		}
-	case <-time.After(time.Second):
-		t.Fatalf("proxyPersistentDaemonConn did not return after stdin and daemon closed")
-	}
-	select {
-	case <-serverDone:
-	case <-time.After(time.Second):
-		t.Fatalf("server did not finish")
-	}
-}
-
-func listenUnixForPersistentProxyTest(t *testing.T) (net.Listener, string) {
-	t.Helper()
-	dir, err := os.MkdirTemp("/tmp", "cmux-proxy-test-*")
-	if err != nil {
-		t.Fatalf("create unix socket dir: %v", err)
-	}
-	socketPath := filepath.Join(dir, "proxy.sock")
-	listener, err := net.Listen("unix", socketPath)
-	if err != nil {
-		_ = os.RemoveAll(dir)
-		t.Fatalf("listen unix socket: %v", err)
-	}
-	t.Cleanup(func() {
-		_ = listener.Close()
-		_ = os.RemoveAll(dir)
-	})
-	return listener, socketPath
-}
diff --git a/daemon/remote/cmd/cmuxd-remote/persistent_pty_exec.go b/daemon/remote/cmd/cmuxd-remote/persistent_pty_exec.go
deleted file mode 100644
index 35812e342a0f..000000000000
--- a/daemon/remote/cmd/cmuxd-remote/persistent_pty_exec.go
+++ /dev/null
@@ -1,60 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"io"
-	"os"
-	"os/exec"
-	"os/signal"
-	"runtime"
-	"strings"
-	"syscall"
-)
-
-const (
-	persistentPTYExecHelperArgument    = "--internal-persistent-pty-exec"
-	persistentPTYExecHelperEnvironment = "CMUX_PERSISTENT_PTY_EXEC_HELPER"
-)
-
-func init() {
-	if len(os.Args) < 2 || os.Args[1] != persistentPTYExecHelperArgument {
-		return
-	}
-	os.Exit(runPersistentPTYExecHelper(os.Args[2:], os.Stderr))
-}
-
-func runPersistentPTYExecHelper(arguments []string, stderr io.Writer) int {
-	if len(arguments) < 2 {
-		_, _ = fmt.Fprintln(stderr, "persistent PTY exec helper requires an executable and argv")
-		return 2
-	}
-	executable := arguments[0]
-	argv := arguments[1:]
-	if !strings.ContainsRune(executable, os.PathSeparator) {
-		resolved, err := exec.LookPath(executable)
-		if err != nil {
-			_, _ = fmt.Fprintf(stderr, "persistent PTY exec helper could not resolve %s through PATH: %v\n", executable, err)
-			return 126
-		}
-		executable = resolved
-	}
-
-	// Keep the ignored disposition as a second layer for shells that explicitly
-	// unblock job-control signals. Agent runtimes that reset the disposition are
-	// still protected by the inherited mask below.
-	signal.Ignore(syscall.SIGHUP)
-
-	// Signal masks belong to OS threads. Pin this goroutine from the mask
-	// change through exec so the new program inherits the mask we set.
-	runtime.LockOSThread()
-	defer runtime.UnlockOSThread()
-	if err := blockPersistentPTYHangup(); err != nil {
-		_, _ = fmt.Fprintf(stderr, "persistent PTY exec helper could not block SIGHUP: %v\n", err)
-		return 126
-	}
-	if err := syscall.Exec(executable, argv, os.Environ()); err != nil {
-		_, _ = fmt.Fprintf(stderr, "persistent PTY exec helper could not exec %s: %v\n", executable, err)
-		return 126
-	}
-	return 0
-}
diff --git a/daemon/remote/cmd/cmuxd-remote/persistent_pty_exec_darwin.go b/daemon/remote/cmd/cmuxd-remote/persistent_pty_exec_darwin.go
deleted file mode 100644
index 78f6c058502d..000000000000
--- a/daemon/remote/cmd/cmuxd-remote/persistent_pty_exec_darwin.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package main
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-func blockPersistentPTYHangup() error {
-	const darwinSignalBlock = 1
-	mask := uint32(1) << uint(syscall.SIGHUP-1)
-	_, _, errno := syscall.RawSyscall(
-		syscall.SYS___PTHREAD_SIGMASK,
-		darwinSignalBlock,
-		uintptr(unsafe.Pointer(&mask)),
-		0,
-	)
-	if errno != 0 {
-		return errno
-	}
-	return nil
-}
diff --git a/daemon/remote/cmd/cmuxd-remote/persistent_pty_exec_linux.go b/daemon/remote/cmd/cmuxd-remote/persistent_pty_exec_linux.go
deleted file mode 100644
index f0ce001e1454..000000000000
--- a/daemon/remote/cmd/cmuxd-remote/persistent_pty_exec_linux.go
+++ /dev/null
@@ -1,24 +0,0 @@
-package main
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-func blockPersistentPTYHangup() error {
-	const linuxSignalBlock = 0
-	mask := uint64(1) << uint(syscall.SIGHUP-1)
-	_, _, errno := syscall.RawSyscall6(
-		syscall.SYS_RT_SIGPROCMASK,
-		linuxSignalBlock,
-		uintptr(unsafe.Pointer(&mask)),
-		0,
-		unsafe.Sizeof(mask),
-		0,
-		0,
-	)
-	if errno != 0 {
-		return errno
-	}
-	return nil
-}
diff --git a/daemon/remote/cmd/cmuxd-remote/tmux_compat.go b/daemon/remote/cmd/cmuxd-remote/tmux_compat.go
deleted file mode 100644
index e7d62c62a844..000000000000
--- a/daemon/remote/cmd/cmuxd-remote/tmux_compat.go
+++ /dev/null
@@ -1,2514 +0,0 @@
-package main
-
-import (
-	"encoding/json"
-	"fmt"
-	"hash/fnv"
-	"io"
-	"math"
-	"os"
-	"path/filepath"
-	"regexp"
-	"strings"
-	"time"
-
-	"golang.org/x/sys/unix"
-)
-
-// runTmuxCompat handles `cmux __tmux-compat <args...>`, translating tmux
-// commands into cmux JSON-RPC calls over the relay socket.
-func runTmuxCompat(socketPath string, args []string, refreshAddr func() string) int {
-	command, cmdArgs, err := splitTmuxCmd(args)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "cmux __tmux-compat: %v\n", err)
-		return 1
-	}
-
-	rc := &rpcContext{socketPath: socketPath, refreshAddr: refreshAddr}
-	if err := dispatchTmuxCommand(rc, command, cmdArgs); err != nil {
-		fmt.Fprintf(os.Stderr, "cmux __tmux-compat: %v\n", err)
-		return 1
-	}
-	return 0
-}
-
-// rpcContext holds connection info for making JSON-RPC calls.
-type rpcContext struct {
-	socketPath  string
-	refreshAddr func() string
-}
-
-// call makes a JSON-RPC call and returns the parsed result.
-func (rc *rpcContext) call(method string, params map[string]any) (map[string]any, error) {
-	resp, err := socketRoundTripV2(rc.socketPath, method, params, rc.refreshAddr)
-	if err != nil {
-		return nil, err
-	}
-	var result map[string]any
-	if err := json.Unmarshal([]byte(resp), &result); err != nil {
-		// Some responses are bare values (string, null)
-		return nil, nil
-	}
-	return result, nil
-}
-
-// --- Tmux argument parsing ---
-
-type tmuxParsed struct {
-	flags      map[string]bool     // boolean flags like -d, -P
-	options    map[string][]string // value flags like -t <target>
-	positional []string
-}
-
-func (p *tmuxParsed) hasFlag(f string) bool {
-	return p.flags[f]
-}
-
-func (p *tmuxParsed) value(f string) string {
-	vals := p.options[f]
-	if len(vals) == 0 {
-		return ""
-	}
-	return vals[len(vals)-1]
-}
-
-func splitTmuxCmd(args []string) (string, []string, error) {
-	globalValueFlags := map[string]bool{"-L": true, "-S": true, "-f": true}
-	globalBoolFlags := map[string]bool{"-V": true, "-v": true}
-
-	i := 0
-	for i < len(args) {
-		arg := args[i]
-		if !strings.HasPrefix(arg, "-") || arg == "-" {
-			return strings.ToLower(arg), args[i+1:], nil
-		}
-		if arg == "--" {
-			break
-		}
-		if globalBoolFlags[arg] {
-			return arg, nil, nil
-		}
-		if globalValueFlags[arg] {
-			// Skip the value
-			i++
-		}
-		i++
-	}
-	return "", nil, fmt.Errorf("tmux shim requires a command")
-}
-
-func parseTmuxArgs(args []string, valueFlags, boolFlags []string) *tmuxParsed {
-	vSet := make(map[string]bool, len(valueFlags))
-	for _, f := range valueFlags {
-		vSet[f] = true
-	}
-	bSet := make(map[string]bool, len(boolFlags))
-	for _, f := range boolFlags {
-		bSet[f] = true
-	}
-
-	p := &tmuxParsed{
-		flags:   make(map[string]bool),
-		options: make(map[string][]string),
-	}
-	pastTerminator := false
-
-	for i := 0; i < len(args); i++ {
-		arg := args[i]
-		if pastTerminator {
-			p.positional = append(p.positional, arg)
-			continue
-		}
-		if arg == "--" {
-			pastTerminator = true
-			continue
-		}
-		if !strings.HasPrefix(arg, "-") || arg == "-" {
-			p.positional = append(p.positional, arg)
-			continue
-		}
-		if strings.HasPrefix(arg, "--") {
-			p.positional = append(p.positional, arg)
-			continue
-		}
-
-		// Cluster parsing: -dPh etc.
-		cluster := []rune(arg[1:])
-		cursor := 0
-		recognized := false
-		for cursor < len(cluster) {
-			flag := "-" + string(cluster[cursor])
-			if bSet[flag] {
-				p.flags[flag] = true
-				cursor++
-				recognized = true
-				continue
-			}
-			if vSet[flag] {
-				remainder := string(cluster[cursor+1:])
-				var value string
-				if remainder != "" {
-					value = remainder
-				} else if i+1 < len(args) {
-					i++
-					value = args[i]
-				}
-				p.options[flag] = append(p.options[flag], value)
-				recognized = true
-				cursor = len(cluster)
-				continue
-			}
-			recognized = false
-			break
-		}
-		if !recognized {
-			p.positional = append(p.positional, arg)
-		}
-	}
-	return p
-}
-
-// --- Format string rendering ---
-
-var tmuxFormatVarRe = regexp.MustCompile(`#\{[^}]+\}`)
-
-func tmuxRenderFormat(format string, context map[string]string, fallback string) string {
-	if format == "" {
-		return fallback
-	}
-	rendered := format
-	for key, value := range context {
-		rendered = strings.ReplaceAll(rendered, "#{"+key+"}", value)
-	}
-	// Remove any remaining unresolved #{...} variables
-	rendered = tmuxFormatVarRe.ReplaceAllString(rendered, "")
-	rendered = strings.TrimSpace(rendered)
-	if rendered == "" {
-		return fallback
-	}
-	return rendered
-}
-
-// --- Format context building ---
-
-func tmuxFormatContext(rc *rpcContext, workspaceId string, paneId string, surfaceId string) (map[string]string, error) {
-	canonicalWsId, err := tmuxResolveWorkspaceId(rc, workspaceId)
-	if err != nil {
-		return nil, err
-	}
-
-	ctx := map[string]string{
-		"session_name":      "cmux",
-		"session_id":        "$" + tmuxStableNumericId(canonicalWsId),
-		"session_attached":  "1",
-		"window_id":         "@" + tmuxStableNumericId(canonicalWsId),
-		"window_uuid":       canonicalWsId,
-		"window_active":     "0",
-		"window_flags":      "",
-		"window_width":      "80",
-		"window_height":     "24",
-		"pane_active":       "1",
-		"pane_width":        "80",
-		"pane_height":       "24",
-		"pane_current_path": tmuxFallbackCurrentPath(),
-	}
-	activeWorkspaceId := tmuxActiveWorkspaceId(rc)
-	activeByCaller := activeWorkspaceId == canonicalWsId
-	if activeByCaller {
-		tmuxSetWindowActive(ctx, true)
-	}
-
-	// Get workspace list for index/title
-	workspaces, err := tmuxWorkspaceItems(rc)
-	if err == nil {
-		for _, ws := range workspaces {
-			wsId, _ := ws["id"].(string)
-			wsRef, _ := ws["ref"].(string)
-			if wsId == canonicalWsId || wsRef == workspaceId {
-				if active, ok := boolFromAnyGo(ws["active"]); ok && !activeByCaller {
-					tmuxSetWindowActive(ctx, active)
-				} else if focused, ok := boolFromAnyGo(ws["focused"]); ok && !activeByCaller {
-					tmuxSetWindowActive(ctx, focused)
-				} else if selected, ok := boolFromAnyGo(ws["selected"]); ok && !activeByCaller {
-					tmuxSetWindowActive(ctx, selected)
-				}
-				if idx := intFromAnyGo(ws["index"]); idx >= 0 {
-					ctx["window_index"] = fmt.Sprintf("%d", idx)
-				}
-				if title, _ := ws["title"].(string); strings.TrimSpace(title) != "" {
-					ctx["window_name"] = strings.TrimSpace(title)
-				}
-				if path := tmuxPathFromObject(ws); path != "" {
-					ctx["pane_current_path"] = path
-				}
-				if paneCount := intFromAnyGo(ws["pane_count"]); paneCount >= 0 {
-					ctx["window_panes"] = fmt.Sprintf("%d", paneCount)
-				}
-				break
-			}
-		}
-	}
-
-	// Get current surface info
-	currentPayload, err := rc.call("surface.current", map[string]any{"workspace_id": canonicalWsId})
-	if err != nil {
-		return ctx, nil
-	}
-
-	resolvedPaneId := ""
-	if paneId != "" {
-		if pid, err := tmuxCanonicalPaneId(rc, paneId, canonicalWsId); err == nil {
-			resolvedPaneId = pid
-		} else {
-			resolvedPaneId = paneId
-		}
-	}
-	if resolvedPaneId == "" {
-		if pid, ok := currentPayload["pane_id"].(string); ok {
-			resolvedPaneId = pid
-		} else if pref, ok := currentPayload["pane_ref"].(string); ok {
-			if pid, err := tmuxCanonicalPaneId(rc, pref, canonicalWsId); err == nil {
-				resolvedPaneId = pid
-			} else {
-				resolvedPaneId = pref
-			}
-		}
-	}
-
-	resolvedSurfaceId := ""
-	if surfaceId != "" {
-		if sid, err := tmuxCanonicalSurfaceId(rc, surfaceId, canonicalWsId); err == nil {
-			resolvedSurfaceId = sid
-		} else {
-			resolvedSurfaceId = surfaceId
-		}
-	}
-	if resolvedSurfaceId == "" && resolvedPaneId != "" {
-		if sid, err := tmuxSelectedSurfaceId(rc, canonicalWsId, resolvedPaneId); err == nil {
-			resolvedSurfaceId = sid
-		}
-	}
-	if resolvedSurfaceId == "" {
-		if sid, ok := currentPayload["surface_id"].(string); ok {
-			resolvedSurfaceId = sid
-		}
-	}
-
-	if resolvedPaneId != "" {
-		ctx["pane_id"] = "%" + tmuxStableNumericId(resolvedPaneId)
-		ctx["pane_uuid"] = resolvedPaneId
-
-		panePayload, err := rc.call("pane.list", map[string]any{"workspace_id": canonicalWsId})
-		if err == nil {
-			panes, _ := panePayload["panes"].([]any)
-			for _, p := range panes {
-				pane, _ := p.(map[string]any)
-				if pane == nil {
-					continue
-				}
-				if pid, _ := pane["id"].(string); pid == resolvedPaneId {
-					if idx := intFromAnyGo(pane["index"]); idx >= 0 {
-						ctx["pane_index"] = fmt.Sprintf("%d", idx)
-					}
-					if focused, ok := boolFromAnyGo(pane["focused"]); ok {
-						if focused {
-							ctx["pane_active"] = "1"
-						} else {
-							ctx["pane_active"] = "0"
-						}
-					}
-					break
-				}
-			}
-		}
-	}
-
-	if resolvedSurfaceId != "" {
-		ctx["surface_id"] = resolvedSurfaceId
-		surfacePayload, err := rc.call("surface.list", map[string]any{"workspace_id": canonicalWsId})
-		if err == nil {
-			surfaces, _ := surfacePayload["surfaces"].([]any)
-			for _, s := range surfaces {
-				surface, _ := s.(map[string]any)
-				if surface == nil {
-					continue
-				}
-				if sid, _ := surface["id"].(string); sid == resolvedSurfaceId {
-					if title, _ := surface["title"].(string); strings.TrimSpace(title) != "" {
-						ctx["pane_title"] = strings.TrimSpace(title)
-						if _, ok := ctx["window_name"]; !ok {
-							ctx["window_name"] = strings.TrimSpace(title)
-						}
-					}
-					if path := tmuxPathFromObject(surface); path != "" {
-						ctx["pane_current_path"] = path
-					}
-					break
-				}
-			}
-		}
-	}
-
-	return ctx, nil
-}
-
-func tmuxEnrichContextWithGeometry(ctx map[string]string, pane map[string]any, containerFrame map[string]any) {
-	isFocused, _ := boolFromAnyGo(pane["focused"])
-	if isFocused {
-		ctx["pane_active"] = "1"
-	} else {
-		ctx["pane_active"] = "0"
-	}
-
-	columns := intFromAnyGo(pane["columns"])
-	rows := intFromAnyGo(pane["rows"])
-	if columns < 0 || rows < 0 {
-		return
-	}
-	ctx["pane_width"] = fmt.Sprintf("%d", columns)
-	ctx["pane_height"] = fmt.Sprintf("%d", rows)
-
-	cellW := intFromAnyGo(pane["cell_width_px"])
-	cellH := intFromAnyGo(pane["cell_height_px"])
-	if cellW <= 0 || cellH <= 0 {
-		return
-	}
-
-	if frame, ok := pane["pixel_frame"].(map[string]any); ok {
-		px := floatFromAny(frame["x"])
-		py := floatFromAny(frame["y"])
-		ctx["pane_left"] = fmt.Sprintf("%d", int(px)/cellW)
-		ctx["pane_top"] = fmt.Sprintf("%d", int(py)/cellH)
-	}
-
-	if containerFrame != nil {
-		cw := floatFromAny(containerFrame["width"])
-		ch := floatFromAny(containerFrame["height"])
-		ww := int(cw) / cellW
-		wh := int(ch) / cellH
-		if ww < 1 {
-			ww = 1
-		}
-		if wh < 1 {
-			wh = 1
-		}
-		ctx["window_width"] = fmt.Sprintf("%d", ww)
-		ctx["window_height"] = fmt.Sprintf("%d", wh)
-	}
-}
-
-func floatFromAny(v any) float64 {
-	switch t := v.(type) {
-	case float64:
-		return t
-	case int:
-		return float64(t)
-	case json.Number:
-		f, _ := t.Float64()
-		return f
-	}
-	return 0
-}
-
-func intFromAnyGo(v any) int {
-	switch t := v.(type) {
-	case float64:
-		return int(t)
-	case int:
-		return t
-	case json.Number:
-		i, err := t.Int64()
-		if err != nil {
-			return -1
-		}
-		return int(i)
-	}
-	return -1
-}
-
-func boolFromAnyGo(v any) (bool, bool) {
-	switch t := v.(type) {
-	case bool:
-		return t, true
-	case string:
-		switch strings.ToLower(strings.TrimSpace(t)) {
-		case "1", "true", "yes", "on":
-			return true, true
-		case "0", "false", "no", "off":
-			return false, true
-		}
-	case float64:
-		if t == 0 {
-			return false, true
-		}
-		if t == 1 {
-			return true, true
-		}
-	case int:
-		if t == 0 {
-			return false, true
-		}
-		if t == 1 {
-			return true, true
-		}
-	case json.Number:
-		i, err := t.Int64()
-		if err == nil && (i == 0 || i == 1) {
-			return i == 1, true
-		}
-	}
-	return false, false
-}
-
-func tmuxSetWindowActive(ctx map[string]string, active bool) {
-	if active {
-		ctx["window_active"] = "1"
-		ctx["window_flags"] = "*"
-	} else {
-		ctx["window_active"] = "0"
-		ctx["window_flags"] = ""
-	}
-}
-
-func tmuxStableNumericId(raw string) string {
-	raw = strings.TrimSpace(raw)
-	if raw == "" {
-		raw = "cmux"
-	}
-	h := fnv.New64a()
-	_, _ = h.Write([]byte(raw))
-	value := h.Sum64() & 0x7fffffffffffffff
-	if value == 0 {
-		value = 1
-	}
-	return fmt.Sprintf("%d", value)
-}
-
-func tmuxTrimIdSigil(raw string) string {
-	raw = strings.TrimSpace(raw)
-	for raw != "" {
-		switch raw[0] {
-		case '$', '@', '%':
-			raw = strings.TrimSpace(raw[1:])
-		default:
-			return raw
-		}
-	}
-	return raw
-}
-
-func tmuxSelectorToken(raw string) (string, bool) {
-	trimmed := strings.TrimSpace(raw)
-	token := tmuxTrimIdSigil(trimmed)
-	return token, token != trimmed
-}
-
-func tmuxNumericIdMatches(handle string, candidates ...string) bool {
-	token := tmuxTrimIdSigil(handle)
-	if token == "" {
-		return false
-	}
-	for _, candidate := range candidates {
-		if strings.TrimSpace(candidate) == "" {
-			continue
-		}
-		if token == tmuxStableNumericId(candidate) {
-			return true
-		}
-	}
-	return false
-}
-
-func tmuxIndexMatches(handle string, index int) bool {
-	if index < 0 {
-		return false
-	}
-	return tmuxTrimIdSigil(handle) == fmt.Sprintf("%d", index)
-}
-
-func tmuxNormalizePath(raw string) string {
-	raw = strings.TrimSpace(raw)
-	if raw == "" {
-		return ""
-	}
-	if strings.HasPrefix(raw, "~/") || raw == "~" {
-		if home, err := os.UserHomeDir(); err == nil && home != "" {
-			if raw == "~" {
-				raw = home
-			} else {
-				raw = filepath.Join(home, raw[2:])
-			}
-		}
-	}
-	if !filepath.IsAbs(raw) {
-		if abs, err := filepath.Abs(raw); err == nil {
-			raw = abs
-		}
-	}
-	if filepath.IsAbs(raw) {
-		return filepath.Clean(raw)
-	}
-	return ""
-}
-
-func tmuxFirstPath(values ...string) string {
-	for _, value := range values {
-		if path := tmuxNormalizePath(value); path != "" {
-			return path
-		}
-	}
-	return ""
-}
-
-func tmuxPathFromObject(item map[string]any) string {
-	if item == nil {
-		return ""
-	}
-	path := tmuxFirstPath(
-		stringFromAnyGo(item["pane_current_path"]),
-		stringFromAnyGo(item["current_directory"]),
-		stringFromAnyGo(item["requested_working_directory"]),
-		stringFromAnyGo(item["working_directory"]),
-		stringFromAnyGo(item["cwd"]),
-	)
-	if path != "" {
-		return path
-	}
-	if binding, ok := item["resume_binding"].(map[string]any); ok {
-		return tmuxFirstPath(stringFromAnyGo(binding["cwd"]))
-	}
-	return ""
-}
-
-func tmuxFallbackCurrentPath() string {
-	if path := tmuxNormalizePath(os.Getenv("PWD")); path != "" {
-		return path
-	}
-	if cwd, err := os.Getwd(); err == nil {
-		if path := tmuxNormalizePath(cwd); path != "" {
-			return path
-		}
-	}
-	if home, err := os.UserHomeDir(); err == nil {
-		if path := tmuxNormalizePath(home); path != "" {
-			return path
-		}
-	}
-	return "/"
-}
-
-func stringFromAnyGo(value any) string {
-	if s, ok := value.(string); ok {
-		return strings.TrimSpace(s)
-	}
-	return ""
-}
-
-// --- Target resolution ---
-
-func tmuxCallerWorkspaceHandle() string {
-	return strings.TrimSpace(os.Getenv("CMUX_WORKSPACE_ID"))
-}
-
-func tmuxCallerSurfaceHandle() string {
-	return strings.TrimSpace(os.Getenv("CMUX_SURFACE_ID"))
-}
-
-func tmuxResolvedCallerWorkspaceId(rc *rpcContext) string {
-	caller := tmuxCallerWorkspaceHandle()
-	if caller == "" {
-		return ""
-	}
-	wsId, err := tmuxResolveWorkspaceId(rc, caller)
-	if err != nil {
-		return ""
-	}
-	return wsId
-}
-
-func tmuxActiveWorkspaceId(rc *rpcContext) string {
-	if callerWs := tmuxResolvedCallerWorkspaceId(rc); callerWs != "" {
-		return callerWs
-	}
-	payload, err := rc.call("workspace.current", nil)
-	if err != nil {
-		return ""
-	}
-	if wsId, _ := payload["workspace_id"].(string); wsId != "" {
-		return wsId
-	}
-	if wsRef, _ := payload["workspace_ref"].(string); wsRef != "" {
-		if wsId, err := tmuxResolveWorkspaceId(rc, wsRef); err == nil {
-			return wsId
-		}
-	}
-	return ""
-}
-
-func tmuxCallerPaneHandle() string {
-	for _, key := range []string{"TMUX_PANE", "CMUX_PANE_ID"} {
-		v := strings.TrimSpace(os.Getenv(key))
-		if v != "" {
-			return strings.TrimPrefix(v, "%")
-		}
-	}
-	return ""
-}
-
-func tmuxWorkspaceItems(rc *rpcContext) ([]map[string]any, error) {
-	payload, err := rc.call("workspace.list", nil)
-	if err != nil {
-		return nil, err
-	}
-	items, _ := payload["workspaces"].([]any)
-	var result []map[string]any
-	for _, item := range items {
-		if m, ok := item.(map[string]any); ok {
-			result = append(result, m)
-		}
-	}
-	return result, nil
-}
-
-func isUUIDish(s string) bool {
-	// Simple UUID check: 8-4-4-4-12 hex
-	if len(s) != 36 {
-		return false
-	}
-	for i, c := range s {
-		if i == 8 || i == 13 || i == 18 || i == 23 {
-			if c != '-' {
-				return false
-			}
-		} else if !((c >= '0' && c <= '9') || (c >= 'a' && c <= 'f') || (c >= 'A' && c <= 'F')) {
-			return false
-		}
-	}
-	return true
-}
-
-func tmuxResolveWorkspaceId(rc *rpcContext, raw string) (string, error) {
-	raw = strings.TrimSpace(raw)
-	if raw == "" || raw == "current" {
-		if caller := tmuxCallerWorkspaceHandle(); caller != "" {
-			if isUUIDish(caller) {
-				return caller, nil
-			}
-			// Resolve ref
-			return tmuxResolveWorkspaceId(rc, caller)
-		}
-		payload, err := rc.call("workspace.current", nil)
-		if err != nil {
-			return "", fmt.Errorf("no workspace selected: %w", err)
-		}
-		if wsId, ok := payload["workspace_id"].(string); ok {
-			return wsId, nil
-		}
-		return "", fmt.Errorf("no workspace selected")
-	}
-
-	if isUUIDish(raw) {
-		return raw, nil
-	}
-
-	token, sigiled := tmuxSelectorToken(raw)
-	if isUUIDish(token) {
-		return token, nil
-	}
-
-	// Try to resolve as ref, tmux numeric id, or workspace index.
-	items, err := tmuxWorkspaceItems(rc)
-	if err != nil {
-		return "", err
-	}
-	for _, item := range items {
-		id, _ := item["id"].(string)
-		if ref, _ := item["ref"].(string); !sigiled && ref == raw {
-			if id != "" {
-				return id, nil
-			}
-		}
-		if id == raw || id == token {
-			return id, nil
-		}
-		if tmuxNumericIdMatches(token, id) || tmuxNumericIdMatches(token, stringFromAnyGo(item["ref"])) {
-			if id != "" {
-				return id, nil
-			}
-		}
-		if !sigiled && tmuxIndexMatches(token, intFromAnyGo(item["index"])) && id != "" {
-			return id, nil
-		}
-	}
-
-	// Try name match
-	if !sigiled {
-		needle := strings.TrimSpace(token)
-		for _, item := range items {
-			title, _ := item["title"].(string)
-			if strings.TrimSpace(title) == needle {
-				if id, _ := item["id"].(string); id != "" {
-					return id, nil
-				}
-			}
-		}
-	}
-
-	return "", fmt.Errorf("workspace not found: %s", raw)
-}
-
-func tmuxResolveWorkspaceTarget(rc *rpcContext, raw string) (string, error) {
-	raw = strings.TrimSpace(raw)
-	if raw == "" {
-		if caller := tmuxCallerWorkspaceHandle(); caller != "" {
-			return tmuxResolveWorkspaceId(rc, caller)
-		}
-		return tmuxResolveWorkspaceId(rc, "")
-	}
-
-	if raw == "!" || raw == "^" || raw == "-" {
-		payload, err := rc.call("workspace.last", nil)
-		if err != nil {
-			return "", fmt.Errorf("previous workspace not found: %w", err)
-		}
-		if wsId, ok := payload["workspace_id"].(string); ok {
-			return wsId, nil
-		}
-		return "", fmt.Errorf("previous workspace not found")
-	}
-
-	// Strip session:window.pane format
-	token := raw
-	if dot := strings.LastIndex(token, "."); dot >= 0 {
-		token = token[:dot]
-	}
-	if colon := strings.LastIndex(token, ":"); colon >= 0 {
-		suffix := token[colon+1:]
-		if suffix != "" {
-			token = suffix
-		} else {
-			token = token[:colon]
-		}
-	}
-	return tmuxResolveWorkspaceId(rc, token)
-}
-
-func tmuxPaneSelector(raw string) string {
-	raw = strings.TrimSpace(raw)
-	if raw == "" {
-		return ""
-	}
-	if strings.HasPrefix(raw, "%") {
-		return raw
-	}
-	if strings.HasPrefix(raw, "pane:") {
-		return raw
-	}
-	if dot := strings.LastIndex(raw, "."); dot >= 0 {
-		return raw[dot+1:]
-	}
-	return ""
-}
-
-func tmuxWindowSelector(raw string) string {
-	raw = strings.TrimSpace(raw)
-	if raw == "" {
-		return ""
-	}
-	if strings.HasPrefix(raw, "%") || strings.HasPrefix(raw, "pane:") {
-		return ""
-	}
-	if dot := strings.LastIndex(raw, "."); dot >= 0 {
-		return raw[:dot]
-	}
-	return raw
-}
-
-func tmuxCanonicalPaneId(rc *rpcContext, handle string, workspaceId string) (string, error) {
-	handle, sigiled := tmuxSelectorToken(handle)
-	if isUUIDish(handle) {
-		return handle, nil
-	}
-	payload, err := rc.call("pane.list", map[string]any{"workspace_id": workspaceId})
-	if err != nil {
-		return "", err
-	}
-	panes, _ := payload["panes"].([]any)
-	for _, p := range panes {
-		pane, _ := p.(map[string]any)
-		if pane == nil {
-			continue
-		}
-		id, _ := pane["id"].(string)
-		ref, _ := pane["ref"].(string)
-		if !sigiled && ref == handle {
-			if id, _ := pane["id"].(string); id != "" {
-				return id, nil
-			}
-		}
-		if id == handle {
-			return id, nil
-		}
-		if tmuxNumericIdMatches(handle, id) || tmuxNumericIdMatches(handle, ref) {
-			if id != "" {
-				return id, nil
-			}
-		}
-	}
-	if !sigiled {
-		for _, p := range panes {
-			pane, _ := p.(map[string]any)
-			if pane == nil {
-				continue
-			}
-			id, _ := pane["id"].(string)
-			if tmuxIndexMatches(handle, intFromAnyGo(pane["index"])) && id != "" {
-				return id, nil
-			}
-		}
-	}
-	return "", fmt.Errorf("pane not found: %s", handle)
-}
-
-func tmuxCanonicalSurfaceId(rc *rpcContext, handle string, workspaceId string) (string, error) {
-	handle, sigiled := tmuxSelectorToken(handle)
-	payload, err := rc.call("surface.list", map[string]any{"workspace_id": workspaceId})
-	if err != nil {
-		return "", err
-	}
-	surfaces, _ := payload["surfaces"].([]any)
-	for _, s := range surfaces {
-		surface, _ := s.(map[string]any)
-		if surface == nil {
-			continue
-		}
-		id, _ := surface["id"].(string)
-		ref, _ := surface["ref"].(string)
-		if !sigiled && ref == handle {
-			if id != "" {
-				return id, nil
-			}
-		}
-		if id == handle {
-			return id, nil
-		}
-		if tmuxNumericIdMatches(handle, id) || tmuxNumericIdMatches(handle, ref) {
-			if id != "" {
-				return id, nil
-			}
-		}
-	}
-	if !sigiled {
-		for _, s := range surfaces {
-			surface, _ := s.(map[string]any)
-			if surface == nil {
-				continue
-			}
-			id, _ := surface["id"].(string)
-			if tmuxIndexMatches(handle, intFromAnyGo(surface["index"])) && id != "" {
-				return id, nil
-			}
-		}
-	}
-	return "", fmt.Errorf("surface not found: %s", handle)
-}
-
-func tmuxFocusedPaneId(rc *rpcContext, workspaceId string) (string, error) {
-	payload, err := rc.call("surface.current", map[string]any{"workspace_id": workspaceId})
-	if err != nil {
-		return "", err
-	}
-	if pid, ok := payload["pane_id"].(string); ok {
-		return pid, nil
-	}
-	if pref, ok := payload["pane_ref"].(string); ok {
-		return tmuxCanonicalPaneId(rc, pref, workspaceId)
-	}
-	return "", fmt.Errorf("pane not found")
-}
-
-func tmuxWorkspaceIdForPaneHandle(rc *rpcContext, handle string) (string, error) {
-	handle, sigiled := tmuxSelectorToken(handle)
-	workspaces, err := tmuxWorkspaceItems(rc)
-	if err != nil {
-		return "", err
-	}
-	for _, ws := range workspaces {
-		wsId, _ := ws["id"].(string)
-		if wsId == "" {
-			continue
-		}
-		payload, err := rc.call("pane.list", map[string]any{"workspace_id": wsId})
-		if err != nil {
-			continue
-		}
-		panes, _ := payload["panes"].([]any)
-		for _, p := range panes {
-			pane, _ := p.(map[string]any)
-			if pane == nil {
-				continue
-			}
-			pid, _ := pane["id"].(string)
-			pref, _ := pane["ref"].(string)
-			if pid == handle {
-				return wsId, nil
-			}
-			if !sigiled && pref == handle {
-				return wsId, nil
-			}
-			if tmuxNumericIdMatches(handle, pid) || tmuxNumericIdMatches(handle, pref) {
-				return wsId, nil
-			}
-			if !sigiled && tmuxIndexMatches(handle, intFromAnyGo(pane["index"])) {
-				return wsId, nil
-			}
-		}
-	}
-	return "", fmt.Errorf("pane not found in any workspace")
-}
-
-func tmuxResolvePaneTarget(rc *rpcContext, raw string) (workspaceId string, paneId string, err error) {
-	raw = strings.TrimSpace(raw)
-	paneSelector := tmuxPaneSelector(raw)
-	windowSelector := tmuxWindowSelector(raw)
-
-	if windowSelector != "" {
-		workspaceId, err = tmuxResolveWorkspaceTarget(rc, windowSelector)
-		if err != nil {
-			return "", "", err
-		}
-	} else if paneSelector != "" {
-		if callerWs := tmuxResolvedCallerWorkspaceId(rc); callerWs != "" {
-			if _, err2 := tmuxCanonicalPaneId(rc, paneSelector, callerWs); err2 == nil {
-				workspaceId = callerWs
-			}
-		}
-		if workspaceId == "" {
-			workspaceId, err = tmuxWorkspaceIdForPaneHandle(rc, paneSelector)
-		}
-		if err != nil {
-			workspaceId, err = tmuxResolveWorkspaceTarget(rc, "")
-			if err != nil {
-				return "", "", err
-			}
-		}
-	} else {
-		workspaceId, err = tmuxResolveWorkspaceTarget(rc, "")
-		if err != nil {
-			return "", "", err
-		}
-	}
-
-	if paneSelector != "" {
-		paneId, err = tmuxCanonicalPaneId(rc, paneSelector, workspaceId)
-		if err != nil {
-			return "", "", err
-		}
-	} else if callerWs := tmuxResolvedCallerWorkspaceId(rc); callerWs == workspaceId {
-		if callerPane := tmuxCallerPaneHandle(); callerPane != "" {
-			if pid, err2 := tmuxCanonicalPaneId(rc, callerPane, workspaceId); err2 == nil {
-				paneId = pid
-			}
-		}
-	}
-
-	if paneId == "" {
-		paneId, err = tmuxFocusedPaneId(rc, workspaceId)
-		if err != nil {
-			return "", "", err
-		}
-	}
-	return workspaceId, paneId, nil
-}
-
-func tmuxSelectedSurfaceId(rc *rpcContext, workspaceId string, paneId string) (string, error) {
-	payload, err := rc.call("pane.surfaces", map[string]any{"workspace_id": workspaceId, "pane_id": paneId})
-	if err != nil {
-		return "", err
-	}
-	surfaces, _ := payload["surfaces"].([]any)
-	for _, s := range surfaces {
-		surface, _ := s.(map[string]any)
-		if surface == nil {
-			continue
-		}
-		if sel, _ := boolFromAnyGo(surface["selected"]); sel {
-			if id, _ := surface["id"].(string); id != "" {
-				return id, nil
-			}
-		}
-	}
-	// Fall back to first surface
-	if len(surfaces) > 0 {
-		if surface, ok := surfaces[0].(map[string]any); ok {
-			if id, _ := surface["id"].(string); id != "" {
-				return id, nil
-			}
-		}
-	}
-	return "", fmt.Errorf("pane has no surface")
-}
-
-func tmuxResolveSurfaceTarget(rc *rpcContext, raw string) (workspaceId string, paneId string, surfaceId string, err error) {
-	raw = strings.TrimSpace(raw)
-
-	if tmuxPaneSelector(raw) != "" {
-		workspaceId, paneId, err = tmuxResolvePaneTarget(rc, raw)
-		if err != nil {
-			return "", "", "", err
-		}
-		// When target pane matches caller's pane, prefer caller's surface
-		callerPane := tmuxCallerPaneHandle()
-		callerSurface := tmuxCallerSurfaceHandle()
-		if callerPane != "" && callerSurface != "" {
-			canonicalCallerPane, _ := tmuxCanonicalPaneId(rc, callerPane, workspaceId)
-			if paneId == callerPane || paneId == canonicalCallerPane {
-				surfaceId, err = tmuxCanonicalSurfaceId(rc, callerSurface, workspaceId)
-				if err == nil {
-					return
-				}
-			}
-		}
-		surfaceId, err = tmuxSelectedSurfaceId(rc, workspaceId, paneId)
-		return
-	}
-
-	winSel := tmuxWindowSelector(raw)
-	workspaceId, err = tmuxResolveWorkspaceTarget(rc, winSel)
-	if err != nil {
-		return "", "", "", err
-	}
-
-	// When no explicit target and caller workspace matches, use caller's surface
-	if winSel == "" {
-		if callerWs := tmuxResolvedCallerWorkspaceId(rc); callerWs == workspaceId {
-			if callerSurface := tmuxCallerSurfaceHandle(); callerSurface != "" {
-				surfaceId, err = tmuxCanonicalSurfaceId(rc, callerSurface, workspaceId)
-				if err == nil {
-					return
-				}
-			}
-		}
-	}
-
-	// Fall back to focused surface
-	payload, err := rc.call("surface.current", map[string]any{"workspace_id": workspaceId})
-	if err == nil {
-		if sid, ok := payload["surface_id"].(string); ok {
-			surfaceId = sid
-			return
-		}
-	}
-
-	// Last resort: first surface in the workspace
-	surfPayload, err := rc.call("surface.list", map[string]any{"workspace_id": workspaceId})
-	if err == nil {
-		surfs, _ := surfPayload["surfaces"].([]any)
-		for _, s := range surfs {
-			surf, _ := s.(map[string]any)
-			if surf == nil {
-				continue
-			}
-			if focused, _ := boolFromAnyGo(surf["focused"]); focused {
-				if id, _ := surf["id"].(string); id != "" {
-					surfaceId = id
-					return workspaceId, "", surfaceId, nil
-				}
-			}
-		}
-		if len(surfs) > 0 {
-			if surf, ok := surfs[0].(map[string]any); ok {
-				if id, _ := surf["id"].(string); id != "" {
-					surfaceId = id
-					return workspaceId, "", surfaceId, nil
-				}
-			}
-		}
-	}
-
-	return "", "", "", fmt.Errorf("unable to resolve surface")
-}
-
-type tmuxSplitAnchor struct {
-	targetSurfaceId string
-	callerSurfaceId string
-	direction       string
-}
-
-func tmuxAnchoredSplitTarget(rc *rpcContext, workspaceId string) (*tmuxSplitAnchor, error) {
-	store, err := loadTmuxCompatStore()
-	if err != nil {
-		return nil, err
-	}
-	if mvState, ok := store.MainVerticalLayouts[workspaceId]; ok && mvState.LastColumnSurfaceId != "" {
-		staleLastColumn := mvState.LastColumnSurfaceId
-		lastColumnId, err := tmuxCanonicalSurfaceId(rc, staleLastColumn, workspaceId)
-		if err == nil {
-			return &tmuxSplitAnchor{
-				targetSurfaceId: lastColumnId,
-				callerSurfaceId: "",
-				direction:       "down",
-			}, nil
-		}
-
-		// Right-column anchors can outlive the pane they pointed at.
-		// Drop stale state and rebuild from the caller surface instead.
-		_ = withLockedTmuxCompatStore(func(store *tmuxCompatStore) error {
-			if current, ok := store.MainVerticalLayouts[workspaceId]; ok &&
-				current.LastColumnSurfaceId == staleLastColumn {
-				current.LastColumnSurfaceId = ""
-				store.MainVerticalLayouts[workspaceId] = current
-				delete(store.LastSplitSurface, workspaceId)
-			}
-			return nil
-		})
-	}
-
-	candidateAnchors := []string{tmuxCallerSurfaceHandle()}
-	if mvState, ok := store.MainVerticalLayouts[workspaceId]; ok && mvState.MainSurfaceId != "" {
-		candidateAnchors = append(candidateAnchors, mvState.MainSurfaceId)
-	}
-	for _, candidate := range candidateAnchors {
-		if candidate == "" {
-			continue
-		}
-		anchorSurfaceId, err := tmuxCanonicalSurfaceId(rc, candidate, workspaceId)
-		if err == nil {
-			return &tmuxSplitAnchor{
-				targetSurfaceId: anchorSurfaceId,
-				callerSurfaceId: anchorSurfaceId,
-				direction:       "right",
-			}, nil
-		}
-	}
-
-	observedLayout, hasObservedLayout := store.MainVerticalLayouts[workspaceId]
-	if hasObservedLayout {
-		_ = withLockedTmuxCompatStore(func(store *tmuxCompatStore) error {
-			if current, ok := store.MainVerticalLayouts[workspaceId]; ok &&
-				current.MainSurfaceId == observedLayout.MainSurfaceId &&
-				current.LastColumnSurfaceId == observedLayout.LastColumnSurfaceId {
-				delete(store.MainVerticalLayouts, workspaceId)
-				delete(store.LastSplitSurface, workspaceId)
-			}
-			return nil
-		})
-	}
-	return nil, nil
-}
-
-// --- TmuxCompatStore (local JSON state) ---
-
-type mainVerticalState struct {
-	MainSurfaceId       string `json:"mainSurfaceId"`
-	LastColumnSurfaceId string `json:"lastColumnSurfaceId,omitempty"`
-}
-
-type tmuxCompatStore struct {
-	Buffers             map[string]string            `json:"buffers,omitempty"`
-	Hooks               map[string]string            `json:"hooks,omitempty"`
-	MainVerticalLayouts map[string]mainVerticalState `json:"mainVerticalLayouts,omitempty"`
-	LastSplitSurface    map[string]string            `json:"lastSplitSurface,omitempty"`
-}
-
-func tmuxCompatStoreURL() string {
-	home, _ := os.UserHomeDir()
-	return filepath.Join(home, ".cmuxterm", "tmux-compat-store.json")
-}
-
-type tmuxCompatStoreDirectory struct {
-	file      *os.File
-	storeName string
-	lockName  string
-}
-
-func openTmuxCompatStoreDirectory(createIfMissing bool) (*tmuxCompatStoreDirectory, error) {
-	directory := filepath.Dir(tmuxCompatStoreURL())
-	if createIfMissing {
-		if err := os.MkdirAll(directory, 0700); err != nil {
-			return nil, err
-		}
-	}
-	fd, err := unix.Open(
-		directory,
-		unix.O_RDONLY|unix.O_DIRECTORY|unix.O_CLOEXEC|unix.O_NOFOLLOW,
-		0,
-	)
-	if err != nil {
-		return nil, err
-	}
-	directoryFile := os.NewFile(uintptr(fd), directory)
-	if err := unix.Fchmod(fd, 0700); err != nil {
-		_ = directoryFile.Close()
-		return nil, err
-	}
-	return &tmuxCompatStoreDirectory{
-		file:      directoryFile,
-		storeName: filepath.Base(tmuxCompatStoreURL()),
-		lockName:  filepath.Base(tmuxCompatStoreURL()) + ".lock",
-	}, nil
-}
-
-func (directory *tmuxCompatStoreDirectory) open(name string, flags int, mode uint32) (*os.File, error) {
-	fd, err := unix.Openat(int(directory.file.Fd()), name, flags, mode)
-	if err != nil {
-		return nil, err
-	}
-	return os.NewFile(uintptr(fd), name), nil
-}
-
-func (directory *tmuxCompatStoreDirectory) rename(source string, destination string) error {
-	return unix.Renameat(int(directory.file.Fd()), source, int(directory.file.Fd()), destination)
-}
-
-func (directory *tmuxCompatStoreDirectory) unlink(name string) {
-	_ = unix.Unlinkat(int(directory.file.Fd()), name, 0)
-}
-
-func emptyTmuxCompatStore() tmuxCompatStore {
-	return tmuxCompatStore{
-		Buffers:             make(map[string]string),
-		Hooks:               make(map[string]string),
-		MainVerticalLayouts: make(map[string]mainVerticalState),
-		LastSplitSurface:    make(map[string]string),
-	}
-}
-
-func loadTmuxCompatStore() (tmuxCompatStore, error) {
-	directory, err := openTmuxCompatStoreDirectory(false)
-	if err != nil {
-		if os.IsNotExist(err) {
-			return emptyTmuxCompatStore(), nil
-		}
-		return tmuxCompatStore{}, err
-	}
-	defer directory.file.Close()
-	return loadTmuxCompatStoreFromDirectory(directory)
-}
-
-func loadTmuxCompatStoreFromDirectory(directory *tmuxCompatStoreDirectory) (tmuxCompatStore, error) {
-	file, err := directory.open(directory.storeName, unix.O_RDONLY|unix.O_CLOEXEC|unix.O_NOFOLLOW, 0)
-	if err != nil {
-		if os.IsNotExist(err) {
-			return emptyTmuxCompatStore(), nil
-		}
-		return tmuxCompatStore{}, err
-	}
-	defer file.Close()
-	info, err := file.Stat()
-	if err != nil {
-		return tmuxCompatStore{}, err
-	}
-	if !info.Mode().IsRegular() {
-		return tmuxCompatStore{}, fmt.Errorf("tmux compatibility store is not a regular file")
-	}
-	// Heal stores created by older versions even when this is a read-only
-	// command, so buffer contents are never left world-readable.
-	if err := unix.Fchmod(int(file.Fd()), 0600); err != nil {
-		return tmuxCompatStore{}, err
-	}
-	data, err := io.ReadAll(file)
-	if err != nil {
-		return tmuxCompatStore{}, err
-	}
-	var store tmuxCompatStore
-	if err := json.Unmarshal(data, &store); err != nil {
-		return tmuxCompatStore{}, err
-	}
-	if store.Buffers == nil {
-		store.Buffers = make(map[string]string)
-	}
-	if store.Hooks == nil {
-		store.Hooks = make(map[string]string)
-	}
-	if store.MainVerticalLayouts == nil {
-		store.MainVerticalLayouts = make(map[string]mainVerticalState)
-	}
-	if store.LastSplitSurface == nil {
-		store.LastSplitSurface = make(map[string]string)
-	}
-	return store, nil
-}
-
-func saveTmuxCompatStore(store tmuxCompatStore) error {
-	return withLockedTmuxCompatStore(func(current *tmuxCompatStore) error {
-		*current = store
-		return nil
-	})
-}
-
-// withLockedTmuxCompatStore serializes a complete store read-modify-write
-// across independent cmuxd processes. The lock file is separate from the JSON
-// path because writers replace the JSON atomically.
-func withLockedTmuxCompatStore(mutate func(*tmuxCompatStore) error) error {
-	return withLockedTmuxCompatStoreIfChanged(func(store *tmuxCompatStore) (bool, error) {
-		if err := mutate(store); err != nil {
-			return false, err
-		}
-		return true, nil
-	})
-}
-
-func withLockedTmuxCompatStoreIfChanged(mutate func(*tmuxCompatStore) (bool, error)) error {
-	directory, err := openTmuxCompatStoreDirectory(true)
-	if err != nil {
-		return err
-	}
-	defer directory.file.Close()
-	lockFile, err := directory.open(
-		directory.lockName,
-		unix.O_CREAT|unix.O_RDWR|unix.O_CLOEXEC|unix.O_NOFOLLOW,
-		0600,
-	)
-	if err != nil {
-		return err
-	}
-	defer lockFile.Close()
-	if err := unix.Fchmod(int(lockFile.Fd()), 0600); err != nil {
-		return err
-	}
-	if err := unix.Flock(int(lockFile.Fd()), unix.LOCK_EX); err != nil {
-		return err
-	}
-	defer unix.Flock(int(lockFile.Fd()), unix.LOCK_UN)
-
-	store, err := loadTmuxCompatStoreFromDirectory(directory)
-	if err != nil {
-		return err
-	}
-	changed, err := mutate(&store)
-	if err != nil {
-		return err
-	}
-	if !changed {
-		return nil
-	}
-	return saveTmuxCompatStoreUnlocked(directory, store)
-}
-
-func saveTmuxCompatStoreUnlocked(directory *tmuxCompatStoreDirectory, store tmuxCompatStore) error {
-	data, err := json.Marshal(store)
-	if err != nil {
-		return err
-	}
-	tmpName := fmt.Sprintf(".tmux-compat-store-%d-%d.tmp", os.Getpid(), time.Now().UnixNano())
-	tmp, err := directory.open(
-		tmpName,
-		unix.O_WRONLY|unix.O_CREAT|unix.O_EXCL|unix.O_CLOEXEC|unix.O_NOFOLLOW,
-		0600,
-	)
-	if err != nil {
-		return err
-	}
-	removeTemp := true
-	defer func() {
-		if removeTemp {
-			directory.unlink(tmpName)
-		}
-	}()
-	if err := unix.Fchmod(int(tmp.Fd()), 0600); err != nil {
-		_ = tmp.Close()
-		return err
-	}
-	if _, err := tmp.Write(data); err != nil {
-		_ = tmp.Close()
-		return err
-	}
-	if err := tmp.Sync(); err != nil {
-		_ = tmp.Close()
-		return err
-	}
-	if err := tmp.Close(); err != nil {
-		return err
-	}
-	if err := directory.rename(tmpName, directory.storeName); err != nil {
-		return err
-	}
-	removeTemp = false
-	return nil
-}
-
-func tmuxPruneCompatWorkspaceState(workspaceId string) error {
-	return withLockedTmuxCompatStoreIfChanged(func(store *tmuxCompatStore) (bool, error) {
-		_, removedLayout := store.MainVerticalLayouts[workspaceId]
-		_, removedSplit := store.LastSplitSurface[workspaceId]
-		if removedLayout {
-			delete(store.MainVerticalLayouts, workspaceId)
-		}
-		if removedSplit {
-			delete(store.LastSplitSurface, workspaceId)
-		}
-		return removedLayout || removedSplit, nil
-	})
-}
-
-func tmuxPruneCompatSurfaceState(workspaceId string, surfaceId string) error {
-	return withLockedTmuxCompatStoreIfChanged(func(store *tmuxCompatStore) (bool, error) {
-		changed := false
-		if lastSplit := store.LastSplitSurface[workspaceId]; lastSplit == surfaceId {
-			delete(store.LastSplitSurface, workspaceId)
-			changed = true
-		}
-		if layout, ok := store.MainVerticalLayouts[workspaceId]; ok {
-			if layout.MainSurfaceId == surfaceId {
-				delete(store.MainVerticalLayouts, workspaceId)
-				delete(store.LastSplitSurface, workspaceId)
-				changed = true
-			} else if layout.LastColumnSurfaceId == surfaceId {
-				layout.LastColumnSurfaceId = ""
-				store.MainVerticalLayouts[workspaceId] = layout
-				changed = true
-			}
-		}
-		return changed, nil
-	})
-}
-
-// --- Special key translation ---
-
-func tmuxSpecialKeyText(token string) string {
-	switch strings.ToLower(token) {
-	case "enter", "c-m", "kpenter":
-		return "\r"
-	case "tab", "c-i":
-		return "\t"
-	case "space":
-		return " "
-	case "bspace", "backspace":
-		return "\x7f"
-	case "escape", "esc", "c-[":
-		return "\x1b"
-	case "c-c":
-		return "\x03"
-	case "c-d":
-		return "\x04"
-	case "c-z":
-		return "\x1a"
-	case "c-l":
-		return "\x0c"
-	default:
-		return ""
-	}
-}
-
-func tmuxSendKeysText(tokens []string, literal bool) string {
-	if literal {
-		return strings.Join(tokens, " ")
-	}
-	var result strings.Builder
-	pendingSpace := false
-	for _, token := range tokens {
-		if special := tmuxSpecialKeyText(token); special != "" {
-			result.WriteString(special)
-			pendingSpace = false
-			continue
-		}
-		if pendingSpace {
-			result.WriteByte(' ')
-		}
-		result.WriteString(token)
-		pendingSpace = true
-	}
-	return result.String()
-}
-
-func tmuxShellQuote(value string) string {
-	return "'" + strings.ReplaceAll(value, "'", "'\"'\"'") + "'"
-}
-
-func tmuxShellCommandText(positional []string, cwd string) string {
-	cwd = strings.TrimSpace(cwd)
-	cmd := strings.TrimSpace(strings.Join(positional, " "))
-	if cwd == "" && cmd == "" {
-		return ""
-	}
-	var pieces []string
-	if cwd != "" {
-		pieces = append(pieces, "cd -- "+tmuxShellQuote(cwd))
-	}
-	if cmd != "" {
-		pieces = append(pieces, cmd)
-	}
-	return strings.Join(pieces, " && ") + "\r"
-}
-
-// --- Wait-for (filesystem-based signaling) ---
-
-func tmuxWaitForSignalPath(name string) string {
-	var sanitized strings.Builder
-	for _, c := range name {
-		if (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9') ||
-			c == '.' || c == '_' || c == '-' {
-			sanitized.WriteRune(c)
-		} else {
-			sanitized.WriteByte('_')
-		}
-	}
-	return fmt.Sprintf("/tmp/cmux-wait-for-%s.sig", sanitized.String())
-}
-
-// --- Main dispatch ---
-
-func dispatchTmuxCommand(rc *rpcContext, command string, args []string) error {
-	switch command {
-	case "-v", "-V":
-		fmt.Println("tmux 3.4")
-		return nil
-
-	case "new-session", "new":
-		return tmuxNewSession(rc, args)
-	case "new-window", "neww":
-		return tmuxNewWindow(rc, args)
-	case "split-window", "splitw":
-		return tmuxSplitWindow(rc, args)
-	case "select-window", "selectw":
-		return tmuxSelectWindow(rc, args)
-	case "select-pane", "selectp":
-		return tmuxSelectPane(rc, args)
-	case "kill-window", "killw":
-		return tmuxKillWindow(rc, args)
-	case "kill-pane", "killp":
-		return tmuxKillPane(rc, args)
-	case "respawn-pane", "respawnp":
-		return tmuxRespawnPane(rc, args)
-	case "send-keys", "send":
-		return tmuxSendKeys(rc, args)
-	case "capture-pane", "capturep":
-		return tmuxCapturePane(rc, args)
-	case "display-message", "display", "displayp":
-		return tmuxDisplayMessage(rc, args)
-	case "list-windows", "lsw":
-		return tmuxListWindows(rc, args)
-	case "list-panes", "lsp":
-		return tmuxListPanes(rc, args)
-	case "rename-window", "renamew":
-		return tmuxRenameWindow(rc, args)
-	case "resize-pane", "resizep":
-		return tmuxResizePane(rc, args)
-	case "wait-for":
-		return tmuxWaitFor(rc, args)
-	case "last-pane":
-		return tmuxLastPane(rc, args)
-	case "has-session", "has":
-		return tmuxHasSession(rc, args)
-	case "select-layout":
-		return tmuxSelectLayout(rc, args)
-	case "show-buffer", "showb":
-		return tmuxShowBuffer(args)
-	case "save-buffer", "saveb":
-		return tmuxSaveBuffer(args)
-
-	// No-ops
-	case "set-option", "set", "set-window-option", "setw", "source-file",
-		"refresh-client", "attach-session", "detach-client",
-		"last-window", "next-window", "previous-window",
-		"set-hook", "set-buffer", "list-buffers":
-		return nil
-
-	default:
-		return fmt.Errorf("unsupported tmux command: %s", command)
-	}
-}
-
-// --- Command implementations ---
-
-func tmuxNewSession(rc *rpcContext, args []string) error {
-	p := parseTmuxArgs(args, []string{"-c", "-F", "-n", "-s"}, []string{"-A", "-d", "-P"})
-	if p.hasFlag("-A") {
-		return fmt.Errorf("new-session -A is not supported")
-	}
-	params := map[string]any{"focus": false}
-	if cwd := p.value("-c"); cwd != "" {
-		params["cwd"] = cwd
-	}
-	created, err := rc.call("workspace.create", params)
-	if err != nil {
-		return err
-	}
-	wsId, _ := created["workspace_id"].(string)
-	if wsId == "" {
-		return fmt.Errorf("workspace.create did not return workspace_id")
-	}
-	if title := firstNonEmpty(p.value("-n"), p.value("-s")); strings.TrimSpace(title) != "" {
-		rc.call("workspace.rename", map[string]any{"workspace_id": wsId, "title": title})
-	}
-	if text := tmuxShellCommandText(p.positional, p.value("-c")); text != "" {
-		surfaceId, err := tmuxGetFirstSurface(rc, wsId)
-		if err == nil {
-			rc.call("surface.send_text", map[string]any{"workspace_id": wsId, "surface_id": surfaceId, "text": text})
-		}
-	}
-	if p.hasFlag("-P") {
-		ctx, err := tmuxFormatContext(rc, wsId, "", "")
-		if err != nil {
-			fmt.Printf("@%s\n", wsId)
-			return nil
-		}
-		fmt.Println(tmuxRenderFormat(p.value("-F"), ctx, "@"+wsId))
-	}
-	return nil
-}
-
-func tmuxNewWindow(rc *rpcContext, args []string) error {
-	p := parseTmuxArgs(args, []string{"-c", "-F", "-n", "-t"}, []string{"-d", "-P"})
-	params := map[string]any{"focus": false}
-	if cwd := p.value("-c"); cwd != "" {
-		params["cwd"] = cwd
-	}
-	created, err := rc.call("workspace.create", params)
-	if err != nil {
-		return err
-	}
-	wsId, _ := created["workspace_id"].(string)
-	if wsId == "" {
-		return fmt.Errorf("workspace.create did not return workspace_id")
-	}
-	if title := p.value("-n"); strings.TrimSpace(title) != "" {
-		rc.call("workspace.rename", map[string]any{"workspace_id": wsId, "title": title})
-	}
-	if text := tmuxShellCommandText(p.positional, p.value("-c")); text != "" {
-		surfaceId, err := tmuxGetFirstSurface(rc, wsId)
-		if err == nil {
-			rc.call("surface.send_text", map[string]any{"workspace_id": wsId, "surface_id": surfaceId, "text": text})
-		}
-	}
-	if p.hasFlag("-P") {
-		ctx, err := tmuxFormatContext(rc, wsId, "", "")
-		if err != nil {
-			fmt.Printf("@%s\n", wsId)
-			return nil
-		}
-		fmt.Println(tmuxRenderFormat(p.value("-F"), ctx, "@"+wsId))
-	}
-	return nil
-}
-
-func tmuxSplitWindow(rc *rpcContext, args []string) error {
-	p := parseTmuxArgs(args, []string{"-c", "-F", "-l", "-t"}, []string{"-P", "-b", "-d", "-h", "-v"})
-
-	targetWs, _, targetSurface, err := tmuxResolveSurfaceTarget(rc, p.value("-t"))
-	if err != nil {
-		return err
-	}
-
-	direction := "down"
-	if p.hasFlag("-h") {
-		direction = "right"
-		if p.hasFlag("-b") {
-			direction = "left"
-		}
-	} else if p.hasFlag("-b") {
-		direction = "up"
-	}
-
-	// Anchor splits to the leader surface for agent teams.
-	callerWorkspace := tmuxCallerWorkspaceHandle()
-	anchoredCallerSurface := ""
-	if callerWorkspace != "" {
-		if wsId, err := tmuxResolveWorkspaceId(rc, callerWorkspace); err == nil {
-			anchored, err := tmuxAnchoredSplitTarget(rc, wsId)
-			if err != nil {
-				return err
-			}
-			if anchored != nil {
-				targetWs = wsId
-				targetSurface = anchored.targetSurfaceId
-				direction = anchored.direction
-				anchoredCallerSurface = anchored.callerSurfaceId
-			}
-		}
-	}
-
-	// Validate the store before creating a pane. A malformed or unreadable
-	// store must not turn a successful surface.split into a reported failure
-	// after the pane has already been created.
-	if err := withLockedTmuxCompatStoreIfChanged(func(*tmuxCompatStore) (bool, error) {
-		return false, nil
-	}); err != nil {
-		return fmt.Errorf("validate tmux compatibility store: %w", err)
-	}
-
-	focusNewPane := !p.hasFlag("-d")
-	created, err := rc.call("surface.split", map[string]any{
-		"workspace_id": targetWs,
-		"surface_id":   targetSurface,
-		"direction":    direction,
-		"focus":        focusNewPane,
-	})
-	if err != nil {
-		return err
-	}
-	surfaceId, _ := created["surface_id"].(string)
-	if surfaceId == "" {
-		return fmt.Errorf("surface.split did not return surface_id")
-	}
-	newPaneId, _ := created["pane_id"].(string)
-
-	// Track for main-vertical layout
-	if err := withLockedTmuxCompatStore(func(store *tmuxCompatStore) error {
-		store.LastSplitSurface[targetWs] = surfaceId
-		if _, ok := store.MainVerticalLayouts[targetWs]; ok {
-			mvs := store.MainVerticalLayouts[targetWs]
-			mvs.LastColumnSurfaceId = surfaceId
-			store.MainVerticalLayouts[targetWs] = mvs
-		} else if direction == "right" && anchoredCallerSurface != "" {
-			store.MainVerticalLayouts[targetWs] = mainVerticalState{
-				MainSurfaceId:       anchoredCallerSurface,
-				LastColumnSurfaceId: surfaceId,
-			}
-		}
-		return nil
-	}); err != nil {
-		if _, rollbackErr := rc.call("surface.close", map[string]any{
-			"workspace_id": targetWs,
-			"surface_id":   surfaceId,
-		}); rollbackErr != nil {
-			return fmt.Errorf("persist tmux compatibility layout: %w (rollback failed: %v)", err, rollbackErr)
-		}
-		return fmt.Errorf("persist tmux compatibility layout: %w", err)
-	}
-
-	// Equalize vertical splits
-	rc.call("workspace.equalize_splits", map[string]any{
-		"workspace_id": targetWs,
-		"orientation":  "vertical",
-	})
-
-	if text := tmuxShellCommandText(p.positional, p.value("-c")); text != "" {
-		rc.call("surface.send_text", map[string]any{
-			"workspace_id": targetWs,
-			"surface_id":   surfaceId,
-			"text":         text,
-		})
-	}
-
-	if p.hasFlag("-P") {
-		ctx, err := tmuxFormatContext(rc, targetWs, newPaneId, surfaceId)
-		if err != nil {
-			fmt.Println(surfaceId)
-			return nil
-		}
-		fallback := surfaceId
-		if pid, ok := ctx["pane_id"]; ok {
-			fallback = pid
-		}
-		fmt.Println(tmuxRenderFormat(p.value("-F"), ctx, fallback))
-	}
-	return nil
-}
-
-func tmuxSelectWindow(rc *rpcContext, args []string) error {
-	p := parseTmuxArgs(args, []string{"-t"}, nil)
-	wsId, err := tmuxResolveWorkspaceTarget(rc, p.value("-t"))
-	if err != nil {
-		return err
-	}
-	_, err = rc.call("workspace.select", map[string]any{"workspace_id": wsId})
-	return err
-}
-
-func tmuxSelectPane(rc *rpcContext, args []string) error {
-	p := parseTmuxArgs(args, []string{"-P", "-T", "-t"}, nil)
-	// -P (style) and -T (title) are no-ops
-	if p.value("-P") != "" || p.value("-T") != "" {
-		return nil
-	}
-	wsId, paneId, err := tmuxResolvePaneTarget(rc, p.value("-t"))
-	if err != nil {
-		return err
-	}
-	_, err = rc.call("pane.focus", map[string]any{"workspace_id": wsId, "pane_id": paneId})
-	return err
-}
-
-func tmuxKillWindow(rc *rpcContext, args []string) error {
-	p := parseTmuxArgs(args, []string{"-t"}, nil)
-	wsId, err := tmuxResolveWorkspaceTarget(rc, p.value("-t"))
-	if err != nil {
-		return err
-	}
-	_, err = rc.call("workspace.close", map[string]any{"workspace_id": wsId})
-	if err != nil {
-		return err
-	}
-	_ = tmuxPruneCompatWorkspaceState(wsId)
-	return nil
-}
-
-func tmuxKillPane(rc *rpcContext, args []string) error {
-	p := parseTmuxArgs(args, []string{"-t"}, nil)
-	wsId, _, surfId, err := tmuxResolveSurfaceTarget(rc, p.value("-t"))
-	if err != nil {
-		return err
-	}
-	_, err = rc.call("surface.close", map[string]any{"workspace_id": wsId, "surface_id": surfId})
-	if err != nil {
-		return err
-	}
-	_ = tmuxPruneCompatSurfaceState(wsId, surfId)
-	// Re-equalize after removal
-	rc.call("workspace.equalize_splits", map[string]any{"workspace_id": wsId, "orientation": "vertical"})
-	return nil
-}
-
-// tmuxRespawnPane mirrors the Swift __tmux-compat respawn-pane handler
-// (CLI/cmux.swift), which Claude Code agent teams use to start teammate
-// panes. Both paths dispatch to the same surface.respawn socket method.
-func tmuxRespawnPane(rc *rpcContext, args []string) error {
-	p := parseTmuxArgs(args, []string{"-c", "-t"}, []string{"-k"})
-	if !p.hasFlag("-k") {
-		return fmt.Errorf("respawn-pane requires -k in cmux tmux compatibility mode")
-	}
-	wsId, _, surfId, err := tmuxResolveSurfaceTarget(rc, p.value("-t"))
-	if err != nil {
-		return err
-	}
-	commandText := strings.TrimSpace(strings.Join(p.positional, " "))
-	if commandText == "" {
-		commandText, err = tmuxStoredStartCommand(rc, wsId, surfId)
-		if err != nil {
-			return err
-		}
-	}
-	if commandText == "" {
-		commandText = "exec ${SHELL:-/bin/sh} -l"
-	}
-	params := map[string]any{
-		"workspace_id": wsId,
-		"surface_id":   surfId,
-		"command":      tmuxRespawnStartCommand(commandText, tmuxClaudeTeamsRespawnEnvironment()),
-		// Kept raw (unwrapped) for display and session persistence, matching
-		// the Swift path.
-		"tmux_start_command": commandText,
-	}
-	if cwd := strings.TrimSpace(p.value("-c")); cwd != "" {
-		if resolved := tmuxNormalizePath(cwd); resolved != "" {
-			params["working_directory"] = resolved
-		}
-	}
-	_, err = rc.call("surface.respawn", params)
-	return err
-}
-
-// tmuxStoredStartCommand returns the surface's recorded start command, used
-// when respawn-pane is called without an explicit command (tmux semantics:
-// reuse the command the pane was started with). A lookup failure is
-// propagated rather than treated as "no stored command", so a transient
-// RPC error cannot silently replace the pane's intended command with the
-// login-shell fallback (matching the Swift path, where the lookup throws).
-func tmuxStoredStartCommand(rc *rpcContext, workspaceId, surfaceId string) (string, error) {
-	payload, err := rc.call("surface.list", map[string]any{"workspace_id": workspaceId})
-	if err != nil {
-		return "", err
-	}
-	surfaces, _ := payload["surfaces"].([]any)
-	for _, s := range surfaces {
-		surface, _ := s.(map[string]any)
-		if surface == nil || stringFromAnyGo(surface["id"]) != surfaceId {
-			continue
-		}
-		for _, key := range []string{"tmux_start_command", "pane_start_command", "initial_command"} {
-			if v := stringFromAnyGo(surface[key]); v != "" {
-				return v, nil
-			}
-		}
-		return "", nil
-	}
-	return "", nil
-}
-
-// tmuxShellInvokedStartCommand wraps a tmux shell-command in `/bin/sh -c`
-// so the surface can exec it. Ghostty execs the pane start command as a
-// single executable, but tmux shell-commands are arbitrary shell
-// expressions (Claude Code teammates respawn with `cd <dir> && env …`),
-// so a bare exec of `cd` fails and the pane dies before the real command
-// runs. Mirrors the Swift tmuxShellInvokedStartCommand.
-func tmuxShellInvokedStartCommand(command string) string {
-	trimmed := strings.TrimSpace(command)
-	if trimmed == "" {
-		return command
-	}
-	return "/bin/sh -c " + tmuxShellQuote(trimmed)
-}
-
-type tmuxEnvPair struct {
-	key   string
-	value string
-}
-
-// tmuxRespawnStartCommand is tmuxShellInvokedStartCommand with prependEnv
-// exported inside the wrapping shell, so the respawned process inherits
-// those variables. With an empty prependEnv it is byte-for-byte identical
-// to tmuxShellInvokedStartCommand. Mirrors the Swift tmuxRespawnStartCommand.
-func tmuxRespawnStartCommand(command string, prependEnv []tmuxEnvPair) string {
-	trimmed := strings.TrimSpace(command)
-	if trimmed == "" {
-		return command
-	}
-	if len(prependEnv) == 0 {
-		return tmuxShellInvokedStartCommand(trimmed)
-	}
-	exports := make([]string, len(prependEnv))
-	for i, kv := range prependEnv {
-		exports[i] = "export " + kv.key + "=" + tmuxShellQuote(kv.value)
-	}
-	return tmuxShellInvokedStartCommand(strings.Join(exports, "; ") + "; " + trimmed)
-}
-
-// tmuxClaudeTeamsRespawnEnvironment re-supplies the environment a
-// claude-teams teammate pane must start with. CLAUDE_CODE_SANDBOXED
-// short-circuits Claude Code's interactive trust prompt, which a teammate
-// pane can never answer. It is only set when the claude-teams launcher
-// recorded the user's explicit opt-in (CMUX_CLAUDE_TEAMS_SANDBOXED=1),
-// propagated to this process by the tmux shim. Mirrors the Swift
-// tmuxClaudeTeamsRespawnEnvironment; see that for the full rationale.
-func tmuxClaudeTeamsRespawnEnvironment() []tmuxEnvPair {
-	if strings.TrimSpace(os.Getenv("CMUX_CLAUDE_TEAMS_SANDBOXED")) != "1" {
-		return nil
-	}
-	return []tmuxEnvPair{{key: "CLAUDE_CODE_SANDBOXED", value: "1"}}
-}
-
-func tmuxSendKeys(rc *rpcContext, args []string) error {
-	p := parseTmuxArgs(args, []string{"-t"}, []string{"-l"})
-	wsId, _, surfId, err := tmuxResolveSurfaceTarget(rc, p.value("-t"))
-	if err != nil {
-		return err
-	}
-	text := tmuxSendKeysText(p.positional, p.hasFlag("-l"))
-	if text != "" {
-		_, err = rc.call("surface.send_text", map[string]any{
-			"workspace_id": wsId,
-			"surface_id":   surfId,
-			"text":         text,
-		})
-	}
-	return err
-}
-
-func tmuxCapturePane(rc *rpcContext, args []string) error {
-	p := parseTmuxArgs(args, []string{"-E", "-S", "-t"}, []string{"-J", "-N", "-p"})
-	wsId, _, surfId, err := tmuxResolveSurfaceTarget(rc, p.value("-t"))
-	if err != nil {
-		return err
-	}
-	params := map[string]any{
-		"workspace_id": wsId,
-		"surface_id":   surfId,
-		"scrollback":   true,
-	}
-	if start := p.value("-S"); start != "" {
-		if lines := parseInt(start); lines < 0 {
-			params["lines"] = int(math.Abs(float64(lines)))
-		}
-	}
-	payload, err := rc.call("surface.read_text", params)
-	if err != nil {
-		return err
-	}
-	text, _ := payload["text"].(string)
-	if p.hasFlag("-p") {
-		fmt.Print(text)
-	} else {
-		if err := withLockedTmuxCompatStore(func(store *tmuxCompatStore) error {
-			store.Buffers["default"] = text
-			return nil
-		}); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func tmuxDisplayMessage(rc *rpcContext, args []string) error {
-	p := parseTmuxArgs(args, []string{"-F", "-t"}, []string{"-p"})
-	wsId, paneId, surfId, err := tmuxResolveSurfaceTarget(rc, p.value("-t"))
-	if err != nil {
-		return err
-	}
-	ctx, err := tmuxFormatContext(rc, wsId, paneId, surfId)
-	if err != nil {
-		ctx = map[string]string{}
-	}
-
-	// Enrich with geometry
-	panePayload, err := rc.call("pane.list", map[string]any{"workspace_id": wsId})
-	if err == nil {
-		panes, _ := panePayload["panes"].([]any)
-		containerFrame, _ := panePayload["container_frame"].(map[string]any)
-		var matchingPane map[string]any
-		if paneId != "" {
-			for _, p := range panes {
-				pn, _ := p.(map[string]any)
-				if pid, _ := pn["id"].(string); pid == paneId {
-					matchingPane = pn
-					break
-				}
-			}
-		}
-		if matchingPane == nil {
-			for _, p := range panes {
-				pn, _ := p.(map[string]any)
-				if focused, _ := boolFromAnyGo(pn["focused"]); focused {
-					matchingPane = pn
-					break
-				}
-			}
-		}
-		if matchingPane == nil && len(panes) > 0 {
-			matchingPane, _ = panes[0].(map[string]any)
-		}
-		if matchingPane != nil {
-			tmuxEnrichContextWithGeometry(ctx, matchingPane, containerFrame)
-		}
-	}
-
-	format := p.value("-F")
-	if len(p.positional) > 0 {
-		format = strings.Join(p.positional, " ")
-	}
-	rendered := tmuxRenderFormat(format, ctx, "")
-	if p.hasFlag("-p") || rendered != "" {
-		fmt.Println(rendered)
-	}
-	return nil
-}
-
-func tmuxListWindows(rc *rpcContext, args []string) error {
-	p := parseTmuxArgs(args, []string{"-F", "-t"}, nil)
-	items, err := tmuxWorkspaceItems(rc)
-	if err != nil {
-		return err
-	}
-	for _, item := range items {
-		wsId, _ := item["id"].(string)
-		if wsId == "" {
-			continue
-		}
-		ctx, err := tmuxFormatContext(rc, wsId, "", "")
-		if err != nil {
-			continue
-		}
-		fallback := ""
-		if idx, ok := ctx["window_index"]; ok {
-			fallback = idx
-		} else {
-			fallback = "?"
-		}
-		if name, ok := ctx["window_name"]; ok {
-			fallback += " " + name
-		} else {
-			fallback += " " + wsId
-		}
-		fmt.Println(tmuxRenderFormat(p.value("-F"), ctx, fallback))
-	}
-	return nil
-}
-
-func tmuxListPanes(rc *rpcContext, args []string) error {
-	p := parseTmuxArgs(args, []string{"-F", "-t"}, nil)
-
-	target := p.value("-t")
-	var wsId string
-	var err error
-
-	if target != "" && tmuxPaneSelector(target) != "" {
-		wsId, _, err = tmuxResolvePaneTarget(rc, target)
-	} else {
-		wsId, err = tmuxResolveWorkspaceTarget(rc, target)
-	}
-	if err != nil {
-		return err
-	}
-
-	payload, err := rc.call("pane.list", map[string]any{"workspace_id": wsId})
-	if err != nil {
-		return err
-	}
-	panes, _ := payload["panes"].([]any)
-	containerFrame, _ := payload["container_frame"].(map[string]any)
-
-	for _, p2 := range panes {
-		pane, _ := p2.(map[string]any)
-		if pane == nil {
-			continue
-		}
-		paneId, _ := pane["id"].(string)
-		if paneId == "" {
-			continue
-		}
-		ctx, err := tmuxFormatContext(rc, wsId, paneId, "")
-		if err != nil {
-			continue
-		}
-		tmuxEnrichContextWithGeometry(ctx, pane, containerFrame)
-		fallback := "%" + paneId
-		if pid, ok := ctx["pane_id"]; ok {
-			fallback = pid
-		}
-		fmt.Println(tmuxRenderFormat(p.value("-F"), ctx, fallback))
-	}
-	return nil
-}
-
-func tmuxRenameWindow(rc *rpcContext, args []string) error {
-	p := parseTmuxArgs(args, []string{"-t"}, nil)
-	title := strings.TrimSpace(strings.Join(p.positional, " "))
-	if title == "" {
-		return fmt.Errorf("rename-window requires a title")
-	}
-	wsId, err := tmuxResolveWorkspaceTarget(rc, p.value("-t"))
-	if err != nil {
-		return err
-	}
-	_, err = rc.call("workspace.rename", map[string]any{"workspace_id": wsId, "title": title})
-	return err
-}
-
-func tmuxResizePane(rc *rpcContext, args []string) error {
-	p := parseTmuxArgs(args, []string{"-t", "-x", "-y"}, []string{"-D", "-L", "-R", "-U"})
-	wsId, paneId, err := tmuxResolvePaneTarget(rc, p.value("-t"))
-	if err != nil {
-		return err
-	}
-
-	hasDirectional := p.hasFlag("-L") || p.hasFlag("-R") || p.hasFlag("-U") || p.hasFlag("-D")
-
-	if !hasDirectional {
-		targetSize := strings.TrimSpace(p.value("-x"))
-		// Deliberately preserve the daemon's historical height-only no-op: recurring
-		// OMX HUD probes share this shape, and this shim has no deterministic HUD
-		// identity signal. Applying -y here would overwrite the user's layout.
-		if targetSize == "" {
-			return nil
-		}
-		isPercentage := strings.HasSuffix(targetSize, "%")
-		target := parseInt(strings.TrimSuffix(targetSize, "%"))
-		if target <= 0 {
-			return fmt.Errorf("resize-pane size must be greater than zero")
-		}
-		panePayload, err := rc.call("pane.list", map[string]any{"workspace_id": wsId})
-		if err != nil {
-			return err
-		}
-		targetPoints := float64(0)
-		if isPercentage {
-			if frame, ok := panePayload["container_frame"].(map[string]any); ok {
-				targetPoints = floatFromAny(frame["width"]) * float64(target) / 100
-			}
-		}
-		panes, _ := panePayload["panes"].([]any)
-		for _, pp := range panes {
-			pane, _ := pp.(map[string]any)
-			if pane == nil {
-				continue
-			}
-			if pid, _ := pane["id"].(string); pid == paneId {
-				cellPoints := floatFromAny(pane["cell_width_points"])
-				if !isPercentage && targetPoints <= 0 && cellPoints > 0 {
-					columns := floatFromAny(pane["columns"])
-					frame, _ := pane["pixel_frame"].(map[string]any)
-					paneWidth := floatFromAny(frame["width"])
-					if columns > 0 && paneWidth > 0 {
-						residual := math.Max(0, paneWidth-columns*cellPoints)
-						targetPoints = float64(target)*cellPoints + residual
-					}
-				}
-				break
-			}
-		}
-		params := map[string]any{
-			"workspace_id":  wsId,
-			"pane_id":       paneId,
-			"absolute_axis": "horizontal",
-			"tmux_compat":   true,
-		}
-		if targetPoints > 0 {
-			params["target_pixels"] = targetPoints
-		}
-		if isPercentage {
-			params["target_percentage"] = target
-		} else {
-			params["target_cells"] = target
-		}
-		_, err = rc.call("pane.resize", params)
-		return err
-	}
-
-	if hasDirectional {
-		dir := "right"
-		directionFlag := "-R"
-		if p.hasFlag("-L") {
-			dir = "left"
-			directionFlag = "-L"
-		} else if p.hasFlag("-U") {
-			dir = "up"
-			directionFlag = "-U"
-		} else if p.hasFlag("-D") {
-			dir = "down"
-			directionFlag = "-D"
-		}
-		rawAmount := "1"
-		if len(p.positional) > 0 {
-			rawAmount = p.positional[0]
-			if strings.HasPrefix(rawAmount, directionFlag) && len(rawAmount) > len(directionFlag) {
-				rawAmount = strings.TrimPrefix(rawAmount, directionFlag)
-			}
-		} else {
-			rawAmount = firstNonEmpty(p.value("-x"), p.value("-y"), "1")
-		}
-		rawAmount = strings.ReplaceAll(rawAmount, "%", "")
-		amount := parseInt(rawAmount)
-		if amount <= 0 {
-			amount = 1
-		}
-		amountPoints := 0
-		panePayload, err := rc.call("pane.list", map[string]any{"workspace_id": wsId})
-		if err != nil {
-			return err
-		}
-		panes, _ := panePayload["panes"].([]any)
-		for _, pp := range panes {
-			pane, _ := pp.(map[string]any)
-			if pane == nil {
-				continue
-			}
-			if pid, _ := pane["id"].(string); pid == paneId {
-				pointsKey := "cell_width_points"
-				if dir == "up" || dir == "down" {
-					pointsKey = "cell_height_points"
-				}
-				cellPoints := floatFromAny(pane[pointsKey])
-				if cellPoints > 0 {
-					amountPoints = max(1, int(math.Round(float64(amount)*cellPoints)))
-				}
-				break
-			}
-		}
-		params := map[string]any{
-			"workspace_id": wsId,
-			"pane_id":      paneId,
-			"direction":    dir,
-			"amount_cells": amount,
-			"tmux_compat":  true,
-		}
-		if amountPoints > 0 {
-			params["amount"] = amountPoints
-		}
-		_, err = rc.call("pane.resize", params)
-		return err
-	}
-	return nil
-}
-
-func tmuxWaitFor(_ *rpcContext, args []string) error {
-	p := parseTmuxArgs(args, []string{"--timeout"}, []string{"-S"})
-	name := ""
-	for _, pos := range p.positional {
-		if !strings.HasPrefix(pos, "-") {
-			name = pos
-			break
-		}
-	}
-	if name == "" {
-		return fmt.Errorf("wait-for requires a name")
-	}
-
-	signalPath := tmuxWaitForSignalPath(name)
-
-	if p.hasFlag("-S") {
-		// Signal mode: create the file
-		os.WriteFile(signalPath, []byte{}, 0644)
-		fmt.Println("OK")
-		return nil
-	}
-
-	// Wait mode: poll for the file
-	timeoutStr := p.value("--timeout")
-	timeout := 30.0
-	if timeoutStr != "" {
-		if t := parseFloat(timeoutStr); t > 0 {
-			timeout = t
-		}
-	}
-
-	deadline := time.Now().Add(time.Duration(timeout * float64(time.Second)))
-	for time.Now().Before(deadline) {
-		if _, err := os.Stat(signalPath); err == nil {
-			os.Remove(signalPath)
-			return nil
-		}
-		time.Sleep(50 * time.Millisecond)
-	}
-	return fmt.Errorf("wait-for timeout: %s", name)
-}
-
-func tmuxLastPane(rc *rpcContext, args []string) error {
-	p := parseTmuxArgs(args, []string{"-t"}, nil)
-	wsId, err := tmuxResolveWorkspaceTarget(rc, p.value("-t"))
-	if err != nil {
-		return err
-	}
-	_, err = rc.call("pane.last", map[string]any{"workspace_id": wsId})
-	return err
-}
-
-func tmuxHasSession(rc *rpcContext, args []string) error {
-	p := parseTmuxArgs(args, []string{"-t"}, nil)
-	_, err := tmuxResolveWorkspaceTarget(rc, p.value("-t"))
-	return err
-}
-
-func tmuxSelectLayout(rc *rpcContext, args []string) error {
-	p := parseTmuxArgs(args, []string{"-t"}, nil)
-	layoutName := ""
-	if len(p.positional) > 0 {
-		layoutName = p.positional[0]
-	}
-
-	// Resolve workspace from target (may be a pane reference)
-	var wsId string
-	var err error
-	if target := p.value("-t"); target != "" {
-		if tmuxPaneSelector(target) != "" {
-			wsId, _, err = tmuxResolvePaneTarget(rc, target)
-		} else {
-			wsId, err = tmuxResolveWorkspaceTarget(rc, target)
-		}
-	} else {
-		wsId, err = tmuxResolveWorkspaceTarget(rc, "")
-	}
-	if err != nil {
-		return err
-	}
-
-	if layoutName == "main-vertical" || layoutName == "main-horizontal" {
-		orientation := "vertical"
-		if layoutName == "main-horizontal" {
-			orientation = "horizontal"
-		}
-		rc.call("workspace.equalize_splits", map[string]any{
-			"workspace_id": wsId,
-			"orientation":  orientation,
-		})
-	} else {
-		rc.call("workspace.equalize_splits", map[string]any{"workspace_id": wsId})
-	}
-
-	if layoutName == "main-vertical" {
-		if callerSurface := tmuxCallerSurfaceHandle(); callerSurface != "" {
-			if err := withLockedTmuxCompatStore(func(store *tmuxCompatStore) error {
-				existingColumn := ""
-				if existing, ok := store.MainVerticalLayouts[wsId]; ok {
-					existingColumn = existing.LastColumnSurfaceId
-				}
-				seedColumn := existingColumn
-				if seedColumn == "" {
-					seedColumn = store.LastSplitSurface[wsId]
-				}
-				store.MainVerticalLayouts[wsId] = mainVerticalState{
-					MainSurfaceId:       callerSurface,
-					LastColumnSurfaceId: seedColumn,
-				}
-				return nil
-			}); err != nil {
-				return err
-			}
-		}
-	} else if layoutName != "" {
-		_ = tmuxPruneCompatWorkspaceState(wsId)
-	}
-
-	return nil
-}
-
-func tmuxShowBuffer(args []string) error {
-	p := parseTmuxArgs(args, []string{"-b"}, nil)
-	name := p.value("-b")
-	if name == "" {
-		name = "default"
-	}
-	store, err := loadTmuxCompatStore()
-	if err != nil {
-		return err
-	}
-	if buf, ok := store.Buffers[name]; ok {
-		fmt.Print(buf)
-	}
-	return nil
-}
-
-func tmuxSaveBuffer(args []string) error {
-	p := parseTmuxArgs(args, []string{"-b"}, nil)
-	name := p.value("-b")
-	if name == "" {
-		name = "default"
-	}
-	store, err := loadTmuxCompatStore()
-	if err != nil {
-		return err
-	}
-	buf, ok := store.Buffers[name]
-	if !ok {
-		return fmt.Errorf("buffer not found: %s", name)
-	}
-	if len(p.positional) > 0 {
-		outputPath := strings.TrimSpace(p.positional[len(p.positional)-1])
-		if outputPath != "" {
-			return os.WriteFile(outputPath, []byte(buf), 0644)
-		}
-	}
-	fmt.Print(buf)
-	return nil
-}
-
-// --- Helpers ---
-
-func tmuxGetFirstSurface(rc *rpcContext, workspaceId string) (string, error) {
-	payload, err := rc.call("surface.list", map[string]any{"workspace_id": workspaceId})
-	if err != nil {
-		return "", err
-	}
-	surfaces, _ := payload["surfaces"].([]any)
-	if len(surfaces) == 0 {
-		return "", fmt.Errorf("workspace has no surfaces")
-	}
-	// Prefer focused surface
-	for _, s := range surfaces {
-		surf, _ := s.(map[string]any)
-		if focused, _ := boolFromAnyGo(surf["focused"]); focused {
-			if id, _ := surf["id"].(string); id != "" {
-				return id, nil
-			}
-		}
-	}
-	if surf, ok := surfaces[0].(map[string]any); ok {
-		if id, _ := surf["id"].(string); id != "" {
-			return id, nil
-		}
-	}
-	return "", fmt.Errorf("workspace has no surfaces")
-}
-
-func firstNonEmpty(values ...string) string {
-	for _, v := range values {
-		if v != "" {
-			return v
-		}
-	}
-	return ""
-}
-
-func parseInt(s string) int {
-	s = strings.TrimSpace(s)
-	var n int
-	fmt.Sscanf(s, "%d", &n)
-	return n
-}
-
-func parseFloat(s string) float64 {
-	s = strings.TrimSpace(s)
-	var f float64
-	fmt.Sscanf(s, "%f", &f)
-	return f
-}
diff --git a/daemon/remote/cmd/cmuxd-remote/tmux_compat_test.go b/daemon/remote/cmd/cmuxd-remote/tmux_compat_test.go
deleted file mode 100644
index f61277efe876..000000000000
--- a/daemon/remote/cmd/cmuxd-remote/tmux_compat_test.go
+++ /dev/null
@@ -1,894 +0,0 @@
-package main
-
-import (
-	"bufio"
-	"bytes"
-	"context"
-	"encoding/json"
-	"fmt"
-	"net"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"regexp"
-	"strconv"
-	"strings"
-	"sync"
-	"testing"
-	"time"
-)
-
-func TestSplitTmuxCmd(t *testing.T) {
-	tests := []struct {
-		name    string
-		args    []string
-		wantCmd string
-		wantN   int // expected number of remaining args
-	}{
-		{"simple", []string{"list-panes", "-t", "%abc"}, "list-panes", 2},
-		{"version flag", []string{"-V"}, "-V", 0},
-		{"with global flags", []string{"-L", "foo", "split-window", "-h"}, "split-window", 1},
-		{"case insensitive", []string{"Display-Message", "-p"}, "display-message", 1},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			cmd, args, err := splitTmuxCmd(tt.args)
-			if err != nil {
-				t.Fatalf("unexpected error: %v", err)
-			}
-			if cmd != tt.wantCmd {
-				t.Errorf("command = %q, want %q", cmd, tt.wantCmd)
-			}
-			if len(args) != tt.wantN {
-				t.Errorf("args count = %d, want %d", len(args), tt.wantN)
-			}
-		})
-	}
-}
-
-func TestParseTmuxArgs(t *testing.T) {
-	p := parseTmuxArgs(
-		[]string{"-dP", "-t", "%abc", "-F", "#{pane_id}", "shell", "cmd"},
-		[]string{"-t", "-F"},
-		[]string{"-d", "-P"},
-	)
-	if !p.hasFlag("-d") {
-		t.Error("expected -d flag")
-	}
-	if !p.hasFlag("-P") {
-		t.Error("expected -P flag")
-	}
-	if p.value("-t") != "%abc" {
-		t.Errorf("target = %q, want %%abc", p.value("-t"))
-	}
-	if p.value("-F") != "#{pane_id}" {
-		t.Errorf("format = %q, want #{pane_id}", p.value("-F"))
-	}
-	if len(p.positional) != 2 || p.positional[0] != "shell" {
-		t.Errorf("positional = %v, want [shell cmd]", p.positional)
-	}
-}
-
-func TestParseTmuxArgsClusteredValueFlag(t *testing.T) {
-	// -t%abc should parse -t with value "%abc"
-	p := parseTmuxArgs([]string{"-t%abc"}, []string{"-t"}, nil)
-	if p.value("-t") != "%abc" {
-		t.Errorf("target = %q, want %%abc", p.value("-t"))
-	}
-}
-
-func TestTmuxRenderFormat(t *testing.T) {
-	ctx := map[string]string{
-		"pane_id":    "%abc123",
-		"pane_width": "80",
-		"window_id":  "@ws1",
-	}
-
-	tests := []struct {
-		format   string
-		fallback string
-		want     string
-	}{
-		{"#{pane_id}", "fallback", "%abc123"},
-		{"#{pane_id}:#{pane_width}", "", "%abc123:80"},
-		{"#{unknown_var}", "fallback", "fallback"},
-		{"", "fallback", "fallback"},
-		{"#{pane_id} #{pane_width} #{window_id}", "", "%abc123 80 @ws1"},
-	}
-	for _, tt := range tests {
-		got := tmuxRenderFormat(tt.format, ctx, tt.fallback)
-		if got != tt.want {
-			t.Errorf("tmuxRenderFormat(%q) = %q, want %q", tt.format, got, tt.want)
-		}
-	}
-}
-
-func TestTmuxSendKeysText(t *testing.T) {
-	tests := []struct {
-		name    string
-		tokens  []string
-		literal bool
-		want    string
-	}{
-		{"literal", []string{"hello", "world"}, true, "hello world"},
-		{"special enter", []string{"echo", "hello", "Enter"}, false, "echo hello\r"},
-		{"special ctrl-c", []string{"C-c"}, false, "\x03"},
-		{"mixed", []string{"ls", "-la", "Enter"}, false, "ls -la\r"},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got := tmuxSendKeysText(tt.tokens, tt.literal)
-			if got != tt.want {
-				t.Errorf("got %q, want %q", got, tt.want)
-			}
-		})
-	}
-}
-
-func TestTmuxShellCommandText(t *testing.T) {
-	tests := []struct {
-		positional []string
-		cwd        string
-		want       string
-	}{
-		{[]string{"echo hi"}, "", "echo hi\r"},
-		{nil, "/tmp", "cd -- '/tmp'\r"},
-		{[]string{"make"}, "/home/user", "cd -- '/home/user' && make\r"},
-		{nil, "", ""},
-	}
-	for _, tt := range tests {
-		got := tmuxShellCommandText(tt.positional, tt.cwd)
-		if got != tt.want {
-			t.Errorf("tmuxShellCommandText(%v, %q) = %q, want %q", tt.positional, tt.cwd, got, tt.want)
-		}
-	}
-}
-
-func TestTmuxWaitForSignalPath(t *testing.T) {
-	path := tmuxWaitForSignalPath("test-signal")
-	if !strings.HasPrefix(path, "/tmp/cmux-wait-for-") {
-		t.Errorf("unexpected path prefix: %s", path)
-	}
-	if !strings.HasSuffix(path, ".sig") {
-		t.Errorf("unexpected path suffix: %s", path)
-	}
-}
-
-func TestTmuxCompatStoreRoundTrip(t *testing.T) {
-	// Use a temp dir for the store
-	tmpDir := t.TempDir()
-	origHome := os.Getenv("HOME")
-	os.Setenv("HOME", tmpDir)
-	defer os.Setenv("HOME", origHome)
-
-	store, err := loadTmuxCompatStore()
-	if err != nil {
-		t.Fatalf("load: %v", err)
-	}
-	store.Buffers["test"] = "captured text"
-	store.MainVerticalLayouts["ws1"] = mainVerticalState{
-		MainSurfaceId:       "surface-main",
-		LastColumnSurfaceId: "surface-col",
-	}
-	if err := saveTmuxCompatStore(store); err != nil {
-		t.Fatalf("save: %v", err)
-	}
-
-	loaded, err := loadTmuxCompatStore()
-	if err != nil {
-		t.Fatalf("reload: %v", err)
-	}
-	if loaded.Buffers["test"] != "captured text" {
-		t.Errorf("buffer = %q, want %q", loaded.Buffers["test"], "captured text")
-	}
-	if mvs, ok := loaded.MainVerticalLayouts["ws1"]; !ok {
-		t.Error("missing main vertical layout for ws1")
-	} else if mvs.LastColumnSurfaceId != "surface-col" {
-		t.Errorf("lastColumnSurfaceId = %q, want %q", mvs.LastColumnSurfaceId, "surface-col")
-	}
-}
-
-func TestTmuxCompatStoreLoadErrorsDoNotOverwriteState(t *testing.T) {
-	home := t.TempDir()
-	t.Setenv("HOME", home)
-
-	if _, err := loadTmuxCompatStore(); err != nil {
-		t.Fatalf("missing store should load as empty: %v", err)
-	}
-	storePath := tmuxCompatStoreURL()
-	if err := os.MkdirAll(filepath.Dir(storePath), 0755); err != nil {
-		t.Fatalf("create store directory: %v", err)
-	}
-	malformed := []byte("{not-json")
-	if err := os.WriteFile(storePath, malformed, 0644); err != nil {
-		t.Fatalf("write malformed store: %v", err)
-	}
-	if _, err := loadTmuxCompatStore(); err == nil {
-		t.Fatal("malformed store should return an error")
-	}
-	called := false
-	if err := withLockedTmuxCompatStore(func(store *tmuxCompatStore) error {
-		called = true
-		store.Buffers["unexpected"] = "mutation"
-		return nil
-	}); err == nil {
-		t.Fatal("locked mutation should fail when loading malformed store")
-	}
-	if called {
-		t.Fatal("mutation callback ran after a store load failure")
-	}
-	persisted, err := os.ReadFile(storePath)
-	if err != nil {
-		t.Fatalf("read malformed store: %v", err)
-	}
-	if string(persisted) != string(malformed) {
-		t.Fatalf("malformed store was overwritten: %q", persisted)
-	}
-}
-
-func TestTmuxCompatStoreConcurrentMutations(t *testing.T) {
-	home := t.TempDir()
-	t.Setenv("HOME", home)
-
-	const writers = 20
-	errors := make(chan error, writers)
-	var group sync.WaitGroup
-	group.Add(writers)
-	for i := 0; i < writers; i++ {
-		go func() {
-			defer group.Done()
-			errors <- withLockedTmuxCompatStore(func(store *tmuxCompatStore) error {
-				store.Buffers["buf-"+fmt.Sprint(i)] = "payload-" + fmt.Sprint(i)
-				return nil
-			})
-		}()
-	}
-	group.Wait()
-	close(errors)
-	for err := range errors {
-		if err != nil {
-			t.Fatalf("concurrent mutation: %v", err)
-		}
-	}
-
-	store, loadErr := loadTmuxCompatStore()
-	if loadErr != nil {
-		t.Fatalf("load: %v", loadErr)
-	}
-	if len(store.Buffers) != writers {
-		t.Fatalf("buffer count = %d, want %d", len(store.Buffers), writers)
-	}
-	for i := 0; i < writers; i++ {
-		name := "buf-" + fmt.Sprint(i)
-		if store.Buffers[name] != "payload-"+fmt.Sprint(i) {
-			t.Errorf("buffer %s = %q, want payload-%d", name, store.Buffers[name], i)
-		}
-	}
-}
-
-func TestTmuxCompatStoreConcurrentProcessMutations(t *testing.T) {
-	if os.Getenv("CMUX_TMUX_STORE_CHILD") == "1" {
-		index, err := strconv.Atoi(os.Getenv("CMUX_TMUX_STORE_INDEX"))
-		if err != nil {
-			t.Fatalf("child index: %v", err)
-		}
-		if err := withLockedTmuxCompatStore(func(store *tmuxCompatStore) error {
-			name := "process-buf-" + strconv.Itoa(index)
-			store.Buffers[name] = "process-payload-" + strconv.Itoa(index)
-			return nil
-		}); err != nil {
-			t.Fatalf("child mutation: %v", err)
-		}
-		return
-	}
-
-	home := t.TempDir()
-	t.Setenv("HOME", home)
-	const writers = 20
-	if err := withLockedTmuxCompatStore(func(store *tmuxCompatStore) error {
-		store.Buffers["seed"] = strings.Repeat("seed", 32_768)
-		return nil
-	}); err != nil {
-		t.Fatalf("seed store: %v", err)
-	}
-
-	executable, err := os.Executable()
-	if err != nil {
-		t.Fatalf("test executable: %v", err)
-	}
-	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
-	defer cancel()
-	type childProcess struct {
-		command *exec.Cmd
-		stderr  *bytes.Buffer
-		reaped  bool
-	}
-	children := make([]*childProcess, 0, writers)
-	t.Cleanup(func() {
-		for _, child := range children {
-			if child.reaped {
-				continue
-			}
-			if child.command.Process != nil {
-				_ = child.command.Process.Kill()
-			}
-			if child.command.Process != nil {
-				_ = child.command.Wait()
-			}
-		}
-	})
-	for i := 0; i < writers; i++ {
-		command := exec.CommandContext(
-			ctx,
-			executable,
-			"-test.run", "^TestTmuxCompatStoreConcurrentProcessMutations$",
-		)
-		command.Env = childEnvironment(home, i)
-		stderr := &bytes.Buffer{}
-		command.Stderr = stderr
-		if err := command.Start(); err != nil {
-			t.Fatalf("start child %d: %v", i, err)
-		}
-		children = append(children, &childProcess{command: command, stderr: stderr})
-	}
-	for i, child := range children {
-		err := child.command.Wait()
-		child.reaped = true
-		if err != nil {
-			t.Fatalf("child %d: %v\n%s", i, err, child.stderr.String())
-		}
-	}
-
-	store, loadErr := loadTmuxCompatStore()
-	if loadErr != nil {
-		t.Fatalf("load: %v", loadErr)
-	}
-	if len(store.Buffers) != writers+1 {
-		t.Fatalf("buffer count = %d, want %d", len(store.Buffers), writers+1)
-	}
-	for i := 0; i < writers; i++ {
-		name := "process-buf-" + strconv.Itoa(i)
-		want := "process-payload-" + strconv.Itoa(i)
-		if store.Buffers[name] != want {
-			t.Errorf("buffer %s = %q, want %q", name, store.Buffers[name], want)
-		}
-	}
-}
-
-func childEnvironment(home string, index int) []string {
-	environment := make([]string, 0, len(os.Environ())+3)
-	for _, value := range os.Environ() {
-		if strings.HasPrefix(value, "HOME=") ||
-			strings.HasPrefix(value, "CMUX_TMUX_STORE_CHILD=") ||
-			strings.HasPrefix(value, "CMUX_TMUX_STORE_INDEX=") {
-			continue
-		}
-		environment = append(environment, value)
-	}
-	environment = append(
-		environment,
-		"HOME="+home,
-		"CMUX_TMUX_STORE_CHILD=1",
-		"CMUX_TMUX_STORE_INDEX="+strconv.Itoa(index),
-	)
-	return environment
-}
-
-func TestTmuxVersion(t *testing.T) {
-	output := captureStdout(t, func() {
-		dispatchTmuxCommand(nil, "-v", nil)
-	})
-	if strings.TrimSpace(output) != "tmux 3.4" {
-		t.Errorf("version = %q, want %q", strings.TrimSpace(output), "tmux 3.4")
-	}
-}
-
-func TestTmuxDisplayReporterFormatFields(t *testing.T) {
-	origHome := os.Getenv("HOME")
-	origWorkspace := os.Getenv("CMUX_WORKSPACE_ID")
-	origSurface := os.Getenv("CMUX_SURFACE_ID")
-	origPane := os.Getenv("TMUX_PANE")
-	os.Setenv("HOME", t.TempDir())
-	os.Setenv("CMUX_WORKSPACE_ID", "workspace:1")
-	os.Setenv("CMUX_SURFACE_ID", "surface:1")
-	leaderPaneToken := "%" + tmuxStableNumericId("33333333-3333-4333-8333-333333333333")
-	os.Setenv("TMUX_PANE", leaderPaneToken)
-	defer func() {
-		os.Setenv("HOME", origHome)
-		if origWorkspace != "" {
-			os.Setenv("CMUX_WORKSPACE_ID", origWorkspace)
-		} else {
-			os.Unsetenv("CMUX_WORKSPACE_ID")
-		}
-		if origSurface != "" {
-			os.Setenv("CMUX_SURFACE_ID", origSurface)
-		} else {
-			os.Unsetenv("CMUX_SURFACE_ID")
-		}
-		if origPane != "" {
-			os.Setenv("TMUX_PANE", origPane)
-		} else {
-			os.Unsetenv("TMUX_PANE")
-		}
-	}()
-
-	sockPath := startMockTmuxCompatSocket(t)
-	rc := &rpcContext{socketPath: sockPath}
-	fields := []string{
-		"session_id",
-		"session_name",
-		"window_index",
-		"window_id",
-		"pane_id",
-		"pane_width",
-		"pane_height",
-		"window_width",
-		"window_height",
-		"pane_current_path",
-		"pane_active",
-		"window_active",
-		"session_attached",
-	}
-	parts := make([]string, 0, len(fields))
-	for _, field := range fields {
-		parts = append(parts, field+"=#{"+field+"}")
-	}
-
-	output := captureStdout(t, func() {
-		if err := dispatchTmuxCommand(rc, "display-message", []string{
-			"-p",
-			"-F", strings.Join(parts, "\t"),
-			"-t", leaderPaneToken,
-		}); err != nil {
-			t.Fatalf("display-message: %v", err)
-		}
-	})
-
-	values := map[string]string{}
-	for _, part := range strings.Split(strings.TrimSpace(output), "\t") {
-		key, value, ok := strings.Cut(part, "=")
-		if !ok {
-			t.Fatalf("malformed field %q in output %q", part, output)
-		}
-		values[key] = value
-	}
-	for _, field := range fields {
-		if _, ok := values[field]; !ok {
-			t.Fatalf("missing field %q in output %q", field, output)
-		}
-	}
-
-	assertTmuxFieldMatch(t, values["session_id"], `^\$[0-9]+$`, "session_id")
-	if values["session_name"] != "cmux" {
-		t.Fatalf("session_name = %q, want cmux", values["session_name"])
-	}
-	assertTmuxFieldMatch(t, values["window_index"], `^[0-9]+$`, "window_index")
-	assertTmuxFieldMatch(t, values["window_id"], `^@[0-9]+$`, "window_id")
-	assertTmuxFieldMatch(t, values["pane_id"], `^%[0-9]+$`, "pane_id")
-	assertTmuxFieldMatch(t, values["pane_width"], `^[0-9]+$`, "pane_width")
-	assertTmuxFieldMatch(t, values["pane_height"], `^[0-9]+$`, "pane_height")
-	assertTmuxFieldMatch(t, values["window_width"], `^[0-9]+$`, "window_width")
-	assertTmuxFieldMatch(t, values["window_height"], `^[0-9]+$`, "window_height")
-	if !filepath.IsAbs(values["pane_current_path"]) {
-		t.Fatalf("pane_current_path = %q, want an absolute path", values["pane_current_path"])
-	}
-	if values["pane_active"] != "1" {
-		t.Fatalf("pane_active = %q, want 1 for stringy focused metadata", values["pane_active"])
-	}
-	assertTmuxFieldMatch(t, values["pane_active"], `^[01]$`, "pane_active")
-	assertTmuxFieldMatch(t, values["window_active"], `^[01]$`, "window_active")
-	assertTmuxFieldMatch(t, values["session_attached"], `^[01]$`, "session_attached")
-}
-
-func assertTmuxFieldMatch(t *testing.T, got string, pattern string, field string) {
-	t.Helper()
-	if !regexp.MustCompile(pattern).MatchString(got) {
-		t.Fatalf("%s = %q, want match %s", field, got, pattern)
-	}
-}
-
-func TestTmuxNoOps(t *testing.T) {
-	noOps := []string{
-		"set-option", "set", "set-window-option", "setw",
-		"source-file", "refresh-client", "attach-session", "detach-client",
-		"last-window", "next-window", "previous-window",
-		"set-hook", "set-buffer", "list-buffers",
-	}
-	for _, cmd := range noOps {
-		t.Run(cmd, func(t *testing.T) {
-			if err := dispatchTmuxCommand(nil, cmd, nil); err != nil {
-				t.Errorf("no-op %q returned error: %v", cmd, err)
-			}
-		})
-	}
-}
-
-func TestTmuxUnsupportedCommand(t *testing.T) {
-	err := dispatchTmuxCommand(nil, "some-unknown-cmd", nil)
-	if err == nil {
-		t.Error("expected error for unknown command")
-	}
-	if !strings.Contains(err.Error(), "unsupported") {
-		t.Errorf("error = %q, want to contain 'unsupported'", err.Error())
-	}
-}
-
-func TestIsUUIDish(t *testing.T) {
-	if !isUUIDish("D88CE676-0A95-4DDA-AD94-E535B0D966DF") {
-		t.Error("expected UUID to be detected")
-	}
-	if !isUUIDish("d88ce676-0a95-4dda-ad94-e535b0d966df") {
-		t.Error("expected lowercase UUID to be detected")
-	}
-	if isUUIDish("not-a-uuid") {
-		t.Error("expected non-UUID to be rejected")
-	}
-}
-
-func TestTmuxPaneSelector(t *testing.T) {
-	tests := []struct {
-		input string
-		want  string
-	}{
-		{"%abc123", "%abc123"},
-		{"pane:test", "pane:test"},
-		{"@ws1.%pane2", "%pane2"},
-		{"@ws1", ""},
-		{"", ""},
-	}
-	for _, tt := range tests {
-		got := tmuxPaneSelector(tt.input)
-		if got != tt.want {
-			t.Errorf("tmuxPaneSelector(%q) = %q, want %q", tt.input, got, tt.want)
-		}
-	}
-}
-
-func TestTmuxWindowSelector(t *testing.T) {
-	tests := []struct {
-		input string
-		want  string
-	}{
-		{"%abc123", ""},
-		{"pane:test", ""},
-		{"@ws1.%pane2", "@ws1"},
-		{"@ws1", "@ws1"},
-		{"", ""},
-	}
-	for _, tt := range tests {
-		got := tmuxWindowSelector(tt.input)
-		if got != tt.want {
-			t.Errorf("tmuxWindowSelector(%q) = %q, want %q", tt.input, got, tt.want)
-		}
-	}
-}
-
-func TestCreateTmuxShimDir(t *testing.T) {
-	tmpDir := t.TempDir()
-	origHome := os.Getenv("HOME")
-	os.Setenv("HOME", tmpDir)
-	defer os.Setenv("HOME", origHome)
-
-	dir, err := createTmuxShimDir("test-shim-bin", claudeTeamsShimScript)
-	if err != nil {
-		t.Fatalf("createTmuxShimDir: %v", err)
-	}
-	tmuxPath := filepath.Join(dir, "tmux")
-	info, err := os.Stat(tmuxPath)
-	if err != nil {
-		t.Fatalf("tmux shim not found: %v", err)
-	}
-	if info.Mode()&0111 == 0 {
-		t.Error("tmux shim is not executable")
-	}
-	content, _ := os.ReadFile(tmuxPath)
-	if !strings.Contains(string(content), "__tmux-compat") {
-		t.Error("shim script should reference __tmux-compat")
-	}
-}
-
-func TestCreateOMOShimDir(t *testing.T) {
-	tmpDir := t.TempDir()
-	origHome := os.Getenv("HOME")
-	os.Setenv("HOME", tmpDir)
-	defer os.Setenv("HOME", origHome)
-
-	dir, err := createOMOShimDir()
-	if err != nil {
-		t.Fatalf("createOMOShimDir: %v", err)
-	}
-	// Check tmux shim exists
-	tmuxPath := filepath.Join(dir, "tmux")
-	if _, err := os.Stat(tmuxPath); err != nil {
-		t.Fatalf("tmux shim not found: %v", err)
-	}
-	// Check terminal-notifier shim exists
-	notifierPath := filepath.Join(dir, "terminal-notifier")
-	if _, err := os.Stat(notifierPath); err != nil {
-		t.Fatalf("terminal-notifier shim not found: %v", err)
-	}
-}
-
-func TestConfigureAgentEnvironment(t *testing.T) {
-	// Save and restore env vars
-	envKeys := []string{
-		"CMUX_CLAUDE_TEAMS_CMUX_BIN", "PATH", "TMUX", "TMUX_PANE",
-		"TERM", "CMUX_SOCKET_PATH", "TERM_PROGRAM",
-		"CMUX_WORKSPACE_ID", "CMUX_SURFACE_ID", "CMUX_PANEL_ID", "CMUX_TAB_ID", "CMUX_PANE_ID",
-		"CLAUDE_CODE_EXPERIMENTAL_AGENT_TEAMS", "COLORTERM",
-	}
-	saved := make(map[string]string)
-	for _, k := range envKeys {
-		saved[k] = os.Getenv(k)
-	}
-	defer func() {
-		for k, v := range saved {
-			if v != "" {
-				os.Setenv(k, v)
-			} else {
-				os.Unsetenv(k)
-			}
-		}
-	}()
-
-	os.Setenv("TERM_PROGRAM", "should-be-removed")
-
-	configureAgentEnvironment(agentConfig{
-		shimDir:    "/tmp/test-shim",
-		socketPath: "127.0.0.1:54321",
-		launchContext: &agentLaunchContext{
-			workspaceId: "ws-abc",
-			windowId:    "win-123",
-			paneHandle:  "pane:456",
-			paneId:      "pane-456",
-			surfaceId:   "surf-789",
-		},
-		tmuxPathPrefix: "cmux-claude-teams",
-		cmuxBinEnvVar:  "CMUX_CLAUDE_TEAMS_CMUX_BIN",
-		termEnvVar:     "CMUX_CLAUDE_TEAMS_TERM",
-		extraEnv: map[string]string{
-			"CLAUDE_CODE_EXPERIMENTAL_AGENT_TEAMS": "1",
-		},
-	})
-
-	// Verify PATH was prepended
-	if !strings.HasPrefix(os.Getenv("PATH"), "/tmp/test-shim:") {
-		t.Error("PATH should start with shim dir")
-	}
-	// Verify TMUX is set with focused context
-	tmux := os.Getenv("TMUX")
-	if !strings.Contains(tmux, "ws-abc") {
-		t.Errorf("TMUX = %q, should contain workspace ID", tmux)
-	}
-	// Verify TMUX_PANE
-	wantPane := "%" + tmuxStableNumericId("pane-456")
-	if os.Getenv("TMUX_PANE") != wantPane {
-		t.Errorf("TMUX_PANE = %q, want %s", os.Getenv("TMUX_PANE"), wantPane)
-	}
-	// Verify socket path
-	if os.Getenv("CMUX_SOCKET_PATH") != "127.0.0.1:54321" {
-		t.Errorf("CMUX_SOCKET_PATH = %q", os.Getenv("CMUX_SOCKET_PATH"))
-	}
-	// Verify COLORTERM is set for truecolor support
-	if os.Getenv("COLORTERM") != "truecolor" {
-		t.Errorf("COLORTERM = %q, want truecolor", os.Getenv("COLORTERM"))
-	}
-	// Verify workspace/surface IDs
-	if os.Getenv("CMUX_WORKSPACE_ID") != "ws-abc" {
-		t.Errorf("CMUX_WORKSPACE_ID = %q", os.Getenv("CMUX_WORKSPACE_ID"))
-	}
-	if os.Getenv("CMUX_SURFACE_ID") != "surf-789" {
-		t.Errorf("CMUX_SURFACE_ID = %q", os.Getenv("CMUX_SURFACE_ID"))
-	}
-	if os.Getenv("CMUX_TAB_ID") != "ws-abc" {
-		t.Errorf("CMUX_TAB_ID = %q", os.Getenv("CMUX_TAB_ID"))
-	}
-	if os.Getenv("CMUX_PANEL_ID") != "surf-789" {
-		t.Errorf("CMUX_PANEL_ID = %q", os.Getenv("CMUX_PANEL_ID"))
-	}
-	if os.Getenv("CMUX_PANE_ID") != "pane-456" {
-		t.Errorf("CMUX_PANE_ID = %q", os.Getenv("CMUX_PANE_ID"))
-	}
-	// Verify extra env
-	if os.Getenv("CLAUDE_CODE_EXPERIMENTAL_AGENT_TEAMS") != "1" {
-		t.Error("CLAUDE_CODE_EXPERIMENTAL_AGENT_TEAMS should be 1")
-	}
-}
-
-func TestTmuxSigiledSelectorsSkipRefsAndIndexes(t *testing.T) {
-	sockPath := startMockTmuxCompatSocket(t)
-	rc := &rpcContext{socketPath: sockPath}
-	workspaceId := "11111111-1111-4111-8111-111111111111"
-	paneId := "33333333-3333-4333-8333-333333333333"
-
-	if got, err := tmuxResolveWorkspaceId(rc, "1"); err != nil || got != workspaceId {
-		t.Fatalf("unsigiled workspace index resolved to %q, %v; want %s", got, err, workspaceId)
-	}
-	if got, err := tmuxCanonicalPaneId(rc, "1", workspaceId); err != nil || got != paneId {
-		t.Fatalf("unsigiled pane index resolved to %q, %v; want %s", got, err, paneId)
-	}
-	if _, err := tmuxResolveWorkspaceId(rc, "$1"); err == nil {
-		t.Fatal("sigiled workspace selector $1 resolved by index; want no match")
-	}
-	if _, err := tmuxCanonicalPaneId(rc, "%1", workspaceId); err == nil {
-		t.Fatal("sigiled pane selector %1 resolved by index; want no match")
-	}
-	if got, err := tmuxResolveWorkspaceId(rc, "$"+tmuxStableNumericId(workspaceId)); err != nil || got != workspaceId {
-		t.Fatalf("sigiled workspace numeric id resolved to %q, %v; want %s", got, err, workspaceId)
-	}
-	if got, err := tmuxCanonicalPaneId(rc, "%"+tmuxStableNumericId(paneId), workspaceId); err != nil || got != paneId {
-		t.Fatalf("sigiled pane numeric id resolved to %q, %v; want %s", got, err, paneId)
-	}
-}
-
-func TestTmuxResolveWorkspaceIdAcceptsSigiledUUIDWithoutList(t *testing.T) {
-	workspaceId := "11111111-1111-4111-8111-111111111111"
-	rc := &rpcContext{socketPath: filepath.Join(t.TempDir(), "missing.sock")}
-
-	for _, raw := range []string{"$" + workspaceId, "@" + workspaceId} {
-		got, err := tmuxResolveWorkspaceId(rc, raw)
-		if err != nil {
-			t.Fatalf("tmuxResolveWorkspaceId(%q) returned error: %v", raw, err)
-		}
-		if got != workspaceId {
-			t.Fatalf("tmuxResolveWorkspaceId(%q) = %q, want %s", raw, got, workspaceId)
-		}
-	}
-}
-
-func TestTmuxCanonicalSelectorsPreferRefsBeforeIndexFallback(t *testing.T) {
-	sockPath := startMockTmuxSelectorPrioritySocket(t)
-	rc := &rpcContext{socketPath: sockPath}
-	workspaceId := "11111111-1111-4111-8111-111111111111"
-	refPaneId := "33333333-3333-4333-8333-333333333333"
-	refSurfaceId := "55555555-5555-4555-8555-555555555555"
-
-	if got, err := tmuxCanonicalPaneId(rc, "1", workspaceId); err != nil || got != refPaneId {
-		t.Fatalf("pane selector resolved to %q, %v; want ref match %s before index fallback", got, err, refPaneId)
-	}
-	if got, err := tmuxCanonicalSurfaceId(rc, "1", workspaceId); err != nil || got != refSurfaceId {
-		t.Fatalf("surface selector resolved to %q, %v; want ref match %s before index fallback", got, err, refSurfaceId)
-	}
-}
-
-func startMockTmuxSelectorPrioritySocket(t *testing.T) string {
-	t.Helper()
-	sockPath := makeShortUnixSocketPath(t)
-	ln, err := net.Listen("unix", sockPath)
-	if err != nil {
-		t.Fatalf("failed to listen: %v", err)
-	}
-	t.Cleanup(func() { ln.Close() })
-
-	go func() {
-		for {
-			conn, err := ln.Accept()
-			if err != nil {
-				return
-			}
-			go func(conn net.Conn) {
-				defer conn.Close()
-				reader := bufio.NewReader(conn)
-				line, err := reader.ReadBytes('\n')
-				if err != nil {
-					return
-				}
-
-				var req map[string]any
-				if err := json.Unmarshal(line, &req); err != nil {
-					_, _ = conn.Write([]byte(`{"ok":false,"error":{"code":"parse","message":"bad json"}}` + "\n"))
-					return
-				}
-
-				method, _ := req["method"].(string)
-				resp := map[string]any{
-					"id": req["id"],
-					"ok": true,
-				}
-				switch method {
-				case "pane.list":
-					resp["result"] = map[string]any{
-						"panes": []map[string]any{
-							{"id": "22222222-2222-4222-8222-222222222222", "ref": "pane:index", "index": 1},
-							{"id": "33333333-3333-4333-8333-333333333333", "ref": "1", "index": 2},
-						},
-					}
-				case "surface.list":
-					resp["result"] = map[string]any{
-						"surfaces": []map[string]any{
-							{"id": "44444444-4444-4444-8444-444444444444", "ref": "surface:index", "index": 1},
-							{"id": "55555555-5555-4555-8555-555555555555", "ref": "1", "index": 2},
-						},
-					}
-				default:
-					resp["result"] = map[string]any{}
-				}
-
-				data, _ := json.Marshal(resp)
-				_, _ = conn.Write(append(data, '\n'))
-			}(conn)
-		}
-	}()
-
-	return sockPath
-}
-
-func TestClaudeTeamsLaunchArgs(t *testing.T) {
-	// Should prepend --teammate-mode auto
-	args := claudeTeamsLaunchArgs([]string{"--verbose"})
-	if args[0] != "--teammate-mode" || args[1] != "auto" || args[2] != "--verbose" {
-		t.Errorf("args = %v, want [--teammate-mode auto --verbose]", args)
-	}
-
-	// Should not duplicate if already present
-	args = claudeTeamsLaunchArgs([]string{"--teammate-mode", "off"})
-	if args[0] != "--teammate-mode" || args[1] != "off" {
-		t.Errorf("args = %v, should not prepend when already present", args)
-	}
-}
-
-func TestMergeNodeOptions(t *testing.T) {
-	const restoreModulePath = "/tmp/restore-node-options.cjs"
-
-	if got := mergeNodeOptions("", restoreModulePath); got != "--require=/tmp/restore-node-options.cjs --max-old-space-size=4096" {
-		t.Fatalf("mergeNodeOptions(\"\") = %q", got)
-	}
-
-	if got := mergeNodeOptions("--trace-warnings", restoreModulePath); got != "--require=/tmp/restore-node-options.cjs --max-old-space-size=4096 --trace-warnings" {
-		t.Fatalf("mergeNodeOptions preserves existing flags = %q", got)
-	}
-
-	existing := "--max-old-space-size=2048 --trace-warnings"
-	if got := mergeNodeOptions(existing, restoreModulePath); got != "--require=/tmp/restore-node-options.cjs --max-old-space-size=4096 --trace-warnings" {
-		t.Fatalf("mergeNodeOptions should replace existing size flag = %q", got)
-	}
-
-	spaceSeparated := "--max-old-space-size 2048 --trace-warnings"
-	if got := mergeNodeOptions(spaceSeparated, restoreModulePath); got != "--require=/tmp/restore-node-options.cjs --max-old-space-size=4096 --trace-warnings" {
-		t.Fatalf("mergeNodeOptions should replace space-separated size flag = %q", got)
-	}
-}
-
-func TestTmuxWaitForSignalRoundTrip(t *testing.T) {
-	name := "test-roundtrip-" + randomHex(4)
-	path := tmuxWaitForSignalPath(name)
-	defer os.Remove(path)
-
-	// Signal creates the file
-	dispatchTmuxCommand(nil, "wait-for", []string{"-S", name})
-	if _, err := os.Stat(path); err != nil {
-		t.Fatalf("signal file not created: %v", err)
-	}
-
-	// Wait consumes the file
-	err := dispatchTmuxCommand(nil, "wait-for", []string{name})
-	if err != nil {
-		t.Fatalf("wait-for should succeed: %v", err)
-	}
-	if _, err := os.Stat(path); !os.IsNotExist(err) {
-		t.Error("signal file should be removed after wait")
-	}
-}
-
-func TestTmuxShowBuffer(t *testing.T) {
-	tmpDir := t.TempDir()
-	origHome := os.Getenv("HOME")
-	os.Setenv("HOME", tmpDir)
-	defer os.Setenv("HOME", origHome)
-
-	store, err := loadTmuxCompatStore()
-	if err != nil {
-		t.Fatalf("load: %v", err)
-	}
-	store.Buffers["default"] = "hello world"
-	if err := saveTmuxCompatStore(store); err != nil {
-		t.Fatalf("save: %v", err)
-	}
-
-	output := captureStdout(t, func() {
-		tmuxShowBuffer(nil)
-	})
-	if strings.TrimSpace(output) != "hello world" {
-		t.Errorf("output = %q, want %q", output, "hello world")
-	}
-}
diff --git a/daemon/remote/cmd/cmuxd-remote/tmux_corpus_behavior_test.go b/daemon/remote/cmd/cmuxd-remote/tmux_corpus_behavior_test.go
deleted file mode 100644
index 7bb9d05eda46..000000000000
--- a/daemon/remote/cmd/cmuxd-remote/tmux_corpus_behavior_test.go
+++ /dev/null
@@ -1,893 +0,0 @@
-package main
-
-import (
-	"bufio"
-	"encoding/json"
-	"net"
-	"os"
-	"reflect"
-	"strings"
-	"sync"
-	"testing"
-)
-
-type tmuxCorpusRPCRequest struct {
-	Method string
-	Params map[string]any
-}
-
-type tmuxCorpusRPCRecorder struct {
-	socketPath            string
-	mu                    sync.Mutex
-	requests              []tmuxCorpusRPCRequest
-	workspaces            []map[string]any
-	readText              string
-	surfaceListExtras     map[string]any
-	failMethods           map[string]bool
-	includePaneMetrics    bool
-	includePointMetrics   bool
-	includeContainerFrame bool
-}
-
-func startTmuxCorpusRPCRecorder(t *testing.T) *tmuxCorpusRPCRecorder {
-	return startTmuxCorpusRPCRecorderWithMetricAvailability(t, true, true, true)
-}
-
-func startTmuxCorpusRPCRecorderWithPaneMetrics(t *testing.T, includePaneMetrics bool) *tmuxCorpusRPCRecorder {
-	return startTmuxCorpusRPCRecorderWithMetricAvailability(
-		t,
-		includePaneMetrics,
-		includePaneMetrics,
-		includePaneMetrics,
-	)
-}
-
-func startTmuxCorpusRPCRecorderWithMetricAvailability(
-	t *testing.T,
-	includePaneMetrics bool,
-	includePointMetrics bool,
-	includeContainerFrame bool,
-) *tmuxCorpusRPCRecorder {
-	t.Helper()
-
-	recorder := &tmuxCorpusRPCRecorder{
-		socketPath:            makeShortUnixSocketPath(t),
-		includePaneMetrics:    includePaneMetrics,
-		includePointMetrics:   includePointMetrics,
-		includeContainerFrame: includeContainerFrame,
-		workspaces: []map[string]any{{
-			"id":    "11111111-1111-4111-8111-111111111111",
-			"ref":   "workspace:1",
-			"index": 1,
-			"title": "main",
-		}},
-	}
-
-	ln, err := net.Listen("unix", recorder.socketPath)
-	if err != nil {
-		t.Fatalf("listen tmux corpus rpc socket: %v", err)
-	}
-	t.Cleanup(func() { _ = ln.Close() })
-
-	go func() {
-		for {
-			conn, err := ln.Accept()
-			if err != nil {
-				return
-			}
-			go recorder.serveConn(conn)
-		}
-	}()
-
-	return recorder
-}
-
-func (r *tmuxCorpusRPCRecorder) serveConn(conn net.Conn) {
-	defer conn.Close()
-
-	line, err := bufio.NewReader(conn).ReadBytes('\n')
-	if err != nil {
-		return
-	}
-
-	var req map[string]any
-	if err := json.Unmarshal(line, &req); err != nil {
-		_, _ = conn.Write([]byte(`{"ok":false,"error":{"code":"parse","message":"bad json"}}` + "\n"))
-		return
-	}
-
-	method, _ := req["method"].(string)
-	params, _ := req["params"].(map[string]any)
-
-	r.mu.Lock()
-	r.requests = append(r.requests, tmuxCorpusRPCRequest{Method: method, Params: cloneMap(params)})
-	resp := map[string]any{
-		"id": req["id"],
-		"ok": true,
-	}
-
-	if r.failMethods[method] {
-		resp["ok"] = false
-		resp["error"] = map[string]any{"code": "unavailable", "message": method + " unavailable"}
-		r.mu.Unlock()
-		payload, _ := json.Marshal(resp)
-		_, _ = conn.Write(append(payload, '\n'))
-		return
-	}
-
-	switch method {
-	case "workspace.create":
-		next := len(r.workspaces) + 1
-		wsID := "22222222-2222-4222-8222-22222222222" + string(rune('0'+next))
-		workspace := map[string]any{
-			"id":    wsID,
-			"ref":   "workspace:" + string(rune('0'+next)),
-			"index": next,
-			"title": "created",
-		}
-		r.workspaces = append(r.workspaces, workspace)
-		resp["result"] = map[string]any{"workspace_id": wsID}
-	case "workspace.rename":
-		wsID, _ := params["workspace_id"].(string)
-		title, _ := params["title"].(string)
-		for _, workspace := range r.workspaces {
-			if workspace["id"] == wsID {
-				workspace["title"] = title
-				break
-			}
-		}
-		resp["result"] = map[string]any{"ok": true}
-	case "workspace.current":
-		resp["result"] = map[string]any{"workspace_id": r.workspaces[0]["id"]}
-	case "workspace.list":
-		resp["result"] = map[string]any{"workspaces": cloneSliceOfMaps(r.workspaces)}
-	case "surface.list":
-		surface := map[string]any{
-			"id":      "44444444-4444-4444-8444-444444444444",
-			"ref":     "surface:1",
-			"focused": true,
-			"pane_id": "33333333-3333-4333-8333-333333333333",
-			"title":   "shell",
-		}
-		for k, v := range r.surfaceListExtras {
-			surface[k] = v
-		}
-		resp["result"] = map[string]any{"surfaces": []map[string]any{surface}}
-	case "surface.current":
-		resp["result"] = map[string]any{
-			"workspace_id": r.workspaces[0]["id"],
-			"pane_id":      "33333333-3333-4333-8333-333333333333",
-			"pane_ref":     "pane:1",
-			"surface_id":   "44444444-4444-4444-8444-444444444444",
-			"surface_ref":  "surface:1",
-		}
-	case "surface.read_text":
-		text := r.readText
-		if text == "" {
-			text = "\x1b[31mRED\x1b[0m\nplain\n"
-		}
-		resp["result"] = map[string]any{"text": text}
-	case "surface.send_text":
-		resp["result"] = map[string]any{"ok": true}
-	case "pane.list":
-		pane := map[string]any{
-			"id":      "33333333-3333-4333-8333-333333333333",
-			"ref":     "pane:1",
-			"index":   1,
-			"focused": true,
-			"columns": 80,
-			"rows":    24,
-		}
-		result := map[string]any{"panes": []map[string]any{pane}}
-		if r.includePaneMetrics {
-			pane["cell_width_px"] = 8
-			pane["cell_height_px"] = 16
-			if r.includePointMetrics {
-				pane["cell_width_points"] = 4
-				pane["cell_height_points"] = 8
-			}
-			pane["pixel_frame"] = map[string]any{"x": 0, "y": 0, "width": 332, "height": 222}
-			if r.includeContainerFrame {
-				result["container_frame"] = map[string]any{"width": 640, "height": 384}
-			}
-		}
-		resp["result"] = result
-	case "pane.surfaces":
-		resp["result"] = map[string]any{"surfaces": []map[string]any{{
-			"id":       "44444444-4444-4444-8444-444444444444",
-			"ref":      "surface:1",
-			"selected": true,
-		}}}
-	case "pane.resize":
-		resp["result"] = map[string]any{"ok": true}
-	case "surface.respawn":
-		resp["result"] = map[string]any{"ok": true}
-	default:
-		resp["ok"] = false
-		resp["error"] = map[string]any{"code": "unsupported", "message": method}
-	}
-	r.mu.Unlock()
-
-	payload, _ := json.Marshal(resp)
-	_, _ = conn.Write(append(payload, '\n'))
-}
-
-func (r *tmuxCorpusRPCRecorder) methods() []string {
-	r.mu.Lock()
-	defer r.mu.Unlock()
-	methods := make([]string, len(r.requests))
-	for i, req := range r.requests {
-		methods[i] = req.Method
-	}
-	return methods
-}
-
-func (r *tmuxCorpusRPCRecorder) requestsFor(method string) []tmuxCorpusRPCRequest {
-	r.mu.Lock()
-	defer r.mu.Unlock()
-	var out []tmuxCorpusRPCRequest
-	for _, req := range r.requests {
-		if req.Method == method {
-			out = append(out, tmuxCorpusRPCRequest{
-				Method: req.Method,
-				Params: cloneMap(req.Params),
-			})
-		}
-	}
-	return out
-}
-
-func (r *tmuxCorpusRPCRecorder) setReadText(text string) {
-	r.mu.Lock()
-	defer r.mu.Unlock()
-	r.readText = text
-}
-
-func (r *tmuxCorpusRPCRecorder) setSurfaceListExtras(extras map[string]any) {
-	r.mu.Lock()
-	defer r.mu.Unlock()
-	r.surfaceListExtras = cloneMap(extras)
-}
-
-func (r *tmuxCorpusRPCRecorder) setMethodFails(method string, fails bool) {
-	r.mu.Lock()
-	defer r.mu.Unlock()
-	if r.failMethods == nil {
-		r.failMethods = make(map[string]bool)
-	}
-	r.failMethods[method] = fails
-}
-
-func cloneMap(input map[string]any) map[string]any {
-	out := make(map[string]any, len(input))
-	for k, v := range input {
-		out[k] = v
-	}
-	return out
-}
-
-func cloneSliceOfMaps(input []map[string]any) []map[string]any {
-	out := make([]map[string]any, 0, len(input))
-	for _, item := range input {
-		out = append(out, cloneMap(item))
-	}
-	return out
-}
-
-func TestTmuxCorpusNewSessionAndNewWindowCommandsDispatchShellText(t *testing.T) {
-	origHome := os.Getenv("HOME")
-	os.Setenv("HOME", t.TempDir())
-	defer os.Setenv("HOME", origHome)
-
-	recorder := startTmuxCorpusRPCRecorder(t)
-	rc := &rpcContext{socketPath: recorder.socketPath}
-
-	if err := dispatchTmuxCommand(rc, "new-session", []string{"-d", "-s", "build", "-c", "/tmp", "echo one"}); err != nil {
-		t.Fatalf("new-session: %v", err)
-	}
-	if err := dispatchTmuxCommand(rc, "new-window", []string{"-d", "-n", "test", "echo two"}); err != nil {
-		t.Fatalf("new-window: %v", err)
-	}
-
-	methods := recorder.methods()
-	wantOrder := []string{
-		"workspace.create",
-		"workspace.rename",
-		"surface.list",
-		"surface.send_text",
-		"workspace.create",
-		"workspace.rename",
-		"surface.list",
-		"surface.send_text",
-	}
-	if !reflect.DeepEqual(methods, wantOrder) {
-		t.Fatalf("RPC methods = %v, want %v", methods, wantOrder)
-	}
-
-	sendRequests := recorder.requestsFor("surface.send_text")
-	if len(sendRequests) != 2 {
-		t.Fatalf("surface.send_text requests = %d, want 2", len(sendRequests))
-	}
-	if got := sendRequests[0].Params["text"]; got != "cd -- '/tmp' && echo one\r" {
-		t.Fatalf("new-session send text = %q", got)
-	}
-	if got := sendRequests[1].Params["text"]; got != "echo two\r" {
-		t.Fatalf("new-window send text = %q", got)
-	}
-
-	createRequests := recorder.requestsFor("workspace.create")
-	if len(createRequests) != 2 {
-		t.Fatalf("workspace.create requests = %d, want 2", len(createRequests))
-	}
-	for _, req := range createRequests {
-		if got := req.Params["focus"]; got != false {
-			t.Fatalf("tmux detached/no-client creation should use focus=false, got %v in %+v", got, req.Params)
-		}
-	}
-}
-
-// Regression: Claude Code agent-team teammate panes respawn with
-// `respawn-pane -k -t %<paneID> <command>`. The Swift/local `__tmux-compat`
-// path supports this, but the Go relay path used for SSH sessions did not,
-// so the first teammate spawn failed with "unsupported tmux command:
-// respawn-pane" and Claude Code fell back to headless for the session.
-func TestTmuxCorpusRespawnPaneDispatchesSurfaceRespawn(t *testing.T) {
-	t.Setenv("HOME", t.TempDir())
-
-	const paneTarget = "%33333333-3333-4333-8333-333333333333"
-	const wantSurface = "44444444-4444-4444-8444-444444444444"
-
-	t.Run("explicit command wraps in sh and keeps raw start command", func(t *testing.T) {
-		recorder := startTmuxCorpusRPCRecorder(t)
-		rc := &rpcContext{socketPath: recorder.socketPath}
-
-		err := dispatchTmuxCommand(rc, "respawn-pane", []string{
-			"-k", "-t", paneTarget, "cd /tmp && env FOO=1 claude",
-		})
-		if err != nil {
-			t.Fatalf("respawn-pane: %v", err)
-		}
-
-		requests := recorder.requestsFor("surface.respawn")
-		if len(requests) != 1 {
-			t.Fatalf("surface.respawn requests = %d, want 1", len(requests))
-		}
-		params := requests[0].Params
-		if got := params["surface_id"]; got != wantSurface {
-			t.Errorf("surface_id = %v, want %v", got, wantSurface)
-		}
-		if got := params["tmux_start_command"]; got != "cd /tmp && env FOO=1 claude" {
-			t.Errorf("tmux_start_command = %q", got)
-		}
-		if got := params["command"]; got != "/bin/sh -c 'cd /tmp && env FOO=1 claude'" {
-			t.Errorf("command = %q", got)
-		}
-	})
-
-	t.Run("respawnp alias with terminator", func(t *testing.T) {
-		recorder := startTmuxCorpusRPCRecorder(t)
-		rc := &rpcContext{socketPath: recorder.socketPath}
-
-		err := dispatchTmuxCommand(rc, "respawnp", []string{
-			"-k", "-t", paneTarget, "--", "echo hi",
-		})
-		if err != nil {
-			t.Fatalf("respawnp: %v", err)
-		}
-		requests := recorder.requestsFor("surface.respawn")
-		if len(requests) != 1 {
-			t.Fatalf("surface.respawn requests = %d, want 1", len(requests))
-		}
-		if got := requests[0].Params["command"]; got != "/bin/sh -c 'echo hi'" {
-			t.Errorf("command = %q", got)
-		}
-	})
-
-	t.Run("no command reuses stored start command", func(t *testing.T) {
-		recorder := startTmuxCorpusRPCRecorder(t)
-		recorder.setSurfaceListExtras(map[string]any{
-			"tmux_start_command": "claude --resume abc",
-			"initial_command":    "should-not-win",
-		})
-		rc := &rpcContext{socketPath: recorder.socketPath}
-
-		err := dispatchTmuxCommand(rc, "respawn-pane", []string{"-k", "-t", paneTarget})
-		if err != nil {
-			t.Fatalf("respawn-pane: %v", err)
-		}
-		requests := recorder.requestsFor("surface.respawn")
-		if len(requests) != 1 {
-			t.Fatalf("surface.respawn requests = %d, want 1", len(requests))
-		}
-		params := requests[0].Params
-		if got := params["tmux_start_command"]; got != "claude --resume abc" {
-			t.Errorf("tmux_start_command = %q, want stored tmux_start_command to win", got)
-		}
-		if got := params["command"]; got != "/bin/sh -c 'claude --resume abc'" {
-			t.Errorf("command = %q", got)
-		}
-	})
-
-	t.Run("no command falls back to pane_start_command", func(t *testing.T) {
-		recorder := startTmuxCorpusRPCRecorder(t)
-		recorder.setSurfaceListExtras(map[string]any{
-			"pane_start_command": "htop",
-		})
-		rc := &rpcContext{socketPath: recorder.socketPath}
-
-		err := dispatchTmuxCommand(rc, "respawn-pane", []string{"-k", "-t", paneTarget})
-		if err != nil {
-			t.Fatalf("respawn-pane: %v", err)
-		}
-		requests := recorder.requestsFor("surface.respawn")
-		if len(requests) != 1 {
-			t.Fatalf("surface.respawn requests = %d, want 1", len(requests))
-		}
-		if got := requests[0].Params["tmux_start_command"]; got != "htop" {
-			t.Errorf("tmux_start_command = %q, want pane_start_command fallback", got)
-		}
-	})
-
-	t.Run("-c sets working_directory", func(t *testing.T) {
-		recorder := startTmuxCorpusRPCRecorder(t)
-		rc := &rpcContext{socketPath: recorder.socketPath}
-
-		err := dispatchTmuxCommand(rc, "respawn-pane", []string{
-			"-k", "-t", paneTarget, "-c", "/tmp/teammate-cwd", "echo hi",
-		})
-		if err != nil {
-			t.Fatalf("respawn-pane: %v", err)
-		}
-		requests := recorder.requestsFor("surface.respawn")
-		if len(requests) != 1 {
-			t.Fatalf("surface.respawn requests = %d, want 1", len(requests))
-		}
-		if got := requests[0].Params["working_directory"]; got != "/tmp/teammate-cwd" {
-			t.Errorf("working_directory = %v, want /tmp/teammate-cwd", got)
-		}
-	})
-
-	t.Run("stored command lookup failure propagates instead of respawning a login shell", func(t *testing.T) {
-		recorder := startTmuxCorpusRPCRecorder(t)
-		recorder.setMethodFails("surface.list", true)
-		rc := &rpcContext{socketPath: recorder.socketPath}
-
-		err := dispatchTmuxCommand(rc, "respawn-pane", []string{"-k", "-t", paneTarget})
-		if err == nil {
-			t.Fatal("respawn-pane should fail when the stored-command lookup fails")
-		}
-		if len(recorder.requestsFor("surface.respawn")) != 0 {
-			t.Error("surface.respawn must not be called when the stored-command lookup fails")
-		}
-	})
-
-	t.Run("no command falls back to login shell", func(t *testing.T) {
-		recorder := startTmuxCorpusRPCRecorder(t)
-		rc := &rpcContext{socketPath: recorder.socketPath}
-
-		err := dispatchTmuxCommand(rc, "respawn-pane", []string{"-k", "-t", paneTarget})
-		if err != nil {
-			t.Fatalf("respawn-pane: %v", err)
-		}
-		requests := recorder.requestsFor("surface.respawn")
-		if len(requests) != 1 {
-			t.Fatalf("surface.respawn requests = %d, want 1", len(requests))
-		}
-		params := requests[0].Params
-		if got := params["tmux_start_command"]; got != "exec ${SHELL:-/bin/sh} -l" {
-			t.Errorf("tmux_start_command = %q", got)
-		}
-		if got := params["command"]; got != "/bin/sh -c 'exec ${SHELL:-/bin/sh} -l'" {
-			t.Errorf("command = %q", got)
-		}
-	})
-
-	t.Run("claude-teams sandbox opt-in prepends env export", func(t *testing.T) {
-		t.Setenv("CMUX_CLAUDE_TEAMS_SANDBOXED", "1")
-		recorder := startTmuxCorpusRPCRecorder(t)
-		rc := &rpcContext{socketPath: recorder.socketPath}
-
-		err := dispatchTmuxCommand(rc, "respawn-pane", []string{
-			"-k", "-t", paneTarget, "claude --resume",
-		})
-		if err != nil {
-			t.Fatalf("respawn-pane: %v", err)
-		}
-		requests := recorder.requestsFor("surface.respawn")
-		if len(requests) != 1 {
-			t.Fatalf("surface.respawn requests = %d, want 1", len(requests))
-		}
-		params := requests[0].Params
-		want := `/bin/sh -c 'export CLAUDE_CODE_SANDBOXED='"'"'1'"'"'; claude --resume'`
-		if got := params["command"]; got != want {
-			t.Errorf("command = %q, want %q", got, want)
-		}
-		if got := params["tmux_start_command"]; got != "claude --resume" {
-			t.Errorf("tmux_start_command = %q (must stay raw for persistence)", got)
-		}
-	})
-
-	t.Run("missing -k is rejected", func(t *testing.T) {
-		recorder := startTmuxCorpusRPCRecorder(t)
-		rc := &rpcContext{socketPath: recorder.socketPath}
-
-		err := dispatchTmuxCommand(rc, "respawn-pane", []string{"-t", paneTarget})
-		if err == nil {
-			t.Fatal("respawn-pane without -k should fail")
-		}
-		if !strings.Contains(err.Error(), "-k") {
-			t.Errorf("error = %q, want mention of -k", err.Error())
-		}
-		if len(recorder.requestsFor("surface.respawn")) != 0 {
-			t.Error("surface.respawn should not be called without -k")
-		}
-	})
-}
-
-func TestTmuxCorpusHasSessionReturnSemantics(t *testing.T) {
-	recorder := startTmuxCorpusRPCRecorder(t)
-	rc := &rpcContext{socketPath: recorder.socketPath}
-
-	if err := dispatchTmuxCommand(rc, "has-session", []string{"-t", "main"}); err != nil {
-		t.Fatalf("has-session existing workspace: %v", err)
-	}
-
-	err := dispatchTmuxCommand(rc, "has-session", []string{"-t", "missing"})
-	if err == nil {
-		t.Fatal("has-session should fail for a missing workspace")
-	}
-	if !strings.Contains(err.Error(), "workspace not found") {
-		t.Fatalf("has-session error = %q, want workspace not found", err.Error())
-	}
-}
-
-func TestTmuxCorpusSendKeysAndTTYKeyTokens(t *testing.T) {
-	tests := []struct {
-		name    string
-		tokens  []string
-		literal bool
-		want    string
-	}{
-		{name: "tmux input keys enter", tokens: []string{"printf", "ok", "Enter"}, want: "printf ok\r"},
-		{name: "tmux input keys controls", tokens: []string{"C-c", "C-d", "C-z", "C-l"}, want: "\x03\x04\x1a\x0c"},
-		{name: "tmux tty keys navigation bytes", tokens: []string{"Escape", "Tab", "BSpace"}, want: "\x1b\t\x7f"},
-		{name: "literal mode", tokens: []string{"Enter", "C-c", "plain"}, literal: true, want: "Enter C-c plain"},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got := tmuxSendKeysText(tt.tokens, tt.literal)
-			if got != tt.want {
-				t.Fatalf("tmuxSendKeysText(%v, literal=%v) = %q, want %q", tt.tokens, tt.literal, got, tt.want)
-			}
-		})
-	}
-}
-
-func TestTmuxCorpusFormatStringsSupportedSubset(t *testing.T) {
-	ctx := map[string]string{
-		"session_name": "cmux",
-		"window_id":    "@workspace",
-		"window_name":  "Build",
-		"pane_id":      "%pane",
-		"pane_width":   "120",
-		"pane_height":  "40",
-	}
-
-	tests := []struct {
-		format   string
-		fallback string
-		want     string
-	}{
-		{format: "#{session_name}:#{window_name}:#{pane_id}", want: "cmux:Build:%pane"},
-		{format: "#{window_id} #{pane_width}x#{pane_height}", want: "@workspace 120x40"},
-		{format: "#{unknown}#{also_unknown}", fallback: "fallback", want: "fallback"},
-	}
-	for _, tt := range tests {
-		if got := tmuxRenderFormat(tt.format, ctx, tt.fallback); got != tt.want {
-			t.Fatalf("tmuxRenderFormat(%q) = %q, want %q", tt.format, got, tt.want)
-		}
-	}
-}
-
-func TestTmuxCorpusCapturePanePreservesTruecolorEscapeBytesInBuffers(t *testing.T) {
-	origHome := os.Getenv("HOME")
-	home := t.TempDir()
-	os.Setenv("HOME", home)
-	defer os.Setenv("HOME", origHome)
-
-	recorder := startTmuxCorpusRPCRecorder(t)
-	rc := &rpcContext{socketPath: recorder.socketPath}
-
-	printed := captureStdout(t, func() {
-		if err := dispatchTmuxCommand(rc, "capture-pane", []string{"-p"}); err != nil {
-			t.Fatalf("capture-pane -p: %v", err)
-		}
-	})
-	if printed != "\x1b[31mRED\x1b[0m\nplain\n" {
-		t.Fatalf("capture-pane -p output = %q", printed)
-	}
-
-	output := captureStdout(t, func() {
-		if err := dispatchTmuxCommand(rc, "capture-pane", nil); err != nil {
-			t.Fatalf("capture-pane buffer: %v", err)
-		}
-		if err := dispatchTmuxCommand(nil, "show-buffer", nil); err != nil {
-			t.Fatalf("show-buffer: %v", err)
-		}
-	})
-	if output != "\x1b[31mRED\x1b[0m\nplain\n" {
-		t.Fatalf("captured buffer = %q", output)
-	}
-}
-
-func TestTmuxCorpusCapturePanePreservesTerminalByteFixtures(t *testing.T) {
-	origHome := os.Getenv("HOME")
-	home := t.TempDir()
-	os.Setenv("HOME", home)
-	defer os.Setenv("HOME", origHome)
-
-	tests := []struct {
-		name string
-		text string
-	}{
-		{
-			name: "capture-pane-sgr0",
-			text: "\x1b[38;2;255;0;0mred\x1b[0mplain\n",
-		},
-		{
-			name: "capture-pane-hyperlink",
-			text: "\x1b]8;;https://example.test\x1b\\linked\x1b]8;;\x1b\\\n",
-		},
-		{
-			name: "osc-11colours-truecolor",
-			text: "\x1b]11;rgb:12/34/56\x1b\\background\n\x1b]111\x1b\\reset\n",
-		},
-		{
-			name: "utf8-combining-and-width-bytes",
-			text: "e\u0301 cafe\u0301 \u26A1\uFE0F\n",
-		},
-		{
-			name: "decrqm-sync-response-bytes",
-			text: "\x1b[?2026;1$ysync-enabled\n",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			recorder := startTmuxCorpusRPCRecorder(t)
-			recorder.setReadText(tt.text)
-			rc := &rpcContext{socketPath: recorder.socketPath}
-
-			printed := captureStdout(t, func() {
-				if err := dispatchTmuxCommand(rc, "capture-pane", []string{"-p"}); err != nil {
-					t.Fatalf("capture-pane -p: %v", err)
-				}
-			})
-			if printed != tt.text {
-				t.Fatalf("capture-pane -p output = %q, want %q", printed, tt.text)
-			}
-
-			buffered := captureStdout(t, func() {
-				if err := dispatchTmuxCommand(rc, "capture-pane", nil); err != nil {
-					t.Fatalf("capture-pane buffer: %v", err)
-				}
-				if err := dispatchTmuxCommand(nil, "show-buffer", nil); err != nil {
-					t.Fatalf("show-buffer: %v", err)
-				}
-			})
-			if buffered != tt.text {
-				t.Fatalf("show-buffer output = %q, want %q", buffered, tt.text)
-			}
-		})
-	}
-}
-
-func TestTmuxCorpusResizePaneDispatchesAbsoluteAndDirectionalResize(t *testing.T) {
-	recorder := startTmuxCorpusRPCRecorder(t)
-	rc := &rpcContext{socketPath: recorder.socketPath}
-
-	if err := dispatchTmuxCommand(rc, "resize-pane", []string{"-t", "pane:1", "-x", "100"}); err != nil {
-		t.Fatalf("resize-pane absolute width: %v", err)
-	}
-	if err := dispatchTmuxCommand(rc, "resize-pane", []string{"-t", "pane:1", "-x", "50%"}); err != nil {
-		t.Fatalf("resize-pane percentage width: %v", err)
-	}
-	if err := dispatchTmuxCommand(rc, "resize-pane", []string{"-t", "pane:1", "-y", "20"}); err != nil {
-		t.Fatalf("resize-pane compatibility height no-op: %v", err)
-	}
-	if err := dispatchTmuxCommand(rc, "resize-pane", []string{"-t", "pane:1", "-L", "7"}); err != nil {
-		t.Fatalf("resize-pane directional: %v", err)
-	}
-	if err := dispatchTmuxCommand(rc, "resize-pane", []string{"-t", "pane:1", "-R"}); err != nil {
-		t.Fatalf("resize-pane default directional: %v", err)
-	}
-	if err := dispatchTmuxCommand(rc, "resize-pane", []string{"-t", "pane:1", "-L7"}); err != nil {
-		t.Fatalf("resize-pane attached directional: %v", err)
-	}
-
-	resizeRequests := recorder.requestsFor("pane.resize")
-	if len(resizeRequests) != 5 {
-		t.Fatalf("pane.resize requests = %d, want 5", len(resizeRequests))
-	}
-	if got := resizeRequests[0].Params["absolute_axis"]; got != "horizontal" {
-		t.Fatalf("absolute resize axis = %v, want horizontal", got)
-	}
-	if got := asInt(t, resizeRequests[0].Params["target_pixels"], "absolute resize pixels"); got != 412 {
-		t.Fatalf("absolute resize pixels = %v, want 412", got)
-	}
-	if got := asInt(t, resizeRequests[0].Params["target_cells"], "absolute resize cells"); got != 100 {
-		t.Fatalf("absolute resize cells = %v, want 100", got)
-	}
-	if got := resizeRequests[0].Params["tmux_compat"]; got != true {
-		t.Fatalf("absolute resize tmux_compat = %v, want true", got)
-	}
-	if got := resizeRequests[1].Params["absolute_axis"]; got != "horizontal" {
-		t.Fatalf("percentage resize axis = %v, want horizontal", got)
-	}
-	if got := asInt(t, resizeRequests[1].Params["target_percentage"], "percentage resize target"); got != 50 {
-		t.Fatalf("percentage resize target = %v, want 50", got)
-	}
-	if got := asInt(t, resizeRequests[1].Params["target_pixels"], "percentage resize pixels"); got != 320 {
-		t.Fatalf("percentage resize pixels = %v, want 320", got)
-	}
-	if _, ok := resizeRequests[1].Params["target_cells"]; ok {
-		t.Fatalf("percentage resize unexpectedly sent target_cells")
-	}
-	if got := resizeRequests[2].Params["direction"]; got != "left" {
-		t.Fatalf("directional resize direction = %v, want left", got)
-	}
-	if got := asInt(t, resizeRequests[2].Params["amount"], "directional resize amount"); got != 28 {
-		t.Fatalf("directional resize amount = %v, want 28", got)
-	}
-	if got := asInt(t, resizeRequests[2].Params["amount_cells"], "directional resize cells"); got != 7 {
-		t.Fatalf("directional resize cells = %v, want 7", got)
-	}
-	if got := resizeRequests[2].Params["tmux_compat"]; got != true {
-		t.Fatalf("directional resize tmux_compat = %v, want true", got)
-	}
-	if got := resizeRequests[3].Params["direction"]; got != "right" {
-		t.Fatalf("default directional resize direction = %v, want right", got)
-	}
-	if got := asInt(t, resizeRequests[3].Params["amount_cells"], "default directional resize cells"); got != 1 {
-		t.Fatalf("default directional resize cells = %v, want 1", got)
-	}
-	if got := asInt(t, resizeRequests[3].Params["amount"], "default directional resize amount"); got != 4 {
-		t.Fatalf("default directional resize amount = %v, want 4", got)
-	}
-	if got := resizeRequests[4].Params["direction"]; got != "left" {
-		t.Fatalf("attached directional resize direction = %v, want left", got)
-	}
-	if got := asInt(t, resizeRequests[4].Params["amount_cells"], "attached directional resize cells"); got != 7 {
-		t.Fatalf("attached directional resize cells = %v, want 7", got)
-	}
-	if got := asInt(t, resizeRequests[4].Params["amount"], "attached directional resize amount"); got != 28 {
-		t.Fatalf("attached directional resize amount = %v, want 28", got)
-	}
-}
-
-func TestTmuxCorpusExactAbsoluteResizeDoesNotRequirePaneMetrics(t *testing.T) {
-	recorder := startTmuxCorpusRPCRecorderWithPaneMetrics(t, false)
-	rc := &rpcContext{socketPath: recorder.socketPath}
-
-	if err := dispatchTmuxCommand(rc, "resize-pane", []string{"-t", "pane:1", "-x", "3"}); err != nil {
-		t.Fatalf("resize-pane cells without metrics: %v", err)
-	}
-	if err := dispatchTmuxCommand(rc, "resize-pane", []string{"-t", "pane:1", "-x", "50%"}); err != nil {
-		t.Fatalf("resize-pane percentage without metrics: %v", err)
-	}
-	if err := dispatchTmuxCommand(rc, "resize-pane", []string{"-t", "pane:1", "-L7"}); err != nil {
-		t.Fatalf("resize-pane relative without metrics: %v", err)
-	}
-
-	requests := recorder.requestsFor("pane.resize")
-	if len(requests) != 3 {
-		t.Fatalf("pane.resize requests = %d, want 3", len(requests))
-	}
-	if got := asInt(t, requests[0].Params["target_cells"], "cell target"); got != 3 {
-		t.Fatalf("target_cells = %v, want 3", got)
-	}
-	if _, ok := requests[0].Params["target_pixels"]; ok {
-		t.Fatalf("cell resize unexpectedly sent target_pixels")
-	}
-	if got := asInt(t, requests[1].Params["target_percentage"], "percentage target"); got != 50 {
-		t.Fatalf("target_percentage = %v, want 50", got)
-	}
-	if _, ok := requests[1].Params["target_pixels"]; ok {
-		t.Fatalf("percentage resize unexpectedly sent target_pixels")
-	}
-	if got := asInt(t, requests[2].Params["amount_cells"], "relative cells"); got != 7 {
-		t.Fatalf("amount_cells = %v, want 7", got)
-	}
-	if _, ok := requests[2].Params["amount"]; ok {
-		t.Fatalf("relative resize unexpectedly sent amount")
-	}
-}
-
-func TestTmuxCorpusPixelMetricsDoNotBecomePointFallbacks(t *testing.T) {
-	recorder := startTmuxCorpusRPCRecorderWithMetricAvailability(t, true, false, true)
-	rc := &rpcContext{socketPath: recorder.socketPath}
-
-	if err := dispatchTmuxCommand(rc, "resize-pane", []string{"-t", "pane:1", "-x", "3"}); err != nil {
-		t.Fatalf("resize-pane cells with pixel-only metrics: %v", err)
-	}
-	if err := dispatchTmuxCommand(rc, "resize-pane", []string{"-t", "pane:1", "-x", "50%"}); err != nil {
-		t.Fatalf("resize-pane percentage with pixel-only metrics: %v", err)
-	}
-	if err := dispatchTmuxCommand(rc, "resize-pane", []string{"-t", "pane:1", "-L7"}); err != nil {
-		t.Fatalf("resize-pane relative with pixel-only metrics: %v", err)
-	}
-
-	requests := recorder.requestsFor("pane.resize")
-	if len(requests) != 3 {
-		t.Fatalf("pane.resize requests = %d, want 3", len(requests))
-	}
-	if got := asInt(t, requests[0].Params["target_cells"], "cell target"); got != 3 {
-		t.Fatalf("target_cells = %v, want 3", got)
-	}
-	if _, ok := requests[0].Params["target_pixels"]; ok {
-		t.Fatalf("cell resize used pixel metrics as point fallback")
-	}
-	if got := asInt(t, requests[1].Params["target_percentage"], "percentage target"); got != 50 {
-		t.Fatalf("target_percentage = %v, want 50", got)
-	}
-	if got := asInt(t, requests[1].Params["target_pixels"], "percentage points"); got != 320 {
-		t.Fatalf("target_pixels = %v, want 320", got)
-	}
-	if got := asInt(t, requests[2].Params["amount_cells"], "relative cells"); got != 7 {
-		t.Fatalf("amount_cells = %v, want 7", got)
-	}
-	if _, ok := requests[2].Params["amount"]; ok {
-		t.Fatalf("relative resize used pixel metrics as point fallback")
-	}
-}
-
-func TestTmuxCorpusPercentageWithoutContainerFrameOmitsPointFallback(t *testing.T) {
-	recorder := startTmuxCorpusRPCRecorderWithMetricAvailability(t, true, true, false)
-	rc := &rpcContext{socketPath: recorder.socketPath}
-
-	if err := dispatchTmuxCommand(rc, "resize-pane", []string{"-t", "pane:1", "-x", "50%"}); err != nil {
-		t.Fatalf("resize-pane percentage without container frame: %v", err)
-	}
-
-	requests := recorder.requestsFor("pane.resize")
-	if len(requests) != 1 {
-		t.Fatalf("pane.resize requests = %d, want 1", len(requests))
-	}
-	if got := asInt(t, requests[0].Params["target_percentage"], "percentage target"); got != 50 {
-		t.Fatalf("target_percentage = %v, want 50", got)
-	}
-	if _, ok := requests[0].Params["target_pixels"]; ok {
-		t.Fatalf("percentage resize without container frame sent target_pixels")
-	}
-}
-
-func TestTmuxCorpusTmuxOnlyFeaturesFailExplicitlyOrNoOpDeliberately(t *testing.T) {
-	unsupported := []string{
-		"copy-mode",
-		"if-shell",
-		"run-shell",
-		"choose-tree",
-		"display-popup",
-	}
-	for _, command := range unsupported {
-		t.Run(command, func(t *testing.T) {
-			err := dispatchTmuxCommand(nil, command, nil)
-			if err == nil {
-				t.Fatalf("%s should not be silently treated as supported", command)
-			}
-			if !strings.Contains(err.Error(), "unsupported") {
-				t.Fatalf("%s error = %q, want unsupported", command, err.Error())
-			}
-		})
-	}
-
-	deliberateNoOps := []string{"source-file", "set-option", "set-window-option", "refresh-client"}
-	for _, command := range deliberateNoOps {
-		t.Run(command, func(t *testing.T) {
-			if err := dispatchTmuxCommand(nil, command, []string{"ignored"}); err != nil {
-				t.Fatalf("%s should remain a deliberate compatibility no-op: %v", command, err)
-			}
-		})
-	}
-}
diff --git a/daemon/remote/cmd/cmuxd-remote/tmux_corpus_fuzz_test.go b/daemon/remote/cmd/cmuxd-remote/tmux_corpus_fuzz_test.go
deleted file mode 100644
index 37502674de38..000000000000
--- a/daemon/remote/cmd/cmuxd-remote/tmux_corpus_fuzz_test.go
+++ /dev/null
@@ -1,97 +0,0 @@
-package main
-
-import (
-	"encoding/json"
-	"strings"
-	"testing"
-)
-
-func FuzzTmuxCompatArgParser(f *testing.F) {
-	for _, seed := range []string{
-		`new-session -d -s build -c /tmp echo ok`,
-		`split-window -h -P -F #{pane_id}`,
-		`capture-pane -p -S -2000`,
-		`display-message -p -F #{session_name}:#{window_name}:#{pane_id}`,
-		`-L cmux has-session -t main`,
-		`-- send-keys -l C-c Enter`,
-	} {
-		f.Add(seed)
-	}
-
-	f.Fuzz(func(t *testing.T, input string) {
-		fields := strings.Fields(input)
-		_, _, _ = splitTmuxCmd(fields)
-		// The first list contains tmux flags that require values, and the second contains flag-only options.
-		// Keep both lists in sync with parseTmuxArgs coverage and the source-named tmux corpus tests.
-		_ = parseTmuxArgs(fields, []string{"-c", "-F", "-n", "-s", "-t", "-x", "-y", "-S", "-E"}, []string{"-A", "-b", "-d", "-D", "-h", "-J", "-L", "-N", "-p", "-P", "-R", "-U", "-v"})
-	})
-}
-
-func FuzzTmuxRenderFormatSupportedSubset(f *testing.F) {
-	for _, seed := range []string{
-		`#{session_name}`,
-		`#{window_id}:#{window_index}:#{window_name}`,
-		`#{pane_id} #{pane_width}x#{pane_height}`,
-		`#{unknown} #{session_name} #{also_unknown}`,
-		`#[fg=#ff0000]#{pane_id}`,
-	} {
-		f.Add(seed)
-	}
-
-	ctx := map[string]string{
-		"session_name": "cmux",
-		"window_id":    "@workspace",
-		"window_index": "1",
-		"window_name":  "main",
-		"pane_id":      "%pane",
-		"pane_width":   "120",
-		"pane_height":  "40",
-	}
-
-	f.Fuzz(func(t *testing.T, format string) {
-		_ = tmuxRenderFormat(format, ctx, "fallback")
-	})
-}
-
-func FuzzTmuxSendKeysTokens(f *testing.F) {
-	for _, seed := range []string{
-		`Enter`,
-		`C-c C-d C-z C-l`,
-		`Escape Tab BSpace`,
-		`printf hello Enter`,
-		`38;2;255;0;0m OSC 11 truecolor`,
-	} {
-		f.Add(seed, false)
-		f.Add(seed, true)
-	}
-
-	f.Fuzz(func(t *testing.T, input string, literal bool) {
-		_ = tmuxSendKeysText(strings.Fields(input), literal)
-	})
-}
-
-func FuzzWebSocketPTYControlFrame(f *testing.F) {
-	for _, seed := range []string{
-		`{"type":"resize","cols":80,"rows":24}`,
-		`{"type":"resize","cols":1000000,"rows":1000000}`,
-		`{"type":"close"}`,
-		`{"type":"resize","cols":-1,"rows":24}`,
-		`{"type":"\u001b[?2026$p","cols":38,"rows":2}`,
-	} {
-		f.Add(seed)
-	}
-
-	f.Fuzz(func(t *testing.T, input string) {
-		var frame wsPTYControlFrame
-		_ = json.Unmarshal([]byte(input), &frame)
-		if frame.Type == "resize" && frame.Cols > 0 && frame.Rows > 0 {
-			cols, rows := normalizePTYSize(frame.Cols, frame.Rows)
-			if cols <= 0 || rows <= 0 {
-				t.Fatalf("normalizePTYSize(%d, %d) = %dx%d, expected positive dimensions", frame.Cols, frame.Rows, cols, rows)
-			}
-			if cols > maxPTYDimension || rows > maxPTYDimension {
-				t.Fatalf("normalizePTYSize(%d, %d) = %dx%d, expected <= %d", frame.Cols, frame.Rows, cols, rows, maxPTYDimension)
-			}
-		}
-	})
-}
diff --git a/daemon/remote/cmd/cmuxd-remote/tmux_corpus_manifest_test.go b/daemon/remote/cmd/cmuxd-remote/tmux_corpus_manifest_test.go
deleted file mode 100644
index 951b0754f290..000000000000
--- a/daemon/remote/cmd/cmuxd-remote/tmux_corpus_manifest_test.go
+++ /dev/null
@@ -1,28 +0,0 @@
-package main
-
-import "testing"
-
-func TestTmuxCorpusPRLaneSourcesExerciseRuntimeBehavior(t *testing.T) {
-	cases := []struct {
-		source string
-		run    func(*testing.T)
-	}{
-		{"regress/command-order.sh", TestTmuxCorpusNewSessionAndNewWindowCommandsDispatchShellText},
-		{"regress/control-client-sanity.sh", TestTmuxCorpusHasSessionReturnSemantics},
-		{"regress/control-client-size.sh", TestTmuxCorpusWebSocketPTYInitialSizeAndResizeControl},
-		{"regress/format-strings.sh", TestTmuxCorpusFormatStringsSupportedSubset},
-		{"regress/has-session-return.sh", TestTmuxCorpusHasSessionReturnSemantics},
-		{"regress/input-keys.sh", TestTmuxCorpusSendKeysAndTTYKeyTokens},
-		{"regress/kill-session-process-exit.sh", TestWebSocketPTYRunsShellOverBinaryFrames},
-		{"regress/new-session-command.sh", TestTmuxCorpusNewSessionAndNewWindowCommandsDispatchShellText},
-		{"regress/new-session-environment.sh", TestWebSocketPTYSeedsUTF8LocaleAndTerminalEnv},
-		{"regress/new-session-no-client.sh", TestTmuxCorpusNewSessionAndNewWindowCommandsDispatchShellText},
-		{"regress/new-session-size.sh", TestTmuxCorpusWebSocketPTYInitialSizeAndResizeControl},
-		{"regress/new-window-command.sh", TestTmuxCorpusNewSessionAndNewWindowCommandsDispatchShellText},
-		{"regress/session-group-resize.sh", TestWebSocketPTYMultiAttachUsesSmallestResize},
-	}
-
-	for _, tc := range cases {
-		t.Run(tc.source, tc.run)
-	}
-}
diff --git a/daemon/remote/cmd/cmuxd-remote/tmux_corpus_ws_pty_test.go b/daemon/remote/cmd/cmuxd-remote/tmux_corpus_ws_pty_test.go
deleted file mode 100644
index 24dbf6bed28d..000000000000
--- a/daemon/remote/cmd/cmuxd-remote/tmux_corpus_ws_pty_test.go
+++ /dev/null
@@ -1,87 +0,0 @@
-package main
-
-import (
-	"bytes"
-	"context"
-	"encoding/json"
-	"net/http/httptest"
-	"path/filepath"
-	"strings"
-	"testing"
-	"time"
-
-	"nhooyr.io/websocket"
-)
-
-func TestTmuxCorpusWebSocketPTYInitialSizeAndResizeControl(t *testing.T) {
-	leasePath := filepath.Join(t.TempDir(), "lease.json")
-	server := httptest.NewServer(newWebSocketPTYHandler(wsPTYServerConfig{
-		PTYAuthLeaseFile: leasePath,
-		Shell:            "/bin/sh",
-	}, &bytes.Buffer{}))
-	defer server.Close()
-
-	ctx, cancel := context.WithTimeout(context.Background(), 15*time.Second)
-	defer cancel()
-
-	writeTestLease(t, leasePath, "size-token", "sess-size", true, time.Now().Add(time.Minute))
-	conn := dialPTY(t, ctx, server.URL)
-	defer conn.Close(websocket.StatusNormalClosure, "done")
-	sendAuth(t, ctx, conn, "size-token", "sess-size", 40, 10)
-
-	msgType, payload, err := conn.Read(ctx)
-	if err != nil {
-		t.Fatalf("read ready: %v", err)
-	}
-	if msgType != websocket.MessageText || !strings.Contains(string(payload), `"ready"`) {
-		t.Fatalf("first frame should be ready text, type=%v payload=%q", msgType, string(payload))
-	}
-
-	if err := conn.Write(ctx, websocket.MessageBinary, []byte("printf 'SIZE1:'; stty size\r")); err != nil {
-		t.Fatalf("write first size probe: %v", err)
-	}
-	output := readPTYBinaryUntil(t, ctx, conn, "SIZE1:10 40")
-
-	resize, err := json.Marshal(wsPTYControlFrame{Type: "resize", Cols: 100, Rows: 31})
-	if err != nil {
-		t.Fatalf("marshal resize: %v", err)
-	}
-	if err := conn.Write(ctx, websocket.MessageText, resize); err != nil {
-		t.Fatalf("write resize control frame: %v", err)
-	}
-	if err := conn.Write(ctx, websocket.MessageBinary, []byte("printf 'SIZE2:'; stty size; exit\r")); err != nil {
-		t.Fatalf("write second size probe: %v", err)
-	}
-	output += readPTYBinaryUntil(t, ctx, conn, "SIZE2:31 100")
-
-	if !strings.Contains(output, "SIZE1:10 40") {
-		t.Fatalf("initial PTY size missing from output: %q", output)
-	}
-	if !strings.Contains(output, "SIZE2:31 100") {
-		t.Fatalf("resized PTY size missing from output: %q", output)
-	}
-}
-
-func readPTYBinaryUntil(t *testing.T, ctx context.Context, conn *websocket.Conn, needle string) string {
-	t.Helper()
-
-	deadline := time.Now().Add(5 * time.Second)
-	var output strings.Builder
-	for time.Now().Before(deadline) {
-		readCtx, cancel := context.WithTimeout(ctx, time.Until(deadline))
-		msgType, payload, err := conn.Read(readCtx)
-		cancel()
-		if err != nil {
-			t.Fatalf("read PTY output looking for %q: %v output=%q", needle, err, output.String())
-		}
-		if msgType != websocket.MessageBinary {
-			continue
-		}
-		output.Write(payload)
-		if strings.Contains(output.String(), needle) {
-			return output.String()
-		}
-	}
-	t.Fatalf("timed out waiting for %q in PTY output %q", needle, output.String())
-	return output.String()
-}
diff --git a/daemon/remote/cmd/cmuxd-remote/tmux_split_ref_test.go b/daemon/remote/cmd/cmuxd-remote/tmux_split_ref_test.go
deleted file mode 100644
index 1a559dec462f..000000000000
--- a/daemon/remote/cmd/cmuxd-remote/tmux_split_ref_test.go
+++ /dev/null
@@ -1,302 +0,0 @@
-package main
-
-import (
-	"bufio"
-	"encoding/json"
-	"net"
-	"os"
-	"path/filepath"
-	"testing"
-)
-
-func startMockTmuxCompatSocket(t *testing.T) string {
-	t.Helper()
-	sockPath := makeShortUnixSocketPath(t)
-	cwd := t.TempDir()
-
-	ln, err := net.Listen("unix", sockPath)
-	if err != nil {
-		t.Fatalf("failed to listen: %v", err)
-	}
-	t.Cleanup(func() { ln.Close() })
-
-	go func() {
-		splitCreated := false
-		for {
-			conn, err := ln.Accept()
-			if err != nil {
-				return
-			}
-			go func(conn net.Conn) {
-				defer conn.Close()
-				reader := bufio.NewReader(conn)
-				line, err := reader.ReadBytes('\n')
-				if err != nil {
-					return
-				}
-
-				var req map[string]any
-				if err := json.Unmarshal(line, &req); err != nil {
-					_, _ = conn.Write([]byte(`{"ok":false,"error":{"code":"parse","message":"bad json"}}` + "\n"))
-					return
-				}
-
-				method, _ := req["method"].(string)
-				params, _ := req["params"].(map[string]any)
-				resp := map[string]any{
-					"id": req["id"],
-					"ok": true,
-				}
-
-				switch method {
-				case "system.identify":
-					resp["result"] = map[string]any{
-						"focused": map[string]any{
-							"workspace_id":  "11111111-1111-4111-8111-111111111111",
-							"workspace_ref": "workspace:1",
-							"pane_id":       "pane:1",
-							"pane_ref":      "pane:1",
-							"surface_ref":   "surface:1",
-						},
-					}
-				case "workspace.list":
-					resp["result"] = map[string]any{
-						"workspaces": []map[string]any{{
-							"id":                "11111111-1111-4111-8111-111111111111",
-							"ref":               "workspace:1",
-							"index":             1,
-							"title":             "demo",
-							"active":            true,
-							"current_directory": cwd,
-						}},
-					}
-				case "surface.list":
-					surfaces := []map[string]any{{
-						"id":                          "44444444-4444-4444-8444-444444444444",
-						"ref":                         "surface:1",
-						"focused":                     "1",
-						"selected_in_pane":            "1",
-						"pane_id":                     "33333333-3333-4333-8333-333333333333",
-						"pane_ref":                    "pane:1",
-						"title":                       "leader",
-						"requested_working_directory": cwd,
-					}}
-					if splitCreated {
-						surfaces = append(surfaces, map[string]any{
-							"id":                          "77777777-7777-4777-8777-777777777777",
-							"ref":                         "surface:2",
-							"focused":                     "0",
-							"selected_in_pane":            "1",
-							"pane_id":                     "66666666-6666-4666-8666-666666666666",
-							"pane_ref":                    "pane:2",
-							"title":                       "teammate",
-							"requested_working_directory": cwd,
-						})
-					}
-					resp["result"] = map[string]any{"surfaces": surfaces}
-				case "surface.current":
-					resp["result"] = map[string]any{
-						"workspace_id":  "11111111-1111-4111-8111-111111111111",
-						"workspace_ref": "workspace:1",
-						"pane_id":       "33333333-3333-4333-8333-333333333333",
-						"pane_ref":      "pane:1",
-						"surface_id":    "44444444-4444-4444-8444-444444444444",
-						"surface_ref":   "surface:1",
-					}
-				case "pane.list":
-					panes := []map[string]any{{
-						"id":                  "33333333-3333-4333-8333-333333333333",
-						"ref":                 "pane:1",
-						"index":               1,
-						"focused":             "1",
-						"columns":             120,
-						"rows":                40,
-						"cell_width_px":       10,
-						"cell_height_px":      20,
-						"pixel_frame":         map[string]any{"x": 0, "y": 0, "width": 1200, "height": 800},
-						"surface_ids":         []any{"44444444-4444-4444-8444-444444444444"},
-						"surface_refs":        []any{"surface:1"},
-						"surface_count":       1,
-						"selected_surface_id": "44444444-4444-4444-8444-444444444444",
-					}}
-					if splitCreated {
-						panes = append(panes, map[string]any{
-							"id":                  "66666666-6666-4666-8666-666666666666",
-							"ref":                 "pane:2",
-							"index":               2,
-							"focused":             "0",
-							"columns":             120,
-							"rows":                40,
-							"cell_width_px":       10,
-							"cell_height_px":      20,
-							"pixel_frame":         map[string]any{"x": 1200, "y": 0, "width": 1200, "height": 800},
-							"surface_ids":         []any{"77777777-7777-4777-8777-777777777777"},
-							"surface_refs":        []any{"surface:2"},
-							"surface_count":       1,
-							"selected_surface_id": "77777777-7777-4777-8777-777777777777",
-						})
-					}
-					resp["result"] = map[string]any{
-						"panes":           panes,
-						"container_frame": map[string]any{"width": 1200, "height": 800},
-					}
-				case "pane.surfaces":
-					paneId, _ := params["pane_id"].(string)
-					surface := map[string]any{
-						"id":       "44444444-4444-4444-8444-444444444444",
-						"ref":      "surface:1",
-						"selected": "1",
-						"focused":  "1",
-					}
-					if paneId == "66666666-6666-4666-8666-666666666666" || paneId == "pane:2" {
-						surface = map[string]any{
-							"id":       "77777777-7777-4777-8777-777777777777",
-							"ref":      "surface:2",
-							"selected": "1",
-							"focused":  "0",
-						}
-					}
-					resp["result"] = map[string]any{"surfaces": []map[string]any{surface}}
-				case "surface.split":
-					if got, _ := params["surface_id"].(string); got != "44444444-4444-4444-8444-444444444444" {
-						resp["ok"] = false
-						resp["error"] = map[string]any{
-							"code":    "not_found",
-							"message": "Surface not found",
-						}
-						break
-					}
-					splitCreated = true
-					resp["result"] = map[string]any{
-						"surface_id": "77777777-7777-4777-8777-777777777777",
-						"pane_id":    "66666666-6666-4666-8666-666666666666",
-					}
-				case "workspace.equalize_splits":
-					resp["result"] = map[string]any{"ok": true}
-				default:
-					resp["ok"] = false
-					resp["error"] = map[string]any{
-						"code":    "unsupported",
-						"message": method,
-					}
-				}
-
-				payload, _ := json.Marshal(resp)
-				_, _ = conn.Write(append(payload, '\n'))
-			}(conn)
-		}
-	}()
-
-	return sockPath
-}
-
-func TestTmuxSplitWindowCanonicalizesCallerSurfaceRefs(t *testing.T) {
-	origHome := os.Getenv("HOME")
-	origWorkspace := os.Getenv("CMUX_WORKSPACE_ID")
-	origSurface := os.Getenv("CMUX_SURFACE_ID")
-	origPane := os.Getenv("TMUX_PANE")
-	os.Setenv("HOME", t.TempDir())
-	os.Setenv("CMUX_WORKSPACE_ID", "workspace:1")
-	os.Setenv("CMUX_SURFACE_ID", "surface:1")
-	os.Setenv("TMUX_PANE", "%"+tmuxStableNumericId("33333333-3333-4333-8333-333333333333"))
-	defer func() {
-		os.Setenv("HOME", origHome)
-		if origWorkspace != "" {
-			os.Setenv("CMUX_WORKSPACE_ID", origWorkspace)
-		} else {
-			os.Unsetenv("CMUX_WORKSPACE_ID")
-		}
-		if origSurface != "" {
-			os.Setenv("CMUX_SURFACE_ID", origSurface)
-		} else {
-			os.Unsetenv("CMUX_SURFACE_ID")
-		}
-		if origPane != "" {
-			os.Setenv("TMUX_PANE", origPane)
-		} else {
-			os.Unsetenv("TMUX_PANE")
-		}
-	}()
-
-	sockPath := startMockTmuxCompatSocket(t)
-	rc := &rpcContext{socketPath: sockPath}
-
-	output := captureStdout(t, func() {
-		if err := dispatchTmuxCommand(rc, "split-window", []string{"-h", "-P", "-F", "#{pane_id}"}); err != nil {
-			t.Fatalf("split-window: %v", err)
-		}
-	})
-
-	want := "%" + tmuxStableNumericId("66666666-6666-4666-8666-666666666666") + "\n"
-	if got := output; got != want {
-		t.Fatalf("stdout = %q, want %q", got, want)
-	}
-}
-
-func TestTmuxSplitWindowIgnoresStaleUUIDColumnSurface(t *testing.T) {
-	origHome := os.Getenv("HOME")
-	origWorkspace := os.Getenv("CMUX_WORKSPACE_ID")
-	origSurface := os.Getenv("CMUX_SURFACE_ID")
-	origPane := os.Getenv("TMUX_PANE")
-	home := t.TempDir()
-	os.Setenv("HOME", home)
-	os.Setenv("CMUX_WORKSPACE_ID", "workspace:1")
-	os.Setenv("CMUX_SURFACE_ID", "surface:1")
-	os.Setenv("TMUX_PANE", "%"+tmuxStableNumericId("33333333-3333-4333-8333-333333333333"))
-	defer func() {
-		os.Setenv("HOME", origHome)
-		if origWorkspace != "" {
-			os.Setenv("CMUX_WORKSPACE_ID", origWorkspace)
-		} else {
-			os.Unsetenv("CMUX_WORKSPACE_ID")
-		}
-		if origSurface != "" {
-			os.Setenv("CMUX_SURFACE_ID", origSurface)
-		} else {
-			os.Unsetenv("CMUX_SURFACE_ID")
-		}
-		if origPane != "" {
-			os.Setenv("TMUX_PANE", origPane)
-		} else {
-			os.Unsetenv("TMUX_PANE")
-		}
-	}()
-
-	storePath := filepath.Join(home, ".cmuxterm", "tmux-compat-store.json")
-	if err := os.MkdirAll(filepath.Dir(storePath), 0o755); err != nil {
-		t.Fatalf("mkdir store dir: %v", err)
-	}
-	storeBytes, err := json.Marshal(tmuxCompatStore{
-		Buffers: make(map[string]string),
-		Hooks:   make(map[string]string),
-		MainVerticalLayouts: map[string]mainVerticalState{
-			"11111111-1111-4111-8111-111111111111": {
-				MainSurfaceId:       "44444444-4444-4444-8444-444444444444",
-				LastColumnSurfaceId: "77777777-7777-4777-8777-777777777777",
-			},
-		},
-		LastSplitSurface: map[string]string{
-			"11111111-1111-4111-8111-111111111111": "77777777-7777-4777-8777-777777777777",
-		},
-	})
-	if err != nil {
-		t.Fatalf("marshal store: %v", err)
-	}
-	if err := os.WriteFile(storePath, storeBytes, 0o644); err != nil {
-		t.Fatalf("write store: %v", err)
-	}
-
-	sockPath := startMockTmuxCompatSocket(t)
-	rc := &rpcContext{socketPath: sockPath}
-
-	output := captureStdout(t, func() {
-		if err := dispatchTmuxCommand(rc, "split-window", []string{"-h", "-P", "-F", "#{pane_id}"}); err != nil {
-			t.Fatalf("split-window: %v", err)
-		}
-	})
-
-	want := "%" + tmuxStableNumericId("66666666-6666-4666-8666-666666666666") + "\n"
-	if got := output; got != want {
-		t.Fatalf("stdout = %q, want %q", got, want)
-	}
-}
diff --git a/daemon/remote/cmd/cmuxd-remote/ws_pty.go b/daemon/remote/cmd/cmuxd-remote/ws_pty.go
deleted file mode 100644
index cbf6bb9c7053..000000000000
--- a/daemon/remote/cmd/cmuxd-remote/ws_pty.go
+++ /dev/null
@@ -1,2616 +0,0 @@
-package main
-
-import (
-	"bytes"
-	"context"
-	"crypto/ed25519"
-	"crypto/sha256"
-	"crypto/subtle"
-	"encoding/base64"
-	"encoding/hex"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io"
-	"net"
-	"net/http"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"sort"
-	"strconv"
-	"strings"
-	"sync"
-	"syscall"
-	"time"
-	"unicode/utf8"
-	"unsafe"
-
-	"github.com/creack/pty"
-	"nhooyr.io/websocket"
-)
-
-type wsPTYServerConfig struct {
-	ListenAddr          string
-	PTYAuthLeaseFile    string
-	RPCAuthLeaseFile    string
-	AdminTokenSHA256    string
-	AdminEd25519PubKey  string
-	CLIBridgeSocketPath string
-	CLIBridge           *cloudCLIBridge
-	Shell               string
-	PTYHub              *wsPTYHub
-	ScrollbackLimit     int
-	SessionIdleTTL      time.Duration
-}
-
-type wsLease struct {
-	Version       int    `json:"version"`
-	TokenSHA256   string `json:"token_sha256"`
-	ExpiresAtUnix int64  `json:"expires_at_unix"`
-	SessionID     string `json:"session_id,omitempty"`
-	SingleUse     bool   `json:"single_use"`
-}
-
-type wsLeaseInstallRequest struct {
-	PTYLease  *wsLease            `json:"pty_lease,omitempty"`
-	RPCLease  *wsLease            `json:"rpc_lease,omitempty"`
-	RPCClient *wsRPCClientPayload `json:"rpc_client,omitempty"`
-}
-
-type wsRPCClientPayload struct {
-	Token         string `json:"token"`
-	SessionID     string `json:"sessionId"`
-	ExpiresAtUnix int64  `json:"expiresAtUnix"`
-}
-
-type wsAuthFrame struct {
-	Type              string `json:"type"`
-	Token             string `json:"token"`
-	SessionID         string `json:"session_id,omitempty"`
-	AttachmentID      string `json:"attachment_id,omitempty"`
-	Cols              int    `json:"cols,omitempty"`
-	Rows              int    `json:"rows,omitempty"`
-	SessionIDExplicit bool   `json:"-"`
-}
-
-type wsPTYControlFrame struct {
-	Type string `json:"type"`
-	Cols int    `json:"cols,omitempty"`
-	Rows int    `json:"rows,omitempty"`
-}
-
-type wsPTYEventFrame struct {
-	Type         string `json:"type"`
-	SessionID    string `json:"session_id,omitempty"`
-	AttachmentID string `json:"attachment_id,omitempty"`
-	Message      string `json:"message,omitempty"`
-}
-
-type wsPTYLease = wsLease
-type wsPTYAuthFrame = wsAuthFrame
-
-var (
-	errWSLeaseMissing             = errors.New("attach lease missing")
-	errWSLeaseExpired             = errors.New("attach lease expired")
-	errWSLeaseForbidden           = errors.New("attach lease rejected")
-	errWSPTYHubClosed             = errors.New("PTY hub is closed")
-	errWSPTYStartOwnersSaturated  = errors.New("too many PTY sessions are already starting")
-	errWSPTYStartWaitersSaturated = errors.New("too many PTY session starts are already being awaited")
-	wsLeaseMu                     sync.Mutex
-)
-
-const (
-	defaultPTYCols                            = 80
-	defaultPTYRows                            = 24
-	maxPTYDimension                           = 65535
-	defaultWebSocketScrollbackCap             = 1 << 20
-	defaultWebSocketReplayChunkBytes          = 48 * 1024
-	defaultWebSocketWriteQueueCap             = 256
-	defaultPTYInputQueueCap                   = 256
-	defaultPTYInputChunkBytes                 = 16 * 1024
-	defaultWebSocketWriteTimeout              = 10 * time.Second
-	defaultWebSocketSessionIdleTTL            = 24 * time.Hour
-	defaultPTYExitDrainTimeout                = time.Second
-	maxConcurrentPTYSessionStartOwnersPerHub  = 16
-	maxConcurrentPTYSessionStartWaitersPerHub = 64
-	standardExecutablePath                    = "/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin"
-)
-
-type wsPTYOutgoingFrame struct {
-	messageType websocket.MessageType
-	payload     []byte
-	inputAck    bool
-}
-
-type wsPTYInputChunk struct {
-	attachmentID  string
-	attachment    *wsPTYAttachment
-	payload       []byte
-	seq           uint64
-	finalSeqChunk bool
-}
-
-type wsPTYInputWriteStatus uint8
-
-const (
-	wsPTYInputWriteOK wsPTYInputWriteStatus = iota
-	wsPTYInputWriteNotFound
-	wsPTYInputWriteQueueFull
-	wsPTYInputWriteSeqGap
-)
-
-type wsPTYAttachment struct {
-	sessionKey      wsPTYSessionKey
-	id              string
-	clientToken     string
-	cols            int
-	rows            int
-	send            chan wsPTYOutgoingFrame
-	cancel          context.CancelFunc
-	conn            *websocket.Conn
-	persistent      bool
-	inputSeqAck     bool
-	replayBytes     int
-	lastAcceptedSeq uint64
-	ackMu           sync.Mutex
-	ackQueued       bool
-	ackSeq          uint64
-}
-
-type wsPTYSessionKey struct {
-	kind        wsPTYSessionKind
-	sessionID   string
-	anonymousID uint64
-}
-
-type wsPTYSessionKind uint8
-
-const (
-	wsPTYPersistentSession wsPTYSessionKind = iota
-	wsPTYAnonymousSession
-)
-
-type wsPTYSessionInitialPhase uint8
-
-// The initial phase keeps a process that exits during attach startup claimable,
-// but not live, until every coalesced caller can observe ready + exit.
-const (
-	wsPTYSessionInitialActive wsPTYSessionInitialPhase = iota
-	wsPTYSessionAwaitingInitialAttachment
-	wsPTYSessionFinishedBeforeInitialAttachment
-)
-
-func persistentPTYSessionKey(sessionID string) wsPTYSessionKey {
-	return wsPTYSessionKey{kind: wsPTYPersistentSession, sessionID: sessionID}
-}
-
-func anonymousPTYSessionKey(sessionID string, anonymousID uint64) wsPTYSessionKey {
-	return wsPTYSessionKey{kind: wsPTYAnonymousSession, sessionID: sessionID, anonymousID: anonymousID}
-}
-
-type wsPTYSession struct {
-	id             string
-	key            wsPTYSessionKey
-	cmd            *exec.Cmd
-	tmpScript      string // temp file path for large startup scripts; cleaned up on exit
-	ptyFile        *os.File
-	ttyFile        *os.File
-	attachments    map[string]*wsPTYAttachment
-	effectiveCols  int
-	effectiveRows  int
-	lastKnownCols  int
-	lastKnownRows  int
-	resizeConfirms int
-	scrollback     []byte
-	input          chan wsPTYInputChunk
-	inputEnqueueMu sync.Mutex
-	done           chan struct{}
-	idleTimer      *time.Timer
-	closed         bool
-	ptyWriteMu     sync.Mutex
-	ptyFileMu      sync.Mutex
-	closeTTYOnce   sync.Once
-	closePTYOnce   sync.Once
-	terminateOnce  sync.Once
-	initialPhase   wsPTYSessionInitialPhase
-	// initialClaims counts the start owner and live joiners that must consume
-	// this exact generation rather than interpreting an early exit as absence.
-	initialClaims int
-}
-
-type wsPTYSessionStart struct {
-	done    chan struct{}
-	err     error
-	session *wsPTYSession
-	// waiters retains the contexts of joiners until the owner publishes or
-	// discards the completed start. Publication marks only contexts that are
-	// still live as initial claimants, linearizing disconnect against publish.
-	waiters        map[*wsPTYSessionStartWaiter]struct{}
-	closeRequested bool
-}
-
-type wsPTYSessionStartWaiter struct {
-	ctx     context.Context
-	claimed bool
-}
-
-type wsPTYHub struct {
-	mu       sync.Mutex
-	sessions map[wsPTYSessionKey]*wsPTYSession
-	// startingSessions reserves a session key while PTY allocation and process
-	// startup run without mu. Callers for the same key join that start; callers
-	// for healthy or unrelated sessions never wait behind it.
-	startingSessions map[wsPTYSessionKey]*wsPTYSessionStart
-	// PTY startup is not context-cancellable once inside the operating system,
-	// so bound the number of start owners that can survive client teardown.
-	sessionStartSlots chan struct{}
-	// Multiple RPC connections share one persistent hub. Bound joiners here,
-	// rather than only per connection, so one stalled same-session start cannot
-	// retain unbounded goroutines across reconnect churn.
-	sessionStartWaiterSlots chan struct{}
-	// sessionTeardownCount keeps a session active for daemon-retirement
-	// decisions after the idle reaper removes it from sessions and until its
-	// processes and PTY files are fully torn down. sessionTeardowns lets
-	// closeAll wait for that same ownership boundary before the process exits.
-	sessionTeardownCount int
-	sessionTeardowns     sync.WaitGroup
-	closed               bool
-	closedCh             chan struct{}
-	nextAttachmentID     uint64
-	nextAnonymousID      uint64
-	shell                string
-	stderr               io.Writer
-	scrollbackLimit      int
-	sessionIdleTTL       time.Duration
-	// openPTY allocates a PTY master/slave pair. It defaults to creack/pty.Open
-	// (which opens /dev/ptmx) and exists as a field so tests can simulate a
-	// hardened devpts where allocation is denied.
-	openPTY ptyOpener
-}
-
-// ptyOpener allocates a PTY master/slave pair, returning the master (ptmx) and
-// slave (tty) ends. The production implementation is creack/pty.Open.
-type ptyOpener func() (ptmx *os.File, tty *os.File, err error)
-
-func newWebSocketPTYHub(cfg wsPTYServerConfig, stderr io.Writer) *wsPTYHub {
-	limit := cfg.ScrollbackLimit
-	if limit <= 0 {
-		limit = defaultWebSocketScrollbackCap
-	}
-	idleTTL := cfg.SessionIdleTTL
-	if idleTTL <= 0 {
-		idleTTL = defaultWebSocketSessionIdleTTL
-	}
-	return &wsPTYHub{
-		sessions:                map[wsPTYSessionKey]*wsPTYSession{},
-		startingSessions:        map[wsPTYSessionKey]*wsPTYSessionStart{},
-		sessionStartSlots:       make(chan struct{}, maxConcurrentPTYSessionStartOwnersPerHub),
-		sessionStartWaiterSlots: make(chan struct{}, maxConcurrentPTYSessionStartWaitersPerHub),
-		closedCh:                make(chan struct{}),
-		shell:                   strings.TrimSpace(cfg.Shell),
-		stderr:                  stderr,
-		scrollbackLimit:         limit,
-		sessionIdleTTL:          idleTTL,
-		openPTY:                 pty.Open,
-	}
-}
-
-func runWebSocketPTYServer(ctx context.Context, cfg wsPTYServerConfig, stderr io.Writer) error {
-	addr := cfg.ListenAddr
-	if strings.TrimSpace(addr) == "" {
-		addr = "127.0.0.1:7777"
-	}
-	if strings.TrimSpace(cfg.PTYAuthLeaseFile) == "" {
-		return errors.New("auth lease file is required")
-	}
-	if cfg.PTYHub == nil {
-		cfg.PTYHub = newWebSocketPTYHub(cfg, stderr)
-	}
-	defer cfg.PTYHub.closeAll()
-	if strings.TrimSpace(cfg.RPCAuthLeaseFile) != "" {
-		if cfg.CLIBridge == nil {
-			cfg.CLIBridge = newCloudCLIBridge()
-		}
-		if err := cfg.CLIBridge.start(ctx, cfg.CLIBridgeSocketPath, stderr); err != nil {
-			return fmt.Errorf("cloud CLI bridge: %w", err)
-		}
-	}
-
-	listener, err := net.Listen("tcp", addr)
-	if err != nil {
-		return err
-	}
-	defer listener.Close()
-
-	server := &http.Server{
-		Handler:           newWebSocketPTYHandler(cfg, stderr),
-		ReadHeaderTimeout: 5 * time.Second,
-	}
-	go func() {
-		<-ctx.Done()
-		shutdownCtx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
-		defer cancel()
-		_ = server.Shutdown(shutdownCtx)
-	}()
-
-	_, _ = fmt.Fprintf(stderr, "cmuxd-remote ws listening on %s\n", listener.Addr().String())
-	err = server.Serve(listener)
-	if errors.Is(err, http.ErrServerClosed) {
-		return nil
-	}
-	return err
-}
-
-func newWebSocketPTYHandler(cfg wsPTYServerConfig, stderr io.Writer) http.Handler {
-	if cfg.PTYHub == nil {
-		cfg.PTYHub = newWebSocketPTYHub(cfg, stderr)
-	}
-
-	mux := http.NewServeMux()
-	mux.HandleFunc("/healthz", func(w http.ResponseWriter, _ *http.Request) {
-		_, statErr := os.Stat(cfg.PTYAuthLeaseFile)
-		locked := statErr != nil
-		w.Header().Set("content-type", "application/json")
-		_ = json.NewEncoder(w).Encode(map[string]any{
-			"ok":     true,
-			"locked": locked,
-		})
-	})
-	mux.HandleFunc("/terminal", func(w http.ResponseWriter, r *http.Request) {
-		handleWebSocketPTY(w, r, cfg, stderr)
-	})
-	mux.HandleFunc("/rpc", func(w http.ResponseWriter, r *http.Request) {
-		handleWebSocketRPC(w, r, cfg)
-	})
-	mux.HandleFunc("/admin/leases", func(w http.ResponseWriter, r *http.Request) {
-		handleWebSocketLeaseInstall(w, r, cfg)
-	})
-	return mux
-}
-
-func handleWebSocketLeaseInstall(w http.ResponseWriter, r *http.Request, cfg wsPTYServerConfig) {
-	if r.Method != http.MethodPost {
-		http.Error(w, "method not allowed", http.StatusMethodNotAllowed)
-		return
-	}
-	expectedHash, err := hex.DecodeString(strings.TrimSpace(cfg.AdminTokenSHA256))
-	publicKey, publicKeyErr := decodeAdminEd25519PublicKey(cfg.AdminEd25519PubKey)
-	if (err != nil || len(expectedHash) != sha256.Size) && publicKeyErr != nil {
-		http.Error(w, "lease install disabled", http.StatusNotFound)
-		return
-	}
-	defer r.Body.Close()
-	body, err := io.ReadAll(io.LimitReader(r.Body, 1<<20))
-	if err != nil {
-		http.Error(w, "read body failed", http.StatusBadRequest)
-		return
-	}
-	if !verifyAdminLeaseInstallAuth(r, body, expectedHash, publicKey) {
-		http.Error(w, "forbidden", http.StatusForbidden)
-		return
-	}
-	var request wsLeaseInstallRequest
-	if err := json.Unmarshal(body, &request); err != nil {
-		http.Error(w, "invalid JSON", http.StatusBadRequest)
-		return
-	}
-	if request.PTYLease == nil && request.RPCLease == nil {
-		http.Error(w, "missing lease", http.StatusBadRequest)
-		return
-	}
-	if request.PTYLease != nil {
-		if err := writeLeaseFile(cfg.PTYAuthLeaseFile, request.PTYLease); err != nil {
-			http.Error(w, "write pty lease failed", http.StatusInternalServerError)
-			return
-		}
-	}
-	if request.RPCLease != nil {
-		if strings.TrimSpace(cfg.RPCAuthLeaseFile) == "" {
-			http.Error(w, "rpc lease disabled", http.StatusBadRequest)
-			return
-		}
-		if err := writeLeaseFile(cfg.RPCAuthLeaseFile, request.RPCLease); err != nil {
-			http.Error(w, "write rpc lease failed", http.StatusInternalServerError)
-			return
-		}
-	}
-	if request.RPCClient != nil {
-		if err := writeJSONFile("/tmp/cmux/attach-rpc-client.json", request.RPCClient); err != nil {
-			http.Error(w, "write rpc client failed", http.StatusInternalServerError)
-			return
-		}
-	}
-	w.Header().Set("content-type", "application/json")
-	_, _ = w.Write([]byte(`{"ok":true}`))
-}
-
-func decodeAdminEd25519PublicKey(raw string) (ed25519.PublicKey, error) {
-	trimmed := strings.TrimSpace(raw)
-	if trimmed == "" {
-		return nil, errors.New("missing ed25519 public key")
-	}
-	decoded, err := base64.StdEncoding.DecodeString(trimmed)
-	if err != nil {
-		decoded, err = base64.RawStdEncoding.DecodeString(trimmed)
-	}
-	if err != nil || len(decoded) != ed25519.PublicKeySize {
-		return nil, errors.New("invalid ed25519 public key")
-	}
-	return ed25519.PublicKey(decoded), nil
-}
-
-func verifyAdminLeaseInstallAuth(r *http.Request, body []byte, expectedHash []byte, publicKey ed25519.PublicKey) bool {
-	const bearerPrefix = "Bearer "
-	auth := r.Header.Get("Authorization")
-	if len(expectedHash) == sha256.Size && strings.HasPrefix(auth, bearerPrefix) {
-		actualHash := sha256.Sum256([]byte(strings.TrimPrefix(auth, bearerPrefix)))
-		if subtle.ConstantTimeCompare(expectedHash, actualHash[:]) == 1 {
-			return true
-		}
-	}
-	if len(publicKey) == ed25519.PublicKeySize {
-		signatureRaw := strings.TrimSpace(r.Header.Get("X-Cmux-Admin-Signature-Ed25519"))
-		signature, err := base64.StdEncoding.DecodeString(signatureRaw)
-		if err != nil {
-			signature, err = base64.RawStdEncoding.DecodeString(signatureRaw)
-		}
-		if err == nil && len(signature) == ed25519.SignatureSize && ed25519.Verify(publicKey, body, signature) {
-			return true
-		}
-	}
-	return false
-}
-
-func writeLeaseFile(path string, lease *wsLease) error {
-	if strings.TrimSpace(path) == "" {
-		return errors.New("lease path is empty")
-	}
-	return writeJSONFile(path, lease)
-}
-
-func writeJSONFile(path string, value any) error {
-	dir := filepath.Dir(path)
-	if err := os.MkdirAll(dir, 0o700); err != nil {
-		return err
-	}
-	data, err := json.Marshal(value)
-	if err != nil {
-		return err
-	}
-	data = append(data, '\n')
-	return os.WriteFile(path, data, 0o600)
-}
-
-func handleWebSocketPTY(w http.ResponseWriter, r *http.Request, cfg wsPTYServerConfig, stderr io.Writer) {
-	conn, err := websocket.Accept(w, r, &websocket.AcceptOptions{
-		CompressionMode: websocket.CompressionDisabled,
-	})
-	if err != nil {
-		return
-	}
-	defer conn.Close(websocket.StatusInternalError, "closed")
-	conn.SetReadLimit(1 << 20)
-
-	authCtx, cancelAuth := context.WithTimeout(r.Context(), 5*time.Second)
-	msgType, payload, err := conn.Read(authCtx)
-	cancelAuth()
-	if err != nil {
-		_ = conn.Close(websocket.StatusPolicyViolation, "auth required")
-		return
-	}
-	if msgType != websocket.MessageText {
-		_ = conn.Close(websocket.StatusUnsupportedData, "auth must be text JSON")
-		return
-	}
-
-	var auth wsAuthFrame
-	if err := json.Unmarshal(payload, &auth); err != nil || auth.Type != "auth" || auth.Token == "" {
-		_ = conn.Close(websocket.StatusPolicyViolation, "invalid auth")
-		return
-	}
-	auth.SessionID = strings.TrimSpace(auth.SessionID)
-	auth.SessionIDExplicit = auth.SessionID != ""
-	auth.Cols, auth.Rows = normalizePTYSize(auth.Cols, auth.Rows)
-	if auth.SessionID == "" {
-		auth.SessionID = "default"
-	}
-
-	if err := consumeWebSocketLease(cfg.PTYAuthLeaseFile, auth); err != nil {
-		if errors.Is(err, errWSLeaseMissing) {
-			_ = conn.Close(websocket.StatusPolicyViolation, "no active lease")
-			return
-		}
-		if errors.Is(err, errWSLeaseExpired) {
-			_ = conn.Close(websocket.StatusPolicyViolation, "lease expired")
-			return
-		}
-		_ = conn.Close(websocket.StatusPolicyViolation, "lease rejected")
-		return
-	}
-
-	attachment, err := cfg.PTYHub.attach(r.Context(), conn, auth)
-	if err != nil {
-		logPersistentDaemonEvent(
-			stderr,
-			"ws_pty_attach_failed",
-			"error_category", persistentDaemonErrorCategory(err),
-		)
-		_ = conn.Close(websocket.StatusInternalError, truncateWebSocketCloseReason(err.Error()))
-		return
-	}
-	defer func() {
-		if attachment.persistent {
-			cfg.PTYHub.detach(attachment)
-		} else {
-			cfg.PTYHub.closeSessionForAttachment(attachment)
-		}
-	}()
-
-	pumpWebSocketToPTY(r.Context(), cfg.PTYHub, attachment, conn)
-	_ = conn.Close(websocket.StatusNormalClosure, "closed")
-}
-
-func consumeWebSocketLease(path string, auth wsAuthFrame) error {
-	wsLeaseMu.Lock()
-	defer wsLeaseMu.Unlock()
-
-	data, err := os.ReadFile(path)
-	if err != nil {
-		if errors.Is(err, os.ErrNotExist) {
-			return errWSLeaseMissing
-		}
-		return err
-	}
-	var lease wsLease
-	if err := json.Unmarshal(data, &lease); err != nil {
-		return errWSLeaseForbidden
-	}
-	if lease.Version != 1 {
-		return errWSLeaseForbidden
-	}
-	if lease.ExpiresAtUnix <= time.Now().Unix() {
-		return errWSLeaseExpired
-	}
-	if lease.SessionID != "" && lease.SessionID != auth.SessionID {
-		return errWSLeaseForbidden
-	}
-
-	expected, err := hex.DecodeString(strings.TrimSpace(lease.TokenSHA256))
-	if err != nil || len(expected) != sha256.Size {
-		return errWSLeaseForbidden
-	}
-	actualHash := sha256.Sum256([]byte(auth.Token))
-	if subtle.ConstantTimeCompare(expected, actualHash[:]) != 1 {
-		return errWSLeaseForbidden
-	}
-
-	if lease.SingleUse {
-		if err := os.Remove(path); err != nil && !errors.Is(err, os.ErrNotExist) {
-			return err
-		}
-	}
-	return nil
-}
-
-type wsRPCFrameWriter struct {
-	conn    *websocket.Conn
-	writeMu *sync.Mutex
-	ctx     context.Context
-}
-
-func (w *wsRPCFrameWriter) writeResponse(resp rpcResponse) error {
-	return w.writeJSONFrame(resp)
-}
-
-func (w *wsRPCFrameWriter) writeEvent(event rpcEvent) error {
-	return w.writeJSONFrame(event)
-}
-
-func (w *wsRPCFrameWriter) writeJSONFrame(payload any) error {
-	data, err := json.Marshal(payload)
-	if err != nil {
-		return err
-	}
-	w.writeMu.Lock()
-	defer w.writeMu.Unlock()
-	return w.conn.Write(w.ctx, websocket.MessageText, data)
-}
-
-func handleWebSocketRPC(w http.ResponseWriter, r *http.Request, cfg wsPTYServerConfig) {
-	if strings.TrimSpace(cfg.RPCAuthLeaseFile) == "" {
-		http.NotFound(w, r)
-		return
-	}
-
-	conn, err := websocket.Accept(w, r, &websocket.AcceptOptions{
-		CompressionMode: websocket.CompressionDisabled,
-	})
-	if err != nil {
-		return
-	}
-	defer conn.Close(websocket.StatusInternalError, "closed")
-	conn.SetReadLimit(maxRPCFrameBytes)
-
-	authCtx, cancelAuth := context.WithTimeout(r.Context(), 5*time.Second)
-	msgType, payload, err := conn.Read(authCtx)
-	cancelAuth()
-	if err != nil {
-		_ = conn.Close(websocket.StatusPolicyViolation, "auth required")
-		return
-	}
-	if msgType != websocket.MessageText {
-		_ = conn.Close(websocket.StatusUnsupportedData, "auth must be text JSON")
-		return
-	}
-
-	var auth wsAuthFrame
-	if err := json.Unmarshal(payload, &auth); err != nil || auth.Type != "auth" || auth.Token == "" {
-		_ = conn.Close(websocket.StatusPolicyViolation, "invalid auth")
-		return
-	}
-	if auth.SessionID == "" {
-		auth.SessionID = "default"
-	}
-
-	if err := consumeWebSocketLease(cfg.RPCAuthLeaseFile, auth); err != nil {
-		if errors.Is(err, errWSLeaseMissing) {
-			_ = conn.Close(websocket.StatusPolicyViolation, "no active lease")
-			return
-		}
-		if errors.Is(err, errWSLeaseExpired) {
-			_ = conn.Close(websocket.StatusPolicyViolation, "lease expired")
-			return
-		}
-		_ = conn.Close(websocket.StatusPolicyViolation, "lease rejected")
-		return
-	}
-
-	writeMu := &sync.Mutex{}
-	if err := writeWSJSON(r.Context(), conn, writeMu, wsPTYEventFrame{
-		Type:      "ready",
-		SessionID: auth.SessionID,
-	}); err != nil {
-		return
-	}
-
-	connectionCtx, cancelConnection := context.WithCancel(r.Context())
-	server := &rpcServer{
-		nextStreamID:  1,
-		nextSessionID: 1,
-		streams:       map[string]*streamState{},
-		sessions:      map[string]*sessionState{},
-		ptyHub:        cfg.PTYHub,
-		ownsPTYHub:    false,
-		cliBridge:     cfg.CLIBridge,
-		frameWriter: &wsRPCFrameWriter{
-			conn:    conn,
-			writeMu: writeMu,
-			ctx:     connectionCtx,
-		},
-	}
-	dispatcher := newRPCRequestDispatcher(connectionCtx, cancelConnection, nil, server)
-	unregisterCLI := func() {}
-	if cfg.CLIBridge != nil {
-		unregisterCLI = cfg.CLIBridge.register(server)
-	}
-	defer unregisterCLI()
-	defer server.closeAll()
-	defer cancelConnection()
-
-	for {
-		msgType, payload, err := conn.Read(connectionCtx)
-		if err != nil {
-			if dispatcher.takeAsyncError() != nil {
-				_ = conn.Close(websocket.StatusInternalError, "write failed")
-				return
-			}
-			_ = conn.Close(websocket.StatusNormalClosure, "closed")
-			return
-		}
-		if msgType != websocket.MessageText {
-			_ = conn.Close(websocket.StatusUnsupportedData, "rpc frames must be text JSON")
-			return
-		}
-
-		payload = bytes.TrimSpace(payload)
-		if len(payload) == 0 {
-			continue
-		}
-
-		var req rpcRequest
-		if err := json.Unmarshal(payload, &req); err != nil {
-			if err := server.frameWriter.writeResponse(rpcResponse{
-				OK: false,
-				Error: &rpcError{
-					Code:    "invalid_request",
-					Message: "invalid JSON request",
-				},
-			}); err != nil {
-				_ = conn.Close(websocket.StatusInternalError, "write failed")
-				return
-			}
-			continue
-		}
-
-		if err := dispatcher.dispatch(req); err != nil {
-			_ = conn.Close(websocket.StatusInternalError, "write failed")
-			return
-		}
-	}
-}
-
-func defaultWebSocketPTYEnv(shellPath string) []string {
-	env, order := envMapWithOrder(os.Environ())
-	set := func(key, value string) {
-		if _, ok := env[key]; !ok {
-			order = append(order, key)
-		}
-		env[key] = value
-	}
-	setIfMissing := func(key, value string) {
-		if strings.TrimSpace(env[key]) == "" {
-			set(key, value)
-		}
-	}
-
-	set("PATH", pathWithStandardExecutableDirectories(env["PATH"]))
-	set("TERM", "xterm-256color")
-	setIfMissing("COLORTERM", "truecolor")
-	setIfMissing("TERM_PROGRAM", "ghostty")
-	setIfMissing("SHELL", shellPath)
-	set("CMUX_REMOTE_TRANSPORT", "ws")
-	if !envHasUTF8Locale(env) {
-		set("LANG", "C.UTF-8")
-		set("LC_CTYPE", "C.UTF-8")
-		set("LC_ALL", "C.UTF-8")
-	}
-
-	out := make([]string, 0, len(order))
-	seen := make(map[string]struct{}, len(order))
-	for _, key := range order {
-		if _, ok := seen[key]; ok {
-			continue
-		}
-		seen[key] = struct{}{}
-		out = append(out, key+"="+env[key])
-	}
-	return out
-}
-
-func pathWithStandardExecutableDirectories(inheritedPath string) string {
-	entries := filepath.SplitList(inheritedPath)
-	present := make(map[string]struct{}, len(entries))
-	for _, entry := range entries {
-		present[entry] = struct{}{}
-	}
-	for _, standardDirectory := range filepath.SplitList(standardExecutablePath) {
-		if _, ok := present[standardDirectory]; ok {
-			continue
-		}
-		entries = append(entries, standardDirectory)
-		present[standardDirectory] = struct{}{}
-	}
-	return strings.Join(entries, string(os.PathListSeparator))
-}
-
-func envMapWithOrder(values []string) (map[string]string, []string) {
-	env := make(map[string]string, len(values))
-	order := make([]string, 0, len(values))
-	for _, value := range values {
-		key, rest, ok := strings.Cut(value, "=")
-		if !ok {
-			continue
-		}
-		if _, exists := env[key]; !exists {
-			order = append(order, key)
-		}
-		env[key] = rest
-	}
-	return env, order
-}
-
-func envHasUTF8Locale(env map[string]string) bool {
-	for _, key := range []string{"LC_ALL", "LC_CTYPE", "LANG"} {
-		value := strings.ToUpper(strings.TrimSpace(env[key]))
-		if value == "" {
-			continue
-		}
-		return strings.Contains(value, "UTF-8") || strings.Contains(value, "UTF8")
-	}
-	return false
-}
-
-func writeWSJSON(ctx context.Context, conn *websocket.Conn, writeMu *sync.Mutex, payload any) error {
-	data, err := json.Marshal(payload)
-	if err != nil {
-		return err
-	}
-	writeMu.Lock()
-	defer writeMu.Unlock()
-	return conn.Write(ctx, websocket.MessageText, data)
-}
-
-func (h *wsPTYHub) attach(ctx context.Context, conn *websocket.Conn, auth wsAuthFrame) (*wsPTYAttachment, error) {
-	sessionID := strings.TrimSpace(auth.SessionID)
-	if sessionID == "" {
-		sessionID = "default"
-	}
-	cols, rows := normalizePTYSize(auth.Cols, auth.Rows)
-	attachmentID := strings.TrimSpace(auth.AttachmentID)
-	persistent := attachmentID != "" && auth.SessionIDExplicit
-	attachment, attachmentCtx, sessionDone, err := h.prepareAttachment(
-		ctx,
-		conn,
-		sessionID,
-		attachmentID,
-		cols,
-		rows,
-		persistent,
-		"",
-		"",
-		false,
-		false,
-	)
-	if err != nil {
-		return nil, err
-	}
-	go attachment.writeLoop(attachmentCtx, conn, sessionDone)
-	return attachment, nil
-}
-
-func (h *wsPTYHub) attachRPC(
-	ctx context.Context,
-	sessionID string,
-	attachmentID string,
-	cols int,
-	rows int,
-	command string,
-	clientToken string,
-	requireExisting bool,
-	inputSeqAck bool,
-) (*wsPTYAttachment, context.Context, <-chan struct{}, error) {
-	return h.attachRPCWithReservation(
-		ctx,
-		ctx,
-		sessionID,
-		attachmentID,
-		cols,
-		rows,
-		command,
-		clientToken,
-		requireExisting,
-		inputSeqAck,
-		nil,
-	)
-}
-
-func (h *wsPTYHub) attachRPCWithReservation(
-	operationCtx context.Context,
-	attachmentLifetimeCtx context.Context,
-	sessionID string,
-	attachmentID string,
-	cols int,
-	rows int,
-	command string,
-	clientToken string,
-	requireExisting bool,
-	inputSeqAck bool,
-	reservationReady func(),
-) (*wsPTYAttachment, context.Context, <-chan struct{}, error) {
-	sessionID = strings.TrimSpace(sessionID)
-	if sessionID == "" {
-		return nil, nil, nil, errors.New("session_id is required")
-	}
-	attachmentID = strings.TrimSpace(attachmentID)
-	cols, rows = normalizePTYSize(cols, rows)
-	return h.prepareAttachmentWithReservation(
-		operationCtx,
-		attachmentLifetimeCtx,
-		nil,
-		sessionID,
-		attachmentID,
-		cols,
-		rows,
-		true,
-		command,
-		clientToken,
-		requireExisting,
-		inputSeqAck,
-		reservationReady,
-	)
-}
-
-func (h *wsPTYHub) prepareAttachment(
-	ctx context.Context,
-	conn *websocket.Conn,
-	sessionID string,
-	attachmentID string,
-	cols int,
-	rows int,
-	persistent bool,
-	command string,
-	clientToken string,
-	requireExisting bool,
-	inputSeqAck bool,
-) (*wsPTYAttachment, context.Context, <-chan struct{}, error) {
-	return h.prepareAttachmentWithReservation(
-		ctx,
-		ctx,
-		conn,
-		sessionID,
-		attachmentID,
-		cols,
-		rows,
-		persistent,
-		command,
-		clientToken,
-		requireExisting,
-		inputSeqAck,
-		nil,
-	)
-}
-
-func (h *wsPTYHub) prepareAttachmentWithReservation(
-	operationCtx context.Context,
-	attachmentLifetimeCtx context.Context,
-	conn *websocket.Conn,
-	sessionID string,
-	attachmentID string,
-	cols int,
-	rows int,
-	persistent bool,
-	command string,
-	clientToken string,
-	requireExisting bool,
-	inputSeqAck bool,
-	reservationReady func(),
-) (*wsPTYAttachment, context.Context, <-chan struct{}, error) {
-	h.mu.Lock()
-	if h.closed {
-		h.mu.Unlock()
-		return nil, nil, nil, errWSPTYHubClosed
-	}
-	sessionKey := persistentPTYSessionKey(sessionID)
-	if !persistent {
-		sessionKey = anonymousPTYSessionKey(sessionID, h.nextAnonymousID)
-		h.nextAnonymousID++
-	}
-	h.mu.Unlock()
-
-	var session *wsPTYSession
-	var claimedSession *wsPTYSession
-	ownsInitialClaim := false
-	for {
-		h.mu.Lock()
-		if h.closed {
-			h.mu.Unlock()
-			return nil, nil, nil, errWSPTYHubClosed
-		}
-		if claimedSession != nil {
-			session = claimedSession
-			claimableFinishedSession := ownsInitialClaim &&
-				session.initialPhase == wsPTYSessionFinishedBeforeInitialAttachment
-			if h.sessions[sessionKey] != session ||
-				(session.closed && !claimableFinishedSession) {
-				h.releaseInitialClaimLocked(session)
-				h.mu.Unlock()
-				return nil, nil, nil, fmt.Errorf("persistent PTY session %q closed before attachment completed", sessionID)
-			}
-			break
-		}
-		session = h.sessions[sessionKey]
-		if session != nil &&
-			session.initialPhase == wsPTYSessionFinishedBeforeInitialAttachment {
-			h.mu.Unlock()
-			return nil, nil, nil, fmt.Errorf("persistent PTY session %q is no longer running", sessionID)
-		}
-		if session != nil && !session.closed {
-			if reservationReady != nil {
-				reservationReady()
-			}
-			break
-		}
-		if start := h.startingSessions[sessionKey]; start != nil {
-			select {
-			case h.sessionStartWaiterSlots <- struct{}{}:
-			default:
-				h.mu.Unlock()
-				return nil, nil, nil, errWSPTYStartWaitersSaturated
-			}
-			waiter := &wsPTYSessionStartWaiter{ctx: operationCtx}
-			start.waiters[waiter] = struct{}{}
-			if reservationReady != nil {
-				reservationReady()
-			}
-			closedCh := h.closedCh
-			h.mu.Unlock()
-			select {
-			case <-start.done:
-				<-h.sessionStartWaiterSlots
-				if start.err != nil {
-					return nil, nil, nil, start.err
-				}
-				if !waiter.claimed {
-					return nil, nil, nil, operationCtx.Err()
-				}
-				claimedSession = start.session
-				ownsInitialClaim = claimedSession != nil
-			case <-closedCh:
-				<-h.sessionStartWaiterSlots
-				h.mu.Lock()
-				if start.session != nil && waiter.claimed {
-					h.releaseInitialClaimLocked(start.session)
-				} else {
-					delete(start.waiters, waiter)
-				}
-				h.mu.Unlock()
-				return nil, nil, nil, errWSPTYHubClosed
-			case <-operationCtx.Done():
-				<-h.sessionStartWaiterSlots
-				h.mu.Lock()
-				if start.session != nil && waiter.claimed {
-					h.releaseInitialClaimLocked(start.session)
-				} else {
-					delete(start.waiters, waiter)
-				}
-				h.mu.Unlock()
-				return nil, nil, nil, operationCtx.Err()
-			}
-			continue
-		}
-		if requireExisting {
-			h.mu.Unlock()
-			return nil, nil, nil, fmt.Errorf("persistent PTY session %q is not running", sessionID)
-		}
-
-		select {
-		case h.sessionStartSlots <- struct{}{}:
-		default:
-			h.mu.Unlock()
-			return nil, nil, nil, errWSPTYStartOwnersSaturated
-		}
-		start := &wsPTYSessionStart{
-			done:    make(chan struct{}),
-			waiters: map[*wsPTYSessionStartWaiter]struct{}{},
-		}
-		h.startingSessions[sessionKey] = start
-		if reservationReady != nil {
-			reservationReady()
-		}
-		h.mu.Unlock()
-
-		startedSession, startErr := h.startSession(sessionKey, sessionID, cols, rows, command)
-		<-h.sessionStartSlots
-		discardStartedSession := false
-		publishedStartedSession := false
-
-		h.mu.Lock()
-		delete(h.startingSessions, sessionKey)
-		if startErr == nil {
-			ownerContextErr := operationCtx.Err()
-			liveWaiters := 0
-			for waiter := range start.waiters {
-				if waiter.ctx.Err() == nil {
-					waiter.claimed = true
-					liveWaiters++
-				}
-			}
-			switch existingSession := h.sessions[sessionKey]; {
-			case h.closed:
-				startErr = errWSPTYHubClosed
-				discardStartedSession = true
-			case start.closeRequested:
-				startErr = fmt.Errorf("persistent PTY session %q was closed while starting", sessionID)
-				discardStartedSession = true
-			case ownerContextErr != nil && liveWaiters == 0:
-				startErr = ownerContextErr
-				discardStartedSession = true
-			case existingSession != nil && !existingSession.closed:
-				discardStartedSession = true
-			default:
-				// A completed persistent generation deliberately survives a
-				// transport gap when a joiner counted live at publication
-				// cancels immediately afterward. Its initial claim is released
-				// by that joiner and the idle reaper bounds retention.
-				startedSession.initialClaims = liveWaiters
-				if ownerContextErr == nil {
-					startedSession.initialClaims++
-					claimedSession = startedSession
-					ownsInitialClaim = true
-				}
-				h.sessions[sessionKey] = startedSession
-				h.scheduleIdleReapLocked(startedSession)
-				start.session = startedSession
-				publishedStartedSession = true
-			}
-		}
-		start.err = startErr
-		close(start.done)
-		h.mu.Unlock()
-
-		if startedSession != nil {
-			h.runSession(startedSession)
-			if discardStartedSession {
-				startedSession.terminateProcesses()
-				startedSession.closePTYFiles()
-			}
-		}
-		if startErr != nil {
-			return nil, nil, nil, startErr
-		}
-		if publishedStartedSession && !ownsInitialClaim {
-			return nil, nil, nil, operationCtx.Err()
-		}
-		if publishedStartedSession {
-			continue
-		}
-	}
-
-	if err := operationCtx.Err(); err != nil {
-		if ownsInitialClaim {
-			h.releaseInitialClaimLocked(session)
-		}
-		terminateAnonymous := false
-		if !persistent && h.sessions[sessionKey] == session {
-			delete(h.sessions, sessionKey)
-			h.cancelIdleReapLocked(session)
-			terminateAnonymous = true
-		} else if persistent && len(session.attachments) == 0 {
-			h.scheduleIdleReapLocked(session)
-		}
-		h.mu.Unlock()
-		if terminateAnonymous {
-			session.terminateProcesses()
-			session.closePTYFiles()
-		}
-		return nil, nil, nil, err
-	}
-	if attachmentID == "" {
-		attachmentID = fmt.Sprintf("att-%d", h.nextAttachmentID)
-		h.nextAttachmentID++
-	}
-	// Supersede any existing attachment with this id. Input the old
-	// attachment already had accepted stays queued and reaches the PTY
-	// ahead of anything the replacement enqueues: session.input is FIFO
-	// with writeInputLoop as its only consumer, whole writes enqueue
-	// atomically under inputEnqueueMu, and writeInputChunk deliberately
-	// does not require the chunk's attachment to still be registered.
-	// Never wait on that drain here — a wedged PTY (reader stopped) must
-	// not turn reattach into an indefinite hang.
-	var superseded *wsPTYAttachment
-	if old := session.attachments[attachmentID]; old != nil {
-		old.cancel()
-		delete(session.attachments, attachmentID)
-		superseded = old
-	}
-
-	// Operation cancellation may abandon this attach without ending the
-	// connection. Once published, the attachment follows the connection
-	// lifetime and can be canceled independently by its identity token.
-	attachmentCtx, cancel := context.WithCancel(attachmentLifetimeCtx)
-	replay := append([]byte(nil), session.scrollback...)
-	clientToken = strings.TrimSpace(clientToken)
-	attachment := &wsPTYAttachment{
-		sessionKey:  sessionKey,
-		id:          attachmentID,
-		clientToken: clientToken,
-		cols:        cols,
-		rows:        rows,
-		send:        make(chan wsPTYOutgoingFrame, defaultWebSocketWriteQueueCap),
-		cancel:      cancel,
-		conn:        conn,
-		persistent:  persistent,
-		inputSeqAck: inputSeqAck,
-		replayBytes: len(replay),
-	}
-	if ok := attachment.enqueueReady(sessionID); !ok {
-		cancel()
-		if ownsInitialClaim {
-			h.releaseInitialClaimLocked(session)
-		}
-		h.mu.Unlock()
-		if superseded != nil {
-			superseded.closeNow()
-		}
-		return nil, nil, nil, errors.New("failed to queue ready frame")
-	}
-	if ok := enqueuePTYReplay(attachment, replay); !ok {
-		cancel()
-		if ownsInitialClaim {
-			h.releaseInitialClaimLocked(session)
-		}
-		h.mu.Unlock()
-		if superseded != nil {
-			superseded.closeNow()
-		}
-		return nil, nil, nil, errors.New("failed to queue replay frame")
-	}
-	finishedBeforeInitialAttachment := session.initialPhase == wsPTYSessionFinishedBeforeInitialAttachment
-	shouldApplySize := false
-	if !finishedBeforeInitialAttachment {
-		session.attachments[attachmentID] = attachment
-		h.activateInitialSessionIfReadyLocked(session)
-		shouldApplySize = h.recomputeSessionSizeLocked(session)
-	}
-	if ownsInitialClaim {
-		h.releaseInitialClaimLocked(session)
-	}
-	sessionDone := session.done
-	h.mu.Unlock()
-
-	if superseded != nil {
-		superseded.closeNow()
-		logPersistentDaemonEvent(
-			h.stderr,
-			"pty_detach",
-			"session_id", sessionID,
-			"attachment_id", superseded.id,
-			"reason", "superseded",
-		)
-	}
-	if shouldApplySize {
-		h.applyCurrentPTYSize(session)
-	}
-	logPersistentDaemonEvent(
-		h.stderr,
-		"pty_attach",
-		"session_id", sessionID,
-		"attachment_id", attachment.id,
-		"persistent", strconv.FormatBool(persistent),
-		"require_existing", strconv.FormatBool(requireExisting),
-		"replay_bytes", strconv.Itoa(attachment.replayBytes),
-	)
-	return attachment, attachmentCtx, sessionDone, nil
-}
-
-func (h *wsPTYHub) releaseInitialClaimLocked(session *wsPTYSession) {
-	if session == nil || session.initialClaims <= 0 {
-		return
-	}
-	session.initialClaims--
-	h.activateInitialSessionIfReadyLocked(session)
-	// An awaiting persistent generation with no attachments is intentionally
-	// retained for reconnect and bounded by its idle timer. Only a generation
-	// that already exited before any claimant attached is removed immediately.
-	if session.initialClaims != 0 ||
-		session.initialPhase != wsPTYSessionFinishedBeforeInitialAttachment ||
-		h.sessions[session.key] != session {
-		return
-	}
-	delete(h.sessions, session.key)
-	h.cancelIdleReapLocked(session)
-	session.closed = true
-}
-
-func (h *wsPTYHub) activateInitialSessionIfReadyLocked(session *wsPTYSession) {
-	if session != nil &&
-		session.initialPhase == wsPTYSessionAwaitingInitialAttachment &&
-		session.initialClaims == 0 &&
-		len(session.attachments) > 0 {
-		session.initialPhase = wsPTYSessionInitialActive
-	}
-}
-
-func (h *wsPTYHub) startSession(sessionKey wsPTYSessionKey, sessionID string, cols int, rows int, command string) (*wsPTYSession, error) {
-	shellPath := resolvePTYShell(h.shell)
-	trimmedCommand := strings.TrimSpace(command)
-	var cmd *exec.Cmd
-	var tmpScript string
-	if trimmedCommand == "" {
-		cmd = exec.Command(shellPath)
-	} else if len(trimmedCommand) > 120*1024 {
-		// Startup script exceeds Linux's MAX_ARG_STRLEN (~128KB). Write to a
-		// temp file and exec /bin/sh <file> to avoid E2BIG from execve.
-		f, err := os.CreateTemp("", "cmuxd-startup-*.sh")
-		if err != nil {
-			return nil, fmt.Errorf("could not create startup script temp file: %w", err)
-		}
-		tmpScript = f.Name()
-		if _, err := f.WriteString(trimmedCommand); err != nil {
-			_ = f.Close()
-			_ = os.Remove(tmpScript)
-			return nil, fmt.Errorf("could not write startup script: %w", err)
-		}
-		_ = f.Chmod(0o400)
-		_ = f.Close()
-		cmd = exec.Command("/bin/sh", tmpScript)
-	} else {
-		cmd = exec.Command("/bin/sh", "-c", trimmedCommand)
-	}
-	cmd.Env = defaultWebSocketPTYEnv(shellPath)
-	if sessionKey.kind == wsPTYPersistentSession {
-		var err error
-		cmd, err = persistentPTYCommand(cmd)
-		if err != nil {
-			if tmpScript != "" {
-				_ = os.Remove(tmpScript)
-			}
-			return nil, err
-		}
-	}
-	ptyFile, ttyFile, err := h.startPTYCommand(cmd, cols, rows)
-	if err != nil {
-		if tmpScript != "" {
-			_ = os.Remove(tmpScript)
-		}
-		logPersistentDaemonEvent(
-			h.stderr,
-			"pty_start_fault",
-			"session_id", sessionID,
-			"error_category", persistentDaemonErrorCategory(err),
-		)
-		return nil, err
-	}
-	session := &wsPTYSession{
-		id:            sessionID,
-		key:           sessionKey,
-		cmd:           cmd,
-		tmpScript:     tmpScript,
-		ptyFile:       ptyFile,
-		ttyFile:       ttyFile,
-		attachments:   map[string]*wsPTYAttachment{},
-		effectiveCols: cols,
-		effectiveRows: rows,
-		lastKnownCols: cols,
-		lastKnownRows: rows,
-		input:         make(chan wsPTYInputChunk, defaultPTYInputQueueCap),
-		done:          make(chan struct{}),
-		initialPhase:  wsPTYSessionAwaitingInitialAttachment,
-	}
-	return session, nil
-}
-
-func (h *wsPTYHub) runSession(session *wsPTYSession) {
-	go h.pumpSession(session)
-	go h.waitSessionProcess(session)
-	go h.writeInputLoop(session)
-}
-
-func persistentPTYCommand(command *exec.Cmd) (*exec.Cmd, error) {
-	helperPath, err := os.Executable()
-	if err != nil {
-		return nil, fmt.Errorf("resolve persistent PTY exec helper: %w", err)
-	}
-	// A persistent PTY outlives every relay attachment. Enter the command
-	// through cmuxd-remote's exec helper so SIGHUP is blocked before exec and
-	// inherited by every shell, foreground job, and background job in the PTY
-	// session. Unlike SIG_IGN, the mask survives programs resetting their own
-	// signal dispositions.
-	arguments := []string{persistentPTYExecHelperArgument, command.Path}
-	arguments = append(arguments, command.Args...)
-	wrapped := exec.Command(helperPath, arguments...)
-	environment := command.Env
-	if environment == nil {
-		environment = os.Environ()
-	}
-	helperEnvironmentPrefix := persistentPTYExecHelperEnvironment + "="
-	wrapped.Env = make([]string, 0, len(environment)+1)
-	for _, value := range environment {
-		if !strings.HasPrefix(value, helperEnvironmentPrefix) {
-			wrapped.Env = append(wrapped.Env, value)
-		}
-	}
-	wrapped.Env = append(wrapped.Env, helperEnvironmentPrefix+helperPath)
-	wrapped.Dir = command.Dir
-	return wrapped, nil
-}
-
-func (h *wsPTYHub) startPTYCommand(cmd *exec.Cmd, cols int, rows int) (*os.File, *os.File, error) {
-	open := h.openPTY
-	if open == nil {
-		open = pty.Open
-	}
-	ptyFile, ttyFile, err := open()
-	if err != nil {
-		return nil, nil, newPTYAllocationError(err)
-	}
-	closeFiles := true
-	defer func() {
-		if closeFiles {
-			_ = ptyFile.Close()
-			_ = ttyFile.Close()
-		}
-	}()
-
-	if err := pty.Setsize(ttyFile, &pty.Winsize{
-		Cols: uint16(cols),
-		Rows: uint16(rows),
-	}); err != nil {
-		return nil, nil, err
-	}
-	if cmd.Stdout == nil {
-		cmd.Stdout = ttyFile
-	}
-	if cmd.Stderr == nil {
-		cmd.Stderr = ttyFile
-	}
-	if cmd.Stdin == nil {
-		cmd.Stdin = ttyFile
-	}
-	if cmd.SysProcAttr == nil {
-		cmd.SysProcAttr = &syscall.SysProcAttr{}
-	}
-	cmd.SysProcAttr.Setsid = true
-	cmd.SysProcAttr.Setctty = true
-
-	if err := cmd.Start(); err != nil {
-		return nil, nil, err
-	}
-	closeFiles = false
-	_ = ttyFile.Close()
-	return ptyFile, nil, nil
-}
-
-// newPTYAllocationError wraps a raw PTY-allocation failure with actionable
-// diagnostics about the remote devpts. Without this, a hardened mount
-// (ptmxmode=000) or a non-writable /dev/ptmx surfaced only a generic
-// "remote PTY attach failed" with a 0-byte daemon log, leaving the operator no
-// way to tell why the terminal would not open. See issue #5185.
-func newPTYAllocationError(err error) error {
-	suffix := ""
-	if detail := describeDevPTS(); detail != "" {
-		suffix = "; " + detail
-	}
-	hint := ""
-	if isPermissionDeniedErr(err) {
-		hint = "; the remote devpts denies /dev/ptmx (e.g. mounted ptmxmode=000): remount it writable with `sudo mount -o remount,ptmxmode=0666 /dev/pts` or expose a writable /dev/ptmx so the cmux daemon can open a terminal"
-	}
-	return fmt.Errorf("could not allocate a remote PTY: %w%s%s", err, suffix, hint)
-}
-
-// describeDevPTS reports the current /dev/ptmx mode and the /dev/pts devpts
-// mount options (which carry ptmxmode) on a best-effort basis. It never errors;
-// missing data is simply omitted from the returned summary.
-func describeDevPTS() string {
-	var parts []string
-	if info, statErr := os.Stat("/dev/ptmx"); statErr == nil {
-		parts = append(parts, fmt.Sprintf("/dev/ptmx mode=%04o", info.Mode().Perm()))
-	} else {
-		parts = append(parts, fmt.Sprintf("/dev/ptmx stat error: %v", statErr))
-	}
-	if opts := devptsMountOptions(); opts != "" {
-		parts = append(parts, "devpts ("+opts+")")
-	}
-	return strings.Join(parts, "; ")
-}
-
-// devptsMountOptions returns the super-block options of the devpts filesystem
-// mounted at /dev/pts (e.g. "rw,gid=5,mode=620,ptmxmode=000"), or "" if it
-// cannot be determined. It parses /proc/self/mountinfo, whose per-line layout
-// places the optional fields and the " - <fstype> <source> <superopts>" tail
-// after a literal " - " separator.
-func devptsMountOptions() string {
-	data, err := os.ReadFile("/proc/self/mountinfo")
-	if err != nil {
-		return ""
-	}
-	for _, line := range strings.Split(string(data), "\n") {
-		fields := strings.Fields(line)
-		// mount point is field index 4 (0-based) in the pre-separator section.
-		if len(fields) < 5 || fields[4] != "/dev/pts" {
-			continue
-		}
-		sep := -1
-		for i, f := range fields {
-			if f == "-" {
-				sep = i
-				break
-			}
-		}
-		if sep < 0 || sep+3 >= len(fields) {
-			continue
-		}
-		if fields[sep+1] != "devpts" {
-			continue
-		}
-		return fields[sep+3]
-	}
-	return ""
-}
-
-// truncateWebSocketCloseReason clamps a close reason to the 123-byte limit a
-// WebSocket control frame allows for its UTF-8 reason payload, trimming on a
-// rune boundary so the frame stays valid.
-func truncateWebSocketCloseReason(reason string) string {
-	const maxReasonBytes = 123
-	if len(reason) <= maxReasonBytes {
-		return reason
-	}
-	truncated := reason[:maxReasonBytes]
-	for len(truncated) > 0 && !utf8.ValidString(truncated) {
-		truncated = truncated[:len(truncated)-1]
-	}
-	return truncated
-}
-
-// isPermissionDeniedErr reports whether err is an EACCES/EPERM-class failure,
-// the signature of a devpts that refuses /dev/ptmx.
-func isPermissionDeniedErr(err error) bool {
-	return errors.Is(err, os.ErrPermission) ||
-		errors.Is(err, syscall.EACCES) ||
-		errors.Is(err, syscall.EPERM)
-}
-
-func (h *wsPTYHub) detach(attachment *wsPTYAttachment) bool {
-	if attachment == nil {
-		return false
-	}
-	h.mu.Lock()
-
-	session := h.sessions[attachment.sessionKey]
-	if session == nil {
-		h.mu.Unlock()
-		return false
-	}
-	current := session.attachments[attachment.id]
-	if current != attachment {
-		h.mu.Unlock()
-		return false
-	}
-	delete(session.attachments, attachment.id)
-	attachment.cancel()
-	shouldApplySize := h.recomputeSessionSizeLocked(session)
-	h.mu.Unlock()
-
-	if shouldApplySize {
-		h.applyCurrentPTYSize(session)
-	}
-	logPersistentDaemonEvent(
-		h.stderr,
-		"pty_detach",
-		"session_id", session.id,
-		"attachment_id", attachment.id,
-		"reason", "attachment_removed",
-	)
-	return true
-}
-
-func (h *wsPTYHub) dropAttachment(attachment *wsPTYAttachment) {
-	if attachment == nil {
-		return
-	}
-	if attachment.persistent {
-		h.detach(attachment)
-	} else {
-		h.closeSessionForAttachment(attachment)
-	}
-	attachment.closeNow()
-}
-
-func (h *wsPTYHub) closeSessionForAttachment(attachment *wsPTYAttachment) {
-	if attachment == nil {
-		return
-	}
-	h.mu.Lock()
-	session := h.sessions[attachment.sessionKey]
-	if session == nil || session.attachments[attachment.id] != attachment {
-		h.mu.Unlock()
-		return
-	}
-	delete(h.sessions, session.key)
-	delete(session.attachments, attachment.id)
-	h.cancelIdleReapLocked(session)
-	attachment.cancel()
-	h.mu.Unlock()
-
-	session.terminateProcesses()
-	session.closePTYFiles()
-}
-
-func (h *wsPTYHub) closeAll() {
-	h.mu.Lock()
-	if !h.closed {
-		h.closed = true
-		close(h.closedCh)
-	}
-	sessions := make([]*wsPTYSession, 0, len(h.sessions))
-	for id, session := range h.sessions {
-		delete(h.sessions, id)
-		h.cancelIdleReapLocked(session)
-		sessions = append(sessions, session)
-	}
-	h.mu.Unlock()
-
-	for _, session := range sessions {
-		session.terminateProcesses()
-		session.closePTYFiles()
-	}
-	h.sessionTeardowns.Wait()
-}
-
-type wsPTYInputWriteResult struct {
-	status wsPTYInputWriteStatus
-	got    uint64
-	want   uint64
-}
-
-func (h *wsPTYHub) writeInputByID(sessionID string, attachmentID string, attachmentToken string, payload []byte) wsPTYInputWriteStatus {
-	return h.writeInputByIDWithSeq(sessionID, attachmentID, attachmentToken, payload, 0, false).status
-}
-
-func (h *wsPTYHub) writeInputByIDWithSeq(sessionID string, attachmentID string, attachmentToken string, payload []byte, seq uint64, hasSeq bool) wsPTYInputWriteResult {
-	attachment := h.attachmentByID(sessionID, attachmentID, attachmentToken)
-	if attachment == nil {
-		return wsPTYInputWriteResult{status: wsPTYInputWriteNotFound}
-	}
-	return h.writeInput(attachment, payload, seq, hasSeq)
-}
-
-func (h *wsPTYHub) resizeByID(sessionID string, attachmentID string, attachmentToken string, cols int, rows int) bool {
-	attachment := h.attachmentByID(sessionID, attachmentID, attachmentToken)
-	if attachment == nil {
-		return false
-	}
-	h.resize(attachment, cols, rows)
-	return true
-}
-
-func (h *wsPTYHub) detachByID(sessionID string, attachmentID string, attachmentToken string) bool {
-	attachment := h.attachmentByID(sessionID, attachmentID, attachmentToken)
-	if attachment == nil {
-		return false
-	}
-	return h.detach(attachment)
-}
-
-func (h *wsPTYHub) closeSessionByID(sessionID string) bool {
-	sessionID = strings.TrimSpace(sessionID)
-	if sessionID == "" {
-		return false
-	}
-	sessionKey := persistentPTYSessionKey(sessionID)
-
-	h.mu.Lock()
-	if start := h.startingSessions[sessionKey]; start != nil {
-		start.closeRequested = true
-		h.mu.Unlock()
-		logPersistentDaemonEvent(h.stderr, "pty_close", "session_id", sessionID, "phase", "starting")
-		return true
-	}
-	session := h.sessions[sessionKey]
-	if session == nil || session.closed {
-		h.mu.Unlock()
-		return false
-	}
-	delete(h.sessions, sessionKey)
-	h.cancelIdleReapLocked(session)
-	session.closed = true
-	h.mu.Unlock()
-	logPersistentDaemonEvent(h.stderr, "pty_close", "session_id", sessionID, "phase", "running")
-
-	session.terminateProcesses()
-	session.closePTYFiles()
-	return true
-}
-
-func (h *wsPTYHub) sessionSnapshots() []map[string]any {
-	h.mu.Lock()
-	defer h.mu.Unlock()
-
-	keys := make([]wsPTYSessionKey, 0, len(h.sessions))
-	for key, session := range h.sessions {
-		if key.kind == wsPTYPersistentSession && session != nil && !session.closed {
-			keys = append(keys, key)
-		}
-	}
-	sort.Slice(keys, func(i, j int) bool {
-		return keys[i].sessionID < keys[j].sessionID
-	})
-
-	snapshots := make([]map[string]any, 0, len(keys))
-	for _, key := range keys {
-		if session := h.sessions[key]; session != nil {
-			snapshots = append(snapshots, h.sessionSnapshotLocked(session))
-		}
-	}
-	return snapshots
-}
-
-func (h *wsPTYHub) attachmentByID(sessionID string, attachmentID string, attachmentToken string) *wsPTYAttachment {
-	sessionID = strings.TrimSpace(sessionID)
-	attachmentID = strings.TrimSpace(attachmentID)
-	attachmentToken = strings.TrimSpace(attachmentToken)
-	if sessionID == "" || attachmentID == "" {
-		return nil
-	}
-
-	h.mu.Lock()
-	defer h.mu.Unlock()
-	session := h.sessions[persistentPTYSessionKey(sessionID)]
-	if session == nil || session.closed {
-		return nil
-	}
-	attachment := session.attachments[attachmentID]
-	if attachment == nil ||
-		subtle.ConstantTimeCompare([]byte(attachment.clientToken), []byte(attachmentToken)) != 1 {
-		return nil
-	}
-	return attachment
-}
-
-func (h *wsPTYHub) sessionSnapshotLocked(session *wsPTYSession) map[string]any {
-	attachmentIDs := make([]string, 0, len(session.attachments))
-	for attachmentID := range session.attachments {
-		attachmentIDs = append(attachmentIDs, attachmentID)
-	}
-	sort.Strings(attachmentIDs)
-
-	attachments := make([]map[string]any, 0, len(attachmentIDs))
-	for _, attachmentID := range attachmentIDs {
-		attachment := session.attachments[attachmentID]
-		attachments = append(attachments, map[string]any{
-			"attachment_id": attachmentID,
-			"cols":          attachment.cols,
-			"rows":          attachment.rows,
-			"persistent":    attachment.persistent,
-		})
-	}
-
-	return map[string]any{
-		"session_id":       session.id,
-		"attachments":      attachments,
-		"effective_cols":   session.effectiveCols,
-		"effective_rows":   session.effectiveRows,
-		"last_known_cols":  session.lastKnownCols,
-		"last_known_rows":  session.lastKnownRows,
-		"scrollback_bytes": len(session.scrollback),
-	}
-}
-
-func (h *wsPTYHub) waitSessionProcess(session *wsPTYSession) {
-	if session.cmd != nil {
-		_ = session.cmd.Wait()
-	}
-	if session.tmpScript != "" {
-		_ = os.Remove(session.tmpScript)
-	}
-	// The process created by startPTYCommand is the POSIX session leader. Its
-	// exit ends the terminal session even when a shielded background job still
-	// holds the PTY slave open, so tear down every remaining member before
-	// closing our slave. pumpSession exclusively owns the master on normal
-	// process exit so it can drain buffered output before EOF and finalization.
-	// Explicit hub teardown still closes both sides to interrupt a stuck pump.
-	session.terminateProcesses()
-	session.closeTTYFile()
-
-	drainTimer := time.NewTimer(defaultPTYExitDrainTimeout)
-	defer func() {
-		if !drainTimer.Stop() {
-			select {
-			case <-drainTimer.C:
-			default:
-			}
-		}
-	}()
-	select {
-	case <-session.done:
-		return
-	case <-drainTimer.C:
-		// A child that deliberately escaped into a new POSIX session may still
-		// hold an inherited slave descriptor. It is outside this session's
-		// process ownership boundary, so bound output draining and force the
-		// pump to finalize rather than retaining the session indefinitely.
-		session.closePTYFile()
-		return
-	}
-}
-
-func (session *wsPTYSession) closePTYFiles() {
-	session.closeTTYFile()
-	session.closePTYFile()
-}
-
-func (session *wsPTYSession) terminateProcesses() {
-	session.terminateProcessesWithForegroundGroupLookup(func(ptyFile *os.File) int {
-		rawConn, err := ptyFile.SyscallConn()
-		if err != nil {
-			return 0
-		}
-		var foregroundGroup int32
-		var ioctlErr syscall.Errno
-		if err := rawConn.Control(func(fd uintptr) {
-			_, _, ioctlErr = syscall.Syscall(
-				syscall.SYS_IOCTL,
-				fd,
-				uintptr(syscall.TIOCGPGRP),
-				uintptr(unsafe.Pointer(&foregroundGroup)),
-			)
-		}); err != nil || ioctlErr != 0 {
-			return 0
-		}
-		return int(foregroundGroup)
-	})
-}
-
-func (session *wsPTYSession) terminateProcessesWithForegroundGroupLookup(lookup func(*os.File) int) {
-	// Two independent paths tear the same session down. waitSessionProcess runs
-	// after the session leader exits, and the hub runs when a client closes the
-	// session, when a non-persistent attachment goes away, on closeAll, and on
-	// an idle reap. A session that outlives its leader and is then closed goes
-	// through both. The hub paths run while the leader is still alive and
-	// unreaped, which is why they signal it at all, but a second pass can only
-	// happen once cmd.Wait has returned, and by then the leader's pid is not
-	// ours to signal. Repeating the member scan is not free either, since it
-	// reads every entry in /proc on Linux and forks ps on macOS.
-	session.terminateOnce.Do(func() {
-		foregroundGroup := 0
-		session.withPTYFileLocked(func(ptyFile *os.File) {
-			foregroundGroup = lookup(ptyFile)
-		})
-		sessionLeader := 0
-		if session.cmd != nil && session.cmd.Process != nil {
-			sessionLeader = session.cmd.Process.Pid
-			terminatePTYSessionMembers(sessionLeader)
-		}
-		if foregroundGroup > 0 {
-			_ = syscall.Kill(-foregroundGroup, syscall.SIGKILL)
-		}
-		if sessionLeader > 0 {
-			_ = syscall.Kill(-sessionLeader, syscall.SIGKILL)
-			_ = session.cmd.Process.Kill()
-		}
-	})
-}
-
-func terminatePTYSessionMembers(sessionID int) {
-	if sessionID <= 0 {
-		return
-	}
-	// The PTY's OS session is the ownership boundary. A member can fork between
-	// a process-table snapshot and signal delivery, so rescan for previously
-	// unseen members. Once SIGKILL has been sent to a process it cannot create
-	// more descendants, which makes the discovered set converge without waiting
-	// for signaled processes to disappear from the process table. A process that
-	// intentionally created its own session remains outside this lifecycle.
-	signaled := make(map[int]struct{})
-	for {
-		members := ptySessionMemberPIDs(sessionID)
-		newMembers := 0
-		for _, pid := range members {
-			if pid == os.Getpid() {
-				continue
-			}
-			if _, alreadySignaled := signaled[pid]; alreadySignaled {
-				continue
-			}
-			signaled[pid] = struct{}{}
-			newMembers++
-			_ = syscall.Kill(pid, syscall.SIGKILL)
-		}
-		if newMembers == 0 {
-			return
-		}
-	}
-}
-
-func (session *wsPTYSession) closeTTYFile() {
-	session.closeTTYOnce.Do(func() {
-		if session.ttyFile != nil {
-			_ = session.ttyFile.Close()
-			session.ttyFile = nil
-		}
-	})
-}
-
-func (session *wsPTYSession) closePTYFile() {
-	session.closePTYOnce.Do(func() {
-		session.ptyFileMu.Lock()
-		defer session.ptyFileMu.Unlock()
-		ptyFile := session.ptyFile
-		session.ptyFile = nil
-		if ptyFile != nil {
-			_ = ptyFile.Close()
-		}
-	})
-}
-
-func (session *wsPTYSession) withPTYFileLocked(operation func(*os.File)) bool {
-	session.ptyFileMu.Lock()
-	defer session.ptyFileMu.Unlock()
-	if session.ptyFile == nil {
-		return false
-	}
-	operation(session.ptyFile)
-	return true
-}
-
-func (session *wsPTYSession) ptyFileSnapshot() *os.File {
-	session.ptyFileMu.Lock()
-	defer session.ptyFileMu.Unlock()
-	return session.ptyFile
-}
-
-func (h *wsPTYHub) activeSessionCount() int {
-	h.mu.Lock()
-	defer h.mu.Unlock()
-	count := h.sessionTeardownCount
-	for _, session := range h.sessions {
-		if session != nil && !session.closed {
-			count++
-		}
-	}
-	return count
-}
-
-func (h *wsPTYHub) maxScrollbackBytes() int {
-	h.mu.Lock()
-	defer h.mu.Unlock()
-	maxBytes := 0
-	for _, session := range h.sessions {
-		if len(session.scrollback) > maxBytes {
-			maxBytes = len(session.scrollback)
-		}
-	}
-	return maxBytes
-}
-
-func (h *wsPTYHub) pumpSession(session *wsPTYSession) {
-	defer h.finishSession(session)
-
-	ptyFile := session.ptyFileSnapshot()
-	if ptyFile == nil {
-		return
-	}
-	buffer := make([]byte, 32768)
-	for {
-		n, err := ptyFile.Read(buffer)
-		if n > 0 {
-			chunk := append([]byte(nil), buffer[:n]...)
-			h.recordAndBroadcast(session, chunk)
-			h.confirmPTYSizeAfterOutput(session)
-		}
-		if err != nil {
-			return
-		}
-		if n == 0 {
-			continue
-		}
-	}
-}
-
-func (h *wsPTYHub) finishSession(session *wsPTYSession) {
-	// Record the exit before closing session.done so an attachment cannot
-	// observe pty.exit ahead of the corresponding persistent diagnostic.
-	logPersistentDaemonEvent(h.stderr, "pty_exit", "session_id", session.id)
-	session.closePTYFiles()
-
-	h.mu.Lock()
-	if session.initialPhase == wsPTYSessionAwaitingInitialAttachment {
-		session.initialPhase = wsPTYSessionFinishedBeforeInitialAttachment
-		session.closed = true
-		h.cancelIdleReapLocked(session)
-		close(session.done)
-		if session.initialClaims == 0 && h.sessions[session.key] == session {
-			delete(h.sessions, session.key)
-		}
-		h.mu.Unlock()
-		return
-	}
-	if h.sessions[session.key] == session {
-		delete(h.sessions, session.key)
-	}
-	h.cancelIdleReapLocked(session)
-	session.closed = true
-	for id := range session.attachments {
-		delete(session.attachments, id)
-	}
-	close(session.done)
-	h.mu.Unlock()
-}
-
-func (h *wsPTYHub) recordAndBroadcast(session *wsPTYSession, data []byte) {
-	h.mu.Lock()
-	if session.closed {
-		h.mu.Unlock()
-		return
-	}
-	h.appendScrollbackLocked(session, data)
-	attachments := make([]*wsPTYAttachment, 0, len(session.attachments))
-	for _, attachment := range session.attachments {
-		attachments = append(attachments, attachment)
-	}
-	h.mu.Unlock()
-
-	for _, attachment := range attachments {
-		if ok := attachment.enqueueBinary(data); !ok {
-			h.dropAttachment(attachment)
-		}
-	}
-}
-
-func (h *wsPTYHub) appendScrollbackLocked(session *wsPTYSession, data []byte) {
-	limit := h.scrollbackLimit
-	if limit <= 0 || len(data) == 0 {
-		return
-	}
-	if len(data) >= limit {
-		session.scrollback = append(make([]byte, 0, limit), data[len(data)-limit:]...)
-		return
-	}
-	if len(session.scrollback)+len(data) > limit {
-		keep := limit - len(data)
-		if keep > len(session.scrollback) {
-			keep = len(session.scrollback)
-		}
-		next := make([]byte, 0, limit)
-		if keep > 0 {
-			next = append(next, session.scrollback[len(session.scrollback)-keep:]...)
-		}
-		session.scrollback = append(next, data...)
-		return
-	}
-	if cap(session.scrollback) > limit {
-		next := make([]byte, len(session.scrollback), limit)
-		copy(next, session.scrollback)
-		session.scrollback = next
-	}
-	session.scrollback = append(session.scrollback, data...)
-}
-
-func (h *wsPTYHub) recomputeSessionSizeLocked(session *wsPTYSession) bool {
-	if len(session.attachments) == 0 {
-		session.effectiveCols = session.lastKnownCols
-		session.effectiveRows = session.lastKnownRows
-		h.scheduleIdleReapLocked(session)
-		return false
-	}
-	h.cancelIdleReapLocked(session)
-
-	minCols := 0
-	minRows := 0
-	for _, attachment := range session.attachments {
-		if minCols == 0 || attachment.cols < minCols {
-			minCols = attachment.cols
-		}
-		if minRows == 0 || attachment.rows < minRows {
-			minRows = attachment.rows
-		}
-	}
-	if session.effectiveCols == minCols && session.effectiveRows == minRows {
-		session.lastKnownCols = minCols
-		session.lastKnownRows = minRows
-		return false
-	}
-	session.effectiveCols = minCols
-	session.effectiveRows = minRows
-	session.lastKnownCols = minCols
-	session.lastKnownRows = minRows
-	session.resizeConfirms = 4
-
-	return true
-}
-
-func (h *wsPTYHub) scheduleIdleReapLocked(session *wsPTYSession) {
-	if h.sessionIdleTTL <= 0 || session.closed || len(session.attachments) > 0 {
-		return
-	}
-	h.cancelIdleReapLocked(session)
-	session.idleTimer = time.AfterFunc(h.sessionIdleTTL, func() {
-		h.reapIdleSession(session)
-	})
-}
-
-func (h *wsPTYHub) cancelIdleReapLocked(session *wsPTYSession) {
-	if session.idleTimer == nil {
-		return
-	}
-	session.idleTimer.Stop()
-	session.idleTimer = nil
-}
-
-func (h *wsPTYHub) reapIdleSession(session *wsPTYSession) {
-	h.mu.Lock()
-	if h.closed || h.sessions[session.key] != session || session.closed || len(session.attachments) > 0 {
-		h.mu.Unlock()
-		return
-	}
-	delete(h.sessions, session.key)
-	session.idleTimer = nil
-	h.sessionTeardownCount++
-	h.sessionTeardowns.Add(1)
-	h.mu.Unlock()
-	defer func() {
-		h.mu.Lock()
-		h.sessionTeardownCount--
-		h.mu.Unlock()
-		h.sessionTeardowns.Done()
-	}()
-
-	session.terminateProcesses()
-	session.closePTYFiles()
-}
-
-func (h *wsPTYHub) confirmPTYSizeAfterOutput(session *wsPTYSession) {
-	h.mu.Lock()
-	if h.sessions[session.key] != session || session.closed || session.resizeConfirms <= 0 {
-		h.mu.Unlock()
-		return
-	}
-	session.resizeConfirms--
-	h.mu.Unlock()
-
-	h.applyCurrentPTYSize(session)
-}
-
-func (h *wsPTYHub) applyCurrentPTYSize(session *wsPTYSession) bool {
-	session.ptyWriteMu.Lock()
-	defer session.ptyWriteMu.Unlock()
-
-	h.mu.Lock()
-	current := h.sessions[session.key] == session && !session.closed && len(session.attachments) > 0
-	cols := session.effectiveCols
-	rows := session.effectiveRows
-	h.mu.Unlock()
-	if !current || cols <= 0 || rows <= 0 {
-		return false
-	}
-
-	h.applyPTYSizeWithWriteLock(session, cols, rows)
-	return true
-}
-
-func (h *wsPTYHub) applyPTYSizeWithWriteLock(session *wsPTYSession, cols int, rows int) bool {
-	desired := &pty.Winsize{
-		Cols: uint16(cols),
-		Rows: uint16(rows),
-	}
-	var lastErr error
-	for attempt := 0; attempt < 8; attempt++ {
-		var actual *pty.Winsize
-		available := session.withPTYFileLocked(func(resizeFile *os.File) {
-			lastErr = pty.Setsize(resizeFile, desired)
-			if lastErr == nil {
-				actual, lastErr = pty.GetsizeFull(resizeFile)
-			}
-		})
-		if !available {
-			lastErr = os.ErrClosed
-			break
-		}
-		if lastErr != nil {
-			continue
-		}
-		if int(actual.Cols) == cols && int(actual.Rows) == rows {
-			return true
-		}
-		lastErr = fmt.Errorf("pty size remained %dx%d after resize to %dx%d", actual.Cols, actual.Rows, cols, rows)
-	}
-	if h.stderr != nil && lastErr != nil {
-		logPersistentDaemonEvent(
-			h.stderr,
-			"pty_resize_fault",
-			"session_id", session.id,
-			"error_category", persistentDaemonErrorCategory(lastErr),
-		)
-	}
-	return false
-}
-
-func (h *wsPTYHub) writeInput(attachment *wsPTYAttachment, payload []byte, seq uint64, hasSeq bool) wsPTYInputWriteResult {
-	session := h.sessionForAttachment(attachment.sessionKey)
-	if session == nil {
-		return wsPTYInputWriteResult{status: wsPTYInputWriteNotFound}
-	}
-	if len(payload) == 0 {
-		return wsPTYInputWriteResult{status: wsPTYInputWriteOK}
-	}
-
-	h.mu.Lock()
-	current := h.sessions[attachment.sessionKey] == session &&
-		!session.closed &&
-		session.attachments[attachment.id] == attachment &&
-		session.input != nil
-	h.mu.Unlock()
-	if !current {
-		return wsPTYInputWriteResult{status: wsPTYInputWriteNotFound}
-	}
-
-	chunks := make([]wsPTYInputChunk, 0, (len(payload)+defaultPTYInputChunkBytes-1)/defaultPTYInputChunkBytes)
-	remaining := len(payload)
-	for len(payload) > 0 {
-		chunkLen := len(payload)
-		if chunkLen > defaultPTYInputChunkBytes {
-			chunkLen = defaultPTYInputChunkBytes
-		}
-		remaining -= chunkLen
-		chunks = append(chunks, wsPTYInputChunk{
-			attachmentID:  attachment.id,
-			attachment:    attachment,
-			payload:       append([]byte(nil), payload[:chunkLen]...),
-			seq:           seq,
-			finalSeqChunk: attachment.inputSeqAck && remaining == 0,
-		})
-		payload = payload[chunkLen:]
-	}
-
-	session.inputEnqueueMu.Lock()
-	defer session.inputEnqueueMu.Unlock()
-
-	h.mu.Lock()
-	current = h.sessions[attachment.sessionKey] == session &&
-		!session.closed &&
-		session.attachments[attachment.id] == attachment &&
-		session.input != nil
-	if current && attachment.inputSeqAck {
-		want := attachment.lastAcceptedSeq + 1
-		if !hasSeq || seq != want {
-			h.mu.Unlock()
-			return wsPTYInputWriteResult{status: wsPTYInputWriteSeqGap, got: seq, want: want}
-		}
-	}
-	h.mu.Unlock()
-	if !current {
-		return wsPTYInputWriteResult{status: wsPTYInputWriteNotFound}
-	}
-	if len(chunks) > cap(session.input)-len(session.input) {
-		if h.stderr != nil {
-			_, _ = fmt.Fprintf(h.stderr, "ws pty input queue full session=%s attachment=%s\n", session.id, attachment.id)
-		}
-		return wsPTYInputWriteResult{status: wsPTYInputWriteQueueFull}
-	}
-	if attachment.inputSeqAck {
-		h.mu.Lock()
-		if h.sessions[attachment.sessionKey] != session ||
-			session.closed ||
-			session.attachments[attachment.id] != attachment ||
-			session.input == nil {
-			h.mu.Unlock()
-			return wsPTYInputWriteResult{status: wsPTYInputWriteNotFound}
-		}
-		attachment.lastAcceptedSeq = seq
-		h.mu.Unlock()
-	}
-	for _, chunk := range chunks {
-		select {
-		case session.input <- chunk:
-		case <-session.done:
-			return wsPTYInputWriteResult{status: wsPTYInputWriteNotFound}
-		}
-	}
-	return wsPTYInputWriteResult{status: wsPTYInputWriteOK}
-}
-
-func (h *wsPTYHub) writeInputLoop(session *wsPTYSession) {
-	for {
-		select {
-		case <-session.done:
-			return
-		case chunk := <-session.input:
-			h.writeInputChunk(session, chunk)
-		}
-	}
-}
-
-func (h *wsPTYHub) writeInputChunk(session *wsPTYSession, chunk wsPTYInputChunk) bool {
-	written, ackOK := h.writeInputChunkLocked(session, chunk)
-	if !ackOK {
-		// enqueueInputAck canceled the attachment because its send queue
-		// was saturated; finish the cleanup like the output path does.
-		// Must run outside ptyWriteMu: dropAttachment can resize via
-		// applyCurrentPTYSize, which takes ptyWriteMu.
-		h.dropAttachment(chunk.attachment)
-	}
-	return written
-}
-
-func (h *wsPTYHub) writeInputChunkLocked(session *wsPTYSession, chunk wsPTYInputChunk) (written bool, ackOK bool) {
-	session.ptyWriteMu.Lock()
-	defer session.ptyWriteMu.Unlock()
-
-	// Deliberately session-scoped, not attachment-scoped: once writeInput
-	// accepted bytes they belong to the persistent session and are written
-	// even if their attachment has since detached (tmux semantics — input
-	// sent before detach still executes). Discarding queued accepted bytes
-	// on detach is the silent-loss bug class this path exists to prevent;
-	// writeInput still rejects NEW writes from detached attachments.
-	h.mu.Lock()
-	current := h.sessions[session.key] == session && !session.closed
-	h.mu.Unlock()
-	ptyFile := session.ptyFileSnapshot()
-	if !current || ptyFile == nil {
-		return false, true
-	}
-	return h.writeInputChunkWithPTYFile(ptyFile, chunk)
-}
-
-func (h *wsPTYHub) writeInputChunkWithPTYFile(ptyFile *os.File, chunk wsPTYInputChunk) (written bool, ackOK bool) {
-	total := 0
-	for total < len(chunk.payload) {
-		n, err := ptyFile.Write(chunk.payload[total:])
-		if n > 0 {
-			total += n
-		}
-		if err != nil {
-			return false, true
-		}
-		if n == 0 {
-			return false, true
-		}
-	}
-	return true, h.ackInputChunk(chunk)
-}
-
-func (h *wsPTYHub) ackInputChunk(chunk wsPTYInputChunk) bool {
-	if !chunk.finalSeqChunk || chunk.attachment == nil || !chunk.attachment.inputSeqAck {
-		return true
-	}
-	return chunk.attachment.enqueueInputAck(chunk.seq)
-}
-
-func (h *wsPTYHub) sessionForAttachment(sessionKey wsPTYSessionKey) *wsPTYSession {
-	h.mu.Lock()
-	defer h.mu.Unlock()
-	session := h.sessions[sessionKey]
-	if session == nil || session.closed {
-		return nil
-	}
-	return session
-}
-
-func (h *wsPTYHub) resize(attachment *wsPTYAttachment, cols int, rows int) {
-	if cols <= 0 || rows <= 0 {
-		return
-	}
-	cols, rows = normalizePTYSize(cols, rows)
-	h.mu.Lock()
-
-	session := h.sessions[attachment.sessionKey]
-	if session == nil || session.closed {
-		h.mu.Unlock()
-		return
-	}
-	current := session.attachments[attachment.id]
-	if current != attachment {
-		h.mu.Unlock()
-		return
-	}
-	current.cols = cols
-	current.rows = rows
-	shouldApplySize := h.recomputeSessionSizeLocked(session)
-	h.mu.Unlock()
-
-	if shouldApplySize {
-		h.applyCurrentPTYSize(session)
-	}
-}
-
-func (a *wsPTYAttachment) enqueueBinary(payload []byte) bool {
-	return a.enqueue(websocket.MessageBinary, payload)
-}
-
-func enqueuePTYReplay(attachment *wsPTYAttachment, replay []byte) bool {
-	for start := 0; start < len(replay); start += defaultWebSocketReplayChunkBytes {
-		end := start + defaultWebSocketReplayChunkBytes
-		if end > len(replay) {
-			end = len(replay)
-		}
-		if ok := attachment.enqueueBinary(replay[start:end]); !ok {
-			return false
-		}
-	}
-	return true
-}
-
-func (a *wsPTYAttachment) enqueueJSON(payload any) bool {
-	data, err := json.Marshal(payload)
-	if err != nil {
-		a.cancel()
-		return false
-	}
-	return a.enqueue(websocket.MessageText, data)
-}
-
-func (a *wsPTYAttachment) enqueueReady(sessionID string) bool {
-	return a.enqueueJSON(wsPTYEventFrame{
-		Type:         "ready",
-		SessionID:    sessionID,
-		AttachmentID: a.id,
-	})
-}
-
-func (a *wsPTYAttachment) enqueue(messageType websocket.MessageType, payload []byte) bool {
-	frame := wsPTYOutgoingFrame{
-		messageType: messageType,
-		payload:     append([]byte(nil), payload...),
-	}
-	select {
-	case a.send <- frame:
-		return true
-	default:
-		a.cancel()
-		return false
-	}
-}
-
-func (a *wsPTYAttachment) enqueueInputAck(seq uint64) bool {
-	a.ackMu.Lock()
-	if seq > a.ackSeq {
-		a.ackSeq = seq
-	}
-	if a.ackQueued {
-		a.ackMu.Unlock()
-		return true
-	}
-	a.ackQueued = true
-	a.ackMu.Unlock()
-
-	select {
-	case a.send <- wsPTYOutgoingFrame{inputAck: true}:
-		return true
-	default:
-		a.ackMu.Lock()
-		a.ackQueued = false
-		a.ackMu.Unlock()
-		a.cancel()
-		return false
-	}
-}
-
-func (a *wsPTYAttachment) consumeInputAck() uint64 {
-	a.ackMu.Lock()
-	defer a.ackMu.Unlock()
-	seq := a.ackSeq
-	a.ackQueued = false
-	return seq
-}
-
-func (a *wsPTYAttachment) writeLoop(ctx context.Context, conn *websocket.Conn, sessionDone <-chan struct{}) {
-	for {
-		select {
-		case <-ctx.Done():
-			return
-		case <-sessionDone:
-			for {
-				select {
-				case frame := <-a.send:
-					if !a.writeFrame(ctx, conn, frame) {
-						return
-					}
-				default:
-					_ = conn.Close(websocket.StatusNormalClosure, "pty closed")
-					return
-				}
-			}
-		case frame := <-a.send:
-			if !a.writeFrame(ctx, conn, frame) {
-				return
-			}
-		}
-	}
-}
-
-func (a *wsPTYAttachment) writeFrame(ctx context.Context, conn *websocket.Conn, frame wsPTYOutgoingFrame) bool {
-	if ctx.Err() != nil {
-		if a.cancel != nil {
-			a.cancel()
-		}
-		_ = conn.CloseNow()
-		return false
-	}
-	writeCtx, cancel := context.WithTimeout(ctx, defaultWebSocketWriteTimeout)
-	err := conn.Write(writeCtx, frame.messageType, frame.payload)
-	cancel()
-	if err != nil {
-		if a.cancel != nil {
-			a.cancel()
-		}
-		_ = conn.CloseNow()
-		return false
-	}
-	return true
-}
-
-func rpcPTYEventForFrame(attachment *wsPTYAttachment, frame wsPTYOutgoingFrame) rpcEvent {
-	if frame.inputAck {
-		return rpcEvent{
-			Event:           "pty.input_ack",
-			SessionID:       attachment.sessionKey.sessionID,
-			AttachmentID:    attachment.id,
-			AttachmentToken: attachment.clientToken,
-			Seq:             attachment.consumeInputAck(),
-		}
-	}
-	event := rpcEvent{
-		Event:           "pty.data",
-		SessionID:       attachment.sessionKey.sessionID,
-		AttachmentID:    attachment.id,
-		AttachmentToken: attachment.clientToken,
-	}
-	if frame.messageType == websocket.MessageText {
-		var wsEvent wsPTYEventFrame
-		if err := json.Unmarshal(frame.payload, &wsEvent); err == nil && strings.TrimSpace(wsEvent.Type) != "" {
-			event.Event = "pty." + strings.TrimSpace(wsEvent.Type)
-			event.Message = wsEvent.Message
-			if strings.TrimSpace(wsEvent.SessionID) != "" {
-				event.SessionID = strings.TrimSpace(wsEvent.SessionID)
-			}
-			if strings.TrimSpace(wsEvent.AttachmentID) != "" {
-				event.AttachmentID = strings.TrimSpace(wsEvent.AttachmentID)
-			}
-			event.AttachmentToken = attachment.clientToken
-			return event
-		}
-		event.Event = "pty.message"
-		event.Message = string(frame.payload)
-		return event
-	}
-	event.DataBase64 = base64.StdEncoding.EncodeToString(frame.payload)
-	return event
-}
-
-func rpcPTYExitEvent(attachment *wsPTYAttachment) rpcEvent {
-	return rpcEvent{
-		Event:           "pty.exit",
-		SessionID:       attachment.sessionKey.sessionID,
-		AttachmentID:    attachment.id,
-		AttachmentToken: attachment.clientToken,
-	}
-}
-
-func (a *wsPTYAttachment) closeNow() {
-	if a == nil || a.conn == nil {
-		return
-	}
-	_ = a.conn.CloseNow()
-}
-
-func pumpWebSocketToPTY(ctx context.Context, hub *wsPTYHub, attachment *wsPTYAttachment, conn *websocket.Conn) {
-	for {
-		msgType, payload, err := conn.Read(ctx)
-		if err != nil {
-			return
-		}
-		switch msgType {
-		case websocket.MessageBinary:
-			if status := hub.writeInput(attachment, payload, 0, false).status; status != wsPTYInputWriteOK {
-				return
-			}
-		case websocket.MessageText:
-			var control wsPTYControlFrame
-			if err := json.Unmarshal(payload, &control); err != nil {
-				continue
-			}
-			switch control.Type {
-			case "resize":
-				hub.resize(attachment, control.Cols, control.Rows)
-			case "close":
-				hub.closeSessionForAttachment(attachment)
-				return
-			}
-		}
-	}
-}
-
-func normalizePTYSize(cols int, rows int) (int, int) {
-	if cols <= 0 {
-		cols = defaultPTYCols
-	}
-	if rows <= 0 {
-		rows = defaultPTYRows
-	}
-	if cols > maxPTYDimension {
-		cols = maxPTYDimension
-	}
-	if rows > maxPTYDimension {
-		rows = maxPTYDimension
-	}
-	return cols, rows
-}
-
-func resolvePTYShell(explicit string) string {
-	if strings.TrimSpace(explicit) != "" {
-		return explicit
-	}
-	if shell := strings.TrimSpace(os.Getenv("SHELL")); shell != "" {
-		if _, err := os.Stat(shell); err == nil {
-			return shell
-		}
-	}
-	for _, candidate := range []string{"/bin/bash", "/usr/bin/bash", "/bin/sh"} {
-		if _, err := os.Stat(candidate); err == nil {
-			return candidate
-		}
-	}
-	return filepath.Clean("/bin/sh")
-}
diff --git a/daemon/remote/cmd/cmuxd-remote/ws_pty_fuzz_test.go b/daemon/remote/cmd/cmuxd-remote/ws_pty_fuzz_test.go
deleted file mode 100644
index a7d29c5369ab..000000000000
--- a/daemon/remote/cmd/cmuxd-remote/ws_pty_fuzz_test.go
+++ /dev/null
@@ -1,47 +0,0 @@
-package main
-
-import (
-	"os"
-	"path/filepath"
-	"testing"
-)
-
-func FuzzConsumeWebSocketLease(f *testing.F) {
-	f.Add(`{"version":1,"token_sha256":"2bb80d537b1da3e38bd30361aa855686bde0ba2cf9c27ffb6b3874b764d66e16","expires_at_unix":4102444800,"session_id":"sess","single_use":false}`, "secret", "sess")
-	f.Add(`{"version":1,"token_sha256":"bad","expires_at_unix":0,"single_use":true}`, "secret", "")
-	f.Add(`not-json`, "secret", "sess")
-
-	f.Fuzz(func(t *testing.T, leaseJSON string, token string, sessionID string) {
-		if len(leaseJSON) > 1<<20 {
-			t.Skip("lease fixture too large")
-		}
-		path := filepath.Join(t.TempDir(), "lease.json")
-		if err := os.WriteFile(path, []byte(leaseJSON), 0o600); err != nil {
-			t.Fatalf("write lease: %v", err)
-		}
-		_ = consumeWebSocketLease(path, wsAuthFrame{
-			Type:      "auth",
-			Token:     token,
-			SessionID: sessionID,
-			Cols:      80,
-			Rows:      24,
-		})
-	})
-}
-
-func FuzzNormalizePTYSize(f *testing.F) {
-	f.Add(80, 24)
-	f.Add(0, 0)
-	f.Add(-1, -100)
-	f.Add(1_000_000, 1_000_000)
-
-	f.Fuzz(func(t *testing.T, cols int, rows int) {
-		gotCols, gotRows := normalizePTYSize(cols, rows)
-		if gotCols <= 0 || gotRows <= 0 {
-			t.Fatalf("normalizePTYSize(%d, %d) = %dx%d, expected positive dimensions", cols, rows, gotCols, gotRows)
-		}
-		if gotCols > maxPTYDimension || gotRows > maxPTYDimension {
-			t.Fatalf("normalizePTYSize(%d, %d) = %dx%d, expected <= %d", cols, rows, gotCols, gotRows, maxPTYDimension)
-		}
-	})
-}
diff --git a/daemon/remote/cmd/cmuxd-remote/ws_pty_session_cleanup_linux_test.go b/daemon/remote/cmd/cmuxd-remote/ws_pty_session_cleanup_linux_test.go
deleted file mode 100644
index 18c951a4b9e0..000000000000
--- a/daemon/remote/cmd/cmuxd-remote/ws_pty_session_cleanup_linux_test.go
+++ /dev/null
@@ -1,246 +0,0 @@
-//go:build linux
-
-package main
-
-import (
-	"context"
-	"io"
-	"os"
-	"strconv"
-	"strings"
-	"syscall"
-	"testing"
-	"time"
-)
-
-func TestWebSocketPTYCleanupTerminatesEverySessionProcessGroup(t *testing.T) {
-	tests := []struct {
-		name   string
-		close  func(*testing.T, *wsPTYHub, *wsPTYAttachment)
-		idleTT time.Duration
-	}{
-		{
-			name: "explicit close",
-			close: func(t *testing.T, hub *wsPTYHub, attachment *wsPTYAttachment) {
-				if !hub.closeSessionByID(attachment.sessionKey.sessionID) {
-					t.Fatal("closeSessionByID returned false")
-				}
-			},
-		},
-		{
-			name: "server closeAll",
-			close: func(_ *testing.T, hub *wsPTYHub, _ *wsPTYAttachment) {
-				hub.closeAll()
-			},
-		},
-		{
-			name:   "idle reap",
-			idleTT: 20 * time.Millisecond,
-			close: func(t *testing.T, hub *wsPTYHub, attachment *wsPTYAttachment) {
-				if !hub.detach(attachment) {
-					t.Fatal("detach returned false")
-				}
-				waitForHubSessionCount(t, hub, 0, 5*time.Second)
-			},
-		},
-	}
-
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			hub := newWebSocketPTYHub(wsPTYServerConfig{
-				Shell:          "/bin/sh",
-				SessionIdleTTL: test.idleTT,
-			}, io.Discard)
-			if test.idleTT == 0 {
-				hub.sessionIdleTTL = time.Hour
-			}
-
-			sessionID := "cleanup-" + strings.ReplaceAll(test.name, " ", "-")
-			attachment, _, _, err := hub.prepareAttachment(
-				context.Background(),
-				nil,
-				sessionID,
-				"attachment",
-				80,
-				24,
-				true,
-				`set -m; trap '' HUP; sleep 300 & wait`,
-				"token",
-				false,
-				false,
-			)
-			if err != nil {
-				t.Fatalf("prepare PTY session: %v", err)
-			}
-
-			hub.mu.Lock()
-			session := hub.sessions[persistentPTYSessionKey(sessionID)]
-			leaderPID := session.cmd.Process.Pid
-			hub.mu.Unlock()
-
-			backgroundPIDs := waitForLinuxSessionBackgroundGroup(t, leaderPID, 5*time.Second)
-			t.Cleanup(func() {
-				for _, pid := range backgroundPIDs {
-					_ = syscall.Kill(pid, syscall.SIGKILL)
-				}
-				_ = syscall.Kill(-leaderPID, syscall.SIGKILL)
-				hub.closeAll()
-			})
-
-			test.close(t, hub, attachment)
-			waitForLinuxProcessesStopped(t, backgroundPIDs, 5*time.Second)
-		})
-	}
-}
-
-func TestWebSocketPTYLeaderExitTerminatesEverySessionProcessGroup(t *testing.T) {
-	hub := newWebSocketPTYHub(wsPTYServerConfig{
-		Shell:          "/bin/sh",
-		SessionIdleTTL: time.Hour,
-	}, io.Discard)
-	t.Cleanup(hub.closeAll)
-
-	const sessionID = "leader-exit-cleanup"
-	releaseLeader := t.TempDir() + "/release-leader"
-	_, _, _, err := hub.prepareAttachment(
-		context.Background(),
-		nil,
-		sessionID,
-		"attachment",
-		80,
-		24,
-		true,
-		`set -m; sleep 300 & while [ ! -f `+strconv.Quote(releaseLeader)+` ]; do sleep 0.01; done; exit 0`,
-		"token",
-		false,
-		false,
-	)
-	if err != nil {
-		t.Fatalf("prepare PTY session: %v", err)
-	}
-
-	hub.mu.Lock()
-	session := hub.sessions[persistentPTYSessionKey(sessionID)]
-	if session == nil || session.cmd == nil || session.cmd.Process == nil {
-		hub.mu.Unlock()
-		t.Fatal("persistent PTY session has no leader process")
-	}
-	leaderPID := session.cmd.Process.Pid
-	hub.mu.Unlock()
-
-	backgroundPIDs := waitForLinuxSessionBackgroundGroup(t, leaderPID, 5*time.Second)
-	t.Cleanup(func() {
-		for _, pid := range backgroundPIDs {
-			_ = syscall.Kill(pid, syscall.SIGKILL)
-		}
-		_ = syscall.Kill(-leaderPID, syscall.SIGKILL)
-	})
-
-	if err := os.WriteFile(releaseLeader, []byte("exit\n"), 0o600); err != nil {
-		t.Fatalf("release PTY session leader: %v", err)
-	}
-	waitForHubSessionCount(t, hub, 0, time.Second)
-	waitForLinuxProcessesStopped(t, backgroundPIDs, 5*time.Second)
-}
-
-type linuxSessionProcess struct {
-	pid     int
-	groupID int
-	state   byte
-}
-
-func waitForLinuxSessionBackgroundGroup(t *testing.T, sessionID int, timeout time.Duration) []int {
-	t.Helper()
-	deadline := time.Now().Add(timeout)
-	for time.Now().Before(deadline) {
-		var backgroundPIDs []int
-		for _, process := range linuxSessionProcesses(t, sessionID) {
-			if process.groupID != sessionID && process.state != 'Z' {
-				backgroundPIDs = append(backgroundPIDs, process.pid)
-			}
-		}
-		if len(backgroundPIDs) > 0 {
-			return backgroundPIDs
-		}
-		time.Sleep(10 * time.Millisecond)
-	}
-	t.Fatalf("PTY session %d did not create a background process group", sessionID)
-	return nil
-}
-
-func waitForLinuxProcessesStopped(t *testing.T, pids []int, timeout time.Duration) {
-	t.Helper()
-	deadline := time.Now().Add(timeout)
-	for time.Now().Before(deadline) {
-		allStopped := true
-		for _, pid := range pids {
-			process, ok := readLinuxSessionProcess(pid)
-			if ok && process.state != 'Z' {
-				allStopped = false
-				break
-			}
-		}
-		if allStopped {
-			return
-		}
-		time.Sleep(10 * time.Millisecond)
-	}
-	t.Fatalf("background PTY session processes still running after cleanup: %v", pids)
-}
-
-func linuxSessionProcesses(t *testing.T, sessionID int) []linuxSessionProcess {
-	t.Helper()
-	entries, err := os.ReadDir("/proc")
-	if err != nil {
-		t.Fatalf("read /proc: %v", err)
-	}
-	processes := make([]linuxSessionProcess, 0)
-	for _, entry := range entries {
-		pid, err := strconv.Atoi(entry.Name())
-		if err != nil {
-			continue
-		}
-		process, ok := readLinuxSessionProcess(pid)
-		if ok && linuxTestProcessSessionID(pid) == sessionID {
-			processes = append(processes, process)
-		}
-	}
-	return processes
-}
-
-func linuxTestProcessSessionID(pid int) int {
-	data, err := os.ReadFile("/proc/" + strconv.Itoa(pid) + "/stat")
-	if err != nil {
-		return 0
-	}
-	fields := linuxProcessStatFields(data)
-	if len(fields) < 4 {
-		return 0
-	}
-	sessionID, _ := strconv.Atoi(fields[3])
-	return sessionID
-}
-
-func readLinuxSessionProcess(pid int) (linuxSessionProcess, bool) {
-	data, err := os.ReadFile("/proc/" + strconv.Itoa(pid) + "/stat")
-	if err != nil {
-		return linuxSessionProcess{}, false
-	}
-	fields := linuxProcessStatFields(data)
-	if len(fields) < 4 || len(fields[0]) != 1 {
-		return linuxSessionProcess{}, false
-	}
-	groupID, err := strconv.Atoi(fields[2])
-	if err != nil {
-		return linuxSessionProcess{}, false
-	}
-	return linuxSessionProcess{pid: pid, groupID: groupID, state: fields[0][0]}, true
-}
-
-func linuxProcessStatFields(data []byte) []string {
-	closingParen := strings.LastIndexByte(string(data), ')')
-	if closingParen < 0 || closingParen+2 >= len(data) {
-		return nil
-	}
-	return strings.Fields(string(data[closingParen+2:]))
-}
diff --git a/daemon/remote/cmd/cmuxd-remote/ws_pty_session_processes_darwin.go b/daemon/remote/cmd/cmuxd-remote/ws_pty_session_processes_darwin.go
deleted file mode 100644
index 1b2c323230c1..000000000000
--- a/daemon/remote/cmd/cmuxd-remote/ws_pty_session_processes_darwin.go
+++ /dev/null
@@ -1,37 +0,0 @@
-//go:build darwin
-
-package main
-
-import (
-	"os/exec"
-	"strconv"
-	"strings"
-	"syscall"
-)
-
-func ptySessionMemberPIDs(sessionID int) []int {
-	output, err := exec.Command("/bin/ps", "-axo", "pid=").Output()
-	if err != nil {
-		return nil
-	}
-	members := make([]int, 0)
-	for _, field := range strings.Fields(string(output)) {
-		pid, err := strconv.Atoi(field)
-		if err != nil {
-			continue
-		}
-		processSessionID, ok := darwinProcessSessionID(pid)
-		if ok && processSessionID == sessionID {
-			members = append(members, pid)
-		}
-	}
-	return members
-}
-
-func darwinProcessSessionID(pid int) (int, bool) {
-	sessionID, _, errno := syscall.RawSyscall(syscall.SYS_GETSID, uintptr(pid), 0, 0)
-	if errno != 0 {
-		return 0, false
-	}
-	return int(sessionID), true
-}
diff --git a/daemon/remote/cmd/cmuxd-remote/ws_pty_session_processes_linux.go b/daemon/remote/cmd/cmuxd-remote/ws_pty_session_processes_linux.go
deleted file mode 100644
index 5f397959f96b..000000000000
--- a/daemon/remote/cmd/cmuxd-remote/ws_pty_session_processes_linux.go
+++ /dev/null
@@ -1,40 +0,0 @@
-//go:build linux
-
-package main
-
-import (
-	"os"
-	"strconv"
-	"strings"
-)
-
-func ptySessionMemberPIDs(sessionID int) []int {
-	entries, err := os.ReadDir("/proc")
-	if err != nil {
-		return nil
-	}
-	members := make([]int, 0)
-	for _, entry := range entries {
-		pid, err := strconv.Atoi(entry.Name())
-		if err != nil {
-			continue
-		}
-		data, err := os.ReadFile("/proc/" + entry.Name() + "/stat")
-		if err != nil {
-			continue
-		}
-		closingParen := strings.LastIndexByte(string(data), ')')
-		if closingParen < 0 || closingParen+2 >= len(data) {
-			continue
-		}
-		fields := strings.Fields(string(data[closingParen+2:]))
-		if len(fields) < 4 || fields[0] == "Z" {
-			continue
-		}
-		processSessionID, err := strconv.Atoi(fields[3])
-		if err == nil && processSessionID == sessionID {
-			members = append(members, pid)
-		}
-	}
-	return members
-}
diff --git a/daemon/remote/cmd/cmuxd-remote/ws_pty_test.go b/daemon/remote/cmd/cmuxd-remote/ws_pty_test.go
deleted file mode 100644
index b5d82ca00156..000000000000
--- a/daemon/remote/cmd/cmuxd-remote/ws_pty_test.go
+++ /dev/null
@@ -1,3254 +0,0 @@
-package main
-
-import (
-	"bytes"
-	"context"
-	"crypto/ed25519"
-	"crypto/sha256"
-	"encoding/base64"
-	"encoding/hex"
-	"encoding/json"
-	"errors"
-	"io"
-	"net/http"
-	"net/http/httptest"
-	"os"
-	"os/exec"
-	"os/signal"
-	"path/filepath"
-	"runtime"
-	"strconv"
-	"strings"
-	"sync/atomic"
-	"syscall"
-	"testing"
-	"time"
-
-	"github.com/creack/pty"
-	"nhooyr.io/websocket"
-)
-
-type doneObservedContext struct {
-	context.Context
-	observed chan<- struct{}
-}
-
-func (c doneObservedContext) Done() <-chan struct{} {
-	select {
-	case c.observed <- struct{}{}:
-	default:
-	}
-	return c.Context.Done()
-}
-
-type cancelAfterFirstErrContext struct {
-	context.Context
-	cancel context.CancelFunc
-	calls  atomic.Int32
-}
-
-func (c *cancelAfterFirstErrContext) Err() error {
-	if err := c.Context.Err(); err != nil {
-		return err
-	}
-	if c.calls.Add(1) == 1 {
-		c.cancel()
-	}
-	return nil
-}
-
-type gatedDoneContext struct {
-	context.Context
-	observed chan<- struct{}
-	release  <-chan struct{}
-}
-
-func (c gatedDoneContext) Done() <-chan struct{} {
-	select {
-	case c.observed <- struct{}{}:
-	default:
-	}
-	<-c.release
-	return c.Context.Done()
-}
-
-func newTestWebSocketPTYServer(t *testing.T, leasePath string) (*httptest.Server, *wsPTYHub) {
-	t.Helper()
-	stderr := &bytes.Buffer{}
-	hub := newWebSocketPTYHub(wsPTYServerConfig{
-		Shell:           "/bin/sh",
-		ScrollbackLimit: 64 * 1024,
-	}, stderr)
-	server := httptest.NewServer(newWebSocketPTYHandler(wsPTYServerConfig{
-		PTYAuthLeaseFile: leasePath,
-		Shell:            "/bin/sh",
-		PTYHub:           hub,
-		ScrollbackLimit:  64 * 1024,
-	}, stderr))
-	t.Cleanup(func() {
-		server.Close()
-		hub.closeAll()
-		if t.Failed() && stderr.Len() > 0 {
-			t.Logf("ws pty stderr:\n%s", stderr.String())
-		}
-	})
-	return server, hub
-}
-
-// TestAttachRPCSurfacesPTYAllocationFailure pins the contract that a remote PTY
-// allocation failure (e.g. a hardened devpts mounted ptmxmode=000 where
-// /dev/ptmx cannot be opened) is reported loudly: the error returned to the
-// client names the failing device and explains the devpts cause, and the daemon
-// records a safe failure category instead of leaving a 0-byte log. This is the
-// regression for https://github.com/manaflow-ai/cmux/issues/5185, where the failure
-// collapsed into a generic "remote PTY attach failed" with an empty daemon log.
-func TestAttachRPCSurfacesPTYAllocationFailure(t *testing.T) {
-	stderr := &bytes.Buffer{}
-	hub := newWebSocketPTYHub(wsPTYServerConfig{Shell: "/bin/sh"}, stderr)
-	t.Cleanup(hub.closeAll)
-
-	denied := &os.PathError{Op: "open", Path: "/dev/ptmx", Err: syscall.EACCES}
-	hub.openPTY = func() (*os.File, *os.File, error) {
-		return nil, nil, denied
-	}
-
-	_, _, _, err := hub.attachRPC(context.Background(), "sess-1", "att-1", 80, 24, "", "", false, false)
-	if err == nil {
-		t.Fatalf("expected attachRPC to fail when PTY allocation is denied")
-	}
-
-	msg := err.Error()
-	lowered := strings.ToLower(msg)
-	// Pin the stable marker the Swift clients key their passthrough off of: a
-	// daemon wording change that dropped it would silently break client-side
-	// preservation of this diagnostic without failing any other assertion. Match
-	// case-insensitively, exactly as Sources/Workspace.swift does.
-	if !strings.Contains(lowered, "could not allocate a remote pty") {
-		t.Fatalf("error must preserve the stable PTY-allocation marker the clients key off: %q", msg)
-	}
-	if !strings.Contains(msg, "/dev/ptmx") {
-		t.Fatalf("error should name the device that could not be opened: %q", msg)
-	}
-	// The EACCES remediation hint is appended for any permission-denied failure
-	// independent of /proc/self/mountinfo, so these assertions hold even in a
-	// container/sandbox without a real devpts mount (describeDevPTS may add
-	// nothing there). Key off the hint, not the optional mount summary.
-	if !strings.Contains(lowered, "ptmxmode") || !strings.Contains(lowered, "remount") {
-		t.Fatalf("error should explain the hardened devpts cause and remediation: %q", msg)
-	}
-
-	if stderr.Len() == 0 {
-		t.Fatalf("PTY allocation failure must be logged to the daemon log, not swallowed")
-	}
-	if !strings.Contains(stderr.String(), "event=pty_start_fault") ||
-		!strings.Contains(stderr.String(), `error_category="permission_denied"`) {
-		t.Fatalf("daemon log should classify the allocation failure: %q", stderr.String())
-	}
-	if strings.Contains(stderr.String(), denied.Error()) {
-		t.Fatalf("daemon log should not persist the raw allocation failure: %q", stderr.String())
-	}
-}
-
-func TestAttachRPCStalledSessionStartDoesNotBlockHealthyReattach(t *testing.T) {
-	hub := newWebSocketPTYHub(wsPTYServerConfig{Shell: "/bin/sh"}, io.Discard)
-	t.Cleanup(hub.closeAll)
-
-	const healthySessionID = "healthy-session"
-	if _, _, _, err := hub.attachRPC(
-		context.Background(),
-		healthySessionID,
-		"initial-attachment",
-		80,
-		24,
-		"sleep 30",
-		"",
-		false,
-		false,
-	); err != nil {
-		t.Fatalf("start healthy session: %v", err)
-	}
-
-	openPTY := hub.openPTY
-	startEntered := make(chan struct{})
-	releaseStart := make(chan struct{})
-	var startCount atomic.Int32
-	hub.openPTY = func() (*os.File, *os.File, error) {
-		if startCount.Add(1) == 1 {
-			close(startEntered)
-			<-releaseStart
-		}
-		return openPTY()
-	}
-
-	stalledResult := make(chan error, 1)
-	go func() {
-		_, _, _, err := hub.attachRPC(
-			context.Background(),
-			"stalled-session",
-			"stalled-attachment",
-			80,
-			24,
-			"sleep 30",
-			"",
-			false,
-			false,
-		)
-		stalledResult <- err
-	}()
-
-	select {
-	case <-startEntered:
-	case <-time.After(5 * time.Second):
-		t.Fatal("stalled session never attempted PTY allocation")
-	}
-
-	healthyResult := make(chan error, 1)
-	go func() {
-		_, _, _, err := hub.attachRPC(
-			context.Background(),
-			healthySessionID,
-			"reattachment",
-			80,
-			24,
-			"",
-			"",
-			true,
-			false,
-		)
-		healthyResult <- err
-	}()
-
-	select {
-	case err := <-healthyResult:
-		if err != nil {
-			close(releaseStart)
-			<-stalledResult
-			t.Fatalf("reattach healthy session: %v", err)
-		}
-	case <-time.After(time.Second):
-		close(releaseStart)
-		<-stalledResult
-		<-healthyResult
-		t.Fatal("healthy reattach blocked behind another session's stalled PTY allocation")
-	}
-
-	independentResult := make(chan error, 1)
-	go func() {
-		_, _, _, err := hub.attachRPC(
-			context.Background(),
-			"independent-session",
-			"independent-attachment",
-			80,
-			24,
-			"sleep 30",
-			"",
-			false,
-			false,
-		)
-		independentResult <- err
-	}()
-	select {
-	case err := <-independentResult:
-		if err != nil {
-			close(releaseStart)
-			<-stalledResult
-			t.Fatalf("start independent session: %v", err)
-		}
-	case <-time.After(time.Second):
-		close(releaseStart)
-		<-stalledResult
-		<-independentResult
-		t.Fatal("independent session start blocked behind another session's stalled PTY allocation")
-	}
-
-	close(releaseStart)
-	if err := <-stalledResult; err != nil {
-		t.Fatalf("finish formerly stalled session start: %v", err)
-	}
-}
-
-func TestAttachRPCConcurrentSameSessionStartsOnce(t *testing.T) {
-	hub := newWebSocketPTYHub(wsPTYServerConfig{Shell: "/bin/sh"}, io.Discard)
-	t.Cleanup(hub.closeAll)
-
-	openPTY := hub.openPTY
-	startEntered := make(chan struct{}, 2)
-	releaseStart := make(chan struct{})
-	var startCount atomic.Int32
-	hub.openPTY = func() (*os.File, *os.File, error) {
-		startCount.Add(1)
-		startEntered <- struct{}{}
-		<-releaseStart
-		return openPTY()
-	}
-
-	attach := func(ctx context.Context, attachmentID string) <-chan error {
-		result := make(chan error, 1)
-		go func() {
-			_, _, _, err := hub.attachRPC(
-				ctx,
-				"shared-session",
-				attachmentID,
-				80,
-				24,
-				"sleep 30",
-				"",
-				false,
-				false,
-			)
-			result <- err
-		}()
-		return result
-	}
-
-	firstResult := attach(context.Background(), "first-attachment")
-	select {
-	case <-startEntered:
-	case <-time.After(5 * time.Second):
-		t.Fatal("first attach never attempted PTY allocation")
-	}
-
-	secondWaiting := make(chan struct{}, 1)
-	secondResult := attach(
-		doneObservedContext{Context: context.Background(), observed: secondWaiting},
-		"second-attachment",
-	)
-	select {
-	case <-secondWaiting:
-	case <-time.After(time.Second):
-		close(releaseStart)
-		<-firstResult
-		<-secondResult
-		t.Fatal("second attach did not join the in-flight session start")
-	}
-	if got := startCount.Load(); got != 1 {
-		close(releaseStart)
-		<-firstResult
-		<-secondResult
-		t.Fatalf("PTY start count before release = %d, want 1", got)
-	}
-	close(releaseStart)
-
-	if err := <-firstResult; err != nil {
-		t.Fatalf("first attach: %v", err)
-	}
-	if err := <-secondResult; err != nil {
-		t.Fatalf("second attach: %v", err)
-	}
-	if got := startCount.Load(); got != 1 {
-		t.Fatalf("PTY start count = %d, want 1 for concurrent attaches to one session", got)
-	}
-
-	hub.mu.Lock()
-	session := hub.sessions[persistentPTYSessionKey("shared-session")]
-	pendingStarts := len(hub.startingSessions)
-	attachmentCount := 0
-	if session != nil {
-		attachmentCount = len(session.attachments)
-	}
-	hub.mu.Unlock()
-	if pendingStarts != 0 {
-		t.Fatalf("pending session starts = %d, want 0 after successful start", pendingStarts)
-	}
-	if attachmentCount != 2 {
-		t.Fatalf("shared session attachments = %d, want 2", attachmentCount)
-	}
-}
-
-func TestAttachRPCSharedStartSurvivesOwnerCancellation(t *testing.T) {
-	hub := newWebSocketPTYHub(wsPTYServerConfig{Shell: "/bin/sh"}, io.Discard)
-	t.Cleanup(hub.closeAll)
-
-	openPTY := hub.openPTY
-	startEntered := make(chan struct{})
-	releaseStart := make(chan struct{})
-	hub.openPTY = func() (*os.File, *os.File, error) {
-		close(startEntered)
-		<-releaseStart
-		return openPTY()
-	}
-
-	ownerCtx, cancelOwner := context.WithCancel(context.Background())
-	ownerResult := make(chan error, 1)
-	go func() {
-		_, _, _, err := hub.attachRPC(
-			ownerCtx,
-			"owner-canceled-session",
-			"owner",
-			80,
-			24,
-			"sleep 30",
-			"",
-			false,
-			false,
-		)
-		ownerResult <- err
-	}()
-	select {
-	case <-startEntered:
-	case <-time.After(5 * time.Second):
-		t.Fatal("start owner never attempted PTY allocation")
-	}
-
-	waiterJoined := make(chan struct{}, 1)
-	waiterResult := make(chan error, 1)
-	go func() {
-		_, _, _, err := hub.attachRPC(
-			doneObservedContext{Context: context.Background(), observed: waiterJoined},
-			"owner-canceled-session",
-			"waiter",
-			80,
-			24,
-			"sleep 30",
-			"",
-			false,
-			false,
-		)
-		waiterResult <- err
-	}()
-	select {
-	case <-waiterJoined:
-	case <-time.After(time.Second):
-		close(releaseStart)
-		t.Fatal("live waiter did not join the owner's in-flight start")
-	}
-
-	cancelOwner()
-	close(releaseStart)
-	if err := <-ownerResult; !errors.Is(err, context.Canceled) {
-		t.Fatalf("canceled start owner error = %v, want context canceled", err)
-	}
-	if err := <-waiterResult; err != nil {
-		t.Fatalf("live waiter failed after start owner cancellation: %v", err)
-	}
-
-	hub.mu.Lock()
-	session := hub.sessions[persistentPTYSessionKey("owner-canceled-session")]
-	attachmentCount := 0
-	if session != nil {
-		attachmentCount = len(session.attachments)
-	}
-	hub.mu.Unlock()
-	if attachmentCount != 1 {
-		t.Fatalf("shared session attachments = %d, want live waiter only", attachmentCount)
-	}
-}
-
-func TestAttachRPCSharedStartDropsWaitersCanceledBeforePublication(t *testing.T) {
-	hub := newWebSocketPTYHub(wsPTYServerConfig{Shell: "/bin/sh"}, io.Discard)
-	t.Cleanup(hub.closeAll)
-
-	openPTY := hub.openPTY
-	startEntered := make(chan struct{})
-	releaseStart := make(chan struct{})
-	hub.openPTY = func() (*os.File, *os.File, error) {
-		close(startEntered)
-		<-releaseStart
-		return openPTY()
-	}
-
-	connectionCtx, cancelConnection := context.WithCancel(context.Background())
-	ownerResult := make(chan error, 1)
-	go func() {
-		_, _, _, err := hub.attachRPC(
-			connectionCtx,
-			"connection-canceled-session",
-			"owner",
-			80,
-			24,
-			"sleep 30",
-			"",
-			false,
-			false,
-		)
-		ownerResult <- err
-	}()
-	select {
-	case <-startEntered:
-	case <-time.After(5 * time.Second):
-		t.Fatal("start owner never attempted PTY allocation")
-	}
-
-	waiterDoneObserved := make(chan struct{}, 1)
-	releaseWaiterDone := make(chan struct{})
-	waiterReleased := false
-	defer func() {
-		if !waiterReleased {
-			close(releaseWaiterDone)
-		}
-	}()
-	waiterResult := make(chan error, 1)
-	go func() {
-		_, _, _, err := hub.attachRPC(
-			gatedDoneContext{
-				Context:  connectionCtx,
-				observed: waiterDoneObserved,
-				release:  releaseWaiterDone,
-			},
-			"connection-canceled-session",
-			"waiter",
-			80,
-			24,
-			"sleep 30",
-			"",
-			false,
-			false,
-		)
-		waiterResult <- err
-	}()
-	select {
-	case <-waiterDoneObserved:
-	case <-time.After(time.Second):
-		close(releaseStart)
-		t.Fatal("same-connection waiter did not join the in-flight start")
-	}
-
-	cancelConnection()
-	close(releaseStart)
-	if err := <-ownerResult; !errors.Is(err, context.Canceled) {
-		t.Fatalf("canceled start owner error = %v, want context canceled", err)
-	}
-
-	hub.mu.Lock()
-	_, published := hub.sessions[persistentPTYSessionKey("connection-canceled-session")]
-	hub.mu.Unlock()
-	if published {
-		t.Fatal("start published a session for waiters canceled before publication")
-	}
-
-	close(releaseWaiterDone)
-	waiterReleased = true
-	if err := <-waiterResult; !errors.Is(err, context.Canceled) {
-		t.Fatalf("canceled start waiter error = %v, want context canceled", err)
-	}
-}
-
-func TestAttachRPCFastExitCoalescedWaitersShareGeneration(t *testing.T) {
-	hub := newWebSocketPTYHub(wsPTYServerConfig{Shell: "/bin/sh"}, io.Discard)
-	t.Cleanup(hub.closeAll)
-
-	openPTY := hub.openPTY
-	startEntered := make(chan struct{})
-	releaseStart := make(chan struct{})
-	var startCount atomic.Int32
-	hub.openPTY = func() (*os.File, *os.File, error) {
-		startCount.Add(1)
-		close(startEntered)
-		<-releaseStart
-		return openPTY()
-	}
-
-	type attachResult struct {
-		attachment  *wsPTYAttachment
-		sessionDone <-chan struct{}
-		err         error
-	}
-	attach := func(ctx context.Context, attachmentID string) <-chan attachResult {
-		result := make(chan attachResult, 1)
-		go func() {
-			attachment, _, sessionDone, err := hub.attachRPC(
-				ctx,
-				"coalesced-fast-exit",
-				attachmentID,
-				80,
-				24,
-				"exit 0",
-				"",
-				false,
-				false,
-			)
-			result <- attachResult{attachment: attachment, sessionDone: sessionDone, err: err}
-		}()
-		return result
-	}
-
-	firstResult := attach(context.Background(), "first")
-	select {
-	case <-startEntered:
-	case <-time.After(5 * time.Second):
-		t.Fatal("first fast-exit attach never attempted PTY allocation")
-	}
-	waiterJoined := make(chan struct{}, 1)
-	releaseWaiter := make(chan struct{})
-	secondResult := attach(
-		gatedDoneContext{
-			Context:  context.Background(),
-			observed: waiterJoined,
-			release:  releaseWaiter,
-		},
-		"second",
-	)
-	select {
-	case <-waiterJoined:
-	case <-time.After(time.Second):
-		close(releaseStart)
-		close(releaseWaiter)
-		t.Fatal("second fast-exit attach did not join the in-flight generation")
-	}
-	close(releaseStart)
-
-	first := <-firstResult
-	if first.err != nil {
-		close(releaseWaiter)
-		t.Fatalf("first coalesced fast-exit attach: %v", first.err)
-	}
-	if first.attachment == nil || first.sessionDone == nil {
-		close(releaseWaiter)
-		t.Fatal("first coalesced fast-exit attach returned incomplete attachment")
-	}
-	select {
-	case <-first.sessionDone:
-	case <-time.After(5 * time.Second):
-		close(releaseWaiter)
-		t.Fatal("fast-exit process did not finish while its final claimant was pending")
-	}
-
-	hub.mu.Lock()
-	session := hub.sessions[persistentPTYSessionKey("coalesced-fast-exit")]
-	remainingClaims := 0
-	initialPhase := wsPTYSessionInitialActive
-	if session != nil {
-		remainingClaims = session.initialClaims
-		initialPhase = session.initialPhase
-	}
-	hub.mu.Unlock()
-	if session == nil {
-		close(releaseWaiter)
-		t.Fatal("fast-exit generation was removed before its final claimant consumed it")
-	}
-	if remainingClaims != 1 {
-		close(releaseWaiter)
-		t.Fatalf("fast-exit generation claims = %d, want final pending claimant", remainingClaims)
-	}
-	if initialPhase != wsPTYSessionFinishedBeforeInitialAttachment {
-		close(releaseWaiter)
-		t.Fatalf("fast-exit generation phase = %d, want finished-before-initial-attachment", initialPhase)
-	}
-	if snapshots := hub.sessionSnapshots(); len(snapshots) != 0 {
-		close(releaseWaiter)
-		t.Fatalf("fast-exit generation remained visible as running: %+v", snapshots)
-	}
-	if status := hub.writeInputByID("coalesced-fast-exit", "first", "", nil); status != wsPTYInputWriteNotFound {
-		close(releaseWaiter)
-		t.Fatalf("fast-exit generation input status = %v, want not found", status)
-	}
-	if hub.resizeByID("coalesced-fast-exit", "first", "", 100, 30) {
-		close(releaseWaiter)
-		t.Fatal("fast-exit generation remained resizable")
-	}
-
-	close(releaseWaiter)
-	second := <-secondResult
-	results := []attachResult{first, second}
-	for index, result := range results {
-		if result.err != nil {
-			t.Fatalf("coalesced fast-exit attach %d: %v", index+1, result.err)
-		}
-		if result.attachment == nil || result.sessionDone == nil {
-			t.Fatalf("coalesced fast-exit attach %d returned incomplete attachment", index+1)
-		}
-		if result.sessionDone != first.sessionDone {
-			t.Fatalf("coalesced fast-exit attach %d received a different generation", index+1)
-		}
-	}
-	if got := startCount.Load(); got != 1 {
-		t.Fatalf("coalesced fast-exit PTY start count = %d, want exactly 1", got)
-	}
-	hub.mu.Lock()
-	_, retained := hub.sessions[persistentPTYSessionKey("coalesced-fast-exit")]
-	hub.mu.Unlock()
-	if retained {
-		t.Fatal("fast-exit generation remained after its final initial claim")
-	}
-}
-
-func TestAttachRPCLateCancellationSchedulesPublishedSessionReap(t *testing.T) {
-	hub := newWebSocketPTYHub(wsPTYServerConfig{
-		Shell:          "/bin/sh",
-		SessionIdleTTL: time.Hour,
-	}, io.Discard)
-	t.Cleanup(hub.closeAll)
-
-	baseCtx, cancel := context.WithCancel(context.Background())
-	ctx := &cancelAfterFirstErrContext{Context: baseCtx, cancel: cancel}
-	_, _, _, err := hub.attachRPC(
-		ctx,
-		"late-canceled-session",
-		"late-canceled-attachment",
-		80,
-		24,
-		"sleep 30",
-		"",
-		false,
-		false,
-	)
-	if !errors.Is(err, context.Canceled) {
-		t.Fatalf("late-canceled attach error = %v, want context canceled", err)
-	}
-
-	hub.mu.Lock()
-	session := hub.sessions[persistentPTYSessionKey("late-canceled-session")]
-	attachmentCount := 0
-	hasIdleTimer := false
-	if session != nil {
-		attachmentCount = len(session.attachments)
-		hasIdleTimer = session.idleTimer != nil
-	}
-	hub.mu.Unlock()
-	if session == nil {
-		t.Fatal("late-canceled published session was not retained for idle reaping")
-	}
-	if attachmentCount != 0 {
-		t.Fatalf("late-canceled session attachments = %d, want 0", attachmentCount)
-	}
-	if !hasIdleTimer {
-		t.Fatal("late-canceled published session has no idle reap timer")
-	}
-
-	reattached, _, _, err := hub.attachRPC(
-		context.Background(),
-		"late-canceled-session",
-		"replacement-attachment",
-		80,
-		24,
-		"",
-		"",
-		true,
-		false,
-	)
-	if err != nil {
-		t.Fatalf("reattach retained late-canceled session: %v", err)
-	}
-	hub.mu.Lock()
-	session = hub.sessions[persistentPTYSessionKey("late-canceled-session")]
-	attachmentCount = 0
-	hasIdleTimer = false
-	initialPhase := wsPTYSessionAwaitingInitialAttachment
-	if session != nil {
-		attachmentCount = len(session.attachments)
-		hasIdleTimer = session.idleTimer != nil
-		initialPhase = session.initialPhase
-	}
-	hub.mu.Unlock()
-	if session == nil {
-		t.Fatal("late-canceled session disappeared before replacement attach")
-	}
-	if attachmentCount != 1 {
-		t.Fatalf("reattached late-canceled session attachments = %d, want 1", attachmentCount)
-	}
-	if hasIdleTimer {
-		t.Fatal("reattached late-canceled session retained its idle reap timer")
-	}
-	if initialPhase != wsPTYSessionInitialActive {
-		t.Fatalf("reattached late-canceled session phase = %d, want active", initialPhase)
-	}
-
-	hub.dropAttachment(reattached)
-	session.terminateProcesses()
-	session.closePTYFiles()
-	waitForHubSessionCount(t, hub, 0, 5*time.Second)
-}
-
-func TestAnonymousAttachLateCancellationDropsPublishedSession(t *testing.T) {
-	hub := newWebSocketPTYHub(wsPTYServerConfig{
-		Shell:          "/bin/sh",
-		SessionIdleTTL: time.Hour,
-	}, io.Discard)
-	t.Cleanup(hub.closeAll)
-
-	baseCtx, cancel := context.WithCancel(context.Background())
-	ctx := &cancelAfterFirstErrContext{Context: baseCtx, cancel: cancel}
-	_, _, _, err := hub.prepareAttachment(
-		ctx,
-		nil,
-		"late-canceled-anonymous",
-		"",
-		80,
-		24,
-		false,
-		"sleep 30",
-		"",
-		false,
-		false,
-	)
-	if !errors.Is(err, context.Canceled) {
-		t.Fatalf("late-canceled anonymous attach error = %v, want context canceled", err)
-	}
-
-	hub.mu.Lock()
-	sessionCount := len(hub.sessions)
-	hub.mu.Unlock()
-	if sessionCount != 0 {
-		t.Fatalf("anonymous sessions after late cancellation = %d, want 0", sessionCount)
-	}
-}
-
-func TestAttachRPCBoundsStalledSessionStartOwners(t *testing.T) {
-	hub := newWebSocketPTYHub(wsPTYServerConfig{Shell: "/bin/sh"}, io.Discard)
-	t.Cleanup(hub.closeAll)
-
-	startEntered := make(chan struct{}, maxConcurrentPTYSessionStartOwnersPerHub)
-	releaseStarts := make(chan struct{})
-	released := false
-	t.Cleanup(func() {
-		if !released {
-			close(releaseStarts)
-		}
-	})
-	hub.openPTY = func() (*os.File, *os.File, error) {
-		startEntered <- struct{}{}
-		<-releaseStarts
-		return nil, nil, errors.New("test PTY start released")
-	}
-
-	results := make(chan error, maxConcurrentPTYSessionStartOwnersPerHub)
-	for i := 0; i < maxConcurrentPTYSessionStartOwnersPerHub; i++ {
-		go func(index int) {
-			_, _, _, err := hub.attachRPC(
-				context.Background(),
-				"bounded-start-"+strconv.Itoa(index),
-				"attachment",
-				80,
-				24,
-				"sleep 30",
-				"",
-				false,
-				false,
-			)
-			results <- err
-		}(i)
-	}
-	for i := 0; i < maxConcurrentPTYSessionStartOwnersPerHub; i++ {
-		select {
-		case <-startEntered:
-		case <-time.After(5 * time.Second):
-			t.Fatalf("PTY start %d did not enter allocation", i+1)
-		}
-	}
-
-	excessResult := make(chan rpcResponse, 1)
-	server := &rpcServer{ptyHub: hub}
-	go func() {
-		excessResult <- server.handleRequest(rpcRequest{
-			ID:     1,
-			Method: "pty.attach",
-			Params: map[string]any{
-				"session_id":              "bounded-start-excess",
-				"attachment_id":           "attachment",
-				"client_attachment_token": "token",
-				"cols":                    80,
-				"rows":                    24,
-				"command":                 "sleep 30",
-			},
-		})
-	}()
-	select {
-	case response := <-excessResult:
-		if response.Error == nil || response.Error.Code != "unavailable" {
-			t.Fatalf("excess PTY start response = %+v, want unavailable error", response)
-		}
-		const wantMessage = "too many PTY sessions are already starting"
-		if response.Error.Message != wantMessage {
-			t.Fatalf("excess PTY start message = %q, want %q", response.Error.Message, wantMessage)
-		}
-	case <-time.After(time.Second):
-		t.Fatal("excess PTY start blocked instead of failing immediately")
-	}
-
-	released = true
-	close(releaseStarts)
-	for i := 0; i < maxConcurrentPTYSessionStartOwnersPerHub; i++ {
-		<-results
-	}
-}
-
-func TestAttachRPCBoundsStalledSessionStartWaitersPerHub(t *testing.T) {
-	hub := newWebSocketPTYHub(wsPTYServerConfig{Shell: "/bin/sh"}, io.Discard)
-	t.Cleanup(hub.closeAll)
-
-	const waiterLimit = 64
-	startEntered := make(chan struct{})
-	releaseStart := make(chan struct{})
-	released := false
-	t.Cleanup(func() {
-		if !released {
-			close(releaseStart)
-		}
-	})
-	hub.openPTY = func() (*os.File, *os.File, error) {
-		close(startEntered)
-		<-releaseStart
-		return nil, nil, errors.New("test PTY start released")
-	}
-
-	results := make(chan error, waiterLimit+1)
-	attach := func(ctx context.Context, attachmentID string) {
-		go func() {
-			_, _, _, err := hub.attachRPC(
-				ctx,
-				"bounded-waiters",
-				attachmentID,
-				80,
-				24,
-				"sleep 30",
-				"",
-				false,
-				false,
-			)
-			results <- err
-		}()
-	}
-	attach(context.Background(), "owner")
-	select {
-	case <-startEntered:
-	case <-time.After(5 * time.Second):
-		t.Fatal("PTY start owner did not enter allocation")
-	}
-
-	for i := 0; i < waiterLimit; i++ {
-		waiterJoined := make(chan struct{}, 1)
-		attach(
-			doneObservedContext{Context: context.Background(), observed: waiterJoined},
-			"waiter-"+strconv.Itoa(i),
-		)
-		select {
-		case <-waiterJoined:
-		case <-time.After(time.Second):
-			t.Fatalf("PTY start waiter %d did not join", i+1)
-		}
-	}
-
-	excessResult := make(chan rpcResponse, 1)
-	server := &rpcServer{ptyHub: hub}
-	go func() {
-		excessResult <- server.handleRequest(rpcRequest{
-			ID:     1,
-			Method: "pty.attach",
-			Params: map[string]any{
-				"session_id":              "bounded-waiters",
-				"attachment_id":           "excess",
-				"client_attachment_token": "token",
-				"cols":                    80,
-				"rows":                    24,
-				"command":                 "sleep 30",
-			},
-		})
-	}()
-	select {
-	case response := <-excessResult:
-		if response.Error == nil || response.Error.Code != "unavailable" {
-			t.Fatalf("excess PTY start waiter response = %+v, want unavailable error", response)
-		}
-		const wantMessage = "too many PTY session starts are already being awaited"
-		if response.Error.Message != wantMessage {
-			t.Fatalf("excess PTY start waiter message = %q, want %q", response.Error.Message, wantMessage)
-		}
-	case <-time.After(time.Second):
-		t.Fatal("excess PTY start waiter blocked instead of failing immediately")
-	}
-
-	released = true
-	close(releaseStart)
-	for i := 0; i < waiterLimit+1; i++ {
-		<-results
-	}
-}
-
-func TestCloseAllDoesNotWaitForStalledSessionStart(t *testing.T) {
-	hub := newWebSocketPTYHub(wsPTYServerConfig{Shell: "/bin/sh"}, io.Discard)
-	t.Cleanup(hub.closeAll)
-
-	openPTY := hub.openPTY
-	startEntered := make(chan struct{})
-	releaseStart := make(chan struct{})
-	hub.openPTY = func() (*os.File, *os.File, error) {
-		close(startEntered)
-		<-releaseStart
-		return openPTY()
-	}
-
-	attachResult := make(chan error, 1)
-	go func() {
-		_, _, _, err := hub.attachRPC(
-			context.Background(),
-			"closing-session",
-			"closing-attachment",
-			80,
-			24,
-			"sleep 30",
-			"",
-			false,
-			false,
-		)
-		attachResult <- err
-	}()
-	select {
-	case <-startEntered:
-	case <-time.After(5 * time.Second):
-		t.Fatal("session start never attempted PTY allocation")
-	}
-
-	closeDone := make(chan struct{})
-	go func() {
-		hub.closeAll()
-		close(closeDone)
-	}()
-	select {
-	case <-closeDone:
-	case <-time.After(time.Second):
-		close(releaseStart)
-		<-attachResult
-		t.Fatal("closeAll blocked behind a stalled session start")
-	}
-
-	close(releaseStart)
-	err := <-attachResult
-	if !errors.Is(err, errWSPTYHubClosed) {
-		t.Fatalf("attach after closeAll error = %v, want PTY hub closed", err)
-	}
-
-	hub.mu.Lock()
-	sessionCount := len(hub.sessions)
-	pendingStarts := len(hub.startingSessions)
-	hub.mu.Unlock()
-	if sessionCount != 0 {
-		t.Fatalf("published sessions after closeAll = %d, want 0", sessionCount)
-	}
-	if pendingStarts != 0 {
-		t.Fatalf("pending session starts after completion = %d, want 0", pendingStarts)
-	}
-}
-
-func TestWebSocketRPCStalledPTYAttachDoesNotBlockHealthyAttach(t *testing.T) {
-	hub := newWebSocketPTYHub(wsPTYServerConfig{Shell: "/bin/sh"}, io.Discard)
-	t.Cleanup(hub.closeAll)
-
-	const healthySessionID = "ws-rpc-healthy"
-	if _, _, _, err := hub.attachRPC(
-		context.Background(),
-		healthySessionID,
-		"seed",
-		80,
-		24,
-		"sleep 30",
-		"seed-token",
-		false,
-		false,
-	); err != nil {
-		t.Fatalf("seed healthy PTY session: %v", err)
-	}
-
-	openPTY := hub.openPTY
-	startEntered := make(chan struct{})
-	releaseStart := make(chan struct{})
-	hub.openPTY = func() (*os.File, *os.File, error) {
-		close(startEntered)
-		<-releaseStart
-		return openPTY()
-	}
-	t.Cleanup(func() {
-		select {
-		case <-releaseStart:
-		default:
-			close(releaseStart)
-		}
-	})
-
-	rpcLeasePath := filepath.Join(t.TempDir(), "rpc-lease.json")
-	const authToken = "ws-rpc-token"
-	const authSessionID = "ws-rpc-client"
-	writeTestLease(t, rpcLeasePath, authToken, authSessionID, true, time.Now().Add(time.Minute))
-	server := httptest.NewServer(newWebSocketPTYHandler(wsPTYServerConfig{
-		PTYAuthLeaseFile: filepath.Join(t.TempDir(), "unused-pty-lease.json"),
-		RPCAuthLeaseFile: rpcLeasePath,
-		Shell:            "/bin/sh",
-		PTYHub:           hub,
-	}, io.Discard))
-	t.Cleanup(server.Close)
-
-	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
-	defer cancel()
-	wsURL := "ws" + strings.TrimPrefix(server.URL, "http") + "/rpc"
-	conn, _, err := websocket.Dial(ctx, wsURL, nil)
-	if err != nil {
-		t.Fatalf("dial WebSocket RPC: %v", err)
-	}
-	t.Cleanup(func() { _ = conn.Close(websocket.StatusNormalClosure, "done") })
-
-	authPayload, err := json.Marshal(wsAuthFrame{
-		Type:      "auth",
-		Token:     authToken,
-		SessionID: authSessionID,
-	})
-	if err != nil {
-		t.Fatalf("marshal WebSocket RPC auth: %v", err)
-	}
-	if err := conn.Write(ctx, websocket.MessageText, authPayload); err != nil {
-		t.Fatalf("write WebSocket RPC auth: %v", err)
-	}
-	if _, payload, err := conn.Read(ctx); err != nil {
-		t.Fatalf("read WebSocket RPC ready: %v", err)
-	} else if !strings.Contains(string(payload), `"ready"`) {
-		t.Fatalf("unexpected WebSocket RPC ready frame: %s", payload)
-	}
-
-	writeRequest := func(req rpcRequest) {
-		t.Helper()
-		payload, err := json.Marshal(req)
-		if err != nil {
-			t.Fatalf("marshal WebSocket RPC request: %v", err)
-		}
-		if err := conn.Write(ctx, websocket.MessageText, payload); err != nil {
-			t.Fatalf("write WebSocket RPC request: %v", err)
-		}
-	}
-	writeRequest(rpcRequest{
-		ID:     1,
-		Method: "pty.attach",
-		Params: map[string]any{
-			"session_id":              "ws-rpc-stalled",
-			"attachment_id":           "stalled",
-			"client_attachment_token": "stalled-token",
-			"cols":                    80,
-			"rows":                    24,
-			"command":                 "sleep 30",
-		},
-	})
-	select {
-	case <-startEntered:
-	case <-time.After(5 * time.Second):
-		t.Fatal("stalled WebSocket RPC attach never reached PTY allocation")
-	}
-	writeRequest(rpcRequest{
-		ID:     2,
-		Method: "pty.attach",
-		Params: map[string]any{
-			"session_id":              healthySessionID,
-			"attachment_id":           "healthy",
-			"client_attachment_token": "healthy-token",
-			"cols":                    80,
-			"rows":                    24,
-			"require_existing":        true,
-		},
-	})
-
-	for {
-		msgType, payload, err := conn.Read(ctx)
-		if err != nil {
-			t.Fatalf("read WebSocket RPC response: %v", err)
-		}
-		if msgType != websocket.MessageText {
-			continue
-		}
-		var frame map[string]any
-		if err := json.Unmarshal(payload, &frame); err != nil {
-			t.Fatalf("decode WebSocket RPC frame %q: %v", payload, err)
-		}
-		if frame["id"] == float64(1) {
-			t.Fatalf("stalled WebSocket RPC attach completed before release: %v", frame)
-		}
-		if frame["id"] == float64(2) {
-			if ok, _ := frame["ok"].(bool); !ok {
-				t.Fatalf("healthy WebSocket RPC attach failed: %v", frame)
-			}
-			return
-		}
-	}
-}
-
-func TestServeWSRequiresExplicitLeaseFile(t *testing.T) {
-	var stderr bytes.Buffer
-	code := run([]string{"serve", "--ws", "--listen", "127.0.0.1:0"}, strings.NewReader(""), &bytes.Buffer{}, &stderr)
-	if code != 2 {
-		t.Fatalf("serve --ws without lease file exit = %d, want 2 stderr=%q", code, stderr.String())
-	}
-	if !strings.Contains(stderr.String(), "requires --auth-lease-file") {
-		t.Fatalf("stderr should explain missing lease file: %q", stderr.String())
-	}
-}
-
-func TestWebSocketPTYHealthIsAvailableWhenLocked(t *testing.T) {
-	leasePath := filepath.Join(t.TempDir(), "lease.json")
-	server, _ := newTestWebSocketPTYServer(t, leasePath)
-
-	resp, err := http.Get(server.URL + "/healthz")
-	if err != nil {
-		t.Fatalf("GET /healthz failed: %v", err)
-	}
-	defer resp.Body.Close()
-	if resp.StatusCode != http.StatusOK {
-		t.Fatalf("/healthz status = %d, want 200", resp.StatusCode)
-	}
-	var body map[string]any
-	if err := json.NewDecoder(resp.Body).Decode(&body); err != nil {
-		t.Fatalf("decode health body: %v", err)
-	}
-	if body["ok"] != true || body["locked"] != true {
-		t.Fatalf("unexpected health body: %v", body)
-	}
-}
-
-func TestWebSocketPTYAdminLeaseInstallRequiresToken(t *testing.T) {
-	leasePath := filepath.Join(t.TempDir(), "lease.json")
-	adminToken := "admin-token"
-	sum := sha256.Sum256([]byte(adminToken))
-	server := httptest.NewServer(newWebSocketPTYHandler(wsPTYServerConfig{
-		PTYAuthLeaseFile: leasePath,
-		AdminTokenSHA256: hex.EncodeToString(sum[:]),
-		Shell:            "/bin/sh",
-	}, nil))
-	defer server.Close()
-
-	req, err := http.NewRequest(http.MethodPost, server.URL+"/admin/leases", strings.NewReader(`{"pty_lease":{}}`))
-	if err != nil {
-		t.Fatalf("new request: %v", err)
-	}
-	resp, err := http.DefaultClient.Do(req)
-	if err != nil {
-		t.Fatalf("POST /admin/leases: %v", err)
-	}
-	defer resp.Body.Close()
-	if resp.StatusCode != http.StatusForbidden {
-		t.Fatalf("unauthenticated install status = %d, want %d", resp.StatusCode, http.StatusForbidden)
-	}
-}
-
-func TestWebSocketPTYAdminLeaseInstallUnlocksAttach(t *testing.T) {
-	leasePath := filepath.Join(t.TempDir(), "lease.json")
-	adminToken := "admin-token"
-	adminSum := sha256.Sum256([]byte(adminToken))
-	ptyToken := "pty-token"
-	ptySum := sha256.Sum256([]byte(ptyToken))
-	server := httptest.NewServer(newWebSocketPTYHandler(wsPTYServerConfig{
-		PTYAuthLeaseFile: leasePath,
-		AdminTokenSHA256: hex.EncodeToString(adminSum[:]),
-		Shell:            "/bin/sh",
-	}, nil))
-	defer server.Close()
-
-	lease := wsPTYLease{
-		Version:       1,
-		TokenSHA256:   hex.EncodeToString(ptySum[:]),
-		ExpiresAtUnix: time.Now().Add(time.Minute).Unix(),
-		SessionID:     "sess-admin",
-		SingleUse:     true,
-	}
-	body, err := json.Marshal(map[string]any{"pty_lease": lease})
-	if err != nil {
-		t.Fatalf("marshal body: %v", err)
-	}
-	req, err := http.NewRequest(http.MethodPost, server.URL+"/admin/leases", bytes.NewReader(body))
-	if err != nil {
-		t.Fatalf("new request: %v", err)
-	}
-	req.Header.Set("Authorization", "Bearer "+adminToken)
-	req.Header.Set("Content-Type", "application/json")
-	resp, err := http.DefaultClient.Do(req)
-	if err != nil {
-		t.Fatalf("POST /admin/leases: %v", err)
-	}
-	defer resp.Body.Close()
-	if resp.StatusCode != http.StatusOK {
-		t.Fatalf("install status = %d, want 200", resp.StatusCode)
-	}
-
-	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
-	defer cancel()
-	conn := dialPTY(t, ctx, server.URL)
-	defer conn.Close(websocket.StatusNormalClosure, "done")
-	sendAuth(t, ctx, conn, ptyToken, "sess-admin", 80, 24)
-	readReady(t, ctx, conn)
-}
-
-func TestWebSocketPTYAdminLeaseInstallAcceptsEd25519Signature(t *testing.T) {
-	leasePath := filepath.Join(t.TempDir(), "lease.json")
-	publicKey, privateKey, err := ed25519.GenerateKey(nil)
-	if err != nil {
-		t.Fatalf("generate key: %v", err)
-	}
-	ptyToken := "pty-token"
-	ptySum := sha256.Sum256([]byte(ptyToken))
-	server := httptest.NewServer(newWebSocketPTYHandler(wsPTYServerConfig{
-		PTYAuthLeaseFile:   leasePath,
-		AdminEd25519PubKey: base64.StdEncoding.EncodeToString(publicKey),
-		Shell:              "/bin/sh",
-	}, nil))
-	defer server.Close()
-
-	lease := wsPTYLease{
-		Version:       1,
-		TokenSHA256:   hex.EncodeToString(ptySum[:]),
-		ExpiresAtUnix: time.Now().Add(time.Minute).Unix(),
-		SessionID:     "sess-signed",
-		SingleUse:     true,
-	}
-	body, err := json.Marshal(map[string]any{"pty_lease": lease})
-	if err != nil {
-		t.Fatalf("marshal body: %v", err)
-	}
-	req, err := http.NewRequest(http.MethodPost, server.URL+"/admin/leases", bytes.NewReader(body))
-	if err != nil {
-		t.Fatalf("new unsigned request: %v", err)
-	}
-	req.Header.Set("Content-Type", "application/json")
-	resp, err := http.DefaultClient.Do(req)
-	if err != nil {
-		t.Fatalf("POST /admin/leases unsigned: %v", err)
-	}
-	_ = resp.Body.Close()
-	if resp.StatusCode != http.StatusForbidden {
-		t.Fatalf("unsigned install status = %d, want %d", resp.StatusCode, http.StatusForbidden)
-	}
-
-	req, err = http.NewRequest(http.MethodPost, server.URL+"/admin/leases", bytes.NewReader(body))
-	if err != nil {
-		t.Fatalf("new signed request: %v", err)
-	}
-	req.Header.Set("Content-Type", "application/json")
-	req.Header.Set("X-Cmux-Admin-Signature-Ed25519", base64.StdEncoding.EncodeToString(ed25519.Sign(privateKey, body)))
-	resp, err = http.DefaultClient.Do(req)
-	if err != nil {
-		t.Fatalf("POST /admin/leases signed: %v", err)
-	}
-	_ = resp.Body.Close()
-	if resp.StatusCode != http.StatusOK {
-		t.Fatalf("signed install status = %d, want %d", resp.StatusCode, http.StatusOK)
-	}
-}
-
-func TestWebSocketPTYRejectsMissingAndWrongLease(t *testing.T) {
-	leasePath := filepath.Join(t.TempDir(), "lease.json")
-	server, _ := newTestWebSocketPTYServer(t, leasePath)
-
-	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
-	defer cancel()
-
-	conn := dialPTY(t, ctx, server.URL)
-	sendAuth(t, ctx, conn, "missing", "sess-missing", 80, 24)
-	_, _, err := conn.Read(ctx)
-	if websocket.CloseStatus(err) != websocket.StatusPolicyViolation {
-		t.Fatalf("missing lease should close with policy violation, got err=%v status=%v", err, websocket.CloseStatus(err))
-	}
-
-	writeTestLease(t, leasePath, "correct-token", "sess-wrong", true, time.Now().Add(time.Minute))
-	conn = dialPTY(t, ctx, server.URL)
-	sendAuth(t, ctx, conn, "wrong-token", "sess-wrong", 80, 24)
-	_, _, err = conn.Read(ctx)
-	if websocket.CloseStatus(err) != websocket.StatusPolicyViolation {
-		t.Fatalf("wrong token should close with policy violation, got err=%v status=%v", err, websocket.CloseStatus(err))
-	}
-	if _, statErr := os.Stat(leasePath); statErr != nil {
-		t.Fatalf("wrong-token attempt should not consume lease: %v", statErr)
-	}
-
-	writeTestLease(t, leasePath, "expired-token", "sess-expired", true, time.Now().Add(-time.Minute))
-	conn = dialPTY(t, ctx, server.URL)
-	sendAuth(t, ctx, conn, "expired-token", "sess-expired", 80, 24)
-	_, _, err = conn.Read(ctx)
-	if websocket.CloseStatus(err) != websocket.StatusPolicyViolation {
-		t.Fatalf("expired token should close with policy violation, got err=%v status=%v", err, websocket.CloseStatus(err))
-	}
-}
-
-func TestWebSocketPTYRequiresSessionMatchAndConsumesLeaseOnce(t *testing.T) {
-	leasePath := filepath.Join(t.TempDir(), "lease.json")
-	server, _ := newTestWebSocketPTYServer(t, leasePath)
-
-	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
-	defer cancel()
-
-	writeTestLease(t, leasePath, "cmux-secret", "sess-good", true, time.Now().Add(time.Minute))
-	conn := dialPTY(t, ctx, server.URL)
-	sendAuth(t, ctx, conn, "cmux-secret", "sess-other", 80, 24)
-	_, _, err := conn.Read(ctx)
-	if websocket.CloseStatus(err) != websocket.StatusPolicyViolation {
-		t.Fatalf("wrong session should close with policy violation, got err=%v status=%v", err, websocket.CloseStatus(err))
-	}
-	if _, statErr := os.Stat(leasePath); statErr != nil {
-		t.Fatalf("wrong-session attempt should not consume lease: %v", statErr)
-	}
-
-	conn = dialPTY(t, ctx, server.URL)
-	sendAuth(t, ctx, conn, "cmux-secret", "sess-good", 100, 30)
-	msgType, payload, err := conn.Read(ctx)
-	if err != nil {
-		t.Fatalf("read ready: %v", err)
-	}
-	if msgType != websocket.MessageText || !strings.Contains(string(payload), `"ready"`) {
-		t.Fatalf("first frame should be ready text, type=%v payload=%q", msgType, string(payload))
-	}
-	if _, statErr := os.Stat(leasePath); !os.IsNotExist(statErr) {
-		t.Fatalf("successful auth should consume lease, stat err=%v", statErr)
-	}
-	_ = conn.Close(websocket.StatusNormalClosure, "done")
-
-	conn = dialPTY(t, ctx, server.URL)
-	sendAuth(t, ctx, conn, "cmux-secret", "sess-good", 100, 30)
-	_, _, err = conn.Read(ctx)
-	if websocket.CloseStatus(err) != websocket.StatusPolicyViolation {
-		t.Fatalf("replay should close with policy violation, got err=%v status=%v", err, websocket.CloseStatus(err))
-	}
-}
-
-func TestWebSocketPTYRunsShellOverBinaryFrames(t *testing.T) {
-	leasePath := filepath.Join(t.TempDir(), "lease.json")
-	server, _ := newTestWebSocketPTYServer(t, leasePath)
-
-	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
-	defer cancel()
-
-	writeTestLease(t, leasePath, "terminal-token", "sess-shell", true, time.Now().Add(time.Minute))
-	conn := dialPTY(t, ctx, server.URL)
-	defer conn.Close(websocket.StatusNormalClosure, "done")
-	sendAuth(t, ctx, conn, "terminal-token", "sess-shell", 80, 24)
-	msgType, payload, err := conn.Read(ctx)
-	if err != nil {
-		t.Fatalf("read ready: %v", err)
-	}
-	if msgType != websocket.MessageText || !strings.Contains(string(payload), `"ready"`) {
-		t.Fatalf("first frame should be ready text, type=%v payload=%q", msgType, string(payload))
-	}
-
-	if err := conn.Write(ctx, websocket.MessageBinary, []byte("printf '%b\\n' '\\103\\115\\125\\130\\137\\127\\123\\137\\117\\113'; exit\r")); err != nil {
-		t.Fatalf("write terminal command: %v", err)
-	}
-
-	output := waitForBinaryContains(t, ctx, conn, "CMUX_WS_OK", 15*time.Second)
-	waitForNormalCloseWithOutput(t, ctx, conn, 10*time.Second, output)
-}
-
-func TestWebSocketPTYReconnectKeepsSessionProcess(t *testing.T) {
-	leasePath := filepath.Join(t.TempDir(), "lease.json")
-	server, hub := newTestWebSocketPTYServer(t, leasePath)
-
-	ctx, cancel := context.WithTimeout(context.Background(), 15*time.Second)
-	defer cancel()
-
-	writeTestLease(t, leasePath, "first-token", "sess-reconnect", true, time.Now().Add(time.Minute))
-	conn := dialPTY(t, ctx, server.URL)
-	sendAuthWithAttachment(t, ctx, conn, "first-token", "sess-reconnect", "same", 80, 24)
-	readReady(t, ctx, conn)
-	if err := conn.Write(ctx, websocket.MessageBinary, []byte("CMUX_RECONNECT_MARKER=alive; export CMUX_RECONNECT_MARKER; printf 'first-ready\\n'\r")); err != nil {
-		t.Fatalf("write first command: %v", err)
-	}
-	waitForBinaryContains(t, ctx, conn, "first-ready", 5*time.Second)
-	_ = conn.Close(websocket.StatusNormalClosure, "detach")
-
-	writeTestLease(t, leasePath, "second-token", "sess-reconnect", true, time.Now().Add(time.Minute))
-	conn = dialPTY(t, ctx, server.URL)
-	defer conn.Close(websocket.StatusNormalClosure, "done")
-	sendAuthWithAttachment(t, ctx, conn, "second-token", "sess-reconnect", "same", 80, 24)
-	readReady(t, ctx, conn)
-	if err := conn.Write(ctx, websocket.MessageBinary, []byte("printf '%s\\n' \"$CMUX_RECONNECT_MARKER\"; exit\r")); err != nil {
-		t.Fatalf("write reconnect command: %v", err)
-	}
-	waitForBinaryContains(t, ctx, conn, "alive", 5*time.Second)
-	waitForHubSessionCount(t, hub, 0, 5*time.Second)
-}
-
-func TestWebSocketPTYReconnectKeepsForegroundProcessAfterHangup(t *testing.T) {
-	if runtime.GOOS != "linux" {
-		t.Skip("foreground PTY hangup delivery is a Linux terminal-session regression")
-	}
-	leasePath := filepath.Join(t.TempDir(), "lease.json")
-	server, hub := newTestWebSocketPTYServer(t, leasePath)
-
-	ctx, cancel := context.WithTimeout(context.Background(), 15*time.Second)
-	defer cancel()
-
-	writeTestLease(t, leasePath, "first-token", "sess-hangup", true, time.Now().Add(time.Minute))
-	conn := dialPTY(t, ctx, server.URL)
-	sendAuthWithAttachment(t, ctx, conn, "first-token", "sess-hangup", "same", 80, 24)
-	readReady(t, ctx, conn)
-	command := `sh -c 'printf "%b=%s\n" "\103\115\125\130\137\110\125\120\137\103\110\111\114\104\137\120\111\104" "$$"; trap "printf \"%b\\n\" \"\\103\\115\\125\\130\\137\\110\\125\\120\\137\\103\\110\\111\\114\\104\\137\\101\\114\\111\\126\\105\"" USR1; while :; do sleep 1; done'` + "\r"
-	if err := conn.Write(ctx, websocket.MessageBinary, []byte(command)); err != nil {
-		t.Fatalf("launch foreground process: %v", err)
-	}
-	const pidMarker = "CMUX_HUP_CHILD_PID="
-	output := waitForBinaryContains(t, ctx, conn, pidMarker, 5*time.Second)
-	markerIndex := strings.LastIndex(output, pidMarker)
-	pidStart := markerIndex + len(pidMarker)
-	pidEnd := pidStart
-	for pidEnd < len(output) && output[pidEnd] >= '0' && output[pidEnd] <= '9' {
-		pidEnd++
-	}
-	childPID, err := strconv.Atoi(output[pidStart:pidEnd])
-	if err != nil || childPID <= 0 {
-		t.Fatalf("parse foreground process pid from output %q: pid=%d err=%v", output, childPID, err)
-	}
-	t.Cleanup(func() { _ = syscall.Kill(-childPID, syscall.SIGKILL) })
-
-	_ = conn.Close(websocket.StatusNormalClosure, "relay drop")
-	waitForHubSessionSize(t, hub, "sess-hangup", 0, 80, 24, 5*time.Second)
-	if err := syscall.Kill(-childPID, syscall.SIGHUP); err != nil {
-		t.Fatalf("deliver hangup to foreground process group: %v", err)
-	}
-
-	writeTestLease(t, leasePath, "second-token", "sess-hangup", true, time.Now().Add(time.Minute))
-	conn = dialPTY(t, ctx, server.URL)
-	defer conn.Close(websocket.StatusNormalClosure, "done")
-	sendAuthWithAttachment(t, ctx, conn, "second-token", "sess-hangup", "same", 80, 24)
-	readReady(t, ctx, conn)
-	waitForBinaryContains(t, ctx, conn, pidMarker, 5*time.Second)
-	if err := syscall.Kill(-childPID, syscall.SIGUSR1); err != nil {
-		t.Fatalf("foreground process did not survive hangup: %v", err)
-	}
-	waitForBinaryContains(t, ctx, conn, "CMUX_HUP_CHILD_ALIVE", 5*time.Second)
-
-	_ = syscall.Kill(-childPID, syscall.SIGKILL)
-	if err := conn.Write(ctx, websocket.MessageBinary, []byte("exit\r")); err != nil {
-		t.Fatalf("exit reattached shell: %v", err)
-	}
-	waitForHubSessionCount(t, hub, 0, 5*time.Second)
-}
-
-func TestWebSocketPTYPersistentInteractiveBashChildSurvivesHangup(t *testing.T) {
-	if runtime.GOOS != "linux" {
-		t.Skip("interactive PTY hangup delivery is a Linux terminal-session regression")
-	}
-	if _, err := os.Stat("/bin/bash"); err != nil {
-		t.Skipf("interactive Bash is unavailable: %v", err)
-	}
-	if _, err := os.Stat("/usr/bin/python3"); err != nil {
-		t.Skipf("Python hangup fixture is unavailable: %v", err)
-	}
-	leasePath := filepath.Join(t.TempDir(), "lease.json")
-	server, hub := newTestWebSocketPTYServer(t, leasePath)
-	const sessionID = "sess-interactive-hangup"
-	if err := func() error {
-		hub.mu.Lock()
-		defer hub.mu.Unlock()
-		startupCommand := `/bin/true; if [ -n "${CMUX_PERSISTENT_PTY_EXEC_HELPER:-}" ]; then exec "$CMUX_PERSISTENT_PTY_EXEC_HELPER" --internal-persistent-pty-exec /bin/bash /bin/bash --noprofile --norc -i; fi; exec /bin/bash --noprofile --norc -i`
-		session, err := hub.startSession(
-			persistentPTYSessionKey(sessionID),
-			sessionID,
-			80,
-			24,
-			startupCommand,
-		)
-		if err != nil {
-			return err
-		}
-		hub.sessions[session.key] = session
-		hub.runSession(session)
-		return nil
-	}(); err != nil {
-		t.Fatalf("start persistent interactive Bash session: %v", err)
-	}
-
-	ctx, cancel := context.WithTimeout(context.Background(), 20*time.Second)
-	defer cancel()
-
-	writeTestLease(t, leasePath, "interactive-token", sessionID, true, time.Now().Add(time.Minute))
-	conn := dialPTY(t, ctx, server.URL)
-	defer conn.Close(websocket.StatusNormalClosure, "done")
-	sendAuthWithAttachment(t, ctx, conn, "interactive-token", sessionID, "same", 80, 24)
-	readReady(t, ctx, conn)
-	// Prove that the interactive Bash has started through an input/output
-	// handshake. Do not infer readiness from prompt text: PS1 is environment-
-	// specific and need not contain the word "bash".
-	const bashReadyMarker = "CMUX_INTERACTIVE_BASH_READY"
-	bashReadyCommand := `test -n "${BASH_VERSION:-}" && printf 'CMUX_INTERACTIVE_%s version=%s\n' BASH_READY "$BASH_VERSION"` + "\r"
-	if err := conn.Write(ctx, websocket.MessageBinary, []byte(bashReadyCommand)); err != nil {
-		t.Fatalf("send interactive Bash readiness probe: %v", err)
-	}
-	waitForBinaryContains(t, ctx, conn, bashReadyMarker, 5*time.Second)
-
-	// The production bootstrap runs external programs before its final login
-	// shell. Agent runtimes may then restore SIGHUP's default disposition, so
-	// both foreground and background jobs must inherit protection from that
-	// final exec boundary instead of depending on the outer /bin/sh process.
-	backgroundCode := `import os,signal,time;signal.signal(signal.SIGHUP,signal.SIG_DFL);status=open("/proc/self/status").read();mask=int(next(line for line in status.splitlines() if line.startswith("SigBlk:")).split()[1],16);blocked=bool(mask&1);ignored=signal.getsignal(signal.SIGHUP)==signal.SIG_IGN;print("CMUX_"+"BACKGROUND_HUP_HELPER pid=%d blocked=%s ignored=%s protected=%s"%(os.getpid(),str(blocked).lower(),str(ignored).lower(),str(blocked or ignored).lower()),flush=True);signal.signal(signal.SIGUSR1,lambda *_:print("CMUX_"+"BACKGROUND_HUP_HELPER alive",flush=True));time.sleep(1000000)`
-	if err := conn.Write(ctx, websocket.MessageBinary, []byte("set -m; /usr/bin/python3 -u -c '"+backgroundCode+"' &\r")); err != nil {
-		t.Fatalf("launch background helper from interactive Bash: %v", err)
-	}
-	const backgroundPIDMarker = "CMUX_BACKGROUND_HUP_HELPER pid="
-	backgroundOutput := waitForBinaryContains(t, ctx, conn, backgroundPIDMarker, 5*time.Second)
-
-	foregroundCode := `import os,signal,time;signal.signal(signal.SIGHUP,signal.SIG_DFL);status=open("/proc/self/status").read();mask=int(next(line for line in status.splitlines() if line.startswith("SigBlk:")).split()[1],16);blocked=bool(mask&1);ignored=signal.getsignal(signal.SIGHUP)==signal.SIG_IGN;print("CMUX_"+"FOREGROUND_HUP_HELPER pid=%d blocked=%s ignored=%s protected=%s"%(os.getpid(),str(blocked).lower(),str(ignored).lower(),str(blocked or ignored).lower()),flush=True);signal.signal(signal.SIGUSR1,lambda *_:print("CMUX_"+"FOREGROUND_HUP_HELPER alive",flush=True));time.sleep(1000000)`
-	command := "/usr/bin/python3 -u -c '" + foregroundCode + "'\r"
-	if err := conn.Write(ctx, websocket.MessageBinary, []byte(command)); err != nil {
-		t.Fatalf("launch foreground helper from interactive Bash: %v", err)
-	}
-	const foregroundPIDMarker = "CMUX_FOREGROUND_HUP_HELPER pid="
-	foregroundOutput := waitForBinaryContains(t, ctx, conn, foregroundPIDMarker, 5*time.Second)
-	parsePID := func(output string, marker string) (int, string) {
-		markerIndex := strings.LastIndex(output, marker)
-		pidStart := markerIndex + len(marker)
-		pidEnd := pidStart
-		for pidEnd < len(output) && output[pidEnd] >= '0' && output[pidEnd] <= '9' {
-			pidEnd++
-		}
-		pid, parseErr := strconv.Atoi(output[pidStart:pidEnd])
-		if parseErr != nil || pid <= 0 {
-			t.Fatalf("parse interactive helper pid from output %q marker=%q: pid=%d err=%v", output, marker, pid, parseErr)
-		}
-		return pid, output[markerIndex:]
-	}
-	backgroundPID, backgroundProtection := parsePID(backgroundOutput, backgroundPIDMarker)
-	foregroundPID, foregroundProtection := parsePID(foregroundOutput, foregroundPIDMarker)
-	t.Logf("interactive background helper state: %q", backgroundProtection)
-	t.Logf("interactive foreground helper state: %q", foregroundProtection)
-	t.Cleanup(func() {
-		_ = syscall.Kill(-foregroundPID, syscall.SIGKILL)
-		_ = syscall.Kill(-backgroundPID, syscall.SIGKILL)
-	})
-
-	_ = conn.Close(websocket.StatusNormalClosure, "relay drop")
-	waitForHubSessionSize(t, hub, sessionID, 0, 80, 24, 5*time.Second)
-	if err := syscall.Kill(-foregroundPID, syscall.SIGHUP); err != nil {
-		t.Fatalf("deliver hangup to interactive foreground process group: %v", err)
-	}
-	if err := syscall.Kill(-backgroundPID, syscall.SIGHUP); err != nil {
-		t.Fatalf("deliver hangup to interactive background process group: %v", err)
-	}
-	time.Sleep(50 * time.Millisecond)
-	if err := syscall.Kill(-foregroundPID, syscall.SIGUSR1); err != nil {
-		t.Fatalf("interactive foreground helper did not survive hangup: %v", err)
-	}
-	if err := syscall.Kill(-backgroundPID, syscall.SIGUSR1); err != nil {
-		t.Fatalf("interactive background helper did not survive hangup: %v", err)
-	}
-
-	writeTestLease(t, leasePath, "reattach-token", sessionID, true, time.Now().Add(time.Minute))
-	conn = dialPTY(t, ctx, server.URL)
-	sendAuthWithAttachment(t, ctx, conn, "reattach-token", sessionID, "same", 80, 24)
-	readReady(t, ctx, conn)
-	waitForBinaryContainsAll(t, ctx, conn, []string{
-		"CMUX_FOREGROUND_HUP_HELPER alive",
-		"CMUX_BACKGROUND_HUP_HELPER alive",
-	}, 5*time.Second)
-	if !strings.Contains(foregroundProtection, "blocked=true ignored=false protected=true") {
-		t.Fatalf("interactive Bash foreground child did not inherit blocked SIGHUP: %q", foregroundProtection)
-	}
-	if !strings.Contains(backgroundProtection, "blocked=true ignored=false protected=true") {
-		t.Fatalf("interactive Bash background child did not inherit blocked SIGHUP: %q", backgroundProtection)
-	}
-
-	_ = syscall.Kill(-foregroundPID, syscall.SIGKILL)
-	_ = syscall.Kill(-backgroundPID, syscall.SIGKILL)
-	if err := conn.Write(ctx, websocket.MessageBinary, []byte("exit\r")); err != nil {
-		t.Fatalf("exit reattached shell: %v", err)
-	}
-	waitForHubSessionCount(t, hub, 0, 5*time.Second)
-}
-
-func TestPersistentPTYExecHelperKeepsHangupBlockedAcrossExec(t *testing.T) {
-	if runtime.GOOS != "darwin" && runtime.GOOS != "linux" {
-		t.Skip("persistent PTY exec helper is supported on Darwin and Linux")
-	}
-	if os.Getenv("CMUX_PERSISTENT_PTY_EXEC_TEST_CHILD") == "1" {
-		signal.Reset(syscall.SIGHUP)
-		if err := syscall.Kill(os.Getpid(), syscall.SIGHUP); err != nil {
-			t.Fatalf("send SIGHUP to helper child: %v", err)
-		}
-		_, _ = os.Stdout.WriteString("CMUX_PERSISTENT_PTY_EXEC_SURVIVED\n")
-		return
-	}
-
-	executable, err := os.Executable()
-	if err != nil {
-		t.Fatalf("resolve test executable: %v", err)
-	}
-	cmd := exec.Command(
-		executable,
-		persistentPTYExecHelperArgument,
-		executable,
-		executable,
-		"-test.run",
-		"^TestPersistentPTYExecHelperKeepsHangupBlockedAcrossExec$",
-	)
-	cmd.Env = append(os.Environ(), "CMUX_PERSISTENT_PTY_EXEC_TEST_CHILD=1")
-	output, err := cmd.CombinedOutput()
-	if err != nil {
-		t.Fatalf("persistent PTY exec helper child failed: %v output=%q", err, output)
-	}
-	if !bytes.Contains(output, []byte("CMUX_PERSISTENT_PTY_EXEC_SURVIVED")) {
-		t.Fatalf("persistent PTY exec helper child did not survive SIGHUP: %q", output)
-	}
-}
-
-func TestPersistentPTYExecHelperResolvesBareExecutableFromPATH(t *testing.T) {
-	if runtime.GOOS != "darwin" && runtime.GOOS != "linux" {
-		t.Skip("persistent PTY exec helper is supported on Darwin and Linux")
-	}
-	if os.Getenv("CMUX_PERSISTENT_PTY_PATH_LOOKUP_TEST_CHILD") == "1" {
-		_, _ = os.Stdout.WriteString("CMUX_PERSISTENT_PTY_PATH_LOOKUP_OK\n")
-		return
-	}
-
-	executable, err := os.Executable()
-	if err != nil {
-		t.Fatalf("resolve test executable: %v", err)
-	}
-	bin := t.TempDir()
-	for _, helperName := range []string{"bash", "cmux-custom-shell"} {
-		t.Run(helperName, func(t *testing.T) {
-			if err := os.Symlink(executable, filepath.Join(bin, helperName)); err != nil {
-				t.Fatalf("link helper test executable: %v", err)
-			}
-			cmd := exec.Command(
-				executable,
-				persistentPTYExecHelperArgument,
-				helperName,
-				helperName,
-				"-test.run",
-				"^TestPersistentPTYExecHelperResolvesBareExecutableFromPATH$",
-			)
-			cmd.Env = append(os.Environ(),
-				"PATH="+bin,
-				"CMUX_PERSISTENT_PTY_PATH_LOOKUP_TEST_CHILD=1",
-			)
-			output, err := cmd.CombinedOutput()
-			if err != nil {
-				t.Fatalf("persistent PTY exec helper did not resolve bare executable %q through PATH: %v output=%q", helperName, err, output)
-			}
-			if !bytes.Contains(output, []byte("CMUX_PERSISTENT_PTY_PATH_LOOKUP_OK")) {
-				t.Fatalf("persistent PTY exec helper child did not run through PATH: %q", output)
-			}
-		})
-	}
-}
-
-func TestPersistentPTYCommandOverridesStaleExecHelperEnvironment(t *testing.T) {
-	executable, err := os.Executable()
-	if err != nil {
-		t.Fatalf("resolve test executable: %v", err)
-	}
-	cmd := exec.Command("/bin/sh", "-c", `test "$CMUX_PERSISTENT_PTY_EXEC_HELPER" = "$CMUX_EXPECTED_PTY_EXEC_HELPER"`)
-	cmd.Env = append(os.Environ(),
-		persistentPTYExecHelperEnvironment+"=/missing/cmuxd-remote",
-		"CMUX_EXPECTED_PTY_EXEC_HELPER="+executable,
-	)
-	wrapped, err := persistentPTYCommand(cmd)
-	if err != nil {
-		t.Fatalf("wrap persistent PTY command: %v", err)
-	}
-	if output, err := wrapped.CombinedOutput(); err != nil {
-		t.Fatalf("wrapped command did not receive authoritative helper path: %v output=%q", err, output)
-	}
-}
-
-func TestWebSocketPTYAnonymousSessionExitsOnHangup(t *testing.T) {
-	if runtime.GOOS != "linux" {
-		t.Skip("foreground PTY hangup delivery is a Linux terminal-session regression")
-	}
-	hangupWasIgnored := signal.Ignored(syscall.SIGHUP)
-	signal.Reset(syscall.SIGHUP)
-	t.Cleanup(func() {
-		if hangupWasIgnored {
-			signal.Ignore(syscall.SIGHUP)
-		}
-	})
-	leasePath := filepath.Join(t.TempDir(), "lease.json")
-	server, _ := newTestWebSocketPTYServer(t, leasePath)
-
-	ctx, cancel := context.WithTimeout(context.Background(), 15*time.Second)
-	defer cancel()
-
-	writeTestLease(t, leasePath, "anonymous-token", "anonymous-hangup", true, time.Now().Add(time.Minute))
-	conn := dialPTY(t, ctx, server.URL)
-	defer conn.Close(websocket.StatusNormalClosure, "done")
-	sendAuth(t, ctx, conn, "anonymous-token", "anonymous-hangup", 80, 24)
-	readReady(t, ctx, conn)
-	executable, err := os.Executable()
-	if err != nil {
-		t.Fatalf("resolve test executable: %v", err)
-	}
-	command := "CMUX_ANON_HUP_HELPER=1 exec " + strconv.Quote(executable) + " -test.run '^TestWebSocketPTYAnonymousHangupHelper$'\r"
-	if err := conn.Write(ctx, websocket.MessageBinary, []byte(command)); err != nil {
-		t.Fatalf("launch anonymous foreground process: %v", err)
-	}
-	const pidMarker = "CMUX_ANON_HUP_HELPER pid="
-	output := waitForBinaryContains(t, ctx, conn, pidMarker, 5*time.Second)
-	markerIndex := strings.LastIndex(output, pidMarker)
-	pidStart := markerIndex + len(pidMarker)
-	pidEnd := pidStart
-	for pidEnd < len(output) && output[pidEnd] >= '0' && output[pidEnd] <= '9' {
-		pidEnd++
-	}
-	childPID, err := strconv.Atoi(output[pidStart:pidEnd])
-	if err != nil || childPID <= 0 {
-		t.Fatalf("parse anonymous foreground process pid from output %q: pid=%d err=%v", output, childPID, err)
-	}
-	if !strings.Contains(output[markerIndex:], "ignored=false") {
-		t.Fatalf("anonymous foreground process inherited ignored SIGHUP: %q", output[markerIndex:])
-	}
-	t.Cleanup(func() { _ = syscall.Kill(-childPID, syscall.SIGKILL) })
-
-	if err := syscall.Kill(-childPID, syscall.SIGHUP); err != nil {
-		t.Fatalf("deliver hangup to anonymous foreground process group: %v", err)
-	}
-	deadline := time.Now().Add(5 * time.Second)
-	for time.Now().Before(deadline) {
-		if err := syscall.Kill(-childPID, 0); errors.Is(err, syscall.ESRCH) {
-			return
-		}
-		time.Sleep(10 * time.Millisecond)
-	}
-	t.Fatalf("anonymous foreground process group %d ignored SIGHUP", childPID)
-}
-
-func TestWebSocketPTYAnonymousHangupHelper(t *testing.T) {
-	if os.Getenv("CMUX_ANON_HUP_HELPER") != "1" {
-		return
-	}
-	_, _ = os.Stdout.WriteString(
-		"CMUX_ANON_HUP_HELPER pid=" + strconv.Itoa(os.Getpid()) +
-			" ignored=" + strconv.FormatBool(signal.Ignored(syscall.SIGHUP)) + "\n",
-	)
-	select {}
-}
-
-func TestTerminateProcessesSerializesPTYClose(t *testing.T) {
-	ptyFile, err := os.Open(os.DevNull)
-	if err != nil {
-		t.Fatalf("open PTY stand-in: %v", err)
-	}
-	session := &wsPTYSession{ptyFile: ptyFile}
-	lookupStarted := make(chan struct{})
-	releaseLookup := make(chan struct{})
-	terminated := make(chan struct{})
-	go func() {
-		session.terminateProcessesWithForegroundGroupLookup(func(*os.File) int {
-			close(lookupStarted)
-			<-releaseLookup
-			return 0
-		})
-		close(terminated)
-	}()
-	<-lookupStarted
-
-	closed := make(chan struct{})
-	go func() {
-		session.closePTYFile()
-		close(closed)
-	}()
-	select {
-	case <-closed:
-		t.Fatal("PTY closed while foreground process-group lookup held its descriptor")
-	case <-time.After(100 * time.Millisecond):
-	}
-
-	close(releaseLookup)
-	select {
-	case <-terminated:
-	case <-time.After(5 * time.Second):
-		t.Fatal("process termination did not finish after lookup was released")
-	}
-	select {
-	case <-closed:
-	case <-time.After(5 * time.Second):
-		t.Fatal("PTY close did not finish after process termination released the descriptor")
-	}
-	if session.ptyFileSnapshot() != nil {
-		t.Fatal("closed PTY descriptor remained available to later operations")
-	}
-}
-
-func TestTerminateProcessesRunsOnlyOnce(t *testing.T) {
-	ptyFile, err := os.Open(os.DevNull)
-	if err != nil {
-		t.Fatalf("open PTY stand-in: %v", err)
-	}
-	t.Cleanup(func() { _ = ptyFile.Close() })
-
-	session := &wsPTYSession{ptyFile: ptyFile}
-	lookupCount := 0
-	lookup := func(*os.File) int {
-		lookupCount++
-		return 0
-	}
-	session.terminateProcessesWithForegroundGroupLookup(lookup)
-	session.terminateProcessesWithForegroundGroupLookup(lookup)
-
-	if lookupCount != 1 {
-		t.Fatalf("process teardown ran %d times, want exactly once", lookupCount)
-	}
-}
-
-func TestWaitSessionProcessDrainsBufferedOutputBeforeForcedMasterClose(t *testing.T) {
-	master, slave, err := os.Pipe()
-	if err != nil {
-		t.Fatalf("open buffered output pipe: %v", err)
-	}
-	heldSlaveFD, err := syscall.Dup(int(slave.Fd()))
-	if err != nil {
-		_ = master.Close()
-		_ = slave.Close()
-		t.Fatalf("duplicate escaped slave holder: %v", err)
-	}
-	heldSlave := os.NewFile(uintptr(heldSlaveFD), "escaped-slave-holder")
-	t.Cleanup(func() {
-		_ = master.Close()
-		_ = slave.Close()
-		_ = heldSlave.Close()
-	})
-
-	const marker = "CMUX_BUFFERED_FAST_EXIT_OUTPUT\n"
-	if _, err := slave.Write([]byte(marker)); err != nil {
-		t.Fatalf("buffer fast-exit output: %v", err)
-	}
-	command := exec.Command("/bin/sh", "-c", "exit 0")
-	if err := command.Start(); err != nil {
-		t.Fatalf("start fast-exit command: %v", err)
-	}
-
-	hub := newWebSocketPTYHub(wsPTYServerConfig{}, io.Discard)
-	t.Cleanup(hub.closeAll)
-	session := &wsPTYSession{
-		id:           "buffered-fast-exit",
-		key:          persistentPTYSessionKey("buffered-fast-exit"),
-		cmd:          command,
-		ptyFile:      master,
-		ttyFile:      slave,
-		attachments:  map[string]*wsPTYAttachment{},
-		done:         make(chan struct{}),
-		initialPhase: wsPTYSessionInitialActive,
-	}
-	hub.sessions[session.key] = session
-
-	go hub.pumpSession(session)
-	waiterDone := make(chan struct{})
-	go func() {
-		hub.waitSessionProcess(session)
-		close(waiterDone)
-	}()
-
-	select {
-	case <-waiterDone:
-	case <-time.After(defaultPTYExitDrainTimeout + 2*time.Second):
-		t.Fatal("process waiter did not force-close the master after its drain deadline")
-	}
-	select {
-	case <-session.done:
-	case <-time.After(time.Second):
-		t.Fatal("forced master close did not finish the escaped-holder session")
-	}
-
-	if got := string(session.scrollback); got != marker {
-		t.Fatalf("drained buffered output = %q, want %q", got, marker)
-	}
-	if _, err := heldSlave.Stat(); err != nil {
-		t.Fatalf("escaped slave holder closed before the master drain deadline: %v", err)
-	}
-}
-
-func TestWebSocketPTYReplacedAttachmentCannotWriteInput(t *testing.T) {
-	leasePath := filepath.Join(t.TempDir(), "lease.json")
-	server, hub := newTestWebSocketPTYServer(t, leasePath)
-
-	ctx, cancel := context.WithTimeout(context.Background(), 15*time.Second)
-	defer cancel()
-
-	writeTestLease(t, leasePath, "old-token", "sess-replace", true, time.Now().Add(time.Minute))
-	oldConn := dialPTY(t, ctx, server.URL)
-	sendAuthWithAttachment(t, ctx, oldConn, "old-token", "sess-replace", "same", 120, 40)
-	readReady(t, ctx, oldConn)
-
-	writeTestLease(t, leasePath, "new-token", "sess-replace", true, time.Now().Add(time.Minute))
-	newConn := dialPTY(t, ctx, server.URL)
-	defer newConn.Close(websocket.StatusNormalClosure, "done")
-	sendAuthWithAttachment(t, ctx, newConn, "new-token", "sess-replace", "same", 90, 30)
-	readReady(t, ctx, newConn)
-	waitForHubSessionSize(t, hub, "sess-replace", 1, 90, 30, 5*time.Second)
-
-	_ = oldConn.Write(ctx, websocket.MessageBinary, []byte("printf 'STALE_INPUT\\n'\r"))
-	resizePayload, err := json.Marshal(wsPTYControlFrame{Type: "resize", Cols: 100, Rows: 35})
-	if err != nil {
-		t.Fatalf("marshal stale resize: %v", err)
-	}
-	_ = oldConn.Write(ctx, websocket.MessageText, resizePayload)
-	_ = oldConn.Close(websocket.StatusNormalClosure, "stale detach")
-	waitForHubSessionSize(t, hub, "sess-replace", 1, 90, 30, 5*time.Second)
-	waitForHubPTYSize(t, hub, "sess-replace", 90, 30, 5*time.Second)
-
-	if err := newConn.Write(ctx, websocket.MessageBinary, []byte("printf 'SIZE:'; stty size; printf '%b\\n' '\\106\\122\\105\\123\\110\\137\\111\\116\\120\\125\\124'; exit\r")); err != nil {
-		t.Fatalf("write fresh command: %v", err)
-	}
-	output := waitForBinaryContains(t, ctx, newConn, "FRESH_INPUT", 5*time.Second)
-	if !strings.Contains(output, "SIZE:30 90") {
-		t.Fatalf("replaced attachment changed terminal size, output=%q", output)
-	}
-	if strings.Contains(output, "STALE_INPUT") {
-		t.Fatalf("replaced attachment wrote input, output=%q", output)
-	}
-	waitForNormalCloseWithOutput(t, ctx, newConn, 5*time.Second, output)
-	waitForHubSessionCount(t, hub, 0, 5*time.Second)
-}
-
-func TestWebSocketPTYReattachWritesAcceptedOldInputBeforeNew(t *testing.T) {
-	hub, session, attachment, readFile, writeFile, done := newTestPTYInputSession(t, "sess-reattach-seam", "same", false)
-	defer close(done)
-	defer readFile.Close()
-	defer writeFile.Close()
-
-	go hub.writeInputLoop(session)
-	session.ptyWriteMu.Lock()
-	if status := hub.writeInputByID(session.id, attachment.id, attachment.clientToken, []byte("OLD")); status != wsPTYInputWriteOK {
-		session.ptyWriteMu.Unlock()
-		t.Fatalf("old write status = %v, want ok", status)
-	}
-
-	attachDone := make(chan *wsPTYAttachment, 1)
-	go func() {
-		newAttachment, _, _, err := hub.prepareAttachment(
-			context.Background(),
-			nil,
-			session.id,
-			attachment.id,
-			80,
-			24,
-			true,
-			"",
-			"new-token",
-			true,
-			false,
-		)
-		if err != nil {
-			t.Errorf("prepare replacement attachment: %v", err)
-			attachDone <- nil
-			return
-		}
-		attachDone <- newAttachment
-	}()
-
-	// Reattach must complete while the PTY writer is still stalled — a
-	// wedged reader must never turn reattach into an indefinite hang.
-	var newAttachment *wsPTYAttachment
-	select {
-	case newAttachment = <-attachDone:
-	case <-time.After(5 * time.Second):
-		session.ptyWriteMu.Unlock()
-		t.Fatal("reattach blocked behind a stalled PTY writer")
-	}
-	if newAttachment == nil {
-		session.ptyWriteMu.Unlock()
-		t.Fatal("replacement attachment was not created")
-	}
-	if status := hub.writeInputByID(session.id, newAttachment.id, newAttachment.clientToken, []byte("NEW")); status != wsPTYInputWriteOK {
-		session.ptyWriteMu.Unlock()
-		t.Fatalf("new write status = %v, want ok", status)
-	}
-	session.ptyWriteMu.Unlock()
-	if got := readExactlyFromFile(t, readFile, 6, 5*time.Second); string(got) != "OLDNEW" {
-		t.Fatalf("PTY input = %q, want OLDNEW", string(got))
-	}
-}
-
-func TestWebSocketPTYInputSeqEnforcement(t *testing.T) {
-	hub, session, attachment, readFile, writeFile, done := newTestPTYInputSession(t, "sess-seq", "seq-att", true)
-	defer close(done)
-	defer readFile.Close()
-	defer writeFile.Close()
-	attachment.inputSeqAck = true
-
-	go hub.writeInputLoop(session)
-	if result := hub.writeInputByIDWithSeq(session.id, attachment.id, attachment.clientToken, []byte("A"), 1, true); result.status != wsPTYInputWriteOK {
-		t.Fatalf("seq 1 status = %v, want ok", result.status)
-	}
-	if result := hub.writeInputByIDWithSeq(session.id, attachment.id, attachment.clientToken, []byte("B"), 2, true); result.status != wsPTYInputWriteOK {
-		t.Fatalf("seq 2 status = %v, want ok", result.status)
-	}
-	if result := hub.writeInputByIDWithSeq(session.id, attachment.id, attachment.clientToken, []byte("D"), 4, true); result.status != wsPTYInputWriteSeqGap || result.got != 4 || result.want != 3 {
-		t.Fatalf("seq 4 result = %+v, want gap got=4 want=3", result)
-	}
-	if got := readExactlyFromFile(t, readFile, 2, 5*time.Second); string(got) != "AB" {
-		t.Fatalf("PTY input = %q, want AB", string(got))
-	}
-
-	replacement, _, _, err := hub.prepareAttachment(context.Background(), nil, session.id, attachment.id, 80, 24, true, "", "seq-token-2", true, true)
-	if err != nil {
-		t.Fatalf("prepare replacement attachment: %v", err)
-	}
-	if result := hub.writeInputByIDWithSeq(session.id, replacement.id, replacement.clientToken, []byte("C"), 1, true); result.status != wsPTYInputWriteOK {
-		t.Fatalf("fresh attachment seq 1 status = %v, want ok", result.status)
-	}
-	if got := readExactlyFromFile(t, readFile, 1, 5*time.Second); string(got) != "C" {
-		t.Fatalf("fresh PTY input = %q, want C", string(got))
-	}
-}
-
-func TestWebSocketPTYSaturatedAckQueueDropsAttachment(t *testing.T) {
-	hub, session, attachment, readFile, writeFile, done := newTestPTYInputSession(t, "sess-ack-full", "ack-att", true)
-	defer close(done)
-	defer readFile.Close()
-	defer writeFile.Close()
-	attachment.inputSeqAck = true
-
-	// Saturate the send queue so the coalesced ack frame cannot be queued.
-	for i := 0; i < cap(attachment.send); i++ {
-		attachment.send <- wsPTYOutgoingFrame{}
-	}
-	chunk := wsPTYInputChunk{
-		attachmentID:  attachment.id,
-		attachment:    attachment,
-		payload:       []byte("x"),
-		seq:           1,
-		finalSeqChunk: true,
-	}
-	if !hub.writeInputChunk(session, chunk) {
-		t.Fatal("payload write should still succeed")
-	}
-	if got := readExactlyFromFile(t, readFile, 1, 5*time.Second); string(got) != "x" {
-		t.Fatalf("PTY input = %q, want x", string(got))
-	}
-	hub.mu.Lock()
-	_, stillAttached := session.attachments[attachment.id]
-	hub.mu.Unlock()
-	if stillAttached {
-		t.Fatal("attachment with a saturated ack queue should be dropped, not leaked")
-	}
-}
-
-func TestWebSocketPTYWriteRejectsMalformedSeq(t *testing.T) {
-	hub, _, attachment, readFile, writeFile, done := newTestPTYInputSession(t, "sess-seq-invalid", "seq-att", true)
-	defer close(done)
-	defer readFile.Close()
-	defer writeFile.Close()
-	attachment.inputSeqAck = true
-
-	server := &rpcServer{ptyHub: hub, frameWriter: &captureRPCFrameWriter{}}
-	for _, badSeq := range []any{"not-a-number", -1, 1.5} {
-		req := rpcRequest{
-			Method: "pty.write",
-			Params: map[string]any{
-				"session_id":              "sess-seq-invalid",
-				"attachment_id":           "seq-att",
-				"client_attachment_token": "token-1",
-				"data_base64":             base64.StdEncoding.EncodeToString([]byte("x")),
-				"seq":                     badSeq,
-			},
-		}
-		resp := server.handlePTYWrite(req)
-		if resp.OK || resp.Error == nil || resp.Error.Code != "invalid_params" {
-			t.Fatalf("seq=%v response = %+v, want invalid_params", badSeq, resp)
-		}
-	}
-}
-
-func TestWebSocketPTYInputSeqGapNotificationEmitsPTYError(t *testing.T) {
-	hub, _, attachment, readFile, writeFile, done := newTestPTYInputSession(t, "sess-seq-event", "seq-att", true)
-	defer close(done)
-	defer readFile.Close()
-	defer writeFile.Close()
-	attachment.inputSeqAck = true
-
-	writer := &captureRPCFrameWriter{}
-	server := &rpcServer{ptyHub: hub, frameWriter: writer}
-	req := rpcRequest{
-		Method: "pty.write",
-		Params: map[string]any{
-			"session_id":              "sess-seq-event",
-			"attachment_id":           "seq-att",
-			"client_attachment_token": "token-1",
-			"data_base64":             base64.StdEncoding.EncodeToString([]byte("gap")),
-			"seq":                     2,
-		},
-	}
-	resp := server.handlePTYWrite(req)
-	if resp.OK || resp.Error == nil || resp.Error.Code != "pty_input_seq_gap" {
-		t.Fatalf("gapped write response = %+v, want pty_input_seq_gap", resp)
-	}
-	if err := server.handleNotificationResponse(req, resp); err != nil {
-		t.Fatalf("handle notification response: %v", err)
-	}
-	if len(writer.events) != 1 {
-		t.Fatalf("events = %d, want 1", len(writer.events))
-	}
-	event := writer.events[0]
-	if event.Event != "pty.error" || !strings.Contains(event.Message, "got 2, want 1") {
-		t.Fatalf("event = %+v, want visible seq gap pty.error", event)
-	}
-	hub.mu.Lock()
-	_, stillAttached := hub.sessions[persistentPTYSessionKey("sess-seq-event")].attachments["seq-att"]
-	hub.mu.Unlock()
-	if stillAttached {
-		t.Fatal("seq-gap error should detach the attachment, not leave it registered")
-	}
-}
-
-func TestWebSocketPTYInputAckEmission(t *testing.T) {
-	hub, session, attachment, readFile, writeFile, done := newTestPTYInputSession(t, "sess-ack", "ack-att", true)
-	defer close(done)
-	defer readFile.Close()
-	defer writeFile.Close()
-	attachment.inputSeqAck = true
-
-	for seq := uint64(1); seq <= 10; seq++ {
-		chunk := wsPTYInputChunk{
-			attachmentID:  attachment.id,
-			attachment:    attachment,
-			payload:       []byte("x"),
-			seq:           seq,
-			finalSeqChunk: true,
-		}
-		if !hub.writeInputChunk(session, chunk) {
-			t.Fatalf("write seq %d failed", seq)
-		}
-	}
-	frame := <-attachment.send
-	event := rpcPTYEventForFrame(attachment, frame)
-	if event.Event != "pty.input_ack" || event.Seq != 10 {
-		t.Fatalf("ack event = %+v, want cumulative seq 10", event)
-	}
-	select {
-	case extra := <-attachment.send:
-		t.Fatalf("ack was not coalesced; extra frame=%+v", extra)
-	default:
-	}
-
-	legacyAttachment := &wsPTYAttachment{
-		sessionKey:  session.key,
-		id:          "legacy-att",
-		clientToken: "legacy-token",
-		send:        make(chan wsPTYOutgoingFrame, defaultWebSocketWriteQueueCap),
-		cancel:      func() {},
-		persistent:  true,
-		inputSeqAck: false,
-	}
-	hub.mu.Lock()
-	session.attachments[legacyAttachment.id] = legacyAttachment
-	hub.mu.Unlock()
-	chunk := wsPTYInputChunk{
-		attachmentID:  legacyAttachment.id,
-		attachment:    legacyAttachment,
-		payload:       []byte("y"),
-		seq:           1,
-		finalSeqChunk: true,
-	}
-	if !hub.writeInputChunk(session, chunk) {
-		t.Fatal("legacy write failed")
-	}
-	select {
-	case frame := <-legacyAttachment.send:
-		t.Fatalf("legacy attachment received unexpected ack frame=%+v", frame)
-	default:
-	}
-}
-
-func TestWebSocketPTYMultiAttachUsesSmallestResize(t *testing.T) {
-	leasePath := filepath.Join(t.TempDir(), "lease.json")
-	server, hub := newTestWebSocketPTYServer(t, leasePath)
-
-	ctx, cancel := context.WithTimeout(context.Background(), 15*time.Second)
-	defer cancel()
-
-	writeTestLease(t, leasePath, "a-token", "sess-resize", true, time.Now().Add(time.Minute))
-	a := dialPTY(t, ctx, server.URL)
-	defer a.Close(websocket.StatusNormalClosure, "done")
-	sendAuthWithAttachment(t, ctx, a, "a-token", "sess-resize", "a", 120, 40)
-	readReady(t, ctx, a)
-
-	writeTestLease(t, leasePath, "b-token", "sess-resize", true, time.Now().Add(time.Minute))
-	b := dialPTY(t, ctx, server.URL)
-	defer b.Close(websocket.StatusNormalClosure, "done")
-	sendAuthWithAttachment(t, ctx, b, "b-token", "sess-resize", "b", 90, 30)
-	readReady(t, ctx, b)
-	waitForHubPTYSize(t, hub, "sess-resize", 90, 30, 5*time.Second)
-
-	invalidResizePayload, err := json.Marshal(wsPTYControlFrame{Type: "resize", Cols: 0, Rows: 0})
-	if err != nil {
-		t.Fatalf("marshal invalid resize: %v", err)
-	}
-	if err := b.Write(ctx, websocket.MessageText, invalidResizePayload); err != nil {
-		t.Fatalf("write invalid resize: %v", err)
-	}
-	if err := b.Write(ctx, websocket.MessageBinary, []byte("printf 'BADSIZE:'; stty size\r")); err != nil {
-		t.Fatalf("write bad resize stty size: %v", err)
-	}
-	waitForBinaryContains(t, ctx, a, "BADSIZE:30 90", 5*time.Second)
-	waitForHubSessionSize(t, hub, "sess-resize", 2, 90, 30, 5*time.Second)
-	waitForHubPTYSize(t, hub, "sess-resize", 90, 30, 5*time.Second)
-
-	if err := a.Write(ctx, websocket.MessageBinary, []byte("stty size\r")); err != nil {
-		t.Fatalf("write stty size: %v", err)
-	}
-	waitForBinaryContains(t, ctx, a, "30 90", 5*time.Second)
-
-	resizePayload, err := json.Marshal(wsPTYControlFrame{Type: "resize", Cols: 100, Rows: 35})
-	if err != nil {
-		t.Fatalf("marshal resize: %v", err)
-	}
-	if err := b.Write(ctx, websocket.MessageText, resizePayload); err != nil {
-		t.Fatalf("write resize: %v", err)
-	}
-	waitForHubSessionSize(t, hub, "sess-resize", 2, 100, 35, 5*time.Second)
-	waitForHubPTYSize(t, hub, "sess-resize", 100, 35, 5*time.Second)
-	if err := a.Write(ctx, websocket.MessageBinary, []byte("printf 'SIZE2:'; stty size\r")); err != nil {
-		t.Fatalf("write second stty size: %v", err)
-	}
-	waitForBinaryContains(t, ctx, a, "SIZE2:35 100", 5*time.Second)
-
-	_ = b.Close(websocket.StatusNormalClosure, "detach b")
-	waitForHubSessionSize(t, hub, "sess-resize", 1, 120, 40, 5*time.Second)
-	waitForHubPTYSize(t, hub, "sess-resize", 120, 40, 5*time.Second)
-	if err := a.Write(ctx, websocket.MessageBinary, []byte("printf 'SIZE3:'; stty size\r")); err != nil {
-		t.Fatalf("write third stty size: %v", err)
-	}
-	waitForBinaryContains(t, ctx, a, "SIZE3:40 120", 5*time.Second)
-	if err := a.Write(ctx, websocket.MessageBinary, []byte("exit\r")); err != nil {
-		t.Fatalf("write final exit: %v", err)
-	}
-	waitForHubSessionCount(t, hub, 0, 5*time.Second)
-}
-
-func TestWebSocketPTYStressSessionCleanupAndBoundedScrollback(t *testing.T) {
-	leasePath := filepath.Join(t.TempDir(), "lease.json")
-	hub := newWebSocketPTYHub(wsPTYServerConfig{
-		Shell:           "/bin/sh",
-		ScrollbackLimit: 4096,
-	}, &bytes.Buffer{})
-	server := httptest.NewServer(newWebSocketPTYHandler(wsPTYServerConfig{
-		PTYAuthLeaseFile: leasePath,
-		Shell:            "/bin/sh",
-		PTYHub:           hub,
-		ScrollbackLimit:  4096,
-	}, &bytes.Buffer{}))
-	defer server.Close()
-	defer hub.closeAll()
-
-	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
-	defer cancel()
-	baseGoroutines := runtime.NumGoroutine()
-
-	for i := 0; i < 25; i++ {
-		sessionID := "stress-" + strconv.Itoa(i)
-		token := "token-" + strconv.Itoa(i)
-		writeTestLease(t, leasePath, token, sessionID, true, time.Now().Add(time.Minute))
-		conn := dialPTY(t, ctx, server.URL)
-		sendAuth(t, ctx, conn, token, sessionID, 80+i, 24)
-		readReady(t, ctx, conn)
-		if err := conn.Write(ctx, websocket.MessageBinary, []byte("printf '%8192s\\n' x; printf '%b\\n' '\\103\\115\\125\\130\\137\\110\\117\\114\\104'; read line; exit\r")); err != nil {
-			t.Fatalf("write stress command %d: %v", i, err)
-		}
-		waitForBinaryContainsLabel(t, ctx, conn, "stress session "+sessionID+" hold marker", "CMUX_HOLD", 10*time.Second)
-		if got := hub.maxScrollbackBytes(); got != 4096 {
-			t.Fatalf("scrollback bytes = %d, want cap 4096", got)
-		}
-		if err := conn.Write(ctx, websocket.MessageBinary, []byte("\r")); err != nil {
-			t.Fatalf("release stress command %d: %v", i, err)
-		}
-		waitForNormalClose(t, ctx, conn, 5*time.Second)
-		waitForHubSessionCount(t, hub, 0, 5*time.Second)
-	}
-	waitForGoroutineCeiling(t, baseGoroutines+8, 5*time.Second)
-}
-
-func TestWebSocketPTYAnonymousDetachTerminatesSession(t *testing.T) {
-	leasePath := filepath.Join(t.TempDir(), "lease.json")
-	server, hub := newTestWebSocketPTYServer(t, leasePath)
-
-	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
-	defer cancel()
-
-	writeTestLease(t, leasePath, "anon-token", "sess-anon", true, time.Now().Add(time.Minute))
-	conn := dialPTY(t, ctx, server.URL)
-	sendAuth(t, ctx, conn, "anon-token", "sess-anon", 80, 24)
-	readReady(t, ctx, conn)
-	if err := conn.Write(ctx, websocket.MessageBinary, []byte("printf 'ANON_READY\\n'\r")); err != nil {
-		t.Fatalf("write anonymous marker: %v", err)
-	}
-	waitForBinaryContains(t, ctx, conn, "ANON_READY", 5*time.Second)
-	_ = conn.Close(websocket.StatusNormalClosure, "detach")
-
-	waitForHubSessionCount(t, hub, 0, 5*time.Second)
-}
-
-func TestWebSocketPTYAnonymousAttachesAreIsolated(t *testing.T) {
-	leasePath := filepath.Join(t.TempDir(), "lease.json")
-	server, hub := newTestWebSocketPTYServer(t, leasePath)
-
-	ctx, cancel := context.WithTimeout(context.Background(), 15*time.Second)
-	defer cancel()
-
-	writeTestLease(t, leasePath, "anon-a-token", "sess-anon-shared", true, time.Now().Add(time.Minute))
-	a := dialPTY(t, ctx, server.URL)
-	defer a.Close(websocket.StatusNormalClosure, "done")
-	sendAuth(t, ctx, a, "anon-a-token", "sess-anon-shared", 80, 24)
-	readReady(t, ctx, a)
-	if err := a.Write(ctx, websocket.MessageBinary, []byte("CMUX_ANON_MARK=one; export CMUX_ANON_MARK; printf 'A_READY\\n'\r")); err != nil {
-		t.Fatalf("write anonymous A marker: %v", err)
-	}
-	waitForBinaryContains(t, ctx, a, "A_READY", 5*time.Second)
-
-	writeTestLease(t, leasePath, "anon-b-token", "sess-anon-shared", true, time.Now().Add(time.Minute))
-	b := dialPTY(t, ctx, server.URL)
-	defer b.Close(websocket.StatusNormalClosure, "done")
-	sendAuth(t, ctx, b, "anon-b-token", "sess-anon-shared", 80, 24)
-	readReady(t, ctx, b)
-	if err := b.Write(ctx, websocket.MessageBinary, []byte("printf 'B_MARK:%s\\n' \"${CMUX_ANON_MARK-unset}\"; exit\r")); err != nil {
-		t.Fatalf("write anonymous B marker: %v", err)
-	}
-	output := waitForBinaryContains(t, ctx, b, "B_MARK:unset", 5*time.Second)
-	if strings.Contains(output, "B_MARK:one") {
-		t.Fatalf("anonymous attach reused another shell, output=%q", output)
-	}
-	waitForHubSessionCount(t, hub, 1, 5*time.Second)
-	_ = a.Close(websocket.StatusNormalClosure, "done")
-	waitForHubSessionCount(t, hub, 0, 5*time.Second)
-}
-
-func TestWebSocketPTYAnonymousSessionKeyCannotBeForged(t *testing.T) {
-	leasePath := filepath.Join(t.TempDir(), "lease.json")
-	server, hub := newTestWebSocketPTYServer(t, leasePath)
-
-	ctx, cancel := context.WithTimeout(context.Background(), 15*time.Second)
-	defer cancel()
-
-	writeTestLease(t, leasePath, "anon-forge-token", "sess-forge", true, time.Now().Add(time.Minute))
-	anon := dialPTY(t, ctx, server.URL)
-	defer anon.Close(websocket.StatusNormalClosure, "done")
-	sendAuth(t, ctx, anon, "anon-forge-token", "sess-forge", 80, 24)
-	readReady(t, ctx, anon)
-	if err := anon.Write(ctx, websocket.MessageBinary, []byte("CMUX_FORGE_MARK=anon; export CMUX_FORGE_MARK; printf 'ANON_FORGE_READY\\n'\r")); err != nil {
-		t.Fatalf("write anonymous forge marker: %v", err)
-	}
-	waitForBinaryContains(t, ctx, anon, "ANON_FORGE_READY", 5*time.Second)
-
-	writeTestLease(t, leasePath, "persistent-forge-token", "sess-forge:anon-0", true, time.Now().Add(time.Minute))
-	persistent := dialPTY(t, ctx, server.URL)
-	defer persistent.Close(websocket.StatusNormalClosure, "done")
-	sendAuthWithAttachment(t, ctx, persistent, "persistent-forge-token", "sess-forge:anon-0", "persist", 80, 24)
-	readReady(t, ctx, persistent)
-	if err := persistent.Write(ctx, websocket.MessageBinary, []byte("printf 'PERSISTENT_FORGE:%s\\n' \"${CMUX_FORGE_MARK-unset}\"; exit\r")); err != nil {
-		t.Fatalf("write persistent forge probe: %v", err)
-	}
-	output := waitForBinaryContains(t, ctx, persistent, "PERSISTENT_FORGE:unset", 5*time.Second)
-	if strings.Contains(output, "PERSISTENT_FORGE:anon") {
-		t.Fatalf("persistent attach reused anonymous shell, output=%q", output)
-	}
-	waitForHubSessionCount(t, hub, 1, 5*time.Second)
-	_ = anon.Close(websocket.StatusNormalClosure, "done")
-	waitForHubSessionCount(t, hub, 0, 5*time.Second)
-}
-
-func TestWebSocketPTYAttachmentWithoutSessionIDIsAnonymous(t *testing.T) {
-	leasePath := filepath.Join(t.TempDir(), "lease.json")
-	server, hub := newTestWebSocketPTYServer(t, leasePath)
-
-	ctx, cancel := context.WithTimeout(context.Background(), 15*time.Second)
-	defer cancel()
-
-	writeTestLease(t, leasePath, "no-session-a-token", "", true, time.Now().Add(time.Minute))
-	a := dialPTY(t, ctx, server.URL)
-	defer a.Close(websocket.StatusNormalClosure, "done")
-	sendAuthWithAttachment(t, ctx, a, "no-session-a-token", "", "same", 80, 24)
-	readReady(t, ctx, a)
-	if err := a.Write(ctx, websocket.MessageBinary, []byte("CMUX_NO_SESSION_MARK=one; export CMUX_NO_SESSION_MARK; printf 'NO_SESSION_A_READY\\n'\r")); err != nil {
-		t.Fatalf("write no-session A marker: %v", err)
-	}
-	waitForBinaryContains(t, ctx, a, "NO_SESSION_A_READY", 5*time.Second)
-
-	writeTestLease(t, leasePath, "no-session-b-token", "", true, time.Now().Add(time.Minute))
-	b := dialPTY(t, ctx, server.URL)
-	defer b.Close(websocket.StatusNormalClosure, "done")
-	sendAuthWithAttachment(t, ctx, b, "no-session-b-token", "", "same", 80, 24)
-	readReady(t, ctx, b)
-	if err := b.Write(ctx, websocket.MessageBinary, []byte("printf 'NO_SESSION_B:%s\\n' \"${CMUX_NO_SESSION_MARK-unset}\"; exit\r")); err != nil {
-		t.Fatalf("write no-session B probe: %v", err)
-	}
-	output := waitForBinaryContains(t, ctx, b, "NO_SESSION_B:unset", 5*time.Second)
-	if strings.Contains(output, "NO_SESSION_B:one") {
-		t.Fatalf("attachment without session_id reused another shell, output=%q", output)
-	}
-	waitForHubSessionCount(t, hub, 1, 5*time.Second)
-	_ = a.Close(websocket.StatusNormalClosure, "done")
-	waitForHubSessionCount(t, hub, 0, 5*time.Second)
-}
-
-func TestWebSocketPTYDropsBackpressuredAttachment(t *testing.T) {
-	hub := newWebSocketPTYHub(wsPTYServerConfig{
-		Shell:           "/bin/sh",
-		ScrollbackLimit: 4096,
-	}, &bytes.Buffer{})
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-	sessionKey := persistentPTYSessionKey("sess-backpressure")
-	attachment := &wsPTYAttachment{
-		sessionKey: sessionKey,
-		id:         "slow",
-		cols:       80,
-		rows:       24,
-		send:       make(chan wsPTYOutgoingFrame, 1),
-		cancel:     cancel,
-		persistent: true,
-	}
-	attachment.send <- wsPTYOutgoingFrame{
-		messageType: websocket.MessageBinary,
-		payload:     []byte("already queued"),
-	}
-	session := &wsPTYSession{
-		id:            "sess-backpressure",
-		key:           sessionKey,
-		attachments:   map[string]*wsPTYAttachment{"slow": attachment},
-		effectiveCols: 80,
-		effectiveRows: 24,
-		lastKnownCols: 80,
-		lastKnownRows: 24,
-	}
-
-	hub.mu.Lock()
-	hub.sessions[session.key] = session
-	hub.mu.Unlock()
-
-	hub.recordAndBroadcast(session, []byte("overflow"))
-	if attachments, _, _, ok := hub.sessionDebugSnapshot(session.id); !ok || attachments != 0 {
-		t.Fatalf("backpressured session state = ok:%v attachments:%d, want ok:true attachments:0", ok, attachments)
-	}
-	select {
-	case <-ctx.Done():
-	default:
-		t.Fatal("backpressured attachment context was not canceled")
-	}
-}
-
-func TestWebSocketPTYInputBackpressureDoesNotBlockHub(t *testing.T) {
-	reader, writer, err := os.Pipe()
-	if err != nil {
-		t.Fatalf("pipe: %v", err)
-	}
-	defer reader.Close()
-
-	stderr := &bytes.Buffer{}
-	hub := newWebSocketPTYHub(wsPTYServerConfig{
-		Shell:           "/bin/sh",
-		ScrollbackLimit: 4096,
-	}, stderr)
-	sessionKey := persistentPTYSessionKey("sess-input-backpressure")
-	sessionDone := make(chan struct{})
-	attachment := &wsPTYAttachment{
-		sessionKey: sessionKey,
-		id:         "att-input",
-		cols:       80,
-		rows:       24,
-		send:       make(chan wsPTYOutgoingFrame, defaultWebSocketWriteQueueCap),
-		cancel:     func() {},
-		persistent: true,
-	}
-	session := &wsPTYSession{
-		id:            "sess-input-backpressure",
-		key:           sessionKey,
-		ptyFile:       writer,
-		attachments:   map[string]*wsPTYAttachment{attachment.id: attachment},
-		effectiveCols: 80,
-		effectiveRows: 24,
-		lastKnownCols: 80,
-		lastKnownRows: 24,
-		input:         make(chan wsPTYInputChunk, defaultPTYInputQueueCap),
-		done:          sessionDone,
-	}
-	defer func() {
-		_ = writer.Close()
-		close(sessionDone)
-	}()
-
-	hub.mu.Lock()
-	hub.sessions[session.key] = session
-	hub.mu.Unlock()
-	go hub.writeInputLoop(session)
-
-	payload := bytes.Repeat([]byte("x"), 64*1024)
-	writesDone := make(chan struct{})
-	go func() {
-		defer close(writesDone)
-		for i := 0; i < defaultPTYInputQueueCap*4; i++ {
-			_ = hub.writeInputByID(session.id, attachment.id, "", payload)
-		}
-	}()
-
-	select {
-	case <-writesDone:
-	case <-time.After(2 * time.Second):
-		t.Fatal("writeInputByID blocked behind a full PTY writer")
-	}
-
-	closeDone := make(chan bool, 1)
-	go func() {
-		closeDone <- hub.closeSessionByID(session.id)
-	}()
-	select {
-	case ok := <-closeDone:
-		if !ok {
-			t.Fatal("closeSessionByID returned false")
-		}
-	case <-time.After(2 * time.Second):
-		t.Fatal("closeSessionByID blocked behind a full PTY writer")
-	}
-}
-
-func TestWebSocketPTYWriteFailureClosesConnectionAndReapsAttachment(t *testing.T) {
-	leasePath := filepath.Join(t.TempDir(), "lease.json")
-	stderr := &bytes.Buffer{}
-	hub := newWebSocketPTYHub(wsPTYServerConfig{
-		Shell:           "/bin/sh",
-		ScrollbackLimit: 4096,
-		SessionIdleTTL:  20 * time.Millisecond,
-	}, stderr)
-	server := httptest.NewServer(newWebSocketPTYHandler(wsPTYServerConfig{
-		PTYAuthLeaseFile: leasePath,
-		Shell:            "/bin/sh",
-		PTYHub:           hub,
-		ScrollbackLimit:  4096,
-		SessionIdleTTL:   20 * time.Millisecond,
-	}, stderr))
-	defer server.Close()
-	defer hub.closeAll()
-
-	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
-	defer cancel()
-
-	writeTestLease(t, leasePath, "write-fail-token", "sess-write-fail", true, time.Now().Add(time.Minute))
-	conn := dialPTY(t, ctx, server.URL)
-	sendAuthWithAttachment(t, ctx, conn, "write-fail-token", "sess-write-fail", "persist", 80, 24)
-	readReady(t, ctx, conn)
-	waitForHubSessionSize(t, hub, "sess-write-fail", 1, 80, 24, 5*time.Second)
-
-	attachment := hub.debugAttachment("sess-write-fail", "persist")
-	if attachment == nil {
-		t.Fatal("attachment was not registered")
-	}
-	cancelWriteCtx, cancelWrite := context.WithCancel(ctx)
-	cancelWrite()
-	if attachment.writeFrame(cancelWriteCtx, attachment.conn, wsPTYOutgoingFrame{
-		messageType: websocket.MessageBinary,
-		payload:     []byte("will fail"),
-	}) {
-		t.Fatal("writeFrame unexpectedly succeeded with a canceled context")
-	}
-
-	waitForHubSessionCount(t, hub, 0, 5*time.Second)
-	closeCtx, cancelClose := context.WithTimeout(ctx, 5*time.Second)
-	defer cancelClose()
-	for {
-		_, _, err := conn.Read(closeCtx)
-		if err == nil {
-			continue
-		}
-		if errors.Is(err, context.DeadlineExceeded) {
-			t.Fatal("client connection stayed open after server write failure")
-		}
-		break
-	}
-}
-
-func TestWebSocketPTYInputBackpressureRejectsWholePayload(t *testing.T) {
-	stderr := &bytes.Buffer{}
-	hub := newWebSocketPTYHub(wsPTYServerConfig{
-		Shell:           "/bin/sh",
-		ScrollbackLimit: 4096,
-	}, stderr)
-	sessionKey := persistentPTYSessionKey("sess-input-atomic")
-	sessionDone := make(chan struct{})
-	attachment := &wsPTYAttachment{
-		sessionKey: sessionKey,
-		id:         "att-input",
-		cols:       80,
-		rows:       24,
-		send:       make(chan wsPTYOutgoingFrame, defaultWebSocketWriteQueueCap),
-		cancel:     func() {},
-		persistent: true,
-	}
-	session := &wsPTYSession{
-		id:            "sess-input-atomic",
-		key:           sessionKey,
-		attachments:   map[string]*wsPTYAttachment{attachment.id: attachment},
-		effectiveCols: 80,
-		effectiveRows: 24,
-		lastKnownCols: 80,
-		lastKnownRows: 24,
-		input:         make(chan wsPTYInputChunk, defaultPTYInputQueueCap),
-		done:          sessionDone,
-	}
-	defer close(sessionDone)
-
-	hub.mu.Lock()
-	hub.sessions[session.key] = session
-	hub.mu.Unlock()
-
-	for i := 0; i < defaultPTYInputQueueCap-1; i++ {
-		session.input <- wsPTYInputChunk{
-			attachmentID: attachment.id,
-			attachment:   attachment,
-			payload:      []byte("queued"),
-		}
-	}
-
-	payload := append(
-		bytes.Repeat([]byte("x"), defaultPTYInputChunkBytes),
-		'y',
-	)
-	if status := hub.writeInputByID(session.id, attachment.id, "", payload); status != wsPTYInputWriteQueueFull {
-		t.Fatalf("writeInputByID status = %v, want queue full", status)
-	}
-	if len(session.input) == defaultPTYInputQueueCap {
-		t.Fatal("writeInputByID unexpectedly accepted a two-chunk payload with one queue slot free")
-	}
-	if got := len(session.input); got != defaultPTYInputQueueCap-1 {
-		t.Fatalf("input queue length = %d, want unchanged %d", got, defaultPTYInputQueueCap-1)
-	}
-	for len(session.input) > 0 {
-		chunk := <-session.input
-		if bytes.Contains(chunk.payload, []byte("x")) || bytes.Contains(chunk.payload, []byte("y")) {
-			t.Fatalf("rejected payload chunk was partially enqueued: %q", string(chunk.payload))
-		}
-	}
-	if !strings.Contains(stderr.String(), "ws pty input queue full") {
-		t.Fatalf("stderr should report input queue backpressure, got %q", stderr.String())
-	}
-}
-
-func newTestPTYInputSession(t *testing.T, sessionID string, attachmentID string, inputSeqAck bool) (*wsPTYHub, *wsPTYSession, *wsPTYAttachment, *os.File, *os.File, chan struct{}) {
-	t.Helper()
-	readFile, writeFile, err := os.Pipe()
-	if err != nil {
-		t.Fatalf("create pipe: %v", err)
-	}
-	hub := newWebSocketPTYHub(wsPTYServerConfig{
-		Shell:           "/bin/sh",
-		ScrollbackLimit: 4096,
-	}, &bytes.Buffer{})
-	sessionKey := persistentPTYSessionKey(sessionID)
-	done := make(chan struct{})
-	attachment := &wsPTYAttachment{
-		sessionKey:  sessionKey,
-		id:          attachmentID,
-		clientToken: "token-1",
-		cols:        80,
-		rows:        24,
-		send:        make(chan wsPTYOutgoingFrame, defaultWebSocketWriteQueueCap),
-		cancel:      func() {},
-		persistent:  true,
-		inputSeqAck: inputSeqAck,
-	}
-	session := &wsPTYSession{
-		id:            sessionID,
-		key:           sessionKey,
-		ptyFile:       writeFile,
-		attachments:   map[string]*wsPTYAttachment{attachment.id: attachment},
-		effectiveCols: 80,
-		effectiveRows: 24,
-		lastKnownCols: 80,
-		lastKnownRows: 24,
-		input:         make(chan wsPTYInputChunk, defaultPTYInputQueueCap),
-		done:          done,
-	}
-	hub.mu.Lock()
-	hub.sessions[session.key] = session
-	hub.mu.Unlock()
-	return hub, session, attachment, readFile, writeFile, done
-}
-
-func readExactlyFromFile(t *testing.T, file *os.File, count int, timeout time.Duration) []byte {
-	t.Helper()
-	type readResult struct {
-		data []byte
-		err  error
-	}
-	resultCh := make(chan readResult, 1)
-	go func() {
-		buf := make([]byte, count)
-		_, err := io.ReadFull(file, buf)
-		resultCh <- readResult{data: buf, err: err}
-	}()
-	select {
-	case result := <-resultCh:
-		if result.err != nil {
-			t.Fatalf("read PTY input: %v", result.err)
-		}
-		return result.data
-	case <-time.After(timeout):
-		t.Fatalf("timed out reading %d PTY bytes", count)
-		return nil
-	}
-}
-
-type captureRPCFrameWriter struct {
-	events []rpcEvent
-}
-
-func (w *captureRPCFrameWriter) writeResponse(rpcResponse) error {
-	return nil
-}
-
-func (w *captureRPCFrameWriter) writeEvent(event rpcEvent) error {
-	w.events = append(w.events, event)
-	return nil
-}
-
-func TestWebSocketPTYReapsDetachedIdleSession(t *testing.T) {
-	leasePath := filepath.Join(t.TempDir(), "lease.json")
-	stderr := &bytes.Buffer{}
-	hub := newWebSocketPTYHub(wsPTYServerConfig{
-		Shell:           "/bin/sh",
-		ScrollbackLimit: 4096,
-		SessionIdleTTL:  20 * time.Millisecond,
-	}, stderr)
-	server := httptest.NewServer(newWebSocketPTYHandler(wsPTYServerConfig{
-		PTYAuthLeaseFile: leasePath,
-		Shell:            "/bin/sh",
-		PTYHub:           hub,
-		ScrollbackLimit:  4096,
-		SessionIdleTTL:   20 * time.Millisecond,
-	}, stderr))
-	defer server.Close()
-	defer hub.closeAll()
-
-	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
-	defer cancel()
-
-	writeTestLease(t, leasePath, "idle-token", "sess-idle", true, time.Now().Add(time.Minute))
-	conn := dialPTY(t, ctx, server.URL)
-	sendAuthWithAttachment(t, ctx, conn, "idle-token", "sess-idle", "persist", 80, 24)
-	readReady(t, ctx, conn)
-	if err := conn.Write(ctx, websocket.MessageBinary, []byte("printf 'IDLE_READY\\n'\r")); err != nil {
-		t.Fatalf("write idle marker: %v", err)
-	}
-	waitForBinaryContains(t, ctx, conn, "IDLE_READY", 5*time.Second)
-	_ = conn.Close(websocket.StatusNormalClosure, "detach")
-
-	waitForHubSessionCount(t, hub, 0, 5*time.Second)
-}
-
-func TestWebSocketPTYCountsIdleSessionUntilTeardownCompletes(t *testing.T) {
-	hub := newWebSocketPTYHub(wsPTYServerConfig{}, io.Discard)
-	sessionKey := persistentPTYSessionKey("teardown-in-flight")
-	session := &wsPTYSession{
-		id:          "teardown-in-flight",
-		key:         sessionKey,
-		attachments: map[string]*wsPTYAttachment{},
-		done:        make(chan struct{}),
-	}
-	hub.mu.Lock()
-	hub.sessions[sessionKey] = session
-	hub.mu.Unlock()
-
-	// Hold the PTY-file mutex so the idle reaper can remove the session from
-	// the map but cannot finish terminateProcesses or closePTYFiles.
-	session.ptyFileMu.Lock()
-	ptyFileLocked := true
-	teardownDone := make(chan struct{})
-	go func() {
-		hub.reapIdleSession(session)
-		close(teardownDone)
-	}()
-	defer func() {
-		if ptyFileLocked {
-			session.ptyFileMu.Unlock()
-			<-teardownDone
-		}
-	}()
-
-	deadline := time.Now().Add(2 * time.Second)
-	for {
-		hub.mu.Lock()
-		_, retained := hub.sessions[sessionKey]
-		hub.mu.Unlock()
-		if !retained {
-			break
-		}
-		if time.Now().After(deadline) {
-			t.Fatalf("idle reaper did not begin session teardown")
-		}
-		runtime.Gosched()
-	}
-
-	if got := hub.activeSessionCount(); got != 1 {
-		t.Fatalf("hub activity during session teardown = %d, want 1", got)
-	}
-	session.ptyFileMu.Unlock()
-	ptyFileLocked = false
-	select {
-	case <-teardownDone:
-	case <-time.After(2 * time.Second):
-		t.Fatalf("idle session teardown did not finish")
-	}
-	if got := hub.activeSessionCount(); got != 0 {
-		t.Fatalf("hub activity after session teardown = %d, want 0", got)
-	}
-}
-
-func TestWebSocketPTYScrollbackDoesNotRetainOversizedChunks(t *testing.T) {
-	hub := newWebSocketPTYHub(wsPTYServerConfig{
-		Shell:           "/bin/sh",
-		ScrollbackLimit: 4096,
-	}, &bytes.Buffer{})
-	session := &wsPTYSession{id: "scrollback"}
-
-	hub.mu.Lock()
-	hub.appendScrollbackLocked(session, bytes.Repeat([]byte("x"), 1<<20))
-	hub.mu.Unlock()
-	if got := len(session.scrollback); got != 4096 {
-		t.Fatalf("scrollback len = %d, want 4096", got)
-	}
-	if got := cap(session.scrollback); got > 4096 {
-		t.Fatalf("scrollback cap = %d, want <= 4096", got)
-	}
-
-	hub.mu.Lock()
-	hub.appendScrollbackLocked(session, []byte("tail"))
-	hub.mu.Unlock()
-	if got := len(session.scrollback); got != 4096 {
-		t.Fatalf("scrollback len after append = %d, want 4096", got)
-	}
-	if got := cap(session.scrollback); got > 4096 {
-		t.Fatalf("scrollback cap after append = %d, want <= 4096", got)
-	}
-	if !strings.HasSuffix(string(session.scrollback), "tail") {
-		t.Fatalf("scrollback should retain newest output, got suffix %q", string(session.scrollback[len(session.scrollback)-16:]))
-	}
-}
-
-func TestDefaultWebSocketPTYEnvAddsStandardExecutableDirectories(t *testing.T) {
-	tests := []struct {
-		name          string
-		inheritedPath string
-	}{
-		{name: "restricted daemon PATH", inheritedPath: "/opt/cmux/bin"},
-		{name: "empty daemon PATH", inheritedPath: ""},
-		{name: "partially complete daemon PATH", inheritedPath: "/opt/cmux/bin:/usr/bin"},
-	}
-
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			t.Setenv("PATH", test.inheritedPath)
-
-			env, _ := envMapWithOrder(defaultWebSocketPTYEnv("/bin/sh"))
-			pathEntries := strings.Split(env["PATH"], string(os.PathListSeparator))
-			inheritedPrefix := test.inheritedPath + string(os.PathListSeparator)
-			if test.inheritedPath != "" && env["PATH"] != test.inheritedPath && !strings.HasPrefix(env["PATH"], inheritedPrefix) {
-				t.Fatalf("PATH should preserve inherited entries first, got %q", env["PATH"])
-			}
-			for _, standardDirectory := range []string{
-				"/usr/local/bin",
-				"/usr/bin",
-				"/bin",
-				"/usr/local/sbin",
-				"/usr/sbin",
-				"/sbin",
-			} {
-				if count := countStrings(pathEntries, standardDirectory); count != 1 {
-					t.Errorf("PATH %q contains standard directory %q %d times, want once", env["PATH"], standardDirectory, count)
-				}
-			}
-		})
-	}
-}
-
-func countStrings(values []string, target string) int {
-	count := 0
-	for _, value := range values {
-		if value == target {
-			count++
-		}
-	}
-	return count
-}
-
-func TestWebSocketPTYSeedsUTF8LocaleAndTerminalEnv(t *testing.T) {
-	leasePath := filepath.Join(t.TempDir(), "lease.json")
-	server, _ := newTestWebSocketPTYServer(t, leasePath)
-
-	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
-	defer cancel()
-
-	writeTestLease(t, leasePath, "env-token", "sess-env", true, time.Now().Add(time.Minute))
-	conn := dialPTY(t, ctx, server.URL)
-	defer conn.Close(websocket.StatusNormalClosure, "done")
-	sendAuth(t, ctx, conn, "env-token", "sess-env", 80, 24)
-	msgType, payload, err := conn.Read(ctx)
-	if err != nil {
-		t.Fatalf("read ready: %v", err)
-	}
-	if msgType != websocket.MessageText || !strings.Contains(string(payload), `"ready"`) {
-		t.Fatalf("first frame should be ready text, type=%v payload=%q", msgType, string(payload))
-	}
-
-	command := "printf '%s\\n' \"$LANG|$LC_CTYPE|$LC_ALL|$TERM|$COLORTERM|$TERM_PROGRAM|$CMUX_REMOTE_TRANSPORT\"; locale charmap; exit\r"
-	if err := conn.Write(ctx, websocket.MessageBinary, []byte(command)); err != nil {
-		t.Fatalf("write terminal command: %v", err)
-	}
-
-	var output strings.Builder
-	wantTerminalEnv := "|xterm-256color|truecolor|ghostty|ws"
-	wantCharmap := "UTF-8"
-	deadline := time.Now().Add(5 * time.Second)
-	for time.Now().Before(deadline) {
-		readCtx, cancelRead := context.WithTimeout(ctx, time.Until(deadline))
-		msgType, payload, err = conn.Read(readCtx)
-		cancelRead()
-		if err != nil {
-			t.Fatalf("read terminal env: %v output=%q", err, output.String())
-		}
-		if msgType != websocket.MessageBinary {
-			continue
-		}
-		output.Write(payload)
-		if strings.Contains(output.String(), wantTerminalEnv) && strings.Contains(output.String(), wantCharmap) {
-			return
-		}
-	}
-	t.Fatalf("timed out waiting for terminal env, got %q", output.String())
-}
-
-func dialPTY(t *testing.T, ctx context.Context, serverURL string) *websocket.Conn {
-	t.Helper()
-	wsURL := "ws" + strings.TrimPrefix(serverURL, "http") + "/terminal"
-	conn, _, err := websocket.Dial(ctx, wsURL, nil)
-	if err != nil {
-		t.Fatalf("dial %s: %v", wsURL, err)
-	}
-	return conn
-}
-
-func sendAuth(t *testing.T, ctx context.Context, conn *websocket.Conn, token, sessionID string, cols, rows int) {
-	t.Helper()
-	sendAuthWithAttachment(t, ctx, conn, token, sessionID, "", cols, rows)
-}
-
-func sendAuthWithAttachment(t *testing.T, ctx context.Context, conn *websocket.Conn, token, sessionID string, attachmentID string, cols, rows int) {
-	t.Helper()
-	payload, err := json.Marshal(wsPTYAuthFrame{
-		Type:         "auth",
-		Token:        token,
-		SessionID:    sessionID,
-		AttachmentID: attachmentID,
-		Cols:         cols,
-		Rows:         rows,
-	})
-	if err != nil {
-		t.Fatalf("marshal auth: %v", err)
-	}
-	if err := conn.Write(ctx, websocket.MessageText, payload); err != nil {
-		t.Fatalf("write auth: %v", err)
-	}
-}
-
-func writeTestLease(t *testing.T, path, token, sessionID string, singleUse bool, expiresAt time.Time) {
-	t.Helper()
-	sum := sha256.Sum256([]byte(token))
-	lease := wsPTYLease{
-		Version:       1,
-		TokenSHA256:   hex.EncodeToString(sum[:]),
-		ExpiresAtUnix: expiresAt.Unix(),
-		SessionID:     sessionID,
-		SingleUse:     singleUse,
-	}
-	data, err := json.Marshal(lease)
-	if err != nil {
-		t.Fatalf("marshal lease: %v", err)
-	}
-	if err := os.WriteFile(path, data, 0o600); err != nil {
-		t.Fatalf("write lease: %v", err)
-	}
-}
-
-func readReady(t *testing.T, ctx context.Context, conn *websocket.Conn) {
-	t.Helper()
-	msgType, payload, err := conn.Read(ctx)
-	if err != nil {
-		t.Fatalf("read ready: %v", err)
-	}
-	if msgType != websocket.MessageText || !strings.Contains(string(payload), `"ready"`) {
-		t.Fatalf("first frame should be ready text, type=%v payload=%q", msgType, string(payload))
-	}
-}
-
-func waitForBinaryContains(t *testing.T, ctx context.Context, conn *websocket.Conn, needle string, timeout time.Duration) string {
-	t.Helper()
-	return waitForBinaryContainsLabel(t, ctx, conn, needle, needle, timeout)
-}
-
-func waitForBinaryContainsAll(t *testing.T, ctx context.Context, conn *websocket.Conn, needles []string, timeout time.Duration) string {
-	t.Helper()
-	var output strings.Builder
-	deadline := time.Now().Add(timeout)
-	closeOnTimeout := time.AfterFunc(timeout, func() {
-		_ = conn.Close(websocket.StatusNormalClosure, "test read timeout")
-	})
-	defer closeOnTimeout.Stop()
-	for time.Now().Before(deadline) {
-		readCtx, cancelRead := context.WithTimeout(ctx, time.Until(deadline))
-		msgType, payload, err := conn.Read(readCtx)
-		cancelRead()
-		if err != nil {
-			t.Fatalf("read terminal output while waiting for %q: %v output=%q", needles, err, output.String())
-		}
-		if msgType != websocket.MessageBinary {
-			continue
-		}
-		output.Write(payload)
-		matchedAll := true
-		for _, needle := range needles {
-			if !strings.Contains(output.String(), needle) {
-				matchedAll = false
-				break
-			}
-		}
-		if matchedAll {
-			return output.String()
-		}
-	}
-	t.Fatalf("timed out waiting for %q, got %q", needles, output.String())
-	return output.String()
-}
-
-func waitForBinaryContainsLabel(t *testing.T, ctx context.Context, conn *websocket.Conn, label string, needle string, timeout time.Duration) string {
-	t.Helper()
-	var output strings.Builder
-	deadline := time.Now().Add(timeout)
-	closeOnTimeout := time.AfterFunc(timeout, func() {
-		_ = conn.Close(websocket.StatusNormalClosure, "test read timeout")
-	})
-	defer closeOnTimeout.Stop()
-	for time.Now().Before(deadline) {
-		readCtx, cancelRead := context.WithTimeout(ctx, time.Until(deadline))
-		msgType, payload, err := conn.Read(readCtx)
-		cancelRead()
-		if err != nil {
-			t.Fatalf("read terminal output while waiting for %s: %v output=%q", label, err, output.String())
-		}
-		if msgType != websocket.MessageBinary {
-			continue
-		}
-		output.Write(payload)
-		if strings.Contains(output.String(), needle) {
-			return output.String()
-		}
-	}
-	t.Fatalf("timed out waiting for %s (%q), got %q", label, needle, output.String())
-	return output.String()
-}
-
-func waitForNormalClose(t *testing.T, ctx context.Context, conn *websocket.Conn, timeout time.Duration) {
-	t.Helper()
-	waitForNormalCloseWithOutput(t, ctx, conn, timeout, "")
-}
-
-func waitForNormalCloseWithOutput(t *testing.T, ctx context.Context, conn *websocket.Conn, timeout time.Duration, output string) {
-	t.Helper()
-	deadline := time.Now().Add(timeout)
-	for time.Now().Before(deadline) {
-		readCtx, cancelRead := context.WithTimeout(ctx, time.Until(deadline))
-		_, _, err := conn.Read(readCtx)
-		cancelRead()
-		if err == nil {
-			continue
-		}
-		if websocket.CloseStatus(err) != websocket.StatusNormalClosure {
-			t.Fatalf("expected normal close, got err=%v status=%v output=%q", err, websocket.CloseStatus(err), output)
-		}
-		return
-	}
-	t.Fatalf("timed out waiting for normal close output=%q", output)
-}
-
-func waitForHubSessionCount(t *testing.T, hub *wsPTYHub, want int, timeout time.Duration) {
-	t.Helper()
-	deadline := time.Now().Add(timeout)
-	for time.Now().Before(deadline) {
-		if got := hub.activeSessionCount(); got == want {
-			return
-		}
-		time.Sleep(10 * time.Millisecond)
-	}
-	t.Fatalf("hub session count = %d, want %d", hub.activeSessionCount(), want)
-}
-
-func waitForHubSessionSize(t *testing.T, hub *wsPTYHub, sessionID string, wantAttachments int, wantCols int, wantRows int, timeout time.Duration) {
-	t.Helper()
-	deadline := time.Now().Add(timeout)
-	for time.Now().Before(deadline) {
-		attachments, cols, rows, ok := hub.sessionDebugSnapshot(sessionID)
-		if ok && attachments == wantAttachments && cols == wantCols && rows == wantRows {
-			return
-		}
-		time.Sleep(10 * time.Millisecond)
-	}
-	attachments, cols, rows, ok := hub.sessionDebugSnapshot(sessionID)
-	t.Fatalf(
-		"hub session %s state = ok:%v attachments:%d size:%dx%d, want attachments:%d size:%dx%d",
-		sessionID,
-		ok,
-		attachments,
-		cols,
-		rows,
-		wantAttachments,
-		wantCols,
-		wantRows,
-	)
-}
-
-func waitForHubPTYSize(t *testing.T, hub *wsPTYHub, sessionID string, wantCols int, wantRows int, timeout time.Duration) {
-	t.Helper()
-	deadline := time.Now().Add(timeout)
-	for time.Now().Before(deadline) {
-		cols, rows, ok, err := hub.sessionPTYSize(sessionID)
-		if err != nil {
-			t.Fatalf("read pty size for %s: %v", sessionID, err)
-		}
-		if ok && cols == wantCols && rows == wantRows {
-			return
-		}
-		time.Sleep(10 * time.Millisecond)
-	}
-	cols, rows, ok, err := hub.sessionPTYSize(sessionID)
-	t.Fatalf("hub session %s pty size = ok:%v size:%dx%d err:%v, want %dx%d", sessionID, ok, cols, rows, err, wantCols, wantRows)
-}
-
-func waitForGoroutineCeiling(t *testing.T, ceiling int, timeout time.Duration) {
-	t.Helper()
-	deadline := time.Now().Add(timeout)
-	for time.Now().Before(deadline) {
-		runtime.GC()
-		if got := runtime.NumGoroutine(); got <= ceiling {
-			return
-		}
-		time.Sleep(10 * time.Millisecond)
-	}
-	t.Fatalf("goroutine count = %d, want <= %d", runtime.NumGoroutine(), ceiling)
-}
-
-func (h *wsPTYHub) sessionDebugSnapshot(sessionID string) (attachments int, effectiveCols int, effectiveRows int, ok bool) {
-	h.mu.Lock()
-	defer h.mu.Unlock()
-	session := h.sessions[persistentPTYSessionKey(sessionID)]
-	if session == nil {
-		return 0, 0, 0, false
-	}
-	return len(session.attachments), session.effectiveCols, session.effectiveRows, true
-}
-
-func (h *wsPTYHub) debugAttachment(sessionID string, attachmentID string) *wsPTYAttachment {
-	h.mu.Lock()
-	defer h.mu.Unlock()
-	session := h.sessions[persistentPTYSessionKey(sessionID)]
-	if session == nil {
-		return nil
-	}
-	return session.attachments[attachmentID]
-}
-
-func (h *wsPTYHub) sessionPTYSize(sessionID string) (cols int, rows int, ok bool, err error) {
-	h.mu.Lock()
-	session := h.sessions[persistentPTYSessionKey(sessionID)]
-	if session == nil {
-		h.mu.Unlock()
-		return 0, 0, false, nil
-	}
-	h.mu.Unlock()
-
-	session.ptyWriteMu.Lock()
-	defer session.ptyWriteMu.Unlock()
-	var size *pty.Winsize
-	available := session.withPTYFileLocked(func(sizeFile *os.File) {
-		size, err = pty.GetsizeFull(sizeFile)
-	})
-	if !available {
-		return 0, 0, true, os.ErrClosed
-	}
-	if err != nil {
-		return 0, 0, true, err
-	}
-	return int(size.Cols), int(size.Rows), true, nil
-}
diff --git a/daemon/remote/cmd/cmuxd-remote/ws_rpc_test.go b/daemon/remote/cmd/cmuxd-remote/ws_rpc_test.go
deleted file mode 100644
index 3dab0b608903..000000000000
--- a/daemon/remote/cmd/cmuxd-remote/ws_rpc_test.go
+++ /dev/null
@@ -1,375 +0,0 @@
-package main
-
-import (
-	"context"
-	"encoding/base64"
-	"encoding/json"
-	"net"
-	"net/http/httptest"
-	"strconv"
-	"strings"
-	"testing"
-	"time"
-
-	"nhooyr.io/websocket"
-)
-
-func TestWebSocketRPCRejectsMissingAndWrongLease(t *testing.T) {
-	leasePath := t.TempDir() + "/rpc-lease.json"
-	server := httptest.NewServer(newWebSocketPTYHandler(wsPTYServerConfig{
-		PTYAuthLeaseFile: t.TempDir() + "/pty-lease.json",
-		RPCAuthLeaseFile: leasePath,
-		Shell:            "/bin/sh",
-	}, nil))
-	defer server.Close()
-
-	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
-	defer cancel()
-
-	conn := dialRPC(t, ctx, server.URL)
-	sendRPCAuth(t, ctx, conn, "missing", "sess-missing")
-	_, _, err := conn.Read(ctx)
-	if websocket.CloseStatus(err) != websocket.StatusPolicyViolation {
-		t.Fatalf("missing lease should close with policy violation, got err=%v status=%v", err, websocket.CloseStatus(err))
-	}
-
-	writeTestLease(t, leasePath, "correct-token", "sess-good", false, time.Now().Add(time.Minute))
-	conn = dialRPC(t, ctx, server.URL)
-	sendRPCAuth(t, ctx, conn, "wrong-token", "sess-good")
-	_, _, err = conn.Read(ctx)
-	if websocket.CloseStatus(err) != websocket.StatusPolicyViolation {
-		t.Fatalf("wrong token should close with policy violation, got err=%v status=%v", err, websocket.CloseStatus(err))
-	}
-}
-
-func TestWebSocketRPCHelloAndProxyRoundTrip(t *testing.T) {
-	leasePath := t.TempDir() + "/rpc-lease.json"
-	server := httptest.NewServer(newWebSocketPTYHandler(wsPTYServerConfig{
-		PTYAuthLeaseFile: t.TempDir() + "/pty-lease.json",
-		RPCAuthLeaseFile: leasePath,
-		Shell:            "/bin/sh",
-	}, nil))
-	defer server.Close()
-
-	upstream := newTestTCPServer(t, "HTTP/1.1 200 OK\r\nContent-Length: 2\r\nConnection: close\r\n\r\nOK")
-	defer upstream.close()
-
-	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
-	defer cancel()
-
-	writeTestLease(t, leasePath, "rpc-token", "sess-rpc", false, time.Now().Add(time.Minute))
-	conn := dialRPC(t, ctx, server.URL)
-	defer conn.Close(websocket.StatusNormalClosure, "done")
-	sendRPCAuth(t, ctx, conn, "rpc-token", "sess-rpc")
-	ready := readWSRPCFrame(t, ctx, conn)
-	if ready["type"] != "ready" {
-		t.Fatalf("expected ready frame, got %v", ready)
-	}
-
-	hello := rpcCall(t, ctx, conn, rpcRequest{
-		ID:     1,
-		Method: "hello",
-		Params: map[string]any{},
-	})
-	if hello["ok"] != true {
-		t.Fatalf("hello failed: %v", hello)
-	}
-
-	open := rpcCall(t, ctx, conn, rpcRequest{
-		ID:     2,
-		Method: "proxy.open",
-		Params: map[string]any{"host": "127.0.0.1", "port": upstream.port},
-	})
-	result, _ := open["result"].(map[string]any)
-	streamID, _ := result["stream_id"].(string)
-	if strings.TrimSpace(streamID) == "" {
-		t.Fatalf("proxy.open missing stream_id: %v", open)
-	}
-
-	subscribe := rpcCall(t, ctx, conn, rpcRequest{
-		ID:     3,
-		Method: "proxy.stream.subscribe",
-		Params: map[string]any{"stream_id": streamID},
-	})
-	if subscribe["ok"] != true {
-		t.Fatalf("proxy.stream.subscribe failed: %v", subscribe)
-	}
-
-	request := "GET / HTTP/1.1\r\nHost: localhost\r\nConnection: close\r\n\r\n"
-	var pendingEvents []map[string]any
-	write := rpcCallCollectingEvents(t, ctx, conn, rpcRequest{
-		ID:     4,
-		Method: "proxy.write",
-		Params: map[string]any{
-			"stream_id":   streamID,
-			"data_base64": base64.StdEncoding.EncodeToString([]byte(request)),
-		},
-	}, &pendingEvents)
-	if write["ok"] != true {
-		t.Fatalf("proxy.write failed: %v", write)
-	}
-
-	var output strings.Builder
-	deadline := time.Now().Add(5 * time.Second)
-	for time.Now().Before(deadline) {
-		var frame map[string]any
-		if len(pendingEvents) > 0 {
-			frame = pendingEvents[0]
-			pendingEvents = pendingEvents[1:]
-		} else {
-			frame = readWSRPCFrame(t, ctx, conn)
-		}
-		eventName, _ := frame["event"].(string)
-		switch eventName {
-		case "proxy.stream.data", "proxy.stream.eof":
-			dataBase64, _ := frame["data_base64"].(string)
-			chunk, err := base64.StdEncoding.DecodeString(dataBase64)
-			if err != nil {
-				t.Fatalf("decode data_base64: %v frame=%v", err, frame)
-			}
-			output.Write(chunk)
-			if eventName == "proxy.stream.eof" {
-				if !strings.Contains(output.String(), "200 OK") || !strings.Contains(output.String(), "\r\n\r\nOK") {
-					t.Fatalf("unexpected proxy output: %q", output.String())
-				}
-				return
-			}
-		case "":
-			t.Fatalf("unexpected response while waiting for stream events: %v", frame)
-		}
-	}
-	t.Fatalf("timed out waiting for proxy stream events, output=%q", output.String())
-}
-
-func TestWebSocketRPCPTYWriteNotificationDoesNotEmitResponse(t *testing.T) {
-	leasePath := t.TempDir() + "/rpc-lease.json"
-	server := httptest.NewServer(newWebSocketPTYHandler(wsPTYServerConfig{
-		PTYAuthLeaseFile: t.TempDir() + "/pty-lease.json",
-		RPCAuthLeaseFile: leasePath,
-		Shell:            "/bin/sh",
-	}, nil))
-	defer server.Close()
-
-	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
-	defer cancel()
-
-	writeTestLease(t, leasePath, "rpc-token", "sess-rpc-notify", false, time.Now().Add(time.Minute))
-	conn := dialRPC(t, ctx, server.URL)
-	defer conn.Close(websocket.StatusNormalClosure, "done")
-	sendRPCAuth(t, ctx, conn, "rpc-token", "sess-rpc-notify")
-	ready := readWSRPCFrame(t, ctx, conn)
-	if ready["type"] != "ready" {
-		t.Fatalf("expected ready frame, got %v", ready)
-	}
-
-	payload, err := json.Marshal(map[string]any{
-		"method": "pty.write",
-		"params": map[string]any{
-			"session_id":              "missing",
-			"attachment_id":           "missing",
-			"client_attachment_token": "token",
-			"data_base64":             base64.StdEncoding.EncodeToString([]byte("a")),
-		},
-	})
-	if err != nil {
-		t.Fatalf("marshal notification: %v", err)
-	}
-	if err := conn.Write(ctx, websocket.MessageText, payload); err != nil {
-		t.Fatalf("write notification: %v", err)
-	}
-	event := readWSRPCFrame(t, ctx, conn)
-	if _, hasID := event["id"]; hasID {
-		t.Fatalf("pty.write notification should not emit an RPC response id: %v", event)
-	}
-	if got := event["event"]; got != "pty.error" {
-		t.Fatalf("first frame = %v, want pty.error event; payload=%v", got, event)
-	}
-
-	ping := rpcCall(t, ctx, conn, rpcRequest{
-		ID:     2,
-		Method: "ping",
-		Params: map[string]any{},
-	})
-	if ping["ok"] != true {
-		t.Fatalf("ping failed after pty.write notification: %v", ping)
-	}
-}
-
-func TestWebSocketRPCPTYResizeNotificationDoesNotEmitResponse(t *testing.T) {
-	leasePath := t.TempDir() + "/rpc-lease.json"
-	server := httptest.NewServer(newWebSocketPTYHandler(wsPTYServerConfig{
-		PTYAuthLeaseFile: t.TempDir() + "/pty-lease.json",
-		RPCAuthLeaseFile: leasePath,
-		Shell:            "/bin/sh",
-	}, nil))
-	defer server.Close()
-
-	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
-	defer cancel()
-
-	writeTestLease(t, leasePath, "rpc-token", "sess-rpc-notify", false, time.Now().Add(time.Minute))
-	conn := dialRPC(t, ctx, server.URL)
-	defer conn.Close(websocket.StatusNormalClosure, "done")
-	sendRPCAuth(t, ctx, conn, "rpc-token", "sess-rpc-notify")
-	ready := readWSRPCFrame(t, ctx, conn)
-	if ready["type"] != "ready" {
-		t.Fatalf("expected ready frame, got %v", ready)
-	}
-
-	payload, err := json.Marshal(map[string]any{
-		"method": "pty.resize",
-		"params": map[string]any{
-			"session_id":              "missing",
-			"attachment_id":           "missing",
-			"client_attachment_token": "token",
-			"cols":                    100,
-			"rows":                    30,
-		},
-	})
-	if err != nil {
-		t.Fatalf("marshal notification: %v", err)
-	}
-	if err := conn.Write(ctx, websocket.MessageText, payload); err != nil {
-		t.Fatalf("write notification: %v", err)
-	}
-	event := readWSRPCFrame(t, ctx, conn)
-	if _, hasID := event["id"]; hasID {
-		t.Fatalf("pty.resize notification should not emit an RPC response id: %v", event)
-	}
-	if got := event["event"]; got != "pty.error" {
-		t.Fatalf("first frame = %v, want pty.error event; payload=%v", got, event)
-	}
-
-	ping := rpcCall(t, ctx, conn, rpcRequest{
-		ID:     2,
-		Method: "ping",
-		Params: map[string]any{},
-	})
-	if ping["ok"] != true {
-		t.Fatalf("ping failed after pty.resize notification: %v", ping)
-	}
-}
-
-func dialRPC(t *testing.T, ctx context.Context, serverURL string) *websocket.Conn {
-	t.Helper()
-	wsURL := "ws" + strings.TrimPrefix(serverURL, "http") + "/rpc"
-	conn, _, err := websocket.Dial(ctx, wsURL, nil)
-	if err != nil {
-		t.Fatalf("dial %s: %v", wsURL, err)
-	}
-	return conn
-}
-
-func sendRPCAuth(t *testing.T, ctx context.Context, conn *websocket.Conn, token, sessionID string) {
-	t.Helper()
-	payload, err := json.Marshal(wsAuthFrame{
-		Type:      "auth",
-		Token:     token,
-		SessionID: sessionID,
-	})
-	if err != nil {
-		t.Fatalf("marshal auth: %v", err)
-	}
-	if err := conn.Write(ctx, websocket.MessageText, payload); err != nil {
-		t.Fatalf("write auth: %v", err)
-	}
-}
-
-func rpcCall(t *testing.T, ctx context.Context, conn *websocket.Conn, req rpcRequest) map[string]any {
-	t.Helper()
-	return rpcCallCollectingEvents(t, ctx, conn, req, nil)
-}
-
-func rpcCallCollectingEvents(
-	t *testing.T,
-	ctx context.Context,
-	conn *websocket.Conn,
-	req rpcRequest,
-	events *[]map[string]any,
-) map[string]any {
-	t.Helper()
-	payload, err := json.Marshal(req)
-	if err != nil {
-		t.Fatalf("marshal request: %v", err)
-	}
-	if err := conn.Write(ctx, websocket.MessageText, payload); err != nil {
-		t.Fatalf("write request: %v", err)
-	}
-	expectedID, _ := req.ID.(int)
-	for {
-		frame := readWSRPCFrame(t, ctx, conn)
-		if eventName, _ := frame["event"].(string); eventName != "" {
-			if events != nil {
-				*events = append(*events, frame)
-				continue
-			}
-			t.Fatalf("unexpected event while waiting for response id %v: %v", expectedID, frame)
-		}
-		id, _ := frame["id"].(float64)
-		if int(id) != expectedID {
-			t.Fatalf("response id = %v, want %v frame=%v", frame["id"], expectedID, frame)
-		}
-		return frame
-	}
-}
-
-func readWSRPCFrame(t *testing.T, ctx context.Context, conn *websocket.Conn) map[string]any {
-	t.Helper()
-	msgType, payload, err := conn.Read(ctx)
-	if err != nil {
-		t.Fatalf("read rpc frame: %v", err)
-	}
-	if msgType != websocket.MessageText {
-		t.Fatalf("expected text frame, got %v payload=%q", msgType, string(payload))
-	}
-	var frame map[string]any
-	if err := json.Unmarshal(payload, &frame); err != nil {
-		t.Fatalf("decode rpc frame: %v payload=%q", err, string(payload))
-	}
-	return frame
-}
-
-type testTCPServer struct {
-	listener net.Listener
-	port     int
-	done     chan struct{}
-}
-
-func newTestTCPServer(t *testing.T, response string) *testTCPServer {
-	t.Helper()
-	listener, err := net.Listen("tcp", "127.0.0.1:0")
-	if err != nil {
-		t.Fatalf("listen: %v", err)
-	}
-	addr := listener.Addr().String()
-	_, portRaw, err := net.SplitHostPort(addr)
-	if err != nil {
-		t.Fatalf("split host/port: %v", err)
-	}
-	port, err := strconv.Atoi(portRaw)
-	if err != nil {
-		t.Fatalf("parse port: %v", err)
-	}
-	server := &testTCPServer{
-		listener: listener,
-		port:     port,
-		done:     make(chan struct{}),
-	}
-	go func() {
-		defer close(server.done)
-		conn, err := listener.Accept()
-		if err != nil {
-			return
-		}
-		defer conn.Close()
-		buffer := make([]byte, 4096)
-		_, _ = conn.Read(buffer)
-		_, _ = conn.Write([]byte(response))
-	}()
-	return server
-}
-
-func (s *testTCPServer) close() {
-	_ = s.listener.Close()
-	<-s.done
-}
diff --git a/daemon/remote/go.mod b/daemon/remote/go.mod
deleted file mode 100644
index be79dc35953a..000000000000
--- a/daemon/remote/go.mod
+++ /dev/null
@@ -1,9 +0,0 @@
-module github.com/manaflow-ai/cmux/daemon/remote
-
-go 1.22
-
-require (
-	github.com/creack/pty v1.1.24
-	golang.org/x/sys v0.30.0
-	nhooyr.io/websocket v1.8.17
-)
diff --git a/daemon/remote/go.sum b/daemon/remote/go.sum
deleted file mode 100644
index 1e3f862a5888..000000000000
--- a/daemon/remote/go.sum
+++ /dev/null
@@ -1,6 +0,0 @@
-github.com/creack/pty v1.1.24 h1:bJrF4RRfyJnbTJqzRLHzcGaZK1NeM5kTC9jGgovnR1s=
-github.com/creack/pty v1.1.24/go.mod h1:08sCNb52WyoAwi2QDyzUCTgcvVFhUzewun7wtTfvcwE=
-golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
-golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-nhooyr.io/websocket v1.8.17 h1:KEVeLJkUywCKVsnLIDlD/5gtayKp8VoCkksHCGGfT9Y=
-nhooyr.io/websocket v1.8.17/go.mod h1:rN9OFWIUwuxg4fR5tELlYC04bXYowCP9GX47ivo2l+c=
diff --git a/daemon/remote/scripts/stress-ws-pty.sh b/daemon/remote/scripts/stress-ws-pty.sh
deleted file mode 100755
index b455b4cd0c22..000000000000
--- a/daemon/remote/scripts/stress-ws-pty.sh
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
-REMOTE_DIR="$(cd -- "$SCRIPT_DIR/.." && pwd)"
-
-duration="${CMUX_PTY_STRESS_DURATION:-12h}"
-fuzztime="${CMUX_PTY_FUZZTIME:-5m}"
-log_every="${CMUX_PTY_STRESS_LOG_EVERY:-60}"
-test_timeout="${CMUX_PTY_TEST_TIMEOUT:-2m}"
-package="./cmd/cmuxd-remote"
-stress_filter='TestWebSocketPTY(StressSessionCleanupAndBoundedScrollback|ReconnectKeepsSessionProcess|MultiAttachUsesSmallestResize|RunsShellOverBinaryFrames)'
-stress_tmp="$(mktemp -d)"
-trap 'rm -rf "$stress_tmp"' EXIT
-stress_bin="$stress_tmp/cmuxd-remote.test"
-
-cd "$REMOTE_DIR"
-export GOTOOLCHAIN="${GOTOOLCHAIN:-go1.24.7+auto}"
-
-if [[ ! "$log_every" =~ ^[1-9][0-9]*$ ]]; then
-  echo "invalid CMUX_PTY_STRESS_LOG_EVERY: $log_every" >&2
-  exit 2
-fi
-
-echo "== unit and integration =="
-go test "$package" -run 'Test(WebSocketPTY|ServeWS)' -count=1
-
-echo "== fuzz lease parser =="
-go test "$package" -run '^$' -fuzz FuzzConsumeWebSocketLease -fuzztime "$fuzztime"
-
-echo "== fuzz pty size normalizer =="
-go test "$package" -run '^$' -fuzz FuzzNormalizePTYSize -fuzztime "$fuzztime"
-
-echo "== build stress binary =="
-go test -c "$package" -o "$stress_bin"
-
-deadline_epoch="$(python3 - "$duration" <<'PY'
-import re
-import sys
-import time
-
-raw = sys.argv[1].strip()
-match = re.fullmatch(r"(\d+)([smhd]?)", raw)
-if not match:
-    raise SystemExit(f"invalid duration: {raw}")
-value = int(match.group(1))
-unit = match.group(2) or "s"
-scale = {"s": 1, "m": 60, "h": 3600, "d": 86400}[unit]
-print(int(time.time()) + value * scale)
-PY
-)"
-
-iteration=0
-max_rss_kb=0
-echo "== stress loop duration=$duration =="
-while [[ "$(date +%s)" -lt "$deadline_epoch" ]]; do
-  iteration=$((iteration + 1))
-  output_file="$(mktemp)"
-  if [[ "$(uname -s)" == "Darwin" ]]; then
-    set +e
-    /usr/bin/time -l "$stress_bin" -test.timeout "$test_timeout" -test.run "$stress_filter" -test.count=1 >"$output_file" 2>&1
-    status=$?
-    set -e
-    rss_kb="$(awk '/maximum resident set size/ {print int($1 / 1024)}' "$output_file" | tail -n 1)"
-  else
-    set +e
-    "$stress_bin" -test.timeout "$test_timeout" -test.run "$stress_filter" -test.count=1 >"$output_file" 2>&1
-    status=$?
-    set -e
-    rss_kb=""
-  fi
-  if [[ -n "$rss_kb" && "$rss_kb" -gt "$max_rss_kb" ]]; then
-    max_rss_kb="$rss_kb"
-  fi
-  if [[ "$status" -eq 0 ]]; then
-    if [[ "$iteration" -eq 1 || $((iteration % log_every)) -eq 0 ]]; then
-      if [[ -n "$rss_kb" ]]; then
-        echo "stress iteration $iteration ok rss=${rss_kb}KB max_rss=${max_rss_kb}KB"
-      else
-        echo "stress iteration $iteration ok"
-      fi
-    fi
-  else
-    echo "stress iteration $iteration failed"
-    cat "$output_file"
-    rm -f "$output_file"
-    exit 1
-  fi
-  rm -f "$output_file"
-done
-
-if [[ "$max_rss_kb" -gt 0 ]]; then
-  echo "stress complete iterations=$iteration max_rss=${max_rss_kb}KB"
-else
-  echo "stress complete iterations=$iteration"
-fi
diff --git a/docs/cli-contract.md b/docs/cli-contract.md
index c49c27854bff..04fa219af7f3 100644
--- a/docs/cli-contract.md
+++ b/docs/cli-contract.md
@@ -224,11 +224,11 @@ VM subcommands:
 | `vm terminal send <machine> <terminal-id> [text] [--keys <k1,k2,…>] [--json]` (alias `write`) | `vm.terminal_write {id, terminal_id, text?, keys?}`: types `text` into the machine terminal exactly as given (no newline), then presses the named keys (`enter`, `tab`, `escape`, `up`, …; chords join with `+`: `ctrl+c`) — cmux-tui `terminal <id> write --text` / `keys`. Headless: no pane is attached or focused. |
 | `vm terminal read <machine> <terminal-id> [--json]` (alias `screen`) | `vm.terminal_read {id, terminal_id}`: the terminal's visible screen (`text`; `--json` adds `rows`, `cols`, `cursor_row`, `cursor_col`, `cursor_visible`) — cmux-tui `terminal <id> screen read`. |
 | `vm terminal wait <machine> <terminal-id> --pattern <regex> [--timeout <seconds>] [--json]` | `vm.terminal_wait {id, terminal_id, pattern, timeout_ms?}`: blocks until the screen text matches (default 30 s) — cmux-tui `terminal <id> screen wait`. Prints `OK matched …`; exits 1 with the screen tail on timeout. |
-| `vm new`, `vm create` | Create a VM with a desktop (screen + noVNC) by default; `--base` makes a shell-only machine. The CLI sends the machine **kind** (`desktop`/`base`) and the backend maps it to the image its deployment supports; `--image <id>` is the explicit override and is the only way an image id leaves the client. Supports `--size <2g|4g|8g|16g|24g|32g>`, `--name <label>` (display label, applied via `vm.rename` after create), `--provider`, `--workspace`, `--detach`, and `-d`. Without `--detach`, opens a plain terminal on the machine through the shared open path (see `vm shell`). The Machines panel's ＋ opens the New Machine sheet (name, kind, size, plan meter) whose Create runs this same command. |
+| `vm new`, `vm create` | Create a shell-only VM. No provider ships a desktop image right now, so `--base` is the default and `--desktop` fails closed with an image config error until one lands; `--base`/`--no-desktop` stay accepted. The CLI sends the machine **kind** (`desktop`/`base`) and the backend maps it to the image its deployment supports; `--image <id>` is the explicit override and is the only way an image id leaves the client. Supports `--size <2g|4g|8g|16g|24g|32g>`, `--name <label>` (display label, applied via `vm.rename` after create), `--provider`, `--workspace`, `--detach`, and `-d`. Without `--detach`, opens a plain terminal on the machine through the shared open path (see `vm shell`). The Machines panel's ＋ opens the New Machine sheet (name, kind, size, plan meter) whose Create runs this same command. |
 | `vm base open`, `vm base reset` | Open (creating on first use) or reset the persistent Base machine. `--base` / `--desktop` choose the kind for the create; an existing Base keeps its image. The app's Cloud VM button shows the Set Up Base sheet only when no Base exists yet. |
 | `vm shell`, `vm attach` | Open an interactive shell for an existing VM. Every cloud open (`vm shell` / `vm new` / `vm fork` / `vm restore` / `vm base open` / `vm base reset`, the Machines panel, the sidebar cloud button) uses one path and lands a PLAIN terminal on the machine (like an ssh session, not the cmux-tui client): `vm.cmux_remote_info` (availability and protocol check; the local client's `client_capabilities` when one is installed), then `workspace.create` or, for `--workspace`, `workspace.cloud_vm_terminal_ready` (a placeholder pane), then `workspace.cloud_vm_bind`, then `surface.new_terminal {machine, open: true, workspace_id, focus: true, name: "shell"}` — the machine's provider creates a `bash -l` terminal in its cmux-tui session (a catalog resource `<machine>/terminal/<term_…>`) and the catalog projects it into the workspace as a pane running `attach --terminal`; the placeholder is closed with `surface.close`. The `OK` line carries `terminal=<term_…>` and a `Reattach: cmux vm open <m>/<ws>/<term>` hint; `--json` adds `terminal_id`, `remote_workspace_id`, `surface_id`. `cmux vm tui <id>` is the only open that runs the full client. The websocket/SSH transports remain only for deployments whose control plane reports no cmux-tui daemon; a machine that answers `vm_attach_transport_unsupported` is cmux-tui only and never falls back. |
 | `vm stats <id>`, `vm top <id>` | Print CPU, memory, and disk for the machine right now; a sleeping machine reports `asleep` and is not woken. |
-| `vm desktop <id>`, `vm vnc <id>` | Open the VM's noVNC desktop as a browser pane in the machine's open workspace, else the workspace you are in (or `--workspace <id|ref|index>`); desktop-image machines only. One path with `vm open <id>:desktop`, the split beside `vm shell`, and the sidebar tree: `vm.desktop_open {id, workspace_id?, focus}` (focus defaults to false so the pane never steals typing from the shell). |
+| `vm desktop <id>`, `vm vnc <id>` | Open the VM's noVNC desktop as a browser pane in the machine's open workspace, else the workspace you are in (or `--workspace <id|ref|index>`); desktop-image machines only, of which there are none today (the verb and its wrapper are kept for Freestyle desktop support). One path with `vm open <id>:desktop`, the split beside `vm shell`, and the sidebar tree: `vm.desktop_open {id, workspace_id?, focus}` (focus defaults to false so the pane never steals typing from the shell). |
 | `vm rename <id> <label>`, `vm rename <id> --clear` | Set or clear a display label; the machine id stays its address. |
 | `vm rm`, `vm destroy`, `vm delete` | Destroy a VM. |
 | `vm ssh` | Open a cmux-managed SSH workspace for an existing VM. |
diff --git a/docs/cloud-cmux-tui-daemon.md b/docs/cloud-cmux-tui-daemon.md
index 534d339555fa..5e7bd66a0a2f 100644
--- a/docs/cloud-cmux-tui-daemon.md
+++ b/docs/cloud-cmux-tui-daemon.md
@@ -1,8 +1,8 @@
 # Cloud VMs on the cmux-tui remote daemon
 
 Design for replacing the Go `cmuxd-remote` daemon in Cloud VMs with the
-cmux-tui remote daemon, validated by a working transport spike
-(`scripts/spike-cmux-tui-blaxel.sh`). North star: every cloud terminal is a
+cmux-tui remote daemon, validated by a working transport spike. North star:
+every cloud terminal is a
 cmux-tui terminal, the macOS app renders it through the Ghostty manual-IO
 surface, and any cmux-tui terminal (cloud, ssh, local) can be attached by
 dragging it out of the right pane.
@@ -38,8 +38,11 @@ The cmux-tui stack already solves each of these on `main`:
 
 ## What the spike proved (2026-08-26)
 
-All steps are automated in `scripts/spike-cmux-tui-blaxel.sh` and were run
-against a live Blaxel sandbox:
+Historical record. The spike ran against a live Blaxel sandbox; Blaxel has
+since been removed as a provider (its driver, images, and build scripts are
+gone) and Freestyle on the public platform is the default. The transport
+conclusions below still describe how every cmux Cloud machine works, but the
+Blaxel-specific mechanics are history, not current code:
 
 1. A static musl `cmux-tui` (55 MB stripped, built on a Blacksmith testbox in
    1m47s warm) runs unmodified in a `blaxel/base-image` microVM.
@@ -68,7 +71,7 @@ against a live Blaxel sandbox:
 An Aug-20 client binary interoperated with a daemon built from `main` tip,
 consistent with the protocol-version gate doing its job (both protocol 5).
 
-## Local repro without Blaxel credentials
+## Local repro without provider credentials
 
 `scripts/spike-cmux-tui-local.sh` runs the same protocol loop with a local
 `server start --remote-ws 127.0.0.1:<port>` process standing in for the VM:
@@ -90,35 +93,33 @@ never on a connection-scoped lease.
 
 One artifact replaces `cmuxd-remote-linux-amd64` everywhere:
 `cmux-tui-x86_64-unknown-linux-musl` from the existing package lane, pinned by
-sha256 exactly as `CMUX_VM_BLAXEL_DAEMON_URL`/`_SHA256` pin the Go binary
-today. The per-provider delivery mechanisms stay what they are:
+sha256, from the artifacts manifest. The per-provider delivery mechanisms stay
+what they are:
 
 | provider | today | change |
 | --- | --- | --- |
-| blaxel | gzip+base64 runtime injection at create | same path, chunked upload or URL fetch (binary is ~4x larger); start `server start --remote-ws` instead of `serve --ws` |
 | e2b | baked into template by `web/scripts/build-cloud-vm-images.ts` | swap the copied binary and start command |
 | daytona | baked into snapshot, entrypoint restarts it | same swap; the driver's repair exec restarts `server start` |
 | freestyle | systemd unit in the VM snapshot | same swap in the unit file |
 
 The daemon's remote state dir must live on the persistent volume (the machine's
-home: `/home/cmux` on blaxel — the daemon and every terminal pane run as the
-non-root `cmux` user with passwordless sudo; sandboxes created before that
-change keep their volume at `/root` and stay root until resurrected, and a
-machine where the user is unusable — missing user or runuser, or a failed
-bindfs identity view — degrades to a root daemon rather than failing — hence
-the HOME-derived default `~/.local/state/cmux/remote` already qualifies)
+home; every current provider runs the daemon as root with `HOME=/root`, so the
+HOME-derived default `~/.local/state/cmux/remote` already qualifies. The
+non-root layout described below (`CMUX_CLOUD_LAYOUT`) is retained as a seam
+but no driver selects it today.)
 so daemon identity and enrolled devices survive sandbox resurrection. Session
 state (`--state`) lives there too, so workspace layout restores from the
 journal checkpoint after a daemon restart; running processes do not survive a
 restart, and clients see the generation change instead of a silent new shell.
 
-On a Blaxel layout machine, the daemon watches the bindfs home view for mount
-events. If the view disappears, the supervisor stops the user daemon and exits
-with a restartable failure code. Blaxel starts the command again, which reruns
+On a layout machine, the daemon watches the bindfs home view for mount events.
+If the view disappears, the supervisor stops the user daemon and exits with a
+restartable failure code. The provider starts the command again, which reruns
 the idempotent user setup and repairs the view before selecting the non-root
 daemon. If repair fails, it detects the still-mounted `/cmux/home` backing path
 and runs the daemon there as root. Active terminals therefore do not continue
-writing into the disposable rootfs directory.
+writing into the disposable rootfs directory. No provider selects this layout
+today; it is kept for a future non-root cloud home.
 
 ## Lease/auth integration with the attach-endpoint flow
 
@@ -197,8 +198,8 @@ grid, matching current cmuxd-remote semantics.
 
 ## Rollout
 
-Phase 1: ship the cmux-tui daemon alongside cmuxd-remote (second port,
-blaxel first since it needs no image rebake), attach-endpoint returns both
+Phase 1: ship the cmux-tui daemon alongside cmuxd-remote (second port),
+attach-endpoint returns both
 transports, macOS opts in behind a feature flag. Phase 2: default new
 attaches to `cmux-remote`, keep `websocket` as fallback for one release.
 Phase 3: delete the Go daemon path per provider, then the `daemon/remote`
diff --git a/scripts/build_remote_daemon_release_assets.sh b/scripts/build_remote_daemon_release_assets.sh
deleted file mode 100755
index e2df5e86a4c4..000000000000
--- a/scripts/build_remote_daemon_release_assets.sh
+++ /dev/null
@@ -1,166 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-usage() {
-  cat <<'EOF'
-Usage: scripts/build_remote_daemon_release_assets.sh \
-  --version <app-version> \
-  --release-tag <tag> \
-  --repo <owner/repo> \
-  --output-dir <dir> \
-  [--asset-suffix <suffix>]
-
-Builds cmuxd-remote release assets for the supported remote platforms and emits:
-  cmuxd-remote-<goos>-<goarch>[-<suffix>]
-  cmuxd-remote-checksums[-<suffix>].txt
-  cmuxd-remote-manifest[-<suffix>].json
-
-When --asset-suffix is provided, all output filenames and manifest download URLs
-include the suffix, making each build's assets immutable (used by nightly builds
-to avoid checksum mismatches when assets are overwritten by later builds).
-EOF
-}
-
-VERSION=""
-RELEASE_TAG=""
-REPO=""
-OUTPUT_DIR=""
-ASSET_SUFFIX=""
-
-while [[ $# -gt 0 ]]; do
-  case "$1" in
-    --version)
-      VERSION="${2:-}"
-      shift 2
-      ;;
-    --release-tag)
-      RELEASE_TAG="${2:-}"
-      shift 2
-      ;;
-    --repo)
-      REPO="${2:-}"
-      shift 2
-      ;;
-    --output-dir)
-      OUTPUT_DIR="${2:-}"
-      shift 2
-      ;;
-    --asset-suffix)
-      ASSET_SUFFIX="${2:-}"
-      shift 2
-      ;;
-    -h|--help)
-      usage
-      exit 0
-      ;;
-    *)
-      echo "error: unknown option $1" >&2
-      usage
-      exit 1
-      ;;
-  esac
-done
-
-if [[ -z "$VERSION" || -z "$RELEASE_TAG" || -z "$REPO" || -z "$OUTPUT_DIR" ]]; then
-  echo "error: --version, --release-tag, --repo, and --output-dir are required" >&2
-  usage
-  exit 1
-fi
-
-if ! command -v go >/dev/null 2>&1; then
-  echo "error: go is required to build cmuxd-remote release assets" >&2
-  exit 1
-fi
-
-SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
-REPO_ROOT="$(cd "${SCRIPT_DIR}/.." && pwd)"
-DAEMON_ROOT="${REPO_ROOT}/daemon/remote"
-mkdir -p "$OUTPUT_DIR"
-OUTPUT_DIR="$(cd "$OUTPUT_DIR" && pwd)"
-rm -f "$OUTPUT_DIR"/cmuxd-remote-* "$OUTPUT_DIR"/cmuxd-remote-checksums.txt "$OUTPUT_DIR"/cmuxd-remote-manifest.json
-
-DAEMON_GO_LDFLAGS="-s -w -X main.version=${VERSION}"
-DAEMON_GO_BUILD_ARGS=(
-  build
-  -trimpath
-  -buildvcs=false
-  -ldflags "$DAEMON_GO_LDFLAGS"
-)
-
-SUFFIX_TAG=""
-if [[ -n "$ASSET_SUFFIX" ]]; then
-  SUFFIX_TAG="-${ASSET_SUFFIX}"
-fi
-
-CHECKSUMS_ASSET_NAME="cmuxd-remote-checksums${SUFFIX_TAG}.txt"
-CHECKSUMS_PATH="${OUTPUT_DIR}/${CHECKSUMS_ASSET_NAME}"
-MANIFEST_PATH="${OUTPUT_DIR}/cmuxd-remote-manifest${SUFFIX_TAG}.json"
-
-TARGETS=(
-  "darwin arm64"
-  "darwin amd64"
-  "linux arm64"
-  "linux amd64"
-)
-
-: > "$CHECKSUMS_PATH"
-ENTRIES_FILE="$(mktemp "${TMPDIR:-/tmp}/cmuxd-remote-entries.XXXXXX")"
-trap 'rm -f "$ENTRIES_FILE"' EXIT
-: > "$ENTRIES_FILE"
-
-BUILD_PIDS=()
-BUILD_LABELS=()
-for target in "${TARGETS[@]}"; do
-  read -r GOOS GOARCH <<<"$target"
-  ASSET_NAME="cmuxd-remote-${GOOS}-${GOARCH}${SUFFIX_TAG}"
-  OUTPUT_PATH="${OUTPUT_DIR}/${ASSET_NAME}"
-
-  # Build into a temp path first, then rename (the binary content is the same
-  # regardless of suffix, so we build once and move).
-  BUILD_PATH="${OUTPUT_DIR}/cmuxd-remote-${GOOS}-${GOARCH}.build"
-  GOOS="$GOOS" \
-  GOARCH="$GOARCH" \
-  CGO_ENABLED=0 \
-  go -C "$DAEMON_ROOT" "${DAEMON_GO_BUILD_ARGS[@]}" \
-    -o "$BUILD_PATH" \
-    ./cmd/cmuxd-remote &
-  BUILD_PIDS+=("$!")
-  BUILD_LABELS+=("${GOOS}/${GOARCH}")
-done
-
-BUILD_FAILED=0
-for index in "${!BUILD_PIDS[@]}"; do
-  if ! wait "${BUILD_PIDS[$index]}"; then
-    echo "error: cmuxd-remote build failed for ${BUILD_LABELS[$index]}" >&2
-    BUILD_FAILED=1
-  fi
-done
-if [[ "$BUILD_FAILED" -ne 0 ]]; then
-  exit 1
-fi
-
-# Assemble checksums and manifest entries in stable target order after every
-# parallel build succeeds. Parallel workers only write their own binary.
-for target in "${TARGETS[@]}"; do
-  read -r GOOS GOARCH <<<"$target"
-  ASSET_NAME="cmuxd-remote-${GOOS}-${GOARCH}${SUFFIX_TAG}"
-  OUTPUT_PATH="${OUTPUT_DIR}/${ASSET_NAME}"
-  BUILD_PATH="${OUTPUT_DIR}/cmuxd-remote-${GOOS}-${GOARCH}.build"
-  mv "$BUILD_PATH" "$OUTPUT_PATH"
-  chmod 755 "$OUTPUT_PATH"
-  SHA256="$(shasum -a 256 "$OUTPUT_PATH" | awk '{print $1}')"
-  printf '%s  %s\n' "$SHA256" "$ASSET_NAME" >> "$CHECKSUMS_PATH"
-
-  printf '%s\t%s\t%s\t%s\n' "$GOOS" "$GOARCH" "$ASSET_NAME" "$SHA256" >> "$ENTRIES_FILE"
-done
-
-python3 "$SCRIPT_DIR/generate_remote_daemon_release_manifest.py" \
-  "$VERSION" \
-  "$RELEASE_TAG" \
-  "$REPO" \
-  "$CHECKSUMS_ASSET_NAME" \
-  "$CHECKSUMS_PATH" \
-  "$MANIFEST_PATH" \
-  "$ENTRIES_FILE"
-
-echo "Built cmuxd-remote assets in ${OUTPUT_DIR}"
diff --git a/scripts/ci/detect_ci_change_areas.py b/scripts/ci/detect_ci_change_areas.py
index 410ffa6a5cd7..2054312e6f93 100644
--- a/scripts/ci/detect_ci_change_areas.py
+++ b/scripts/ci/detect_ci_change_areas.py
@@ -16,18 +16,16 @@
 class ChangeAreas:
     macos: bool
     web: bool
-    go: bool
     agent_session_web: bool
 
     @classmethod
     def all(cls) -> ChangeAreas:
-        return cls(macos=True, web=True, go=True, agent_session_web=True)
+        return cls(macos=True, web=True, agent_session_web=True)
 
     def as_output_lines(self) -> list[str]:
         return [
             f"macos={bool_output(self.macos)}",
             f"web={bool_output(self.web)}",
-            f"go={bool_output(self.go)}",
             f"agent_session_web={bool_output(self.agent_session_web)}",
         ]
 
@@ -78,14 +76,6 @@ def is_web_change(path: str) -> bool:
     }
 
 
-def is_go_change(path: str) -> bool:
-    return path.startswith("daemon/remote/") or path in {
-        "scripts/build_remote_daemon_release_assets.sh",
-        "scripts/generate_remote_daemon_release_manifest.py",
-        "tests/test_remote_daemon_release_assets.sh",
-    }
-
-
 def is_agent_session_web_change(path: str) -> bool:
     if path.startswith(
         (
@@ -108,7 +98,7 @@ def is_agent_session_web_change(path: str) -> bool:
 def is_macos_neutral(path: str) -> bool:
     # `cmux-tui/` is the standalone cmux-tui Rust project, gated by its own `cmux-tui`
     # workflow; it never affects the macOS app build or app-host tests.
-    if path.startswith(("docs/", "design/", "plans/", "ios/", "web/", "webviews/", "daemon/remote/", "cmux-tui/")):
+    if path.startswith(("docs/", "design/", "plans/", "ios/", "web/", "webviews/", "cmux-tui/")):
         return True
     return path == "README.md" or (path.startswith("README.") and path.endswith(".md"))
 
@@ -128,7 +118,6 @@ def is_macos_change(path: str) -> bool:
 def classify_files(paths: Iterable[str]) -> ChangeAreas:
     macos = False
     web = False
-    go = False
     agent_session_web = False
 
     for raw_path in paths:
@@ -138,13 +127,10 @@ def classify_files(paths: Iterable[str]) -> ChangeAreas:
         if forces_all_areas(path):
             macos = True
             web = True
-            go = True
             agent_session_web = True
             continue
         if is_web_change(path):
             web = True
-        if is_go_change(path):
-            go = True
         if is_agent_session_web_change(path):
             agent_session_web = True
         if is_macos_change(path):
@@ -153,7 +139,6 @@ def classify_files(paths: Iterable[str]) -> ChangeAreas:
     return ChangeAreas(
         macos=macos,
         web=web,
-        go=go,
         agent_session_web=agent_session_web,
     )
 
diff --git a/scripts/generate_remote_daemon_release_manifest.py b/scripts/generate_remote_daemon_release_manifest.py
deleted file mode 100644
index cb377ee0736e..000000000000
--- a/scripts/generate_remote_daemon_release_manifest.py
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/usr/bin/env python3
-"""Generate the release manifest after parallel remote-daemon builds finish."""
-
-import json
-import sys
-import urllib.parse
-from pathlib import Path
-
-
-def main() -> None:
-    (
-        version,
-        release_tag,
-        repo,
-        checksums_asset_name,
-        checksums_path,
-        manifest_path,
-        entries_file,
-    ) = sys.argv[1:]
-
-    quoted_tag = urllib.parse.quote(release_tag, safe="")
-    release_url = f"https://github.com/{repo}/releases/download/{quoted_tag}"
-    checksums_url = (
-        f"{release_url}/{urllib.parse.quote(checksums_asset_name, safe='')}"
-    )
-
-    entries = []
-    for line in Path(entries_file).read_text(encoding="utf-8").splitlines():
-        if not line.strip():
-            continue
-        go_os, go_arch, asset_name, sha256 = line.split("\t")
-        entries.append(
-            {
-                "goOS": go_os,
-                "goArch": go_arch,
-                "assetName": asset_name,
-                "downloadURL": (
-                    f"{release_url}/{urllib.parse.quote(asset_name, safe='')}"
-                ),
-                "sha256": sha256,
-            }
-        )
-
-    manifest = {
-        "schemaVersion": 1,
-        "appVersion": version,
-        "releaseTag": release_tag,
-        "releaseURL": release_url,
-        "checksumsAssetName": checksums_asset_name,
-        "checksumsURL": checksums_url,
-        "entries": entries,
-    }
-    Path(manifest_path).write_text(
-        json.dumps(manifest, indent=2, sort_keys=True) + "\n",
-        encoding="utf-8",
-    )
-
-
-if __name__ == "__main__":
-    if len(sys.argv) != 8:
-        raise SystemExit(
-            "usage: generate_remote_daemon_release_manifest.py "
-            "<version> <release-tag> <repo> <checksums-asset-name> "
-            "<checksums-path> <manifest-path> <entries-file>"
-        )
-    main()
diff --git a/scripts/prune_nightly_release_assets.py b/scripts/prune_nightly_release_assets.py
index 2d50cd9cfde9..a6a71afe298e 100644
--- a/scripts/prune_nightly_release_assets.py
+++ b/scripts/prune_nightly_release_assets.py
@@ -18,9 +18,6 @@
 IMMUTABLE_ASSET_PATTERNS = [
     re.compile(r"^cmux-nightly-macos-(?P<build>\d+)\.dmg$"),
     re.compile(r"^cmux-nightly-universal-macos-(?P<build>\d+)\.dmg$"),
-    re.compile(r"^cmuxd-remote-(?:darwin-arm64|darwin-amd64|linux-arm64|linux-amd64)-(?P<build>\d+)$"),
-    re.compile(r"^cmuxd-remote-checksums-(?P<build>\d+)\.txt$"),
-    re.compile(r"^cmuxd-remote-manifest-(?P<build>\d+)\.json$"),
 ]
 
 
diff --git a/scripts/release_asset_guard.js b/scripts/release_asset_guard.js
index 4699b324874c..98c487fbc753 100644
--- a/scripts/release_asset_guard.js
+++ b/scripts/release_asset_guard.js
@@ -3,12 +3,6 @@
 const IMMUTABLE_RELEASE_ASSETS = [
   "cmux-macos.dmg",
   "appcast.xml",
-  "cmuxd-remote-darwin-arm64",
-  "cmuxd-remote-darwin-amd64",
-  "cmuxd-remote-linux-arm64",
-  "cmuxd-remote-linux-amd64",
-  "cmuxd-remote-checksums.txt",
-  "cmuxd-remote-manifest.json",
 ];
 const RELEASE_ASSET_GUARD_STATE = Object.freeze({
   CLEAR: "clear",
diff --git a/scripts/release_asset_guard.test.js b/scripts/release_asset_guard.test.js
index 39cdcf89a970..1a9cbc39f125 100644
--- a/scripts/release_asset_guard.test.js
+++ b/scripts/release_asset_guard.test.js
@@ -36,7 +36,7 @@ test("marks guard as clear when immutable assets are not present", () => {
 });
 
 test("marks guard as partial when only some immutable assets exist", () => {
-  const partialAssets = ["appcast.xml", "cmuxd-remote-manifest.json"];
+  const partialAssets = ["appcast.xml"];
   const result = evaluateReleaseAssetGuard({
     existingAssetNames: partialAssets,
   });
diff --git a/skills/cmux-cloud-vm/SKILL.md b/skills/cmux-cloud-vm/SKILL.md
index 429b1b4cae48..1ba69d173809 100644
--- a/skills/cmux-cloud-vm/SKILL.md
+++ b/skills/cmux-cloud-vm/SKILL.md
@@ -12,7 +12,7 @@ Everything the Cloud sidebar can do, from the CLI — plus agent-only primitives
 | Term | Meaning |
 |------|---------|
 | **Machine** | A persistent cloud VM (`cmux vm ls`). Sleeps when idle (free while asleep), wakes on connect or exec. `/root` is a 16 GB persistent volume; the rest of the filesystem is disposable compute. |
-| **Contents** | Ubuntu 22.04 (xfce desktop image, the default): node 22, bun, uv, git, gh, ripgrep, fd, jq, tmux, xdotool. **Claude Code, Codex, OpenCode, and Pi are preinstalled** under `/root/.npm-global/bin`. The desktop runs TigerVNC + noVNC and the CUA driver (`cua-computer-server`) for computer-use agents. Provisioning runs in the background on first boot — `cat /tmp/cmux/provision.log` on a brand-new machine if a tool is missing. |
+| **Contents** | Ubuntu (shared devbox image): node, bun, uv, git, gh, ripgrep, fd, jq, tmux, xdotool. **Claude Code, Codex, OpenCode, and Pi are preinstalled**. Machines are shell-only today — no provider ships a desktop image, so there is no VNC screen to open. Provisioning runs in the background on first boot — `cat /tmp/cmux/provision.log` on a brand-new machine if a tool is missing. |
 | **Session** | Every machine runs the **cmux-tui remote daemon**: its own workspaces → terminals, visible in `cmux vm tree`. A terminal you start there keeps running when the Mac disconnects. |
 | **Surface** | A terminal, VNC screen or browser — on This Mac or on a machine — with a stable id `<machine>/<kind>/<key>` (`cmux surface ls --json`). Panes *project* surfaces: `cmux surface open <id>` reuses the pane already showing one, or lands it at a pane edge you choose; closing a pane never kills a machine's terminal. |
 | **Base** | The one pinned persistent machine (`cmux vm base open`) — use it for the user's ongoing work. |
diff --git a/skills/cmux-cloud-vm/references/sidebar-parity.md b/skills/cmux-cloud-vm/references/sidebar-parity.md
index de4956199d63..b081ac20d7cf 100644
--- a/skills/cmux-cloud-vm/references/sidebar-parity.md
+++ b/skills/cmux-cloud-vm/references/sidebar-parity.md
@@ -15,8 +15,8 @@ Machine row › **Open Full cmux-tui Client** | `cmux vm tui <m>` | (pane comman
 Machine row › **Refresh**, any group › Refresh | `cmux vm tree --refresh` / `cmux surface ls --refresh` | `vm.tree {refresh}` | ✅
 Machine row › **Rename…** | `cmux vm rename <m> <label>` | `vm.rename` | ✅
 Machine row › **Status** | `cmux vm status <m>` (+ `vm stats`) | `vm.status` / `vm.stats` | ✅
-Machine row › **Checkpoint** (only when `capabilities.snapshot`) | `cmux vm snapshot <m> [--name n]` | `vm.snapshot` | ✅ hidden on providers that cannot (Blaxel); `vm ls --json` → `capabilities`
-Machine row › **Fork** (only when `capabilities.fork`) | `cmux vm fork <m> [--name n]` | `vm.fork` | ✅ hidden on providers that cannot (Blaxel)
+Machine row › **Checkpoint** (only when `capabilities.snapshot`) | `cmux vm snapshot <m> [--name n]` | `vm.snapshot` | ✅ hidden on providers that cannot; `vm ls --json` → `capabilities`
+Machine row › **Fork** (only when `capabilities.fork`) | `cmux vm fork <m> [--name n]` | `vm.fork` | ✅ hidden on providers that cannot
 Machine row › **Delete…** | `cmux vm rm <m>` | `vm.destroy` | ✅
 Terminals / Workspaces group › **New Terminal** | `cmux surface new-terminal --machine <m> [-- <cmd>]` | `vm.terminal_new` | ✅
 Workspace row › **New Terminal Here** | `cmux surface new-terminal --machine <m> --remote-workspace <ws>` | `vm.terminal_new {workspace_id}` | ✅
diff --git a/tests/test_ci_attestation_retry.sh b/tests/test_ci_attestation_retry.sh
deleted file mode 100755
index 9ae42dc0d645..000000000000
--- a/tests/test_ci_attestation_retry.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/usr/bin/env bash
-# Guard release/nightly provenance attestation against transient Sigstore/Rekor
-# network failures without making attestation optional.
-set -euo pipefail
-
-ROOT_DIR="$(cd "$(dirname "$0")/.." && pwd)"
-ACTION='actions/attest-build-provenance@a2bbfa25375fe432b6a289bc6b6cd05ecd0c4c32'
-
-check_attestation_retry() {
-  local file="$1"
-  local first_step="$2"
-  local first_id="$3"
-  local retry_step="$4"
-  local subject_marker="$5"
-
-  if ! awk -v first_step="$first_step" -v first_id="$first_id" -v action="$ACTION" -v subject="$subject_marker" '
-    $0 ~ "^[[:space:]]*- name: " first_step "$" { in_step=1; next }
-    in_step && /^      - name:/ { in_step=0 }
-    in_step && $0 ~ "id: " first_id "$" { saw_id=1 }
-    in_step && /continue-on-error:[[:space:]]*true/ { saw_continue=1 }
-    in_step && index($0, "uses: " action) { saw_action=1 }
-    in_step && index($0, subject) { saw_subject=1 }
-    END { exit !(saw_id && saw_continue && saw_action && saw_subject) }
-  ' "$file"; then
-    echo "FAIL: $(basename "$file") first attestation step must have id=$first_id, continue-on-error, pinned action, and expected subject"
-    exit 1
-  fi
-
-  if ! awk -v retry_step="$retry_step" -v first_id="$first_id" -v action="$ACTION" -v subject="$subject_marker" '
-    $0 ~ "^[[:space:]]*- name: " retry_step "$" { in_step=1; next }
-    in_step && /^      - name:/ { in_step=0 }
-    in_step && index($0, "steps." first_id ".outcome == '\''failure'\''") { saw_outcome=1 }
-    in_step && index($0, "uses: " action) { saw_action=1 }
-    in_step && index($0, subject) { saw_subject=1 }
-    in_step && /continue-on-error:/ { saw_retry_continue=1 }
-    END { exit !(saw_outcome && saw_action && saw_subject && !saw_retry_continue) }
-  ' "$file"; then
-    echo "FAIL: $(basename "$file") retry attestation step must run only after first failure and remain required"
-    exit 1
-  fi
-
-  echo "PASS: $(basename "$file") retries required remote daemon asset attestation"
-}
-
-check_attestation_retry \
-  "$ROOT_DIR/.github/workflows/nightly.yml" \
-  "Attest remote daemon nightly assets" \
-  "attest-remote-daemon-nightly-assets" \
-  "Retry remote daemon nightly asset attestation" \
-  'remote-daemon-assets/cmuxd-remote-manifest-${{ env.NIGHTLY_BUILD }}.json'
-
-check_attestation_retry \
-  "$ROOT_DIR/.github/workflows/release.yml" \
-  "Attest remote daemon release assets" \
-  "attest-remote-daemon-release-assets" \
-  "Retry remote daemon release asset attestation" \
-  "remote-daemon-assets/cmuxd-remote-manifest.json"
diff --git a/tests/test_ci_change_areas.py b/tests/test_ci_change_areas.py
index 810da5f73989..c481e57b8344 100644
--- a/tests/test_ci_change_areas.py
+++ b/tests/test_ci_change_areas.py
@@ -29,30 +29,28 @@ def assert_areas(
     *,
     macos: bool,
     web: bool,
-    go: bool,
     agent_session_web: bool = False,
 ) -> None:
     actual = module.classify_files(paths)
     assert actual.macos is macos, (paths, actual)
     assert actual.web is web, (paths, actual)
-    assert actual.go is go, (paths, actual)
     assert actual.agent_session_web is agent_session_web, (paths, actual)
 
 
 def test_docs_only_skips_expensive_areas() -> None:
-    assert_areas(["docs/ci.md", "README.md"], macos=False, web=False, go=False)
+    assert_areas(["docs/ci.md", "README.md"], macos=False, web=False)
 
 
 def test_cli_contract_doc_runs_macos_contract_tests() -> None:
-    assert_areas(["docs/cli-contract.md"], macos=True, web=False, go=False)
+    assert_areas(["docs/cli-contract.md"], macos=True, web=False)
 
 
 def test_changelog_runs_web_validation() -> None:
-    assert_areas(["CHANGELOG.md"], macos=True, web=True, go=False)
+    assert_areas(["CHANGELOG.md"], macos=True, web=True)
 
 
 def test_web_only_runs_web_without_macos() -> None:
-    assert_areas(["web/app/page.tsx", "webviews/src/diff/App.tsx"], macos=False, web=True, go=False)
+    assert_areas(["web/app/page.tsx", "webviews/src/diff/App.tsx"], macos=False, web=True)
 
 
 def test_cmux_tui_only_skips_macos() -> None:
@@ -62,12 +60,11 @@ def test_cmux_tui_only_skips_macos() -> None:
         ["cmux-tui/crates/cmux-tui-core/src/browser.rs", "cmux-tui/README.md", "cmux-tui/docs/protocol.md"],
         macos=False,
         web=False,
-        go=False,
     )
 
 
 def test_website_only_does_not_run_agent_session_resource_check() -> None:
-    assert_areas(["web/app/page.tsx"], macos=False, web=True, go=False, agent_session_web=False)
+    assert_areas(["web/app/page.tsx"], macos=False, web=True, agent_session_web=False)
 
 
 def test_agent_session_webview_sources_run_bundled_asset_check() -> None:
@@ -75,7 +72,6 @@ def test_agent_session_webview_sources_run_bundled_asset_check() -> None:
         ["webviews/src/agent-session/shared/message.test.ts"],
         macos=True,
         web=True,
-        go=False,
         agent_session_web=True,
     )
 
@@ -85,7 +81,6 @@ def test_markdown_viewer_resources_run_webviews_asset_guard() -> None:
         ["Resources/markdown-viewer/webviews-app/index.js", "Resources/markdown-viewer/marked.min.js"],
         macos=True,
         web=True,
-        go=False,
         agent_session_web=True,
     )
 
@@ -95,7 +90,6 @@ def test_markdown_viewer_webview_app_does_not_run_agent_session_resource_check()
         ["Resources/markdown-viewer/webviews-app/index.js"],
         macos=True,
         web=True,
-        go=False,
         agent_session_web=False,
     )
 
@@ -105,7 +99,6 @@ def test_root_agent_web_dependencies_run_web_and_macos() -> None:
         ["package.json", "bun.lock"],
         macos=True,
         web=True,
-        go=False,
         agent_session_web=True,
     )
 
@@ -115,37 +108,23 @@ def test_agent_session_resources_run_web_and_macos() -> None:
         ["Resources/agent-session-react/index.js"],
         macos=True,
         web=True,
-        go=False,
         agent_session_web=True,
     )
     assert_areas(
         ["Resources/agent-session-solid/index.js"],
         macos=True,
         web=True,
-        go=False,
         agent_session_web=True,
     )
-    assert_areas(["Resources/agent-session-backup/index.js"], macos=True, web=False, go=False)
+    assert_areas(["Resources/agent-session-backup/index.js"], macos=True, web=False)
 
 
 def test_ios_only_skips_main_macos_ci() -> None:
-    assert_areas(["ios/cmux/ContentView.swift"], macos=False, web=False, go=False)
-
-
-def test_remote_daemon_runs_go_only() -> None:
-    assert_areas(["daemon/remote/main.go"], macos=False, web=False, go=True)
-
-
-def test_remote_daemon_asset_builder_runs_go_validation() -> None:
-    assert_areas(["scripts/build_remote_daemon_release_assets.sh"], macos=True, web=False, go=True)
-
-
-def test_remote_daemon_manifest_generator_runs_go_validation() -> None:
-    assert_areas(["scripts/generate_remote_daemon_release_manifest.py"], macos=True, web=False, go=True)
+    assert_areas(["ios/cmux/ContentView.swift"], macos=False, web=False)
 
 
 def test_app_source_runs_macos() -> None:
-    assert_areas(["Sources/AppDelegate.swift"], macos=True, web=False, go=False)
+    assert_areas(["Sources/AppDelegate.swift"], macos=True, web=False)
 
 
 def test_workflow_changes_run_everything() -> None:
@@ -153,7 +132,6 @@ def test_workflow_changes_run_everything() -> None:
         [".github/workflows/ci.yml"],
         macos=True,
         web=True,
-        go=True,
         agent_session_web=True,
     )
 
@@ -322,7 +300,6 @@ def linux_preflight_needs(
     route_outputs = {
         "macos": "true",
         "web": "true",
-        "go": "true",
         "agent_session_web": "true",
     }
     if outputs:
@@ -331,7 +308,6 @@ def linux_preflight_needs(
         "changes": "success",
         "workflow-guard-tests": "success",
         "ghosttykit-release-check": "success",
-        "remote-daemon-tests": "success",
         "web-typecheck": "success",
         "react-apps-check": "success",
         "diff-sidecar-check": "success",
@@ -400,7 +376,7 @@ def test_workflow_self_change_guard_runs_before_detector_imports() -> None:
     result, outputs = run_detect_step_for_paths(["scripts/ci/subprocess.py"])
 
     assert "CI router changed; running all CI areas." in result.stdout
-    assert outputs == ["macos=true", "web=true", "go=true", "agent_session_web=true"]
+    assert outputs == ["macos=true", "web=true", "agent_session_web=true"]
 
 
 def test_workflow_diff_failure_runs_all_areas() -> None:
@@ -430,7 +406,6 @@ def test_workflow_diff_failure_runs_all_areas() -> None:
         assert output_path.read_text(encoding="utf-8").splitlines() == [
             "macos=true",
             "web=true",
-            "go=true",
             "agent_session_web=true",
         ]
 
@@ -514,7 +489,6 @@ def test_workflow_routes_from_shallow_synthetic_merge() -> None:
         assert output_path.read_text(encoding="utf-8").splitlines() == [
             "macos=false",
             "web=true",
-            "go=false",
             "agent_session_web=false",
         ]
 
@@ -523,7 +497,7 @@ def test_workflow_empty_diff_runs_all_areas() -> None:
     result, outputs = run_detect_step_for_paths([])
 
     assert "PR diff is empty; running all CI areas." in result.stdout
-    assert outputs == ["macos=true", "web=true", "go=true", "agent_session_web=true"]
+    assert outputs == ["macos=true", "web=true", "agent_session_web=true"]
 
 
 def test_router_changes_run_everything() -> None:
@@ -531,27 +505,24 @@ def test_router_changes_run_everything() -> None:
         ["scripts/ci/detect_ci_change_areas.py"],
         macos=True,
         web=True,
-        go=True,
         agent_session_web=True,
     )
     assert_areas(
         ["scripts/ci/subprocess.py"],
         macos=True,
         web=True,
-        go=True,
         agent_session_web=True,
     )
     assert_areas(
         ["tests/test_ci_change_areas.py"],
         macos=True,
         web=True,
-        go=True,
         agent_session_web=True,
     )
 
 
 def test_ghosttykit_checksum_pin_runs_macos() -> None:
-    assert_areas(["scripts/ghosttykit-checksums.txt"], macos=True, web=False, go=False)
+    assert_areas(["scripts/ghosttykit-checksums.txt"], macos=True, web=False)
 
 
 def test_ghosttykit_checksum_pr_uses_release_guard_only() -> None:
@@ -564,7 +535,6 @@ def test_ghosttykit_checksum_pr_uses_release_guard_only() -> None:
     assert outputs == [
         "macos=false",
         "web=false",
-        "go=false",
         "agent_session_web=false",
     ]
 
@@ -586,7 +556,6 @@ def test_ghosttykit_guard_wiring_pr_stays_on_release_guard() -> None:
     assert outputs == [
         "macos=false",
         "web=false",
-        "go=false",
         "agent_session_web=false",
     ]
 
@@ -598,17 +567,16 @@ def test_workflow_only_pr_keeps_fail_open_routing() -> None:
     assert outputs == [
         "macos=true",
         "web=true",
-        "go=true",
         "agent_session_web=true",
     ]
 
 
 def test_app_bundled_markdown_runs_macos() -> None:
-    assert_areas(["THIRD_PARTY_LICENSES.md"], macos=True, web=False, go=False)
+    assert_areas(["THIRD_PARTY_LICENSES.md"], macos=True, web=False)
 
 
 def test_swift_warning_budget_runs_macos() -> None:
-    assert_areas([".github/swift-warning-budget.tsv"], macos=True, web=False, go=False)
+    assert_areas([".github/swift-warning-budget.tsv"], macos=True, web=False)
 
 
 def test_cli_writes_github_outputs() -> None:
@@ -634,11 +602,10 @@ def test_cli_writes_github_outputs() -> None:
             stderr=subprocess.PIPE,
         )
 
-        assert "Resolved areas: macos=false web=true go=false" in result.stdout
+        assert "Resolved areas: macos=false web=true" in result.stdout
         assert output_path.read_text(encoding="utf-8").splitlines() == [
             "macos=false",
             "web=true",
-            "go=false",
             "agent_session_web=false",
         ]
 
@@ -667,11 +634,10 @@ def test_cli_empty_diff_runs_all_areas() -> None:
         )
 
         assert "PR diff is empty; running all CI areas." in result.stdout
-        assert "Resolved areas: macos=true web=true go=true agent_session_web=true" in result.stdout
+        assert "Resolved areas: macos=true web=true agent_session_web=true" in result.stdout
         assert output_path.read_text(encoding="utf-8").splitlines() == [
             "macos=true",
             "web=true",
-            "go=true",
             "agent_session_web=true",
         ]
 
@@ -685,7 +651,7 @@ def test_non_pr_events_run_all_areas() -> None:
         stderr=subprocess.PIPE,
     )
 
-    assert "Resolved areas: macos=true web=true go=true agent_session_web=true" in result.stdout
+    assert "Resolved areas: macos=true web=true agent_session_web=true" in result.stdout
 
 
 def test_ci_status_job_accepts_skipped_routed_jobs() -> None:
@@ -694,7 +660,6 @@ def test_ci_status_job_accepts_skipped_routed_jobs() -> None:
     for job_name in [
         "changes",
         "workflow-guard-tests",
-        "remote-daemon-tests",
         "web-typecheck",
         "react-apps-check",
         "diff-sidecar-check",
@@ -728,7 +693,7 @@ def test_macos_jobs_wait_for_linux_preflight() -> None:
     # The staged macOS jobs must gate on their direct needs explicitly.
     # A bare `if: needs.changes.outputs.macos == 'true'` keeps the implicit
     # success() gate, which GitHub evaluates over the transitive needs chain:
-    # routed linux jobs that legitimately skip (web/go/agent-session paths)
+    # routed linux jobs that legitimately skip (web/agent-session paths)
     # then mark every macOS job skipped even though linux-preflight succeeded.
     for job_name in [
         "app-host-unit-tests",
@@ -758,7 +723,6 @@ def test_linux_preflight_blocks_macos_on_cheap_layer_failure() -> None:
     assert "      - changes" in block
     assert "      - workflow-guard-tests" in block
     assert "      - ghosttykit-release-check" in block
-    assert "      - remote-daemon-tests" in block
     assert "      - web-typecheck" in block
     assert "      - react-apps-check" in block
     assert "      - diff-sidecar-check" in block
@@ -773,23 +737,23 @@ def test_linux_preflight_blocks_macos_on_cheap_layer_failure() -> None:
 
 def test_linux_preflight_fails_when_routed_job_skips() -> None:
     result = run_linux_preflight(
-        linux_preflight_needs(results={"remote-daemon-tests": "skipped"})
+        linux_preflight_needs(results={"web-typecheck": "skipped"})
     )
 
     assert result.returncode != 0
-    assert "remote-daemon-tests: skipped (route go=true)" in result.stderr
+    assert "web-typecheck: skipped (route web=true)" in result.stderr
 
 
 def test_linux_preflight_allows_unrouted_job_skip() -> None:
     result = run_linux_preflight(
         linux_preflight_needs(
-            outputs={"go": "false"},
-            results={"remote-daemon-tests": "skipped"},
+            outputs={"web": "false"},
+            results={"web-typecheck": "skipped"},
         )
     )
 
     assert result.returncode == 0, result.stderr
-    assert "remote-daemon-tests: skipped" in result.stdout
+    assert "web-typecheck: skipped" in result.stdout
 
 
 def test_macos_jobs_use_lane_specific_xcode_pin_vars() -> None:
@@ -895,8 +859,8 @@ def test_agent_session_web_resources_runs_only_for_agent_session_web_area() -> N
 def test_perf_activation_workflow_keeps_required_status_while_gating_benchmark() -> None:
     result, outputs = run_detect_step_for_paths(["docs/ci-runners.md"], PERF_ACTIVATION_WORKFLOW)
 
-    assert "Resolved areas: macos=false web=false go=false" in result.stdout
-    assert outputs == ["macos=false", "web=false", "go=false", "agent_session_web=false"]
+    assert "Resolved areas: macos=false web=false" in result.stdout
+    assert outputs == ["macos=false", "web=false", "agent_session_web=false"]
 
     benchmark = workflow_job_block("activation-session-benchmark", PERF_ACTIVATION_WORKFLOW)
     sentinel = workflow_job_block("activation-session", PERF_ACTIVATION_WORKFLOW)
diff --git a/tests/test_remote_daemon_release_assets.sh b/tests/test_remote_daemon_release_assets.sh
deleted file mode 100755
index 2afb1d11dd2a..000000000000
--- a/tests/test_remote_daemon_release_assets.sh
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-ROOT_DIR="$(cd "$(dirname "$0")/.." && pwd)"
-OUTPUT_DIR="$(mktemp -d "${TMPDIR:-/tmp}/cmux-remote-assets-test.XXXXXX")"
-trap 'rm -rf "$OUTPUT_DIR"' EXIT
-
-"$ROOT_DIR/scripts/build_remote_daemon_release_assets.sh" \
-  --version "0.62.0-test" \
-  --release-tag "v0.62.0-test" \
-  --repo "manaflow-ai/cmux" \
-  --output-dir "$OUTPUT_DIR" >/dev/null
-
-for asset in \
-  cmuxd-remote-darwin-arm64 \
-  cmuxd-remote-darwin-amd64 \
-  cmuxd-remote-linux-arm64 \
-  cmuxd-remote-linux-amd64 \
-  cmuxd-remote-checksums.txt \
-  cmuxd-remote-manifest.json
-do
-  if [[ ! -f "$OUTPUT_DIR/$asset" ]]; then
-    echo "FAIL: missing asset $asset" >&2
-    exit 1
-  fi
-done
-
-python3 - <<'PY' "$OUTPUT_DIR/cmuxd-remote-manifest.json" "$OUTPUT_DIR/cmuxd-remote-checksums.txt"
-import json
-import sys
-from pathlib import Path
-
-manifest_path = Path(sys.argv[1])
-checksums_path = Path(sys.argv[2])
-manifest = json.loads(manifest_path.read_text(encoding="utf-8"))
-
-expected_targets = {
-    ("darwin", "arm64"),
-    ("darwin", "amd64"),
-    ("linux", "arm64"),
-    ("linux", "amd64"),
-}
-actual_targets = {(entry["goOS"], entry["goArch"]) for entry in manifest["entries"]}
-if actual_targets != expected_targets:
-    raise SystemExit(f"FAIL: manifest targets {sorted(actual_targets)} != {sorted(expected_targets)}")
-
-if manifest["appVersion"] != "0.62.0-test":
-    raise SystemExit(f"FAIL: unexpected appVersion {manifest['appVersion']}")
-if manifest["releaseTag"] != "v0.62.0-test":
-    raise SystemExit(f"FAIL: unexpected releaseTag {manifest['releaseTag']}")
-if not manifest["checksumsURL"].endswith("/cmuxd-remote-checksums.txt"):
-    raise SystemExit(f"FAIL: unexpected checksumsURL {manifest['checksumsURL']}")
-
-checksum_lines = [line for line in checksums_path.read_text(encoding="utf-8").splitlines() if line.strip()]
-if len(checksum_lines) != 4:
-    raise SystemExit(f"FAIL: expected 4 checksum lines, got {len(checksum_lines)}")
-
-for entry in manifest["entries"]:
-    if not entry["downloadURL"].endswith("/" + entry["assetName"]):
-        raise SystemExit(f"FAIL: downloadURL mismatch for {entry['assetName']}")
-    if len(entry["sha256"]) != 64:
-        raise SystemExit(f"FAIL: invalid sha256 for {entry['assetName']}")
-
-print("PASS: remote daemon release assets include all targets and manifest entries")
-PY
-
-# ------------------------------------------------------------------
-# Test with --asset-suffix (nightly-style immutable asset names)
-# ------------------------------------------------------------------
-SUFFIX_DIR="$(mktemp -d "${TMPDIR:-/tmp}/cmux-remote-assets-suffix-test.XXXXXX")"
-trap 'rm -rf "$OUTPUT_DIR" "$SUFFIX_DIR"' EXIT
-
-"$ROOT_DIR/scripts/build_remote_daemon_release_assets.sh" \
-  --version "0.62.0-nightly.123456" \
-  --release-tag "nightly" \
-  --repo "manaflow-ai/cmux" \
-  --output-dir "$SUFFIX_DIR" \
-  --asset-suffix "123456" >/dev/null
-
-for asset in \
-  cmuxd-remote-darwin-arm64-123456 \
-  cmuxd-remote-darwin-amd64-123456 \
-  cmuxd-remote-linux-arm64-123456 \
-  cmuxd-remote-linux-amd64-123456 \
-  cmuxd-remote-checksums-123456.txt \
-  cmuxd-remote-manifest-123456.json
-do
-  if [[ ! -f "$SUFFIX_DIR/$asset" ]]; then
-    echo "FAIL: missing suffixed asset $asset" >&2
-    exit 1
-  fi
-done
-
-python3 - <<'PY' "$SUFFIX_DIR/cmuxd-remote-manifest-123456.json"
-import json
-import sys
-from pathlib import Path
-
-manifest = json.loads(Path(sys.argv[1]).read_text(encoding="utf-8"))
-
-for entry in manifest["entries"]:
-    if not entry["assetName"].endswith("-123456"):
-        raise SystemExit(f"FAIL: suffixed asset name missing suffix: {entry['assetName']}")
-    if not entry["downloadURL"].endswith("/" + entry["assetName"]):
-        raise SystemExit(f"FAIL: downloadURL mismatch for {entry['assetName']}")
-
-print("PASS: --asset-suffix produces correctly suffixed assets and manifest entries")
-PY
diff --git a/web/app/api/vm/[id]/attach-endpoint/route.ts b/web/app/api/vm/[id]/attach-endpoint/route.ts
index 7114cda0672f..2e88e11e307c 100644
--- a/web/app/api/vm/[id]/attach-endpoint/route.ts
+++ b/web/app/api/vm/[id]/attach-endpoint/route.ts
@@ -42,7 +42,7 @@ export async function POST(
       if (!account.ok) return account.response;
       setSpanAttributes(span, { "cmux.vm.id": id });
       // Transport selection: "cmux-remote" is the cmux-tui remote daemon — the only
-      // transport Blaxel machines serve. Clients that do not ask keep the legacy
+      // transport cmux Cloud machines serve. Clients that do not ask keep the legacy
       // WebSocket PTY/RPC endpoint on providers that still run cmuxd-remote; on a
       // cmux-tui-only machine that request answers 409 vm_attach_transport_unsupported.
       const transport = optionalString(body.transport);
diff --git a/web/app/api/vm/[id]/ssh-endpoint/route.ts b/web/app/api/vm/[id]/ssh-endpoint/route.ts
deleted file mode 100644
index 6fc44fa12579..000000000000
--- a/web/app/api/vm/[id]/ssh-endpoint/route.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import {
-  jsonResponse,
-  resolveVmRouteAccountScope,
-  vmResourceErrorResponse,
-  withAuthedVmApiRoute,
-} from "../../../../../services/vms/routeHelpers";
-import { setSpanAttributes } from "../../../../../services/telemetry";
-import { openSshEndpoint, runVmWorkflow } from "../../../../../services/vms/workflows";
-
-
-/**
- * Returns the SSH endpoint the mac client will dial to reach this VM's cmuxd-remote.
- *
- * Freestyle response shape: `{ host: "vm-ssh.freestyle.sh", port: 22,
- * username: "<vmId>+cmux", credential: { kind: "password", value: "<one-time token>" } }`.
- * Mac client hands this to the existing `cmux ssh` transport; no Next.js in the data plane.
- *
- * E2B returns 501-ish (provider throws) because E2B sandboxes don't expose raw TCP.
- *
- * Short-lived: each call mints a fresh identity + token. The Postgres-backed VM workflow revokes
- * the identity alongside the VM on destroy, so idle sessions don't accumulate zombie credentials.
- */
-export async function POST(
-  request: Request,
-  { params }: { params: Promise<{ id: string }> },
-): Promise<Response> {
-  return withAuthedVmApiRoute(
-    request,
-    "/api/vm/[id]/ssh-endpoint",
-    { "cmux.vm.operation": "open_ssh" },
-    "/api/vm/[id]/ssh-endpoint failed",
-    async ({ user, span }) => {
-      const { id } = await params;
-      const account = resolveVmRouteAccountScope(user, request);
-      if (!account.ok) return account.response;
-      setSpanAttributes(span, { "cmux.vm.id": id });
-      try {
-        const endpoint = await runVmWorkflow(openSshEndpoint({
-          userId: user.id,
-          billingTeamId: account.entitlements.billingTeamId,
-          callerPlanId: account.entitlements.planId,
-          teamIds: user.teamIds,
-          providerVmId: id,
-        }));
-        setSpanAttributes(span, { "cmux.ssh.credential_kind": endpoint.credential.kind });
-        return jsonResponse(endpoint);
-      } catch (err) {
-        const response = vmResourceErrorResponse(err, id);
-        if (response) return response;
-        throw err;
-      }
-    },
-  );
-}
diff --git a/web/app/api/vm/base/routeShared.ts b/web/app/api/vm/base/routeShared.ts
index 8482049d18b6..f2978123d9f9 100644
--- a/web/app/api/vm/base/routeShared.ts
+++ b/web/app/api/vm/base/routeShared.ts
@@ -10,7 +10,6 @@ import {
   isVmLimitExceededError,
 } from "../../../../services/vms/errors";
 import {
-  imageUsesBakedFreestyleSignedAdmin,
   inferVmProviderForImage,
   resolveVmImage,
 } from "../../../../services/vms/images/resolver";
@@ -107,7 +106,6 @@ export async function runBaseRoute(input: {
       image: imageSelection.image,
       imageVersion: imageSelection.imageVersion,
       baseName: parsed.body.name,
-      bakedFreestyleSignedAdmin: imageUsesBakedFreestyleSignedAdmin(provider, imageSelection.image),
       timing: input.timing,
     };
     entry = await runVmWorkflow(
diff --git a/web/app/api/vm/route.ts b/web/app/api/vm/route.ts
index 5022565c58ae..3d0a3feedb8a 100644
--- a/web/app/api/vm/route.ts
+++ b/web/app/api/vm/route.ts
@@ -31,7 +31,6 @@ import {
   vmFreeAccessWindowDays,
 } from "../../../services/vms/entitlements";
 import {
-  imageUsesBakedFreestyleSignedAdmin,
   inferVmProviderForImage,
   resolveVmImage,
 } from "../../../services/vms/images/resolver";
@@ -451,7 +450,6 @@ export async function POST(request: Request): Promise<Response> {
             imageVersion: imageSelection.imageVersion,
             provider,
             idempotencyKey,
-            bakedFreestyleSignedAdmin: imageUsesBakedFreestyleSignedAdmin(provider, image),
             persistentHome: candidate.persistentHome === true,
             perMachineHome: candidate.perMachineHome === true,
             memoryMb,
diff --git a/web/bun.lock b/web/bun.lock
index 65a9f5836ce7..a4eafc4ae49f 100644
--- a/web/bun.lock
+++ b/web/bun.lock
@@ -1,6 +1,5 @@
 {
   "lockfileVersion": 1,
-  "configVersion": 1,
   "workspaces": {
     "": {
       "name": "web",
@@ -34,8 +33,7 @@
         "drizzle-orm": "1.0.0-beta.22",
         "e2b": "^2.20.0",
         "effect": "^3.21.2",
-        "freestyle": "0.1.51",
-        "freestyle-beta": "npm:freestyle@0.2.0-beta.7",
+        "freestyle": "0.2.9",
         "fzstd": "^0.1.1",
         "next": "16.3.4",
         "next-intl": "^4.11.2",
@@ -1150,7 +1148,7 @@
 
     "ajv-keywords": ["ajv-keywords@5.1.0", "", { "dependencies": { "fast-deep-equal": "^3.1.3" }, "peerDependencies": { "ajv": "^8.8.2" } }, "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw=="],
 
-    "ansi-regex": ["ansi-regex@6.2.2", "", {}, "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg=="],
+    "ansi-regex": ["ansi-regex@5.0.1", "", {}, "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="],
 
     "ansi-styles": ["ansi-styles@4.3.0", "", { "dependencies": { "color-convert": "^2.0.1" } }, "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="],
 
@@ -1254,7 +1252,7 @@
 
     "client-only": ["client-only@0.0.1", "", {}, "sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA=="],
 
-    "cliui": ["cliui@9.0.1", "", { "dependencies": { "string-width": "^7.2.0", "strip-ansi": "^7.1.0", "wrap-ansi": "^9.0.0" } }, "sha512-k7ndgKhwoQveBL+/1tqGJYNz097I7WOvwbmmU2AR5+magtbjPWQTS1C5vzGkBC8Ym8UWRzfKUzUUqFLypY4Q+w=="],
+    "cliui": ["cliui@8.0.1", "", { "dependencies": { "string-width": "^4.2.0", "strip-ansi": "^6.0.1", "wrap-ansi": "^7.0.0" } }, "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ=="],
 
     "clsx": ["clsx@2.1.1", "", {}, "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA=="],
 
@@ -1464,9 +1462,7 @@
 
     "forwarded-parse": ["forwarded-parse@2.1.2", "", {}, "sha512-alTFZZQDKMporBH77856pXgzhEzaUVmLCDk+egLgIgHst3Tpndzz8MnKe+GzRJRfvVdn69HhpW7cmXzvtLvJAw=="],
 
-    "freestyle": ["freestyle@0.1.51", "", { "optionalDependencies": { "dotenv": "^17.3.1", "glob": "^13.0.0", "yargs": "^18.0.0" }, "bin": { "freestyle": "cli.mjs", "freestyle-sandboxes": "cli.mjs" } }, "sha512-iUu19j3Topc7e9A7iyq9ZoHjOVEnZnnVUhgW1OnyFrS59jbfTaoe9Daow72p49EXzUijS3A8ya4pH6B/N8p+iQ=="],
-
-    "freestyle-beta": ["freestyle@0.2.0-beta.7", "", { "dependencies": { "dotenv": "^17.4.2", "ws": "^8.18.0", "yargs": "^17.7.2" }, "bin": { "freestyle": "dist/cli/index.js" } }, "sha512-EeBiEwZ1uvqt79+tD93qPco6MbFtANPrbq9n0/YH4JLPZj5CUpdewRub35v8JboL2MounQj7nmo38XlXDDZfHg=="],
+    "freestyle": ["freestyle@0.2.9", "", { "dependencies": { "dotenv": "^17.4.2", "ws": "^8.18.0", "yargs": "^17.7.2" }, "bin": { "freestyle": "dist/cli/index.js" } }, "sha512-coFGZhYYh+anvcIeV1OoBtZl4xmy9mTTqAxD/mSpSbpudT9E83p5hDaOL5sAXuV+DGLyEhP4ZxiC+k1CNDBTTA=="],
 
     "fsevents": ["fsevents@2.3.2", "", { "os": "darwin" }, "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA=="],
 
@@ -1484,8 +1480,6 @@
 
     "get-caller-file": ["get-caller-file@2.0.5", "", {}, "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="],
 
-    "get-east-asian-width": ["get-east-asian-width@1.6.0", "", {}, "sha512-QRbvDIbx6YklUe6RxeTeleMR0yv3cYH6PsPZHcnVn7xv7zO1BHN8r0XETu8n6Ye3Q+ahtSarc3WgtNWmehIBfA=="],
-
     "get-intrinsic": ["get-intrinsic@1.3.0", "", { "dependencies": { "call-bind-apply-helpers": "^1.0.2", "es-define-property": "^1.0.1", "es-errors": "^1.3.0", "es-object-atoms": "^1.1.1", "function-bind": "^1.1.2", "get-proto": "^1.0.1", "gopd": "^1.2.0", "has-symbols": "^1.1.0", "hasown": "^2.0.2", "math-intrinsics": "^1.1.0" } }, "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ=="],
 
     "get-nonce": ["get-nonce@1.0.1", "", {}, "sha512-FJhYRoDaiatfEkUK8HKlicmu/3SGFD51q3itKDGoSTysQJBnfOcxU5GxnhE1E6soB76MbT0MBtnKJuXyAx+96Q=="],
@@ -2076,7 +2070,7 @@
 
     "streamsearch": ["streamsearch@1.1.0", "", {}, "sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg=="],
 
-    "string-width": ["string-width@7.2.0", "", { "dependencies": { "emoji-regex": "^10.3.0", "get-east-asian-width": "^1.0.0", "strip-ansi": "^7.1.0" } }, "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ=="],
+    "string-width": ["string-width@4.2.3", "", { "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", "strip-ansi": "^6.0.1" } }, "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="],
 
     "string.prototype.includes": ["string.prototype.includes@2.0.1", "", { "dependencies": { "call-bind": "^1.0.7", "define-properties": "^1.2.1", "es-abstract": "^1.23.3" } }, "sha512-o7+c9bW6zpAdJHTtujeePODAhkuicdAryFsfVKwA+wGw89wJ4GTY484WTucM9hLtDEOpOvI+aHnzqnC5lHp4Rg=="],
 
@@ -2094,7 +2088,7 @@
 
     "stringify-entities": ["stringify-entities@4.0.4", "", { "dependencies": { "character-entities-html4": "^2.0.0", "character-entities-legacy": "^3.0.0" } }, "sha512-IwfBptatlO+QCJUo19AqvrPNqlVMpW9YEL2LIVY+Rpv2qsjCGxaDLNRgeGsQWJhfItebuJhsGSLjaBbNSQ+ieg=="],
 
-    "strip-ansi": ["strip-ansi@7.2.0", "", { "dependencies": { "ansi-regex": "^6.2.2" } }, "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w=="],
+    "strip-ansi": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="],
 
     "strip-bom": ["strip-bom@3.0.0", "", {}, "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA=="],
 
@@ -2242,7 +2236,7 @@
 
     "word-wrap": ["word-wrap@1.2.5", "", {}, "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA=="],
 
-    "wrap-ansi": ["wrap-ansi@9.0.2", "", { "dependencies": { "ansi-styles": "^6.2.1", "string-width": "^7.0.0", "strip-ansi": "^7.1.0" } }, "sha512-42AtmgqjV+X1VpdOfyTGOYRi0/zsoLqtXQckTmqTeybT+BDIbM/Guxo7x3pE2vtpr1ok6xRqM9OpBe+Jyoqyww=="],
+    "wrap-ansi": ["wrap-ansi@7.0.0", "", { "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", "strip-ansi": "^6.0.0" } }, "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="],
 
     "ws": ["ws@8.21.0", "", { "peerDependencies": { "bufferutil": "^4.0.1", "utf-8-validate": ">=5.0.2" }, "optionalPeers": ["bufferutil", "utf-8-validate"] }, "sha512-Vsp28b7DRcimFQvrqu2Wek3z1iYxDCWqHYB8Qsnk/S4RfaCQzPGPyBNuVjJV3cd6UiKtUtp6sNM77gWvzcCH+g=="],
 
@@ -2258,9 +2252,9 @@
 
     "yaml": ["yaml@2.9.0", "", { "bin": { "yaml": "bin.mjs" } }, "sha512-2AvhNX3mb8zd6Zy7INTtSpl1F15HW6Wnqj0srWlkKLcpYl/gMIMJiyuGq2KeI2YFxUPjdlB+3Lc10seMLtL4cA=="],
 
-    "yargs": ["yargs@18.0.0", "", { "dependencies": { "cliui": "^9.0.1", "escalade": "^3.1.1", "get-caller-file": "^2.0.5", "string-width": "^7.2.0", "y18n": "^5.0.5", "yargs-parser": "^22.0.0" } }, "sha512-4UEqdc2RYGHZc7Doyqkrqiln3p9X2DZVxaGbwhn2pi7MrRagKaOcIKe8L3OxYcbhXLgLFUS3zAYuQjKBQgmuNg=="],
+    "yargs": ["yargs@17.7.3", "", { "dependencies": { "cliui": "^8.0.1", "escalade": "^3.1.1", "get-caller-file": "^2.0.5", "require-directory": "^2.1.1", "string-width": "^4.2.3", "y18n": "^5.0.5", "yargs-parser": "^21.1.1" } }, "sha512-GZtjxm/J/4TSxuL3FNYjCmLktBTnIw/rVmKSIyKeYAZpmJB2ig9VauCC5xsa82GNKVKDAqpOn3KVzNt0zmrU0g=="],
 
-    "yargs-parser": ["yargs-parser@22.0.0", "", {}, "sha512-rwu/ClNdSMpkSrUb+d6BRsSkLUq1fmfsY6TOpYzTwvwkg1/NRG85KBy3kq++A8LKQwX6lsu+aWad+2khvuXrqw=="],
+    "yargs-parser": ["yargs-parser@21.1.1", "", {}, "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw=="],
 
     "yocto-queue": ["yocto-queue@0.1.0", "", {}, "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="],
 
@@ -2288,8 +2282,6 @@
 
     "@eslint/eslintrc/globals": ["globals@14.0.0", "", {}, "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ=="],
 
-    "@grpc/proto-loader/yargs": ["yargs@17.7.3", "", { "dependencies": { "cliui": "^8.0.1", "escalade": "^3.1.1", "get-caller-file": "^2.0.5", "require-directory": "^2.1.1", "string-width": "^4.2.3", "y18n": "^5.0.5", "yargs-parser": "^21.1.1" } }, "sha512-GZtjxm/J/4TSxuL3FNYjCmLktBTnIw/rVmKSIyKeYAZpmJB2ig9VauCC5xsa82GNKVKDAqpOn3KVzNt0zmrU0g=="],
-
     "@img/sharp-freebsd-wasm32/@img/sharp-wasm32": ["@img/sharp-wasm32@0.35.4", "", { "dependencies": { "@emnapi/runtime": "^1.11.3" } }, "sha512-zQnl4Kwp7Q6NHsENtU2T/00Zi+w3AQNwz3+UaTyVBy2FpXrzXzGjndpK61onhZjRtRpQXxCTeqw19bVyXOh7jA=="],
 
     "@img/sharp-webcontainers-wasm32/@img/sharp-wasm32": ["@img/sharp-wasm32@0.35.4", "", { "dependencies": { "@emnapi/runtime": "^1.11.3" } }, "sha512-zQnl4Kwp7Q6NHsENtU2T/00Zi+w3AQNwz3+UaTyVBy2FpXrzXzGjndpK61onhZjRtRpQXxCTeqw19bVyXOh7jA=="],
@@ -2422,10 +2414,6 @@
 
     "fast-glob/glob-parent": ["glob-parent@5.1.2", "", { "dependencies": { "is-glob": "^4.0.1" } }, "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="],
 
-    "freestyle/glob": ["glob@13.0.6", "", { "dependencies": { "minimatch": "^10.2.2", "minipass": "^7.1.3", "path-scurry": "^2.0.2" } }, "sha512-Wjlyrolmm8uDpm/ogGyXZXb1Z+Ca2B8NbJwqBVg0axK9GbBeoS7yGV6vjXnYdGm6X53iehEuxxbyiKp8QmN4Vw=="],
-
-    "freestyle-beta/yargs": ["yargs@17.7.3", "", { "dependencies": { "cliui": "^8.0.1", "escalade": "^3.1.1", "get-caller-file": "^2.0.5", "require-directory": "^2.1.1", "string-width": "^4.2.3", "y18n": "^5.0.5", "yargs-parser": "^21.1.1" } }, "sha512-GZtjxm/J/4TSxuL3FNYjCmLktBTnIw/rVmKSIyKeYAZpmJB2ig9VauCC5xsa82GNKVKDAqpOn3KVzNt0zmrU0g=="],
-
     "jest-worker/supports-color": ["supports-color@8.1.1", "", { "dependencies": { "has-flag": "^4.0.0" } }, "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q=="],
 
     "next/postcss": ["postcss@8.5.23", "", { "dependencies": { "nanoid": "^3.3.16", "picocolors": "^1.1.1", "source-map-js": "^1.2.1" } }, "sha512-g50586zr4bZmwFiTlflMu8E0bDTb5I5gertgwAKmsdUlTQIhZtunzUlD1WSzwcVWPoAVpsrA6vlfCD7oXvRwgg=="],
@@ -2448,7 +2436,7 @@
 
     "stacktrace-parser/type-fest": ["type-fest@0.7.1", "", {}, "sha512-Ne2YiiGN8bmrmJJEuTWTLJR32nh/JdL1+PSicowtNb0WFpn59GK8/lfD61bVtzguz7b3PBt74nxpv/Pw5po5Rg=="],
 
-    "string-width/emoji-regex": ["emoji-regex@10.6.0", "", {}, "sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A=="],
+    "string-width/emoji-regex": ["emoji-regex@8.0.0", "", {}, "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="],
 
     "tsx/esbuild": ["esbuild@0.28.1", "", { "optionalDependencies": { "@esbuild/aix-ppc64": "0.28.1", "@esbuild/android-arm": "0.28.1", "@esbuild/android-arm64": "0.28.1", "@esbuild/android-x64": "0.28.1", "@esbuild/darwin-arm64": "0.28.1", "@esbuild/darwin-x64": "0.28.1", "@esbuild/freebsd-arm64": "0.28.1", "@esbuild/freebsd-x64": "0.28.1", "@esbuild/linux-arm": "0.28.1", "@esbuild/linux-arm64": "0.28.1", "@esbuild/linux-ia32": "0.28.1", "@esbuild/linux-loong64": "0.28.1", "@esbuild/linux-mips64el": "0.28.1", "@esbuild/linux-ppc64": "0.28.1", "@esbuild/linux-riscv64": "0.28.1", "@esbuild/linux-s390x": "0.28.1", "@esbuild/linux-x64": "0.28.1", "@esbuild/netbsd-arm64": "0.28.1", "@esbuild/netbsd-x64": "0.28.1", "@esbuild/openbsd-arm64": "0.28.1", "@esbuild/openbsd-x64": "0.28.1", "@esbuild/openharmony-arm64": "0.28.1", "@esbuild/sunos-x64": "0.28.1", "@esbuild/win32-arm64": "0.28.1", "@esbuild/win32-ia32": "0.28.1", "@esbuild/win32-x64": "0.28.1" }, "bin": { "esbuild": "bin/esbuild" } }, "sha512-HrJrvZv5ayxBzPfwphOoNzkzOIIlifzk0KJrGK2c8R4+LKpMtpYLQeUdjnwjWv/LZlkH2laZk+4w78pi99D4Vw=="],
 
@@ -2460,8 +2448,6 @@
 
     "webpack/mime-db": ["mime-db@1.54.0", "", {}, "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ=="],
 
-    "wrap-ansi/ansi-styles": ["ansi-styles@6.2.3", "", {}, "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg=="],
-
     "yup/type-fest": ["type-fest@2.19.0", "", {}, "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA=="],
 
     "@babel/helper-compilation-targets/lru-cache/yallist": ["yallist@3.1.1", "", {}, "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="],
@@ -2474,12 +2460,6 @@
 
     "@effect/sql-pg/pg-types/postgres-interval": ["postgres-interval@3.0.0", "", {}, "sha512-BSNDnbyZCXSxgA+1f5UU2GmwhoI0aU5yMxRGO8CdFEcY2BQF9xm/7MqKnYoM1nJDk8nONNWDk9WeSmePFhQdlw=="],
 
-    "@grpc/proto-loader/yargs/cliui": ["cliui@8.0.1", "", { "dependencies": { "string-width": "^4.2.0", "strip-ansi": "^6.0.1", "wrap-ansi": "^7.0.0" } }, "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ=="],
-
-    "@grpc/proto-loader/yargs/string-width": ["string-width@4.2.3", "", { "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", "strip-ansi": "^6.0.1" } }, "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="],
-
-    "@grpc/proto-loader/yargs/yargs-parser": ["yargs-parser@21.1.1", "", {}, "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw=="],
-
     "@img/sharp-freebsd-wasm32/@img/sharp-wasm32/@emnapi/runtime": ["@emnapi/runtime@1.11.3", "", { "dependencies": { "tslib": "^2.4.0" } }, "sha512-Xz4Tpyki7XyrpbUK1jR1AhdAdaXyhhY4lZ3neLodmhpuWfy2PAQN5B46sAiU4liOXGLkHypn/qU+jvfWSCYYLA=="],
 
     "@img/sharp-webcontainers-wasm32/@img/sharp-wasm32/@emnapi/runtime": ["@emnapi/runtime@1.11.3", "", { "dependencies": { "tslib": "^2.4.0" } }, "sha512-Xz4Tpyki7XyrpbUK1jR1AhdAdaXyhhY4lZ3neLodmhpuWfy2PAQN5B46sAiU4liOXGLkHypn/qU+jvfWSCYYLA=="],
@@ -2492,12 +2472,6 @@
 
     "ansi-styles/color-convert/color-name": ["color-name@1.1.4", "", {}, "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="],
 
-    "freestyle-beta/yargs/cliui": ["cliui@8.0.1", "", { "dependencies": { "string-width": "^4.2.0", "strip-ansi": "^6.0.1", "wrap-ansi": "^7.0.0" } }, "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ=="],
-
-    "freestyle-beta/yargs/string-width": ["string-width@4.2.3", "", { "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", "strip-ansi": "^6.0.1" } }, "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="],
-
-    "freestyle-beta/yargs/yargs-parser": ["yargs-parser@21.1.1", "", {}, "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw=="],
-
     "next/postcss/nanoid": ["nanoid@3.3.18", "", { "bin": { "nanoid": "bin/nanoid.cjs" } }, "sha512-DTg4MJbGMWkfi6VZFdNt2/caMbQy4Ou+Op/hJQvGEWcnVfoA1QA+xzRKAzw9jD6+GVOOeYr/mIcuDSdug6F6+w=="],
 
     "next/sharp/@img/sharp-darwin-arm64": ["@img/sharp-darwin-arm64@0.35.4", "", { "optionalDependencies": { "@img/sharp-libvips-darwin-arm64": "1.3.3" }, "os": "darwin", "cpu": "arm64" }, "sha512-Uhfl4V4lhP2nbUVF9+hyH1+luj86f1gUFeo8ALYxFoULoU+G87D43BfeMP8XHsk9boxAnCY/bf2EHwhA7MuGsA=="],
@@ -2550,8 +2524,6 @@
 
     "qrcode/yargs/find-up": ["find-up@4.1.0", "", { "dependencies": { "locate-path": "^5.0.0", "path-exists": "^4.0.0" } }, "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw=="],
 
-    "qrcode/yargs/string-width": ["string-width@4.2.3", "", { "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", "strip-ansi": "^6.0.1" } }, "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="],
-
     "qrcode/yargs/y18n": ["y18n@4.0.3", "", {}, "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ=="],
 
     "qrcode/yargs/yargs-parser": ["yargs-parser@18.1.3", "", { "dependencies": { "camelcase": "^5.0.0", "decamelize": "^1.2.0" } }, "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ=="],
@@ -2612,46 +2584,12 @@
 
     "webpack/eslint-scope/estraverse": ["estraverse@4.3.0", "", {}, "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="],
 
-    "@grpc/proto-loader/yargs/cliui/strip-ansi": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="],
-
-    "@grpc/proto-loader/yargs/cliui/wrap-ansi": ["wrap-ansi@7.0.0", "", { "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", "strip-ansi": "^6.0.0" } }, "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="],
-
-    "@grpc/proto-loader/yargs/string-width/emoji-regex": ["emoji-regex@8.0.0", "", {}, "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="],
-
-    "@grpc/proto-loader/yargs/string-width/strip-ansi": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="],
-
-    "freestyle-beta/yargs/cliui/strip-ansi": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="],
-
-    "freestyle-beta/yargs/cliui/wrap-ansi": ["wrap-ansi@7.0.0", "", { "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", "strip-ansi": "^6.0.0" } }, "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="],
-
-    "freestyle-beta/yargs/string-width/emoji-regex": ["emoji-regex@8.0.0", "", {}, "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="],
-
-    "freestyle-beta/yargs/string-width/strip-ansi": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="],
-
-    "qrcode/yargs/cliui/strip-ansi": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="],
-
     "qrcode/yargs/cliui/wrap-ansi": ["wrap-ansi@6.2.0", "", { "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", "strip-ansi": "^6.0.0" } }, "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA=="],
 
     "qrcode/yargs/find-up/locate-path": ["locate-path@5.0.0", "", { "dependencies": { "p-locate": "^4.1.0" } }, "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g=="],
 
-    "qrcode/yargs/string-width/emoji-regex": ["emoji-regex@8.0.0", "", {}, "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="],
-
-    "qrcode/yargs/string-width/strip-ansi": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="],
-
-    "@grpc/proto-loader/yargs/cliui/strip-ansi/ansi-regex": ["ansi-regex@5.0.1", "", {}, "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="],
-
-    "@grpc/proto-loader/yargs/string-width/strip-ansi/ansi-regex": ["ansi-regex@5.0.1", "", {}, "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="],
-
-    "freestyle-beta/yargs/cliui/strip-ansi/ansi-regex": ["ansi-regex@5.0.1", "", {}, "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="],
-
-    "freestyle-beta/yargs/string-width/strip-ansi/ansi-regex": ["ansi-regex@5.0.1", "", {}, "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="],
-
-    "qrcode/yargs/cliui/strip-ansi/ansi-regex": ["ansi-regex@5.0.1", "", {}, "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="],
-
     "qrcode/yargs/find-up/locate-path/p-locate": ["p-locate@4.1.0", "", { "dependencies": { "p-limit": "^2.2.0" } }, "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A=="],
 
-    "qrcode/yargs/string-width/strip-ansi/ansi-regex": ["ansi-regex@5.0.1", "", {}, "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="],
-
     "qrcode/yargs/find-up/locate-path/p-locate/p-limit": ["p-limit@2.3.0", "", { "dependencies": { "p-try": "^2.0.0" } }, "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w=="],
   }
 }
diff --git a/web/db/migrations/20260901120000_remove_blaxel_vm_provider/migration.sql b/web/db/migrations/20260901120000_remove_blaxel_vm_provider/migration.sql
new file mode 100644
index 000000000000..c9d18295e593
--- /dev/null
+++ b/web/db/migrations/20260901120000_remove_blaxel_vm_provider/migration.sql
@@ -0,0 +1,33 @@
+-- Remove 'blaxel' from vm_provider.
+--
+-- Postgres cannot drop a value from an enum, so the type is rebuilt: rename the
+-- old one aside, create the new one without 'blaxel', re-point every column
+-- then drop the old type. (No provider column carries a default.) The DROP TYPE
+-- at the end is the safety interlock: it fails if anything still references the
+-- old type, so a missed column aborts the whole transaction instead of silently
+-- leaving a split schema.
+--
+-- Any row still naming a Blaxel machine is rewritten to 'e2b' first. Those
+-- machines are unreachable regardless (the driver is gone); this keeps history
+-- rows readable rather than dropping them. Run the reaper to destroy live
+-- Blaxel machines BEFORE applying this migration — afterwards nothing in the
+-- control plane can address them.
+
+UPDATE "cloud_vms" SET "provider" = 'e2b' WHERE "provider" = 'blaxel';
+UPDATE "cloud_vm_usage_events" SET "provider" = 'e2b' WHERE "provider" = 'blaxel';
+UPDATE "cloud_vm_bases" SET "active_provider" = 'e2b' WHERE "active_provider" = 'blaxel';
+UPDATE "cloud_vm_base_generations" SET "provider" = 'e2b' WHERE "provider" = 'blaxel';
+
+ALTER TYPE "vm_provider" RENAME TO "vm_provider_old";
+CREATE TYPE "vm_provider" AS ENUM ('e2b', 'freestyle', 'daytona');
+
+ALTER TABLE "cloud_vms"
+  ALTER COLUMN "provider" TYPE "vm_provider" USING "provider"::text::"vm_provider";
+ALTER TABLE "cloud_vm_usage_events"
+  ALTER COLUMN "provider" TYPE "vm_provider" USING "provider"::text::"vm_provider";
+ALTER TABLE "cloud_vm_bases"
+  ALTER COLUMN "active_provider" TYPE "vm_provider" USING "active_provider"::text::"vm_provider";
+ALTER TABLE "cloud_vm_base_generations"
+  ALTER COLUMN "provider" TYPE "vm_provider" USING "provider"::text::"vm_provider";
+
+DROP TYPE "vm_provider_old";
diff --git a/web/db/schema.ts b/web/db/schema.ts
index 107ee5eba485..2c7171ef5130 100644
--- a/web/db/schema.ts
+++ b/web/db/schema.ts
@@ -15,7 +15,7 @@ import {
   uuid,
 } from "drizzle-orm/pg-core";
 
-export const vmProvider = pgEnum("vm_provider", ["e2b", "freestyle", "daytona", "blaxel"]);
+export const vmProvider = pgEnum("vm_provider", ["e2b", "freestyle", "daytona"]);
 
 export const vmStatus = pgEnum("vm_status", [
   "provisioning",
diff --git a/web/package.json b/web/package.json
index d11a613dca36..b7fe6c4e7efc 100644
--- a/web/package.json
+++ b/web/package.json
@@ -68,8 +68,7 @@
     "drizzle-orm": "1.0.0-beta.22",
     "e2b": "^2.20.0",
     "effect": "^3.21.2",
-    "freestyle": "0.1.51",
-    "freestyle-beta": "npm:freestyle@0.2.0-beta.7",
+    "freestyle": "0.2.9",
     "fzstd": "^0.1.1",
     "next": "16.3.4",
     "next-intl": "^4.11.2",
diff --git a/web/scripts/build-blaxel-image.sh b/web/scripts/build-blaxel-image.sh
deleted file mode 100755
index 72d6e923e942..000000000000
--- a/web/scripts/build-blaxel-image.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/env bash
-# Builds and publishes the baked Blaxel machine image (sandbox/cmux-devbox) on
-# Blaxel's remote builder. No local docker needed; the Blaxel CLI uploads the
-# template directory and streams the build.
-#
-#   web/scripts/build-blaxel-image.sh            # build + publish image only
-#   web/scripts/build-blaxel-image.sh --skip-build
-#
-# After a successful bake, create a machine with BLAXEL_SANDBOX_IMAGE set to the
-# printed image id, validate it (terminal, agents, desktop on 6901), and update
-# web/services/vms/images/manifest.json.
-set -euo pipefail
-
-script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-template_dir="$script_dir/../services/vms/images/blaxel"
-
-command -v bl >/dev/null 2>&1 || { echo "blaxel CLI (bl) not installed" >&2; exit 127; }
-
-# Run from inside the template directory. `bl push -d <dir>` resolves blaxel.toml
-# from <dir> but packages the CALLER's cwd as the build context: invoked from the
-# repo root it uploads the monorepo, finds no Dockerfile there, sees the root
-# package.json, and silently generates a Node app image instead of building this
-# template (measured 2026-08-26). --name is also required: the CLI otherwise
-# names the image after the directory, ignoring blaxel.toml.
-cd "$template_dir"
-bl push -t sandbox -n cmux-devbox -y "$@"
-
-echo
-echo "Published. Resolve the image id with:"
-echo "  bl get image sandbox/cmux-devbox --latest"
-echo "Then validate a machine with BLAXEL_SANDBOX_IMAGE=sandbox/cmux-devbox:latest"
-echo "and record the result in web/services/vms/images/manifest.json."
diff --git a/web/scripts/build-devbox-freestyle.ts b/web/scripts/build-devbox-freestyle.ts
index c0995102dfc9..aaabe44bee7f 100644
--- a/web/scripts/build-devbox-freestyle.ts
+++ b/web/scripts/build-devbox-freestyle.ts
@@ -1,17 +1,17 @@
 #!/usr/bin/env bun
 /**
- * Build the cmux Cloud devbox Freestyle snapshot on the BETA platform
- * (freestyle@0.2.0-beta.7 via the freestyle-beta alias; beta-api.freestyle.sh)
- * by replaying web/services/vms/images/devbox/Dockerfile as exec steps on a
- * builder VM, mirroring chatmux infra/sandbox-images/build-freestyle.ts.
+ * Build the cmux Cloud devbox Freestyle snapshot on the public platform
+ * (freestyle@0.2.9; api.freestyle.sh) by replaying
+ * web/services/vms/images/devbox/Dockerfile as exec steps on a builder VM,
+ * mirroring chatmux infra/sandbox-images/build-freestyle.ts.
  * The exec API has no COPY; small repo files travel as base64 embeds.
  *
  * Usage:
  *   bun scripts/build-devbox-freestyle.ts <snapshot-slug>
  *
- * Auth: FREESTYLE_API_KEY (permanent key from beta-dashboard.freestyle.sh),
- * or FREESTYLE_STACK_ACCESS_TOKEN + FREESTYLE_TEAM_ID for interactive use
- * (mint via `npx freestyle@beta login`).
+ * Auth: FREESTYLE_API_KEY (permanent key from the Freestyle dashboard), or
+ * FREESTYLE_STACK_ACCESS_TOKEN + FREESTYLE_TEAM_ID for interactive use
+ * (mint via `npx freestyle login`). FREESTYLE_API_URL overrides the edge.
  *
  * Freestyle snapshot slugs are unique per account and creation does not
  * reassign, so pass a fresh versioned slug per rebuild (cmux-devbox-<tag>);
@@ -23,15 +23,14 @@
  * cmux-tui-daemon systemd unit runs /usr/local/bin/cmux-devbox-boot, which
  * waits for /root/.cmux/bin/cmux-tui and supervises the daemon once a driver
  * installs the pinned build at create time. The unit binds the listener
- * dual-stack (CMUX_TUI_REMOTE_WS_BIND=[::]:1337) because the beta driver arm
- * (web/services/vms/drivers/freestyleBeta.ts) routes attaches to the VM's
- * stable public IPv6; the legacy (0.1.51) driver arm cannot boot these
- * snapshots — the manifest marks them features.freestylePlatform: "beta".
+ * dual-stack (CMUX_TUI_REMOTE_WS_BIND=[::]:1337) because the driver
+ * (web/services/vms/drivers/freestyle.ts) routes attaches to the VM's stable
+ * public IPv6.
  *
  * Builder VM: freestyle/ubuntu-sm, outbound-only firewall, deleted whatever
  * happens.
  */
-import { Freestyle } from "freestyle-beta";
+import { Freestyle } from "freestyle";
 import { fileURLToPath } from "node:url";
 import {
   bakeMetadata,
@@ -44,9 +43,10 @@ import {
 const apiKey = process.env.FREESTYLE_API_KEY;
 const stackToken = process.env.FREESTYLE_STACK_ACCESS_TOKEN;
 const teamId = process.env.FREESTYLE_TEAM_ID;
+const baseUrl = process.env.FREESTYLE_API_URL?.trim() || undefined;
 const fs = (() => {
-  if (apiKey) return new Freestyle({ apiKey });
-  if (stackToken && teamId) return new Freestyle({ stackAccessToken: stackToken, teamId });
+  if (apiKey) return new Freestyle({ apiKey, baseUrl });
+  if (stackToken && teamId) return new Freestyle({ stackAccessToken: stackToken, teamId, baseUrl });
   throw new Error("set FREESTYLE_API_KEY, or FREESTYLE_STACK_ACCESS_TOKEN + FREESTYLE_TEAM_ID");
 })();
 
@@ -57,10 +57,10 @@ if (!slug || slug.startsWith("--")) {
 
 const preflight = bakePreflight();
 
-// The beta exec API caps timeoutMs at 300000 (5 minutes per step).
+// The exec API caps timeoutMs at 300000 (5 minutes per step).
 const STEP_TIMEOUT_MS = 300_000;
 
-// Per-exec env (the beta API replays it into every step): the Dockerfile's
+// Per-exec env (the API replays it into every step): the Dockerfile's
 // ENV block, PATH literal included.
 const BUILD_ENV = {
   MISE_DATA_DIR: "/opt/mise",
@@ -89,6 +89,9 @@ async function step(label: string, command: string): Promise<void> {
     command: `${HOME_PREFIX} && ${command}`,
     env: BUILD_ENV,
     timeoutMs: STEP_TIMEOUT_MS,
+    // The 0.2 API's default guest user is uid 1000, not root. Every build step
+    // writes to /opt, /usr/local and /etc, so the bake must run as root.
+    linuxUser: "root",
   });
   const secs = ((Date.now() - t0) / 1000).toFixed(1);
   const exitCode = r.statusCode ?? 124;
@@ -184,7 +187,7 @@ const service = [
   "[Service]",
   "Type=simple",
   "User=root",
-  // Freestyle beta machines are reached at their stable public IPv6, so the
+  // Freestyle machines are reached at their stable public IPv6, so the
   // daemon listens dual-stack ([::] accepts IPv4 too). cmux-devbox-boot
   // defaults to 0.0.0.0 for the container providers, whose runtimes may have
   // IPv6 disabled entirely.
@@ -236,7 +239,7 @@ console.log(
         snapshotId,
         "FREESTYLE_SANDBOX_SNAPSHOT",
         metadata,
-        "Shared devbox exec-replay on the Freestyle BETA platform; cmux-tui transport; requires the beta-SDK driver (do not pin for the legacy driver).",
+        "Shared devbox exec-replay on the Freestyle public platform (api.freestyle.sh); cmux-tui transport.",
       ),
       next: `bun scripts/verify-devbox-image.ts freestyle ${snapshotId}`,
     },
diff --git a/web/scripts/cloud-vm/defaultProviderAudit.mjs b/web/scripts/cloud-vm/defaultProviderAudit.mjs
index c6c5b68bfeee..77f870fa7902 100644
--- a/web/scripts/cloud-vm/defaultProviderAudit.mjs
+++ b/web/scripts/cloud-vm/defaultProviderAudit.mjs
@@ -1,7 +1,7 @@
 // Coherence check between the deployed Cloud VM env and the image manifest.
 //
-// The 2026-08-26 outage: code shipped assuming CMUX_VM_DEFAULT_PROVIDER=blaxel
-// while production still said freestyle, and no BLAXEL_SANDBOX_IMAGE was set.
+// The 2026-08-26 outage: code shipped assuming one CMUX_VM_DEFAULT_PROVIDER
+// while production still said another, and no image selector was set for it.
 // Key-presence auditing could not catch that; provider VALUES have to agree
 // with the manifest. Image env vars derive from manifest.json (each entry
 // carries its provider and env var), so a new provider cannot be added
@@ -15,14 +15,13 @@ const PROVIDER_CREDENTIAL_KEYS = {
   e2b: ["E2B_API_KEY"],
   freestyle: ["FREESTYLE_API_KEY"],
   daytona: ["DAYTONA_API_KEY"],
-  blaxel: ["BL_API_KEY", "BL_WORKSPACE"],
 };
 
 // Mirrors defaultProviderId() in services/vms/drivers/index.ts. Shipped CLIs
 // also hardcode this provider's image ids (cmux.swift cloudVMDesktopImage /
 // cloudVMBaseImage), so it must stay provisionable in production even when
 // the env deliberately selects a different default as a rollback.
-export const CODE_DEFAULT_PROVIDER = "blaxel";
+export const CODE_DEFAULT_PROVIDER = "freestyle";
 
 // What `vercel env pull` writes for values it cannot decrypt. The default
 // provider and its image id are configuration, not secrets; stored as
@@ -97,11 +96,11 @@ export function auditProviderReadiness(provider, env, manifest) {
 /**
  * Full coherence audit. Two legs:
  * - the env-selected default provider (what imageless creates use), and
- * - the code default (blaxel) whenever the env selects something else,
- *   because shipped clients hardcode blaxel image ids: an env rollback to
- *   another default must not leave blaxel unprovisionable. This second leg
+ * - the code default (freestyle) whenever the env selects something else,
+ *   because shipped clients hardcode the code default's image ids: an env
+ *   rollback to another default must not leave it unprovisionable. This leg
  *   is what would have caught the 2026-08-26 production env, where a fully
- *   coherent freestyle default coexisted with clients that only send blaxel.
+ *   coherent env default coexisted with clients that only send the code default.
  *
  * @param {Record<string, string | undefined>} env
  * @param {{ images: Array<{ provider: string, version: string, imageId: string, envVar: string, validationStatus: string }> }} manifest
diff --git a/web/scripts/cloud-vm/projects.mjs b/web/scripts/cloud-vm/projects.mjs
index f69c6952cc90..549a82c52764 100755
--- a/web/scripts/cloud-vm/projects.mjs
+++ b/web/scripts/cloud-vm/projects.mjs
@@ -25,11 +25,6 @@ export const projects = {
 export const requiredRuntimeEnvKeys = [
   "AWS_REGION",
   "AWS_ROLE_ARN",
-  // Blaxel is the production default provider (CMUX_VM_DEFAULT_PROVIDER):
-  // without credentials and an image selector every create 503s.
-  "BLAXEL_SANDBOX_IMAGE",
-  "BL_API_KEY",
-  "BL_WORKSPACE",
   // Without the Slack sink every triggered VM alert drops silently while the
   // alert cron keeps returning 200, so an unset webhook is an observability
   // outage, not a tuning choice. The only waiver is a recorded operator
@@ -44,6 +39,8 @@ export const requiredRuntimeEnvKeys = [
   "CMUX_VM_CREATE_ENABLED",
   "CMUX_VM_DEFAULT_PROVIDER",
   "CMUX_VM_E2B_ENABLED",
+  // Freestyle is the production default provider (CMUX_VM_DEFAULT_PROVIDER):
+  // without credentials and a snapshot selector every create 503s.
   "CMUX_VM_FREESTYLE_ENABLED",
   // Every Vercel cron (VM alerts included) refuses to run without it.
   "CRON_SECRET",
@@ -61,9 +58,6 @@ export const requiredRuntimeEnvKeys = [
 ];
 
 export const recommendedRuntimeEnvKeys = [
-  // Optional by design: when unset, desktop creates fall back to the generic
-  // BLAXEL_SANDBOX_IMAGE selector (services/vms/images/resolver.ts).
-  "BLAXEL_SANDBOX_DESKTOP_IMAGE",
   "CMUX_DB_POOL_MAX",
   // Kill switches are off-only: unset means enabled, so requiring presence
   // would fail a healthy deployment. Recommended for explicitness (the other
@@ -73,7 +67,7 @@ export const recommendedRuntimeEnvKeys = [
   // VALUES are audited by freeProvisioningAudit.mjs (a permissive value fails).
   // CMUX_ALERTS_SINK_UNCONFIGURED_ACK is absent for the same reason; its VALUE
   // is audited by alertSinkAudit.mjs.
-  "CMUX_VM_BLAXEL_ENABLED",
+  "CMUX_VM_DAYTONA_ENABLED",
   "CMUX_DB_SSL_REJECT_UNAUTHORIZED",
   "OTEL_EXPORTER_OTLP_ENDPOINT",
   "OTEL_EXPORTER_OTLP_HEADERS",
diff --git a/web/scripts/cloud-vm/smoke-vm-api.mjs b/web/scripts/cloud-vm/smoke-vm-api.mjs
index 78e2f1adef2a..00f9f3e4c32c 100755
--- a/web/scripts/cloud-vm/smoke-vm-api.mjs
+++ b/web/scripts/cloud-vm/smoke-vm-api.mjs
@@ -13,7 +13,7 @@ import {
   requireEnvKeys,
 } from "./projects.mjs";
 
-const usage = "Usage: smoke-vm-api.mjs [web-dir] <staging|production> [--create] [--provider e2b|freestyle|daytona|blaxel|default] [--image <manifest image id or version>] [--url https://preview.example] [--vercel-curl] [--skip-attach] [--paid]";
+const usage = "Usage: smoke-vm-api.mjs [web-dir] <staging|production> [--create] [--provider e2b|freestyle|daytona|default] [--image <manifest image id or version>] [--url https://preview.example] [--vercel-curl] [--skip-attach] [--paid]";
 const args = process.argv.slice(2);
 const { webDir, target, project, rest } = parseWebDirAndTarget(args, usage);
 const shouldCreate = rest.includes("--create");
@@ -35,10 +35,9 @@ if (
   provider !== "e2b" &&
   provider !== "freestyle" &&
   provider !== "daytona" &&
-  provider !== "blaxel" &&
   provider !== "default"
 ) {
-  console.error("--provider must be e2b, freestyle, daytona, blaxel, or default");
+  console.error("--provider must be e2b, freestyle, daytona, or default");
   process.exit(2);
 }
 
@@ -188,12 +187,9 @@ try {
     let attachTransport;
     let attachDurationMs;
     if (!skipAttach) {
-      // Blaxel machines run only the cmux-tui remote daemon; every other provider still
-      // serves the legacy cmuxd-remote websocket PTY.
-      const expectedTransport = created.provider === "blaxel" ? "cmux-remote" : "websocket";
-      const attachBody = expectedTransport === "cmux-remote"
-        ? { transport: "cmux-remote" }
-        : { requireDaemon: true };
+      // Every cmux Cloud machine runs only the cmux-tui remote daemon.
+      const expectedTransport = "cmux-remote";
+      const attachBody = { transport: "cmux-remote" };
       // First attach after create races the in-VM daemon boot; the API says
       // retryable with retryAfterSeconds and real clients loop. Retry 502s
       // within a bounded budget so the smoke measures the client contract,
@@ -228,7 +224,9 @@ try {
       if (attached.transport !== expectedTransport) {
         throw new Error(`expected ${expectedTransport} attach, got ${attached.transport}`);
       }
-      if (expectedTransport === "cmux-remote" && !/^wss:\/\/.+\/v1\/link\?/.test(attached.route ?? "")) {
+      // Providers reach the daemon either through a tokened wss proxy (E2B,
+      // Daytona) or straight at the VM's public IPv6 over ws (Freestyle).
+      if (!/^wss?:\/\/.+\/v1\/link(\?|$)/.test(attached.route ?? "")) {
         throw new Error("cmux-remote attach response missing the daemon route");
       }
       attachTransport = attached.transport;
diff --git a/web/scripts/cloud-vm/stress-vm-api.mjs b/web/scripts/cloud-vm/stress-vm-api.mjs
index 8a9be5f5d3f5..33165b44079a 100644
--- a/web/scripts/cloud-vm/stress-vm-api.mjs
+++ b/web/scripts/cloud-vm/stress-vm-api.mjs
@@ -154,9 +154,8 @@ async function runCase(index) {
     vmId = created.id;
     throwIfInterrupted();
 
-    // Blaxel machines run only the cmux-tui remote daemon (no cmuxd RPC to probe);
-    // every other provider still serves the legacy cmuxd-remote websocket PTY.
-    const expectedTransport = created.provider === "blaxel" ? "cmux-remote" : "websocket";
+    // cmux Cloud machines run only the cmux-tui remote daemon (no cmuxd RPC to probe).
+    const expectedTransport = "cmux-remote";
     const attachStartedAt = performance.now();
     const attach = await fetchWithTimeout(`${targetUrl}/api/vm/${encodeURIComponent(vmId)}/attach-endpoint`, {
       method: "POST",
@@ -174,7 +173,8 @@ async function runCase(index) {
 
     let rpcCapabilities = null;
     if (expectedTransport === "cmux-remote") {
-      if (!/^wss:\/\/.+\/v1\/link\?/.test(attached.route ?? "")) {
+      // Tokened wss proxy (E2B, Daytona) or direct public IPv6 ws (Freestyle).
+      if (!/^wss?:\/\/.+\/v1\/link(\?|$)/.test(attached.route ?? "")) {
         throw new Error("cmux-remote attach response missing the daemon route");
       }
     } else {
diff --git a/web/scripts/devbox-image-common.ts b/web/scripts/devbox-image-common.ts
index 89fa8f4dd635..9e037c7c28bb 100644
--- a/web/scripts/devbox-image-common.ts
+++ b/web/scripts/devbox-image-common.ts
@@ -155,7 +155,7 @@ export function manifestEntrySkeleton(
     envVar,
     defaultForLocalDev: false,
     // The session daemon is cmux-tui, installed at create time from the pinned
-    // artifacts manifest; no cmuxd-remote build is baked (same as Blaxel).
+    // artifacts manifest; no cmuxd-remote build is baked.
     cmuxdRemoteCommit: "none-cmux-tui",
     builtAt: metadata.builtAt,
     builderScriptVersion: metadata.builderScriptVersion,
diff --git a/web/scripts/load-dev-env.sh b/web/scripts/load-dev-env.sh
index 1a1203f67be0..f4bdf5a79b58 100755
--- a/web/scripts/load-dev-env.sh
+++ b/web/scripts/load-dev-env.sh
@@ -120,9 +120,10 @@ if [[ "${CMUX_DEV_USE_EXTERNAL_VM_API_BASE_URL:-0}" != "1" ]]; then
   export CMUX_VM_API_BASE_URL="http://localhost:${CMUX_PORT}"
 fi
 
-# Local Cloud VM dogfood uses the Blaxel WebSocket provider by default. A caller
-# can still opt into another provider explicitly with CMUX_VM_DEFAULT_PROVIDER.
-export CMUX_VM_DEFAULT_PROVIDER="${CMUX_VM_DEFAULT_PROVIDER:-blaxel}"
+# Local Cloud VM dogfood uses Freestyle (the public platform) by default. A
+# caller can still opt into another provider explicitly with
+# CMUX_VM_DEFAULT_PROVIDER.
+export CMUX_VM_DEFAULT_PROVIDER="${CMUX_VM_DEFAULT_PROVIDER:-freestyle}"
 
 # Local dev should not require a checked-in or per-worktree .env.local just to pass
 # startup validation for routes the developer is not exercising.
diff --git a/web/scripts/test-blaxel-vm-poc.ts b/web/scripts/test-blaxel-vm-poc.ts
deleted file mode 100644
index 6cf7e23c021a..000000000000
--- a/web/scripts/test-blaxel-vm-poc.ts
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/usr/bin/env bun
-// Live E2E proof for the Blaxel Cloud VM driver, run directly against the driver (no HTTP
-// route, no Postgres): create a sandbox, let the driver install and start the cmux-tui
-// remote daemon, mint the cmux-remote attach endpoint (route + enrollment invitation),
-// verify the daemon answers on that route, check the smart-sleep watcher, then destroy
-// the sandbox. The Noise handshake itself needs a cmux-tui client and is covered by
-// `cmux vm tui <id>` from the Mac.
-//
-// Usage:
-//   set -a; source ~/.secrets/cmux.env; set +a   # BL_API_KEY, BL_WORKSPACE
-//   bun scripts/test-blaxel-vm-poc.ts [--keep]
-import { BlaxelProvider } from "../services/vms/drivers/blaxel";
-import { resolveVmImage } from "../services/vms/images/resolver";
-
-const keep = process.argv.includes("--keep");
-
-function log(step: string, detail?: unknown) {
-  console.log(`[blaxel-poc] ${step}${detail === undefined ? "" : ` ${JSON.stringify(detail)}`}`);
-}
-
-// The daemon route is a tokenized WebSocket URL. Dialing it without a Noise handshake
-// proves the ingress + daemon are up (the upgrade completes) without enrolling a device.
-async function probeRoute(route: string): Promise<{ opened: boolean; detail: string }> {
-  return new Promise((resolve) => {
-    const ws = new WebSocket(route);
-    const timer = setTimeout(() => {
-      ws.close();
-      resolve({ opened: false, detail: "timeout" });
-    }, 15_000);
-    ws.onopen = () => {
-      clearTimeout(timer);
-      ws.close();
-      resolve({ opened: true, detail: "upgrade completed" });
-    };
-    ws.onerror = (event) => {
-      clearTimeout(timer);
-      resolve({ opened: false, detail: String((event as { message?: string }).message ?? "error") });
-    };
-  });
-}
-
-const provider = new BlaxelProvider();
-const image = resolveVmImage("blaxel", process.env.BLAXEL_SANDBOX_IMAGE, process.env).image;
-
-log("create", { image });
-const t0 = Date.now();
-const handle = await provider.create({ image });
-log("created", { vmId: handle.providerVmId, ms: Date.now() - t0, previewUrl: handle.providerMetadata?.previewUrl });
-
-let failed = false;
-try {
-  const execResult = await provider.exec(handle.providerVmId, "uname -sm && whoami && cmux-tui --version");
-  log("exec", execResult);
-  if (execResult.exitCode !== 0) throw new Error("exec failed (cmux-tui missing?)");
-
-  // The legacy attach must be refused: the driver serves cmux-remote only.
-  let legacyRefused = false;
-  try {
-    await provider.openAttach(handle.providerVmId, { requireDaemon: true });
-  } catch (err) {
-    legacyRefused = /cmux-remote/.test(err instanceof Error ? err.message : String(err));
-  }
-  log("legacy-attach-refused", { pass: legacyRefused });
-  if (!legacyRefused) throw new Error("openAttach must be refused on Blaxel (cmux-tui only)");
-
-  const t1 = Date.now();
-  const endpoint = await provider.openCmuxRemote(handle.providerVmId, {
-    deviceFingerprint: "poc-device",
-    providerMetadata: handle.providerMetadata,
-  });
-  log("cmux-remote-endpoint", {
-    route: endpoint.route.replace(/bl_preview_token=[^&]+/, "bl_preview_token=<redacted>"),
-    session: endpoint.session,
-    invited: !!endpoint.invitation,
-    daemonBuild: endpoint.daemonBuild ?? null,
-    ms: Date.now() - t1,
-  });
-  if (endpoint.transport !== "cmux-remote") throw new Error("expected a cmux-remote endpoint");
-  if (!endpoint.invitation) throw new Error("a never-enrolled device must receive an enrollment invitation");
-
-  const probe = await probeRoute(endpoint.route);
-  log("route-probe", probe);
-  if (!probe.opened) throw new Error(`daemon route did not accept a WebSocket upgrade: ${probe.detail}`);
-
-  const pending = await provider.approveCmuxRemoteEnrollment(handle.providerVmId, endpoint.invitation.invitationId);
-  log("approve-unclaimed-invitation", pending);
-  if (pending.state !== "pending") throw new Error("an unclaimed invitation must report pending, not approve");
-
-  const status = await provider.getStatus(handle.providerVmId);
-  log("status", { status });
-
-  // Smart sleep: the watcher must be the keepAlive process and the daemon must not be, so an
-  // idle sandbox can freeze to $0 while a busy one keeps running with the laptop closed.
-  const watcherCheck = await provider.exec(
-    handle.providerVmId,
-    "pgrep -f cmux-smart-sleep >/dev/null && echo watcher-running; pgrep -x cmuxd-remote >/dev/null && echo cmuxd-present",
-  );
-  log("smart-sleep-watcher", { pass: watcherCheck.stdout.includes("watcher-running") });
-  if (!watcherCheck.stdout.includes("watcher-running")) {
-    throw new Error("smart-sleep watcher is not running after create");
-  }
-  if (watcherCheck.stdout.includes("cmuxd-present")) {
-    throw new Error("cmuxd-remote must not run on a cmux-tui-only machine");
-  }
-} catch (err) {
-  failed = true;
-  console.error("[blaxel-poc] FAIL:", err);
-} finally {
-  if (keep) {
-    log("keeping sandbox for manual inspection", { vmId: handle.providerVmId });
-  } else {
-    await provider.destroy(handle.providerVmId);
-    log("destroyed", { vmId: handle.providerVmId });
-  }
-}
-
-if (failed) process.exit(1);
-log("PASS");
diff --git a/web/scripts/test-cloud-vm-ws-auth.ts b/web/scripts/test-cloud-vm-ws-auth.ts
index 13da39811edd..511600744d04 100644
--- a/web/scripts/test-cloud-vm-ws-auth.ts
+++ b/web/scripts/test-cloud-vm-ws-auth.ts
@@ -2,21 +2,12 @@
 import { createHash, randomBytes } from "node:crypto";
 import WebSocket from "ws";
 import { Sandbox } from "e2b";
-import { Freestyle } from "freestyle";
 import { Daytona, type Sandbox as DaytonaSandbox } from "@daytonaio/sdk";
 
-type Provider = "e2b" | "freestyle" | "daytona";
-type FreestyleVmRef = {
-  exec(args: { command: string; timeoutMs?: number }): Promise<{
-    stdout?: string | null;
-    stderr?: string | null;
-    statusCode?: number | null;
-  }>;
-};
-
+type Provider = "e2b" | "daytona";
 const provider = argValue("--provider") as Provider | undefined;
-if (provider !== "e2b" && provider !== "freestyle" && provider !== "daytona") {
-  throw new Error("--provider must be e2b, freestyle, or daytona");
+if (provider !== "e2b" && provider !== "daytona") {
+  throw new Error("--provider must be e2b or daytona");
 }
 
 const image = argValue("--image") ?? argValue("--template") ?? argValue("--snapshot");
@@ -27,13 +18,10 @@ if (!image) {
 const keep = hasFlag("--keep");
 const ptyLeasePath = "/tmp/cmux/attach-pty-lease.json";
 const legacyPtyLeasePath = "/tmp/cmux/attach-lease.json";
-const freestyleTimeoutMs = 15 * 60 * 1000;
 
 const result = provider === "e2b"
   ? await testE2B(image, keep)
-  : provider === "freestyle"
-    ? await testFreestyle(image, keep)
-    : await testDaytona(image, keep);
+  : await testDaytona(image, keep);
 console.log(JSON.stringify(result, null, 2));
 
 function argValue(name: string): string | undefined {
@@ -119,78 +107,6 @@ async function testE2B(template: string, keep: boolean): Promise<Record<string,
   }
 }
 
-async function testFreestyle(snapshotId: string, keep: boolean): Promise<Record<string, unknown>> {
-  if (!process.env.FREESTYLE_API_KEY) {
-    throw new Error("FREESTYLE_API_KEY is required");
-  }
-  const fs = freestyleClient();
-  const created = await fs.vms.create({
-    snapshotId,
-    ports: [{ port: 443, targetPort: 7777 }],
-    readySignalTimeoutSeconds: 600,
-  });
-  const vmId = created.vmId;
-  const vm = fs.vms.ref({ vmId });
-
-  try {
-    const domain = (created as { domains?: string[] }).domains?.[0] ?? `${vmId}.vm.freestyle.sh`;
-    const httpURL = `https://${domain}`;
-    const wsURL = `wss://${domain}/terminal`;
-    const rpcURL = `wss://${domain}/rpc`;
-
-    const health = await fetch(`${httpURL}/healthz`);
-    if (health.status !== 200) {
-      throw new Error(`expected Freestyle healthz 200, got ${health.status}`);
-    }
-    const service = await readFreestyleWebSocketService(vm);
-    if (!service.rpcLeasePath) {
-      throw new Error("Freestyle cmuxd-ws service is missing --rpc-auth-lease-file; browser proxy cannot work");
-    }
-
-    await installLeaseFreestyle(vm, service.ptyLeasePath, "wrong-freestyle", "sess-fs", true);
-    const wrongCmuxToken = await websocketAuthShouldFail(wsURL, {}, "wrong-token", "sess-fs");
-    const leaseStillThere = await freestyleFileExists(vm, service.ptyLeasePath);
-    if (!leaseStillThere) throw new Error("wrong cmux token consumed Freestyle lease");
-
-    const token = await installLeaseFreestyle(vm, service.ptyLeasePath, "right-freestyle", "sess-fs", true);
-    const terminalOutput = await websocketShellRoundTrip(wsURL, {}, token, "sess-fs");
-    const replay = await websocketAuthShouldFail(wsURL, {}, token, "sess-fs");
-
-    const rpcToken = await installLeaseFreestyle(vm, service.rpcLeasePath, "rpc-freestyle", "sess-rpc-fs", false);
-    const rpcHello = await websocketRPCHello(rpcURL, {}, rpcToken, "sess-rpc-fs");
-    const rpcHelloReplay = await websocketRPCHello(rpcURL, {}, rpcToken, "sess-rpc-fs");
-    const rpcProxyHealthz = await websocketRPCProxyHTTPRoundTrip(
-      rpcURL,
-      {},
-      rpcToken,
-      "sess-rpc-fs",
-      "127.0.0.1",
-      7777,
-      "/healthz",
-    );
-
-    return {
-      provider: "freestyle",
-      vmId,
-      domain,
-      ptyLeasePath: service.ptyLeasePath,
-      rpcLeasePath: service.rpcLeasePath,
-      health: health.status,
-      wrongCmuxToken,
-      terminalOutput,
-      replay,
-      rpcHello,
-      rpcHelloReplay,
-      rpcProxyHealthz,
-      kept: keep,
-    };
-  } finally {
-    if (!keep) {
-      await fs.vms.delete({ vmId }).catch(() => undefined);
-    }
-  }
-}
-
 async function testDaytona(snapshot: string, keep: boolean): Promise<Record<string, unknown>> {
   if (!process.env.DAYTONA_API_KEY) {
     throw new Error("DAYTONA_API_KEY is required");
@@ -270,12 +186,6 @@ async function testDaytona(snapshot: string, keep: boolean): Promise<Record<stri
   }
 }
 
-function freestyleClient(timeoutMs = freestyleTimeoutMs): Freestyle {
-  const longFetch: typeof fetch = (input, init) =>
-    fetch(input as Request, { ...(init ?? {}), signal: AbortSignal.timeout(timeoutMs) });
-  return new Freestyle({ fetch: longFetch });
-}
-
 async function installLeaseE2B(
   sandbox: Sandbox,
   path: string,
@@ -309,22 +219,6 @@ async function readE2BWebSocketService(sandbox: Sandbox): Promise<{
   };
 }
 
-async function installLeaseFreestyle(
-  vm: FreestyleVmRef,
-  path: string,
-  label: string,
-  sessionId: string,
-  singleUse: boolean,
-): Promise<string> {
-  const { token, lease } = makeLease(label, sessionId, singleUse);
-  const encoded = Buffer.from(JSON.stringify(lease)).toString("base64");
-  await vm.exec({
-    command: `${ensurePrivateDirectoryCommand(path)} && printf '%s' '${encoded}' | base64 -d > ${shellQuote(path)} && chmod 600 ${shellQuote(path)}`,
-    timeoutMs: 30_000,
-  });
-  return token;
-}
-
 async function installLeaseDaytona(
   sandbox: DaytonaSandbox,
   path: string,
@@ -384,31 +278,6 @@ async function e2bFileExists(sandbox: Sandbox, path: string): Promise<boolean> {
   return result.stdout.trim() === "yes";
 }
 
-async function freestyleFileExists(vm: FreestyleVmRef, path: string): Promise<boolean> {
-  const result = await vm.exec({
-    command: `test -f ${shellQuote(path)} && echo yes || echo no`,
-    timeoutMs: 30_000,
-  });
-  return (result.stdout ?? "").trim() === "yes";
-}
-
-async function readFreestyleWebSocketService(vm: FreestyleVmRef): Promise<{
-  ptyLeasePath: string;
-  rpcLeasePath: string | null;
-}> {
-  const result = await vm.exec({
-    command: "systemctl cat cmuxd-ws 2>/dev/null || true; ps auxww | grep cmuxd-remote | grep -v grep || true",
-    timeoutMs: 30_000,
-  });
-  const stdout = result.stdout ?? "";
-  return {
-    ptyLeasePath:
-      shellArgValue(stdout, "--auth-lease-file")
-      ?? (stdout.includes(legacyPtyLeasePath) ? legacyPtyLeasePath : ptyLeasePath),
-    rpcLeasePath: shellArgValue(stdout, "--rpc-auth-lease-file"),
-  };
-}
-
 async function websocketAuthShouldFail(
   url: string,
   headers: Record<string, string>,
diff --git a/web/scripts/verify-devbox-image.ts b/web/scripts/verify-devbox-image.ts
index cda6d73d0a82..188270b93ada 100644
--- a/web/scripts/verify-devbox-image.ts
+++ b/web/scripts/verify-devbox-image.ts
@@ -20,10 +20,9 @@
  */
 import { Daytona } from "@daytonaio/sdk";
 import { Sandbox } from "e2b";
-// The devbox freestyle bake targets the BETA platform (see
-// build-devbox-freestyle.ts), so its snapshots are verified with the beta
-// SDK too. The shipped freestyle driver still speaks the legacy platform.
-import { Freestyle } from "freestyle-beta";
+// The devbox freestyle bake targets the public platform (see
+// build-devbox-freestyle.ts), the same platform the shipped driver speaks.
+import { Freestyle } from "freestyle";
 import path from "node:path";
 import {
   CMUX_TUI_SESSION,
@@ -264,10 +263,11 @@ if (provider === "e2b") {
   const apiKey = process.env.FREESTYLE_API_KEY;
   const stackToken = process.env.FREESTYLE_STACK_ACCESS_TOKEN;
   const teamId = process.env.FREESTYLE_TEAM_ID;
+  const baseUrl = process.env.FREESTYLE_API_URL?.trim() || undefined;
   const fs = apiKey
-    ? new Freestyle({ apiKey })
+    ? new Freestyle({ apiKey, baseUrl })
     : stackToken && teamId
-      ? new Freestyle({ stackAccessToken: stackToken, teamId })
+      ? new Freestyle({ stackAccessToken: stackToken, teamId, baseUrl })
       : (() => {
           throw new Error("set FREESTYLE_API_KEY, or FREESTYLE_STACK_ACCESS_TOKEN + FREESTYLE_TEAM_ID");
         })();
@@ -275,7 +275,7 @@ if (provider === "e2b") {
   const { vm, vmId } = await fs.vms.create({
     snapshotId: image,
     displayName: "cmux-devbox-verify",
-    // Beta creates require an explicit firewall; the daemon install below
+    // Creates require an explicit firewall; the daemon install below
     // needs outbound (files.cmux.com).
     firewall: { rules: [{ action: "allow", source: {}, destination: { public: true } }] },
   });
@@ -284,7 +284,8 @@ if (provider === "e2b") {
     const exec: Exec = async (cmd, timeoutMs = 120_000) => {
       // Login bash for the mise shims; Freestyle guest exec has an empty HOME.
       const wrapped = `bash -lc 'export HOME="$\{HOME:-$(getent passwd $(id -u) | cut -d: -f6)\}"; export PATH="/opt/mise/shims:$\{PATH\}"; ${cmd.replace(/'/g, `'\\''`)}'`;
-      const r = await vm.exec({ command: wrapped, timeoutMs: Math.min(timeoutMs, 300_000) });
+      // The 0.2 API defaults to uid 1000; the driver runs everything as root.
+      const r = await vm.exec({ command: wrapped, timeoutMs: Math.min(timeoutMs, 300_000), linuxUser: "root" });
       return {
         exitCode: r.statusCode ?? 124,
         output: `${r.stdout ?? ""}${r.stderr ?? ""}`,
diff --git a/web/services/coderouter/vmModelPlane.ts b/web/services/coderouter/vmModelPlane.ts
index 92f8fcd41bb5..a450510e30f6 100644
--- a/web/services/coderouter/vmModelPlane.ts
+++ b/web/services/coderouter/vmModelPlane.ts
@@ -9,7 +9,7 @@
 //
 // The baked image's /etc/cmux/agent-config.sh materializes harness configs
 // from these vars at first shell and persists them on the machine's durable
-// home volume, because Blaxel create-time envs do not survive a resurrect.
+// home volume, because provider create-time envs do not survive a resurrect.
 // Minting is best-effort by design: a coderouter outage or an entitlement
 // block must never fail a VM create, it only ships an unwired machine.
 import { coderouterEntitlement } from "./entitlement";
diff --git a/web/services/vms/README.md b/web/services/vms/README.md
index 4a5f25c04de3..6254baa6c3bd 100644
--- a/web/services/vms/README.md
+++ b/web/services/vms/README.md
@@ -1,6 +1,6 @@
 # Cloud VMs service
 
-Backend for `cmux vm new/ls/rm/exec/attach` and the sidebar Cloud VM surface. Stack Auth gates every public route. Provider API keys stay server-side. Blaxel, E2B, and Daytona machines attach through the cmux-tui remote daemon (transport `cmux-remote`); Freestyle still serves the legacy `cmuxd-remote` WebSocket PTY with short-lived leases, and older Freestyle VMs can fall back to its SSH gateway.
+Backend for `cmux vm new/ls/rm/exec/attach` and the sidebar Cloud VM surface. Stack Auth gates every public route. Provider API keys stay server-side. Every machine — Freestyle, E2B, Daytona — attaches through the cmux-tui remote daemon (transport `cmux-remote`). The legacy `cmuxd-remote` WebSocket PTY and the Freestyle SSH gateway are gone.
 
 ## Layout
 
@@ -9,7 +9,7 @@ services/vms/
   auth.ts             Stack Auth request verification helpers
   billingGateway.ts   Stack Auth VM create-credit reservations
   entitlements.ts     Team plan and active VM limit resolution
-  drivers/            Provider SDK adapters for E2B, Freestyle, and Daytona
+  drivers/            Provider SDK adapters for Freestyle, E2B, and Daytona
   images/             Checked-in known-good provider image manifest
   errors.ts           Typed Effect errors for VM workflows
   config.ts           Runtime kill switches and deployment guards
@@ -28,7 +28,6 @@ db/
 - `/api/vm/:id`, authenticated `DELETE` destroy.
 - `/api/vm/:id/exec`, authenticated `POST` command execution.
 - `/api/vm/:id/attach-endpoint`, authenticated `POST` PTY/RPC attach lease minting.
-- `/api/vm/:id/ssh-endpoint`, authenticated `POST` legacy Freestyle SSH attach.
 
 There is no raw actor or provider protocol endpoint. The old `/api/rivet/*` gateway has been removed.
 
@@ -69,8 +68,8 @@ the provider, provider image id, cmux image version, build metadata, and validat
 Default image policy:
 
 - Production and staging select images with `E2B_CMUXD_WS_TEMPLATE`,
-  `FREESTYLE_SANDBOX_SNAPSHOT`, `DAYTONA_SANDBOX_SNAPSHOT`, and for Blaxel `BLAXEL_SANDBOX_IMAGE`
-  (base machines) plus `BLAXEL_SANDBOX_DESKTOP_IMAGE` (desktop machines).
+  `FREESTYLE_SANDBOX_SNAPSHOT`, and `DAYTONA_SANDBOX_SNAPSHOT`. A provider that ships a
+  desktop image also gets a `_DESKTOP_IMAGE` selector; none does today.
 - Clients request a machine **kind** (`kind: "desktop" | "base"` on `POST /api/vm`,
   `POST /api/vm/base/open`, and `POST /api/vm/base/reset`) rather than pinning an image id. With
   no `image`, the resolver picks the kind's env var, then the manifest entry flagged
@@ -88,9 +87,15 @@ Default image policy:
   `expectNoCloudVmImplementationLeaks` in `tests/vm-route-auth.test.ts`).
 - Local development uses the manifest entry marked `defaultForLocalDev` when the provider env var
   is unset.
-- The current intended default provider is Blaxel. Set `CMUX_VM_DEFAULT_PROVIDER=blaxel` (the local
-  loader supplies this when unset); Freestyle, E2B, and Daytona remain explicit rollback/provider
-  overrides rather than silent fallbacks.
+- The current intended default provider is Freestyle on the public platform
+  (`api.freestyle.sh`). Set `CMUX_VM_DEFAULT_PROVIDER=freestyle` (the local loader supplies
+  this when unset); E2B and Daytona remain explicit rollback/provider overrides rather than
+  silent fallbacks.
+- **The Freestyle devbox snapshot must be re-baked on the public platform.** The manifest's
+  only Freestyle entry (`sh-fb3dcf7b…`) was baked against the retired `beta-api.freestyle.sh`
+  and is marked `validationStatus: "unknown"`. Until `scripts/build-devbox-freestyle.ts` bakes
+  a public-platform snapshot and its id lands in the manifest, Freestyle creates fail closed
+  with `vm_image_config_error`.
 - Baked agent tools are installed at image-build time. They are not auto-updated on VM startup, so
   startup latency stays bounded and the active image manifest remains the source of truth.
 - To update tool versions, rebuild the provider images and record the new template/snapshot IDs in
@@ -114,7 +119,7 @@ Rollback is an env-only operation:
 
 The E2B, Daytona, and Freestyle devbox images are defined in
 `web/services/vms/images/devbox/` and baked with `web/scripts/build-devbox-e2b.ts`,
-`build-devbox-daytona.ts`, and `build-devbox-freestyle.ts` (chatmux/Blaxel devbox
+`build-devbox-daytona.ts`, and `build-devbox-freestyle.ts` (chatmux devbox
 parity: devtools, mise node/python/bun, uv, gh, Chrome + cua-driver, pinned coding
 agents, ble.sh devshell, agent-config generator). The session daemon is cmux-tui,
 installed at create time from the pinned files.cmux.com artifacts manifest by
@@ -205,7 +210,7 @@ Set these Vercel environment variables per production/staging environment:
 - `E2B_CMUXD_WS_TEMPLATE`, E2B template alias/name for WebSocket PTY sandboxes.
 - `FREESTYLE_SANDBOX_SNAPSHOT`, Freestyle snapshot id.
 - `DAYTONA_SANDBOX_SNAPSHOT`, Daytona snapshot name for WebSocket PTY sandboxes.
-- `CMUX_VM_DEFAULT_PROVIDER`, `blaxel`, `freestyle`, `e2b`, or `daytona` (defaults to `blaxel`).
+- `CMUX_VM_DEFAULT_PROVIDER`, `freestyle`, `e2b`, or `daytona` (defaults to `freestyle`).
 - `CMUX_VM_DEFAULT_PLAN`, optional fallback for accounts without plan metadata. It defaults to `free`;
   paid values are ignored unless `CMUX_VM_ALLOW_FREE_PROVISIONING=1`, so deployment configuration
   cannot silently grant every unclassified account a paid entitlement.
@@ -310,76 +315,63 @@ The dev Postgres port is `CMUX_PORT + 10000`, so `CMUX_PORT=10180` maps to `loca
 
 ## Provider matrix
 
-| Verb                        | Freestyle | E2B | Daytona | Blaxel |
-|-----------------------------|-----------|-----|---------|--------|
-| `cmux vm new`               | yes       | yes | yes | yes |
-| `cmux vm new --workspace`   | yes       | yes | yes | yes |
-| `cmux vm new --detach`      | yes       | yes | yes | yes |
-| `cmux vm attach <id>`       | yes       | yes | yes | yes |
-| `cmux vm ssh <id>`          | yes       | yes | yes | yes |
-| `cmux vm ssh-info <id>`     | legacy SSH info only | legacy SSH info only | no (WebSocket only) | no (WebSocket only) |
-| `cmux vm exec <id> -- ...`  | yes       | yes | yes | yes |
-| `cmux vm ls / rm`           | yes       | yes | yes | yes |
-| snapshot / restore          | yes       | yes | yes | not yet |
+| Verb                        | Freestyle | E2B | Daytona |
+|-----------------------------|-----------|-----|---------|
+| `cmux vm new`               | yes       | yes | yes |
+| `cmux vm new --workspace`   | yes       | yes | yes |
+| `cmux vm new --detach`      | yes       | yes | yes |
+| `cmux vm attach <id>`       | yes       | yes | yes |
+| `cmux vm ssh <id>`          | yes       | yes | yes |
+| `cmux vm ssh-info <id>`     | no (cmux-remote only) | no (cmux-remote only) | no (cmux-remote only) |
+| `cmux vm exec <id> -- ...`  | yes       | yes | yes |
+| `cmux vm ls / rm`           | yes       | yes | yes |
+| snapshot / restore          | yes       | yes | yes |
 
 `cmux vm ssh <id>` is the user-facing interactive alias and opens the same managed workspace path
-as `cmux vm attach <id>`. `cmux vm ssh-info <id>` is print-only for provider SSH debugging.
-
-Blaxel machines boot the baked `sandbox/cmux-devbox` image (template in
-`services/vms/images/blaxel/`, published with `web/scripts/build-blaxel-image.sh` on
-Blaxel's remote builder): chatmux-devbox tool parity (mise node/python/bun, uv, gh,
-devtools, pinned coding agents, ble.sh, half-life prompt, seeded history) plus an
-openbox/TigerVNC desktop with Ghostty, Chrome, and noVNC on 6901. The image stamps
-`/etc/cmux/image-stamp`, which short-circuits the driver's create-time provisioning
-fallback for stock images, and keeps the stock desktop contract (`start-vnc.sh` as user
-`cua`, RFB 5901) so the driver's VNC heal works unchanged. Stock `blaxel/xfce-vnc:latest`
-remains a validated manifest fallback (`BLAXEL_SANDBOX_IMAGE`;
-`blaxel/base-image:latest` with `cmux vm new --base`). Machines run no cmuxd-remote: the
-driver bootstraps every image, baked or stock, at create time with the **cmux-tui remote
-daemon as the machine's only session daemon**.
-The sandbox downloads the pinned static-musl `cmux-tui` build onto its persistent home
-volume, normally `/cmux/home/.cmux/bin/cmux-tui`, with `sha256sum -c` verification inside
-the VM. A bindfs identity view presents that volume at `/home/cmux`; the supervisor runs the
-daemon and its terminal panes as `cmux` (uid 1001) with passwordless sudo. The binary and
-daemon state are reused on resurrection. The build and its digest come from the artifacts
-manifest published by `.github/workflows/cmux-tui-artifacts.yml`, nothing is pinned by hand.
-Config: `BL_API_KEY`, `BL_WORKSPACE`; optionally `CMUX_VM_CMUX_TUI_MANIFEST_URL` to pin a
-deployment to one commit's `https://files.cmux.com/cmux-tui/<commit>/manifest.json` instead
-of the rolling `latest`. Blaxel freezes a sandbox ~15 s after the last connection unless a
-`keepAlive` process runs; the smart-sleep watcher is that process and exits once every
-cmux-tui shell is idle and no client is connected, so an idle machine drops to (free)
-standby and the next attach wakes it.
-
-The persistent home volume (`/cmux/home`) is sized from the machine's memory in dev-box tiers
-(`defaultHomeVolumeMbForMemory`: ≤4 GB → 8 GB, otherwise 16 GB, Blaxel refuses volumes above
-16 GB, measured 2026-08-26, so the 24 GB plan default gets the 16 GB ceiling instead of the old
-flat 5 GB). `CMUX_VM_BLAXEL_HOME_VOLUME_MB` pins every new volume to one size instead. The
-chosen size is recorded in `providerMetadata.homeVolumeMb`. Volumes are never resized: existing
-machines keep the volume they were created with, and a size Blaxel's volume API rejects fails the
-create with the provider's message. Sandboxes created before this layout change still mount their
-volume at `/root` and keep a root daemon until resurrection. If the `/home/cmux` bindfs view is
-unavailable, the daemon and `cmux vm exec` use `/cmux/home` as a root fallback, so they never
-write to the disposable rootfs home.
-
-Preview ingress is enforced private: attach only reuses a preview whose spec is not public,
-replaces a public one, and refuses a preview that comes back public, so the daemon is never
-reachable without a minted preview token. The daemon has two previews for port 1337: the
-branded `https://<machine>.vm.cmux.sh` host (whose ingress refuses WebSocket upgrades
-without a User-Agent, so it is handed only to clients advertising the
-`direct-ws-user-agent` capability from `cmux-tui remote-probe --json`) and the raw
-`<hash>.preview.bl.run` host for everyone else. `POST /api/vm/[id]/attach-endpoint` with
+as `cmux vm attach <id>`. No provider serves an SSH gateway any more, so `cmux vm ssh-info <id>`
+has nothing to print and `POST /api/vm/:id/ssh-endpoint` is gone.
+
+Freestyle machines boot the shared devbox snapshot (definition in
+`services/vms/images/devbox/`, baked with `web/scripts/build-devbox-freestyle.ts` against
+the public platform `api.freestyle.sh`): chatmux-devbox tool parity (mise node/python/bun,
+uv, gh, devtools, pinned coding agents, ble.sh, half-life prompt, seeded history). Machines
+run no cmuxd-remote: the driver bootstraps the image at create time with the **cmux-tui
+remote daemon as the machine's only session daemon**, downloading the pinned static-musl
+`cmux-tui` build to `/root/.cmux/bin/cmux-tui` with `sha256sum -c` verification inside the
+VM. The daemon runs as root with `HOME=/root`; the build and its digest come from the
+artifacts manifest published by `.github/workflows/cmux-tui-artifacts.yml`, nothing is
+pinned by hand. Config: `FREESTYLE_API_KEY` (or `FREESTYLE_STACK_ACCESS_TOKEN` +
+`FREESTYLE_TEAM_ID`), `FREESTYLE_SANDBOX_SNAPSHOT`; optionally `FREESTYLE_API_URL` to point
+at a non-default edge and `CMUX_VM_CMUX_TUI_MANIFEST_URL` to pin a deployment to one
+commit's `https://files.cmux.com/cmux-tui/<commit>/manifest.json` instead of the rolling
+`latest`.
+
+There is no HTTP ingress proxy to arbitrary VM ports on the public platform (a TLS edge rule
+needs a customer-verified domain), so the daemon is reached directly at the VM's stable
+public IPv6: `ws://[<publicIpv6>]:1337/v1/link`. Creates state a mandatory `firewall` —
+outbound open, inbound only 1337 — and the daemon binds dual-stack (`[::]:1337`), re-asserted
+on every attach-time heal because a daemon bound `0.0.0.0` is unreachable at that address.
+The Noise handshake encrypts and authenticates the session end to end, so carrier TLS is not
+required; the route token exists only for the lease ledger. Creates take no ports field and
+no create-time env, so the coderouter model-plane vars are delivered by writing the persisted
+`/root/.config/cmux/model-plane.env` (0600) that `/etc/cmux/agent-config.sh` already sources.
+
+Every guest command is run with `linuxUser: "root"`. The 0.2 API's default is *not* root but
+"the account holding uid 1000, or root in an image with no such account", and the devbox image
+ships a uid-1000 user — leaving it unset would silently move the daemon, its install, and the
+model-plane write off the root layout they are baked around.
+
+`POST /api/vm/[id]/attach-endpoint` with
 `{"transport":"cmux-remote","clientCapabilities":[...]}` returns
-`{route, token, session, daemonBuild?, invitation?}` where `route` is
-`wss://<host>/v1/link?bl_preview_token=…` and `invitation` is a single-use
+`{route, token, session, daemonBuild?, invitation?}` where `invitation` is a single-use
 `cmux://enroll/…` URI minted only when the caller's device is not enrolled. The client
 connects with `cmux-tui remote connect <route> --invite-file …`, then
 `POST /api/vm/[id]/cmux-remote/approve {invitationId}` approves the pending claim (poll
 until `state` is `approved`). The legacy websocket/SSH attach (`attach-endpoint` without a
-transport, `POST /api/vm/[id]/sessions`) answers `409 vm_attach_transport_unsupported` on
-Blaxel machines with `details.supportedTransports: ["cmux-remote"]`. `cmux vm shell`,
-`cmux vm new`, `cmux vm base open` and the Machines panel all drive this from the Mac.
-See docs/cloud-cmux-tui-daemon.md for the design. Live driver E2E:
-`bun scripts/test-blaxel-vm-poc.ts`.
+transport, `POST /api/vm/[id]/sessions`) answers `409 vm_attach_transport_unsupported` with
+`details.supportedTransports: ["cmux-remote"]`. `cmux vm shell`, `cmux vm new`,
+`cmux vm base open` and the Machines panel all drive this from the Mac.
+See docs/cloud-cmux-tui-daemon.md for the design.
 
 E2B and Daytona machines run the same cmux-tui daemon and only the `cmux-remote`
 transport. The E2B route is the sandbox's public port host
@@ -392,11 +384,12 @@ not use Daytona's SSH gateway. The backend writes only a hash of attach tokens t
 Postgres; raw tokens are returned once to the Mac client. Machines created by the
 old cmuxd-remote drivers cannot serve this transport and need recreation.
 
-Operational note: Blaxel is the intended default. Before rollout or rollback, verify the deployed
-`CMUX_VM_DEFAULT_PROVIDER`, `CMUX_VM_BLAXEL_ENABLED`, `BL_API_KEY`, and `BL_WORKSPACE` env values
-with `bun run cloud-vm:env:audit -- <target> --strict`, then confirm WebSocket PTY, reusable
-daemon RPC lease, and browser proxy health with `bun run cloud-vm:stress -- <target> --provider default`.
-Keep Freestyle/E2B enabled only when deliberately selecting them as rollback providers.
+Operational note: Freestyle is the intended default. Before rollout or rollback, verify the
+deployed `CMUX_VM_DEFAULT_PROVIDER`, `CMUX_VM_FREESTYLE_ENABLED`, `FREESTYLE_API_KEY`, and
+`FREESTYLE_SANDBOX_SNAPSHOT` env values with `bun run cloud-vm:env:audit -- <target> --strict`,
+then confirm attach and daemon health with
+`bun run cloud-vm:stress -- <target> --provider default`.
+Keep E2B/Daytona enabled only when deliberately selecting them as rollback providers.
 
 ## Usage, limits, and pricing
 
diff --git a/web/services/vms/config.ts b/web/services/vms/config.ts
index e160aa791912..ac1924e804cb 100644
--- a/web/services/vms/config.ts
+++ b/web/services/vms/config.ts
@@ -39,8 +39,6 @@ export function providerEnabledEnvKey(provider: ProviderId): string {
       return "CMUX_VM_FREESTYLE_ENABLED";
     case "daytona":
       return "CMUX_VM_DAYTONA_ENABLED";
-    case "blaxel":
-      return "CMUX_VM_BLAXEL_ENABLED";
     default:
       return assertNever(provider);
   }
diff --git a/web/services/vms/desktopWrapper.ts b/web/services/vms/desktopWrapper.ts
index f5213c71e404..8ed082c74939 100644
--- a/web/services/vms/desktopWrapper.ts
+++ b/web/services/vms/desktopWrapper.ts
@@ -1,22 +1,34 @@
 /**
  * The cmux-owned desktop wrapper: the URL a person actually sees and keeps.
  *
- * Blaxel's gateway owns the `bl_preview_token` query parameter — it cannot be
- * renamed at their edge — so instead the raw tokened preview URL stops being
+ * A desktop preview gateway owns its own token query parameter and cannot be
+ * asked to rename it, so instead the raw tokened preview URL stops being
  * user-visible at all. `openUrl` for a port open points at
  * `/vm/desktop/<machine>?cmux_token=…` on our origin; that page validates the
  * upstream host and token, then sends the pane to the noVNC page top-level with
  * the gateway's own parameter. It must be a top-level navigation, not an iframe:
- * the gateway answers the tokened request with a `bl_preview_token` cookie that
- * every later asset, and the websockify upgrade, must carry, and WebKit refuses
+ * the gateway answers the tokened request with a matching cookie that every
+ * later asset, and the websockify upgrade, must carry, and WebKit refuses
  * third-party cookies inside a cross-site frame — an iframed desktop rendered as
  * unstyled noVNC HTML with a dead Connect button. The wrapper also knows the
  * token's expiry, so a lapsed pane shows an honest "reopen from cmux" screen
  * instead of a silent white one.
+ *
+ * DORMANT: no driver implements `openPort`, so nothing produces an upstream URL
+ * for this wrapper today. It is kept as the seam for Freestyle desktop support
+ * (public Freestyle serves arbitrary ports through a TLS rule on a verified
+ * domain). Whoever wires that up sets DESKTOP_UPSTREAM_TOKEN_PARAM and the host
+ * suffix to whatever that edge actually uses.
  */
 
-/** Hosts the wrapper will agree to send a pane to: Blaxel previews, branded or not. */
-const ALLOWED_UPSTREAM_SUFFIXES = [".vm.cmux.sh", ".preview.bl.run"] as const;
+/** Hosts the wrapper will agree to send a pane to: the cmux-branded machine domain. */
+const ALLOWED_UPSTREAM_SUFFIXES = [".vm.cmux.sh"] as const;
+
+/**
+ * The upstream gateway's own token parameter. Still carries the retired
+ * gateway's name because no replacement edge has been chosen yet.
+ */
+const DESKTOP_UPSTREAM_TOKEN_PARAM = "bl_preview_token";
 
 export function isAllowedDesktopUpstreamHost(host: string | null | undefined): boolean {
   const normalized = host?.trim().toLowerCase();
@@ -75,7 +87,7 @@ export function desktopUpstreamUrl(input: {
   const token = input.token.trim();
   if (!token || !/^[A-Za-z0-9_-]{8,512}$/.test(token)) return null;
   const url = new URL(`https://${input.host.trim().toLowerCase()}/`);
-  url.searchParams.set("bl_preview_token", token);
+  url.searchParams.set(DESKTOP_UPSTREAM_TOKEN_PARAM, token);
   for (const key of FORWARDED_DISPLAY_PARAMS) {
     const value = input.params[key];
     const single = Array.isArray(value) ? value[0] : value;
diff --git a/web/services/vms/drivers/blaxel.ts b/web/services/vms/drivers/blaxel.ts
deleted file mode 100644
index 236be4e5671f..000000000000
--- a/web/services/vms/drivers/blaxel.ts
+++ /dev/null
@@ -1,2471 +0,0 @@
-import { dirname } from "node:path";
-import { randomBytes } from "node:crypto";
-import {
-  ProviderError,
-  type AttachEndpoint,
-  type AttachOptions,
-  type AttachTransport,
-  type CreateOptions,
-  type ExecOptions,
-  type ExecResult,
-  type SSHEndpoint,
-  type SnapshotRef,
-  type VMHandle,
-  type VMProvider,
-  type VMStats,
-  type VMStatus,
-  type VMVolume,
-  type VMVolumePage,
-  type VMVolumeListOptions,
-  type VMVolumeInventory,
-  type CmuxRemoteApprovalResult,
-  type CmuxRemoteApprovalOptions,
-  type CmuxRemoteAttachOptions,
-  type CmuxRemoteEndpoint,
-} from "./types";
-import { VmOperationUnsupportedError } from "../errors";
-import { withVmSpan } from "../telemetry";
-import { shellQuote } from "./wsLease";
-import {
-  approveCmuxTuiEnrollment,
-  CMUX_CLOUD_HOME,
-  CMUX_CLOUD_HOME_VOLUME_BACKING_PATH,
-  CMUX_CLOUD_LAYOUT,
-  CMUX_CLOUD_USER,
-  cmuxTuiBinaryPath,
-  cmuxTuiDaemonBuild,
-  cmuxTuiDaemonCommand as sharedCmuxTuiDaemonCommand,
-  cmuxTuiHomeViewMissingCondition,
-  cmuxTuiPersistentMountWait as sharedCmuxTuiPersistentMountWait,
-  CMUX_TUI_PERSISTENT_MOUNT_WAIT_TIMEOUT_MS,
-  CMUX_TUI_LAYOUT_MARKER_PATH,
-  cmuxTuiInstallCommand as sharedCmuxTuiInstallCommand,
-  cmuxTuiPinCheckCommand as sharedCmuxTuiPinCheckCommand,
-  cmuxTuiUserUsableCondition,
-  isCmuxTuiDeviceEnrolled,
-  mintCmuxTuiInvitation,
-  resolveCmuxTuiSource as sharedResolveCmuxTuiSource,
-  waitForCmuxTuiReady as sharedWaitForCmuxTuiReady,
-  type CmuxTuiInvoke,
-  type CmuxTuiSource,
-} from "./cmuxTuiDaemon";
-
-// Blaxel sandboxes are name-addressed micro-VMs reached over HTTPS only: a per-sandbox
-// "sandbox API" (process exec + filesystem) on the control side, and per-port preview URLs
-// (`https://<id>.<region>.preview.bl.run` + `X-Blaxel-Preview-Token` header) for ingress.
-// There is no raw TCP, so `openSSH` throws: Blaxel machines attach through the cmux-tui
-// remote daemon (transport `cmux-remote`, docs/cloud-cmux-tui-daemon.md), the machine's
-// only session daemon.
-//
-// Unlike the other drivers this one does not need a pre-baked provider image: `create`
-// bootstraps a stock Blaxel image by having the sandbox download the pinned cmux-tui
-// build onto its persistent home volume and starting `cmux-tui server start` under the
-// sandbox supervisor. Blaxel freezes a sandbox ~15 s after the last open connection
-// unless a keepAlive process runs; the smart-sleep watcher below is that process, so a
-// busy machine stays awake and an idle one drops to (free) standby.
-// 8080 is the Blaxel sandbox-api (control channel); never expose it through a preview.
-const CMUX_SANDBOX_API_PORT = 8080;
-const SMART_SLEEP_PATH = "/usr/local/bin/cmux-smart-sleep";
-const SMART_SLEEP_PROCESS_NAME = "cmux-keepalive";
-// cmux-tui remote daemon: listens on its own port behind a private preview. The binary
-// lives on the persistent home volume so a resurrected sandbox reuses it; daemon identity
-// and enrolled devices live under the same home (the daemon's default state dir), so
-// they survive as well. The daemon and every terminal pane run as the non-root cmux
-// user (CMUX_CLOUD_LAYOUT); machines from before that change keep their volume at
-// /root and stay root until resurrected (see cmuxTuiDaemonCommand).
-const CMUX_TUI_PORT = 1337;
-// Two previews for the same port: the branded one for clients that can pass the
-// custom-domain ingress, the raw one for everything else (see cmuxTuiPreviewBranded).
-const CMUX_TUI_PREVIEW_NAME = "cmuxtui";
-const CMUX_TUI_RAW_PREVIEW_NAME = "cmuxtui-raw";
-const CMUX_TUI_SESSION = "cloud";
-const CMUX_TUI_BINARY_PATH = cmuxTuiBinaryPath(CMUX_CLOUD_HOME);
-const CMUX_TUI_BACKING_BINARY_PATH = cmuxTuiBinaryPath(CMUX_CLOUD_HOME_VOLUME_BACKING_PATH);
-// Where the binary lived when the volume mounted at /root; still what a pre-layout
-// machine's running daemon was started from, so lease revocation must match it too.
-const CMUX_TUI_LEGACY_BINARY_PATH = cmuxTuiBinaryPath("/root");
-const CMUX_TUI_PROCESS_NAME = "cmux-tui-daemon";
-
-const CMUX_TUI_INSTALL_TIMEOUT_MS = 5 * 60 * 1000;
-// Blaxel keeps a sandbox awake while any keepAlive process runs and freezes it ~15 s after the
-// last connection otherwise. The watcher is that keepAlive process: it stays alive while any
-// cmux-tui shell has a foreground/background job (a daemon child with descendants) or any
-// client is connected to the daemon port, and exits after a sustained idle grace so the
-// sandbox drops to standby ($0, memory snapshot, ~25 ms wake). Every attach re-arms it, so
-// "wake" is just reconnecting.
-export const SMART_SLEEP_SCRIPT = `#!/bin/sh
-# cmux smart sleep: hold the sandbox awake while work is running or a client is attached.
-TUI_PORT_HEX=0539 # 1337 (cmux-tui remote daemon)
-IDLE_LIMIT=\${CMUX_SMART_SLEEP_IDLE_CHECKS:-8}
-INTERVAL=\${CMUX_SMART_SLEEP_INTERVAL:-15}
-idle=0
-while true; do
-  busy=""
-  for cm in $(pidof cmux-tui 2>/dev/null); do
-    for c in $(pgrep -P "$cm" 2>/dev/null); do
-      if pgrep -P "$c" >/dev/null 2>&1; then busy=jobs; break 2; fi
-    done
-  done
-  if [ -z "$busy" ]; then
-    if awk -v tui="$TUI_PORT_HEX" '$2 ~ ":"tui"$" && $4 == "01" { found=1 } END { exit !found }' /proc/net/tcp /proc/net/tcp6 2>/dev/null; then
-      busy=conn
-    fi
-  fi
-  if [ -n "$busy" ]; then
-    idle=0
-  else
-    idle=$((idle + 1))
-    if [ "$idle" -ge "$IDLE_LIMIT" ]; then
-      echo "smart-sleep: idle for $((idle * INTERVAL))s, releasing keepAlive"
-      exit 0
-    fi
-  fi
-  sleep "$INTERVAL"
-done
-`;
-// The persistent volume is virtiofs with all guest identity squashed to root
-// (measured 2026-08-28 on sandbox/cmux-devbox: chown is a silent no-op, and a file
-// created by uid 1001 comes back root:root 644 — the creator instantly loses write).
-// Idmapped bind mounts are refused by this virtiofs (mount_setattr EINVAL), so a
-// non-root home on the volume needs a FUSE identity map: the volume mounts at a
-// backing path and bindfs presents it at /home/cmux with every file owned by cmux,
-// performing the real I/O as root. Legacy root-owned volume data becomes cmux-owned
-// through the view instantly, with no chown walk.
-export const CMUX_HOME_VOLUME_BACKING_PATH = CMUX_CLOUD_HOME_VOLUME_BACKING_PATH;
-export const CMUX_HOME_BINDFS_COMMAND =
-  `bindfs -o allow_other --multithreaded --force-user=${CMUX_CLOUD_USER} --force-group=${CMUX_CLOUD_USER} ` +
-  `--create-for-user=root --create-for-group=root --chown-ignore --chgrp-ignore ` +
-  `${CMUX_HOME_VOLUME_BACKING_PATH} ${CMUX_CLOUD_HOME}`;
-
-const CMUX_PACKAGE_INSTALL_LOCK_PATH = "/etc/cmux/package-install.lock";
-const CMUX_PACKAGE_INSTALL_FALLBACK_LOCK_PATH = "/etc/cmux/package-install.lock.d";
-const CMUX_PACKAGE_INSTALL_LOCK_OWNER_PATH = `${CMUX_PACKAGE_INSTALL_FALLBACK_LOCK_PATH}/owner`;
-const CMUX_PACKAGE_INSTALL_BUSY_PATH = "/etc/cmux/package-install.lock.busy";
-const CMUX_PACKAGE_INSTALL_LOCK_STALE_MINUTES = 5;
-const CMUX_PACKAGE_INSTALL_LOCK_WAIT_SECONDS = 300;
-
-/**
- * Serializes every apt/apk mutation with one transition-safe protocol. The
- * directory gate is acquired before checking flock, so a caller that installs
- * util-linux cannot race a caller that already sees flock. Once flock exists,
- * the gate is released after the file lock is held and later callers block on
- * that same file. Contenders wait for the owner to release the directory, with
- * a bounded timeout, so a concurrent bootstrap does not silently select the
- * root fallback. A dead owner pid permits recovery from a killed old-image
- * setup; an ownerless directory is reclaimed only after a grace period, which
- * covers a process killed between mkdir and writing its owner pid without
- * interrupting a fresh acquisition.
- */
-function withPackageInstallLock(body: string): string {
-  const packageDir = CMUX_PACKAGE_INSTALL_LOCK_PATH.replace(/\/[^/]+$/, "");
-  return (
-    `mkdir -p ${packageDir} 2>/dev/null; ` +
-    `cmux_package_lock_acquired=0; cmux_package_lock_wait=0; ` +
-    `while [ "$cmux_package_lock_wait" -lt ${CMUX_PACKAGE_INSTALL_LOCK_WAIT_SECONDS} ]; do ` +
-    `if [ -d ${CMUX_PACKAGE_INSTALL_FALLBACK_LOCK_PATH} ]; then ` +
-    `cmux_package_lock_pid=""; ` +
-    `if [ -r ${CMUX_PACKAGE_INSTALL_LOCK_OWNER_PATH} ]; then ` +
-    `cmux_package_lock_pid="$(cat ${CMUX_PACKAGE_INSTALL_LOCK_OWNER_PATH} 2>/dev/null || true)"; fi; ` +
-    `if [ -n "$cmux_package_lock_pid" ] && ! kill -0 "$cmux_package_lock_pid" 2>/dev/null; then ` +
-    `rm -f ${CMUX_PACKAGE_INSTALL_LOCK_OWNER_PATH} 2>/dev/null || true; ` +
-    `rmdir ${CMUX_PACKAGE_INSTALL_FALLBACK_LOCK_PATH} 2>/dev/null || true; ` +
-    `elif [ -z "$cmux_package_lock_pid" ] && [ -n "$(find ${CMUX_PACKAGE_INSTALL_FALLBACK_LOCK_PATH} -prune -mmin +${CMUX_PACKAGE_INSTALL_LOCK_STALE_MINUTES} -print 2>/dev/null)" ]; then ` +
-    `rm -f ${CMUX_PACKAGE_INSTALL_LOCK_OWNER_PATH} 2>/dev/null || true; ` +
-    `rmdir ${CMUX_PACKAGE_INSTALL_FALLBACK_LOCK_PATH} 2>/dev/null || true; fi; fi; ` +
-    `if mkdir ${CMUX_PACKAGE_INSTALL_FALLBACK_LOCK_PATH} 2>/dev/null; then cmux_package_lock_acquired=1; break; fi; ` +
-    `if [ ! -d ${CMUX_PACKAGE_INSTALL_FALLBACK_LOCK_PATH} ]; then break; fi; ` +
-    `sleep 1; cmux_package_lock_wait=$((cmux_package_lock_wait + 1)); ` +
-    `done; ` +
-    `if [ "$cmux_package_lock_acquired" -eq 1 ]; then ` +
-    // Create the owner file before writing the pid. If the shell is killed in
-    // this tiny window, stale recovery can observe the empty file and reclaim
-    // the directory after the grace period instead of wedging all future setup.
-    `if ! : > ${CMUX_PACKAGE_INSTALL_LOCK_OWNER_PATH} || ! printf '%s\\n' "$$" > ${CMUX_PACKAGE_INSTALL_LOCK_OWNER_PATH}; then ` +
-    `rmdir ${CMUX_PACKAGE_INSTALL_FALLBACK_LOCK_PATH} 2>/dev/null || true; false; ` +
-    `else ( ` +
-    `trap 'rm -f ${CMUX_PACKAGE_INSTALL_LOCK_OWNER_PATH} 2>/dev/null || true; rmdir ${CMUX_PACKAGE_INSTALL_FALLBACK_LOCK_PATH} 2>/dev/null || true; exit 143' TERM INT HUP; ` +
-    `trap 'rm -f ${CMUX_PACKAGE_INSTALL_LOCK_OWNER_PATH} 2>/dev/null || true; rmdir ${CMUX_PACKAGE_INSTALL_FALLBACK_LOCK_PATH} 2>/dev/null || true' EXIT; ` +
-    `if command -v flock >/dev/null 2>&1; then ` +
-    // Once flock exists, hold the file lock before releasing the transition gate.
-    // This lets later callers wait on the same file while this body runs.
-    `flock -w ${CMUX_PACKAGE_INSTALL_LOCK_WAIT_SECONDS} 9 || exit 1; ` +
-    `rm -f ${CMUX_PACKAGE_INSTALL_LOCK_OWNER_PATH} 2>/dev/null || true; ` +
-    `rmdir ${CMUX_PACKAGE_INSTALL_FALLBACK_LOCK_PATH} 2>/dev/null || true; ` +
-    `${body}; ` +
-    `else ` +
-    // Before util-linux installs flock, the directory itself is the mutex. Keep
-    // it until body exits; releasing it here would let a second apt/apk mutate
-    // the package database concurrently during this first transaction.
-    `${body}; fi ) 9>${CMUX_PACKAGE_INSTALL_LOCK_PATH}; fi; ` +
-    `else printf '%s package-install-busy\\n' "$(date -u +%FT%TZ)" > ${CMUX_PACKAGE_INSTALL_BUSY_PATH} 2>/dev/null || true; false; fi`
-  );
-}
-
-// The non-root branches need runuser and mountpoint. findmnt is also required:
-// the layout daemon uses its kernel mount-event poll to leave a failed bindfs
-// view before any terminal can write to a disposable rootfs directory.
-const CMUX_CLOUD_PREREQUISITE_INSTALL =
-  `if ! (command -v bash >/dev/null 2>&1 && command -v runuser >/dev/null 2>&1 && command -v mountpoint >/dev/null 2>&1 && command -v findmnt >/dev/null 2>&1 && command -v flock >/dev/null 2>&1 && (command -v curl >/dev/null 2>&1 || command -v wget >/dev/null 2>&1)); then ` +
-  `if command -v apk >/dev/null 2>&1; then ` +
-  `apk add --no-cache bash 2>/dev/null || true; ` +
-  `apk add --no-cache runuser 2>/dev/null || true; ` +
-  `apk add --no-cache util-linux 2>/dev/null || true; ` +
-  `if ! (command -v curl >/dev/null 2>&1 || command -v wget >/dev/null 2>&1); then apk add --no-cache curl 2>/dev/null || true; fi; ` +
-  `elif command -v apt-get >/dev/null 2>&1; then ` +
-  `export DEBIAN_FRONTEND=noninteractive; ` +
-  `apt-get update -qq && apt-get install -y -qq --no-install-recommends util-linux curl 2>/dev/null || true; ` +
-  `fi; fi; ` +
-  // Re-check after installation. The caller's usability predicate decides the
-  // safe root fallback when an old image cannot provide these tools.
-  `command -v bash >/dev/null 2>&1 && command -v runuser >/dev/null 2>&1 && command -v mountpoint >/dev/null 2>&1 && command -v findmnt >/dev/null 2>&1 && command -v flock >/dev/null 2>&1 || true`;
-
-const CMUX_CLOUD_HOME_VIEW_SETUP =
-  `if mountpoint -q ${CMUX_HOME_VOLUME_BACKING_PATH} 2>/dev/null && ! mountpoint -q ${CMUX_CLOUD_HOME} 2>/dev/null; then ` +
-  // bindfs ships in baked images; this install path repairs older images while
-  // still holding the package lock shared with sudo and provisioning.
-  `command -v bindfs >/dev/null 2>&1` +
-  ` || { export DEBIAN_FRONTEND=noninteractive; apt-get update -qq && apt-get install -y -qq --no-install-recommends bindfs; }` +
-  ` || apk add --no-cache bindfs 2>/dev/null || true; ` +
-  `if command -v bindfs >/dev/null 2>&1; then ` +
-  // On a volume machine the real home is the volume. The rootfs directory at
-  // the mountpoint is disposable skel and must be empty before FUSE mounts.
-  `find ${CMUX_CLOUD_HOME} -mindepth 1 -maxdepth 1 -exec rm -rf {} + 2>/dev/null; ` +
-  `${CMUX_HOME_BINDFS_COMMAND}; fi; fi`;
-
-// Runtime user setup, run at every bootstrap (create and resurrect) before the daemon
-// starts. Idempotent, and the safety net for images that predate the baked cmux user:
-// creates the user at uid 1001 so uids are stable across image versions (with
-// Alpine's busybox adduser as a fallback), writes the passwordless-sudo policy
-// (inert until the sudo binary exists — see CMUX_SUDO_INSTALL_COMMAND), and puts the
-// bindfs view over /home/cmux when this machine has a home volume. Machines without a
-// volume keep /home/cmux on the (chown-capable) rootfs and need no view. All package
-// mutations, including the util-linux prerequisite and bindfs repair, run inside the
-// shared lock with detached provisioning and the sudo heal. Skipped work on pre-layout
-// sandboxes (volume still at /root): no backing mount exists there.
-export const CMUX_CLOUD_USER_SETUP_COMMAND = [
-  // Every creation form pins uid 1001. If that uid is already occupied, the
-  // command fails closed below instead of silently creating a different identity.
-  `id -u ${CMUX_CLOUD_USER} >/dev/null 2>&1` +
-    ` || useradd -m -u 1001 -s /bin/bash ${CMUX_CLOUD_USER} 2>/dev/null` +
-    ` || adduser -D -u 1001 -s /bin/bash ${CMUX_CLOUD_USER} 2>/dev/null` +
-    ` || useradd -m -u 1001 -s /bin/bash ${CMUX_CLOUD_USER} 2>/dev/null` +
-    ` || adduser -D -u 1001 -s /bin/bash ${CMUX_CLOUD_USER} 2>/dev/null || true`,
-  `[ "$(id -u ${CMUX_CLOUD_USER} 2>/dev/null || echo -1)" = "1001" ] || exit 1`,
-  `mkdir -p ${CMUX_CLOUD_HOME} /etc/sudoers.d`,
-  `printf '${CMUX_CLOUD_USER} ALL=(ALL) NOPASSWD:ALL\\n' > /etc/sudoers.d/90-cmux-nopasswd`,
-  `chmod 0440 /etc/sudoers.d/90-cmux-nopasswd`,
-  // All prerequisite and bindfs installs share one lock. This prevents an attach
-  // from racing the detached provisioner while an older image is being repaired.
-  `${withPackageInstallLock(`${CMUX_CLOUD_PREREQUISITE_INSTALL}; ${CMUX_CLOUD_HOME_VIEW_SETUP}`)} || true`,
-  // A failed view is not a failed machine: the daemon command's usable-user probe
-  // falls back to a root daemon, which still attaches (the pre-layout behavior).
-  `true`,
-].join("; ");
-// Installing bindfs on an old image does an apt round-trip; give it minutes, not the
-// default exec timeout. Everything else in the setup returns instantly.
-const CMUX_USER_SETUP_TIMEOUT_MS = 5 * 60 * 1000;
-// Baked images before 2026-08-31-r12 ship no sudo binary. This heal runs synchronously
-// and is awaited at every bootstrap and daemon restart, including stock images without
-// an image stamp, so readiness never races package installation. The lock serializes it
-// with the detached provisioner when an attach overlaps a still-running first boot.
-const CMUX_SUDO_INSTALL_BODY =
-  "command -v sudo >/dev/null 2>&1 || " +
-  "{ export DEBIAN_FRONTEND=noninteractive; " +
-  "{ apt-get update -qq && apt-get install -y -qq --no-install-recommends sudo; } 2>/dev/null" +
-  " || apk add --no-cache sudo 2>/dev/null || true; }";
-export const CMUX_SUDO_INSTALL_COMMAND =
-  "if command -v sudo >/dev/null 2>&1; then :; else " +
-  // The sudo heal uses the same lock as user setup and detached provisioning,
-  // including the old-image directory-lock path while flock is being installed.
-  `${withPackageInstallLock(CMUX_SUDO_INSTALL_BODY)}; fi; ` +
-  "command -v sudo >/dev/null 2>&1" +
-  " || { mkdir -p /etc/cmux 2>/dev/null; printf '%s sudo-install-failed\\n' \"$(date -u +%FT%TZ)\" > /etc/cmux/root-session-fallback; exit 1; }";
-const CMUX_SUDO_INSTALL_TIMEOUT_MS = 3 * 60 * 1000;
-
-// "The volume is mounted but its identity view is not": the fail-over state where
-// sessions must run as root homed on the backing path, because the rootfs dir at
-// /home/cmux is writable (useradd -m) yet disposable — data written there dies with
-// the sandbox and is swept by the next bootstrap's junk clean.
-const CMUX_HOME_VIEW_MISSING_CONDITION = cmuxTuiHomeViewMissingCondition(CMUX_CLOUD_LAYOUT);
-// "The work user is actually usable": it exists, runuser can drop to it, and it can
-// write its home. Callers check CMUX_HOME_VIEW_MISSING_CONDITION first, so reaching
-// this means the home is the mounted view or the (volume-less) rootfs home. Shared by
-// the daemon command (via cmuxTuiDaemon), CLI invocations, and user exec so they
-// always agree on which user owns the machine's sessions.
-const CMUX_CLOUD_USER_USABLE_CONDITION = cmuxTuiUserUsableCondition(CMUX_CLOUD_LAYOUT);
-
-/** Runs user-facing `cmux vm exec` under the same identity and home as a terminal pane. */
-export function userExecCommand(
-  command: string,
-  options?: { readonly persistentVolumeExpected?: boolean },
-): string {
-  const quoted = shellQuote(command);
-  const persistentVolumeExpected = options?.persistentVolumeExpected === true;
-  const backingExec =
-    `if mountpoint -q ${CMUX_HOME_VOLUME_BACKING_PATH} 2>/dev/null; then ` +
-    `cd ${CMUX_HOME_VOLUME_BACKING_PATH} 2>/dev/null || exit 75; exec env HOME=${CMUX_HOME_VOLUME_BACKING_PATH} sh -c ${quoted}; ` +
-    `else exit 75; fi`;
-  const rootFallback = persistentVolumeExpected
-    ? `elif mountpoint -q ${CMUX_HOME_VOLUME_BACKING_PATH} 2>/dev/null; then ${backingExec}; else exit 75`
-    : `elif mountpoint -q ${CMUX_HOME_VOLUME_BACKING_PATH} 2>/dev/null; then ${backingExec}; ` +
-      `else cd ${CMUX_CLOUD_HOME} 2>/dev/null || exit 75; exec env HOME=${CMUX_CLOUD_HOME} sh -c ${quoted}`;
-  const persistentVolumeGuard = persistentVolumeExpected
-    ? `if ! mountpoint -q /root 2>/dev/null && ! mountpoint -q ${CMUX_HOME_VOLUME_BACKING_PATH} 2>/dev/null; then exit 75; fi; `
-    : "";
-  return (
-    persistentVolumeGuard +
-    `if mountpoint -q /root 2>/dev/null; then cd /root 2>/dev/null || exit 75; exec env HOME=/root sh -c ${quoted}; ` +
-    `elif ${CMUX_HOME_VIEW_MISSING_CONDITION}; then ` +
-    `${backingExec}; ` +
-    `elif ${CMUX_CLOUD_USER_USABLE_CONDITION}; then ` +
-    `cd ${CMUX_CLOUD_HOME} 2>/dev/null || exit 75; exec runuser -u ${CMUX_CLOUD_USER} -- env HOME=${CMUX_CLOUD_HOME} USER=${CMUX_CLOUD_USER} LOGNAME=${CMUX_CLOUD_USER} sh -c ${quoted}; ` +
-    `${rootFallback}; fi`
-  );
-}
-
-// Background provisioning for every machine: coding agents plus the dev essentials a person
-// expects on "their computer". The .bashrc seed only writes when absent so user edits stick.
-// Background provisioning: a machine comes with the tools agents and people expect,
-// without delaying attach. Written to the sandbox as a file (heredoc-free, so it survives
-// the process API's own quoting) and run detached; the log is /tmp/cmux/provision.log.
-// Idempotent: re-runs on resurrection (the sandbox root filesystem is disposable, the
-// home volume is not), so anything that can live in the persistent home does — bun, npm
-// globals (the agents), uv tools — and only distro packages are reinstalled. Ubuntu/Debian
-// (blaxel/xfce-vnc) and Alpine (blaxel/base-image) are both handled. Runs as root;
-// everything it puts in the home is handed to the cmux user at the end.
-export const CMUX_PROVISION_SCRIPT_PATH = "/tmp/cmux/provision.sh";
-export const CMUX_PROVISION_LOG_PATH = "/tmp/cmux/provision.log";
-export const CMUX_PROVISION_AGENT_PACKAGES = [
-  "@anthropic-ai/claude-code",
-  "@openai/codex",
-  "opencode-ai",
-  "@earendil-works/pi-coding-agent",
-] as const;
-export const CMUX_PROVISION_SCRIPT = `#!/bin/bash
-# cmux machine provisioning (background, idempotent). Log: ${CMUX_PROVISION_LOG_PATH}
-# Baked images (services/vms/images/blaxel) already contain everything below, pinned
-# at bake time, and stamp /etc/cmux/image-stamp; re-provisioning would only drift the
-# pinned versions to latest, so the stamp short-circuits the whole script. The cmux-tui
-# session daemon is NOT part of this script: bootstrapDaemon installs and starts it via
-# cmuxTuiInstallCommand on every image, so a stamped image still gets its daemon.
-[ -f /etc/cmux/image-stamp ] && exit 0
-# A pre-layout sandbox keeps its persistent volume at /root (the daemon and exec
-# paths detect and honor that); its old driver already provisioned /root at create.
-# Writing the new-layout home there would target disposable rootfs, so do nothing.
-mountpoint -q /root 2>/dev/null && exit 0
-# A volume-backed process carries this intent explicitly. If the provider has
-# not mounted the volume yet, wait for its kernel mount event instead of
-# installing tools into the disposable /home/cmux rootfs directory.
-if [ "\${CMUX_PROVISION_VOLUME_EXPECTED:-0}" = "1" ] && ! mountpoint -q ${CMUX_HOME_VOLUME_BACKING_PATH} 2>/dev/null; then
-  mkdir -p ${CMUX_HOME_VOLUME_BACKING_PATH} 2>/dev/null || true
-  if command -v findmnt >/dev/null 2>&1 && findmnt --help 2>&1 | grep -q -- '--poll' && findmnt --help 2>&1 | grep -q -- '--timeout'; then
-    # The mount may complete after the check above but before findmnt starts.
-    # Recheck the mountpoint after a poll error before failing closed.
-    if findmnt --poll=mount --timeout=${CMUX_TUI_PERSISTENT_MOUNT_WAIT_TIMEOUT_MS} --first-only --mountpoint ${CMUX_HOME_VOLUME_BACKING_PATH} >/dev/null 2>&1; then :; elif mountpoint -q /root 2>/dev/null || mountpoint -q ${CMUX_HOME_VOLUME_BACKING_PATH} 2>/dev/null; then :; else exit 75; fi
-  else
-    exit 75
-  fi
-  mountpoint -q ${CMUX_HOME_VOLUME_BACKING_PATH} 2>/dev/null || exit 75
-fi
-# A mounted volume with no bindfs identity view is still durable. Use its backing
-# path for provisioning instead of the writable-but-disposable /home/cmux rootfs dir.
-# When the view exists, keep using it so files are presented as cmux-owned.
-if mountpoint -q ${CMUX_HOME_VOLUME_BACKING_PATH} 2>/dev/null && ! mountpoint -q ${CMUX_CLOUD_HOME} 2>/dev/null; then
-  export HOME=${CMUX_HOME_VOLUME_BACKING_PATH}
-else
-  export HOME=${CMUX_CLOUD_HOME}
-fi
-export DEBIAN_FRONTEND=noninteractive
-export PATH="$HOME/.bun/bin:$HOME/.npm-global/bin:$HOME/.local/bin:/usr/local/bin:$PATH"
-mkdir -p "$HOME/.npm-global" "$HOME/.local/bin"
-log() { printf '%s %s\\n' "$(date -u +%FT%TZ)" "$*"; }
-step() { local name="$1"; shift; if "$@"; then log "ok $name"; else log "FAILED $name (exit $?)"; fi; }
-
-distro_packages_unlocked() {
-  if command -v apt-get >/dev/null 2>&1; then
-    apt-get update -qq
-    apt-get install -y -qq --no-install-recommends \\
-      ca-certificates curl wget git sudo tmux vim less jq ripgrep fd-find unzip zip \\
-      build-essential pkg-config python3 python3-pip python3-venv openssh-client util-linux \\
-      xdotool scrot xclip xsel
-    [ -x /usr/local/bin/fd ] || ln -sf "$(command -v fdfind)" /usr/local/bin/fd
-    if ! command -v node >/dev/null 2>&1 || [ "$(node -p 'process.versions.node.split(".")[0]' 2>/dev/null || echo 0)" -lt 20 ]; then
-      curl -fsSL https://deb.nodesource.com/setup_22.x | bash - && apt-get install -y -qq nodejs
-    fi
-    if ! command -v gh >/dev/null 2>&1; then
-      curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg -o /usr/share/keyrings/githubcli-archive-keyring.gpg
-      echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" > /etc/apt/sources.list.d/github-cli.list
-      apt-get update -qq && apt-get install -y -qq gh
-    fi
-  elif command -v apk >/dev/null 2>&1; then
-    apk add --no-cache ca-certificates curl wget git sudo tmux vim less jq ripgrep fd unzip zip \\
-      build-base pkgconf python3 py3-pip openssh-client nodejs npm github-cli util-linux
-  fi
-}
-
-# The create path starts this script after the daemon bootstrap, but an attach can
-# overlap a still-running first boot. Share the same lock as the synchronous sudo
-# heal so apt and apk never mutate their databases at the same time.
-distro_packages() {
-  ${withPackageInstallLock("distro_packages_unlocked")}
-}
-
-bun_runtime() {
-  [ -x "$HOME/.bun/bin/bun" ] || curl -fsSL https://bun.sh/install | bash
-  ln -sf "$HOME/.bun/bin/bun" /usr/local/bin/bun
-  ln -sf "$HOME/.bun/bin/bunx" /usr/local/bin/bunx
-}
-
-uv_runtime() {
-  command -v uv >/dev/null 2>&1 || curl -LsSf https://astral.sh/uv/install.sh | sh
-}
-
-# The coding agents live under the persistent home so they survive sandbox resurrection.
-agents() {
-  command -v npm >/dev/null 2>&1 || return 1
-  npm config set prefix "$HOME/.npm-global"
-  npm install -g --no-fund --no-audit ${CMUX_PROVISION_AGENT_PACKAGES.join(" ")}
-  for bin in "$HOME"/.npm-global/bin/*; do [ -x "$bin" ] && ln -sf "$bin" "/usr/local/bin/$(basename "$bin")"; done
-}
-
-# The CUA driver: cua-computer-server exposes the desktop (screenshot, click, type) to
-# computer-use agents. The desktop image ships and starts it; base images get it too so a
-# later desktop attach has something to talk to.
-cua_driver() {
-  python3 -m pip show cua-computer-server >/dev/null 2>&1 || python3 -m pip install -q --break-system-packages cua-computer-server 2>/dev/null || python3 -m pip install -q cua-computer-server
-}
-
-shell_profile() {
-  [ -f "$HOME/.bashrc" ] || printf '%s\\n' \\
-    '[ -f /etc/cmux/bashrc ] && . /etc/cmux/bashrc' \\
-    '[ -f /etc/cmux/agent-config.sh ] && . /etc/cmux/agent-config.sh' \\
-    "export PS1='\\\\[\\\\e[1;36m\\\\]\\\\h\\\\[\\\\e[0m\\\\]:\\\\[\\\\e[1;34m\\\\]\\\\w\\\\[\\\\e[0m\\\\]\\\\$ '" \\
-    "alias ll='ls -la'" > "$HOME/.bashrc"
-  grep -qF '[ -f /etc/cmux/bashrc ] && . /etc/cmux/bashrc' "$HOME/.bashrc" 2>/dev/null || \\
-    printf '%s\\n' '[ -f /etc/cmux/bashrc ] && . /etc/cmux/bashrc' >> "$HOME/.bashrc"
-  grep -qF '[ -f /etc/cmux/agent-config.sh ] && . /etc/cmux/agent-config.sh' "$HOME/.bashrc" 2>/dev/null || \\
-    printf '%s\\n' '[ -f /etc/cmux/agent-config.sh ] && . /etc/cmux/agent-config.sh' >> "$HOME/.bashrc"
-  grep -q '\\$HOME/.bun' "$HOME/.bashrc" 2>/dev/null || printf '%s\\n' '# cmux provisioning: tools that live on the persistent home' 'export PATH=$HOME/.bun/bin:$HOME/.npm-global/bin:$HOME/.local/bin:$PATH' >> "$HOME/.bashrc"
-  [ -f "$HOME/.profile" ] || printf '%s\\n' '[ -f "$HOME/.bashrc" ] && . "$HOME/.bashrc"' > "$HOME/.profile"
-}
-
-# Provisioning runs as root; the home belongs to the cmux user. Only needed when
-# the home is a plain rootfs dir (no-volume machines, always small): a mounted
-# bindfs view already presents every file as cmux-owned and turns chown into a
-# pure no-op, so walking a grown persistent home there would be wasted disk work
-# on every resurrection. Scoped to the dirs this script writes, never the whole home.
-own_home() {
-  id -u ${CMUX_CLOUD_USER} >/dev/null 2>&1 || return 0
-  # Bindfs already maps ownership, and a raw volume may reject chown entirely.
-  mountpoint -q ${CMUX_CLOUD_HOME} 2>/dev/null && return 0
-  mountpoint -q ${CMUX_HOME_VOLUME_BACKING_PATH} 2>/dev/null && return 0
-  chown -R ${CMUX_CLOUD_USER}:${CMUX_CLOUD_USER} "$HOME/.bun" "$HOME/.npm-global" "$HOME/.local" "$HOME/.bashrc" "$HOME/.profile" 2>/dev/null || true
-}
-
-{
-  log "provisioning start"
-  step distro_packages distro_packages
-  step bun bun_runtime
-  step uv uv_runtime
-  step agents agents
-  step cua_driver cua_driver
-  step shell_profile shell_profile
-  step own_home own_home
-  log "provisioning done"
-} >> ${CMUX_PROVISION_LOG_PATH} 2>&1
-`;
-export const CMUX_PROVISION_COMMAND = `bash ${CMUX_PROVISION_SCRIPT_PATH}`;
-
-// The machine knows its own name: the prompt reads noble-wren:~#, not (none):~#. But a
-// renamed host must stay *resolvable*: TigerVNC's `vncserver` wrapper calls `hostname -f`
-// and aborts the whole desktop session when the name has no /etc/hosts entry. A bare
-// `hostname <name>` (all we used to do) silently broke noVNC on every desktop machine —
-// 5901 never bound and the browser showed "Failed to connect to server". Map the name to
-// loopback so `hostname -f` resolves. Idempotent: re-runs harmlessly on resurrection.
-export function hostnameSetupCommand(name: string): string {
-  const q = shellQuote(name);
-  return (
-    `hostname ${q} 2>/dev/null; echo ${q} > /etc/hostname || true; ` +
-    `grep -qF ${q} /etc/hosts || printf '127.0.0.1 %s\\n127.0.1.1 %s\\n' ${q} ${q} >> /etc/hosts`
-  );
-}
-
-// Desktop images (blaxel/xfce-vnc) start TigerVNC via supervisord at boot — before this
-// driver's bootstrap makes the hostname resolvable — so that first attempt fails and
-// supervisord exhausts its retries and gives up (FATAL). Once hostnameSetupCommand has
-// fixed /etc/hosts nothing kicks vncserver again, so we start it ourselves, as the image's
-// `cua` desktop user, when 5901 is not already listening (a snapshot-resumed machine keeps
-// its running Xtigervnc, so we skip). A no-op on base images, which have no start-vnc.sh.
-const DESKTOP_VNC_HEAL_PROCESS_NAME = "cmux-vnc-heal";
-export const DESKTOP_VNC_HEAL_COMMAND = [
-  "[ -x /usr/local/bin/start-vnc.sh ] || exit 0;",
-  "for i in 1 2 3 4 5; do { ss -tln 2>/dev/null || netstat -tln 2>/dev/null; } | grep -q ':5901 ' && exit 0; sleep 1; done;",
-  "exec runuser -u cua -- env HOME=/home/cua USER=cua DISPLAY=:1 bash /usr/local/bin/start-vnc.sh",
-].join(" ");
-
-const PREVIEW_TOKEN_TTL_SECONDS = 12 * 60 * 60;
-// Desktop/port panes are long-lived surfaces a person leaves open for days; a
-// 12h token turned every long-lived pane into a silent white screen at hour
-// twelve. The wrapper page shows an honest expiry screen when this lapses.
-const PREVIEW_OPEN_TOKEN_TTL_SECONDS = 7 * 24 * 60 * 60;
-const EXEC_DEFAULT_TIMEOUT_MS = 30_000;
-const MAX_EXEC_TIMEOUT_MS = 15 * 60 * 1000;
-const CONTROL_PLANE_BASE = "https://api.blaxel.ai/v0";
-const DEFAULT_MEMORY_MB = 4096;
-// The persistent-home volume backs the cmux user's home so dotfiles, repos, and agent
-// state survive sandbox destruction. The sandbox is disposable compute; the volume is
-// the machine. It mounts at the backing path, and the runtime user setup presents it
-// at /home/cmux through the bindfs identity map (see CMUX_HOME_BINDFS_COMMAND).
-// Volumes born when this said "/root" keep their data: resurrection remounts them here
-// and the view makes the root-owned tree cmux-owned instantly.
-const HOME_VOLUME_MOUNT_PATH = CMUX_HOME_VOLUME_BACKING_PATH;
-
-/** Returns whether the VM row or live Blaxel response identifies a persistent home volume. */
-function sandboxHasPersistentHomeVolume(
-  sandbox: BlaxelSandbox,
-  providerMetadata?: Record<string, unknown>,
-): boolean {
-  const liveVolume = (sandbox.spec?.volumes ?? []).some((volume) =>
-    volume.mountPath === HOME_VOLUME_MOUNT_PATH || volume.mountPath === "/root"
-  );
-  if (liveVolume) return true;
-  const persistedVolume = providerMetadata?.homeVolume;
-  return typeof persistedVolume === "string" && persistedVolume.trim().length > 0;
-}
-
-// Disk follows memory the way hosted dev boxes do, but Blaxel caps a volume at 16 GB
-// (measured 2026-08-26: 16384 MB accepted, 20480 MB refused with "exceeds maximum allowed
-// size"), so the 24 GB plan default gets the 16 GB ceiling instead of the old flat 5 GB.
-// Volumes are created once and never resized: existing machines keep what they were born
-// with. Raise the ceiling here when the provider does.
-export const BLAXEL_MAX_HOME_VOLUME_MB = 16 * 1024;
-const HOME_VOLUME_MB_BY_MEMORY: ReadonlyArray<readonly [maxMemoryMb: number, volumeMb: number]> = [
-  [4 * 1024, 8 * 1024],
-  [8 * 1024, 16 * 1024],
-];
-
-/** Home volume size for a machine's memory: ≤4 GB → 8 GB, otherwise the 16 GB provider ceiling. */
-export function defaultHomeVolumeMbForMemory(memoryMb: number): number {
-  if (!Number.isFinite(memoryMb) || memoryMb <= 0) {
-    throw new ProviderError("blaxel", "memoryMb must be a positive number to size the home volume");
-  }
-  for (const [maxMemoryMb, volumeMb] of HOME_VOLUME_MB_BY_MEMORY) {
-    if (memoryMb <= maxMemoryMb) return Math.min(volumeMb, BLAXEL_MAX_HOME_VOLUME_MB);
-  }
-  return BLAXEL_MAX_HOME_VOLUME_MB;
-}
-
-/** `CMUX_VM_BLAXEL_HOME_VOLUME_MB` pins every new volume to one size; otherwise disk follows memory. */
-export function resolveHomeVolumeMb(
-  memoryMb: number,
-  envValues: Record<string, string | undefined> = process.env,
-): number {
-  const raw = envValues.CMUX_VM_BLAXEL_HOME_VOLUME_MB?.trim();
-  if (raw) {
-    const parsed = Number.parseInt(raw, 10);
-    if (Number.isFinite(parsed) && parsed > 0) return parsed;
-  }
-  return defaultHomeVolumeMbForMemory(memoryMb);
-}
-
-type BlaxelSandbox = {
-  metadata?: { name?: string; url?: string; createdAt?: string };
-  spec?: {
-    runtime?: { image?: string; memory?: number };
-    volumes?: Array<{ name?: string; mountPath?: string }>;
-  };
-  state?: string;
-  status?: string;
-};
-
-type BlaxelProcess = {
-  pid?: string;
-  name?: string;
-  status?: string;
-  exitCode?: number;
-  stdout?: string;
-  stderr?: string;
-  logs?: string;
-};
-
-type BlaxelPreview = {
-  metadata?: { name?: string };
-  spec?: {
-    url?: string;
-    public?: boolean;
-    prefixUrl?: string;
-    customDomain?: string;
-  };
-};
-
-type BlaxelVolume = {
-  metadata?: { name?: string; createdAt?: string | number };
-  state?: { attachedTo?: unknown };
-  // Keep the parser tolerant of older control-plane responses that surfaced
-  // attachment state at the resource root.
-  attachedTo?: unknown;
-};
-
-// The preview URL is the only ingress to the cmux-tui daemon, and it must stay token-gated:
-// a preview that is (or has been flipped) public would expose the daemon's `/v1/link`
-// listener to anyone holding the URL, leaving device enrollment as the sole barrier. Only a
-// private preview's URL is ever usable; a public one is treated as absent so callers replace
-// or reject it.
-export function usablePrivatePreviewUrl(preview: BlaxelPreview | null | undefined): string | null {
-  const url = preview?.spec?.url;
-  if (!url) return null;
-  if (preview?.spec?.public === true) return null;
-  return url;
-}
-
-function env(name: string): string | undefined {
-  return process.env[name]?.trim() || undefined;
-}
-
-function requireEnv(name: string): string {
-  const value = env(name);
-  if (!value) {
-    throw new ProviderError("blaxel", `${name} is not configured`);
-  }
-  return value;
-}
-
-// Step-level latency attribution for the create path. The workflow recorder only
-// shows provider_create as one block, so CMUX_VM_DEBUG_TIMINGS=1 additionally logs
-// one line per driver step (volume, sandbox create, daemon install, preview) — slow
-// creates get measured, not guessed at.
-async function timedStep<T>(step: string, run: () => Promise<T>): Promise<T> {
-  if (env("CMUX_VM_DEBUG_TIMINGS") !== "1") return run();
-  const start = performance.now();
-  try {
-    return await run();
-  } finally {
-    console.info(`[blaxel] timing step=${step} ms=${Math.round(performance.now() - start)}`);
-  }
-}
-
-function controlHeaders(): Record<string, string> {
-  return {
-    "X-Blaxel-Authorization": `Bearer ${requireEnv("BL_API_KEY")}`,
-    "X-Blaxel-Workspace": requireEnv("BL_WORKSPACE"),
-    "Content-Type": "application/json",
-  };
-}
-
-// Bounded retry for the Blaxel control plane. Every control-plane call used to
-// be a single bare fetch, so any transient 429/5xx or network blip failed the
-// whole provisioning workflow (August 2026: 18 of 19 real create attempts).
-// Retries are per-method: 429, 5xx, and network errors are retried only for
-// idempotent requests (GET, DELETE, HEAD, and this driver's PUTs, which write
-// fixed file content). POST is never replayed because a rate-limit response
-// does not prove that the provider did no work. Sandbox create relies on the
-// caller's 409 name-collision loop instead, and process starts are not
-// idempotent.
-export const BLAXEL_FETCH_MAX_ATTEMPTS = 4;
-const BLAXEL_RETRY_BASE_DELAY_MS = 250;
-const BLAXEL_RETRY_MAX_DELAY_MS = 4_000;
-const BLAXEL_RETRY_AFTER_CAP_MS = 15_000;
-
-/**
- * Retries exhausted on a retriable control-plane failure. Distinct from a
- * plain ProviderError so logs can tell "Blaxel kept failing for the whole
- * retry budget" from "Blaxel rejected this request".
- */
-export class BlaxelRetryExhaustedError extends ProviderError {
-  constructor(method: string, url: string, attempts: number, lastFailure: string, cause?: unknown) {
-    super(
-      "blaxel",
-      `${method} ${url} -> ${lastFailure} (retries exhausted after ${attempts} attempts)`,
-      cause,
-    );
-    this.name = "BlaxelRetryExhaustedError";
-  }
-}
-
-function parseRetryAfterMs(header: string | null): number | null {
-  if (!header) return null;
-  const seconds = Number(header);
-  if (Number.isFinite(seconds) && seconds >= 0) return Math.round(seconds * 1000);
-  const dateMs = Date.parse(header);
-  if (!Number.isNaN(dateMs)) return Math.max(0, dateMs - Date.now());
-  return null;
-}
-
-/** Full-jitter exponential backoff; a server-provided Retry-After wins (capped). */
-export function blaxelRetryDelayMs(
-  attempt: number,
-  retryAfterHeader: string | null,
-  random: () => number = Math.random,
-): number {
-  const retryAfterMs = parseRetryAfterMs(retryAfterHeader);
-  if (retryAfterMs !== null) return Math.min(retryAfterMs, BLAXEL_RETRY_AFTER_CAP_MS);
-  const cap = Math.min(BLAXEL_RETRY_MAX_DELAY_MS, BLAXEL_RETRY_BASE_DELAY_MS * 2 ** attempt);
-  return Math.floor(random() * cap);
-}
-
-const BLAXEL_DEFAULT_TIMEOUT_MS = 60_000;
-
-type BlaxelFetchOptions = {
-  /** Maximum time allowed for one HTTP attempt. */
-  timeoutMs?: number;
-  /** Maximum time allowed for the complete request and all retries. */
-  retryBudgetMs?: number;
-  /** Disable transport/status retries for callers with a narrower retry policy. */
-  retry?: boolean;
-  /** Caller-owned cancellation for the complete request and all retries. */
-  signal?: AbortSignal;
-  /** Test seam; production callers use the cancellation-aware implementation. */
-  sleep?: (ms: number, signal: AbortSignal) => Promise<void>;
-  /** Test seam for deterministic jitter. */
-  random?: () => number;
-};
-
-/** Return the caller's abort reason, with a standards-compatible fallback. */
-function abortReason(signal: AbortSignal): unknown {
-  return signal.reason ?? new DOMException("The operation was aborted", "AbortError");
-}
-
-/** Stop an attempt immediately when its caller has cancelled the operation. */
-function throwIfAborted(signal: AbortSignal | undefined): void {
-  if (signal?.aborted) throw abortReason(signal);
-}
-
-/** Wait for a retry delay, and always remove the abort listener and timer. */
-function defaultRetrySleep(ms: number, signal: AbortSignal): Promise<void> {
-  if (signal.aborted) return Promise.reject(abortReason(signal));
-  return new Promise<void>((resolve, reject) => {
-    let settled = false;
-    const finish = (error?: unknown) => {
-      if (settled) return;
-      settled = true;
-      clearTimeout(timer);
-      signal.removeEventListener("abort", onAbort);
-      if (error === undefined) resolve();
-      else reject(error);
-    };
-    const onAbort = () => finish(abortReason(signal));
-    const timer = setTimeout(() => finish(), Math.max(0, ms));
-    signal.addEventListener("abort", onAbort, { once: true });
-    if (signal.aborted) onAbort();
-  });
-}
-
-type TimedAbortSignal = {
-  signal: AbortSignal;
-  cleanup: () => void;
-};
-
-/** Create a parent-aware timeout signal whose timer is always explicitly cleared. */
-function timedAbortSignal(parent: AbortSignal | undefined, timeoutMs: number): TimedAbortSignal {
-  const controller = new AbortController();
-  let timer: ReturnType<typeof setTimeout> | undefined;
-  const onParentAbort = () => {
-    if (!controller.signal.aborted && parent) controller.abort(abortReason(parent));
-  };
-  if (parent?.aborted) {
-    onParentAbort();
-  } else if (parent) {
-    parent.addEventListener("abort", onParentAbort, { once: true });
-  }
-  if (!controller.signal.aborted) {
-    timer = setTimeout(() => {
-      if (!controller.signal.aborted) {
-        controller.abort(new DOMException("The operation timed out", "TimeoutError"));
-      }
-    }, Math.max(1, timeoutMs));
-  }
-  return {
-    signal: controller.signal,
-    cleanup: () => {
-      if (timer !== undefined) clearTimeout(timer);
-      parent?.removeEventListener("abort", onParentAbort);
-    },
-  };
-}
-
-/** Convert an unknown transport failure into a bounded diagnostic for operators. */
-function retryFailureMessage(err: unknown): string {
-  return `network failure: ${err instanceof Error ? err.message : String(err)}`;
-}
-
-/** Execute one Blaxel request with bounded, cancellation-aware retries. */
-export async function blaxelFetch<T>(
-  method: string,
-  url: string,
-  body?: unknown,
-  opts?: BlaxelFetchOptions,
-): Promise<T> {
-  const requestMethod = method.toUpperCase();
-  const idempotent =
-    requestMethod === "GET" ||
-    requestMethod === "DELETE" ||
-    requestMethod === "PUT" ||
-    requestMethod === "HEAD";
-  const callerSignal = opts?.signal;
-  throwIfAborted(callerSignal);
-  // Resolve configuration and serialize the body before entering the retry
-  // boundary. Configuration and serialization errors are deterministic and
-  // must never be mislabeled as transport failures.
-  const headers = controlHeaders();
-  const serializedBody = body === undefined ? undefined : JSON.stringify(body);
-  const sleep = opts?.sleep ?? defaultRetrySleep;
-  const random = opts?.random ?? Math.random;
-  const retryEnabled = opts?.retry !== false;
-  const attemptTimeoutMs = Math.max(1, opts?.timeoutMs ?? BLAXEL_DEFAULT_TIMEOUT_MS);
-  // The default operation budget must leave room for every configured attempt
-  // and the waits between them. Retry-After is capped at 15 seconds, so this
-  // covers both server-directed waits and the shorter exponential backoff.
-  // An explicit budget remains authoritative for callers that need a tighter
-  // wall-clock limit.
-  const defaultRetryBudgetMs =
-    attemptTimeoutMs * BLAXEL_FETCH_MAX_ATTEMPTS +
-    BLAXEL_RETRY_AFTER_CAP_MS * (BLAXEL_FETCH_MAX_ATTEMPTS - 1);
-  const retryBudgetMs = Math.max(1, opts?.retryBudgetMs ?? defaultRetryBudgetMs);
-  const deadlineMs = Date.now() + retryBudgetMs;
-  let lastFailure = "";
-  let lastCause: unknown;
-  let attemptsMade = 0;
-  for (let attempt = 0; attempt < BLAXEL_FETCH_MAX_ATTEMPTS; attempt += 1) {
-    throwIfAborted(callerSignal);
-    const remainingMs = deadlineMs - Date.now();
-    if (remainingMs <= 0) break;
-    const lastAttempt = attempt === BLAXEL_FETCH_MAX_ATTEMPTS - 1;
-    attemptsMade += 1;
-    let response: Response;
-    let text: string;
-    const attemptSignal = timedAbortSignal(
-      callerSignal,
-      Math.min(attemptTimeoutMs, remainingMs),
-    );
-    try {
-      response = await fetch(url, {
-        method: requestMethod,
-        headers,
-        body: serializedBody,
-        signal: attemptSignal.signal,
-      });
-      // A response can arrive while its body stream fails. Keep that transport
-      // failure in the same attempt boundary so safe requests can retry it.
-      text = await response.text();
-    } catch (err) {
-      attemptSignal.cleanup();
-      if (callerSignal?.aborted) throw abortReason(callerSignal);
-      // Network failure or timeout: a non-idempotent request may still have
-      // executed on the far side, so only idempotent methods are replayed.
-      if (!idempotent || !retryEnabled) throw err;
-      lastFailure = retryFailureMessage(err);
-      lastCause = err;
-      if (lastAttempt || Date.now() >= deadlineMs) break;
-      const delayMs = blaxelRetryDelayMs(attempt, null, random);
-      const waitRemainingMs = deadlineMs - Date.now();
-      if (waitRemainingMs <= 0) break;
-      const waitSignal = timedAbortSignal(callerSignal, waitRemainingMs);
-      try {
-        await sleep(Math.min(delayMs, waitRemainingMs), waitSignal.signal);
-      } catch (err) {
-        // The operation-level deadline ends the retry loop with the normal
-        // exhausted error. Only caller cancellation or a test/transport
-        // failure escapes this wait.
-        if (callerSignal?.aborted) throw abortReason(callerSignal);
-        if (!waitSignal.signal.aborted) throw err;
-        break;
-      } finally {
-        waitSignal.cleanup();
-      }
-      throwIfAborted(callerSignal);
-      if (Date.now() >= deadlineMs) break;
-      continue;
-    }
-    attemptSignal.cleanup();
-    if (response.ok) return (text ? JSON.parse(text) : undefined) as T;
-    const retriable = retryEnabled && idempotent && (response.status === 429 || response.status >= 500);
-    if (!retriable) {
-      // Preserve the exact historical message shape: the sandbox-create
-      // name-collision loop matches /-> 409/ and not-found checks match /-> 404/.
-      throw new ProviderError(
-        "blaxel",
-        `${requestMethod} ${url} -> ${response.status}: ${text.slice(0, 500)}`,
-      );
-    }
-    lastFailure = `${response.status}: ${text.slice(0, 500)}`;
-    lastCause = undefined;
-    if (lastAttempt || Date.now() >= deadlineMs) break;
-    const delayMs = blaxelRetryDelayMs(attempt, response.headers.get("retry-after"), random);
-    const waitRemainingMs = deadlineMs - Date.now();
-    if (waitRemainingMs <= 0) break;
-    const waitSignal = timedAbortSignal(callerSignal, waitRemainingMs);
-    try {
-      await sleep(Math.min(delayMs, waitRemainingMs), waitSignal.signal);
-    } catch (err) {
-      if (callerSignal?.aborted) throw abortReason(callerSignal);
-      if (!waitSignal.signal.aborted) throw err;
-      break;
-    } finally {
-      waitSignal.cleanup();
-    }
-    throwIfAborted(callerSignal);
-    if (Date.now() >= deadlineMs) break;
-  }
-  throw new BlaxelRetryExhaustedError(
-    requestMethod,
-    url,
-    attemptsMade,
-    lastFailure || "retry budget expired",
-    lastCause,
-  );
-}
-
-// The daemon source resolution, install command, daemon command, and enrollment
-// flows live in ./cmuxTuiDaemon (shared with the E2B and Daytona drivers); the
-// re-exports keep this module the historical import site.
-export {
-  CMUX_CLOUD_HOME,
-  CMUX_CLOUD_LAYOUT,
-  CMUX_CLOUD_USER,
-  CMUX_TUI_LINUX_TARGET,
-  CMUX_TUI_DEFAULT_MANIFEST_URL,
-  cmuxTuiBinaryPath,
-  cmuxTuiManifestUrl,
-  parseCmuxTuiManifest,
-  resolveCmuxTuiSource,
-  resetCmuxTuiSourceCache,
-  cmuxTuiInstallCommand,
-  cmuxTuiPinCheckCommand,
-  cmuxTuiDaemonCommand,
-  parseEnrollmentInvitationUri,
-  type CmuxTuiSource,
-  type CmuxTuiDaemonOptions,
-} from "./cmuxTuiDaemon";
-
-export const CMUX_TUI_CLIENT_CAPABILITY_USER_AGENT = "direct-ws-user-agent";
-
-/**
- * The branded machine host (`<machine>.vm.cmux.sh`) sits behind a CloudFront
- * distribution that refuses WebSocket upgrades without a User-Agent (measured
- * 2026-08-26: 403 without, 101 with). cmux-tui clients that send one advertise
- * `direct-ws-user-agent`; every other client gets the raw `<hash>.preview.bl.run`
- * host, which does not enforce it.
- */
-export function cmuxTuiPreviewBranded(clientCapabilities: readonly string[] | undefined): boolean {
-  return (clientCapabilities ?? []).includes(CMUX_TUI_CLIENT_CAPABILITY_USER_AGENT);
-}
-
-
-function parseJsonObject(text: string): Record<string, unknown> {
-  try {
-    const value = JSON.parse(text.trim());
-    return value && typeof value === "object" && !Array.isArray(value) ? value as Record<string, unknown> : {};
-  } catch {
-    return {};
-  }
-}
-
-function parseJsonArray(text: string): Array<Record<string, unknown>> {
-  try {
-    const value = JSON.parse(text.trim());
-    return Array.isArray(value)
-      ? value.filter((entry): entry is Record<string, unknown> => !!entry && typeof entry === "object")
-      : [];
-  } catch {
-    return [];
-  }
-}
-
-function volumeListItems(payload: unknown): unknown[] {
-  if (Array.isArray(payload)) return payload;
-  if (!payload || typeof payload !== "object") return [];
-  const candidate = payload as { items?: unknown; data?: unknown };
-  if (Array.isArray(candidate.items)) return candidate.items;
-  if (Array.isArray(candidate.data)) return candidate.data;
-  // Current Blaxel responses wrap the page as `{ data: { items }, meta }`.
-  if (candidate.data && typeof candidate.data === "object") {
-    const data = candidate.data as { items?: unknown; data?: unknown };
-    if (Array.isArray(data.items)) return data.items;
-    if (Array.isArray(data.data)) return data.data;
-  }
-  return [];
-}
-
-/**
- * Completion must be an explicit provider signal: a continuation-cursor key
- * present with an empty value, or hasMore === false. A meta object that only
- * carries counts (e.g. { total: 1000 }) proves nothing about exhaustion and
- * must leave coverage marked partial.
- */
-/**
- * A payload only counts as a volume page when it carries a recognized items
- * container. Completion claims from shapes we cannot parse must fail closed,
- * otherwise a malformed response reads as an empty-but-complete inventory.
- */
-function hasRecognizedVolumeContainer(payload: unknown): boolean {
-  if (Array.isArray(payload)) return true;
-  if (!payload || typeof payload !== "object") return false;
-  const candidate = payload as { items?: unknown; data?: unknown };
-  if (Array.isArray(candidate.items) || Array.isArray(candidate.data)) return true;
-  if (candidate.data && typeof candidate.data === "object") {
-    const data = candidate.data as { items?: unknown; data?: unknown };
-    return Array.isArray(data.items) || Array.isArray(data.data);
-  }
-  return false;
-}
-
-function volumePaginationComplete(payload: unknown): boolean {
-  if (!payload || typeof payload !== "object" || Array.isArray(payload)) return false;
-  const explicitEnd = (source: unknown): boolean => {
-    if (!source || typeof source !== "object" || Array.isArray(source)) return false;
-    const value = source as {
-      nextCursor?: unknown;
-      next_cursor?: unknown;
-      hasMore?: unknown;
-      has_more?: unknown;
-    };
-    if (value.hasMore === false || value.has_more === false) return true;
-    const cursorKeyPresent = "nextCursor" in value || "next_cursor" in value;
-    if (!cursorKeyPresent) return false;
-    const cursor = value.nextCursor ?? value.next_cursor;
-    return cursor === null || cursor === undefined || cursor === "";
-  };
-  const candidate = payload as { meta?: unknown; data?: unknown };
-  if (explicitEnd(payload)) return true;
-  if (explicitEnd(candidate.meta)) return true;
-  if (candidate.data && typeof candidate.data === "object" && !Array.isArray(candidate.data)) {
-    return explicitEnd((candidate.data as { meta?: unknown }).meta);
-  }
-  return false;
-}
-
-function volumeNextCursor(payload: unknown): string | null {
-  if (!payload || typeof payload !== "object") return null;
-  const candidate = payload as {
-    nextCursor?: unknown;
-    next_cursor?: unknown;
-    meta?: unknown;
-    data?: unknown;
-  };
-  const readMeta = (meta: unknown): string | null => {
-    if (!meta || typeof meta !== "object") return null;
-    const value = meta as { nextCursor?: unknown; next_cursor?: unknown };
-    const cursor = value.nextCursor ?? value.next_cursor;
-    return typeof cursor === "string" && cursor.trim().length > 0 ? cursor.trim() : null;
-  };
-  return readMeta(candidate.meta) ??
-    (typeof candidate.nextCursor === "string" && candidate.nextCursor.trim().length > 0
-      ? candidate.nextCursor.trim()
-      : typeof candidate.next_cursor === "string" && candidate.next_cursor.trim().length > 0
-        ? candidate.next_cursor.trim()
-        : candidate.data && typeof candidate.data === "object"
-          ? readMeta((candidate.data as { meta?: unknown }).meta)
-          : null);
-}
-
-function attachmentFields(volume: BlaxelVolume): Pick<VMVolume, "attachedTo" | "attachmentState"> {
-  const hasOwn = (value: object, key: string): boolean => Object.prototype.hasOwnProperty.call(value, key);
-  const state = volume.state && typeof volume.state === "object" ? volume.state : undefined;
-  const stateHasAttachment = !!state && hasOwn(state, "attachedTo");
-  const rootHasAttachment = hasOwn(volume, "attachedTo");
-  const raw = stateHasAttachment
-    ? state?.attachedTo
-      : rootHasAttachment
-      ? volume.attachedTo
-      : undefined;
-
-  if (typeof raw === "string" && raw.trim().length > 0) {
-    return { attachedTo: raw.trim(), attachmentState: "attached" };
-  }
-  if (raw === null) return { attachedTo: null, attachmentState: "unattached" };
-  // An absent, empty, or malformed attachment field is not proof of freedom.
-  return { attachmentState: "unknown" };
-}
-
-function parseBlaxelVolumeItems(items: readonly unknown[]): VMVolume[] {
-  return items.flatMap((item): VMVolume[] => {
-    if (!item || typeof item !== "object") return [];
-    const volume = item as BlaxelVolume;
-    const rawName = volume.metadata && typeof volume.metadata === "object"
-      ? (volume.metadata as { name?: unknown }).name
-      : undefined;
-    const name = typeof rawName === "string" ? rawName.trim() : "";
-    if (!name) return [];
-    const rawCreatedAt = volume.metadata && typeof volume.metadata === "object"
-      ? (volume.metadata as { createdAt?: unknown }).createdAt
-      : undefined;
-    const createdAt = typeof rawCreatedAt === "number" && Number.isFinite(rawCreatedAt)
-      ? rawCreatedAt
-      : typeof rawCreatedAt === "string"
-        ? Date.parse(rawCreatedAt)
-        : Number.NaN;
-    const attachment = attachmentFields(volume);
-    return [{
-      name,
-      createdAt: Number.isFinite(createdAt) ? createdAt : null,
-      ...attachment,
-    }];
-  });
-}
-
-/** Normalize the Blaxel `/volumes` response for provider-agnostic cleanup code. */
-export function parseBlaxelVolumes(payload: unknown): VMVolume[] {
-  return parseBlaxelVolumeItems(volumeListItems(payload));
-}
-
-/** Parse one bounded Blaxel volume page, including its opaque continuation cursor. */
-export function parseBlaxelVolumePage(payload: unknown, limit = 100): VMVolumePage {
-  const boundedLimit = Number.isSafeInteger(limit) && limit > 0 ? Math.min(limit, 100) : 100;
-  const items = volumeListItems(payload);
-  const truncated = items.length > boundedLimit;
-  return {
-    // Slice before normalization so legacy responses do not make the reaper
-    // retain or sort an unbounded provider inventory.
-    volumes: parseBlaxelVolumeItems(items.slice(0, boundedLimit)),
-    nextCursor: volumeNextCursor(payload),
-    complete: hasRecognizedVolumeContainer(payload) &&
-      volumeNextCursor(payload) === null &&
-      volumePaginationComplete(payload) &&
-      !truncated,
-  };
-}
-
-export class BlaxelProvider implements VMProvider {
-  // Snapshot/fork are a workspace-tier feature Blaxel has not enabled (see `snapshot`);
-  // declared so the app hides Checkpoint/Fork instead of offering verbs that 502.
-  readonly capabilities = { snapshot: false, restore: false, fork: false } as const;
-  readonly id = "blaxel" as const;
-
-  async create(options: CreateOptions): Promise<VMHandle> {
-    const image = options.image.trim();
-    if (!image) {
-      throw new ProviderError("blaxel", "create requires a resolved image");
-    }
-    return withVmSpan(
-      "cmux.vm.provider.create",
-      { "cmux.vm.provider": "blaxel", "cmux.vm.operation": "create", "cmux.vm.image": image },
-      async (span) => {
-        try {
-          const memoryMb = resolveMemoryMb(options.memoryMb);
-          // Memory is settled before any volume exists: the home's size follows it.
-          const homeVolumeMb = resolveHomeVolumeMb(memoryMb);
-          // A `{machine}` token in homeVolume is resolved against the generated
-          // machine name, giving every fresh machine its own durable home. The
-          // resolved name (never the template) is what lands in providerMetadata,
-          // so resurrection finds the right volume.
-          const homeVolumeSpec = options.homeVolume?.trim() || undefined;
-          // A `{machine}` volume is owned by exactly one machine, so failure paths
-          // may delete it; a fixed name is the user's shared volume and is never
-          // deleted by create/destroy paths.
-          const perMachineHomeVolume = !!homeVolumeSpec?.includes("{machine}");
-          const resolveHomeVolume = (machineName: string): string | undefined =>
-            homeVolumeSpec?.replace("{machine}", machineName);
-          let name = friendlyVmName();
-          let homeVolume = resolveHomeVolume(name);
-          let created: BlaxelSandbox | null = null;
-          for (let attempt = 0; attempt < 4 && !created; attempt += 1) {
-            let volumeCreated = false;
-            if (homeVolume) {
-              const volume = homeVolume;
-              volumeCreated = await timedStep("ensure_home_volume", () => this.ensureHomeVolume(volume, homeVolumeMb));
-            }
-            try {
-              created = await timedStep("create_sandbox", () => blaxelFetch<BlaxelSandbox>("POST", `${CONTROL_PLANE_BASE}/sandboxes`, {
-                metadata: { name },
-                spec: {
-                  runtime: {
-                    image,
-                    memory: memoryMb,
-                    envs: sandboxEnvs(options.envs),
-                    ports: sandboxPorts(),
-                  },
-                  ...(homeVolume ? { volumes: [{ name: homeVolume, mountPath: HOME_VOLUME_MOUNT_PATH }] } : {}),
-                },
-              }));
-            } catch (err) {
-              // A per-machine volume this call just created for a sandbox that never
-              // came to exist is already orphaned — a retried create picks a fresh
-              // name, so nothing ever reattaches it. Delete it before moving on. A
-              // pre-existing volume (409 on ensure) is left alone: it may belong to
-              // the live sandbox this name conflicted with.
-              if (homeVolume && perMachineHomeVolume && volumeCreated) {
-                const volume = homeVolume;
-                await this.deleteHomeVolume(volume).catch((cleanupErr) => {
-                  console.error(`[blaxel] create cleanup failed; volume ${volume} may be orphaned`, cleanupErr);
-                });
-              }
-              const conflict = err instanceof ProviderError && /-> 409/.test(err.message);
-              if (!conflict || attempt === 3) throw err;
-              name = friendlyVmName(attempt >= 1);
-              homeVolume = resolveHomeVolume(name);
-            }
-          }
-          const sandboxUrl = created?.metadata?.url;
-          if (!sandboxUrl) {
-            throw new Error("create response is missing metadata.url for the sandbox API");
-          }
-          // The daemon previews are minted through the same paths attach uses, so a
-          // machine is born at https://<name>.vm.cmux.sh (or <name>-cmux.preview.bl.run)
-          // rather than an opaque hash it would then keep for life; the raw preview is
-          // the route for clients that cannot pass the branded ingress. Previews live on
-          // the control plane and only need the sandbox to exist, so they are created in
-          // parallel with the in-sandbox daemon bootstrap.
-          // All branches settle before any rollback (allSettled, not all): a
-          // fast-failing bootstrap must not start deleting the sandbox while a
-          // preview POST is still in flight, or the late preview recreates the
-          // orphaned branded route the rollback exists to remove.
-          const [bootstrapResult, previewResult, rawPreviewResult] = await Promise.allSettled([
-            timedStep("bootstrap_daemon", () => this.bootstrapMachine(name, sandboxUrl, !!homeVolume)),
-            timedStep("ensure_preview", () => this.ensurePreview(name, CMUX_TUI_PREVIEW_NAME, CMUX_TUI_PORT, { branded: true })),
-            timedStep("ensure_raw_preview", () => this.ensurePreview(name, CMUX_TUI_RAW_PREVIEW_NAME, CMUX_TUI_PORT, { branded: false })),
-          ]);
-          // A machine that failed to bootstrap must not survive as an orphaned
-          // sandbox (its previews die with it). A per-machine home volume dies with
-          // the machine: a retried create picks a fresh name, so nothing would ever
-          // reattach it while its storage keeps billing. A shared user volume is
-          // kept — a retried create reattaches it by name.
-          // A rollback failure means the sandbox or volume is now leaked on the
-          // provider: log it loudly (the original create error still propagates) so
-          // the orphan is findable instead of silently accumulating.
-          const rollback = async () => {
-            await this.destroy(name).catch((cleanupErr) => {
-              console.error(`[blaxel] create rollback failed; sandbox ${name} may be orphaned`, cleanupErr);
-            });
-            if (homeVolume && perMachineHomeVolume) {
-              const volume = homeVolume;
-              await this.deleteHomeVolume(volume).catch((cleanupErr) => {
-                console.error(`[blaxel] create rollback failed; volume ${volume} may be orphaned`, cleanupErr);
-              });
-            }
-          };
-          if (bootstrapResult.status === "rejected") {
-            await rollback();
-            throw bootstrapResult.reason;
-          }
-          if (previewResult.status === "rejected") {
-            await rollback();
-            throw previewResult.reason;
-          }
-          if (rawPreviewResult.status === "rejected") {
-            await rollback();
-            throw rawPreviewResult.reason;
-          }
-          const previewUrl = previewResult.value;
-          span.setAttribute("cmux.vm.id", name);
-          return {
-            provider: "blaxel",
-            providerVmId: name,
-            status: "running",
-            image,
-            createdAt: Date.now(),
-            providerMetadata: homeVolume
-              ? {
-                  sandboxUrl,
-                  previewUrl,
-                  homeVolume,
-                  homeVolumeMb,
-                  image,
-                  memoryMb,
-                  // Destroy paths delete only volumes a machine owns exclusively;
-                  // this marker is that ownership record.
-                  ...(perMachineHomeVolume ? { homeVolumePerMachine: true } : {}),
-                }
-              : { sandboxUrl, previewUrl, image, memoryMb },
-          };
-        } catch (err) {
-          throw err instanceof ProviderError ? err : new ProviderError("blaxel", `create(${image}) failed`, err);
-        }
-      },
-    );
-  }
-
-  // MARK: cmux-tui remote daemon
-
-  /** Create-time bootstrap: the smart-sleep watcher, the cmux-tui daemon, the hostname/VNC chain and background provisioning. */
-  private async bootstrapMachine(
-    name: string,
-    sandboxUrl: string,
-    persistentVolumeExpected: boolean,
-  ): Promise<void> {
-    // A just-created sandbox answers 404 ("VM not found") on its API for a few
-    // seconds; the first write is the readiness probe and retries instead.
-    await this.awaitSandboxApi(name, sandboxUrl, () =>
-      blaxelFetch("PUT", `${sandboxUrl}/filesystem/${SMART_SLEEP_PATH}`, { content: SMART_SLEEP_SCRIPT, permissions: "0755" }));
-    const prep = await this.sandboxExec(sandboxUrl, `chmod 755 ${SMART_SLEEP_PATH} && mkdir -p /tmp/cmux && chmod 700 /tmp/cmux`);
-    if (prep.exitCode !== 0) {
-      throw new ProviderError("blaxel", `machine prep in ${name} failed: ${prep.stderr || prep.stdout}`);
-    }
-    // The work user must exist (and a migrated volume must be owned) before the daemon
-    // starts, or its panes would be root shells. The daemon bootstrap also owns the
-    // first package-manager operation (curl on a stock image), so it completes before
-    // the detached provisioner can start another apt/apk process.
-    let userSetup: ExecResult | null = null;
-    try {
-      userSetup = await timedStep("user_setup", () =>
-        this.sandboxExec(sandboxUrl, CMUX_CLOUD_USER_SETUP_COMMAND, CMUX_USER_SETUP_TIMEOUT_MS));
-    } catch (err) {
-      // User setup is best effort. The daemon's UID and mount predicates select
-      // the persistent root fallback when an old or custom image cannot provide
-      // the work user, so a setup failure must not orphan an otherwise usable VM.
-      console.warn(`[blaxel] user setup in ${name} failed; continuing with root fallback`, err);
-    }
-    if (userSetup && userSetup.exitCode !== 0) {
-      console.warn(`[blaxel] user setup in ${name} exited ${userSetup.exitCode}; continuing with root fallback`);
-    }
-    // Readiness must imply an attempted escalation setup: the bounded sudo heal
-    // completes before the daemon can start, including on unstamped stock images.
-    // A known install failure is logged and leaves the daemon's root fallback active.
-    await timedStep("sudo_heal", () => this.healSudo(sandboxUrl, `create ${name}`));
-    // The watcher and hostname/VNC heal can start while the daemon downloads its
-    // binary. Keep the detached provisioner until that download is done, because a
-    // stock image may need apk for curl and cannot run two package managers safely.
-    const daemonReady = timedStep("cmux_tui_bootstrap", () =>
-      this.bootstrapCmuxTui(name, sandboxUrl, persistentVolumeExpected),
-    );
-    await Promise.all([
-      daemonReady,
-      timedStep("watcher_start", () => this.startWatcherProcess(sandboxUrl)),
-      (async () => {
-        await timedStep("hostname_setup", () => this.sandboxExec(sandboxUrl, hostnameSetupCommand(name)).catch(() => undefined));
-        await timedStep("vnc_heal_start", () => this.startDesktopVncHeal(sandboxUrl));
-      })(),
-    ]);
-    // The provision script has its own package lock for attach races. Its process is
-    // detached, so launching it here does not delay the create response.
-    await (async () => {
-      await blaxelFetch("PUT", `${sandboxUrl}/filesystem/${CMUX_PROVISION_SCRIPT_PATH}`, { content: CMUX_PROVISION_SCRIPT, permissions: "0755" });
-      await blaxelFetch<BlaxelProcess>("POST", `${sandboxUrl}/process`, {
-        name: "cmux-provision",
-        command: `CMUX_PROVISION_VOLUME_EXPECTED=${persistentVolumeExpected ? "1" : "0"} ${CMUX_PROVISION_COMMAND}`,
-        waitForCompletion: false,
-      });
-    })().catch(() => undefined);
-  }
-
-  private async awaitSandboxApi<T>(name: string, sandboxUrl: string, call: () => Promise<T>): Promise<T> {
-    const deadline = Date.now() + 60_000;
-    let lastError: unknown;
-    while (Date.now() < deadline) {
-      try {
-        return await call();
-      } catch (err) {
-        const notReady = err instanceof ProviderError && /-> 404|VM not found|-> 503/i.test(err.message);
-        if (!notReady) throw err;
-        lastError = err;
-        await new Promise((resolve) => setTimeout(resolve, 1500));
-      }
-    }
-    throw new ProviderError("blaxel", `sandbox API for ${name} did not become reachable`, lastError);
-  }
-
-  /** Installs (or re-verifies) the pinned binary and starts the daemon. */
-  private async bootstrapCmuxTui(
-    name: string,
-    sandboxUrl: string,
-    persistentVolumeExpected: boolean,
-  ): Promise<void> {
-    const source = await sharedResolveCmuxTuiSource("blaxel");
-    const install = await this.sandboxExec(
-      sandboxUrl,
-      sharedCmuxTuiInstallCommand(source, CMUX_CLOUD_LAYOUT, { persistentVolumeExpected }),
-      CMUX_TUI_INSTALL_TIMEOUT_MS,
-    );
-    if (install.exitCode !== 0) {
-      throw new ProviderError("blaxel", `cmux-tui install in ${name} failed: ${install.stderr || install.stdout}`);
-    }
-    await this.startCmuxTuiProcess(sandboxUrl, persistentVolumeExpected);
-    await this.waitForCmuxTuiReady(name, sandboxUrl, persistentVolumeExpected);
-  }
-
-  private async startCmuxTuiProcess(
-    sandboxUrl: string,
-    persistentVolumeExpected: boolean,
-  ): Promise<void> {
-    // Blaxel restarts this named process after the mount watcher returns 75.
-    // Re-run the idempotent setup in that same command so a lost bindfs view
-    // is repaired before the daemon chooses its root backing fallback. A
-    // bounded second attempt covers a short package-lock or mirror failure
-    // before the daemon accepts a deliberate root fallback.
-    const setup = shellQuote(CMUX_CLOUD_USER_SETUP_COMMAND);
-    const daemon = sharedCmuxTuiDaemonCommand(undefined, CMUX_CLOUD_LAYOUT, {
-      persistentVolumeExpected,
-    });
-    const setupAttempt = `if command -v timeout >/dev/null 2>&1; then timeout 300 sh -c ${setup}; else sh -c ${setup}; fi`;
-    // A volume may be attached after the provider process starts. Wait for that
-    // mount before setup so bindfs repair runs against durable storage, rather
-    // than creating a healthy root fallback from a transient rootfs home.
-    const persistentMountWait = sharedCmuxTuiPersistentMountWait(
-      CMUX_CLOUD_LAYOUT,
-      persistentVolumeExpected,
-    );
-    const command =
-      persistentMountWait +
-      `for _ in 1 2; do ` +
-      `${setupAttempt} >/dev/null 2>&1 || true; ` +
-      `if ${CMUX_CLOUD_USER_USABLE_CONDITION}; then break; fi; ` +
-      `done; ` +
-      `${daemon}`;
-    await blaxelFetch<BlaxelProcess>("POST", `${sandboxUrl}/process`, {
-      name: CMUX_TUI_PROCESS_NAME,
-      command,
-      waitForCompletion: false,
-      // Not keepAlive: the smart-sleep watcher counts connections on the daemon's port,
-      // so an idle machine still drops to standby.
-      keepAlive: false,
-      restartOnFailure: true,
-      maxRestarts: 10,
-    });
-  }
-
-  /** Stops the named daemon supervisor without turning an already-gone process into an error. */
-  private async stopCmuxTuiProcess(sandboxUrl: string, context: string): Promise<boolean> {
-    try {
-      await blaxelFetch(
-        "DELETE",
-        `${sandboxUrl}/process/${encodeURIComponent(CMUX_TUI_PROCESS_NAME)}`,
-      );
-      return true;
-    } catch (err) {
-      if (err instanceof ProviderError && /-> 404/.test(err.message)) return true;
-      console.warn(`[blaxel] ${context}: could not stop the named cmux-tui process`, err);
-      return false;
-    }
-  }
-
-  /** Reconciles a healthy root fallback after setup later restores the non-root layout. */
-  private async reconcileCmuxTuiRootFallback(
-    vmId: string,
-    sandboxUrl: string,
-    proc: BlaxelProcess,
-    source: CmuxTuiSource,
-    persistentVolumeExpected: boolean,
-  ): Promise<void> {
-    if (proc.status !== "running") return;
-    const marker = await this.sandboxExec(
-      sandboxUrl,
-      `cat ${CMUX_TUI_LAYOUT_MARKER_PATH} 2>/dev/null`,
-      10_000,
-    ).catch(() => null);
-    if (marker?.stdout.trim() !== "root") return;
-    // A /root mount is the intentional pre-layout state. Keep that daemon root-owned
-    // until resurrection moves the volume to the current layout.
-    const legacy = await this.sandboxExec(sandboxUrl, "mountpoint -q /root 2>/dev/null", 10_000).catch(() => null);
-    if (legacy?.exitCode === 0) return;
-
-    // Retry the same idempotent setup used by the process command. This is the
-    // attach-time reconciliation for a transient lock or package mirror failure.
-    await this.sandboxExec(sandboxUrl, CMUX_CLOUD_USER_SETUP_COMMAND, CMUX_USER_SETUP_TIMEOUT_MS).catch(() => undefined);
-    await this.healSudo(sandboxUrl, `attach ${vmId} root-fallback-reconcile`);
-    // Do not stop a durable root fallback until the expected volume is back. The
-    // setup command is safe to retry, but replacing the only live daemon while
-    // its persistent home is absent would create avoidable downtime.
-    const usableCondition = persistentVolumeExpected
-      ? `${CMUX_CLOUD_USER_USABLE_CONDITION} && mountpoint -q ${CMUX_HOME_VOLUME_BACKING_PATH} 2>/dev/null`
-      : CMUX_CLOUD_USER_USABLE_CONDITION;
-    const usable = await this.sandboxExec(sandboxUrl, usableCondition, 10_000).catch(() => null);
-    if (usable?.exitCode !== 0) return;
-
-    const installed = await this.sandboxExec(
-      sandboxUrl,
-      sharedCmuxTuiPinCheckCommand(source, CMUX_CLOUD_LAYOUT, { persistentVolumeExpected }),
-    ).catch(() => null);
-    if (!(await this.stopCmuxTuiProcess(sandboxUrl, `attach ${vmId} root-fallback-reconcile`))) return;
-    if (installed?.exitCode !== 0) {
-      await this.bootstrapCmuxTui(vmId, sandboxUrl, persistentVolumeExpected);
-    } else {
-      await this.startCmuxTuiProcess(sandboxUrl, persistentVolumeExpected);
-      await this.waitForCmuxTuiReady(vmId, sandboxUrl, persistentVolumeExpected);
-    }
-  }
-
-  // Attach requests can arrive in parallel while a degraded daemon is being
-  // replaced. Coalesce the stop/setup/start sequence per sandbox so one attach
-  // cannot terminate the replacement started by another.
-  private readonly inflightRootFallbackReconciliations = new Map<string, Promise<void>>();
-
-  private reconcileCmuxTuiRootFallbackOnce(
-    vmId: string,
-    sandboxUrl: string,
-    proc: BlaxelProcess,
-    source: CmuxTuiSource,
-    persistentVolumeExpected: boolean,
-  ): Promise<void> {
-    const key = `${vmId}:${sandboxUrl}`;
-    const inflight = this.inflightRootFallbackReconciliations.get(key);
-    if (inflight) return inflight;
-    const task = this.reconcileCmuxTuiRootFallback(
-      vmId,
-      sandboxUrl,
-      proc,
-      source,
-      persistentVolumeExpected,
-    ).finally(() => {
-      if (this.inflightRootFallbackReconciliations.get(key) === task) {
-        this.inflightRootFallbackReconciliations.delete(key);
-      }
-    });
-    this.inflightRootFallbackReconciliations.set(key, task);
-    return task;
-  }
-
-  private waitForCmuxTuiReady(
-    name: string,
-    sandboxUrl: string,
-    persistentVolumeExpected: boolean,
-  ): Promise<void> {
-    return sharedWaitForCmuxTuiReady(
-      this.cmuxTuiInvoke(sandboxUrl, persistentVolumeExpected),
-      "blaxel",
-      name,
-    );
-  }
-
-  // Mirrors the daemon command's user/home selection (cmuxTuiDaemonCommand): CLI
-  // invocations must read the same state dir, as the same user, as the daemon writes.
-  /** Runs a cmux-tui CLI request using the daemon's selected home and identity. */
-  private cmuxTuiExec(
-    sandboxUrl: string,
-    args: string,
-    timeoutMs = EXEC_DEFAULT_TIMEOUT_MS,
-    persistentVolumeExpected = false,
-  ): Promise<ExecResult> {
-    const legacy =
-      `if [ -x ${CMUX_TUI_LEGACY_BINARY_PATH} ]; then exec env HOME=/root ${CMUX_TUI_LEGACY_BINARY_PATH} ${args}; ` +
-      `elif [ -x ${CMUX_TUI_BINARY_PATH} ]; then exec env HOME=/root ${CMUX_TUI_BINARY_PATH} ${args}; ` +
-      `else exec env HOME=/root ${CMUX_TUI_LEGACY_BINARY_PATH} ${args}; fi`;
-    const backing =
-      `if ! mountpoint -q ${CMUX_HOME_VOLUME_BACKING_PATH} 2>/dev/null; then exit 75; fi; ` +
-      `if [ -x ${CMUX_TUI_BACKING_BINARY_PATH} ]; then exec env HOME=${CMUX_HOME_VOLUME_BACKING_PATH} ${CMUX_TUI_BACKING_BINARY_PATH} ${args}; ` +
-      `elif [ -x ${CMUX_TUI_LEGACY_BINARY_PATH} ]; then exec env HOME=${CMUX_HOME_VOLUME_BACKING_PATH} ${CMUX_TUI_LEGACY_BINARY_PATH} ${args}; ` +
-      `else exec env HOME=${CMUX_HOME_VOLUME_BACKING_PATH} ${CMUX_TUI_BACKING_BINARY_PATH} ${args}; fi`;
-    const usable = persistentVolumeExpected
-      ? `${CMUX_CLOUD_USER_USABLE_CONDITION} && mountpoint -q ${CMUX_HOME_VOLUME_BACKING_PATH} 2>/dev/null`
-      : CMUX_CLOUD_USER_USABLE_CONDITION;
-    const rootFallback = persistentVolumeExpected
-      ? `elif mountpoint -q ${CMUX_HOME_VOLUME_BACKING_PATH} 2>/dev/null; then ${backing}; else exit 75`
-      : `elif mountpoint -q ${CMUX_HOME_VOLUME_BACKING_PATH} 2>/dev/null; then ${backing}; ` +
-        `else exec env HOME=${CMUX_CLOUD_HOME} ${CMUX_TUI_BINARY_PATH} ${args}`;
-    const persistentVolumeGuard = persistentVolumeExpected
-      ? `if ! mountpoint -q /root 2>/dev/null && ! mountpoint -q ${CMUX_HOME_VOLUME_BACKING_PATH} 2>/dev/null; then exit 75; fi; `
-      : "";
-    const command =
-      persistentVolumeGuard +
-      `if mountpoint -q /root 2>/dev/null; then ${legacy}; ` +
-      `elif ${CMUX_HOME_VIEW_MISSING_CONDITION}; then ` +
-      backing +
-      "; " +
-      `elif ${usable}; then ` +
-      `exec runuser -u ${CMUX_CLOUD_USER} -- env HOME=${CMUX_CLOUD_HOME} USER=${CMUX_CLOUD_USER} LOGNAME=${CMUX_CLOUD_USER} ${CMUX_TUI_BINARY_PATH} ${args}; ` +
-      `${rootFallback}; fi`;
-    return this.sandboxExec(sandboxUrl, command, timeoutMs);
-  }
-
-  /** Adapts the sandbox API exec to the shared cmux-tui flows. */
-  private cmuxTuiInvoke(
-    sandboxUrl: string,
-    persistentVolumeExpected = false,
-  ): CmuxTuiInvoke {
-    return (args, timeoutMs) => this.cmuxTuiExec(
-      sandboxUrl,
-      args,
-      timeoutMs ?? EXEC_DEFAULT_TIMEOUT_MS,
-      persistentVolumeExpected,
-    );
-  }
-
-  private async ensureCmuxTuiRunning(
-    vmId: string,
-    sandboxUrl: string,
-    persistentVolumeExpected: boolean,
-  ): Promise<void> {
-    const source = await sharedResolveCmuxTuiSource("blaxel");
-    const proc = await blaxelFetch<BlaxelProcess>("GET", `${sandboxUrl}/process/${CMUX_TUI_PROCESS_NAME}`).catch(() => null);
-    if (proc?.status === "running") {
-      await this.reconcileCmuxTuiRootFallbackOnce(
-        vmId,
-        sandboxUrl,
-        proc,
-        source,
-        persistentVolumeExpected,
-      );
-    } else {
-      // The daemon is about to (re)start with the layout command; make sure the work
-      // user it drops to exists even on a sandbox whose create predates the layout
-      // (best-effort: the daemon command itself falls back to root without the user).
-      await this.sandboxExec(sandboxUrl, CMUX_CLOUD_USER_SETUP_COMMAND, CMUX_USER_SETUP_TIMEOUT_MS).catch(() => undefined);
-      // Same heal as create/resurrect bootstrap: a still-alive sandbox from a stamped
-      // pre-r12 image has the user and sudoers policy but no sudo binary, and without
-      // this its cmux sessions would have no escalation path after a daemon restart.
-      await this.healSudo(sandboxUrl, `attach ${vmId}`);
-      // The binary lives on the persistent volume, so a resurrected sandbox usually only
-      // needs the process started; a pin change or a fresh volume re-runs the install.
-      const installed = await this.sandboxExec(
-        sandboxUrl,
-        sharedCmuxTuiPinCheckCommand(source, CMUX_CLOUD_LAYOUT, { persistentVolumeExpected }),
-      ).catch(() => null);
-      if (installed?.exitCode !== 0) {
-        // Missing, or a different build than the manifest now pins: (re)install.
-        await this.bootstrapCmuxTui(vmId, sandboxUrl, persistentVolumeExpected);
-      } else {
-        await this.startCmuxTuiProcess(sandboxUrl, persistentVolumeExpected);
-        await this.waitForCmuxTuiReady(vmId, sandboxUrl, persistentVolumeExpected);
-      }
-    }
-    // Attach = user activity: re-arm the smart-sleep watcher so the sandbox stays awake
-    // while this session works, and can freeze again once it goes idle.
-    const watcher = await blaxelFetch<BlaxelProcess>("GET", `${sandboxUrl}/process/${SMART_SLEEP_PROCESS_NAME}`).catch(() => null);
-    if (watcher?.status !== "running") {
-      await this.startWatcherProcess(sandboxUrl);
-    }
-  }
-
-  /**
-   * A status read doubles as the wake request for a sandbox in standby. A persistent-home
-   * machine whose sandbox is gone gets resurrected around its volume. "Gone" is either a
-   * 404 or a still-listed TERMINATED/DELETING record — Blaxel deletion is asynchronous, so
-   * both shapes mean the compute is dead.
-   */
-  private async liveSandboxForAttach(vmId: string, providerMetadata?: Record<string, unknown>): Promise<BlaxelSandbox> {
-    let sandbox: BlaxelSandbox | null = null;
-    try {
-      const fetched = await this.getSandbox(vmId);
-      sandbox = mapStatus(fetched) === "destroyed" ? null : fetched;
-    } catch (err) {
-      const gone = err instanceof ProviderError && /-> 404/.test(err.message);
-      if (!gone) throw err;
-    }
-    if (!sandbox) {
-      sandbox = providerMetadata ? await this.resurrectSandbox(vmId, providerMetadata) : null;
-      if (!sandbox) {
-        throw new ProviderError("blaxel", `sandbox ${vmId} is gone and has no persistent home to resurrect from`);
-      }
-    }
-    return sandbox;
-  }
-
-  async openCmuxRemote(vmId: string, options?: CmuxRemoteAttachOptions): Promise<CmuxRemoteEndpoint> {
-    return withVmSpan(
-      "cmux.vm.provider.open_cmux_remote",
-      { "cmux.vm.provider": "blaxel", "cmux.vm.operation": "open_cmux_remote", "cmux.vm.id": vmId },
-      async (span) => {
-        try {
-          const sandbox = await this.liveSandboxForAttach(vmId, options?.providerMetadata);
-          const sandboxUrl = sandbox.metadata?.url;
-          if (!sandboxUrl) {
-            throw new Error("sandbox is missing metadata.url");
-          }
-          const persistentVolumeExpected =
-            sandboxHasPersistentHomeVolume(sandbox, options?.providerMetadata);
-          await this.ensureCmuxTuiRunning(vmId, sandboxUrl, persistentVolumeExpected);
-          const branded = cmuxTuiPreviewBranded(options?.clientCapabilities);
-          const previewUrl = await this.ensurePreview(
-            vmId,
-            branded ? CMUX_TUI_PREVIEW_NAME : CMUX_TUI_RAW_PREVIEW_NAME,
-            CMUX_TUI_PORT,
-            { branded },
-          );
-          span.setAttribute("cmux.vm.cmux_remote.branded", branded);
-          const token = await this.mintPreviewToken(vmId, branded ? CMUX_TUI_PREVIEW_NAME : CMUX_TUI_RAW_PREVIEW_NAME);
-          const expiresAtUnix = Math.floor(Date.now() / 1000) + PREVIEW_TOKEN_TTL_SECONDS;
-          const host = previewUrl.replace(/^https?:\/\//, "").replace(/\/+$/, "");
-          // The gateway accepts the preview token as a query parameter and the Rust dialer
-          // passes the URL through verbatim, so the tokenized route is the whole story
-          // (proven by scripts/spike-cmux-tui-blaxel.sh). It travels only in this response,
-          // never inside an invitation.
-          const route = `wss://${host}/v1/link?bl_preview_token=${encodeURIComponent(token)}`;
-
-          const invoke = this.cmuxTuiInvoke(sandboxUrl, persistentVolumeExpected);
-          let invitation: CmuxRemoteEndpoint["invitation"];
-          const enrolled = options?.deviceFingerprint
-            ? await isCmuxTuiDeviceEnrolled(invoke, options.deviceFingerprint)
-            : false;
-          if (!enrolled) {
-            invitation = await mintCmuxTuiInvitation(invoke, "blaxel", vmId);
-          }
-          span.setAttribute("cmux.vm.cmux_remote.invited", !enrolled);
-          const daemonBuild = await cmuxTuiDaemonBuild(invoke);
-          return {
-            transport: "cmux-remote",
-            route,
-            token,
-            expiresAtUnix,
-            session: CMUX_TUI_SESSION,
-            ...(daemonBuild ? { daemonBuild } : {}),
-            ...(invitation ? { invitation } : {}),
-          };
-        } catch (err) {
-          throw err instanceof ProviderError ? err : new ProviderError("blaxel", `openCmuxRemote(${vmId}) failed`, err);
-        }
-      },
-    );
-  }
-
-  async approveCmuxRemoteEnrollment(
-    vmId: string,
-    invitationId: string,
-    options?: CmuxRemoteApprovalOptions,
-  ): Promise<CmuxRemoteApprovalResult> {
-    return withVmSpan(
-      "cmux.vm.provider.approve_cmux_remote_enrollment",
-      { "cmux.vm.provider": "blaxel", "cmux.vm.operation": "approve_cmux_remote_enrollment", "cmux.vm.id": vmId },
-      async () => {
-        try {
-          const sandbox = await this.getSandbox(vmId);
-          const sandboxUrl = sandbox.metadata?.url;
-          if (!sandboxUrl) {
-            throw new ProviderError("blaxel", `sandbox ${vmId} has no API url (status ${sandbox.status ?? "unknown"})`);
-          }
-          return await approveCmuxTuiEnrollment(
-            this.cmuxTuiInvoke(sandboxUrl, sandboxHasPersistentHomeVolume(sandbox, options?.providerMetadata)),
-            "blaxel",
-            vmId,
-            invitationId,
-          );
-        } catch (err) {
-          throw err instanceof ProviderError ? err : new ProviderError("blaxel", `approveCmuxRemoteEnrollment(${vmId}) failed`, err);
-        }
-      },
-    );
-  }
-
-  // The daemon itself is NOT keepAlive: while every shell is idle and no client is attached,
-  // nothing pins the sandbox and Blaxel freezes it (processes preserved in the memory
-  // snapshot). The smart-sleep watcher is the only keepAlive process, and it exits when idle.
-  private async startWatcherProcess(sandboxUrl: string): Promise<void> {
-    await blaxelFetch<BlaxelProcess>("POST", `${sandboxUrl}/process`, {
-      name: SMART_SLEEP_PROCESS_NAME,
-      command: SMART_SLEEP_PATH,
-      waitForCompletion: false,
-      keepAlive: true,
-    });
-  }
-
-  // Best-effort: a desktop machine should come up with its screen, but a base machine has no
-  // start-vnc.sh and the command self-exits, so this is safe to run on every bootstrap. Not
-  // keepAlive — a live desktop is pinned by the attached client, not by this starter.
-  private async startDesktopVncHeal(sandboxUrl: string): Promise<void> {
-    await blaxelFetch<BlaxelProcess>("POST", `${sandboxUrl}/process`, {
-      name: DESKTOP_VNC_HEAL_PROCESS_NAME,
-      command: DESKTOP_VNC_HEAL_COMMAND,
-      waitForCompletion: false,
-      keepAlive: false,
-    }).catch(() => undefined);
-  }
-
-  async destroy(vmId: string): Promise<void> {
-    await withVmSpan(
-      "cmux.vm.provider.destroy",
-      { "cmux.vm.provider": "blaxel", "cmux.vm.operation": "destroy", "cmux.vm.id": vmId },
-      async () => {
-        try {
-          await blaxelFetch("DELETE", `${CONTROL_PLANE_BASE}/sandboxes/${encodeURIComponent(vmId)}`);
-        } catch (err) {
-          // Cleanup paths retry destroy after partial create failures; a sandbox
-          // that is already gone is this operation's success state, not an error.
-          const gone = err instanceof ProviderError && /-> 404/.test(err.message);
-          if (!gone) throw err;
-        }
-      },
-    );
-  }
-
-  /** List one bounded page of volumes; the no-argument form keeps legacy callers working. */
-  async listVolumes(): Promise<readonly VMVolume[]>;
-  async listVolumes(options: VMVolumeListOptions): Promise<VMVolumePage>;
-  async listVolumes(options?: VMVolumeListOptions): Promise<VMVolumeInventory> {
-    const query = new URLSearchParams();
-    if (options) {
-      const limit = Number.isSafeInteger(options.limit) && options.limit > 0
-        ? Math.min(options.limit, 100)
-        : 100;
-      query.set("limit", String(limit));
-      if (options.cursor) query.set("cursor", options.cursor);
-      // The provider supports ordered cursor pages. This keeps a run fair for
-      // old volumes without requiring the reaper to sort an unbounded result.
-      query.set("sort", "createdAt:asc");
-    }
-    const suffix = query.size > 0 ? `?${query.toString()}` : "";
-    const payload = await blaxelFetch<unknown>("GET", `${CONTROL_PLANE_BASE}/volumes${suffix}`);
-    return options
-      ? parseBlaxelVolumePage(payload, options.limit)
-      : parseBlaxelVolumes(payload);
-  }
-
-  async getStatus(vmId: string): Promise<VMStatus> {
-    const sandbox = await this.getSandbox(vmId);
-    return mapStatus(sandbox);
-  }
-
-  // Blaxel hibernates automatically (~15 s after the last connection when no keepAlive process
-  // is running) and wakes transparently on the next request, so pause is a no-op and resume is
-  // just a status read that also serves as the wake request.
-  async pause(vmId: string): Promise<void> {
-    void vmId;
-  }
-
-  async resume(vmId: string): Promise<VMHandle> {
-    return withVmSpan(
-      "cmux.vm.provider.resume",
-      { "cmux.vm.provider": "blaxel", "cmux.vm.operation": "resume", "cmux.vm.id": vmId },
-      async () => {
-        const sandbox = await this.getSandbox(vmId);
-        return this.handleFromSandbox(vmId, sandbox);
-      },
-    );
-  }
-
-  async exec(vmId: string, command: string, opts?: ExecOptions): Promise<ExecResult> {
-    const timeoutMs = Math.min(opts?.timeoutMs ?? EXEC_DEFAULT_TIMEOUT_MS, MAX_EXEC_TIMEOUT_MS);
-    return withVmSpan(
-      "cmux.vm.provider.exec",
-      {
-        "cmux.vm.provider": "blaxel",
-        "cmux.vm.operation": "exec",
-        "cmux.vm.id": vmId,
-        "cmux.command_length": command.length,
-        "cmux.timeout_ms": timeoutMs,
-      },
-      async (span) => {
-        const sandbox = await this.getSandbox(vmId);
-        const sandboxUrl = sandbox.metadata?.url;
-        if (!sandboxUrl) {
-          throw new ProviderError("blaxel", `sandbox ${vmId} has no API url (status ${sandbox.status ?? "unknown"})`);
-        }
-        const result = await this.sandboxExec(
-          sandboxUrl,
-          userExecCommand(command, {
-            persistentVolumeExpected: sandboxHasPersistentHomeVolume(sandbox, opts?.providerMetadata),
-          }),
-          timeoutMs,
-        );
-        span.setAttribute("cmux.exec.exit_code", result.exitCode);
-        return result;
-      },
-    );
-  }
-
-  async snapshot(vmId: string, name?: string): Promise<SnapshotRef> {
-    void vmId;
-    void name;
-    // Blaxel exposes GET/POST /sandboxes/{name}/snapshots, but the API returns
-    // 403 "Sandbox snapshot/fork feature is not enabled for this workspace" on the current
-    // workspace tier (verified 2026-08-20). Wire this up once the feature is enabled; until
-    // then durability comes from standby memory snapshots (automatic) and the sandbox TTL.
-    throw new VmOperationUnsupportedError({ provider: this.id, operation: "snapshot" });
-  }
-
-  async restore(snapshotId: string): Promise<VMHandle> {
-    void snapshotId;
-    throw new VmOperationUnsupportedError({ provider: this.id, operation: "restore" });
-  }
-
-  async openSSH(vmId: string): Promise<SSHEndpoint> {
-    return withVmSpan(
-      "cmux.vm.provider.open_ssh",
-      { "cmux.vm.provider": "blaxel", "cmux.vm.operation": "open_ssh", "cmux.vm.id": vmId },
-      async () => {
-        throw new ProviderError(
-          "blaxel",
-          "Blaxel sandboxes have no raw TCP ingress, so there is no SSH. " +
-            "Blaxel machines attach through the cmux-tui remote daemon (transport cmux-remote).",
-        );
-      },
-    );
-  }
-
-  /** The only session transport: the cmux-tui remote daemon (`openCmuxRemote`). */
-  readonly attachTransports: readonly AttachTransport[] = ["cmux-remote"];
-
-  async openAttach(vmId: string, options?: AttachOptions): Promise<AttachEndpoint> {
-    void options;
-    throw new ProviderError(
-      "blaxel",
-      `openAttach(${vmId}) is not supported: Blaxel machines attach through the cmux-tui remote daemon (transport cmux-remote).`,
-    );
-  }
-
-  async revokeSSHIdentity(identityHandle: string): Promise<void> {
-    void identityHandle;
-    // openSSH always throws, so there is never an identity to revoke.
-  }
-
-  /**
-   * Close every cmux ingress for a machine during account sign-out.
-   *
-   * Blaxel preview tokens are independent of Stack Auth, so deleting only the
-   * Postgres lease row would leave a copied preview URL usable until its TTL.
-   * Remove the private previews and stop the cmux-tui daemon before returning;
-   * the next authenticated attach recreates both idempotently.
-   */
-  async revokeEndpointLeases(vmId: string): Promise<void> {
-    const previewsBase = `${CONTROL_PLANE_BASE}/sandboxes/${encodeURIComponent(vmId)}/previews`;
-    let sandbox: BlaxelSandbox | null = null;
-    try {
-      sandbox = await this.getSandbox(vmId);
-    } catch (err) {
-      if (!(err instanceof ProviderError && /-> 404/.test(err.message))) throw err;
-    }
-
-    const sandboxUrl = sandbox?.metadata?.url;
-    if (sandboxUrl) {
-      // Stop the named supervisor through the sandbox API first. The layout
-      // daemon owns a mount-health watcher and a child process; killing only
-      // the child would make restartOnFailure launch it again. The shell
-      // fallback below still cleans up legacy daemons on older API versions.
-      await this.stopCmuxTuiProcess(sandboxUrl, `revokeEndpointLeases(${vmId})`);
-      const result = await this.sandboxExec(
-        sandboxUrl,
-        [
-          `pkill -TERM -x ${shellQuote(SMART_SLEEP_PROCESS_NAME)} 2>/dev/null || true`,
-          `pkill -TERM -f ${shellQuote(`${CMUX_TUI_BINARY_PATH} server start`)} 2>/dev/null || true`,
-          `pkill -TERM -f ${shellQuote(`${CMUX_TUI_BACKING_BINARY_PATH} server start`)} 2>/dev/null || true`,
-          // A pre-layout sandbox's daemon was started from the /root binary path.
-          `pkill -TERM -f ${shellQuote(`${CMUX_TUI_LEGACY_BINARY_PATH} server start`)} 2>/dev/null || true`,
-        ].join("; "),
-        15_000,
-      );
-      if (result.exitCode !== 0) {
-        throw new ProviderError(
-          "blaxel",
-          `revokeEndpointLeases(${vmId}) failed to stop the cmux-tui daemon: ${result.stderr || result.stdout}`,
-        );
-      }
-    }
-
-    // Preview deletion is control-plane-only, so it also works when the
-    // sandbox is asleep and has no live sandbox API URL.
-    let listed: unknown;
-    try {
-      listed = await blaxelFetch<unknown>("GET", previewsBase);
-    } catch (err) {
-      if (err instanceof ProviderError && /-> 404/.test(err.message)) return;
-      throw err;
-    }
-    const rawItems = Array.isArray(listed)
-      ? listed
-      : listed && typeof listed === "object" && Array.isArray((listed as { items?: unknown }).items)
-      ? (listed as { items: unknown[] }).items
-      : [];
-    const names = rawItems
-      .map((item) => {
-        if (!item || typeof item !== "object") return null;
-        const candidate = item as BlaxelPreview;
-        return candidate.metadata?.name?.trim() || null;
-      })
-      .filter((name): name is string => !!name);
-    await Promise.all(names.map(async (name) => {
-      try {
-        await blaxelFetch("DELETE", `${previewsBase}/${encodeURIComponent(name)}`);
-      } catch (err) {
-        if (!(err instanceof ProviderError && /-> 404/.test(err.message))) throw err;
-      }
-    }));
-  }
-
-  private async getSandbox(vmId: string): Promise<BlaxelSandbox> {
-    return blaxelFetch<BlaxelSandbox>("GET", `${CONTROL_PLANE_BASE}/sandboxes/${encodeURIComponent(vmId)}`);
-  }
-
-  // A size the volume API rejects surfaces as the provider's own message (non-409
-  // responses propagate); there is no silent fallback to a smaller disk.
-  /** Returns true when this call created the volume, false when it already existed. */
-  private async ensureHomeVolume(name: string, sizeMb: number): Promise<boolean> {
-    try {
-      await blaxelFetch("POST", `${CONTROL_PLANE_BASE}/volumes`, {
-        metadata: { name },
-        spec: { size: sizeMb },
-      });
-      return true;
-    } catch (err) {
-      // An existing volume is the expected steady state; anything else is fatal.
-      const conflict = err instanceof ProviderError && /-> 409/.test(err.message);
-      if (!conflict) throw err;
-      return false;
-    }
-  }
-
-  // Blaxel deletes sandboxes asynchronously and keeps a volume's attachment record
-  // alive until that finishes, answering 409 in the window. ~7.5 s of backoff covers it.
-  private static readonly HOME_VOLUME_DELETE_RETRY_DELAYS_MS: readonly number[] = [500, 1000, 2000, 4000];
-
-  /**
-   * Delete a persistent home volume (`DELETE /volumes/{name}`). A 404 is success —
-   * the volume is already gone. A 409 (still attached while the owning sandbox
-   * finishes deleting) is retried with bounded backoff; anything else, or an
-   * exhausted retry budget, throws so the caller can record the leak. Ownership is
-   * the caller's judgment: only a volume owned solely by a destroyed machine may
-   * be passed here.
-   */
-  async deleteHomeVolume(volumeName: string, opts?: { retryDelaysMs?: readonly number[] }): Promise<void> {
-    const name = volumeName.trim();
-    if (!name) throw new ProviderError("blaxel", "deleteHomeVolume requires a volume name");
-    await withVmSpan(
-      "cmux.vm.provider.delete_home_volume",
-      { "cmux.vm.provider": "blaxel", "cmux.vm.operation": "delete_home_volume", "cmux.vm.volume": name },
-      async () => {
-        const delays = opts?.retryDelaysMs ?? BlaxelProvider.HOME_VOLUME_DELETE_RETRY_DELAYS_MS;
-        for (let attempt = 0; ; attempt += 1) {
-          try {
-            // This method owns a narrower policy: only the provider's transient
-            // "still attached" 409 is retried below. Do not add the generic
-            // idempotent 5xx retry on top of that bounded cleanup loop.
-            await blaxelFetch(
-              "DELETE",
-              `${CONTROL_PLANE_BASE}/volumes/${encodeURIComponent(name)}`,
-              undefined,
-              { retry: false },
-            );
-            return;
-          } catch (err) {
-            const gone = err instanceof ProviderError && /-> 404/.test(err.message);
-            if (gone) return;
-            const attached = err instanceof ProviderError && /-> 409/.test(err.message);
-            if (!attached || attempt >= delays.length) {
-              throw err instanceof ProviderError
-                ? err
-                : new ProviderError("blaxel", `deleteHomeVolume(${name}) failed`, err);
-            }
-            await new Promise((resolve) => setTimeout(resolve, delays[attempt]));
-          }
-        }
-      },
-    );
-  }
-
-  /**
-   * Resurrection: a persistent-home machine whose sandbox is gone (TTL expiry, provider loss)
-   * is recreated around the same volume and re-bootstrapped, so from the user's side the
-   * machine never died — its compute was just asleep somewhere deeper. Only possible when the
-   * VM row's providerMetadata carries homeVolume + image from the original create.
-   */
-  private async resurrectSandbox(
-    vmId: string,
-    metadata: Record<string, unknown>,
-  ): Promise<BlaxelSandbox | null> {
-    const homeVolume = typeof metadata.homeVolume === "string" ? metadata.homeVolume : null;
-    const image = typeof metadata.image === "string" ? metadata.image : null;
-    if (!homeVolume || !image) return null;
-    const memoryMb = resolveMemoryMb(
-      typeof metadata.memoryMb === "number" ? metadata.memoryMb : undefined,
-    );
-    // The volume already exists (409 → steady state); the size only matters if it was lost.
-    const homeVolumeMb = typeof metadata.homeVolumeMb === "number" && metadata.homeVolumeMb > 0
-      ? metadata.homeVolumeMb
-      : resolveHomeVolumeMb(memoryMb);
-    await this.ensureHomeVolume(homeVolume, homeVolumeMb);
-    const created = await blaxelFetch<BlaxelSandbox>("POST", `${CONTROL_PLANE_BASE}/sandboxes`, {
-      metadata: { name: vmId },
-      spec: {
-        runtime: {
-          image,
-          memory: memoryMb,
-          // Create-time model-plane envs are gone here by design; the machine
-          // re-sources them from the home volume (see sandboxEnvs).
-          envs: sandboxEnvs(),
-          ports: sandboxPorts(),
-        },
-        volumes: [{ name: homeVolume, mountPath: HOME_VOLUME_MOUNT_PATH }],
-      },
-    });
-    const sandboxUrl = created.metadata?.url;
-    if (!sandboxUrl) {
-      throw new ProviderError("blaxel", `resurrect(${vmId}) returned no sandbox url`);
-    }
-    await this.bootstrapMachine(vmId, sandboxUrl, true);
-    return created;
-  }
-
-  private async sandboxApiUrl(vmId: string): Promise<string> {
-    const sandbox = await this.getSandbox(vmId);
-    const url = sandbox.metadata?.url;
-    if (!url) {
-      throw new ProviderError("blaxel", `sandbox ${vmId} has no API url (status ${sandbox.status ?? "unknown"})`);
-    }
-    return url;
-  }
-
-  private handleFromSandbox(vmId: string, sandbox: BlaxelSandbox): VMHandle {
-    return {
-      provider: "blaxel",
-      providerVmId: vmId,
-      status: mapStatus(sandbox),
-      image: sandbox.spec?.runtime?.image ?? "unknown",
-      createdAt: sandbox.metadata?.createdAt ? Date.parse(sandbox.metadata.createdAt) : Date.now(),
-      providerMetadata: sandbox.metadata?.url ? { sandboxUrl: sandbox.metadata.url } : undefined,
-    };
-  }
-
-  /** Runs the bounded sudo heal and records a deliberate root fallback on failure. */
-  private async healSudo(sandboxUrl: string, context: string): Promise<void> {
-    try {
-      const result = await this.sandboxExec(sandboxUrl, CMUX_SUDO_INSTALL_COMMAND, CMUX_SUDO_INSTALL_TIMEOUT_MS);
-      if (result.exitCode !== 0) {
-        console.warn(`[blaxel] ${context}: sudo heal exited ${result.exitCode}; root fallback remains active`);
-      }
-    } catch {
-      console.warn(`[blaxel] ${context}: sudo heal request failed; root fallback remains active`);
-    }
-  }
-
-  private async sandboxExec(sandboxUrl: string, command: string, timeoutMs = EXEC_DEFAULT_TIMEOUT_MS): Promise<ExecResult> {
-    const result = await blaxelFetch<BlaxelProcess>(
-      "POST",
-      `${sandboxUrl}/process`,
-      { command, waitForCompletion: true, timeout: Math.ceil(timeoutMs / 1000) },
-      { timeoutMs: timeoutMs + 30_000 },
-    );
-    return {
-      exitCode: result.exitCode ?? (result.status === "completed" ? 0 : 1),
-      stdout: result.stdout ?? "",
-      stderr: result.stderr ?? "",
-    };
-  }
-
-  // One in-flight ensure per (machine, preview): a create that races the attach it triggers
-  // must not mint the same preview twice. Cross-process races are handled below by re-reading
-  // the preview after a failed branded create instead of clobbering it.
-  private readonly inflightPreviews = new Map<string, Promise<string>>();
-
-  private ensurePreview(
-    vmId: string,
-    previewName: string,
-    port: number,
-    options: { branded?: boolean } = {},
-  ): Promise<string> {
-    const key = `${vmId}/${previewName}`;
-    const inflight = this.inflightPreviews.get(key);
-    if (inflight) return inflight;
-    const task = this.ensurePreviewUncoalesced(vmId, previewName, port, options.branded !== false).finally(() => {
-      this.inflightPreviews.delete(key);
-    });
-    this.inflightPreviews.set(key, task);
-    return task;
-  }
-
-  // `branded: false` keeps the preview on Blaxel's own opaque `<hash>.preview.bl.run` host.
-  // The cmux-tui daemon has one of each: the branded machine host sits behind an ingress
-  // that refuses WebSocket upgrades without a User-Agent, so only clients advertising
-  // `direct-ws-user-agent` are routed there (see cmuxTuiPreviewBranded); everything else
-  // dials the raw host. Browser-facing port previews keep the branded, cookie-friendly host.
-  private async ensurePreviewUncoalesced(vmId: string, previewName: string, port: number, branded = true): Promise<string> {
-    const base = `${CONTROL_PLANE_BASE}/sandboxes/${encodeURIComponent(vmId)}/previews`;
-    const readExisting = () =>
-      blaxelFetch<BlaxelPreview>("GET", `${base}/${previewName}`).catch(() => null);
-    const prefixUrl = branded ? brandedPreviewPrefix(vmId, previewName, port) : null;
-    const customDomain = prefixUrl ? await verifiedCustomDomain() : null;
-    const existing = await readExisting();
-    const existingUrl = usablePrivatePreviewUrl(existing);
-    if (existingUrl && !branded) {
-      // An unbranded preview must not carry a prefix or custom domain; rotate one that does.
-      const spec = existing?.spec ?? {};
-      const isBranded = !!(spec.prefixUrl?.trim() || spec.customDomain?.trim());
-      if (!isBranded) return existingUrl;
-      await blaxelFetch("DELETE", `${base}/${previewName}`).catch(() => undefined);
-    } else if (existingUrl) {
-      const existingCustomDomain = existing?.spec?.customDomain?.trim().toLowerCase();
-      const existingHost = (() => {
-        try {
-          return new URL(existingUrl).hostname.toLowerCase();
-        } catch {
-          return "";
-        }
-      })();
-      const alreadyOnCustomDomain =
-        !!customDomain &&
-        (existingCustomDomain === customDomain.toLowerCase() ||
-          existingHost.endsWith(`.${customDomain.toLowerCase()}`));
-      if (!customDomain || alreadyOnCustomDomain) return existingUrl;
-      // The custom domain became verified after this preview was created. Rotate only the
-      // ingress record (never the sandbox or its files) so existing machines converge to
-      // the cmux-owned hostname on their next attach/open-port request.
-      await blaxelFetch("DELETE", `${base}/${previewName}`).catch(() => undefined);
-    }
-    if (existing?.spec?.url && !existingUrl) {
-      // The preview exists but is public; drop it and recreate private below.
-      await blaxelFetch("DELETE", `${base}/${previewName}`);
-    }
-    // Branded subdomains: Blaxel renders prefixUrl as https://<prefix>-<workspace>.preview.bl.run,
-    // so with the cmux workspace the daemon preview reads noble-wren-cmux.preview.bl.run and a
-    // port preview noble-wren-3000-cmux.preview.bl.run — the machine's name is its address. A
-    // rejected prefix (collision, length, validation) falls back to the opaque hash URL rather
-    // than failing the attach.
-    const brandedSpecs: Array<{ label: string; spec: Record<string, unknown> }> = [];
-    if (prefixUrl && customDomain) {
-      // Blaxel's API takes the bare verified domain in customDomain and composes the
-      // host from prefixUrl: {prefixUrl: "noble-wren", customDomain: "vm.cmux.sh"} →
-      // https://noble-wren.vm.cmux.sh. Passing the full host 404s ("Custom domain not found").
-      brandedSpecs.push({ label: "custom-domain", spec: { port, public: false, prefixUrl, customDomain } });
-    }
-    if (prefixUrl) {
-      brandedSpecs.push({ label: "branded", spec: { port, public: false, prefixUrl } });
-    }
-    for (const attempt of brandedSpecs) {
-      try {
-        const created = await blaxelFetch<BlaxelPreview>("POST", base, {
-          metadata: { name: previewName },
-          spec: attempt.spec,
-        });
-        const url = usablePrivatePreviewUrl(created);
-        if (url) return url;
-      } catch (error) {
-        // The usual reason a branded create fails is that another caller (a second server
-        // instance, or the attach racing the create that spawned it) minted this preview a
-        // moment ago under the same prefix. Adopt that one; an unbranded create here would
-        // upsert the name and replace the machine-name URL with an opaque hash.
-        const raced = usablePrivatePreviewUrl(await readExisting());
-        if (raced) return raced;
-        console.warn(
-          `[blaxel] ${attempt.label} preview create failed for ${vmId}/${previewName}; falling back:`,
-          error instanceof Error ? error.message : String(error),
-        );
-      }
-    }
-    const created = await blaxelFetch<BlaxelPreview>("POST", base, {
-      metadata: { name: previewName },
-      spec: { port, public: false },
-    });
-    const url = usablePrivatePreviewUrl(created);
-    if (!url) {
-      throw new ProviderError("blaxel", `preview create for ${vmId} returned no url or came back public`);
-    }
-    return url;
-  }
-
-  private async mintPreviewToken(
-    vmId: string,
-    previewName: string,
-    ttlSeconds = PREVIEW_TOKEN_TTL_SECONDS,
-  ): Promise<string> {
-    const expiresAt = new Date(Date.now() + ttlSeconds * 1000).toISOString();
-    const created = await blaxelFetch<{ spec?: { token?: string } }>(
-      "POST",
-      `${CONTROL_PLANE_BASE}/sandboxes/${encodeURIComponent(vmId)}/previews/${previewName}/tokens`,
-      { spec: { expiresAt } },
-    );
-    const token = created.spec?.token;
-    if (!token) {
-      throw new ProviderError("blaxel", `preview token mint for ${vmId} returned no token`);
-    }
-    return token;
-  }
-
-  // The Cloud panel's activity view. A control-plane read tells us whether the machine is
-  // awake; only then do we exec on it (an exec would wake a sleeping machine, and a
-  // sleeping machine costs nothing — the panel should show that, not defeat it).
-  async getStats(vmId: string): Promise<VMStats> {
-    return withVmSpan("vm.stats", { "cmux.vm.provider": "blaxel", "cmux.vm.id": vmId }, async () => {
-      const sandbox = await this.getSandbox(vmId);
-      const memoryTotalMb = sandbox.spec?.runtime?.memory;
-      const rawState = (sandbox.state ?? "").toUpperCase();
-      const state: VMStats["state"] = rawState === "RUNNING" ? "awake" : rawState ? "asleep" : "unknown";
-      const sampledAt = Date.now();
-      const sandboxUrl = sandbox.metadata?.url;
-      if (state !== "awake" || !sandboxUrl) {
-        return { state, sampledAt, memoryTotalMb };
-      }
-      const result = await this.sandboxExec(sandboxUrl, MACHINE_STATS_COMMAND, 15_000);
-      return { state, sampledAt, ...parseMachineStats(result.stdout, memoryTotalMb) };
-    });
-  }
-
-  // The exe.dev "https://vmname.exe.xyz:3456" equivalent: a private, token-gated preview URL
-  // for any HTTP port on the machine. The token rides as ?bl_preview_token=... (the gateway
-  // sets a cookie on first load, so pages and their websockets keep working in a browser).
-  async openPort(vmId: string, port: number): Promise<{ url: string; token: string; openUrl: string }> {
-    return withVmSpan(
-      "cmux.vm.provider.open_port",
-      { "cmux.vm.provider": "blaxel", "cmux.vm.operation": "open_port", "cmux.vm.id": vmId, "cmux.vm.port": port },
-      async () => {
-        if (!Number.isInteger(port) || port < 1 || port > 65535 || port === CMUX_SANDBOX_API_PORT) {
-          throw new ProviderError("blaxel", `openPort(${vmId}) requires a valid port other than ${CMUX_SANDBOX_API_PORT}`);
-        }
-        // Wake the sandbox (status read) so the preview answers immediately.
-        await this.getSandbox(vmId);
-        const previewName = `port-${port}`;
-        const url = await this.ensurePreview(vmId, previewName, port);
-        const expiresAtMs = Date.now() + PREVIEW_OPEN_TOKEN_TTL_SECONDS * 1000;
-        const token = await this.mintPreviewToken(vmId, previewName, PREVIEW_OPEN_TOKEN_TTL_SECONDS);
-        const openUrl = `${url.replace(/\/+$/, "")}/?bl_preview_token=${encodeURIComponent(token)}`;
-        return { url, token, openUrl, expiresAtMs };
-      },
-    );
-  }
-}
-
-// Preview subdomain prefix: the machine name for the daemon preview, machine-port for port
-// previews. Only lowercase alphanumerics and hyphens survive; anything else (or an
-// over-long result) disables branding for that preview rather than risking a failed create.
-// Fully-owned machine URLs: when CMUX_VM_BLAXEL_CUSTOM_DOMAIN names a domain that is
-// registered AND verified on the workspace (e.g. vm.cmux.sh with its wildcard CNAME live),
-// previews are created on <prefix>.<domain> — noble-wren.vm.cmux.sh — instead of bl.run.
-// Blaxel rejects customDomain while verification is pending, so the driver checks status
-// (cached briefly) and silently keeps the prefix/hash URL until DNS is live.
-let cachedCustomDomain: { value: string | null; checkedAt: number } | null = null;
-const CUSTOM_DOMAIN_CACHE_MS = 5 * 60 * 1000;
-
-async function verifiedCustomDomain(): Promise<string | null> {
-  const domain = env("CMUX_VM_BLAXEL_CUSTOM_DOMAIN");
-  if (!domain) return null;
-  if (cachedCustomDomain && Date.now() - cachedCustomDomain.checkedAt < CUSTOM_DOMAIN_CACHE_MS) {
-    return cachedCustomDomain.value;
-  }
-  let value: string | null = null;
-  try {
-    const record = await blaxelFetch<{ spec?: { status?: string } }>(
-      "GET",
-      `${CONTROL_PLANE_BASE}/customdomains/${encodeURIComponent(domain)}`,
-    );
-    value = record.spec?.status === "verified" ? domain : null;
-  } catch {
-    value = null;
-  }
-  cachedCustomDomain = { value, checkedAt: Date.now() };
-  return value;
-}
-
-// One shell round-trip that samples everything the Cloud panel's activity view shows.
-// Two /proc/stat reads half a second apart give a real CPU% (loadavg alone lags minutes).
-// The disk row reads the persistent home volume wherever this machine holds it:
-// the /home/cmux view on healthy machines, the raw backing mount when the view is
-// missing (the degraded state sessions fail over to), /root on pre-layout sandboxes.
-export const MACHINE_STATS_COMMAND =
-  "head -1 /proc/stat; sleep 0.5; head -1 /proc/stat; cat /proc/loadavg; nproc; " +
-  `grep -E '^(MemTotal|MemAvailable):' /proc/meminfo; ` +
-  `(if mountpoint -q ${CMUX_CLOUD_HOME} 2>/dev/null; then df -kP ${CMUX_CLOUD_HOME}; ` +
-  `elif mountpoint -q ${CMUX_HOME_VOLUME_BACKING_PATH} 2>/dev/null; then df -kP ${CMUX_HOME_VOLUME_BACKING_PATH}; ` +
-  `else df -kP /root; fi) | tail -1`;
-
-export function parseMachineStats(
-  stdout: string,
-  memoryTotalMbFallback?: number,
-): Omit<VMStats, "state" | "sampledAt"> {
-  const lines = stdout.split(/\r?\n/).map((l) => l.trim()).filter(Boolean);
-  const cpuLines = lines.filter((l) => /^cpu\s/.test(l));
-  let cpuPercent: number | undefined;
-  if (cpuLines.length >= 2) {
-    const sample = (line: string) => {
-      const n = line.split(/\s+/).slice(1).map(Number);
-      const idle = (n[3] ?? 0) + (n[4] ?? 0);
-      const total = n.reduce((a, b) => a + (Number.isFinite(b) ? b : 0), 0);
-      return { idle, total };
-    };
-    const a = sample(cpuLines[0]!);
-    const b = sample(cpuLines[cpuLines.length - 1]!);
-    const total = b.total - a.total;
-    const idle = b.idle - a.idle;
-    if (total > 0) cpuPercent = Math.max(0, Math.min(100, ((total - idle) / total) * 100));
-  }
-  const loadLine = lines.find((l) => /^\d+(\.\d+)?\s+\d+(\.\d+)?\s+\d+(\.\d+)?\s+\d+\/\d+/.test(l));
-  const loadAverage1m = loadLine ? Number(loadLine.split(/\s+/)[0]) : undefined;
-  const cpusLine = lines.find((l) => /^\d+$/.test(l));
-  const cpus = cpusLine ? Number(cpusLine) : undefined;
-  const memKb = (key: string) => {
-    const line = lines.find((l) => l.startsWith(`${key}:`));
-    const value = line ? Number(line.split(/\s+/)[1]) : NaN;
-    return Number.isFinite(value) ? value : undefined;
-  };
-  const memTotalKb = memKb("MemTotal");
-  const memAvailableKb = memKb("MemAvailable");
-  const memoryTotalMb = memTotalKb !== undefined ? Math.round(memTotalKb / 1024) : memoryTotalMbFallback;
-  const memoryUsedMb =
-    memTotalKb !== undefined && memAvailableKb !== undefined
-      ? Math.max(0, Math.round((memTotalKb - memAvailableKb) / 1024))
-      : undefined;
-  // df -kP: Filesystem 1024-blocks Used Available Capacity Mounted
-  const dfLine = lines.find((l) => /^\S+\s+\d+\s+\d+\s+\d+\s+\d+%/.test(l));
-  let diskTotalMb: number | undefined;
-  let diskUsedMb: number | undefined;
-  if (dfLine) {
-    const cols = dfLine.split(/\s+/);
-    diskTotalMb = Math.round(Number(cols[1]) / 1024);
-    diskUsedMb = Math.round(Number(cols[2]) / 1024);
-  }
-  return { cpus, cpuPercent, loadAverage1m, memoryTotalMb, memoryUsedMb, diskTotalMb, diskUsedMb };
-}
-
-// The machine's bare name is its daemon address (`<machine>.vm.cmux.sh`); port previews
-// hang off it as `<machine>-<port>`.
-export function brandedPreviewPrefix(vmId: string, previewName: string, port: number): string | null {
-  const machine = vmId.toLowerCase();
-  if (!/^[a-z0-9][a-z0-9-]{0,40}$/.test(machine)) return null;
-  const prefix = previewName === CMUX_TUI_PREVIEW_NAME ? machine : `${machine}-${port}`;
-  return prefix.length <= 48 ? prefix : null;
-}
-
-function mapStatus(sandbox: BlaxelSandbox): VMStatus {
-  switch (sandbox.status) {
-    case "TERMINATED":
-    case "DELETING":
-      return "destroyed";
-    case "UPLOADING":
-    case "BUILDING":
-    case "DEPLOYING":
-      return "creating";
-    default:
-      // DEPLOYED covers both RUNNING and STANDBY states; standby wakes transparently on the
-      // next request, so callers can treat it as running.
-      return "running";
-  }
-}
-
-// Machines are addressed by name everywhere (`cmux vm ssh brave-otter`), so names are
-// generated memorable instead of opaque. Blaxel sandbox names ARE the provider VM id, so
-// this is the whole naming story — no display-name mapping to keep in sync. Collisions
-// retry with fresh picks, then fall back to a random suffix.
-const NAME_ADJECTIVES = [
-  "amber", "bold", "brave", "brisk", "calm", "clever", "coral", "crisp",
-  "eager", "fleet", "gold", "happy", "keen", "kind", "lively", "lucid",
-  "mellow", "noble", "quick", "quiet", "rapid", "sharp", "silver", "smooth",
-  "solid", "spry", "steady", "sunny", "swift", "tidy", "vivid", "warm",
-];
-const NAME_ANIMALS = [
-  "badger", "bison", "crane", "dolphin", "falcon", "finch", "fox", "gecko",
-  "heron", "ibex", "jay", "koala", "lemur", "lynx", "marmot", "marten",
-  "newt", "orca", "osprey", "otter", "owl", "panda", "petrel", "puffin",
-  "raven", "seal", "sparrow", "stoat", "swan", "tern", "wombat", "wren",
-];
-
-export function sandboxPorts(): Array<{ name: string; protocol: "HTTP"; target: number }> {
-  return [{ name: CMUX_TUI_PREVIEW_NAME, protocol: "HTTP", target: CMUX_TUI_PORT }];
-}
-
-/**
- * Machine-level env for the sandbox create payload: LANG always (PTYs from
- * the sandbox API do not inherit image ENV), plus caller-supplied env such
- * as the coderouter model-plane vars. Create-time only: Blaxel envs are
- * immutable after create and are NOT replayed on resurrect, so anything a
- * machine must keep across a resurrect is persisted onto the home volume by
- * /etc/cmux/agent-config.sh at first shell. LANG wins on name collision.
- */
-export function sandboxEnvs(
-  extra?: Readonly<Record<string, string>>,
-): Array<{ name: string; value: string }> {
-  const envs = Object.entries(extra ?? {})
-    .filter(([name]) => name !== "LANG")
-    .map(([name, value]) => ({ name, value }));
-  return [{ name: "LANG", value: "C.UTF-8" }, ...envs];
-}
-
-export function friendlyVmName(withSuffix = false): string {
-  const pick = (list: readonly string[]) => list[randomBytes(1)[0] % list.length];
-  const base = `${pick(NAME_ADJECTIVES)}-${pick(NAME_ANIMALS)}`;
-  if (!withSuffix) return base;
-  const alphabet = "abcdefghijklmnopqrstuvwxyz0123456789";
-  const suffix = Array.from(randomBytes(4), (byte) => alphabet[byte % alphabet.length]).join("");
-  return `${base}-${suffix}`;
-}
-
-export function resolveBlaxelMemoryMb(
-  requested: number | undefined,
-  envValues: Record<string, string | undefined> = process.env,
-): number {
-  if (requested !== undefined) {
-    if (!Number.isSafeInteger(requested) || requested <= 0) {
-      throw new ProviderError("blaxel", "memoryMb must be a positive integer");
-    }
-    return requested;
-  }
-  const raw = envValues.CMUX_VM_BLAXEL_MEMORY_MB?.trim();
-  if (!raw) return DEFAULT_MEMORY_MB;
-  const parsed = Number.parseInt(raw, 10);
-  return Number.isFinite(parsed) && parsed > 0 ? parsed : DEFAULT_MEMORY_MB;
-}
-
-function resolveMemoryMb(requested: number | undefined): number {
-  return resolveBlaxelMemoryMb(requested);
-}
diff --git a/web/services/vms/drivers/cmuxTuiDaemon.ts b/web/services/vms/drivers/cmuxTuiDaemon.ts
index d6441f1db0c4..3ba18911305e 100644
--- a/web/services/vms/drivers/cmuxTuiDaemon.ts
+++ b/web/services/vms/drivers/cmuxTuiDaemon.ts
@@ -5,17 +5,20 @@ import {
   type ExecResult,
   type ProviderId,
 } from "./types";
-import { shellQuote } from "./wsLease";
 
 // cmux-tui is the ONE session daemon on every cmux Cloud machine
 // (docs/cloud-cmux-tui-daemon.md). This module carries everything about it
 // that is not provider-specific: the pinned-manifest source resolution, the
 // sha256-verified install command, the daemon command, and the enrollment
-// flows, all parameterized over a provider exec so blaxel.ts (sandbox API),
+// flows, all parameterized over a provider exec so freestyle.ts (VM exec API),
 // e2b.ts (commands.run as root), and daytona.ts (toolbox exec) share one
 // implementation. Providers keep only their transport mechanics: how the
 // daemon process is supervised and how port 1337 is reached from outside.
 
+export function shellQuote(value: string): string {
+  return `'${value.replace(/'/g, `'\\''`)}'`;
+}
+
 export const CMUX_TUI_PORT = 1337;
 export const CMUX_TUI_SESSION = "cloud";
 export const CMUX_TUI_BINARY_PATH = "/root/.cmux/bin/cmux-tui";
@@ -27,8 +30,8 @@ export const CMUX_TUI_PERSISTENT_MOUNT_WAIT_TIMEOUT_MS = 30_000;
 
 // The non-root work user on cmux Cloud machines. Terminals must not run as root
 // (coding agents refuse root, e.g. `claude --dangerously-skip-permissions`); root
-// stays one passwordless `sudo` away. The Blaxel image bakes this user; the
-// driver's runtime user setup creates it on images that predate it.
+// stays one passwordless `sudo` away. An image that bakes this user is driven
+// through CMUX_CLOUD_LAYOUT; images without it keep the root daemon.
 export const CMUX_CLOUD_USER = "cmux";
 export const CMUX_CLOUD_HOME = "/home/cmux";
 
@@ -142,7 +145,7 @@ const CMUX_TUI_MANIFEST_CACHE_MS = 5 * 60 * 1000;
  * `latest`. Nothing else is configured by hand: the build and its sha256 come from
  * the manifest the artifacts workflow publishes.
  */
-export function cmuxTuiManifestUrl(provider: ProviderId = "blaxel"): string {
+export function cmuxTuiManifestUrl(provider: ProviderId = "freestyle"): string {
   const url = process.env.CMUX_VM_CMUX_TUI_MANIFEST_URL?.trim() || CMUX_TUI_DEFAULT_MANIFEST_URL;
   if (!/^https:\/\//.test(url)) {
     throw new ProviderError(provider, "CMUX_VM_CMUX_TUI_MANIFEST_URL must be an https:// URL");
@@ -154,7 +157,7 @@ export function cmuxTuiManifestUrl(provider: ProviderId = "blaxel"): string {
 export function parseCmuxTuiManifest(
   manifestUrl: string,
   manifest: unknown,
-  provider: ProviderId = "blaxel",
+  provider: ProviderId = "freestyle",
 ): CmuxTuiSource {
   const record = manifest && typeof manifest === "object" ? manifest as Record<string, unknown> : {};
   const commit = typeof record.commit === "string" ? record.commit : "";
@@ -178,7 +181,7 @@ export function parseCmuxTuiManifest(
 let cmuxTuiSourceCache: { url: string; fetchedAt: number; source: CmuxTuiSource } | null = null;
 
 /** The Linux daemon build to install, from the manifest (cached 5 min per manifest URL). */
-export async function resolveCmuxTuiSource(provider: ProviderId = "blaxel"): Promise<CmuxTuiSource> {
+export async function resolveCmuxTuiSource(provider: ProviderId = "freestyle"): Promise<CmuxTuiSource> {
   const manifestUrl = cmuxTuiManifestUrl(provider);
   if (cmuxTuiSourceCache && cmuxTuiSourceCache.url === manifestUrl && Date.now() - cmuxTuiSourceCache.fetchedAt < CMUX_TUI_MANIFEST_CACHE_MS) {
     return cmuxTuiSourceCache.source;
@@ -248,8 +251,8 @@ export function cmuxTuiInstallCommand(
   const bin = shellQuote(binaryPath);
   const tmp = shellQuote(`${binaryPath}.tmp`);
   const pinned = (path: string) => `printf '%s  %s\n' ${shellQuote(source.sha256)} ${path} | sha256sum -c >/dev/null 2>&1`;
-  // A stock blaxel/base-image has no curl until background provisioning adds it, so
-  // the fetch installs curl itself (apk, Alpine) and falls back to busybox wget.
+  // A stock minimal base image may have no curl until background provisioning adds
+  // it, so the fetch installs curl itself (apk, Alpine) and falls back to busybox wget.
   const fetch =
     `(command -v curl >/dev/null 2>&1 || apk add --no-cache curl >/dev/null 2>&1 || true); ` +
     `if command -v curl >/dev/null 2>&1; then curl -fsSL --retry 3 --retry-delay 2 -o ${tmp} ${shellQuote(source.url)}; ` +
@@ -281,8 +284,8 @@ export function cmuxTuiPinCheckCommand(
 
 /** The listener bind every container provider uses; cmux-devbox-boot's CMUX_TUI_REMOTE_WS_BIND default. */
 export const CMUX_TUI_DEFAULT_REMOTE_WS_BIND = `0.0.0.0:${CMUX_TUI_PORT}`;
-// Rootfs state lets the Blaxel provider distinguish an intentional root
-// fallback from a still-running non-root daemon and reconcile it on attach.
+// Rootfs state lets a driver distinguish an intentional root fallback from a
+// still-running non-root daemon and reconcile it on attach.
 export const CMUX_TUI_LAYOUT_MARKER_PATH = "/etc/cmux/daemon-layout";
 
 const CMUX_TUI_BACKING_EXPECTED_VAR = "cmux_tui_backing_expected";
@@ -376,7 +379,7 @@ function cmuxTuiSupervisedDaemonInvocation(
     `${watcherPid}=''`,
     terminateChild,
     // USR1 is private to this supervisor. TERM/INT/HUP still stop both children
-    // cleanly when Blaxel stops the named process during lease revocation.
+    // cleanly when a provider stops the named process during lease revocation.
     `trap '${viewLost}=1; cmux_tui_terminate_child "$${daemonPid}"' USR1`,
     `trap 'cmux_tui_terminate_child "$${daemonPid}"; cmux_tui_terminate_child "$${watcherPid}"; exit 143' TERM INT HUP`,
     `{ mkdir -p /etc/cmux 2>/dev/null; printf '${layoutMarker}\\n' > ${CMUX_TUI_LAYOUT_MARKER_PATH}; } 2>/dev/null`,
@@ -442,8 +445,8 @@ function cmuxTuiBackingDaemonInvocation(
  * default).
  *
  * Without a layout the daemon (and so every terminal pane it spawns) runs as root
- * with HOME=/root — the historical model, still used by E2B, Daytona, and
- * Freestyle. With a layout (Blaxel) the daemon drops to the layout user via
+ * with HOME=/root — the model every current driver uses (E2B, Daytona,
+ * Freestyle). With a layout the daemon drops to the layout user via
  * runuser, so panes are non-root shells with passwordless sudo. Two guards keep
  * old machines working:
  *  - A sandbox from before the layout change mounts its persistent volume at
@@ -474,7 +477,7 @@ export function cmuxTuiDaemonCommand(
   const backingBin = cmuxTuiBinaryPath(backing);
   const legacyBin = cmuxTuiBinaryPath("/root");
   const usableBase = cmuxTuiUserUsableCondition(layout);
-  // A no-volume Blaxel machine legitimately uses its disposable rootfs home.
+  // A no-volume machine legitimately uses its disposable rootfs home.
   // A volume-backed machine must never silently switch to that path while its
   // mount is late or lost, because all writes there disappear on resurrection.
   const usable = persistentVolumeExpected
@@ -539,7 +542,7 @@ export function cmuxTuiDaemonCommand(
 /** Enrollment invitations are `cmux://enroll/<base64url JSON>`; the id and expiry inside are what the approve flow needs. */
 export function parseEnrollmentInvitationUri(
   uri: string,
-  provider: ProviderId = "blaxel",
+  provider: ProviderId = "freestyle",
 ): { id: string; expiresAtUnix: number; daemonFingerprint: string | null } {
   const prefix = "cmux://enroll/";
   if (!uri.startsWith(prefix)) {
@@ -588,8 +591,8 @@ export function parseJsonArray(text: string): Array<Record<string, unknown>> {
 
 /**
  * Runs `cmux-tui <args>` inside the VM as the daemon's own user and HOME (the
- * daemon's state home). Each provider supplies its own transport: Blaxel's
- * sandbox API, E2B's commands.run, Daytona's toolbox exec.
+ * daemon's state home). Each provider supplies its own transport: Freestyle's
+ * VM exec API, E2B's commands.run, Daytona's toolbox exec.
  */
 export type CmuxTuiInvoke = (args: string, timeoutMs?: number) => Promise<ExecResult>;
 
diff --git a/web/services/vms/drivers/daytona.ts b/web/services/vms/drivers/daytona.ts
index 691c956a1cc3..437d346dba29 100644
--- a/web/services/vms/drivers/daytona.ts
+++ b/web/services/vms/drivers/daytona.ts
@@ -36,7 +36,7 @@ import {
 
 // Daytona sandboxes attach through the cmux-tui remote daemon (transport
 // `cmux-remote`, docs/cloud-cmux-tui-daemon.md), the machine's only session daemon —
-// same model as Blaxel. `create` installs the pinned files.cmux.com build
+// same model as the other cmux Cloud drivers. `create` installs the pinned files.cmux.com build
 // (sha256-verified, fetched by the sandbox itself); the devbox image's registered
 // entrypoint (/usr/local/bin/cmux-devbox-boot) supervises the daemon and Daytona
 // re-runs it on every sandbox start, which matters because Daytona stop kills
@@ -446,7 +446,7 @@ export class DaytonaProvider implements VMProvider {
   }
 
   /**
-   * Attach-time heal, mirroring the Blaxel driver: a running daemon is left alone;
+   * Attach-time heal, mirroring the other cmux-tui drivers: a running daemon is left alone;
    * a dead one is restarted, reinstalling first when the binary is missing or a
    * manifest pin change supersedes it. Daytona stop kills processes, so this runs
    * for real after every stop/start cycle that beat the image entrypoint.
diff --git a/web/services/vms/drivers/e2b.ts b/web/services/vms/drivers/e2b.ts
index 4831fdf34ec6..c0424a43f0b3 100644
--- a/web/services/vms/drivers/e2b.ts
+++ b/web/services/vms/drivers/e2b.ts
@@ -36,17 +36,17 @@ import {
 
 // E2B sandboxes attach through the cmux-tui remote daemon (transport `cmux-remote`,
 // docs/cloud-cmux-tui-daemon.md), the machine's only session daemon — same model as
-// Blaxel. `create` installs the pinned files.cmux.com build (sha256-verified, fetched
+// the other cmux Cloud drivers. `create` installs the pinned files.cmux.com build (sha256-verified, fetched
 // by the sandbox itself) and starts the daemon as a background command; E2B
 // pause/resume snapshots memory, so the daemon survives lifecycle transitions, and
 // every attach re-verifies pin + liveness (ensureCmuxTuiRunning) exactly like the
-// Blaxel driver.
+// Freestyle driver.
 //
 // Ingress: E2B proxies `https://<port>-<sandbox-id>.e2b.app` per port. Its only
 // request auth is the `e2b-traffic-access-token` HEADER, which the cmux-tui dialer
 // cannot send (it dials the route verbatim, adding only a User-Agent), so sandboxes
 // are created with public port traffic and the daemon's Noise device enrollment is
-// the session gate — the same trust model as Blaxel's raw preview, where the route
+// the session gate — the same trust model as a raw provider preview, where the route
 // token "only gates reachability". Sandboxes created by the old cmuxd-remote driver
 // (allowPublicTraffic: false, no cmux-tui) cannot serve this transport and need
 // recreation.
@@ -356,7 +356,7 @@ export class E2BProvider implements VMProvider {
   }
 
   /**
-   * Attach-time heal, mirroring the Blaxel driver: a running daemon is left
+   * Attach-time heal, mirroring the other cmux-tui drivers: a running daemon is left
    * alone; a dead one is restarted, reinstalling first when the binary is
    * missing or a manifest pin change supersedes it. E2B pause/resume preserves
    * processes (memory snapshot), so this is normally a no-op.
diff --git a/web/services/vms/drivers/freestyle.ts b/web/services/vms/drivers/freestyle.ts
index 9171e5b86eb2..422bf28f7b91 100644
--- a/web/services/vms/drivers/freestyle.ts
+++ b/web/services/vms/drivers/freestyle.ts
@@ -1,151 +1,244 @@
-import { Freestyle } from "freestyle";
-import { createHash, createPrivateKey, createPublicKey, randomBytes, sign, verify } from "node:crypto";
+import { Freestyle, FreestyleApiError, type VmData, type Vm } from "freestyle";
+import { randomBytes } from "node:crypto";
 import {
   ProviderError,
+  type AttachEndpoint,
   type AttachOptions,
+  type AttachTransport,
+  type CmuxRemoteApprovalResult,
   type CmuxRemoteApprovalOptions,
+  type CmuxRemoteAttachOptions,
+  type CmuxRemoteEndpoint,
   type CreateOptions,
   type ExecOptions,
   type ExecResult,
-  type AttachEndpoint,
   type SSHEndpoint,
-  type WebSocketPtyEndpoint,
   type SnapshotRef,
   type VMHandle,
   type VMProvider,
   type VMStatus,
 } from "./types";
+import { recordSpanError, setSpanAttributes, withVmSpan } from "../telemetry";
 import {
-  recordSpanError,
-  setSpanAttributes,
-  withVmSpan,
-} from "../telemetry";
-import { isProviderIdentityNotFoundError } from "../providerErrors";
-import {
-  isReusableRpcLease,
-  ensurePrivateDirectoryCommand,
-  leaseClientMetadata,
-  makeWebSocketAttachmentId,
-  makeWebSocketLease,
-  shellArgValue,
-  shellQuote,
-  type ReusableRpcLease,
-} from "./wsLease";
-import {
-  FreestyleBetaPlatform,
-  freestylePlatformIsBeta,
-  isFreestyleBetaVmId,
-} from "./freestyleBeta";
-import type {
-  AttachTransport,
-  CmuxRemoteApprovalResult,
-  CmuxRemoteAttachOptions,
-  CmuxRemoteEndpoint,
-} from "./types";
-
-// Freestyle VMs reach the outside world only via their SSH gateway, which terminates on
-// `vm-ssh.freestyle.sh:22`. `ssh <vmId>+<user>@vm-ssh.freestyle.sh` authenticates against
-// an identity token the backend mints per attach session (short TTL, revoked on rm).
-const SSH_HOST = "vm-ssh.freestyle.sh";
-const SSH_PORT = 22;
-const CMUX_LINUX_USER = "cmux"; // must match Resources/install.sh in scratch/vm-experiments
-const CMUXD_WS_PTY_LEASE_PATH = "/tmp/cmux/attach-pty-lease.json";
-const CMUXD_WS_LEGACY_PTY_LEASE_PATH = "/tmp/cmux/attach-lease.json";
-const CMUXD_WS_RPC_CLIENT_PATH = "/tmp/cmux/attach-rpc-client.json";
-const CMUXD_WS_RPC_LEASE_PATH = "/tmp/cmux/attach-rpc-lease.json";
-const CMUXD_WS_PTY_LEASE_TTL_SECONDS = 5 * 60;
-const CMUXD_WS_RPC_LEASE_TTL_SECONDS = 12 * 60 * 60;
-const CMUXD_WS_RPC_RENEW_BEFORE_SECONDS = 60;
-const FREESTYLE_WS_PORTS = [{ port: 443, targetPort: 7777 }];
-const FREESTYLE_DAEMON_ADMIN_TOKEN_METADATA_KEY = "freestyleDaemonAdminToken";
-const CMUX_CLOUD_SHELL_PATH = "/usr/local/bin/cmux-cloud-shell";
+  CMUX_TUI_INSTALL_TIMEOUT_MS,
+  CMUX_TUI_PORT,
+  CMUX_TUI_SESSION,
+  approveCmuxTuiEnrollment,
+  cmuxTuiDaemonBuild,
+  cmuxTuiDaemonCommand,
+  cmuxTuiInstallCommand,
+  cmuxTuiPinCheckCommand,
+  isCmuxTuiDeviceEnrolled,
+  mintCmuxTuiInvitation,
+  resolveCmuxTuiSource,
+  waitForCmuxTuiReady,
+  type CmuxTuiInvoke,
+} from "./cmuxTuiDaemon";
+
+// The Freestyle driver, on the public platform (api.freestyle.sh /v5, SDK
+// freestyle@0.2.x). This is the only Freestyle arm: the legacy 0.1.x platform
+// (SSH gateway, cmuxd-remote WebSocket PTY on 7777) has been removed,
+// so every Freestyle machine now attaches the same way every other cmux Cloud
+// machine does.
+//
+// Machines attach through the cmux-tui remote daemon (transport `cmux-remote`,
+// docs/cloud-cmux-tui-daemon.md), the same model as E2B/Daytona. The API has
+// no HTTP ingress proxy to arbitrary VM ports (TLS edge rules need a
+// customer-verified domain), so the route is the VM's stable public IPv6
+// straight to the daemon: `ws://[<publicIpv6>]:1337/v1/link`. The daemon's
+// Noise handshake encrypts and authenticates the session end to end (carrier
+// TLS is not required and the route token only feeds the lease ledger, exactly
+// like E2B's public proxy). The daemon must therefore bind dual-stack: the
+// baked systemd unit sets CMUX_TUI_REMOTE_WS_BIND=[::]:1337 and the driver
+// re-asserts it on heal.
+//
+// Creates take NO ports field, NO create-time env, and NO systemd injection;
+// `firewall` is mandatory. Model-plane env is delivered by writing the
+// persisted /root/.config/cmux/model-plane.env file (0600) that
+// /etc/cmux/agent-config.sh already sources when the boot env is absent.
+
+export const FREESTYLE_REMOTE_WS_BIND = `[::]:${CMUX_TUI_PORT}`;
+export const FREESTYLE_ATTACH_TRANSPORT: AttachTransport = "cmux-remote";
+
+/**
+ * Every guest command runs as root. The 0.2 API's `linuxUser` default is not
+ * root but "the account holding uid 1000, or root in an image with no such
+ * account", and the cmux devbox image ships a uid-1000 user — so leaving this
+ * off would silently move the daemon, its install, and the model-plane write
+ * off the root layout they are baked around.
+ */
+const GUEST_LINUX_USER = "root";
 
 const DEFAULT_TIMEOUT_MS = 60_000;
 const CREATE_TIMEOUT_MS = 15 * 60 * 1000;
 const SNAPSHOT_TIMEOUT_MS = 15 * 60 * 1000;
+const EXEC_DEFAULT_TIMEOUT_MS = 30_000;
+/** The exec API rejects timeoutMs above 300000 (5 minutes per exec). */
+const MAX_EXEC_TIMEOUT_MS = 300_000;
 const EXEC_OVERHEAD_TIMEOUT_MS = 15_000;
-const MAX_EXEC_TIMEOUT_MS = 15 * 60 * 1000;
-
-function client(timeoutMs = DEFAULT_TIMEOUT_MS): Freestyle {
+const ROUTE_TOKEN_TTL_SECONDS = 12 * 60 * 60;
+const MODEL_PLANE_ENV_PATH = "/root/.config/cmux/model-plane.env";
+
+/**
+ * FREESTYLE_API_URL stays as an operator escape hatch (a staging edge); unset,
+ * the SDK's own default — the public api.freestyle.sh — is used. The
+ * stack-token pair mirrors build-devbox-freestyle.ts for interactive use.
+ */
+function freestyleClient(timeoutMs = DEFAULT_TIMEOUT_MS): Freestyle {
   const longFetch: typeof fetch = (input, init) =>
     fetch(input as Request, { ...(init ?? {}), signal: AbortSignal.timeout(timeoutMs) });
-  return new Freestyle({ fetch: longFetch });
+  const baseUrl = process.env.FREESTYLE_API_URL?.trim() || undefined;
+  const apiKey = process.env.FREESTYLE_API_KEY?.trim();
+  if (apiKey) return new Freestyle({ apiKey, baseUrl, fetch: longFetch });
+  const stackAccessToken = process.env.FREESTYLE_STACK_ACCESS_TOKEN?.trim();
+  const teamId = process.env.FREESTYLE_TEAM_ID?.trim();
+  if (stackAccessToken && teamId) {
+    return new Freestyle({ stackAccessToken, teamId, baseUrl, fetch: longFetch });
+  }
+  throw new ProviderError(
+    "freestyle",
+    "freestyle requires FREESTYLE_API_KEY (or FREESTYLE_STACK_ACCESS_TOKEN + FREESTYLE_TEAM_ID)",
+  );
+}
+
+/**
+ * Outbound open (package installs, files.cmux.com, agents); inbound only the
+ * cmux-tui daemon port. The mandatory `firewall` field defaults to NOTHING —
+ * no outbound, no inbound — so both rules are stated. Session auth on 1337 is
+ * the daemon's Noise device enrollment; the platform edge closing every other
+ * port is the same posture the e2b driver builds by hand with iptables.
+ */
+export function freestyleFirewallRules() {
+  return [
+    { action: "allow" as const, source: {}, destination: { public: true as const } },
+    {
+      action: "allow" as const,
+      source: { public: true as const },
+      destination: { port: CMUX_TUI_PORT, protocol: "tcp" as const },
+    },
+  ];
+}
+
+/** `ws://[<publicIpv6>]:1337/v1/link` — see the ingress note at the top of this file. */
+export function freestyleCmuxRemoteRoute(publicIpv6: string | null | undefined, vmId: string): string {
+  const ipv6 = publicIpv6?.trim();
+  if (!ipv6) {
+    throw new ProviderError(
+      "freestyle",
+      `VM ${vmId} has no public IPv6 address, so its cmux-tui daemon is unreachable (the platform has no HTTP ingress to arbitrary ports)`,
+    );
+  }
+  return `ws://[${ipv6}]:${CMUX_TUI_PORT}/v1/link`;
+}
+
+/**
+ * The persisted model-plane env file, byte-compatible with what
+ * /etc/cmux/agent-config.sh itself writes from a boot env: shells that see no
+ * boot env source this copy and then materialize the codex/pi/opencode
+ * configs. Freestyle has no create-time env, so the driver writes the file.
+ */
+export function renderFreestyleModelPlaneEnvFile(envs: Readonly<Record<string, string>>): string | null {
+  const baseUrl = envs.OPENAI_BASE_URL?.trim();
+  if (!baseUrl) return null;
+  const quote = (value: string) => `'${value.replace(/'/g, `'\\''`)}'`;
+  const lines = [
+    "# generated by cmux from machine boot env; managed, do not edit",
+    `export OPENAI_BASE_URL=${quote(baseUrl)}`,
+  ];
+  if (envs.OPENAI_API_KEY) lines.push(`export OPENAI_API_KEY=${quote(envs.OPENAI_API_KEY)}`);
+  if (envs.CMUX_CODEROUTER_URL) lines.push(`export CMUX_CODEROUTER_URL=${quote(envs.CMUX_CODEROUTER_URL)}`);
+  return `${lines.join("\n")}\n`;
 }
 
-function normalizeExecTimeout(timeoutMs: number | undefined): number {
+export function normalizeFreestyleExecTimeout(timeoutMs: number | undefined): number {
   if (typeof timeoutMs !== "number" || !Number.isFinite(timeoutMs) || timeoutMs <= 0) {
-    return 30_000;
+    return EXEC_DEFAULT_TIMEOUT_MS;
   }
   return Math.min(Math.floor(timeoutMs), MAX_EXEC_TIMEOUT_MS);
 }
 
-function mapStatus(state: string | null | undefined): VMStatus {
+/**
+ * `stopped` maps to paused, not destroyed: a stopped VM still exists and
+ * `start()` boots it again (poweroff, an idle timeout, or a failure with
+ * automaticRestart off all leave a recoverable machine).
+ */
+export function mapFreestyleState(state: VmData["state"] | null | undefined): VMStatus {
   switch (state) {
     case "starting":
       return "creating";
     case "running":
       return "running";
-    case "suspending":
-    case "suspended":
-      return "paused";
+    case "pausing":
+    case "paused":
     case "stopped":
-      return "destroyed";
+      return "paused";
     default:
       return "running";
   }
 }
 
-// The freestyle ProviderId spans TWO Freestyle platforms. Existing production
-// machines live on the legacy platform (api.freestyle.sh, SDK freestyle@0.1.51,
-// cmuxd-remote on 7777) and keep the code below unchanged. New creates from a
-// beta image dispatch to FreestyleBetaPlatform (./freestyleBeta.ts): the beta
-// devbox snapshot, cmux-tui on 1337, transport cmux-remote. Per-machine
-// dispatch keys on the id shape — beta ids are `vm-<32 hex>`, legacy ids bare
-// 20-char base36 — with the persisted providerMetadata.freestylePlatform
-// marker (written by every beta create) as the authoritative override where
-// metadata flows (attach paths).
+/**
+ * Healthy = the daemon process is up AND something listens on 1337 in the v6
+ * table (a dual-stack `[::]` bind; 0x0539 = 1337). A daemon bound 0.0.0.0 only
+ * appears in /proc/net/tcp, is unreachable at the public IPv6, and must be
+ * restarted under the dual-stack override.
+ */
+export function freestyleDaemonHealthyCommand(): string {
+  return "pgrep -f 'cmux-tui server start' >/dev/null 2>&1 && grep -qi ':0539 ' /proc/net/tcp6";
+}
+
+const REMOTE_WS_BIND_OVERRIDE =
+  "/etc/systemd/system/cmux-tui-daemon.service.d/10-cmux-remote-ws-bind.conf";
+
+/**
+ * (Re)start the daemon listening dual-stack. Under systemd (the baked
+ * cmux-tui-daemon unit), install a drop-in setting
+ * CMUX_TUI_REMOTE_WS_BIND=[::]:1337 — the env cmux-devbox-boot reads — then
+ * restart the unit, healing machines from bakes that predate the env default.
+ * Without systemd (or the unit), fall back to a direct daemon launch with the
+ * dual-stack bind, mirroring the Daytona driver's fallback.
+ */
+export function freestyleStartDaemonCommand(): string {
+  return [
+    "if [ -d /run/systemd/system ] && [ -f /etc/systemd/system/cmux-tui-daemon.service ]; then",
+    `mkdir -p ${REMOTE_WS_BIND_OVERRIDE.replace(/\/[^/]+$/, "")};`,
+    `printf '[Service]\\nEnvironment=CMUX_TUI_REMOTE_WS_BIND=${FREESTYLE_REMOTE_WS_BIND}\\n' > ${REMOTE_WS_BIND_OVERRIDE};`,
+    "systemctl daemon-reload;",
+    "systemctl restart cmux-tui-daemon;",
+    "else",
+    `pgrep -f 'cmux-tui server start' >/dev/null 2>&1 || (setsid nohup sh -c '${cmuxTuiDaemonCommand(FREESTYLE_REMOTE_WS_BIND)}' >>/tmp/cmux-tui-daemon.log 2>&1 &);`,
+    "fi",
+  ].join(" ");
+}
+
+function isNotFound(err: unknown): boolean {
+  return err instanceof FreestyleApiError && (err.status === 404 || err.code === "NOT_FOUND");
+}
+
+function errorMessage(err: unknown): string {
+  return err instanceof Error ? err.message : String(err);
+}
+
+function spanAttributes(vmId: string, operation: string, extra: Record<string, string | number | boolean> = {}) {
+  return {
+    "cmux.vm.provider": "freestyle",
+    "cmux.vm.operation": operation,
+    "cmux.vm.id": vmId,
+    ...extra,
+  };
+}
+
 export class FreestyleProvider implements VMProvider {
   readonly id = "freestyle" as const;
-  private readonly beta = new FreestyleBetaPlatform();
 
-  /**
-   * The union across both platforms: legacy machines serve websocket/SSH via
-   * openAttach, beta machines only cmux-remote. A cmux-remote-only list here
-   * would make the workflow gate refuse openAttach for the legacy fleet, so
-   * per-machine refusal happens inside openAttach/openCmuxRemote instead.
-   */
-  readonly attachTransports: readonly AttachTransport[] = ["cmux-remote", "websocket", "ssh"];
-
-  /** Beta marker where metadata flows, id shape everywhere else. */
-  private isBetaMachine(vmId: string, metadata?: Record<string, unknown>): boolean {
-    return freestylePlatformIsBeta(metadata) || isFreestyleBetaVmId(vmId);
-  }
+  /** The only session transport: the cmux-tui remote daemon (`openCmuxRemote`). */
+  readonly attachTransports: readonly AttachTransport[] = ["cmux-remote"];
 
   async create(options: CreateOptions): Promise<VMHandle> {
-    if (this.beta.createTargetsBeta(options)) {
-      return this.beta.create(options);
-    }
     const image = options.image.trim();
     if (!image) {
       throw new ProviderError("freestyle", "create requires a resolved image");
     }
-    const signedAdmin = freestyleAdminSigningConfig();
-    if (options.bakedFreestyleSignedAdmin === true && !signedAdmin) {
-      throw new ProviderError(
-        "freestyle",
-        "create requires CMUX_FREESTYLE_ADMIN_SIGNING_PRIVATE_KEY_SEED and CMUX_FREESTYLE_ADMIN_SIGNING_PUBLIC_KEY for this Cloud VM image",
-      );
-    }
-    const adminToken = signedAdmin
-      ? null
-      : freestyleDaemonAdminToken(options.providerMetadata)
-        ?? `cmux-freestyle-admin-${randomBytes(32).toString("hex")}`;
-    const providerMetadata = adminToken
-      ? {
-        ...(options.providerMetadata ?? {}),
-        [FREESTYLE_DAEMON_ADMIN_TOKEN_METADATA_KEY]: adminToken,
-      }
-      : { ...(options.providerMetadata ?? {}) };
     return withVmSpan(
       "cmux.vm.provider.create",
       {
@@ -155,52 +248,48 @@ export class FreestyleProvider implements VMProvider {
         "cmux.timeout_ms": CREATE_TIMEOUT_MS,
       },
       async (span) => {
-        const fs = client(CREATE_TIMEOUT_MS);
         try {
-          // Build images can take several minutes if the snapshot cache misses.
-          const createRequest: Parameters<typeof fs.vms.create>[0] = {
+          const fs = freestyleClient(CREATE_TIMEOUT_MS);
+          const { vm, vmId } = await fs.vms.create({
             snapshotId: image,
-            ports: FREESTYLE_WS_PORTS,
-            readySignalTimeoutSeconds: 600,
-          };
-          if (adminToken && options.bakedFreestyleSignedAdmin !== true) {
-            createRequest.systemd = {
-              services: [freestyleWebSocketService(adminToken)],
-            };
+            displayName: "cmux Cloud VM",
+            metadata: { cmux: "cloud" },
+            firewall: { rules: freestyleFirewallRules() },
+          });
+          setSpanAttributes(span, { "cmux.vm.id": vmId });
+          try {
+            await this.bootstrapCmuxTui(vm, vmId, options.envs);
+          } catch (err) {
+            // A VM that failed to bootstrap must not survive as an orphan.
+            await vm.delete().catch((cleanupErr) => {
+              console.error(`[freestyle] create rollback failed; VM ${vmId} may be orphaned`, cleanupErr);
+            });
+            throw err;
           }
-          const created = await fs.vms.create(createRequest);
-          setSpanAttributes(span, { "cmux.vm.id": created.vmId });
           return {
-            provider: "freestyle",
-            providerVmId: created.vmId,
-            status: "running",
+            provider: "freestyle" as const,
+            providerVmId: vmId,
+            status: "running" as const,
             image,
             createdAt: Date.now(),
-            providerMetadata,
+            providerMetadata: { ...(options.providerMetadata ?? {}) },
           };
         } catch (err) {
-          throw new ProviderError("freestyle", `create(${image})`, err);
+          throw err instanceof ProviderError ? err : new ProviderError("freestyle", `create(${image}) failed`, err);
         }
       },
     );
   }
 
   async destroy(vmId: string): Promise<void> {
-    if (isFreestyleBetaVmId(vmId)) return this.beta.destroy(vmId);
     return withVmSpan(
       "cmux.vm.provider.destroy",
-      {
-        "cmux.vm.provider": "freestyle",
-        "cmux.vm.operation": "destroy",
-        "cmux.vm.id": vmId,
-        "cmux.timeout_ms": DEFAULT_TIMEOUT_MS,
-      },
+      spanAttributes(vmId, "destroy"),
       async () => {
         try {
-          const fs = client();
-          const ref = fs.vms.ref({ vmId });
-          await ref.delete();
+          await freestyleClient().vms.ref(vmId).delete();
         } catch (err) {
+          if (isNotFound(err)) return; // already gone; destroy is idempotent
           throw new ProviderError("freestyle", `destroy(${vmId})`, err);
         }
       },
@@ -208,43 +297,31 @@ export class FreestyleProvider implements VMProvider {
   }
 
   async getStatus(vmId: string): Promise<VMStatus> {
-    if (isFreestyleBetaVmId(vmId)) return this.beta.getStatus(vmId);
     return withVmSpan(
       "cmux.vm.provider.get_status",
-      {
-        "cmux.vm.provider": "freestyle",
-        "cmux.vm.operation": "get_status",
-        "cmux.vm.id": vmId,
-        "cmux.timeout_ms": DEFAULT_TIMEOUT_MS,
-      },
+      spanAttributes(vmId, "get_status"),
       async (span) => {
         try {
-          const info = await client().vms.ref({ vmId }).getInfo();
-          const status = mapStatus(info.state);
-          setSpanAttributes(span, { "cmux.vm.provider_state": info.state, "cmux.vm.status": status });
+          const data = await freestyleClient().vms.get(vmId);
+          const status = mapFreestyleState(data.state);
+          setSpanAttributes(span, { "cmux.vm.provider_state": data.state, "cmux.vm.status": status });
           return status;
         } catch (err) {
+          if (isNotFound(err)) return "destroyed";
           throw new ProviderError("freestyle", `getStatus(${vmId})`, err);
         }
       },
     );
   }
 
+  /** Pause freezes memory, so a later start resumes the daemon in place. */
   async pause(vmId: string): Promise<void> {
-    if (isFreestyleBetaVmId(vmId)) return this.beta.pause(vmId);
     return withVmSpan(
       "cmux.vm.provider.pause",
-      {
-        "cmux.vm.provider": "freestyle",
-        "cmux.vm.operation": "pause",
-        "cmux.vm.id": vmId,
-        "cmux.timeout_ms": DEFAULT_TIMEOUT_MS,
-      },
+      spanAttributes(vmId, "pause"),
       async () => {
         try {
-          const fs = client();
-          const ref = fs.vms.ref({ vmId });
-          await ref.suspend();
+          await freestyleClient(CREATE_TIMEOUT_MS).vms.ref(vmId).pause();
         } catch (err) {
           throw new ProviderError("freestyle", `pause(${vmId})`, err);
         }
@@ -253,28 +330,29 @@ export class FreestyleProvider implements VMProvider {
   }
 
   async resume(vmId: string): Promise<VMHandle> {
-    if (isFreestyleBetaVmId(vmId)) return this.beta.resume(vmId);
     return withVmSpan(
       "cmux.vm.provider.resume",
-      {
-        "cmux.vm.provider": "freestyle",
-        "cmux.vm.operation": "resume",
-        "cmux.vm.id": vmId,
-        "cmux.timeout_ms": DEFAULT_TIMEOUT_MS,
-      },
+      spanAttributes(vmId, "resume"),
       async (span) => {
         try {
-          const fs = client();
-          const ref = fs.vms.ref({ vmId });
-          await ref.start();
-          const info = await ref.getInfo();
-          const status = mapStatus(info.state);
-          setSpanAttributes(span, { "cmux.vm.provider_state": info.state, "cmux.vm.status": status });
+          const fs = freestyleClient(CREATE_TIMEOUT_MS);
+          const vm = fs.vms.ref(vmId);
+          const data = await vm.start();
+          const status = mapFreestyleState(data.state);
+          setSpanAttributes(span, { "cmux.vm.provider_state": data.state, "cmux.vm.status": status });
+          // A memory-preserving pause keeps the daemon; a cold boot (the VM had
+          // stopped) relies on the baked systemd unit. Heal best-effort so the
+          // first attach doesn't race the unit; attach re-verifies anyway.
+          try {
+            await this.ensureCmuxTuiRunning(vm, vmId);
+          } catch (healErr) {
+            recordSpanError(span, healErr);
+          }
           return {
-            provider: "freestyle",
-            providerVmId: info.id,
+            provider: "freestyle" as const,
+            providerVmId: data.id,
             status,
-            image: "freestyle:resumed",
+            image: data.snapshotId ?? "freestyle:resumed",
             createdAt: Date.now(),
           };
         } catch (err) {
@@ -284,35 +362,22 @@ export class FreestyleProvider implements VMProvider {
     );
   }
 
-  async exec(
-    vmId: string,
-    command: string,
-    opts?: ExecOptions,
-  ): Promise<ExecResult> {
-    if (isFreestyleBetaVmId(vmId)) return this.beta.exec(vmId, command, opts);
-    const timeoutMs = normalizeExecTimeout(opts?.timeoutMs);
+  async exec(vmId: string, command: string, opts?: ExecOptions): Promise<ExecResult> {
+    const timeoutMs = normalizeFreestyleExecTimeout(opts?.timeoutMs);
     return withVmSpan(
       "cmux.vm.provider.exec",
-      {
-        "cmux.vm.provider": "freestyle",
-        "cmux.vm.operation": "exec",
-        "cmux.vm.id": vmId,
+      spanAttributes(vmId, "exec", {
         "cmux.command_length": command.length,
         "cmux.timeout_ms": timeoutMs,
-      },
+      }),
       async (span) => {
         try {
-          const fs = client(timeoutMs + EXEC_OVERHEAD_TIMEOUT_MS);
-          const ref = fs.vms.ref({ vmId });
-          const r = await ref.exec({ command, timeoutMs });
-          const exitCode = (r as { statusCode?: number }).statusCode ?? 0;
+          const fs = freestyleClient(timeoutMs + EXEC_OVERHEAD_TIMEOUT_MS);
+          const r = await fs.vms.ref(vmId).exec({ command, timeoutMs, linuxUser: GUEST_LINUX_USER });
+          // statusCode is null when the guest killed the command at its timeout.
+          const exitCode = r.statusCode ?? 124;
           setSpanAttributes(span, { "cmux.exec.exit_code": exitCode });
-          // ResponsePostV1VmsVmIdExecAwait200 shape: { stdout, stderr, statusCode }
-          return {
-            exitCode,
-            stdout: (r as { stdout?: string | null }).stdout ?? "",
-            stderr: (r as { stderr?: string | null }).stderr ?? "",
-          };
+          return { exitCode, stdout: r.stdout ?? "", stderr: r.stderr ?? "" };
         } catch (err) {
           throw new ProviderError("freestyle", `exec(${vmId})`, err);
         }
@@ -321,28 +386,22 @@ export class FreestyleProvider implements VMProvider {
   }
 
   async snapshot(vmId: string, name?: string): Promise<SnapshotRef> {
-    if (isFreestyleBetaVmId(vmId)) return this.beta.snapshot(vmId, name);
     return withVmSpan(
       "cmux.vm.provider.snapshot",
-      {
-        "cmux.vm.provider": "freestyle",
-        "cmux.vm.operation": "snapshot",
-        "cmux.vm.id": vmId,
+      spanAttributes(vmId, "snapshot", {
         "cmux.snapshot.named": !!name,
         "cmux.timeout_ms": SNAPSHOT_TIMEOUT_MS,
-      },
+      }),
       async (span) => {
         try {
-          const fs = client(SNAPSHOT_TIMEOUT_MS);
-          const ref = fs.vms.ref({ vmId });
-          const out = await ref.snapshot(name ? { name } : undefined);
-          const id =
-            (out as { snapshotId?: string }).snapshotId ??
-            (out as { id?: string }).id ??
-            "";
-          if (!id) throw new Error("snapshot response missing snapshotId");
-          setSpanAttributes(span, { "cmux.snapshot.id": id });
-          return { id, createdAt: Date.now(), name };
+          const fs = freestyleClient(SNAPSHOT_TIMEOUT_MS);
+          // Snapshots capture memory + disk of a running or paused VM. The
+          // caller's name goes to displayName only: slugs are unique per account
+          // and a collision would fail the snapshot for a cosmetic label.
+          const out = await fs.vms.ref(vmId).snapshot(name ? { displayName: name } : undefined);
+          if (!out.snapshotId) throw new Error("snapshot response missing snapshotId");
+          setSpanAttributes(span, { "cmux.snapshot.id": out.snapshotId });
+          return { id: out.snapshotId, createdAt: Date.now(), name };
         } catch (err) {
           throw new ProviderError("freestyle", `snapshot(${vmId})`, err);
         }
@@ -351,7 +410,6 @@ export class FreestyleProvider implements VMProvider {
   }
 
   async restore(snapshotId: string): Promise<VMHandle> {
-    if (this.beta.restoreTargetsBeta(snapshotId)) return this.beta.restore(snapshotId);
     return withVmSpan(
       "cmux.vm.provider.restore",
       {
@@ -362,30 +420,24 @@ export class FreestyleProvider implements VMProvider {
       },
       async (span) => {
         try {
-          const fs = client(CREATE_TIMEOUT_MS);
-          const signedAdmin = freestyleAdminSigningConfig();
-          const adminToken = signedAdmin ? null : `cmux-freestyle-admin-${randomBytes(32).toString("hex")}`;
-          const createRequest: Parameters<typeof fs.vms.create>[0] = {
+          const fs = freestyleClient(CREATE_TIMEOUT_MS);
+          const { vm, vmId } = await fs.vms.create({
             snapshotId,
-            ports: FREESTYLE_WS_PORTS,
-            readySignalTimeoutSeconds: 600,
-          };
-          if (adminToken) {
-            createRequest.systemd = {
-              services: [freestyleWebSocketService(adminToken)],
-            };
-          }
-          const created = await fs.vms.create(createRequest);
-          setSpanAttributes(span, { "cmux.vm.id": created.vmId });
+            displayName: "cmux Cloud VM",
+            metadata: { cmux: "cloud" },
+            firewall: { rules: freestyleFirewallRules() },
+          });
+          setSpanAttributes(span, { "cmux.vm.id": vmId });
+          // The snapshot carries the installed binary and the persisted
+          // model-plane file; heal best-effort so the machine is attach-ready
+          // without failing restore on a transient error.
+          await this.ensureCmuxTuiRunning(vm, vmId).catch(() => undefined);
           return {
-            provider: "freestyle",
-            providerVmId: created.vmId,
-            status: "running",
+            provider: "freestyle" as const,
+            providerVmId: vmId,
+            status: "running" as const,
             image: snapshotId,
             createdAt: Date.now(),
-            providerMetadata: adminToken ? {
-              [FREESTYLE_DAEMON_ADMIN_TOKEN_METADATA_KEY]: adminToken,
-            } : {},
           };
         } catch (err) {
           throw new ProviderError("freestyle", `restore(${snapshotId})`, err);
@@ -394,732 +446,176 @@ export class FreestyleProvider implements VMProvider {
     );
   }
 
-  async fork(vmId: string): Promise<VMHandle> {
-    if (isFreestyleBetaVmId(vmId)) {
-      // The beta API has no fork; snapshot + restore is the equivalent flow.
-      throw new ProviderError(
-        "freestyle",
-        `fork(${vmId}) is not supported on the Freestyle beta platform; snapshot the machine and restore from the snapshot instead`,
-      );
-    }
-    return withVmSpan(
-      "cmux.vm.provider.fork",
-      {
-        "cmux.vm.provider": "freestyle",
-        "cmux.vm.operation": "fork",
-        "cmux.vm.id": vmId,
-        "cmux.timeout_ms": SNAPSHOT_TIMEOUT_MS,
-      },
-      async (span) => {
-        try {
-          const fs = client(SNAPSHOT_TIMEOUT_MS);
-          const ref = fs.vms.ref({ vmId });
-          const out = await ref.fork({ count: 1 });
-          const fork = out.forks[0];
-          if (!fork) throw new Error("fork response contained no child VM");
-          const info = await fork.vm.getInfo();
-          const status = mapStatus(info.state);
-          setSpanAttributes(span, {
-            "cmux.vm.fork_id": fork.vmId,
-            "cmux.vm.provider_state": info.state,
-            "cmux.vm.status": status,
-          });
-          return {
-            provider: "freestyle",
-            providerVmId: fork.vmId,
-            status,
-            image: "freestyle:fork",
-            createdAt: Date.now(),
-          };
-        } catch (err) {
-          throw new ProviderError("freestyle", `fork(${vmId})`, err);
-        }
-      },
-    );
-  }
-
-  /**
-   * Prefer the baked cmuxd WebSocket daemon. Older VMs without an exposed 443 -> 7777 port
-   * still fall back to Freestyle SSH, but the mac client must treat that as shell-only.
-   */
-  async openAttach(vmId: string, options?: AttachOptions): Promise<AttachEndpoint> {
-    if (this.isBetaMachine(vmId, options?.providerMetadata)) {
-      throw new ProviderError(
-        "freestyle",
-        `openAttach(${vmId}) is not supported on the Freestyle beta platform: these machines attach through the cmux-tui remote daemon (transport cmux-remote).`,
-      );
-    }
-    try {
-      const endpoint = await this.openWebSocketPty(vmId, options);
-      if (options?.requireDaemon && !endpoint.daemon) {
-        throw new ProviderError(
-          "freestyle",
-          `openAttach(${vmId}) requires a cmuxd RPC endpoint, but this VM snapshot only exposes the PTY WebSocket. Rebuild it with the current cmuxd-remote snapshot.`,
-        );
-      }
-      return endpoint;
-    } catch (err) {
-      if (options?.requireDaemon) {
-        throw err;
-      }
-      if (!shouldFallbackAttachToSSH(err)) {
-        throw err;
-      }
-      return await withVmSpan(
-        "cmux.vm.provider.open_attach_ssh_fallback",
-        {
-          "cmux.vm.provider": "freestyle",
-          "cmux.vm.operation": "open_attach_ssh_fallback",
-          "cmux.vm.id": vmId,
-          "cmux.vm.attach.require_daemon": options?.requireDaemon === true,
-        },
-        async (span) => {
-          recordSpanError(span, err);
-          setSpanAttributes(span, { "cmux.vm.attach.fallback": "ssh" });
-          return await this.openSSH(vmId);
-        },
-      );
-    }
-  }
-
-  async openWebSocketPty(vmId: string, options?: AttachOptions): Promise<WebSocketPtyEndpoint> {
+  async openCmuxRemote(vmId: string, options?: CmuxRemoteAttachOptions): Promise<CmuxRemoteEndpoint> {
     return withVmSpan(
-      "cmux.vm.provider.open_websocket_pty",
-      {
-        "cmux.vm.provider": "freestyle",
-        "cmux.vm.operation": "open_websocket_pty",
-        "cmux.vm.id": vmId,
-      },
+      "cmux.vm.provider.open_cmux_remote",
+      spanAttributes(vmId, "open_cmux_remote"),
       async (span) => {
         try {
-          const fs = client();
-          const vm = fs.vms.ref({ vmId });
-          const domain = `${vmId}.vm.freestyle.sh`;
-          const pty = makeWebSocketLease("freestyle", "pty", true, CMUXD_WS_PTY_LEASE_TTL_SECONDS, options?.sessionId);
-          const attachmentId = options?.attachmentId?.trim() || makeWebSocketAttachmentId("freestyle");
-          let daemon: ReusableRpcLease | null = null;
-          let daemonReused = false;
-          const adminToken = freestyleDaemonAdminToken(options?.providerMetadata);
-          const signedAdmin = freestyleAdminSigningConfig();
-          await ensureFreestyleWebSocketHealthyOrRepair(domain, vm, adminToken, signedAdmin);
-          if (adminToken || signedAdmin) {
-            const daemonLease = makeWebSocketLease("freestyle", "rpc", false, CMUXD_WS_RPC_LEASE_TTL_SECONDS);
-            daemon = daemonLease;
-            await installFreestyleLeasesViaDaemon(domain, adminToken ? { kind: "bearer", token: adminToken } : {
-              kind: "ed25519",
-              privateKeySeed: signedAdmin!.privateKeySeed,
-              publicKey: signedAdmin!.publicKey,
-            }, {
-              ptyLease: pty.lease,
-              rpcLease: daemonLease.lease,
-              rpcClient: leaseClientMetadata(daemonLease),
-            });
-          } else {
-            const service = await readFreestyleWebSocketService(vm);
-            const encodedPTY = Buffer.from(JSON.stringify(pty.lease)).toString("base64");
-            const commands = [
-              ensurePrivateDirectoryCommand(service.ptyLeasePath),
-              `printf '%s' '${encodedPTY}' | base64 -d > ${shellQuote(service.ptyLeasePath)}`,
-              `chmod 600 ${shellQuote(service.ptyLeasePath)}`,
-            ];
-            if (service.rpcLeasePath) {
-              const existingDaemon = await readReusableRpcLease(vm, service.rpcLeasePath);
-              const newDaemon = existingDaemon
-                ? null
-                : makeWebSocketLease("freestyle", "rpc", false, CMUXD_WS_RPC_LEASE_TTL_SECONDS);
-              daemon = existingDaemon ?? newDaemon!;
-              daemonReused = !!existingDaemon;
-              if (newDaemon) {
-                const encodedDaemon = Buffer.from(JSON.stringify(newDaemon.lease)).toString("base64");
-                const encodedDaemonClient = Buffer.from(JSON.stringify(leaseClientMetadata(newDaemon))).toString("base64");
-                commands.push(
-                  ensurePrivateDirectoryCommand(service.rpcLeasePath),
-                  `printf '%s' '${encodedDaemon}' | base64 -d > ${shellQuote(service.rpcLeasePath)}`,
-                  `chmod 600 ${shellQuote(service.rpcLeasePath)}`,
-                  `printf '%s' '${encodedDaemonClient}' | base64 -d > ${shellQuote(CMUXD_WS_RPC_CLIENT_PATH)}`,
-                  `chmod 600 ${shellQuote(CMUXD_WS_RPC_CLIENT_PATH)}`,
-                );
-              }
-            }
-            await execFreestyleOrThrow(vm, commands.join(" && "));
-          }
-          span.setAttribute("cmux.vm.attach.transport", "websocket");
-          span.setAttribute("cmux.vm.attach.expires_at_unix", pty.expiresAtUnix);
-          span.setAttribute("cmux.vm.attach.daemon_available", !!daemon);
-          if (daemon) {
-            span.setAttribute("cmux.vm.attach.daemon_expires_at_unix", daemon.expiresAtUnix);
-            span.setAttribute("cmux.vm.attach.daemon_reused", daemonReused);
+          const fs = freestyleClient(CMUX_TUI_INSTALL_TIMEOUT_MS + EXEC_OVERHEAD_TIMEOUT_MS);
+          const vm = fs.vms.ref(vmId);
+          const data = await vm.data();
+          const route = freestyleCmuxRemoteRoute(data.publicIpv6, vmId);
+          await this.ensureCmuxTuiRunning(vm, vmId);
+          const invoke = this.cmuxTuiInvoke(vm);
+          // Direct-IPv6 carries no URL token; this one exists only for the
+          // lease ledger. The daemon's Noise enrollment is the session gate —
+          // the same trust model as E2B's public proxy route.
+          const token = `cmux-freestyle-route-${randomBytes(32).toString("hex")}`;
+          const expiresAtUnix = Math.floor(Date.now() / 1000) + ROUTE_TOKEN_TTL_SECONDS;
+          let invitation: CmuxRemoteEndpoint["invitation"];
+          const enrolled = options?.deviceFingerprint
+            ? await isCmuxTuiDeviceEnrolled(invoke, options.deviceFingerprint)
+            : false;
+          if (!enrolled) {
+            invitation = await mintCmuxTuiInvitation(invoke, "freestyle", vmId);
           }
+          span.setAttribute("cmux.vm.cmux_remote.invited", !enrolled);
+          const daemonBuild = await cmuxTuiDaemonBuild(invoke);
           return {
-            transport: "websocket",
-            url: `wss://${domain}/terminal`,
-            headers: {},
-            token: pty.token,
-            sessionId: pty.sessionId,
-            attachmentId,
-            expiresAtUnix: pty.expiresAtUnix,
-            daemon: daemon ? {
-              url: `wss://${domain}/rpc`,
-              headers: {},
-              token: daemon.token,
-              sessionId: daemon.sessionId,
-              expiresAtUnix: daemon.expiresAtUnix,
-            } : undefined,
+            transport: "cmux-remote" as const,
+            route,
+            token,
+            expiresAtUnix,
+            session: CMUX_TUI_SESSION,
+            ...(daemonBuild ? { daemonBuild } : {}),
+            ...(invitation ? { invitation } : {}),
           };
         } catch (err) {
-          throw new ProviderError("freestyle", `openWebSocketPty(${vmId})`, err);
+          throw err instanceof ProviderError
+            ? err
+            : new ProviderError("freestyle", `openCmuxRemote(${vmId}) failed`, err);
         }
       },
     );
   }
 
-  private async openReusableRpcDaemon(vmId: string): Promise<WebSocketPtyEndpoint["daemon"] | undefined> {
-    const fs = client();
-    const vm = fs.vms.ref({ vmId });
-    const service = await readFreestyleWebSocketService(vm);
-    if (!service.rpcLeasePath) {
-      return undefined;
-    }
-    const existingDaemon = await readReusableRpcLease(vm, service.rpcLeasePath);
-    const newDaemon = existingDaemon
-      ? null
-      : makeWebSocketLease("freestyle", "rpc", false, CMUXD_WS_RPC_LEASE_TTL_SECONDS);
-    const daemon = existingDaemon ?? newDaemon!;
-    if (newDaemon) {
-      const encodedDaemon = Buffer.from(JSON.stringify(newDaemon.lease)).toString("base64");
-      const encodedDaemonClient = Buffer.from(JSON.stringify(leaseClientMetadata(newDaemon))).toString("base64");
-      await execFreestyleOrThrow(
-        vm,
-        [
-          ensurePrivateDirectoryCommand(service.rpcLeasePath),
-          `printf '%s' '${encodedDaemon}' | base64 -d > ${shellQuote(service.rpcLeasePath)}`,
-          `chmod 600 ${shellQuote(service.rpcLeasePath)}`,
-          `printf '%s' '${encodedDaemonClient}' | base64 -d > ${shellQuote(CMUXD_WS_RPC_CLIENT_PATH)}`,
-          `chmod 600 ${shellQuote(CMUXD_WS_RPC_CLIENT_PATH)}`,
-        ].join(" && "),
-      );
-    }
-    return {
-      url: `wss://${vmId}.vm.freestyle.sh/rpc`,
-      headers: {},
-      token: daemon.token,
-      sessionId: daemon.sessionId,
-      expiresAtUnix: daemon.expiresAtUnix,
-    };
-  }
-
-  /**
-   * Mint a short-lived SSH token + permission scoped to this VM, return the endpoint the mac
-   * client will dial. Freestyle's gateway terminates at `vm-ssh.freestyle.sh:22`, username is
-   * `<vmId>+<linuxUser>`, password is the access token we just minted.
-   */
-  async openCmuxRemote(vmId: string, options?: CmuxRemoteAttachOptions): Promise<CmuxRemoteEndpoint> {
-    if (!this.isBetaMachine(vmId, options?.providerMetadata)) {
-      throw new ProviderError(
-        "freestyle",
-        `openCmuxRemote(${vmId}) is not supported on legacy-platform freestyle machines (no cmux-tui daemon); attach over the legacy websocket transport, or recreate the machine on a beta devbox image.`,
-      );
-    }
-    return this.beta.openCmuxRemote(vmId, options);
-  }
-
   async approveCmuxRemoteEnrollment(
     vmId: string,
     invitationId: string,
     options?: CmuxRemoteApprovalOptions,
   ): Promise<CmuxRemoteApprovalResult> {
-    if (!this.isBetaMachine(vmId)) {
-      throw new ProviderError(
-        "freestyle",
-        `approveCmuxRemoteEnrollment(${vmId}) is not supported on legacy-platform freestyle machines (no cmux-tui daemon).`,
-      );
-    }
-    return this.beta.approveCmuxRemoteEnrollment(vmId, invitationId, options);
-  }
-
-  async openSSH(vmId: string): Promise<SSHEndpoint> {
-    if (isFreestyleBetaVmId(vmId)) {
-      // The beta API has no SSH gateway (its CLI's `vm ssh` is the API pty in
-      // disguise); sessions go through the cmux-tui daemon.
-      throw new ProviderError(
-        "freestyle",
-        `openSSH(${vmId}) is not supported on the Freestyle beta platform; attach through the cmux-tui remote daemon (transport cmux-remote).`,
-      );
-    }
+    void options;
     return withVmSpan(
-      "cmux.vm.provider.open_ssh",
-      {
-        "cmux.vm.provider": "freestyle",
-        "cmux.vm.operation": "open_ssh",
-        "cmux.vm.id": vmId,
-        "cmux.timeout_ms": DEFAULT_TIMEOUT_MS,
-      },
-      async (span) => {
-        const fs = client();
-        // A fresh identity per attach session. The VM workflow persists the identityId so it can
-        // call `revokeSSHIdentity` on VM destroy / before minting a replacement, otherwise
-        // every `cmux vm shell` invocation would leak a live credential under the Freestyle
-        // account indefinitely.
-        let identity: Awaited<ReturnType<typeof fs.identities.create>>["identity"] | undefined;
-        let identityId = "";
+      "cmux.vm.provider.approve_cmux_remote_enrollment",
+      spanAttributes(vmId, "approve_cmux_remote_enrollment"),
+      async () => {
         try {
-          const created = await fs.identities.create({});
-          identity = created.identity;
-          identityId = created.identityId;
-          setSpanAttributes(span, { "cmux.ssh.identity_created": true });
-          await identity.permissions.vms.grant({
-            vmId,
-            allowedUsers: [CMUX_LINUX_USER],
-          });
-          const { token } = await identity.tokens.create();
-          let daemon: WebSocketPtyEndpoint["daemon"] | undefined;
-          try {
-            daemon = await this.openReusableRpcDaemon(vmId);
-          } catch (daemonErr) {
-            recordSpanError(span, daemonErr);
-          }
-          return {
-            transport: "ssh",
-            host: SSH_HOST,
-            port: SSH_PORT,
-            username: `${vmId}+${CMUX_LINUX_USER}`,
-            publicKeyFingerprint: null,
-            credential: { kind: "password", value: token },
-            daemon,
-            identityHandle: identityId,
-          };
+          const vm = freestyleClient().vms.ref(vmId);
+          return await approveCmuxTuiEnrollment(this.cmuxTuiInvoke(vm), "freestyle", vmId, invitationId);
         } catch (err) {
-          // Without this, an identity created above but failed-on afterwards (grant or token
-          // mint threw) leaks. Best-effort delete before rethrowing.
-          if (identityId) {
-            try {
-              await fs.identities.delete({ identityId });
-            } catch (cleanupError) {
-              recordSpanError(span, cleanupError);
-            }
-          }
-          throw new ProviderError("freestyle", `openSSH(${vmId})`, err);
+          throw err instanceof ProviderError
+            ? err
+            : new ProviderError("freestyle", `approveCmuxRemoteEnrollment(${vmId}) failed`, err);
         }
       },
     );
   }
 
-  async revokeSSHIdentity(identityHandle: string): Promise<void> {
-    if (!identityHandle) return;
-    await withVmSpan(
-      "cmux.vm.provider.revoke_ssh_identity",
-      {
-        "cmux.vm.provider": "freestyle",
-        "cmux.vm.operation": "revoke_ssh_identity",
-        "cmux.timeout_ms": DEFAULT_TIMEOUT_MS,
-      },
-      async (span) => {
-        try {
-          await client().identities.delete({ identityId: identityHandle });
-        } catch (err) {
-          if (isProviderIdentityNotFoundError(err)) return;
-          recordSpanError(span, err);
-          throw new ProviderError("freestyle", `revokeSSHIdentity(${identityHandle})`, err);
-        }
-      },
+  async openAttach(vmId: string, options?: AttachOptions): Promise<AttachEndpoint> {
+    void options;
+    throw new ProviderError(
+      "freestyle",
+      `openAttach(${vmId}) is not supported: Freestyle machines attach through the cmux-tui remote daemon (transport cmux-remote).`,
     );
   }
-}
-
-function shouldFallbackAttachToSSH(err: unknown): boolean {
-  const messages = [errorMessage(err)];
-  if (err instanceof ProviderError && err.cause) {
-    messages.push(errorMessage(err.cause));
-  }
-  return messages.some((message) =>
-    message.includes("requires a cmuxd RPC endpoint")
-    || message.includes("Freestyle cmuxd websocket health check returned")
-    || message.includes("Freestyle cmuxd websocket health check failed")
-  );
-}
-
-function errorMessage(err: unknown): string {
-  return err instanceof Error ? err.message : String(err);
-}
 
-function freestyleDaemonAdminToken(metadata: Record<string, unknown> | undefined): string | null {
-  const value = metadata?.[FREESTYLE_DAEMON_ADMIN_TOKEN_METADATA_KEY];
-  if (typeof value !== "string") return null;
-  const trimmed = value.trim();
-  return trimmed.length > 0 ? trimmed : null;
-}
-
-function sha256Hex(value: string): string {
-  return createHash("sha256").update(value).digest("hex");
-}
-
-type FreestyleAdminAuth =
-  | { kind: "bearer"; token: string }
-  | { kind: "ed25519"; privateKeySeed: Buffer; publicKey: Buffer };
-
-type FreestyleAdminSigningConfig = { privateKeySeed: Buffer; publicKey: Buffer };
-
-function freestyleAdminSigningConfig(): FreestyleAdminSigningConfig | null {
-  const seedRaw = process.env.CMUX_FREESTYLE_ADMIN_SIGNING_PRIVATE_KEY_SEED?.trim();
-  const publicRaw = process.env.CMUX_FREESTYLE_ADMIN_SIGNING_PUBLIC_KEY?.trim();
-  if (!seedRaw && !publicRaw) return null;
-  if (!seedRaw || !publicRaw) {
-    throw new Error(
-      "CMUX_FREESTYLE_ADMIN_SIGNING_PRIVATE_KEY_SEED and CMUX_FREESTYLE_ADMIN_SIGNING_PUBLIC_KEY must be set together",
-    );
-  }
-  const privateKeySeed = decodeBase64Bytes(seedRaw);
-  const publicKey = decodeBase64Bytes(publicRaw);
-  if (privateKeySeed.length !== 32) {
-    throw new Error("CMUX_FREESTYLE_ADMIN_SIGNING_PRIVATE_KEY_SEED must decode to 32 bytes");
-  }
-  if (publicKey.length !== 32) {
-    throw new Error("CMUX_FREESTYLE_ADMIN_SIGNING_PUBLIC_KEY must decode to 32 bytes");
-  }
-  const auth = { kind: "ed25519" as const, privateKeySeed, publicKey };
-  const probe = Buffer.from("cmux-freestyle-admin-signing-config");
-  const signature = Buffer.from(signAdminLeaseBody(auth, probe.toString("utf8")), "base64");
-  if (!verify(null, probe, ed25519PublicKeyFromRaw(publicKey), signature)) {
-    throw new Error(
-      "CMUX_FREESTYLE_ADMIN_SIGNING_PRIVATE_KEY_SEED does not match CMUX_FREESTYLE_ADMIN_SIGNING_PUBLIC_KEY",
+  async openSSH(vmId: string): Promise<SSHEndpoint> {
+    return withVmSpan(
+      "cmux.vm.provider.open_ssh",
+      spanAttributes(vmId, "open_ssh"),
+      async () => {
+        throw new ProviderError(
+          "freestyle",
+          "Freestyle machines have no SSH gateway on the public platform. " +
+            "They attach through the cmux-tui remote daemon (transport cmux-remote).",
+        );
+      },
     );
   }
-  return { privateKeySeed, publicKey };
-}
-
-function decodeBase64Bytes(value: string): Buffer {
-  return Buffer.from(value.replace(/-/g, "+").replace(/_/g, "/"), "base64");
-}
-
-function base64url(bytes: Buffer): string {
-  return bytes.toString("base64").replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/u, "");
-}
 
-function signAdminLeaseBody(auth: Extract<FreestyleAdminAuth, { kind: "ed25519" }>, body: string): string {
-  const privateKey = createPrivateKey({
-    format: "jwk",
-    key: {
-      kty: "OKP",
-      crv: "Ed25519",
-      d: base64url(auth.privateKeySeed),
-      x: base64url(auth.publicKey),
-    },
-  });
-  return sign(null, Buffer.from(body), privateKey).toString("base64");
-}
-
-function ed25519PublicKeyFromRaw(publicKey: Buffer) {
-  return createPublicKey({
-    format: "jwk" as const,
-    key: {
-      kty: "OKP",
-      crv: "Ed25519",
-      x: base64url(publicKey),
-    },
-  });
-}
-
-function freestyleWebSocketService(adminToken: string) {
-  return {
-    name: "cmuxd-ws",
-    mode: "service" as const,
-    user: "root",
-    after: ["network.target"],
-    env: {
-      CMUXD_WS_ADMIN_TOKEN_SHA256: sha256Hex(adminToken),
-    },
-    exec: [
-      [
-        "/usr/local/bin/cmuxd-remote",
-        "serve",
-        "--ws",
-        "--listen",
-        "0.0.0.0:7777",
-        "--auth-lease-file",
-        CMUXD_WS_PTY_LEASE_PATH,
-        "--rpc-auth-lease-file",
-        CMUXD_WS_RPC_LEASE_PATH,
-        "--shell",
-        CMUX_CLOUD_SHELL_PATH,
-      ].map(shellQuote).join(" "),
-    ],
-  };
-}
-
-function repairedFreestyleWebSocketService(
-  auth: { readonly adminToken?: string | null; readonly publicKey?: string | null },
-): string {
-  const env = auth.publicKey
-    ? `Environment=CMUXD_WS_ADMIN_ED25519_PUBLIC_KEY=${auth.publicKey}`
-    : `Environment=CMUXD_WS_ADMIN_TOKEN_SHA256=${sha256Hex(auth.adminToken ?? "")}`;
-  return `[Unit]
-Description=cmux remote WebSocket daemon
-After=network.target
-
-[Service]
-Type=simple
-User=root
-${env}
-ExecStart=/usr/local/bin/cmuxd-remote serve --ws --listen 0.0.0.0:7777 --auth-lease-file ${CMUXD_WS_PTY_LEASE_PATH} --rpc-auth-lease-file ${CMUXD_WS_RPC_LEASE_PATH} --shell /usr/local/bin/cmux-cloud-shell
-Restart=always
-RestartSec=2
-
-[Install]
-WantedBy=multi-user.target
-`;
-}
-
-async function ensureFreestyleWebSocketHealthyOrRepair(
-  domain: string,
-  vm: FreestyleVmRef,
-  adminToken: string | null,
-  signedAdmin: FreestyleAdminSigningConfig | null,
-): Promise<void> {
-  const canRepair = !!adminToken || !!signedAdmin;
-  let healthError: unknown = null;
-  try {
-    await ensureFreestyleWebSocketHealthy(domain);
-  } catch (err) {
-    healthError = err;
+  async revokeSSHIdentity(identityHandle: string): Promise<void> {
+    void identityHandle;
+    // openSSH always throws, so there is never an identity to revoke.
   }
 
-  if (!healthError && canRepair) {
-    const state = await readFreestyleCloudShellState(vm).catch(() => null);
-    if (!state) {
-      // The daemon/admin websocket is the attach control plane. Freestyle exec
-      // can be temporarily unavailable on otherwise attachable VMs, so do not
-      // block lease installation on this shell-integration probe.
-      return;
-    }
-    if (!state.ok) {
-      await repairFreestyleWebSocketService(vm, adminToken, signedAdmin).catch((repairErr: unknown) => {
-        throw new Error(
-          `Cloud VM terminal service shell repair failed (${state.reason}): ${errorMessage(repairErr)}`,
-        );
+  /** Installs the pinned binary, persists the model-plane env, starts the daemon (fresh create). */
+  private async bootstrapCmuxTui(vm: Vm, vmId: string, envs?: Readonly<Record<string, string>>): Promise<void> {
+    const source = await resolveCmuxTuiSource("freestyle");
+    await this.execOrThrow(vm, vmId, cmuxTuiInstallCommand(source), CMUX_TUI_INSTALL_TIMEOUT_MS)
+      .catch((err: unknown) => {
+        throw new ProviderError("freestyle", `cmux-tui install in ${vmId} failed: ${errorMessage(err)}`);
       });
-      await waitForFreestyleWebSocketHealthy(domain);
-    }
-    return;
-  }
-
-  if (healthError) {
-    if (!canRepair) {
-      throw healthError;
-    }
-    await repairFreestyleWebSocketService(vm, adminToken, signedAdmin).catch((repairErr: unknown) => {
-      throw new Error(
-        `Cloud VM terminal service repair failed after health check failed (${errorMessage(healthError)}): ${errorMessage(repairErr)}`,
-      );
-    });
-    await waitForFreestyleWebSocketHealthy(domain).catch((healthErr: unknown) => {
-      throw new Error(
-        `Cloud VM terminal service stayed unavailable after repair (${errorMessage(healthError)}): ${errorMessage(healthErr)}`,
-      );
-    });
-  }
-}
-
-async function repairFreestyleWebSocketService(
-  vm: FreestyleVmRef,
-  adminToken: string | null,
-  signedAdmin: FreestyleAdminSigningConfig | null,
-): Promise<void> {
-  const service = repairedFreestyleWebSocketService({
-    adminToken,
-    publicKey: signedAdmin?.publicKey.toString("base64") ?? null,
-  });
-  const encodedService = Buffer.from(service).toString("base64");
-  const commands = [
-    ...freestyleCloudShellSetupCommands(),
-    "mkdir -p /tmp/cmux /usr/local/bin /etc/systemd/system /etc/systemd/system/multi-user.target.wants",
-    "chmod 700 /tmp/cmux",
-    `printf '%s' '${encodedService}' | base64 -d > /etc/systemd/system/cmuxd-ws.service`,
-    "ln -sf /etc/systemd/system/cmuxd-ws.service /etc/systemd/system/multi-user.target.wants/cmuxd-ws.service",
-    "(systemctl daemon-reload >/dev/null 2>&1 || true)",
-    "(systemctl enable cmuxd-ws >/dev/null 2>&1 || true)",
-    "(systemctl restart cmuxd-ws >/dev/null 2>&1 || systemctl start cmuxd-ws >/dev/null 2>&1 || true)",
-  ];
-  await execFreestyleCommandsOrThrow(vm, commands, 180_000);
-}
-
-function freestyleCloudShellSetupCommands(): string[] {
-  return [
-    "export PATH=\"/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:${PATH:-}\"",
-    "if command -v apt-get >/dev/null 2>&1 && { ! command -v zsh >/dev/null 2>&1 || ! command -v gh >/dev/null 2>&1 || ! command -v htop >/dev/null 2>&1 || ! command -v btop >/dev/null 2>&1 || ! command -v tmux >/dev/null 2>&1; }; then apt-get update >/dev/null 2>&1 || true; DEBIAN_FRONTEND=noninteractive apt-get install -y zsh zsh-autosuggestions gh htop btop tmux >/dev/null 2>&1 || true; fi",
-    "id -u cmux >/dev/null 2>&1 || useradd -m -s \"$(command -v zsh 2>/dev/null || printf /bin/bash)\" cmux",
-    "printf 'cmux ALL=(ALL) NOPASSWD:ALL\\n' > /etc/sudoers.d/90-cmux-nopasswd 2>/dev/null || true",
-    "chmod 0440 /etc/sudoers.d/90-cmux-nopasswd 2>/dev/null || true",
-    "mkdir -p /etc/cmux /home/cmux/.config/cmux /home/cmux/.cmux /tmp/cmux /usr/local/bin",
-    "chmod 700 /tmp/cmux",
-    "chown cmux:cmux /tmp/cmux /home/cmux/.config /home/cmux/.config/cmux /home/cmux/.cmux 2>/dev/null || true",
-    "if [ ! -x /usr/local/bin/cmux ] && [ -x /usr/local/bin/cmuxd-remote ]; then ln -sf /usr/local/bin/cmuxd-remote /usr/local/bin/cmux >/dev/null 2>&1 || true; fi",
-    "cat > /etc/cmux/zshrc <<'CMUX_ZSHRC'\n# cmux default zsh profile. Put personal overrides in ~/.zshrc.local.\nexport PATH=\"/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:${PATH:-}\"\nexport SHELL=\"$(command -v zsh 2>/dev/null || printf /bin/bash)\"\nmkdir -p \"$HOME/.cmux\" 2>/dev/null || true\nprintf '%s' '/tmp/cmux-cloud-cli.sock' > \"$HOME/.cmux/socket_addr\" 2>/dev/null || true\nexport CMUX_SOCKET_PATH=\"${CMUX_SOCKET_PATH:-/tmp/cmux-cloud-cli.sock}\"\nautoload -Uz colors 2>/dev/null && colors\nsetopt prompt_subst interactivecomments no_beep hist_ignore_dups share_history 2>/dev/null || true\nPROMPT_EOL_MARK=''\nunsetopt prompt_sp 2>/dev/null || true\nHISTFILE=\"${HISTFILE:-$HOME/.zsh_history}\"\nHISTSIZE=\"${HISTSIZE:-50000}\"\nSAVEHIST=\"${SAVEHIST:-50000}\"\nbindkey -e 2>/dev/null || true\nif [ -r /usr/share/zsh-autosuggestions/zsh-autosuggestions.zsh ]; then\n  source /usr/share/zsh-autosuggestions/zsh-autosuggestions.zsh\n  ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE=\"${ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE:-fg=8}\"\nfi\n: ${CMUX_PROMPT_USER:=cmux-cloud}\n: ${CMUX_PROMPT_CHAR:=$'\\u03bb'}\nPROMPT='%F{magenta}${CMUX_PROMPT_USER}%f in %F{green}%~%f ${CMUX_PROMPT_CHAR} '\nCMUX_ZSHRC",
-    "if [ ! -e /home/cmux/.zshrc ] || grep -q \"cmux-managed zsh defaults\" /home/cmux/.zshrc 2>/dev/null; then cat > /home/cmux/.zshrc <<'CMUX_USER_ZSHRC'\n# cmux-managed zsh defaults. Edit ~/.zshrc.local for personal overrides.\nmkdir -p \"$HOME/.cmux\" 2>/dev/null || true\nprintf '%s' '/tmp/cmux-cloud-cli.sock' > \"$HOME/.cmux/socket_addr\" 2>/dev/null || true\nexport CMUX_SOCKET_PATH=\"${CMUX_SOCKET_PATH:-/tmp/cmux-cloud-cli.sock}\"\n[ -r /etc/cmux/zshrc ] && source /etc/cmux/zshrc\n[ -r \"$HOME/.zshrc.local\" ] && source \"$HOME/.zshrc.local\"\nif [ \"${CMUX_CLOUD_WELCOME:-1}\" != \"0\" ] && [ -z \"${CMUX_CLOUD_WELCOME_SHOWN:-}\" ] && [ -t 1 ]; then\n  export CMUX_CLOUD_WELCOME_SHOWN=1\n  printf '\\033[38;2;0;212;255m  ::\\033[0m\\n'\n  printf '\\033[38;2;24;181;250m    ::::              \\033[38;2;0;212;255mc\\033[38;2;24;181;250mm\\033[38;2;48;150;245mu\\033[38;2;124;58;237mx cloud\\033[0m\\n'\n  printf '\\033[38;2;48;150;245m      ::::::\\033[0m\\n'\n  printf '\\033[38;2;72;119;241m        ::::::\\033[0m        \\033[38;2;130;130;140mpersistent cloud VM\\033[0m\\n'\n  printf '\\033[38;2;96;88;239m      ::::::\\033[0m          \\033[38;2;130;130;140mready for coding agents\\033[0m\\n'\n  printf '\\033[38;2;110;73;238m    ::::\\033[0m\\n'\n  printf '\\033[38;2;124;58;237m  ::\\033[0m\\n'\n  printf '\\n'\nfi\nCMUX_USER_ZSHRC\nfi",
-    "if [ ! -e /home/cmux/.zshrc.local ]; then cat > /home/cmux/.zshrc.local <<'CMUX_LOCAL_ZSHRC'\n# Personal zsh overrides for this cloud VM.\n# Examples:\n#   CMUX_CLOUD_WELCOME=0\n#   CMUX_PROMPT_USER='cmux-cloud'\n#   CMUX_PROMPT_CHAR='>'\n#   PROMPT='%F{cyan}%n%f:%F{green}%~%f %# '\nCMUX_LOCAL_ZSHRC\nfi",
-    "cat > /usr/local/bin/cmux-cloud-shell <<'CMUX_CLOUD_SHELL'\n#!/bin/sh\ncd /home/cmux 2>/dev/null || true\nexport HOME=/home/cmux\nexport USER=cmux\nexport LOGNAME=cmux\nif command -v zsh >/dev/null 2>&1; then\n  export SHELL=\"$(command -v zsh)\"\n  exec runuser -u cmux -- \"$SHELL\" -l\nfi\nexport SHELL=/bin/bash\nexec runuser -u cmux -- /bin/bash -l\nCMUX_CLOUD_SHELL",
-    "chmod 0755 /usr/local/bin/cmux-cloud-shell",
-    "touch /home/cmux/.hushlogin /etc/cmux/zsh-bootstrap-v6 2>/dev/null || true",
-    "chown cmux:cmux /home/cmux/.zshrc /home/cmux/.zshrc.local /home/cmux/.hushlogin 2>/dev/null || true",
-    "chsh -s \"$(command -v zsh 2>/dev/null || printf /bin/bash)\" cmux >/dev/null 2>&1 || true",
-  ];
-}
-
-async function readFreestyleCloudShellState(vm: FreestyleVmRef): Promise<{ ok: true } | { ok: false; reason: string }> {
-  const command = [
-    "set -u",
-    "service_shell=\"\"",
-    "service_text=\"$(cat /etc/systemd/system/cmuxd-ws.service 2>/dev/null; cat /lib/systemd/system/cmuxd-ws.service 2>/dev/null; ps auxww | grep cmuxd-remote | grep -v grep || true)\"",
-    "case \"$service_text\" in *'--shell /usr/local/bin/cmux-cloud-shell'*|*'--shell=/usr/local/bin/cmux-cloud-shell'*) service_shell=ok ;; esac",
-    "test \"$service_shell\" = ok || { printf '%s\\n' service-shell-not-managed; exit 10; }",
-    "test -x /usr/local/bin/cmux-cloud-shell || { printf '%s\\n' cloud-shell-missing; exit 11; }",
-    "id -u cmux >/dev/null 2>&1 || { printf '%s\\n' cmux-user-missing; exit 12; }",
-    "test -r /etc/cmux/zshrc || { printf '%s\\n' etc-zshrc-missing; exit 13; }",
-    "test -r /home/cmux/.zshrc || { printf '%s\\n' home-zshrc-missing; exit 14; }",
-    "command -v zsh >/dev/null 2>&1 || { printf '%s\\n' zsh-missing; exit 15; }",
-    "printf '%s\\n' ok",
-  ].join(" && ");
-  const result = await vm.exec({ command, timeoutMs: 30_000 });
-  const exitCode = (result as { statusCode?: number }).statusCode ?? 0;
-  if (exitCode === 0) {
-    return { ok: true };
+    if (envs) await this.writeModelPlaneEnv(vm, vmId, envs);
+    await this.execOrThrow(vm, vmId, freestyleStartDaemonCommand(), 60_000);
+    await waitForCmuxTuiReady(this.cmuxTuiInvoke(vm), "freestyle", vmId);
   }
-  return {
-    ok: false,
-    reason: ((result.stdout ?? result.stderr ?? "").trim() || `cloud shell state check exited ${exitCode}`),
-  };
-}
 
-async function waitForFreestyleWebSocketHealthy(domain: string): Promise<void> {
-  let lastError: unknown = null;
-  for (let attempt = 0; attempt < 12; attempt += 1) {
+  /**
+   * There is no create-time env. The coderouter model-plane vars are delivered
+   * by writing the persisted file /etc/cmux/agent-config.sh already reads
+   * (0600, root); every shell the daemon spawns sources it through the
+   * profile/bashrc chain and materializes the harness configs from it.
+   */
+  private async writeModelPlaneEnv(vm: Vm, vmId: string, envs: Readonly<Record<string, string>>): Promise<void> {
+    const content = renderFreestyleModelPlaneEnvFile(envs);
+    if (!content) return;
     try {
-      await ensureFreestyleWebSocketHealthy(domain);
-      return;
+      await vm.exec({
+        command: `mkdir -p ${MODEL_PLANE_ENV_PATH.replace(/\/[^/]+$/, "")}`,
+        timeoutMs: 30_000,
+        linuxUser: GUEST_LINUX_USER,
+      });
+      await vm.fs.writeTextFile(MODEL_PLANE_ENV_PATH, content, { mode: 0o600 });
     } catch (err) {
-      lastError = err;
-      await new Promise((resolve) => setTimeout(resolve, 1_000));
+      throw new ProviderError("freestyle", `model-plane env write in ${vmId} failed`, err);
     }
   }
-  throw lastError ?? new Error("Cloud VM terminal service did not become healthy");
-}
-
-async function installFreestyleLeasesViaDaemon(
-  domain: string,
-  auth: FreestyleAdminAuth,
-  leases: {
-    ptyLease: unknown;
-    rpcLease?: unknown;
-    rpcClient?: ReusableRpcLease;
-  },
-): Promise<void> {
-  const body = JSON.stringify({
-    pty_lease: leases.ptyLease,
-    rpc_lease: leases.rpcLease,
-    rpc_client: leases.rpcClient,
-  });
-  const headers: Record<string, string> = {
-    "content-type": "application/json",
-  };
-  if (auth.kind === "bearer") {
-    headers.authorization = `Bearer ${auth.token}`;
-  } else {
-    headers["x-cmux-admin-signature-ed25519"] = signAdminLeaseBody(auth, body);
-  }
-  const response = await fetch(`https://${domain}/admin/leases`, {
-    method: "POST",
-    headers,
-    body,
-    signal: AbortSignal.timeout(10_000),
-  }).catch((err: unknown) => {
-    throw new Error(`Freestyle cmuxd lease install failed: ${errorMessage(err)}`);
-  });
-  if (!response.ok) {
-    const text = await response.text().catch(() => "");
-    throw new Error(
-      `Freestyle cmuxd lease install returned ${response.status}${text ? `: ${text.trim()}` : ""}`,
-    );
-  }
-}
 
-async function ensureFreestyleWebSocketHealthy(domain: string): Promise<void> {
-  const response = await fetch(`https://${domain}/healthz`, {
-    signal: AbortSignal.timeout(10_000),
-  }).catch((err: unknown) => {
-    throw new Error(`Freestyle cmuxd websocket health check failed: ${errorMessage(err)}`);
-  });
-  if (response.status !== 200) {
-    throw new Error(`Freestyle cmuxd websocket health check returned ${response.status}`);
+  /**
+   * Attach-time heal, mirroring the other cmux-tui drivers: a daemon that is
+   * running AND listening dual-stack is left alone; anything else is repaired,
+   * reinstalling first when the binary is missing or superseded by a manifest
+   * pin change. The dual-stack check matters because a machine from an older
+   * bake boots the daemon on 0.0.0.0, which the public-IPv6 route cannot reach.
+   */
+  private async ensureCmuxTuiRunning(vm: Vm, vmId: string): Promise<void> {
+    const healthy = await this.execResult(vm, freestyleDaemonHealthyCommand());
+    if (healthy?.exitCode === 0) return;
+    const source = await resolveCmuxTuiSource("freestyle");
+    const pinned = await this.execResult(vm, cmuxTuiPinCheckCommand(source));
+    if (pinned?.exitCode !== 0) {
+      await this.execOrThrow(vm, vmId, cmuxTuiInstallCommand(source), CMUX_TUI_INSTALL_TIMEOUT_MS)
+        .catch((err: unknown) => {
+          throw new ProviderError("freestyle", `cmux-tui install in ${vmId} failed: ${errorMessage(err)}`);
+        });
+    }
+    await this.execOrThrow(vm, vmId, freestyleStartDaemonCommand(), 60_000);
+    await waitForCmuxTuiReady(this.cmuxTuiInvoke(vm), "freestyle", vmId);
   }
-}
 
-async function readFreestyleWebSocketService(vm: FreestyleVmRef): Promise<{
-  ptyLeasePath: string;
-  rpcLeasePath: string | null;
-}> {
-  const result = await execFreestyleOrThrow(
-    vm,
-    [
-      "cat /etc/systemd/system/cmuxd-ws.service 2>/dev/null || true",
-      "cat /lib/systemd/system/cmuxd-ws.service 2>/dev/null || true",
-      "ps auxww | grep cmuxd-remote | grep -v grep || true",
-    ].join("; "),
-  );
-  const stdout = result.stdout ?? "";
-  const ptyLeasePath =
-    shellArgValue(stdout, "--auth-lease-file")
-    ?? (stdout.includes(CMUXD_WS_LEGACY_PTY_LEASE_PATH)
-      ? CMUXD_WS_LEGACY_PTY_LEASE_PATH
-      : CMUXD_WS_PTY_LEASE_PATH);
-  const rpcLeasePath = shellArgValue(stdout, "--rpc-auth-lease-file");
-  return { ptyLeasePath, rpcLeasePath };
-}
-
-async function readReusableRpcLease(
-  vm: FreestyleVmRef,
-  rpcLeasePath: string,
-): Promise<ReusableRpcLease | null> {
-  const result = await vm.exec({
-    command: [
-      `test -s ${shellQuote(rpcLeasePath)}`,
-      `test -s ${shellQuote(CMUXD_WS_RPC_CLIENT_PATH)}`,
-      `cat ${shellQuote(CMUXD_WS_RPC_CLIENT_PATH)}`,
-    ].join(" && "),
-    timeoutMs: 30_000,
-  }).catch(() => null);
-  const raw = result?.stdout?.trim();
-  if (!raw) return null;
-  try {
-    const parsed = JSON.parse(raw) as unknown;
-    if (!isReusableRpcLease(parsed)) return null;
-    const nowUnix = Math.floor(Date.now() / 1000);
-    if (parsed.expiresAtUnix <= nowUnix + CMUXD_WS_RPC_RENEW_BEFORE_SECONDS) return null;
-    return parsed;
-  } catch {
-    return null;
+  private async execResult(vm: Vm, command: string, timeoutMs = EXEC_DEFAULT_TIMEOUT_MS): Promise<ExecResult | null> {
+    try {
+      const r = await vm.exec({ command, timeoutMs, linuxUser: GUEST_LINUX_USER });
+      return { exitCode: r.statusCode ?? 124, stdout: r.stdout ?? "", stderr: r.stderr ?? "" };
+    } catch {
+      return null;
+    }
   }
-}
 
-type FreestyleVmRef = ReturnType<ReturnType<typeof client>["vms"]["ref"]>;
-
-async function execFreestyleCommandsOrThrow(
-  vm: FreestyleVmRef,
-  commands: readonly string[],
-  timeoutMs = 30_000,
-): Promise<void> {
-  for (const command of commands) {
-    await execFreestyleOrThrow(
-      vm,
-      `export PATH="/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:\${PATH:-}"; ${command}`,
-      timeoutMs,
-    );
+  private async execOrThrow(vm: Vm, vmId: string, command: string, timeoutMs: number): Promise<ExecResult> {
+    const r = await vm.exec({ command, timeoutMs, linuxUser: GUEST_LINUX_USER });
+    const exitCode = r.statusCode ?? 124;
+    if (exitCode !== 0) {
+      throw new Error(`exec in ${vmId} exited ${exitCode}: ${(r.stderr ?? r.stdout ?? "").trim().slice(0, 500)}`);
+    }
+    return { exitCode, stdout: r.stdout ?? "", stderr: r.stderr ?? "" };
   }
-}
 
-async function execFreestyleOrThrow(vm: FreestyleVmRef, command: string, timeoutMs = 30_000) {
-  const result = await vm.exec({ command, timeoutMs });
-  const exitCode = (result as { statusCode?: number }).statusCode ?? 0;
-  if (exitCode !== 0) {
-    throw new Error(`Freestyle exec failed with status ${exitCode}: ${(result.stderr ?? "").trim()}`);
+  private cmuxTuiInvoke(vm: Vm): CmuxTuiInvoke {
+    return async (args, timeoutMs) => {
+      const r = await this.execResult(vm, `env HOME=/root /root/.cmux/bin/cmux-tui ${args}`, timeoutMs ?? EXEC_DEFAULT_TIMEOUT_MS);
+      return r ?? { exitCode: 124, stdout: "", stderr: "exec failed" };
+    };
   }
-  return result;
 }
diff --git a/web/services/vms/drivers/freestyleBeta.ts b/web/services/vms/drivers/freestyleBeta.ts
deleted file mode 100644
index 85c640502fbc..000000000000
--- a/web/services/vms/drivers/freestyleBeta.ts
+++ /dev/null
@@ -1,620 +0,0 @@
-import { Freestyle, FreestyleApiError, type VmData, type Vm } from "freestyle-beta";
-import { randomBytes } from "node:crypto";
-import {
-  ProviderError,
-  type AttachTransport,
-  type CmuxRemoteApprovalResult,
-  type CmuxRemoteApprovalOptions,
-  type CmuxRemoteAttachOptions,
-  type CmuxRemoteEndpoint,
-  type CreateOptions,
-  type ExecOptions,
-  type ExecResult,
-  type SnapshotRef,
-  type VMHandle,
-  type VMStatus,
-} from "./types";
-import { recordSpanError, setSpanAttributes, withVmSpan } from "../telemetry";
-import { imageUsesFreestyleBetaPlatform } from "../images/resolver";
-import {
-  CMUX_TUI_INSTALL_TIMEOUT_MS,
-  CMUX_TUI_PORT,
-  CMUX_TUI_SESSION,
-  approveCmuxTuiEnrollment,
-  cmuxTuiDaemonBuild,
-  cmuxTuiDaemonCommand,
-  cmuxTuiInstallCommand,
-  cmuxTuiPinCheckCommand,
-  isCmuxTuiDeviceEnrolled,
-  mintCmuxTuiInvitation,
-  resolveCmuxTuiSource,
-  waitForCmuxTuiReady,
-  type CmuxTuiInvoke,
-} from "./cmuxTuiDaemon";
-
-// The Freestyle BETA platform arm of the freestyle driver (beta-api.freestyle.sh
-// /v5, SDK alias freestyle-beta = npm:freestyle@0.2.0-beta.7). FreestyleProvider
-// in ./freestyle.ts owns the ProviderId and dispatches here per machine; the
-// legacy 0.1.51 platform code there keeps serving existing production machines.
-//
-// Machines attach through the cmux-tui remote daemon (transport `cmux-remote`,
-// docs/cloud-cmux-tui-daemon.md), the same model as Blaxel/E2B/Daytona. The
-// beta API has no HTTP ingress proxy to arbitrary VM ports (verified against
-// /openapi.json: no preview/port routes; TLS edge rules need a customer-verified
-// domain), so the route is the VM's stable public IPv6 straight to the daemon:
-// `ws://[<publicIpv6>]:1337/v1/link`. The daemon's Noise handshake encrypts and
-// authenticates the session end to end (carrier TLS is not required and the
-// route token only feeds the lease ledger, exactly like E2B's public proxy).
-// The daemon must therefore bind dual-stack: the baked systemd unit sets
-// CMUX_TUI_REMOTE_WS_BIND=[::]:1337 and the driver re-asserts it on heal.
-//
-// Beta creates take NO ports field, NO create-time env, and NO systemd
-// injection; `firewall` is mandatory. Model-plane env is delivered by writing
-// the persisted /root/.config/cmux/model-plane.env file (0600) that
-// /etc/cmux/agent-config.sh already sources when the boot env is absent.
-
-export const FREESTYLE_PLATFORM_METADATA_KEY = "freestylePlatform";
-/** Beta VM ids are `vm-<32 hex>`; legacy ids are bare 20-char base36. */
-const FREESTYLE_BETA_VM_ID_PATTERN = /^vm-[0-9a-f]{32}$/;
-/** Beta snapshot ids are `sh-<32 hex>`; legacy ones are `sh-`/`sc-` + 20 base36. */
-const FREESTYLE_BETA_SNAPSHOT_ID_PATTERN = /^sh-[0-9a-f]{32}$/;
-
-export const FREESTYLE_BETA_REMOTE_WS_BIND = `[::]:${CMUX_TUI_PORT}`;
-export const FREESTYLE_BETA_ATTACH_TRANSPORT: AttachTransport = "cmux-remote";
-
-const DEFAULT_TIMEOUT_MS = 60_000;
-const CREATE_TIMEOUT_MS = 15 * 60 * 1000;
-const SNAPSHOT_TIMEOUT_MS = 15 * 60 * 1000;
-const EXEC_DEFAULT_TIMEOUT_MS = 30_000;
-/** The beta exec API rejects timeoutMs above 300000 (5 minutes per exec). */
-const MAX_EXEC_TIMEOUT_MS = 300_000;
-const EXEC_OVERHEAD_TIMEOUT_MS = 15_000;
-const ROUTE_TOKEN_TTL_SECONDS = 12 * 60 * 60;
-const MODEL_PLANE_ENV_PATH = "/root/.config/cmux/model-plane.env";
-
-export function isFreestyleBetaVmId(vmId: string): boolean {
-  return FREESTYLE_BETA_VM_ID_PATTERN.test(vmId.trim());
-}
-
-export function isFreestyleBetaSnapshotId(snapshotId: string): boolean {
-  return FREESTYLE_BETA_SNAPSHOT_ID_PATTERN.test(snapshotId.trim());
-}
-
-export function freestylePlatformIsBeta(metadata: Record<string, unknown> | undefined): boolean {
-  return metadata?.[FREESTYLE_PLATFORM_METADATA_KEY] === "beta";
-}
-
-/**
- * Legacy and beta are different platforms with different API keys (a legacy key
- * answers 401 on beta-api). FREESTYLE_BETA_API_KEY lets a deployment serve both
- * at once; single-platform setups keep using FREESTYLE_API_KEY. The stack-token
- * pair mirrors build-devbox-freestyle.ts for interactive use.
- */
-function betaClient(timeoutMs = DEFAULT_TIMEOUT_MS): Freestyle {
-  const longFetch: typeof fetch = (input, init) =>
-    fetch(input as Request, { ...(init ?? {}), signal: AbortSignal.timeout(timeoutMs) });
-  const baseUrl = process.env.FREESTYLE_BETA_API_URL?.trim() || undefined;
-  const apiKey = process.env.FREESTYLE_BETA_API_KEY?.trim() || process.env.FREESTYLE_API_KEY?.trim();
-  if (apiKey) return new Freestyle({ apiKey, baseUrl, fetch: longFetch });
-  const stackAccessToken = process.env.FREESTYLE_STACK_ACCESS_TOKEN?.trim();
-  const teamId = process.env.FREESTYLE_TEAM_ID?.trim();
-  if (stackAccessToken && teamId) {
-    return new Freestyle({ stackAccessToken, teamId, baseUrl, fetch: longFetch });
-  }
-  throw new ProviderError(
-    "freestyle",
-    "beta platform requires FREESTYLE_BETA_API_KEY or FREESTYLE_API_KEY (or FREESTYLE_STACK_ACCESS_TOKEN + FREESTYLE_TEAM_ID)",
-  );
-}
-
-/**
- * Outbound open (package installs, files.cmux.com, agents); inbound only the
- * cmux-tui daemon port. Beta's mandatory `firewall` field defaults to NOTHING —
- * no outbound, no inbound — so both rules are stated. Session auth on 1337 is
- * the daemon's Noise device enrollment; the platform edge closing every other
- * port is the same posture the e2b driver builds by hand with iptables.
- */
-export function freestyleBetaFirewallRules() {
-  return [
-    { action: "allow" as const, source: {}, destination: { public: true as const } },
-    {
-      action: "allow" as const,
-      source: { public: true as const },
-      destination: { port: CMUX_TUI_PORT, protocol: "tcp" as const },
-    },
-  ];
-}
-
-/** `ws://[<publicIpv6>]:1337/v1/link` — see the ingress note at the top of this file. */
-export function freestyleBetaCmuxRemoteRoute(publicIpv6: string | null | undefined, vmId: string): string {
-  const ipv6 = publicIpv6?.trim();
-  if (!ipv6) {
-    throw new ProviderError(
-      "freestyle",
-      `VM ${vmId} has no public IPv6 address, so its cmux-tui daemon is unreachable (the beta platform has no HTTP ingress to arbitrary ports)`,
-    );
-  }
-  return `ws://[${ipv6}]:${CMUX_TUI_PORT}/v1/link`;
-}
-
-/**
- * The persisted model-plane env file, byte-compatible with what
- * /etc/cmux/agent-config.sh itself writes from a boot env: shells that see no
- * boot env source this copy and then materialize the codex/pi/opencode
- * configs. Beta has no create-time env, so the driver writes the file instead.
- */
-export function renderFreestyleModelPlaneEnvFile(envs: Readonly<Record<string, string>>): string | null {
-  const baseUrl = envs.OPENAI_BASE_URL?.trim();
-  if (!baseUrl) return null;
-  const quote = (value: string) => `'${value.replace(/'/g, `'\\''`)}'`;
-  const lines = [
-    "# generated by cmux from machine boot env; managed, do not edit",
-    `export OPENAI_BASE_URL=${quote(baseUrl)}`,
-  ];
-  if (envs.OPENAI_API_KEY) lines.push(`export OPENAI_API_KEY=${quote(envs.OPENAI_API_KEY)}`);
-  if (envs.CMUX_CODEROUTER_URL) lines.push(`export CMUX_CODEROUTER_URL=${quote(envs.CMUX_CODEROUTER_URL)}`);
-  return `${lines.join("\n")}\n`;
-}
-
-export function normalizeFreestyleBetaExecTimeout(timeoutMs: number | undefined): number {
-  if (typeof timeoutMs !== "number" || !Number.isFinite(timeoutMs) || timeoutMs <= 0) {
-    return EXEC_DEFAULT_TIMEOUT_MS;
-  }
-  return Math.min(Math.floor(timeoutMs), MAX_EXEC_TIMEOUT_MS);
-}
-
-/**
- * `stopped` maps to paused, not destroyed: a stopped beta VM still exists and
- * `start()` boots it again (poweroff, an idle timeout, or a failure with
- * automaticRestart off all leave a recoverable machine).
- */
-export function mapFreestyleBetaState(state: VmData["state"] | null | undefined): VMStatus {
-  switch (state) {
-    case "starting":
-      return "creating";
-    case "running":
-      return "running";
-    case "pausing":
-    case "paused":
-    case "stopped":
-      return "paused";
-    default:
-      return "running";
-  }
-}
-
-/**
- * Healthy = the daemon process is up AND something listens on 1337 in the v6
- * table (a dual-stack `[::]` bind; 0x0539 = 1337). A daemon bound 0.0.0.0 only
- * appears in /proc/net/tcp, is unreachable at the public IPv6, and must be
- * restarted under the dual-stack override.
- */
-export function freestyleBetaDaemonHealthyCommand(): string {
-  return "pgrep -f 'cmux-tui server start' >/dev/null 2>&1 && grep -qi ':0539 ' /proc/net/tcp6";
-}
-
-const REMOTE_WS_BIND_OVERRIDE =
-  "/etc/systemd/system/cmux-tui-daemon.service.d/10-cmux-remote-ws-bind.conf";
-
-/**
- * (Re)start the daemon listening dual-stack. Under systemd (the baked
- * cmux-tui-daemon unit), install a drop-in setting
- * CMUX_TUI_REMOTE_WS_BIND=[::]:1337 — the env cmux-devbox-boot reads — then
- * restart the unit, healing machines from bakes that predate the env default.
- * Without systemd (or the unit), fall back to a direct daemon launch with the
- * dual-stack bind, mirroring the Daytona driver's fallback.
- */
-export function freestyleBetaStartDaemonCommand(): string {
-  return [
-    "if [ -d /run/systemd/system ] && [ -f /etc/systemd/system/cmux-tui-daemon.service ]; then",
-    `mkdir -p ${REMOTE_WS_BIND_OVERRIDE.replace(/\/[^/]+$/, "")};`,
-    `printf '[Service]\\nEnvironment=CMUX_TUI_REMOTE_WS_BIND=${FREESTYLE_BETA_REMOTE_WS_BIND}\\n' > ${REMOTE_WS_BIND_OVERRIDE};`,
-    "systemctl daemon-reload;",
-    "systemctl restart cmux-tui-daemon;",
-    "else",
-    `pgrep -f 'cmux-tui server start' >/dev/null 2>&1 || (setsid nohup sh -c '${cmuxTuiDaemonCommand(FREESTYLE_BETA_REMOTE_WS_BIND)}' >>/tmp/cmux-tui-daemon.log 2>&1 &);`,
-    "fi",
-  ].join(" ");
-}
-
-function isBetaNotFound(err: unknown): boolean {
-  return err instanceof FreestyleApiError && (err.status === 404 || err.code === "NOT_FOUND");
-}
-
-function errorMessage(err: unknown): string {
-  return err instanceof Error ? err.message : String(err);
-}
-
-function betaSpanAttributes(vmId: string, operation: string, extra: Record<string, string | number | boolean> = {}) {
-  return {
-    "cmux.vm.provider": "freestyle",
-    "cmux.vm.operation": operation,
-    "cmux.vm.id": vmId,
-    "cmux.vm.platform": "beta",
-    ...extra,
-  };
-}
-
-export class FreestyleBetaPlatform {
-  /**
-   * A create targets beta when any of these say so: the caller's metadata
-   * marker, the image's manifest entry (`features.freestylePlatform: "beta"`),
-   * the CMUX_FREESTYLE_PLATFORM=beta operator override (unmanifested beta
-   * snapshots in local dev), or the snapshot id's beta shape. Everything else
-   * stays on the legacy platform, so existing images and deployments are
-   * untouched until an operator points at a beta image.
-   */
-  createTargetsBeta(options: CreateOptions): boolean {
-    if (freestylePlatformIsBeta(options.providerMetadata)) return true;
-    if (imageUsesFreestyleBetaPlatform("freestyle", options.image.trim())) return true;
-    if (process.env.CMUX_FREESTYLE_PLATFORM?.trim().toLowerCase() === "beta") return true;
-    return isFreestyleBetaSnapshotId(options.image);
-  }
-
-  restoreTargetsBeta(snapshotId: string): boolean {
-    if (imageUsesFreestyleBetaPlatform("freestyle", snapshotId.trim())) return true;
-    if (process.env.CMUX_FREESTYLE_PLATFORM?.trim().toLowerCase() === "beta") return true;
-    return isFreestyleBetaSnapshotId(snapshotId);
-  }
-
-  async create(options: CreateOptions): Promise<VMHandle> {
-    const image = options.image.trim();
-    if (!image) {
-      throw new ProviderError("freestyle", "create requires a resolved image");
-    }
-    return withVmSpan(
-      "cmux.vm.provider.create",
-      {
-        "cmux.vm.provider": "freestyle",
-        "cmux.vm.operation": "create",
-        "cmux.vm.image": image,
-        "cmux.vm.platform": "beta",
-        "cmux.timeout_ms": CREATE_TIMEOUT_MS,
-      },
-      async (span) => {
-        try {
-          const fs = betaClient(CREATE_TIMEOUT_MS);
-          const { vm, vmId } = await fs.vms.create({
-            snapshotId: image,
-            displayName: "cmux Cloud VM",
-            metadata: { cmux: "cloud" },
-            firewall: { rules: freestyleBetaFirewallRules() },
-          });
-          setSpanAttributes(span, { "cmux.vm.id": vmId });
-          try {
-            await this.bootstrapCmuxTui(vm, vmId, options.envs);
-          } catch (err) {
-            // A VM that failed to bootstrap must not survive as an orphan.
-            await vm.delete().catch((cleanupErr) => {
-              console.error(`[freestyle-beta] create rollback failed; VM ${vmId} may be orphaned`, cleanupErr);
-            });
-            throw err;
-          }
-          return {
-            provider: "freestyle" as const,
-            providerVmId: vmId,
-            status: "running" as const,
-            image,
-            createdAt: Date.now(),
-            providerMetadata: {
-              ...(options.providerMetadata ?? {}),
-              [FREESTYLE_PLATFORM_METADATA_KEY]: "beta",
-            },
-          };
-        } catch (err) {
-          throw err instanceof ProviderError ? err : new ProviderError("freestyle", `create(${image}) on beta failed`, err);
-        }
-      },
-    );
-  }
-
-  async destroy(vmId: string): Promise<void> {
-    return withVmSpan(
-      "cmux.vm.provider.destroy",
-      betaSpanAttributes(vmId, "destroy"),
-      async () => {
-        try {
-          await betaClient().vms.ref(vmId).delete();
-        } catch (err) {
-          if (isBetaNotFound(err)) return; // already gone; destroy is idempotent
-          throw new ProviderError("freestyle", `destroy(${vmId}) on beta`, err);
-        }
-      },
-    );
-  }
-
-  async getStatus(vmId: string): Promise<VMStatus> {
-    return withVmSpan(
-      "cmux.vm.provider.get_status",
-      betaSpanAttributes(vmId, "get_status"),
-      async (span) => {
-        try {
-          const data = await betaClient().vms.get(vmId);
-          const status = mapFreestyleBetaState(data.state);
-          setSpanAttributes(span, { "cmux.vm.provider_state": data.state, "cmux.vm.status": status });
-          return status;
-        } catch (err) {
-          if (isBetaNotFound(err)) return "destroyed";
-          throw new ProviderError("freestyle", `getStatus(${vmId}) on beta`, err);
-        }
-      },
-    );
-  }
-
-  /** Beta pause freezes memory, so a later start resumes the daemon in place. */
-  async pause(vmId: string): Promise<void> {
-    return withVmSpan(
-      "cmux.vm.provider.pause",
-      betaSpanAttributes(vmId, "pause"),
-      async () => {
-        try {
-          await betaClient(CREATE_TIMEOUT_MS).vms.ref(vmId).pause();
-        } catch (err) {
-          throw new ProviderError("freestyle", `pause(${vmId}) on beta`, err);
-        }
-      },
-    );
-  }
-
-  async resume(vmId: string): Promise<VMHandle> {
-    return withVmSpan(
-      "cmux.vm.provider.resume",
-      betaSpanAttributes(vmId, "resume"),
-      async (span) => {
-        try {
-          const fs = betaClient(CREATE_TIMEOUT_MS);
-          const vm = fs.vms.ref(vmId);
-          const data = await vm.start();
-          const status = mapFreestyleBetaState(data.state);
-          setSpanAttributes(span, { "cmux.vm.provider_state": data.state, "cmux.vm.status": status });
-          // A memory-preserving pause keeps the daemon; a cold boot (the VM had
-          // stopped) relies on the baked systemd unit. Heal best-effort so the
-          // first attach doesn't race the unit; attach re-verifies anyway.
-          try {
-            await this.ensureCmuxTuiRunning(vm, vmId);
-          } catch (healErr) {
-            recordSpanError(span, healErr);
-          }
-          return {
-            provider: "freestyle" as const,
-            providerVmId: data.id,
-            status,
-            image: data.snapshotId ?? "freestyle:resumed",
-            createdAt: Date.now(),
-            providerMetadata: { [FREESTYLE_PLATFORM_METADATA_KEY]: "beta" },
-          };
-        } catch (err) {
-          throw new ProviderError("freestyle", `resume(${vmId}) on beta`, err);
-        }
-      },
-    );
-  }
-
-  async exec(vmId: string, command: string, opts?: ExecOptions): Promise<ExecResult> {
-    const timeoutMs = normalizeFreestyleBetaExecTimeout(opts?.timeoutMs);
-    return withVmSpan(
-      "cmux.vm.provider.exec",
-      betaSpanAttributes(vmId, "exec", {
-        "cmux.command_length": command.length,
-        "cmux.timeout_ms": timeoutMs,
-      }),
-      async (span) => {
-        try {
-          const fs = betaClient(timeoutMs + EXEC_OVERHEAD_TIMEOUT_MS);
-          const r = await fs.vms.ref(vmId).exec({ command, timeoutMs });
-          // statusCode is null when the guest killed the command at its timeout.
-          const exitCode = r.statusCode ?? 124;
-          setSpanAttributes(span, { "cmux.exec.exit_code": exitCode });
-          return { exitCode, stdout: r.stdout ?? "", stderr: r.stderr ?? "" };
-        } catch (err) {
-          throw new ProviderError("freestyle", `exec(${vmId}) on beta`, err);
-        }
-      },
-    );
-  }
-
-  async snapshot(vmId: string, name?: string): Promise<SnapshotRef> {
-    return withVmSpan(
-      "cmux.vm.provider.snapshot",
-      betaSpanAttributes(vmId, "snapshot", {
-        "cmux.snapshot.named": !!name,
-        "cmux.timeout_ms": SNAPSHOT_TIMEOUT_MS,
-      }),
-      async (span) => {
-        try {
-          const fs = betaClient(SNAPSHOT_TIMEOUT_MS);
-          // Beta snapshots capture memory + disk of a running or paused VM. The
-          // caller's name goes to displayName only: slugs are unique per account
-          // and a collision would fail the snapshot for a cosmetic label.
-          const out = await fs.vms.ref(vmId).snapshot(name ? { displayName: name } : undefined);
-          if (!out.snapshotId) throw new Error("snapshot response missing snapshotId");
-          setSpanAttributes(span, { "cmux.snapshot.id": out.snapshotId });
-          return { id: out.snapshotId, createdAt: Date.now(), name };
-        } catch (err) {
-          throw new ProviderError("freestyle", `snapshot(${vmId}) on beta`, err);
-        }
-      },
-    );
-  }
-
-  async restore(snapshotId: string): Promise<VMHandle> {
-    return withVmSpan(
-      "cmux.vm.provider.restore",
-      {
-        "cmux.vm.provider": "freestyle",
-        "cmux.vm.operation": "restore",
-        "cmux.snapshot.id": snapshotId,
-        "cmux.vm.platform": "beta",
-        "cmux.timeout_ms": CREATE_TIMEOUT_MS,
-      },
-      async (span) => {
-        try {
-          const fs = betaClient(CREATE_TIMEOUT_MS);
-          const { vm, vmId } = await fs.vms.create({
-            snapshotId,
-            displayName: "cmux Cloud VM",
-            metadata: { cmux: "cloud" },
-            firewall: { rules: freestyleBetaFirewallRules() },
-          });
-          setSpanAttributes(span, { "cmux.vm.id": vmId });
-          // The snapshot carries the installed binary and the persisted
-          // model-plane file; heal best-effort so the machine is attach-ready
-          // without failing restore on a transient error.
-          await this.ensureCmuxTuiRunning(vm, vmId).catch(() => undefined);
-          return {
-            provider: "freestyle" as const,
-            providerVmId: vmId,
-            status: "running" as const,
-            image: snapshotId,
-            createdAt: Date.now(),
-            providerMetadata: { [FREESTYLE_PLATFORM_METADATA_KEY]: "beta" },
-          };
-        } catch (err) {
-          throw new ProviderError("freestyle", `restore(${snapshotId}) on beta`, err);
-        }
-      },
-    );
-  }
-
-  async openCmuxRemote(vmId: string, options?: CmuxRemoteAttachOptions): Promise<CmuxRemoteEndpoint> {
-    return withVmSpan(
-      "cmux.vm.provider.open_cmux_remote",
-      betaSpanAttributes(vmId, "open_cmux_remote"),
-      async (span) => {
-        try {
-          const fs = betaClient(CMUX_TUI_INSTALL_TIMEOUT_MS + EXEC_OVERHEAD_TIMEOUT_MS);
-          const vm = fs.vms.ref(vmId);
-          const data = await vm.data();
-          const route = freestyleBetaCmuxRemoteRoute(data.publicIpv6, vmId);
-          await this.ensureCmuxTuiRunning(vm, vmId);
-          const invoke = this.cmuxTuiInvoke(vm);
-          // Direct-IPv6 carries no URL token; this one exists only for the
-          // lease ledger. The daemon's Noise enrollment is the session gate —
-          // the same trust model as E2B's public proxy route.
-          const token = `cmux-freestyle-route-${randomBytes(32).toString("hex")}`;
-          const expiresAtUnix = Math.floor(Date.now() / 1000) + ROUTE_TOKEN_TTL_SECONDS;
-          let invitation: CmuxRemoteEndpoint["invitation"];
-          const enrolled = options?.deviceFingerprint
-            ? await isCmuxTuiDeviceEnrolled(invoke, options.deviceFingerprint)
-            : false;
-          if (!enrolled) {
-            invitation = await mintCmuxTuiInvitation(invoke, "freestyle", vmId);
-          }
-          span.setAttribute("cmux.vm.cmux_remote.invited", !enrolled);
-          const daemonBuild = await cmuxTuiDaemonBuild(invoke);
-          return {
-            transport: "cmux-remote" as const,
-            route,
-            token,
-            expiresAtUnix,
-            session: CMUX_TUI_SESSION,
-            ...(daemonBuild ? { daemonBuild } : {}),
-            ...(invitation ? { invitation } : {}),
-          };
-        } catch (err) {
-          throw err instanceof ProviderError
-            ? err
-            : new ProviderError("freestyle", `openCmuxRemote(${vmId}) on beta failed`, err);
-        }
-      },
-    );
-  }
-
-  async approveCmuxRemoteEnrollment(
-    vmId: string,
-    invitationId: string,
-    options?: CmuxRemoteApprovalOptions,
-  ): Promise<CmuxRemoteApprovalResult> {
-    void options;
-    return withVmSpan(
-      "cmux.vm.provider.approve_cmux_remote_enrollment",
-      betaSpanAttributes(vmId, "approve_cmux_remote_enrollment"),
-      async () => {
-        try {
-          const vm = betaClient().vms.ref(vmId);
-          return await approveCmuxTuiEnrollment(this.cmuxTuiInvoke(vm), "freestyle", vmId, invitationId);
-        } catch (err) {
-          throw err instanceof ProviderError
-            ? err
-            : new ProviderError("freestyle", `approveCmuxRemoteEnrollment(${vmId}) on beta failed`, err);
-        }
-      },
-    );
-  }
-
-  /** Installs the pinned binary, persists the model-plane env, starts the daemon (fresh create). */
-  private async bootstrapCmuxTui(vm: Vm, vmId: string, envs?: Readonly<Record<string, string>>): Promise<void> {
-    const source = await resolveCmuxTuiSource("freestyle");
-    await this.execOrThrow(vm, vmId, cmuxTuiInstallCommand(source), CMUX_TUI_INSTALL_TIMEOUT_MS)
-      .catch((err: unknown) => {
-        throw new ProviderError("freestyle", `cmux-tui install in ${vmId} failed: ${errorMessage(err)}`);
-      });
-    if (envs) await this.writeModelPlaneEnv(vm, vmId, envs);
-    await this.execOrThrow(vm, vmId, freestyleBetaStartDaemonCommand(), 60_000);
-    await waitForCmuxTuiReady(this.cmuxTuiInvoke(vm), "freestyle", vmId);
-  }
-
-  /**
-   * Beta has no create-time env. The coderouter model-plane vars are delivered
-   * by writing the persisted file /etc/cmux/agent-config.sh already reads
-   * (0600, root); every shell the daemon spawns sources it through the
-   * profile/bashrc chain and materializes the harness configs from it.
-   */
-  private async writeModelPlaneEnv(vm: Vm, vmId: string, envs: Readonly<Record<string, string>>): Promise<void> {
-    const content = renderFreestyleModelPlaneEnvFile(envs);
-    if (!content) return;
-    try {
-      await vm.exec({ command: `mkdir -p ${MODEL_PLANE_ENV_PATH.replace(/\/[^/]+$/, "")}`, timeoutMs: 30_000 });
-      await vm.fs.writeTextFile(MODEL_PLANE_ENV_PATH, content, { mode: 0o600 });
-    } catch (err) {
-      throw new ProviderError("freestyle", `model-plane env write in ${vmId} failed`, err);
-    }
-  }
-
-  /**
-   * Attach-time heal, mirroring the other cmux-tui drivers: a daemon that is
-   * running AND listening dual-stack is left alone; anything else is repaired,
-   * reinstalling first when the binary is missing or superseded by a manifest
-   * pin change. The dual-stack check matters because a machine from an older
-   * bake boots the daemon on 0.0.0.0, which the public-IPv6 route cannot reach.
-   */
-  private async ensureCmuxTuiRunning(vm: Vm, vmId: string): Promise<void> {
-    const healthy = await this.execResult(vm, freestyleBetaDaemonHealthyCommand());
-    if (healthy?.exitCode === 0) return;
-    const source = await resolveCmuxTuiSource("freestyle");
-    const pinned = await this.execResult(vm, cmuxTuiPinCheckCommand(source));
-    if (pinned?.exitCode !== 0) {
-      await this.execOrThrow(vm, vmId, cmuxTuiInstallCommand(source), CMUX_TUI_INSTALL_TIMEOUT_MS)
-        .catch((err: unknown) => {
-          throw new ProviderError("freestyle", `cmux-tui install in ${vmId} failed: ${errorMessage(err)}`);
-        });
-    }
-    await this.execOrThrow(vm, vmId, freestyleBetaStartDaemonCommand(), 60_000);
-    await waitForCmuxTuiReady(this.cmuxTuiInvoke(vm), "freestyle", vmId);
-  }
-
-  private async execResult(vm: Vm, command: string, timeoutMs = EXEC_DEFAULT_TIMEOUT_MS): Promise<ExecResult | null> {
-    try {
-      const r = await vm.exec({ command, timeoutMs });
-      return { exitCode: r.statusCode ?? 124, stdout: r.stdout ?? "", stderr: r.stderr ?? "" };
-    } catch {
-      return null;
-    }
-  }
-
-  private async execOrThrow(vm: Vm, vmId: string, command: string, timeoutMs: number): Promise<ExecResult> {
-    const r = await vm.exec({ command, timeoutMs });
-    const exitCode = r.statusCode ?? 124;
-    if (exitCode !== 0) {
-      throw new Error(`beta exec in ${vmId} exited ${exitCode}: ${(r.stderr ?? r.stdout ?? "").trim().slice(0, 500)}`);
-    }
-    return { exitCode, stdout: r.stdout ?? "", stderr: r.stderr ?? "" };
-  }
-
-  private cmuxTuiInvoke(vm: Vm): CmuxTuiInvoke {
-    return async (args, timeoutMs) => {
-      const r = await this.execResult(vm, `env HOME=/root /root/.cmux/bin/cmux-tui ${args}`, timeoutMs ?? EXEC_DEFAULT_TIMEOUT_MS);
-      return r ?? { exitCode: 124, stdout: "", stderr: "exec failed" };
-    };
-  }
-}
diff --git a/web/services/vms/drivers/index.ts b/web/services/vms/drivers/index.ts
index a893c73ab65b..58438f816f02 100644
--- a/web/services/vms/drivers/index.ts
+++ b/web/services/vms/drivers/index.ts
@@ -1,11 +1,10 @@
-import { BlaxelProvider } from "./blaxel";
 import { DaytonaProvider } from "./daytona";
 import { E2BProvider } from "./e2b";
 import { FreestyleProvider } from "./freestyle";
 import { isProviderId, type ProviderId, type VmCapabilities, type VMProvider } from "./types";
 
 export * from "./types";
-export { BlaxelProvider, DaytonaProvider, E2BProvider, FreestyleProvider };
+export { DaytonaProvider, E2BProvider, FreestyleProvider };
 
 let registry: Map<ProviderId, VMProvider> | null = null;
 
@@ -14,7 +13,6 @@ function buildRegistry(): Map<ProviderId, VMProvider> {
   map.set("e2b", new E2BProvider());
   map.set("freestyle", new FreestyleProvider());
   map.set("daytona", new DaytonaProvider());
-  map.set("blaxel", new BlaxelProvider());
   return map;
 }
 
@@ -25,13 +23,27 @@ export function getProvider(id: ProviderId): VMProvider {
   return p;
 }
 
+/**
+ * The provider whose persistent home volumes the reaper scans, or null when no
+ * registered driver exposes a volume inventory. Volumes were a single-provider
+ * feature; the seam stays so the reaper wakes up on its own if a driver
+ * implements `listVolumes` again.
+ */
+export function volumeCapableProviderId(): ProviderId | null {
+  if (!registry) registry = buildRegistry();
+  for (const [id, provider] of registry) {
+    if (typeof provider.listVolumes === "function") return id;
+  }
+  return null;
+}
+
 export function defaultProviderId(): ProviderId {
   const configured = process.env.CMUX_VM_DEFAULT_PROVIDER;
   if (isProviderId(configured)) return configured;
-  // Blaxel is the default interactive provider. Other providers remain available
-  // as explicit overrides (or an explicitly configured deployment rollback), but
-  // a bare `cmux vm new` must never silently fall back to Freestyle SSH.
-  return "blaxel";
+  // Freestyle (the public platform) is the default interactive provider. E2B and
+  // Daytona remain available as explicit overrides, or as an explicitly
+  // configured deployment rollback, but never as a silent fallback.
+  return "freestyle";
 }
 
 /** The provider's capability set with defaults applied: an absent flag means supported,
diff --git a/web/services/vms/drivers/types.ts b/web/services/vms/drivers/types.ts
index fd36653636ce..4f30b9923e0d 100644
--- a/web/services/vms/drivers/types.ts
+++ b/web/services/vms/drivers/types.ts
@@ -2,9 +2,9 @@
 // per-provider implementations behind an interface. Callers hold a `VMProvider` and never reach
 // into specifics.
 
-export type ProviderId = "e2b" | "freestyle" | "daytona" | "blaxel";
+export type ProviderId = "e2b" | "freestyle" | "daytona";
 
-const PROVIDER_IDS: readonly ProviderId[] = ["e2b", "freestyle", "daytona", "blaxel"];
+const PROVIDER_IDS: readonly ProviderId[] = ["e2b", "freestyle", "daytona"];
 
 export function isProviderId(value: unknown): value is ProviderId {
   return typeof value === "string" && PROVIDER_IDS.includes(value as ProviderId);
@@ -69,7 +69,6 @@ export type VMHandle = {
 export type CreateOptions = {
   image: string; // provider-specific template/snapshot identifier
   providerMetadata?: Record<string, unknown>;
-  bakedFreestyleSignedAdmin?: boolean;
   /**
    * Name of a persistent volume to mount as the machine's home directory. Providers that
    * support it create the volume if missing and record it in providerMetadata so attach can
@@ -294,18 +293,19 @@ export interface VMProvider {
   fork?(vmId: string): Promise<VMHandle>;
 
   // Session transports this driver supports. Undefined means the legacy set (`websocket`
-  // and/or `ssh` via openAttach/openSSH). A driver that lists only `cmux-remote` (Blaxel)
+  // and/or `ssh` via openAttach/openSSH). A driver that lists only `cmux-remote`
   // never serves openAttach: workflows fail such requests with
   // VmAttachTransportUnsupportedError before reaching the provider.
   readonly attachTransports?: readonly AttachTransport[];
 
   // Returns a live attach endpoint the client can dial into: cmuxd-remote WebSocket PTY
-  // with a short-lived one-use lease (E2B/Daytona/Freestyle), or SSH.
+  // with a short-lived one-use lease, or SSH. Every current driver is cmux-remote only
+  // and throws here; the seam stays for a provider that serves a raw PTY again.
   openAttach(vmId: string, options?: AttachOptions): Promise<AttachEndpoint>;
 
   // Optional: attach through the cmux-tui remote daemon in the VM (see CmuxRemoteEndpoint).
-  // Blaxel machines run only this daemon; providers that have not been migrated leave
-  // this undefined.
+  // Every cmux Cloud machine runs this daemon; providers that have not been migrated
+  // leave this undefined.
   openCmuxRemote?(vmId: string, options?: CmuxRemoteAttachOptions): Promise<CmuxRemoteEndpoint>;
   // Optional: approve the pending enrollment a previous openCmuxRemote invited.
   approveCmuxRemoteEnrollment?(
diff --git a/web/services/vms/drivers/wsLease.ts b/web/services/vms/drivers/wsLease.ts
deleted file mode 100644
index 8eda593f4395..000000000000
--- a/web/services/vms/drivers/wsLease.ts
+++ /dev/null
@@ -1,74 +0,0 @@
-import { createHash, randomBytes } from "node:crypto";
-
-export function shellQuote(value: string): string {
-  return `'${value.replace(/'/g, `'\\''`)}'`;
-}
-
-export function shellArgValue(text: string, argName: string): string | null {
-  const escaped = argName.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-  const match = text.match(new RegExp(`(?:^|\\s)${escaped}(?:=|\\s+)(?:"([^"]+)"|'([^']+)'|(\\S+))`));
-  return match?.[1] ?? match?.[2] ?? match?.[3] ?? null;
-}
-
-export function parentDirectory(path: string): string {
-  const index = path.lastIndexOf("/");
-  return index > 0 ? path.slice(0, index) : ".";
-}
-
-export function ensurePrivateDirectoryCommand(filePath: string): string {
-  const directory = shellQuote(parentDirectory(filePath));
-  return `mkdir -p ${directory} && chmod 700 ${directory}`;
-}
-
-export function makeWebSocketLease(
-  provider: string,
-  label: string,
-  singleUse: boolean,
-  ttlSeconds: number,
-  requestedSessionId?: string,
-) {
-  const token = `cmux-${provider}-${label}-${randomBytes(32).toString("hex")}`;
-  const trimmedSessionId = requestedSessionId?.trim();
-  const sessionId = trimmedSessionId || randomBytes(16).toString("hex");
-  const expiresAtUnix = Math.floor(Date.now() / 1000) + ttlSeconds;
-  return {
-    token,
-    sessionId,
-    expiresAtUnix,
-    lease: {
-      version: 1,
-      token_sha256: createHash("sha256").update(token).digest("hex"),
-      expires_at_unix: expiresAtUnix,
-      session_id: sessionId,
-      single_use: singleUse,
-    },
-  };
-}
-
-export function makeWebSocketAttachmentId(provider: string): string {
-  return `cmux-${provider}-${randomBytes(16).toString("hex")}`;
-}
-
-export type WebSocketLease = ReturnType<typeof makeWebSocketLease>;
-export type ReusableRpcLease = Pick<WebSocketLease, "token" | "sessionId" | "expiresAtUnix">;
-
-export function leaseClientMetadata(lease: ReusableRpcLease): ReusableRpcLease {
-  return {
-    token: lease.token,
-    sessionId: lease.sessionId,
-    expiresAtUnix: lease.expiresAtUnix,
-  };
-}
-
-export function isReusableRpcLease(value: unknown): value is ReusableRpcLease {
-  if (!value || typeof value !== "object") return false;
-  const candidate = value as Partial<ReusableRpcLease>;
-  return (
-    typeof candidate.token === "string" &&
-    candidate.token.length > 0 &&
-    typeof candidate.sessionId === "string" &&
-    candidate.sessionId.length > 0 &&
-    typeof candidate.expiresAtUnix === "number" &&
-    Number.isFinite(candidate.expiresAtUnix)
-  );
-}
diff --git a/web/services/vms/entitlements.ts b/web/services/vms/entitlements.ts
index 7df938a2feec..8e816927dcea 100644
--- a/web/services/vms/entitlements.ts
+++ b/web/services/vms/entitlements.ts
@@ -114,7 +114,7 @@ function resolveBillingContext(
 }
 
 /**
- * Machine sizes a person can pick, as memory in MB. Blaxel scales vCPUs with
+ * Machine sizes a person can pick, as memory in MB. Providers scale vCPUs with
  * memory (a 4 GB machine reports 2 cpus), so memory is the whole size story.
  */
 export const VM_MEMORY_OPTIONS_MB: readonly number[] = [2048, 4096, 8192, 16384, 24576, 32768];
diff --git a/web/services/vms/errors.ts b/web/services/vms/errors.ts
index 8e54dbdfb4de..fd841d459377 100644
--- a/web/services/vms/errors.ts
+++ b/web/services/vms/errors.ts
@@ -93,8 +93,8 @@ export class VmBillingError extends Data.TaggedError("VmBillingError")<{
 
 /**
  * The caller asked for a session transport the machine's provider does not serve
- * (e.g. the legacy websocket/SSH attach on a Blaxel machine, which only runs the
- * cmux-tui remote daemon). Not retryable: the client must switch transports.
+ * (e.g. the legacy websocket/SSH attach on a machine that only runs the cmux-tui
+ * remote daemon). Not retryable: the client must switch transports.
  */
 export class VmAttachTransportUnsupportedError extends Data.TaggedError("VmAttachTransportUnsupportedError")<{
   readonly provider: ProviderId;
diff --git a/web/services/vms/images/blaxel/Dockerfile b/web/services/vms/images/blaxel/Dockerfile
deleted file mode 100644
index c2b126b99b93..000000000000
--- a/web/services/vms/images/blaxel/Dockerfile
+++ /dev/null
@@ -1,307 +0,0 @@
-# cmux Cloud baked Blaxel machine image ("base snapshot"): sandbox/cmux-devbox.
-#
-# Parity target is the chatmux devbox (chatmux repo, infra/sandbox-images/Dockerfile)
-# plus its desktop image (Dockerfile.desktop): same devtools, mise toolchains, coding
-# agents, ble.sh ghost text, half-life prompt, seeded history, and an openbox/TigerVNC
-# desktop with Ghostty, Chrome, and Thunar on a tint2 dock.
-#
-# Driver contract this image must keep (web/services/vms/drivers/blaxel.ts):
-#   - /usr/local/bin/start-vnc.sh exists, is idempotent, and is runnable as user `cua`
-#     with HOME=/home/cua DISPLAY=:1 (DESKTOP_VNC_HEAL_COMMAND runs exactly that).
-#   - The VNC RFB port is 5901 (the heal probe greps for a :5901 listener).
-#   - The noVNC web client answers on 6901 (CLI cloudVMDesktopPort) at `/` with the
-#     standard noVNC URL params (autoconnect/resize/reconnect).
-#   - Terminals run as the non-root `cmux` user (uid 1001) with passwordless sudo; the
-#     driver's daemon command drops to it via runuser, so the user, its sudoers policy,
-#     and bindfs (the identity view over the root-squashing home volume) must exist in
-#     the image.
-#   - /home/cmux is shadowed at runtime by the bindfs view of the persistent home
-#     volume (mounted at /cmux/home), so nothing user-facing may be baked into it (or
-#     into /root); per-HOME setup materializes at shell start from /etc/cmux.
-#   - /etc/cmux/image-stamp marks the image as baked; the driver skips its create-time
-#     provisioning fallback when it is present.
-#
-# Bake with web/scripts/build-blaxel-image.sh (remote build on Blaxel, no local docker).
-
-# Trixie, not bookworm: the pinned Ghostty community .deb needs GTK4 >= 4.14.
-FROM debian:trixie-slim
-
-# Cache-buster: bump to force a full rebuild on Blaxel's builder.
-ENV CMUX_IMAGE_EPOCH=2026-08-31-r13
-
-# Blaxel's sandbox API binary is mandatory in every custom image: it is the control
-# plane (port 8080) the driver uses for filesystem and process operations.
-COPY --from=ghcr.io/blaxel-ai/sandbox:latest /sandbox-api /usr/local/bin/sandbox-api
-
-ENV LANG=C.UTF-8 \
-    DEBIAN_FRONTEND=noninteractive
-
-# Devtools (chatmux devbox apt list, plus vim, plus iproute2 which the driver's VNC
-# heal probe needs for `ss`).
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    git \
-    ripgrep \
-    build-essential \
-    curl \
-    ca-certificates \
-    unzip \
-    zip \
-    xz-utils \
-    zstd \
-    procps \
-    iproute2 \
-    openssh-client \
-    pkg-config \
-    jq \
-    fd-find \
-    fzf \
-    sqlite3 \
-    tmux \
-    less \
-    sudo \
-    bindfs \
-    rsync \
-    file \
-    tree \
-    nano \
-    vim \
-  && rm -rf /var/lib/apt/lists/* \
-  && ln -s "$(command -v fdfind)" /usr/local/bin/fd
-
-# GitHub CLI from its own apt repo.
-RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg -o /usr/share/keyrings/githubcli-archive-keyring.gpg \
-  && chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg \
-  && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" > /etc/apt/sources.list.d/github-cli.list \
-  && apt-get update && apt-get install -y --no-install-recommends gh \
-  && rm -rf /var/lib/apt/lists/*
-
-# mise as the system-wide toolchain manager (node/python/bun), shims on PATH for
-# every process, not just login shells.
-ENV MISE_DATA_DIR=/opt/mise \
-    MISE_CACHE_DIR=/opt/mise/cache \
-    MISE_GLOBAL_CONFIG_FILE=/etc/mise/config.toml \
-    PATH=/opt/mise/shims:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-RUN curl -fsSL https://mise.run | MISE_INSTALL_PATH=/usr/local/bin/mise sh \
-  && mkdir -p /etc/mise /etc/profile.d \
-  && printf '%s\n' \
-    'export MISE_DATA_DIR=/opt/mise' \
-    'export MISE_CACHE_DIR=/opt/mise/cache' \
-    'export MISE_GLOBAL_CONFIG_FILE=/etc/mise/config.toml' \
-    'export PATH="/opt/mise/shims:$PATH"' > /etc/profile.d/mise.sh
-
-RUN mise use -g node@lts python@3.12 bun@latest \
-  && mise reshim \
-  && node --version && python3 --version && bun --version
-
-RUN curl -LsSf https://astral.sh/uv/install.sh | env UV_INSTALL_DIR=/usr/local/bin INSTALLER_NO_MODIFY_PATH=1 sh \
-  && uv --version
-
-# Desktop + media stack (chatmux Dockerfile.desktop apt list, plus novnc so the
-# desktop wrapper's iframe finds a web client at /, plus the capture/input tools).
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    tigervnc-standalone-server \
-    tigervnc-tools \
-    openbox \
-    tint2 \
-    thunar \
-    feh \
-    novnc \
-    websockify \
-    at-spi2-core \
-    dbus-x11 \
-    x11-xserver-utils \
-    xdg-utils \
-    adwaita-icon-theme \
-    libgl1-mesa-dri \
-    mesa-vulkan-drivers \
-    libvulkan1 \
-    libxkbcommon0 \
-    libxkbcommon-x11-0 \
-    fonts-dejavu-core \
-    fonts-liberation \
-    xdotool \
-    ffmpeg \
-    xvfb \
-    xauth \
-    x11-utils \
-    netcat-openbsd \
-  && rm -rf /var/lib/apt/lists/* \
-  && [ -e /usr/share/novnc/index.html ] || ln -s vnc.html /usr/share/novnc/index.html
-
-# Google Chrome stable + managed policy (DuckDuckGo default search).
-RUN curl -fsSL -o /tmp/chrome.deb https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb \
-  && apt-get update && apt-get install -y --no-install-recommends /tmp/chrome.deb \
-  && rm -rf /var/lib/apt/lists/* /tmp/chrome.deb
-COPY chrome-managed-policy.json /etc/opt/chrome/policies/managed/cmux.json
-# The dock launches Chrome through this entry: first run is pre-accepted so no
-# ToS dialog ever shows on a machine (or in anything resumed from its snapshot).
-COPY google-chrome-cmux.desktop /etc/cmux/apps/google-chrome-cmux.desktop
-ENV AGENT_BROWSER_EXECUTABLE_PATH=/usr/bin/google-chrome-stable
-# Blaxel's deploy-time rootfs slimming strips /usr/share/applications and the
-# raster icon themes, so the dock's launcher entries and icons are kept under
-# /etc/cmux, which survives. Icons are copied out of the installed packages
-# here, before slimming can eat them.
-COPY thunar-cmux.desktop /etc/cmux/apps/thunar-cmux.desktop
-RUN mkdir -p /etc/cmux/icons \
-  && cp /opt/google/chrome/product_logo_128.png /etc/cmux/icons/google-chrome.png \
-  && cp "$(find /usr/share/icons -name 'org.xfce.thunar.png' -path '*128*' | head -1)" /etc/cmux/icons/thunar.png \
-  && test -s /etc/cmux/icons/thunar.png
-
-# Ghostty, pinned community .deb for trixie (github.com/mkasberg/ghostty-ubuntu;
-# no official upstream .deb exists). libgl1-mesa-dri above is the software GL its
-# renderer uses under Xvnc.
-RUN curl -fsSL -o /tmp/ghostty.deb https://github.com/mkasberg/ghostty-ubuntu/releases/download/1.3.1-0-ppa2/ghostty_1.3.1-0.ppa2_amd64_trixie.deb \
-  && apt-get update && apt-get install -y --no-install-recommends /tmp/ghostty.deb \
-  && rm -rf /var/lib/apt/lists/* /tmp/ghostty.deb \
-  && ghostty +version
-COPY ghostty-cmux.desktop /etc/cmux/apps/ghostty-cmux.desktop
-RUN mkdir -p /etc/cmux/icons \
-  && cp "$(find /usr/share/icons -name 'com.mitchellh.ghostty.png' -path '*128*' | head -1)" /etc/cmux/icons/ghostty.png \
-  && test -s /etc/cmux/icons/ghostty.png
-
-# cua computer-use driver, pinned.
-ENV CUA_DRIVER_RS_HOME=/opt/cua-driver
-RUN curl -fsSL https://cua.ai/driver/install.sh -o /tmp/cua-install.sh \
-  && CUA_DRIVER_RS_VERSION=0.23.2 CUA_DRIVER_BIN_DIR=/usr/local/bin CUA_DRIVER_NO_MODIFY_PATH=1 bash /tmp/cua-install.sh \
-  && rm -f /tmp/cua-install.sh \
-  && ls /usr/local/bin | grep -qi cua
-
-# Coding agents, pinned at bake time (bump with the image epoch). Installed on the
-# mise node so they ride the same toolchain users get.
-ARG CMUX_IMAGE_CLAUDE_CODE_VERSION=2.1.252
-ARG CMUX_IMAGE_CODEX_VERSION=0.151.0
-ARG CMUX_IMAGE_OPENCODE_VERSION=1.18.25
-ARG CMUX_IMAGE_PI_VERSION=0.84.4
-ARG CMUX_IMAGE_AGENT_BROWSER_VERSION=0.35.2
-RUN npm install -g --foreground-scripts \
-    "@anthropic-ai/claude-code@${CMUX_IMAGE_CLAUDE_CODE_VERSION}" \
-    "@openai/codex@${CMUX_IMAGE_CODEX_VERSION}" \
-    "opencode-ai@${CMUX_IMAGE_OPENCODE_VERSION}" \
-    "@earendil-works/pi-coding-agent@${CMUX_IMAGE_PI_VERSION}" \
-    "agent-browser@${CMUX_IMAGE_AGENT_BROWSER_VERSION}" \
-  && mise reshim \
-  && claude --version && codex --version && opencode --version && pi --version
-
-# Keep Claude Code session transcripts effectively forever (chatmux parity).
-RUN mkdir -p /etc/claude-code \
-  && echo '{ "cleanupPeriodDays": 99999 }' > /etc/claude-code/managed-settings.json
-
-# Desktop user. The driver heals the desktop as `cua` with HOME=/home/cua; the
-# stock blaxel/xfce-vnc image set that contract and we keep it.
-RUN useradd -m -u 1000 -s /bin/bash cua
-
-# Work user. Terminals and agents run as `cmux`, never root: coding agents refuse a
-# root shell (`claude --dangerously-skip-permissions`), and root should require an
-# explicit `sudo` — which is passwordless. The driver mounts the persistent home
-# volume over /home/cmux and starts the cmux-tui daemon as this user (uid 1001 is
-# the driver's runtime-setup pin too, so volume ownership is stable across images).
-RUN useradd -m -u 1001 -s /bin/bash cmux \
-  && printf 'cmux ALL=(ALL) NOPASSWD:ALL\n' > /etc/sudoers.d/90-cmux-nopasswd \
-  && chmod 0440 /etc/sudoers.d/90-cmux-nopasswd \
-  && visudo -c
-
-# Interactive shell setup: ble.sh ghost text, half-life prompt, seeded history.
-# Everything global lives under /etc/cmux because /home/cmux is shadowed by the
-# persistent home volume at runtime; cmux-bashrc materializes per-HOME state.
-RUN curl -fsSL https://github.com/akinomyoga/ble.sh/releases/download/nightly/ble-nightly.tar.xz -o /tmp/ble.tar.xz \
-  && tar xJf /tmp/ble.tar.xz -C /tmp \
-  && mv /tmp/ble-nightly /usr/local/share/blesh \
-  && rm -f /tmp/ble.tar.xz
-COPY cmux-bashrc /etc/cmux/bashrc
-COPY seed-history /etc/cmux/seed-history
-COPY tint2rc /etc/cmux/tint2rc
-# CC0 mountain-lake wallpaper; provenance and license in WALLPAPER.md.
-COPY wallpaper.jpg /usr/share/backgrounds/cmux/wallpaper.jpg
-RUN printf '%s\n' '[ -f /etc/cmux/bashrc ] && . /etc/cmux/bashrc' >> /etc/bash.bashrc \
-  && printf '%s\n' '[ -f /etc/cmux/bashrc ] && . /etc/cmux/bashrc' >> /etc/skel/.bashrc \
-  && printf '%s\n' '[ -f /etc/cmux/bashrc ] && . /etc/cmux/bashrc' >> /root/.bashrc \
-  && printf '%s\n' '[ -f /etc/cmux/bashrc ] && . /etc/cmux/bashrc' >> /home/cmux/.bashrc \
-  && printf '%s\n' '[ -f /etc/cmux/bashrc ] && . /etc/cmux/bashrc' >> /home/cua/.bashrc \
-  && echo 'set -g default-shell /bin/bash' >> /etc/tmux.conf
-
-# Pre-generate ble.sh's per-TERM tput caches for the terminals cmux panes use.
-# Without them the FIRST shell on a machine prints
-# "ble/term.sh: updating tput cache for TERM=... done" into the pane (and pays
-# the tput walk) before its first prompt. ble.sh resolves its cache dir in two
-# steps (verified live on a machine): ${XDG_CACHE_HOME:-~/.cache}/blesh/<ver>
-# only when that base dir ALREADY exists, else <blesh>/cache.d/<uid>. A fresh
-# home volume has no ~/.cache, so panes start on cache.d/<uid> and switch to
-# the XDG path once anything creates ~/.cache — both places are seeded:
-# cache.d here, the XDG copy by cmux-bashrc from /etc/cmux/blesh-cache-seed.
-# Generation runs ble.sh itself through the rc chain above under a pty
-# (`script`; ble.sh refuses `bash -c` and ttyless shells), so the cache layout
-# stays ble.sh's own business. The freshness test ble.sh applies is
-# "cache newer than lib/init-term.sh" — everything here is written after the
-# tarball unpack, and the hard `test` guards prove the bake produced files.
-RUN mkdir -p /etc/cmux/blesh-cache-seed \
-  && for term in xterm-256color screen-256color tmux-256color linux; do \
-       printf 'exit\n' | TERM="$term" HOME=/tmp/blesh-seed-home XDG_CACHE_HOME=/etc/cmux/blesh-cache-seed \
-         script -qec 'bash -i' /dev/null >/dev/null 2>&1 || true; \
-     done \
-  && rm -rf /tmp/blesh-seed-home \
-  && test -s /etc/cmux/blesh-cache-seed/blesh/*/term.xterm-256color \
-  && test -s /etc/cmux/blesh-cache-seed/blesh/*/term.screen-256color \
-  && test -s /etc/cmux/blesh-cache-seed/blesh/*/term.tmux-256color \
-  && test -s /etc/cmux/blesh-cache-seed/blesh/*/term.linux \
-  && mkdir -p /usr/local/share/blesh/cache.d/0 /usr/local/share/blesh/cache.d/1000 /usr/local/share/blesh/cache.d/1001 \
-  && chmod a+rwxt /usr/local/share/blesh/cache.d \
-  && cp /etc/cmux/blesh-cache-seed/blesh/*/term.* /usr/local/share/blesh/cache.d/0/ \
-  && cp /etc/cmux/blesh-cache-seed/blesh/*/term.* /usr/local/share/blesh/cache.d/1000/ \
-  && cp /etc/cmux/blesh-cache-seed/blesh/*/term.* /usr/local/share/blesh/cache.d/1001/ \
-  && chmod 700 /usr/local/share/blesh/cache.d/0 /usr/local/share/blesh/cache.d/1000 /usr/local/share/blesh/cache.d/1001 \
-  && chown -R cua:cua /usr/local/share/blesh/cache.d/1000 \
-  && chown -R cmux:cmux /usr/local/share/blesh/cache.d/1001
-
-# Agent harness config: every shell materializes per-harness model-proxy
-# configs from the machine boot env (the coderouter model-plane vars minted at
-# VM create), and persists that env on the durable home volume because Blaxel
-# create-time envs are not replayed on resurrect. The build check generates
-# configs under a throwaway HOME with fake env, then proves the image itself
-# ships no generated config.
-COPY agent-config.sh /etc/cmux/agent-config.sh
-RUN bash -n /etc/cmux/agent-config.sh \
-  && printf '%s\n' '[ -f /etc/cmux/agent-config.sh ] && . /etc/cmux/agent-config.sh' > /etc/profile.d/cmux-agents.sh \
-  && printf '%s\n' '[ -f /etc/cmux/agent-config.sh ] && . /etc/cmux/agent-config.sh' >> /etc/bash.bashrc \
-  && printf '%s\n' '[ -f /etc/cmux/agent-config.sh ] && . /etc/cmux/agent-config.sh' >> /etc/skel/.bashrc \
-  && printf '%s\n' '[ -f /etc/cmux/agent-config.sh ] && . /etc/cmux/agent-config.sh' >> /root/.bashrc \
-  && printf '%s\n' '[ -f /etc/cmux/agent-config.sh ] && . /etc/cmux/agent-config.sh' >> /home/cmux/.bashrc \
-  && printf '%s\n' '[ -f /etc/cmux/agent-config.sh ] && . /etc/cmux/agent-config.sh' >> /home/cua/.bashrc \
-  && mkdir -p /tmp/agent-config-check \
-  && env HOME=/tmp/agent-config-check OPENAI_BASE_URL=https://example.invalid/v1 OPENAI_API_KEY=crt_check CMUX_CODEROUTER_URL=https://example.invalid bash -lc 'true' \
-  && grep -q 'model_provider = "cmux"' /tmp/agent-config-check/.codex/config.toml \
-  && grep -q 'base_url = "https://example.invalid/v1"' /tmp/agent-config-check/.codex/config.toml \
-  && grep -q 'wire_api = "responses"' /tmp/agent-config-check/.codex/config.toml \
-  && grep -q 'persistence = "save-all"' /tmp/agent-config-check/.codex/config.toml \
-  && grep -q "export OPENAI_API_KEY='crt_check'" /tmp/agent-config-check/.config/cmux/model-plane.env \
-  && [ "$(stat -c %a /tmp/agent-config-check/.config/cmux/model-plane.env)" = "600" ] \
-  && grep -q '"baseUrl": "https://example.invalid/v1"' /tmp/agent-config-check/.pi/agent/models.json \
-  && grep -qF '"x-coderouter-route-token": "$OPENAI_API_KEY"' /tmp/agent-config-check/.pi/agent/models.json \
-  && ! grep -q 'crt_check' /tmp/agent-config-check/.pi/agent/models.json \
-  && test ! -e /tmp/agent-config-check/.config/opencode/opencode.json \
-  && rm -rf /tmp/agent-config-check \
-  && mkdir -p /tmp/agent-config-resurrect/.config/cmux \
-  && printf '%s\n' "export OPENAI_BASE_URL='https://resurrect.invalid/v1'" "export OPENAI_API_KEY='crt_persisted'" > /tmp/agent-config-resurrect/.config/cmux/model-plane.env \
-  && env HOME=/tmp/agent-config-resurrect bash -lc 'grep -q "https://resurrect.invalid/v1" "$HOME/.codex/config.toml"' \
-  && rm -rf /tmp/agent-config-resurrect \
-  && bash -lc 'true' \
-  && test ! -e /root/.codex/config.toml \
-  && test ! -e /root/.pi/agent/models.json \
-  && test ! -e /root/.config/opencode/opencode.json \
-  && test ! -e /root/.config/cmux/model-plane.env \
-  && test ! -e /home/cmux/.codex/config.toml \
-  && test ! -e /home/cmux/.pi/agent/models.json \
-  && test ! -e /home/cmux/.config/opencode/opencode.json \
-  && test ! -e /home/cmux/.config/cmux/model-plane.env
-
-# /entrypoint.sh is the path every official Blaxel template uses; the microVM
-# boot command comes from this ENTRYPOINT.
-COPY start-vnc.sh /usr/local/bin/start-vnc.sh
-COPY entrypoint.sh /entrypoint.sh
-RUN chmod +x /usr/local/bin/start-vnc.sh /entrypoint.sh /usr/local/bin/sandbox-api \
-  && bash -n /usr/local/bin/start-vnc.sh && bash -n /entrypoint.sh
-
-# Stamp last: its presence tells the driver every layer above baked successfully.
-RUN mkdir -p /etc/cmux && echo "cmux-devbox ${CMUX_IMAGE_EPOCH}" > /etc/cmux/image-stamp
-
-EXPOSE 5901 6901 8080
-ENTRYPOINT ["/entrypoint.sh"]
diff --git a/web/services/vms/images/blaxel/WALLPAPER.md b/web/services/vms/images/blaxel/WALLPAPER.md
deleted file mode 100644
index 755b6fda5310..000000000000
--- a/web/services/vms/images/blaxel/WALLPAPER.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# cmux-devbox wallpaper (copied from the chatmux desktop image)
-
-`wallpaper.jpg` — mountain lake landscape.
-
-- Source: Wikimedia Commons,
-  "File:Landscape-mountains-nature-lake (24326735085).jpg"
-  https://commons.wikimedia.org/wiki/File:Landscape-mountains-nature-lake_(24326735085).jpg
-- Original file:
-  https://upload.wikimedia.org/wikipedia/commons/5/5c/Landscape-mountains-nature-lake_%2824326735085%29.jpg
-- Author: www.Pixel.la Free Stock Photos (via Flickr,
-  https://www.flickr.com/photos/137643065@N06/24326735085/)
-- License: **CC0 1.0 Universal (public domain dedication)**
-  https://creativecommons.org/publicdomain/zero/1.0/deed.en
-  (license verified 2026-08-12 via the Commons imageinfo API:
-  `LicenseShortName: CC0`)
-- Processing: original 5966x3978 downscaled to 2560x1707 JPEG (quality 80)
-  with macOS `sips`; committed into the repo so image builds are hermetic
-  (no network fetch at build time).
diff --git a/web/services/vms/images/blaxel/agent-config.sh b/web/services/vms/images/blaxel/agent-config.sh
deleted file mode 100644
index 5f8e5994f845..000000000000
--- a/web/services/vms/images/blaxel/agent-config.sh
+++ /dev/null
@@ -1,116 +0,0 @@
-# cmux cloud machine agent config generator (/etc/cmux/agent-config.sh).
-# Parity source: chatmux infra/sandbox-images/agent-config.sh. Sourced from
-# /etc/profile.d/cmux-agents.sh (login/exec shells) and the bashrc chain
-# (interactive shells).
-#
-# Materializes per-harness model-proxy configs from the machine's boot env
-# (OPENAI_BASE_URL / OPENAI_API_KEY / CMUX_CODEROUTER_URL, minted at VM
-# create from the creator's coderouter team; see
-# web/services/coderouter/vmModelPlane.ts). Idempotent and silent: each
-# harness config is written only when missing, so a user who edits or
-# deletes one keeps control.
-#
-# Blaxel create-time envs are immutable and are NOT replayed when a dead
-# sandbox is resurrected around its home volume, so shells that see the boot
-# env persist it 0600 on the volume, and shells that do not (post-resurrect)
-# re-source the persisted copy. The persisted file always mirrors the newest
-# boot env: a fresh machine on a reused volume carries a fresh token.
-
-cmux_write_agent_configs() {
-  if [ -n "${OPENAI_BASE_URL-}" ]; then
-    mkdir -p "$HOME/.config/cmux" 2>/dev/null && (
-      umask 077
-      {
-        echo "# generated by cmux from machine boot env; managed, do not edit"
-        echo "export OPENAI_BASE_URL='$OPENAI_BASE_URL'"
-        if [ -n "${OPENAI_API_KEY-}" ]; then
-          echo "export OPENAI_API_KEY='$OPENAI_API_KEY'"
-        fi
-        if [ -n "${CMUX_CODEROUTER_URL-}" ]; then
-          echo "export CMUX_CODEROUTER_URL='$CMUX_CODEROUTER_URL'"
-        fi
-      } > "$HOME/.config/cmux/model-plane.env" 2>/dev/null
-    )
-  elif [ -f "$HOME/.config/cmux/model-plane.env" ]; then
-    . "$HOME/.config/cmux/model-plane.env" 2>/dev/null || true
-  fi
-
-  # codex: a CUSTOM provider, not the built-in openai one. A custom provider
-  # defaults WebSockets OFF and pins the plain HTTP Responses API, which is
-  # exactly what the /v1 data plane serves. Auth comes from OPENAI_API_KEY at
-  # request time (env_key), so a rotated token needs no config rewrite.
-  if [ -n "${OPENAI_BASE_URL-}" ] && [ ! -e "$HOME/.codex/config.toml" ]; then
-    mkdir -p "$HOME/.codex" 2>/dev/null && {
-      echo "# generated by cmux from machine boot env; delete to manage manually"
-      echo "model_provider = \"cmux\""
-      echo ""
-      echo "[model_providers.cmux]"
-      echo "name = \"cmux\""
-      echo "base_url = \"$OPENAI_BASE_URL\""
-      echo "env_key = \"OPENAI_API_KEY\""
-      echo "wire_api = \"responses\""
-      echo "requires_openai_auth = false"
-      echo ""
-      echo "[history]"
-      echo "persistence = \"save-all\""
-    } > "$HOME/.codex/config.toml" 2>/dev/null
-  fi
-
-  # pi: override the built-in openai-codex provider, whose
-  # openai-codex-responses implementation speaks the exact dialect the /v1
-  # plane proxies (it appends /codex/responses to baseUrl, which the plane
-  # serves). pi derives a chatgpt-account-id header from its apiKey
-  # client-side and refuses a non-JWT, so the apiKey carries the same public
-  # placeholder JWT the `cr pi` extension ships; the real route token rides
-  # the x-coderouter-route-token header, which the plane's auth checks first.
-  # pi resolves the $OPENAI_API_KEY header reference at request time, so a
-  # rotated token needs no config rewrite, and no secret lands in the file.
-  # baseUrl must be a literal (pi does not env-resolve it), hence this
-  # generator.
-  if [ -n "${OPENAI_BASE_URL-}" ] && [ ! -e "$HOME/.pi/agent/models.json" ]; then
-    mkdir -p "$HOME/.pi/agent" 2>/dev/null && {
-      echo '{'
-      echo '  "providers": {'
-      echo '    "openai-codex": {'
-      echo '      "name": "cmux",'
-      echo "      \"baseUrl\": \"$OPENAI_BASE_URL\","
-      echo '      "apiKey": "e30.eyJodHRwczovL2FwaS5vcGVuYWkuY29tL2F1dGgiOnsiY2hhdGdwdF9hY2NvdW50X2lkIjoiY29kZXJvdXRlciJ9fQ.signature",'
-      echo '      "headers": { "x-coderouter-route-token": "$OPENAI_API_KEY" }'
-      echo '    }'
-      echo '  }'
-      echo '}'
-    } > "$HOME/.pi/agent/models.json" 2>/dev/null
-  fi
-
-  # opencode: the provider catalog (ids, npm packages, model lists) lives in
-  # the team's opencode console account behind the coderouter proxy and
-  # changes without image rebuilds, so the ready-made rewritten config is
-  # fetched from the coderouter opencode config endpoint instead of being
-  # guessed statically. The endpoint inlines the route token as each
-  # provider's apiKey; it is swapped for an {env:OPENAI_API_KEY} reference
-  # that opencode resolves at request time, so a rotated token needs no
-  # rewrite. A coderouter outage, a team without an opencode account (503),
-  # or an empty catalog writes nothing and the next shell retries.
-  if [ -n "${CMUX_CODEROUTER_URL-}" ] && [ -n "${OPENAI_API_KEY-}" ] \
-    && [ ! -e "$HOME/.config/opencode/opencode.json" ] \
-    && command -v curl >/dev/null 2>&1; then
-    cmux_opencode_config=$(curl -fsS --connect-timeout 2 -m 10 \
-      -H "authorization: Bearer $OPENAI_API_KEY" \
-      "$CMUX_CODEROUTER_URL/api/coderouter/opencode/config" 2>/dev/null) || cmux_opencode_config=""
-    case $cmux_opencode_config in
-      '{"provider":{}}') ;;
-      '{"provider":'*)
-        mkdir -p "$HOME/.config/opencode" 2>/dev/null && (
-          umask 077
-          printf '%s\n' "$cmux_opencode_config" \
-            | sed "s/\"$OPENAI_API_KEY\"/\"{env:OPENAI_API_KEY}\"/g" \
-            > "$HOME/.config/opencode/opencode.json"
-        ) 2>/dev/null
-        ;;
-    esac
-    unset cmux_opencode_config
-  fi
-}
-
-cmux_write_agent_configs
-unset -f cmux_write_agent_configs
diff --git a/web/services/vms/images/blaxel/blaxel.toml b/web/services/vms/images/blaxel/blaxel.toml
deleted file mode 100644
index ccdc118a154b..000000000000
--- a/web/services/vms/images/blaxel/blaxel.toml
+++ /dev/null
@@ -1,16 +0,0 @@
-name = "cmux-devbox"
-type = "sandbox"
-description = "cmux Cloud machine: chatmux-devbox tool parity plus an openbox/TigerVNC desktop with Ghostty, Chrome, and noVNC on 6901"
-
-[runtime]
-generation = "mk3"
-memory = 4096
-
-# cmux-tui remote daemon (1337) needs no declaration here: the driver mints
-# control-plane previews for it, which only require the sandbox to exist.
-
-# noVNC web client served by websockify; the desktop wrapper opens this port.
-[[runtime.ports]]
-name = "novnc"
-target = 6901
-protocol = "tcp"
diff --git a/web/services/vms/images/blaxel/chrome-managed-policy.json b/web/services/vms/images/blaxel/chrome-managed-policy.json
deleted file mode 100644
index e8239166fb53..000000000000
--- a/web/services/vms/images/blaxel/chrome-managed-policy.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "DefaultSearchProviderEnabled": true,
-  "DefaultSearchProviderName": "DuckDuckGo",
-  "DefaultSearchProviderKeyword": "duckduckgo.com",
-  "DefaultSearchProviderSearchURL": "https://duckduckgo.com/?q={searchTerms}",
-  "DefaultSearchProviderSuggestURL": "https://duckduckgo.com/ac/?q={searchTerms}&type=list",
-  "DefaultSearchProviderNewTabURL": "https://duckduckgo.com",
-  "MetricsReportingEnabled": false,
-  "PromotionalTabsEnabled": false,
-  "BrowserSignin": 0
-}
diff --git a/web/services/vms/images/blaxel/cmux-bashrc b/web/services/vms/images/blaxel/cmux-bashrc
deleted file mode 100644
index 700749f91eed..000000000000
--- a/web/services/vms/images/blaxel/cmux-bashrc
+++ /dev/null
@@ -1,70 +0,0 @@
-# cmux cloud machine interactive shell setup (/etc/cmux/bashrc).
-# Sourced from /etc/bash.bashrc, /etc/skel/.bashrc, /root/.bashrc,
-# /home/cmux/.bashrc, and /home/cua/.bashrc. Parity source: chatmux
-# infra/sandbox-images/devshell.bashrc.
-case $- in *i*) ;; *) return ;; esac
-
-# PTYs from the sandbox API do not reliably inherit these.
-export LANG="${LANG:-C.UTF-8}"
-export USER="${USER:-$(id -un)}"
-export HOME="${HOME:-$(getent passwd "$(id -u)" | cut -d: -f6)}"
-
-# First interactive shell on a fresh HOME (the persistent volume shadows the
-# image's /home/cmux): seed history so ble.sh ghost text completes agent launches.
-if [ ! -f "$HOME/.bash_history" ] && [ -f /etc/cmux/seed-history ]; then
-  cp /etc/cmux/seed-history "$HOME/.bash_history" 2>/dev/null || true
-fi
-
-# Seed ble.sh's per-TERM tput caches (baked by the Dockerfile for the TERMs
-# cmux uses) so no shell prints "ble/term.sh: updating tput cache ... done"
-# into the pane before its first prompt. ble.sh uses ~/.cache only when it
-# already exists (else it falls back to <blesh>/cache.d/<uid>, seeded in the
-# image). Per file, not per directory: a durable home carries the cache dir of
-# an older image (other ble version dir, or entries stale against a newer
-# lib/init-term.sh — ble.sh regenerates and prints unless the cache file is
-# NEWER than that file), so copy each seed entry that is missing or stale.
-# Plain cp (not -a) stamps now, which always beats init-term.sh.
-if [ -d /etc/cmux/blesh-cache-seed/blesh ]; then
-  __cmux_cache_base="${XDG_CACHE_HOME:-$HOME/.cache}"
-  for __cmux_seed in /etc/cmux/blesh-cache-seed/blesh/*/term.*; do
-    [ -f "$__cmux_seed" ] || continue
-    __cmux_dst="$__cmux_cache_base/${__cmux_seed#/etc/cmux/blesh-cache-seed/}"
-    if [ ! -f "$__cmux_dst" ] || [ /usr/local/share/blesh/lib/init-term.sh -nt "$__cmux_dst" ]; then
-      mkdir -p "${__cmux_dst%/*}" 2>/dev/null \
-        && cp "$__cmux_seed" "$__cmux_dst" 2>/dev/null \
-        || true
-    fi
-  done
-  unset __cmux_cache_base __cmux_seed __cmux_dst
-fi
-
-if [ -f /usr/local/share/blesh/ble.sh ] && [ -z "${BLE_VERSION:-}" ]; then
-  source /usr/local/share/blesh/ble.sh --noattach
-  bleopt prompt_eol_mark= exec_errexit_mark= exec_elapsed_mark= exec_exit_mark=
-  # Minimal integration: token highlighting off entirely (the stock faces
-  # paint colored backgrounds under mistyped commands and mid-word input,
-  # which reads as noise on dark themes). Keep only the history ghost text,
-  # foreground gray.
-  bleopt highlight_syntax= highlight_filename= highlight_variable=
-  ble-face auto_complete=fg=245
-fi
-
-# half-life palette: purple 135, lime 118, orange 166, hotpink 161. The machine
-# name stays in the prompt (\h): cloud machines are addressed by name.
-__cmux_git() {
-  local b d=""
-  b=$(git symbolic-ref --short HEAD 2>/dev/null) || b=$(git rev-parse --short HEAD 2>/dev/null) || return 0
-  git diff --quiet --ignore-submodules HEAD 2>/dev/null || d="*"
-  printf ' on \001\033[38;5;166m\002%s\001\033[38;5;161m\002%s\001\033[0m\002' "$b" "$d"
-}
-PS1='\[\e[38;5;135m\]\u@\h\[\e[0m\] in \[\e[38;5;118m\]\w\[\e[0m\]$(__cmux_git) λ '
-
-HISTSIZE=50000
-HISTFILESIZE=50000
-shopt -s histappend
-
-alias ls='ls --color=auto'
-alias grep='grep --color=auto'
-alias g=git
-
-[ -n "${BLE_VERSION:-}" ] && ble-attach
diff --git a/web/services/vms/images/blaxel/entrypoint.sh b/web/services/vms/images/blaxel/entrypoint.sh
deleted file mode 100755
index 28bcf51e8e6a..000000000000
--- a/web/services/vms/images/blaxel/entrypoint.sh
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/usr/bin/env bash
-# Entrypoint for the cmux-devbox Blaxel image. Blaxel requires the sandbox API
-# to be launched here and the script to stay alive with `wait`.
-set -u
-
-# Supervise the sandbox API: it is the machine's control plane, and without a
-# restart a crashed API leaves a "running" machine whose filesystem/process
-# operations all fail. Backoff is capped so a crash-looping binary cannot spin
-# the CPU, and the log is truncated so it cannot grow without bound.
-(
-  api_log=/var/log/cmux-sandbox-api.log
-  backoff=1
-  while true; do
-    started=$(date +%s)
-    /usr/local/bin/sandbox-api >>"$api_log" 2>&1
-    rc=$?
-    [ "$(wc -c <"$api_log" 2>/dev/null || echo 0)" -gt 1048576 ] && {
-      tail -c 65536 "$api_log" > "$api_log.tmp" && mv "$api_log.tmp" "$api_log"
-    }
-    if [ $(( $(date +%s) - started )) -ge 60 ]; then
-      backoff=1
-    else
-      backoff=$((backoff * 2))
-      [ "$backoff" -gt 30 ] && backoff=30
-    fi
-    echo "sandbox-api exited (rc=$rc); restarting in ${backoff}s" >>"$api_log"
-    sleep "$backoff"
-  done
-) &
-
-# Wait until the sandbox API answers on 8080 before anything else runs.
-for _ in $(seq 1 100); do
-  nc -z 127.0.0.1 8080 >/dev/null 2>&1 && break
-  sleep 0.2
-done
-
-# Blaxel's rootfs transform does not carry /home/cua over from the image (the
-# runtime mounts a fresh root-owned dir there), so recreate the desktop user's
-# home on every boot before dropping privileges. Ownership is fixed on the
-# exact paths created here, never recursively: the home can hold user data and
-# an unbounded walk would delay boot. The "First Run" marker pre-accepts
-# Chrome's first-run/ToS dialog, so the dock's Chrome opens straight to a page
-# on a fresh machine and in anything resumed from its snapshot.
-mkdir -p "/home/cua/.config/google-chrome"
-touch "/home/cua/.config/google-chrome/First Run"
-chown cua:cua /home/cua /home/cua/.config /home/cua/.config/google-chrome \
-  "/home/cua/.config/google-chrome/First Run"
-
-# The persistent home volume is mounted at /cmux/home. The driver later presents
-# it at /home/cmux through bindfs, so this boot chown only prepares the disposable
-# rootfs home for machines without that identity view. The one-time recursive
-# ownership migration of pre-existing volume contents is the driver's job
-# (CMUX_CLOUD_USER_SETUP_COMMAND), not boot's.
-if id -u cmux >/dev/null 2>&1; then
-  mkdir -p /home/cmux
-  chown cmux:cmux /home/cmux 2>/dev/null || true
-fi
-
-# Bring the desktop up, and bring it back if a component dies. The driver's
-# VNC heal covers bootstrap/resurrect only; this loop covers mid-life crashes.
-# start-vnc.sh is idempotent, so re-running it against a healthy desktop is a
-# cheap no-op probe.
-(
-  while true; do
-    runuser -u cua -- env HOME=/home/cua USER=cua DISPLAY=:1 \
-      bash /usr/local/bin/start-vnc.sh >>/var/log/cmux-desktop.log 2>&1 || true
-    sleep 30
-  done
-) &
-
-wait
diff --git a/web/services/vms/images/blaxel/ghostty-cmux.desktop b/web/services/vms/images/blaxel/ghostty-cmux.desktop
deleted file mode 100644
index 4d37daff2428..000000000000
--- a/web/services/vms/images/blaxel/ghostty-cmux.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Ghostty
-Comment=Terminal emulator
-Exec=/usr/bin/ghostty
-Terminal=false
-Icon=/etc/cmux/icons/ghostty.png
-Type=Application
-Categories=System;TerminalEmulator;
-StartupNotify=true
diff --git a/web/services/vms/images/blaxel/google-chrome-cmux.desktop b/web/services/vms/images/blaxel/google-chrome-cmux.desktop
deleted file mode 100644
index a0d9f534b3ee..000000000000
--- a/web/services/vms/images/blaxel/google-chrome-cmux.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Google Chrome
-Comment=Browse the web
-Exec=/usr/bin/google-chrome-stable --no-first-run --no-default-browser-check --disable-session-crashed-bubble %U
-Terminal=false
-Icon=/etc/cmux/icons/google-chrome.png
-Type=Application
-Categories=Network;WebBrowser;
-StartupNotify=true
diff --git a/web/services/vms/images/blaxel/seed-history b/web/services/vms/images/blaxel/seed-history
deleted file mode 100644
index 8d5bbcc3fd74..000000000000
--- a/web/services/vms/images/blaxel/seed-history
+++ /dev/null
@@ -1,2 +0,0 @@
-claude --dangerously-skip-permissions
-codex --yolo
diff --git a/web/services/vms/images/blaxel/start-vnc.sh b/web/services/vms/images/blaxel/start-vnc.sh
deleted file mode 100755
index e08ff352930a..000000000000
--- a/web/services/vms/images/blaxel/start-vnc.sh
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/usr/bin/env bash
-# Desktop starter for the cmux-devbox image. CONTRACT FILE: the Blaxel driver's
-# DESKTOP_VNC_HEAL_COMMAND runs exactly `runuser -u cua -- env HOME=/home/cua
-# USER=cua DISPLAY=:1 bash /usr/local/bin/start-vnc.sh` when no :5901 listener
-# exists, so this path, user, display, and port must not change without a
-# matching driver change (web/services/vms/drivers/blaxel.ts).
-#
-# Idempotent: every component is guarded by a liveness probe, so re-running
-# against a healthy desktop starts nothing. Starts everything in the background
-# and exits; the image entrypoint's supervisor loop re-invokes it.
-set -u
-
-DISPLAY="${DISPLAY:-:1}"
-export DISPLAY
-GEOMETRY="${CMUX_VNC_GEOMETRY:-1440x900}"
-# The driver's heal can run this before anything recreated $HOME (Blaxel's
-# rootfs transform drops /home/cua from the image), so never let an unwritable
-# HOME keep the desktop down: fall back to a per-user tmp dir for logs.
-LOG_DIR="$HOME/.cmux/desktop-logs"
-mkdir -p "$LOG_DIR" 2>/dev/null || { LOG_DIR="/tmp/cmux-desktop-logs-$(id -u)"; mkdir -p "$LOG_DIR"; }
-
-# The supervisor re-runs this every 30 s, so cap each component log here: a
-# crash-looping component must not grow its log without bound.
-for log in "$LOG_DIR"/*.log; do
-  [ -f "$log" ] || continue
-  if [ "$(wc -c <"$log" 2>/dev/null || echo 0)" -gt 1048576 ]; then
-    tail -c 65536 "$log" > "$log.tmp" 2>/dev/null && mv "$log.tmp" "$log"
-  fi
-done
-
-VNC_BIN="$(command -v Xvnc || command -v Xtigervnc)" || exit 0
-
-listening() { ss -tln 2>/dev/null | grep -q ":$1 "; }
-
-# TigerVNC on :1, RFB on 5901, loopback only: the sole ingress is Blaxel's
-# tokened preview in front of websockify, so VNC-level auth would be a second
-# password prompt noVNC's autoconnect cannot answer.
-if ! listening 5901; then
-  "$VNC_BIN" "$DISPLAY" \
-    -geometry "$GEOMETRY" \
-    -depth 24 \
-    -rfbport 5901 \
-    -localhost \
-    -SecurityTypes None \
-    -AlwaysShared \
-    >>"$LOG_DIR/xvnc.log" 2>&1 &
-  for _ in $(seq 1 50); do listening 5901 && break; sleep 0.2; done
-fi
-
-if ! pgrep -u "$(id -u)" -x openbox >/dev/null 2>&1; then
-  dbus-launch openbox >>"$LOG_DIR/openbox.log" 2>&1 &
-fi
-
-set_wallpaper() {
-  if [ -f /usr/share/backgrounds/cmux/wallpaper.jpg ] && command -v feh >/dev/null 2>&1; then
-    feh --no-fehbg --bg-fill /usr/share/backgrounds/cmux/wallpaper.jpg >/dev/null 2>&1 \
-      || xsetroot -solid '#1f2430' >/dev/null 2>&1 || true
-  else
-    xsetroot -solid '#1f2430' >/dev/null 2>&1 || true
-  fi
-}
-set_wallpaper
-
-if ! pgrep -u "$(id -u)" -x tint2 >/dev/null 2>&1; then
-  tint2 -c /etc/cmux/tint2rc >>"$LOG_DIR/tint2.log" 2>&1 &
-fi
-
-# noVNC's remote resize grows the display live, but the root pixmap keeps its
-# old size (X tiles it: the doubled-wallpaper bug) and tint2 keeps its old
-# strut. Re-fill the wallpaper and nudge tint2 whenever the geometry changes.
-# `bash -c '…' cmux-desktop-resize-watch` puts the marker in $0 so the pgrep
-# guard finds the loop on the next idempotent pass.
-if ! pgrep -u "$(id -u)" -f cmux-desktop-resize-watch >/dev/null 2>&1; then
-  bash -c '
-    last=""
-    while :; do
-      now=$(xdpyinfo 2>/dev/null | awk "/dimensions:/ {print \$2}")
-      if [ -n "$now" ] && [ "$now" != "$last" ]; then
-        if [ -n "$last" ]; then
-          feh --no-fehbg --bg-fill /usr/share/backgrounds/cmux/wallpaper.jpg >/dev/null 2>&1 || true
-          pkill -USR1 -U "$(id -u)" -x tint2 >/dev/null 2>&1 || true
-        fi
-        last="$now"
-      fi
-      sleep 2
-    done
-  ' cmux-desktop-resize-watch >>"$LOG_DIR/resize-watch.log" 2>&1 &
-fi
-
-# noVNC web client + websocket proxy on 6901 (the CLI's cloudVMDesktopPort).
-if ! listening 6901; then
-  websockify --web /usr/share/novnc --heartbeat 30 0.0.0.0:6901 127.0.0.1:5901 \
-    >>"$LOG_DIR/websockify.log" 2>&1 &
-fi
-
-exit 0
diff --git a/web/services/vms/images/blaxel/thunar-cmux.desktop b/web/services/vms/images/blaxel/thunar-cmux.desktop
deleted file mode 100644
index be8ed36fe40d..000000000000
--- a/web/services/vms/images/blaxel/thunar-cmux.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Files
-Comment=Browse the filesystem
-Exec=/usr/bin/thunar %U
-Terminal=false
-Icon=/etc/cmux/icons/thunar.png
-Type=Application
-Categories=System;Utility;FileManager;
-StartupNotify=true
diff --git a/web/services/vms/images/blaxel/tint2rc b/web/services/vms/images/blaxel/tint2rc
deleted file mode 100644
index 0e015175e4ab..000000000000
--- a/web/services/vms/images/blaxel/tint2rc
+++ /dev/null
@@ -1,42 +0,0 @@
-# tint2 dock for the cmux-devbox desktop: launchers (Chrome, Thunar, Ghostty)
-# and a taskbar, no clock. Bottom panel, dark, matches the chatmux desktop
-# layout. Launchers and icons live under /etc/cmux because Blaxel's rootfs
-# slimming strips /usr/share/applications and the raster icon themes.
-#
-# ORDER MATTERS. tint2 resolves every `*_background_id = N` while it parses,
-# against the backgrounds defined ABOVE that line (id 0 is the built-in
-# transparent one; each `rounded =` opens the next). A forward reference clamps
-# to -1 and hands the panel a garbage Background (out-of-bounds g_array_index):
-# garbage borders drive the launcher icon size negative, every scaled icon comes
-# back NULL, and the whole dock paints nothing (the 2026-08-27 invisible-toolbar
-# regression). Keep the background blocks first; tests/vm-blaxel-image.test.ts
-# pins this.
-
-# Background 1: panel
-rounded = 0
-border_width = 0
-background_color = #14161c 90
-border_color = #14161c 0
-
-panel_items = LT
-panel_position = bottom center horizontal
-panel_size = 100% 36
-panel_margin = 0 0
-panel_padding = 6 3 6
-panel_background_id = 1
-panel_layer = top
-wm_menu = 1
-
-launcher_padding = 4 2 8
-launcher_icon_size = 26
-launcher_item_app = /etc/cmux/apps/google-chrome-cmux.desktop
-launcher_item_app = /etc/cmux/apps/thunar-cmux.desktop
-launcher_item_app = /etc/cmux/apps/ghostty-cmux.desktop
-
-taskbar_mode = single_desktop
-taskbar_padding = 6 2 6
-task_maximum_size = 220 30
-task_padding = 8 3
-task_text = 1
-task_icon = 1
-task_font_color = #d8dee9 100
diff --git a/web/services/vms/images/blaxel/wallpaper.jpg b/web/services/vms/images/blaxel/wallpaper.jpg
deleted file mode 100644
index 634f5df460e2..000000000000
Binary files a/web/services/vms/images/blaxel/wallpaper.jpg and /dev/null differ
diff --git a/web/services/vms/images/devbox/Dockerfile b/web/services/vms/images/devbox/Dockerfile
index cb63aa39cf77..ed9fec667a3b 100644
--- a/web/services/vms/images/devbox/Dockerfile
+++ b/web/services/vms/images/devbox/Dockerfile
@@ -2,13 +2,12 @@
 # snapshot (web/scripts/build-devbox-e2b.ts and build-devbox-daytona.ts;
 # build-devbox-freestyle.ts replays the same steps over Freestyle exec).
 # Parity target is the chatmux devbox (chatmux repo,
-# infra/sandbox-images/Dockerfile) and the Blaxel cmux-devbox template
-# (../blaxel/Dockerfile): same devtools, mise toolchains, pinned coding
+# infra/sandbox-images/Dockerfile): same devtools, mise toolchains, pinned coding
 # agents, ble.sh ghost text, half-life prompt, seeded history, and the
 # coderouter agent-config generator.
 #
 # Session daemon: cmux-tui, the machine's only session daemon
-# (docs/cloud-cmux-tui-daemon.md), exactly as on Blaxel. The binary is NOT
+# (docs/cloud-cmux-tui-daemon.md). The binary is NOT
 # baked: each driver installs the pinned files.cmux.com build
 # (sha256-verified) onto the machine at create time and heals it on attach
 # (web/services/vms/drivers/cmuxTuiDaemon.ts). The image ships only
@@ -34,7 +33,7 @@ ENV CMUX_IMAGE_EPOCH=2026-09-01-r3
 ENV LANG=C.UTF-8 \
     DEBIAN_FRONTEND=noninteractive
 
-# Devtools (chatmux devbox apt list) plus vim (Blaxel parity), sudo for
+# Devtools (chatmux devbox apt list) plus vim, sudo for
 # non-root provider exec users (E2B), and procps for the drivers' daemon
 # process discovery (pgrep).
 RUN apt-get update && apt-get install -y --no-install-recommends \
@@ -136,7 +135,7 @@ RUN curl -fsSL https://cua.ai/driver/install.sh -o /tmp/cua-install.sh \
   && cua-driver --version
 
 # Coding agents, pinned at bake time (bump with the image epoch; keep in
-# lockstep with ../blaxel/Dockerfile). Installed on the mise node so they
+# lockstep with the chatmux devbox). Installed on the mise node so they
 # ride the same toolchain users get.
 ARG CMUX_IMAGE_CLAUDE_CODE_VERSION=2.1.252
 ARG CMUX_IMAGE_CODEX_VERSION=0.151.0
@@ -162,7 +161,7 @@ RUN mkdir -p /etc/claude-code \
 # the machine (cmux sessions run as root via the cmux-tui daemon).
 RUN if id -u user >/dev/null 2>&1; then echo 'user ALL=(ALL) NOPASSWD:ALL' > /etc/sudoers.d/91-user-nopasswd && chmod 0440 /etc/sudoers.d/91-user-nopasswd; fi
 
-# Interactive shell polish: bash IS the shell (Blaxel/chatmux parity); it
+# Interactive shell polish: bash IS the shell (chatmux parity); it
 # borrows the oh-my-zsh half-life theme colors and ble.sh supplies
 # zsh-autosuggestions-style ghost text from history, seeded with the
 # claude/codex launch commands. The build-time `bash -ic` check runs without
@@ -182,7 +181,7 @@ RUN bash -n /etc/cmux/bashrc \
   && echo 'set -g default-shell /bin/bash' >> /etc/tmux.conf \
   && bash -ic 'head -2 /root/.bash_history'
 
-# Seed ble.sh tput caches for the TERMs cmux uses, exactly as the Blaxel
+# Seed ble.sh tput caches for the TERMs cmux uses, exactly as the chatmux
 # template does (its Dockerfile carries the full rationale): without them the
 # FIRST shell on a machine prints "ble/term.sh: updating tput cache ... done"
 # into the pane before its first prompt. Both cache homes are seeded: the
diff --git a/web/services/vms/images/devbox/README.md b/web/services/vms/images/devbox/README.md
index a6bbb67c7e2f..02d341b5fbec 100644
--- a/web/services/vms/images/devbox/README.md
+++ b/web/services/vms/images/devbox/README.md
@@ -1,24 +1,22 @@
 # cmux Cloud devbox image (e2b / daytona / freestyle)
 
-One devbox definition for the three non-Blaxel Cloud VM providers. The
+One devbox definition for every Cloud VM provider. The
 Dockerfile here is the source of truth for E2B and Daytona;
 `web/scripts/build-devbox-freestyle.ts` replays the same steps over
 Freestyle exec (its build API has no COPY). Parity targets are the chatmux
-devbox (`chatmux:infra/sandbox-images/Dockerfile`) and the Blaxel
-`cmux-devbox` template (`../blaxel/`): same devtools, mise node/python/bun,
+devbox (`chatmux:infra/sandbox-images/Dockerfile`): same devtools, mise node/python/bun,
 uv, gh, Chrome + cua-driver, pinned coding agents, ble.sh ghost text,
 half-life prompt, seeded history, and the coderouter agent-config generator.
-Blaxel keeps its own template; nothing here changes it.
 
 `vm-devbox-image.test.ts` pins the shared files (`cmux-bashrc`,
 `agent-config.sh`, `seed-history`, `chrome-managed-policy.json`) to their
-Blaxel counterparts, so edit both copies together.
+chatmux counterparts, so edit both copies together.
 
 ## Session daemon: cmux-tui
 
 Every provider attaches through the cmux-tui remote daemon on port 1337
 (transport `cmux-remote`, docs/cloud-cmux-tui-daemon.md) — the same model as
-Blaxel. The binary is NOT baked: each driver installs the pinned
+every provider. The binary is NOT baked: each driver installs the pinned
 files.cmux.com build (sha256-verified) at create time and heals pin drift on
 attach (`web/services/vms/drivers/cmuxTuiDaemon.ts`). The image ships only
 `cmux-devbox-boot`, the supervisor that waits for the binary and restarts
@@ -35,7 +33,7 @@ the daemon:
   persists; start re-runs the entrypoint. The route is the preview proxy
   with its token as the `DAYTONA_SANDBOX_AUTH_KEY` query parameter, minted
   fresh per attach.
-- freestyle (beta platform, `freestyle-beta` npm alias): the baked
+- freestyle (public platform, `freestyle` npm package): the baked
   `cmux-tui-daemon` systemd unit runs the supervisor with
   `CMUX_TUI_REMOTE_WS_BIND=[::]:1337` — the beta API has no HTTP ingress to
   arbitrary ports, so the route is the VM's stable public IPv6 straight to
@@ -48,7 +46,7 @@ the daemon:
 
 Shells spawned by the daemon run as root with HOME=/root and get the bash
 devshell (ble.sh ghost text, half-life prompt, seeded history) through the
-`/etc/bash.bashrc` chain, exactly like Blaxel machines.
+`/etc/bash.bashrc` chain.
 
 ## Bake
 
@@ -67,7 +65,7 @@ Freestyle (beta) auth is `FREESTYLE_API_KEY`, or
 `FREESTYLE_STACK_ACCESS_TOKEN` + `FREESTYLE_TEAM_ID`; the argument is the
 snapshot slug (falls back to slugless on a collision) and the printed
 `sh-…` id is the pointer to pin. Agent pins live only in the Dockerfile ARG
-defaults; bump them together with `CMUX_IMAGE_EPOCH` and the Blaxel
+defaults; bump them together with `CMUX_IMAGE_EPOCH` and the chatmux
 template. The cmux-tui pin comes from the artifacts manifest at deploy time
 (`CMUX_VM_CMUX_TUI_MANIFEST_URL`), never from the image.
 
diff --git a/web/services/vms/images/devbox/agent-config.sh b/web/services/vms/images/devbox/agent-config.sh
index 6e330a393215..a1ff5e196bc7 100644
--- a/web/services/vms/images/devbox/agent-config.sh
+++ b/web/services/vms/images/devbox/agent-config.sh
@@ -1,5 +1,5 @@
 # cmux Cloud devbox agent config generator (/etc/cmux/agent-config.sh).
-# Parity sources: web/services/vms/images/blaxel/agent-config.sh (byte-identical
+# Parity sources: the chatmux devbox agent-config (byte-identical
 # body below the header; vm-devbox-image.test.ts pins it) and chatmux
 # infra/sandbox-images/agent-config.sh. Sourced from
 # /etc/profile.d/cmux-agents.sh (login/exec shells) and the bashrc chain
@@ -12,7 +12,7 @@
 # harness config is written only when missing, so a user who edits or
 # deletes one keeps control.
 #
-# Create-time envs are not replayed on every provider (Blaxel resurrect;
+# Create-time envs are not replayed on every provider (resurrect;
 # Freestyle has no VM-level create env at all), so shells that see the boot
 # env persist it 0600 on disk, and shells that do not re-source the
 # persisted copy. The persisted file always mirrors the newest boot env.
diff --git a/web/services/vms/images/devbox/cmux-bashrc b/web/services/vms/images/devbox/cmux-bashrc
index f91ad2c493f1..83511e7f3246 100644
--- a/web/services/vms/images/devbox/cmux-bashrc
+++ b/web/services/vms/images/devbox/cmux-bashrc
@@ -1,6 +1,6 @@
 # cmux Cloud devbox interactive shell setup (/etc/cmux/bashrc).
 # Sourced from /etc/bash.bashrc, /etc/skel/.bashrc, /root/.bashrc, and
-# /home/cmux/.bashrc. Parity sources: web/services/vms/images/blaxel/cmux-bashrc
+# /home/cmux/.bashrc.
 # (byte-identical body below the header; vm-devbox-image.test.ts pins it) and
 # chatmux infra/sandbox-images/devshell.bashrc.
 case $- in *i*) ;; *) return ;; esac
diff --git a/web/services/vms/images/manifest.json b/web/services/vms/images/manifest.json
index 381dd791deed..e726c6291bf4 100644
--- a/web/services/vms/images/manifest.json
+++ b/web/services/vms/images/manifest.json
@@ -25,30 +25,6 @@
       "validationStatus": "passed",
       "notes": "Known E2B template alias from local env examples."
     },
-    {
-      "provider": "freestyle",
-      "version": "freestyle-sc-mt237",
-      "imageId": "sc-mt237w1nd7c7673bd03m",
-      "envVar": "FREESTYLE_SANDBOX_SNAPSHOT",
-      "defaultForLocalDev": false,
-      "cmuxdRemoteCommit": "pre-manifest",
-      "builtAt": "2026-04-24T00:00:00.000Z",
-      "builderScriptVersion": "pre-manifest",
-      "validationStatus": "passed",
-      "notes": "Freestyle snapshot with cmuxd-remote WebSocket PTY/RPC, locale, sudo, and Python/OpenSSL fixes."
-    },
-    {
-      "provider": "freestyle",
-      "version": "freestyle-rpclease-20260502a",
-      "imageId": "sh-6ch5p9k23xrcx24056n8",
-      "envVar": "FREESTYLE_SANDBOX_SNAPSHOT",
-      "defaultForLocalDev": false,
-      "cmuxdRemoteCommit": "c678f473c3d606f697f2607a8216751023808394",
-      "builtAt": "2026-05-02T09:32:48.440Z",
-      "builderScriptVersion": "3b7bc6901346b7056dc8bcac7ef2ca4300ee1e2001fcbde5ebaaa443a0ed4e59",
-      "validationStatus": "passed",
-      "notes": "Validated Freestyle WebSocket PTY/RPC and browser proxy smoke. binarySha256=dd8867cf67131a10bf973d4a579938949d7ac5a1ebc3ea591b04ce1c8724705c"
-    },
     {
       "provider": "e2b",
       "version": "e2b-tooling-20260509d",
@@ -61,18 +37,6 @@
       "validationStatus": "passed",
       "notes": "Validated E2B WebSocket PTY/RPC image with baked cmux CLI, Node, Bun, Claude Code, OpenCode, Codex, and Pi. binarySha256=6e46feefcbf6a07ad98ceebd9c70a5d0444bcacadc9061458ab20c7a4999428f nodeMajor=22 agentTools=@anthropic-ai/claude-code,opencode-ai,@openai/codex,@earendil-works/pi-coding-agent"
     },
-    {
-      "provider": "freestyle",
-      "version": "freestyle-tooling-20260509d",
-      "imageId": "sh-17agfasevrc18c8f15nn",
-      "envVar": "FREESTYLE_SANDBOX_SNAPSHOT",
-      "defaultForLocalDev": false,
-      "cmuxdRemoteCommit": "1d8f4c3139fbced71ad8eb90736a51da0565e9ee",
-      "builtAt": "2026-05-09T04:19:44.920Z",
-      "builderScriptVersion": "ce14852d98e7da13597df486a4a7f2db46c2049d99a303d105f03ab4dd5f6d96",
-      "validationStatus": "passed",
-      "notes": "Validated Freestyle WebSocket PTY/RPC image with baked cmux CLI, Node, npm, Bun, Claude Code, OpenCode, Codex, Pi, Python SSL, and active cmuxd-ws service. binarySha256=6e46feefcbf6a07ad98ceebd9c70a5d0444bcacadc9061458ab20c7a4999428f nodeMajor=22 agentTools=@anthropic-ai/claude-code,opencode-ai,@openai/codex,@earendil-works/pi-coding-agent"
-    },
     {
       "provider": "e2b",
       "version": "e2b-tooling-20260509f",
@@ -91,45 +55,6 @@
       "validationStatus": "passed",
       "notes": "Validated E2B WebSocket PTY/RPC image with baked cmux CLI, Node, Bun, Claude Code, OpenCode, Codex, and Pi. binarySha256=fa1e8b7c107e0fd910740af16245aabcb0ab474590d69df5e646e343ad44206d nodeMajor=22 agentTools=@anthropic-ai/claude-code@2.1.137,opencode-ai@1.14.41,@openai/codex@0.130.0,@earendil-works/pi-coding-agent@0.74.0"
     },
-    {
-      "provider": "freestyle",
-      "version": "freestyle-tooling-20260509f",
-      "imageId": "sh-w2otfp1g287lzrpuc2gr",
-      "envVar": "FREESTYLE_SANDBOX_SNAPSHOT",
-      "defaultForLocalDev": false,
-      "cmuxdRemoteCommit": "f1e8ca2d1a3424f34966f815a2eae91164382fbf",
-      "builtAt": "2026-05-09T05:27:59.769Z",
-      "builderScriptVersion": "252a9efe757f773a64601e8fcc9978709c546738e217e9e454879a7181e13b21",
-      "agentToolResolvedVersions": {
-        "claude": "2.1.137",
-        "opencode": "1.14.41",
-        "codex": "0.130.0",
-        "pi": "0.74.0"
-      },
-      "validationStatus": "unknown",
-      "notes": "Validated Freestyle image internals with baked cmux CLI, active cmuxd-ws service, Node, npm, Bun, Claude Code, OpenCode, Codex, Pi, and Python SSL. External Freestyle domains returned provider 503 during smoke. binarySha256=fa1e8b7c107e0fd910740af16245aabcb0ab474590d69df5e646e343ad44206d nodeMajor=22 agentTools=@anthropic-ai/claude-code@2.1.137,opencode-ai@1.14.41,@openai/codex@0.130.0,@earendil-works/pi-coding-agent@0.74.0"
-    },
-    {
-      "provider": "freestyle",
-      "version": "freestyle-signedadmin-20260625b",
-      "imageId": "sh-b3jqa6o88qe6l738dw9z",
-      "envVar": "FREESTYLE_SANDBOX_SNAPSHOT",
-      "defaultForLocalDev": true,
-      "features": {
-        "bakedFreestyleSignedAdmin": true
-      },
-      "cmuxdRemoteCommit": "working-tree-signedadmin-20260625b",
-      "builtAt": "2026-06-25T08:20:00.000Z",
-      "builderScriptVersion": "working-tree-signedadmin-20260625b",
-      "agentToolResolvedVersions": {
-        "claude": "2.1.137",
-        "opencode": "1.14.41",
-        "codex": "0.130.0",
-        "pi": "0.74.0"
-      },
-      "validationStatus": "passed",
-      "notes": "Validated fresh Cloud VM boot from the 20260624 signed-admin base, rotated baked signed-admin public key over SSH because provider exec/write_file was unavailable, clean locked healthz before lease install, and signed /admin/leases success. Includes zsh defaults, gh, htop, btop, cmux CLI, Node, Bun, Claude Code, OpenCode, Codex, and Pi. binarySha256=066979bd77cf3a507e7eec8191ce1deb64fbf760154d6bd255c35c93f42d302f"
-    },
     {
       "provider": "daytona",
       "version": "daytona-ws-20260702-074420",
@@ -148,54 +73,6 @@
       "validationStatus": "passed",
       "notes": "Validated Daytona preview gate (healthz 401 without x-daytona-preview-token), WS PTY lease auth + single-use replay rejection, shell round trip, RPC hello + reusable lease, and RPC HTTP proxy to healthz. Region: shared us (runner in Corona, CA). binarySha256=d7d2a6b1ef9080ae0deadca3ced6fefbb4aeb88292d136b31bd0ea0784c01461 nodeMajor=22 agentTools=@anthropic-ai/claude-code@2.1.137,opencode-ai@1.14.41,@openai/codex@0.130.0,@earendil-works/pi-coding-agent@0.74.0"
     },
-    {
-      "provider": "blaxel",
-      "version": "blaxel-cmux-devbox-20260831b",
-      "imageId": "sandbox/cmux-devbox:latest",
-      "envVar": "BLAXEL_SANDBOX_IMAGE",
-      "defaultForLocalDev": true,
-      "kind": "desktop",
-      "defaultForKind": true,
-      "cmuxdRemoteCommit": "none-cmux-tui",
-      "builtAt": "2026-09-01T01:40:00.000Z",
-      "builderScriptVersion": "cmux-devbox-2026-08-31-r12",
-      "agentToolResolvedVersions": {
-        "@anthropic-ai/claude-code": "2.1.246",
-        "@openai/codex": "0.150.0",
-        "opencode-ai": "1.18.23",
-        "@earendil-works/pi-coding-agent": "0.84.3",
-        "agent-browser": "0.35.1"
-      },
-      "validationStatus": "passed",
-      "notes": "Baked cmux machine image (services/vms/images/blaxel, deployed with web/scripts/build-blaxel-image.sh): chatmux-devbox tool parity (mise node/python/bun, uv, gh, devtools, pinned coding agents, ble.sh ghost text, half-life prompt, seeded history) plus an openbox/TigerVNC desktop with Ghostty, Chrome, Thunar, and noVNC on 6901. Keeps the stock desktop driver contract: start-vnc.sh as user cua, RFB 5901. /etc/cmux/image-stamp makes the driver skip create-time provisioning. The session daemon is not baked: the driver installs the pinned cmux-tui build at create time exactly as on stock images. Validated 2026-08-26 on tag bb86c85e4ea70d04351d5 (epoch r6) in us-pdx-1: driver E2E on the cmux-tui transport (create, cmux-tui install, cmux-remote route upgrade, enrollment, smart-sleep watcher), agents/toolchain/Ghostty/Chrome versions, half-life prompt + seeded history, 5901+6901 listening, noVNC through a tokened gateway preview, and screenshots showing the wallpaper, the Chrome/Files/Ghostty dock, Chrome opening straight to DuckDuckGo with first run pre-accepted, and Ghostty rendering with the prompt. Blaxel's deploy-time rootfs slimming strips /usr/share/applications and raster icon themes, so dock launchers and icons bake under /etc/cmux. r7 (2026-08-27, digest sandbox/cmux-devbox:b3c3cdc9cfe048515743e): the tint2 dock paints again (panel background defined before it is referenced); wallpaper re-fills on noVNC remote resize. r12 (2026-08-31, digest sandbox/cmux-devbox:b62efe3f7ab023c5be1e8): non-root terminals plus the r11 ble.sh tput cache seeds — bakes the cmux work user (uid 1001) with NOPASSWD sudo plus the sudo and bindfs packages; the driver mounts the home volume at /cmux/home and bindfs presents it at /home/cmux (the volume's virtiofs squashes guest identity to root, so the view is what makes a non-root home possible), and the tput cache.d seeds cover uids 0/1000/1001. Validated 2026-08-31 with the new driver on volume-backed machines: image-stamp r12, /home/cmux is the fuse view over the virtiofs backing, daemon process runs as cmux, write/rewrite as cmux persists to the volume backing, sudo -n whoami returns root, claude --dangerously-skip-permissions launches to the login prompt instead of refusing, and the first interactive shell prints zero tput-cache lines."
-    },
-    {
-      "provider": "blaxel",
-      "version": "blaxel-bootstrap-20260820a",
-      "imageId": "blaxel/xfce-vnc:latest",
-      "envVar": "BLAXEL_SANDBOX_IMAGE",
-      "defaultForLocalDev": false,
-      "kind": "desktop",
-      "cmuxdRemoteCommit": "none-cmux-tui",
-      "builtAt": "2026-08-20T04:30:00.000Z",
-      "builderScriptVersion": "bootstrap-on-create",
-      "validationStatus": "passed",
-      "notes": "Stock Blaxel xfce + TigerVNC/noVNC image (a machine comes with its screen; `cmux vm new --base` picks blaxel/base-image:latest explicitly). No cmuxd-remote: at create time the sandbox installs the pinned cmux-tui build from the artifacts manifest onto its persistent home volume and the supervisor runs `cmux-tui server start --remote-ws 0.0.0.0:1337`, so no baked template is required. Validated cmux-remote attach (route + enrollment), exec, private preview URL + minted preview token, and standby/wake process preservation in us-pdx-1."
-    },
-    {
-      "provider": "blaxel",
-      "version": "blaxel-base-bootstrap-20260824a",
-      "imageId": "blaxel/base-image:latest",
-      "envVar": "BLAXEL_SANDBOX_IMAGE",
-      "defaultForLocalDev": false,
-      "cmuxdRemoteCommit": "none-cmux-tui",
-      "builtAt": "2026-08-24T23:07:01.000Z",
-      "builderScriptVersion": "bootstrap-on-create",
-      "validationStatus": "passed",
-      "notes": "Stock Blaxel Alpine shell image, no desktop; `cmux vm new --base` and `vm run` pool provisioning send this id explicitly. Nothing is baked: the driver bootstraps every image at create time, installing the pinned cmux-tui build onto the persistent home volume (the installer adds curl via apk first, since the stock image ships without it). Validated live in #10478 in us-pdx-1: create + bootstrap, cmux-remote attach (route + enrollment), exec, and standby/wake process preservation. Listed so deployed runtimes accept the id the CLI sends; it was missing from the manifest between #10478 and this entry, so `vm new --base` failed closed in production.",
-      "kind": "base",
-      "defaultForKind": true
-    },
     {
       "provider": "e2b",
       "version": "e2b-devbox-20260828b",
@@ -214,7 +91,7 @@
         "agent-browser": "0.35.1"
       },
       "validationStatus": "passed",
-      "notes": "Shared devbox image (services/vms/images/devbox) at epoch 2026-08-28-r1 (#11099: agent-config also wires pi models.json and the opencode config fetch to the coderouter model plane), cmux-tui transport. Supersedes cmux-devbox:devbox-20260828a. Baked with build-devbox-e2b.ts (templateId 3fktz2o6rxgms895lclw). Validated 2026-08-28 with verify-devbox-image.ts against cmux-tui pin fa77ad23364aa12993644b357b425513d61ca632: pinned agents, mise toolchain, devtools, Chrome + DuckDuckGo managed policy, cua-driver, ffmpeg/Xvfb, byte-identical baked files, ble.sh ghost text under a tmux PTY, agent-config generator (codex custom provider + pi models.json with the x-coderouter-route-token env reference and no literal token; no opencode.json when the config endpoint is unreachable), cmux-tui install + daemon serving session cloud on 1337. Inbound firewall proven live again: after the driver's default-deny INPUT (allow lo/established/icmp + envd 49983 + cmux-tui 1337) envd control and 1337 stayed reachable while a scratch dev server on 4820 was reachable before and blocked after. Not the default provider; Blaxel stays default."
+      "notes": "Shared devbox image (services/vms/images/devbox) at epoch 2026-08-28-r1 (#11099: agent-config also wires pi models.json and the opencode config fetch to the coderouter model plane), cmux-tui transport. Supersedes cmux-devbox:devbox-20260828a. Baked with build-devbox-e2b.ts (templateId 3fktz2o6rxgms895lclw). Validated 2026-08-28 with verify-devbox-image.ts against cmux-tui pin fa77ad23364aa12993644b357b425513d61ca632: pinned agents, mise toolchain, devtools, Chrome + DuckDuckGo managed policy, cua-driver, ffmpeg/Xvfb, byte-identical baked files, ble.sh ghost text under a tmux PTY, agent-config generator (codex custom provider + pi models.json with the x-coderouter-route-token env reference and no literal token; no opencode.json when the config endpoint is unreachable), cmux-tui install + daemon serving session cloud on 1337. Inbound firewall proven live again: after the driver's default-deny INPUT (allow lo/established/icmp + envd 49983 + cmux-tui 1337) envd control and 1337 stayed reachable while a scratch dev server on 4820 was reachable before and blocked after. Not the default provider; Freestyle stays default."
     },
     {
       "provider": "daytona",
@@ -234,7 +111,7 @@
         "agent-browser": "0.35.1"
       },
       "validationStatus": "passed",
-      "notes": "Shared devbox image (services/vms/images/devbox) at epoch 2026-08-28-r1 (#11099: agent-config also wires pi models.json and the opencode config fetch to the coderouter model plane), cmux-tui transport. Supersedes cmux-devbox-20260828a. Baked fresh (never trusting Daytona's layer cache) with build-devbox-daytona.ts; the cmux-devbox-boot supervisor is the registered snapshot entrypoint (Daytona stop kills processes, start re-runs it). Validated 2026-08-28 with verify-devbox-image.ts against cmux-tui pin fa77ad23364aa12993644b357b425513d61ca632: pinned agents, mise toolchain, devtools, Chrome + DuckDuckGo managed policy, cua-driver, ffmpeg/Xvfb, byte-identical baked files, ble.sh ghost text under a tmux PTY, agent-config generator (codex custom provider + pi models.json with the x-coderouter-route-token env reference and no literal token; no opencode.json when the config endpoint is unreachable), cmux-tui install + daemon serving session cloud on 1337 through the entrypoint supervisor, and the preview proxy route with the DAYTONA_SANDBOX_AUTH_KEY query token. Region shared us. Not the default provider; Blaxel stays default."
+      "notes": "Shared devbox image (services/vms/images/devbox) at epoch 2026-08-28-r1 (#11099: agent-config also wires pi models.json and the opencode config fetch to the coderouter model plane), cmux-tui transport. Supersedes cmux-devbox-20260828a. Baked fresh (never trusting Daytona's layer cache) with build-devbox-daytona.ts; the cmux-devbox-boot supervisor is the registered snapshot entrypoint (Daytona stop kills processes, start re-runs it). Validated 2026-08-28 with verify-devbox-image.ts against cmux-tui pin fa77ad23364aa12993644b357b425513d61ca632: pinned agents, mise toolchain, devtools, Chrome + DuckDuckGo managed policy, cua-driver, ffmpeg/Xvfb, byte-identical baked files, ble.sh ghost text under a tmux PTY, agent-config generator (codex custom provider + pi models.json with the x-coderouter-route-token env reference and no literal token; no opencode.json when the config endpoint is unreachable), cmux-tui install + daemon serving session cloud on 1337 through the entrypoint supervisor, and the preview proxy route with the DAYTONA_SANDBOX_AUTH_KEY query token. Region shared us. Not the default provider; Freestyle stays default."
     },
     {
       "provider": "freestyle",
@@ -242,9 +119,6 @@
       "imageId": "sh-fb3dcf7b47894114889b10186626af5b",
       "envVar": "FREESTYLE_SANDBOX_SNAPSHOT",
       "defaultForLocalDev": false,
-      "features": {
-        "freestylePlatform": "beta"
-      },
       "cmuxdRemoteCommit": "none-cmux-tui",
       "builtAt": "2026-08-28T10:35:57.736Z",
       "builderScriptVersion": "6e40d373a9e25289770d1bfbfc515becafbd905f3b448741df4cc4ea2f2c6cd1",
@@ -255,8 +129,8 @@
         "@earendil-works/pi-coding-agent": "0.84.3",
         "agent-browser": "0.35.1"
       },
-      "validationStatus": "passed",
-      "notes": "cmux devbox epoch 2026-08-28-r1 on the Freestyle BETA platform (beta-api.freestyle.sh; slug cmux-devbox-beta1). cmux-tui transport over the VM public IPv6; systemd unit binds [::]:1337. verify-devbox-image.ts passed all toolchain, agent-pin, ghost-text, baked-file, and daemon checks 2026-08-28. Requires the beta driver arm; the legacy driver cannot boot it."
+      "validationStatus": "unknown",
+      "notes": "cmux devbox epoch 2026-08-28-r1, baked on the retired beta-api.freestyle.sh endpoint (slug cmux-devbox-beta1). NOT VALID on the public platform (api.freestyle.sh): re-bake with scripts/build-devbox-freestyle.ts and record the new snapshot id before setting FREESTYLE_SANDBOX_SNAPSHOT. cmux-tui transport over the VM public IPv6; systemd unit binds [::]:1337."
     }
   ]
 }
diff --git a/web/services/vms/images/resolver.ts b/web/services/vms/images/resolver.ts
index 2166703b950a..aa156548c8a2 100644
--- a/web/services/vms/images/resolver.ts
+++ b/web/services/vms/images/resolver.ts
@@ -25,14 +25,6 @@ export type VmImageManifestEntry = {
   readonly kind?: VmImageKind;
   /** The manifest default for `kind` when neither the client nor the env picks an image. */
   readonly defaultForKind?: boolean;
-  readonly features?: {
-    readonly bakedFreestyleSignedAdmin?: boolean;
-    /**
-     * The image lives on the Freestyle BETA platform (beta-api.freestyle.sh);
-     * the freestyle driver dispatches creates from it to the beta arm.
-     */
-    readonly freestylePlatform?: "beta";
-  };
   readonly cmuxdRemoteCommit: string;
   readonly builtAt: string;
   readonly builderScriptVersion: string;
@@ -60,7 +52,7 @@ const typedManifest = manifest as {
 
 /**
  * Env var that selects the provider's image. Desktop images get their own
- * `_DESKTOP_IMAGE` selector (today only blaxel ships desktop images); providers
+ * `_DESKTOP_IMAGE` selector (no provider ships a desktop image today); providers
  * with a single template/snapshot variable use it for both kinds.
  */
 export function providerImageEnvKey(provider: ProviderId, kind?: VmImageKind): string {
@@ -79,8 +71,6 @@ function providerBaseImageEnvKey(provider: ProviderId): string {
       return "FREESTYLE_SANDBOX_SNAPSHOT";
     case "daytona":
       return "DAYTONA_SANDBOX_SNAPSHOT";
-    case "blaxel":
-      return "BLAXEL_SANDBOX_IMAGE";
     default:
       return assertNever(provider);
   }
@@ -161,18 +151,6 @@ export function inferVmProviderForImage(requestedImage: string | undefined): Pro
   return [...providers][0] ?? null;
 }
 
-export function imageUsesBakedFreestyleSignedAdmin(provider: ProviderId, imageId: string): boolean {
-  const entry = typedManifest.images.find((candidate) =>
-    candidate.provider === provider && candidate.imageId === imageId
-  );
-  return entry?.features?.bakedFreestyleSignedAdmin === true;
-}
-
-/** Whether an image id or version names a Freestyle BETA platform image (see `features.freestylePlatform`). */
-export function imageUsesFreestyleBetaPlatform(provider: ProviderId, image: string): boolean {
-  return findVmImageManifestEntry(provider, image)?.features?.freestylePlatform === "beta";
-}
-
 /**
  * Resolution order:
  *  1. an explicit `requestedImage` (must be in the manifest unless unmanifested images are allowed);
@@ -257,7 +235,7 @@ function resolveByKind(
 ): VmImageSelection {
   // The kind-specific selector is unset. The provider's generic selector still
   // counts when the image it names is of the requested kind (e.g. a deployment
-  // whose BLAXEL_SANDBOX_IMAGE already names a desktop image).
+  // whose FREESTYLE_SANDBOX_SNAPSHOT already names a desktop image).
   const genericEnvVar = providerImageEnvKey(provider);
   if (genericEnvVar !== envVar) {
     const generic = env[genericEnvVar]?.trim();
diff --git a/web/services/vms/reaper.ts b/web/services/vms/reaper.ts
index b787d91396a2..60d9d15f00c1 100644
--- a/web/services/vms/reaper.ts
+++ b/web/services/vms/reaper.ts
@@ -1,8 +1,10 @@
 import * as Effect from "effect/Effect";
-import type {
-  VMVolume,
-  VMVolumeInventory,
-  VMVolumePage,
+import {
+  volumeCapableProviderId,
+  type ProviderId,
+  type VMVolume,
+  type VMVolumeInventory,
+  type VMVolumePage,
 } from "./drivers";
 import { VmProviderGateway, type VmProviderGatewayShape } from "./providerGateway";
 import {
@@ -87,6 +89,13 @@ export type VmReaperOptions = {
   readonly provisioningLimit?: number;
   /** Age threshold in milliseconds. */
   readonly stuckProvisioningAgeMs?: number;
+  /**
+   * Provider whose persistent home volumes are scanned. Defaults to the first
+   * registered driver exposing a volume inventory — none today, which makes the
+   * orphan-volume scan a no-op reporting partial coverage. Tests inject one to
+   * exercise the scan against a stub gateway.
+   */
+  readonly volumeProvider?: ProviderId;
   readonly env?: Record<string, string | undefined>;
 };
 
@@ -186,6 +195,7 @@ export function reapVmResources(
       scanLimit: volumeScanLimit,
       now,
       minAgeMs: volumeMinAgeMs,
+      provider: input.volumeProvider ?? volumeCapableProviderId(),
     });
 
     const orphan = summary.orphanVolumes;
@@ -278,10 +288,12 @@ function reportOrphanVolumes(
     readonly scanLimit: number;
     readonly now: Date;
     readonly minAgeMs: number;
+    readonly provider: ProviderId | null;
   },
 ): Effect.Effect<void, never> {
   const listVolumes = providers.listVolumes;
-  if (!listVolumes) {
+  const volumeProvider = input.provider;
+  if (!listVolumes || !volumeProvider) {
     summary.orphanVolumes.coveragePartial = true;
     return Effect.void;
   }
@@ -320,7 +332,7 @@ function reportOrphanVolumes(
         1_000,
         VM_REAPER_SCAN_DEADLINE_MS - (Date.now() - scanStartedAtMs),
       );
-      const listed = yield* listVolumes("blaxel", {
+      const listed = yield* listVolumes(volumeProvider, {
         limit: requestLimit,
         ...(cursor ? { cursor } : {}),
       }).pipe(
@@ -349,6 +361,7 @@ function reportOrphanVolumes(
 
       const pageReport = yield* reportVolumePage(
         repo,
+        volumeProvider,
         summary,
         selected,
         input.limit,
@@ -404,6 +417,7 @@ function reportOrphanVolumes(
 
 function reportVolumePage(
   repo: VmRepositoryShape,
+  volumeProvider: ProviderId,
   summary: MutableSummary,
   volumes: readonly VMVolume[],
   candidateLimit: number,
@@ -455,7 +469,7 @@ function reportVolumePage(
           });
           continue;
         }
-        const recorded = yield* recordSystemUsageEvent(repo, ORPHAN_VOLUME_UNKNOWN_ATTACHMENT_EVENT, {
+        const recorded = yield* recordSystemUsageEvent(repo, volumeProvider, ORPHAN_VOLUME_UNKNOWN_ATTACHMENT_EVENT, {
           source: "vm_reaper",
           mode: "report",
           action: "report",
@@ -474,6 +488,7 @@ function reportVolumePage(
 
     const liveReferences = yield* loadLiveReferences(
       repo,
+      volumeProvider,
       free.map(({ name }) => name),
       summary,
     );
@@ -497,7 +512,7 @@ function reportVolumePage(
           });
           continue;
         }
-        const recorded = yield* recordSystemUsageEvent(repo, ORPHAN_VOLUME_UNKNOWN_REFERENCE_EVENT, {
+        const recorded = yield* recordSystemUsageEvent(repo, volumeProvider, ORPHAN_VOLUME_UNKNOWN_REFERENCE_EVENT, {
           source: "vm_reaper",
           mode: "report",
           action: "report",
@@ -562,7 +577,7 @@ function reportVolumePage(
         continue;
       }
       summary.orphanVolumes.candidates += 1;
-      const recorded = yield* recordSystemUsageEvent(repo, ORPHAN_VOLUME_EVENT, {
+      const recorded = yield* recordSystemUsageEvent(repo, volumeProvider, ORPHAN_VOLUME_EVENT, {
         source: "vm_reaper",
         mode: "report",
         action: "report",
@@ -609,6 +624,7 @@ function loadRecentReaperReportKeys(
 
 function loadLiveReferences(
   repo: VmRepositoryShape,
+  provider: ProviderId,
   names: readonly string[],
   summary: MutableSummary,
 ): Effect.Effect<Set<string> | null, never> {
@@ -617,7 +633,7 @@ function loadLiveReferences(
     console.error("[VM] reaper cannot verify live volume references");
     return Effect.succeed(null);
   }
-  return repo.listLiveHomeVolumeNames({ provider: "blaxel", volumeNames: names }).pipe(
+  return repo.listLiveHomeVolumeNames({ provider, volumeNames: names }).pipe(
     Effect.map((liveNames) => new Set(liveNames.map((name) => name.trim()).filter(Boolean))),
     Effect.catchAll((error) => Effect.sync(() => {
       summary.orphanVolumes.errors += 1;
@@ -657,6 +673,7 @@ function recordVmUsageEvent(
 
 function recordSystemUsageEvent(
   repo: VmRepositoryShape,
+  provider: ProviderId,
   eventType: string,
   metadata: Record<string, unknown>,
 ): Effect.Effect<boolean, never> {
@@ -665,7 +682,7 @@ function recordSystemUsageEvent(
     billingTeamId: null,
     billingPlanId: null,
     eventType,
-    provider: "blaxel",
+    provider,
     metadata,
   }).pipe(
     Effect.as(true),
diff --git a/web/services/vms/routeHelpers.ts b/web/services/vms/routeHelpers.ts
index 2a33cb374acc..de6c1727587e 100644
--- a/web/services/vms/routeHelpers.ts
+++ b/web/services/vms/routeHelpers.ts
@@ -536,7 +536,7 @@ export async function vmWorkflowErrorResponse(
     const providerCause = providerCauseSummary(workflowError.cause);
     const phase = vmPhaseForOperation(workflowError.operation);
     if (providerImageNotFound(workflowError.cause)) {
-      // The provider rejected the resolved image (e.g. Blaxel IMAGE_NOT_FOUND):
+      // The provider rejected the resolved image (e.g. a provider IMAGE_NOT_FOUND):
       // nothing was created and retrying cannot help until an operator
       // publishes the image, so this is configuration, not availability.
       console.error(
@@ -565,31 +565,18 @@ export async function vmWorkflowErrorResponse(
         },
       });
     }
-    const retryExhausted = providerRetryExhausted(workflowError.cause);
-    if (retryExhausted) {
-      // Keep the provider and operation in operator logs only. The response
-      // below deliberately contains no URL, status, or upstream body.
-      console.error("[vm-provider-retry-exhausted]", {
-        provider: workflowError.provider,
-        operation: workflowError.operation,
-      });
-    }
     const retryAfterSeconds = retryAfterForOperation(workflowError.operation);
-    const providerMessage = !retryExhausted && providerCause?.message
+    const providerMessage = providerCause?.message
       ? sanitizedProviderMessage(providerCause.message)
       : null;
-    const providerCode = retryExhausted
-      ? "provider_retry_exhausted"
-      : providerCause?.code
-        ? sanitizedProviderCode(providerCause.code)
-        : inferredProviderCode(providerMessage);
+    const providerCode = providerCause?.code
+      ? sanitizedProviderCode(providerCause.code)
+      : inferredProviderCode(providerMessage);
     return vmErrorResponse({
       error: "vm_cloud_service_unavailable",
       status: 502,
       message: vmUnavailableMessage(phase),
-      reason: retryExhausted
-        ? "The Cloud VM service is temporarily unavailable."
-        : providerMessage
+      reason: providerMessage
         ? `Cloud VM service is temporarily unavailable: ${providerMessage}`
         : "Cloud VM service is temporarily unavailable.",
       action: cloudServiceAction(workflowError.operation, retryAfterSeconds),
@@ -669,17 +656,6 @@ async function vmUnsupportedOperationResponse(
   });
 }
 
-/** Identify a retry wrapper whose provider details must stay in operator logs. */
-function providerRetryExhausted(cause: unknown): boolean {
-  let current: unknown = cause;
-  for (let depth = 0; depth < 8 && current; depth += 1) {
-    const record = current as { name?: unknown; cause?: unknown };
-    if (record.name === "BlaxelRetryExhaustedError") return true;
-    current = record.cause;
-  }
-  return false;
-}
-
 /** True when the provider reported that the requested image/template does not exist. */
 function providerImageNotFound(cause: unknown): boolean {
   let current: unknown = cause;
@@ -687,8 +663,10 @@ function providerImageNotFound(cause: unknown): boolean {
     const record = current as { body?: { code?: unknown }; cause?: unknown; message?: unknown };
     const code = typeof record.body?.code === "string" ? record.body.code : "";
     const message = typeof record.message === "string" ? record.message : "";
-    if (/IMAGE_NOT_FOUND|TEMPLATE_NOT_FOUND/i.test(code)) return true;
-    if (/IMAGE_NOT_FOUND|TEMPLATE_NOT_FOUND|(image|template)\s+'[^']*'\s+not found|(image|template) not found/i.test(message)) {
+    // Freestyle resolves an image to a SNAPSHOT id, so its missing-image
+    // answer is a snapshot 404, not an IMAGE_NOT_FOUND code.
+    if (/IMAGE_NOT_FOUND|TEMPLATE_NOT_FOUND|SNAPSHOT_NOT_FOUND/i.test(code)) return true;
+    if (/IMAGE_NOT_FOUND|TEMPLATE_NOT_FOUND|SNAPSHOT_NOT_FOUND|(image|template|snapshot)\s+'[^']*'\s+not found|(image|template|snapshot) not found/i.test(message)) {
       return true;
     }
     current = record.cause;
diff --git a/web/services/vms/workflows.ts b/web/services/vms/workflows.ts
index b1e24b49d68e..315b2df8e47c 100644
--- a/web/services/vms/workflows.ts
+++ b/web/services/vms/workflows.ts
@@ -300,7 +300,6 @@ export function createVm(input: {
   readonly image: string;
   readonly imageVersion?: string | null;
   readonly idempotencyKey?: string;
-  readonly bakedFreestyleSignedAdmin?: boolean;
   /**
    * "Your computer" semantics: mount a per-user persistent volume as the machine's home so
    * the sandbox is disposable compute around durable data. The volume name is derived from
@@ -357,7 +356,6 @@ export function createVm(input: {
       providers.create(input.provider, {
         image: input.image,
         providerMetadata: create.vm.providerMetadata,
-        bakedFreestyleSignedAdmin: input.bakedFreestyleSignedAdmin,
         homeVolume: input.perMachineHome
           ? homeVolumeTemplateForUser(input.userId)
           : input.persistentHome
@@ -441,7 +439,6 @@ export function openBaseVm(input: {
   readonly image: string;
   readonly imageVersion?: string | null;
   readonly baseName?: string;
-  readonly bakedFreestyleSignedAdmin?: boolean;
   readonly timing?: VmTimingSink;
 }): Effect.Effect<BaseVmEntry, VmWorkflowError, VmRepository | VmProviderGateway | VmBillingGateway> {
   return Effect.gen(function* () {
@@ -468,7 +465,6 @@ export function resetBaseVm(input: {
   readonly imageVersion?: string | null;
   readonly baseName?: string;
   readonly reason?: string | null;
-  readonly bakedFreestyleSignedAdmin?: boolean;
   readonly timing?: VmTimingSink;
 }): Effect.Effect<BaseVmEntry, VmWorkflowError, VmRepository | VmProviderGateway | VmBillingGateway> {
   return Effect.gen(function* () {
@@ -498,8 +494,7 @@ function finishBaseCreate(
     readonly image: string;
     readonly imageVersion?: string | null;
     readonly baseName?: string;
-    readonly bakedFreestyleSignedAdmin?: boolean;
-    readonly timing?: VmTimingSink;
+      readonly timing?: VmTimingSink;
   },
   create: BeginBaseCreateResult,
 ): Effect.Effect<BaseVmEntry, VmWorkflowError, never> {
@@ -550,7 +545,6 @@ function finishBaseCreate(
       providers.create(input.provider, {
         image: input.image,
         providerMetadata: create.vm.providerMetadata,
-        bakedFreestyleSignedAdmin: input.bakedFreestyleSignedAdmin,
       }),
     ).pipe(
       Effect.tapError((err) =>
@@ -758,7 +752,6 @@ export function restoreVm(input: {
       image: input.snapshotId,
       imageVersion: null,
       idempotencyKey: input.idempotencyKey,
-      bakedFreestyleSignedAdmin: false,
       timing: input.timing,
     });
   });
@@ -1023,7 +1016,7 @@ function refreshActiveLimitProviderStatuses(
       if (!providerVmId) return Effect.void;
       // Provider-agnostic on purpose: the cron reconcile path already refreshes
       // every provider, and this lazy refresh used to skip everything except
-      // Freestyle, so a stale `running` row blocked Blaxel creates for up to a
+      // Freestyle, so a stale `running` row blocked creates for up to a
       // full cron interval. Candidates are `running` rows only, so the
       // gateway's "running" fallback for a driver without getStatus is a
       // harmless no-op rather than a wrong transition.
@@ -1736,7 +1729,7 @@ export function openVmPort(input: {
 }
 
 /**
- * Attach through the cmux-tui remote daemon — the only session transport on Blaxel
+ * Attach through the cmux-tui remote daemon — the only session transport on
  * machines (other providers still serve the legacy websocket/SSH attach). The ingress
  * token lands in the same lease ledger as previews so sign-out revokes it; session
  * auth is the daemon's device enrollment, which the client completes with
@@ -1952,7 +1945,7 @@ function openAttachEndpointResult(input: OpenAttachEndpointInput) {
     const repo = yield* VmRepository;
     const providers = yield* VmProviderGateway;
     const vm = yield* requireAccessibleUserVm(input);
-    // A provider that only runs the cmux-tui daemon (Blaxel) cannot serve the legacy
+    // A provider that only runs the cmux-tui daemon cannot serve the legacy
     // websocket/SSH attach at all; say so before waking or mutating anything.
     const supportedTransports = providers.attachTransports?.(vm.provider);
     if (supportedTransports && !supportedTransports.some((t) => t === "websocket" || t === "ssh")) {
@@ -2022,49 +2015,6 @@ function openAttachEndpointResult(input: OpenAttachEndpointInput) {
   });
 }
 
-export function openSshEndpoint(input: {
-  readonly userId: string;
-  readonly billingTeamId?: string | null;
-  readonly teamIds?: readonly string[];
-  readonly providerVmId: string;
-  /** Caller's CURRENT billing plan; used for the free access window. */
-  readonly callerPlanId?: string | null;
-}) {
-  return Effect.gen(function* () {
-    const repo = yield* VmRepository;
-    const providers = yield* VmProviderGateway;
-    const vm = yield* requireAccessibleUserVm(input);
-    yield* preflightResumeIfSuspended(repo, providers, vm, input.providerVmId, "ssh");
-    yield* revokeActiveIdentities(vm, { failOnCleanupError: true });
-    const endpoint = yield* withResumeOnSuspendedAfterFailure(
-      repo,
-      providers,
-      vm,
-      input.providerVmId,
-      "ssh",
-      providers.openSSH(vm.provider, input.providerVmId),
-    );
-    yield* storeEndpointLeases(vm, endpoint).pipe(
-      Effect.catchAll((err) =>
-        revokeEndpointIdentity(vm.provider, endpoint).pipe(
-          Effect.andThen(Effect.fail(err)),
-        ),
-      ),
-    );
-    yield* repo.recordUsageEvent({
-      userId: input.userId,
-      billingTeamId: vm.billingTeamId,
-      billingPlanId: vm.billingPlanId,
-      vmId: vm.id,
-      eventType: "vm.ssh_endpoint",
-      provider: vm.provider,
-      imageId: vm.imageId,
-      metadata: { credentialKind: endpoint.credential.kind },
-    }).pipe(Effect.catchAll(() => Effect.void));
-    return endpoint;
-  });
-}
-
 /// Access-verb variant of requireUserVm: a free-plan machine older than the
 /// free access window is preserved but unreachable until the caller upgrades.
 /// List/status/rename/delete deliberately keep using requireUserVm so the
diff --git a/web/tests/cloud-vm-env-audit.test.ts b/web/tests/cloud-vm-env-audit.test.ts
index 9276a2eab608..e6e0c64a3391 100644
--- a/web/tests/cloud-vm-env-audit.test.ts
+++ b/web/tests/cloud-vm-env-audit.test.ts
@@ -50,63 +50,63 @@ const realManifest = JSON.parse(
 ) as Manifest;
 
 describe("cloud VM provider coherence audit", () => {
-  test("the exact 2026-08-26 production env fails on the code-default leg", () => {
-    // Prod state during the outage: a fully coherent freestyle default, while
-    // shipped CLIs hardcode blaxel image ids and no blaxel env existed. The
-    // old key-presence audit passed this env.
+  test("an env default that is not the code default fails on the code-default leg", () => {
+    // The 2026-08-26 outage shape: a fully coherent env default for one
+    // provider, while shipped clients send the code default's image ids and no
+    // env existed for it. The old key-presence audit passed this env.
     const result = auditCloudVmProviderCoherence(
       {
-        CMUX_VM_DEFAULT_PROVIDER: "freestyle",
-        FREESTYLE_SANDBOX_SNAPSHOT: "sh-17agfasevrc18c8f15nn",
-        FREESTYLE_API_KEY: "x",
-        BL_API_KEY: "x",
-        BL_WORKSPACE: "manaflow",
+        CMUX_VM_DEFAULT_PROVIDER: "e2b",
+        E2B_CMUXD_WS_TEMPLATE: "cmuxd-ws:tooling-20260509f",
+        E2B_API_KEY: "x",
       },
       realManifest,
     ) as Coherence;
-    expect(result.selected?.provider).toBe("freestyle");
-    expect(result.codeDefault?.provider).toBe("blaxel");
-    expect(result.problems.join("\n")).toContain("BLAXEL_SANDBOX_IMAGE is not set");
+    expect(result.selected?.provider).toBe("e2b");
+    expect(result.codeDefault?.provider).toBe("freestyle");
+    expect(result.problems.join("\n")).toContain("FREESTYLE_SANDBOX_SNAPSHOT is not set");
   });
 
-  test("no default provider set means the code default (blaxel) must be ready", () => {
+  test("no default provider set means the code default (freestyle) must be ready", () => {
     const result = auditCloudVmProviderCoherence(
-      { FREESTYLE_SANDBOX_SNAPSHOT: "sh-17agfasevrc18c8f15nn", FREESTYLE_API_KEY: "x" },
+      { E2B_CMUXD_WS_TEMPLATE: "cmuxd-ws:tooling-20260509f", E2B_API_KEY: "x" },
       realManifest,
     ) as Coherence;
-    expect(result.selected?.provider).toBe("blaxel");
+    expect(result.selected?.provider).toBe("freestyle");
     expect(result.codeDefault).toBeNull();
-    expect(result.problems.join("\n")).toContain("BLAXEL_SANDBOX_IMAGE is not set");
-    expect(result.problems.join("\n")).toContain("BL_API_KEY");
+    expect(result.problems.join("\n")).toContain("FREESTYLE_SANDBOX_SNAPSHOT is not set");
+    expect(result.problems.join("\n")).toContain("FREESTYLE_API_KEY");
   });
 
-  test("a coherent blaxel production env passes", () => {
+  test("the freestyle devbox snapshot is not deployable until it is re-baked on the public platform", () => {
+    // The only freestyle manifest entry was baked against the retired
+    // beta-api.freestyle.sh endpoint and carries validationStatus "unknown".
+    // The audit must keep failing until a public-platform bake replaces it, so
+    // nobody ships a default provider that cannot boot a machine.
     const result = auditCloudVmProviderCoherence(
       {
-        CMUX_VM_DEFAULT_PROVIDER: "blaxel",
-        BLAXEL_SANDBOX_IMAGE: "sandbox/cmux-devbox:latest",
-        BL_API_KEY: "x",
-        BL_WORKSPACE: "manaflow",
+        CMUX_VM_DEFAULT_PROVIDER: "freestyle",
+        FREESTYLE_SANDBOX_SNAPSHOT: "sh-fb3dcf7b47894114889b10186626af5b",
+        FREESTYLE_API_KEY: "x",
       },
       realManifest,
     ) as Coherence;
-    expect(result.selected?.provider).toBe("blaxel");
-    expect(result.codeDefault).toBeNull();
-    expect(result.problems).toEqual([]);
+    expect(result.selected?.provider).toBe("freestyle");
+    expect(result.problems.join("\n")).toContain("validationStatus");
   });
 
-  test("a deliberate freestyle rollback passes only with blaxel still provisionable", () => {
+  test("a coherent e2b rollback passes only with the code default still provisionable", () => {
     const rollbackEnv = {
-      CMUX_VM_DEFAULT_PROVIDER: "freestyle",
-      FREESTYLE_SANDBOX_SNAPSHOT: "sh-17agfasevrc18c8f15nn",
+      CMUX_VM_DEFAULT_PROVIDER: "e2b",
+      E2B_CMUXD_WS_TEMPLATE: "cmuxd-ws:tooling-20260509f",
+      E2B_API_KEY: "x",
+      FREESTYLE_SANDBOX_SNAPSHOT: "sh-fb3dcf7b47894114889b10186626af5b",
       FREESTYLE_API_KEY: "x",
-      BLAXEL_SANDBOX_IMAGE: "sandbox/cmux-devbox:latest",
-      BL_API_KEY: "x",
-      BL_WORKSPACE: "manaflow",
     };
     const result = auditCloudVmProviderCoherence(rollbackEnv, realManifest) as Coherence;
-    expect(result.problems).toEqual([]);
-    expect(result.codeDefault?.provider).toBe("blaxel");
+    expect(result.codeDefault?.provider).toBe("freestyle");
+    // Still not clean: the code default's snapshot has not been re-baked.
+    expect(result.problems.join("\n")).toContain("validationStatus");
   });
 
   test("an image value outside the manifest is a problem", () => {
@@ -130,7 +130,7 @@ describe("cloud VM provider coherence audit", () => {
   test("a manifest entry that never passed validation is a problem", () => {
     const result = auditProviderReadiness(
       "freestyle",
-      { FREESTYLE_SANDBOX_SNAPSHOT: "sh-w2otfp1g287lzrpuc2gr", FREESTYLE_API_KEY: "x" },
+      { FREESTYLE_SANDBOX_SNAPSHOT: "sh-fb3dcf7b47894114889b10186626af5b", FREESTYLE_API_KEY: "x" },
       realManifest,
     ) as { problems: string[] };
     expect(result.problems.join("\n")).toContain("validationStatus");
@@ -149,10 +149,9 @@ describe("sensitive env placeholders", () => {
   test("a Sensitive image value is itself a problem", () => {
     const result = auditCloudVmProviderCoherence(
       {
-        CMUX_VM_DEFAULT_PROVIDER: "blaxel",
-        BLAXEL_SANDBOX_IMAGE: "[SENSITIVE]",
-        BL_API_KEY: "x",
-        BL_WORKSPACE: "manaflow",
+        CMUX_VM_DEFAULT_PROVIDER: "e2b",
+        E2B_CMUXD_WS_TEMPLATE: "[SENSITIVE]",
+        E2B_API_KEY: "x",
       },
       realManifest,
     ) as Coherence;
@@ -195,11 +194,11 @@ describe("audit constants stay tied to the runtime", () => {
 });
 
 describe("required runtime env keys cover the production provider path", () => {
-  test("blaxel credentials, cron auth, and the alert sink are required", () => {
+  test("freestyle credentials, cron auth, and the alert sink are required", () => {
     for (const key of [
-      "BL_API_KEY",
-      "BL_WORKSPACE",
-      "BLAXEL_SANDBOX_IMAGE",
+      "FREESTYLE_API_KEY",
+      "FREESTYLE_SANDBOX_SNAPSHOT",
+      "CMUX_VM_FREESTYLE_ENABLED",
       "CRON_SECRET",
       "CMUX_ALERTS_SLACK_WEBHOOK_URL",
     ]) {
@@ -207,16 +206,19 @@ describe("required runtime env keys cover the production provider path", () => {
     }
   });
 
-  test("off-only kill switches and the desktop selector stay recommended, not required", () => {
-    // Unset means enabled for kill switches, and desktop creates fall back to
-    // the generic BLAXEL_SANDBOX_IMAGE selector, so requiring these would
-    // fail a healthy deployment.
-    for (const key of ["CMUX_VM_BLAXEL_ENABLED", "BLAXEL_SANDBOX_DESKTOP_IMAGE"]) {
-      expect(recommendedRuntimeEnvKeys).toContain(key);
+  test("no removed provider's env keys are still demanded", () => {
+    for (const key of ["BL_API_KEY", "BL_WORKSPACE", "BLAXEL_SANDBOX_IMAGE", "BLAXEL_SANDBOX_DESKTOP_IMAGE", "CMUX_VM_BLAXEL_ENABLED"]) {
       expect(requiredRuntimeEnvKeys).not.toContain(key);
+      expect(recommendedRuntimeEnvKeys).not.toContain(key);
     }
   });
 
+  test("an off-only kill switch for a non-default provider stays recommended, not required", () => {
+    // Unset means enabled, so requiring presence would fail a healthy deployment.
+    expect(recommendedRuntimeEnvKeys).toContain("CMUX_VM_DAYTONA_ENABLED");
+    expect(requiredRuntimeEnvKeys).not.toContain("CMUX_VM_DAYTONA_ENABLED");
+  });
+
   test("the free-provisioning escape hatch is never required or recommended", () => {
     // Unset is the safe value; listing it for presence would nudge operators
     // into setting it. Its VALUE is audited instead (see below).
diff --git a/web/tests/vm-access-revocation.test.ts b/web/tests/vm-access-revocation.test.ts
index ec79e7034c7b..7a9c4292d948 100644
--- a/web/tests/vm-access-revocation.test.ts
+++ b/web/tests/vm-access-revocation.test.ts
@@ -31,7 +31,7 @@ describe("Cloud VM access revocation", () => {
         consumedAt: null,
         revokedAt: null,
         createdAt: new Date(),
-        provider: "blaxel",
+        provider: "freestyle",
         providerVmId: "machine-a",
       },
       {
@@ -48,7 +48,7 @@ describe("Cloud VM access revocation", () => {
         consumedAt: null,
         revokedAt: null,
         createdAt: new Date(),
-        provider: "blaxel",
+        provider: "freestyle",
         providerVmId: "machine-a",
       },
     ] as unknown as CloudVmAccessLeaseRow[];
diff --git a/web/tests/vm-blaxel-fetch-retry.test.ts b/web/tests/vm-blaxel-fetch-retry.test.ts
deleted file mode 100644
index b085d6a26bd7..000000000000
--- a/web/tests/vm-blaxel-fetch-retry.test.ts
+++ /dev/null
@@ -1,244 +0,0 @@
-import { afterEach, beforeEach, describe, expect, test } from "bun:test";
-
-import {
-  BLAXEL_FETCH_MAX_ATTEMPTS,
-  BlaxelRetryExhaustedError,
-  blaxelFetch,
-  blaxelRetryDelayMs,
-} from "../services/vms/drivers/blaxel";
-import { ProviderError } from "../services/vms/drivers/types";
-
-const realFetch = globalThis.fetch;
-let envBackup: Record<string, string | undefined>;
-
-beforeEach(() => {
-  envBackup = {
-    BL_API_KEY: process.env.BL_API_KEY,
-    BL_WORKSPACE: process.env.BL_WORKSPACE,
-  };
-  process.env.BL_API_KEY = "test-key";
-  process.env.BL_WORKSPACE = "test-workspace";
-});
-
-afterEach(() => {
-  globalThis.fetch = realFetch;
-  for (const [key, value] of Object.entries(envBackup)) {
-    if (value === undefined) delete process.env[key];
-    else process.env[key] = value;
-  }
-});
-
-function jsonResponse(status: number, body: unknown = {}, headers: Record<string, string> = {}): Response {
-  return new Response(JSON.stringify(body), { status, headers });
-}
-
-function scriptedFetch(script: Array<Response | Error>): { calls: number } {
-  const state = { calls: 0 };
-  globalThis.fetch = (async () => {
-    const step = script[Math.min(state.calls, script.length - 1)];
-    state.calls += 1;
-    if (step instanceof Error) throw step;
-    return typeof step.clone === "function" ? step.clone() : step;
-  }) as typeof fetch;
-  return state;
-}
-
-function timeoutThenSuccessFetch(): { calls: number } {
-  const state = { calls: 0 };
-  globalThis.fetch = (async (_input, init) => {
-    state.calls += 1;
-    if (state.calls === 1) {
-      const signal = init?.signal;
-      await new Promise<never>((_resolve, reject) => {
-        if (!signal) {
-          reject(new Error("missing attempt signal"));
-          return;
-        }
-        if (signal.aborted) {
-          reject(signal.reason);
-          return;
-        }
-        signal.addEventListener("abort", () => reject(signal.reason), { once: true });
-      });
-    }
-    return jsonResponse(200, { recovered: true });
-  }) as typeof fetch;
-  return state;
-}
-
-function seams(sleeps: number[]): { sleep: (ms: number) => Promise<void>; random: () => number } {
-  return {
-    sleep: async (ms: number) => {
-      sleeps.push(ms);
-    },
-    random: () => 1,
-  };
-}
-
-const URL_UNDER_TEST = "https://api.blaxel.test/sandboxes/machine-1";
-
-describe("blaxelFetch retry", () => {
-  test("GET retries transient 5xx and succeeds", async () => {
-    const state = scriptedFetch([jsonResponse(503), jsonResponse(502), jsonResponse(200, { ok: true })]);
-    const sleeps: number[] = [];
-    const result = await blaxelFetch<{ ok: boolean }>("GET", URL_UNDER_TEST, undefined, seams(sleeps));
-    expect(result).toEqual({ ok: true });
-    expect(state.calls).toBe(3);
-    // Full jitter with random()=1: min(4000, 250 * 2^attempt).
-    expect(sleeps).toEqual([250, 500]);
-  });
-
-  test("GET surfaces a distinct error after the retry budget", async () => {
-    const state = scriptedFetch([jsonResponse(503, { code: "UNAVAILABLE" })]);
-    const err = await blaxelFetch("GET", URL_UNDER_TEST, undefined, seams([])).then(
-      () => null,
-      (e: unknown) => e,
-    );
-    expect(err).toBeInstanceOf(BlaxelRetryExhaustedError);
-    expect(err).toBeInstanceOf(ProviderError);
-    expect(String((err as Error).message)).toContain(`retries exhausted after ${BLAXEL_FETCH_MAX_ATTEMPTS} attempts`);
-    expect(String((err as Error).message)).toContain("503");
-    expect(state.calls).toBe(BLAXEL_FETCH_MAX_ATTEMPTS);
-  });
-
-  test("POST is not replayed on 5xx", async () => {
-    const state = scriptedFetch([jsonResponse(500, { code: "INTERNAL" })]);
-    const err = await blaxelFetch("POST", URL_UNDER_TEST, { spec: {} }, seams([])).then(
-      () => null,
-      (e: unknown) => e,
-    );
-    expect(err).toBeInstanceOf(ProviderError);
-    expect(err).not.toBeInstanceOf(BlaxelRetryExhaustedError);
-    expect(String((err as Error).message)).toMatch(/-> 500/);
-    expect(state.calls).toBe(1);
-  });
-
-  test("POST is not replayed on 429 without idempotency protection", async () => {
-    const state = scriptedFetch([jsonResponse(429, {}, { "retry-after": "2" })]);
-    const err = await blaxelFetch("POST", URL_UNDER_TEST, { spec: {} }, seams([])).then(
-      () => null,
-      (e: unknown) => e,
-    );
-    expect(err).toBeInstanceOf(ProviderError);
-    expect(err).not.toBeInstanceOf(BlaxelRetryExhaustedError);
-    expect(String((err as Error).message)).toMatch(/-> 429/);
-    expect(state.calls).toBe(1);
-  });
-
-  test("POST network failures propagate without replay", async () => {
-    const boom = new TypeError("fetch failed");
-    const state = scriptedFetch([boom]);
-    const err = await blaxelFetch("POST", URL_UNDER_TEST, { spec: {} }, seams([])).then(
-      () => null,
-      (e: unknown) => e,
-    );
-    expect(err).toBe(boom);
-    expect(state.calls).toBe(1);
-  });
-
-  test("GET network failures are retried", async () => {
-    const state = scriptedFetch([new TypeError("fetch failed"), jsonResponse(200, { ok: true })]);
-    const result = await blaxelFetch<{ ok: boolean }>("GET", URL_UNDER_TEST, undefined, seams([]));
-    expect(result).toEqual({ ok: true });
-    expect(state.calls).toBe(2);
-  });
-
-  test("GET retries a timed-out first attempt under the default retry budget", async () => {
-    const state = timeoutThenSuccessFetch();
-    const result = await blaxelFetch<{ recovered: boolean }>("GET", URL_UNDER_TEST, undefined, {
-      timeoutMs: 25,
-      sleep: async () => undefined,
-      random: () => 0,
-    });
-    expect(result).toEqual({ recovered: true });
-    expect(state.calls).toBe(2);
-  });
-
-  test("missing configuration is not treated as a retryable network failure", async () => {
-    delete process.env.BL_API_KEY;
-    const state = scriptedFetch([jsonResponse(200, { ok: true })]);
-    const err = await blaxelFetch("GET", URL_UNDER_TEST, undefined, seams([])).then(
-      () => null,
-      (e: unknown) => e,
-    );
-    expect(err).toBeInstanceOf(ProviderError);
-    expect(String((err as Error).message)).toContain("BL_API_KEY is not configured");
-    expect(state.calls).toBe(0);
-  });
-
-  test("idempotent requests retry a response-body transport failure", async () => {
-    const brokenResponse = {
-      ok: true,
-      status: 200,
-      headers: new Headers(),
-      text: async () => { throw new TypeError("body stream failed"); },
-    } as unknown as Response;
-    const state = scriptedFetch([brokenResponse, jsonResponse(200, { recovered: true })]);
-    const result = await blaxelFetch<{ recovered: boolean }>("GET", URL_UNDER_TEST, undefined, seams([]));
-    expect(result).toEqual({ recovered: true });
-    expect(state.calls).toBe(2);
-  });
-
-  test("abort during backoff stops before the next attempt", async () => {
-    const controller = new AbortController();
-    const state = scriptedFetch([jsonResponse(503)]);
-    const sleeps: number[] = [];
-    const err = await blaxelFetch("GET", URL_UNDER_TEST, undefined, {
-      ...seams(sleeps),
-      signal: controller.signal,
-      sleep: async (ms: number) => {
-        sleeps.push(ms);
-        controller.abort(new Error("request cancelled"));
-      },
-    }).then(
-      () => null,
-      (e: unknown) => e,
-    );
-    expect(err).toBeInstanceOf(Error);
-    expect(String((err as Error).message)).toBe("request cancelled");
-    expect(state.calls).toBe(1);
-    expect(sleeps).toEqual([250]);
-  });
-
-  test("already-aborted requests do not read configuration or call fetch", async () => {
-    const controller = new AbortController();
-    const reason = new Error("request already cancelled");
-    controller.abort(reason);
-    const state = scriptedFetch([jsonResponse(200, { unexpected: true })]);
-    const err = await blaxelFetch("GET", URL_UNDER_TEST, undefined, {
-      signal: controller.signal,
-      sleep: async () => undefined,
-    }).then(
-      () => null,
-      (e: unknown) => e,
-    );
-    expect(err).toBe(reason);
-    expect(state.calls).toBe(0);
-  });
-
-  test("4xx keeps the historical message shape the create collision loop matches", async () => {
-    const state = scriptedFetch([jsonResponse(409, { error: "name already exists" })]);
-    const err = await blaxelFetch("POST", URL_UNDER_TEST, { spec: {} }, seams([])).then(
-      () => null,
-      (e: unknown) => e,
-    );
-    expect(err).toBeInstanceOf(ProviderError);
-    expect(String((err as Error).message)).toMatch(/-> 409/);
-    expect(state.calls).toBe(1);
-  });
-});
-
-describe("blaxelRetryDelayMs", () => {
-  test("full-jitter backoff grows per attempt and is capped", () => {
-    expect(blaxelRetryDelayMs(0, null, () => 1)).toBe(250);
-    expect(blaxelRetryDelayMs(1, null, () => 1)).toBe(500);
-    expect(blaxelRetryDelayMs(2, null, () => 1)).toBe(1000);
-    expect(blaxelRetryDelayMs(10, null, () => 1)).toBe(4000);
-    expect(blaxelRetryDelayMs(0, null, () => 0)).toBe(0);
-  });
-
-  test("Retry-After wins over backoff and is capped", () => {
-    expect(blaxelRetryDelayMs(0, "2", () => 1)).toBe(2000);
-    expect(blaxelRetryDelayMs(0, "60", () => 1)).toBe(15000);
-  });
-});
diff --git a/web/tests/vm-blaxel-image.test.ts b/web/tests/vm-blaxel-image.test.ts
deleted file mode 100644
index 62961094c339..000000000000
--- a/web/tests/vm-blaxel-image.test.ts
+++ /dev/null
@@ -1,315 +0,0 @@
-import { describe, expect, test } from "bun:test";
-import { spawnSync } from "node:child_process";
-import { readFileSync, readdirSync } from "node:fs";
-import path from "node:path";
-
-// Contract tests for the baked Blaxel machine image template
-// (services/vms/images/blaxel). These pin the pieces other code depends on:
-// the driver's VNC heal path, the CLI's desktop port, the provisioning
-// short-circuit stamp, and the Blaxel template requirements. Deliberately not
-// source-shape tests of app behavior: the template IS the artifact here, the
-// same way freestyleBaseDockerfileContent is for Freestyle.
-
-const templateDir = path.join(import.meta.dirname, "../services/vms/images/blaxel");
-const read = (name: string) => readFileSync(path.join(templateDir, name), "utf8");
-
-const dockerfile = read("Dockerfile");
-const entrypoint = read("entrypoint.sh");
-const startVnc = read("start-vnc.sh");
-const bashrc = read("cmux-bashrc");
-const toml = read("blaxel.toml");
-
-describe("Blaxel baked image template", () => {
-  test("template directory contains exactly the expected files", () => {
-    expect(readdirSync(templateDir).sort()).toEqual([
-      "Dockerfile",
-      "WALLPAPER.md",
-      "agent-config.sh",
-      "blaxel.toml",
-      "chrome-managed-policy.json",
-      "cmux-bashrc",
-      "entrypoint.sh",
-      "ghostty-cmux.desktop",
-      "google-chrome-cmux.desktop",
-      "seed-history",
-      "start-vnc.sh",
-      "thunar-cmux.desktop",
-      "tint2rc",
-      "wallpaper.jpg",
-    ]);
-  });
-
-  test("every shell file parses (bash -n)", () => {
-    for (const name of ["entrypoint.sh", "start-vnc.sh", "cmux-bashrc", "agent-config.sh"]) {
-      const result = spawnSync("bash", ["-n", path.join(templateDir, name)]);
-      expect({ name, status: result.status }).toEqual({ name, status: 0 });
-    }
-  });
-
-  test("embeds the Blaxel sandbox API and launches it from the entrypoint", () => {
-    expect(dockerfile).toContain(
-      "COPY --from=ghcr.io/blaxel-ai/sandbox:latest /sandbox-api /usr/local/bin/sandbox-api",
-    );
-    expect(dockerfile).toContain('ENTRYPOINT ["/entrypoint.sh"]');
-    expect(entrypoint).toContain("/usr/local/bin/sandbox-api");
-    // The control plane is supervised: a crashed API restarts instead of leaving a dead machine.
-    expect(entrypoint).toContain("sandbox-api exited");
-    expect(entrypoint.trimEnd().endsWith("wait")).toBe(true);
-  });
-
-  test("keeps the driver's desktop heal contract", () => {
-    // web/services/vms/drivers/blaxel.ts DESKTOP_VNC_HEAL_COMMAND runs
-    // start-vnc.sh as cua with DISPLAY=:1 and waits for a :5901 listener.
-    expect(dockerfile).toContain("COPY start-vnc.sh /usr/local/bin/start-vnc.sh");
-    expect(dockerfile).toContain("useradd -m -u 1000 -s /bin/bash cua");
-    expect(startVnc).toContain("-rfbport 5901");
-    expect(startVnc).toContain("-SecurityTypes None");
-    expect(startVnc).toContain("-localhost");
-    // The CLI's cloudVMDesktopPort: the noVNC web client must answer on 6901.
-    expect(startVnc).toContain("websockify --web /usr/share/novnc --heartbeat 30 0.0.0.0:6901 127.0.0.1:5901");
-    expect(dockerfile).toContain("ln -s vnc.html /usr/share/novnc/index.html");
-  });
-
-  test("bakes the provisioning short-circuit stamp last", () => {
-    const stampRun = 'echo "cmux-devbox ${CMUX_IMAGE_EPOCH}" > /etc/cmux/image-stamp';
-    expect(dockerfile).toContain(stampRun);
-    const stampIndex = dockerfile.indexOf(stampRun);
-    for (const layer of ["npm install -g", "ghostty", "blesh", "start-vnc.sh"]) {
-      expect(dockerfile.indexOf(layer)).toBeGreaterThan(-1);
-      expect(dockerfile.indexOf(layer)).toBeLessThan(stampIndex);
-    }
-  });
-
-  test("pins every coding agent and Ghostty", () => {
-    for (const arg of [
-      "ARG CMUX_IMAGE_CLAUDE_CODE_VERSION=",
-      "ARG CMUX_IMAGE_CODEX_VERSION=",
-      "ARG CMUX_IMAGE_OPENCODE_VERSION=",
-      "ARG CMUX_IMAGE_PI_VERSION=",
-      "ARG CMUX_IMAGE_AGENT_BROWSER_VERSION=",
-    ]) {
-      expect(dockerfile).toContain(arg);
-    }
-    for (const pkg of [
-      "@anthropic-ai/claude-code@${CMUX_IMAGE_CLAUDE_CODE_VERSION}",
-      "@openai/codex@${CMUX_IMAGE_CODEX_VERSION}",
-      "opencode-ai@${CMUX_IMAGE_OPENCODE_VERSION}",
-      "@earendil-works/pi-coding-agent@${CMUX_IMAGE_PI_VERSION}",
-      "agent-browser@${CMUX_IMAGE_AGENT_BROWSER_VERSION}",
-    ]) {
-      expect(dockerfile).toContain(pkg);
-    }
-    // Ghostty comes from a pinned release asset, never a moving tag.
-    expect(dockerfile).toMatch(
-      /ghostty-ubuntu\/releases\/download\/[0-9][^\s]*\/ghostty_[0-9][^\s]*_amd64_trixie\.deb/,
-    );
-  });
-
-  test("terminals get a non-root work user with passwordless sudo", () => {
-    // Coding agents refuse a root shell (`claude --dangerously-skip-permissions`);
-    // the daemon drops to cmux, and root stays one passwordless sudo away. uid 1001
-    // matches the driver's runtime-setup pin so volume ownership is stable.
-    expect(dockerfile).toContain("useradd -m -u 1001 -s /bin/bash cmux");
-    expect(dockerfile).toContain("printf 'cmux ALL=(ALL) NOPASSWD:ALL\\n' > /etc/sudoers.d/90-cmux-nopasswd");
-    expect(dockerfile).toContain("chmod 0440 /etc/sudoers.d/90-cmux-nopasswd");
-    expect(dockerfile).toContain("visudo -c");
-    // The sudo binary itself ships in the devtools layer.
-    expect(dockerfile).toMatch(/apt-get install[^&]*\bsudo \\\n/);
-    // The volume lives at /cmux/home; this boot chown only prepares a disposable
-    // rootfs home for machines without the bindfs view, and is never recursive.
-    expect(entrypoint).toContain("persistent home volume is mounted at /cmux/home");
-    expect(entrypoint).toContain("rootfs home for machines without that identity view");
-    expect(entrypoint).toContain("chown cmux:cmux /home/cmux");
-  });
-
-  test("shell setup survives the persistent home volume shadowing the image", () => {
-    // Nothing user-facing baked into /home/cmux except the one-line bashrc hook;
-    // per-HOME state (seed history) materializes at shell start from /etc/cmux.
-    expect(bashrc).toContain("/etc/cmux/seed-history");
-    expect(bashrc).toContain('cp /etc/cmux/seed-history "$HOME/.bash_history"');
-    expect(read("seed-history")).toBe("claude --dangerously-skip-permissions\ncodex --yolo\n");
-    expect(bashrc).toContain("source /usr/local/share/blesh/ble.sh --noattach");
-    expect(bashrc).toContain("ble-attach");
-    // ble.sh tput caches are baked and seeded, so no pane ever opens on
-    // "ble/term.sh: updating tput cache ... done". Both cache homes are
-    // covered: <blesh>/cache.d/<uid> (what a shell uses while ~/.cache does
-    // not exist yet) bakes in the image; the XDG copy seeds per HOME from
-    // /etc/cmux/blesh-cache-seed. The runtime copy must NOT preserve seed
-    // mtimes (ble.sh loads the cache only when it is newer than
-    // lib/init-term.sh), so it is a plain cp -R.
-    expect(dockerfile).toContain("/etc/cmux/blesh-cache-seed");
-    expect(dockerfile).toContain("/usr/local/share/blesh/cache.d/0");
-    expect(dockerfile).toContain("/usr/local/share/blesh/cache.d/1000");
-    // The bake must prove every seeded TERM generated, not just the first two.
-    for (const term of ["xterm-256color", "screen-256color", "tmux-256color", "linux"]) {
-      expect(dockerfile).toContain(`test -s /etc/cmux/blesh-cache-seed/blesh/*/term.${term}`);
-    }
-    // Per-file seeding with the same freshness rule ble.sh applies, so durable
-    // homes from older images (stale or missing entries) reseed too.
-    expect(bashrc).toContain("/etc/cmux/blesh-cache-seed/blesh/*/term.*");
-    expect(bashrc).toContain('[ /usr/local/share/blesh/lib/init-term.sh -nt "$__cmux_dst" ]');
-    expect(bashrc.indexOf("blesh-cache-seed")).toBeLessThan(
-      bashrc.indexOf("source /usr/local/share/blesh/ble.sh"),
-    );
-    // half-life prompt with the machine name kept (\h): machines are addressed by name.
-    expect(bashrc).toContain("PS1='\\[\\e[38;5;135m\\]\\u@\\h");
-    expect(dockerfile).toContain("echo 'set -g default-shell /bin/bash' >> /etc/tmux.conf");
-    for (const target of ["/etc/bash.bashrc", "/etc/skel/.bashrc", "/root/.bashrc", "/home/cmux/.bashrc", "/home/cua/.bashrc"]) {
-      expect(dockerfile).toContain(`'[ -f /etc/cmux/bashrc ] && . /etc/cmux/bashrc' >> ${target}`);
-    }
-  });
-
-  test("ble.sh integration stays minimal: no token highlighting, ghost text only", () => {
-    // User feedback 2026-08-31: any token highlighting (colored backgrounds
-    // under mistyped commands included) reads as noise. The bashrc turns the
-    // highlight layers off entirely and keeps only gray history ghost text.
-    expect(bashrc).toContain("bleopt highlight_syntax= highlight_filename= highlight_variable=");
-    const faceLines = bashrc.split("\n").filter((l) => l.trimStart().startsWith("ble-face"));
-    expect(faceLines).toEqual(["  ble-face auto_complete=fg=245"]);
-    for (const line of faceLines) {
-      expect(line).not.toContain("bg=");
-    }
-  });
-
-  test("agent config generator wires the coderouter model plane per HOME", () => {
-    const agentConfig = read("agent-config.sh");
-    // Sourced for login/exec shells and every interactive HOME.
-    expect(dockerfile).toContain(
-      "'[ -f /etc/cmux/agent-config.sh ] && . /etc/cmux/agent-config.sh' > /etc/profile.d/cmux-agents.sh",
-    );
-    for (const target of ["/etc/bash.bashrc", "/etc/skel/.bashrc", "/root/.bashrc", "/home/cmux/.bashrc", "/home/cua/.bashrc"]) {
-      expect(dockerfile).toContain(
-        `'[ -f /etc/cmux/agent-config.sh ] && . /etc/cmux/agent-config.sh' >> ${target}`,
-      );
-    }
-    // Boot env is persisted on the durable home volume (Blaxel create-time
-    // envs are not replayed on resurrect) and re-sourced when absent.
-    expect(agentConfig).toContain('model-plane.env');
-    expect(agentConfig).toContain("umask 077");
-    expect(agentConfig).toContain('. "$HOME/.config/cmux/model-plane.env"');
-    // codex rides a custom provider on the /v1 Responses plane with env auth.
-    expect(agentConfig).toContain('model_provider = \\"cmux\\"');
-    expect(agentConfig).toContain('wire_api = \\"responses\\"');
-    expect(agentConfig).toContain('env_key = \\"OPENAI_API_KEY\\"');
-    // Write-if-missing keeps the user in control of their harness config.
-    expect(agentConfig).toContain('[ ! -e "$HOME/.codex/config.toml" ]');
-    // pi overrides the built-in openai-codex provider (its codex Responses
-    // dialect is what the plane proxies); the route token rides the
-    // x-coderouter-route-token header as a request-time env reference, so
-    // the file carries no secret and survives token rotation.
-    expect(agentConfig).toContain('"openai-codex"');
-    expect(agentConfig).toContain('"x-coderouter-route-token": "$OPENAI_API_KEY"');
-    expect(agentConfig).toContain('[ ! -e "$HOME/.pi/agent/models.json" ]');
-    // opencode fetches the live rewritten catalog from the coderouter config
-    // endpoint and de-tokenizes it to a runtime env reference.
-    expect(agentConfig).toContain("/api/coderouter/opencode/config");
-    expect(agentConfig).toContain("{env:OPENAI_API_KEY}");
-    expect(agentConfig).toContain('[ ! -e "$HOME/.config/opencode/opencode.json" ]');
-    // The Dockerfile proves generation under a throwaway HOME and proves the
-    // image ships no generated config for /root or the work user's home.
-    expect(dockerfile).toContain("test ! -e /root/.codex/config.toml");
-    expect(dockerfile).toContain("test ! -e /root/.pi/agent/models.json");
-    expect(dockerfile).toContain("test ! -e /root/.config/opencode/opencode.json");
-    expect(dockerfile).toContain("test ! -e /root/.config/cmux/model-plane.env");
-    expect(dockerfile).toContain("test ! -e /home/cmux/.codex/config.toml");
-    expect(dockerfile).toContain("test ! -e /home/cmux/.config/cmux/model-plane.env");
-  });
-
-  test("declares the Blaxel template with the ports cmux opens", () => {
-    expect(toml).toContain('name = "cmux-devbox"');
-    expect(toml).toContain('type = "sandbox"');
-    expect(toml).toContain("target = 6901");
-    // The cmuxd-era 7777 port is gone: cmux-tui (1337) is reached through
-    // driver-minted previews, which need no template port declaration.
-    expect(toml).not.toContain("7777");
-    expect(dockerfile).not.toContain("7777");
-  });
-
-  test("desktop polish: pre-accepted Chrome, CC0 wallpaper, no clock, dock order", () => {
-    // Chrome opens from the dock with first run pre-accepted: flagged .desktop
-    // plus the "First Run" marker seeded into the recreated home at boot.
-    expect(read("google-chrome-cmux.desktop")).toContain("--no-first-run");
-    expect(dockerfile).toContain(
-      "COPY google-chrome-cmux.desktop /etc/cmux/apps/google-chrome-cmux.desktop",
-    );
-    expect(entrypoint).toContain('touch "/home/cua/.config/google-chrome/First Run"');
-    expect(entrypoint).not.toContain("chown -R");
-    expect(entrypoint).toContain("chown cua:cua /home/cua");
-    // Launcher icons are baked into /etc/cmux/icons because Blaxel's rootfs
-    // slimming strips /usr/share/applications and the raster icon themes.
-    for (const icon of ["google-chrome.png", "thunar.png", "ghostty.png"]) {
-      expect(dockerfile).toContain(`/etc/cmux/icons/${icon}`);
-    }
-    for (const app of ["thunar-cmux.desktop", "ghostty-cmux.desktop"]) {
-      expect(read(app)).toContain("Icon=/etc/cmux/icons/");
-    }
-    // Wallpaper is committed with provenance; the license must stay CC0.
-    expect(read("WALLPAPER.md")).toContain("CC0 1.0 Universal");
-    expect(dockerfile).toContain("COPY wallpaper.jpg /usr/share/backgrounds/cmux/wallpaper.jpg");
-    expect(startVnc).toContain("feh --no-fehbg --bg-fill /usr/share/backgrounds/cmux/wallpaper.jpg");
-    const tint2 = read("tint2rc");
-    expect(tint2).toContain("panel_items = LT");
-    expect(tint2).not.toContain("time1_format");
-    const launchers = tint2
-      .split("\n")
-      .filter((line) => line.startsWith("launcher_item_app"))
-      .join("\n");
-    expect(launchers).toBe(
-      [
-        "launcher_item_app = /etc/cmux/apps/google-chrome-cmux.desktop",
-        "launcher_item_app = /etc/cmux/apps/thunar-cmux.desktop",
-        "launcher_item_app = /etc/cmux/apps/ghostty-cmux.desktop",
-      ].join("\n"),
-    );
-  });
-
-  test("tint2rc defines every background before the line that references it", () => {
-    // tint2 resolves `*_background_id = N` while parsing, against the backgrounds
-    // defined ABOVE that line (id 0 is the built-in transparent one; each
-    // `rounded =` opens the next). A forward reference clamps to -1 and hands the
-    // panel a garbage Background (out-of-bounds g_array_index): garbage borders
-    // make the launcher's icon size negative, every scaled icon comes back NULL,
-    // and the whole dock paints nothing — the 2026-08-27 invisible-toolbar
-    // regression on real machines. Order is the contract, so pin it.
-    const lines = read("tint2rc").split("\n");
-    let backgrounds = 1;
-    for (const [index, raw] of lines.entries()) {
-      const line = raw.trim();
-      if (line.startsWith("rounded")) backgrounds += 1;
-      const ref = /^([a-z_]+_background_id)\s*=\s*(\d+)/.exec(line);
-      if (!ref) continue;
-      const id = Number(ref[2]);
-      if (id >= backgrounds) {
-        throw new Error(
-          `tint2rc line ${index + 1}: ${ref[1]} = ${id} references a background that is not defined yet (${backgrounds} known so far)`,
-        );
-      }
-    }
-    expect(backgrounds).toBeGreaterThan(1);
-    // Every launcher entry is a template file whose icon is a baked PNG.
-    for (const line of lines.filter((l) => l.startsWith("launcher_item_app"))) {
-      const file = path.basename(line.split("=")[1].trim());
-      expect(read(file)).toMatch(/^Icon=\/etc\/cmux\/icons\/[a-z-]+\.png$/m);
-    }
-  });
-
-  test("never installs docker (unsupported in Blaxel microVMs)", () => {
-    expect(dockerfile.toLowerCase()).not.toContain("docker.io");
-    expect(dockerfile.toLowerCase()).not.toContain("docker-ce");
-    expect(dockerfile.toLowerCase()).not.toContain("get.docker.com");
-  });
-});
-
-describe("Blaxel driver provisioning short-circuit", () => {
-  test("create-time provisioning exits early on baked images", () => {
-    const driver = readFileSync(
-      path.join(import.meta.dirname, "../services/vms/drivers/blaxel.ts"),
-      "utf8",
-    );
-    const provisionStart = driver.indexOf("CMUX_PROVISION_SCRIPT");
-    const stampGuard = driver.indexOf("[ -f /etc/cmux/image-stamp ] && exit 0");
-    expect(provisionStart).toBeGreaterThan(-1);
-    expect(stampGuard).toBeGreaterThan(provisionStart);
-    expect(stampGuard - provisionStart).toBeLessThan(1200);
-  });
-});
diff --git a/web/tests/vm-blaxel-provider.test.ts b/web/tests/vm-blaxel-provider.test.ts
deleted file mode 100644
index b9f4b397d05d..000000000000
--- a/web/tests/vm-blaxel-provider.test.ts
+++ /dev/null
@@ -1,904 +0,0 @@
-import { describe, expect, test } from "bun:test";
-import {
-  BlaxelProvider,
-  DESKTOP_VNC_HEAL_COMMAND,
-  SMART_SLEEP_SCRIPT,
-  brandedPreviewPrefix,
-  hostnameSetupCommand,
-  parseMachineStats,
-  BLAXEL_MAX_HOME_VOLUME_MB,
-  CMUX_CLOUD_USER_SETUP_COMMAND,
-  CMUX_HOME_BINDFS_COMMAND,
-  CMUX_PROVISION_AGENT_PACKAGES,
-  CMUX_PROVISION_COMMAND,
-  CMUX_PROVISION_SCRIPT,
-  CMUX_PROVISION_SCRIPT_PATH,
-  CMUX_SUDO_INSTALL_COMMAND,
-  userExecCommand,
-  defaultHomeVolumeMbForMemory,
-  resolveBlaxelMemoryMb,
-  resolveHomeVolumeMb,
-  sandboxEnvs,
-  sandboxPorts,
-  usablePrivatePreviewUrl,
-} from "../services/vms/drivers/blaxel";
-import { ProviderError } from "../services/vms/drivers/types";
-import { providerEnabledEnvKey } from "../services/vms/config";
-import { providerImageEnvKey, resolveVmImage } from "../services/vms/images/resolver";
-import { defaultProviderId, getProvider } from "../services/vms/drivers";
-
-describe("BlaxelProvider registry wiring", () => {
-  test("is registered and resolvable", () => {
-    const provider = getProvider("blaxel");
-    expect(provider.id).toBe("blaxel");
-  });
-
-  test("has kill-switch and image env keys", () => {
-    expect(providerEnabledEnvKey("blaxel")).toBe("CMUX_VM_BLAXEL_ENABLED");
-    expect(providerImageEnvKey("blaxel")).toBe("BLAXEL_SANDBOX_IMAGE");
-  });
-
-  test("CMUX_VM_DEFAULT_PROVIDER=blaxel is honored", () => {
-    const prev = process.env.CMUX_VM_DEFAULT_PROVIDER;
-    process.env.CMUX_VM_DEFAULT_PROVIDER = "blaxel";
-    try {
-      expect(defaultProviderId()).toBe("blaxel");
-    } finally {
-      if (prev === undefined) delete process.env.CMUX_VM_DEFAULT_PROVIDER;
-      else process.env.CMUX_VM_DEFAULT_PROVIDER = prev;
-    }
-  });
-
-  test("Blaxel is the default when no provider override is configured", () => {
-    const previous = process.env.CMUX_VM_DEFAULT_PROVIDER;
-    delete process.env.CMUX_VM_DEFAULT_PROVIDER;
-    try {
-      expect(defaultProviderId()).toBe("blaxel");
-    } finally {
-      if (previous === undefined) delete process.env.CMUX_VM_DEFAULT_PROVIDER;
-      else process.env.CMUX_VM_DEFAULT_PROVIDER = previous;
-    }
-  });
-
-  test("manifest resolves a local-dev default image", () => {
-    const selection = resolveVmImage("blaxel", undefined, {});
-    expect(selection.image).toBe("sandbox/cmux-devbox:latest");
-    expect(selection.manifestEntry?.provider).toBe("blaxel");
-  });
-});
-
-describe("BlaxelProvider session transport", () => {
-  // Blaxel machines run the cmux-tui remote daemon and nothing else: no cmuxd-remote is
-  // installed, so the legacy websocket PTY attach cannot exist. The driver declares the
-  // one transport it serves and refuses openAttach outright instead of fabricating an
-  // endpoint nothing listens on.
-  test("declares cmux-remote as the only attach transport", () => {
-    expect(new BlaxelProvider().attachTransports).toEqual(["cmux-remote"]);
-  });
-
-  test("openAttach is refused and points at the cmux-tui transport", async () => {
-    const provider = new BlaxelProvider();
-    await expect(provider.openAttach("cmux-vm-test", { requireDaemon: true })).rejects.toThrow(ProviderError);
-    await expect(provider.openAttach("cmux-vm-test")).rejects.toThrow("transport cmux-remote");
-  });
-
-  test("the sandbox exposes only the cmux-tui daemon port", () => {
-    expect(sandboxPorts()).toEqual([{ name: "cmuxtui", protocol: "HTTP", target: 1337 }]);
-  });
-
-  test("machine env always carries LANG and appends caller env after it", () => {
-    expect(sandboxEnvs()).toEqual([{ name: "LANG", value: "C.UTF-8" }]);
-    expect(
-      sandboxEnvs({ OPENAI_BASE_URL: "https://cmux.example/v1", OPENAI_API_KEY: "crt_x" }),
-    ).toEqual([
-      { name: "LANG", value: "C.UTF-8" },
-      { name: "OPENAI_BASE_URL", value: "https://cmux.example/v1" },
-      { name: "OPENAI_API_KEY", value: "crt_x" },
-    ]);
-    // LANG is the image contract; a caller-supplied LANG never overrides it.
-    expect(sandboxEnvs({ LANG: "en_US.UTF-8" })).toEqual([{ name: "LANG", value: "C.UTF-8" }]);
-  });
-
-  test("uses persisted home metadata when the sandbox omits its volume list", async () => {
-    const previousKey = process.env.BL_API_KEY;
-    const previousWorkspace = process.env.BL_WORKSPACE;
-    process.env.BL_API_KEY = "test-key";
-    process.env.BL_WORKSPACE = "cmux";
-    const originalFetch = globalThis.fetch;
-    const processBodies: string[] = [];
-    globalThis.fetch = (async (input: string | URL | Request, init?: RequestInit) => {
-      const url = typeof input === "string" ? input : input instanceof URL ? input.toString() : input.url;
-      const method = init?.method ?? "GET";
-      if (method === "GET" && url.endsWith("/sandboxes/machine-with-hidden-volume")) {
-        // Some provider responses omit spec.volumes even though the VM row still
-        // has the authoritative volume marker from create.
-        return new Response(JSON.stringify({
-          status: "DEPLOYED",
-          metadata: { url: "https://sandbox-api.test" },
-          spec: { runtime: { image: "sandbox/cmux-devbox:latest" } },
-        }), { status: 200 });
-      }
-      if (method === "POST" && url === "https://sandbox-api.test/process") {
-        processBodies.push(typeof init?.body === "string" ? JSON.parse(init.body).command : "");
-        return new Response(JSON.stringify({ status: "completed", exitCode: 0, stdout: "ok", stderr: "" }), { status: 200 });
-      }
-      return new Response(JSON.stringify({ error: `unexpected ${method} ${url}` }), { status: 500 });
-    }) as typeof fetch;
-    try {
-      const result = await new BlaxelProvider().exec(
-        "machine-with-hidden-volume",
-        "printf ok",
-        { timeoutMs: 1000, providerMetadata: { homeVolume: "cmux-home-machine-with-hidden-volume" } },
-      );
-      expect(result).toEqual({ exitCode: 0, stdout: "ok", stderr: "" });
-      expect(processBodies).toHaveLength(1);
-      expect(processBodies[0]).toContain("if ! mountpoint -q /root");
-      expect(processBodies[0]).toContain("exit 75");
-      expect(processBodies[0]).not.toContain("else cd /home/cmux 2>/dev/null; exec env HOME=/home/cmux");
-    } finally {
-      globalThis.fetch = originalFetch;
-      if (previousKey === undefined) delete process.env.BL_API_KEY;
-      else process.env.BL_API_KEY = previousKey;
-      if (previousWorkspace === undefined) delete process.env.BL_WORKSPACE;
-      else process.env.BL_WORKSPACE = previousWorkspace;
-    }
-  });
-
-  test("uses persisted home metadata during enrollment approval", async () => {
-    const previousKey = process.env.BL_API_KEY;
-    const previousWorkspace = process.env.BL_WORKSPACE;
-    process.env.BL_API_KEY = "test-key";
-    process.env.BL_WORKSPACE = "cmux";
-    const originalFetch = globalThis.fetch;
-    const processBodies: string[] = [];
-    globalThis.fetch = (async (input: string | URL | Request, init?: RequestInit) => {
-      const url = typeof input === "string" ? input : input instanceof URL ? input.toString() : input.url;
-      const method = init?.method ?? "GET";
-      if (method === "GET" && url.endsWith("/sandboxes/machine-approval-hidden-volume")) {
-        return new Response(JSON.stringify({
-          status: "DEPLOYED",
-          metadata: { url: "https://sandbox-api.test" },
-          spec: { runtime: { image: "sandbox/cmux-devbox:latest" } },
-        }), { status: 200 });
-      }
-      if (method === "POST" && url === "https://sandbox-api.test/process") {
-        const command = typeof init?.body === "string" ? JSON.parse(init.body).command : "";
-        processBodies.push(command);
-        if (command.includes("remote enroll pending")) {
-          return new Response(JSON.stringify({
-            status: "completed",
-            exitCode: 0,
-            stdout: JSON.stringify([{ invitation_id: "invite-1", device_fingerprint: "device-1" }]),
-            stderr: "",
-          }), { status: 200 });
-        }
-        if (command.includes("remote enroll approve")) {
-          return new Response(JSON.stringify({
-            status: "completed",
-            exitCode: 0,
-            stdout: JSON.stringify({ fingerprint: "device-1" }),
-            stderr: "",
-          }), { status: 200 });
-        }
-      }
-      return new Response(JSON.stringify({ error: `unexpected ${method} ${url}` }), { status: 500 });
-    }) as typeof fetch;
-    try {
-      const provider = new BlaxelProvider();
-      // Reflect.apply lets the test exercise the optional argument before the
-      // implementation commit adds it to the shared driver contract.
-      const result = await Reflect.apply(
-        provider.approveCmuxRemoteEnrollment,
-        provider,
-        ["machine-approval-hidden-volume", "invite-1", {
-          providerMetadata: { homeVolume: "cmux-home-machine-approval-hidden-volume" },
-        }],
-      );
-      expect(result).toEqual({ approved: true, state: "approved", deviceFingerprint: "device-1" });
-      expect(processBodies).toHaveLength(2);
-      for (const body of processBodies) {
-        expect(body).toContain("if ! mountpoint -q /root");
-        expect(body).toContain("exit 75");
-      }
-    } finally {
-      globalThis.fetch = originalFetch;
-      if (previousKey === undefined) delete process.env.BL_API_KEY;
-      else process.env.BL_API_KEY = previousKey;
-      if (previousWorkspace === undefined) delete process.env.BL_WORKSPACE;
-      else process.env.BL_WORKSPACE = previousWorkspace;
-    }
-  });
-
-  test("the smart-sleep watcher only knows the cmux-tui daemon", () => {
-    expect(SMART_SLEEP_SCRIPT).toContain("pidof cmux-tui");
-    expect(SMART_SLEEP_SCRIPT).toContain("0539");
-    expect(SMART_SLEEP_SCRIPT).not.toContain("cmuxd");
-    expect(SMART_SLEEP_SCRIPT).not.toContain("7777");
-    expect(SMART_SLEEP_SCRIPT).not.toContain("1E61");
-  });
-
-  test("the machine's bare branded hostname belongs to the cmux-tui daemon preview", () => {
-    expect(brandedPreviewPrefix("noble-wren", "cmuxtui", 1337)).toBe("noble-wren");
-    expect(brandedPreviewPrefix("noble-wren", "port-3000", 3000)).toBe("noble-wren-3000");
-    expect(brandedPreviewPrefix("Not Valid!", "cmuxtui", 1337)).toBeNull();
-  });
-});
-
-describe("BlaxelProvider SSH surface", () => {
-  test("openSSH is unsupported and points at the cmux-tui transport", async () => {
-    const provider = new BlaxelProvider();
-
-    await expect(provider.openSSH("cmux-vm-test")).rejects.toThrow(ProviderError);
-    await expect(provider.openSSH("cmux-vm-test")).rejects.toThrow("cmux-tui remote daemon");
-  });
-
-  test("revokeSSHIdentity is a safe no-op", async () => {
-    const provider = new BlaxelProvider();
-
-    await expect(provider.revokeSSHIdentity("anything")).resolves.toBeUndefined();
-    await expect(provider.revokeSSHIdentity("")).resolves.toBeUndefined();
-  });
-
-  test("revokes the cmux-tui daemon and every preview ingress on sign-out", async () => {
-    const previousKey = process.env.BL_API_KEY;
-    const previousWorkspace = process.env.BL_WORKSPACE;
-    process.env.BL_API_KEY = "test-key";
-    process.env.BL_WORKSPACE = "cmux";
-    const originalFetch = globalThis.fetch;
-    const calls: Array<{ method: string; url: string; body?: string }> = [];
-    globalThis.fetch = (async (input: string | URL | Request, init?: RequestInit) => {
-      const url = typeof input === "string" ? input : input instanceof URL ? input.toString() : input.url;
-      calls.push({ method: init?.method ?? "GET", url, body: typeof init?.body === "string" ? init.body : undefined });
-      if (url.endsWith("/sandboxes/machine-a")) {
-        return new Response(JSON.stringify({ metadata: { url: "https://sandbox-api.test" } }), { status: 200 });
-      }
-      if (url === "https://sandbox-api.test/process/cmux-tui-daemon") {
-        return new Response(JSON.stringify({ message: "stopped" }), { status: 200 });
-      }
-      if (url === "https://sandbox-api.test/process") {
-        return new Response(JSON.stringify({ exitCode: 0, status: "completed" }), { status: 200 });
-      }
-      if (url.endsWith("/sandboxes/machine-a/previews")) {
-        return new Response(JSON.stringify([
-          { metadata: { name: "cmuxtui" } },
-          { metadata: { name: "cmuxtui-raw" } },
-          { metadata: { name: "port-3000" } },
-        ]), { status: 200 });
-      }
-      if (url.includes("/previews/")) return new Response("", { status: 200 });
-      return new Response("unexpected", { status: 500 });
-    }) as typeof fetch;
-    try {
-      await new BlaxelProvider().revokeEndpointLeases("machine-a");
-      const processCall = calls.find((call) => call.url === "https://sandbox-api.test/process");
-      expect(processCall?.method).toBe("POST");
-      // cmux-tui only: stop the keepalive watcher and the daemon, nothing cmuxd-shaped.
-      expect(processCall?.body).toContain("pkill -TERM -x 'cmux-keepalive'");
-      expect(processCall?.body).toContain("server start");
-      expect(processCall?.body).not.toContain("cmuxd");
-      expect(processCall?.body).not.toContain("attach-pty-lease.json");
-      expect(calls.filter((call) => call.method === "DELETE")).toHaveLength(4);
-      expect(calls.some((call) => call.url === "https://sandbox-api.test/process/cmux-tui-daemon")).toBe(true);
-    } finally {
-      globalThis.fetch = originalFetch;
-      if (previousKey === undefined) delete process.env.BL_API_KEY;
-      else process.env.BL_API_KEY = previousKey;
-      if (previousWorkspace === undefined) delete process.env.BL_WORKSPACE;
-      else process.env.BL_WORKSPACE = previousWorkspace;
-    }
-  });
-});
-
-describe("BlaxelProvider configuration errors", () => {
-  test("create fails with a clear error when BL_API_KEY is missing", async () => {
-    const prevKey = process.env.BL_API_KEY;
-    const prevWs = process.env.BL_WORKSPACE;
-    delete process.env.BL_API_KEY;
-    process.env.BL_WORKSPACE = "cmux";
-    try {
-      const provider = new BlaxelProvider();
-      await expect(provider.create({ image: "blaxel/base-image:latest" })).rejects.toThrow(
-        "BL_API_KEY is not configured",
-      );
-    } finally {
-      if (prevKey === undefined) delete process.env.BL_API_KEY;
-      else process.env.BL_API_KEY = prevKey;
-      if (prevWs === undefined) delete process.env.BL_WORKSPACE;
-      else process.env.BL_WORKSPACE = prevWs;
-    }
-  });
-
-  test("create requires a resolved image", async () => {
-    const provider = new BlaxelProvider();
-    await expect(provider.create({ image: "  " })).rejects.toThrow("create requires a resolved image");
-  });
-
-  test("home volume follows memory in dev-box tiers unless the env pins a size", () => {
-    expect(defaultHomeVolumeMbForMemory(2048)).toBe(8 * 1024);
-    expect(defaultHomeVolumeMbForMemory(8 * 1024)).toBe(16 * 1024);
-    expect(defaultHomeVolumeMbForMemory(16 * 1024)).toBe(16 * 1024);
-    // The plan default (24 GB) lands in the 64 GB tier, not a flat 5 GB.
-    // Blaxel refuses anything above 16 GB, so every larger machine sits at the ceiling.
-    expect(defaultHomeVolumeMbForMemory(24 * 1024)).toBe(BLAXEL_MAX_HOME_VOLUME_MB);
-    expect(defaultHomeVolumeMbForMemory(32 * 1024)).toBe(BLAXEL_MAX_HOME_VOLUME_MB);
-    expect(defaultHomeVolumeMbForMemory(48 * 1024)).toBe(BLAXEL_MAX_HOME_VOLUME_MB);
-    expect(() => defaultHomeVolumeMbForMemory(0)).toThrow("positive");
-
-    expect(resolveHomeVolumeMb(24 * 1024, {})).toBe(16 * 1024);
-    expect(resolveHomeVolumeMb(24 * 1024, { CMUX_VM_BLAXEL_HOME_VOLUME_MB: "5120" })).toBe(5120);
-    expect(resolveHomeVolumeMb(24 * 1024, { CMUX_VM_BLAXEL_HOME_VOLUME_MB: "nope" })).toBe(16 * 1024);
-  });
-
-  test("uses the request memory and preserves the env fallback", () => {
-    expect(resolveBlaxelMemoryMb(8192, { CMUX_VM_BLAXEL_MEMORY_MB: "4096" })).toBe(8192);
-    expect(resolveBlaxelMemoryMb(undefined, { CMUX_VM_BLAXEL_MEMORY_MB: "16384" })).toBe(16384);
-    expect(resolveBlaxelMemoryMb(undefined, {})).toBe(4096);
-    expect(() => resolveBlaxelMemoryMb(0, {})).toThrow("memoryMb must be a positive integer");
-  });
-});
-
-describe("BlaxelProvider preview privacy", () => {
-  test("only a private preview URL is usable", () => {
-    const url = "https://abc123.us-pdx-1.preview.bl.run";
-    expect(usablePrivatePreviewUrl({ spec: { url } })).toBe(url);
-    expect(usablePrivatePreviewUrl({ spec: { url, public: false } })).toBe(url);
-  });
-
-  test("a public preview is treated as absent so callers replace or reject it", () => {
-    const url = "https://abc123.us-pdx-1.preview.bl.run";
-    expect(usablePrivatePreviewUrl({ spec: { url, public: true } })).toBeNull();
-  });
-
-  test("a missing preview or URL is not usable", () => {
-    expect(usablePrivatePreviewUrl(null)).toBeNull();
-    expect(usablePrivatePreviewUrl(undefined)).toBeNull();
-    expect(usablePrivatePreviewUrl({})).toBeNull();
-    expect(usablePrivatePreviewUrl({ spec: {} })).toBeNull();
-  });
-});
-
-describe("BlaxelProvider preview branding under races", () => {
-  type FetchCall = { method: string; url: string; body: unknown };
-
-  function installFetch(handler: (call: FetchCall) => { status: number; body?: unknown }) {
-    const calls: FetchCall[] = [];
-    const original = globalThis.fetch;
-    globalThis.fetch = (async (input: string | URL | Request, init?: RequestInit) => {
-      const url = typeof input === "string" ? input : input instanceof URL ? input.toString() : input.url;
-      const call: FetchCall = {
-        method: init?.method ?? "GET",
-        url,
-        body: typeof init?.body === "string" ? JSON.parse(init.body) : undefined,
-      };
-      calls.push(call);
-      const result = handler(call);
-      return new Response(result.body === undefined ? "" : JSON.stringify(result.body), {
-        status: result.status,
-        headers: { "content-type": "application/json" },
-      });
-    }) as typeof fetch;
-    return { calls, restore: () => { globalThis.fetch = original; } };
-  }
-
-  const savedEnv = { key: process.env.BL_API_KEY, workspace: process.env.BL_WORKSPACE, domain: process.env.CMUX_VM_BLAXEL_CUSTOM_DOMAIN };
-  function withEnv() {
-    process.env.BL_API_KEY = "test-key";
-    process.env.BL_WORKSPACE = "cmux";
-    process.env.CMUX_VM_BLAXEL_CUSTOM_DOMAIN = "vm.cmux.sh";
-  }
-  function restoreEnv() {
-    process.env.BL_API_KEY = savedEnv.key;
-    process.env.BL_WORKSPACE = savedEnv.workspace;
-    process.env.CMUX_VM_BLAXEL_CUSTOM_DOMAIN = savedEnv.domain;
-  }
-
-  test("adopts a preview minted concurrently instead of clobbering it with a hash URL", async () => {
-    withEnv();
-    let raced = false;
-    const branded = { spec: { url: "https://noble-wren-3000.vm.cmux.sh", public: false, prefixUrl: "noble-wren-3000" } };
-    const fetchMock = installFetch(({ method, url }) => {
-      if (url.endsWith("/sandboxes/noble-wren")) return { status: 200, body: { status: "DEPLOYED", metadata: { name: "noble-wren" } } };
-      if (url.endsWith("/customdomains/vm.cmux.sh")) return { status: 200, body: { spec: { status: "verified" } } };
-      if (method === "GET" && url.endsWith("/previews/port-3000")) {
-        return raced ? { status: 200, body: branded } : { status: 404, body: { error: "not found" } };
-      }
-      if (method === "POST" && url.endsWith("/previews")) {
-        // Another caller won the race between our GET and POST.
-        raced = true;
-        return { status: 409, body: { error: "preview already exists" } };
-      }
-      if (method === "POST" && url.endsWith("/tokens")) return { status: 200, body: { spec: { token: "preview-token" } } };
-      return { status: 500, body: { error: `unexpected ${method} ${url}` } };
-    });
-    try {
-      const provider = new BlaxelProvider();
-      const opened = await provider.openPort("noble-wren", 3000);
-      expect(opened.url).toBe("https://noble-wren-3000.vm.cmux.sh");
-      const creates = fetchMock.calls.filter((c) => c.method === "POST" && c.url.endsWith("/previews"));
-      expect(creates).toHaveLength(1);
-      expect((creates[0]!.body as { spec: { prefixUrl?: string } }).spec.prefixUrl).toBe("noble-wren-3000");
-    } finally {
-      fetchMock.restore();
-      restoreEnv();
-    }
-  });
-
-  test("coalesces concurrent ensures for the same preview into one create", async () => {
-    withEnv();
-    let created: unknown = null;
-    const fetchMock = installFetch(({ method, url, body }) => {
-      if (url.endsWith("/sandboxes/noble-wren")) return { status: 200, body: { status: "DEPLOYED", metadata: { name: "noble-wren" } } };
-      if (url.endsWith("/customdomains/vm.cmux.sh")) return { status: 200, body: { spec: { status: "verified" } } };
-      if (method === "GET" && url.endsWith("/previews/port-3000")) {
-        return created ? { status: 200, body: created } : { status: 404, body: { error: "not found" } };
-      }
-      if (method === "POST" && url.endsWith("/previews")) {
-        const spec = (body as { spec: { prefixUrl?: string } }).spec;
-        created = { spec: { url: `https://${spec.prefixUrl}.vm.cmux.sh`, public: false, prefixUrl: spec.prefixUrl } };
-        return { status: 200, body: created };
-      }
-      if (method === "POST" && url.endsWith("/tokens")) return { status: 200, body: { spec: { token: "preview-token" } } };
-      return { status: 500, body: { error: `unexpected ${method} ${url}` } };
-    });
-    try {
-      const provider = new BlaxelProvider();
-      const [a, b] = await Promise.all([provider.openPort("noble-wren", 3000), provider.openPort("noble-wren", 3000)]);
-      expect(a.url).toBe("https://noble-wren-3000.vm.cmux.sh");
-      expect(b.url).toBe(a.url);
-      const creates = fetchMock.calls.filter((c) => c.method === "POST" && c.url.endsWith("/previews"));
-      expect(creates).toHaveLength(1);
-    } finally {
-      fetchMock.restore();
-      restoreEnv();
-    }
-  });
-
-  test("rotates an old private bl.run preview after the custom domain is verified", async () => {
-    withEnv();
-    const old = {
-      spec: {
-        url: "https://noble-wren-3000-cmux.preview.bl.run",
-        public: false,
-        prefixUrl: "noble-wren-3000",
-      },
-    };
-    const replacement = {
-      spec: {
-        url: "https://noble-wren-3000.vm.cmux.sh",
-        public: false,
-        prefixUrl: "noble-wren-3000",
-        customDomain: "vm.cmux.sh",
-      },
-    };
-    const fetchMock = installFetch(({ method, url, body }) => {
-      if (url.endsWith("/customdomains/vm.cmux.sh")) return { status: 200, body: { spec: { status: "verified" } } };
-      if (url.endsWith("/sandboxes/noble-wren")) return { status: 200, body: { status: "DEPLOYED", metadata: { name: "noble-wren" } } };
-      if (method === "GET" && url.endsWith("/previews/port-3000")) return { status: 200, body: old };
-      if (method === "DELETE" && url.endsWith("/previews/port-3000")) return { status: 200, body: old };
-      if (method === "POST" && url.endsWith("/previews")) return { status: 200, body: replacement };
-      if (method === "POST" && url.endsWith("/tokens")) return { status: 200, body: { spec: { token: "preview-token" } } };
-      throw new Error(`unexpected ${method} ${url} ${JSON.stringify(body)}`);
-    });
-    try {
-      const opened = await new BlaxelProvider().openPort("noble-wren", 3000);
-      expect(opened.url).toBe("https://noble-wren-3000.vm.cmux.sh");
-      expect(fetchMock.calls.filter((call) => call.method === "DELETE")).toHaveLength(1);
-      const create = fetchMock.calls.find((call) => call.method === "POST" && call.url.endsWith("/previews"));
-      expect(create?.body).toMatchObject({
-        spec: { prefixUrl: "noble-wren-3000", customDomain: "vm.cmux.sh", public: false },
-      });
-    } finally {
-      fetchMock.restore();
-      restoreEnv();
-    }
-  });
-});
-
-describe("BlaxelProvider machine stats parsing", () => {
-  test("turns the sampled /proc output into CPU, memory, and disk readings", () => {
-    const stdout = [
-      "cpu  1000 0 500 8000 100 0 0 0 0 0",
-      "cpu  1300 0 600 8100 100 0 0 0 0 0",
-      "0.42 0.30 0.20 1/123 4567",
-      "2",
-      "MemTotal:       4194304 kB",
-      "MemAvailable:   3145728 kB",
-      "/dev/vdb       5242880 1310720 3932160  26% /root",
-    ].join("\n");
-    const stats = parseMachineStats(stdout, 4096);
-    expect(stats.cpus).toBe(2);
-    // 500 busy ticks out of 600 total between the two samples.
-    expect(Math.round(stats.cpuPercent ?? -1)).toBe(80);
-    expect(stats.loadAverage1m).toBeCloseTo(0.42);
-    expect(stats.memoryTotalMb).toBe(4096);
-    expect(stats.memoryUsedMb).toBe(1024);
-    expect(stats.diskTotalMb).toBe(5120);
-    expect(stats.diskUsedMb).toBe(1280);
-  });
-
-  test("falls back to provisioned memory and leaves unknown fields undefined", () => {
-    const stats = parseMachineStats("", 2048);
-    expect(stats.memoryTotalMb).toBe(2048);
-    expect(stats.cpuPercent).toBeUndefined();
-    expect(stats.diskTotalMb).toBeUndefined();
-  });
-});
-
-describe("BlaxelProvider desktop VNC bootstrap", () => {
-  // Regression: renaming the host without an /etc/hosts entry made `hostname -f` fail, which
-  // aborts TigerVNC's `vncserver` wrapper — so 5901 never bound and noVNC showed "Failed to
-  // connect to server" on every desktop machine. The bootstrap must make the name resolvable.
-  test("hostnameSetupCommand maps the machine name to loopback in /etc/hosts", () => {
-    const cmd = hostnameSetupCommand("warm-jay");
-    expect(cmd).toContain("hostname 'warm-jay'");
-    expect(cmd).toContain("/etc/hosts");
-    expect(cmd).toContain("127.0.0.1");
-    // The whole point: a fresh boot must not append a duplicate on resurrection.
-    expect(cmd).toContain("grep -qF 'warm-jay' /etc/hosts ||");
-  });
-
-  test("hostnameSetupCommand single-quotes the name so it cannot inject shell", () => {
-    const cmd = hostnameSetupCommand("a; rm -rf /");
-    expect(cmd).toContain("'a; rm -rf /'");
-    expect(cmd).not.toMatch(/;\s*rm -rf \/\s*(;|$)/);
-  });
-
-  // The VNC heal starts TigerVNC as the desktop user only when it is really down, and never
-  // touches a base machine (no start-vnc.sh) or a snapshot-resumed one (5901 already up).
-  test("desktop VNC heal is guarded on start-vnc.sh, port 5901, and the cua user", () => {
-    expect(DESKTOP_VNC_HEAL_COMMAND).toContain("[ -x /usr/local/bin/start-vnc.sh ] || exit 0");
-    expect(DESKTOP_VNC_HEAL_COMMAND).toContain(":5901 ");
-    expect(DESKTOP_VNC_HEAL_COMMAND).toContain("runuser -u cua");
-    expect(DESKTOP_VNC_HEAL_COMMAND).toContain("start-vnc.sh");
-  });
-});
-
-describe("background provisioning", () => {
-  test("installs the standard toolset, the agents, and the CUA driver on both distro families", () => {
-    expect(CMUX_PROVISION_COMMAND).toBe(`bash ${CMUX_PROVISION_SCRIPT_PATH}`);
-    expect(CMUX_PROVISION_SCRIPT.startsWith("#!/bin/bash")).toBe(true);
-    // Ubuntu (xfce-vnc) and Alpine (base-image) both provision.
-    expect(CMUX_PROVISION_SCRIPT).toContain("apt-get install");
-    expect(CMUX_PROVISION_SCRIPT).toContain("apk add");
-    for (const tool of ["ripgrep", "jq", "tmux", "git", "curl", "xdotool", "nodesource", "cli.github.com", "bun.sh/install", "astral.sh/uv"]) {
-      expect(CMUX_PROVISION_SCRIPT).toContain(tool);
-    }
-    for (const pkg of CMUX_PROVISION_AGENT_PACKAGES) {
-      expect(CMUX_PROVISION_SCRIPT).toContain(pkg);
-    }
-    expect(CMUX_PROVISION_SCRIPT).toContain("cua-computer-server");
-    // Persistent-home placement: npm globals and bun survive sandbox resurrection.
-    // A failed bindfs mount selects the durable backing path instead of disposable
-    // /home/cmux, while the normal path remains the identity-mapped home.
-    expect(CMUX_PROVISION_SCRIPT).toContain("if mountpoint -q /cmux/home 2>/dev/null && ! mountpoint -q /home/cmux 2>/dev/null");
-    expect(CMUX_PROVISION_SCRIPT).toContain('export HOME=/cmux/home');
-    expect(CMUX_PROVISION_SCRIPT).toContain('export HOME=/home/cmux');
-    expect(CMUX_PROVISION_SCRIPT).toContain('npm config set prefix "$HOME/.npm-global"');
-    expect(CMUX_PROVISION_SCRIPT).toContain('"$HOME/.bun/bin/bun"');
-    expect(CMUX_PROVISION_SCRIPT).not.toContain("/root/.npm-global");
-    expect(CMUX_PROVISION_SCRIPT).not.toContain("/root/.bun");
-    // A persistent home shadows the image's /home/cmux/.bashrc. The generated
-    // profile must source both shared fragments so volume-backed panes keep the
-    // prompt, ble.sh setup, and coderouter agent environment.
-    expect(CMUX_PROVISION_SCRIPT).toContain("[ -f /etc/cmux/bashrc ] && . /etc/cmux/bashrc");
-    expect(CMUX_PROVISION_SCRIPT).toContain("[ -f /etc/cmux/agent-config.sh ] && . /etc/cmux/agent-config.sh");
-    // Legacy sandboxes (volume still at /root) were provisioned by the old driver;
-    // the script is a no-op there instead of writing tools to disposable rootfs.
-    expect(CMUX_PROVISION_SCRIPT).toContain("mountpoint -q /root 2>/dev/null && exit 0");
-    // The stock-image path installs sudo too (baked images already ship it).
-    expect(CMUX_PROVISION_SCRIPT).toMatch(/apt-get install[^\n]*\n[^\n]*\bsudo\b/);
-    expect(CMUX_PROVISION_SCRIPT).toMatch(/apk add[^\n]*\bsudo\b/);
-    // Root-run provisioning hands what it wrote in the home to the work user —
-    // but only on rootfs homes: through a mounted view chown is a no-op and the
-    // walk over a grown persistent home would be pure wasted disk work.
-    expect(CMUX_PROVISION_SCRIPT).toContain("mountpoint -q /home/cmux 2>/dev/null && return 0");
-    expect(CMUX_PROVISION_SCRIPT).toContain("mountpoint -q /cmux/home 2>/dev/null && return 0");
-    expect(CMUX_PROVISION_SCRIPT).toContain('chown -R cmux:cmux "$HOME/.bun" "$HOME/.npm-global" "$HOME/.local"');
-    expect(CMUX_PROVISION_SCRIPT).toContain("distro_packages_unlocked()");
-    expect(CMUX_PROVISION_SCRIPT).toContain("mkdir /etc/cmux/package-install.lock.d");
-    // When util-linux is not present yet, the directory gate remains held while
-    // the first transaction installs it. Once flock exists, the same body runs
-    // under the file lock after the transition gate is released.
-    expect(CMUX_PROVISION_SCRIPT).toContain("else distro_packages_unlocked; fi ) 9>/etc/cmux/package-install.lock");
-    expect(CMUX_PROVISION_SCRIPT).toContain("/tmp/cmux/provision.log");
-  });
-});
-
-describe("cloud work user setup", () => {
-  test("creates the cmux user idempotently with passwordless sudo policy", () => {
-    // uid 1001 keeps volume ownership stable across image generations; busybox
-    // adduser is the Alpine fallback; reruns are no-ops thanks to the id guard.
-    expect(CMUX_CLOUD_USER_SETUP_COMMAND).toContain("id -u cmux >/dev/null 2>&1 || useradd -m -u 1001 -s /bin/bash cmux");
-    expect(CMUX_CLOUD_USER_SETUP_COMMAND).toContain("|| adduser -D -u 1001 -s /bin/bash cmux");
-    // Every fallback keeps the same uid; an auto-assigned uid would break the
-    // persistent-volume identity contract on older Alpine images.
-    expect((CMUX_CLOUD_USER_SETUP_COMMAND.match(/-u 1001/g) ?? [])).toHaveLength(4);
-    expect(CMUX_CLOUD_USER_SETUP_COMMAND).toContain('[ "$(id -u cmux 2>/dev/null || echo -1)" = "1001" ] || exit 1');
-    expect(CMUX_CLOUD_USER_SETUP_COMMAND).toContain("printf 'cmux ALL=(ALL) NOPASSWD:ALL\\n' > /etc/sudoers.d/90-cmux-nopasswd");
-    expect(CMUX_CLOUD_USER_SETUP_COMMAND).toContain("chmod 0440 /etc/sudoers.d/90-cmux-nopasswd");
-    // Alpine has no runuser in busybox; without it the daemon would silently run root.
-    expect(CMUX_CLOUD_USER_SETUP_COMMAND).toContain("apk add --no-cache runuser");
-  });
-
-  test("presents the root-squashing volume as cmux-owned through the bindfs view", () => {
-    // The Blaxel volume is virtiofs that squashes every guest identity to root
-    // (chown no-ops; a cmux-created file comes back root-owned and unwritable), so
-    // the home the user sees is a bindfs map over the backing mount: everything
-    // shown as cmux, real I/O done as root.
-    expect(CMUX_HOME_BINDFS_COMMAND).toContain("bindfs -o allow_other");
-    expect(CMUX_HOME_BINDFS_COMMAND).toContain("--force-user=cmux --force-group=cmux");
-    expect(CMUX_HOME_BINDFS_COMMAND).toContain("--create-for-user=root --create-for-group=root");
-    expect(CMUX_HOME_BINDFS_COMMAND).toContain("/cmux/home /home/cmux");
-    // The view mounts only when this machine has a volume, once, and bindfs is
-    // installed on demand for images that predate it being baked in.
-    expect(CMUX_CLOUD_USER_SETUP_COMMAND).toContain(CMUX_HOME_BINDFS_COMMAND);
-    expect(CMUX_CLOUD_USER_SETUP_COMMAND).toContain("if mountpoint -q /cmux/home 2>/dev/null && ! mountpoint -q /home/cmux 2>/dev/null");
-    // The whole view setup (mount check, junk clean, mount) shares the package
-    // gate and flock, so it cannot race sudo/provision installs or junk-clean a mounted home.
-    expect(CMUX_CLOUD_USER_SETUP_COMMAND).toContain("/etc/cmux/package-install.lock.d/owner");
-    expect(CMUX_CLOUD_USER_SETUP_COMMAND).toContain("flock -w 300 9 || exit 1");
-    expect(CMUX_CLOUD_USER_SETUP_COMMAND).toContain("sleep 1; cmux_package_lock_wait=$((cmux_package_lock_wait + 1))");
-    expect(CMUX_CLOUD_USER_SETUP_COMMAND).toContain(") 9>/etc/cmux/package-install.lock");
-    expect(CMUX_CLOUD_USER_SETUP_COMMAND).toContain("apt-get install -y -qq --no-install-recommends bindfs");
-    // Curl or wget is prepared under this same gate. The daemon installer does
-    // not start an unlocked apk transaction on a stock Alpine image.
-    expect(CMUX_CLOUD_USER_SETUP_COMMAND).toContain("apk add --no-cache bash");
-    expect(CMUX_CLOUD_USER_SETUP_COMMAND).toContain("apk add --no-cache curl");
-    expect(CMUX_CLOUD_USER_SETUP_COMMAND).toContain("apt-get install -y -qq --no-install-recommends util-linux curl");
-  });
-
-  test("sudo heal covers stock and stamped images before the daemon starts", () => {
-    // The bounded heal runs synchronously for every image, including stock images
-    // with no image stamp, so the daemon never starts before sudo is available.
-    expect(CMUX_SUDO_INSTALL_COMMAND).not.toContain("image-stamp");
-    expect(CMUX_SUDO_INSTALL_COMMAND).toContain("command -v sudo >/dev/null 2>&1");
-    expect(CMUX_SUDO_INSTALL_COMMAND).toContain("apt-get install -y -qq --no-install-recommends sudo");
-    expect(CMUX_SUDO_INSTALL_COMMAND).toContain("apk add --no-cache sudo");
-    // A failed install is exposed (breadcrumb + nonzero exit), not swallowed; the
-    // next bootstrap or daemon restart retries automatically.
-    expect(CMUX_SUDO_INSTALL_COMMAND).toContain("sudo-install-failed");
-    expect(CMUX_SUDO_INSTALL_COMMAND).toContain("exit 1");
-  });
-
-  test("user-facing exec runs as the work user, root only via legacy volume, missing view, or sudo", () => {
-    const wrapped = userExecCommand("echo 'hi there'");
-    expect(wrapped).toContain("runuser -u cmux -- env HOME=/home/cmux USER=cmux LOGNAME=cmux sh -c 'echo '\\''hi there'\\'''");
-    // Legacy sandboxes (volume at /root) keep the historical root exec.
-    expect(wrapped).toContain("if mountpoint -q /root 2>/dev/null; then cd /root 2>/dev/null || exit 75; exec env HOME=/root sh -c");
-    // Volume mounted but the view missing: root exec homed on the persistent
-    // backing path, matching where the daemon fail-over puts sessions.
-    expect(wrapped).toContain(
-      "elif mountpoint -q /cmux/home 2>/dev/null && ! mountpoint -q /home/cmux 2>/dev/null; then if mountpoint -q /cmux/home 2>/dev/null; then cd /cmux/home 2>/dev/null || exit 75; exec env HOME=/cmux/home sh -c",
-    );
-    // No user/runuser: fall back to root, keeping state on the mounted volume
-    // when one exists and using the rootfs home only without a volume.
-    expect(wrapped).toContain(
-      "elif mountpoint -q /cmux/home 2>/dev/null; then if mountpoint -q /cmux/home 2>/dev/null; then cd /cmux/home 2>/dev/null || exit 75; exec env HOME=/cmux/home sh -c",
-    );
-    expect(wrapped).toContain("else cd /home/cmux 2>/dev/null || exit 75; exec env HOME=/home/cmux sh -c");
-
-    // The provider marks volume-backed sandboxes from the Blaxel spec. If the
-    // mount is late or gone, exec must fail closed instead of writing to the
-    // disposable rootfs home.
-    const guarded = userExecCommand("echo 'hi there'", { persistentVolumeExpected: true });
-    expect(guarded).toContain("if ! mountpoint -q /root 2>/dev/null && ! mountpoint -q /cmux/home 2>/dev/null; then exit 75; fi");
-    expect(guarded).toContain("else exit 75; fi");
-    expect(guarded).not.toContain("else cd /home/cmux 2>/dev/null; exec env HOME=/home/cmux sh -c");
-  });
-});
-
-describe("BlaxelProvider home volume lifecycle", () => {
-  test("create rollback deletes the per-machine home volume it provisioned", async () => {
-    const prevKey = process.env.BL_API_KEY;
-    const prevWs = process.env.BL_WORKSPACE;
-    const prevDomain = process.env.CMUX_VM_BLAXEL_CUSTOM_DOMAIN;
-    process.env.BL_API_KEY = "test-key";
-    process.env.BL_WORKSPACE = "cmux";
-    delete process.env.CMUX_VM_BLAXEL_CUSTOM_DOMAIN;
-    const originalFetch = globalThis.fetch;
-    const calls: Array<{ method: string; url: string }> = [];
-    let machineName = "";
-    globalThis.fetch = (async (input: string | URL | Request, init?: RequestInit) => {
-      const url = typeof input === "string" ? input : input instanceof URL ? input.toString() : input.url;
-      const method = init?.method ?? "GET";
-      calls.push({ method, url });
-      const respond = (status: number, body?: unknown) =>
-        new Response(body === undefined ? "" : JSON.stringify(body), {
-          status,
-          headers: { "content-type": "application/json" },
-        });
-      if (method === "POST" && url.endsWith("/volumes")) return respond(200, {});
-      if (method === "POST" && url.endsWith("/sandboxes")) {
-        const parsed = JSON.parse(String(init?.body)) as { metadata?: { name?: string } };
-        machineName = parsed.metadata?.name ?? "";
-        return respond(200, { metadata: { name: machineName, url: "https://sandbox-api.test" } });
-      }
-      // The first bootstrap write fails hard (a non-404/503 status is not retried by
-      // awaitSandboxApi), which forces create's rollback path.
-      if (method === "PUT" && url.startsWith("https://sandbox-api.test/filesystem/")) return respond(500, { error: "boom" });
-      if (method === "GET" && url.includes("/previews/")) return respond(404, {});
-      if (method === "POST" && url.includes("/previews")) {
-        return respond(200, { spec: { url: "https://abc123.us-pdx-1.preview.bl.run", public: false } });
-      }
-      if (method === "DELETE" && url.includes("/sandboxes/")) return respond(200, {});
-      if (method === "DELETE" && url.includes("/volumes/")) return respond(200, {});
-      return respond(500, { error: `unexpected ${method} ${url}` });
-    }) as typeof fetch;
-    try {
-      const provider = new BlaxelProvider();
-      await expect(
-        provider.create({
-          image: "blaxel/base-image:latest",
-          homeVolume: "cmux-home-testuser-{machine}",
-          memoryMb: 4096,
-        }),
-      ).rejects.toThrow();
-      expect(machineName).not.toBe("");
-      const sandboxDelete = calls.findIndex((call) => call.method === "DELETE" && call.url.endsWith(`/sandboxes/${machineName}`));
-      const volumeDelete = calls.findIndex((call) => call.method === "DELETE" && call.url.endsWith(`/volumes/cmux-home-testuser-${machineName}`));
-      expect(sandboxDelete).toBeGreaterThan(-1);
-      // Without volume cleanup the per-machine volume leaks forever: a retried create
-      // generates a fresh machine name, so nothing ever reattaches (or frees) the old
-      // volume, and Blaxel bills per-volume storage monotonically.
-      expect(volumeDelete).toBeGreaterThan(-1);
-      expect(volumeDelete).toBeGreaterThan(sandboxDelete);
-    } finally {
-      globalThis.fetch = originalFetch;
-      if (prevKey === undefined) delete process.env.BL_API_KEY;
-      else process.env.BL_API_KEY = prevKey;
-      if (prevWs === undefined) delete process.env.BL_WORKSPACE;
-      else process.env.BL_WORKSPACE = prevWs;
-      if (prevDomain === undefined) delete process.env.CMUX_VM_BLAXEL_CUSTOM_DOMAIN;
-      else process.env.CMUX_VM_BLAXEL_CUSTOM_DOMAIN = prevDomain;
-    }
-  });
-});
-
-describe("BlaxelProvider deleteHomeVolume", () => {
-  type VolumeCall = { method: string; url: string };
-
-  function withBlaxelFetch(handler: (call: VolumeCall) => { status: number; body?: unknown }) {
-    const prevKey = process.env.BL_API_KEY;
-    const prevWs = process.env.BL_WORKSPACE;
-    process.env.BL_API_KEY = "test-key";
-    process.env.BL_WORKSPACE = "cmux";
-    const originalFetch = globalThis.fetch;
-    const calls: VolumeCall[] = [];
-    globalThis.fetch = (async (input: string | URL | Request, init?: RequestInit) => {
-      const url = typeof input === "string" ? input : input instanceof URL ? input.toString() : input.url;
-      const call = { method: init?.method ?? "GET", url };
-      calls.push(call);
-      const result = handler(call);
-      return new Response(result.body === undefined ? "" : JSON.stringify(result.body), {
-        status: result.status,
-        headers: { "content-type": "application/json" },
-      });
-    }) as typeof fetch;
-    return {
-      calls,
-      restore: () => {
-        globalThis.fetch = originalFetch;
-        if (prevKey === undefined) delete process.env.BL_API_KEY;
-        else process.env.BL_API_KEY = prevKey;
-        if (prevWs === undefined) delete process.env.BL_WORKSPACE;
-        else process.env.BL_WORKSPACE = prevWs;
-      },
-    };
-  }
-
-  test("deletes the volume by name", async () => {
-    const mock = withBlaxelFetch(() => ({ status: 200, body: {} }));
-    try {
-      await new BlaxelProvider().deleteHomeVolume("cmux-home-x-noble-wren");
-      expect(mock.calls).toEqual([
-        { method: "DELETE", url: "https://api.blaxel.ai/v0/volumes/cmux-home-x-noble-wren" },
-      ]);
-    } finally {
-      mock.restore();
-    }
-  });
-
-  test("an already-missing volume is success", async () => {
-    const mock = withBlaxelFetch(() => ({ status: 404, body: { error: "Volume does not exist" } }));
-    try {
-      await new BlaxelProvider().deleteHomeVolume("cmux-home-x-noble-wren");
-      expect(mock.calls).toHaveLength(1);
-    } finally {
-      mock.restore();
-    }
-  });
-
-  test("retries through the volume-still-attached window", async () => {
-    let attempts = 0;
-    const mock = withBlaxelFetch(() => {
-      attempts += 1;
-      return attempts <= 2
-        ? { status: 409, body: { error: "Volume is currently attached to a sandbox" } }
-        : { status: 200, body: {} };
-    });
-    try {
-      await new BlaxelProvider().deleteHomeVolume("cmux-home-x-noble-wren", { retryDelaysMs: [0, 0, 0] });
-      expect(mock.calls).toHaveLength(3);
-    } finally {
-      mock.restore();
-    }
-  });
-
-  test("gives up after the bounded retry budget", async () => {
-    const mock = withBlaxelFetch(() => ({ status: 409, body: { error: "Volume is currently attached to a sandbox" } }));
-    try {
-      await expect(
-        new BlaxelProvider().deleteHomeVolume("cmux-home-x-noble-wren", { retryDelaysMs: [0] }),
-      ).rejects.toThrow("409");
-      expect(mock.calls).toHaveLength(2);
-    } finally {
-      mock.restore();
-    }
-  });
-
-  test("does not retry non-conflict failures", async () => {
-    const mock = withBlaxelFetch(() => ({ status: 500, body: { error: "boom" } }));
-    try {
-      await expect(
-        new BlaxelProvider().deleteHomeVolume("cmux-home-x-noble-wren", { retryDelaysMs: [0, 0] }),
-      ).rejects.toThrow("500");
-      expect(mock.calls).toHaveLength(1);
-    } finally {
-      mock.restore();
-    }
-  });
-
-  test("create rollback keeps a shared (fixed-name) home volume", async () => {
-    const prevKey = process.env.BL_API_KEY;
-    const prevWs = process.env.BL_WORKSPACE;
-    const prevDomain = process.env.CMUX_VM_BLAXEL_CUSTOM_DOMAIN;
-    process.env.BL_API_KEY = "test-key";
-    process.env.BL_WORKSPACE = "cmux";
-    delete process.env.CMUX_VM_BLAXEL_CUSTOM_DOMAIN;
-    const originalFetch = globalThis.fetch;
-    const calls: VolumeCall[] = [];
-    globalThis.fetch = (async (input: string | URL | Request, init?: RequestInit) => {
-      const url = typeof input === "string" ? input : input instanceof URL ? input.toString() : input.url;
-      const method = init?.method ?? "GET";
-      calls.push({ method, url });
-      const respond = (status: number, body?: unknown) =>
-        new Response(body === undefined ? "" : JSON.stringify(body), {
-          status,
-          headers: { "content-type": "application/json" },
-        });
-      if (method === "POST" && url.endsWith("/volumes")) return respond(200, {});
-      if (method === "POST" && url.endsWith("/sandboxes")) {
-        const parsed = JSON.parse(String(init?.body)) as { metadata?: { name?: string } };
-        return respond(200, { metadata: { name: parsed.metadata?.name ?? "", url: "https://sandbox-api.test" } });
-      }
-      if (method === "PUT" && url.startsWith("https://sandbox-api.test/filesystem/")) return respond(500, { error: "boom" });
-      if (method === "GET" && url.includes("/previews/")) return respond(404, {});
-      if (method === "POST" && url.includes("/previews")) {
-        return respond(200, { spec: { url: "https://abc123.us-pdx-1.preview.bl.run", public: false } });
-      }
-      if (method === "DELETE" && url.includes("/sandboxes/")) return respond(200, {});
-      return respond(500, { error: `unexpected ${method} ${url}` });
-    }) as typeof fetch;
-    try {
-      await expect(
-        new BlaxelProvider().create({
-          image: "blaxel/base-image:latest",
-          // No {machine} token: this is the user's shared durable home. A retried
-          // create reattaches it by name, so rollback must leave it alone.
-          homeVolume: "cmux-home-shared-user",
-          memoryMb: 4096,
-        }),
-      ).rejects.toThrow();
-      expect(calls.some((call) => call.method === "DELETE" && call.url.includes("/volumes/"))).toBe(false);
-      expect(calls.some((call) => call.method === "DELETE" && call.url.includes("/sandboxes/"))).toBe(true);
-    } finally {
-      globalThis.fetch = originalFetch;
-      if (prevKey === undefined) delete process.env.BL_API_KEY;
-      else process.env.BL_API_KEY = prevKey;
-      if (prevWs === undefined) delete process.env.BL_WORKSPACE;
-      else process.env.BL_WORKSPACE = prevWs;
-      if (prevDomain === undefined) delete process.env.CMUX_VM_BLAXEL_CUSTOM_DOMAIN;
-      else process.env.CMUX_VM_BLAXEL_CUSTOM_DOMAIN = prevDomain;
-    }
-  });
-});
diff --git a/web/tests/vm-blaxel-cmux-tui.test.ts b/web/tests/vm-cmux-tui.test.ts
similarity index 98%
rename from web/tests/vm-blaxel-cmux-tui.test.ts
rename to web/tests/vm-cmux-tui.test.ts
index a5bcf7809a84..b04507953bcd 100644
--- a/web/tests/vm-blaxel-cmux-tui.test.ts
+++ b/web/tests/vm-cmux-tui.test.ts
@@ -6,14 +6,13 @@ import { describe, expect, test } from "bun:test";
 import {
   CMUX_CLOUD_LAYOUT,
   cmuxTuiDaemonCommand,
-  cmuxTuiPreviewBranded,
   cmuxTuiInstallCommand,
   cmuxTuiPinCheckCommand,
   cmuxTuiManifestUrl,
+  cmuxTuiPersistentMountWait,
   parseCmuxTuiManifest,
   parseEnrollmentInvitationUri,
-} from "../services/vms/drivers/blaxel";
-import { cmuxTuiPersistentMountWait } from "../services/vms/drivers/cmuxTuiDaemon";
+} from "../services/vms/drivers/cmuxTuiDaemon";
 
 const SHA = "c7a3155341a85a2f10a873d69a041bdf1855ec059a802e58e0779a7a6bdec607";
 const COMMIT = "5a4780614cecd8e8ef040a24478f928ef31cc4ae";
@@ -789,12 +788,3 @@ describe("enrollment invitation parsing", () => {
     expect(() => parseEnrollmentInvitationUri(missing)).toThrow(/id or expiry/);
   });
 });
-
-describe("daemon preview host selection", () => {
-  test("only clients that send a User-Agent get the branded machine host", () => {
-    expect(cmuxTuiPreviewBranded(["direct-ws-user-agent"])).toBe(true);
-    expect(cmuxTuiPreviewBranded(["something-else", "direct-ws-user-agent"])).toBe(true);
-    expect(cmuxTuiPreviewBranded([])).toBe(false);
-    expect(cmuxTuiPreviewBranded(undefined)).toBe(false);
-  });
-});
diff --git a/web/tests/vm-create-kill-switch.test.ts b/web/tests/vm-create-kill-switch.test.ts
index 7e00160e2ea1..a45a86ef83c1 100644
--- a/web/tests/vm-create-kill-switch.test.ts
+++ b/web/tests/vm-create-kill-switch.test.ts
@@ -5,19 +5,19 @@ import { isVmCreateDisabledError } from "../services/vms/errors";
 
 describe("VM create kill switch", () => {
   test("unset flags mean enabled", () => {
-    expect(vmCreateDisabledReason("blaxel", {})).toBeNull();
+    expect(vmCreateDisabledReason("e2b", {})).toBeNull();
     expect(vmCreateDisabledReason("freestyle", {})).toBeNull();
   });
 
   test("the global flag disables every provider", () => {
-    expect(vmCreateDisabledReason("blaxel", { CMUX_VM_CREATE_ENABLED: "0" })).toContain("disabled");
+    expect(vmCreateDisabledReason("e2b", { CMUX_VM_CREATE_ENABLED: "0" })).toContain("disabled");
     expect(vmCreateDisabledReason("freestyle", { CMUX_VM_CREATE_ENABLED: "off" })).toContain("disabled");
   });
 
   test("a provider flag disables only that provider", () => {
-    const env = { CMUX_VM_BLAXEL_ENABLED: "false" };
-    expect(vmCreateDisabledReason("blaxel", env)).toContain("blaxel");
-    expect(vmCreateDisabledReason("freestyle", env)).toBeNull();
+    const env = { CMUX_VM_FREESTYLE_ENABLED: "false" };
+    expect(vmCreateDisabledReason("freestyle", env)).toContain("freestyle");
+    expect(vmCreateDisabledReason("e2b", env)).toBeNull();
   });
 
   test("assertVmCreateEnabled throws the typed error", () => {
diff --git a/web/tests/vm-daytona-provider.test.ts b/web/tests/vm-daytona-provider.test.ts
index ad2f18339539..03f3b19aa7f4 100644
--- a/web/tests/vm-daytona-provider.test.ts
+++ b/web/tests/vm-daytona-provider.test.ts
@@ -5,7 +5,7 @@ import { DaytonaProvider } from "../services/vms/drivers/daytona";
 import { ProviderError } from "../services/vms/drivers/types";
 
 // Daytona machines attach exclusively through the cmux-tui remote daemon
-// (transport cmux-remote), same as Blaxel. The legacy websocket PTY and SSH
+// (transport cmux-remote), same as every other driver. The legacy websocket PTY and SSH
 // surfaces must refuse loudly so callers migrate instead of hanging.
 
 describe("DaytonaProvider session transports", () => {
diff --git a/web/tests/vm-desktop-wrapper.test.ts b/web/tests/vm-desktop-wrapper.test.ts
index cf103d94988e..f61399da377b 100644
--- a/web/tests/vm-desktop-wrapper.test.ts
+++ b/web/tests/vm-desktop-wrapper.test.ts
@@ -6,12 +6,13 @@ import {
 } from "../services/vms/desktopWrapper";
 
 describe("desktop upstream host allowlist", () => {
-  test("branded and gateway preview hosts pass", () => {
+  test("the branded machine host passes", () => {
     expect(isAllowedDesktopUpstreamHost("tidy-heron-6901.vm.cmux.sh")).toBe(true);
-    expect(isAllowedDesktopUpstreamHost("noble-wren-cmux.preview.bl.run")).toBe(true);
   });
 
   test("anything else fails closed", () => {
+    // The retired gateway's own preview domain is no longer trusted.
+    expect(isAllowedDesktopUpstreamHost("noble-wren-cmux.preview.bl.run")).toBe(false);
     expect(isAllowedDesktopUpstreamHost("evil.example.com")).toBe(false);
     expect(isAllowedDesktopUpstreamHost("vm.cmux.sh")).toBe(false);
     expect(isAllowedDesktopUpstreamHost("x.vm.cmux.sh.evil.com")).toBe(false);
diff --git a/web/tests/vm-devbox-image.test.ts b/web/tests/vm-devbox-image.test.ts
index e914ce2335ec..afd8b5c3ee04 100644
--- a/web/tests/vm-devbox-image.test.ts
+++ b/web/tests/vm-devbox-image.test.ts
@@ -16,30 +16,18 @@ import { DEVBOX_TEMPLATE_FILES, devboxAgentPins } from "../scripts/devbox-image-
 // (services/vms/images/devbox), consumed by build-devbox-e2b.ts,
 // build-devbox-daytona.ts, and build-devbox-freestyle.ts. These pin the
 // pieces other code depends on: the cmux-tui daemon contract each driver
-// expects, Blaxel-template parity for the shared shell/agent files, and the
-// E2B Dockerfile-parser restrictions. Same rationale as
-// vm-blaxel-image.test.ts: the template IS the artifact.
+// expects and the E2B Dockerfile-parser restrictions. The template IS the
+// artifact, so it is pinned here rather than only exercised by a live bake.
 
 const templateDir = path.join(import.meta.dirname, "../services/vms/images/devbox");
-const blaxelDir = path.join(import.meta.dirname, "../services/vms/images/blaxel");
 const scriptsDir = path.join(import.meta.dirname, "../scripts");
 const read = (name: string) => readFileSync(path.join(templateDir, name), "utf8");
-const readBlaxel = (name: string) => readFileSync(path.join(blaxelDir, name), "utf8");
 const readScript = (name: string) => readFileSync(path.join(scriptsDir, name), "utf8");
 
 const dockerfile = read("Dockerfile");
 const bashrc = read("cmux-bashrc");
-const agentConfig = read("agent-config.sh");
 const devboxBoot = read("cmux-devbox-boot");
 
-// Comment/blank stripping: the devbox copies of the Blaxel-shared files may
-// differ only in their header comments (each names its parity source).
-const body = (text: string): string =>
-  text
-    .split("\n")
-    .filter((line) => line.trim() !== "" && !line.trimStart().startsWith("#"))
-    .join("\n");
-
 // A throwaway local HTTP server standing in for the coderouter opencode
 // config endpoint, and a shell run sourcing the generator against it.
 const listen = (
@@ -110,51 +98,6 @@ describe("devbox image template", () => {
     expect(result.status).toBe(0);
   });
 
-  test("shared files stay in lockstep with the Blaxel template", () => {
-    // Byte-identical data files; comment-normalized shell files (headers
-    // name their own parity source).
-    expect(read("seed-history")).toBe(readBlaxel("seed-history"));
-    expect(read("chrome-managed-policy.json")).toBe(readBlaxel("chrome-managed-policy.json"));
-    expect(body(bashrc)).toBe(body(readBlaxel("cmux-bashrc")));
-    expect(body(agentConfig)).toBe(body(readBlaxel("agent-config.sh")));
-  });
-
-  test("agent and CUA driver pins match the Blaxel template", () => {
-    const blaxelDockerfile = readBlaxel("Dockerfile");
-    const args = [
-      "CMUX_IMAGE_CLAUDE_CODE_VERSION",
-      "CMUX_IMAGE_CODEX_VERSION",
-      "CMUX_IMAGE_OPENCODE_VERSION",
-      "CMUX_IMAGE_PI_VERSION",
-      "CMUX_IMAGE_AGENT_BROWSER_VERSION",
-    ];
-    for (const arg of args) {
-      const devboxPin = new RegExp(`^ARG ${arg}=(\\S+)$`, "m").exec(dockerfile)?.[1];
-      const blaxelPin = new RegExp(`^ARG ${arg}=(\\S+)$`, "m").exec(blaxelDockerfile)?.[1];
-      expect({ arg, pin: devboxPin }).toEqual({ arg, pin: blaxelPin });
-      expect(devboxPin).toMatch(/^\d+\.\d+\.\d+$/);
-    }
-    // The build scripts derive their pins from the same ARGs.
-    expect(devboxAgentPins(dockerfile).map((pin) => pin.pkg)).toEqual([
-      "@anthropic-ai/claude-code",
-      "@openai/codex",
-      "opencode-ai",
-      "@earendil-works/pi-coding-agent",
-      "agent-browser",
-    ]);
-
-    const cuaVersion = (source: string): string | undefined =>
-      /CUA_DRIVER_RS_VERSION=(\S+)/.exec(source)?.[1];
-    const devboxCuaVersion = cuaVersion(dockerfile);
-    expect({ tool: "cua-driver", pin: devboxCuaVersion }).toEqual({
-      tool: "cua-driver",
-      pin: cuaVersion(blaxelDockerfile),
-    });
-    expect(readScript("build-devbox-freestyle.ts")).toContain(
-      `CUA_DRIVER_RS_VERSION=${devboxCuaVersion}`,
-    );
-  });
-
   test("ble.sh integration stays minimal: no token highlighting, ghost text only", () => {
     // User feedback 2026-08-31: any token highlighting (colored backgrounds
     // under mistyped commands included) reads as noise. The bashrc turns the
@@ -259,33 +202,62 @@ describe("devbox image template", () => {
     );
   });
 
-  test("the beta SDK serves the bake, verify, and beta driver arm; the legacy arm stays on 0.1.51", () => {
-    expect(readScript("build-devbox-freestyle.ts")).toContain('from "freestyle-beta"');
-    expect(readScript("verify-devbox-image.ts")).toContain('from "freestyle-beta"');
-    // The freestyle bake's systemd unit binds the daemon dual-stack: the beta
+  test("agent and CUA driver pins are exact and reach the build scripts", () => {
+    for (const arg of [
+      "CMUX_IMAGE_CLAUDE_CODE_VERSION",
+      "CMUX_IMAGE_CODEX_VERSION",
+      "CMUX_IMAGE_OPENCODE_VERSION",
+      "CMUX_IMAGE_PI_VERSION",
+      "CMUX_IMAGE_AGENT_BROWSER_VERSION",
+    ]) {
+      const devboxPin = new RegExp(`^ARG ${arg}=(\\S+)$`, "m").exec(dockerfile)?.[1];
+      // Ranges and floating tags would make a bake unreproducible.
+      expect({ arg, exact: /^\d+\.\d+\.\d+$/.test(devboxPin ?? "") }).toEqual({ arg, exact: true });
+    }
+    // The build scripts derive their pins from the same ARGs.
+    expect(devboxAgentPins(dockerfile).map((pin) => pin.pkg)).toEqual([
+      "@anthropic-ai/claude-code",
+      "@openai/codex",
+      "opencode-ai",
+      "@earendil-works/pi-coding-agent",
+      "agent-browser",
+    ]);
+
+    const devboxCuaVersion = /CUA_DRIVER_RS_VERSION=(\S+)/.exec(dockerfile)?.[1];
+    expect(devboxCuaVersion).toBeTruthy();
+    expect(readScript("build-devbox-freestyle.ts")).toContain(
+      `CUA_DRIVER_RS_VERSION=${devboxCuaVersion}`,
+    );
+  });
+
+  test("one public-platform SDK serves the bake, the verifier, and the driver", () => {
+    // There is a single Freestyle arm now: the public platform on freestyle@0.2.x.
+    // A stray `freestyle-beta` alias would silently send one of these three at
+    // the retired beta-api endpoint.
+    expect(readScript("build-devbox-freestyle.ts")).toContain('from "freestyle"');
+    expect(readScript("build-devbox-freestyle.ts")).not.toContain("freestyle-beta");
+    expect(readScript("verify-devbox-image.ts")).toContain('from "freestyle"');
+    expect(readScript("verify-devbox-image.ts")).not.toContain("freestyle-beta");
+    // The freestyle bake's systemd unit binds the daemon dual-stack: the
     // driver's route is the VM's public IPv6 straight to port 1337.
     expect(readScript("build-devbox-freestyle.ts")).toContain(
       "Environment=CMUX_TUI_REMOTE_WS_BIND=[::]:1337",
     );
-    // The freestyle driver spans both platforms: the legacy arm (existing
-    // production machines) keeps the 0.1.51 SDK, the beta arm rides the alias.
+    // Both the bake and the verifier must pin root: the 0.2 API's default guest
+    // user is uid 1000, which the devbox image ships.
+    expect(readScript("build-devbox-freestyle.ts")).toContain('linuxUser: "root"');
+    expect(readScript("verify-devbox-image.ts")).toContain('linuxUser: "root"');
     const driver = readFileSync(
       path.join(import.meta.dirname, "../services/vms/drivers/freestyle.ts"),
       "utf8",
     );
     expect(driver).toContain('from "freestyle"');
-    expect(driver).toContain('from "./freestyleBeta"');
-    const betaArm = readFileSync(
-      path.join(import.meta.dirname, "../services/vms/drivers/freestyleBeta.ts"),
-      "utf8",
-    );
-    expect(betaArm).toContain('from "freestyle-beta"');
-    expect(betaArm).not.toContain('from "freestyle";');
+    expect(driver).not.toContain("freestyle-beta");
     const packageJson = JSON.parse(
       readFileSync(path.join(import.meta.dirname, "../package.json"), "utf8"),
     ) as { dependencies: Record<string, string> };
-    expect(packageJson.dependencies.freestyle).toBe("0.1.51");
-    expect(packageJson.dependencies["freestyle-beta"]).toBe("npm:freestyle@0.2.0-beta.7");
+    expect(packageJson.dependencies.freestyle).toBe("0.2.9");
+    expect(packageJson.dependencies["freestyle-beta"]).toBeUndefined();
   });
 
   test("agent config generator is sourced for every shell family", () => {
diff --git a/web/tests/vm-e2b-provider.test.ts b/web/tests/vm-e2b-provider.test.ts
index 4ddeb7d5af06..0bf67dc8edaa 100644
--- a/web/tests/vm-e2b-provider.test.ts
+++ b/web/tests/vm-e2b-provider.test.ts
@@ -5,7 +5,7 @@ import { E2BProvider, ENVD_CONTROL_PORT, INBOUND_FIREWALL_COMMAND } from "../ser
 import { ProviderError } from "../services/vms/drivers/types";
 
 // E2B machines attach exclusively through the cmux-tui remote daemon
-// (transport cmux-remote), same as Blaxel. The legacy websocket PTY and SSH
+// (transport cmux-remote), same as every other driver. The legacy websocket PTY and SSH
 // surfaces must refuse loudly so callers migrate instead of hanging.
 
 describe("E2BProvider session transports", () => {
@@ -44,7 +44,7 @@ describe("E2BProvider cmux-remote route", () => {
     // which the cmux-tui dialer cannot send (it dials the route verbatim).
     // Sandboxes are therefore created with public port traffic and the
     // daemon's Noise device enrollment gates sessions — the same trust model
-    // as Blaxel's raw preview route.
+    // as a raw provider preview route.
     const driver = readFileSync(
       path.join(import.meta.dirname, "../services/vms/drivers/e2b.ts"),
       "utf8",
diff --git a/web/tests/vm-freestyle-provider.test.ts b/web/tests/vm-freestyle-provider.test.ts
index d9e72206be6a..f30812f6b852 100644
--- a/web/tests/vm-freestyle-provider.test.ts
+++ b/web/tests/vm-freestyle-provider.test.ts
@@ -1,257 +1,75 @@
+import { readFileSync } from "node:fs";
+import path from "node:path";
 import { describe, expect, test } from "bun:test";
-import { FreestyleProvider } from "../services/vms/drivers/freestyle";
 import {
-  FREESTYLE_PLATFORM_METADATA_KEY,
-  freestyleBetaCmuxRemoteRoute,
-  freestyleBetaDaemonHealthyCommand,
-  freestyleBetaFirewallRules,
-  freestyleBetaStartDaemonCommand,
-  isFreestyleBetaSnapshotId,
-  isFreestyleBetaVmId,
-  mapFreestyleBetaState,
-  normalizeFreestyleBetaExecTimeout,
+  FreestyleProvider,
+  freestyleCmuxRemoteRoute,
+  freestyleDaemonHealthyCommand,
+  freestyleFirewallRules,
+  freestyleStartDaemonCommand,
+  mapFreestyleState,
+  normalizeFreestyleExecTimeout,
   renderFreestyleModelPlaneEnvFile,
-} from "../services/vms/drivers/freestyleBeta";
+} from "../services/vms/drivers/freestyle";
 import { ProviderError } from "../services/vms/drivers/types";
-import type {
-  SSHEndpoint,
-  WebSocketPtyEndpoint,
-} from "../services/vms/drivers/types";
 
-// A real beta id/snapshot shape (vm-/sh- + 32 hex) vs the legacy platform's
-// bare 20-char base36 ids; the driver dispatches per machine on this shape.
-const BETA_VM_ID = "vm-d05087e5773e4a978036fc806b0cd759";
-const BETA_SNAPSHOT_ID = "sh-9581282fc6c644b399fd49fdcdbcf130";
-const LEGACY_VM_ID = "t9mstkvydmb4x0tjmnqu";
+const VM_ID = "vm-d05087e5773e4a978036fc806b0cd759";
 
-const sshEndpoint: SSHEndpoint = {
-  transport: "ssh",
-  host: "vm-ssh.freestyle.sh",
-  port: 22,
-  username: "vm-1+cmux",
-  publicKeyFingerprint: null,
-  credential: { kind: "password", value: "token" },
-  identityHandle: "identity-1",
-};
-
-const websocketEndpoint: WebSocketPtyEndpoint = {
-  transport: "websocket",
-  url: "wss://vm-1.vm.freestyle.sh/terminal",
-  headers: {},
-  token: "pty-token",
-  sessionId: "pty-session",
-  attachmentId: "attachment-1",
-  expiresAtUnix: Math.floor(Date.now() / 1000) + 300,
-};
-
-class TestFreestyleProvider extends FreestyleProvider {
-  websocketResult: WebSocketPtyEndpoint | Error = websocketEndpoint;
-  sshCalls = 0;
-
-  override async openWebSocketPty(_vmId: string): Promise<WebSocketPtyEndpoint> {
-    if (this.websocketResult instanceof Error) {
-      throw this.websocketResult;
-    }
-    return this.websocketResult;
-  }
-
-  override async openSSH(_vmId: string): Promise<SSHEndpoint> {
-    this.sshCalls += 1;
-    return sshEndpoint;
-  }
-}
-
-describe("FreestyleProvider attach fallback", () => {
-  test("does not fall back to SSH when a required daemon attach is unavailable", async () => {
-    const provider = new TestFreestyleProvider();
-    provider.websocketResult = new Error("Freestyle cmuxd websocket health check returned 502");
-
-    await expect(provider.openAttach("vm-1", { requireDaemon: true })).rejects.toThrow(
-      "Freestyle cmuxd websocket health check returned 502",
-    );
-
-    expect(provider.sshCalls).toBe(0);
-  });
-
-  test("does not fall back to SSH when required daemon health check times out", async () => {
-    const provider = new TestFreestyleProvider();
-    provider.websocketResult = new Error(
-      "Freestyle cmuxd websocket health check failed: The operation was aborted",
-    );
-
-    await expect(provider.openAttach("vm-1", { requireDaemon: true })).rejects.toThrow(
-      "Freestyle cmuxd websocket health check failed",
-    );
-
-    expect(provider.sshCalls).toBe(0);
-  });
-
-  test("keeps SSH fallback for non-daemon attach when WebSocket is unavailable", async () => {
-    const provider = new TestFreestyleProvider();
-    provider.websocketResult = new Error("Freestyle cmuxd websocket health check returned 502");
-
-    const endpoint = await provider.openAttach("vm-1");
-
-    expect(endpoint).toEqual(sshEndpoint);
-    expect(provider.sshCalls).toBe(1);
-  });
-
-  test("does not mint SSH credentials for unexpected attach errors", async () => {
-    const provider = new TestFreestyleProvider();
-    provider.websocketResult = new Error("Freestyle API returned 401");
-
-    await expect(provider.openAttach("vm-1", { requireDaemon: true })).rejects.toThrow(
-      "Freestyle API returned 401",
-    );
-    expect(provider.sshCalls).toBe(0);
-  });
-
-  test("does not fall back to SSH when required daemon metadata is missing", async () => {
-    const provider = new TestFreestyleProvider();
-    provider.websocketResult = websocketEndpoint;
-
-    await expect(provider.openAttach("vm-1", { requireDaemon: true })).rejects.toThrow(
-      "requires a cmuxd RPC endpoint",
-    );
-
-    expect(provider.sshCalls).toBe(0);
-  });
-
-  test("keeps WebSocket attach when daemon metadata is present", async () => {
-    const provider = new TestFreestyleProvider();
-    const endpointWithDaemon: WebSocketPtyEndpoint = {
-      ...websocketEndpoint,
-      daemon: {
-        url: "wss://vm-1.vm.freestyle.sh/rpc",
-        headers: {},
-        token: "rpc-token",
-        sessionId: "rpc-session",
-        expiresAtUnix: Math.floor(Date.now() / 1000) + 600,
-      },
-    };
-    provider.websocketResult = endpointWithDaemon;
-
-    const endpoint = await provider.openAttach("vm-1", { requireDaemon: true });
-
-    expect(endpoint).toEqual(endpointWithDaemon);
-    expect(provider.sshCalls).toBe(0);
-  });
-
-  test("keeps daemon attach when Freestyle exec probe fails but websocket admin is healthy", async () => {
-    const originalFetch = globalThis.fetch;
-    const originalApiKey = process.env.FREESTYLE_API_KEY;
-    process.env.FREESTYLE_API_KEY = "test-freestyle-api-key";
-    const urls: string[] = [];
-    globalThis.fetch = (async (input, init) => {
-      const url = input instanceof Request ? input.url : String(input);
-      urls.push(url);
-      if (url === "https://vm-1.vm.freestyle.sh/healthz") {
-        return new Response("ok", { status: 200 });
-      }
-      if (url === "https://vm-1.vm.freestyle.sh/admin/leases") {
-        expect(init?.method).toBe("POST");
-        return new Response("ok", { status: 200 });
-      }
-      return new Response(JSON.stringify({ error: "INTERNAL_ERROR", message: "Internal server error" }), {
-        status: 500,
-        headers: { "content-type": "application/json" },
-      });
-    }) as typeof fetch;
-
-    try {
-      const provider = new FreestyleProvider();
-      const endpoint = await provider.openAttach("vm-1", {
-        requireDaemon: true,
-        providerMetadata: { freestyleDaemonAdminToken: "admin-token" },
-      });
-
-      expect(endpoint.transport).toBe("websocket");
-      if (endpoint.transport !== "websocket") {
-        throw new Error("expected websocket attach endpoint");
-      }
-      expect(endpoint.url).toBe("wss://vm-1.vm.freestyle.sh/terminal");
-      expect(endpoint.daemon?.url).toBe("wss://vm-1.vm.freestyle.sh/rpc");
-      expect(urls).toContain("https://vm-1.vm.freestyle.sh/healthz");
-      expect(urls).toContain("https://vm-1.vm.freestyle.sh/admin/leases");
-    } finally {
-      globalThis.fetch = originalFetch;
-      if (originalApiKey === undefined) {
-        delete process.env.FREESTYLE_API_KEY;
-      } else {
-        process.env.FREESTYLE_API_KEY = originalApiKey;
-      }
-    }
-  });
-});
-
-describe("Freestyle platform dispatch", () => {
-  test("beta ids are vm-<32 hex>; legacy ids and near-misses stay legacy", () => {
-    expect(isFreestyleBetaVmId(BETA_VM_ID)).toBe(true);
-    expect(isFreestyleBetaVmId(LEGACY_VM_ID)).toBe(false);
-    expect(isFreestyleBetaVmId("vm-1")).toBe(false); // legacy test fixtures
-    expect(isFreestyleBetaVmId("vm-D05087E5773E4A978036FC806B0CD759")).toBe(false);
-  });
-
-  test("beta snapshots are sh-<32 hex>; legacy sh-/sc- + 20 base36 stay legacy", () => {
-    expect(isFreestyleBetaSnapshotId(BETA_SNAPSHOT_ID)).toBe(true);
-    expect(isFreestyleBetaSnapshotId("sh-6ch5p9k23xrcx24056n8")).toBe(false);
-    expect(isFreestyleBetaSnapshotId("sc-mt237w1nd7c7673bd03m")).toBe(false);
-  });
-
-  test("attachTransports is the union across both platforms", () => {
-    // cmux-remote-only would make the workflow gate refuse openAttach for the
-    // whole legacy fleet; the per-machine refusal lives inside the methods.
+describe("FreestyleProvider transport contract", () => {
+  test("cmux-remote is the only session transport", () => {
     const provider = new FreestyleProvider();
-    expect(provider.attachTransports).toEqual(["cmux-remote", "websocket", "ssh"]);
+    expect(provider.attachTransports).toEqual(["cmux-remote"]);
     expect(typeof provider.openCmuxRemote).toBe("function");
     expect(typeof provider.approveCmuxRemoteEnrollment).toBe("function");
   });
 
-  test("openAttach on a beta machine refuses and names cmux-remote", async () => {
-    const provider = new TestFreestyleProvider();
-    await expect(provider.openAttach(BETA_VM_ID)).rejects.toThrow("cmux-remote");
-    await expect(
-      provider.openAttach("vm-1", { providerMetadata: { [FREESTYLE_PLATFORM_METADATA_KEY]: "beta" } }),
-    ).rejects.toThrow("cmux-remote");
-    expect(provider.sshCalls).toBe(0);
+  test("openAttach refuses and names cmux-remote", async () => {
+    const provider = new FreestyleProvider();
+    await expect(provider.openAttach(VM_ID)).rejects.toThrow(ProviderError);
+    await expect(provider.openAttach(VM_ID)).rejects.toThrow("cmux-remote");
   });
 
-  test("openCmuxRemote on a legacy machine refuses and names recreation", async () => {
+  test("openSSH refuses: the public platform has no SSH gateway", async () => {
     const provider = new FreestyleProvider();
-    await expect(provider.openCmuxRemote(LEGACY_VM_ID)).rejects.toThrow(ProviderError);
-    await expect(provider.openCmuxRemote(LEGACY_VM_ID)).rejects.toThrow("beta devbox image");
-    await expect(provider.approveCmuxRemoteEnrollment(LEGACY_VM_ID, "inv-1")).rejects.toThrow(ProviderError);
+    await expect(provider.openSSH(VM_ID)).rejects.toThrow(ProviderError);
+    await expect(provider.openSSH(VM_ID)).rejects.toThrow("cmux-remote");
   });
 
-  test("openSSH and fork refuse on beta machines", async () => {
+  test("revokeSSHIdentity is a no-op, so destroy/cleanup paths stay safe", async () => {
     const provider = new FreestyleProvider();
-    await expect(provider.openSSH(BETA_VM_ID)).rejects.toThrow("cmux-remote");
-    await expect(provider.fork(BETA_VM_ID)).rejects.toThrow("snapshot");
+    await expect(provider.revokeSSHIdentity("identity-1")).resolves.toBeUndefined();
+  });
+
+  test("fork is not implemented, so the capability resolves false", () => {
+    // vmCapabilitiesFor() derives `fork` from the method's existence; a machine
+    // menu must not offer a verb the driver cannot serve.
+    const provider = new FreestyleProvider();
+    expect((provider as { fork?: unknown }).fork).toBeUndefined();
   });
 });
 
-describe("Freestyle beta platform contract", () => {
+describe("Freestyle platform contract", () => {
   test("firewall: outbound open, inbound only the daemon port", () => {
-    expect(freestyleBetaFirewallRules()).toEqual([
+    expect(freestyleFirewallRules()).toEqual([
       { action: "allow", source: {}, destination: { public: true } },
       { action: "allow", source: { public: true }, destination: { port: 1337, protocol: "tcp" } },
     ]);
   });
 
   test("cmux-remote route is the public IPv6 straight to the daemon", () => {
-    expect(freestyleBetaCmuxRemoteRoute("2602:f75c:0:1::2a", BETA_VM_ID)).toBe(
+    expect(freestyleCmuxRemoteRoute("2602:f75c:0:1::2a", VM_ID)).toBe(
       "ws://[2602:f75c:0:1::2a]:1337/v1/link",
     );
-    expect(() => freestyleBetaCmuxRemoteRoute(null, BETA_VM_ID)).toThrow("public IPv6");
-    expect(() => freestyleBetaCmuxRemoteRoute("  ", BETA_VM_ID)).toThrow("public IPv6");
+    expect(() => freestyleCmuxRemoteRoute(null, VM_ID)).toThrow("public IPv6");
+    expect(() => freestyleCmuxRemoteRoute("  ", VM_ID)).toThrow("public IPv6");
   });
 
   test("daemon health requires a v6-table listener; start installs the dual-stack override", () => {
     // 0x0539 = 1337; a 0.0.0.0-bound daemon appears only in /proc/net/tcp and
     // is unreachable at the public IPv6, so it must be restarted.
-    expect(freestyleBetaDaemonHealthyCommand()).toContain("/proc/net/tcp6");
-    expect(freestyleBetaDaemonHealthyCommand()).toContain(":0539 ");
-    const start = freestyleBetaStartDaemonCommand();
+    expect(freestyleDaemonHealthyCommand()).toContain("/proc/net/tcp6");
+    expect(freestyleDaemonHealthyCommand()).toContain(":0539 ");
+    const start = freestyleStartDaemonCommand();
     expect(start).toContain("Environment=CMUX_TUI_REMOTE_WS_BIND=[::]:1337");
     expect(start).toContain("systemctl restart cmux-tui-daemon");
     expect(start).toContain("--remote-ws [::]:1337"); // non-systemd fallback
@@ -277,18 +95,50 @@ describe("Freestyle beta platform contract", () => {
     expect(renderFreestyleModelPlaneEnvFile({ OPENAI_API_KEY: "crt_x" })).toBeNull();
   });
 
-  test("exec timeouts clamp to the beta per-exec cap; killed execs read as 124", () => {
-    expect(normalizeFreestyleBetaExecTimeout(undefined)).toBe(30_000);
-    expect(normalizeFreestyleBetaExecTimeout(-5)).toBe(30_000);
-    expect(normalizeFreestyleBetaExecTimeout(10 * 60 * 1000)).toBe(300_000);
-    expect(normalizeFreestyleBetaExecTimeout(12_345)).toBe(12_345);
+  test("exec timeouts clamp to the per-exec cap; killed execs read as 124", () => {
+    expect(normalizeFreestyleExecTimeout(undefined)).toBe(30_000);
+    expect(normalizeFreestyleExecTimeout(-5)).toBe(30_000);
+    expect(normalizeFreestyleExecTimeout(10 * 60 * 1000)).toBe(300_000);
+    expect(normalizeFreestyleExecTimeout(12_345)).toBe(12_345);
+  });
+
+  test("stopped VMs read as paused (start() recovers them), not destroyed", () => {
+    expect(mapFreestyleState("starting")).toBe("creating");
+    expect(mapFreestyleState("running")).toBe("running");
+    expect(mapFreestyleState("pausing")).toBe("paused");
+    expect(mapFreestyleState("paused")).toBe("paused");
+    expect(mapFreestyleState("stopped")).toBe("paused");
+  });
+});
+
+const driverSource = readFileSync(
+  path.join(import.meta.dirname, "../services/vms/drivers/freestyle.ts"),
+  "utf8",
+);
+
+describe("Freestyle client configuration", () => {
+  test("every guest exec is pinned to root", () => {
+    // The 0.2 API's linuxUser default is uid 1000, not root. The devbox image
+    // ships such a user, so an unpinned exec would silently move the daemon,
+    // its install, and the model-plane write off the root layout.
+    const execCalls = driverSource.match(/\.exec\(\{[\s\S]*?\}\)/g) ?? [];
+    expect(execCalls.length).toBeGreaterThan(0);
+    for (const call of execCalls) {
+      expect(call).toContain("linuxUser");
+    }
+  });
+
+  test("the driver talks to the SDK's default public edge unless overridden", () => {
+    // No hardcoded beta host, and no baseUrl unless FREESTYLE_API_URL says so.
+    expect(driverSource).not.toContain("beta-api.freestyle.sh");
+    expect(driverSource).toContain("process.env.FREESTYLE_API_URL");
   });
 
-  test("stopped beta VMs read as paused (start() recovers them), not destroyed", () => {
-    expect(mapFreestyleBetaState("starting")).toBe("creating");
-    expect(mapFreestyleBetaState("running")).toBe("running");
-    expect(mapFreestyleBetaState("pausing")).toBe("paused");
-    expect(mapFreestyleBetaState("paused")).toBe("paused");
-    expect(mapFreestyleBetaState("stopped")).toBe("paused");
+  test("the beta SDK alias is gone from package.json", () => {
+    const packageJson = JSON.parse(
+      readFileSync(path.join(import.meta.dirname, "../package.json"), "utf8"),
+    ) as { dependencies: Record<string, string> };
+    expect(packageJson.dependencies["freestyle-beta"]).toBeUndefined();
+    expect(packageJson.dependencies.freestyle).toBe("0.2.9");
   });
 });
diff --git a/web/tests/vm-image-resolver.test.ts b/web/tests/vm-image-resolver.test.ts
index 6b7e73f9116c..67e565260afe 100644
--- a/web/tests/vm-image-resolver.test.ts
+++ b/web/tests/vm-image-resolver.test.ts
@@ -1,8 +1,6 @@
 import { describe, expect, test } from "bun:test";
 import {
   reportVmImageConfigError,
-  imageUsesBakedFreestyleSignedAdmin,
-  imageUsesFreestyleBetaPlatform,
   inferVmProviderForImage,
   listVmImageKinds,
   providerImageEnvKey,
@@ -26,123 +24,90 @@ describe("VM image resolver: request by kind", () => {
   const deployed = { VERCEL: "1", VERCEL_ENV: "production" };
 
   test("desktop images get their own env selector; single-variable providers share one", () => {
-    expect(providerImageEnvKey("blaxel")).toBe("BLAXEL_SANDBOX_IMAGE");
-    expect(providerImageEnvKey("blaxel", "base")).toBe("BLAXEL_SANDBOX_IMAGE");
-    expect(providerImageEnvKey("blaxel", "desktop")).toBe("BLAXEL_SANDBOX_DESKTOP_IMAGE");
+    expect(providerImageEnvKey("e2b")).toBe("E2B_CMUXD_WS_TEMPLATE");
+    expect(providerImageEnvKey("e2b", "base")).toBe("E2B_CMUXD_WS_TEMPLATE");
+    // No provider ships a desktop image today, so no provider has a distinct
+    // `_IMAGE`-suffixed selector to split; the generic one serves both kinds.
     expect(providerImageEnvKey("e2b", "desktop")).toBe("E2B_CMUXD_WS_TEMPLATE");
     expect(providerImageEnvKey("freestyle", "desktop")).toBe("FREESTYLE_SANDBOX_SNAPSHOT");
+    expect(providerImageEnvKey("daytona", "desktop")).toBe("DAYTONA_SANDBOX_SNAPSHOT");
   });
 
-  test("kind env var wins over the manifest kind default", () => {
+  test("the kind env var resolves a manifest image of that kind", () => {
     expect(
-      resolveVmImage("blaxel", undefined, {
-        ...deployed,
-        BLAXEL_SANDBOX_DESKTOP_IMAGE: "blaxel/xfce-vnc:latest",
-        BLAXEL_SANDBOX_IMAGE: "blaxel/base-image:latest",
-      }, { kind: "desktop" }),
-    ).toMatchObject({
-      image: "blaxel/xfce-vnc:latest",
-      imageVersion: "blaxel-bootstrap-20260820a",
-      kind: "desktop",
-    });
-    expect(
-      resolveVmImage("blaxel", undefined, {
-        ...deployed,
-        BLAXEL_SANDBOX_DESKTOP_IMAGE: "blaxel/xfce-vnc:latest",
-        BLAXEL_SANDBOX_IMAGE: "blaxel/base-image:latest",
-      }, { kind: "base" }),
-    ).toMatchObject({ image: "blaxel/base-image:latest", imageVersion: "blaxel-base-bootstrap-20260824a", kind: "base" });
-  });
-
-  test("a generic env selector of the other kind falls through to the kind default", () => {
-    // Production reality before kinds existed: BLAXEL_SANDBOX_IMAGE names the
-    // desktop devbox and no desktop-specific selector is set. A kind=base
-    // request must resolve the manifest base default, not 503 on the desktop
-    // image's kind mismatch (seen in prod 2026-08-30 21:58 UTC).
-    expect(
-      resolveVmImage("blaxel", undefined, {
+      resolveVmImage("e2b", undefined, {
         ...deployed,
-        BLAXEL_SANDBOX_IMAGE: "sandbox/cmux-devbox:latest",
+        E2B_CMUXD_WS_TEMPLATE: "cmux-devbox:devbox-20260828b",
       }, { kind: "base" }),
     ).toMatchObject({
-      image: "blaxel/base-image:latest",
-      imageVersion: "blaxel-base-bootstrap-20260824a",
+      image: "cmux-devbox:devbox-20260828b",
+      imageVersion: "e2b-devbox-20260828b",
       kind: "base",
     });
-    // The same env still serves desktop and kind-less requests unchanged.
-    expect(
-      resolveVmImage("blaxel", undefined, {
-        ...deployed,
-        BLAXEL_SANDBOX_IMAGE: "sandbox/cmux-devbox:latest",
-      }, { kind: "desktop" }),
-    ).toMatchObject({ image: "sandbox/cmux-devbox:latest", kind: "desktop" });
-    expect(
-      resolveVmImage("blaxel", undefined, {
-        ...deployed,
-        BLAXEL_SANDBOX_IMAGE: "sandbox/cmux-devbox:latest",
-      }),
-    ).toMatchObject({ image: "sandbox/cmux-devbox:latest" });
   });
 
   test("an explicitly requested image of the wrong kind still errors", () => {
     const err = captureImageConfigError(() =>
-      resolveVmImage("blaxel", "sandbox/cmux-devbox:latest", deployed, { kind: "base" }));
-    expect(err.reason).toMatch(/desktop image, not a base image/);
+      resolveVmImage("e2b", "cmux-devbox:devbox-20260828b", deployed, { kind: "desktop" }));
+    expect(err.reason).toMatch(/base image, not a desktop image/);
   });
 
-  test("deployed runtimes fall back to the manifest kind default instead of throwing", () => {
-    // The nightly app's `vm base open` with no image and nothing configured for
-    // desktop used to 503; now the manifest default desktop image serves it.
-    expect(resolveVmImage("blaxel", undefined, deployed, { kind: "desktop" })).toMatchObject({
-      image: "sandbox/cmux-devbox:latest",
-      imageVersion: "blaxel-cmux-devbox-20260831b",
-      kind: "desktop",
-    });
-    // Without a kind, the legacy contract still requires the env selector.
-    expect(captureImageConfigError(() => resolveVmImage("blaxel", undefined, deployed))).toMatchObject({
-      envVar: "BLAXEL_SANDBOX_IMAGE",
+  test("no provider ships a desktop image, so every desktop request fails closed", () => {
+    // The desktop kind and its noVNC wrapper are kept as a seam for Freestyle
+    // desktop support; until an image exists, the request must 503 with a
+    // config error rather than silently serving a base machine.
+    for (const provider of ["freestyle", "e2b", "daytona"] as const) {
+      const err = captureImageConfigError(() =>
+        resolveVmImage(provider, undefined, deployed, { kind: "desktop" }),
+      );
+      expect(err).toMatchObject({ provider, kind: "desktop", source: "default" });
+    }
+  });
+
+  test("freestyle has no usable image until the devbox snapshot is re-baked on the public platform", () => {
+    // The only freestyle manifest entry was baked against the retired
+    // beta-api endpoint and carries validationStatus "unknown", so it is
+    // neither a kind default nor a local-dev default. Creates fail closed.
+    const err = captureImageConfigError(() => resolveVmImage("freestyle", undefined, deployed));
+    expect(err).toMatchObject({
+      provider: "freestyle",
+      envVar: "FREESTYLE_SANDBOX_SNAPSHOT",
       source: "env",
     });
+    expect(captureImageConfigError(() => resolveVmImage("freestyle", undefined, {}))).toMatchObject({
+      provider: "freestyle",
+      reason: "no local default image is recorded for freestyle",
+    });
+    expect(listVmImageKinds("freestyle", deployed)).toEqual([]);
   });
 
-  test("the generic env selector serves a desktop request when it names a desktop image", () => {
+  test("an operator-set freestyle snapshot still resolves, so a re-bake is env-only", () => {
     expect(
-      resolveVmImage("blaxel", undefined, {
+      resolveVmImage("freestyle", undefined, {
         ...deployed,
-        BLAXEL_SANDBOX_IMAGE: "blaxel/xfce-vnc:latest",
-      }, { kind: "desktop" }),
-    ).toMatchObject({ image: "blaxel/xfce-vnc:latest", kind: "desktop" });
-  });
-
-  test("an explicit image overrides kind, but must match the kind it claims", () => {
-    expect(
-      resolveVmImage("blaxel", "blaxel/xfce-vnc:latest", deployed, { kind: "desktop" }),
-    ).toMatchObject({ image: "blaxel/xfce-vnc:latest", kind: "desktop" });
-    expect(captureImageConfigError(() =>
-      resolveVmImage("blaxel", "blaxel/xfce-vnc:latest", deployed, { kind: "base" }),
-    )).toMatchObject({
-      image: "blaxel/xfce-vnc:latest",
-      kind: "base",
-      source: "request",
-      reason: "blaxel/xfce-vnc:latest is a desktop image, not a base image",
+        FREESTYLE_SANDBOX_SNAPSHOT: "sh-fb3dcf7b47894114889b10186626af5b",
+      }),
+    ).toMatchObject({
+      provider: "freestyle",
+      image: "sh-fb3dcf7b47894114889b10186626af5b",
+      imageVersion: "freestyle-cmux-devbox-beta1",
     });
   });
 
   test("rejects unknown kinds with an actionable error", () => {
     const err = captureImageConfigError(() =>
-      resolveVmImage("blaxel", undefined, deployed, { kind: "gpu" as unknown as VmImageKind }),
+      resolveVmImage("e2b", undefined, deployed, { kind: "gpu" as unknown as VmImageKind }),
     );
-    expect(err).toMatchObject({ provider: "blaxel", kind: "gpu", source: "request" });
-    expect(err.allowedImages).toEqual(["sandbox/cmux-devbox:latest", "blaxel/xfce-vnc:latest", "blaxel/base-image:latest"]);
+    expect(err).toMatchObject({ provider: "e2b", kind: "gpu", source: "request" });
     expect(reportVmImageConfigError(err, deployed)).toMatchObject({
       message: 'Cloud VM image kind "gpu" is not supported.',
-      details: { imageRequested: false, kind: "gpu", source: "request", allowedKinds: ["desktop", "base"] },
+      // Nothing is flagged defaultForKind and `deployed` sets no selector, so
+      // no kind is currently servable.
+      details: { imageRequested: false, kind: "gpu", source: "request", allowedKinds: [] },
     });
   });
 
-  test("a kind with nothing configured names the env var and the allowed images", () => {
-    // freestyle ships no desktop image, so it exercises the unresolvable-kind
-    // error shape (blaxel base resolves from the manifest default now).
+  test("a kind with nothing configured names the env var and stays client-safe", () => {
     const err = captureImageConfigError(() =>
       resolveVmImage("freestyle", undefined, deployed, { kind: "desktop" }),
     );
@@ -155,7 +120,6 @@ describe("VM image resolver: request by kind", () => {
     });
     const report = reportVmImageConfigError(err, deployed);
     expect(report.message).toBe("No desktop Cloud VM image is available in this environment.");
-    // Deployed freestyle with no env selector serves no kind at all.
     expect(report.action).toContain("available: none");
     // Client-safe details name the kind and the source, never the env var or image ids.
     expect(report.details).toEqual({
@@ -174,44 +138,25 @@ describe("VM image resolver: request by kind", () => {
 
   test("client-requested unknown images stay strict and report imageRequested", () => {
     const err = captureImageConfigError(() =>
-      resolveVmImage("blaxel", "blaxel/unlisted:latest", deployed),
+      resolveVmImage("e2b", "cmuxd-ws:unlisted", deployed),
     );
-    expect(err).toMatchObject({ image: "blaxel/unlisted:latest", source: "request" });
+    expect(err).toMatchObject({ image: "cmuxd-ws:unlisted", source: "request" });
     const report = reportVmImageConfigError(err, deployed);
-    expect(report.details).toEqual({ imageRequested: true, kind: undefined, source: "request", allowedKinds: ["desktop", "base"] });
+    expect(report.details).toEqual({ imageRequested: true, kind: undefined, source: "request", allowedKinds: [] });
     expect(report.message).toBe("The requested Cloud VM image is not available in this environment.");
-    expect(report.action).toContain("`kind`: desktop, base");
-    expect(report.operator).toMatchObject({ image: "blaxel/unlisted:latest", allowedImages: ["sandbox/cmux-devbox:latest", "blaxel/xfce-vnc:latest", "blaxel/base-image:latest"] });
-  });
-
-  test("local dev serves a kind from the local default only when the kinds agree", () => {
-    expect(resolveVmImage("blaxel", undefined, {}, { kind: "desktop" })).toMatchObject({
-      image: "sandbox/cmux-devbox:latest",
-      kind: "desktop",
-    });
-    expect(resolveVmImage("freestyle", undefined, {}, { kind: "base" })).toMatchObject({
-      image: "sh-b3jqa6o88qe6l738dw9z",
-      kind: "base",
-    });
-    expect(() => resolveVmImage("freestyle", undefined, {}, { kind: "desktop" })).toThrow(VmImageConfigError);
+    expect(report.operator).toMatchObject({ image: "cmuxd-ws:unlisted" });
   });
 
   test("derives a kind for stored images and lists the kinds a provider can serve", () => {
-    expect(vmImageKindFor("blaxel", "sandbox/cmux-devbox:latest")).toBe("desktop");
-    expect(vmImageKindFor("blaxel", "blaxel/xfce-vnc:latest")).toBe("desktop");
-    expect(vmImageKindFor("blaxel", "blaxel/base-image:latest")).toBe("base");
-    expect(vmImageKindFor("freestyle", "sh-b3jqa6o88qe6l738dw9z")).toBe("base");
+    expect(vmImageKindFor("e2b", "cmux-devbox:devbox-20260828b")).toBe("base");
+    expect(vmImageKindFor("daytona", "cmux-devbox-20260828b")).toBe("base");
+    // No manifest kind and no `xfce`/`devbox` in the id: the heuristic says base.
+    expect(vmImageKindFor("freestyle", "sh-fb3dcf7b47894114889b10186626af5b")).toBe("base");
 
-    expect(listVmImageKinds("blaxel", deployed)).toEqual([
-      { kind: "desktop", image: "sandbox/cmux-devbox:latest" },
-      { kind: "base", image: "blaxel/base-image:latest" },
-    ]);
-    expect(listVmImageKinds("blaxel", { ...deployed, BLAXEL_SANDBOX_IMAGE: "blaxel/base-image:latest" })).toEqual([
-      { kind: "desktop", image: "sandbox/cmux-devbox:latest" },
-      { kind: "base", image: "blaxel/base-image:latest" },
-    ]);
-    expect(listVmImageKinds("freestyle", {})).toEqual([
-      { kind: "base", image: "sh-b3jqa6o88qe6l738dw9z" },
+    // Nothing is flagged defaultForKind, so a kind only resolves from an env selector.
+    expect(listVmImageKinds("e2b", deployed)).toEqual([]);
+    expect(listVmImageKinds("e2b", { ...deployed, E2B_CMUXD_WS_TEMPLATE: "cmux-devbox:devbox-20260828b" })).toEqual([
+      { kind: "base", image: "cmux-devbox:devbox-20260828b" },
     ]);
   });
 });
@@ -223,31 +168,6 @@ describe("VM image resolver", () => {
       image: "cmuxd-ws:tooling-20260509f",
       imageVersion: "e2b-tooling-20260509f",
     });
-    expect(resolveVmImage("freestyle", undefined, {})).toMatchObject({
-      provider: "freestyle",
-      image: "sh-b3jqa6o88qe6l738dw9z",
-      imageVersion: "freestyle-signedadmin-20260625b",
-    });
-    expect(imageUsesBakedFreestyleSignedAdmin("freestyle", "sh-b3jqa6o88qe6l738dw9z")).toBe(true);
-  });
-
-  test("the baked beta devbox snapshot reads as a beta-platform image", () => {
-    expect(imageUsesFreestyleBetaPlatform("freestyle", "sh-fb3dcf7b47894114889b10186626af5b")).toBe(true);
-    expect(imageUsesFreestyleBetaPlatform("freestyle", "freestyle-cmux-devbox-beta1")).toBe(true);
-  });
-
-  test("legacy freestyle images never read as beta-platform images", () => {
-    // The freestyle driver dispatches creates on this flag; a legacy image
-    // reading as beta would boot the old snapshot on the wrong platform.
-    for (const image of [
-      "sc-mt237w1nd7c7673bd03m",
-      "sh-6ch5p9k23xrcx24056n8",
-      "sh-17agfasevrc18c8f15nn",
-      "sh-w2otfp1g287lzrpuc2gr",
-      "sh-b3jqa6o88qe6l738dw9z",
-    ]) {
-      expect(imageUsesFreestyleBetaPlatform("freestyle", image)).toBe(false);
-    }
   });
 
   test("daytona has no local default until a validated snapshot lands in the manifest", () => {
@@ -314,29 +234,23 @@ describe("VM image resolver", () => {
   });
 
   test("accepts an env-configured image that is missing from the manifest", () => {
-    // Production drifted: BLAXEL_SANDBOX_IMAGE named an image the manifest did not
-    // list, and every base open failed with imageRequested: true even though the
-    // client sent no image. Operator config wins; only client requests are strict.
+    // Production drifted once: the provider's image selector named an image the
+    // manifest did not list, and every base open failed with imageRequested:
+    // true even though the client sent no image. Operator config wins; only
+    // client requests are strict.
     expect(
-      resolveVmImage("blaxel", undefined, {
+      resolveVmImage("e2b", undefined, {
         VERCEL: "1",
         VERCEL_ENV: "production",
-        BLAXEL_SANDBOX_IMAGE: "blaxel/ops-override:custom",
+        E2B_CMUXD_WS_TEMPLATE: "cmuxd-ws:ops-override",
       }),
     ).toMatchObject({
-      provider: "blaxel",
-      image: "blaxel/ops-override:custom",
+      provider: "e2b",
+      image: "cmuxd-ws:ops-override",
       imageVersion: null,
       manifestEntry: null,
       kind: "base",
     });
-    expect(
-      resolveVmImage("blaxel", undefined, {
-        VERCEL: "1",
-        VERCEL_ENV: "production",
-        BLAXEL_SANDBOX_DESKTOP_IMAGE: "sandbox/cmux-devbox:next",
-      }, { kind: "desktop" }),
-    ).toMatchObject({ image: "sandbox/cmux-devbox:next", imageVersion: null, kind: "desktop" });
   });
 
   test("permits unmanifested images only when explicitly allowed", () => {
@@ -357,15 +271,14 @@ describe("VM image resolver", () => {
 
 describe("provider inference from explicit images", () => {
   test("a manifest image id uniquely owned by one provider infers that provider", () => {
-    expect(inferVmProviderForImage("blaxel/xfce-vnc:latest")).toBe("blaxel");
-    expect(inferVmProviderForImage("sandbox/cmux-devbox:latest")).toBe("blaxel");
-    expect(inferVmProviderForImage("sh-6ch5p9k23xrcx24056n8")).toBe("freestyle");
+    expect(inferVmProviderForImage("sh-fb3dcf7b47894114889b10186626af5b")).toBe("freestyle");
     expect(inferVmProviderForImage("cmuxd-ws:tooling-20260509f")).toBe("e2b");
+    expect(inferVmProviderForImage("cmux-devbox-20260828b")).toBe("daytona");
   });
 
   test("manifest versions infer their provider too", () => {
-    expect(inferVmProviderForImage("blaxel-bootstrap-20260820a")).toBe("blaxel");
-    expect(inferVmProviderForImage("freestyle-rpclease-20260502a")).toBe("freestyle");
+    expect(inferVmProviderForImage("freestyle-cmux-devbox-beta1")).toBe("freestyle");
+    expect(inferVmProviderForImage("e2b-proxy-20260424a")).toBe("e2b");
   });
 
   test("unknown or absent images infer nothing", () => {
diff --git a/web/tests/vm-limit-refresh.test.ts b/web/tests/vm-limit-refresh.test.ts
index bc3c981183ea..5f20f9015059 100644
--- a/web/tests/vm-limit-refresh.test.ts
+++ b/web/tests/vm-limit-refresh.test.ts
@@ -17,7 +17,7 @@ function row(overrides: Partial<CloudVmRow>): CloudVmRow {
     userId: "user-limit-refresh",
     billingTeamId: "team-limit-refresh",
     billingPlanId: "pro",
-    provider: "blaxel",
+    provider: "e2b",
     providerVmId: null,
     displayName: null,
     imageId: "snapshot-test",
@@ -35,8 +35,8 @@ function row(overrides: Partial<CloudVmRow>): CloudVmRow {
 }
 
 // Regression: refreshActiveLimitProviderStatuses returned early for every
-// non-Freestyle machine, so a stale `running` row on Blaxel (the prod default
-// provider) blocked creates until the 10-minute cron even though Blaxel has a
+// non-Freestyle machine, so a stale `running` row on another provider blocked
+// creates until the 10-minute cron even though that provider has a
 // status read. The lazy refresh on limit-exceeded must reconcile every
 // provider the gateway can report on, exactly like the cron path.
 describe("lazy active-limit provider refresh", () => {
@@ -47,10 +47,10 @@ describe("lazy active-limit provider refresh", () => {
       status: "running",
       providerVmId: "provider-vm-limit-refresh-new",
     });
-    const staleBlaxel = row({
+    const staleE2b = row({
       id: "00000000-0000-4000-8000-000000000103",
-      provider: "blaxel",
-      providerVmId: "provider-vm-stale-blaxel",
+      provider: "e2b",
+      providerVmId: "provider-vm-stale-e2b",
       status: "running",
     });
     const staleFreestyle = row({
@@ -86,7 +86,7 @@ describe("lazy active-limit provider refresh", () => {
         // Deliberately return more rows than the requested limit. The workflow
         // keeps its own cap so alternate repository implementations cannot make
         // the synchronous retry unbounded.
-        return Effect.succeed([staleBlaxel, staleFreestyle, ...extraCandidates]);
+        return Effect.succeed([staleE2b, staleFreestyle, ...extraCandidates]);
       },
       markProviderObservedStatus: (update: ObservedStatusUpdate) => {
         observed.push(update);
@@ -103,7 +103,7 @@ describe("lazy active-limit provider refresh", () => {
 
     const providers = {
       create: () => Effect.succeed({
-        provider: "blaxel" as const,
+        provider: "e2b" as const,
         providerVmId: "provider-vm-limit-refresh-new",
         status: "running" as const,
         image: "snapshot-test",
@@ -133,7 +133,7 @@ describe("lazy active-limit provider refresh", () => {
         billingTeamId: "team-limit-refresh",
         billingPlanId: "pro",
         maxActiveVms: 5,
-        provider: "blaxel",
+        provider: "e2b",
         image: "snapshot-test",
       }).pipe(Effect.provide(layer)),
     );
@@ -142,12 +142,12 @@ describe("lazy active-limit provider refresh", () => {
     expect(beginCreateCalls).toBe(2);
     expect(candidateLimit).toBe(200);
     expect(statusCalls).toHaveLength(200);
-    // The refresh must probe BOTH stale rows; before the fix it skipped blaxel.
-    expect(statusCalls).toContainEqual(["blaxel", "provider-vm-stale-blaxel"]);
+    // The refresh must probe BOTH stale rows; before the fix it skipped non-freestyle.
+    expect(statusCalls).toContainEqual(["e2b", "provider-vm-stale-e2b"]);
     expect(statusCalls).toContainEqual(["freestyle", "provider-vm-stale-freestyle"]);
     // And must durably record what the provider said so the recount can pass.
     const observedIds = observed.map((u) => u.providerVmId).sort();
-    expect(observedIds).toContain("provider-vm-stale-blaxel");
+    expect(observedIds).toContain("provider-vm-stale-e2b");
     expect(observedIds).toContain("provider-vm-stale-freestyle");
     expect(observedIds).toHaveLength(200);
     expect(new Set(observed.map((u) => u.status))).toEqual(new Set(["destroyed"]));
diff --git a/web/tests/vm-observability.test.ts b/web/tests/vm-observability.test.ts
index 667a053c6c28..9d1f8edce020 100644
--- a/web/tests/vm-observability.test.ts
+++ b/web/tests/vm-observability.test.ts
@@ -32,7 +32,7 @@ describe("vm error choke point", () => {
       message: "The Cloud VM image is not available in this environment.",
       action: "Retry in a moment.",
       details: { imageRequested: true },
-      diagnostics: { provider: "freestyle", image: "blaxel/xfce-vnc:latest", envVar: "FREESTYLE_SANDBOX_SNAPSHOT" },
+      diagnostics: { provider: "freestyle", image: "sh-fb3dcf7b47894114889b10186626af5b", envVar: "FREESTYLE_SANDBOX_SNAPSHOT" },
       phase: "create",
       retryable: true,
     });
diff --git a/web/tests/vm-reaper.test.ts b/web/tests/vm-reaper.test.ts
index 465b10660132..b3fb095ee4c9 100644
--- a/web/tests/vm-reaper.test.ts
+++ b/web/tests/vm-reaper.test.ts
@@ -86,10 +86,10 @@ function vmRow(overrides: Partial<CloudVmRow> = {}): CloudVmRow {
     userId: "user-reaper",
     billingTeamId: "team-reaper",
     billingPlanId: "pro",
-    provider: "blaxel",
+    provider: "e2b",
     providerVmId: "stale-sandbox",
     displayName: null,
-    imageId: "blaxel/base-image:latest",
+    imageId: "cmux-devbox:devbox-20260828b",
     imageVersion: null,
     status: "provisioning",
     idempotencyKey: "reaper-key",
@@ -109,13 +109,44 @@ function runReaper(
   options: VmReaperOptions = {},
 ) {
   return Effect.runPromise(
-    reapVmResources({ now: NOW, ...options }).pipe(
+    // No shipped driver exposes a volume inventory, so the scan is inert unless
+    // a provider is named; these tests drive it against the stub gateway.
+    reapVmResources({ now: NOW, volumeProvider: "e2b", ...options }).pipe(
       Effect.provide(workflowLayer(repo, provider)),
     ),
   );
 }
 
 describe("Cloud VM reaper report", () => {
+  test("the volume scan is inert when no registered driver exposes a volume inventory", async () => {
+    // Persistent home volumes were a single-provider feature and no shipped
+    // driver implements listVolumes today. The reaper must not scan a
+    // hardcoded provider; it reports partial coverage and touches nothing.
+    const usage: Array<Record<string, unknown>> = [];
+    const listVolumeCalls: string[] = [];
+    const repo = repository({
+      stuckProvisioningCandidates: () => Effect.succeed([]),
+      recordUsageEvent: (event) => Effect.sync(() => usage.push(event as Record<string, unknown>)),
+    });
+    const provider = {
+      ...baseProvider(),
+      listVolumes: (providerId: string) => Effect.sync(() => {
+        listVolumeCalls.push(providerId);
+        return [];
+      }),
+    } as unknown as VmProviderGatewayShape;
+
+    const result = await Effect.runPromise(
+      reapVmResources({ now: NOW }).pipe(Effect.provide(workflowLayer(repo, provider))),
+    );
+
+    expect(listVolumeCalls).toEqual([]);
+    expect(result.orphanVolumes.scanned).toBe(0);
+    expect(result.orphanVolumes.candidates).toBe(0);
+    expect(result.orphanVolumes.coveragePartial).toBe(true);
+    expect(usage).toEqual([]);
+  });
+
   test("reports only known orphan candidates and never deletes or writes VM rows", async () => {
     const usage: Array<Record<string, unknown>> = [];
     const deleted: string[] = [];
@@ -136,7 +167,7 @@ describe("Cloud VM reaper report", () => {
         oldVolume("cmux-home-abcdef123456"),
         oldVolume("shared-volume"),
       ]),
-      deleteHomeVolume: (_provider: "blaxel", name: string) => Effect.sync(() => deleted.push(name)),
+      deleteHomeVolume: (_provider: "e2b", name: string) => Effect.sync(() => deleted.push(name)),
     } as unknown as VmProviderGatewayShape;
 
     const result = await runReaper(repo, provider, {
@@ -398,7 +429,7 @@ describe("Cloud VM reaper report", () => {
     });
     const provider = {
       ...baseProvider(),
-      listVolumes: (_provider: "blaxel", options: { limit: number; cursor?: string }): Effect.Effect<VMVolumeInventory> => Effect.sync(() => {
+      listVolumes: (_provider: "e2b", options: { limit: number; cursor?: string }): Effect.Effect<VMVolumeInventory> => Effect.sync(() => {
         calls.push({ limit: options.limit, ...(options.cursor ? { cursor: options.cursor } : {}) });
         return options.cursor
           ? { volumes: secondPage, nextCursor: null }
diff --git a/web/tests/vm-route-auth.test.ts b/web/tests/vm-route-auth.test.ts
index 973b89400595..a3bbd6a9fd6c 100644
--- a/web/tests/vm-route-auth.test.ts
+++ b/web/tests/vm-route-auth.test.ts
@@ -15,7 +15,6 @@ const forkVm = mock(() => ({ workflow: "fork" }));
 const openAttachEndpoint = mock(() => ({ workflow: "attach" }));
 const openVmCmuxRemote = mock(() => ({ workflow: "cmux-remote" }));
 const approveVmCmuxRemoteEnrollment = mock(() => ({ workflow: "cmux-remote-approve" }));
-const openSshEndpoint = mock(() => ({ workflow: "ssh" }));
 const restoreVm = mock(() => ({ workflow: "restore" }));
 const snapshotVm = mock(() => ({ workflow: "snapshot" }));
 const revokeUserVmAccess = mock(() => ({ workflow: "revoke-access" }));
@@ -61,7 +60,6 @@ const realOpenBaseVm = workflowsModule.openBaseVm;
 const realOpenAttachEndpoint = workflowsModule.openAttachEndpoint;
 const realOpenVmCmuxRemote = workflowsModule.openVmCmuxRemote;
 const realApproveVmCmuxRemoteEnrollment = workflowsModule.approveVmCmuxRemoteEnrollment;
-const realOpenSshEndpoint = workflowsModule.openSshEndpoint;
 const realResetBaseVm = workflowsModule.resetBaseVm;
 const realRestoreVm = workflowsModule.restoreVm;
 const realRunVmWorkflow = workflowsModule.runVmWorkflow;
@@ -116,8 +114,6 @@ mock.module("../services/vms/workflows", () => ({
     useWorkflowStubs ? callMock(openVmCmuxRemote, args) : realOpenVmCmuxRemote(...args)) as typeof realOpenVmCmuxRemote,
   approveVmCmuxRemoteEnrollment: ((...args: Parameters<typeof realApproveVmCmuxRemoteEnrollment>) =>
     useWorkflowStubs ? callMock(approveVmCmuxRemoteEnrollment, args) : realApproveVmCmuxRemoteEnrollment(...args)) as typeof realApproveVmCmuxRemoteEnrollment,
-  openSshEndpoint: ((...args: Parameters<typeof realOpenSshEndpoint>) =>
-    useWorkflowStubs ? callMock(openSshEndpoint, args) : realOpenSshEndpoint(...args)) as typeof realOpenSshEndpoint,
   resetBaseVm: ((...args: Parameters<typeof realResetBaseVm>) =>
     useWorkflowStubs ? callMock(resetBaseVm, args) : realResetBaseVm(...args)) as typeof realResetBaseVm,
   restoreVm: ((...args: Parameters<typeof realRestoreVm>) =>
@@ -167,7 +163,6 @@ const cmuxRemoteApproveRoute = await import("../app/api/vm/[id]/cmux-remote/appr
 const execRoute = await import("../app/api/vm/[id]/exec/route");
 const forkRoute = await import("../app/api/vm/[id]/fork/route");
 const _snapshotRoute = await import("../app/api/vm/[id]/snapshot/route");
-const sshRoute = await import("../app/api/vm/[id]/ssh-endpoint/route");
 const restoreRoute = await import("../app/api/vm/restore/route");
 const revokeAccessRoute = await import("../app/api/vm/leases/revoke/route");
 const {
@@ -215,7 +210,6 @@ beforeEach(() => {
   getVm.mockClear();
   listUserVms.mockClear();
   openAttachEndpoint.mockClear();
-  openSshEndpoint.mockClear();
   restoreVm.mockClear();
   snapshotVm.mockClear();
   revokeUserVmAccess.mockClear();
@@ -340,7 +334,6 @@ describe("VM REST auth", () => {
     const responses = await Promise.all([
       DELETE(new Request("https://cmux.test/api/vm/provider-vm-1", { method: "DELETE" }), context),
       attachRoute.POST(new Request("https://cmux.test/api/vm/provider-vm-1/attach-endpoint", { method: "POST" }), context),
-      sshRoute.POST(new Request("https://cmux.test/api/vm/provider-vm-1/ssh-endpoint", { method: "POST" }), context),
       execRoute.POST(
         new Request("https://cmux.test/api/vm/provider-vm-1/exec", {
           method: "POST",
@@ -458,12 +451,15 @@ describe("VM REST auth", () => {
   });
 
   test("creates by kind without an image and echoes the resolved kind", async () => {
+    // The deployed shape: the operator's snapshot selector names the image, and
+    // the client only asks for a kind.
+    process.env.FREESTYLE_SANDBOX_SNAPSHOT = "sh-fb3dcf7b47894114889b10186626af5b";
     getUser.mockResolvedValue(authedStackUser());
     runVmWorkflow.mockResolvedValue({
       providerVmId: "provider-vm-kind",
       provider: "freestyle",
-      image: "sh-b3jqa6o88qe6l738dw9z",
-      imageVersion: "freestyle-signedadmin-20260625b",
+      image: "sh-fb3dcf7b47894114889b10186626af5b",
+      imageVersion: "freestyle-cmux-devbox-beta1",
       createdAt: 1_777_000_000_000,
     });
 
@@ -479,12 +475,13 @@ describe("VM REST auth", () => {
     expect(await response.json()).toMatchObject({ id: "provider-vm-kind", kind: "base" });
     expect(createVm).toHaveBeenCalledWith(expect.objectContaining({
       provider: "freestyle",
-      image: "sh-b3jqa6o88qe6l738dw9z",
-      imageVersion: "freestyle-signedadmin-20260625b",
+      image: "sh-fb3dcf7b47894114889b10186626af5b",
+      imageVersion: "freestyle-cmux-devbox-beta1",
     }));
   });
 
   test("a kind the provider cannot serve fails with an actionable image config error", async () => {
+    process.env.FREESTYLE_SANDBOX_SNAPSHOT = "sh-fb3dcf7b47894114889b10186626af5b";
     getUser.mockResolvedValue(authedStackUser());
 
     const create = await POST(
@@ -524,10 +521,11 @@ describe("VM REST auth", () => {
   });
 
   test("lists the kinds the default provider can serve alongside plan limits", async () => {
+    process.env.FREESTYLE_SANDBOX_SNAPSHOT = "sh-fb3dcf7b47894114889b10186626af5b";
     getUser.mockResolvedValue(authedStackUser());
     runVmWorkflow.mockResolvedValue([
-      { providerVmId: "desk", provider: "blaxel", image: "sandbox/cmux-devbox:latest", imageVersion: "v", status: "running", createdAt: 1_777_000_000_000 },
-      { providerVmId: "base", provider: "blaxel", image: "blaxel/base-image:latest", imageVersion: null, status: "running", createdAt: 1_777_000_000_000 },
+      { providerVmId: "devbox", provider: "e2b", image: "cmux-devbox:devbox-20260828b", imageVersion: "v", status: "running", createdAt: 1_777_000_000_000 },
+      { providerVmId: "base", provider: "e2b", image: "cmuxd-ws:tooling-20260509f", imageVersion: null, status: "running", createdAt: 1_777_000_000_000 },
     ]);
 
     const response = await GET(new Request("https://cmux.test/api/vm"));
@@ -536,7 +534,8 @@ describe("VM REST auth", () => {
       vms: Array<{ id: string; kind: string }>;
       limits: { imageKinds: Array<{ kind: string; image: string }> };
     };
-    expect(payload.vms).toMatchObject([{ id: "desk", kind: "desktop" }, { id: "base", kind: "base" }]);
+    // No image is a desktop image today, so every machine echoes kind "base".
+    expect(payload.vms).toMatchObject([{ id: "devbox", kind: "base" }, { id: "base", kind: "base" }]);
     const { listVmImageKinds } = await import("../services/vms/images/resolver");
     const { defaultProviderId } = await import("../services/vms/drivers");
     expect(payload.limits.imageKinds).toEqual(listVmImageKinds(defaultProviderId()));
@@ -972,8 +971,8 @@ describe("VM REST auth", () => {
   test("lists free-plan machines with a server-authoritative free access expiry", async () => {
     getUser.mockResolvedValue(freePlanStackUser());
     runVmWorkflow.mockResolvedValue([
-      { providerVmId: "older", provider: "blaxel", image: "blaxel/xfce-vnc:latest", imageVersion: "v", status: "running", createdAt: 1_777_000_000_000 },
-      { providerVmId: "newer", provider: "blaxel", image: "blaxel/xfce-vnc:latest", imageVersion: "v", status: "running", createdAt: 1_777_100_000_000 },
+      { providerVmId: "older", provider: "freestyle", image: "sh-fb3dcf7b47894114889b10186626af5b", imageVersion: "v", status: "running", createdAt: 1_777_000_000_000 },
+      { providerVmId: "newer", provider: "freestyle", image: "sh-fb3dcf7b47894114889b10186626af5b", imageVersion: "v", status: "running", createdAt: 1_777_100_000_000 },
     ]);
 
     const response = await GET(new Request("https://cmux.test/api/vm"));
@@ -996,7 +995,7 @@ describe("VM REST auth", () => {
   test("paid plans list machines without a free access expiry", async () => {
     getUser.mockResolvedValue(authedStackUser());
     runVmWorkflow.mockResolvedValue([
-      { providerVmId: "pro-vm", provider: "blaxel", image: "blaxel/xfce-vnc:latest", imageVersion: "v", status: "running", createdAt: 1_777_000_000_000 },
+      { providerVmId: "pro-vm", provider: "freestyle", image: "sh-fb3dcf7b47894114889b10186626af5b", imageVersion: "v", status: "running", createdAt: 1_777_000_000_000 },
     ]);
 
     const response = await GET(new Request("https://cmux.test/api/vm"));
@@ -1007,17 +1006,18 @@ describe("VM REST auth", () => {
     });
   });
 
-  test("every listed machine carries its provider's capabilities (Blaxel: no checkpoint/fork)", async () => {
+  test("every listed machine carries its provider's capabilities (no driver forks)", async () => {
     // The app hides Checkpoint/Fork when these are false instead of offering verbs
-    // that can only answer 502 "not implemented".
+    // that can only answer 502 "not implemented". Freestyle snapshots and
+    // restores; no driver implements fork.
     getUser.mockResolvedValue(authedStackUser());
     runVmWorkflow.mockResolvedValue([
-      { providerVmId: "desk", provider: "blaxel", image: "sandbox/cmux-devbox:latest", imageVersion: "v", status: "running", createdAt: 1_777_000_000_000 },
+      { providerVmId: "desk", provider: "freestyle", image: "sh-fb3dcf7b47894114889b10186626af5b", imageVersion: "v", status: "running", createdAt: 1_777_000_000_000 },
     ]);
     const response = await GET(new Request("https://cmux.test/api/vm"));
     expect(response.status).toBe(200);
     expect(await response.json()).toMatchObject({
-      vms: [{ id: "desk", capabilities: { snapshot: false, restore: false, fork: false } }],
+      vms: [{ id: "desk", capabilities: { snapshot: true, restore: true, fork: false } }],
     });
   });
 
@@ -1517,7 +1517,7 @@ describe("VM REST auth", () => {
     (runVmWorkflow as unknown as { mockImplementation(next: () => Promise<never>): void }).mockImplementation(
       async () => {
         throw new VmAttachTransportUnsupportedError({
-          provider: "blaxel",
+          provider: "freestyle",
           vmId: "provider-vm-team-1",
           requested: "websocket",
           supported: ["cmux-remote"],
@@ -1537,7 +1537,7 @@ describe("VM REST auth", () => {
     expect(payload.error).toBe("vm_attach_transport_unsupported");
     expect(payload.retryable).toBe(false);
     expect(payload.details).toMatchObject({
-      provider: "blaxel",
+      provider: "freestyle",
       requestedTransport: "websocket",
       supportedTransports: ["cmux-remote"],
       phase: "attach",
@@ -1659,29 +1659,6 @@ describe("VM REST auth", () => {
       providerVmId: "provider-vm-team-1",
     }));
 
-    runVmWorkflow.mockResolvedValue({
-      transport: "ssh",
-      host: "vm-ssh.example.invalid",
-      port: 22,
-      username: "cmux",
-      publicKeyFingerprint: null,
-      credential: { kind: "password", value: "token" },
-    });
-    await sshRoute.POST(
-      new Request("https://cmux.test/api/vm/provider-vm-team-1/ssh-endpoint", {
-        method: "POST",
-        headers: { origin: "https://cmux.test" },
-      }),
-      context,
-    );
-    expect(openSshEndpoint).toHaveBeenCalledWith({
-      userId: "user-1",
-      billingTeamId: "team-1",
-      teamIds: ["team-1"],
-      providerVmId: "provider-vm-team-1",
-      callerPlanId: "pro",
-    });
-
     runVmWorkflow.mockResolvedValue({ exitCode: 0, stdout: "", stderr: "" });
     await execRoute.POST(
       new Request("https://cmux.test/api/vm/provider-vm-team-1/exec", {
@@ -1808,7 +1785,7 @@ describe("VM REST auth", () => {
     console.error = mock(() => {}) as unknown as typeof console.error;
     try {
       const providerCause = new Error(
-        "POST https://api.blaxel.ai/v0/sandboxes -> 400: {\"code\":\"IMAGE_NOT_FOUND\",\"message\":\"Image 'sandbox/cmux-devbox:latest' not found. Create and deploy a template sandbox.\"}",
+        "POST https://api.freestyle.sh/v5/vms -> 404: {\"code\":\"NOT_FOUND\",\"message\":\"Snapshot 'sh-fb3dcf7b47894114889b10186626af5b' not found.\"}",
       );
       const response = await withAuthedVmApiRoute(
         new Request("https://cmux.test/api/vm", {
@@ -1821,7 +1798,7 @@ describe("VM REST auth", () => {
         "/api/vm failed",
         async () => {
           throw new VmProviderOperationError({
-            provider: "blaxel",
+            provider: "freestyle",
             operation: "create",
             cause: providerCause,
           });
@@ -1928,7 +1905,6 @@ describe("VM REST auth", () => {
     const responses = await Promise.all([
       DELETE(new Request("https://cmux.test/api/vm/provider-vm-1", { method: "DELETE", headers }), context),
       attachRoute.POST(new Request("https://cmux.test/api/vm/provider-vm-1/attach-endpoint", { method: "POST", headers }), context),
-      sshRoute.POST(new Request("https://cmux.test/api/vm/provider-vm-1/ssh-endpoint", { method: "POST", headers }), context),
       execRoute.POST(
         new Request("https://cmux.test/api/vm/provider-vm-1/exec", {
           method: "POST",
@@ -2336,13 +2312,13 @@ describe("VM REST auth", () => {
   test("records manifest image version on create workflow input", async () => {
     process.env.VERCEL = "1";
     process.env.VERCEL_ENV = "preview";
-    process.env.FREESTYLE_SANDBOX_SNAPSHOT = "sh-6ch5p9k23xrcx24056n8";
+    process.env.FREESTYLE_SANDBOX_SNAPSHOT = "sh-fb3dcf7b47894114889b10186626af5b";
     getUser.mockResolvedValue(authedStackUser());
     runVmWorkflow.mockResolvedValue({
       providerVmId: "provider-vm-manifest",
       provider: "freestyle",
-      image: "sh-6ch5p9k23xrcx24056n8",
-      imageVersion: "freestyle-rpclease-20260502a",
+      image: "sh-fb3dcf7b47894114889b10186626af5b",
+      imageVersion: "freestyle-cmux-devbox-beta1",
       createdAt: 1_777_000_000_000,
     });
 
@@ -2356,25 +2332,25 @@ describe("VM REST auth", () => {
 
     expect(response.status).toBe(200);
     expect(createVm).toHaveBeenCalledWith(expect.objectContaining({
-      image: "sh-6ch5p9k23xrcx24056n8",
-      imageVersion: "freestyle-rpclease-20260502a",
+      image: "sh-fb3dcf7b47894114889b10186626af5b",
+      imageVersion: "freestyle-cmux-devbox-beta1",
     }));
   });
 
   test("explicit manifest image resolves its own provider when the deployment default disagrees", async () => {
-    // Regression for the 2026-08-26 outage: the CLI sends Blaxel image ids with
-    // no provider override, and prod still had CMUX_VM_DEFAULT_PROVIDER=freestyle,
-    // so the image was looked up under freestyle and every create 503ed.
+    // Regression for the 2026-08-26 outage: a client sends one provider's image
+    // ids with no provider override while the deployment default names another,
+    // so the image was looked up under the wrong provider and every create 503ed.
     process.env.VERCEL = "1";
     process.env.VERCEL_ENV = "preview";
     process.env.CMUX_VM_DEFAULT_PROVIDER = "freestyle";
-    process.env.FREESTYLE_SANDBOX_SNAPSHOT = "sh-6ch5p9k23xrcx24056n8";
+    process.env.FREESTYLE_SANDBOX_SNAPSHOT = "sh-fb3dcf7b47894114889b10186626af5b";
     getUser.mockResolvedValue(authedStackUser());
     runVmWorkflow.mockResolvedValue({
-      providerVmId: "provider-vm-blaxel",
-      provider: "blaxel",
-      image: "blaxel/xfce-vnc:latest",
-      imageVersion: "blaxel-bootstrap-20260820a",
+      providerVmId: "provider-vm-e2b",
+      provider: "e2b",
+      image: "cmux-devbox:devbox-20260828b",
+      imageVersion: "e2b-devbox-20260828b",
       createdAt: 1_777_000_000_000,
     });
 
@@ -2382,15 +2358,15 @@ describe("VM REST auth", () => {
       new Request("https://cmux.test/api/vm", {
         method: "POST",
         headers: { origin: "https://cmux.test" },
-        body: JSON.stringify({ image: "blaxel/xfce-vnc:latest" }),
+        body: JSON.stringify({ image: "cmux-devbox:devbox-20260828b" }),
       }),
     );
 
     expect(response.status).toBe(200);
     expect(createVm).toHaveBeenCalledWith(expect.objectContaining({
-      provider: "blaxel",
-      image: "blaxel/xfce-vnc:latest",
-      imageVersion: "blaxel-bootstrap-20260820a",
+      provider: "e2b",
+      image: "cmux-devbox:devbox-20260828b",
+      imageVersion: "e2b-devbox-20260828b",
     }));
   });
 
@@ -2400,10 +2376,10 @@ describe("VM REST auth", () => {
     process.env.CMUX_VM_DEFAULT_PROVIDER = "freestyle";
     getUser.mockResolvedValue(authedStackUser());
     runVmWorkflow.mockResolvedValue({
-      providerVmId: "provider-vm-blaxel-base",
-      provider: "blaxel",
-      image: "blaxel/base-image:latest",
-      imageVersion: "blaxel-base-bootstrap-20260824a",
+      providerVmId: "provider-vm-e2b-base",
+      provider: "e2b",
+      image: "cmuxd-ws:tooling-20260509f",
+      imageVersion: "e2b-tooling-20260509f",
       createdAt: 1_777_000_000_000,
     });
 
@@ -2411,14 +2387,14 @@ describe("VM REST auth", () => {
       new Request("https://cmux.test/api/vm", {
         method: "POST",
         headers: { origin: "https://cmux.test" },
-        body: JSON.stringify({ image: "blaxel/base-image:latest" }),
+        body: JSON.stringify({ image: "cmuxd-ws:tooling-20260509f" }),
       }),
     );
 
     expect(response.status).toBe(200);
     expect(createVm).toHaveBeenCalledWith(expect.objectContaining({
-      provider: "blaxel",
-      image: "blaxel/base-image:latest",
+      provider: "e2b",
+      image: "cmuxd-ws:tooling-20260509f",
     }));
   });
 });
diff --git a/web/tests/vm-route-input.test.ts b/web/tests/vm-route-input.test.ts
index 72b221642590..535f1ed8c013 100644
--- a/web/tests/vm-route-input.test.ts
+++ b/web/tests/vm-route-input.test.ts
@@ -85,7 +85,7 @@ describe("Cloud VM route input", () => {
   });
 
   test("uses the same provider allow-list for restore input and defaults", async () => {
-    expect(providerField({ provider: "blaxel" })).toEqual({ ok: true, provider: "blaxel" });
+    expect(providerField({ provider: "daytona" })).toEqual({ ok: true, provider: "daytona" });
     expect(providerField({})).toEqual({ ok: true });
     const invalid = providerField({ provider: "aws" });
     expect(invalid.ok).toBe(false);
diff --git a/web/tests/vm-snapshot-not-found-dispatch.test.ts b/web/tests/vm-snapshot-not-found-dispatch.test.ts
index 3e5bce62a2be..2134cbbf0bdc 100644
--- a/web/tests/vm-snapshot-not-found-dispatch.test.ts
+++ b/web/tests/vm-snapshot-not-found-dispatch.test.ts
@@ -33,7 +33,7 @@ async function restoreUnknownSnapshot(): Promise<unknown> {
         billingTeamId: "user-snapshot-dispatch",
         billingPlanId: "pro",
         maxActiveVms: 5,
-        provider: "blaxel",
+        provider: "freestyle",
         snapshotId: "snap-missing",
       }).pipe(Effect.provide(layer)),
     );
diff --git a/web/tests/vm-unsupported-op.test.ts b/web/tests/vm-unsupported-op.test.ts
index 16fb1d979e1e..25f054daff7f 100644
--- a/web/tests/vm-unsupported-op.test.ts
+++ b/web/tests/vm-unsupported-op.test.ts
@@ -1,22 +1,22 @@
 import { describe, expect, test } from "bun:test";
 
-import { BlaxelRetryExhaustedError } from "../services/vms/drivers/blaxel";
-import { BlaxelProvider } from "../services/vms/drivers/blaxel";
+import { getProvider, vmCapabilitiesFor } from "../services/vms/drivers";
 import { VmOperationUnsupportedError, VmProviderOperationError } from "../services/vms/errors";
 import { isOperatorFaultVmError } from "../services/vms/observability";
 import { vmWorkflowErrorResponse } from "../services/vms/routeHelpers";
 import { vmRequestLocale } from "../services/vms/vmErrorMessages";
 import { locales } from "../i18n/routing";
 
-// Blaxel snapshot/restore throw VmOperationUnsupportedError. Before this mapping they
-// surfaced as 502 vm_cloud_service_unavailable retryable:true, telling users
-// to retry an operation the provider will never perform.
+// A driver that cannot perform an operation raises VmOperationUnsupportedError.
+// Before this mapping it surfaced as 502 vm_cloud_service_unavailable
+// retryable:true, telling users to retry an operation the provider will never
+// perform. `fork` is the live case today: no driver implements it.
 describe("unsupported provider operations", () => {
   test("the structured driver error maps to an honest non-retryable 501", async () => {
     const response = await vmWorkflowErrorResponse(new VmProviderOperationError({
-      provider: "blaxel",
+      provider: "freestyle",
       operation: "snapshot",
-      cause: new VmOperationUnsupportedError({ provider: "blaxel", operation: "snapshot" }),
+      cause: new VmOperationUnsupportedError({ provider: "freestyle", operation: "snapshot" }),
     }));
     expect(response).not.toBeNull();
     expect(response!.status).toBe(501);
@@ -39,15 +39,15 @@ describe("unsupported provider operations", () => {
     });
     const raw = JSON.stringify(payload);
     // No provider or implementation leaks, and the copy must not invite a retry.
-    expect(raw).not.toMatch(/blaxel|not implemented|NotImplemented/i);
+    expect(raw).not.toMatch(/freestyle|not implemented|NotImplemented/i);
     expect(String(payload.action)).toMatch(/^Do not retry/);
   });
 
   test("restore gets restore-phase copy", async () => {
     const response = await vmWorkflowErrorResponse(new VmProviderOperationError({
-      provider: "blaxel",
+      provider: "freestyle",
       operation: "restore",
-      cause: new VmOperationUnsupportedError({ provider: "blaxel", operation: "restore" }),
+      cause: new VmOperationUnsupportedError({ provider: "freestyle", operation: "restore" }),
     }));
     expect(response!.status).toBe(501);
     const payload = await response!.json() as { error: string; phase: string; message: string };
@@ -68,23 +68,20 @@ describe("unsupported provider operations", () => {
     expect(payload.retryable).toBe(true);
   });
 
-  test("Blaxel throws the structured error for unsupported operations", async () => {
-    const provider = new BlaxelProvider();
-    await expect(provider.snapshot("vm-1")).rejects.toMatchObject({
-      _tag: "VmOperationUnsupportedError",
-      provider: "blaxel",
-      operation: "snapshot",
-    });
-    await expect(provider.restore("snapshot-1")).rejects.toMatchObject({
-      _tag: "VmOperationUnsupportedError",
-      provider: "blaxel",
-      operation: "restore",
-    });
+  test("a driver without fork reports the capability as false, so clients hide the verb", () => {
+    // vmCapabilitiesFor derives `fork` from the method's existence; the gateway
+    // raises VmOperationUnsupportedError when a caller asks anyway.
+    for (const provider of ["freestyle", "e2b", "daytona"] as const) {
+      const capabilities = vmCapabilitiesFor(provider);
+      expect(capabilities.fork).toBe(typeof getProvider(provider).fork === "function");
+      expect(capabilities.snapshot).toBe(true);
+      expect(capabilities.restore).toBe(true);
+    }
   });
 
   test("transient provider failures keep the retryable 502 path", async () => {
     const response = await vmWorkflowErrorResponse(new VmProviderOperationError({
-      provider: "blaxel",
+      provider: "freestyle",
       operation: "snapshot",
       cause: new Error("INTERNAL_ERROR: Internal server error"),
     }));
@@ -94,38 +91,30 @@ describe("unsupported provider operations", () => {
     expect(payload.retryable).toBe(true);
   });
 
-  test("hides provider retry details from the public response", async () => {
+  test("hides upstream provider detail from the public response", async () => {
     const response = await vmWorkflowErrorResponse(new VmProviderOperationError({
-      provider: "blaxel",
+      provider: "freestyle",
       operation: "create",
-      cause: new BlaxelRetryExhaustedError(
-        "GET",
-        "https://api.blaxel.test/workspaces/private",
-        4,
-        "503: private upstream details",
-      ),
+      cause: new Error("INTERNAL_ERROR: private upstream details from https://api.freestyle.test/v5/vms"),
     }));
     const payload = await response!.json() as Record<string, unknown>;
     const raw = JSON.stringify(payload);
     expect(response!.status).toBe(502);
-    expect(payload.reason).toBe("The Cloud VM service is temporarily unavailable.");
-    expect(payload.details).toMatchObject({
-      operation: "create",
-      retryable: true,
-      providerCode: "provider_retry_exhausted",
-    });
-    expect(payload.details).not.toHaveProperty("providerMessage");
-    expect(raw).not.toContain("blaxel");
-    expect(raw).not.toContain("api.blaxel.test");
+    expect(payload.details).toMatchObject({ operation: "create", retryable: true });
+    // The sanitizer collapses the upstream text to a category, so neither the
+    // provider name, its endpoint, nor the upstream body reaches the client.
+    expect(payload.details).toMatchObject({ providerMessage: "internal service error" });
+    expect(raw).not.toContain("freestyle");
+    expect(raw).not.toContain("api.freestyle.test");
     expect(raw).not.toContain("private upstream details");
   });
 
   test("resolves unsupported-operation copy from the requested locale", async () => {
     const response = await vmWorkflowErrorResponse(
       new VmProviderOperationError({
-        provider: "blaxel",
+        provider: "freestyle",
         operation: "restore",
-        cause: new VmOperationUnsupportedError({ provider: "blaxel", operation: "restore" }),
+        cause: new VmOperationUnsupportedError({ provider: "freestyle", operation: "restore" }),
       }),
       { locale: "ja" },
     );
diff --git a/web/tests/vm-workflows.test.ts b/web/tests/vm-workflows.test.ts
index cbfd4f34abfe..6d1a78aa249d 100644
--- a/web/tests/vm-workflows.test.ts
+++ b/web/tests/vm-workflows.test.ts
@@ -46,8 +46,8 @@ import {
   approveVmCmuxRemoteEnrollment,
   openBaseVm,
   openAttachEndpoint,
+  openVmCmuxRemote,
   openVmSession,
-  openSshEndpoint,
   revokeExpiredIdentityLeases,
   revokeUserIdentityLeasesForAccountDeletion,
   resetBaseVm,
@@ -199,7 +199,7 @@ describe("VM Effect workflows", () => {
     const vm = testCloudVmRow({
       id: "00000000-0000-4000-8000-000000000119",
       userId: "user-workflow-exec-metadata",
-      provider: "blaxel",
+      provider: "freestyle",
       providerVmId: "provider-vm-exec-metadata",
       status: "running",
       providerMetadata: { homeVolume: "cmux-home-user-workflow-exec-metadata" },
@@ -235,7 +235,7 @@ describe("VM Effect workflows", () => {
     const vm = testCloudVmRow({
       id: "00000000-0000-4000-8000-000000000120",
       userId: "user-workflow-approve-metadata",
-      provider: "blaxel",
+      provider: "freestyle",
       providerVmId: "provider-vm-approve-metadata",
       status: "running",
       providerMetadata: { homeVolume: "cmux-home-user-workflow-approve-metadata" },
@@ -1191,14 +1191,14 @@ describe("VM Effect workflows", () => {
   });
 
   test("openAttachEndpoint and openVmSession refuse the legacy transport on a cmux-tui-only provider", async () => {
-    // Blaxel machines run only the cmux-tui remote daemon: the legacy websocket/SSH
+    // Machines run only the cmux-tui remote daemon: the legacy websocket/SSH
     // attach must fail closed before the provider is asked (no wake, no lease, no
     // identity churn) with a typed error the route maps to 409.
     const vm = testCloudVmRow({
       id: "00000000-0000-4000-8000-000000000115",
       userId: "user-workflow-attach-unsupported",
       billingTeamId: "team-workflow-attach-unsupported",
-      provider: "blaxel",
+      provider: "freestyle",
       providerVmId: "provider-vm-attach-unsupported",
       status: "running",
     });
@@ -1232,7 +1232,7 @@ describe("VM Effect workflows", () => {
     );
     expect(isVmAttachTransportUnsupportedError(attachError)).toBe(true);
     expect(attachError).toMatchObject({
-      provider: "blaxel",
+      provider: "freestyle",
       vmId: "provider-vm-attach-unsupported",
       requested: "websocket",
       supported: ["cmux-remote"],
@@ -1441,141 +1441,6 @@ describe("VM Effect workflows", () => {
     expect(usageEvents).toHaveLength(0);
   });
 
-  test("openSshEndpoint preflight-resumes a paused VM before minting", async () => {
-    const vm = testCloudVmRow({
-      id: "00000000-0000-4000-8000-000000000106",
-      userId: "user-workflow-ssh-resume",
-      billingTeamId: "team-workflow-ssh-resume",
-      providerVmId: "provider-vm-ssh-resume",
-      status: "running",
-    });
-    const usageEvents: RecordedUsageEvent[] = [];
-    const leases: RecordedLease[] = [];
-    const observedStatuses: ObservedStatusUpdate[] = [];
-    const repo = testWorkflowRepo({ vm, usageEvents, leases, observedStatuses });
-    const endpoint = testSshEndpoint();
-    let sshCalls = 0;
-    let statusCalls = 0;
-    let resumeCalls = 0;
-    const provider: VmProviderGatewayShape = {
-      ...unusedProviderGateway(),
-      openSSH: () =>
-        Effect.suspend(() => {
-          sshCalls += 1;
-          return Effect.succeed(endpoint);
-        }),
-      getStatus: () =>
-        Effect.sync(() => {
-          statusCalls += 1;
-          return "paused" as const;
-        }),
-      resume: () =>
-        Effect.sync(() => {
-          resumeCalls += 1;
-          return testVmHandle({ providerVmId: "provider-vm-ssh-resume" });
-        }),
-    };
-
-    const result = await Effect.runPromise(
-      openSshEndpoint({
-        userId: "user-workflow-ssh-resume",
-        teamIds: ["team-workflow-ssh-resume"],
-        providerVmId: "provider-vm-ssh-resume",
-      }).pipe(Effect.provide(workflowLayer(repo, provider))),
-    );
-
-    expect(result).toEqual(endpoint);
-    expect(sshCalls).toBe(1);
-    expect(statusCalls).toBe(1);
-    expect(resumeCalls).toBe(1);
-    expect(observedStatuses).toEqual([
-      { id: vm.id, providerVmId: "provider-vm-ssh-resume", status: "running" },
-    ]);
-    expect(leases).toHaveLength(1);
-    expect(usageEvents).toHaveLength(1);
-    expect(usageEvents[0]).toMatchObject({
-      eventType: "vm.ssh_endpoint",
-      vmId: vm.id,
-      metadata: { credentialKind: "password" },
-    });
-  });
-
-  test("openSshEndpoint does not pause a preflight-resumed VM when cleanup fails before minting", async () => {
-    const vm = testCloudVmRow({
-      id: "00000000-0000-4000-8000-000000000128",
-      userId: "user-workflow-ssh-cleanup-before-resume",
-      providerVmId: "provider-vm-ssh-cleanup-before-resume",
-      status: "paused",
-    });
-    const activeLease: CloudVmLeaseRow = {
-      id: "lease-active-cleanup-before-resume",
-      vmId: vm.id,
-      userId: vm.userId,
-      kind: "ssh",
-      tokenHash: "active-cleanup-before-resume",
-      providerIdentityHandle: "identity-cleanup-before-resume",
-      sessionId: null,
-      transport: "ssh",
-      metadata: {},
-      expiresAt: new Date(Date.now() + 60_000),
-      consumedAt: null,
-      revokedAt: null,
-      createdAt: new Date(),
-    };
-    const observedStatuses: ObservedStatusUpdate[] = [];
-    const repo = testWorkflowRepo({ vm, activeIdentityLeases: [activeLease], observedStatuses });
-    let statusCalls = 0;
-    let resumeCalls = 0;
-    let pauseCalls = 0;
-    let openCalls = 0;
-    const provider: VmProviderGatewayShape = {
-      ...unusedProviderGateway(),
-      getStatus: () => {
-        statusCalls += 1;
-        return Effect.succeed("paused");
-      },
-      resume: () => {
-        resumeCalls += 1;
-        return Effect.succeed(testVmHandle({ providerVmId: vm.providerVmId! }));
-      },
-      pause: () =>
-        Effect.sync(() => {
-          pauseCalls += 1;
-        }),
-      revokeSSHIdentity: () =>
-        Effect.fail(providerOperationError("revokeSSHIdentity", "provider delete failed")),
-      openSSH: () => {
-        openCalls += 1;
-        return Effect.succeed({
-          transport: "ssh" as const,
-          host: "vm-ssh.freestyle.sh",
-          port: 22,
-          username: "provider-vm-ssh-cleanup-before-resume+cmux",
-          publicKeyFingerprint: null,
-          credential: { kind: "password" as const, value: "secret" },
-          identityHandle: "new-identity",
-        });
-      },
-    };
-
-    await expect(
-      Effect.runPromise(
-        openSshEndpoint({
-          userId: vm.userId,
-          providerVmId: vm.providerVmId!,
-        }).pipe(Effect.provide(workflowLayer(repo, provider))),
-      ),
-    ).rejects.toThrow();
-
-    expect(statusCalls).toBe(1);
-    expect(resumeCalls).toBe(1);
-    expect(pauseCalls).toBe(0);
-    expect(openCalls).toBe(0);
-    expect(observedStatuses).toEqual([
-      { id: vm.id, providerVmId: vm.providerVmId!, status: "running" },
-    ]);
-  });
-
   test("openAttachEndpoint recovers when the VM suspends between preflight and minting", async () => {
     const vm = testCloudVmRow({
       id: "00000000-0000-4000-8000-000000000112",
@@ -2542,282 +2407,6 @@ describe("VM Effect workflows", () => {
     expect(activeSlotCount).toBe("1");
   });
 
-  dbTest("revokes the previous SSH identity before minting a replacement", async () => {
-    if (!sql) throw new Error("test database not initialized");
-    await sql`truncate cloud_vm_billing_grants, cloud_vm_usage_events, cloud_vm_leases, cloud_vms restart identity cascade`;
-    const [vm] = await sql<{ id: string }[]>`
-      insert into cloud_vms (user_id, provider, provider_vm_id, image_id, status)
-      values ('user-workflow-ssh', 'freestyle', 'provider-vm-ssh-1', 'snapshot-test', 'running')
-      returning id
-    `;
-
-    let mintCount = 0;
-    const revoked: string[] = [];
-    const provider: VmProviderGatewayShape = {
-      create: () => Effect.fail(new Error("unused") as never),
-      destroy: () => Effect.void,
-      exec: () => Effect.succeed({ exitCode: 0, stdout: "", stderr: "" }),
-      openAttach: () => Effect.fail(new Error("unused") as never),
-      openSSH: () =>
-        Effect.sync(() => {
-          mintCount += 1;
-          return {
-            transport: "ssh" as const,
-            host: "vm-ssh.freestyle.sh",
-            port: 22,
-            username: "provider-vm-ssh-1+cmux",
-            publicKeyFingerprint: null,
-            credential: { kind: "password" as const, value: `token-${mintCount}` },
-            identityHandle: `identity-${mintCount}`,
-          };
-        }),
-      revokeSSHIdentity: (_provider, identityHandle) =>
-        Effect.sync(() => {
-          revoked.push(identityHandle);
-        }),
-    };
-    const layer = providerLayer(provider);
-
-    const endpoint1 = await Effect.runPromise(
-      openSshEndpoint({ userId: "user-workflow-ssh", providerVmId: "provider-vm-ssh-1" }).pipe(
-        Effect.provide(layer),
-      ),
-    );
-    const endpoint2 = await Effect.runPromise(
-      openSshEndpoint({ userId: "user-workflow-ssh", providerVmId: "provider-vm-ssh-1" }).pipe(
-        Effect.provide(layer),
-      ),
-    );
-
-    expect(endpoint1.identityHandle).toBe("identity-1");
-    expect(endpoint2.identityHandle).toBe("identity-2");
-    expect(revoked).toEqual(["identity-1"]);
-
-    const leases = await sql<{ providerIdentityHandle: string; revokedAt: Date | null }[]>`
-      select provider_identity_handle as "providerIdentityHandle", revoked_at as "revokedAt"
-      from cloud_vm_leases
-      where vm_id = ${vm.id}
-      order by provider_identity_handle
-    `;
-    expect(leases).toHaveLength(2);
-    expect(leases[0]).toMatchObject({ providerIdentityHandle: "identity-1" });
-    expect(leases[0]?.revokedAt).toBeInstanceOf(Date);
-    expect(leases[1]).toMatchObject({ providerIdentityHandle: "identity-2", revokedAt: null });
-  });
-
-  dbTest("does not mint a replacement SSH endpoint when active identity cleanup fails", async () => {
-    if (!sql) throw new Error("test database not initialized");
-    await sql`truncate cloud_vm_billing_grants, cloud_vm_usage_events, cloud_vm_leases, cloud_vms restart identity cascade`;
-    const [vm] = await sql<{ id: string }[]>`
-      insert into cloud_vms (user_id, provider, provider_vm_id, image_id, status)
-      values ('user-workflow-ssh-revoke-failure', 'freestyle', 'provider-vm-ssh-revoke-failure', 'snapshot-test', 'running')
-      returning id
-    `;
-
-    let mintCount = 0;
-    const provider: VmProviderGatewayShape = {
-      create: () => Effect.fail(new Error("unused") as never),
-      destroy: () => Effect.void,
-      exec: () => Effect.succeed({ exitCode: 0, stdout: "", stderr: "" }),
-      openAttach: () => Effect.fail(new Error("unused") as never),
-      openSSH: () =>
-        Effect.sync(() => {
-          mintCount += 1;
-          return {
-            transport: "ssh" as const,
-            host: "vm-ssh.freestyle.sh",
-            port: 22,
-            username: "provider-vm-ssh-revoke-failure+cmux",
-            publicKeyFingerprint: null,
-            credential: { kind: "password" as const, value: `token-${mintCount}` },
-            identityHandle: `identity-revoke-failure-${mintCount}`,
-          };
-        }),
-      revokeSSHIdentity: () =>
-        Effect.fail(providerOperationError("revokeSSHIdentity", "provider delete failed")),
-    };
-    const layer = providerLayer(provider);
-
-    await Effect.runPromise(
-      openSshEndpoint({
-        userId: "user-workflow-ssh-revoke-failure",
-        providerVmId: "provider-vm-ssh-revoke-failure",
-      }).pipe(Effect.provide(layer)),
-    );
-    await expect(
-      Effect.runPromise(
-        openSshEndpoint({
-          userId: "user-workflow-ssh-revoke-failure",
-          providerVmId: "provider-vm-ssh-revoke-failure",
-        }).pipe(Effect.provide(layer)),
-      ),
-    ).rejects.toThrow();
-    expect(mintCount).toBe(1);
-
-    const leases = await sql<{ providerIdentityHandle: string; revokedAt: Date | null }[]>`
-      select provider_identity_handle as "providerIdentityHandle", revoked_at as "revokedAt"
-      from cloud_vm_leases
-      where vm_id = ${vm.id}
-      order by provider_identity_handle
-    `;
-    expect(leases).toEqual([
-      { providerIdentityHandle: "identity-revoke-failure-1", revokedAt: null },
-    ]);
-  });
-
-  dbTest("does not revoke or mint when active identity cleanup exceeds the hot-path cap", async () => {
-    if (!sql) throw new Error("test database not initialized");
-    await sql`truncate cloud_vm_billing_grants, cloud_vm_usage_events, cloud_vm_leases, cloud_vms restart identity cascade`;
-    const [vm] = await sql<{ id: string }[]>`
-      insert into cloud_vms (user_id, provider, provider_vm_id, image_id, status)
-      values ('user-workflow-ssh-cleanup-bound', 'freestyle', 'provider-vm-ssh-cleanup-bound', 'snapshot-test', 'running')
-      returning id
-    `;
-    await sql`
-      insert into cloud_vm_leases (
-        vm_id, user_id, kind, token_hash, expires_at, provider_identity_handle, transport, metadata
-      )
-      select ${vm.id}, 'user-workflow-ssh-cleanup-bound', 'ssh', 'cleanup-bound-token-' || n,
-        now() + interval '15 minutes', 'identity-cleanup-bound-' || n, 'ssh', '{}'::jsonb
-      from generate_series(1, 9) as n
-    `;
-
-    let revokeCalls = 0;
-    let mintCalls = 0;
-    const provider: VmProviderGatewayShape = {
-      create: () => Effect.fail(new Error("unused") as never),
-      destroy: () => Effect.void,
-      exec: () => Effect.succeed({ exitCode: 0, stdout: "", stderr: "" }),
-      openAttach: () => Effect.fail(new Error("unused") as never),
-      openSSH: () =>
-        Effect.sync(() => {
-          mintCalls += 1;
-          return {
-            transport: "ssh" as const,
-            host: "vm-ssh.freestyle.sh",
-            port: 22,
-            username: "provider-vm-ssh-cleanup-bound+cmux",
-            publicKeyFingerprint: null,
-            credential: { kind: "password" as const, value: "token" },
-            identityHandle: "identity-cleanup-bound-new",
-          };
-        }),
-      revokeSSHIdentity: () =>
-        Effect.sync(() => {
-          revokeCalls += 1;
-        }),
-    };
-
-    await expect(
-      Effect.runPromise(
-        openSshEndpoint({
-          userId: "user-workflow-ssh-cleanup-bound",
-          providerVmId: "provider-vm-ssh-cleanup-bound",
-        }).pipe(Effect.provide(providerLayer(provider))),
-      ),
-    ).rejects.toThrow();
-    expect(revokeCalls).toBe(0);
-    expect(mintCalls).toBe(0);
-
-    const [{ remainingLeaseCount }] = await sql<{ remainingLeaseCount: string }[]>`
-      select count(*)::text as "remainingLeaseCount"
-      from cloud_vm_leases
-      where vm_id = ${vm.id} and revoked_at is null
-    `;
-    expect(remainingLeaseCount).toBe("9");
-  });
-
-  dbTest("resumes a paused VM before minting SSH credentials", async () => {
-    if (!sql) throw new Error("test database not initialized");
-    await sql`truncate cloud_vm_billing_grants, cloud_vm_usage_events, cloud_vm_leases, cloud_vms restart identity cascade`;
-    // A paid plan: the free plan's active-VM limit is 0 since #10948, which
-    // would fail the resume reservation before the SSH mechanics under test
-    // ever run.
-    await sql`
-      insert into cloud_vms (user_id, billing_team_id, billing_plan_id, provider, provider_vm_id, image_id, status)
-      values ('user-workflow-resume-ssh', 'team-workflow-resume-ssh', 'pro', 'freestyle', 'provider-vm-resume-ssh', 'snapshot-test', 'paused')
-    `;
-
-    let resumeCalls = 0;
-    let sshCalls = 0;
-    const callOrder: string[] = [];
-    const provider: VmProviderGatewayShape = {
-      create: () => Effect.fail(new Error("unused") as never),
-      destroy: () => Effect.void,
-      resume: () =>
-        Effect.sync(() => {
-          resumeCalls += 1;
-          callOrder.push("resume");
-          return {
-            provider: "freestyle" as const,
-            providerVmId: "provider-vm-resume-ssh",
-            status: "running" as const,
-            image: "snapshot-test",
-            createdAt: Date.now(),
-          };
-        }),
-      exec: () => Effect.succeed({ exitCode: 0, stdout: "", stderr: "" }),
-      getStatus: () =>
-        Effect.sync(() => {
-          callOrder.push("getStatus");
-          return "paused" as const;
-        }),
-      openAttach: () => Effect.fail(new Error("unused") as never),
-      openSSH: () =>
-        Effect.sync(() => {
-          sshCalls += 1;
-          callOrder.push("openSSH");
-          return {
-            transport: "ssh" as const,
-            host: "vm-ssh.freestyle.sh",
-            port: 22,
-            username: "provider-vm-resume-ssh+cmux",
-            publicKeyFingerprint: null,
-            credential: { kind: "password" as const, value: "token" },
-            identityHandle: "identity-resumed",
-          };
-        }),
-      revokeSSHIdentity: () => Effect.void,
-    };
-
-    const endpoint = await withEnvironment(
-      { CMUX_VM_PLAN_FREE_MAX_ACTIVE_VMS: "1" },
-      () => Effect.runPromise(
-        openSshEndpoint({
-          userId: "user-workflow-resume-ssh",
-          billingTeamId: "team-workflow-resume-ssh",
-          teamIds: ["team-workflow-resume-ssh"],
-          providerVmId: "provider-vm-resume-ssh",
-        }).pipe(
-          Effect.provide(providerLayer(provider)),
-        ),
-      ),
-    );
-
-    expect(endpoint.transport).toBe("ssh");
-    expect(resumeCalls).toBe(1);
-    expect(sshCalls).toBe(1);
-    expect(callOrder).toEqual(["getStatus", "resume", "openSSH"]);
-
-    const [vm] = await sql<{ status: string }[]>`
-      select status from cloud_vms where provider_vm_id = 'provider-vm-resume-ssh'
-    `;
-    expect(vm?.status).toBe("running");
-
-    const [{ resumeUsageCount }] = await sql<{ resumeUsageCount: string }[]>`
-      select count(*)::text as "resumeUsageCount"
-      from cloud_vm_usage_events
-      where provider = 'freestyle'
-        and event_type = 'vm.resumed'
-        and metadata->>'source' = 'ssh'
-        and vm_id in (
-          select id from cloud_vms
-          where provider_vm_id = 'provider-vm-resume-ssh'
-        )
-    `;
-    expect(resumeUsageCount).toBe("1");
-  });
-
   dbTest("enforces active VM limits per billing team before provider create", async () => {
     if (!sql) throw new Error("test database not initialized");
     await sql`truncate cloud_vm_billing_grants, cloud_vm_usage_events, cloud_vm_leases, cloud_vms restart identity cascade`;
@@ -3599,8 +3188,8 @@ describe("VM Effect workflows", () => {
     await sql`
       insert into cloud_vms (user_id, billing_team_id, billing_plan_id, provider, provider_vm_id, image_id, status, provider_metadata, updated_at)
       values
-        ('user-workflow-reconcile-home', 'team-workflow-reconcile-home', 'free', 'blaxel', 'provider-vm-reconcile-home', 'snapshot-test', 'running', '{"homeVolume": "cmux-home-user-reconcile-home", "image": "blaxel/base-image:latest"}'::jsonb, now() - interval '10 minutes'),
-        ('user-workflow-reconcile-nohome', 'team-workflow-reconcile-home', 'free', 'blaxel', 'provider-vm-reconcile-nohome', 'snapshot-test', 'running', '{}'::jsonb, now() - interval '10 minutes')
+        ('user-workflow-reconcile-home', 'team-workflow-reconcile-home', 'free', 'freestyle', 'provider-vm-reconcile-home', 'snapshot-test', 'running', '{"homeVolume": "cmux-home-user-reconcile-home", "image": "sh-fb3dcf7b47894114889b10186626af5b"}'::jsonb, now() - interval '10 minutes'),
+        ('user-workflow-reconcile-nohome', 'team-workflow-reconcile-home', 'free', 'freestyle', 'provider-vm-reconcile-nohome', 'snapshot-test', 'running', '{}'::jsonb, now() - interval '10 minutes')
     `;
 
     const provider: VmProviderGatewayShape = {
@@ -3610,7 +3199,7 @@ describe("VM Effect workflows", () => {
           const gone = new Error(`sandbox ${vmId} -> 404 not found`);
           (gone as Error & { status?: number }).status = 404;
           return Effect.fail(new VmProviderOperationError({
-            provider: "blaxel",
+            provider: "freestyle",
             operation: "getStatus",
             cause: gone,
           }));
@@ -4686,8 +4275,9 @@ describe("VM Effect workflows", () => {
         timeoutMs: 1000,
       }).pipe(Effect.flip, Effect.provide(layer)),
     );
-    const sshError = await Effect.runPromise(
-      openSshEndpoint({ userId: "user-workflow-attacker", providerVmId: "provider-vm-private-2" }).pipe(
+    // cmux-remote is the live attach verb; ownership must refuse it too.
+    const attachError = await Effect.runPromise(
+      openVmCmuxRemote({ userId: "user-workflow-attacker", providerVmId: "provider-vm-private-2" }).pipe(
         Effect.flip,
         Effect.provide(layer),
       ),
@@ -4695,7 +4285,7 @@ describe("VM Effect workflows", () => {
 
     expect(destroyError).toBeInstanceOf(VmNotFoundError);
     expect(execError).toBeInstanceOf(VmNotFoundError);
-    expect(sshError).toBeInstanceOf(VmNotFoundError);
+    expect(attachError).toBeInstanceOf(VmNotFoundError);
     expect(destroyCalls).toBe(0);
     expect(execCalls).toBe(0);
     expect(sshCalls).toBe(0);
@@ -5057,18 +4647,6 @@ function testAttachEndpoint(): AttachEndpoint {
   };
 }
 
-function testSshEndpoint(): SSHEndpoint {
-  return {
-    transport: "ssh",
-    host: "vm-ssh.freestyle.sh",
-    port: 22,
-    username: "provider-vm-ssh-resume+cmux",
-    publicKeyFingerprint: null,
-    credential: { kind: "password", value: "token" },
-    identityHandle: "identity-ssh-resume",
-  };
-}
-
 async function waitForBlockedAdvisoryLock(sql: Sql, billingTeamId: string): Promise<void> {
   for (let attempt = 0; attempt < 100; attempt += 1) {
     const [{ blocked }] = await sql<{ blocked: string }[]>`
@@ -5118,7 +4696,7 @@ describe("destroyVm home volume cleanup", () => {
     const vm = testCloudVmRow({
       id: "00000000-0000-4000-8000-000000000140",
       userId,
-      provider: "blaxel",
+      provider: "freestyle",
       providerVmId: "noble-wren",
       status: "running",
       providerMetadata: { homeVolume: volume, homeVolumePerMachine: true },
@@ -5146,7 +4724,7 @@ describe("destroyVm home volume cleanup", () => {
     const vm = testCloudVmRow({
       id: "00000000-0000-4000-8000-000000000141",
       userId,
-      provider: "blaxel",
+      provider: "freestyle",
       providerVmId: "noble-wren",
       status: "running",
       providerMetadata: { homeVolume: volume },
@@ -5167,7 +4745,7 @@ describe("destroyVm home volume cleanup", () => {
     const vm = testCloudVmRow({
       id: "00000000-0000-4000-8000-000000000142",
       userId,
-      provider: "blaxel",
+      provider: "freestyle",
       providerVmId: "noble-wren",
       status: "running",
       providerMetadata: { homeVolume: homeVolumeNameForUser(userId) },
@@ -5193,7 +4771,7 @@ describe("destroyVm home volume cleanup", () => {
     const vm = testCloudVmRow({
       id: "00000000-0000-4000-8000-000000000143",
       userId,
-      provider: "blaxel",
+      provider: "freestyle",
       providerVmId: "noble-wren",
       status: "running",
       providerMetadata: { homeVolume: volume, homeVolumePerMachine: true },
@@ -5223,7 +4801,7 @@ describe("destroyVm home volume cleanup", () => {
     const vm = testCloudVmRow({
       id: "00000000-0000-4000-8000-000000000145",
       userId,
-      provider: "blaxel",
+      provider: "freestyle",
       providerVmId: "noble-wren",
       status: "running",
       providerMetadata: { homeVolume: volume, homeVolumePerMachine: true },
@@ -5259,7 +4837,7 @@ describe("destroyVm home volume cleanup", () => {
     const vm = testCloudVmRow({
       id: "00000000-0000-4000-8000-000000000144",
       userId,
-      provider: "blaxel",
+      provider: "freestyle",
       providerVmId: "noble-wren",
       status: "running",
       providerMetadata: {},