diff --git a/Dockerfile.server b/Dockerfile.server
index a9c07a280..9125e4f93 100644
--- a/Dockerfile.server
+++ b/Dockerfile.server
@@ -73,9 +73,12 @@ RUN bun -e " \
     fs.writeFileSync(f, JSON.stringify(p, null, 2)); \
   }"
 
-# Match CI's stable install mode. `--trust` can hang in container builds,
-# while the frozen install path already passes in CI.
-RUN bun install --frozen-lockfile
+# This build intentionally strips better-sqlite3 from the copied manifests to
+# avoid cross-arch native compilation failures. That makes the in-container
+# package graph diverge from the committed bun.lock, so a frozen install will
+# fail by construction. `--no-save` keeps the install ephemeral inside the
+# image while still using the lockfile as the base resolution source.
+RUN bun install --no-save --ignore-scripts
 
 # Bun may hoist workspace deps without materializing per-package node_modules.
 # Create every runtime COPY source explicitly so missing dirs don't break builds.
@@ -101,8 +104,8 @@ RUN cd /app/packages/physx-js-webidl && bun run build && \
     cd /app/packages/plugin-hyperscape && bun run build && \
     cd /app/packages/web3 && bun run build && \
     cd /app/packages/server && bun run build && \
-    cd /app/packages/client && NODE_OPTIONS='--max-old-space-size=4096' \
-    node ../../node_modules/vite/bin/vite.js build
+    cd /app/packages/client && bun run build:cf && \
+    python3 /app/scripts/fix-esm-specifiers.py
 
 # ─── Runtime ────────────────────────────────────────────────────────────────
 #
diff --git a/bun.lock b/bun.lock
index b4b68ebfb..6adf72964 100644
--- a/bun.lock
+++ b/bun.lock
@@ -1,5 +1,6 @@
 {
   "lockfileVersion": 1,
+  "configVersion": 0,
   "workspaces": {
     "": {
       "name": "@hyperscape/hyperscape",
@@ -230,6 +231,7 @@
         "@typescript-eslint/parser": "^8.38.0",
         "@vitejs/plugin-react": "^6.0.1",
         "@vitest/coverage-v8": "^4.0.6",
+        "@webgpu/types": "^0.1.69",
         "autoprefixer": "^10.4.21",
         "esbuild": "^0.27.0",
         "eslint": "^10.0.2",
@@ -360,7 +362,6 @@
       "version": "1.0.0",
       "dependencies": {
         "@hyperscape/impostor": "workspace:*",
-        "@hyperscape/shared": "workspace:*",
         "delaunator": "^5.0.1",
       },
       "devDependencies": {
@@ -391,7 +392,9 @@
         "@elizaos/core": "alpha",
         "@elizaos/plugin-anthropic": "alpha",
         "@elizaos/plugin-elizacloud": "alpha",
+        "@elizaos/plugin-goals": "2.0.0-alpha.9",
         "@elizaos/plugin-groq": "alpha",
+        "@elizaos/plugin-ollama": "2.0.0-alpha.70",
         "@elizaos/plugin-openai": "alpha",
         "@elizaos/plugin-sql": "alpha",
         "@fastify/compress": "^8.0.1",
@@ -416,7 +419,9 @@
         "livekit-server-sdk": "^2.11.0",
         "moment": "^2.30.1",
         "msgpackr": "^1.11.5",
+        "ollama-ai-provider-v2": "^3.5.0",
         "pg": "^8.13.1",
+        "rate-limiter-flexible": "^11.0.1",
         "socket.io-client": "^4.8.1",
         "source-map-support": "^0.5.21",
         "uWebSockets.js": "uNetworking/uWebSockets.js#v20.60.0",
@@ -644,6 +649,7 @@
     "esbuild": ">=0.24.3",
     "h3": ">=1.15.5",
     "hono": ">=4.11.4",
+    "jsdom": "27.0.1",
     "jsondiffpatch": ">=0.7.2",
     "jws": "^3.2.3",
     "lodash": ">=4.17.23",
@@ -669,6 +675,8 @@
 
     "@ai-sdk/gateway": ["@ai-sdk/gateway@3.0.66", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.19", "@vercel/oidc": "3.1.0" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-SIQ0YY0iMuv+07HLsZ+bB990zUJ6S4ujORAh+Jv1V2KGNn73qQKnGO0JBk+w+Res8YqOFSycwDoWcFlQrVxS4A=="],
 
+    "@ai-sdk/google": ["@ai-sdk/google@3.0.64", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.23" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-CbR82EgGPNrj/6q0HtclwuCqe0/pDShyv3nWDP/A9DroujzWXnLMlUJVrgPOsg4b40zQCwwVs2XSKCxvt/4QaA=="],
+
     "@ai-sdk/groq": ["@ai-sdk/groq@3.0.29", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.19" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-I/tUoHuOvGXbIr1dJ0CLRLA7W0UPDMtrYT5mgeb3O+P+6I5BAm/7riPwr22Xw5YTzpwQxcoDQlIczOU9XDXBpA=="],
 
     "@ai-sdk/openai": ["@ai-sdk/openai@3.0.41", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.19" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-IZ42A+FO+vuEQCVNqlnAPYQnnUpUfdJIwn1BEDOBywiEHa23fw7PahxVtlX9zm3/zMvTW4JKPzWyvAgDu+SQ2A=="],
@@ -677,6 +685,8 @@
 
     "@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.19", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.6" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-3eG55CrSWCu2SXlqq2QCsFjo3+E7+Gmg7i/oRVoSZzIodTuDSfLb3MRje67xE9RFea73Zao7Lm4mADIfUETKGg=="],
 
+    "@ai-sdk/ui-utils": ["@ai-sdk/ui-utils@1.2.11", "", { "dependencies": { "@ai-sdk/provider": "1.1.3", "@ai-sdk/provider-utils": "2.2.8", "zod-to-json-schema": "^3.24.1" }, "peerDependencies": { "zod": "^3.23.8" } }, "sha512-3zcwCc8ezzFlwp3ZD15wAPjf2Au4s3vAbKsXQVyhxODHcmu0iyPO2Eua6D/vicq/AUm/BAo60r97O6HU+EI0+w=="],
+
     "@algolia/abtesting": ["@algolia/abtesting@1.15.2", "", { "dependencies": { "@algolia/client-common": "5.49.2", "@algolia/requester-browser-xhr": "5.49.2", "@algolia/requester-fetch": "5.49.2", "@algolia/requester-node-http": "5.49.2" } }, "sha512-rF7vRVE61E0QORw8e2NNdnttcl3jmFMWS9B4hhdga12COe+lMa26bQLfcBn/Nbp9/AF/8gXdaRCPsVns3CnjsA=="],
 
     "@algolia/autocomplete-core": ["@algolia/autocomplete-core@1.19.2", "", { "dependencies": { "@algolia/autocomplete-plugin-algolia-insights": "1.19.2", "@algolia/autocomplete-shared": "1.19.2" } }, "sha512-mKv7RyuAzXvwmq+0XRK8HqZXt9iZ5Kkm2huLjgn5JoCPtDy+oh9yxUMfDDaVCw0oyzZ1isdJBc7l9nuCyyR7Nw=="],
@@ -715,7 +725,7 @@
 
     "@alloc/quick-lru": ["@alloc/quick-lru@5.2.0", "", {}, "sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw=="],
 
-    "@anthropic-ai/sdk": ["@anthropic-ai/sdk@0.32.1", "", { "dependencies": { "@types/node": "^18.11.18", "@types/node-fetch": "^2.6.4", "abort-controller": "^3.0.0", "agentkeepalive": "^4.2.1", "form-data-encoder": "1.7.2", "formdata-node": "^4.3.2", "node-fetch": "^2.6.7" } }, "sha512-U9JwTrDvdQ9iWuABVsMLj8nJVwAyQz6QXvgLsVhryhCEPkLsbcP/MXxm+jYcAwLoV8ESbaTTjnD4kuAFa+Hyjg=="],
+    "@anthropic-ai/sdk": ["@anthropic-ai/sdk@0.90.0", "", { "dependencies": { "json-schema-to-ts": "^3.1.1" }, "peerDependencies": { "zod": "^3.25.0 || ^4.0.0" }, "optionalPeers": ["zod"], "bin": { "anthropic-ai-sdk": "bin/cli" } }, "sha512-MzZtPabJF1b0FTDl6Z6H5ljphPwACLGP13lu8MTiB8jXaW/YXlpOp+Po2cVou3MPM5+f5toyLnul9whKCy7fBg=="],
 
     "@apideck/better-ajv-errors": ["@apideck/better-ajv-errors@0.3.6", "", { "dependencies": { "json-schema": "^0.4.0", "jsonpointer": "^5.0.0", "leven": "^3.1.0" }, "peerDependencies": { "ajv": ">=8" } }, "sha512-P+ZygBLZtkp0qqOAJJVX4oX/sFo5JR3eBWwwuqHHhK0GIgQOKWrAfiAaWX0aArHkRWHMuggFEgAZNxVPwPZYaA=="],
 
@@ -723,9 +733,9 @@
 
     "@ark/util": ["@ark/util@0.2.2", "", {}, "sha512-ryZ4+f3SlReQRH9nTFLK5EeU1Pan5ZfS+ACPSk0ir5uujJouFmvOdnkVfeAJAgeOb3kKmUM9kjelv1cwH2ScZg=="],
 
-    "@asamuzakjp/css-color": ["@asamuzakjp/css-color@5.0.1", "", { "dependencies": { "@csstools/css-calc": "^3.1.1", "@csstools/css-color-parser": "^4.0.2", "@csstools/css-parser-algorithms": "^4.0.0", "@csstools/css-tokenizer": "^4.0.0", "lru-cache": "^11.2.6" } }, "sha512-2SZFvqMyvboVV1d15lMf7XiI3m7SDqXUuKaTymJYLN6dSGadqp+fVojqJlVoMlbZnlTmu3S0TLwLTJpvBMO1Aw=="],
+    "@asamuzakjp/css-color": ["@asamuzakjp/css-color@4.1.2", "", { "dependencies": { "@csstools/css-calc": "^3.0.0", "@csstools/css-color-parser": "^4.0.1", "@csstools/css-parser-algorithms": "^4.0.0", "@csstools/css-tokenizer": "^4.0.0", "lru-cache": "^11.2.5" } }, "sha512-NfBUvBaYgKIuq6E/RBLY1m0IohzNHAYyaJGuTK79Z23uNwmz2jl1mPsC5ZxCCxylinKhT1Amn5oNTlx1wN8cQg=="],
 
-    "@asamuzakjp/dom-selector": ["@asamuzakjp/dom-selector@7.0.3", "", { "dependencies": { "@asamuzakjp/nwsapi": "^2.3.9", "bidi-js": "^1.0.3", "css-tree": "^3.2.1", "is-potential-custom-element-name": "^1.0.1", "lru-cache": "^11.2.7" } }, "sha512-Q6mU0Z6bfj6YvnX2k9n0JxiIwrCFN59x/nWmYQnAqP000ruX/yV+5bp/GRcF5T8ncvfwJQ7fgfP74DlpKExILA=="],
+    "@asamuzakjp/dom-selector": ["@asamuzakjp/dom-selector@6.8.1", "", { "dependencies": { "@asamuzakjp/nwsapi": "^2.3.9", "bidi-js": "^1.0.3", "css-tree": "^3.1.0", "is-potential-custom-element-name": "^1.0.1", "lru-cache": "^11.2.6" } }, "sha512-MvRz1nCqW0fsy8Qz4dnLIvhOlMzqDVBabZx6lH+YywFDdjXhMY37SmpV1XFX3JzG5GWHn63j6HX6QPr3lZXHvQ=="],
 
     "@asamuzakjp/nwsapi": ["@asamuzakjp/nwsapi@2.3.9", "", {}, "sha512-n8GuYSrI9bF7FFZ/SjhwevlHc8xaVlb/7HmHelnc/PZXBD2ZR49NnN9sMMuDdEGPeeRQ5d0hqlSlEpgCX3Wl0Q=="],
 
@@ -1027,8 +1037,6 @@
 
     "@borewit/text-codec": ["@borewit/text-codec@0.2.1", "", {}, "sha512-k7vvKPbf7J2fZ5klGRD9AeKfUvojuZIQ3BT5u7Jfv+puwXkUBUT5PVyMDfJZpy30CBDXGMgw7fguK/lpOMBvgw=="],
 
-    "@bramus/specificity": ["@bramus/specificity@2.4.2", "", { "dependencies": { "css-tree": "^3.0.0" }, "bin": { "specificity": "bin/cli.js" } }, "sha512-ctxtJ/eA+t+6q2++vj5j7FYX3nRu311q1wfYH3xjlLOsczhlhxAg2FWNUXhpGvAw3BWo1xBcvOV6/YLc2r5FJw=="],
-
     "@bufbuild/protobuf": ["@bufbuild/protobuf@1.10.1", "", {}, "sha512-wJ8ReQbHxsAfXhrf9ixl0aYbZorRuOWpBNzm8pL8ftmSxQx/wnJD5Eg861NwJU/czy2VXFIebCeZnZrI9rktIQ=="],
 
     "@capacitor/android": ["@capacitor/android@8.2.0", "", { "peerDependencies": { "@capacitor/core": "^8.2.0" } }, "sha512-XLm5OsWLPfXQxDxzFS7SOdMEgGvW+2c7TGLXkTR2cSKdkWK5Abns4imlT5qghKYhjM9r74IrDkBWg/9ALUGNKQ=="],
@@ -1051,7 +1059,7 @@
 
     "@csstools/cascade-layer-name-parser": ["@csstools/cascade-layer-name-parser@2.0.5", "", { "peerDependencies": { "@csstools/css-parser-algorithms": "^3.0.5", "@csstools/css-tokenizer": "^3.0.4" } }, "sha512-p1ko5eHgV+MgXFVa4STPKpvPxr6ReS8oS2jzTukjR74i5zJNyWO1ZM1m8YKBXnzDKWfBN1ztLYlHxbVemDD88A=="],
 
-    "@csstools/color-helpers": ["@csstools/color-helpers@6.0.2", "", {}, "sha512-LMGQLS9EuADloEFkcTBR3BwV/CGHV7zyDxVRtVDTwdI2Ca4it0CCVTT9wCkxSgokjE5Ho41hEPgb8OEUwoXr6Q=="],
+    "@csstools/color-helpers": ["@csstools/color-helpers@5.1.0", "", {}, "sha512-S11EXWJyy0Mz5SYvRmY8nJYTFFd1LCNV+7cXyAgQtOOuzb4EsgfqDufL+9esx72/eLhsRdGZwaldu/h+E4t4BA=="],
 
     "@csstools/css-calc": ["@csstools/css-calc@3.1.1", "", { "peerDependencies": { "@csstools/css-parser-algorithms": "^4.0.0", "@csstools/css-tokenizer": "^4.0.0" } }, "sha512-HJ26Z/vmsZQqs/o3a6bgKslXGFAungXGbinULZO3eMsOyNJHeBBZfup5FiZInOghgoM4Hwnmw+OgbJCNg1wwUQ=="],
 
@@ -1235,19 +1243,23 @@
 
     "@electric-sql/pglite": ["@electric-sql/pglite@0.3.15", "", {}, "sha512-Cj++n1Mekf9ETfdc16TlDi+cDDQF0W7EcbyRHYOAeZdsAe8M/FJg18itDTSwyHfar2WIezawM9o0EKaRGVKygQ=="],
 
-    "@elizaos/core": ["@elizaos/core@2.0.0-alpha.76", "", { "dependencies": { "@anthropic-ai/sdk": "^0.32.1", "@bufbuild/protobuf": "^2.11.0", "@langchain/core": "^1.1.12", "@langchain/textsplitters": "^1.0.1", "adze": "^2.2.5", "crypto-browserify": "^3.12.0", "dedent": "^1.7.1", "dotenv": "^17.2.3", "drizzle-orm": "^0.45.1", "fast-redact": "^3.5.0", "file-type": "^21.3.0", "glob": "^13.0.0", "handlebars": "^4.7.8", "json5": "^2.2.3", "markdown-it": "^14.1.0", "pdfjs-dist": "^5.4.530", "undici": "^7.0.0", "unique-names-generator": "^4.7.1", "uuid": "^13.0.0", "yaml": "^2.7.0", "zod": "^4.3.6" } }, "sha512-qxPxa64LlBtIX5NndeZ2bFB1O32vkC+g6lvAdffkZmCl7d3N6Yd5GOUpXhxxCJSyAPVdcgg6WlqCLRWWk4Tt9A=="],
+    "@elizaos/core": ["@elizaos/core@2.0.0-alpha.196", "", { "dependencies": { "@ai-sdk/anthropic": "^3.0.13", "@ai-sdk/google": "^3.0.8", "@ai-sdk/openai": "^3.0.9", "@anthropic-ai/sdk": "^0.90.0", "@bufbuild/protobuf": "^2.11.0", "@langchain/core": "^1.1.12", "@langchain/textsplitters": "^1.0.1", "@noble/ciphers": "^2.0.0", "@noble/hashes": "^1.8.0", "@openrouter/ai-sdk-provider": "^2.0.0", "@toon-format/toon": "^2.1.0", "adze": "^2.2.5", "ai": "^6.0.30", "coding-agent-adapters": "0.16.3", "dedent": "^1.7.1", "dotenv": "^17.2.3", "drizzle-orm": "^0.45.1", "fast-redact": "^3.5.0", "file-type": "^22.0.0", "fs-extra": "^11.3.2", "git-workspace-service": "0.4.5", "glob": "^13.0.0", "handlebars": "^4.7.8", "json5": "^2.2.3", "mammoth": "^1.9.0", "markdown-it": "^14.1.0", "pdfjs-dist": "^5.4.530", "undici": "^8.0.0", "unique-names-generator": "^4.7.1", "unpdf": "^1.4.0", "uuid": "^13.0.0", "yaml": "^2.7.0", "zod": "^4.3.6" } }, "sha512-CfzZ/+/G+6ELT6dFjRtgrRamYShCo3bjYez2OfolQnqGhq9/BYYY2lcUctv/k+KlNQISskTeQYxEBcScvHmzBg=="],
+
+    "@elizaos/plugin-anthropic": ["@elizaos/plugin-anthropic@2.0.0-alpha.14", "", { "dependencies": { "@ai-sdk/anthropic": "^3.0.9", "ai": "^6.0.23", "jsonrepair": "^3.12.0", "undici": "^7.16.0" }, "peerDependencies": { "@elizaos/core": "2.0.0-alpha.116" } }, "sha512-IuxsqBUF8FiJQVcaCrZPGAX2k2QeFP6iLDVRWTvSksiuSrxaQi+Ptx6S8saJm0OpefZn9zKIZruoUvC8VfNAsg=="],
 
-    "@elizaos/plugin-anthropic": ["@elizaos/plugin-anthropic@2.0.0-alpha.9", "", { "dependencies": { "@ai-sdk/anthropic": "^3.0.9", "@elizaos/core": "alpha", "ai": "^6.0.23", "jsonrepair": "^3.12.0", "undici": "^7.16.0" } }, "sha512-yiCtx6IEnpHipqJGIbDR/S+/erGPb3bI2cvQrIxwKNzkqMG97uezE4hjp2rIFSNHOsyTwndU5+J5GqyMMZc4Ig=="],
+    "@elizaos/plugin-elizacloud": ["@elizaos/plugin-elizacloud@2.0.0-alpha.8", "", { "dependencies": { "@ai-sdk/openai": "^3.0.9", "@elizaos/core": "2.0.0-alpha.114", "ai": "^6.0.30", "js-tiktoken": "^1.0.21", "undici": "^7.16.0" }, "peerDependencies": { "zod": "^4.3.6" } }, "sha512-B311icfV64/FLY3w+Dsa204F2Hga8WZ/gg3/lBrTUgJNy8yACHx0c43uEgQAqRLEAd8EFEJ02XXgbxuikhHfRg=="],
 
-    "@elizaos/plugin-elizacloud": ["@elizaos/plugin-elizacloud@2.0.0-alpha.7", "", { "dependencies": { "@ai-sdk/openai": "^3.0.9", "@elizaos/core": "2.0.0-alpha.3", "ai": "^6.0.30", "js-tiktoken": "^1.0.21", "undici": "^7.16.0" }, "peerDependencies": { "zod": "^4.3.6" } }, "sha512-9q/QNqnKKidmVq70yIch8uxRfartvdT0dgrcsYfXYJTImuLyEcKG2PRt8kkoRHO6+8jTwkUuSESMuTilfV0Pfw=="],
+    "@elizaos/plugin-goals": ["@elizaos/plugin-goals@2.0.0-alpha.9", "", { "dependencies": { "@elizaos/core": "2.0.0-alpha.3", "@radix-ui/react-checkbox": "^1.1.4", "@radix-ui/react-collapsible": "^1.1.3", "@radix-ui/react-label": "^2.1.2", "@radix-ui/react-select": "^2.2.2", "@radix-ui/react-separator": "^1.1.2", "@radix-ui/react-slot": "^1.1.2", "class-variance-authority": "^0.7.1" } }, "sha512-SpcqzApEW4G9fOyocf+OnLcu0q8Fz9i8W/hVRrvlK0dOrTzKlifP4sQJkKeIQNiGO6r6CqSYEH9uAbzp8oE3AQ=="],
 
     "@elizaos/plugin-groq": ["@elizaos/plugin-groq@2.0.0-alpha.10", "", { "dependencies": { "@ai-sdk/groq": "^3.0.4", "@elizaos/core": "alpha", "ai": "^6.0.0" } }, "sha512-VjceRHNUFFaQnXTxrC1Mi7Zs0szmx999Kw/+byjd7uCJXhCg0M/lXEdSM7z9i5/zjAZL3q6stQEMaOmJczNMIQ=="],
 
-    "@elizaos/plugin-openai": ["@elizaos/plugin-openai@2.0.0-alpha.13", "", { "dependencies": { "@ai-sdk/openai": "^3.0.9", "@elizaos/core": "alpha", "ai": "^6.0.30", "js-tiktoken": "^1.0.21", "undici": "^7.16.0" }, "peerDependencies": { "zod": "^4.3.6" } }, "sha512-ho6vxXwoU5kdbT8Rl5Y1iZ9yTXqkUcWgXdb2Wpr2/1tIaVP16yG9IrFrd0OAaF4crUX6wWJWQByfnGgxi8/GqA=="],
+    "@elizaos/plugin-ollama": ["@elizaos/plugin-ollama@2.0.0-alpha.70", "", { "dependencies": { "@ai-sdk/ui-utils": "^1.2.8", "@elizaos/core": "alpha", "ai": "^4.3.9", "js-tiktoken": "^1.0.18", "ollama-ai-provider": "^1.2.0" } }, "sha512-NlNaQTiEUs7KDKazqozmwbUGVHHs6vCocwXvU7RhyeRtgd49rYb5R0d/oLmMCKjTIld/jGmMjY9/qIHRqFk9wA=="],
+
+    "@elizaos/plugin-openai": ["@elizaos/plugin-openai@2.0.0-alpha.16", "", { "dependencies": { "@ai-sdk/openai": "^3.0.9", "ai": "^6.0.30", "js-tiktoken": "^1.0.21", "undici": "^7.16.0" }, "peerDependencies": { "@elizaos/core": "2.0.0-alpha.114", "zod": "^4.3.6" } }, "sha512-l4WaO5/m/Urx+j3/3nUrJ75kFTop7Ct6CbSRqCuhsrMdqE/GE83RrghmOu60IvWpex45P4Gx5mhSsras9+30gg=="],
 
-    "@elizaos/plugin-sql": ["@elizaos/plugin-sql@2.0.0-alpha.17", "", { "dependencies": { "@electric-sql/pglite": "^0.3.3", "@elizaos/core": "alpha", "@neondatabase/serverless": "^1.0.2", "dotenv": "^17.2.3", "drizzle-kit": "^0.31.8", "drizzle-orm": "^0.45.1", "pg": "^8.16.3", "uuid": "^13.0.0" } }, "sha512-O3I7ZX73DFMMCXWtjITi4QBYdo/01MI0neNBfqf6kbCBsE6j1r3ejZDoPBbRi/Ticsj3jlCc9nuwiOnKgWt+mQ=="],
+    "@elizaos/plugin-sql": ["@elizaos/plugin-sql@2.0.0-alpha.19", "", { "dependencies": { "@electric-sql/pglite": "^0.3.3", "@elizaos/core": "workspace:*", "@neondatabase/serverless": "^1.0.2", "dotenv": "^17.2.3", "drizzle-kit": "^0.31.8", "drizzle-orm": "^0.45.1", "pg": "^8.16.3", "uuid": "^13.0.0" } }, "sha512-LKHzdcD/yMDEZJ2MzJUwIDbYScAlp/oDc3O5x6Byd1Z10VrkWbKIU26+aAPuqTQwlTJMfvddY6u/I9lRxeGyIw=="],
 
-    "@elizaos/prompts": ["@elizaos/prompts@2.0.0-alpha.76", "", {}, "sha512-ZUASVWPpKgkqi4q1gGkTuh6KRk43KkZaeQayFRXZYxpKbAEvKqRdv7vZfXpZYXrwCmDLp62DYFGKPNsQ0oLMBA=="],
+    "@elizaos/prompts": ["@elizaos/prompts@2.0.0-alpha.196", "", {}, "sha512-+IFlaufZ58L0ZbyPuKiHruELGWNrkkqeuV99V2Jl5T1TprfIJv1RiT9qCEhYiYXsGZ8glHoSMGxdBkG6Qd4fBw=="],
 
     "@elysiajs/cors": ["@elysiajs/cors@1.4.1", "", { "peerDependencies": { "elysia": ">= 1.4.0" } }, "sha512-lQfad+F3r4mNwsxRKbXyJB8Jg43oAOXjRwn7sKUL6bcOW3KjUqUimTS+woNpO97efpzjtDE0tEjGk9DTw8lqTQ=="],
 
@@ -1409,8 +1421,6 @@
 
     "@ethersproject/wordlists": ["@ethersproject/wordlists@5.8.0", "", { "dependencies": { "@ethersproject/bytes": "^5.8.0", "@ethersproject/hash": "^5.8.0", "@ethersproject/logger": "^5.8.0", "@ethersproject/properties": "^5.8.0", "@ethersproject/strings": "^5.8.0" } }, "sha512-2df9bbXicZws2Sb5S6ET493uJ0Z84Fjr3pC4tu/qlnZERibZCeUVuqdtt+7Tv9xxhUxHoIekIA7avrKUWHrezg=="],
 
-    "@exodus/bytes": ["@exodus/bytes@1.15.0", "", { "peerDependencies": { "@noble/hashes": "^1.8.0 || ^2.0.0" }, "optionalPeers": ["@noble/hashes"] }, "sha512-UY0nlA+feH81UGSHv92sLEPLCeZFjXOuHhrIo0HQydScuQc8s0A7kL/UdgwgDq8g8ilksmuoF35YVTNphV2aBQ=="],
-
     "@farcaster/miniapp-core": ["@farcaster/miniapp-core@0.5.1", "", { "dependencies": { "@solana/web3.js": "^1.98.2", "ox": "^0.4.4", "zod": "^3.25.0" } }, "sha512-5QFn9zTV8GHUqZF31X9iwq9tNlnoOgP/o0UXb+QmdNeJsWXrhUFBKYl+C7KQOhVw2xqWKhBSDgYIHOkSRua3vg=="],
 
     "@farcaster/miniapp-sdk": ["@farcaster/miniapp-sdk@0.2.3", "", { "dependencies": { "@farcaster/miniapp-core": "0.5.1", "@farcaster/quick-auth": "^0.0.6", "comlink": "^4.4.2", "eventemitter3": "^5.0.1", "ox": "^0.4.4" } }, "sha512-FwxqGcYCXw3HyGfDuchFUmQN9Gd49jTJs585zzQv6l1Oba6A/vVVCYohEG6QxRT6b/UrdemImpNMGTnqAZ3hKw=="],
@@ -1933,7 +1943,7 @@
 
     "@nicolo-ribaudo/eslint-scope-5-internals": ["@nicolo-ribaudo/eslint-scope-5-internals@5.1.1-v1", "", { "dependencies": { "eslint-scope": "5.1.1" } }, "sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg=="],
 
-    "@noble/ciphers": ["@noble/ciphers@1.3.0", "", {}, "sha512-2I0gnIVPtfnMw9ee9h1dJG7tp81+8Ob3OJb3Mv37rx5L40/b0i7djjCVvGOVqc9AEIQyvyu1i6ypKdFw8R8gQw=="],
+    "@noble/ciphers": ["@noble/ciphers@2.2.0", "", {}, "sha512-Z6pjIZ/8IJcCGzb2S/0Px5J81yij85xASuk1teLNeg75bfT07MV3a/O2Mtn1I2se43k3lkVEcFaR10N4cgQcZA=="],
 
     "@noble/curves": ["@noble/curves@1.9.7", "", { "dependencies": { "@noble/hashes": "1.8.0" } }, "sha512-gbKGcRUYIjA3/zCCNaWDciTMFI0dCkvou3TL8Zmy5Nc7sJ47a0jtOeZoTaMxkuqRo9cRhjOdZJXegxYE5FN/xw=="],
 
@@ -2005,6 +2015,44 @@
 
     "@npmcli/redact": ["@npmcli/redact@4.0.0", "", {}, "sha512-gOBg5YHMfZy+TfHArfVogwgfBeQnKbbGo3pSUyK/gSI0AVu+pEiDVcKlQb0D8Mg1LNRZILZ6XG8I5dJ4KuAd9Q=="],
 
+    "@octokit/auth-app": ["@octokit/auth-app@6.1.4", "", { "dependencies": { "@octokit/auth-oauth-app": "^7.1.0", "@octokit/auth-oauth-user": "^4.1.0", "@octokit/request": "^8.3.1", "@octokit/request-error": "^5.1.0", "@octokit/types": "^13.1.0", "deprecation": "^2.3.1", "lru-cache": "npm:@wolfy1339/lru-cache@^11.0.2-patch.1", "universal-github-app-jwt": "^1.1.2", "universal-user-agent": "^6.0.0" } }, "sha512-QkXkSOHZK4dA5oUqY5Dk3S+5pN2s1igPjEASNQV8/vgJgW034fQWR16u7VsNOK/EljA00eyjYF5mWNxWKWhHRQ=="],
+
+    "@octokit/auth-oauth-app": ["@octokit/auth-oauth-app@7.1.0", "", { "dependencies": { "@octokit/auth-oauth-device": "^6.1.0", "@octokit/auth-oauth-user": "^4.1.0", "@octokit/request": "^8.3.1", "@octokit/types": "^13.0.0", "@types/btoa-lite": "^1.0.0", "btoa-lite": "^1.0.0", "universal-user-agent": "^6.0.0" } }, "sha512-w+SyJN/b0l/HEb4EOPRudo7uUOSW51jcK1jwLa+4r7PA8FPFpoxEnHBHMITqCsc/3Vo2qqFjgQfz/xUUvsSQnA=="],
+
+    "@octokit/auth-oauth-device": ["@octokit/auth-oauth-device@6.1.0", "", { "dependencies": { "@octokit/oauth-methods": "^4.1.0", "@octokit/request": "^8.3.1", "@octokit/types": "^13.0.0", "universal-user-agent": "^6.0.0" } }, "sha512-FNQ7cb8kASufd6Ej4gnJ3f1QB5vJitkoV1O0/g6e6lUsQ7+VsSNRHRmFScN2tV4IgKA12frrr/cegUs0t+0/Lw=="],
+
+    "@octokit/auth-oauth-user": ["@octokit/auth-oauth-user@4.1.0", "", { "dependencies": { "@octokit/auth-oauth-device": "^6.1.0", "@octokit/oauth-methods": "^4.1.0", "@octokit/request": "^8.3.1", "@octokit/types": "^13.0.0", "btoa-lite": "^1.0.0", "universal-user-agent": "^6.0.0" } }, "sha512-FrEp8mtFuS/BrJyjpur+4GARteUCrPeR/tZJzD8YourzoVhRics7u7we/aDcKv+yywRNwNi/P4fRi631rG/OyQ=="],
+
+    "@octokit/auth-token": ["@octokit/auth-token@4.0.0", "", {}, "sha512-tY/msAuJo6ARbK6SPIxZrPBms3xPbfwBrulZe0Wtr/DIY9lje2HeV1uoebShn6mx7SjCHif6EjMvoREj+gZ+SA=="],
+
+    "@octokit/core": ["@octokit/core@5.2.2", "", { "dependencies": { "@octokit/auth-token": "^4.0.0", "@octokit/graphql": "^7.1.0", "@octokit/request": "^8.4.1", "@octokit/request-error": "^5.1.1", "@octokit/types": "^13.0.0", "before-after-hook": "^2.2.0", "universal-user-agent": "^6.0.0" } }, "sha512-/g2d4sW9nUDJOMz3mabVQvOGhVa4e/BN/Um7yca9Bb2XTzPPnfTWHWQg+IsEYO7M3Vx+EXvaM/I2pJWIMun1bg=="],
+
+    "@octokit/endpoint": ["@octokit/endpoint@9.0.6", "", { "dependencies": { "@octokit/types": "^13.1.0", "universal-user-agent": "^6.0.0" } }, "sha512-H1fNTMA57HbkFESSt3Y9+FBICv+0jFceJFPWDePYlR/iMGrwM5ph+Dd4XRQs+8X+PUFURLQgX9ChPfhJ/1uNQw=="],
+
+    "@octokit/graphql": ["@octokit/graphql@7.1.1", "", { "dependencies": { "@octokit/request": "^8.4.1", "@octokit/types": "^13.0.0", "universal-user-agent": "^6.0.0" } }, "sha512-3mkDltSfcDUoa176nlGoA32RGjeWjl3K7F/BwHwRMJUW/IteSa4bnSV8p2ThNkcIcZU2umkZWxwETSSCJf2Q7g=="],
+
+    "@octokit/oauth-authorization-url": ["@octokit/oauth-authorization-url@6.0.2", "", {}, "sha512-CdoJukjXXxqLNK4y/VOiVzQVjibqoj/xHgInekviUJV73y/BSIcwvJ/4aNHPBPKcPWFnd4/lO9uqRV65jXhcLA=="],
+
+    "@octokit/oauth-methods": ["@octokit/oauth-methods@4.1.0", "", { "dependencies": { "@octokit/oauth-authorization-url": "^6.0.2", "@octokit/request": "^8.3.1", "@octokit/request-error": "^5.1.0", "@octokit/types": "^13.0.0", "btoa-lite": "^1.0.0" } }, "sha512-4tuKnCRecJ6CG6gr0XcEXdZtkTDbfbnD5oaHBmLERTjTMZNi2CbfEHZxPU41xXLDG4DfKf+sonu00zvKI9NSbw=="],
+
+    "@octokit/openapi-types": ["@octokit/openapi-types@24.2.0", "", {}, "sha512-9sIH3nSUttelJSXUrmGzl7QUBFul0/mB8HRYl3fOlgHbIWG+WnYDXU3v/2zMtAvuzZ/ed00Ei6on975FhBfzrg=="],
+
+    "@octokit/plugin-paginate-rest": ["@octokit/plugin-paginate-rest@11.4.4-cjs.2", "", { "dependencies": { "@octokit/types": "^13.7.0" }, "peerDependencies": { "@octokit/core": "5" } }, "sha512-2dK6z8fhs8lla5PaOTgqfCGBxgAv/le+EhPs27KklPhm1bKObpu6lXzwfUEQ16ajXzqNrKMujsFyo9K2eaoISw=="],
+
+    "@octokit/plugin-request-log": ["@octokit/plugin-request-log@4.0.1", "", { "peerDependencies": { "@octokit/core": "5" } }, "sha512-GihNqNpGHorUrO7Qa9JbAl0dbLnqJVrV8OXe2Zm5/Y4wFkZQDfTreBzVmiRfJVfE4mClXdihHnbpyyO9FSX4HA=="],
+
+    "@octokit/plugin-rest-endpoint-methods": ["@octokit/plugin-rest-endpoint-methods@13.3.2-cjs.1", "", { "dependencies": { "@octokit/types": "^13.8.0" }, "peerDependencies": { "@octokit/core": "^5" } }, "sha512-VUjIjOOvF2oELQmiFpWA1aOPdawpyaCUqcEBc/UOUnj3Xp6DJGrJ1+bjUIIDzdHjnFNO6q57ODMfdEZnoBkCwQ=="],
+
+    "@octokit/request": ["@octokit/request@8.4.1", "", { "dependencies": { "@octokit/endpoint": "^9.0.6", "@octokit/request-error": "^5.1.1", "@octokit/types": "^13.1.0", "universal-user-agent": "^6.0.0" } }, "sha512-qnB2+SY3hkCmBxZsR/MPCybNmbJe4KAlfWErXq+rBKkQJlbjdJeS85VI9r8UqeLYLvnAenU8Q1okM/0MBsAGXw=="],
+
+    "@octokit/request-error": ["@octokit/request-error@5.1.1", "", { "dependencies": { "@octokit/types": "^13.1.0", "deprecation": "^2.0.0", "once": "^1.4.0" } }, "sha512-v9iyEQJH6ZntoENr9/yXxjuezh4My67CBSu9r6Ve/05Iu5gNgnisNWOsoJHTP6k0Rr0+HQIpnH+kyammu90q/g=="],
+
+    "@octokit/rest": ["@octokit/rest@20.1.2", "", { "dependencies": { "@octokit/core": "^5.0.2", "@octokit/plugin-paginate-rest": "11.4.4-cjs.2", "@octokit/plugin-request-log": "^4.0.0", "@octokit/plugin-rest-endpoint-methods": "13.3.2-cjs.1" } }, "sha512-GmYiltypkHHtihFwPRxlaorG5R9VAHuk/vbszVoRTGXnAsY60wYLkh/E2XiFmdZmqrisw+9FaazS1i5SbdWYgA=="],
+
+    "@octokit/types": ["@octokit/types@13.10.0", "", { "dependencies": { "@octokit/openapi-types": "^24.2.0" } }, "sha512-ifLaO34EbbPj0Xgro4G5lP5asESjwHracYJvVaPIyXMuiuXLlhic3S47cBdTb+jfODkTE5YtGCLt3Ay3+J97sA=="],
+
+    "@openrouter/ai-sdk-provider": ["@openrouter/ai-sdk-provider@2.8.0", "", { "peerDependencies": { "ai": "^6.0.0", "zod": "^3.25.0 || ^4.0.0" } }, "sha512-oDDW/0KMqz4suHVloB9sNv0YyKLGNYf1FTevXH6adDkid5dsmbbcYuiEsbIhpZSZtHa6o5AVjK1jEAfePOLxww=="],
+
     "@opentelemetry/api": ["@opentelemetry/api@1.9.0", "", {}, "sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg=="],
 
     "@openzeppelin/contracts": ["@openzeppelin/contracts@5.6.1", "", {}, "sha512-Ly6SlsVJ3mj+b18W3R8gNufB7dTICT105fJhodGAGgyC2oqnBAhqSiNDJ8V8DLY05cCz81GLI0CU5vNYA1EC/w=="],
@@ -2147,6 +2195,68 @@
 
     "@puppeteer/browsers": ["@puppeteer/browsers@2.13.0", "", { "dependencies": { "debug": "^4.4.3", "extract-zip": "^2.0.1", "progress": "^2.0.3", "proxy-agent": "^6.5.0", "semver": "^7.7.4", "tar-fs": "^3.1.1", "yargs": "^17.7.2" }, "bin": { "browsers": "lib/cjs/main-cli.js" } }, "sha512-46BZJYJjc/WwmKjsvDFykHtXrtomsCIrwYQPOP7VfMJoZY2bsDF9oROBABR3paDjDcmkUye1Pb1BqdcdiipaWA=="],
 
+    "@radix-ui/number": ["@radix-ui/number@1.1.1", "", {}, "sha512-MkKCwxlXTgz6CFoJx3pCwn07GKp36+aZyu/u2Ln2VrA5DcdyCZkASEDBTd8x5whTQQL5CiYf4prXKLcgQdv29g=="],
+
+    "@radix-ui/primitive": ["@radix-ui/primitive@1.1.3", "", {}, "sha512-JTF99U/6XIjCBo0wqkU5sK10glYe27MRRsfwoiq5zzOEZLHU3A3KCMa5X/azekYRCJ0HlwI0crAXS/5dEHTzDg=="],
+
+    "@radix-ui/react-arrow": ["@radix-ui/react-arrow@1.1.7", "", { "dependencies": { "@radix-ui/react-primitive": "2.1.3" }, "peerDependencies": { "@types/react": "*", "@types/react-dom": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react", "@types/react-dom"] }, "sha512-F+M1tLhO+mlQaOWspE8Wstg+z6PwxwRd8oQ8IXceWz92kfAmalTRf0EjrouQeo7QssEPfCn05B4Ihs1K9WQ/7w=="],
+
+    "@radix-ui/react-checkbox": ["@radix-ui/react-checkbox@1.3.3", "", { "dependencies": { "@radix-ui/primitive": "1.1.3", "@radix-ui/react-compose-refs": "1.1.2", "@radix-ui/react-context": "1.1.2", "@radix-ui/react-presence": "1.1.5", "@radix-ui/react-primitive": "2.1.3", "@radix-ui/react-use-controllable-state": "1.2.2", "@radix-ui/react-use-previous": "1.1.1", "@radix-ui/react-use-size": "1.1.1" }, "peerDependencies": { "@types/react": "*", "@types/react-dom": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react", "@types/react-dom"] }, "sha512-wBbpv+NQftHDdG86Qc0pIyXk5IR3tM8Vd0nWLKDcX8nNn4nXFOFwsKuqw2okA/1D/mpaAkmuyndrPJTYDNZtFw=="],
+
+    "@radix-ui/react-collapsible": ["@radix-ui/react-collapsible@1.1.12", "", { "dependencies": { "@radix-ui/primitive": "1.1.3", "@radix-ui/react-compose-refs": "1.1.2", "@radix-ui/react-context": "1.1.2", "@radix-ui/react-id": "1.1.1", "@radix-ui/react-presence": "1.1.5", "@radix-ui/react-primitive": "2.1.3", "@radix-ui/react-use-controllable-state": "1.2.2", "@radix-ui/react-use-layout-effect": "1.1.1" }, "peerDependencies": { "@types/react": "*", "@types/react-dom": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react", "@types/react-dom"] }, "sha512-Uu+mSh4agx2ib1uIGPP4/CKNULyajb3p92LsVXmH2EHVMTfZWpll88XJ0j4W0z3f8NK1eYl1+Mf/szHPmcHzyA=="],
+
+    "@radix-ui/react-collection": ["@radix-ui/react-collection@1.1.7", "", { "dependencies": { "@radix-ui/react-compose-refs": "1.1.2", "@radix-ui/react-context": "1.1.2", "@radix-ui/react-primitive": "2.1.3", "@radix-ui/react-slot": "1.2.3" }, "peerDependencies": { "@types/react": "*", "@types/react-dom": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react", "@types/react-dom"] }, "sha512-Fh9rGN0MoI4ZFUNyfFVNU4y9LUz93u9/0K+yLgA2bwRojxM8JU1DyvvMBabnZPBgMWREAJvU2jjVzq+LrFUglw=="],
+
+    "@radix-ui/react-compose-refs": ["@radix-ui/react-compose-refs@1.1.2", "", { "peerDependencies": { "@types/react": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react"] }, "sha512-z4eqJvfiNnFMHIIvXP3CY57y2WJs5g2v3X0zm9mEJkrkNv4rDxu+sg9Jh8EkXyeqBkB7SOcboo9dMVqhyrACIg=="],
+
+    "@radix-ui/react-context": ["@radix-ui/react-context@1.1.2", "", { "peerDependencies": { "@types/react": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react"] }, "sha512-jCi/QKUM2r1Ju5a3J64TH2A5SpKAgh0LpknyqdQ4m6DCV0xJ2HG1xARRwNGPQfi1SLdLWZ1OJz6F4OMBBNiGJA=="],
+
+    "@radix-ui/react-direction": ["@radix-ui/react-direction@1.1.1", "", { "peerDependencies": { "@types/react": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react"] }, "sha512-1UEWRX6jnOA2y4H5WczZ44gOOjTEmlqv1uNW4GAJEO5+bauCBhv8snY65Iw5/VOS/ghKN9gr2KjnLKxrsvoMVw=="],
+
+    "@radix-ui/react-dismissable-layer": ["@radix-ui/react-dismissable-layer@1.1.11", "", { "dependencies": { "@radix-ui/primitive": "1.1.3", "@radix-ui/react-compose-refs": "1.1.2", "@radix-ui/react-primitive": "2.1.3", "@radix-ui/react-use-callback-ref": "1.1.1", "@radix-ui/react-use-escape-keydown": "1.1.1" }, "peerDependencies": { "@types/react": "*", "@types/react-dom": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react", "@types/react-dom"] }, "sha512-Nqcp+t5cTB8BinFkZgXiMJniQH0PsUt2k51FUhbdfeKvc4ACcG2uQniY/8+h1Yv6Kza4Q7lD7PQV0z0oicE0Mg=="],
+
+    "@radix-ui/react-focus-guards": ["@radix-ui/react-focus-guards@1.1.3", "", { "peerDependencies": { "@types/react": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react"] }, "sha512-0rFg/Rj2Q62NCm62jZw0QX7a3sz6QCQU0LpZdNrJX8byRGaGVTqbrW9jAoIAHyMQqsNpeZ81YgSizOt5WXq0Pw=="],
+
+    "@radix-ui/react-focus-scope": ["@radix-ui/react-focus-scope@1.1.7", "", { "dependencies": { "@radix-ui/react-compose-refs": "1.1.2", "@radix-ui/react-primitive": "2.1.3", "@radix-ui/react-use-callback-ref": "1.1.1" }, "peerDependencies": { "@types/react": "*", "@types/react-dom": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react", "@types/react-dom"] }, "sha512-t2ODlkXBQyn7jkl6TNaw/MtVEVvIGelJDCG41Okq/KwUsJBwQ4XVZsHAVUkK4mBv3ewiAS3PGuUWuY2BoK4ZUw=="],
+
+    "@radix-ui/react-id": ["@radix-ui/react-id@1.1.1", "", { "dependencies": { "@radix-ui/react-use-layout-effect": "1.1.1" }, "peerDependencies": { "@types/react": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react"] }, "sha512-kGkGegYIdQsOb4XjsfM97rXsiHaBwco+hFI66oO4s9LU+PLAC5oJ7khdOVFxkhsmlbpUqDAvXw11CluXP+jkHg=="],
+
+    "@radix-ui/react-label": ["@radix-ui/react-label@2.1.8", "", { "dependencies": { "@radix-ui/react-primitive": "2.1.4" }, "peerDependencies": { "@types/react": "*", "@types/react-dom": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react", "@types/react-dom"] }, "sha512-FmXs37I6hSBVDlO4y764TNz1rLgKwjJMQ0EGte6F3Cb3f4bIuHB/iLa/8I9VKkmOy+gNHq8rql3j686ACVV21A=="],
+
+    "@radix-ui/react-popper": ["@radix-ui/react-popper@1.2.8", "", { "dependencies": { "@floating-ui/react-dom": "^2.0.0", "@radix-ui/react-arrow": "1.1.7", "@radix-ui/react-compose-refs": "1.1.2", "@radix-ui/react-context": "1.1.2", "@radix-ui/react-primitive": "2.1.3", "@radix-ui/react-use-callback-ref": "1.1.1", "@radix-ui/react-use-layout-effect": "1.1.1", "@radix-ui/react-use-rect": "1.1.1", "@radix-ui/react-use-size": "1.1.1", "@radix-ui/rect": "1.1.1" }, "peerDependencies": { "@types/react": "*", "@types/react-dom": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react", "@types/react-dom"] }, "sha512-0NJQ4LFFUuWkE7Oxf0htBKS6zLkkjBH+hM1uk7Ng705ReR8m/uelduy1DBo0PyBXPKVnBA6YBlU94MBGXrSBCw=="],
+
+    "@radix-ui/react-portal": ["@radix-ui/react-portal@1.1.9", "", { "dependencies": { "@radix-ui/react-primitive": "2.1.3", "@radix-ui/react-use-layout-effect": "1.1.1" }, "peerDependencies": { "@types/react": "*", "@types/react-dom": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react", "@types/react-dom"] }, "sha512-bpIxvq03if6UNwXZ+HTK71JLh4APvnXntDc6XOX8UVq4XQOVl7lwok0AvIl+b8zgCw3fSaVTZMpAPPagXbKmHQ=="],
+
+    "@radix-ui/react-presence": ["@radix-ui/react-presence@1.1.5", "", { "dependencies": { "@radix-ui/react-compose-refs": "1.1.2", "@radix-ui/react-use-layout-effect": "1.1.1" }, "peerDependencies": { "@types/react": "*", "@types/react-dom": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react", "@types/react-dom"] }, "sha512-/jfEwNDdQVBCNvjkGit4h6pMOzq8bHkopq458dPt2lMjx+eBQUohZNG9A7DtO/O5ukSbxuaNGXMjHicgwy6rQQ=="],
+
+    "@radix-ui/react-primitive": ["@radix-ui/react-primitive@2.1.3", "", { "dependencies": { "@radix-ui/react-slot": "1.2.3" }, "peerDependencies": { "@types/react": "*", "@types/react-dom": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react", "@types/react-dom"] }, "sha512-m9gTwRkhy2lvCPe6QJp4d3G1TYEUHn/FzJUtq9MjH46an1wJU+GdoGC5VLof8RX8Ft/DlpshApkhswDLZzHIcQ=="],
+
+    "@radix-ui/react-select": ["@radix-ui/react-select@2.2.6", "", { "dependencies": { "@radix-ui/number": "1.1.1", "@radix-ui/primitive": "1.1.3", "@radix-ui/react-collection": "1.1.7", "@radix-ui/react-compose-refs": "1.1.2", "@radix-ui/react-context": "1.1.2", "@radix-ui/react-direction": "1.1.1", "@radix-ui/react-dismissable-layer": "1.1.11", "@radix-ui/react-focus-guards": "1.1.3", "@radix-ui/react-focus-scope": "1.1.7", "@radix-ui/react-id": "1.1.1", "@radix-ui/react-popper": "1.2.8", "@radix-ui/react-portal": "1.1.9", "@radix-ui/react-primitive": "2.1.3", "@radix-ui/react-slot": "1.2.3", "@radix-ui/react-use-callback-ref": "1.1.1", "@radix-ui/react-use-controllable-state": "1.2.2", "@radix-ui/react-use-layout-effect": "1.1.1", "@radix-ui/react-use-previous": "1.1.1", "@radix-ui/react-visually-hidden": "1.2.3", "aria-hidden": "^1.2.4", "react-remove-scroll": "^2.6.3" }, "peerDependencies": { "@types/react": "*", "@types/react-dom": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react", "@types/react-dom"] }, "sha512-I30RydO+bnn2PQztvo25tswPH+wFBjehVGtmagkU78yMdwTwVf12wnAOF+AeP8S2N8xD+5UPbGhkUfPyvT+mwQ=="],
+
+    "@radix-ui/react-separator": ["@radix-ui/react-separator@1.1.8", "", { "dependencies": { "@radix-ui/react-primitive": "2.1.4" }, "peerDependencies": { "@types/react": "*", "@types/react-dom": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react", "@types/react-dom"] }, "sha512-sDvqVY4itsKwwSMEe0jtKgfTh+72Sy3gPmQpjqcQneqQ4PFmr/1I0YA+2/puilhggCe2gJcx5EBAYFkWkdpa5g=="],
+
+    "@radix-ui/react-slot": ["@radix-ui/react-slot@1.2.4", "", { "dependencies": { "@radix-ui/react-compose-refs": "1.1.2" }, "peerDependencies": { "@types/react": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react"] }, "sha512-Jl+bCv8HxKnlTLVrcDE8zTMJ09R9/ukw4qBs/oZClOfoQk/cOTbDn+NceXfV7j09YPVQUryJPHurafcSg6EVKA=="],
+
+    "@radix-ui/react-use-callback-ref": ["@radix-ui/react-use-callback-ref@1.1.1", "", { "peerDependencies": { "@types/react": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react"] }, "sha512-FkBMwD+qbGQeMu1cOHnuGB6x4yzPjho8ap5WtbEJ26umhgqVXbhekKUQO+hZEL1vU92a3wHwdp0HAcqAUF5iDg=="],
+
+    "@radix-ui/react-use-controllable-state": ["@radix-ui/react-use-controllable-state@1.2.2", "", { "dependencies": { "@radix-ui/react-use-effect-event": "0.0.2", "@radix-ui/react-use-layout-effect": "1.1.1" }, "peerDependencies": { "@types/react": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react"] }, "sha512-BjasUjixPFdS+NKkypcyyN5Pmg83Olst0+c6vGov0diwTEo6mgdqVR6hxcEgFuh4QrAs7Rc+9KuGJ9TVCj0Zzg=="],
+
+    "@radix-ui/react-use-effect-event": ["@radix-ui/react-use-effect-event@0.0.2", "", { "dependencies": { "@radix-ui/react-use-layout-effect": "1.1.1" }, "peerDependencies": { "@types/react": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react"] }, "sha512-Qp8WbZOBe+blgpuUT+lw2xheLP8q0oatc9UpmiemEICxGvFLYmHm9QowVZGHtJlGbS6A6yJ3iViad/2cVjnOiA=="],
+
+    "@radix-ui/react-use-escape-keydown": ["@radix-ui/react-use-escape-keydown@1.1.1", "", { "dependencies": { "@radix-ui/react-use-callback-ref": "1.1.1" }, "peerDependencies": { "@types/react": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react"] }, "sha512-Il0+boE7w/XebUHyBjroE+DbByORGR9KKmITzbR7MyQ4akpORYP/ZmbhAr0DG7RmmBqoOnZdy2QlvajJ2QA59g=="],
+
+    "@radix-ui/react-use-layout-effect": ["@radix-ui/react-use-layout-effect@1.1.1", "", { "peerDependencies": { "@types/react": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react"] }, "sha512-RbJRS4UWQFkzHTTwVymMTUv8EqYhOp8dOOviLj2ugtTiXRaRQS7GLGxZTLL1jWhMeoSCf5zmcZkqTl9IiYfXcQ=="],
+
+    "@radix-ui/react-use-previous": ["@radix-ui/react-use-previous@1.1.1", "", { "peerDependencies": { "@types/react": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react"] }, "sha512-2dHfToCj/pzca2Ck724OZ5L0EVrr3eHRNsG/b3xQJLA2hZpVCS99bLAX+hm1IHXDEnzU6by5z/5MIY794/a8NQ=="],
+
+    "@radix-ui/react-use-rect": ["@radix-ui/react-use-rect@1.1.1", "", { "dependencies": { "@radix-ui/rect": "1.1.1" }, "peerDependencies": { "@types/react": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react"] }, "sha512-QTYuDesS0VtuHNNvMh+CjlKJ4LJickCMUAqjlE3+j8w+RlRpwyX3apEQKGFzbZGdo7XNG1tXa+bQqIE7HIXT2w=="],
+
+    "@radix-ui/react-use-size": ["@radix-ui/react-use-size@1.1.1", "", { "dependencies": { "@radix-ui/react-use-layout-effect": "1.1.1" }, "peerDependencies": { "@types/react": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react"] }, "sha512-ewrXRDTAqAXlkl6t/fkXWNAhFX9I+CkKlw6zjEwk86RSPKwZr3xpBRso655aqYafwtnbpHLj6toFzmd6xdVptQ=="],
+
+    "@radix-ui/react-visually-hidden": ["@radix-ui/react-visually-hidden@1.2.3", "", { "dependencies": { "@radix-ui/react-primitive": "2.1.3" }, "peerDependencies": { "@types/react": "*", "@types/react-dom": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react", "@types/react-dom"] }, "sha512-pzJq12tEaaIhqjbzpCuv/OypJY/BPavOofm+dbab+MHLajy277+1lLm6JFcGgF5eskJ6mquGirhXY2GD/8u8Ug=="],
+
+    "@radix-ui/rect": ["@radix-ui/rect@1.1.1", "", {}, "sha512-HPwpGIzkl28mWyZqG52jiqDJ12waP11Pa1lGoiyUkIEuMLBP0oeK/C89esbXrxsky5we7dfd8U58nm0SgAWpVw=="],
+
     "@react-aria/focus": ["@react-aria/focus@3.21.5", "", { "dependencies": { "@react-aria/interactions": "^3.27.1", "@react-aria/utils": "^3.33.1", "@react-types/shared": "^3.33.1", "@swc/helpers": "^0.5.0", "clsx": "^2.0.0" }, "peerDependencies": { "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1", "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1" } }, "sha512-V18fwCyf8zqgJdpLQeDU5ZRNd9TeOfBbhLgmX77Zr5ae9XwaoJ1R3SFJG1wCJX60t34AW+aLZSEEK+saQElf3Q=="],
 
     "@react-aria/interactions": ["@react-aria/interactions@3.27.1", "", { "dependencies": { "@react-aria/ssr": "^3.9.10", "@react-aria/utils": "^3.33.1", "@react-stately/flags": "^3.1.2", "@react-types/shared": "^3.33.1", "@swc/helpers": "^0.5.0" }, "peerDependencies": { "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1", "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1" } }, "sha512-M3wLpTTmDflI0QGNK0PJNUaBXXfeBXue8ZxLMngfc1piHNiH4G5lUvWd9W14XVbqrSCVY8i8DfGrNYpyyZu0tw=="],
@@ -2729,6 +2839,8 @@
 
     "@tokenizer/token": ["@tokenizer/token@0.3.0", "", {}, "sha512-OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A=="],
 
+    "@toon-format/toon": ["@toon-format/toon@2.1.0", "", {}, "sha512-JwWptdF5eOA0HaQxbKAzkpQtR4wSWTEfDlEy/y3/4okmOAX1qwnpLZMmtEWr+ncAhTTY1raCKH0kteHhSXnQqg=="],
+
     "@tootallnate/quickjs-emscripten": ["@tootallnate/quickjs-emscripten@0.23.0", "", {}, "sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA=="],
 
     "@trpc/client": ["@trpc/client@10.34.0", "", { "peerDependencies": { "@trpc/server": "10.34.0" } }, "sha512-nqtDTIqSY/9syo2EjSy4WWWXPU9GsamEh9Tsg698gLAh1nhgFc5+/YYeb+Ne1pbvWGZ5/3t9Dcz3h4wMyyJ9gQ=="],
@@ -2767,6 +2879,8 @@
 
     "@types/braces": ["@types/braces@3.0.5", "", {}, "sha512-SQFof9H+LXeWNz8wDe7oN5zu7ket0qwMu5vZubW4GCJ8Kkeh6nBWUz87+KTz/G3Kqsrp0j/W253XJb3KMEeg3w=="],
 
+    "@types/btoa-lite": ["@types/btoa-lite@1.0.2", "", {}, "sha512-ZYbcE2x7yrvNFJiU7xJGrpF/ihpkM7zKgw8bha3LNJSesvTtUNxbpzaT7WXBIryf6jovisrxTBvymxMeLLj1Mg=="],
+
     "@types/bun": ["@types/bun@1.3.10", "", { "dependencies": { "bun-types": "1.3.10" } }, "sha512-0+rlrUrOrTSskibryHbvQkDOWRJwJZqZlxrUs1u4oOoTln8+WIXBPmAuCF35SWB2z4Zl3E84Nl/D0P7803nigQ=="],
 
     "@types/chai": ["@types/chai@5.2.3", "", { "dependencies": { "@types/deep-eql": "*", "assertion-error": "^2.0.1" } }, "sha512-Mw558oeA9fFbv65/y4mHtXDs9bPnFMZAL/jxdPFUpOHHIXX91mcgEHbS5Lahr+pwZFR8A7GQleRWeI6cGFC2UA=="],
@@ -3187,6 +3301,8 @@
 
     "acorn-walk": ["acorn-walk@8.3.5", "", { "dependencies": { "acorn": "^8.11.0" } }, "sha512-HEHNfbars9v4pgpW6SO1KSPkfoS0xVOM/9UzkJltjlsHZmJasxg8aXkuZa7SMf8vKGIBhpUsPluQSqhJFCqebw=="],
 
+    "adapter-types": ["adapter-types@0.2.0", "", {}, "sha512-T6YjdynGF9u1+D+DnqjsGmyW/dkq+kVRpz/wgVGcK2EHBAz9ETCX9Kz9ZHZdqyd0B2s/YJ0euGHiwhOFoGe0NA=="],
+
     "address": ["address@1.2.2", "", {}, "sha512-4B/qKCfeE/ODUaAUpSwfzazo5x29WD4r3vXiWsB7I2mSDAihwEqKO+g8GELZUQSSAo5e1XTYh3ZVfLyxBc12nA=="],
 
     "adm-zip": ["adm-zip@0.4.16", "", {}, "sha512-TFi4HBKSGfIKsK5YCkKaaFG2m4PEDyViZmEwof3MTIgzimHLto6muaHVpbrljdIvIrFZzEq/p4nafOeLcYegrg=="],
@@ -3195,7 +3311,7 @@
 
     "aes-js": ["aes-js@4.0.0-beta.5", "", {}, "sha512-G965FqalsNyrPqgEGON7nIx1e/OVENSgiEIzyC63haUMuvNnwIgIjMs52hlTCKhkBny7A2ORNlfY9Zu+jmGk1Q=="],
 
-    "agent-base": ["agent-base@6.0.2", "", { "dependencies": { "debug": "4" } }, "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ=="],
+    "agent-base": ["agent-base@7.1.4", "", {}, "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ=="],
 
     "agentkeepalive": ["agentkeepalive@4.6.0", "", { "dependencies": { "humanize-ms": "^1.2.1" } }, "sha512-kja8j7PjmncONqaTsB8fQ+wE2mSU2DJ9D4XKoJ5PFWIdRMa6SLSN1ff4mOr4jCbfRSsxR4keIiySJU0N9T5hIQ=="],
 
@@ -3247,6 +3363,8 @@
 
     "argparse": ["argparse@1.0.10", "", { "dependencies": { "sprintf-js": "~1.0.2" } }, "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg=="],
 
+    "aria-hidden": ["aria-hidden@1.2.6", "", { "dependencies": { "tslib": "^2.0.0" } }, "sha512-ik3ZgC9dY/lYVVM++OISsaYDeg1tb0VtP5uL3ouh1koGOaUMDPpbFIei4JkFimWUFPn90sbMNMXQAIVOlnYKJA=="],
+
     "aria-query": ["aria-query@5.3.2", "", {}, "sha512-COROpnaoap1E2F000S62r6A60uHZnmlvomhfyT2DlTcrY1OrBKn2UhH7qn5wTC9zMvD0AY7csdPSNwKP+7WiQw=="],
 
     "arktype": ["arktype@2.0.0-beta.6", "", { "dependencies": { "@ark/schema": "0.3.3", "@ark/util": "0.2.2" } }, "sha512-tbH5/h0z371sgrJIAhZhH2BcrErWv8uQIPVcLmknJ8ffov5/ZbMNufrQ3hG9avGKTcVnVmdQoPhl1WuKuagqXA=="],
@@ -3375,6 +3493,8 @@
 
     "bech32": ["bech32@1.1.4", "", {}, "sha512-s0IrSOzLlbvX7yp4WBfPITzpAU8sqQcpsmwXDiKwrG4r491vwCO/XpejasRNl0piBMe/DvP4Tz0mIS/X1DPJBQ=="],
 
+    "before-after-hook": ["before-after-hook@2.2.3", "", {}, "sha512-NzUnlZexiaH/46WDhANlyR2bXRopNg4F/zuSA3OpZnllCUgRaOF2znDioDWrmbNVsuZk6l9pMquQB38cfBZwkQ=="],
+
     "better-ajv-errors": ["better-ajv-errors@2.0.3", "", { "dependencies": { "@babel/code-frame": "^7.27.1", "@humanwhocodes/momoa": "^2.0.4", "chalk": "^4.1.2", "jsonpointer": "^5.0.1", "leven": "^3.1.0 < 4" }, "peerDependencies": { "ajv": "4.11.8 - 8" } }, "sha512-t1vxUP+vYKsaYi/BbKo2K98nEAZmfi4sjwvmRT8aOPDzPJeAtLurfoIDazVkLILxO4K+Sw4YrLYnBQ46l6pePg=="],
 
     "better-sqlite3": ["better-sqlite3@12.6.2", "", { "dependencies": { "bindings": "^1.5.0", "prebuild-install": "^7.1.1" } }, "sha512-8VYKM3MjCa9WcaSAI3hzwhmyHVlH8tiGFwf0RlTsZPWJ1I5MkzjiudCo4KC4DxOaL/53A5B1sI/IbldNFDbsKA=="],
@@ -3393,6 +3513,8 @@
 
     "blakejs": ["blakejs@1.2.1", "", {}, "sha512-QXUSXI3QVc/gJME0dBpXrag1kbzOqCjCX8/b54ntNyW6sjtoqxqRk3LTmXzaJoh71zMsDCjM+47jS7XiwN/+fQ=="],
 
+    "bluebird": ["bluebird@3.4.7", "", {}, "sha512-iD3898SR7sWVRHbiQv+sHUtHnMvC1o3nW5rAcqnq3uOn07DSAppZYUkIGslDz6gXC7HfunPe7YVBgoEJASPcHA=="],
+
     "bmp-ts": ["bmp-ts@1.0.9", "", {}, "sha512-cTEHk2jLrPyi+12M3dhpEbnnPOsaZuq7C45ylbbQIiWgDFZq4UVYPEY5mlqjvsj/6gJv9qX5sa+ebDzLXT28Vw=="],
 
     "bn.js": ["bn.js@5.2.3", "", {}, "sha512-EAcmnPkxpntVL+DS7bO1zhcZNvCkxqtkd0ZY53h06GNQ3DEkkGZ/gKgmDv6DdZQGj9BgfSPKtJJ7Dp1GPP8f7w=="],
@@ -3417,16 +3539,6 @@
 
     "brorand": ["brorand@1.1.0", "", {}, "sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w=="],
 
-    "browserify-aes": ["browserify-aes@1.2.0", "", { "dependencies": { "buffer-xor": "^1.0.3", "cipher-base": "^1.0.0", "create-hash": "^1.1.0", "evp_bytestokey": "^1.0.3", "inherits": "^2.0.1", "safe-buffer": "^5.0.1" } }, "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA=="],
-
-    "browserify-cipher": ["browserify-cipher@1.0.1", "", { "dependencies": { "browserify-aes": "^1.0.4", "browserify-des": "^1.0.0", "evp_bytestokey": "^1.0.0" } }, "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w=="],
-
-    "browserify-des": ["browserify-des@1.0.2", "", { "dependencies": { "cipher-base": "^1.0.1", "des.js": "^1.0.0", "inherits": "^2.0.1", "safe-buffer": "^5.1.2" } }, "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A=="],
-
-    "browserify-rsa": ["browserify-rsa@4.1.1", "", { "dependencies": { "bn.js": "^5.2.1", "randombytes": "^2.1.0", "safe-buffer": "^5.2.1" } }, "sha512-YBjSAiTqM04ZVei6sXighu679a3SqWORA3qZTEqZImnlkDIFtKc6pNutpjyZ8RJTjQtuYfeetkxM11GwoYXMIQ=="],
-
-    "browserify-sign": ["browserify-sign@4.2.5", "", { "dependencies": { "bn.js": "^5.2.2", "browserify-rsa": "^4.1.1", "create-hash": "^1.2.0", "create-hmac": "^1.1.7", "elliptic": "^6.6.1", "inherits": "^2.0.4", "parse-asn1": "^5.1.9", "readable-stream": "^2.3.8", "safe-buffer": "^5.2.1" } }, "sha512-C2AUdAJg6rlM2W5QMp2Q4KGQMVBwR1lIimTsUnutJ8bMpW5B52pGpR2gEnNBNwijumDo5FojQ0L9JrXA8m4YEw=="],
-
     "browserslist": ["browserslist@4.28.1", "", { "dependencies": { "baseline-browser-mapping": "^2.9.0", "caniuse-lite": "^1.0.30001759", "electron-to-chromium": "^1.5.263", "node-releases": "^2.0.27", "update-browserslist-db": "^1.2.0" }, "bin": { "browserslist": "cli.js" } }, "sha512-ZC5Bd0LgJXgwGqUknZY/vkUQ04r8NXnJZ3yYi4vDmSiZmC/pdSN0NbNRPxZpbtO4uAfDUAFffO8IZoM3Gj8IkA=="],
 
     "bs-logger": ["bs-logger@0.2.6", "", { "dependencies": { "fast-json-stable-stringify": "2.x" } }, "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog=="],
@@ -3435,6 +3547,8 @@
 
     "bser": ["bser@2.1.1", "", { "dependencies": { "node-int64": "^0.4.0" } }, "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ=="],
 
+    "btoa-lite": ["btoa-lite@1.0.0", "", {}, "sha512-gvW7InbIyF8AicrqWoptdW08pUxuhq8BEgowNajy9RhiE86fmGAGl+bLKo6oB8QP0CkqHLowfN0oJdKC/J6LbA=="],
+
     "buffer": ["buffer@6.0.3", "", { "dependencies": { "base64-js": "^1.3.1", "ieee754": "^1.2.1" } }, "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA=="],
 
     "buffer-crc32": ["buffer-crc32@0.2.13", "", {}, "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ=="],
@@ -3443,8 +3557,6 @@
 
     "buffer-from": ["buffer-from@1.1.2", "", {}, "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="],
 
-    "buffer-xor": ["buffer-xor@1.0.3", "", {}, "sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ=="],
-
     "bufferutil": ["bufferutil@4.1.0", "", { "dependencies": { "node-gyp-build": "^4.3.0" } }, "sha512-ZMANVnAixE6AWWnPzlW2KpUrxhm9woycYvPOo67jWHyFowASTEd9s+QN1EIMsSDtwhIxN4sWE1jotpuDUIgyIw=="],
 
     "bun-types": ["bun-types@1.3.10", "", { "dependencies": { "@types/node": "*" } }, "sha512-tcpfCCl6XWo6nCVnpcVrxQ+9AYN1iqMIzgrSKYMB/fjLtV2eyAVEg7AxQJuCq/26R6HpKWykQXuSOq/21RYcbg=="],
@@ -3539,12 +3651,12 @@
 
     "ci-info": ["ci-info@4.4.0", "", {}, "sha512-77PSwercCZU2Fc4sX94eF8k8Pxte6JAwL4/ICZLFjJLqegs7kCuAsqqj/70NQF6TvDpgFjkubQB2FW2ZZddvQg=="],
 
-    "cipher-base": ["cipher-base@1.0.7", "", { "dependencies": { "inherits": "^2.0.4", "safe-buffer": "^5.2.1", "to-buffer": "^1.2.2" } }, "sha512-Mz9QMT5fJe7bKI7MH31UilT5cEK5EHHRCccw/YRFsRY47AuNgaV6HY3rscp0/I4Q+tTW/5zoqpSeRRI54TkDWA=="],
-
     "cjs-module-lexer": ["cjs-module-lexer@2.2.0", "", {}, "sha512-4bHTS2YuzUvtoLjdy+98ykbNB5jS0+07EvFNXerqZQJ89F7DI6ET7OQo/HJuW6K0aVsKA9hj9/RVb2kQVOrPDQ=="],
 
     "clarinet": ["clarinet@github:latticexyz/clarinet#9c30657", {}, "latticexyz-clarinet-9c30657"],
 
+    "class-variance-authority": ["class-variance-authority@0.7.1", "", { "dependencies": { "clsx": "^2.1.1" } }, "sha512-Ka+9Trutv7G8M6WT6SeiRWz792K5qEqIGEGzXKhAE6xOWAY6pPH8U+9IY3oCMv6kqTmLsv7Xh/2w2RigkePMsg=="],
+
     "classcat": ["classcat@5.0.5", "", {}, "sha512-JhZUT7JFcQy/EzW605k/ktHtncoo9vnyW/2GspNYwFlN1C/WmjuV/xtS04e9SOkL2sTdw0VAZ2UGCcQ9lR6p6w=="],
 
     "clean-css": ["clean-css@5.3.3", "", { "dependencies": { "source-map": "~0.6.0" } }, "sha512-D5J+kHaVb/wKSFcyyV75uCn8fiY4sV38XJoe4CUyGQ+mOU/fMVYUdH1hJC+CJQ5uY3EnW27SbJYS4X8BiLrAFg=="],
@@ -3569,6 +3681,8 @@
 
     "co": ["co@4.6.0", "", {}, "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ=="],
 
+    "coding-agent-adapters": ["coding-agent-adapters@0.16.3", "", { "dependencies": { "adapter-types": "^0.2.0", "pino": "^9.6.0" }, "peerDependencies": { "agent-adapter-monitor": "^0.3.0" }, "optionalPeers": ["agent-adapter-monitor"] }, "sha512-eY2fiJ95sIYl2PUok7EP2XREQ+Mjpz88itv0rJV9ChS0g94PwfqDE6Vm1/qhBqOCt6CIE6HD0FMHzZlM+51nig=="],
+
     "collapse-white-space": ["collapse-white-space@2.1.0", "", {}, "sha512-loKTxY1zCOuG4j9f6EPnuyyYkf58RnhhWTvRoZEokgB+WbdXehfjFviyOVYkqzEWz1Q5kRiZdBYS5SwxbQYwzw=="],
 
     "collect-v8-coverage": ["collect-v8-coverage@1.0.3", "", {}, "sha512-1L5aqIkwPfiodaMgQunkF1zRhNqifHBmtbbbxcr6yVxxBnliw4TDOW6NxpO8DJLgJ16OT+Y4ztZqP6p/FtXnAw=="],
@@ -3653,12 +3767,6 @@
 
     "crc-32": ["crc-32@1.2.2", "", { "bin": { "crc32": "bin/crc32.njs" } }, "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ=="],
 
-    "create-ecdh": ["create-ecdh@4.0.4", "", { "dependencies": { "bn.js": "^4.1.0", "elliptic": "^6.5.3" } }, "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A=="],
-
-    "create-hash": ["create-hash@1.2.0", "", { "dependencies": { "cipher-base": "^1.0.1", "inherits": "^2.0.1", "md5.js": "^1.3.4", "ripemd160": "^2.0.1", "sha.js": "^2.4.0" } }, "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg=="],
-
-    "create-hmac": ["create-hmac@1.1.7", "", { "dependencies": { "cipher-base": "^1.0.3", "create-hash": "^1.1.0", "inherits": "^2.0.1", "ripemd160": "^2.0.0", "safe-buffer": "^5.0.1", "sha.js": "^2.4.8" } }, "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg=="],
-
     "create-require": ["create-require@1.1.1", "", {}, "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ=="],
 
     "cross-env": ["cross-env@7.0.3", "", { "dependencies": { "cross-spawn": "^7.0.1" }, "bin": { "cross-env": "src/bin/cross-env.js", "cross-env-shell": "src/bin/cross-env-shell.js" } }, "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw=="],
@@ -3669,8 +3777,6 @@
 
     "crypt": ["crypt@0.0.2", "", {}, "sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow=="],
 
-    "crypto-browserify": ["crypto-browserify@3.12.1", "", { "dependencies": { "browserify-cipher": "^1.0.1", "browserify-sign": "^4.2.3", "create-ecdh": "^4.0.4", "create-hash": "^1.2.0", "create-hmac": "^1.1.7", "diffie-hellman": "^5.0.3", "hash-base": "~3.0.4", "inherits": "^2.0.4", "pbkdf2": "^3.1.2", "public-encrypt": "^4.0.3", "randombytes": "^2.1.0", "randomfill": "^1.0.4" } }, "sha512-r4ESw/IlusD17lgQi1O20Fa3qNnsckR126TdUuBgAu7GBYSIPvdNyONd3Zrxh0xCwA4+6w/TDArBPsMvhur+KQ=="],
-
     "crypto-random-string": ["crypto-random-string@4.0.0", "", { "dependencies": { "type-fest": "^1.0.1" } }, "sha512-x8dy3RnvYdlUcPOjkEHqozhiwzKNSq7GcPuXFbnyMOCHxX8V3OgIg/pYuabl2sbUPfIJaeAQB7PMOK8DFIdoRA=="],
 
     "css-blank-pseudo": ["css-blank-pseudo@7.0.1", "", { "dependencies": { "postcss-selector-parser": "^7.0.0" }, "peerDependencies": { "postcss": "^8.4" } }, "sha512-jf+twWGDf6LDoXDUode+nc7ZlrqfaNphrBIBrcmeP3D8yw1uPaix1gCC8LUQUGQ6CycuK2opkbFFWFuq/a94ag=="],
@@ -3693,8 +3799,6 @@
 
     "css-tree": ["css-tree@3.2.1", "", { "dependencies": { "mdn-data": "2.27.1", "source-map-js": "^1.2.1" } }, "sha512-X7sjQzceUhu1u7Y/ylrRZFU2FS6LRiFVp6rKLPg23y3x3c3DOKAwuXGDp+PAGjh6CSnCjYeAul8pcT8bAl+lSA=="],
 
-    "cssstyle": ["cssstyle@5.3.7", "", { "dependencies": { "@asamuzakjp/css-color": "^4.1.1", "@csstools/css-syntax-patches-for-csstree": "^1.0.21", "css-tree": "^3.1.0", "lru-cache": "^11.2.4" } }, "sha512-7D2EPVltRrsTkhpQmksIu+LxeWAIEk6wRDMJ1qljlv+CKHJM+cJLlfhWIzNA44eAsHXSNe3+vO6DW1yCYx8SuQ=="],
-
     "css-what": ["css-what@6.2.2", "", {}, "sha512-u/O3vwbptzhMs3L1fQE82ZSLHQQfto5gyZzwteVIEyeaY5Fc7R4dapF/BvRoSYFeqfBk4m0V1Vafq5Pjv25wvA=="],
 
     "css.escape": ["css.escape@1.5.1", "", {}, "sha512-YUifsXXuknHlUsmlgyY0PKzgPOr7/FjCePfHNt0jxm83wHZi44VDMQ7/fGNkjY3/jV1MC+1CmZbaHzugyeRtpg=="],
@@ -3713,6 +3817,8 @@
 
     "csso": ["csso@5.0.5", "", { "dependencies": { "css-tree": "~2.2.0" } }, "sha512-0LrrStPOdJj+SPCCrGhzryycLjwcgUSHBtxNA8aIDxf0GLsRh1cKYhB00Gd1lDOS4yGH69+SNn13+TWbVHETFQ=="],
 
+    "cssstyle": ["cssstyle@5.3.7", "", { "dependencies": { "@asamuzakjp/css-color": "^4.1.1", "@csstools/css-syntax-patches-for-csstree": "^1.0.21", "css-tree": "^3.1.0", "lru-cache": "^11.2.4" } }, "sha512-7D2EPVltRrsTkhpQmksIu+LxeWAIEk6wRDMJ1qljlv+CKHJM+cJLlfhWIzNA44eAsHXSNe3+vO6DW1yCYx8SuQ=="],
+
     "csstype": ["csstype@3.2.3", "", {}, "sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ=="],
 
     "csv-stringify": ["csv-stringify@6.5.2", "", {}, "sha512-RFPahj0sXcmUyjrObAK+DOWtMvMIFV328n4qZJhgX3x2RqkQgOTU2mCUmiFR0CzM6AzChlRSUErjiJeEt8BaQA=="],
@@ -3785,7 +3891,7 @@
 
     "data-uri-to-buffer": ["data-uri-to-buffer@4.0.1", "", {}, "sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A=="],
 
-    "data-urls": ["data-urls@7.0.0", "", { "dependencies": { "whatwg-mimetype": "^5.0.0", "whatwg-url": "^16.0.0" } }, "sha512-23XHcCF+coGYevirZceTVD7NdJOqVn+49IHyxgszm+JIiHLoB2TkmPtsYkNWT1pvRSGkc35L6NHs0yHkN2SumA=="],
+    "data-urls": ["data-urls@6.0.1", "", { "dependencies": { "whatwg-mimetype": "^5.0.0", "whatwg-url": "^15.1.0" } }, "sha512-euIQENZg6x8mj3fO6o9+fOW8MimUI4PpD/fZBhJfeioZVy9TUpM4UY7KjQNVZFlqwJ0UdzRDzkycB997HEq1BQ=="],
 
     "data-view-buffer": ["data-view-buffer@1.0.2", "", { "dependencies": { "call-bound": "^1.0.3", "es-errors": "^1.3.0", "is-data-view": "^1.0.2" } }, "sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ=="],
 
@@ -3849,14 +3955,14 @@
 
     "depd": ["depd@2.0.0", "", {}, "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="],
 
+    "deprecation": ["deprecation@2.3.1", "", {}, "sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ=="],
+
     "deps-regex": ["deps-regex@0.2.0", "", {}, "sha512-PwuBojGMQAYbWkMXOY9Pd/NWCDNHVH12pnS7WHqZkTSeMESe4hwnKKRp0yR87g37113x4JPbo/oIvXY+s/f56Q=="],
 
     "dequal": ["dequal@2.0.3", "", {}, "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA=="],
 
     "derive-valtio": ["derive-valtio@0.1.0", "", { "peerDependencies": { "valtio": "*" } }, "sha512-OCg2UsLbXK7GmmpzMXhYkdO64vhJ1ROUUGaTFyHjVwEdMEcTTRj7W1TxLbSBxdY8QLBPCcp66MTyaSy0RpO17A=="],
 
-    "des.js": ["des.js@1.1.0", "", { "dependencies": { "inherits": "^2.0.1", "minimalistic-assert": "^1.0.0" } }, "sha512-r17GxjhUCjSRy8aiJpr8/UadFIzMzJGexI3Nmz4ADi9LYSFx4gTBp80+NaX/YsXWWLhpZ7v/v/ubEc/bCNfKwg=="],
-
     "destr": ["destr@2.0.5", "", {}, "sha512-ugFTXCtDZunbzasqBxrK93Ik/DRYsO6S/fedkWEMKqt04xZ4csmnmwGDBAb07QWNaGMAmnTIemsYZCksjATwsA=="],
 
     "destroy": ["destroy@1.2.0", "", {}, "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg=="],
@@ -3873,6 +3979,8 @@
 
     "detect-node": ["detect-node@2.1.0", "", {}, "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g=="],
 
+    "detect-node-es": ["detect-node-es@1.1.0", "", {}, "sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ=="],
+
     "detect-port": ["detect-port@1.6.1", "", { "dependencies": { "address": "^1.0.1", "debug": "4" }, "bin": { "detect": "bin/detect-port.js", "detect-port": "bin/detect-port.js" } }, "sha512-CmnVc+Hek2egPx1PeTFVta2W78xy2K/9Rkf6cC4T59S50tVnzKj+tnx5mmx5lwvCkujZ4uRrpRSuV+IVs3f90Q=="],
 
     "devlop": ["devlop@1.1.0", "", { "dependencies": { "dequal": "^2.0.0" } }, "sha512-RWmIqhcFf1lRYBvNmr7qTNuyCt/7/ns2jbpp1+PalgE/rDQcBT0fioSMUpJ93irlUhC5hrg4cYqe6U+0ImW0rA=="],
@@ -3883,10 +3991,10 @@
 
     "diff": ["diff@8.0.3", "", {}, "sha512-qejHi7bcSD4hQAZE0tNAawRK1ZtafHDmMTMkrrIGgSLl7hTnQHmKCeB45xAcbfTqK2zowkM3j3bHt/4b/ARbYQ=="],
 
-    "diffie-hellman": ["diffie-hellman@5.0.3", "", { "dependencies": { "bn.js": "^4.1.0", "miller-rabin": "^4.0.0", "randombytes": "^2.0.0" } }, "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg=="],
-
     "dijkstrajs": ["dijkstrajs@1.0.3", "", {}, "sha512-qiSlmBq9+BCdCA/L46dw8Uy93mloxsPSbwnm5yrKn2vMPiy8KyAskTF6zuV/j5BMsmOGZDPs7KjU+mjb670kfA=="],
 
+    "dingbat-to-unicode": ["dingbat-to-unicode@1.0.1", "", {}, "sha512-98l0sW87ZT58pU4i61wa2OHwxbiYSbuxsCBozaVnYX2iCnr3bLM3fIes1/ej7h1YdOKuKt/MLs706TVnALA65w=="],
+
     "dir-glob": ["dir-glob@3.0.1", "", { "dependencies": { "path-type": "^4.0.0" } }, "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA=="],
 
     "discontinuous-range": ["discontinuous-range@1.0.0", "", {}, "sha512-c68LpLbO+7kP/b1Hr1qs8/BJ09F5khZGTxqxZuhzxpmwJKOgRFHJWIb9/KmqnqHhLdO55aOxFH/EGBvUQbL/RQ=="],
@@ -3925,6 +4033,8 @@
 
     "dts-bundle-generator": ["dts-bundle-generator@9.5.1", "", { "dependencies": { "typescript": ">=5.0.2", "yargs": "^17.6.0" }, "bin": { "dts-bundle-generator": "dist/bin/dts-bundle-generator.js" } }, "sha512-DxpJOb2FNnEyOzMkG11sxO2dmxPjthoVWxfKqWYJ/bI/rT1rvTMktF5EKjAYrRZu6Z6t3NhOUZ0sZ5ZXevOfbA=="],
 
+    "duck": ["duck@0.1.12", "", { "dependencies": { "underscore": "^1.13.1" } }, "sha512-wkctla1O6VfP89gQ+J/yDesM0S7B7XLXjKGzXxMDVFg7uEn706niAtyYovKbyq1oT9YwDcly721/iUWoc8MVRg=="],
+
     "dunder-proto": ["dunder-proto@1.0.1", "", { "dependencies": { "call-bind-apply-helpers": "^1.0.1", "es-errors": "^1.3.0", "gopd": "^1.2.0" } }, "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A=="],
 
     "duplexer": ["duplexer@0.1.2", "", {}, "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg=="],
@@ -4125,8 +4235,6 @@
 
     "eventsource-parser": ["eventsource-parser@3.0.6", "", {}, "sha512-Vo1ab+QXPzZ4tCa8SwIHJFaSzy4R6SHf7BY79rFBDf0idraZWAkYrDjDj8uWaSm3S2TK+hJ7/t1CEmZ7jXw+pg=="],
 
-    "evp_bytestokey": ["evp_bytestokey@1.0.3", "", { "dependencies": { "md5.js": "^1.3.4", "safe-buffer": "^5.1.1" } }, "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA=="],
-
     "exact-mirror": ["exact-mirror@0.2.7", "", { "peerDependencies": { "@sinclair/typebox": "^0.34.15" }, "optionalPeers": ["@sinclair/typebox"] }, "sha512-+MeEmDcLA4o/vjK2zujgk+1VTxPR4hdp23qLqkWfStbECtAq9gmsvQa3LW6z/0GXZyHJobrCnmy1cdeE7BjsYg=="],
 
     "execa": ["execa@5.1.1", "", { "dependencies": { "cross-spawn": "^7.0.3", "get-stream": "^6.0.0", "human-signals": "^2.1.0", "is-stream": "^2.0.0", "merge-stream": "^2.0.0", "npm-run-path": "^4.0.1", "onetime": "^5.1.2", "signal-exit": "^3.0.3", "strip-final-newline": "^2.0.0" } }, "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg=="],
@@ -4237,7 +4345,7 @@
 
     "file-loader": ["file-loader@6.2.0", "", { "dependencies": { "loader-utils": "^2.0.0", "schema-utils": "^3.0.0" }, "peerDependencies": { "webpack": "^4.0.0 || ^5.0.0" } }, "sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw=="],
 
-    "file-type": ["file-type@21.3.1", "", { "dependencies": { "@tokenizer/inflate": "^0.4.1", "strtok3": "^10.3.4", "token-types": "^6.1.1", "uint8array-extras": "^1.4.0" } }, "sha512-SrzXX46I/zsRDjTb82eucsGg0ODq2NpGDp4HcsFKApPy8P8vACjpJRDoGGMfEzhFC0ry61ajd7f72J3603anBA=="],
+    "file-type": ["file-type@22.0.1", "", { "dependencies": { "@tokenizer/inflate": "^0.4.1", "strtok3": "^10.3.5", "token-types": "^6.1.2", "uint8array-extras": "^1.5.0" } }, "sha512-ww5Mhre0EE+jmBvOXTmXAbEMuZE7uX4a3+oRCQFNj8w++g3ev913N6tXQz0XTXbueQ5TWQfm6BdaViEHHn8bhA=="],
 
     "file-uri-to-path": ["file-uri-to-path@1.0.0", "", {}, "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw=="],
 
@@ -4273,7 +4381,7 @@
 
     "foreground-child": ["foreground-child@3.3.1", "", { "dependencies": { "cross-spawn": "^7.0.6", "signal-exit": "^4.0.1" } }, "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw=="],
 
-    "forge-std": ["forge-std@github:foundry-rs/forge-std#f5495c9", {}, "foundry-rs-forge-std-f5495c9"],
+    "forge-std": ["forge-std@github:foundry-rs/forge-std#2999b65", {}, "foundry-rs-forge-std-2999b65", "sha512-kNfmnlt5OmqFrR1fHVC0TjAPBCTzgKdI6XeW2qQeDZcLAgBjyL5NswrEVwUuakmeQqMRnWjXLpnw7N7LLhkoEQ=="],
 
     "form-data": ["form-data@4.0.5", "", { "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", "es-set-tostringtag": "^2.1.0", "hasown": "^2.0.2", "mime-types": "^2.1.12" } }, "sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w=="],
 
@@ -4323,6 +4431,8 @@
 
     "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=="],
+
     "get-own-enumerable-property-symbols": ["get-own-enumerable-property-symbols@3.0.2", "", {}, "sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g=="],
 
     "get-package-type": ["get-package-type@0.1.0", "", {}, "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q=="],
@@ -4341,6 +4451,8 @@
 
     "gifwrap": ["gifwrap@0.10.1", "", { "dependencies": { "image-q": "^4.0.0", "omggif": "^1.0.10" } }, "sha512-2760b1vpJHNmLzZ/ubTtNnEx5WApN/PYWJvXvgS+tL1egTTthayFYIQQNi136FLEDcN/IyEY2EcGpIITD6eYUw=="],
 
+    "git-workspace-service": ["git-workspace-service@0.4.5", "", { "dependencies": { "@octokit/auth-app": "^6.0.0", "@octokit/rest": "^20.0.0", "pino": "^9.0.0" } }, "sha512-T5mMXDku9s/Gz3yus/CudzqUg2KbaGvF4Y4lgDYZYDGbeFiGWYuJLzVexWQMaiOuctw5XKvRKQYLyB2nwXsMSQ=="],
+
     "github-from-package": ["github-from-package@0.0.0", "", {}, "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw=="],
 
     "github-slugger": ["github-slugger@1.5.0", "", {}, "sha512-wIh+gKBI9Nshz2o46B0B3f5k/W+WI9ZAv6y5Dn5WJ5SK1t0TnDimB4WE5rmTD05ZAIn8HALCZVmCsvj0w0v0lw=="],
@@ -4403,8 +4515,6 @@
 
     "has-yarn": ["has-yarn@3.0.0", "", {}, "sha512-IrsVwUHhEULx3R8f/aA8AHuEzAorplsab/v8HBzEiIukwq5i/EC+xmOW+HfP1OaDP+2JkgT1yILHN2O3UFIbcA=="],
 
-    "hash-base": ["hash-base@3.0.5", "", { "dependencies": { "inherits": "^2.0.4", "safe-buffer": "^5.2.1" } }, "sha512-vXm0l45VbcHEVlTCzs8M+s0VeYsB2lnlAaThoLKGXr3bE/VWDOelNUnycUPEhKEaXARL2TEFjBOyUiM6+55KBg=="],
-
     "hash.js": ["hash.js@1.1.7", "", { "dependencies": { "inherits": "^2.0.3", "minimalistic-assert": "^1.0.1" } }, "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA=="],
 
     "hasown": ["hasown@2.0.2", "", { "dependencies": { "function-bind": "^1.1.2" } }, "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ=="],
@@ -4453,7 +4563,7 @@
 
     "hpack.js": ["hpack.js@2.1.6", "", { "dependencies": { "inherits": "^2.0.1", "obuf": "^1.0.0", "readable-stream": "^2.0.1", "wbuf": "^1.1.0" } }, "sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ=="],
 
-    "html-encoding-sniffer": ["html-encoding-sniffer@6.0.0", "", { "dependencies": { "@exodus/bytes": "^1.6.0" } }, "sha512-CV9TW3Y3f8/wT0BRFc1/KAVQ3TUHiXmaAb6VW9vtiMFf7SLoMd1PdAc4W3KFOFETBJUb90KatHqlsZMWV+R9Gg=="],
+    "html-encoding-sniffer": ["html-encoding-sniffer@4.0.0", "", { "dependencies": { "whatwg-encoding": "^3.1.1" } }, "sha512-Y22oTqIU4uuPgEemfz7NDJz6OeKf12Lsu+QC+s3BVpda64lTiMYCyGwg5ki4vFxkMwQdeZDl2adZoqUgdFuTgQ=="],
 
     "html-escaper": ["html-escaper@2.0.2", "", {}, "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg=="],
 
@@ -4485,7 +4595,7 @@
 
     "http2-wrapper": ["http2-wrapper@2.2.1", "", { "dependencies": { "quick-lru": "^5.1.1", "resolve-alpn": "^1.2.0" } }, "sha512-V5nVw1PAOgfI3Lmeaj2Exmeg7fenjhRUgz1lPSezy1CuhPYbgQtbQj4jZfEAEMlaL+vupsvhjqCyjzob0yxsmQ=="],
 
-    "https-proxy-agent": ["https-proxy-agent@5.0.1", "", { "dependencies": { "agent-base": "6", "debug": "4" } }, "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA=="],
+    "https-proxy-agent": ["https-proxy-agent@7.0.6", "", { "dependencies": { "agent-base": "^7.1.2", "debug": "4" } }, "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw=="],
 
     "human-signals": ["human-signals@2.1.0", "", {}, "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw=="],
 
@@ -4799,6 +4909,8 @@
 
     "json-schema-ref-resolver": ["json-schema-ref-resolver@3.0.0", "", { "dependencies": { "dequal": "^2.0.3" } }, "sha512-hOrZIVL5jyYFjzk7+y7n5JDzGlU8rfWDuYyHwGa2WA8/pcmMHezp2xsVwxrebD/Q9t8Nc5DboieySDpCp4WG4A=="],
 
+    "json-schema-to-ts": ["json-schema-to-ts@3.1.1", "", { "dependencies": { "@babel/runtime": "^7.18.3", "ts-algebra": "^2.0.0" } }, "sha512-+DWg8jCJG2TEnpy7kOm/7/AxaYoaRbjVB4LFZLySZlWn8exGs3A4OLJR966cVvU26N7X9TWxl+Jsw7dzAqKT6g=="],
+
     "json-schema-traverse": ["json-schema-traverse@1.0.0", "", {}, "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="],
 
     "json-stable-stringify": ["json-stable-stringify@1.3.0", "", { "dependencies": { "call-bind": "^1.0.8", "call-bound": "^1.0.4", "isarray": "^2.0.5", "jsonify": "^0.0.1", "object-keys": "^1.1.1" } }, "sha512-qtYiSSFlwot9XHtF9bD9c7rwKjr+RecWT//ZnPvSmEjpV5mmPOCN4j8UjY5hbjNkOwZ/jQv3J6R1/pL7RwgMsg=="],
@@ -4823,6 +4935,8 @@
 
     "jsx-ast-utils": ["jsx-ast-utils@3.3.5", "", { "dependencies": { "array-includes": "^3.1.6", "array.prototype.flat": "^1.3.1", "object.assign": "^4.1.4", "object.values": "^1.1.6" } }, "sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ=="],
 
+    "jszip": ["jszip@3.10.1", "", { "dependencies": { "lie": "~3.3.0", "pako": "~1.0.2", "readable-stream": "~2.3.6", "setimmediate": "^1.0.5" } }, "sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g=="],
+
     "jwa": ["jwa@1.4.2", "", { "dependencies": { "buffer-equal-constant-time": "^1.0.1", "ecdsa-sig-formatter": "1.0.11", "safe-buffer": "^5.0.1" } }, "sha512-eeH5JO+21J78qMvTIDdBXidBd6nG2kZjg5Ohz/1fpa28Z4CcsWUzJ1ZZyFq/3z3N17aZy+ZuBoHljASbL1WfOw=="],
 
     "jws": ["jws@3.2.3", "", { "dependencies": { "jwa": "^1.4.2", "safe-buffer": "^5.0.1" } }, "sha512-byiJ0FLRdLdSVSReO/U4E7RoEyOCKnEnEPMjq3HxWtvzLsV08/i5RQKsFVNkCldrCaPr2vDNAOMsfs8T/Hze7g=="],
@@ -4969,13 +5083,15 @@
 
     "loose-envify": ["loose-envify@1.4.0", "", { "dependencies": { "js-tokens": "^3.0.0 || ^4.0.0" }, "bin": { "loose-envify": "cli.js" } }, "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q=="],
 
+    "lop": ["lop@0.4.2", "", { "dependencies": { "duck": "^0.1.12", "option": "~0.2.1", "underscore": "^1.13.1" } }, "sha512-RefILVDQ4DKoRZsJ4Pj22TxE3omDO47yFpkIBoDKzkqPRISs5U1cnAdg/5583YPkWPaLIYHOKRMQSvjFsO26cw=="],
+
     "loupe": ["loupe@3.2.1", "", {}, "sha512-CdzqowRJCeLU72bHvWqwRBBlLcMEtIvGrlvef74kMnV2AolS9Y8xUv1I0U/MNAWMhBlKIoyuEgoJ0t/bbwHbLQ=="],
 
     "lower-case": ["lower-case@2.0.2", "", { "dependencies": { "tslib": "^2.0.3" } }, "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg=="],
 
     "lowercase-keys": ["lowercase-keys@3.0.0", "", {}, "sha512-ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ=="],
 
-    "lru-cache": ["lru-cache@11.2.7", "", {}, "sha512-aY/R+aEsRelme17KGQa/1ZSIpLpNYYrhcrepKTZgE+W3WM16YMCaPwOHLHsmopZHELU0Ojin1lPVxKR0MihncA=="],
+    "lru-cache": ["lru-cache@6.0.0", "", { "dependencies": { "yallist": "^4.0.0" } }, "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="],
 
     "lucide-react": ["lucide-react@0.577.0", "", { "peerDependencies": { "react": "^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0" } }, "sha512-4LjoFv2eEPwYDPg/CUdBJQSDfPyzXCRrVW1X7jrx/trgxnxkHFjnVZINbzvzxjN70dxychOfg+FTYwBiS3pQ5A=="],
 
@@ -4997,6 +5113,8 @@
 
     "makeerror": ["makeerror@1.0.12", "", { "dependencies": { "tmpl": "1.0.5" } }, "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg=="],
 
+    "mammoth": ["mammoth@1.12.0", "", { "dependencies": { "@xmldom/xmldom": "^0.8.6", "argparse": "~1.0.3", "base64-js": "^1.5.1", "bluebird": "~3.4.0", "dingbat-to-unicode": "^1.0.1", "jszip": "^3.7.1", "lop": "^0.4.2", "path-is-absolute": "^1.0.0", "underscore": "^1.13.1", "xmlbuilder": "^10.0.0" }, "bin": { "mammoth": "bin/mammoth" } }, "sha512-cwnK1RIcRdDMi2HRx2EXGYlxqIEh0Oo3bLhorgnsVJi2UkbX1+jKxuBNR9PC5+JaX7EkmJxFPmo6mjLpqShI2w=="],
+
     "map-obj": ["map-obj@5.0.0", "", {}, "sha512-2L3MIgJynYrZ3TYMriLDLWocz15okFakV6J12HXvMXDHui2x/zgChzg1u9mFFGbbGWE+GsLpQByt4POb9Or+uA=="],
 
     "markdown-extensions": ["markdown-extensions@2.0.0", "", {}, "sha512-o5vL7aDWatOTX8LzaS1WMoaoxIiLRQJuIKKe2wAw6IeULDHaqbiqiggmx+pKvZDb1Sj+pE46Sn1T7lCqfFtg1Q=="],
@@ -5011,8 +5129,6 @@
 
     "md5": ["md5@2.3.0", "", { "dependencies": { "charenc": "0.0.2", "crypt": "0.0.2", "is-buffer": "~1.1.6" } }, "sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g=="],
 
-    "md5.js": ["md5.js@1.3.5", "", { "dependencies": { "hash-base": "^3.0.0", "inherits": "^2.0.1", "safe-buffer": "^5.1.2" } }, "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg=="],
-
     "mdast-util-directive": ["mdast-util-directive@3.1.0", "", { "dependencies": { "@types/mdast": "^4.0.0", "@types/unist": "^3.0.0", "ccount": "^2.0.0", "devlop": "^1.0.0", "mdast-util-from-markdown": "^2.0.0", "mdast-util-to-markdown": "^2.0.0", "parse-entities": "^4.0.0", "stringify-entities": "^4.0.0", "unist-util-visit-parents": "^6.0.0" } }, "sha512-I3fNFt+DHmpWCYAT7quoM6lHf9wuqtI+oCOfvILnoicNIqjh5E3dEJWiXuYME2gNe8vl1iMQwyUHa7bgFmak6Q=="],
 
     "mdast-util-find-and-replace": ["mdast-util-find-and-replace@3.0.2", "", { "dependencies": { "@types/mdast": "^4.0.0", "escape-string-regexp": "^5.0.0", "unist-util-is": "^6.0.0", "unist-util-visit-parents": "^6.0.0" } }, "sha512-Tmd1Vg/m3Xz43afeNxDIhWRtFZgM2VLyaf4vSTYwudTyeuTneoL3qtWMA5jeLyz/O1vDJmmV4QuScFCA2tBPwg=="],
@@ -5187,8 +5303,6 @@
 
     "mikktspace": ["mikktspace@1.1.1", "", {}, "sha512-w+n5O2YLFsv/aRi3QUF0jxR+mEsl2J08ZkRItJHE08MWqiDIy8amyZN9vetBfbLhlWGMb8G3mzSPwtKHvBF7hQ=="],
 
-    "miller-rabin": ["miller-rabin@4.0.1", "", { "dependencies": { "bn.js": "^4.0.0", "brorand": "^1.0.1" }, "bin": { "miller-rabin": "bin/miller-rabin" } }, "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA=="],
-
     "mime": ["mime@1.6.0", "", { "bin": { "mime": "cli.js" } }, "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="],
 
     "mime-db": ["mime-db@1.54.0", "", {}, "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ=="],
@@ -5375,6 +5489,10 @@
 
     "ofetch": ["ofetch@1.5.1", "", { "dependencies": { "destr": "^2.0.5", "node-fetch-native": "^1.6.7", "ufo": "^1.6.1" } }, "sha512-2W4oUZlVaqAPAil6FUg/difl6YhqhUR7x2eZY4bQCko22UXg3hptq9KLQdqFClV+Wu85UX7hNtdGTngi/1BxcA=="],
 
+    "ollama-ai-provider": ["ollama-ai-provider@1.2.0", "", { "dependencies": { "@ai-sdk/provider": "^1.0.0", "@ai-sdk/provider-utils": "^2.0.0", "partial-json": "0.1.7" }, "peerDependencies": { "zod": "^3.0.0" }, "optionalPeers": ["zod"] }, "sha512-jTNFruwe3O/ruJeppI/quoOUxG7NA6blG3ZyQj3lei4+NnJo7bi3eIRWqlVpRlu/mbzbFXeJSBuYQWF6pzGKww=="],
+
+    "ollama-ai-provider-v2": ["ollama-ai-provider-v2@3.5.0", "", { "dependencies": { "@ai-sdk/provider": "^3.0.8", "@ai-sdk/provider-utils": "^4.0.19" }, "peerDependencies": { "ai": "^5.0.0 || ^6.0.0", "zod": "^4.0.16" } }, "sha512-+s/aYIYa91z2Vk3AkGAz3BaPAQ0flS2eFZD3BN2mD/N6W6YQbcookyu6pc2cbc8SP5VGpNB857WJ0eHDjKXsXw=="],
+
     "omggif": ["omggif@1.0.10", "", {}, "sha512-LMJTtvgc/nugXj0Vcrrs68Mn2D1r0zf630VNtqtpI1FEO7e+O9FP4gqs9AcnBaSEeoHIPm28u6qgPR0oyEpGSw=="],
 
     "on-exit-leak-free": ["on-exit-leak-free@2.1.2", "", {}, "sha512-0eJJY6hXLGf1udHwfNftBqH+g73EU4B504nZeKpz1sYRKafAghwxEJunB2O7rDZkL4PGfsMVnTXZ2EjibbqcsA=="],
@@ -5401,6 +5519,8 @@
 
     "openurl": ["openurl@1.1.1", "", {}, "sha512-d/gTkTb1i1GKz5k3XE3XFV/PxQ1k45zDqGP2OA7YhgsaLoqm6qRvARAZOFer1fcXritWlGBRCu/UgeS4HAnXAA=="],
 
+    "option": ["option@0.2.4", "", {}, "sha512-pkEqbDyl8ou5cpq+VsnQbe/WlEy5qS7xPzMS1U55OCG9KPvwFD46zDbxQIj3egJSFc3D+XhYOPUzz49zQAVy7A=="],
+
     "optionator": ["optionator@0.9.4", "", { "dependencies": { "deep-is": "^0.1.3", "fast-levenshtein": "^2.0.6", "levn": "^0.4.1", "prelude-ls": "^1.2.1", "type-check": "^0.4.0", "word-wrap": "^1.2.5" } }, "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g=="],
 
     "own-keys": ["own-keys@1.0.1", "", { "dependencies": { "get-intrinsic": "^1.2.6", "object-keys": "^1.1.1", "safe-push-apply": "^1.0.0" } }, "sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg=="],
@@ -5441,8 +5561,6 @@
 
     "parent-module": ["parent-module@1.0.1", "", { "dependencies": { "callsites": "^3.0.0" } }, "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g=="],
 
-    "parse-asn1": ["parse-asn1@5.1.9", "", { "dependencies": { "asn1.js": "^4.10.1", "browserify-aes": "^1.2.0", "evp_bytestokey": "^1.0.3", "pbkdf2": "^3.1.5", "safe-buffer": "^5.2.1" } }, "sha512-fIYNuZ/HastSb80baGOuPRo1O9cf4baWw5WsAp7dBuUzeTD/BoaG8sVTdlPFksBE2lF21dN+A1AnrpIjSWqHHg=="],
-
     "parse-bmfont-ascii": ["parse-bmfont-ascii@1.0.6", "", {}, "sha512-U4RrVsUFCleIOBsIGYOMKjn9PavsGOXxbvYGtMOEfnId0SVNsgehXh1DxUdVPLoxd5mvcEtvmKs2Mmf0Mpa1ZA=="],
 
     "parse-bmfont-binary": ["parse-bmfont-binary@1.0.6", "", {}, "sha512-GxmsRea0wdGdYthjuUeWTMWPqm2+FAd4GI8vCvhgJsFnoGhTrLhXDDupwTo7rXVAgaLIGoVHDZS9p/5XbSqeWA=="],
@@ -5467,6 +5585,8 @@
 
     "parseurl": ["parseurl@1.3.3", "", {}, "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="],
 
+    "partial-json": ["partial-json@0.1.7", "", {}, "sha512-Njv/59hHaokb/hRUjce3Hdv12wd60MtM9Z5Olmn+nehe0QDAsRtRbJPvJ0Z91TusF0SuZRIvnM+S4l6EIP8leA=="],
+
     "pascal-case": ["pascal-case@3.1.2", "", { "dependencies": { "no-case": "^3.0.4", "tslib": "^2.0.3" } }, "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g=="],
 
     "path": ["path@0.12.7", "", { "dependencies": { "process": "^0.11.1", "util": "^0.10.3" } }, "sha512-aXXC6s+1w7otVF9UletFkFcDsJeO7lSZBPUQhtb5O0xJe8LtYhj/GxldoL09bBj9+ZmE2hNoHqQSFMN5fikh4Q=="],
@@ -5493,8 +5613,6 @@
 
     "pathval": ["pathval@2.0.1", "", {}, "sha512-//nshmD55c46FuFw26xV/xFAaB5HF9Xdap7HJBBnrKdAd6/GxDBaNA1870O79+9ueg61cZLSVc+OaFlfmObYVQ=="],
 
-    "pbkdf2": ["pbkdf2@3.1.5", "", { "dependencies": { "create-hash": "^1.2.0", "create-hmac": "^1.1.7", "ripemd160": "^2.0.3", "safe-buffer": "^5.2.1", "sha.js": "^2.4.12", "to-buffer": "^1.2.1" } }, "sha512-Q3CG/cYvCO1ye4QKkuH7EXxs3VC/rI1/trd+qX2+PolbaKG0H+bgcZzrTt96mMyRtejk+JMCiLUn3y29W8qmFQ=="],
-
     "pdfjs-dist": ["pdfjs-dist@5.5.207", "", { "optionalDependencies": { "@napi-rs/canvas": "^0.1.95", "node-readable-to-web-readable-stream": "^0.4.2" } }, "sha512-WMqqw06w1vUt9ZfT0gOFhMf3wHsWhaCrxGrckGs5Cci6ybDW87IvPaOd2pnBwT6BJuP/CzXDZxjFgmSULLdsdw=="],
 
     "peek-readable": ["peek-readable@4.1.0", "", {}, "sha512-ZI3LnwUv5nOGbQzD9c2iDG6toheuXSZP5esSHBjopsXH4dg19soufvpUGA3uohi5anFtGb2lhAVdHzH6R/Evvg=="],
@@ -5777,8 +5895,6 @@
 
     "proxy-from-env": ["proxy-from-env@1.1.0", "", {}, "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="],
 
-    "public-encrypt": ["public-encrypt@4.0.3", "", { "dependencies": { "bn.js": "^4.1.0", "browserify-rsa": "^4.0.0", "create-hash": "^1.1.0", "parse-asn1": "^5.0.0", "randombytes": "^2.0.1", "safe-buffer": "^5.1.2" } }, "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q=="],
-
     "pump": ["pump@3.0.4", "", { "dependencies": { "end-of-stream": "^1.1.0", "once": "^1.3.1" } }, "sha512-VS7sjc6KR7e1ukRFhQSY5LM2uBWAUPiOPa/A3mkKmiMwSmRFUITt0xuj+/lesgnCv+dPIEYlkzrcyXgquIHMcA=="],
 
     "pumpify": ["pumpify@2.0.1", "", { "dependencies": { "duplexify": "^4.1.1", "inherits": "^2.0.3", "pump": "^3.0.0" } }, "sha512-m7KOje7jZxrmutanlkS1daj1dS6z6BgslzOXmcSEpIlCxM3VJH7lG5QLeck/6hgF6F4crFf01UtQmNsJfweTAw=="],
@@ -5821,10 +5937,10 @@
 
     "randombytes": ["randombytes@2.1.0", "", { "dependencies": { "safe-buffer": "^5.1.0" } }, "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ=="],
 
-    "randomfill": ["randomfill@1.0.4", "", { "dependencies": { "randombytes": "^2.0.5", "safe-buffer": "^5.1.0" } }, "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw=="],
-
     "range-parser": ["range-parser@1.2.1", "", {}, "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="],
 
+    "rate-limiter-flexible": ["rate-limiter-flexible@11.0.1", "", {}, "sha512-hvyCUefjRund2N6hro2H8Dql7OvB6+B3Qv2FLWWbdsdyQScXf4+N0tM0Bryz11awTtNxx6C1QbHYb1rCiAx7pA=="],
+
     "raw-body": ["raw-body@2.5.3", "", { "dependencies": { "bytes": "~3.1.2", "http-errors": "~2.0.1", "iconv-lite": "~0.4.24", "unpipe": "~1.0.0" } }, "sha512-s4VSOf6yN0rvbRZGxs8Om5CWj6seneMwK3oDb4lWDH0UPhWcxwOWw5+qk24bxq87szX1ydrwylIOp2uG1ojUpA=="],
 
     "rc": ["rc@1.2.8", "", { "dependencies": { "deep-extend": "^0.6.0", "ini": "~1.3.0", "minimist": "^1.2.0", "strip-json-comments": "~2.0.1" }, "bin": { "rc": "./cli.js" } }, "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw=="],
@@ -5853,12 +5969,18 @@
 
     "react-refresh": ["react-refresh@0.14.2", "", {}, "sha512-jCvmsr+1IUSMUyzOkRcvnVbX3ZYC6g9TDrDbFuFmRDq7PD4yaGbLKNQL6k2jnArV8hjYxh7hVhAZB6s9HDGpZA=="],
 
+    "react-remove-scroll": ["react-remove-scroll@2.7.2", "", { "dependencies": { "react-remove-scroll-bar": "^2.3.7", "react-style-singleton": "^2.2.3", "tslib": "^2.1.0", "use-callback-ref": "^1.3.3", "use-sidecar": "^1.1.3" }, "peerDependencies": { "@types/react": "*", "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react"] }, "sha512-Iqb9NjCCTt6Hf+vOdNIZGdTiH1QSqr27H/Ek9sv/a97gfueI/5h1s3yRi1nngzMUaOOToin5dI1dXKdXiF+u0Q=="],
+
+    "react-remove-scroll-bar": ["react-remove-scroll-bar@2.3.8", "", { "dependencies": { "react-style-singleton": "^2.2.2", "tslib": "^2.0.0" }, "peerDependencies": { "@types/react": "*", "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" }, "optionalPeers": ["@types/react"] }, "sha512-9r+yi9+mgU33AKcj6IbT9oRCO78WriSj6t/cF8DWBZJ9aOGPOTEDvdUDz1FwKim7QXWwmHqtdHnRJfhAxEG46Q=="],
+
     "react-router": ["react-router@5.3.4", "", { "dependencies": { "@babel/runtime": "^7.12.13", "history": "^4.9.0", "hoist-non-react-statics": "^3.1.0", "loose-envify": "^1.3.1", "path-to-regexp": "^1.7.0", "prop-types": "^15.6.2", "react-is": "^16.6.0", "tiny-invariant": "^1.0.2", "tiny-warning": "^1.0.0" }, "peerDependencies": { "react": ">=15" } }, "sha512-Ys9K+ppnJah3QuaRiLxk+jDWOR1MekYQrlytiXxC1RyfbdsZkS5pvKAzCCr031xHixZwpnsYNT5xysdFHQaYsA=="],
 
     "react-router-config": ["react-router-config@5.1.1", "", { "dependencies": { "@babel/runtime": "^7.1.2" }, "peerDependencies": { "react": ">=15", "react-router": ">=5" } }, "sha512-DuanZjaD8mQp1ppHjgnnUnyOlqYXZVjnov/JzFhjLEwd3Z4dYjMSnqrEzzGThH47vpCOqPPwJM2FtthLeJ8Pbg=="],
 
     "react-router-dom": ["react-router-dom@7.13.1", "", { "dependencies": { "react-router": "7.13.1" }, "peerDependencies": { "react": ">=18", "react-dom": ">=18" } }, "sha512-UJnV3Rxc5TgUPJt2KJpo1Jpy0OKQr0AjgbZzBFjaPJcFOb2Y8jA5H3LT8HUJAiRLlWrEXWHbF1Z4SCZaQjWDHw=="],
 
+    "react-style-singleton": ["react-style-singleton@2.2.3", "", { "dependencies": { "get-nonce": "^1.0.0", "tslib": "^2.0.0" }, "peerDependencies": { "@types/react": "*", "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react"] }, "sha512-b6jSvxvVnyptAiLjbkWLE/lOnR4lfTtDAl+eUC7RZy+QQWc6wRzIV2CE6xBuMmDxc2qIihtDCZD5NPOFl7fRBQ=="],
+
     "react-use-measure": ["react-use-measure@2.1.7", "", { "peerDependencies": { "react": ">=16.13", "react-dom": ">=16.13" }, "optionalPeers": ["react-dom"] }, "sha512-KrvcAo13I/60HpwGO5jpW7E9DfusKyLPLvuHlUyP5zqnmAPhNc6qTRjUQrdTADl0lpPpDVU2/Gg51UlOGHXbdg=="],
 
     "read-cache": ["read-cache@1.0.0", "", { "dependencies": { "pify": "^2.3.0" } }, "sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA=="],
@@ -5937,8 +6059,6 @@
 
     "require-from-string": ["require-from-string@2.0.2", "", {}, "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw=="],
 
-    "rrweb-cssom": ["rrweb-cssom@0.8.0", "", {}, "sha512-guoltQEx+9aMf2gDZ0s62EcV8lsXR+0w8915TC3ITdn2YueuNjdAYh/levpU9nFaoChh9RUS5ZdQMrKfVEN9tw=="],
-
     "require-like": ["require-like@0.1.2", "", {}, "sha512-oyrU88skkMtDdauHDuKVrgR+zuItqr6/c//FXzvmxRGMexSDc6hNvJInGW3LL46n+8b50RykrvwSUIIQH2LQ5A=="],
 
     "require-main-filename": ["require-main-filename@2.0.0", "", {}, "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="],
@@ -5977,8 +6097,6 @@
 
     "rimraf": ["rimraf@3.0.2", "", { "dependencies": { "glob": "^7.1.3" }, "bin": { "rimraf": "bin.js" } }, "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA=="],
 
-    "ripemd160": ["ripemd160@2.0.3", "", { "dependencies": { "hash-base": "^3.1.2", "inherits": "^2.0.4" } }, "sha512-5Di9UC0+8h1L6ZD2d7awM7E/T4uA1fJRlx6zk/NvdCCVEoAnFqvHmCuNeIKoCeIixBX/q8uM+6ycDvF8woqosA=="],
-
     "robust-predicates": ["robust-predicates@3.0.2", "", {}, "sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg=="],
 
     "rolldown": ["rolldown@1.0.0-rc.10", "", { "dependencies": { "@oxc-project/types": "=0.120.0", "@rolldown/pluginutils": "1.0.0-rc.10" }, "optionalDependencies": { "@rolldown/binding-android-arm64": "1.0.0-rc.10", "@rolldown/binding-darwin-arm64": "1.0.0-rc.10", "@rolldown/binding-darwin-x64": "1.0.0-rc.10", "@rolldown/binding-freebsd-x64": "1.0.0-rc.10", "@rolldown/binding-linux-arm-gnueabihf": "1.0.0-rc.10", "@rolldown/binding-linux-arm64-gnu": "1.0.0-rc.10", "@rolldown/binding-linux-arm64-musl": "1.0.0-rc.10", "@rolldown/binding-linux-ppc64-gnu": "1.0.0-rc.10", "@rolldown/binding-linux-s390x-gnu": "1.0.0-rc.10", "@rolldown/binding-linux-x64-gnu": "1.0.0-rc.10", "@rolldown/binding-linux-x64-musl": "1.0.0-rc.10", "@rolldown/binding-openharmony-arm64": "1.0.0-rc.10", "@rolldown/binding-wasm32-wasi": "1.0.0-rc.10", "@rolldown/binding-win32-arm64-msvc": "1.0.0-rc.10", "@rolldown/binding-win32-x64-msvc": "1.0.0-rc.10" }, "bin": { "rolldown": "bin/cli.mjs" } }, "sha512-q7j6vvarRFmKpgJUT8HCAUljkgzEp4LAhPlJUvQhA5LA1SUL36s5QCysMutErzL3EbNOZOkoziSx9iZC4FddKA=="],
@@ -5989,6 +6107,8 @@
 
     "rpc-websockets": ["rpc-websockets@9.3.5", "", { "dependencies": { "@swc/helpers": "^0.5.11", "@types/uuid": "^10.0.0", "@types/ws": "^8.2.2", "buffer": "^6.0.3", "eventemitter3": "^5.0.1", "uuid": "^11.0.0", "ws": "^8.5.0" }, "optionalDependencies": { "bufferutil": "^4.0.1", "utf-8-validate": "^6.0.0" } }, "sha512-4mAmr+AEhPYJ9TmDtxF3r3ZcbWy7W8kvZ4PoZYw/Xgp2J7WixjwTgiQZsoTDvch5nimmg3Ay6/0Kuh9oIvVs9A=="],
 
+    "rrweb-cssom": ["rrweb-cssom@0.8.0", "", {}, "sha512-guoltQEx+9aMf2gDZ0s62EcV8lsXR+0w8915TC3ITdn2YueuNjdAYh/levpU9nFaoChh9RUS5ZdQMrKfVEN9tw=="],
+
     "rtlcss": ["rtlcss@4.3.0", "", { "dependencies": { "escalade": "^3.1.1", "picocolors": "^1.0.0", "postcss": "^8.4.21", "strip-json-comments": "^3.1.1" }, "bin": { "rtlcss": "bin/rtlcss.js" } }, "sha512-FI+pHEn7Wc4NqKXMXFM+VAYKEj/mRIcW4h24YVwVtyjI+EqGrLc2Hx/Ny0lrZ21cBWU2goLy36eqMcNj3AQJig=="],
 
     "run-applescript": ["run-applescript@7.1.0", "", {}, "sha512-DPe5pVFaAsinSaV6QjQ6gdiedWDcRCbUuiQfQa2wmWV7+xC9bGulGI8+TdRmoFkAPaBXk8CrAbnlY2ISniJ47Q=="],
@@ -6071,6 +6191,8 @@
 
     "set-proto": ["set-proto@1.0.0", "", { "dependencies": { "dunder-proto": "^1.0.1", "es-errors": "^1.3.0", "es-object-atoms": "^1.0.0" } }, "sha512-RJRdvCo6IAnPdsvP/7m6bsQqNnn1FCBX5ZNtFL98MmFF/4xAIJTIg1YbHW5DC2W5SKZanrC6i4HsJqlajw/dZw=="],
 
+    "setimmediate": ["setimmediate@1.0.5", "", {}, "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA=="],
+
     "setprototypeof": ["setprototypeof@1.2.0", "", {}, "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="],
 
     "sha.js": ["sha.js@2.4.12", "", { "dependencies": { "inherits": "^2.0.4", "safe-buffer": "^5.2.1", "to-buffer": "^1.2.0" }, "bin": { "sha.js": "bin.js" } }, "sha512-8LzC5+bvI45BjpfXU8V5fdU2mfeKiQe1D1gIMn7XUlF3OTUrpdJpPPH4EMAnF0DsHHdSZqCdSss5qCmJKuiO3w=="],
@@ -6263,7 +6385,7 @@
 
     "strnum": ["strnum@2.2.0", "", {}, "sha512-Y7Bj8XyJxnPAORMZj/xltsfo55uOiyHcU2tnAVzHUnSJR/KsEX+9RoDeXEnsXtl/CX4fAcrt64gZ13aGaWPeBg=="],
 
-    "strtok3": ["strtok3@10.3.4", "", { "dependencies": { "@tokenizer/token": "^0.3.0" } }, "sha512-KIy5nylvC5le1OdaaoCJ07L+8iQzJHGH6pWDuzS+d07Cu7n1MZ2x26P8ZKIWfbK02+XIL8Mp4RkWeqdUCrDMfg=="],
+    "strtok3": ["strtok3@10.3.5", "", { "dependencies": { "@tokenizer/token": "^0.3.0" } }, "sha512-ki4hZQfh5rX0QDLLkOCj+h+CVNkqmp/CMf8v8kZpkNVK6jGQooMytqzLZYUVYIZcFZ6yDB70EfD8POcFXiF5oA=="],
 
     "style-to-js": ["style-to-js@1.1.21", "", { "dependencies": { "style-to-object": "1.0.14" } }, "sha512-RjQetxJrrUJLQPHbLku6U/ocGtzyjbJMP9lCNK7Ag0CNh690nSH8woqWH9u16nMjYBAok+i7JO1NP2pOy8IsPQ=="],
 
@@ -6423,6 +6545,8 @@
 
     "trough": ["trough@2.2.0", "", {}, "sha512-tmMpK00BjZiUyVyvrBK7knerNgmgvcV/KLVyuma/SC+TQN167GrMRciANTz09+k3zW8L8t60jWO1GpfkZdjTaw=="],
 
+    "ts-algebra": ["ts-algebra@2.0.0", "", {}, "sha512-FPAhNPFMrkwz76P7cdjdmiShwMynZYN6SgOujD1urY4oNm80Ou9oMdmbR45LotcKOXoy7wSmHkRFE6Mxbrhefw=="],
+
     "ts-api-utils": ["ts-api-utils@2.4.0", "", { "peerDependencies": { "typescript": ">=4.8.4" } }, "sha512-3TaVTaAv2gTiMB35i3FiGJaRfwb3Pyn/j3m/bfAvGe8FB7CF6u+LMYqYlDh7reQf7UNvoTvdfAqHGmPGOSsPmA=="],
 
     "ts-case-convert": ["ts-case-convert@2.1.0", "", {}, "sha512-Ye79el/pHYXfoew6kqhMwCoxp4NWjKNcm2kBzpmEMIU9dd9aBmHNNFtZ+WTm0rz1ngyDmfqDXDlyUnBXayiD0w=="],
@@ -6499,7 +6623,7 @@
 
     "typescript-eslint": ["typescript-eslint@8.57.0", "", { "dependencies": { "@typescript-eslint/eslint-plugin": "8.57.0", "@typescript-eslint/parser": "8.57.0", "@typescript-eslint/typescript-estree": "8.57.0", "@typescript-eslint/utils": "8.57.0" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", "typescript": ">=4.8.4 <6.0.0" } }, "sha512-W8GcigEMEeB07xEZol8oJ26rigm3+bfPHxHvwbYUlu1fUDsGuQ7Hiskx5xGW/xM4USc9Ephe3jtv7ZYPQntHeA=="],
 
-    "uWebSockets.js": ["uWebSockets.js@github:uNetworking/uWebSockets.js#a80dda2", {}, "uNetworking-uWebSockets.js-a80dda2"],
+    "uWebSockets.js": ["uWebSockets.js@github:uNetworking/uWebSockets.js#a80dda2", {}, "uNetworking-uWebSockets.js-a80dda2", "sha512-6uNfO7n5+UZGySX6Ap4AwOQdIN8C6Ovfn9F2n5RlsjCbrpMkifc6eGtcYwwE32AJaNlcZ3+CxTdC2xA4PX/CPw=="],
 
     "ua-parser-js": ["ua-parser-js@1.0.41", "", { "bin": { "ua-parser-js": "script/cli.js" } }, "sha512-LbBDqdIC5s8iROCUjMbW1f5dJQTEFB1+KO9ogbvlb3nm9n4YHa5p4KTvFPWvh2Hs8gZMBuiB1/8+pdfe/tDPug=="],
 
@@ -6519,6 +6643,8 @@
 
     "uncrypto": ["uncrypto@0.1.3", "", {}, "sha512-Ql87qFHB3s/De2ClA9e0gsnS6zXG27SkTiSJwjCc9MebbfapQfuPzumMIUMi38ezPZVNFcHI9sUIepeQfw8J8Q=="],
 
+    "underscore": ["underscore@1.13.8", "", {}, "sha512-DXtD3ZtEQzc7M8m4cXotyHR+FAS18C64asBYY5vqZexfYryNNnDc02W4hKg3rdQuqOYas1jkseX0+nZXjTXnvQ=="],
+
     "undici": ["undici@7.24.3", "", {}, "sha512-eJdUmK/Wrx2d+mnWWmwwLRyA7OQCkLap60sk3dOK4ViZR7DKwwptwuIvFBg2HaiP9ESaEdhtpSymQPvytpmkCA=="],
 
     "undici-types": ["undici-types@7.18.2", "", {}, "sha512-AsuCzffGHJybSaRrmr5eHr81mwJU3kjw6M+uprWvCXiNeN9SOGwQ3Jn8jb8m3Z6izVgknn1R0FTCEAP2QrLY/w=="],
@@ -6555,8 +6681,14 @@
 
     "unist-util-visit-parents": ["unist-util-visit-parents@6.0.2", "", { "dependencies": { "@types/unist": "^3.0.0", "unist-util-is": "^6.0.0" } }, "sha512-goh1s1TBrqSqukSc8wrjwWhL0hiJxgA8m4kFxGlQ+8FYQ3C/m11FcTs4YYem7V664AhHVvgoQLk890Ssdsr2IQ=="],
 
+    "universal-github-app-jwt": ["universal-github-app-jwt@1.2.0", "", { "dependencies": { "@types/jsonwebtoken": "^9.0.0", "jsonwebtoken": "^9.0.2" } }, "sha512-dncpMpnsKBk0eetwfN8D8OUHGfiDhhJ+mtsbMl+7PfW7mYjiH8LIcqRmYMtzYLgSh47HjfdBtrBwIQ/gizKR3g=="],
+
+    "universal-user-agent": ["universal-user-agent@6.0.1", "", {}, "sha512-yCzhz6FN2wU1NiiQRogkTQszlQSlpWaw8SvVegAc+bDxbzHgh1vX8uIe8OYyMH6DwH+sdTJsgMl36+mSMdRJIQ=="],
+
     "universalify": ["universalify@2.0.1", "", {}, "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw=="],
 
+    "unpdf": ["unpdf@1.6.0", "", { "peerDependencies": { "@napi-rs/canvas": "^0.1.69" }, "optionalPeers": ["@napi-rs/canvas"] }, "sha512-DsjbuDe6PDbZzGvAP40QQp0xskrXP3Tm3fd/FLkGObL00Icr7cc28QgrPHYg+6B1lMWydgXwDXauIv5CGyXudA=="],
+
     "unpipe": ["unpipe@1.0.0", "", {}, "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ=="],
 
     "unrs-resolver": ["unrs-resolver@1.11.1", "", { "dependencies": { "napi-postinstall": "^0.3.0" }, "optionalDependencies": { "@unrs/resolver-binding-android-arm-eabi": "1.11.1", "@unrs/resolver-binding-android-arm64": "1.11.1", "@unrs/resolver-binding-darwin-arm64": "1.11.1", "@unrs/resolver-binding-darwin-x64": "1.11.1", "@unrs/resolver-binding-freebsd-x64": "1.11.1", "@unrs/resolver-binding-linux-arm-gnueabihf": "1.11.1", "@unrs/resolver-binding-linux-arm-musleabihf": "1.11.1", "@unrs/resolver-binding-linux-arm64-gnu": "1.11.1", "@unrs/resolver-binding-linux-arm64-musl": "1.11.1", "@unrs/resolver-binding-linux-ppc64-gnu": "1.11.1", "@unrs/resolver-binding-linux-riscv64-gnu": "1.11.1", "@unrs/resolver-binding-linux-riscv64-musl": "1.11.1", "@unrs/resolver-binding-linux-s390x-gnu": "1.11.1", "@unrs/resolver-binding-linux-x64-gnu": "1.11.1", "@unrs/resolver-binding-linux-x64-musl": "1.11.1", "@unrs/resolver-binding-wasm32-wasi": "1.11.1", "@unrs/resolver-binding-win32-arm64-msvc": "1.11.1", "@unrs/resolver-binding-win32-ia32-msvc": "1.11.1", "@unrs/resolver-binding-win32-x64-msvc": "1.11.1" } }, "sha512-bSjt9pjaEBnNiGgc9rUiHGKv5l4/TGzDmYw3RhnkJGtLhbnnA/5qJj7x3dNDCRx/PJxu774LlH8lCOlB4hEfKg=="],
@@ -6577,6 +6709,10 @@
 
     "url-loader": ["url-loader@4.1.1", "", { "dependencies": { "loader-utils": "^2.0.0", "mime-types": "^2.1.27", "schema-utils": "^3.0.0" }, "peerDependencies": { "file-loader": "*", "webpack": "^4.0.0 || ^5.0.0" }, "optionalPeers": ["file-loader"] }, "sha512-3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA=="],
 
+    "use-callback-ref": ["use-callback-ref@1.3.3", "", { "dependencies": { "tslib": "^2.0.0" }, "peerDependencies": { "@types/react": "*", "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react"] }, "sha512-jQL3lRnocaFtu3V00JToYz/4QkNWswxijDaCVNZRiRTO3HQDLsdu1ZtmIUvV4yPp+rvWm5j0y0TG/S61cuijTg=="],
+
+    "use-sidecar": ["use-sidecar@1.1.3", "", { "dependencies": { "detect-node-es": "^1.1.0", "tslib": "^2.0.0" }, "peerDependencies": { "@types/react": "*", "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react"] }, "sha512-Fedw0aZvkhynoPYlA5WXrMCAMm+nSWdZt6lzJQ7Ok8S6Q+VsHmHpRWndVRJ8Be0ZbkfPc5LRYH+5XrzXcEeLRQ=="],
+
     "use-sync-external-store": ["use-sync-external-store@1.6.0", "", { "peerDependencies": { "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" } }, "sha512-Pp6GSwGP/NrPIrxVFAIkOQeyw8lFenOHijQWkUTrDvrF4ALqylP2C/KCkeS9dpUM3KvYRQhna5vt7IL95+ZQ9w=="],
 
     "utf-8-validate": ["utf-8-validate@6.0.6", "", { "dependencies": { "node-gyp-build": "^4.3.0" } }, "sha512-q3l3P9UtEEiAHcsgsqTgf9PPjctrDWoIXW3NpOHFdRDbLvu4DLIcxHangJ4RLrWkBcKjmcs/6NkerI8T/rE4LA=="],
@@ -6675,13 +6811,13 @@
 
     "websocket-extensions": ["websocket-extensions@0.1.4", "", {}, "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="],
 
-    "whatwg-fetch": ["whatwg-fetch@3.6.20", "", {}, "sha512-EqhiFU6daOA8kpjOWTL0olhVOF3i7OrFzSYiGsEMB8GcXS+RrzauAERX65xMeNWVqxA6HXH2m69Z9LaKKdisfg=="],
-
     "whatwg-encoding": ["whatwg-encoding@3.1.1", "", { "dependencies": { "iconv-lite": "0.6.3" } }, "sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ=="],
 
-    "whatwg-mimetype": ["whatwg-mimetype@5.0.0", "", {}, "sha512-sXcNcHOC51uPGF0P/D4NVtrkjSU2fNsm9iog4ZvZJsL3rjoDAzXZhkm2MWt1y+PUdggKAYVoMAIYcs78wJ51Cw=="],
+    "whatwg-fetch": ["whatwg-fetch@3.6.20", "", {}, "sha512-EqhiFU6daOA8kpjOWTL0olhVOF3i7OrFzSYiGsEMB8GcXS+RrzauAERX65xMeNWVqxA6HXH2m69Z9LaKKdisfg=="],
+
+    "whatwg-mimetype": ["whatwg-mimetype@4.0.0", "", {}, "sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg=="],
 
-    "whatwg-url": ["whatwg-url@16.0.1", "", { "dependencies": { "@exodus/bytes": "^1.11.0", "tr46": "^6.0.0", "webidl-conversions": "^8.0.1" } }, "sha512-1to4zXBxmXHV3IiSSEInrreIlu02vUOvrhxJJH5vcxYTBDAx51cqZiKdyTxlecdKNSjj8EcxGBxNf6Vg+945gw=="],
+    "whatwg-url": ["whatwg-url@15.1.0", "", { "dependencies": { "tr46": "^6.0.0", "webidl-conversions": "^8.0.0" } }, "sha512-2ytDk0kiEj/yu90JOAp44PVPUkO9+jVhyf+SybKlRHSDlvOOZhdPIrr7xTH64l4WixO2cP+wQIcgujkGBPPz6g=="],
 
     "which": ["which@2.0.2", "", { "dependencies": { "isexe": "^2.0.0" }, "bin": { "node-which": "./bin/node-which" } }, "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="],
 
@@ -6765,7 +6901,7 @@
 
     "xml2js": ["xml2js@0.6.2", "", { "dependencies": { "sax": ">=0.6.0", "xmlbuilder": "~11.0.0" } }, "sha512-T4rieHaC1EXcES0Kxxj4JWgaUQHDk+qwHcYOCFHfiwKz7tOVPLq7Hjq9dM1WCMhylqMEfP7hMcOIChvotiZegA=="],
 
-    "xmlbuilder": ["xmlbuilder@15.1.1", "", {}, "sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg=="],
+    "xmlbuilder": ["xmlbuilder@10.1.1", "", {}, "sha512-OyzrcFLL/nb6fMGHbiRDuPup9ljBycsdCypwuyg5AAHvyWzGfChJpCXMG88AGTIMFhGZ9RccFN1e6lhg3hkwKg=="],
 
     "xmlchars": ["xmlchars@2.2.0", "", {}, "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw=="],
 
@@ -6797,21 +6933,25 @@
 
     "zod": ["zod@4.3.6", "", {}, "sha512-rftlrkhHZOcjDwkGlnUtZZkvaPHCsDATp4pGpuOOMDaTdDDXF91wuVDJoWoPsKX/3YPQ5fHuF3STjcYyKr+Qhg=="],
 
+    "zod-to-json-schema": ["zod-to-json-schema@3.25.2", "", { "peerDependencies": { "zod": "^3.25.28 || ^4" } }, "sha512-O/PgfnpT1xKSDeQYSCfRI5Gy3hPf91mKVDuYLUHZJMiDFptvP41MSnWofm8dnCm0256ZNfZIM7DSzuSMAFnjHA=="],
+
     "zod-validation-error": ["zod-validation-error@4.0.2", "", { "peerDependencies": { "zod": "^3.25.0 || ^4.0.0" } }, "sha512-Q6/nZLe6jxuU80qb/4uJ4t5v2VEZ44lzQjPDhYJNztRQ4wyWc6VF3D3Kb/fAuPetZQnhS3hnajCf9CsWesghLQ=="],
 
     "zustand": ["zustand@5.0.11", "", { "peerDependencies": { "@types/react": ">=18.0.0", "immer": ">=9.0.6", "react": ">=18.0.0", "use-sync-external-store": ">=1.2.0" }, "optionalPeers": ["@types/react", "immer", "react", "use-sync-external-store"] }, "sha512-fdZY+dk7zn/vbWNCYmzZULHRrss0jx5pPFiOuMZ/5HJN6Yv3u+1Wswy/4MpZEkEGhtNH+pwxZB8OKgUBPzYAGg=="],
 
     "zwitch": ["zwitch@2.0.4", "", {}, "sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A=="],
 
-    "@anthropic-ai/sdk/@types/node": ["@types/node@18.19.130", "", { "dependencies": { "undici-types": "~5.26.4" } }, "sha512-GRaXQx6jGfL8sKfaIDD6OupbIHBr9jv7Jnaml9tB7l4v068PAOXqfcujMMo5PhbIs6ggR1XODELqahT2R8v0fg=="],
+    "@ai-sdk/google/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.23", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.6" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-z8GlDaCmRSDlqkMF2f4/RFgWxdarvIbyuk+m6WXT1LYgsnGiXRJGTD2Z1+SDl3LqtFuRtGX1aghYvQLoHL/9pg=="],
 
-    "@anthropic-ai/sdk/form-data-encoder": ["form-data-encoder@1.7.2", "", {}, "sha512-qfqtYan3rxrnCk1VYaA4H+Ms9xdpPqvLZa6xmMgFvhO32x7/3J/ExcTd6qpxM0vH2GdMI+poehyBZvqfMTto8A=="],
+    "@ai-sdk/ui-utils/@ai-sdk/provider": ["@ai-sdk/provider@1.1.3", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-qZMxYJ0qqX/RfnuIaab+zp8UAeJn/ygXXAffR5I4N0n1IrvA6qBsjc8hXLmBiMV2zoXlifkacF7sEFnYnjBcqg=="],
 
-    "@anthropic-ai/sdk/formdata-node": ["formdata-node@4.4.1", "", { "dependencies": { "node-domexception": "1.0.0", "web-streams-polyfill": "4.0.0-beta.3" } }, "sha512-0iirZp3uVDjVGt9p49aTaqjk84TrglENEDuqfdlZQ1roC9CWlPk6Avf8EEnZNcAqPonwkG35x4n3ww/1THYAeQ=="],
+    "@ai-sdk/ui-utils/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@2.2.8", "", { "dependencies": { "@ai-sdk/provider": "1.1.3", "nanoid": "^3.3.8", "secure-json-parse": "^2.7.0" }, "peerDependencies": { "zod": "^3.23.8" } }, "sha512-fqhG+4sCVv8x7nFzYnFo19ryhAa3w096Kmc3hWxMQfW/TubPOmt3A6tYZhl4mUfQWWQMsuSkLrtjlWuXBVSGQA=="],
 
-    "@anthropic-ai/sdk/node-fetch": ["node-fetch@2.7.0", "", { "dependencies": { "whatwg-url": "^5.0.0" }, "peerDependencies": { "encoding": "^0.1.0" }, "optionalPeers": ["encoding"] }, "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A=="],
+    "@ai-sdk/ui-utils/zod": ["zod@3.25.76", "", {}, "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ=="],
 
-    "@asamuzakjp/css-color/lru-cache": ["lru-cache@11.2.6", "", {}, "sha512-ESL2CrkS/2wTPfuend7Zhkzo2u0daGJ/A2VucJOgQ/C48S/zB8MMeMHSGKYpXhIjbPxfuezITkaBH1wqv00DDQ=="],
+    "@asamuzakjp/css-color/lru-cache": ["lru-cache@11.2.7", "", {}, "sha512-aY/R+aEsRelme17KGQa/1ZSIpLpNYYrhcrepKTZgE+W3WM16YMCaPwOHLHsmopZHELU0Ojin1lPVxKR0MihncA=="],
+
+    "@asamuzakjp/dom-selector/lru-cache": ["lru-cache@11.2.7", "", {}, "sha512-aY/R+aEsRelme17KGQa/1ZSIpLpNYYrhcrepKTZgE+W3WM16YMCaPwOHLHsmopZHELU0Ojin1lPVxKR0MihncA=="],
 
     "@aws-crypto/sha256-browser/@smithy/util-utf8": ["@smithy/util-utf8@2.3.0", "", { "dependencies": { "@smithy/util-buffer-from": "^2.2.0", "tslib": "^2.6.2" } }, "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A=="],
 
@@ -6871,6 +7011,8 @@
 
     "@csstools/cascade-layer-name-parser/@csstools/css-tokenizer": ["@csstools/css-tokenizer@3.0.4", "", {}, "sha512-Vd/9EVDiu6PPJt9yAh6roZP6El1xHrdvIVGjyBsHR0RYwNHgL7FJPyIIW4fANJNG6FtyZfvlRPpFI4ZM/lubvw=="],
 
+    "@csstools/css-color-parser/@csstools/color-helpers": ["@csstools/color-helpers@6.0.2", "", {}, "sha512-LMGQLS9EuADloEFkcTBR3BwV/CGHV7zyDxVRtVDTwdI2Ca4it0CCVTT9wCkxSgokjE5Ho41hEPgb8OEUwoXr6Q=="],
+
     "@csstools/media-query-list-parser/@csstools/css-parser-algorithms": ["@csstools/css-parser-algorithms@3.0.5", "", { "peerDependencies": { "@csstools/css-tokenizer": "^3.0.4" } }, "sha512-DaDeUkXZKjdGhgYaHNJTV9pV7Y9B3b644jCLs9Upc3VeNGg6LWARAT6O+Q+/COo+2gg/bM5rhpMAtf70WqfBdQ=="],
 
     "@csstools/media-query-list-parser/@csstools/css-tokenizer": ["@csstools/css-tokenizer@3.0.4", "", {}, "sha512-Vd/9EVDiu6PPJt9yAh6roZP6El1xHrdvIVGjyBsHR0RYwNHgL7FJPyIIW4fANJNG6FtyZfvlRPpFI4ZM/lubvw=="],
@@ -7001,8 +7143,6 @@
 
     "@csstools/postcss-system-ui-font-family/@csstools/css-tokenizer": ["@csstools/css-tokenizer@3.0.4", "", {}, "sha512-Vd/9EVDiu6PPJt9yAh6roZP6El1xHrdvIVGjyBsHR0RYwNHgL7FJPyIIW4fANJNG6FtyZfvlRPpFI4ZM/lubvw=="],
 
-    "@csstools/postcss-text-decoration-shorthand/@csstools/color-helpers": ["@csstools/color-helpers@5.1.0", "", {}, "sha512-S11EXWJyy0Mz5SYvRmY8nJYTFFd1LCNV+7cXyAgQtOOuzb4EsgfqDufL+9esx72/eLhsRdGZwaldu/h+E4t4BA=="],
-
     "@csstools/postcss-trigonometric-functions/@csstools/css-calc": ["@csstools/css-calc@2.1.4", "", { "peerDependencies": { "@csstools/css-parser-algorithms": "^3.0.5", "@csstools/css-tokenizer": "^3.0.4" } }, "sha512-3N8oaj+0juUw/1H3YwmDDJXCgTB1gKU6Hc/bB502u9zR0q2vd786XJH9QfrKIEgFlZmhZiq6epXl4rHqhzsIgQ=="],
 
     "@csstools/postcss-trigonometric-functions/@csstools/css-parser-algorithms": ["@csstools/css-parser-algorithms@3.0.5", "", { "peerDependencies": { "@csstools/css-tokenizer": "^3.0.4" } }, "sha512-DaDeUkXZKjdGhgYaHNJTV9pV7Y9B3b644jCLs9Upc3VeNGg6LWARAT6O+Q+/COo+2gg/bM5rhpMAtf70WqfBdQ=="],
@@ -7043,12 +7183,16 @@
 
     "@donmccurdy/caporal/table": ["table@5.4.6", "", { "dependencies": { "ajv": "^6.10.2", "lodash": "^4.17.14", "slice-ansi": "^2.1.0", "string-width": "^3.0.0" } }, "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug=="],
 
+    "@ecies/ciphers/@noble/ciphers": ["@noble/ciphers@1.3.0", "", {}, "sha512-2I0gnIVPtfnMw9ee9h1dJG7tp81+8Ob3OJb3Mv37rx5L40/b0i7djjCVvGOVqc9AEIQyvyu1i6ypKdFw8R8gQw=="],
+
     "@elizaos/core/@bufbuild/protobuf": ["@bufbuild/protobuf@2.11.0", "", {}, "sha512-sBXGT13cpmPR5BMgHE6UEEfEaShh5Ror6rfN3yEK5si7QVrtZg8LEPQb0VVhiLRUslD2yLnXtnRzG035J/mZXQ=="],
 
     "@elizaos/core/dotenv": ["dotenv@17.3.1", "", {}, "sha512-IO8C/dzEb6O3F9/twg6ZLXz164a2fhTnEWb95H23Dm4OuN+92NmEAlTrupP9VW6Jm3sO26tQlqyvyi4CsnY9GA=="],
 
     "@elizaos/core/drizzle-orm": ["drizzle-orm@0.45.1", "", { "peerDependencies": { "@aws-sdk/client-rds-data": ">=3", "@cloudflare/workers-types": ">=4", "@electric-sql/pglite": ">=0.2.0", "@libsql/client": ">=0.10.0", "@libsql/client-wasm": ">=0.10.0", "@neondatabase/serverless": ">=0.10.0", "@op-engineering/op-sqlite": ">=2", "@opentelemetry/api": "^1.4.1", "@planetscale/database": ">=1.13", "@prisma/client": "*", "@tidbcloud/serverless": "*", "@types/better-sqlite3": "*", "@types/pg": "*", "@types/sql.js": "*", "@upstash/redis": ">=1.34.7", "@vercel/postgres": ">=0.8.0", "@xata.io/client": "*", "better-sqlite3": ">=7", "bun-types": "*", "expo-sqlite": ">=14.0.0", "gel": ">=2", "knex": "*", "kysely": "*", "mysql2": ">=2", "pg": ">=8", "postgres": ">=3", "sql.js": ">=1", "sqlite3": ">=5" }, "optionalPeers": ["@aws-sdk/client-rds-data", "@cloudflare/workers-types", "@electric-sql/pglite", "@libsql/client", "@libsql/client-wasm", "@neondatabase/serverless", "@op-engineering/op-sqlite", "@opentelemetry/api", "@planetscale/database", "@prisma/client", "@tidbcloud/serverless", "@types/better-sqlite3", "@types/pg", "@types/sql.js", "@upstash/redis", "@vercel/postgres", "@xata.io/client", "better-sqlite3", "bun-types", "expo-sqlite", "gel", "knex", "kysely", "mysql2", "pg", "postgres", "sql.js", "sqlite3"] }, "sha512-Te0FOdKIistGNPMq2jscdqngBRfBpC8uMFVwqjf6gtTVJHIQ/dosgV/CLBU2N4ZJBsXL5savCba9b0YJskKdcA=="],
 
+    "@elizaos/plugin-ollama/@elizaos/core": ["@elizaos/core@2.0.0-alpha.214", "", { "dependencies": { "@ai-sdk/anthropic": "^3.0.13", "@ai-sdk/google": "^3.0.8", "@ai-sdk/openai": "^3.0.9", "@anthropic-ai/sdk": "^0.90.0", "@bufbuild/protobuf": "^2.11.0", "@langchain/core": "^1.1.12", "@langchain/textsplitters": "^1.0.1", "@noble/ciphers": "^2.0.0", "@noble/hashes": "^1.8.0", "@openrouter/ai-sdk-provider": "^2.0.0", "@toon-format/toon": "^2.1.0", "adze": "^2.2.5", "ai": "^6.0.30", "coding-agent-adapters": "0.16.3", "dedent": "^1.7.1", "dotenv": "^17.2.3", "drizzle-orm": "^0.45.1", "fast-redact": "^3.5.0", "file-type": "^22.0.0", "fs-extra": "^11.3.2", "git-workspace-service": "0.4.5", "glob": "^13.0.0", "handlebars": "^4.7.8", "json5": "^2.2.3", "mammoth": "^1.9.0", "markdown-it": "^14.1.0", "pdfjs-dist": "^5.4.530", "undici": "^8.0.0", "unique-names-generator": "^4.7.1", "unpdf": "^1.4.0", "uuid": "^13.0.0", "yaml": "^2.7.0", "zod": "^4.3.6" } }, "sha512-kMuQA5Oenv7Bi4oPbU7dVVhAuQh0nYisQvu2mYsVHkQoCB9LGbYsKpWaZteRouGsM8Z0w6a2BvXbZt/yKjgfKQ=="],
+
     "@elizaos/plugin-sql/dotenv": ["dotenv@17.3.1", "", {}, "sha512-IO8C/dzEb6O3F9/twg6ZLXz164a2fhTnEWb95H23Dm4OuN+92NmEAlTrupP9VW6Jm3sO26tQlqyvyi4CsnY9GA=="],
 
     "@elizaos/plugin-sql/drizzle-orm": ["drizzle-orm@0.45.1", "", { "peerDependencies": { "@aws-sdk/client-rds-data": ">=3", "@cloudflare/workers-types": ">=4", "@electric-sql/pglite": ">=0.2.0", "@libsql/client": ">=0.10.0", "@libsql/client-wasm": ">=0.10.0", "@neondatabase/serverless": ">=0.10.0", "@op-engineering/op-sqlite": ">=2", "@opentelemetry/api": "^1.4.1", "@planetscale/database": ">=1.13", "@prisma/client": "*", "@tidbcloud/serverless": "*", "@types/better-sqlite3": "*", "@types/pg": "*", "@types/sql.js": "*", "@upstash/redis": ">=1.34.7", "@vercel/postgres": ">=0.8.0", "@xata.io/client": "*", "better-sqlite3": ">=7", "bun-types": "*", "expo-sqlite": ">=14.0.0", "gel": ">=2", "knex": "*", "kysely": "*", "mysql2": ">=2", "pg": ">=8", "postgres": ">=3", "sql.js": ">=1", "sqlite3": ">=5" }, "optionalPeers": ["@aws-sdk/client-rds-data", "@cloudflare/workers-types", "@electric-sql/pglite", "@libsql/client", "@libsql/client-wasm", "@neondatabase/serverless", "@op-engineering/op-sqlite", "@opentelemetry/api", "@planetscale/database", "@prisma/client", "@tidbcloud/serverless", "@types/better-sqlite3", "@types/pg", "@types/sql.js", "@upstash/redis", "@vercel/postgres", "@xata.io/client", "better-sqlite3", "bun-types", "expo-sqlite", "gel", "knex", "kysely", "mysql2", "pg", "postgres", "sql.js", "sqlite3"] }, "sha512-Te0FOdKIistGNPMq2jscdqngBRfBpC8uMFVwqjf6gtTVJHIQ/dosgV/CLBU2N4ZJBsXL5savCba9b0YJskKdcA=="],
@@ -7111,10 +7255,14 @@
 
     "@hyperscape/impostor/vitest": ["vitest@3.2.4", "", { "dependencies": { "@types/chai": "^5.2.2", "@vitest/expect": "3.2.4", "@vitest/mocker": "3.2.4", "@vitest/pretty-format": "^3.2.4", "@vitest/runner": "3.2.4", "@vitest/snapshot": "3.2.4", "@vitest/spy": "3.2.4", "@vitest/utils": "3.2.4", "chai": "^5.2.0", "debug": "^4.4.1", "expect-type": "^1.2.1", "magic-string": "^0.30.17", "pathe": "^2.0.3", "picomatch": "^4.0.2", "std-env": "^3.9.0", "tinybench": "^2.9.0", "tinyexec": "^0.3.2", "tinyglobby": "^0.2.14", "tinypool": "^1.1.1", "tinyrainbow": "^2.0.0", "vite": "^5.0.0 || ^6.0.0 || ^7.0.0-0", "vite-node": "3.2.4", "why-is-node-running": "^2.3.0" }, "peerDependencies": { "@edge-runtime/vm": "*", "@types/debug": "^4.1.12", "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0", "@vitest/browser": "3.2.4", "@vitest/ui": "3.2.4", "happy-dom": "*", "jsdom": "*" }, "optionalPeers": ["@edge-runtime/vm", "@types/debug", "@types/node", "@vitest/browser", "@vitest/ui", "happy-dom", "jsdom"], "bin": { "vitest": "vitest.mjs" } }, "sha512-LUCP5ev3GURDysTWiP47wRRUpLKMOfPh+yKTx3kVIEiu5KOMeqzpnYNsKyOoVrULivR8tLcks4+lga33Whn90A=="],
 
+    "@hyperscape/plugin-hyperscape/@elizaos/core": ["@elizaos/core@2.0.0-alpha.214", "", { "dependencies": { "@ai-sdk/anthropic": "^3.0.13", "@ai-sdk/google": "^3.0.8", "@ai-sdk/openai": "^3.0.9", "@anthropic-ai/sdk": "^0.90.0", "@bufbuild/protobuf": "^2.11.0", "@langchain/core": "^1.1.12", "@langchain/textsplitters": "^1.0.1", "@noble/ciphers": "^2.0.0", "@noble/hashes": "^1.8.0", "@openrouter/ai-sdk-provider": "^2.0.0", "@toon-format/toon": "^2.1.0", "adze": "^2.2.5", "ai": "^6.0.30", "coding-agent-adapters": "0.16.3", "dedent": "^1.7.1", "dotenv": "^17.2.3", "drizzle-orm": "^0.45.1", "fast-redact": "^3.5.0", "file-type": "^22.0.0", "fs-extra": "^11.3.2", "git-workspace-service": "0.4.5", "glob": "^13.0.0", "handlebars": "^4.7.8", "json5": "^2.2.3", "mammoth": "^1.9.0", "markdown-it": "^14.1.0", "pdfjs-dist": "^5.4.530", "undici": "^8.0.0", "unique-names-generator": "^4.7.1", "unpdf": "^1.4.0", "uuid": "^13.0.0", "yaml": "^2.7.0", "zod": "^4.3.6" } }, "sha512-kMuQA5Oenv7Bi4oPbU7dVVhAuQh0nYisQvu2mYsVHkQoCB9LGbYsKpWaZteRouGsM8Z0w6a2BvXbZt/yKjgfKQ=="],
+
     "@hyperscape/plugin-hyperscape/vitest": ["vitest@4.1.0", "", { "dependencies": { "@vitest/expect": "4.1.0", "@vitest/mocker": "4.1.0", "@vitest/pretty-format": "4.1.0", "@vitest/runner": "4.1.0", "@vitest/snapshot": "4.1.0", "@vitest/spy": "4.1.0", "@vitest/utils": "4.1.0", "es-module-lexer": "^2.0.0", "expect-type": "^1.3.0", "magic-string": "^0.30.21", "obug": "^2.1.1", "pathe": "^2.0.3", "picomatch": "^4.0.3", "std-env": "^4.0.0-rc.1", "tinybench": "^2.9.0", "tinyexec": "^1.0.2", "tinyglobby": "^0.2.15", "tinyrainbow": "^3.0.3", "vite": "^6.0.0 || ^7.0.0 || ^8.0.0-0", "why-is-node-running": "^2.3.0" }, "peerDependencies": { "@edge-runtime/vm": "*", "@opentelemetry/api": "^1.9.0", "@types/node": "^20.0.0 || ^22.0.0 || >=24.0.0", "@vitest/browser-playwright": "4.1.0", "@vitest/browser-preview": "4.1.0", "@vitest/browser-webdriverio": "4.1.0", "@vitest/ui": "4.1.0", "happy-dom": "*", "jsdom": "*" }, "optionalPeers": ["@edge-runtime/vm", "@opentelemetry/api", "@types/node", "@vitest/browser-playwright", "@vitest/browser-preview", "@vitest/browser-webdriverio", "@vitest/ui", "happy-dom", "jsdom"], "bin": { "vitest": "vitest.mjs" } }, "sha512-YbDrMF9jM2Lqc++2530UourxZHmkKLxrs4+mYhEwqWS97WJ7wOYEkcr+QfRgJ3PW9wz3odRijLZjHEaRLTNbqw=="],
 
     "@hyperscape/procgen/vitest": ["vitest@4.1.0", "", { "dependencies": { "@vitest/expect": "4.1.0", "@vitest/mocker": "4.1.0", "@vitest/pretty-format": "4.1.0", "@vitest/runner": "4.1.0", "@vitest/snapshot": "4.1.0", "@vitest/spy": "4.1.0", "@vitest/utils": "4.1.0", "es-module-lexer": "^2.0.0", "expect-type": "^1.3.0", "magic-string": "^0.30.21", "obug": "^2.1.1", "pathe": "^2.0.3", "picomatch": "^4.0.3", "std-env": "^4.0.0-rc.1", "tinybench": "^2.9.0", "tinyexec": "^1.0.2", "tinyglobby": "^0.2.15", "tinyrainbow": "^3.0.3", "vite": "^6.0.0 || ^7.0.0 || ^8.0.0-0", "why-is-node-running": "^2.3.0" }, "peerDependencies": { "@edge-runtime/vm": "*", "@opentelemetry/api": "^1.9.0", "@types/node": "^20.0.0 || ^22.0.0 || >=24.0.0", "@vitest/browser-playwright": "4.1.0", "@vitest/browser-preview": "4.1.0", "@vitest/browser-webdriverio": "4.1.0", "@vitest/ui": "4.1.0", "happy-dom": "*", "jsdom": "*" }, "optionalPeers": ["@edge-runtime/vm", "@opentelemetry/api", "@types/node", "@vitest/browser-playwright", "@vitest/browser-preview", "@vitest/browser-webdriverio", "@vitest/ui", "happy-dom", "jsdom"], "bin": { "vitest": "vitest.mjs" } }, "sha512-YbDrMF9jM2Lqc++2530UourxZHmkKLxrs4+mYhEwqWS97WJ7wOYEkcr+QfRgJ3PW9wz3odRijLZjHEaRLTNbqw=="],
 
+    "@hyperscape/server/@elizaos/core": ["@elizaos/core@2.0.0-alpha.214", "", { "dependencies": { "@ai-sdk/anthropic": "^3.0.13", "@ai-sdk/google": "^3.0.8", "@ai-sdk/openai": "^3.0.9", "@anthropic-ai/sdk": "^0.90.0", "@bufbuild/protobuf": "^2.11.0", "@langchain/core": "^1.1.12", "@langchain/textsplitters": "^1.0.1", "@noble/ciphers": "^2.0.0", "@noble/hashes": "^1.8.0", "@openrouter/ai-sdk-provider": "^2.0.0", "@toon-format/toon": "^2.1.0", "adze": "^2.2.5", "ai": "^6.0.30", "coding-agent-adapters": "0.16.3", "dedent": "^1.7.1", "dotenv": "^17.2.3", "drizzle-orm": "^0.45.1", "fast-redact": "^3.5.0", "file-type": "^22.0.0", "fs-extra": "^11.3.2", "git-workspace-service": "0.4.5", "glob": "^13.0.0", "handlebars": "^4.7.8", "json5": "^2.2.3", "mammoth": "^1.9.0", "markdown-it": "^14.1.0", "pdfjs-dist": "^5.4.530", "undici": "^8.0.0", "unique-names-generator": "^4.7.1", "unpdf": "^1.4.0", "uuid": "^13.0.0", "yaml": "^2.7.0", "zod": "^4.3.6" } }, "sha512-kMuQA5Oenv7Bi4oPbU7dVVhAuQh0nYisQvu2mYsVHkQoCB9LGbYsKpWaZteRouGsM8Z0w6a2BvXbZt/yKjgfKQ=="],
+
     "@hyperscape/server/@vitest/coverage-v8": ["@vitest/coverage-v8@4.1.0", "", { "dependencies": { "@bcoe/v8-coverage": "^1.0.2", "@vitest/utils": "4.1.0", "ast-v8-to-istanbul": "^1.0.0", "istanbul-lib-coverage": "^3.2.2", "istanbul-lib-report": "^3.0.1", "istanbul-reports": "^3.2.0", "magicast": "^0.5.2", "obug": "^2.1.1", "std-env": "^4.0.0-rc.1", "tinyrainbow": "^3.0.3" }, "peerDependencies": { "@vitest/browser": "4.1.0", "vitest": "4.1.0" }, "optionalPeers": ["@vitest/browser"] }, "sha512-nDWulKeik2bL2Va/Wl4x7DLuTKAXa906iRFooIRPR+huHkcvp9QDkPQ2RJdmjOFrqOqvNfoSQLF68deE3xC3CQ=="],
 
     "@hyperscape/server/dotenv": ["dotenv@17.3.1", "", {}, "sha512-IO8C/dzEb6O3F9/twg6ZLXz164a2fhTnEWb95H23Dm4OuN+92NmEAlTrupP9VW6Jm3sO26tQlqyvyi4CsnY9GA=="],
@@ -7353,9 +7501,9 @@
 
     "@nomicfoundation/ignition-core/immer": ["immer@10.0.2", "", {}, "sha512-Rx3CqeqQ19sxUtYV9CU911Vhy8/721wRFnJv3REVGWUmoAcIwzifTsdmJte/MV+0/XpM35LZdQMBGkRIoLPwQA=="],
 
-    "@npmcli/agent/agent-base": ["agent-base@7.1.4", "", {}, "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ=="],
+    "@npmcli/agent/lru-cache": ["lru-cache@11.2.7", "", {}, "sha512-aY/R+aEsRelme17KGQa/1ZSIpLpNYYrhcrepKTZgE+W3WM16YMCaPwOHLHsmopZHELU0Ojin1lPVxKR0MihncA=="],
 
-    "@npmcli/agent/https-proxy-agent": ["https-proxy-agent@7.0.6", "", { "dependencies": { "agent-base": "^7.1.2", "debug": "4" } }, "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw=="],
+    "@octokit/auth-app/lru-cache": ["@wolfy1339/lru-cache@11.0.2-patch.1", "", {}, "sha512-BgYZfL2ADCXKOw2wJtkM3slhHotawWkgIRRxq4wEybnZQPjvAp71SPX35xepMykTw8gXlzWcWPTY31hlbnRsDA=="],
 
     "@oxc-resolver/binding-wasm32-wasi/@napi-rs/wasm-runtime": ["@napi-rs/wasm-runtime@1.1.1", "", { "dependencies": { "@emnapi/core": "^1.7.1", "@emnapi/runtime": "^1.7.1", "@tybys/wasm-util": "^0.10.1" } }, "sha512-p64ah1M1ld8xjWv3qbvFwHiFVWrq1yFvV4f7w+mzaqiR4IlSgkqhcRdHwsGgomwzBH51sRY4NEowLxnaBjcW/A=="],
 
@@ -7381,6 +7529,16 @@
 
     "@privy-io/server-auth/type-fest": ["type-fest@3.13.1", "", {}, "sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g=="],
 
+    "@radix-ui/react-collection/@radix-ui/react-slot": ["@radix-ui/react-slot@1.2.3", "", { "dependencies": { "@radix-ui/react-compose-refs": "1.1.2" }, "peerDependencies": { "@types/react": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react"] }, "sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A=="],
+
+    "@radix-ui/react-label/@radix-ui/react-primitive": ["@radix-ui/react-primitive@2.1.4", "", { "dependencies": { "@radix-ui/react-slot": "1.2.4" }, "peerDependencies": { "@types/react": "*", "@types/react-dom": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react", "@types/react-dom"] }, "sha512-9hQc4+GNVtJAIEPEqlYqW5RiYdrr8ea5XQ0ZOnD6fgru+83kqT15mq2OCcbe8KnjRZl5vF3ks69AKz3kh1jrhg=="],
+
+    "@radix-ui/react-primitive/@radix-ui/react-slot": ["@radix-ui/react-slot@1.2.3", "", { "dependencies": { "@radix-ui/react-compose-refs": "1.1.2" }, "peerDependencies": { "@types/react": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react"] }, "sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A=="],
+
+    "@radix-ui/react-select/@radix-ui/react-slot": ["@radix-ui/react-slot@1.2.3", "", { "dependencies": { "@radix-ui/react-compose-refs": "1.1.2" }, "peerDependencies": { "@types/react": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react"] }, "sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A=="],
+
+    "@radix-ui/react-separator/@radix-ui/react-primitive": ["@radix-ui/react-primitive@2.1.4", "", { "dependencies": { "@radix-ui/react-slot": "1.2.4" }, "peerDependencies": { "@types/react": "*", "@types/react-dom": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react", "@types/react-dom"] }, "sha512-9hQc4+GNVtJAIEPEqlYqW5RiYdrr8ea5XQ0ZOnD6fgru+83kqT15mq2OCcbe8KnjRZl5vF3ks69AKz3kh1jrhg=="],
+
     "@react-native/codegen/hermes-parser": ["hermes-parser@0.32.0", "", { "dependencies": { "hermes-estree": "0.32.0" } }, "sha512-g4nBOWFpuiTqjR3LZdRxKUkij9iyveWeuks7INEsMX741f3r9xxrOe8TeQfUxtda0eXmiIFiMQzoeSQEno33Hw=="],
 
     "@react-native/dev-middleware/open": ["open@7.4.2", "", { "dependencies": { "is-docker": "^2.0.0", "is-wsl": "^2.1.1" } }, "sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q=="],
@@ -7617,6 +7775,8 @@
 
     "@walletconnect/time/tslib": ["tslib@1.14.1", "", {}, "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="],
 
+    "@walletconnect/utils/@noble/ciphers": ["@noble/ciphers@1.3.0", "", {}, "sha512-2I0gnIVPtfnMw9ee9h1dJG7tp81+8Ob3OJb3Mv37rx5L40/b0i7djjCVvGOVqc9AEIQyvyu1i6ypKdFw8R8gQw=="],
+
     "@walletconnect/utils/ox": ["ox@0.9.3", "", { "dependencies": { "@adraffy/ens-normalize": "^1.11.0", "@noble/ciphers": "^1.3.0", "@noble/curves": "1.9.1", "@noble/hashes": "^1.8.0", "@scure/bip32": "^1.7.0", "@scure/bip39": "^1.6.0", "abitype": "^1.0.9", "eventemitter3": "5.0.1" }, "peerDependencies": { "typescript": ">=5.4.0" }, "optionalPeers": ["typescript"] }, "sha512-KzyJP+fPV4uhuuqrTZyok4DC7vFzi7HLUFiUNEmpbyh59htKWkOC98IONC1zgXJPbHAhQgqs6B0Z6StCGhmQvg=="],
 
     "@walletconnect/window-getters/tslib": ["tslib@1.14.1", "", {}, "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="],
@@ -7653,7 +7813,7 @@
 
     "boxen/type-fest": ["type-fest@2.19.0", "", {}, "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA=="],
 
-    "browserify-sign/readable-stream": ["readable-stream@2.3.8", "", { "dependencies": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", "isarray": "~1.0.0", "process-nextick-args": "~2.0.0", "safe-buffer": "~5.1.1", "string_decoder": "~1.1.1", "util-deprecate": "~1.0.1" } }, "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA=="],
+    "cacache/lru-cache": ["lru-cache@11.2.7", "", {}, "sha512-aY/R+aEsRelme17KGQa/1ZSIpLpNYYrhcrepKTZgE+W3WM16YMCaPwOHLHsmopZHELU0Ojin1lPVxKR0MihncA=="],
 
     "cacache/p-map": ["p-map@7.0.4", "", {}, "sha512-tkAQEw8ysMzmkhgw8k+1U/iPhWNhykKnSk4Rd5zLoPJCuJaGRPo6YposrZgaxHKzDHdDWWZvE/Sk7hsL2X/CpQ=="],
 
@@ -7705,8 +7865,6 @@
 
     "cross-fetch/node-fetch": ["node-fetch@2.7.0", "", { "dependencies": { "whatwg-url": "^5.0.0" }, "peerDependencies": { "encoding": "^0.1.0" }, "optionalPeers": ["encoding"] }, "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A=="],
 
-    "cssstyle/@asamuzakjp/css-color": ["@asamuzakjp/css-color@4.1.2", "", { "dependencies": { "@csstools/css-calc": "^3.0.0", "@csstools/css-color-parser": "^4.0.1", "@csstools/css-parser-algorithms": "^4.0.0", "@csstools/css-tokenizer": "^4.0.0", "lru-cache": "^11.2.5" } }, "sha512-NfBUvBaYgKIuq6E/RBLY1m0IohzNHAYyaJGuTK79Z23uNwmz2jl1mPsC5ZxCCxylinKhT1Amn5oNTlx1wN8cQg=="],
-
     "crypto-random-string/type-fest": ["type-fest@1.4.0", "", {}, "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA=="],
 
     "css-blank-pseudo/postcss-selector-parser": ["postcss-selector-parser@7.1.1", "", { "dependencies": { "cssesc": "^3.0.0", "util-deprecate": "^1.0.2" } }, "sha512-orRsuYpJVw8LdAwqqLykBj9ecS5/cRHlI5+nvTo8LcCKmzDmqVORXtOIYEEQuL9D4BxtA1lm5isAqzQZCoQ6Eg=="],
@@ -7719,10 +7877,14 @@
 
     "csso/css-tree": ["css-tree@2.2.1", "", { "dependencies": { "mdn-data": "2.0.28", "source-map-js": "^1.0.1" } }, "sha512-OA0mILzGc1kCOCSJerOeqDxDQ4HOh+G8NbOJFOTgOCzpw7fCBubk0fEyxp8AgOL/jvLgYA/uV0cMbe43ElF1JA=="],
 
+    "cssstyle/lru-cache": ["lru-cache@11.2.7", "", {}, "sha512-aY/R+aEsRelme17KGQa/1ZSIpLpNYYrhcrepKTZgE+W3WM16YMCaPwOHLHsmopZHELU0Ojin1lPVxKR0MihncA=="],
+
     "d3-dsv/commander": ["commander@7.2.0", "", {}, "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw=="],
 
     "d3-dsv/iconv-lite": ["iconv-lite@0.6.3", "", { "dependencies": { "safer-buffer": ">= 2.1.2 < 3.0.0" } }, "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw=="],
 
+    "data-urls/whatwg-mimetype": ["whatwg-mimetype@5.0.0", "", {}, "sha512-sXcNcHOC51uPGF0P/D4NVtrkjSU2fNsm9iog4ZvZJsL3rjoDAzXZhkm2MWt1y+PUdggKAYVoMAIYcs78wJ51Cw=="],
+
     "depcheck/cosmiconfig": ["cosmiconfig@7.1.0", "", { "dependencies": { "@types/parse-json": "^4.0.0", "import-fresh": "^3.2.1", "parse-json": "^5.0.0", "path-type": "^4.0.0", "yaml": "^1.10.0" } }, "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA=="],
 
     "depcheck/ignore": ["ignore@5.3.2", "", {}, "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g=="],
@@ -7733,6 +7895,8 @@
 
     "duplexify/readable-stream": ["readable-stream@3.6.2", "", { "dependencies": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", "util-deprecate": "^1.0.1" } }, "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA=="],
 
+    "eciesjs/@noble/ciphers": ["@noble/ciphers@1.3.0", "", {}, "sha512-2I0gnIVPtfnMw9ee9h1dJG7tp81+8Ob3OJb3Mv37rx5L40/b0i7djjCVvGOVqc9AEIQyvyu1i6ypKdFw8R8gQw=="],
+
     "elementtree/sax": ["sax@1.1.4", "", {}, "sha512-5f3k2PbGGp+YtKJjOItpg3P99IMD84E4HOvcfleTb5joCHNXYLsR9yWFPOYGgaeMPDubQILTCMdsFb2OMeOjtg=="],
 
     "elevenlabs/node-fetch": ["node-fetch@2.7.0", "", { "dependencies": { "whatwg-url": "^5.0.0" }, "peerDependencies": { "encoding": "^0.1.0" }, "optionalPeers": ["encoding"] }, "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A=="],
@@ -7795,6 +7959,8 @@
 
     "fast-glob/glob-parent": ["glob-parent@5.1.2", "", { "dependencies": { "is-glob": "^4.0.1" } }, "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="],
 
+    "ffmpeg-static/https-proxy-agent": ["https-proxy-agent@5.0.1", "", { "dependencies": { "agent-base": "6", "debug": "4" } }, "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA=="],
+
     "file-loader/schema-utils": ["schema-utils@3.3.0", "", { "dependencies": { "@types/json-schema": "^7.0.8", "ajv": "^6.12.5", "ajv-keywords": "^3.5.2" } }, "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg=="],
 
     "finalhandler/debug": ["debug@2.6.9", "", { "dependencies": { "ms": "2.0.0" } }, "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="],
@@ -7835,24 +8001,6 @@
 
     "http-proxy/eventemitter3": ["eventemitter3@4.0.7", "", {}, "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="],
 
-    "http-proxy-agent/agent-base": ["agent-base@7.1.4", "", {}, "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ=="],
-
-    "jsdom/@asamuzakjp/dom-selector": ["@asamuzakjp/dom-selector@6.8.1", "", { "dependencies": { "@asamuzakjp/nwsapi": "^2.3.9", "bidi-js": "^1.0.3", "css-tree": "^3.1.0", "is-potential-custom-element-name": "^1.0.1", "lru-cache": "^11.2.6" } }, "sha512-MvRz1nCqW0fsy8Qz4dnLIvhOlMzqDVBabZx6lH+YywFDdjXhMY37SmpV1XFX3JzG5GWHn63j6HX6QPr3lZXHvQ=="],
-
-    "jsdom/data-urls": ["data-urls@6.0.1", "", { "dependencies": { "whatwg-mimetype": "^5.0.0", "whatwg-url": "^15.1.0" } }, "sha512-euIQENZg6x8mj3fO6o9+fOW8MimUI4PpD/fZBhJfeioZVy9TUpM4UY7KjQNVZFlqwJ0UdzRDzkycB997HEq1BQ=="],
-
-    "jsdom/html-encoding-sniffer": ["html-encoding-sniffer@4.0.0", "", { "dependencies": { "whatwg-encoding": "^3.1.1" } }, "sha512-Y22oTqIU4uuPgEemfz7NDJz6OeKf12Lsu+QC+s3BVpda64lTiMYCyGwg5ki4vFxkMwQdeZDl2adZoqUgdFuTgQ=="],
-
-    "jsdom/https-proxy-agent": ["https-proxy-agent@7.0.6", "", { "dependencies": { "agent-base": "^7.1.2", "debug": "4" } }, "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw=="],
-
-    "jsdom/whatwg-mimetype": ["whatwg-mimetype@4.0.0", "", {}, "sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg=="],
-
-    "jsdom/whatwg-url": ["whatwg-url@15.1.0", "", { "dependencies": { "tr46": "^6.0.0", "webidl-conversions": "^8.0.0" } }, "sha512-2ytDk0kiEj/yu90JOAp44PVPUkO9+jVhyf+SybKlRHSDlvOOZhdPIrr7xTH64l4WixO2cP+wQIcgujkGBPPz6g=="],
-
-    "jsdom/data-urls/whatwg-mimetype": ["whatwg-mimetype@5.0.0", "", {}, "sha512-sXcNcHOC51uPGF0P/D4NVtrkjSU2fNsm9iog4ZvZJsL3rjoDAzXZhkm2MWt1y+PUdggKAYVoMAIYcs78wJ51Cw=="],
-
-    "jsdom/https-proxy-agent/agent-base": ["agent-base@7.1.4", "", {}, "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ=="],
-
     "http-proxy-middleware/is-plain-obj": ["is-plain-obj@3.0.0", "", {}, "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA=="],
 
     "http-response-object/@types/node": ["@types/node@10.17.60", "", {}, "sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw=="],
@@ -7955,6 +8103,8 @@
 
     "json-rpc-engine/@metamask/safe-event-emitter": ["@metamask/safe-event-emitter@2.0.0", "", {}, "sha512-/kSXhY692qiV1MXu6EeOZvg5nECLclxNXcKCxJ3cXQgYuRymRHpdx/t7JXfsK+JLjwA1e1c1/SBrlQYpusC29Q=="],
 
+    "jszip/readable-stream": ["readable-stream@2.3.8", "", { "dependencies": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", "isarray": "~1.0.0", "process-nextick-args": "~2.0.0", "safe-buffer": "~5.1.1", "string_decoder": "~1.1.1", "util-deprecate": "~1.0.1" } }, "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA=="],
+
     "keccak/node-addon-api": ["node-addon-api@2.0.2", "", {}, "sha512-Ntyt4AIXyaLIuMHF6IOoTakB3K+RWxwtsHNRxllEoA6vPwP9o4866g6YWDLUdnucilZhmkxiHwHr11gAENw+QA=="],
 
     "keccak/readable-stream": ["readable-stream@3.6.2", "", { "dependencies": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", "util-deprecate": "^1.0.1" } }, "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA=="],
@@ -8031,8 +8181,6 @@
 
     "metro-babel-transformer/hermes-parser": ["hermes-parser@0.33.3", "", { "dependencies": { "hermes-estree": "0.33.3" } }, "sha512-Yg3HgaG4CqgyowtYjX/FsnPAuZdHOqSMtnbpylbptsQ9nwwSKsy6uRWcGO5RK0EqiX12q8HvDWKgeAVajRO5DA=="],
 
-    "metro-cache/https-proxy-agent": ["https-proxy-agent@7.0.6", "", { "dependencies": { "agent-base": "^7.1.2", "debug": "4" } }, "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw=="],
-
     "metro-config/jest-validate": ["jest-validate@29.7.0", "", { "dependencies": { "@jest/types": "^29.6.3", "camelcase": "^6.2.0", "chalk": "^4.0.0", "jest-get-type": "^29.6.3", "leven": "^3.1.0", "pretty-format": "^29.7.0" } }, "sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw=="],
 
     "metro-source-map/source-map": ["source-map@0.5.7", "", {}, "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ=="],
@@ -8193,15 +8341,15 @@
 
     "obj-multiplex/readable-stream": ["readable-stream@2.3.8", "", { "dependencies": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", "isarray": "~1.0.0", "process-nextick-args": "~2.0.0", "safe-buffer": "~5.1.1", "string_decoder": "~1.1.1", "util-deprecate": "~1.0.1" } }, "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA=="],
 
-    "ox/eventemitter3": ["eventemitter3@5.0.1", "", {}, "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA=="],
+    "ollama-ai-provider/@ai-sdk/provider": ["@ai-sdk/provider@1.1.3", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-qZMxYJ0qqX/RfnuIaab+zp8UAeJn/ygXXAffR5I4N0n1IrvA6qBsjc8hXLmBiMV2zoXlifkacF7sEFnYnjBcqg=="],
 
-    "p-locate/p-limit": ["p-limit@3.1.0", "", { "dependencies": { "yocto-queue": "^0.1.0" } }, "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ=="],
+    "ollama-ai-provider/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@2.2.8", "", { "dependencies": { "@ai-sdk/provider": "1.1.3", "nanoid": "^3.3.8", "secure-json-parse": "^2.7.0" }, "peerDependencies": { "zod": "^3.23.8" } }, "sha512-fqhG+4sCVv8x7nFzYnFo19ryhAa3w096Kmc3hWxMQfW/TubPOmt3A6tYZhl4mUfQWWQMsuSkLrtjlWuXBVSGQA=="],
 
-    "pac-proxy-agent/agent-base": ["agent-base@7.1.4", "", {}, "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ=="],
+    "ollama-ai-provider-v2/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.23", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.6" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-z8GlDaCmRSDlqkMF2f4/RFgWxdarvIbyuk+m6WXT1LYgsnGiXRJGTD2Z1+SDl3LqtFuRtGX1aghYvQLoHL/9pg=="],
 
-    "pac-proxy-agent/https-proxy-agent": ["https-proxy-agent@7.0.6", "", { "dependencies": { "agent-base": "^7.1.2", "debug": "4" } }, "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw=="],
+    "ox/eventemitter3": ["eventemitter3@5.0.1", "", {}, "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA=="],
 
-    "parse-asn1/asn1.js": ["asn1.js@4.10.1", "", { "dependencies": { "bn.js": "^4.0.0", "inherits": "^2.0.1", "minimalistic-assert": "^1.0.0" } }, "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw=="],
+    "p-locate/p-limit": ["p-limit@3.1.0", "", { "dependencies": { "yocto-queue": "^0.1.0" } }, "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ=="],
 
     "parse-bmfont-xml/xml2js": ["xml2js@0.5.0", "", { "dependencies": { "sax": ">=0.6.0", "xmlbuilder": "~11.0.0" } }, "sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA=="],
 
@@ -8215,8 +8363,6 @@
 
     "peek-stream/duplexify": ["duplexify@3.7.1", "", { "dependencies": { "end-of-stream": "^1.0.0", "inherits": "^2.0.1", "readable-stream": "^2.0.0", "stream-shift": "^1.0.0" } }, "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g=="],
 
-    "pg-mem/lru-cache": ["lru-cache@6.0.0", "", { "dependencies": { "yallist": "^4.0.0" } }, "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="],
-
     "pg-mem/object-hash": ["object-hash@2.2.0", "", {}, "sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw=="],
 
     "pino-pretty/pino-abstract-transport": ["pino-abstract-transport@3.0.0", "", { "dependencies": { "split2": "^4.0.0" } }, "sha512-wlfUczU+n7Hy/Ha5j9a/gZNy7We5+cXp8YL+X+PG8S0KXxw7n/JXA3c46Y0zQznIJ83URJiwy7Lh56WLokNuxg=="],
@@ -8227,6 +8373,8 @@
 
     "playwright/fsevents": ["fsevents@2.3.2", "", { "os": "darwin" }, "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA=="],
 
+    "plist/xmlbuilder": ["xmlbuilder@15.1.1", "", {}, "sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg=="],
+
     "porto/idb-keyval": ["idb-keyval@6.2.2", "", {}, "sha512-yjD9nARJ/jb1g+CvD0tlhUHOrJ9Sy0P8T9MF3YaLlHnSRpwPfpTX0XIvpmw3gAJUmEu3FiICLBDPXVwyEvrleg=="],
 
     "porto/ox": ["ox@0.9.17", "", { "dependencies": { "@adraffy/ens-normalize": "^1.11.0", "@noble/ciphers": "^1.3.0", "@noble/curves": "1.9.1", "@noble/hashes": "^1.8.0", "@scure/bip32": "^1.7.0", "@scure/bip39": "^1.6.0", "abitype": "^1.0.9", "eventemitter3": "5.0.1" }, "peerDependencies": { "typescript": ">=5.4.0" }, "optionalPeers": ["typescript"] }, "sha512-rKAnhzhRU3Xh3hiko+i1ZxywZ55eWQzeS/Q4HRKLx2PqfHOolisZHErSsJVipGlmQKHW5qwOED/GighEw9dbLg=="],
@@ -8293,10 +8441,6 @@
 
     "proxy-addr/ipaddr.js": ["ipaddr.js@1.9.1", "", {}, "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="],
 
-    "proxy-agent/agent-base": ["agent-base@7.1.4", "", {}, "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ=="],
-
-    "proxy-agent/https-proxy-agent": ["https-proxy-agent@7.0.6", "", { "dependencies": { "agent-base": "^7.1.2", "debug": "4" } }, "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw=="],
-
     "proxy-agent/lru-cache": ["lru-cache@7.18.3", "", {}, "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA=="],
 
     "qrcode/pngjs": ["pngjs@5.0.0", "", {}, "sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw=="],
@@ -8333,8 +8477,6 @@
 
     "rimraf/glob": ["glob@7.2.3", "", { "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", "inherits": "2", "minimatch": "^3.1.1", "once": "^1.3.0", "path-is-absolute": "^1.0.0" } }, "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="],
 
-    "ripemd160/hash-base": ["hash-base@3.1.2", "", { "dependencies": { "inherits": "^2.0.4", "readable-stream": "^2.3.8", "safe-buffer": "^5.2.1", "to-buffer": "^1.2.1" } }, "sha512-Bb33KbowVTIj5s7Ked1OsqHUeCpz//tPwR+E2zJgJKo9Z5XolZ9b6bdUgjmYlwnWhoOQKoTd1TYToZGn5mAYOg=="],
-
     "rolldown/@rolldown/pluginutils": ["@rolldown/pluginutils@1.0.0-rc.10", "", {}, "sha512-UkVDEFk1w3mveXeKgaTuYfKWtPbvgck1dT8TUG3bnccrH0XtLTuAyfCoks4Q/M5ZGToSVJTIQYCzy2g/atAOeg=="],
 
     "rpc-websockets/@types/uuid": ["@types/uuid@10.0.0", "", {}, "sha512-7gqG38EyHgyP1S+7+xomFtL+ZNHcKv6DwNaCZmJmo1vgMugyF3TCnXVg4t1uk89mLNwnLtnY3TpOpCOyp1/xHQ=="],
@@ -8365,8 +8507,6 @@
 
     "sockjs/uuid": ["uuid@8.3.2", "", { "bin": { "uuid": "dist/bin/uuid" } }, "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="],
 
-    "socks-proxy-agent/agent-base": ["agent-base@7.1.4", "", {}, "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ=="],
-
     "solhint/@solidity-parser/parser": ["@solidity-parser/parser@0.20.2", "", {}, "sha512-rbu0bzwNvMcwAjH86hiEAcOeRI2EeK8zCkHDrFykh/Al8mvJeFmjy3UrE7GYQjNwOgbGUUtCn5/k8CB8zIu7QA=="],
 
     "solhint/ajv": ["ajv@6.14.0", "", { "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", "json-schema-traverse": "^0.4.1", "uri-js": "^4.2.2" } }, "sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw=="],
@@ -8527,11 +8667,9 @@
 
     "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=="],
 
-    "@anthropic-ai/sdk/@types/node/undici-types": ["undici-types@5.26.5", "", {}, "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="],
-
-    "@anthropic-ai/sdk/formdata-node/web-streams-polyfill": ["web-streams-polyfill@4.0.0-beta.3", "", {}, "sha512-QW95TCTaHmsYfHDybGMwO5IJIM93I/6vTRk+daHTWFPhwh+C8Cg7j7XyKrwrj8Ib6vYXe0ocYNrmzY4xAAN6ug=="],
+    "@ai-sdk/ui-utils/@ai-sdk/provider-utils/nanoid": ["nanoid@3.3.11", "", { "bin": { "nanoid": "bin/nanoid.cjs" } }, "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w=="],
 
-    "@anthropic-ai/sdk/node-fetch/whatwg-url": ["whatwg-url@5.0.0", "", { "dependencies": { "tr46": "~0.0.3", "webidl-conversions": "^3.0.0" } }, "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw=="],
+    "@ai-sdk/ui-utils/@ai-sdk/provider-utils/secure-json-parse": ["secure-json-parse@2.7.0", "", {}, "sha512-6aU+Rwsezw7VR8/nyvKTx8QpWH9FrcYiXXlqC4z5d5XQBDRqtbfsRjnwGyqbi3gddNtWHuEk9OANUotL26qKUw=="],
 
     "@aws-crypto/sha256-browser/@smithy/util-utf8/@smithy/util-buffer-from": ["@smithy/util-buffer-from@2.2.0", "", { "dependencies": { "@smithy/is-array-buffer": "^2.2.0", "tslib": "^2.6.2" } }, "sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA=="],
 
@@ -8587,48 +8725,26 @@
 
     "@coinbase/cdp-sdk/@solana/kit/@solana/transactions": ["@solana/transactions@5.5.1", "", { "dependencies": { "@solana/addresses": "5.5.1", "@solana/codecs-core": "5.5.1", "@solana/codecs-data-structures": "5.5.1", "@solana/codecs-numbers": "5.5.1", "@solana/codecs-strings": "5.5.1", "@solana/errors": "5.5.1", "@solana/functional": "5.5.1", "@solana/instructions": "5.5.1", "@solana/keys": "5.5.1", "@solana/nominal-types": "5.5.1", "@solana/rpc-types": "5.5.1", "@solana/transaction-messages": "5.5.1" }, "peerDependencies": { "typescript": "^5.0.0" }, "optionalPeers": ["typescript"] }, "sha512-8hHtDxtqalZ157pnx6p8k10D7J/KY/biLzfgh9R09VNLLY3Fqi7kJvJCr7M2ik3oRll56pxhraAGCC9yIT6eOA=="],
 
-    "@csstools/postcss-alpha-function/@csstools/css-color-parser/@csstools/color-helpers": ["@csstools/color-helpers@5.1.0", "", {}, "sha512-S11EXWJyy0Mz5SYvRmY8nJYTFFd1LCNV+7cXyAgQtOOuzb4EsgfqDufL+9esx72/eLhsRdGZwaldu/h+E4t4BA=="],
-
     "@csstools/postcss-alpha-function/@csstools/css-color-parser/@csstools/css-calc": ["@csstools/css-calc@2.1.4", "", { "peerDependencies": { "@csstools/css-parser-algorithms": "^3.0.5", "@csstools/css-tokenizer": "^3.0.4" } }, "sha512-3N8oaj+0juUw/1H3YwmDDJXCgTB1gKU6Hc/bB502u9zR0q2vd786XJH9QfrKIEgFlZmhZiq6epXl4rHqhzsIgQ=="],
 
-    "@csstools/postcss-color-function-display-p3-linear/@csstools/css-color-parser/@csstools/color-helpers": ["@csstools/color-helpers@5.1.0", "", {}, "sha512-S11EXWJyy0Mz5SYvRmY8nJYTFFd1LCNV+7cXyAgQtOOuzb4EsgfqDufL+9esx72/eLhsRdGZwaldu/h+E4t4BA=="],
-
     "@csstools/postcss-color-function-display-p3-linear/@csstools/css-color-parser/@csstools/css-calc": ["@csstools/css-calc@2.1.4", "", { "peerDependencies": { "@csstools/css-parser-algorithms": "^3.0.5", "@csstools/css-tokenizer": "^3.0.4" } }, "sha512-3N8oaj+0juUw/1H3YwmDDJXCgTB1gKU6Hc/bB502u9zR0q2vd786XJH9QfrKIEgFlZmhZiq6epXl4rHqhzsIgQ=="],
 
-    "@csstools/postcss-color-function/@csstools/css-color-parser/@csstools/color-helpers": ["@csstools/color-helpers@5.1.0", "", {}, "sha512-S11EXWJyy0Mz5SYvRmY8nJYTFFd1LCNV+7cXyAgQtOOuzb4EsgfqDufL+9esx72/eLhsRdGZwaldu/h+E4t4BA=="],
-
     "@csstools/postcss-color-function/@csstools/css-color-parser/@csstools/css-calc": ["@csstools/css-calc@2.1.4", "", { "peerDependencies": { "@csstools/css-parser-algorithms": "^3.0.5", "@csstools/css-tokenizer": "^3.0.4" } }, "sha512-3N8oaj+0juUw/1H3YwmDDJXCgTB1gKU6Hc/bB502u9zR0q2vd786XJH9QfrKIEgFlZmhZiq6epXl4rHqhzsIgQ=="],
 
-    "@csstools/postcss-color-mix-function/@csstools/css-color-parser/@csstools/color-helpers": ["@csstools/color-helpers@5.1.0", "", {}, "sha512-S11EXWJyy0Mz5SYvRmY8nJYTFFd1LCNV+7cXyAgQtOOuzb4EsgfqDufL+9esx72/eLhsRdGZwaldu/h+E4t4BA=="],
-
     "@csstools/postcss-color-mix-function/@csstools/css-color-parser/@csstools/css-calc": ["@csstools/css-calc@2.1.4", "", { "peerDependencies": { "@csstools/css-parser-algorithms": "^3.0.5", "@csstools/css-tokenizer": "^3.0.4" } }, "sha512-3N8oaj+0juUw/1H3YwmDDJXCgTB1gKU6Hc/bB502u9zR0q2vd786XJH9QfrKIEgFlZmhZiq6epXl4rHqhzsIgQ=="],
 
-    "@csstools/postcss-color-mix-variadic-function-arguments/@csstools/css-color-parser/@csstools/color-helpers": ["@csstools/color-helpers@5.1.0", "", {}, "sha512-S11EXWJyy0Mz5SYvRmY8nJYTFFd1LCNV+7cXyAgQtOOuzb4EsgfqDufL+9esx72/eLhsRdGZwaldu/h+E4t4BA=="],
-
     "@csstools/postcss-color-mix-variadic-function-arguments/@csstools/css-color-parser/@csstools/css-calc": ["@csstools/css-calc@2.1.4", "", { "peerDependencies": { "@csstools/css-parser-algorithms": "^3.0.5", "@csstools/css-tokenizer": "^3.0.4" } }, "sha512-3N8oaj+0juUw/1H3YwmDDJXCgTB1gKU6Hc/bB502u9zR0q2vd786XJH9QfrKIEgFlZmhZiq6epXl4rHqhzsIgQ=="],
 
-    "@csstools/postcss-contrast-color-function/@csstools/css-color-parser/@csstools/color-helpers": ["@csstools/color-helpers@5.1.0", "", {}, "sha512-S11EXWJyy0Mz5SYvRmY8nJYTFFd1LCNV+7cXyAgQtOOuzb4EsgfqDufL+9esx72/eLhsRdGZwaldu/h+E4t4BA=="],
-
     "@csstools/postcss-contrast-color-function/@csstools/css-color-parser/@csstools/css-calc": ["@csstools/css-calc@2.1.4", "", { "peerDependencies": { "@csstools/css-parser-algorithms": "^3.0.5", "@csstools/css-tokenizer": "^3.0.4" } }, "sha512-3N8oaj+0juUw/1H3YwmDDJXCgTB1gKU6Hc/bB502u9zR0q2vd786XJH9QfrKIEgFlZmhZiq6epXl4rHqhzsIgQ=="],
 
-    "@csstools/postcss-gamut-mapping/@csstools/css-color-parser/@csstools/color-helpers": ["@csstools/color-helpers@5.1.0", "", {}, "sha512-S11EXWJyy0Mz5SYvRmY8nJYTFFd1LCNV+7cXyAgQtOOuzb4EsgfqDufL+9esx72/eLhsRdGZwaldu/h+E4t4BA=="],
-
     "@csstools/postcss-gamut-mapping/@csstools/css-color-parser/@csstools/css-calc": ["@csstools/css-calc@2.1.4", "", { "peerDependencies": { "@csstools/css-parser-algorithms": "^3.0.5", "@csstools/css-tokenizer": "^3.0.4" } }, "sha512-3N8oaj+0juUw/1H3YwmDDJXCgTB1gKU6Hc/bB502u9zR0q2vd786XJH9QfrKIEgFlZmhZiq6epXl4rHqhzsIgQ=="],
 
-    "@csstools/postcss-gradients-interpolation-method/@csstools/css-color-parser/@csstools/color-helpers": ["@csstools/color-helpers@5.1.0", "", {}, "sha512-S11EXWJyy0Mz5SYvRmY8nJYTFFd1LCNV+7cXyAgQtOOuzb4EsgfqDufL+9esx72/eLhsRdGZwaldu/h+E4t4BA=="],
-
     "@csstools/postcss-gradients-interpolation-method/@csstools/css-color-parser/@csstools/css-calc": ["@csstools/css-calc@2.1.4", "", { "peerDependencies": { "@csstools/css-parser-algorithms": "^3.0.5", "@csstools/css-tokenizer": "^3.0.4" } }, "sha512-3N8oaj+0juUw/1H3YwmDDJXCgTB1gKU6Hc/bB502u9zR0q2vd786XJH9QfrKIEgFlZmhZiq6epXl4rHqhzsIgQ=="],
 
-    "@csstools/postcss-hwb-function/@csstools/css-color-parser/@csstools/color-helpers": ["@csstools/color-helpers@5.1.0", "", {}, "sha512-S11EXWJyy0Mz5SYvRmY8nJYTFFd1LCNV+7cXyAgQtOOuzb4EsgfqDufL+9esx72/eLhsRdGZwaldu/h+E4t4BA=="],
-
     "@csstools/postcss-hwb-function/@csstools/css-color-parser/@csstools/css-calc": ["@csstools/css-calc@2.1.4", "", { "peerDependencies": { "@csstools/css-parser-algorithms": "^3.0.5", "@csstools/css-tokenizer": "^3.0.4" } }, "sha512-3N8oaj+0juUw/1H3YwmDDJXCgTB1gKU6Hc/bB502u9zR0q2vd786XJH9QfrKIEgFlZmhZiq6epXl4rHqhzsIgQ=="],
 
-    "@csstools/postcss-oklab-function/@csstools/css-color-parser/@csstools/color-helpers": ["@csstools/color-helpers@5.1.0", "", {}, "sha512-S11EXWJyy0Mz5SYvRmY8nJYTFFd1LCNV+7cXyAgQtOOuzb4EsgfqDufL+9esx72/eLhsRdGZwaldu/h+E4t4BA=="],
-
     "@csstools/postcss-oklab-function/@csstools/css-color-parser/@csstools/css-calc": ["@csstools/css-calc@2.1.4", "", { "peerDependencies": { "@csstools/css-parser-algorithms": "^3.0.5", "@csstools/css-tokenizer": "^3.0.4" } }, "sha512-3N8oaj+0juUw/1H3YwmDDJXCgTB1gKU6Hc/bB502u9zR0q2vd786XJH9QfrKIEgFlZmhZiq6epXl4rHqhzsIgQ=="],
 
-    "@csstools/postcss-relative-color-syntax/@csstools/css-color-parser/@csstools/color-helpers": ["@csstools/color-helpers@5.1.0", "", {}, "sha512-S11EXWJyy0Mz5SYvRmY8nJYTFFd1LCNV+7cXyAgQtOOuzb4EsgfqDufL+9esx72/eLhsRdGZwaldu/h+E4t4BA=="],
-
     "@csstools/postcss-relative-color-syntax/@csstools/css-color-parser/@csstools/css-calc": ["@csstools/css-calc@2.1.4", "", { "peerDependencies": { "@csstools/css-parser-algorithms": "^3.0.5", "@csstools/css-tokenizer": "^3.0.4" } }, "sha512-3N8oaj+0juUw/1H3YwmDDJXCgTB1gKU6Hc/bB502u9zR0q2vd786XJH9QfrKIEgFlZmhZiq6epXl4rHqhzsIgQ=="],
 
     "@docusaurus/core/chokidar/glob-parent": ["glob-parent@5.1.2", "", { "dependencies": { "is-glob": "^4.0.1" } }, "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="],
@@ -8653,6 +8769,12 @@
 
     "@donmccurdy/caporal/table/string-width": ["string-width@3.1.0", "", { "dependencies": { "emoji-regex": "^7.0.1", "is-fullwidth-code-point": "^2.0.0", "strip-ansi": "^5.1.0" } }, "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w=="],
 
+    "@elizaos/plugin-ollama/@elizaos/core/@bufbuild/protobuf": ["@bufbuild/protobuf@2.11.0", "", {}, "sha512-sBXGT13cpmPR5BMgHE6UEEfEaShh5Ror6rfN3yEK5si7QVrtZg8LEPQb0VVhiLRUslD2yLnXtnRzG035J/mZXQ=="],
+
+    "@elizaos/plugin-ollama/@elizaos/core/dotenv": ["dotenv@17.3.1", "", {}, "sha512-IO8C/dzEb6O3F9/twg6ZLXz164a2fhTnEWb95H23Dm4OuN+92NmEAlTrupP9VW6Jm3sO26tQlqyvyi4CsnY9GA=="],
+
+    "@elizaos/plugin-ollama/@elizaos/core/drizzle-orm": ["drizzle-orm@0.45.1", "", { "peerDependencies": { "@aws-sdk/client-rds-data": ">=3", "@cloudflare/workers-types": ">=4", "@electric-sql/pglite": ">=0.2.0", "@libsql/client": ">=0.10.0", "@libsql/client-wasm": ">=0.10.0", "@neondatabase/serverless": ">=0.10.0", "@op-engineering/op-sqlite": ">=2", "@opentelemetry/api": "^1.4.1", "@planetscale/database": ">=1.13", "@prisma/client": "*", "@tidbcloud/serverless": "*", "@types/better-sqlite3": "*", "@types/pg": "*", "@types/sql.js": "*", "@upstash/redis": ">=1.34.7", "@vercel/postgres": ">=0.8.0", "@xata.io/client": "*", "better-sqlite3": ">=7", "bun-types": "*", "expo-sqlite": ">=14.0.0", "gel": ">=2", "knex": "*", "kysely": "*", "mysql2": ">=2", "pg": ">=8", "postgres": ">=3", "sql.js": ">=1", "sqlite3": ">=5" }, "optionalPeers": ["@aws-sdk/client-rds-data", "@cloudflare/workers-types", "@electric-sql/pglite", "@libsql/client", "@libsql/client-wasm", "@neondatabase/serverless", "@op-engineering/op-sqlite", "@opentelemetry/api", "@planetscale/database", "@prisma/client", "@tidbcloud/serverless", "@types/better-sqlite3", "@types/pg", "@types/sql.js", "@upstash/redis", "@vercel/postgres", "@xata.io/client", "better-sqlite3", "bun-types", "expo-sqlite", "gel", "knex", "kysely", "mysql2", "pg", "postgres", "sql.js", "sqlite3"] }, "sha512-Te0FOdKIistGNPMq2jscdqngBRfBpC8uMFVwqjf6gtTVJHIQ/dosgV/CLBU2N4ZJBsXL5savCba9b0YJskKdcA=="],
+
     "@fastify/static/glob/jackspeak": ["jackspeak@4.2.3", "", { "dependencies": { "@isaacs/cliui": "^9.0.0" } }, "sha512-ykkVRwrYvFm1nb2AJfKKYPr0emF6IiXDYUaFx4Zn9ZuIH7MrzEZ3sD5RlqGXNRpHtvUHJyOnCEFxOlNDtGo7wg=="],
 
     "@gemini-wallet/core/@metamask/rpc-errors/@metamask/utils": ["@metamask/utils@11.10.0", "", { "dependencies": { "@ethereumjs/tx": "^4.2.0", "@metamask/superstruct": "^3.1.0", "@noble/hashes": "^1.3.1", "@scure/base": "^1.1.3", "@types/debug": "^4.1.7", "@types/lodash": "^4.17.20", "debug": "^4.3.4", "lodash": "^4.17.21", "pony-cause": "^2.1.10", "semver": "^7.5.4", "uuid": "^9.0.1" } }, "sha512-+bWmTOANx1MbBW6RFM8Se4ZoigFYGXiuIrkhjj4XnG5Aez8uWaTSZ76yn9srKKClv+PoEVoAuVtcUOogFEMUNA=="],
@@ -8787,6 +8909,12 @@
 
     "@hyperscape/impostor/vitest/tinyrainbow": ["tinyrainbow@2.0.0", "", {}, "sha512-op4nsTR47R6p0vMUUoYl/a+ljLFVtlfaXkLQmqfLR1qHma1h/ysYk4hEXZ880bf2CYgTskvTa/e196Vd5dDQXw=="],
 
+    "@hyperscape/plugin-hyperscape/@elizaos/core/@bufbuild/protobuf": ["@bufbuild/protobuf@2.11.0", "", {}, "sha512-sBXGT13cpmPR5BMgHE6UEEfEaShh5Ror6rfN3yEK5si7QVrtZg8LEPQb0VVhiLRUslD2yLnXtnRzG035J/mZXQ=="],
+
+    "@hyperscape/plugin-hyperscape/@elizaos/core/dotenv": ["dotenv@17.3.1", "", {}, "sha512-IO8C/dzEb6O3F9/twg6ZLXz164a2fhTnEWb95H23Dm4OuN+92NmEAlTrupP9VW6Jm3sO26tQlqyvyi4CsnY9GA=="],
+
+    "@hyperscape/plugin-hyperscape/@elizaos/core/drizzle-orm": ["drizzle-orm@0.45.1", "", { "peerDependencies": { "@aws-sdk/client-rds-data": ">=3", "@cloudflare/workers-types": ">=4", "@electric-sql/pglite": ">=0.2.0", "@libsql/client": ">=0.10.0", "@libsql/client-wasm": ">=0.10.0", "@neondatabase/serverless": ">=0.10.0", "@op-engineering/op-sqlite": ">=2", "@opentelemetry/api": "^1.4.1", "@planetscale/database": ">=1.13", "@prisma/client": "*", "@tidbcloud/serverless": "*", "@types/better-sqlite3": "*", "@types/pg": "*", "@types/sql.js": "*", "@upstash/redis": ">=1.34.7", "@vercel/postgres": ">=0.8.0", "@xata.io/client": "*", "better-sqlite3": ">=7", "bun-types": "*", "expo-sqlite": ">=14.0.0", "gel": ">=2", "knex": "*", "kysely": "*", "mysql2": ">=2", "pg": ">=8", "postgres": ">=3", "sql.js": ">=1", "sqlite3": ">=5" }, "optionalPeers": ["@aws-sdk/client-rds-data", "@cloudflare/workers-types", "@electric-sql/pglite", "@libsql/client", "@libsql/client-wasm", "@neondatabase/serverless", "@op-engineering/op-sqlite", "@opentelemetry/api", "@planetscale/database", "@prisma/client", "@tidbcloud/serverless", "@types/better-sqlite3", "@types/pg", "@types/sql.js", "@upstash/redis", "@vercel/postgres", "@xata.io/client", "better-sqlite3", "bun-types", "expo-sqlite", "gel", "knex", "kysely", "mysql2", "pg", "postgres", "sql.js", "sqlite3"] }, "sha512-Te0FOdKIistGNPMq2jscdqngBRfBpC8uMFVwqjf6gtTVJHIQ/dosgV/CLBU2N4ZJBsXL5savCba9b0YJskKdcA=="],
+
     "@hyperscape/plugin-hyperscape/vitest/@vitest/expect": ["@vitest/expect@4.1.0", "", { "dependencies": { "@standard-schema/spec": "^1.1.0", "@types/chai": "^5.2.2", "@vitest/spy": "4.1.0", "@vitest/utils": "4.1.0", "chai": "^6.2.2", "tinyrainbow": "^3.0.3" } }, "sha512-EIxG7k4wlWweuCLG9Y5InKFwpMEOyrMb6ZJ1ihYu02LVj/bzUwn2VMU+13PinsjRW75XnITeFrQBMH5+dLvCDA=="],
 
     "@hyperscape/plugin-hyperscape/vitest/@vitest/mocker": ["@vitest/mocker@4.1.0", "", { "dependencies": { "@vitest/spy": "4.1.0", "estree-walker": "^3.0.3", "magic-string": "^0.30.21" }, "peerDependencies": { "msw": "^2.4.9", "vite": "^6.0.0 || ^7.0.0 || ^8.0.0-0" }, "optionalPeers": ["msw", "vite"] }, "sha512-evxREh+Hork43+Y4IOhTo+h5lGmVRyjqI739Rz4RlUPqwrkFFDF6EMvOOYjTx4E8Tl6gyCLRL8Mu7Ry12a13Tw=="],
@@ -8823,6 +8951,10 @@
 
     "@hyperscape/procgen/vitest/std-env": ["std-env@4.0.0", "", {}, "sha512-zUMPtQ/HBY3/50VbpkupYHbRroTRZJPRLvreamgErJVys0ceuzMkD44J/QjqhHjOzK42GQ3QZIeFG1OYfOtKqQ=="],
 
+    "@hyperscape/server/@elizaos/core/@bufbuild/protobuf": ["@bufbuild/protobuf@2.11.0", "", {}, "sha512-sBXGT13cpmPR5BMgHE6UEEfEaShh5Ror6rfN3yEK5si7QVrtZg8LEPQb0VVhiLRUslD2yLnXtnRzG035J/mZXQ=="],
+
+    "@hyperscape/server/@elizaos/core/drizzle-orm": ["drizzle-orm@0.45.1", "", { "peerDependencies": { "@aws-sdk/client-rds-data": ">=3", "@cloudflare/workers-types": ">=4", "@electric-sql/pglite": ">=0.2.0", "@libsql/client": ">=0.10.0", "@libsql/client-wasm": ">=0.10.0", "@neondatabase/serverless": ">=0.10.0", "@op-engineering/op-sqlite": ">=2", "@opentelemetry/api": "^1.4.1", "@planetscale/database": ">=1.13", "@prisma/client": "*", "@tidbcloud/serverless": "*", "@types/better-sqlite3": "*", "@types/pg": "*", "@types/sql.js": "*", "@upstash/redis": ">=1.34.7", "@vercel/postgres": ">=0.8.0", "@xata.io/client": "*", "better-sqlite3": ">=7", "bun-types": "*", "expo-sqlite": ">=14.0.0", "gel": ">=2", "knex": "*", "kysely": "*", "mysql2": ">=2", "pg": ">=8", "postgres": ">=3", "sql.js": ">=1", "sqlite3": ">=5" }, "optionalPeers": ["@aws-sdk/client-rds-data", "@cloudflare/workers-types", "@electric-sql/pglite", "@libsql/client", "@libsql/client-wasm", "@neondatabase/serverless", "@op-engineering/op-sqlite", "@opentelemetry/api", "@planetscale/database", "@prisma/client", "@tidbcloud/serverless", "@types/better-sqlite3", "@types/pg", "@types/sql.js", "@upstash/redis", "@vercel/postgres", "@xata.io/client", "better-sqlite3", "bun-types", "expo-sqlite", "gel", "knex", "kysely", "mysql2", "pg", "postgres", "sql.js", "sqlite3"] }, "sha512-Te0FOdKIistGNPMq2jscdqngBRfBpC8uMFVwqjf6gtTVJHIQ/dosgV/CLBU2N4ZJBsXL5savCba9b0YJskKdcA=="],
+
     "@hyperscape/server/@vitest/coverage-v8/@vitest/utils": ["@vitest/utils@4.1.0", "", { "dependencies": { "@vitest/pretty-format": "4.1.0", "convert-source-map": "^2.0.0", "tinyrainbow": "^3.0.3" } }, "sha512-XfPXT6a8TZY3dcGY8EdwsBulFCIw+BeeX0RZn2x/BtiY/75YGh8FeWGG8QISN/WhaqSrE2OrlDgtF8q5uhOTmw=="],
 
     "@hyperscape/server/@vitest/coverage-v8/ast-v8-to-istanbul": ["ast-v8-to-istanbul@1.0.0", "", { "dependencies": { "@jridgewell/trace-mapping": "^0.3.31", "estree-walker": "^3.0.3", "js-tokens": "^10.0.0" } }, "sha512-1fSfIwuDICFA4LKkCzRPO7F0hzFf0B7+Xqrl27ynQaa+Rh0e1Es0v6kWHPott3lU10AyAr7oKHa65OppjLn3Rg=="],
@@ -9017,8 +9149,6 @@
 
     "@metamask/sdk/debug/ms": ["ms@2.1.2", "", {}, "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="],
 
-    "@microsoft/api-extractor/semver/lru-cache": ["lru-cache@6.0.0", "", { "dependencies": { "yallist": "^4.0.0" } }, "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="],
-
     "@neondatabase/serverless/@types/node/undici-types": ["undici-types@6.21.0", "", {}, "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ=="],
 
     "@next/eslint-plugin-next/fast-glob/glob-parent": ["glob-parent@5.1.2", "", { "dependencies": { "is-glob": "^4.0.1" } }, "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="],
@@ -9083,8 +9213,6 @@
 
     "@rollup/plugin-replace/@rollup/pluginutils/picomatch": ["picomatch@2.3.1", "", {}, "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="],
 
-    "@rushstack/node-core-library/semver/lru-cache": ["lru-cache@6.0.0", "", { "dependencies": { "yallist": "^4.0.0" } }, "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="],
-
     "@scalar/themes/@scalar/types/@scalar/openapi-types": ["@scalar/openapi-types@0.2.0", "", { "dependencies": { "zod": "^3.23.8" } }, "sha512-waiKk12cRCqyUCWTOX0K1WEVX46+hVUK+zRPzAahDJ7G0TApvbNkuy5wx7aoUyEk++HHde0XuQnshXnt8jsddA=="],
 
     "@scalar/themes/@scalar/types/zod": ["zod@3.23.8", "", {}, "sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g=="],
@@ -9403,12 +9531,6 @@
 
     "borsh/bs58/base-x": ["base-x@3.0.11", "", { "dependencies": { "safe-buffer": "^5.0.1" } }, "sha512-xz7wQ8xDhdyP7tQxwdteLYeFfS68tSMNCZ/Y37WJ4bhGfKPpqEIlmIyueQHqOyoPhE6xNUqjzRr8ra0eF9VRvA=="],
 
-    "browserify-sign/readable-stream/isarray": ["isarray@1.0.0", "", {}, "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="],
-
-    "browserify-sign/readable-stream/safe-buffer": ["safe-buffer@5.1.2", "", {}, "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="],
-
-    "browserify-sign/readable-stream/string_decoder": ["string_decoder@1.1.1", "", { "dependencies": { "safe-buffer": "~5.1.0" } }, "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="],
-
     "cheerio/parse5/entities": ["entities@6.0.1", "", {}, "sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g=="],
 
     "cli-table3/string-width/emoji-regex": ["emoji-regex@8.0.0", "", {}, "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="],
@@ -9467,6 +9589,8 @@
 
     "express/debug/ms": ["ms@2.0.0", "", {}, "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="],
 
+    "ffmpeg-static/https-proxy-agent/agent-base": ["agent-base@6.0.2", "", { "dependencies": { "debug": "4" } }, "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ=="],
+
     "file-loader/schema-utils/ajv": ["ajv@6.14.0", "", { "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", "json-schema-traverse": "^0.4.1", "uri-js": "^4.2.2" } }, "sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw=="],
 
     "file-loader/schema-utils/ajv-keywords": ["ajv-keywords@3.5.2", "", { "peerDependencies": { "ajv": "^6.9.1" } }, "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ=="],
@@ -9531,6 +9655,12 @@
 
     "jest-util/@jest/types/@jest/schemas": ["@jest/schemas@29.6.3", "", { "dependencies": { "@sinclair/typebox": "^0.27.8" } }, "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA=="],
 
+    "jszip/readable-stream/isarray": ["isarray@1.0.0", "", {}, "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="],
+
+    "jszip/readable-stream/safe-buffer": ["safe-buffer@5.1.2", "", {}, "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="],
+
+    "jszip/readable-stream/string_decoder": ["string_decoder@1.1.1", "", { "dependencies": { "safe-buffer": "~5.1.0" } }, "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="],
+
     "knex/debug/ms": ["ms@2.1.2", "", {}, "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="],
 
     "langsmith/p-queue/eventemitter3": ["eventemitter3@4.0.7", "", {}, "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="],
@@ -9565,8 +9695,6 @@
 
     "metro-babel-transformer/hermes-parser/hermes-estree": ["hermes-estree@0.33.3", "", {}, "sha512-6kzYZHCk8Fy1Uc+t3HGYyJn3OL4aeqKLTyina4UFtWl8I0kSL7OmKThaiX+Uh2f8nGw3mo4Ifxg0M5Zk3/Oeqg=="],
 
-    "metro-cache/https-proxy-agent/agent-base": ["agent-base@7.1.4", "", {}, "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ=="],
-
     "metro-config/jest-validate/@jest/types": ["@jest/types@29.6.3", "", { "dependencies": { "@jest/schemas": "^29.6.3", "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^3.0.0", "@types/node": "*", "@types/yargs": "^17.0.8", "chalk": "^4.0.0" } }, "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw=="],
 
     "metro-config/jest-validate/pretty-format": ["pretty-format@29.7.0", "", { "dependencies": { "@jest/schemas": "^29.6.3", "ansi-styles": "^5.0.0", "react-is": "^18.0.0" } }, "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ=="],
@@ -9669,6 +9797,12 @@
 
     "obj-multiplex/readable-stream/string_decoder": ["string_decoder@1.1.1", "", { "dependencies": { "safe-buffer": "~5.1.0" } }, "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="],
 
+    "ollama-ai-provider/@ai-sdk/provider-utils/nanoid": ["nanoid@3.3.11", "", { "bin": { "nanoid": "bin/nanoid.cjs" } }, "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w=="],
+
+    "ollama-ai-provider/@ai-sdk/provider-utils/secure-json-parse": ["secure-json-parse@2.7.0", "", {}, "sha512-6aU+Rwsezw7VR8/nyvKTx8QpWH9FrcYiXXlqC4z5d5XQBDRqtbfsRjnwGyqbi3gddNtWHuEk9OANUotL26qKUw=="],
+
+    "ollama-ai-provider/@ai-sdk/provider-utils/zod": ["zod@3.25.76", "", {}, "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ=="],
+
     "p-locate/p-limit/yocto-queue": ["yocto-queue@0.1.0", "", {}, "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="],
 
     "parse-bmfont-xml/xml2js/xmlbuilder": ["xmlbuilder@11.0.1", "", {}, "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA=="],
@@ -9683,16 +9817,14 @@
 
     "porto/ox/@adraffy/ens-normalize": ["@adraffy/ens-normalize@1.11.1", "", {}, "sha512-nhCBV3quEgesuf7c7KYfperqSS14T8bYuvJ8PcLJp6znkZpFc0AuW4qBtr8eKVyPPe/8RSr7sglCWPU5eaxwKQ=="],
 
+    "porto/ox/@noble/ciphers": ["@noble/ciphers@1.3.0", "", {}, "sha512-2I0gnIVPtfnMw9ee9h1dJG7tp81+8Ob3OJb3Mv37rx5L40/b0i7djjCVvGOVqc9AEIQyvyu1i6ypKdFw8R8gQw=="],
+
     "porto/ox/@noble/curves": ["@noble/curves@1.9.1", "", { "dependencies": { "@noble/hashes": "1.8.0" } }, "sha512-k11yZxZg+t+gWvBbIswW0yoJlu8cHOC7dhunwOzoWH/mXGBiYyR4YY6hAEK/3EUs4UpB8la1RfdRpeGsFHkWsA=="],
 
     "porto/ox/eventemitter3": ["eventemitter3@5.0.1", "", {}, "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA=="],
 
-    "postcss-color-functional-notation/@csstools/css-color-parser/@csstools/color-helpers": ["@csstools/color-helpers@5.1.0", "", {}, "sha512-S11EXWJyy0Mz5SYvRmY8nJYTFFd1LCNV+7cXyAgQtOOuzb4EsgfqDufL+9esx72/eLhsRdGZwaldu/h+E4t4BA=="],
-
     "postcss-color-functional-notation/@csstools/css-color-parser/@csstools/css-calc": ["@csstools/css-calc@2.1.4", "", { "peerDependencies": { "@csstools/css-parser-algorithms": "^3.0.5", "@csstools/css-tokenizer": "^3.0.4" } }, "sha512-3N8oaj+0juUw/1H3YwmDDJXCgTB1gKU6Hc/bB502u9zR0q2vd786XJH9QfrKIEgFlZmhZiq6epXl4rHqhzsIgQ=="],
 
-    "postcss-lab-function/@csstools/css-color-parser/@csstools/color-helpers": ["@csstools/color-helpers@5.1.0", "", {}, "sha512-S11EXWJyy0Mz5SYvRmY8nJYTFFd1LCNV+7cXyAgQtOOuzb4EsgfqDufL+9esx72/eLhsRdGZwaldu/h+E4t4BA=="],
-
     "postcss-lab-function/@csstools/css-color-parser/@csstools/css-calc": ["@csstools/css-calc@2.1.4", "", { "peerDependencies": { "@csstools/css-parser-algorithms": "^3.0.5", "@csstools/css-tokenizer": "^3.0.4" } }, "sha512-3N8oaj+0juUw/1H3YwmDDJXCgTB1gKU6Hc/bB502u9zR0q2vd786XJH9QfrKIEgFlZmhZiq6epXl4rHqhzsIgQ=="],
 
     "postcss-loader/cosmiconfig/js-yaml": ["js-yaml@4.1.1", "", { "dependencies": { "argparse": "^2.0.1" }, "bin": { "js-yaml": "bin/js-yaml.js" } }, "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA=="],
@@ -9725,8 +9857,6 @@
 
     "renderkid/htmlparser2/entities": ["entities@2.2.0", "", {}, "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="],
 
-    "ripemd160/hash-base/readable-stream": ["readable-stream@2.3.8", "", { "dependencies": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", "isarray": "~1.0.0", "process-nextick-args": "~2.0.0", "safe-buffer": "~5.1.1", "string_decoder": "~1.1.1", "util-deprecate": "~1.0.1" } }, "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA=="],
-
     "send/debug/ms": ["ms@2.0.0", "", {}, "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="],
 
     "serve-index/debug/ms": ["ms@2.0.0", "", {}, "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="],
@@ -9775,6 +9905,8 @@
 
     "viem/ox/@adraffy/ens-normalize": ["@adraffy/ens-normalize@1.11.1", "", {}, "sha512-nhCBV3quEgesuf7c7KYfperqSS14T8bYuvJ8PcLJp6znkZpFc0AuW4qBtr8eKVyPPe/8RSr7sglCWPU5eaxwKQ=="],
 
+    "viem/ox/@noble/ciphers": ["@noble/ciphers@1.3.0", "", {}, "sha512-2I0gnIVPtfnMw9ee9h1dJG7tp81+8Ob3OJb3Mv37rx5L40/b0i7djjCVvGOVqc9AEIQyvyu1i6ypKdFw8R8gQw=="],
+
     "viem/ox/eventemitter3": ["eventemitter3@5.0.1", "", {}, "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA=="],
 
     "webpack-dev-server/chokidar/glob-parent": ["glob-parent@5.1.2", "", { "dependencies": { "is-glob": "^4.0.1" } }, "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="],
@@ -9863,10 +9995,6 @@
 
     "yargs/string-width/emoji-regex": ["emoji-regex@8.0.0", "", {}, "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="],
 
-    "@anthropic-ai/sdk/node-fetch/whatwg-url/tr46": ["tr46@0.0.3", "", {}, "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="],
-
-    "@anthropic-ai/sdk/node-fetch/whatwg-url/webidl-conversions": ["webidl-conversions@3.0.1", "", {}, "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="],
-
     "@aws-crypto/sha256-browser/@smithy/util-utf8/@smithy/util-buffer-from/@smithy/is-array-buffer": ["@smithy/is-array-buffer@2.2.0", "", { "dependencies": { "tslib": "^2.6.2" } }, "sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA=="],
 
     "@aws-crypto/util/@smithy/util-utf8/@smithy/util-buffer-from/@smithy/is-array-buffer": ["@smithy/is-array-buffer@2.2.0", "", { "dependencies": { "tslib": "^2.6.2" } }, "sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA=="],
@@ -10039,6 +10167,8 @@
 
     "@latticexyz/cli/viem/ox/@adraffy/ens-normalize": ["@adraffy/ens-normalize@1.11.1", "", {}, "sha512-nhCBV3quEgesuf7c7KYfperqSS14T8bYuvJ8PcLJp6znkZpFc0AuW4qBtr8eKVyPPe/8RSr7sglCWPU5eaxwKQ=="],
 
+    "@latticexyz/cli/viem/ox/@noble/ciphers": ["@noble/ciphers@1.3.0", "", {}, "sha512-2I0gnIVPtfnMw9ee9h1dJG7tp81+8Ob3OJb3Mv37rx5L40/b0i7djjCVvGOVqc9AEIQyvyu1i6ypKdFw8R8gQw=="],
+
     "@latticexyz/cli/viem/ox/@noble/curves": ["@noble/curves@1.9.7", "", { "dependencies": { "@noble/hashes": "1.8.0" } }, "sha512-gbKGcRUYIjA3/zCCNaWDciTMFI0dCkvou3TL8Zmy5Nc7sJ47a0jtOeZoTaMxkuqRo9cRhjOdZJXegxYE5FN/xw=="],
 
     "@latticexyz/cli/viem/ox/abitype": ["abitype@1.2.3", "", { "peerDependencies": { "typescript": ">=5.0.4", "zod": "^3.22.0 || ^4.0.0" }, "optionalPeers": ["typescript", "zod"] }, "sha512-Ofer5QUnuUdTFsBRwARMoWKOH1ND5ehwYhJ3OJ/BQO+StkwQjHw0XyVh4vDttzHB7QOFhPHa/o413PJ82gU/Tg=="],
@@ -10061,6 +10191,8 @@
 
     "@reown/appkit-controllers/@walletconnect/universal-provider/@walletconnect/sign-client/@walletconnect/core": ["@walletconnect/core@2.21.9", "", { "dependencies": { "@walletconnect/heartbeat": "1.2.2", "@walletconnect/jsonrpc-provider": "1.0.14", "@walletconnect/jsonrpc-types": "1.0.4", "@walletconnect/jsonrpc-utils": "1.0.8", "@walletconnect/jsonrpc-ws-connection": "1.0.16", "@walletconnect/keyvaluestorage": "1.1.1", "@walletconnect/logger": "2.1.2", "@walletconnect/relay-api": "1.0.11", "@walletconnect/relay-auth": "1.1.0", "@walletconnect/safe-json": "1.0.2", "@walletconnect/time": "1.0.2", "@walletconnect/types": "2.21.9", "@walletconnect/utils": "2.21.9", "@walletconnect/window-getters": "1.0.1", "es-toolkit": "1.39.3", "events": "3.3.0", "uint8arrays": "3.1.1" } }, "sha512-SlSknLvbO4i9Y4y8zU0zeCuJv1klQIUX3HRSBs1BaYvQKVVkrdiWPgRj4jcrL2wEOINa9NXw6HXp6x5XCXOolA=="],
 
+    "@reown/appkit-controllers/@walletconnect/universal-provider/@walletconnect/utils/@noble/ciphers": ["@noble/ciphers@1.3.0", "", {}, "sha512-2I0gnIVPtfnMw9ee9h1dJG7tp81+8Ob3OJb3Mv37rx5L40/b0i7djjCVvGOVqc9AEIQyvyu1i6ypKdFw8R8gQw=="],
+
     "@reown/appkit-controllers/@walletconnect/universal-provider/@walletconnect/utils/viem": ["viem@2.36.0", "", { "dependencies": { "@noble/curves": "1.9.6", "@noble/hashes": "1.8.0", "@scure/bip32": "1.7.0", "@scure/bip39": "1.6.0", "abitype": "1.0.8", "isows": "1.0.7", "ox": "0.9.1", "ws": "8.18.3" }, "peerDependencies": { "typescript": ">=5.0.4" }, "optionalPeers": ["typescript"] }, "sha512-Xz7AkGtR43K+NY74X2lBevwfRrsXuifGUzt8QiULO47NXIcT7g3jcA4nIvl5m2OTE5v8SlzishwXmg64xOIVmQ=="],
 
     "@reown/appkit-ui/qrcode/yargs/cliui": ["cliui@6.0.0", "", { "dependencies": { "string-width": "^4.2.0", "strip-ansi": "^6.0.0", "wrap-ansi": "^6.2.0" } }, "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ=="],
@@ -10089,6 +10221,8 @@
 
     "@reown/appkit-utils/@walletconnect/universal-provider/@walletconnect/sign-client/@walletconnect/core": ["@walletconnect/core@2.21.9", "", { "dependencies": { "@walletconnect/heartbeat": "1.2.2", "@walletconnect/jsonrpc-provider": "1.0.14", "@walletconnect/jsonrpc-types": "1.0.4", "@walletconnect/jsonrpc-utils": "1.0.8", "@walletconnect/jsonrpc-ws-connection": "1.0.16", "@walletconnect/keyvaluestorage": "1.1.1", "@walletconnect/logger": "2.1.2", "@walletconnect/relay-api": "1.0.11", "@walletconnect/relay-auth": "1.1.0", "@walletconnect/safe-json": "1.0.2", "@walletconnect/time": "1.0.2", "@walletconnect/types": "2.21.9", "@walletconnect/utils": "2.21.9", "@walletconnect/window-getters": "1.0.1", "es-toolkit": "1.39.3", "events": "3.3.0", "uint8arrays": "3.1.1" } }, "sha512-SlSknLvbO4i9Y4y8zU0zeCuJv1klQIUX3HRSBs1BaYvQKVVkrdiWPgRj4jcrL2wEOINa9NXw6HXp6x5XCXOolA=="],
 
+    "@reown/appkit-utils/@walletconnect/universal-provider/@walletconnect/utils/@noble/ciphers": ["@noble/ciphers@1.3.0", "", {}, "sha512-2I0gnIVPtfnMw9ee9h1dJG7tp81+8Ob3OJb3Mv37rx5L40/b0i7djjCVvGOVqc9AEIQyvyu1i6ypKdFw8R8gQw=="],
+
     "@reown/appkit-utils/@walletconnect/universal-provider/@walletconnect/utils/viem": ["viem@2.36.0", "", { "dependencies": { "@noble/curves": "1.9.6", "@noble/hashes": "1.8.0", "@scure/bip32": "1.7.0", "@scure/bip39": "1.6.0", "abitype": "1.0.8", "isows": "1.0.7", "ox": "0.9.1", "ws": "8.18.3" }, "peerDependencies": { "typescript": ">=5.0.4" }, "optionalPeers": ["typescript"] }, "sha512-Xz7AkGtR43K+NY74X2lBevwfRrsXuifGUzt8QiULO47NXIcT7g3jcA4nIvl5m2OTE5v8SlzishwXmg64xOIVmQ=="],
 
     "@reown/appkit-wallet/@walletconnect/logger/pino/on-exit-leak-free": ["on-exit-leak-free@0.2.0", "", {}, "sha512-dqaz3u44QbRXQooZLTUKU41ZrzYrcvLISVgbrzbyCMxpmSLJvZ3ZamIJIZ29P6OhZIkNIQKosdeM6t1LYbA9hg=="],
@@ -10109,6 +10243,8 @@
 
     "@reown/appkit/@walletconnect/universal-provider/@walletconnect/sign-client/@walletconnect/core": ["@walletconnect/core@2.21.9", "", { "dependencies": { "@walletconnect/heartbeat": "1.2.2", "@walletconnect/jsonrpc-provider": "1.0.14", "@walletconnect/jsonrpc-types": "1.0.4", "@walletconnect/jsonrpc-utils": "1.0.8", "@walletconnect/jsonrpc-ws-connection": "1.0.16", "@walletconnect/keyvaluestorage": "1.1.1", "@walletconnect/logger": "2.1.2", "@walletconnect/relay-api": "1.0.11", "@walletconnect/relay-auth": "1.1.0", "@walletconnect/safe-json": "1.0.2", "@walletconnect/time": "1.0.2", "@walletconnect/types": "2.21.9", "@walletconnect/utils": "2.21.9", "@walletconnect/window-getters": "1.0.1", "es-toolkit": "1.39.3", "events": "3.3.0", "uint8arrays": "3.1.1" } }, "sha512-SlSknLvbO4i9Y4y8zU0zeCuJv1klQIUX3HRSBs1BaYvQKVVkrdiWPgRj4jcrL2wEOINa9NXw6HXp6x5XCXOolA=="],
 
+    "@reown/appkit/@walletconnect/universal-provider/@walletconnect/utils/@noble/ciphers": ["@noble/ciphers@1.3.0", "", {}, "sha512-2I0gnIVPtfnMw9ee9h1dJG7tp81+8Ob3OJb3Mv37rx5L40/b0i7djjCVvGOVqc9AEIQyvyu1i6ypKdFw8R8gQw=="],
+
     "@reown/appkit/@walletconnect/universal-provider/@walletconnect/utils/viem": ["viem@2.36.0", "", { "dependencies": { "@noble/curves": "1.9.6", "@noble/hashes": "1.8.0", "@scure/bip32": "1.7.0", "@scure/bip39": "1.6.0", "abitype": "1.0.8", "isows": "1.0.7", "ox": "0.9.1", "ws": "8.18.3" }, "peerDependencies": { "typescript": ">=5.0.4" }, "optionalPeers": ["typescript"] }, "sha512-Xz7AkGtR43K+NY74X2lBevwfRrsXuifGUzt8QiULO47NXIcT7g3jcA4nIvl5m2OTE5v8SlzishwXmg64xOIVmQ=="],
 
     "@so-ric/colorspace/color/color-convert/color-name": ["color-name@2.1.0", "", {}, "sha512-1bPaDNFm0axzE4MEAzKPuqKWeRaT43U/hyxKPBdqTfmPF+d6n7FSoTFxLVULUJOmiLp01KjhIPPH+HrXZJN4Rg=="],
@@ -10769,12 +10905,6 @@
 
     "renderkid/htmlparser2/domutils/dom-serializer": ["dom-serializer@1.4.1", "", { "dependencies": { "domelementtype": "^2.0.1", "domhandler": "^4.2.0", "entities": "^2.0.0" } }, "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag=="],
 
-    "ripemd160/hash-base/readable-stream/isarray": ["isarray@1.0.0", "", {}, "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="],
-
-    "ripemd160/hash-base/readable-stream/safe-buffer": ["safe-buffer@5.1.2", "", {}, "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="],
-
-    "ripemd160/hash-base/readable-stream/string_decoder": ["string_decoder@1.1.1", "", { "dependencies": { "safe-buffer": "~5.1.0" } }, "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="],
-
     "url-loader/schema-utils/ajv/json-schema-traverse": ["json-schema-traverse@0.4.1", "", {}, "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="],
 
     "webpackbar/wrap-ansi/string-width/emoji-regex": ["emoji-regex@8.0.0", "", {}, "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="],
diff --git a/docs/duel-stack.md b/docs/duel-stack.md
index 161668cde..10c84200d 100644
--- a/docs/duel-stack.md
+++ b/docs/duel-stack.md
@@ -1,103 +1,240 @@
-# Duel Stack (`bun run duel`)
+# Duel Stack
+
+This document is the authoritative streaming model for the duel arena stack on
+`enoomian` personal staging and the basis for the canonical production path.
+
+## Source Of Truth
+
+Hyperscapes owns duel truth across three layers:
+
+1. simulation truth
+   - duel lifecycle
+   - fighter state
+   - result data
+2. renderer truth
+   - stream-page readiness
+   - render tick freshness
+   - visual change freshness
+   - capture and encoder cadence
+3. broadcast truth
+   - channel identity
+   - destination roles
+   - canonical public readiness
+   - fallback readiness
+   - mirror isolation
+
+Hyperbet does not invent a second broadcast model. It consumes the additive
+session/feed contract that Hyperscapes publishes.
+
+## Runtime Topology
+
+- Cloudflare Pages hosts the public `/stream` page.
+- `/stream` is a dedicated capture preset, not a generic spectator client.
+- The stream preset keeps the duel camera path and combat/world SFX, but strips
+  non-essential client systems that do not improve viewer output.
+- The GPU host runs the dedicated source worker service (`hyperscape-stream-source`)
+  for browser capture and FFmpeg encode.
+- The duel API/control-plane service (`hyperscape-duel-api`) runs the duel stack
+  without capture ownership unless `DUEL_OWNS_STREAM_CAPTURE=true` is set
+  explicitly for local ownership mode.
+- Railway hosts the Hyperscapes API and control plane.
+- The transport plane fans out one encoded stream to multiple independent
+  destinations using the existing FFmpeg tee architecture.
+- Self-hosted HLS remains available on the GPU host for smoke, fallback, and
+  diagnostics.
+- Provider selection is environment-driven rather than hard-wired:
+  `self_hls` can be canonical while Cloudflare remains a warm fallback or
+  research rail.
+- Twitch, Kick, YouTube, and custom restream outputs are mirrors.
+
+Railway is not the renderer of record for personal staging. The channel is
+always on; duel transitions update the content carried by the channel rather
+than restarting the broadcast identity.
+
+## Channel Contract
+
+Each emitted session/feed frame carries a server-authored channel snapshot:
+
+- `channel.id`
+- `channel.mode`
+- `channel.presentationDelayMs`
+- `channel.activeDuelId`
+- `channel.activeDuelKey`
+- `channel.canonicalDestinationId`
+- `channel.fallbackDestinationId`
+- `channel.destinations[]`
+- `channel.publicPlaybackUrl`
+- `channel.publicReadiness`
+
+Each destination entry carries:
+
+- `id`
+- `name`
+- `role`
+- `provider`
+- `transport`
+- `playbackUrl`
+- `ingestUrl`
+- `connected`
+- `transportHealthy`
+- `playbackReady`
+- `manifestStatus`
+- `lastError`
+- `updatedAt`
+
+The channel contract is authoritative. Keepers and frontends relay and consume
+it; they do not reconstruct equivalent state from local env vars.
+
+## Destination Roles
+
+- `canonical`
+  - the only destination that controls betting-page public readiness
+  - Cloudflare on `enoomian/staging`, with operator-only failover outside the bettor path
+- `fallback`
+  - warm standby rail tracked independently from canonical truth
+  - promoted only by an explicit authority/operator path, never by the browser
+- `mirror`
+  - downstream promotional outputs
+  - Twitch, Kick, YouTube, custom
+
+Mirror failures must not change canonical public readiness. Fallback is tracked
+independently and is not promoted automatically by the browser.
+
+## Delivery Configuration
+
+The runtime remains provider-neutral, but delivery config is now a bootstrap
+helper for the source server and bridge, not a canonical truth surface.
+
+Relevant bootstrap envs include:
+
+- `STREAM_DELIVERY_MODE`
+- `STREAM_DELIVERY_PROVIDER`
+- `STREAM_CANONICAL_PROVIDER_PRIORITY`
+- `STREAM_FAILBACK_SOAK_MS`
+- `STREAM_INGEST_*`
+- `STREAM_PLAYBACK_*`
+- `STREAM_EXTERNAL_DELIVERY_PROVIDER`
+- `STREAM_EXTERNAL_PLAYBACK_HLS_URL`
+- `STREAM_EXTERNAL_PLAYBACK_LLHLS_URL`
+- `STREAM_EXTERNAL_INGEST_RTMPS_URL`
+- `STREAM_CLOUDFLARE_PROBE_ONLY`
+- `DUEL_OWNS_STREAM_CAPTURE=true` for explicit local integrated-mode capture
+  ownership only
+
+Those envs define destination bootstrapping on the source server. They are not
+for keepers or frontends to use when deciding whether canonical betting
+playback is healthy.
+
+## Renderer Health Model
+
+The stream page publishes a heartbeat and the capture pipeline persists richer
+status snapshots. Health is phase-aware:
+
+- `IDLE`, `OPEN`, `LOCKED`
+  - require fresh render tick and fresh delivery/manifests
+- `FIGHT`, `RESOLUTION`
+  - also require recent visual change
+  - also require acceptable capture and encoder cadence
+
+Current degraded reasons include:
+
+- `render_tick_stale`
+- `visual_change_stale`
+- `capture_fps_low`
+- `encoder_fps_low`
+- `manifest_stale`
+- `asset_origin_incomplete`
+
+Renderer health and broadcast readiness are related but not identical. A
+healthy renderer with an unhealthy canonical destination is a distribution-plane
+incident, not a simulation or renderer incident.
+
+## Canonical Public Readiness
+
+Canonical betting readiness is derived only from the canonical destination.
+
+For external-delivery canonical providers such as Cloudflare, readiness
+requires both:
+
+- healthy bridge transport to the canonical destination
+- a positive public playback probe against the canonical playback manifest
+
+For self-hosted HLS canonical delivery, readiness depends on local manifest
+freshness plus local transport health. Mirrors do not participate in canonical
+readiness.
+
+Missing canonical readiness must be treated as not ready.
 
-`bun run duel` now boots the end-to-end agent duel arena stack:
+## Required Health Checks
+
+For the renderer/capture worker:
+
+- `GET /api/streaming/capture/status`
+- `GET /api/streaming/capture/smoke`
+- `GET /api/streaming/rtmp/status`
+- `GET /live/stream.m3u8`
+- `capture/status` should reflect source-worker readiness before canonical
+  public playback is considered healthy
 
-1. Game server + client (streaming duel scheduler enabled)
-2. Duel matchmaker bots (`dev:duel:skip-dev`)
-3. RTMP bridge fanout to public platforms (YouTube/Twitch/etc.)
-4. Betting app (testnet mode)
-5. Keeper bot (testnet automation)
+For the API/control plane:
 
-## Run
-
-```bash
-bun run duel
-```
-
-`bun run duel` now bootstraps streaming prerequisites automatically on first run:
-- uses bundled `ffmpeg-static` binary by default (or `FFMPEG_PATH` if provided)
-- auto-installs Playwright Chromium if the bundled browser is missing
-
-No separate Docker stream container is required for stream fanout.
-
-Recommended fresh-install prep command:
-
-```bash
-bun run install
-```
-
-This ensures assets are synced and Chromium is installed for local capture.
-
-Optional flags:
-
-```bash
-bun run duel --bots=6 --betting-port=4179 --rtmp-port=8765
-bun run duel --skip-keeper
-bun run duel --skip-stream
-bun run duel --verify
-```
-
-## Streaming Outputs
-
-Configure the following env vars (root `.env` or `packages/server/.env`):
-
-- `RTMP_MULTIPLEXER_URL` (+ optional `RTMP_MULTIPLEXER_STREAM_KEY`, `RTMP_MULTIPLEXER_NAME`)
-- `TWITCH_STREAM_KEY` (or `TWITCH_RTMP_STREAM_KEY`)
-  Optional ingest override: `TWITCH_STREAM_URL` / `TWITCH_RTMP_URL` / `TWITCH_RTMP_SERVER`
-- `YOUTUBE_STREAM_KEY` (or `YOUTUBE_RTMP_STREAM_KEY`)
-  Optional ingest override: `YOUTUBE_STREAM_URL` / `YOUTUBE_RTMP_URL`
-- `KICK_STREAM_KEY` (+ optional `KICK_RTMP_URL`)
-- `PUMPFUN_RTMP_URL` (+ optional `PUMPFUN_STREAM_KEY`)
-- `X_RTMP_URL` (+ optional `X_STREAM_KEY`)
-- `RTMP_DESTINATIONS_JSON` for additional/custom fanout destinations
-- `STREAMING_VIEWER_ACCESS_TOKEN` optional gate for live WebSocket stream/spectator viewers
-
-Default anti-cheat timing policy (no env required):
+- `GET /health`
+- `GET /api/streaming/state`
+- `GET /api/streaming/state/events`
+- `GET /api/hyperbet/config`
+- betting feed/session payloads must include `channel.publicReadiness`
 
-- Canonical platform: `youtube`
-- Default public delay: `15000ms`
-- Optional: `STREAMING_CANONICAL_PLATFORM` (`youtube` | `twitch`)
-- Optional override: `STREAMING_PUBLIC_DELAY_MS`
+For the canonical public rail:
 
-Optional client-side extra delay (usually keep `0` if server delay is enabled):
+- probe the canonical playback manifest exposed in `channel.publicPlaybackUrl`
+- verify public playback readiness independently from ingest connectivity
 
-- `VITE_UI_SYNC_DELAY_MS`
+For the rendered page:
 
-Website/betting embed input (recommended):
+- `/stream` must visibly move through a full duel
+- during active combat, `visualChangeAgeMs < 1000`
+- during active combat, `captureFps >= 24`
+- during active combat, `encodeFps >= 24`
 
-- `NEXT_PUBLIC_ARENA_STREAM_EMBED_URL` (in `packages/website/.env.local`)
-- `VITE_STREAM_EMBED_URL` (in the Hyperbet app `.env*` files if you boot the sibling repo locally)
+## Personal Staging Rule
 
-When `STREAMING_PUBLIC_DELAY_MS > 0`, live `mode=streaming` WebSocket viewers are restricted to:
-- loopback/local capture clients, or
-- clients presenting `streamToken=<STREAMING_VIEWER_ACCESS_TOKEN>`
+On `enoomian` personal staging:
 
-`stream-to-rtmp` automatically appends `streamToken` to capture URLs when `STREAMING_VIEWER_ACCESS_TOKEN` is set.
+- Pages hosts the public client
+- the GPU box runs the source worker service that renders and encodes
+- Railway serves the API and control plane
+- self-hosted HLS is the current canonical betting viewer path
+- Cloudflare Stream is configured as a warm fallback and investigation rail
+- canonical selection is driven by
+  `STREAM_CANONICAL_PROVIDER_PRIORITY=self_hls,cloudflare_stream`
+- `STREAM_CLOUDFLARE_PROBE_ONLY=false` keeps Cloudflare exercised in parallel
+  without letting it poison canonical readiness while it is unhealthy
+- mirrors are optional and independent
+- health-driven source-worker restarts are handled by the source worker
+  process supervisor, not the API control plane
 
-## Spectator + Betting URLs
+## Operational Outcomes
 
-- Game stream view: `http://localhost:3333/?page=stream`
-- Embedded spectator: `http://localhost:3333/?embedded=true&mode=spectator`
-- Betting app: `http://localhost:4179`
-- Betting video source: `VITE_STREAM_EMBED_URL` (YouTube/Twitch embed URL)
+### Canonical Down, Mirrors Healthy
 
-## Open APIs (duel telemetry + monologues)
+- betting playback is unavailable
+- mirror viewers may still be healthy
+- this is a canonical distribution incident
 
-- `GET /api/streaming/state`
-- `GET /api/streaming/duel-context`
-- `GET /api/streaming/agent/:characterId/inventory`
-- `GET /api/streaming/agent/:characterId/monologues?limit=20`
+### Mirror Down, Canonical Healthy
 
-These endpoints power the betting app live duel telemetry section (inventory, wins/losses, level, HP, and internal monologues).
+- betting playback remains healthy
+- only that mirror destination is degraded
+- do not relabel this as a betting outage
 
-## Verification
+### Renderer Healthy, Canonical Not Ready
 
-Run the full startup verifier against a running stack:
+- duel truth and renderer output continue
+- betting playback remains unavailable until public readiness recovers
+- investigate canonical destination transport health and manifest probe results
 
-```bash
-bun run duel:verify
-bun run duel:verify --require-destinations=twitch,youtube
-```
+### Duel Transition
 
-This validates server/client/betting uptime, active duel combat, RTMP bridge status evidence, and telemetry endpoints.
-RTMP bridge status is best-effort by default, and can be made strict with `--require-destinations`.
+- the channel remains continuous
+- only `activeDuelId` and content-related state change
+- transport identity and routing policy should not reset
diff --git a/docs/railway-dev-prod.md b/docs/railway-dev-prod.md
index e851f5cba..48d15700c 100644
--- a/docs/railway-dev-prod.md
+++ b/docs/railway-dev-prod.md
@@ -1,60 +1,110 @@
-# Railway Dev/Prod Deployment
-
-This repository deploys Railway environments with branch-to-environment mapping:
-
-- `main` -> `prod`
-- `develop` or `dev` -> `dev`
-
-Manual deploys are also supported via GitHub Actions (`Deploy to Railway`) with:
-
-- `environment=prod`
-- `environment=dev`
-
-## Required GitHub Configuration
-
-Set the following repository secret:
-
-- `RAILWAY_TOKEN`
-
-Set these repository variables for `dev`:
-
-- `RAILWAY_DEV_SERVICE_ID`
-- `RAILWAY_DEV_ENVIRONMENT_ID`
-
-Legacy fallback is supported:
-
-- `RAILWAY_STAGING_SERVICE_ID`
-- `RAILWAY_STAGING_ENVIRONMENT_ID`
-
-Production service/environment IDs are currently pinned in
-`.github/workflows/deploy-railway.yml`.
-
-## Railway Setup (One-Time)
-
-1. In Railway, create or confirm two environments:
-   - `production`
-   - `development` (or your existing staging environment)
-2. Confirm each environment has a service instance for this app.
-3. Copy the `serviceId` and `environmentId` for development into GitHub variables.
-
-## Point `hyperscape.gg` to Production
-
-1. In Railway:
-   - Open the production service.
-   - Go to `Settings -> Domains`.
-   - Add `hyperscape.gg` as a custom domain.
-   - Optionally add `www.hyperscape.gg` and redirect it to apex.
-2. Railway will show the exact DNS record(s) required. Create those records at your DNS provider exactly as shown.
-3. If you use Cloudflare DNS, set proxy to DNS-only until certificate issuance completes.
-4. Wait for domain verification and TLS certificate status to become active in Railway.
-5. Validate:
-   - `https://hyperscape.gg/status`
-   - `wss://hyperscape.gg/ws`
-
-## Optional Dev Domain
-
-Recommended custom domain for development:
-
-- `dev.hyperscape.gg`
-
-Add it in the development Railway environment and create matching DNS records from Railway's instructions.
+# Railway Dev And Prod
+
+Railway hosts the Hyperscapes API and control-plane services. It is not the
+renderer of record for the duel stream.
+
+## Branch Mapping
+
+- `main` -> shared production
+- `develop`/`dev` -> shared development
+- `enoomian/personal-staging-integration` -> personal staging when explicitly
+  selected on the service source branch
+
+## Responsibilities
+
+Railway owns:
+
+- `/health`
+- `/api/streaming/state`
+- `/api/streaming/state/events`
+- `/api/streaming/capture/status`
+- `/api/streaming/capture/smoke`
+- `/api/hyperbet/config`
+- wallet auth and HyperBet public routes
+
+Railway does not own:
+
+- headful stream-page rendering
+- browser capture
+- FFmpeg encode
+- GPU-bound viewer delivery
+
+Those live on the GPU capture host.
+
+## Personal Staging Model
+
+For `enoomian` personal staging:
+
+- Cloudflare Pages serves the public `/stream` page
+- `/stream` runs in the dedicated capture preset rather than the full generic
+  client
+- the GPU host runs the dedicated source worker service (`hyperscape-stream-source`)
+- the API/game-control service is separate (`hyperscape-duel-api`)
+- Railway points at the integrated branch and serves API/control-plane state
+- viewer delivery uses authority-layer provider selection rather than assuming
+  Cloudflare is always canonical
+- self-hosted HLS is the current personal-staging canonical rail
+- Cloudflare remains configured as a warm fallback and investigation rail
+- `DUEL_OWNS_STREAM_CAPTURE=true` is reserved for explicit local integrated
+  mode only; split topology is the default for staging/prod
+
+## Required Railway Variables
+
+Keep secrets in Railway only. Do not commit them to git.
+
+Streaming delivery selection:
+
+- `STREAM_DELIVERY_MODE=self_hls|external_hls`
+- `STREAM_DELIVERY_PROVIDER`
+- `STREAM_CANONICAL_PROVIDER_PRIORITY`
+- `STREAM_FAILBACK_SOAK_MS`
+- `STREAM_INGEST_RTMPS_URL`
+- `STREAM_INGEST_STREAM_KEY`
+- `STREAM_PLAYBACK_HLS_URL`
+- `STREAM_PLAYBACK_LLHLS_URL`
+- `STREAM_EXTERNAL_DELIVERY_PROVIDER`
+- `STREAM_EXTERNAL_PLAYBACK_HLS_URL`
+- `STREAM_EXTERNAL_PLAYBACK_LLHLS_URL`
+- `STREAM_EXTERNAL_INGEST_RTMPS_URL`
+- `STREAM_CLOUDFLARE_PROBE_ONLY`
+
+Renderer health polling:
+
+- `STREAM_RENDERER_HEALTH_URL`
+- `STREAM_RENDERER_HEALTH_BEARER_TOKEN`
+- `STREAM_RENDERER_HEALTH_POLL_MS`
+- `STREAM_RENDERER_HEALTH_TIMEOUT_MS`
+- `STREAM_RENDERER_HLS_FRESHNESS_MS`
+
+Capture/encode defaults expected by the integrated branch:
+
+- `FFMPEG_HWACCEL=nvidia`
+- `STREAM_LOW_LATENCY=true`
+- `STREAM_FPS=30`
+- `HLS_TIME_SECONDS=1`
+- `HLS_LIST_SIZE=6`
+- `HLS_DELETE_THRESHOLD=24`
+
+## Deployment Checks
+
+After every Railway deploy verify:
+
+1. `/health` returns `200`
+2. `/api/streaming/capture/status` includes:
+   - `metrics`
+   - `hlsManifest`
+   - `delivery`
+   - `sourceRuntime` when the source worker is healthy
+3. `/api/streaming/capture/smoke` includes:
+   - `currentSceneUrl`
+   - `activeBundle`
+   - `deliveryMode`
+   - `captureFpsP50/P95`
+   - `encodeFpsP50/P95`
+4. `/api/hyperbet/config` resolves
+5. the returned `delivery.playbackUrl` matches the intended viewer path
+6. `rendererHealth.ready=true` only when render, encode, and delivery are fresh
+7. source-worker restarts should be health-driven rather than hidden behind
+   the API/control-plane process
+8. `channel.canonicalDestinationId` and `channel.fallbackDestinationId`
+   represent the intended provider ordering for the environment
diff --git a/ecosystem.config.cjs b/ecosystem.config.cjs
index 10bb2f3a7..27423c5d3 100644
--- a/ecosystem.config.cjs
+++ b/ecosystem.config.cjs
@@ -6,22 +6,35 @@
  *   pm2 restart ecosystem.config.cjs        # restart all
  *   pm2 stop ecosystem.config.cjs           # stop all
  *   pm2 delete ecosystem.config.cjs         # remove from pm2
- *   pm2 logs hyperscape-duel                # tail logs
+ *   pm2 logs hyperscape-duel-api            # tail control-plane logs
  *
- * The duel-stack.mjs orchestrator already manages sub-processes internally
- * (game server, client, bots, RTMP bridge, betting app, keeper bot).
- * If ANY critical sub-process dies, the orchestrator tears everything down
- * and exits with code 1. PM2 then restarts it from scratch, giving us an
- * infinite self-healing loop.
+ * The default topology is split:
+ * - hyperscape-duel-api owns the control plane, duel server, client, bots,
+ *   betting app, and keeper automation.
+ * - hyperscape-stream-source owns the dedicated browser capture + FFmpeg
+ *   source worker.
+ *
+ * The duel-stack orchestrator only owns the stream worker when explicitly
+ * opted in with DUEL_OWNS_STREAM_CAPTURE=true. That keeps staging/prod from
+ * silently reverting to the old all-in-one capture model.
  */
 
 // ── Load deploy-time secrets into process.env ─────────────────────────────
 // bunx pm2 may not inherit the deploy shell's exported env vars, so we
-// read the secrets file directly to ensure DATABASE_URL et al. are present.
+// read the local runtime secret files directly. These files are intended to
+// stay personal and untracked for enoomian staging; shared project secrets
+// are intentionally not consulted here.
 const fs = require("fs");
+// Prefer persistent paths first. /tmp is wiped on reboot by systemd-tmpfiles
+// on recent Ubuntu/Debian (rule `D /tmp` in /usr/lib/tmpfiles.d/tmp.conf),
+// so after a host reboot a pm2 resurrect would find /tmp/hyperscape-secrets.env
+// missing and start processes with default env. The persistent copy at
+// /root/hyperscape-secrets.env survives reboots. The /tmp path remains as a
+// transitional fallback for deploy scripts that haven't migrated.
 const SECRETS_FILES = [
   "/tmp/hyperscape-secrets.env",
   require("path").join(__dirname, ".env.production"),
+  "/root/hyperscape-secrets.env",
 ];
 for (const secretsPath of SECRETS_FILES) {
   try {
@@ -39,9 +52,10 @@ for (const secretsPath of SECRETS_FILES) {
           (value.startsWith("'") && value.endsWith("'"))) {
           value = value.slice(1, -1);
         }
-        if (!process.env[key]) {
-          process.env[key] = value;
-        }
+        // Runtime secret files are the deploy-time source of truth for this
+        // PM2 config. Override inherited PM2 env so secret rotations take
+        // effect on `pm2 restart ecosystem.config.cjs --update-env`.
+        process.env[key] = value;
       }
     }
   } catch { /* ignore missing/unreadable files */ }
@@ -113,14 +127,172 @@ function sanitizeRuntimeEnv() {
 }
 
 const runtimeEnv = sanitizeRuntimeEnv();
+const defaultGameUrl = process.env.GAME_URL || "http://localhost:3333/?page=stream";
+const defaultGameFallbackUrls =
+  process.env.GAME_FALLBACK_URLS ||
+  [
+    defaultGameUrl,
+    "http://localhost:3333/?embedded=true&mode=spectator",
+    "http://localhost:3333/",
+  ].join(",");
+const defaultHlsOutputPath =
+  process.env.HLS_OUTPUT_PATH ||
+  require("path").join(__dirname, "packages/server/public/live/stream.m3u8");
+const defaultHlsSegmentPattern =
+  process.env.HLS_SEGMENT_PATTERN ||
+  require("path").join(
+    __dirname,
+    "packages/server/public/live/stream-%09d.ts",
+  );
+const configuredStreamDestinations =
+  process.env.STREAM_ENABLED_DESTINATIONS ||
+  process.env.DUEL_STREAM_DESTINATIONS ||
+  "";
+const normalizedStreamDestinations = configuredStreamDestinations
+  .split(",")
+  .map((value) => value.trim().toLowerCase())
+  .filter(Boolean);
+const localHlsOutputEnabled =
+  normalizedStreamDestinations.length === 0 ||
+  normalizedStreamDestinations.some((value) =>
+    ["self", "self_hls", "hls"].includes(value),
+  );
+const defaultRtmpStatusFile =
+  process.env.RTMP_STATUS_FILE ||
+  require("path").join(__dirname, ".runtime-locks/rtmp-status.json");
+
+const display = process.env.DISPLAY || ":99";
+const sharedProductionEnv = {
+  ...runtimeEnv,
+  NODE_ENV: "production",
+  DISPLAY: display,
+  POSTGRES_POOL_MAX: "20",
+  POSTGRES_POOL_MIN: "2",
+  SKIP_MIGRATIONS: "true",
+  DATABASE_URL: process.env.DATABASE_URL || "",
+  USE_LOCAL_POSTGRES:
+    process.env.USE_LOCAL_POSTGRES ||
+    (process.env.DATABASE_URL ? "false" : "true"),
+  STREAMING_DUEL_ENABLED: "true",
+  DUEL_BETTING_ENABLED: "false",
+  SOLANA_RPC_URL: "https://api.devnet.solana.com",
+  SOLANA_WS_URL: "wss://api.devnet.solana.com/",
+  ORACLE_SETTLEMENT_DELAY_MS: "7000",
+  SOLANA_ARENA_MARKET_PROGRAM_ID:
+    process.env.SOLANA_ARENA_MARKET_PROGRAM_ID ||
+    "9NdidShnVzy1fc1WHWJTvyuXmH47ynfNGA6QFdyfAuSU",
+  SOLANA_GOLD_MINT:
+    process.env.SOLANA_GOLD_MINT ||
+    "DK9nBUMfdu4XprPRWeh8f6KnQiGWD8Z4xz3yzs9gpump",
+  PUBLIC_CDN_URL: process.env.PUBLIC_CDN_URL || "https://assets.hyperscape.club",
+  DISABLE_RATE_LIMIT: "true",
+  ALLOW_DESTRUCTIVE_CHANGES: "false",
+  AUTO_START_AGENTS: "true",
+  AUTO_START_AGENTS_MAX: "10",
+  SPAWN_MODEL_AGENTS: "true",
+  MAX_MODEL_AGENTS: "4",
+  MALLOC_TRIM_THRESHOLD_: "-1",
+  MIMALLOC_ALLOW_DECOMMIT: "0",
+  MIMALLOC_ALLOW_RESET: "0",
+  MIMALLOC_PAGE_RESET: "0",
+  MIMALLOC_PURGE_DELAY: "1000000",
+  STREAM_CAPTURE_MODE: process.env.STREAM_CAPTURE_MODE || "cdp",
+  STREAM_ALLOW_WEBCODECS_CLOUDFLARE:
+    process.env.STREAM_ALLOW_WEBCODECS_CLOUDFLARE || "false",
+  STREAM_CAPTURE_HEADLESS: "false",
+  STREAM_CAPTURE_CHANNEL: "chrome-beta",
+  STREAM_CAPTURE_ANGLE: "vulkan",
+  STREAM_CAPTURE_WIDTH: process.env.STREAM_CAPTURE_WIDTH || "1280",
+  STREAM_CAPTURE_HEIGHT: process.env.STREAM_CAPTURE_HEIGHT || "720",
+  STREAM_OUTPUT_WIDTH:
+    process.env.STREAM_OUTPUT_WIDTH ||
+    process.env.STREAM_CAPTURE_WIDTH ||
+    "1280",
+  STREAM_OUTPUT_HEIGHT:
+    process.env.STREAM_OUTPUT_HEIGHT ||
+    process.env.STREAM_CAPTURE_HEIGHT ||
+    "720",
+  FFMPEG_HWACCEL:
+    process.env.FFMPEG_HWACCEL ||
+    (process.platform === "linux"
+      ? "nvidia"
+      : process.platform === "darwin"
+        ? "mac"
+        : "auto"),
+  STREAM_LOW_LATENCY: process.env.STREAM_LOW_LATENCY || "true",
+  STREAM_FPS: process.env.STREAM_FPS || "30",
+  HLS_TIME_SECONDS: process.env.HLS_TIME_SECONDS || "1",
+  HLS_LIST_SIZE: process.env.HLS_LIST_SIZE || "6",
+  HLS_DELETE_THRESHOLD: process.env.HLS_DELETE_THRESHOLD || "24",
+  FFMPEG_PATH: process.env.FFMPEG_PATH || "ffmpeg",
+  TWITCH_STREAM_URL: process.env.TWITCH_STREAM_URL || "rtmp://live.twitch.tv/app",
+  TWITCH_STREAM_KEY:
+    process.env.TWITCH_STREAM_KEY || process.env.TWITCH_RTMP_STREAM_KEY || "",
+  KICK_STREAM_KEY: process.env.KICK_STREAM_KEY || "",
+  KICK_RTMP_URL:
+    process.env.KICK_RTMP_URL ||
+    "rtmps://fa723fc1b171.global-contribute.live-video.net/app",
+  STREAM_ENABLED_DESTINATIONS:
+    configuredStreamDestinations,
+  YOUTUBE_STREAM_URL: process.env.YOUTUBE_STREAM_URL || "rtmp://a.rtmp.youtube.com/live2",
+  HLS_OUTPUT_PATH: localHlsOutputEnabled ? defaultHlsOutputPath : "",
+  HLS_SEGMENT_PATTERN: localHlsOutputEnabled ? defaultHlsSegmentPattern : "",
+  RTMP_STATUS_FILE: defaultRtmpStatusFile,
+  GAME_URL: defaultGameUrl,
+  GAME_FALLBACK_URLS: defaultGameFallbackUrls,
+  STREAMING_DUEL_COMBAT_AI_ENABLED: "false",
+  SERVER_RUNTIME_MAX_TICKS_PER_FRAME: "1",
+  SERVER_RUNTIME_MIN_DELAY_MS: "10",
+};
+
+const apiProcessEnv = {
+  ...sharedProductionEnv,
+  DUEL_OWNS_STREAM_CAPTURE: "false",
+  STREAMING_CAPTURE_ENABLED: "false",
+};
+
+const streamSourceEnv = {
+  ...sharedProductionEnv,
+  STREAMING_CAPTURE_ENABLED: "true",
+  // ───────────────────────────────────────────────────────────────────────────
+  // To switch this worker to the native x11grab + NVENC capture path
+  // (replaces CDP JPEG screencast; Chromium becomes a pure scene renderer):
+  //
+  //   STREAM_CAPTURE_MODE: "x11_nvenc",
+  //
+  // Requirements:
+  //   - FFMPEG_HWACCEL=nvidia (already set in sharedProductionEnv on Linux)
+  //   - Xvfb sized to exactly STREAM_CAPTURE_WIDTH x STREAM_CAPTURE_HEIGHT
+  //   - xdpyinfo available on PATH (preflighted at start)
+  // Rollback is instant: unset STREAM_CAPTURE_MODE (or set it to "cdp")
+  // and `pm2 restart hyperscape-stream-source`.
+  // ───────────────────────────────────────────────────────────────────────────
+};
 
 module.exports = {
   apps: [
     {
-      name: "hyperscape-duel",
-      script: "scripts/duel-stack.mjs",
+      name: "hyperscape-duel-api",
+      script: "dist/index.js",
+      interpreter: "node",
+      node_args: "--import ./scripts/register-hooks.mjs",
+      cwd: require("path").join(__dirname, "packages/server"),
+      autorestart: true,
+      max_restarts: 999999,
+      min_uptime: "10s",
+      restart_delay: 10000,
+      exp_backoff_restart_delay: 2000,
+      max_memory_restart: "4G",
+      error_file: "logs/duel-api-error.log",
+      out_file: "logs/duel-api-out.log",
+      merge_logs: true,
+      log_date_format: "YYYY-MM-DD HH:mm:ss Z",
+      env: apiProcessEnv,
+    },
+    {
+      name: "hyperscape-stream-source",
+      script: "packages/server/scripts/stream-to-rtmp.ts",
       interpreter: "bun",
-      args: "--skip-betting --skip-bots",
       cwd: __dirname,
       autorestart: true,
       max_restarts: 999999,
@@ -128,79 +300,11 @@ module.exports = {
       restart_delay: 10000,
       exp_backoff_restart_delay: 2000,
       max_memory_restart: "4G",
-      error_file: "logs/duel-error.log",
-      out_file: "logs/duel-out.log",
+      error_file: "logs/stream-source-error.log",
+      out_file: "logs/stream-source-out.log",
       merge_logs: true,
       log_date_format: "YYYY-MM-DD HH:mm:ss Z",
-      env: {
-        ...runtimeEnv,
-        NODE_ENV: "production",
-        DISPLAY: process.env.DISPLAY || ":99",
-        POSTGRES_POOL_MAX: "20",
-        POSTGRES_POOL_MIN: "2",
-        SKIP_MIGRATIONS: "true",
-        DATABASE_URL: process.env.DATABASE_URL || "",
-        USE_LOCAL_POSTGRES:
-          process.env.USE_LOCAL_POSTGRES ||
-          (process.env.DATABASE_URL ? "false" : "true"),
-        STREAMING_DUEL_ENABLED: "true",
-        DUEL_BETTING_ENABLED: "false",
-        SOLANA_RPC_URL: "https://api.devnet.solana.com",
-        SOLANA_WS_URL: "wss://api.devnet.solana.com/",
-        ORACLE_SETTLEMENT_DELAY_MS: "7000",
-        SOLANA_ARENA_MARKET_PROGRAM_ID:
-          process.env.SOLANA_ARENA_MARKET_PROGRAM_ID ||
-          "9NdidShnVzy1fc1WHWJTvyuXmH47ynfNGA6QFdyfAuSU",
-        SOLANA_GOLD_MINT:
-          process.env.SOLANA_GOLD_MINT ||
-          "DK9nBUMfdu4XprPRWeh8f6KnQiGWD8Z4xz3yzs9gpump",
-
-        PUBLIC_CDN_URL: process.env.PUBLIC_CDN_URL || "https://assets.hyperscape.club",
-        DISABLE_RATE_LIMIT: "true",
-        ALLOW_DESTRUCTIVE_CHANGES: "false",
-        AUTO_START_AGENTS: "true",
-        AUTO_START_AGENTS_MAX: "10",
-        SPAWN_MODEL_AGENTS: "true",
-        MAX_MODEL_AGENTS: "4",
-        MALLOC_TRIM_THRESHOLD_: "-1",
-        MIMALLOC_ALLOW_DECOMMIT: "0",
-        MIMALLOC_ALLOW_RESET: "0",
-        MIMALLOC_PAGE_RESET: "0",
-        MIMALLOC_PURGE_DELAY: "1000000",
-        STREAM_CAPTURE_MODE: "cdp",
-        STREAM_CAPTURE_HEADLESS: "false",
-        STREAM_CAPTURE_CHANNEL: "chrome-beta",
-        STREAM_CAPTURE_ANGLE: "vulkan",
-        STREAM_CAPTURE_WIDTH: "1280",
-        STREAM_CAPTURE_HEIGHT: "720",
-        STREAM_OUTPUT_WIDTH: "1280",
-        STREAM_OUTPUT_HEIGHT: "720",
-        FFMPEG_PATH: process.env.FFMPEG_PATH || "ffmpeg",
-        TWITCH_STREAM_URL:
-          process.env.TWITCH_STREAM_URL ||
-          "rtmp://live.twitch.tv/app",
-        TWITCH_STREAM_KEY:
-          process.env.TWITCH_STREAM_KEY ||
-          process.env.TWITCH_RTMP_STREAM_KEY ||
-          "",
-        KICK_STREAM_KEY: process.env.KICK_STREAM_KEY || "",
-        KICK_RTMP_URL:
-          process.env.KICK_RTMP_URL ||
-          "rtmps://fa723fc1b171.global-contribute.live-video.net/app",
-        STREAM_ENABLED_DESTINATIONS:
-          process.env.STREAM_ENABLED_DESTINATIONS ||
-          process.env.DUEL_STREAM_DESTINATIONS ||
-          "",
-        YOUTUBE_STREAM_URL:
-          process.env.YOUTUBE_STREAM_URL ||
-          "rtmp://a.rtmp.youtube.com/live2",
-        GAME_URL: "http://localhost:3333/?page=stream",
-        GAME_FALLBACK_URLS:
-          "http://localhost:3333/?page=stream,http://localhost:3333/?embedded=true&mode=spectator,http://localhost:3333/",
-        STREAMING_DUEL_COMBAT_AI_ENABLED: "false",
-        SERVER_RUNTIME_MAX_TICKS_PER_FRAME: "1",
-        SERVER_RUNTIME_MIN_DELAY_MS: "10",
-      },
+      env: streamSourceEnv,
     },
   ],
 };
diff --git a/packages/client/package.json b/packages/client/package.json
index 531e7c2df..2694ffe5a 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -101,6 +101,7 @@
     "@types/node": "^25.3.0",
     "@types/react": "^19.2.14",
     "@types/react-dom": "^19.2.3",
+    "@webgpu/types": "^0.1.69",
     "@typescript-eslint/eslint-plugin": "^8.38.0",
     "@typescript-eslint/parser": "^8.38.0",
     "@vitejs/plugin-react": "^6.0.1",
diff --git a/packages/client/public/_headers b/packages/client/public/_headers
index 56a2d006d..f4da2b6e9 100644
--- a/packages/client/public/_headers
+++ b/packages/client/public/_headers
@@ -22,15 +22,38 @@
   # Report-Only mode for testing stricter policies (uncomment to test)
   # Content-Security-Policy-Report-Only: default-src 'self'; script-src 'self' https://auth.privy.io https://*.privy.io; style-src 'self'; report-uri /api/csp-report;
 
+# ============================================================================
+# /stream route: path-scoped override so the bets page can embed the live
+# capture view as an iframe. We keep the full CSP from /* but add a
+# frame-ancestors directive. Per HTML/CSP spec, when CSP includes
+# frame-ancestors the browser IGNORES X-Frame-Options entirely, so the
+# legacy DENY from the /* rule becomes inert on /stream without needing
+# to explicitly clear it (which CF Pages' _headers parser does not support).
+# Scope is intentionally narrow: only /stream, only the bets staging domain.
+# ============================================================================
+/stream
+  Cache-Control: no-store
+  Content-Security-Policy: default-src 'self'; script-src 'self' 'unsafe-inline' 'unsafe-eval' https://auth.privy.io https://*.privy.io https://static.cloudflareinsights.com blob:; style-src 'self' 'unsafe-inline' https://fonts.googleapis.com; img-src 'self' data: https: blob:; font-src 'self' data: https://fonts.gstatic.com; connect-src 'self' wss: https: ws://localhost:* http://localhost:* data: blob:; frame-src 'self' https://auth.privy.io https://*.privy.io; worker-src 'self' blob:; media-src 'self' blob:; frame-ancestors 'self' https://hyperbet-enoomian-staging.pages.dev https://*.hyperbet-enoomian-staging.pages.dev;
+
+/stream.html
+  Cache-Control: no-store
+  Content-Security-Policy: default-src 'self'; script-src 'self' 'unsafe-inline' 'unsafe-eval' https://auth.privy.io https://*.privy.io https://static.cloudflareinsights.com blob:; style-src 'self' 'unsafe-inline' https://fonts.googleapis.com; img-src 'self' data: https: blob:; font-src 'self' data: https://fonts.gstatic.com; connect-src 'self' wss: https: ws://localhost:* http://localhost:* data: blob:; frame-src 'self' https://auth.privy.io https://*.privy.io; worker-src 'self' blob:; media-src 'self' blob:; frame-ancestors 'self' https://hyperbet-enoomian-staging.pages.dev https://*.hyperbet-enoomian-staging.pages.dev;
+
+/env.js
+  Cache-Control: no-store
+
+/registerSW.js
+  Cache-Control: no-store
+
+/sw.js
+  Cache-Control: no-store
+
 /assets/*
   Cache-Control: public, max-age=31536000, immutable
 
 /images/*
   Cache-Control: public, max-age=86400
 
-/*.js
-  Cache-Control: public, max-age=31536000, immutable
-
 /*.css
   Cache-Control: public, max-age=31536000, immutable
 
diff --git a/packages/client/public/env.js b/packages/client/public/env.js
index d8a4421a8..b44f18f55 100644
--- a/packages/client/public/env.js
+++ b/packages/client/public/env.js
@@ -1,7 +1,7 @@
 // Runtime environment configuration
 // This file is loaded at runtime to override build-time environment variables.
-// In development, defaults are used. In production, this file is generated
-// by the deployment platform (Cloudflare Pages, Vercel, etc.) with actual values.
+// In development, defaults are used. In production, runtime host-specific
+// overrides keep manually deployed Pages builds pointed at the correct backend.
 //
 // Example production content:
 //   window.env = {
@@ -19,10 +19,12 @@
     currentPort === "3333" || currentPort === "4173" || currentPort === "5173";
 
   if (isLocalDevServer) {
-    const host = window.location.hostname || "127.0.0.1";
+    const hostname = window.location.hostname || "127.0.0.1";
+    const host = hostname || "127.0.0.1";
     env.PUBLIC_API_URL ||= `http://${host}:5555`;
     env.PUBLIC_WS_URL ||= `ws://${host}:5556/ws`;
     env.PUBLIC_CDN_URL ||= `http://${host}:5555/game-assets`;
+    env.PUBLIC_ELIZAOS_URL ||= `http://${host}:5555`;
   }
 
   window.env = env;
diff --git a/packages/client/src/components/streaming/CountdownOverlay.tsx b/packages/client/src/components/streaming/CountdownOverlay.tsx
index 62b27abee..c0465dceb 100644
--- a/packages/client/src/components/streaming/CountdownOverlay.tsx
+++ b/packages/client/src/components/streaming/CountdownOverlay.tsx
@@ -83,7 +83,7 @@ export function CountdownOverlay({
   const isFight = displayCount === 0;
 
   // Fade-out: starts fully opaque, fades to 0 over the linger period
-  const fightOpacity = isFight ? 1 - fightProgress * 0.9 : 1;
+  const fightOpacity = isFight ? 1 - fightProgress : 1;
   // Scale: starts at 1, scales up to 1.3 then back during fade
   const fightScale = isFight ? 1 + Math.sin(fightProgress * Math.PI) * 0.3 : 1;
 
diff --git a/packages/client/src/components/streaming/DamageFloaters.tsx b/packages/client/src/components/streaming/DamageFloaters.tsx
new file mode 100644
index 000000000..004395167
--- /dev/null
+++ b/packages/client/src/components/streaming/DamageFloaters.tsx
@@ -0,0 +1,116 @@
+/**
+ * DamageFloaters - Floating damage numbers that appear when agents take hits
+ *
+ * Each floater animates upward and fades out over 1.5 seconds using CSS keyframes.
+ * Positioned near the corresponding agent's HP bar (left or right side).
+ */
+
+import React, { useEffect, useRef } from "react";
+import type { DamageFloaterEntry } from "./StreamingOverlay";
+
+/** Duration of the float-up + fade-out animation (ms). */
+const FLOATER_DURATION_MS = 1500;
+
+interface DamageFloatersProps {
+  floaters: DamageFloaterEntry[];
+  onExpire: (id: string) => void;
+}
+
+// Inject the keyframe animation once into the document head
+let styleInjected = false;
+function ensureStyleInjected(): void {
+  if (styleInjected) return;
+  styleInjected = true;
+  const style = document.createElement("style");
+  style.textContent = `
+    @keyframes dmgFloatUp {
+      0% {
+        opacity: 1;
+        transform: translateY(0) scale(1.2);
+      }
+      60% {
+        opacity: 0.9;
+        transform: translateY(-32px) scale(1.05);
+      }
+      100% {
+        opacity: 0;
+        transform: translateY(-56px) scale(1.0);
+      }
+    }
+  `;
+  document.head.appendChild(style);
+}
+
+export function DamageFloaters({ floaters, onExpire }: DamageFloatersProps) {
+  useEffect(() => {
+    ensureStyleInjected();
+  }, []);
+
+  return (
+    <div
+      style={{
+        position: "absolute",
+        top: "20px",
+        left: "50%",
+        transform: "translateX(-50%)",
+        width: "min(1200px, calc(100vw - 40px))",
+        height: 120,
+        pointerEvents: "none",
+        zIndex: 60,
+      }}
+    >
+      {floaters.map((floater) => (
+        <SingleDamageFloater
+          key={floater.id}
+          floater={floater}
+          onExpire={onExpire}
+        />
+      ))}
+    </div>
+  );
+}
+
+interface SingleDamageFloaterProps {
+  floater: DamageFloaterEntry;
+  onExpire: (id: string) => void;
+}
+
+function SingleDamageFloater({ floater, onExpire }: SingleDamageFloaterProps) {
+  const timerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+
+  useEffect(() => {
+    timerRef.current = setTimeout(() => {
+      onExpire(floater.id);
+    }, FLOATER_DURATION_MS);
+    return () => {
+      if (timerRef.current) clearTimeout(timerRef.current);
+    };
+  }, [floater.id, onExpire]);
+
+  // Position: left side floaters appear ~25% from left, right side ~75% from left
+  // Add slight random horizontal jitter so stacked hits don't overlap perfectly
+  const jitter = (floater.createdAt % 40) - 20;
+  const xPercent = floater.side === "left" ? 18 : 82;
+
+  return (
+    <div
+      style={{
+        position: "absolute",
+        top: 48,
+        left: `${xPercent}%`,
+        transform: `translateX(calc(-50% + ${jitter}px))`,
+        color: "#ff0d3c",
+        fontSize: "clamp(1.6rem, 3vw, 2.4rem)",
+        fontWeight: 900,
+        fontFamily: "'Teko', 'Arial Black', sans-serif",
+        textShadow:
+          "0 0 8px rgba(255,13,60,0.8), 2px 2px 0 #000, -1px -1px 0 #000, 1px -1px 0 #000, -1px 1px 0 #000",
+        animation: `dmgFloatUp ${FLOATER_DURATION_MS}ms ease-out forwards`,
+        pointerEvents: "none",
+        whiteSpace: "nowrap",
+      }}
+    >
+      -{floater.amount}
+    </div>
+  );
+}
diff --git a/packages/client/src/components/streaming/LeaderboardPanel.tsx b/packages/client/src/components/streaming/LeaderboardPanel.tsx
index 20f6e119b..9a94cd0c2 100644
--- a/packages/client/src/components/streaming/LeaderboardPanel.tsx
+++ b/packages/client/src/components/streaming/LeaderboardPanel.tsx
@@ -46,6 +46,9 @@ export function LeaderboardPanel({ leaderboard }: LeaderboardPanelProps) {
               {entry.currentStreak > 0 && (
                 <div style={styles.streak}>🔥{entry.currentStreak}</div>
               )}
+              {entry.lossStreak != null && entry.lossStreak > 1 && (
+                <div style={styles.streak}>❄️{entry.lossStreak}</div>
+              )}
             </div>
           ))
         )}
diff --git a/packages/client/src/components/streaming/StreamingBettingRail.tsx b/packages/client/src/components/streaming/StreamingBettingRail.tsx
index 320b97eed..a62705254 100644
--- a/packages/client/src/components/streaming/StreamingBettingRail.tsx
+++ b/packages/client/src/components/streaming/StreamingBettingRail.tsx
@@ -6,6 +6,7 @@
  */
 
 import React, { useMemo } from "react";
+import type { StreamCountdownHoldState } from "./streamCountdown";
 
 export interface StreamingBettingConfig {
   betUrl: string | null;
@@ -25,20 +26,14 @@ function buildBetHref(base: string, duelId: string | null): string {
   }
 }
 
-function formatMmSs(ms: number): string {
-  const totalSeconds = Math.max(0, Math.floor(ms / 1000));
-  const m = Math.floor(totalSeconds / 60);
-  const s = totalSeconds % 60;
-  return `${m}:${s.toString().padStart(2, "0")}`;
-}
-
 interface StreamingBettingRailProps {
   config: StreamingBettingConfig | null;
   phase: string | undefined;
   duelId: string | null | undefined;
   agent1Name: string | null | undefined;
   agent2Name: string | null | undefined;
-  timeRemainingMs: number;
+  countdownText: string;
+  countdownHoldState: StreamCountdownHoldState;
 }
 
 export function StreamingBettingRail({
@@ -47,7 +42,8 @@ export function StreamingBettingRail({
   duelId,
   agent1Name,
   agent2Name,
-  timeRemainingMs,
+  countdownText,
+  countdownHoldState,
 }: StreamingBettingRailProps) {
   const betUrl = config?.betUrl?.trim() || null;
   const hasMatchup = Boolean(agent1Name && agent2Name);
@@ -68,8 +64,16 @@ export function StreamingBettingRail({
   let urgency: "open" | "locked" | "done" = "open";
 
   if (phase === "ANNOUNCEMENT") {
-    headline = "Betting open";
-    sub = `Wagers lock when the fight countdown starts. Closes in ${formatMmSs(timeRemainingMs)}.`;
+    if (countdownHoldState === "preparing_arena") {
+      headline = "Preparing arena";
+      sub =
+        "Wagers are closing while the arena readies for the live countdown.";
+    } else {
+      headline = "Betting open";
+      sub = countdownText
+        ? `Wagers lock when the fight countdown starts. Closes in ${countdownText}.`
+        : "Wagers lock when the fight countdown starts.";
+    }
     urgency = "open";
   } else if (phase === "COUNTDOWN" || phase === "FIGHTING") {
     headline = "Betting locked";
diff --git a/packages/client/src/components/streaming/StreamingOverlay.css b/packages/client/src/components/streaming/StreamingOverlay.css
index c63239313..b54bc1091 100644
--- a/packages/client/src/components/streaming/StreamingOverlay.css
+++ b/packages/client/src/components/streaming/StreamingOverlay.css
@@ -1,4 +1,4 @@
-/* Public stream overlay — vignette, leaderboard, lower third, waiting */
+/* Public stream overlay — vignette, opt-in diagnostics, waiting */
 
 .streaming-overlay-root {
   isolation: isolate;
@@ -42,73 +42,6 @@
   display: none;
 }
 
-.streaming-lower-third {
-  position: absolute;
-  left: 50%;
-  bottom: max(16px, env(safe-area-inset-bottom, 0px));
-  transform: translateX(-50%);
-  z-index: 52;
-  width: min(720px, calc(100vw - 28px));
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  gap: 6px;
-  padding: 12px 18px 14px;
-  border-radius: 14px;
-  background: linear-gradient(
-    180deg,
-    rgba(6, 8, 14, 0.82) 0%,
-    rgba(8, 12, 22, 0.9) 100%
-  );
-  border: 1px solid rgba(251, 191, 36, 0.18);
-  box-shadow:
-    0 18px 48px rgba(0, 0, 0, 0.55),
-    0 0 0 1px rgba(255, 255, 255, 0.04) inset;
-  backdrop-filter: blur(14px) saturate(1.1);
-  -webkit-backdrop-filter: blur(14px) saturate(1.1);
-  animation: streaming-mount-in 0.6s ease-out 0.15s both;
-}
-
-.streaming-lower-third-brand {
-  display: flex;
-  align-items: baseline;
-  justify-content: center;
-  flex-wrap: wrap;
-  gap: 6px;
-}
-
-.streaming-lower-third-mark {
-  font-size: 0.72rem;
-  font-weight: 800;
-  letter-spacing: 0.22em;
-  text-transform: uppercase;
-  color: rgba(251, 191, 36, 0.95);
-}
-
-.streaming-lower-third-divider {
-  color: rgba(148, 163, 184, 0.45);
-  font-weight: 700;
-}
-
-.streaming-lower-third-sub {
-  font-size: 0.72rem;
-  font-weight: 700;
-  letter-spacing: 0.12em;
-  text-transform: uppercase;
-  color: rgba(226, 232, 240, 0.88);
-}
-
-.streaming-lower-third-status {
-  margin: 0;
-  text-align: center;
-  font-size: clamp(0.78rem, 1.9vw, 0.92rem);
-  font-weight: 600;
-  line-height: 1.35;
-  color: rgba(203, 213, 225, 0.95);
-  text-shadow: 0 2px 10px rgba(0, 0, 0, 0.65);
-  max-width: 42ch;
-}
-
 .streaming-fight-timer-eyebrow {
   display: block;
   margin-bottom: 6px;
diff --git a/packages/client/src/components/streaming/StreamingOverlay.tsx b/packages/client/src/components/streaming/StreamingOverlay.tsx
index cf8482187..52d136e3e 100644
--- a/packages/client/src/components/streaming/StreamingOverlay.tsx
+++ b/packages/client/src/components/streaming/StreamingOverlay.tsx
@@ -4,24 +4,25 @@
  * Displays:
  * - Duel info panel (top center)
  * - Agent HP bars (bottom)
- * - Leaderboard (left)
- * - Lower third (brand + live status for viewers)
+ * - Debug leaderboard (left, opt-in)
  * - Countdown timer
  * - Victory announcement
  */
 
-import React, { useEffect, useState, useRef } from "react";
+import React, { useEffect, useState, useRef, useCallback } from "react";
 import type { StreamingState } from "../../screens/StreamingMode";
 import { AgentStatsDisplay } from "./AgentStatsDisplay";
 import { LeaderboardPanel } from "./LeaderboardPanel";
 import { CountdownOverlay } from "./CountdownOverlay";
 import { VictoryOverlay } from "./VictoryOverlay";
+import { DamageFloaters } from "./DamageFloaters";
 import { PostFightStatsCard } from "./PostFightStatsCard";
 import {
   StreamingBettingRail,
   type StreamingBettingConfig,
 } from "./StreamingBettingRail";
 import { CombatLog } from "./CombatLog";
+import { resolveStreamCountdownDisplay } from "./streamCountdown";
 import "./StreamingOverlay.css";
 
 // Delay before showing victory overlay during RESOLUTION phase (ms).
@@ -32,6 +33,13 @@ const VICTORY_OVERLAY_DELAY_MS = 500;
 /** How long the "FIGHT!" text lingers after the countdown ends (ms). */
 const FIGHT_TEXT_LINGER_MS = 2500;
 
+export interface DamageFloaterEntry {
+  id: string;
+  amount: number;
+  side: "left" | "right";
+  createdAt: number;
+}
+
 interface StreamingOverlayProps {
   state: StreamingState | null;
   /** From GET /api/streaming/betting — public bet link for viewers */
@@ -43,13 +51,28 @@ export function StreamingOverlay({
   bettingConfig = null,
 }: StreamingOverlayProps) {
   const [showVictory, setShowVictory] = useState(false);
+  const [countdownNowMs, setCountdownNowMs] = useState(() => Date.now());
   const victoryTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
 
   // Track when the FIGHTING phase starts so the "FIGHT!" text can linger
   const [showFightText, setShowFightText] = useState(false);
   const fightTextTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+  const prevHpRef = useRef<{
+    agent1Hp: number | null;
+    agent2Hp: number | null;
+  }>({
+    agent1Hp: null,
+    agent2Hp: null,
+  });
+  const [damageFloaters, setDamageFloaters] = useState<DamageFloaterEntry[]>(
+    [],
+  );
 
   const phase = state?.cycle?.phase;
+  const agent1 = state?.cycle?.agent1 ?? null;
+  const agent2 = state?.cycle?.agent2 ?? null;
+  const agent1Hp = agent1?.hp ?? null;
+  const agent2Hp = agent2?.hp ?? null;
 
   useEffect(() => {
     if (phase === "RESOLUTION") {
@@ -71,6 +94,82 @@ export function StreamingOverlay({
     };
   }, [phase]);
 
+  useEffect(() => {
+    const targetTimeMs =
+      phase === "ANNOUNCEMENT"
+        ? (state?.cycle?.betCloseTime ?? null)
+        : phase === "COUNTDOWN"
+          ? (state?.cycle?.fightStartTime ?? null)
+          : null;
+
+    setCountdownNowMs(Date.now());
+
+    if (targetTimeMs == null || !Number.isFinite(targetTimeMs)) {
+      return;
+    }
+
+    const intervalId = setInterval(() => {
+      setCountdownNowMs(Date.now());
+    }, 250);
+
+    return () => {
+      clearInterval(intervalId);
+    };
+  }, [phase, state?.cycle?.betCloseTime, state?.cycle?.fightStartTime]);
+
+  useEffect(() => {
+    const prev = prevHpRef.current;
+    const newFloaters: DamageFloaterEntry[] = [];
+
+    if (phase === "FIGHTING") {
+      if (
+        prev.agent1Hp !== null &&
+        agent1Hp !== null &&
+        agent1Hp < prev.agent1Hp
+      ) {
+        const createdAt = Date.now();
+        newFloaters.push({
+          id: `${createdAt}-${Math.random().toString(36).slice(2, 8)}-a1`,
+          amount: prev.agent1Hp - agent1Hp,
+          side: "left",
+          createdAt,
+        });
+      }
+
+      if (
+        prev.agent2Hp !== null &&
+        agent2Hp !== null &&
+        agent2Hp < prev.agent2Hp
+      ) {
+        const createdAt = Date.now();
+        newFloaters.push({
+          id: `${createdAt}-${Math.random().toString(36).slice(2, 8)}-a2`,
+          amount: prev.agent2Hp - agent2Hp,
+          side: "right",
+          createdAt,
+        });
+      }
+    }
+
+    prev.agent1Hp = agent1Hp;
+    prev.agent2Hp = agent2Hp;
+
+    if (newFloaters.length > 0) {
+      setDamageFloaters((existing) => [...existing, ...newFloaters]);
+    }
+  }, [agent1Hp, agent2Hp, phase]);
+
+  useEffect(() => {
+    setDamageFloaters([]);
+    prevHpRef.current = { agent1Hp: null, agent2Hp: null };
+  }, [state?.cycle?.cycleId]);
+
+  const handleFloaterExpire = useCallback((id: string) => {
+    setDamageFloaters((existing) =>
+      existing.filter((floater) => floater.id !== id),
+    );
+  }, []);
+
   // When transitioning to FIGHTING, keep the fight text visible for a linger period
   useEffect(() => {
     if (phase === "FIGHTING") {
@@ -110,14 +209,21 @@ export function StreamingOverlay({
 
   const { cycle, leaderboard } = state;
   const {
-    agent1,
-    agent2,
     winnerId,
     winnerName,
     winReason,
     timeRemaining,
     duelId,
+    betCloseTime,
+    fightStartTime,
   } = cycle;
+  const countdownDisplay = resolveStreamCountdownDisplay({
+    phase,
+    betCloseTime,
+    fightStartTime,
+    fallbackTimeRemainingMs: timeRemaining,
+    nowMs: countdownNowMs,
+  });
 
   // Get winner agent info
   const winnerAgent =
@@ -166,19 +272,24 @@ export function StreamingOverlay({
   const matchupLine =
     agent1 && agent2 ? `${agent1.name} vs ${agent2.name}` : null;
 
+  const debugCombatLogEnabled =
+    import.meta.env.VITE_STREAMING_DEBUG_COMBAT_LOG === "1";
   const showCombatLog =
-    phase === "FIGHTING" || phase === "COUNTDOWN" || phase === "RESOLUTION";
+    debugCombatLogEnabled &&
+    (phase === "FIGHTING" || phase === "COUNTDOWN" || phase === "RESOLUTION");
+  const showDebugLeaderboard =
+    !showCombatLog && import.meta.env.VITE_STREAMING_DEBUG_LEADERBOARD === "1";
 
   return (
     <div className="streaming-overlay-root" style={styles.overlay}>
-      {/* Left panel: combat log during a fight, leaderboard during intermission */}
+      {/* Left-side diagnostic panels are opt-in only for the public capture. */}
       {showCombatLog ? (
         <CombatLog state={state} />
-      ) : (
+      ) : showDebugLeaderboard ? (
         <aside className="streaming-leaderboard-mount">
           <LeaderboardPanel leaderboard={leaderboard} />
         </aside>
-      )}
+      ) : null}
 
       <StreamingBettingRail
         config={bettingConfig}
@@ -186,7 +297,8 @@ export function StreamingOverlay({
         duelId={duelId ?? null}
         agent1Name={agent1?.name}
         agent2Name={agent2?.name}
-        timeRemainingMs={timeRemaining}
+        countdownText={countdownDisplay.text}
+        countdownHoldState={countdownDisplay.holdState}
       />
 
       {/* Duel Info - Top Center (live fight + countdown to first swing) */}
@@ -194,11 +306,17 @@ export function StreamingOverlay({
         <div style={styles.duelInfoContainer}>
           <AgentStatsDisplay agent={agent1} side="left" />
           <div style={styles.timerContainer}>
-            <span className="streaming-fight-timer-eyebrow">Round timer</span>
+            <span className="streaming-fight-timer-eyebrow">
+              {phase === "COUNTDOWN"
+                ? countdownDisplay.label || "Fight starts"
+                : "Round timer"}
+            </span>
             <div style={styles.timerHexOuter}>
               <div style={styles.timerHexInner}>
                 <div style={styles.timerHighlight} />
-                {formatTime(timeRemaining)}
+                {phase === "COUNTDOWN"
+                  ? countdownDisplay.text || "Starting..."
+                  : formatTime(timeRemaining)}
               </div>
               <div style={styles.timerInsetShadow} />
             </div>
@@ -207,6 +325,13 @@ export function StreamingOverlay({
         </div>
       )}
 
+      {damageFloaters.length > 0 && (
+        <DamageFloaters
+          floaters={damageFloaters}
+          onExpire={handleFloaterExpire}
+        />
+      )}
+
       {/* Between phases: keep fighter cards when we know the matchup */}
       {showBetweenMatchupStrip && agent1 && agent2 && (
         <div className="streaming-between-strip">
@@ -236,7 +361,7 @@ export function StreamingOverlay({
             </span>
             <div className="streaming-between-timer-wrap">
               <div className="streaming-between-timer-inner">
-                {timeRemaining > 0 ? formatTime(timeRemaining) : "—"}
+                {countdownDisplay.text || "—"}
               </div>
             </div>
             <span
@@ -249,7 +374,9 @@ export function StreamingOverlay({
                 color: "rgba(148, 163, 184, 0.9)",
               }}
             >
-              {phase === "RESOLUTION" ? "Next duel" : "Starts in"}
+              {phase === "RESOLUTION"
+                ? "Next duel"
+                : countdownDisplay.label || "Up next"}
             </span>
           </div>
           <div
@@ -285,7 +412,7 @@ export function StreamingOverlay({
             ) : null}
             <div className="streaming-interstitial-rule" />
             <div className="streaming-interstitial-timer">
-              {timeRemaining > 0 ? formatTime(timeRemaining) : "—"}
+              {countdownDisplay.text || "—"}
             </div>
             <span
               style={{
@@ -296,7 +423,9 @@ export function StreamingOverlay({
                 color: "rgba(148, 163, 184, 0.85)",
               }}
             >
-              {phase === "RESOLUTION" ? "Next round" : "Time to ring"}
+              {phase === "RESOLUTION"
+                ? "Next round"
+                : countdownDisplay.label || "Time to ring"}
             </span>
           </div>
         )}
@@ -316,6 +445,13 @@ export function StreamingOverlay({
       {phase === "RESOLUTION" && showVictory && winnerAgent && (
         <VictoryOverlay
           winner={winnerAgent}
+          loser={
+            winnerId === agent1?.id
+              ? agent2
+              : winnerId === agent2?.id
+                ? agent1
+                : null
+          }
           winReason={winReason || "victory"}
           winReasonLine={formatWinReason(winReason || "victory")}
         />
@@ -336,19 +472,6 @@ export function StreamingOverlay({
             />
           </div>
         )}
-
-      <footer className="streaming-lower-third">
-        <div className="streaming-lower-third-brand">
-          <span className="streaming-lower-third-mark">Hyperscape</span>
-          <span className="streaming-lower-third-divider" aria-hidden>
-            ·
-          </span>
-          <span className="streaming-lower-third-sub">AI duel arena</span>
-        </div>
-        <p className="streaming-lower-third-status">
-          {publicStreamStatusLine(phase, hasMatchup, bettingConfig)}
-        </p>
-      </footer>
     </div>
   );
 }
@@ -360,36 +483,6 @@ function formatTime(ms: number): string {
   return `${minutes}:${seconds.toString().padStart(2, "0")}`;
 }
 
-/** One line for the lower-third bar (OBS-friendly, readable at a glance). */
-function publicStreamStatusLine(
-  phase: StreamingState["cycle"]["phase"] | undefined,
-  hasMatchup: boolean,
-  betting: StreamingBettingConfig | null,
-): string {
-  switch (phase) {
-    case "IDLE":
-      return hasMatchup
-        ? "Matchup locked — ring opens soon"
-        : "Pairing the next warriors";
-    case "ANNOUNCEMENT":
-      if (betting?.betUrl && hasMatchup) {
-        return "Betting open on this matchup — pick a side before the bell.";
-      }
-      return "Fighters heading to the arena";
-    case "COUNTDOWN":
-      return "Get ready — combat starts after countdown";
-    case "FIGHTING":
-      return "Live — round in progress";
-    case "RESOLUTION":
-      if (betting?.bettingBridgeEnabled && betting?.betUrl) {
-        return "Winner decided — on-chain payouts follow oracle settlement.";
-      }
-      return "Winner decided — next bout loading";
-    default:
-      return "Hyperscape AI duels";
-  }
-}
-
 /** Readable subtitle for victory overlay / interstitials */
 function formatWinReason(reason: string): string {
   const r = reason.toLowerCase().replace(/_/g, " ");
diff --git a/packages/client/src/components/streaming/VictoryOverlay.tsx b/packages/client/src/components/streaming/VictoryOverlay.tsx
index 02bdd0e2c..9e90dd40e 100644
--- a/packages/client/src/components/streaming/VictoryOverlay.tsx
+++ b/packages/client/src/components/streaming/VictoryOverlay.tsx
@@ -8,16 +8,38 @@
 import React, { useEffect, useRef } from "react";
 import type { AgentInfo } from "../../screens/StreamingMode";
 
+function formatWinReason(raw: string): string {
+  switch (raw) {
+    case "hp_advantage":
+      return "by HP advantage";
+    case "damage_advantage":
+      return "by damage dealt";
+    case "timeout":
+    case "time_limit":
+      return "by timeout";
+    case "knockout":
+    case "death":
+    case "killed":
+      return "by knockout";
+    case "draw":
+      return "Draw!";
+    default:
+      return raw.replace(/_/g, " ").replace(/\b\w/g, (c) => c.toUpperCase());
+  }
+}
+
 interface VictoryOverlayProps {
   winner: AgentInfo;
   winReason: string;
+  loser?: AgentInfo | null;
   /** Pre-formatted line for viewers (e.g. "Knockout — HP reached zero.") */
   winReasonLine?: string | null;
 }
 
 export function VictoryOverlay({
   winner,
-  winReason: _winReason,
+  winReason,
+  loser = null,
   winReasonLine,
 }: VictoryOverlayProps) {
   const containerRef = useRef<HTMLDivElement>(null);
@@ -36,9 +58,18 @@ export function VictoryOverlay({
     <div style={styles.container}>
       <div ref={containerRef} className="victory-pulse" style={styles.content}>
         <div style={styles.winnerName}>{winner.name}</div>
-        <div style={styles.winsText}>WINS!</div>
-        {winReasonLine ? (
-          <div style={styles.reasonLine}>{winReasonLine}</div>
+        <div style={styles.winsText}>
+          {winReason === "draw" ? "DRAW!" : "WINS!"}
+        </div>
+        {loser && winReason !== "draw" ? (
+          <div style={styles.defeatedLine}>
+            defeated <span style={styles.loserName}>{loser.name}</span>
+          </div>
+        ) : null}
+        {winReasonLine || winReason ? (
+          <div style={styles.reasonLine}>
+            {winReasonLine ?? formatWinReason(winReason)}
+          </div>
         ) : null}
       </div>
 
@@ -110,4 +141,18 @@ const styles: Record<string, React.CSSProperties> = {
     textShadow: "0 2px 16px rgba(0,0,0,0.9), 0 0 20px rgba(96,165,250,0.12)",
     lineHeight: 1.35,
   },
+  defeatedLine: {
+    color: "rgba(200, 200, 210, 0.72)",
+    fontSize: "clamp(1rem, 3vw, 2rem)",
+    fontWeight: 700,
+    fontFamily: "Impact, sans-serif",
+    letterSpacing: "0.08em",
+    textTransform: "uppercase",
+    textShadow: "0 2px 6px rgba(0,0,0,0.8)",
+    lineHeight: 1.2,
+    marginTop: "0.2em",
+  },
+  loserName: {
+    color: "rgba(255, 255, 255, 0.92)",
+  },
 };
diff --git a/packages/client/src/components/streaming/index.ts b/packages/client/src/components/streaming/index.ts
index f933e7c88..df47376ed 100644
--- a/packages/client/src/components/streaming/index.ts
+++ b/packages/client/src/components/streaming/index.ts
@@ -8,6 +8,7 @@ export { AgentStatsDisplay } from "./AgentStatsDisplay";
 export { LeaderboardPanel } from "./LeaderboardPanel";
 export { CountdownOverlay } from "./CountdownOverlay";
 export { VictoryOverlay } from "./VictoryOverlay";
+export { DamageFloaters } from "./DamageFloaters";
 export { PostFightStatsCard } from "./PostFightStatsCard";
 export { CombatLog } from "./CombatLog";
 export {
diff --git a/packages/client/src/components/streaming/streamCountdown.ts b/packages/client/src/components/streaming/streamCountdown.ts
new file mode 100644
index 000000000..2a455b621
--- /dev/null
+++ b/packages/client/src/components/streaming/streamCountdown.ts
@@ -0,0 +1,110 @@
+import type { StreamingState } from "../../screens/StreamingMode";
+
+export type StreamCountdownHoldState = "preparing_arena" | "starting" | null;
+
+export interface StreamCountdownDisplay {
+  text: string;
+  kind: "timer" | "hold" | "none";
+  holdState: StreamCountdownHoldState;
+  label: string;
+  remainingMs: number | null;
+}
+
+export interface ResolveStreamCountdownDisplayInputs {
+  phase: StreamingState["cycle"]["phase"] | undefined;
+  betCloseTime?: number | null;
+  fightStartTime?: number | null;
+  fallbackTimeRemainingMs?: number | null;
+  nowMs?: number;
+}
+
+function formatTimeCeil(ms: number): string {
+  const totalSeconds = Math.max(0, Math.ceil(ms / 1000));
+  const minutes = Math.floor(totalSeconds / 60);
+  const seconds = totalSeconds % 60;
+  return `${minutes}:${seconds.toString().padStart(2, "0")}`;
+}
+
+export function resolveStreamCountdownDisplay(
+  inputs: ResolveStreamCountdownDisplayInputs,
+): StreamCountdownDisplay {
+  const {
+    phase,
+    betCloseTime = null,
+    fightStartTime = null,
+    fallbackTimeRemainingMs = null,
+    nowMs = Date.now(),
+  } = inputs;
+
+  const targetTimeMs =
+    phase === "ANNOUNCEMENT"
+      ? betCloseTime
+      : phase === "COUNTDOWN"
+        ? fightStartTime
+        : null;
+
+  if (targetTimeMs != null && Number.isFinite(targetTimeMs)) {
+    const remainingMs = Math.max(0, targetTimeMs - nowMs);
+    if (remainingMs > 0) {
+      return {
+        text: formatTimeCeil(remainingMs),
+        kind: "timer",
+        holdState: null,
+        label:
+          phase === "ANNOUNCEMENT"
+            ? "Betting closes"
+            : phase === "COUNTDOWN"
+              ? "Fight starts"
+              : "Timer",
+        remainingMs,
+      };
+    }
+
+    if (phase === "ANNOUNCEMENT") {
+      return {
+        text: "__:__",
+        kind: "hold",
+        holdState: "preparing_arena",
+        label: "",
+        remainingMs: 0,
+      };
+    }
+
+    if (phase === "COUNTDOWN") {
+      return {
+        text: "Starting...",
+        kind: "hold",
+        holdState: "starting",
+        label: "Starting...",
+        remainingMs: 0,
+      };
+    }
+  }
+
+  if (
+    fallbackTimeRemainingMs != null &&
+    Number.isFinite(fallbackTimeRemainingMs) &&
+    fallbackTimeRemainingMs > 0
+  ) {
+    return {
+      text: formatTimeCeil(fallbackTimeRemainingMs),
+      kind: "timer",
+      holdState: null,
+      label:
+        phase === "FIGHTING"
+          ? "Round timer"
+          : phase === "RESOLUTION"
+            ? "Next round"
+            : "Timer",
+      remainingMs: fallbackTimeRemainingMs,
+    };
+  }
+
+  return {
+    text: "",
+    kind: "none",
+    holdState: null,
+    label: "",
+    remainingMs: fallbackTimeRemainingMs,
+  };
+}
diff --git a/packages/client/src/game/CoreUI.tsx b/packages/client/src/game/CoreUI.tsx
index 67832a58d..c1c952e95 100644
--- a/packages/client/src/game/CoreUI.tsx
+++ b/packages/client/src/game/CoreUI.tsx
@@ -61,7 +61,7 @@ function CoreUIContent({ world }: { world: ClientWorld }) {
   // Check if this is spectator mode (from embedded config)
   const isSpectatorMode = (() => {
     const config = window.__HYPERSCAPE_CONFIG__;
-    return config?.mode === "spectator";
+    return config?.mode === "spectator" || config?.mode === "stream";
   })();
 
   // Presentation gating flags
diff --git a/packages/client/src/game/CurvePane.tsx b/packages/client/src/game/CurvePane.tsx
deleted file mode 100644
index 8d7c28fed..000000000
--- a/packages/client/src/game/CurvePane.tsx
+++ /dev/null
@@ -1,170 +0,0 @@
-import React from "react";
-import { useEffect, useRef } from "react";
-import { Curve } from "@hyperscape/shared";
-import { usePane } from "../hooks/usePane";
-
-interface CurvePaneProps {
-  curve: Curve;
-  xLabel: string;
-  xRange?: [number, number];
-  yLabel: string;
-  yMin: number;
-  yMax: number;
-  onCommit: () => void;
-  onCancel: () => void;
-}
-
-export function CurvePane({
-  curve,
-  xLabel,
-  xRange,
-  yLabel,
-  yMin,
-  yMax,
-  onCommit,
-  onCancel,
-}: CurvePaneProps) {
-  const paneRef = useRef<HTMLDivElement | null>(null);
-  const headRef = useRef<HTMLDivElement | null>(null);
-  const canvasRef = useRef<HTMLCanvasElement | null>(null);
-  const editorRef = useRef<{ curve: Curve; canvas: HTMLCanvasElement } | null>(
-    null,
-  );
-
-  usePane(
-    "curve",
-    paneRef as React.RefObject<HTMLElement>,
-    headRef as React.RefObject<HTMLElement>,
-  );
-
-  useEffect(() => {
-    if (!canvasRef.current) return;
-
-    // Initialize curve editor
-    const canvas = canvasRef.current;
-    const ctx = canvas.getContext("2d");
-    if (!ctx) return;
-
-    // Set canvas size
-    const rect = canvas.getBoundingClientRect();
-    canvas.width = rect.width * window.devicePixelRatio;
-    canvas.height = rect.height * window.devicePixelRatio;
-    ctx.scale(window.devicePixelRatio, window.devicePixelRatio);
-
-    // Create editor
-    const editor = {
-      curve,
-      canvas,
-    };
-    editorRef.current = editor;
-
-    // Render curve
-    renderCurve(ctx, curve, rect.width, rect.height, xRange, yMin, yMax);
-
-    return () => {
-      editorRef.current = null;
-    };
-  }, [curve, xRange, yMin, yMax]);
-
-  const renderCurve = (
-    ctx: CanvasRenderingContext2D,
-    curve: Curve,
-    width: number,
-    height: number,
-    xRange: [number, number] | undefined,
-    yMin: number,
-    yMax: number,
-  ) => {
-    ctx.clearRect(0, 0, width, height);
-
-    // Draw grid
-    ctx.strokeStyle = "rgba(255, 255, 255, 0.1)";
-    ctx.lineWidth = 1;
-
-    for (let i = 0; i <= 10; i++) {
-      const x = (i / 10) * width;
-      ctx.beginPath();
-      ctx.moveTo(x, 0);
-      ctx.lineTo(x, height);
-      ctx.stroke();
-
-      const y = (i / 10) * height;
-      ctx.beginPath();
-      ctx.moveTo(0, y);
-      ctx.lineTo(width, y);
-      ctx.stroke();
-    }
-
-    // Draw curve
-    if (curve) {
-      ctx.strokeStyle = "#00a7ff";
-      ctx.lineWidth = 2;
-      ctx.beginPath();
-
-      const range = xRange || [0, 1];
-      for (let x = 0; x < width; x++) {
-        const t = (x / width) * (range[1] - range[0]) + range[0];
-        const y = curve.evaluate(t);
-        const normalizedY = 1 - (y - yMin) / (yMax - yMin);
-        const pixelY = normalizedY * height;
-
-        if (x === 0) {
-          ctx.moveTo(x, pixelY);
-        } else {
-          ctx.lineTo(x, pixelY);
-        }
-      }
-      ctx.stroke();
-    }
-  };
-
-  return (
-    <div
-      ref={paneRef}
-      className="curvepane absolute top-5 left-1/2 -translate-x-1/2 w-[500px] h-[400px] bg-[rgba(22,22,28,1)] border border-white/[0.03] rounded-[10px] shadow-[rgba(0,0,0,0.5)_0px_10px_30px] pointer-events-auto flex flex-col"
-    >
-      <div
-        className="curvepane-head h-[50px] border-b border-white/5 flex items-center px-5"
-        ref={headRef}
-      >
-        <div className="curvepane-head-title flex-1 font-medium">
-          Curve Editor
-        </div>
-        <div
-          className="curvepane-head-close w-10 h-10 flex items-center justify-center text-white/50 hover:text-white cursor-pointer"
-          onClick={onCancel}
-        >
-          ×
-        </div>
-      </div>
-      <div className="curvepane-content flex-1 p-5 flex flex-col">
-        <canvas
-          ref={canvasRef}
-          className="curvepane-canvas w-full flex-1 bg-[#1a1a1a] rounded-[5px] cursor-crosshair"
-        />
-        <div className="curvepane-labels flex justify-between mt-2.5 text-xs text-white/50">
-          <span>
-            {xLabel} ({xRange ? `${xRange[0]} - ${xRange[1]}` : "0 - 1"})
-          </span>
-          <span>
-            {yLabel} ({yMin} - {yMax})
-          </span>
-        </div>
-      </div>
-      <div className="curvepane-footer p-5 border-t border-white/5 flex gap-2.5 justify-end">
-        <button
-          className="curvepane-btn px-4 py-2 rounded-[5px] border-none text-sm cursor-pointer bg-[#333] text-white"
-          onClick={onCancel}
-        >
-          Cancel
-        </button>
-        <button
-          className="curvepane-btn px-4 py-2 rounded-[5px] border-none text-sm cursor-pointer bg-[#00a7ff] text-white"
-          onClick={onCommit}
-        >
-          Apply
-        </button>
-      </div>
-    </div>
-  );
-}
diff --git a/packages/client/src/game/CurvePreview.tsx b/packages/client/src/game/CurvePreview.tsx
deleted file mode 100644
index b67d73073..000000000
--- a/packages/client/src/game/CurvePreview.tsx
+++ /dev/null
@@ -1,103 +0,0 @@
-import { useEffect, useRef } from "react";
-import type { Curve } from "@hyperscape/shared";
-
-interface CurvePreviewProps {
-  curve: Curve;
-  width?: number;
-  height?: number;
-  xRange?: [number, number];
-  yMin?: number;
-  yMax?: number;
-}
-
-export function CurvePreview({
-  curve,
-  width = 200,
-  height = 100,
-  xRange = [0, 1],
-  yMin = 0,
-  yMax = 1,
-}: CurvePreviewProps) {
-  const canvasRef = useRef<HTMLCanvasElement | null>(null);
-  const divRef = useRef<HTMLDivElement | null>(null);
-
-  useEffect(() => {
-    const canvas = canvasRef.current;
-    if (!canvas) return;
-
-    const ctx = canvas.getContext("2d");
-    if (!ctx) return;
-
-    // Set canvas size to match display size
-    canvas.width = width * window.devicePixelRatio;
-    canvas.height = height * window.devicePixelRatio;
-    ctx.scale(window.devicePixelRatio, window.devicePixelRatio);
-
-    // Clear canvas
-    ctx.clearRect(0, 0, width, height);
-
-    // Draw background
-    ctx.fillStyle = "#1a1a1a";
-    ctx.fillRect(0, 0, width, height);
-
-    // Draw grid
-    ctx.strokeStyle = "rgba(255, 255, 255, 0.1)";
-    ctx.lineWidth = 1;
-
-    // Vertical grid lines
-    for (let i = 0; i <= 4; i++) {
-      const x = (i / 4) * width;
-      ctx.beginPath();
-      ctx.moveTo(x, 0);
-      ctx.lineTo(x, height);
-      ctx.stroke();
-    }
-
-    // Horizontal grid lines
-    for (let i = 0; i <= 4; i++) {
-      const y = (i / 4) * height;
-      ctx.beginPath();
-      ctx.moveTo(0, y);
-      ctx.lineTo(width, y);
-      ctx.stroke();
-    }
-
-    // Draw curve
-    if (curve) {
-      ctx.strokeStyle = "#00a7ff";
-      ctx.lineWidth = 2;
-      ctx.beginPath();
-
-      let first = true;
-      for (let x = 0; x < width; x++) {
-        const t = (x / width) * (xRange[1] - xRange[0]) + xRange[0];
-        const y = curve.evaluate(t);
-
-        // Normalize y value to canvas coordinates
-        const normalizedY = 1 - (y - yMin) / (yMax - yMin);
-        const pixelY = Math.max(0, Math.min(height, normalizedY * height));
-
-        if (first) {
-          ctx.moveTo(x, pixelY);
-          first = false;
-        } else {
-          ctx.lineTo(x, pixelY);
-        }
-      }
-      ctx.stroke();
-    }
-  }, [curve, width, height, xRange, yMin, yMax]);
-
-  return (
-    <div
-      ref={divRef}
-      className="border border-white/10 rounded overflow-hidden"
-      style={{
-        width: `${width}px`,
-        height: `${height}px`,
-      }}
-    >
-      <canvas ref={canvasRef} className="w-full h-full block" />
-    </div>
-  );
-}
diff --git a/packages/client/src/game/EmbeddedGameClient.tsx b/packages/client/src/game/EmbeddedGameClient.tsx
index 89a2a9b92..95a493c59 100644
--- a/packages/client/src/game/EmbeddedGameClient.tsx
+++ b/packages/client/src/game/EmbeddedGameClient.tsx
@@ -14,6 +14,10 @@ import { cloneEmbeddedConfig } from "../lib/embedded-entry";
 import type { World } from "@hyperscape/shared";
 import { EventType } from "@hyperscape/shared";
 import { logger } from "../lib/logger";
+import {
+  findStreamingTargetEntity,
+  isTargetAvatarReady,
+} from "../lib/streamingReadiness";
 import { getStreamingAccessToken } from "../lib/streamingAccessToken";
 
 /** API base URL derived from WebSocket URL */
@@ -83,85 +87,10 @@ type PrefsSystem = {
   setWaterReflections?: (value: boolean) => void;
 };
 
-function isTargetAvatarReady(world: World, targetEntityId: string): boolean {
-  const playerDirect = world.entities?.players?.get(targetEntityId) as
-    | { avatar?: unknown }
-    | undefined;
-  if (playerDirect?.avatar) {
-    return true;
-  }
-
-  if (world.entities?.players) {
-    for (const [, player] of world.entities.players) {
-      const candidate = player as {
-        id?: string;
-        characterId?: string;
-        avatar?: unknown;
-      };
-      if (
-        (candidate.id === targetEntityId ||
-          candidate.characterId === targetEntityId) &&
-        candidate.avatar
-      ) {
-        return true;
-      }
-    }
-  }
-
-  return false;
-}
-
-function findEntityBySpectatorTarget(
-  world: World,
-  targetEntityId: string,
-): unknown | null {
-  const directMatch =
-    world.entities?.items?.get(targetEntityId) ||
-    world.entities?.players?.get(targetEntityId);
-  if (directMatch) {
-    return directMatch;
-  }
-
-  if (world.entities?.items) {
-    for (const [id, entity] of world.entities.items) {
-      const candidate = entity as {
-        id?: string;
-        characterId?: string;
-        data?: { id?: string; characterId?: string };
-      };
-      if (
-        id === targetEntityId ||
-        candidate.id === targetEntityId ||
-        candidate.characterId === targetEntityId ||
-        candidate.data?.id === targetEntityId ||
-        candidate.data?.characterId === targetEntityId
-      ) {
-        return entity;
-      }
-    }
-  }
-
-  if (world.entities?.players) {
-    for (const [id, player] of world.entities.players) {
-      const candidate = player as {
-        id?: string;
-        characterId?: string;
-        data?: { id?: string; characterId?: string };
-      };
-      if (
-        id === targetEntityId ||
-        candidate.id === targetEntityId ||
-        candidate.characterId === targetEntityId ||
-        candidate.data?.id === targetEntityId ||
-        candidate.data?.characterId === targetEntityId
-      ) {
-        return player;
-      }
-    }
-  }
-
-  return null;
-}
+// `isTargetAvatarReady` and the spectator target lookup moved to
+// `../lib/streamingReadiness` so EmbeddedGameClient and StreamingMode share a
+// single source of truth. The local lookup used to be named
+// `findEntityBySpectatorTarget`; call sites now use `findStreamingTargetEntity`.
 
 /**
  * Disable all player input controls (spectator mode)
@@ -232,7 +161,7 @@ function setupSpectatorCamera(
   // 1. There's no local player entity to control
   // 2. The client-input system may not be fully initialized
   // 3. Spectators are read-only viewers by design
-  if (config.mode === "spectator") {
+  if (isSpectatorLikeMode(config.mode)) {
     logger.log(
       "[EmbeddedGameClient] Spectator mode - player controls not applicable (no local player)",
     );
@@ -256,7 +185,7 @@ function setupSpectatorCamera(
    */
   const findLiveEntity = (entityId: string) => {
     // Resolve by both entity-id and character-id aliases.
-    const fromCollections = findEntityBySpectatorTarget(world, entityId);
+    const fromCollections = findStreamingTargetEntity(world, entityId);
     if (fromCollections) return fromCollections;
 
     // Try entity-manager as fallback
@@ -351,7 +280,7 @@ function setupSpectatorCamera(
     onCameraLocked?.();
 
     // Ensure controls are still disabled (belt and suspenders)
-    if (config.mode === "spectator") {
+    if (isSpectatorLikeMode(config.mode)) {
       disablePlayerControls(world);
     }
   };
@@ -516,6 +445,10 @@ function applyQualityPresets(world: World, _config: EmbeddedViewportConfig) {
   prefs.setWaterReflections?.(quality.shadows !== "none");
 }
 
+function isSpectatorLikeMode(mode: EmbeddedViewportConfig["mode"] | undefined) {
+  return mode === "spectator" || mode === "stream";
+}
+
 /**
  * Embedded Game Client Component
  */
@@ -570,7 +503,7 @@ export function EmbeddedGameClient() {
       return;
     }
 
-    const isSpectatorMode = embeddedConfig.mode === "spectator";
+    const isSpectatorMode = isSpectatorLikeMode(embeddedConfig.mode);
 
     // Check if auth token is already available
     if (embeddedConfig.authToken) {
@@ -758,7 +691,7 @@ export function EmbeddedGameClient() {
   }, []);
 
   useEffect(() => {
-    if (!config || config.mode !== "spectator") {
+    if (!config || !isSpectatorLikeMode(config.mode)) {
       setMinimumLoadElapsed(true);
       return;
     }
@@ -806,7 +739,7 @@ export function EmbeddedGameClient() {
           return;
         }
 
-        if (config.mode === "spectator") {
+        if (isSpectatorLikeMode(config.mode)) {
           const targetId =
             getServerAssignedSpectatorFollowEntity(world) ||
             config.followEntity ||
@@ -815,7 +748,7 @@ export function EmbeddedGameClient() {
             return;
           }
 
-          const targetEntity = findEntityBySpectatorTarget(world, targetId);
+          const targetEntity = findStreamingTargetEntity(world, targetId);
           const targetPosition = (
             targetEntity as
               | {
@@ -873,7 +806,7 @@ export function EmbeddedGameClient() {
         getServerAssignedSpectatorFollowEntity(world) ||
         config.followEntity ||
         config.characterId;
-      const needsTargetAvatar = config.mode === "spectator";
+      const needsTargetAvatar = isSpectatorLikeMode(config.mode);
       const checkAvatarReady = () => {
         const targetEntityId = resolveTargetEntityId();
         if (!targetEntityId) {
@@ -978,7 +911,7 @@ export function EmbeddedGameClient() {
   // The auth credentials are passed via window.__HYPERSCAPE_CONFIG__ which ClientNetwork reads
   const wsUrl = (() => {
     const url = new URL(config.wsUrl, window.location.href);
-    if (config.mode === "spectator") {
+    if (isSpectatorLikeMode(config.mode)) {
       url.searchParams.set("mode", "spectator");
       url.searchParams.set(
         "followEntity",
@@ -993,7 +926,8 @@ export function EmbeddedGameClient() {
     return url.toString();
   })();
 
-  const requiresCameraLock = config.mode === "spectator";
+  const spectatorLikeMode = isSpectatorLikeMode(config.mode);
+  const requiresCameraLock = spectatorLikeMode;
   const showLoading =
     !minimumLoadElapsed ||
     !worldReady ||
@@ -1033,8 +967,8 @@ export function EmbeddedGameClient() {
       <GameClient
         wsUrl={wsUrl}
         onSetup={handleSetup}
-        hideUI={config.mode === "spectator"}
-        streamingMode={config.mode === "spectator"}
+        hideUI={spectatorLikeMode}
+        streamingMode={spectatorLikeMode}
       />
       {showLoading && worldRef.current && (
         <div style={{ zIndex: 100, position: "absolute", inset: 0 }}>
diff --git a/packages/client/src/game/Fields.tsx b/packages/client/src/game/Fields.tsx
deleted file mode 100644
index 4c9ad7199..000000000
--- a/packages/client/src/game/Fields.tsx
+++ /dev/null
@@ -1,956 +0,0 @@
-import { useContext, useEffect, useMemo, useRef, useState } from "react";
-import { Curve, downloadFile, hashFile } from "@hyperscape/shared";
-import type { ClientWorld } from "../types";
-import { CurvePane } from "./CurvePane";
-import { CurvePreview } from "./CurvePreview";
-import { HintContext, Portal } from "@/ui";
-import { useUpdate } from "../hooks/useUpdate";
-
-interface LoadingFile {
-  type: string;
-  name: string;
-  url: string;
-}
-
-interface SwitchOption {
-  label: string;
-  value: unknown;
-}
-
-interface FieldTextProps {
-  label: string;
-  hint?: string;
-  placeholder?: string;
-  value: string;
-  onChange: (value: string) => void;
-}
-
-interface FieldTextareaProps {
-  label: string;
-  hint?: string;
-  placeholder?: string;
-  value: string;
-  onChange: (value: string) => void;
-}
-
-interface FieldSwitchProps {
-  label: string;
-  hint?: string;
-  options: SwitchOption[];
-  value: unknown;
-  onChange: (value: unknown) => void;
-}
-
-interface FieldToggleProps {
-  label: string;
-  hint?: string;
-  trueLabel?: string;
-  falseLabel?: string;
-  value: boolean;
-  onChange: (value: boolean) => void;
-}
-
-interface FieldRangeProps {
-  label: string;
-  hint?: string;
-  min?: number;
-  max?: number;
-  step?: number;
-  instant?: boolean;
-  value: number;
-  onChange: (value: number) => void;
-}
-
-interface FieldFileProps {
-  world: ClientWorld;
-  label: string;
-  hint?: string;
-  kind: keyof typeof fileKinds;
-  value: { type?: string; name?: string; url?: string } | null;
-  onChange: (value: LoadingFile | null) => void;
-}
-
-interface FieldNumberProps {
-  label: string;
-  hint?: string;
-  dp?: number;
-  min?: number;
-  max?: number;
-  step?: number;
-  bigStep?: number;
-  value: number;
-  onChange: (value: number) => void;
-}
-
-interface FieldVec3Props {
-  label: string;
-  hint?: string;
-  dp?: number;
-  min?: number;
-  max?: number;
-  step?: number;
-  bigStep?: number;
-  value: [number, number, number];
-  onChange: (value: [number, number, number]) => void;
-}
-
-interface FieldCurveProps {
-  label: string;
-  hint?: string;
-  x: string;
-  xRange?: number;
-  y: string;
-  yMin: number;
-  yMax: number;
-  value: string;
-  onChange: (value: string) => void;
-}
-
-interface FieldBtnProps {
-  label: string;
-  note?: string;
-  hint?: string;
-  nav?: boolean;
-  onClick: () => void;
-}
-
-export function FieldText({
-  label,
-  hint,
-  placeholder,
-  value,
-  onChange,
-}: FieldTextProps) {
-  const hintContext = useContext(HintContext);
-  if (!hintContext) {
-    throw new Error("HintContext not found");
-  }
-  const setHint = hintContext.setHint;
-  return (
-    <label
-      className="field field-text block mb-1.5 relative"
-      onPointerEnter={() => hint && setHint(hint)}
-      onPointerLeave={() => hint && setHint(null)}
-    >
-      <div className="field-label text-[8px] mb-1 text-white/70 font-medium">
-        {label}
-      </div>
-      <input
-        type="text"
-        placeholder={placeholder}
-        value={value}
-        onChange={(e) => onChange(e.target.value)}
-        className="w-full text-[8px] py-1 px-1.5 bg-white/5 border border-white/10 rounded text-white hover:bg-white/10 hover:border-white/20 focus:bg-white/10 focus:border-white/30 focus:outline-none"
-        onKeyDown={(e) => {
-          if (e.code === "Escape") {
-            const target = e.target as HTMLInputElement;
-            target.blur();
-          }
-        }}
-      />
-    </label>
-  );
-}
-
-export function FieldTextarea({
-  label,
-  hint,
-  placeholder,
-  value,
-  onChange,
-}: FieldTextareaProps) {
-  const hintContext = useContext(HintContext);
-  if (!hintContext) {
-    throw new Error("HintContext not found");
-  }
-  const setHint = hintContext.setHint;
-  const textareaRef = useRef<HTMLTextAreaElement | null>(null);
-  useEffect(() => {
-    const textarea = textareaRef.current;
-    if (!textarea) return;
-    function update() {
-      if (!textarea) return;
-      textarea.style.height = "auto";
-      textarea.style.height = textarea.scrollHeight + "px";
-    }
-    update();
-    textarea.addEventListener("input", update);
-    return () => {
-      textarea.removeEventListener("input", update);
-    };
-  }, []);
-  return (
-    <label
-      className="field field-textarea block mb-2 relative"
-      onPointerEnter={() => hint && setHint(hint)}
-      onPointerLeave={() => hint && setHint(null)}
-    >
-      <div className="field-label text-[0.8125rem] mb-1.5 text-white/70 font-medium">
-        {label}
-      </div>
-      <textarea
-        ref={textareaRef}
-        placeholder={placeholder}
-        value={value}
-        onChange={(e) => onChange(e.target.value)}
-        className="w-full text-sm py-1.5 px-2 bg-white/5 border border-white/10 rounded resize-none min-h-12 text-white hover:bg-white/10 hover:border-white/20 focus:bg-white/10 focus:border-white/30 focus:outline-none"
-        onKeyDown={(e) => {
-          if (e.code === "Escape") {
-            const target = e.target as HTMLTextAreaElement;
-            target.blur();
-          }
-        }}
-      />
-    </label>
-  );
-}
-
-export function FieldSwitch({
-  label,
-  hint,
-  options,
-  value,
-  onChange,
-}: FieldSwitchProps) {
-  const hintContext = useContext(HintContext);
-  if (!hintContext) {
-    throw new Error("HintContext not found");
-  }
-  const setHint = hintContext.setHint;
-  const idx = options.findIndex((o: SwitchOption) => o.value === value);
-  const prev = () => {
-    const newIdx = idx - 1;
-    if (newIdx < 0) {
-      onChange(options[options.length - 1].value);
-    } else {
-      onChange(options[newIdx].value);
-    }
-  };
-  const next = () => {
-    const newIdx = idx + 1;
-    if (newIdx >= options.length) {
-      onChange(options[0].value);
-    } else {
-      onChange(options[newIdx].value);
-    }
-  };
-  return (
-    <div
-      className="field field-switch mb-1.5"
-      onPointerEnter={() => hint && setHint(hint)}
-      onPointerLeave={() => hint && setHint(null)}
-    >
-      <div className="field-label text-[8px] mb-1 text-white/70 font-medium">
-        {label}
-      </div>
-      <div className="field-switch-control flex items-center gap-1.5 text-[8px]">
-        <div
-          className="field-switch-btn w-5 h-5 flex items-center justify-center bg-white/5 border border-white/10 rounded cursor-pointer hover:bg-white/10 hover:border-white/20"
-          onClick={prev}
-        >
-          ‹
-        </div>
-        <div className="field-switch-value flex-1 text-center text-white">
-          {options[idx]?.label || ""}
-        </div>
-        <div
-          className="field-switch-btn w-5 h-5 flex items-center justify-center bg-white/5 border border-white/10 rounded cursor-pointer hover:bg-white/10 hover:border-white/20"
-          onClick={next}
-        >
-          ›
-        </div>
-      </div>
-    </div>
-  );
-}
-
-export function FieldToggle({
-  label,
-  hint,
-  trueLabel = "Yes",
-  falseLabel = "No",
-  value,
-  onChange,
-}: FieldToggleProps) {
-  return (
-    <FieldSwitch
-      label={label}
-      hint={hint}
-      options={[
-        { label: falseLabel, value: false },
-        { label: trueLabel, value: true },
-      ]}
-      value={value}
-      onChange={(val: unknown) => onChange(val as boolean)}
-    />
-  );
-}
-
-export function FieldRange({
-  label,
-  hint,
-  min = 0,
-  max = 1,
-  step = 0.05,
-  instant,
-  value,
-  onChange,
-}: FieldRangeProps) {
-  const hintContext = useContext(HintContext);
-  if (!hintContext) {
-    throw new Error("HintContext not found");
-  }
-  const setHint = hintContext.setHint;
-  const trackRef = useRef<HTMLDivElement | null>(null);
-  if (value === undefined || value === null) {
-    value = 0;
-  }
-  const [local, setLocal] = useState(value);
-  const [sliding, setSliding] = useState(false);
-  useEffect(() => {
-    if (!sliding && local !== value) setLocal(value);
-  }, [sliding, value, local]);
-  useEffect(() => {
-    const track = trackRef.current;
-    if (!track) return;
-    function calculateValueFromPointer(
-      e: PointerEvent,
-      trackElement: HTMLElement,
-    ) {
-      const rect = trackElement.getBoundingClientRect();
-      const position = (e.clientX - rect.left) / rect.width;
-      const rawValue = min + position * (max - min);
-      // Round to nearest step
-      const steppedValue = Math.round(rawValue / step) * step;
-      // Clamp between min and max
-      return Math.max(min, Math.min(max, steppedValue));
-    }
-    let sliding = false;
-    function onPointerDown(e: PointerEvent) {
-      sliding = true;
-      setSliding(true);
-      const newValue = calculateValueFromPointer(
-        e,
-        e.currentTarget as HTMLElement,
-      );
-      setLocal(newValue);
-      if (instant) onChange(newValue);
-      (e.currentTarget as HTMLElement).setPointerCapture(e.pointerId);
-    }
-    function onPointerMove(e: PointerEvent) {
-      if (!sliding) return;
-      const newValue = calculateValueFromPointer(
-        e,
-        e.currentTarget as HTMLElement,
-      );
-      setLocal(newValue);
-      if (instant) onChange(newValue);
-    }
-    function onPointerUp(e: PointerEvent) {
-      if (!sliding) return;
-      sliding = false;
-      setSliding(false);
-      const finalValue = calculateValueFromPointer(
-        e,
-        e.currentTarget as HTMLElement,
-      );
-      setLocal(finalValue);
-      onChange(finalValue);
-      (e.currentTarget as HTMLElement).releasePointerCapture(e.pointerId);
-    }
-    track.addEventListener("pointerdown", onPointerDown);
-    track.addEventListener("pointermove", onPointerMove);
-    track.addEventListener("pointerup", onPointerUp);
-    return () => {
-      track.removeEventListener("pointerdown", onPointerDown);
-      track.removeEventListener("pointermove", onPointerMove);
-      track.removeEventListener("pointerup", onPointerUp);
-    };
-  }, [min, max, step, instant, onChange]);
-  const barWidthPercentage = ((local - min) / (max - min)) * 100 + "";
-  const text = useMemo(() => {
-    const num = local;
-    const decimalDigits = (num.toString().split(".")[1] || "").length;
-    if (decimalDigits <= 2) {
-      return num.toString();
-    }
-    return num.toFixed(2);
-  }, [local]);
-  const [isHovered, setIsHovered] = useState(false);
-
-  return (
-    <div
-      className={`fieldrange flex items-center h-7 px-2 ${isHovered ? "bg-white/[0.03]" : "bg-transparent"}`}
-      onPointerEnter={() => {
-        hint && setHint(hint);
-        setIsHovered(true);
-      }}
-      onPointerLeave={() => {
-        hint && setHint(null);
-        setIsHovered(false);
-      }}
-    >
-      <div className="fieldrange-label flex-1 whitespace-nowrap overflow-hidden text-ellipsis text-[8px] text-white/70 pr-2">
-        {label}
-      </div>
-      <div
-        className={`fieldrange-text text-[7px] font-medium text-white mr-1.5 ${isHovered ? "opacity-100" : "opacity-0"}`}
-      >
-        {text}
-      </div>
-      <div
-        className="fieldrange-track w-20 shrink-0 h-1.5 rounded-sm flex items-stretch bg-white/10 cursor-pointer"
-        ref={trackRef}
-      >
-        <div
-          className="fieldrange-bar bg-white rounded-sm"
-          style={{ width: `${barWidthPercentage}%` }}
-        />
-      </div>
-    </div>
-  );
-}
-
-export const fileKinds = {
-  avatar: {
-    type: "avatar",
-    accept: ".vrm",
-    exts: ["vrm"],
-    placeholder: "vrm",
-  },
-  emote: {
-    type: "emote",
-    accept: ".glb",
-    exts: ["glb"],
-    placeholder: "glb",
-  },
-  model: {
-    type: "model",
-    accept: ".glb",
-    exts: ["glb"],
-    placeholder: "glb",
-  },
-  texture: {
-    type: "texture",
-    accept: ".jpg,.jpeg,.png,.webp",
-    exts: ["jpg", "jpeg", "png", "webp"],
-    placeholder: "jpg,png,webp",
-  },
-  image: {
-    type: "image",
-    accept: ".jpg,.jpeg,.png,.webp",
-    exts: ["jpg", "jpeg", "png", "webp"],
-    placeholder: "jpg,png,webp",
-  },
-  video: {
-    type: "video",
-    accept: ".mp4",
-    exts: ["mp4"],
-    placeholder: "mp4",
-  },
-  hdr: {
-    type: "hdr",
-    accept: ".hdr",
-    exts: ["hdr"],
-    placeholder: "hdr",
-  },
-  audio: {
-    type: "audio",
-    accept: ".mp3",
-    exts: ["mp3"],
-    placeholder: "mp3",
-  },
-};
-
-export function FieldFile({
-  world,
-  label,
-  hint,
-  kind: kindName,
-  value,
-  onChange,
-}: FieldFileProps) {
-  const hintContext = useContext(HintContext);
-  if (!hintContext) {
-    throw new Error("HintContext not found");
-  }
-  const setHint = hintContext.setHint;
-  const nRef = useRef(0);
-  const update = useUpdate();
-  const [loading, setLoading] = useState<LoadingFile | null>(null);
-  const kind = fileKinds[kindName];
-  if (!kind) return null; // invalid?
-  const set = async (e: React.ChangeEvent<HTMLInputElement>) => {
-    // trigger input rebuild
-    const n = ++nRef.current;
-    update();
-    // get file
-    const file = e.target.files?.[0];
-    if (!file) return;
-    // check ext
-    const ext = file.name.split(".").pop()?.toLowerCase();
-    if (!ext || !kind.exts.includes(ext)) {
-      return console.error(
-        `attempted invalid file extension for ${String(kindName)}: ${ext}`,
-      );
-    }
-    // immutable hash the file
-    const hash = await hashFile(file);
-    // use hash as glb filename
-    const filename = `${hash}.${ext}`;
-    // canonical url to this file
-    const url = `asset://${filename}`;
-    // show loading
-    const newValue: LoadingFile = {
-      type: kind.type,
-      name: file.name,
-      url,
-    };
-    setLoading(newValue);
-    // Upload file - strong type assumption that network has upload method
-    const networkWithUpload = world.network as {
-      upload: (file: File) => Promise<unknown>;
-    };
-    await networkWithUpload.upload(file);
-    // ignore if new value/upload
-    if (nRef.current !== n) return;
-    // cache file locally so this client can insta-load it
-    if (world.loader) {
-      world.loader.insert(kind.type, url, file);
-    }
-    // apply!
-    setLoading(null);
-    onChange(newValue);
-  };
-  const remove = (e: React.MouseEvent) => {
-    e.preventDefault();
-    e.stopPropagation();
-    onChange(null);
-  };
-  const handleDownload = (e: React.MouseEvent) => {
-    const fileValue = value as { url?: string; name?: string } | null;
-    if (e.shiftKey && fileValue?.url && world.loader) {
-      e.preventDefault();
-      const file = world.loader.getFile(fileValue.url, fileValue.name);
-      if (!file) return;
-      downloadFile(file);
-    }
-  };
-  const n = nRef.current;
-  const fileValue = value as { name?: string } | null;
-  const name = loading?.name || fileValue?.name;
-  return (
-    <label
-      className="fieldfile flex items-center h-10 px-4 overflow-hidden"
-      onPointerEnter={() => hint && setHint(hint)}
-      onPointerLeave={() => hint && setHint(null)}
-      onClick={handleDownload}
-    >
-      <div className="fieldfile-label flex-1 whitespace-nowrap overflow-hidden text-ellipsis pr-4 text-[0.9375rem] text-white/70">
-        {label}
-      </div>
-      {!value && !loading && (
-        <div className="fieldfile-placeholder text-white/50">
-          {kind.placeholder}
-        </div>
-      )}
-      {name && (
-        <div className="fieldfile-name text-[0.9375rem] text-right whitespace-nowrap overflow-hidden text-ellipsis max-w-36 text-white">
-          {name}
-        </div>
-      )}
-      {!!value && !loading && (
-        <div
-          className="fieldfile-x leading-none -mr-0.5 ml-1 text-white/50 hover:text-white cursor-pointer"
-          onClick={remove}
-        >
-          ×
-        </div>
-      )}
-      {loading && (
-        <div className="fieldfile-loading -mr-px ml-1 flex items-center justify-center text-white">
-          ⟳
-        </div>
-      )}
-      <input key={n} type="file" onChange={set} accept={kind.accept} />
-    </label>
-  );
-}
-
-export function FieldNumber({
-  label,
-  hint,
-  dp = 0,
-  min = -Infinity,
-  max = Infinity,
-  step = 1,
-  bigStep = 2,
-  value,
-  onChange,
-}: FieldNumberProps) {
-  const hintContext = useContext(HintContext);
-  if (!hintContext) {
-    throw new Error("HintContext not found");
-  }
-  const setHint = hintContext.setHint;
-  if (value === undefined || value === null) {
-    value = 0;
-  }
-  const [local, setLocal] = useState(value.toFixed(dp));
-  const [focused, setFocused] = useState(false);
-  useEffect(() => {
-    if (!focused && local !== value.toFixed(dp)) setLocal(value.toFixed(dp));
-  }, [focused, value, local, dp]);
-  const setTo = (str: string) => {
-    // Parse math expression - eval returns a number
-    let num = (0, eval)(str) as number;
-    if (num < min || num > max) {
-      num = value;
-    }
-    setLocal(num.toFixed(dp));
-    onChange(+num.toFixed(dp));
-  };
-  const [isHovered, setIsHovered] = useState(false);
-
-  return (
-    <label
-      className={`fieldnumber flex items-center h-10 px-4 cursor-text ${isHovered ? "bg-white/[0.03]" : "bg-transparent"}`}
-      onPointerEnter={() => {
-        hint && setHint(hint);
-        setIsHovered(true);
-      }}
-      onPointerLeave={() => {
-        hint && setHint(null);
-        setIsHovered(false);
-      }}
-    >
-      <div className="fieldnumber-label w-[9.4rem] shrink-0 whitespace-nowrap overflow-hidden text-ellipsis text-[0.9375rem] text-white/70">
-        {label}
-      </div>
-      <div className="fieldnumber-field flex-1">
-        <input
-          type="text"
-          value={local}
-          onChange={(e) => setLocal(e.target.value)}
-          className="text-[0.9375rem] h-4 text-right overflow-hidden cursor-inherit bg-transparent border-none text-white w-full focus:outline-none"
-          onKeyDown={(e) => {
-            if (e.code === "Enter") {
-              e.preventDefault();
-              (e.target as HTMLInputElement).blur();
-            }
-            if (e.code === "ArrowUp") {
-              const amount = e.shiftKey ? bigStep : step;
-              setTo((value + amount).toString());
-            }
-            if (e.code === "ArrowDown") {
-              const amount = e.shiftKey ? bigStep : step;
-              setTo((value - amount).toString());
-            }
-          }}
-          onFocus={(e) => {
-            setFocused(true);
-            e.target.select();
-          }}
-          onBlur={(_e) => {
-            setFocused(false);
-            // if blank, set back to original
-            if (local === "") {
-              setLocal(value.toFixed(dp));
-              return;
-            }
-            // otherwise run through pipeline
-            setTo(local);
-          }}
-        />
-      </div>
-    </label>
-  );
-}
-
-export function FieldVec3({
-  label,
-  hint,
-  dp = 0,
-  min = -Infinity,
-  max = Infinity,
-  step = 1,
-  bigStep = 2,
-  value,
-  onChange,
-}: FieldVec3Props) {
-  const hintContext = useContext(HintContext);
-  if (!hintContext) {
-    throw new Error("HintContext not found");
-  }
-  const setHint = hintContext.setHint;
-  const valueX = value?.[0] || 0;
-  const valueY = value?.[1] || 0;
-  const valueZ = value?.[2] || 0;
-  const [localX, setLocalX] = useState(valueX.toFixed(dp));
-  const [localY, setLocalY] = useState(valueY.toFixed(dp));
-  const [localZ, setLocalZ] = useState(valueZ.toFixed(dp));
-  const [focused, setFocused] = useState(false);
-  useEffect(() => {
-    if (!focused) {
-      if (localX !== valueX.toFixed(dp)) setLocalX(valueX.toFixed(dp));
-      if (localY !== valueY.toFixed(dp)) setLocalY(valueY.toFixed(dp));
-      if (localZ !== valueZ.toFixed(dp)) setLocalZ(valueZ.toFixed(dp));
-    }
-  }, [focused, valueX, valueY, valueZ, localX, localY, localZ, dp]);
-  const parseStr = (str: string) => {
-    // Parse math expression - eval returns a number
-    let num = (0, eval)(str) as number;
-    if (num < min || num > max) {
-      num = 0;
-    }
-    return num;
-  };
-  const [isHovered, setIsHovered] = useState(false);
-
-  return (
-    <label
-      className={`fieldvec3 flex items-center h-10 px-4 cursor-text ${isHovered ? "bg-white/[0.03]" : "bg-transparent"}`}
-      onPointerEnter={() => {
-        hint && setHint(hint);
-        setIsHovered(true);
-      }}
-      onPointerLeave={() => {
-        hint && setHint(null);
-        setIsHovered(false);
-      }}
-    >
-      <div className="fieldvec3-label w-[9.4rem] shrink-0 whitespace-nowrap overflow-hidden text-ellipsis text-[0.9375rem] text-white/70">
-        {label}
-      </div>
-      <div className="fieldvec3-field flex-1 flex items-center gap-2">
-        <input
-          type="text"
-          value={localX}
-          onChange={(e) => setLocalX(e.target.value)}
-          className="text-[0.9375rem] h-4 text-right overflow-hidden cursor-inherit bg-transparent border-none text-white flex-1 focus:outline-none"
-          onKeyDown={(e) => {
-            if (e.code === "Enter") {
-              e.preventDefault();
-              (e.target as HTMLInputElement).blur();
-            }
-            if (e.code === "ArrowUp") {
-              const amount = e.shiftKey ? bigStep : step;
-              const num = parseStr((valueX + amount).toString());
-              setLocalX(num.toFixed(dp));
-              onChange([+num.toFixed(dp), valueY, valueZ]);
-            }
-            if (e.code === "ArrowDown") {
-              const amount = e.shiftKey ? bigStep : step;
-              const num = parseStr((valueX - amount).toString());
-              setLocalX(num.toFixed(dp));
-              onChange([+num.toFixed(dp), valueY, valueZ]);
-            }
-          }}
-          onFocus={(e) => {
-            setFocused(true);
-            e.target.select();
-          }}
-          onBlur={(_e) => {
-            setFocused(false);
-            // if blank, set back to original
-            if (localX === "") {
-              setLocalX(valueX.toFixed(dp));
-              return;
-            }
-            // otherwise run through pipeline
-            const num = parseStr(localX);
-            setLocalX(num.toFixed(dp));
-            onChange([+num.toFixed(dp), valueY, valueZ]);
-          }}
-        />
-        <input
-          type="text"
-          value={localY}
-          onChange={(e) => setLocalY(e.target.value)}
-          className="text-[0.9375rem] h-4 text-right overflow-hidden cursor-inherit bg-transparent border-none text-white flex-1 focus:outline-none"
-          onKeyDown={(e) => {
-            if (e.code === "Enter") {
-              e.preventDefault();
-              (e.target as HTMLInputElement).blur();
-            }
-            if (e.code === "ArrowUp") {
-              const amount = e.shiftKey ? bigStep : step;
-              const num = parseStr((valueY + amount).toString());
-              setLocalY(num.toFixed(dp));
-              onChange([valueX, +num.toFixed(dp), valueZ]);
-            }
-            if (e.code === "ArrowDown") {
-              const amount = e.shiftKey ? bigStep : step;
-              const num = parseStr((valueY - amount).toString());
-              setLocalY(num.toFixed(dp));
-              onChange([valueX, +num.toFixed(dp), valueZ]);
-            }
-          }}
-          onFocus={(e) => {
-            setFocused(true);
-            e.target.select();
-          }}
-          onBlur={(_e) => {
-            setFocused(false);
-            // if blank, set back to original
-            if (localY === "") {
-              setLocalY(valueY.toFixed(dp));
-              return;
-            }
-            // otherwise run through pipeline
-            const num = parseStr(localY);
-            setLocalY(num.toFixed(dp));
-            onChange([valueX, +num.toFixed(dp), valueZ]);
-          }}
-        />
-        <input
-          type="text"
-          value={localZ}
-          onChange={(e) => setLocalZ(e.target.value)}
-          className="text-[0.9375rem] h-4 text-right overflow-hidden cursor-inherit bg-transparent border-none text-white flex-1 focus:outline-none"
-          onKeyDown={(e) => {
-            if (e.code === "Enter") {
-              e.preventDefault();
-              (e.target as HTMLInputElement).blur();
-            }
-            if (e.code === "ArrowUp") {
-              const amount = e.shiftKey ? bigStep : step;
-              const num = parseStr((valueZ + amount).toString());
-              setLocalZ(num.toFixed(dp));
-              onChange([valueX, valueY, +num.toFixed(dp)]);
-            }
-            if (e.code === "ArrowDown") {
-              const amount = e.shiftKey ? bigStep : step;
-              const num = parseStr((valueZ - amount).toString());
-              setLocalZ(num.toFixed(dp));
-              onChange([valueX, valueY, +num.toFixed(dp)]);
-            }
-          }}
-          onFocus={(e) => {
-            setFocused(true);
-            e.target.select();
-          }}
-          onBlur={(_e) => {
-            setFocused(false);
-            // if blank, set back to original
-            if (localZ === "") {
-              setLocalZ(valueZ.toFixed(dp));
-              return;
-            }
-            // otherwise run through pipeline
-            const num = parseStr(localZ);
-            setLocalZ(num.toFixed(dp));
-            onChange([valueX, valueY, +num.toFixed(dp)]);
-          }}
-        />
-      </div>
-    </label>
-  );
-}
-
-export function FieldCurve({
-  label,
-  hint,
-  x,
-  xRange,
-  y,
-  yMin,
-  yMax,
-  value,
-  onChange,
-}: FieldCurveProps) {
-  const hintContext = useContext(HintContext);
-  if (!hintContext) {
-    throw new Error("HintContext not found");
-  }
-  const setHint = hintContext.setHint;
-  const curve = useMemo(
-    () => new Curve().deserialize(value || "0,0.5,0,0|1,0.5,0,0"),
-    [value],
-  );
-  const [edit, setEdit] = useState<Curve | false>(false);
-  const [isHovered, setIsHovered] = useState(false);
-
-  return (
-    <div
-      className={`fieldcurve cursor-pointer ${isHovered ? "bg-white/[0.03]" : "bg-transparent"}`}
-    >
-      <div
-        className="fieldcurve-control flex items-center h-10 px-4"
-        onClick={() => {
-          if (edit) {
-            setEdit(false);
-          } else {
-            setEdit(curve.clone());
-          }
-        }}
-        onPointerEnter={() => {
-          hint && setHint(hint);
-          setIsHovered(true);
-        }}
-        onPointerLeave={() => {
-          hint && setHint(null);
-          setIsHovered(false);
-        }}
-      >
-        <div className="fieldcurve-label flex-1 whitespace-nowrap overflow-hidden text-ellipsis pr-4 text-[0.9375rem] text-white/70">
-          {label}
-        </div>
-        <div className="fieldcurve-curve w-24 h-5 relative">
-          <CurvePreview curve={curve} yMin={yMin} yMax={yMax} />
-        </div>
-      </div>
-      {edit && (
-        <Portal>
-          <CurvePane
-            curve={edit as Curve}
-            xLabel={x}
-            xRange={[0, xRange || 1]}
-            yLabel={y}
-            yMin={yMin}
-            yMax={yMax}
-            onCommit={() => {
-              onChange((edit as Curve).serialize());
-              setEdit(false);
-            }}
-            onCancel={() => {
-              setEdit(false);
-            }}
-          />
-        </Portal>
-      )}
-    </div>
-  );
-}
-
-export function FieldBtn({ label, note, hint, nav, onClick }: FieldBtnProps) {
-  const hintContext = useContext(HintContext);
-  if (!hintContext) {
-    throw new Error("HintContext not found");
-  }
-  const setHint = hintContext.setHint;
-  const [isHovered, setIsHovered] = useState(false);
-
-  return (
-    <div
-      className={`fieldbtn flex items-center h-7 px-2 cursor-pointer ${isHovered ? "bg-white/[0.03]" : "bg-transparent"}`}
-      onPointerEnter={() => {
-        hint && setHint(hint);
-        setIsHovered(true);
-      }}
-      onPointerLeave={() => {
-        hint && setHint(null);
-        setIsHovered(false);
-      }}
-      onClick={onClick}
-    >
-      <div className="fieldbtn-label flex-1 whitespace-nowrap overflow-hidden text-ellipsis text-[8px] text-white/70">
-        {label}
-      </div>
-      {note && (
-        <div className="fieldbtn-note text-[8px] text-white/50">{note}</div>
-      )}
-      {nav && <span className="text-base text-white">›</span>}
-    </div>
-  );
-}
diff --git a/packages/client/src/game/dashboard/AgentSkillsPanel.tsx b/packages/client/src/game/dashboard/AgentSkillsPanel.tsx
index 83de0b54c..bd9f3b809 100644
--- a/packages/client/src/game/dashboard/AgentSkillsPanel.tsx
+++ b/packages/client/src/game/dashboard/AgentSkillsPanel.tsx
@@ -2,6 +2,13 @@ import { GAME_API_URL } from "@/lib/api-config";
 import React, { useState, useEffect, useRef } from "react";
 import type { Agent } from "./types";
 import { ChevronDown, ChevronUp, Swords, TrendingUp } from "lucide-react";
+import {
+  calculateCombatLevel,
+  normalizeCombatSkills,
+  getXPForLevel,
+  getXPProgress,
+  type Skills,
+} from "@hyperscape/shared";
 
 // Configuration constants
 const SKILLS_POLL_INTERVAL_MS = 10000; // Poll every 10 seconds to avoid rate limiting
@@ -47,23 +54,7 @@ async function fetchWithRetry(
   throw lastError || new Error("Request failed after retries");
 }
 
-interface SkillData {
-  level: number;
-  xp: number;
-}
-
-interface AgentSkills {
-  attack?: SkillData;
-  strength?: SkillData;
-  defense?: SkillData;
-  constitution?: SkillData;
-  // ranged?: SkillData; // Hidden for melee-only MVP
-  woodcutting?: SkillData;
-  fishing?: SkillData;
-  firemaking?: SkillData;
-  cooking?: SkillData;
-  agility?: SkillData;
-}
+type AgentSkills = Partial<Skills>;
 
 interface AgentSkillsPanelProps {
   agent: Agent;
@@ -84,36 +75,6 @@ const SKILL_CONFIG = [
   { key: "agility", label: "Agility", icon: "🏃" },
 ] as const;
 
-// XP calculation for progress bar
-function calculateXPForLevel(level: number): number {
-  let total = 0;
-  for (let i = 1; i < level; i++) {
-    total += Math.floor(i + 300 * Math.pow(2, i / 7));
-  }
-  return Math.floor(total / 4);
-}
-
-function getXPProgress(xp: number, level: number): number {
-  if (level >= MAX_SKILL_LEVEL) return 100;
-  const currentLevelXP = calculateXPForLevel(level);
-  const nextLevelXP = calculateXPForLevel(level + 1);
-  const xpIntoLevel = xp - currentLevelXP;
-  const xpForThisLevel = nextLevelXP - currentLevelXP;
-  return Math.min(100, Math.max(0, (xpIntoLevel / xpForThisLevel) * 100));
-}
-
-// Calculate combat level from skills (melee-only MVP)
-function calculateCombatLevel(skills: AgentSkills): number {
-  const defense = skills.defense?.level || 1;
-  const constitution = skills.constitution?.level || 10;
-  const attack = skills.attack?.level || 1;
-  const strength = skills.strength?.level || 1;
-
-  const base = 0.25 * (defense + constitution);
-  const melee = 0.325 * (attack + strength);
-  return Math.floor(base + melee);
-}
-
 function SkillRow({
   icon,
   label,
@@ -351,7 +312,19 @@ export const AgentSkillsPanel: React.FC<AgentSkillsPanelProps> = ({
       }, 0)
     : 0;
 
-  const combatLevel = skills ? calculateCombatLevel(skills) : 3;
+  const combatLevel = skills
+    ? calculateCombatLevel(
+        normalizeCombatSkills({
+          attack: skills.attack?.level,
+          strength: skills.strength?.level,
+          defense: skills.defense?.level,
+          constitution: skills.constitution?.level,
+          ranged: skills.ranged?.level,
+          magic: skills.magic?.level,
+          prayer: skills.prayer?.level,
+        }),
+      )
+    : 3;
 
   return (
     <div className="border-t border-[#8b4513]/30 bg-[#0b0a15]/80">
diff --git a/packages/client/src/game/dashboard/AgentSummaryCard.tsx b/packages/client/src/game/dashboard/AgentSummaryCard.tsx
index 237af881d..25e192547 100644
--- a/packages/client/src/game/dashboard/AgentSummaryCard.tsx
+++ b/packages/client/src/game/dashboard/AgentSummaryCard.tsx
@@ -2,6 +2,10 @@ import { GAME_API_URL } from "@/lib/api-config";
 import React, { useState, useEffect, useRef, useCallback } from "react";
 import type { Agent } from "./types";
 import { Swords, Activity, Target, Coins, Clock, Heart } from "lucide-react";
+import {
+  calculateCombatLevel,
+  normalizeCombatSkills,
+} from "@hyperscape/shared";
 
 interface HealthData {
   current: number;
@@ -67,20 +71,6 @@ function formatXp(xp: number): string {
   return xp.toLocaleString();
 }
 
-// Calculate combat level from skills
-function calculateCombatLevel(
-  skills: Record<string, { level: number }> | null,
-): number {
-  if (!skills) return 3;
-  const defense = skills.defense?.level || 1;
-  const constitution = skills.constitution?.level || 10;
-  const attack = skills.attack?.level || 1;
-  const strength = skills.strength?.level || 1;
-  const base = 0.25 * (defense + constitution);
-  const melee = 0.325 * (attack + strength);
-  return Math.floor(base + melee);
-}
-
 // Calculate total level
 function calculateTotalLevel(
   skills: Record<string, { level: number }> | null,
@@ -199,7 +189,19 @@ export const AgentSummaryCard: React.FC<AgentSummaryCardProps> = ({
             ...prev,
             online: posData.online !== false,
             uptimeMs: Date.now() - sessionStartTime,
-            combatLevel: calculateCombatLevel(skills),
+            combatLevel: skills
+              ? calculateCombatLevel(
+                  normalizeCombatSkills({
+                    attack: skills.attack?.level,
+                    strength: skills.strength?.level,
+                    defense: skills.defense?.level,
+                    constitution: skills.constitution?.level,
+                    ranged: skills.ranged?.level,
+                    magic: skills.magic?.level,
+                    prayer: skills.prayer?.level,
+                  }),
+                )
+              : 3,
             totalLevel: calculateTotalLevel(skills),
             currentGoal: goalData?.goal?.description || null,
             goalProgress: goalData?.goal?.progressPercent || 0,
@@ -215,7 +217,19 @@ export const AgentSummaryCard: React.FC<AgentSummaryCardProps> = ({
         ...prev,
         online: agent.status === "active",
         uptimeMs: Date.now() - sessionStartTime,
-        combatLevel: calculateCombatLevel(skills),
+        combatLevel: skills
+          ? calculateCombatLevel(
+              normalizeCombatSkills({
+                attack: skills.attack?.level,
+                strength: skills.strength?.level,
+                defense: skills.defense?.level,
+                constitution: skills.constitution?.level,
+                ranged: skills.ranged?.level,
+                magic: skills.magic?.level,
+                prayer: skills.prayer?.level,
+              }),
+            )
+          : 3,
         totalLevel: calculateTotalLevel(skills),
         currentGoal: goalData?.goal?.description || null,
         goalProgress: goalData?.goal?.progressPercent || 0,
diff --git a/packages/client/src/game/dashboard/AgentViewportChat.tsx b/packages/client/src/game/dashboard/AgentViewportChat.tsx
index 4e14774a7..c28bded5e 100644
--- a/packages/client/src/game/dashboard/AgentViewportChat.tsx
+++ b/packages/client/src/game/dashboard/AgentViewportChat.tsx
@@ -165,7 +165,9 @@ export const AgentViewportChat: React.FC<AgentViewportChatProps> = ({
 
   // ── Unread badge when chat is closed ────────────────────────────────────
   useEffect(() => {
-    if (!chatOpen && messages.at(-1)?.sender === "agent") {
+    const latestMessage =
+      messages.length > 0 ? messages[messages.length - 1] : undefined;
+    if (!chatOpen && latestMessage?.sender === "agent") {
       setUnreadCount((n) => n + 1);
     }
   }, [messages]); // chatOpen intentionally omitted: only trigger on new messages
@@ -509,7 +511,11 @@ export const AgentViewportChat: React.FC<AgentViewportChatProps> = ({
   });
 
   const agentDisplayName = agent.characterName || agent.name;
-  const lastAgentMsg = messages.filter((m) => m.sender === "agent").at(-1);
+  const agentMessages = messages.filter((m) => m.sender === "agent");
+  const lastAgentMsg =
+    agentMessages.length > 0
+      ? agentMessages[agentMessages.length - 1]
+      : undefined;
 
   return (
     <div
diff --git a/packages/client/src/game/hud/EntityContextMenu.tsx b/packages/client/src/game/hud/EntityContextMenu.tsx
index 62915afed..9c50831ca 100644
--- a/packages/client/src/game/hud/EntityContextMenu.tsx
+++ b/packages/client/src/game/hud/EntityContextMenu.tsx
@@ -1,5 +1,9 @@
 import React, { useState, useEffect, useRef } from "react";
-import type { World, LabelSegment } from "@hyperscape/shared";
+import type {
+  World,
+  LabelSegment,
+  ContextMenuAction as SharedContextMenuAction,
+} from "@hyperscape/shared";
 import { useThemeStore } from "@/ui";
 import { UI } from "@/ui/core";
 import {
@@ -7,15 +11,13 @@ import {
   getContextMenuSurfaceStyle,
 } from "@/ui/theme/themes";
 
-export interface ContextMenuAction {
-  id: string;
-  label: string;
-  /** Rich text label with colors/styles - takes precedence over label if present */
-  styledLabel?: LabelSegment[];
-  icon?: string;
-  enabled: boolean;
+/** Context menu action for React rendering — shared action minus handler/priority, plus onClick */
+export type ContextMenuAction = Omit<
+  SharedContextMenuAction,
+  "handler" | "priority"
+> & {
   onClick: () => void;
-}
+};
 
 /**
  * Render a styled label with colored segments.
diff --git a/packages/client/src/game/hud/Minimap.tsx b/packages/client/src/game/hud/Minimap.tsx
index b7281bf40..c67c6a33b 100644
--- a/packages/client/src/game/hud/Minimap.tsx
+++ b/packages/client/src/game/hud/Minimap.tsx
@@ -2,37 +2,46 @@
  * Minimap.tsx - 2D Minimap Component
  *
  * Shows player position, nearby entities, and terrain on a 2D minimap.
+ * Orchestrates canvas lifecycle, RAF loop, and satellite hooks.
+ *
+ * Rendering: Overlay (roads, buildings, entities, destination) is rendered
+ * off-thread by shared MinimapWorker via OffscreenCanvas. Terrain background
+ * stays on main thread (biome-aware cache in useMinimapTerrainCache).
+ * Interaction logic lives in useMinimapInteraction.ts.
  */
 
-import React, {
-  memo,
-  useCallback,
-  useEffect,
-  useRef,
-  useState,
-  useMemo,
-} from "react";
+import React, { memo, useEffect, useRef } from "react";
 import { useThemeStore, useQuestSelectionStore } from "@/ui";
 import {
   Entity,
-  EventType,
   THREE,
-  TERRAIN_CONSTANTS,
-  INPUT,
+  MinimapWorkerManager,
+  isMinimapWorkerSupported,
+  type MinimapEntity as WorkerEntity,
+  type MinimapRoad as WorkerRoad,
+  type MinimapBuilding as WorkerBuilding,
 } from "@hyperscape/shared";
 import type { ClientWorld } from "../../types";
 import { type EntityPip, useMinimapEntityPips } from "./useMinimapEntityPips";
 import { useQuestStatusSync } from "./useQuestStatusSync";
 import {
-  type MinimapRoad,
   type MinimapRoadWithAABB,
   type MinimapTown,
+  type MinimapRoad,
   useMinimapWorldCaches,
 } from "./useMinimapWorldCaches";
 import {
   MINIMAP_TERRAIN_OVERSHOOT,
   useMinimapTerrainCache,
 } from "./useMinimapTerrainCache";
+import {
+  type MinimapRenderState,
+  type HyperscapeWindow,
+  createRenderState,
+  getSpectatorTarget,
+} from "./minimapTypes";
+import { useMinimapInteraction } from "./useMinimapInteraction";
+
 // Shared with terrain-cache generation so draw-time coverage matches the
 // cached snapshot's real world footprint.
 const TERRAIN_OVERSHOOT = MINIMAP_TERRAIN_OVERSHOOT;
@@ -41,742 +50,6 @@ const TERRAIN_OVERSHOOT = MINIMAP_TERRAIN_OVERSHOOT;
 // live overlay motion instead of throttling it behind the player.
 const RENDER_EVERY_N_FRAMES = 1;
 
-// Zoom bounds and step size — kept at module scope for stability across re-renders
-const MIN_EXTENT = 20;
-const MAX_EXTENT = 1000;
-const STEP_EXTENT = 10;
-
-// Reference minimap pixel size at which the initial zoom level is 1:1.
-// sizeBasedExtent = zoom × (avgSize / MINIMAP_BASE_SIZE_PX)
-const MINIMAP_BASE_SIZE_PX = 200;
-
-// Fixed road/building pixel widths — do NOT scale with zoom
-const ROAD_LINE_WIDTH_PX = 5;
-const ROAD_OUTLINE_WIDTH_PX = 7;
-const BUILDING_LINE_WIDTH_PX = 0.5;
-const ROAD_OUTLINE_COLOR = "rgb(56, 60, 68)";
-const ROAD_FILL_COLOR = "rgb(164, 151, 128)";
-const BUILDING_FILL_COLOR = "rgba(84, 92, 104, 0.92)";
-const BUILDING_STROKE_COLOR = "rgb(34, 39, 46)";
-
-/** 2D context interface for minimap drawing — satisfied by both CanvasRenderingContext2D and OffscreenCanvasRenderingContext2D */
-interface MinimapDrawContext {
-  save(): void;
-  restore(): void;
-  beginPath(): void;
-  moveTo(x: number, y: number): void;
-  lineTo(x: number, y: number): void;
-  closePath(): void;
-  stroke(): void;
-  fill(): void;
-  strokeStyle: string | CanvasGradient | CanvasPattern;
-  fillStyle: string | CanvasGradient | CanvasPattern;
-  lineWidth: number;
-  lineCap: "butt" | "round" | "square";
-  lineJoin: "bevel" | "round" | "miter";
-}
-
-/**
- * Pre-allocated flat pixel-path buffer — zero heap allocation per road per frame.
- * Stores (x, y) pairs for all visible road points in a single contiguous block.
- * Grows by doubling when capacity is exceeded; never shrinks.
- */
-function ensureRoadPixelBufCapacity(
-  roadPixelBufRef: React.MutableRefObject<Float32Array>,
-  needed: number,
-): void {
-  if (roadPixelBufRef.current.length >= needed * 2) return;
-  let n = roadPixelBufRef.current.length;
-  while (n < needed * 2) n *= 2;
-  roadPixelBufRef.current = new Float32Array(n);
-}
-
-/** Per-road projected data — populated once per frame, two-pass rendered */
-type ProjectedRoad = {
-  pts: Float32Array;
-  len: number;
-  fill: number;
-  outline: number;
-};
-/**
- * Project a world XZ point to canvas pixel coordinates using the camera's
- * projection-view matrix — the same transform used for entity pips.
- *
- * This replaces the old worldToPx() which used a separate (often stale)
- * center/extent/up coordinate system that would drift out of sync with the
- * terrain on zoom, pan, or rotate.
- */
-function worldToPx(
-  wx: number,
-  wz: number,
-  projectionViewMatrix: THREE.Matrix4,
-  scratchVec: THREE.Vector3,
-  cw: number,
-  ch: number,
-): void {
-  scratchVec.set(wx, 0, wz);
-  scratchVec.applyMatrix4(projectionViewMatrix);
-  scratchVec.x = (scratchVec.x * 0.5 + 0.5) * cw;
-  scratchVec.y = (scratchVec.y * -0.5 + 0.5) * ch;
-}
-
-/**
- * Draw roads and buildings on the overlay canvas.
- *
- * Uses camera-matrix projection (same as entity pips) so roads zoom, pan, and
- * rotate in perfect lockstep with pips — no separate coordinate system, no
- * terrain-cache dependency, no desync on zoom or rotation.
- *
- * Roads use fixed pixel widths (ROAD_LINE_WIDTH_PX / ROAD_OUTLINE_WIDTH_PX) so
- * they don't visually scale when the player zooms in/out — only the terrain
- * background scales.
- */
-function drawRoadsAndBuildingsOverlay(
-  ctx: CanvasRenderingContext2D,
-  roads: MinimapRoadWithAABB[] | null,
-  towns: MinimapTown[] | null,
-  roadPixelBufRef: React.MutableRefObject<Float32Array>,
-  projectedRoadsRef: React.MutableRefObject<ProjectedRoad[]>,
-  projectionViewMatrix: THREE.Matrix4,
-  scratchVec: THREE.Vector3,
-  camX: number,
-  camZ: number,
-  viewRadius: number,
-  /** Pixels per world unit: cw / (2 * extent). Used to scale road widths with zoom. */
-  worldToPixel: number,
-  cw: number,
-  ch: number,
-): void {
-  if (roads && roads.length > 0) {
-    // Two-pass rendering: all outlines first, all fills second.
-    // Drawing per-road (outline→fill→outline→fill…) leaves dark outline bands
-    // wherever roads cross because each road's outline paints over the previous
-    // road's fill.  Batching outlines then fills means every fill covers every
-    // outline edge, so intersections look seamless.
-
-    // Pass 0 — count total visible points so we can pre-size the global buffer
-    // in one shot, avoiding any mid-loop reallocation.
-    let totalVisiblePts = 0;
-    for (const road of roads) {
-      if (road.path.length < 2) continue;
-      if (
-        road.maxX < camX - viewRadius ||
-        road.minX > camX + viewRadius ||
-        road.maxZ < camZ - viewRadius ||
-        road.minZ > camZ + viewRadius
-      )
-        continue;
-      totalVisiblePts += road.path.length;
-    }
-    ensureRoadPixelBufCapacity(roadPixelBufRef, totalVisiblePts);
-    const roadPixelBuf = roadPixelBufRef.current;
-    const projectedRoads = projectedRoadsRef.current;
-
-    // Pass 1 (projection) — write XY pairs into _roadPixelBuf, store subarray
-    // views in _projectedRoads.  Zero Float32Array allocations per frame.
-    projectedRoads.length = 0;
-    let _bufOffset = 0;
-
-    for (const road of roads) {
-      if (road.path.length < 2) continue;
-      if (
-        road.maxX < camX - viewRadius ||
-        road.minX > camX + viewRadius ||
-        road.maxZ < camZ - viewRadius ||
-        road.minZ > camZ + viewRadius
-      )
-        continue;
-
-      const worldWidth = road.width > 0 ? road.width : 4;
-      const scaledFill = Math.max(
-        ROAD_LINE_WIDTH_PX,
-        Math.min(40, worldWidth * worldToPixel),
-      );
-      const scaledOutline = Math.max(ROAD_OUTLINE_WIDTH_PX, scaledFill + 2);
-
-      const ptsBase = _bufOffset;
-      for (let ri = 0; ri < road.path.length; ri++) {
-        worldToPx(
-          road.path[ri].x,
-          road.path[ri].z,
-          projectionViewMatrix,
-          scratchVec,
-          cw,
-          ch,
-        );
-        roadPixelBuf[_bufOffset++] = scratchVec.x;
-        roadPixelBuf[_bufOffset++] = scratchVec.y;
-      }
-      projectedRoads.push({
-        pts: roadPixelBuf.subarray(ptsBase, _bufOffset),
-        len: road.path.length,
-        fill: scaledFill,
-        outline: scaledOutline,
-      });
-    }
-
-    if (projectedRoads.length > 0) {
-      ctx.save();
-      ctx.lineCap = "round";
-      ctx.lineJoin = "round";
-
-      // Pass 2 — outlines only (all roads)
-      ctx.strokeStyle = ROAD_OUTLINE_COLOR;
-      for (const r of projectedRoads) {
-        ctx.lineWidth = r.outline;
-        ctx.beginPath();
-        ctx.moveTo(r.pts[0], r.pts[1]);
-        for (let i = 1; i < r.len; i++)
-          ctx.lineTo(r.pts[i * 2], r.pts[i * 2 + 1]);
-        ctx.stroke();
-      }
-
-      // Pass 3 — fills only (all roads)
-      ctx.strokeStyle = ROAD_FILL_COLOR;
-      for (const r of projectedRoads) {
-        ctx.lineWidth = r.fill;
-        ctx.beginPath();
-        ctx.moveTo(r.pts[0], r.pts[1]);
-        for (let i = 1; i < r.len; i++)
-          ctx.lineTo(r.pts[i * 2], r.pts[i * 2 + 1]);
-        ctx.stroke();
-      }
-      ctx.restore();
-    }
-  }
-
-  if (towns && towns.length > 0) {
-    ctx.save();
-    // Building stroke scales with zoom but clamped to a thin line
-    ctx.lineWidth = Math.max(
-      BUILDING_LINE_WIDTH_PX + 0.25,
-      Math.min(3.25, worldToPixel * 0.35),
-    );
-    for (const town of towns) {
-      for (const building of town.buildings) {
-        const bx = building.position.x;
-        const bz = building.position.z;
-        if (
-          Math.abs(bx - camX) > viewRadius ||
-          Math.abs(bz - camZ) > viewRadius
-        )
-          continue;
-
-        const hw = building.size.width * 0.5;
-        const hd = building.size.depth * 0.5;
-        const cos = Math.cos(building.rotation);
-        const sin = Math.sin(building.rotation);
-
-        // Project 4 rotated corners through the camera matrix
-        worldToPx(
-          bx + cos * hw - sin * hd,
-          bz + sin * hw + cos * hd,
-          projectionViewMatrix,
-          scratchVec,
-          cw,
-          ch,
-        );
-        const p0x = scratchVec.x;
-        const p0y = scratchVec.y;
-
-        worldToPx(
-          bx - cos * hw - sin * hd,
-          bz - sin * hw + cos * hd,
-          projectionViewMatrix,
-          scratchVec,
-          cw,
-          ch,
-        );
-        const p1x = scratchVec.x;
-        const p1y = scratchVec.y;
-
-        worldToPx(
-          bx - cos * hw + sin * hd,
-          bz - sin * hw - cos * hd,
-          projectionViewMatrix,
-          scratchVec,
-          cw,
-          ch,
-        );
-        const p2x = scratchVec.x;
-        const p2y = scratchVec.y;
-
-        worldToPx(
-          bx + cos * hw + sin * hd,
-          bz + sin * hw - cos * hd,
-          projectionViewMatrix,
-          scratchVec,
-          cw,
-          ch,
-        );
-        const p3x = scratchVec.x;
-        const p3y = scratchVec.y;
-
-        ctx.beginPath();
-        ctx.moveTo(p0x, p0y);
-        ctx.lineTo(p1x, p1y);
-        ctx.lineTo(p2x, p2y);
-        ctx.lineTo(p3x, p3y);
-        ctx.closePath();
-        ctx.fillStyle = BUILDING_FILL_COLOR;
-        ctx.fill();
-        ctx.strokeStyle = BUILDING_STROKE_COLOR;
-        ctx.stroke();
-      }
-    }
-    ctx.restore();
-  }
-}
-
-/**
- * Per-instance render state factory.
- *
- * Previously these were module-level constants, which meant multiple simultaneous
- * Minimap instances would corrupt each other's temp vectors mid-frame.  Each
- * component instance now gets its own isolated set via renderStateRef.
- */
-interface MinimapRenderState {
-  /** Camera forward direction (XZ) */
-  forwardVec: THREE.Vector3;
-  /** Pip world→screen projection scratch */
-  projectVec: THREE.Vector3;
-  /** Destination marker projection scratch */
-  destVec: THREE.Vector3;
-  /** screenToWorldXZ unprojection scratch */
-  unprojectVec: THREE.Vector3;
-  /** Camera follow target position scratch */
-  targetPos: { x: number; z: number };
-  /** Combined projection-view matrix, updated once per frame */
-  projectionViewMatrix: THREE.Matrix4;
-  /** Whether projectionViewMatrix has been populated this session */
-  hasCachedMatrix: boolean;
-}
-
-function createRenderState(): MinimapRenderState {
-  return {
-    forwardVec: new THREE.Vector3(),
-    projectVec: new THREE.Vector3(),
-    destVec: new THREE.Vector3(),
-    unprojectVec: new THREE.Vector3(),
-    targetPos: { x: 0, z: 0 },
-    projectionViewMatrix: new THREE.Matrix4(),
-    hasCachedMatrix: false,
-  };
-}
-
-/** Augmented window type covering all Hyperscape globals written to window */
-type HyperscapeWindow = Window &
-  typeof globalThis & {
-    __lastRaycastTarget?: { x: number; y: number; z: number; method: string };
-    __HYPERSCAPE_CONFIG__?: { mode?: string; followEntity?: string };
-  };
-
-/** Camera info shape returned by the client-camera-system */
-interface SpectatorTarget {
-  id?: string;
-  position: { x: number; z: number };
-}
-
-/**
- * Returns the spectated entity's position when in spectator mode, or null.
- * Centralises the duplicated window.__HYPERSCAPE_CONFIG__ + camera-system reads
- * that previously appeared independently in the entity interval and the RAF loop.
- */
-function getSpectatorTarget(world: ClientWorld): SpectatorTarget | null {
-  if ((window as HyperscapeWindow).__HYPERSCAPE_CONFIG__?.mode !== "spectator")
-    return null;
-  const cameraSystem = world.getSystem("client-camera-system") as {
-    getCameraInfo?: () => {
-      target?: {
-        id?: string;
-        node?: { position?: THREE.Vector3 };
-        position?: { x: number; z: number };
-      };
-    };
-  } | null;
-  const info = cameraSystem?.getCameraInfo?.();
-  if (!info?.target) return null;
-  // Entity-interval callers need node.position (Vector3); RAF needs target.position ({x,z}).
-  // Return the first available position shape.
-  const pos = info.target.node?.position ?? info.target.position;
-  if (!pos) return null;
-  return { id: info.target.id, position: { x: pos.x, z: pos.z } };
-}
-
-/** Color palette for group members (up to 8 unique) */
-const GROUP_COLORS = [
-  "#4CAF50", // Green - party leader
-  "#2196F3", // Blue
-  "#9C27B0", // Purple
-  "#FF9800", // Orange
-  "#00BCD4", // Cyan
-  "#E91E63", // Pink
-  "#CDDC39", // Lime
-  "#607D8B", // Blue-grey
-];
-
-/**
- * Draw a star shape on canvas for quest markers
- */
-function drawStar(
-  ctx: CanvasRenderingContext2D,
-  cx: number,
-  cy: number,
-  outerRadius: number,
-  innerRadius: number,
-  points: number = 5,
-): void {
-  const step = Math.PI / points;
-  ctx.beginPath();
-  for (let i = 0; i < 2 * points; i++) {
-    const radius = i % 2 === 0 ? outerRadius : innerRadius;
-    const angle = i * step - Math.PI / 2;
-    const x = cx + radius * Math.cos(angle);
-    const y = cy + radius * Math.sin(angle);
-    if (i === 0) {
-      ctx.moveTo(x, y);
-    } else {
-      ctx.lineTo(x, y);
-    }
-  }
-  ctx.closePath();
-}
-
-/**
- * Draw a diamond shape on canvas
- */
-function drawDiamond(
-  ctx: CanvasRenderingContext2D,
-  cx: number,
-  cy: number,
-  size: number,
-): void {
-  ctx.beginPath();
-  ctx.moveTo(cx, cy - size); // Top
-  ctx.lineTo(cx + size, cy); // Right
-  ctx.lineTo(cx, cy + size); // Bottom
-  ctx.lineTo(cx - size, cy); // Left
-  ctx.closePath();
-}
-
-/**
- * Draw a red flag destination marker (RS3-style)
- * Simple: thin pole + small filled triangle flag
- */
-function drawFlag(ctx: CanvasRenderingContext2D, cx: number, cy: number): void {
-  // Pole
-  ctx.strokeStyle = "#880000";
-  ctx.lineWidth = 1;
-  ctx.beginPath();
-  ctx.moveTo(cx, cy + 3);
-  ctx.lineTo(cx, cy - 5);
-  ctx.stroke();
-
-  // Flag (small filled triangle off the pole)
-  ctx.fillStyle = "#ff0000";
-  ctx.beginPath();
-  ctx.moveTo(cx, cy - 5);
-  ctx.lineTo(cx + 5, cy - 3);
-  ctx.lineTo(cx, cy - 1);
-  ctx.closePath();
-  ctx.fill();
-}
-
-/**
- * Flyweight icon cache: each distinct subType is rendered exactly ONCE into a
- * 16×16 OffscreenCanvas and stored here.  Every subsequent call uses drawImage()
- * which is GPU-accelerated and ~10–20× faster than re-executing path drawing code.
- *
- * The cache is populated lazily so fonts are guaranteed to be loaded by first use.
- */
-const _iconCache = new Map<string, OffscreenCanvas | null>();
-const _ICON_SIZE = 16;
-
-function _renderIconOnce(subType: string): OffscreenCanvas | null {
-  const offscreen = new OffscreenCanvas(_ICON_SIZE, _ICON_SIZE);
-  const raw = offscreen.getContext("2d");
-  if (!raw) return null;
-  // OffscreenCanvasRenderingContext2D satisfies all properties in the extended
-  // MinimapDrawContext intersection — this cast is safe.
-  const ictx = raw as Parameters<typeof _drawIconGlyph>[0];
-  const cx = _ICON_SIZE / 2;
-  const cy = _ICON_SIZE / 2;
-  const drawn = _drawIconGlyph(ictx, cx, cy, subType);
-  return drawn ? offscreen : null;
-}
-
-/**
- * Draw minimap icon for a location type.
- * Returns true if drawn, false for unknown subType (caller falls back to a dot).
- *
- * On first call per subType, renders to an OffscreenCanvas and caches it.
- * All subsequent calls use drawImage() — zero path drawing overhead.
- */
-function drawMinimapIcon(
-  ctx: CanvasRenderingContext2D,
-  cx: number,
-  cy: number,
-  subType: string,
-): boolean {
-  let icon = _iconCache.get(subType);
-  if (icon === undefined) {
-    // First time — render and cache (null = unknown type, skip caching a blank canvas)
-    icon = _renderIconOnce(subType);
-    _iconCache.set(subType, icon);
-  }
-  if (!icon) return false;
-  ctx.drawImage(
-    icon,
-    cx - _ICON_SIZE / 2,
-    cy - _ICON_SIZE / 2,
-    _ICON_SIZE,
-    _ICON_SIZE,
-  );
-  return true;
-}
-
-/** Inner glyph renderer — only called once per subType. */
-function _drawIconGlyph(
-  ctx: MinimapDrawContext & {
-    font: string;
-    textAlign: "left" | "right" | "center" | "start" | "end";
-    textBaseline:
-      | "top"
-      | "hanging"
-      | "middle"
-      | "alphabetic"
-      | "ideographic"
-      | "bottom";
-    fillText(text: string, x: number, y: number): void;
-    fillRect(x: number, y: number, w: number, h: number): void;
-    strokeRect(x: number, y: number, w: number, h: number): void;
-    arc(x: number, y: number, r: number, sA: number, eA: number): void;
-    ellipse(
-      x: number,
-      y: number,
-      rX: number,
-      rY: number,
-      rot: number,
-      sA: number,
-      eA: number,
-    ): void;
-    quadraticCurveTo(cpx: number, cpy: number, x: number, y: number): void;
-  },
-  cx: number,
-  cy: number,
-  subType: string,
-): boolean {
-  ctx.save();
-  ctx.lineWidth = 1;
-  ctx.strokeStyle = "#000000";
-
-  switch (subType) {
-    // --- Bank: gold coin ($) ---
-    case "bank":
-      ctx.fillStyle = "#daa520";
-      ctx.beginPath();
-      ctx.arc(cx, cy, 6, 0, Math.PI * 2);
-      ctx.fill();
-      ctx.stroke();
-      ctx.fillStyle = "#ffffff";
-      ctx.font = "bold 10px sans-serif";
-      ctx.textAlign = "center";
-      ctx.textBaseline = "middle";
-      ctx.fillText("$", cx + 0.5, cy + 1);
-      break;
-
-    // --- Shop: small open-top bag ---
-    case "shop":
-      ctx.fillStyle = "#daa520";
-      ctx.beginPath();
-      ctx.moveTo(cx - 5, cy - 4);
-      ctx.lineTo(cx - 4, cy + 5);
-      ctx.lineTo(cx + 4, cy + 5);
-      ctx.lineTo(cx + 5, cy - 4);
-      ctx.closePath();
-      ctx.fill();
-      ctx.stroke();
-      break;
-
-    // --- Prayer altar: simple cross ---
-    case "altar":
-      ctx.fillStyle = "#ffffff";
-      ctx.fillRect(cx - 1.5, cy - 6, 3, 12);
-      ctx.fillRect(cx - 5, cy - 2.5, 10, 3);
-      ctx.strokeRect(cx - 1.5, cy - 6, 3, 12);
-      ctx.strokeRect(cx - 5, cy - 2.5, 10, 3);
-      break;
-
-    // --- Runecrafting altar: purple circle ---
-    case "runecrafting_altar":
-      ctx.fillStyle = "#7744cc";
-      ctx.beginPath();
-      ctx.arc(cx, cy, 6, 0, Math.PI * 2);
-      ctx.fill();
-      ctx.stroke();
-      ctx.fillStyle = "#ffffff";
-      ctx.font = "bold 10px sans-serif";
-      ctx.textAlign = "center";
-      ctx.textBaseline = "middle";
-      ctx.fillText("R", cx + 0.5, cy + 1);
-      break;
-
-    // --- Anvil: dark flat anvil silhouette ---
-    case "anvil":
-      ctx.fillStyle = "#666666";
-      ctx.beginPath();
-      ctx.moveTo(cx - 6, cy + 4);
-      ctx.lineTo(cx - 4, cy - 1);
-      ctx.lineTo(cx - 5, cy - 4);
-      ctx.lineTo(cx + 5, cy - 4);
-      ctx.lineTo(cx + 4, cy - 1);
-      ctx.lineTo(cx + 6, cy + 4);
-      ctx.closePath();
-      ctx.fill();
-      ctx.stroke();
-      break;
-
-    // --- Furnace: orange circle with flame ---
-    case "furnace":
-      ctx.fillStyle = "#dd5500";
-      ctx.beginPath();
-      ctx.arc(cx, cy, 6, 0, Math.PI * 2);
-      ctx.fill();
-      ctx.stroke();
-      // Simple flame (inverted drop)
-      ctx.fillStyle = "#ffcc00";
-      ctx.beginPath();
-      ctx.moveTo(cx, cy - 4);
-      ctx.quadraticCurveTo(cx + 3, cy + 1, cx, cy + 4);
-      ctx.quadraticCurveTo(cx - 3, cy + 1, cx, cy - 4);
-      ctx.fill();
-      break;
-
-    // --- Cooking range: brown circle with steam ---
-    case "range":
-      ctx.fillStyle = "#8b5e3c";
-      ctx.beginPath();
-      ctx.arc(cx, cy, 6, 0, Math.PI * 2);
-      ctx.fill();
-      ctx.stroke();
-      // Two short steam lines
-      ctx.strokeStyle = "#ffffff";
-      ctx.lineWidth = 1;
-      ctx.beginPath();
-      ctx.moveTo(cx - 2, cy + 1);
-      ctx.lineTo(cx - 2, cy - 3);
-      ctx.moveTo(cx + 2, cy + 1);
-      ctx.lineTo(cx + 2, cy - 3);
-      ctx.stroke();
-      break;
-
-    // --- Fishing spot: cyan dot with fish ---
-    case "fishing":
-      ctx.fillStyle = "#2288cc";
-      ctx.beginPath();
-      ctx.arc(cx, cy, 6, 0, Math.PI * 2);
-      ctx.fill();
-      ctx.strokeStyle = "#000000";
-      ctx.stroke();
-      // Tiny fish shape
-      ctx.fillStyle = "#ffffff";
-      ctx.beginPath();
-      ctx.ellipse(cx - 1, cy, 3.5, 2, 0, 0, Math.PI * 2);
-      ctx.fill();
-      // Tail
-      ctx.beginPath();
-      ctx.moveTo(cx + 2.5, cy);
-      ctx.lineTo(cx + 5, cy - 2.5);
-      ctx.lineTo(cx + 5, cy + 2.5);
-      ctx.closePath();
-      ctx.fill();
-      break;
-
-    // --- Mining rock: brown dot with pickaxe ---
-    case "mining":
-      ctx.fillStyle = "#8b6914";
-      ctx.beginPath();
-      ctx.arc(cx, cy, 6, 0, Math.PI * 2);
-      ctx.fill();
-      ctx.strokeStyle = "#000000";
-      ctx.stroke();
-      // Diagonal pick handle
-      ctx.strokeStyle = "#dddddd";
-      ctx.lineWidth = 1.5;
-      ctx.beginPath();
-      ctx.moveTo(cx - 3.5, cy + 3.5);
-      ctx.lineTo(cx + 3.5, cy - 3.5);
-      ctx.stroke();
-      // Pick head
-      ctx.beginPath();
-      ctx.moveTo(cx + 1, cy - 5);
-      ctx.lineTo(cx + 5, cy - 1);
-      ctx.stroke();
-      break;
-
-    // --- Tree: green circle ---
-    case "tree":
-      ctx.fillStyle = "#228822";
-      ctx.beginPath();
-      ctx.arc(cx, cy, 5, 0, Math.PI * 2);
-      ctx.fill();
-      ctx.strokeStyle = "#115511";
-      ctx.stroke();
-      break;
-
-    // --- Quest NPC (available): blue circle with white "!" ---
-    case "quest_available":
-    case "quest":
-      ctx.fillStyle = "#2196F3";
-      ctx.beginPath();
-      ctx.arc(cx, cy, 6, 0, Math.PI * 2);
-      ctx.fill();
-      ctx.strokeStyle = "#000000";
-      ctx.stroke();
-      ctx.fillStyle = "#ffffff";
-      ctx.font = "bold 10px sans-serif";
-      ctx.textAlign = "center";
-      ctx.textBaseline = "middle";
-      ctx.fillText("!", cx + 0.5, cy + 1);
-      break;
-
-    // --- Quest NPC (in progress): blue circle with white "?" ---
-    case "quest_in_progress":
-      ctx.fillStyle = "#2196F3";
-      ctx.beginPath();
-      ctx.arc(cx, cy, 6, 0, Math.PI * 2);
-      ctx.fill();
-      ctx.strokeStyle = "#000000";
-      ctx.stroke();
-      ctx.fillStyle = "#ffffff";
-      ctx.font = "bold 10px sans-serif";
-      ctx.textAlign = "center";
-      ctx.textBaseline = "middle";
-      ctx.fillText("?", cx + 0.5, cy + 1);
-      break;
-
-    default:
-      ctx.restore();
-      return false;
-  }
-
-  ctx.restore();
-  return true;
-}
-
-/** Terrain system interface used for height sampling and click-to-move */
-interface TerrainSystemLike {
-  getHeightAt: (x: number, z: number) => number;
-  getWaterBodyRegistry?: () => {
-    getWaterSurfaceAt: (x: number, z: number) => number;
-  };
-}
-
-/** Network send interface needed for server-authoritative move requests */
-interface WorldNetworkSend {
-  network: { send: (method: string, data: unknown) => void };
-}
-
 /** Minimal structural interface for elements that can be rotated via inline style */
 interface CSSStylable {
   style: { transform: string };
@@ -846,10 +119,16 @@ function MinimapInner({
   const cameraRef = useRef<THREE.OrthographicCamera | null>(null);
   const entityPipsRefForRender = useRef<EntityPip[]>([]);
   const entityCacheRef = useRef<Map<string, EntityPip>>(new Map());
-  const roadPixelBufRef = useRef(new Float32Array(4096 * 2));
-  const projectedRoadsRef = useRef<ProjectedRoad[]>([]);
-  // Per-instance render state — isolated from other Minimap instances
   const renderStateRef = useRef<MinimapRenderState>(createRenderState());
+  const lastDestinationWorldRef = useRef<{ x: number; z: number } | null>(null);
+  const workerRef = useRef<MinimapWorkerManager | null>(null);
+  const workerInitializedRef = useRef(false);
+
+  // Always rotate with the main camera (RS3-style).
+  const rotateWithCameraRef = useRef<boolean>(true);
+  // Direct ref to the collapsed compass SVG -- yaw is written via DOM to avoid
+  // triggering React reconciliation from inside requestAnimationFrame.
+  const compassRef = useRef<CSSStylable | null>(null);
 
   const {
     terrainOffscreenRef,
@@ -861,14 +140,12 @@ function MinimapInner({
     ensureTerrainCache,
   } = useMinimapTerrainCache(world);
 
-  // Cached 2D rendering contexts — avoids DOM query every frame
+  // Cached 2D rendering contexts -- avoids DOM query every frame
   const mainCtxRef = useRef<CanvasRenderingContext2D | null>(null);
   const overlayCtxRef = useRef<CanvasRenderingContext2D | null>(null);
 
-  // Static world feature caches — populated once, used for overlay with fixed pixel sizes
+  // Static world feature caches -- populated once, used for overlay with fixed pixel sizes
   const roadsCacheRef = useRef<MinimapRoad[] | null>(null);
-  // Roads enriched with pre-computed AABBs — built once when the road cache is first
-  // populated so the per-frame visibility check is O(1) instead of O(path_length).
   const roadsWithAABBRef = useRef<MinimapRoadWithAABB[] | null>(null);
   const townsCacheRef = useRef<MinimapTown[] | null>(null);
 
@@ -878,83 +155,50 @@ function MinimapInner({
 
   useQuestStatusSync({ world, questStatusesRef, setQuestStatuses });
 
-  // Collapsed state for collapsible minimap
-  const [isCollapsed, setIsCollapsed] = useState(defaultCollapsed);
-
-  // Handle collapse toggle
-  const toggleCollapse = useCallback(() => {
-    setIsCollapsed((prev) => {
-      const newValue = !prev;
-      onCollapseChange?.(newValue);
-      return newValue;
-    });
-  }, [onCollapseChange]);
-
-  // Current size state (for resizing)
-  const [currentWidth, setCurrentWidth] = useState(initialWidth);
-  const [currentHeight, setCurrentHeight] = useState(initialHeight);
-  const width = currentWidth;
-  const height = currentHeight;
-
-  // Refs for width/height to allow RAF loop to access current values without stale closures
-  const widthRef = useRef(width);
-  const heightRef = useRef(height);
-
-  // Keep dimension refs updated for RAF loop access
-  useEffect(() => {
-    widthRef.current = width;
-    heightRef.current = height;
-  }, [width, height]);
-
-  // Resize state
-  const [isResizing, setIsResizing] = useState(false);
-  const resizeStartRef = useRef<{
-    x: number;
-    y: number;
-    w: number;
-    h: number;
-  } | null>(null);
-  const resizeCleanupRef = useRef<(() => void) | null>(null);
-  // Tracks the latest clamped size so handleUp always reads the post-drag value,
-  // not the stale closure-captured size from when the pointerdown fired.
-  const latestSizeRef = useRef({ w: initialWidth, h: initialHeight });
-
-  // Calculate extent based on size - larger size = more visible area (not scaled)
-  // Use the average of width/height to determine extent
-  const sizeBasedExtent = useMemo(() => {
-    const avgSize = (width + height) / 2;
-    return zoom * (avgSize / MINIMAP_BASE_SIZE_PX);
-  }, [width, height, zoom]);
-
-  // Minimap zoom state (orthographic half-extent in world units)
-  const [targetExtent, setTargetExtent] = useState<number>(sizeBasedExtent);
-  const targetExtentRef = useRef<number>(targetExtent);
-  const extentRef = useRef<number>(targetExtent); // Live displayed extent for render loop
-  // Update extent when size changes (reveals more map)
-  useEffect(() => {
-    setTargetExtent(sizeBasedExtent);
-  }, [sizeBasedExtent]);
-
-  // Always rotate with the main camera (RS3-style).
-  const rotateWithCameraRef = useRef<boolean>(true);
-  // Direct ref to the collapsed compass SVG — yaw is written via DOM to avoid
-  // triggering React reconciliation from inside requestAnimationFrame.
-  const compassRef = useRef<CSSStylable | null>(null);
-
-  // Destination in world space — written by handleMinimapClick, cleared by RAF on arrival.
-  // Ref-only: the RAF loop reads it synchronously, no React state needed.
-  const lastDestinationWorldRef = useRef<{ x: number; z: number } | null>(null);
-  // Debounce: ignore minimap clicks within 150ms of the previous one to prevent
-  // flooding the server with moveRequest packets during accidental double-clicks.
-  const lastClickTimeRef = useRef<number>(0);
+  // ── Interaction hook ─────────────────────────────────────────────────────────
+  const interaction = useMinimapInteraction({
+    world,
+    initialWidth,
+    initialHeight,
+    zoom,
+    resizable,
+    minSize,
+    maxSize,
+    onSizeChange,
+    collapsible,
+    defaultCollapsed,
+    onCollapseChange,
+    cameraRef,
+    canvasRef,
+    overlayCanvasRef,
+    containerRef,
+    renderStateRef,
+    lastDestinationWorldRef,
+  });
 
-  // Initialize minimap camera (no WebGPU renderer needed — Canvas 2D handles all drawing)
+  const {
+    width,
+    height,
+    widthRef,
+    heightRef,
+    extentRef,
+    targetExtentRef,
+    isCollapsed,
+    isResizing,
+    toggleCollapse,
+    onCollapseButtonClick,
+    onOverlayClick,
+    onPreventDefault,
+    onStopAndPrevent,
+    handleResizeStart,
+  } = interaction;
+
+  // ── Camera init ──────────────────────────────────────────────────────────────
   useEffect(() => {
     const canvas = canvasRef.current;
     const overlayCanvas = overlayCanvasRef.current;
     if (!canvas || !overlayCanvas) return;
 
-    // Create orthographic camera for overhead view
     const camera = new THREE.OrthographicCamera(
       -targetExtentRef.current,
       targetExtentRef.current,
@@ -963,7 +207,6 @@ function MinimapInner({
       0.1,
       2000,
     );
-    // Orient minimap to match main camera heading on XZ plane
     const initialForward = new THREE.Vector3();
     if (world?.camera) {
       world.camera.getWorldDirection(initialForward);
@@ -979,56 +222,44 @@ function MinimapInner({
     camera.up.copy(initialForward);
     camera.position.set(0, 500, 0);
     camera.lookAt(0, 0, 0);
-
-    // Mark camera as minimap for systems that need to check (e.g., water system)
     camera.userData.isMinimap = true;
-
     cameraRef.current = camera;
 
-    // Ensure both canvases have the correct backing size
     canvas.width = width;
     canvas.height = height;
-    overlayCanvas.width = width;
-    overlayCanvas.height = height;
-
-    // Cache 2D contexts once (getContext is a DOM query — avoid calling every frame)
     mainCtxRef.current = canvas.getContext("2d");
     overlayCtxRef.current = overlayCanvas.getContext("2d");
-
-    // Invalidate terrain cache when canvas dimensions change
     invalidateTerrainCache();
 
+    // Resize worker if it exists
+    if (workerRef.current) {
+      workerRef.current.resize(width, height);
+    }
+
     // Note: extent intentionally omitted - changes handled via extentRef in render loop
   }, [width, height, world]);
 
-  // Cleanup camera reference and terrain cache when component unmounts
+  // ── Cleanup ──────────────────────────────────────────────────────────────────
   useEffect(() => {
     return () => {
-      // Clear camera reference and userData
       if (cameraRef.current) {
         cameraRef.current.userData = {};
         cameraRef.current = null;
       }
-
       clearTerrainCache();
       roadsCacheRef.current = null;
       roadsWithAABBRef.current = null;
       townsCacheRef.current = null;
-
-      // Clear entity cache to prevent memory retention
       entityCacheRef.current.clear();
-      // Clear icon flyweight cache so OffscreenCanvas objects can be GC'd
-      _iconCache.clear();
-      // Remove any dangling resize listeners if unmounted mid-drag
-      resizeCleanupRef.current?.();
+      if (workerRef.current) {
+        workerRef.current.dispose();
+        workerRef.current = null;
+        workerInitializedRef.current = false;
+      }
     };
   }, [clearTerrainCache]);
 
-  // Keep extent ref in sync with state for render loop access
-  useEffect(() => {
-    targetExtentRef.current = targetExtent;
-  }, [targetExtent]);
-
+  // ── Satellite hooks ──────────────────────────────────────────────────────────
   useMinimapEntityPips({
     world,
     isVisible,
@@ -1044,8 +275,7 @@ function MinimapInner({
     townsCacheRef,
   });
 
-  // Single unified render loop - handles camera position, frustum, and rendering
-  // Uses refs for all state access to avoid restarting the RAF loop
+  // ── RAF render loop ──────────────────────────────────────────────────────────
   useEffect(() => {
     const overlayCanvas = overlayCanvasRef.current;
     if (!overlayCanvas || !isVisible) return;
@@ -1055,59 +285,44 @@ function MinimapInner({
 
     const render = () => {
       frameCount++;
-      // Cache time once per frame — reused for pulse animations, avoids Date.now() per-pip
       const frameTimeMs = performance.now();
       const cam = cameraRef.current;
-
-      // Destructure per-instance render state — object aliases let us mutate through them
-      // without changing any of the hot-path code that uses these names.
       const rs = renderStateRef.current;
-      const _tempForwardVec = rs.forwardVec;
-      const _tempProjectVec = rs.projectVec;
-      const _tempDestVec = rs.destVec;
-      const _tempTargetPos = rs.targetPos;
-      const _cachedProjectionViewMatrix = rs.projectionViewMatrix;
+      const forwardVec = rs.forwardVec;
+      const projectVec = rs.projectVec;
+      const destVec = rs.destVec;
+      const targetPos = rs.targetPos;
+      const pvMatrix = rs.projectionViewMatrix;
 
       // --- Camera Position Update (follow player or spectated entity) ---
       const player = world.entities?.player as Entity | undefined;
       let hasTarget = false;
 
       if (player) {
-        // Normal mode: follow local player
-        _tempTargetPos.x = player.node.position.x;
-        _tempTargetPos.z = player.node.position.z;
+        targetPos.x = player.node.position.x;
+        targetPos.z = player.node.position.z;
         hasTarget = true;
       } else {
-        // Spectator mode: get camera target from camera system
         const spectatorTarget = getSpectatorTarget(world);
         if (spectatorTarget) {
-          _tempTargetPos.x = spectatorTarget.position.x;
-          _tempTargetPos.z = spectatorTarget.position.z;
+          targetPos.x = spectatorTarget.position.x;
+          targetPos.z = spectatorTarget.position.z;
           hasTarget = true;
         }
       }
 
       if (cam && hasTarget) {
-        // Keep centered on target (player or spectated entity)
-        // Using pre-allocated _tempTargetPos to avoid GC pressure
-        cam.position.x = _tempTargetPos.x;
-        cam.position.z = _tempTargetPos.z;
-        cam.lookAt(_tempTargetPos.x, 0, _tempTargetPos.z);
+        cam.position.x = targetPos.x;
+        cam.position.z = targetPos.z;
+        cam.lookAt(targetPos.x, 0, targetPos.z);
 
-        // Rotate minimap with main camera yaw if enabled
         if (rotateWithCameraRef.current && world.camera) {
-          const worldCam = world.camera;
-          // Reuse pre-allocated vector to avoid GC pressure
-          worldCam.getWorldDirection(_tempForwardVec);
-          _tempForwardVec.y = 0;
-          if (_tempForwardVec.lengthSq() > 1e-6) {
-            _tempForwardVec.normalize();
-            // Compute yaw so that up vector rotates the minimap
-            const yaw = Math.atan2(_tempForwardVec.x, -_tempForwardVec.z);
-            const upX = Math.sin(yaw);
-            const upZ = -Math.cos(yaw);
-            cam.up.set(upX, 0, upZ);
-            // Update compass arrow via direct DOM write — no React re-render
+          world.camera.getWorldDirection(forwardVec);
+          forwardVec.y = 0;
+          if (forwardVec.lengthSq() > 1e-6) {
+            forwardVec.normalize();
+            const yaw = Math.atan2(forwardVec.x, -forwardVec.z);
+            cam.up.set(Math.sin(yaw), 0, -Math.cos(yaw));
             if (compassRef.current) {
               compassRef.current.style.transform = `rotate(${THREE.MathUtils.radToDeg(yaw)}deg)`;
             }
@@ -1119,8 +334,8 @@ function MinimapInner({
         // Clear destination when reached
         const destWorld = lastDestinationWorldRef.current;
         if (destWorld) {
-          const dx = destWorld.x - _tempTargetPos.x;
-          const dz = destWorld.z - _tempTargetPos.z;
+          const dx = destWorld.x - targetPos.x;
+          const dz = destWorld.z - targetPos.z;
           if (dx * dx + dz * dz < 0.36) {
             lastDestinationWorldRef.current = null;
           }
@@ -1129,8 +344,8 @@ function MinimapInner({
         // Also clear global raycast target when player reaches it
         const hw = window as HyperscapeWindow;
         if (hw.__lastRaycastTarget) {
-          const dx = hw.__lastRaycastTarget.x - _tempTargetPos.x;
-          const dz = hw.__lastRaycastTarget.z - _tempTargetPos.z;
+          const dx = hw.__lastRaycastTarget.x - targetPos.x;
+          const dz = hw.__lastRaycastTarget.z - targetPos.z;
           if (dx * dx + dz * dz < 0.36) delete hw.__lastRaycastTarget;
         }
       }
@@ -1144,11 +359,10 @@ function MinimapInner({
           const zoomStep =
             Math.sign(zoomDelta) *
             Math.min(60, Math.max(2, Math.abs(zoomDelta) * 0.24));
-          const nextExtent =
+          extentRef.current =
             Math.abs(zoomDelta) <= Math.abs(zoomStep)
               ? desiredExtent
               : currentExtent + zoomStep;
-          extentRef.current = nextExtent;
         }
         const liveExtent = extentRef.current;
         if (cam.right !== liveExtent) {
@@ -1160,292 +374,188 @@ function MinimapInner({
         }
       }
 
-      // --- Update camera matrices every frame for smooth pip rendering ---
-      // Pips represent live entity positions and must stay fluid at 60fps.
-      // Road/building overlays use the terrain-snapshot parameters (below) so they
-      // remain locked to the terrain ImageData regardless of this live matrix.
+      // --- Update camera matrices every frame ---
       if (cam) {
         cam.updateMatrixWorld();
-        _cachedProjectionViewMatrix.multiplyMatrices(
-          cam.projectionMatrix,
-          cam.matrixWorldInverse,
-        );
+        pvMatrix.multiplyMatrices(cam.projectionMatrix, cam.matrixWorldInverse);
         rs.hasCachedMatrix = true;
       }
 
-      // --- Canvas 2D terrain background (throttled, same cadence as old 3D render) ---
+      // --- Canvas 2D terrain background ---
       const shouldRedrawTerrain = frameCount % RENDER_EVERY_N_FRAMES === 0;
       if (shouldRedrawTerrain && cam) {
         const mainCanvas = canvasRef.current;
-        // Use cached context — avoids a DOM query every frame
         const mainCtx = mainCtxRef.current;
         if (mainCanvas && mainCtx) {
-          {
-            const cw = mainCanvas.width;
-            const ch = mainCanvas.height;
-
-            // Snapshot camera state — used for both terrain generation and overlay drawing
-            // so all layers are guaranteed to be aligned with each other.
-            const centerX = cam.position.x;
-            const centerZ = cam.position.z;
-            const currentExtent = extentRef.current;
-            const upX = cam.up.x;
-            const upZ = cam.up.z;
-
-            // Compute the rotation delta between the live camera and the cached terrain angle.
-            // KEY INSIGHT: rotating the canvas context by +deltaYaw around the canvas center
-            // is mathematically equivalent to re-drawing everything with the live worldToPx
-            // camera orientation (proven by coordinate algebra). This means terrain, roads,
-            // and buildings all rotate INSTANTLY without needing terrain regeneration.
-            const cachedYaw = Math.atan2(
-              terrainCacheUpRef.current.x,
-              -terrainCacheUpRef.current.z,
+          const cw = mainCanvas.width;
+          const ch = mainCanvas.height;
+          const centerX = cam.position.x;
+          const centerZ = cam.position.z;
+          const currentExtent = extentRef.current;
+          const upX = cam.up.x;
+          const upZ = cam.up.z;
+          const cachedYaw = Math.atan2(
+            terrainCacheUpRef.current.x,
+            -terrainCacheUpRef.current.z,
+          );
+          const currentYaw = Math.atan2(upX, -upZ);
+          const deltaYaw = currentYaw - cachedYaw;
+
+          ensureTerrainCache({
+            centerX,
+            centerZ,
+            currentExtent,
+            upX,
+            upZ,
+            viewportPixels: Math.max(cw, ch),
+          });
+
+          mainCtx.save();
+          mainCtx.translate(cw / 2, ch / 2);
+          mainCtx.rotate(-deltaYaw);
+          mainCtx.translate(-cw / 2, -ch / 2);
+
+          if (terrainOffscreenRef.current) {
+            mainCtx.imageSmoothingEnabled = true;
+            mainCtx.imageSmoothingQuality = "high";
+            const cachedExt = terrainCacheExtentRef.current;
+            const extentScale = cachedExt > 0 ? cachedExt / currentExtent : 1;
+            const drawScale = Math.max(1 / TERRAIN_OVERSHOOT, extentScale);
+            const drawW = cw * TERRAIN_OVERSHOOT * drawScale;
+            const drawH = ch * TERRAIN_OVERSHOOT * drawScale;
+            const cachedUpX = terrainCacheUpRef.current.x;
+            const cachedUpZ = terrainCacheUpRef.current.z;
+            const cachedRightX = -cachedUpZ;
+            const cachedRightZ = cachedUpX;
+            const cachedCenterX = terrainCacheCenterRef.current.x;
+            const cachedCenterZ = terrainCacheCenterRef.current.z;
+            const centerDeltaX = centerX - cachedCenterX;
+            const centerDeltaZ = centerZ - cachedCenterZ;
+            const offsetRight =
+              centerDeltaX * cachedRightX + centerDeltaZ * cachedRightZ;
+            const offsetUp =
+              centerDeltaX * cachedUpX + centerDeltaZ * cachedUpZ;
+            const pixelsPerWorldX = cw / (2 * currentExtent);
+            const pixelsPerWorldY = ch / (2 * currentExtent);
+            const offsetX = -offsetRight * pixelsPerWorldX;
+            const offsetY = offsetUp * pixelsPerWorldY;
+            mainCtx.fillStyle = "#11161c";
+            mainCtx.fillRect(0, 0, cw, ch);
+            mainCtx.drawImage(
+              terrainOffscreenRef.current,
+              cw / 2 - drawW / 2 + offsetX,
+              ch / 2 - drawH / 2 + offsetY,
+              drawW,
+              drawH,
             );
-            const currentYaw = Math.atan2(upX, -upZ);
-            const deltaYaw = currentYaw - cachedYaw;
-
-            // Terrain regeneration is triggered by POSITION or EXTENT change only —
-            // NOT by camera rotation (canvas rotation handles that instantly).
-            // This eliminates the restart-cancel deadlock: previously, every 4-frame
-            // terrain check during rotation would increment the version token and cancel
-            // the in-flight generation before it could finish, freezing the minimap.
-            ensureTerrainCache({
-              centerX,
-              centerZ,
-              currentExtent,
-              upX,
-              upZ,
-              viewportPixels: Math.max(cw, ch),
-            });
-
-            // Apply a single canvas rotation transform so terrain + all vector overlays
-            // rotate to the live camera orientation in one GPU operation.
-            // Negative deltaYaw so minimap rotates same direction as camera (canvas
-            // positive angle = clockwise; user "rotate left" = counterclockwise = we need -deltaYaw).
-            mainCtx.save();
-            mainCtx.translate(cw / 2, ch / 2);
-            mainCtx.rotate(-deltaYaw);
-            mainCtx.translate(-cw / 2, -ch / 2);
-
-            if (terrainOffscreenRef.current) {
-              mainCtx.imageSmoothingEnabled = true;
-              mainCtx.imageSmoothingQuality = "high";
-              const cachedExt = terrainCacheExtentRef.current;
-              const extentScale = cachedExt > 0 ? cachedExt / currentExtent : 1;
-              // Draw stale snapshots at their true world scale. When rapidly
-              // zooming out, keep at least viewport coverage so we never expose
-              // a hard black box while the replacement cache is generated.
-              const drawScale = Math.max(1 / TERRAIN_OVERSHOOT, extentScale);
-              const drawW = cw * TERRAIN_OVERSHOOT * drawScale;
-              const drawH = ch * TERRAIN_OVERSHOOT * drawScale;
-              const cachedUpX = terrainCacheUpRef.current.x;
-              const cachedUpZ = terrainCacheUpRef.current.z;
-              const cachedRightX = -cachedUpZ;
-              const cachedRightZ = cachedUpX;
-              const cachedCenterX = terrainCacheCenterRef.current.x;
-              const cachedCenterZ = terrainCacheCenterRef.current.z;
-              const centerDeltaX = centerX - cachedCenterX;
-              const centerDeltaZ = centerZ - cachedCenterZ;
-              // Project center deltas into the cached terrain basis, not the
-              // live camera basis. The cached image is authored in that older
-              // orientation and then globally rotated above via deltaYaw.
-              const offsetRight =
-                centerDeltaX * cachedRightX + centerDeltaZ * cachedRightZ;
-              const offsetUp =
-                centerDeltaX * cachedUpX + centerDeltaZ * cachedUpZ;
-              const pixelsPerWorldX = cw / (2 * currentExtent);
-              const pixelsPerWorldY = ch / (2 * currentExtent);
-              const offsetX = -offsetRight * pixelsPerWorldX;
-              const offsetY = offsetUp * pixelsPerWorldY;
-              mainCtx.fillStyle = "#11161c";
-              mainCtx.fillRect(0, 0, cw, ch);
-              mainCtx.drawImage(
-                terrainOffscreenRef.current,
-                cw / 2 - drawW / 2 + offsetX,
-                ch / 2 - drawH / 2 + offsetY,
-                drawW,
-                drawH,
-              );
-            } else {
-              // Fallback: dark background until terrain system is ready
-              mainCtx.fillStyle = "#11161c";
-              mainCtx.fillRect(0, 0, cw, ch);
-            }
-
-            // Restore canvas transform — terrain only, no overlays here
-            mainCtx.restore();
+          } else {
+            mainCtx.fillStyle = "#11161c";
+            mainCtx.fillRect(0, 0, cw, ch);
           }
+
+          mainCtx.restore();
         }
       }
 
-      // Draw 2D overlay (roads → buildings → pips → flag) every frame
-      const ctx = overlayCtxRef.current;
-      if (ctx) {
-        const cw = overlayCanvas.width;
-        const ch = overlayCanvas.height;
-        const viewportW = widthRef.current;
-        const viewportH = heightRef.current;
-        ctx.clearRect(0, 0, cw, ch);
-
-        // ── Roads & buildings ─────────────────────────────────────────────────
-        // Same camera-matrix projection as entity pips — moves, zooms, and
-        // rotates in perfect sync with no separate coordinate system.
-        if (rs.hasCachedMatrix && cam) {
-          const currentExtent = extentRef.current;
-          drawRoadsAndBuildingsOverlay(
-            ctx,
-            roadsWithAABBRef.current,
-            townsCacheRef.current,
-            roadPixelBufRef,
-            projectedRoadsRef,
-            _cachedProjectionViewMatrix,
-            _tempProjectVec,
-            cam.position.x,
-            cam.position.z,
-            currentExtent * 2,
-            // pixels per world unit — drives road width scaling with zoom
-            cw / (2 * currentExtent),
-            cw,
-            ch,
+      // --- Worker overlay (roads, buildings, entities, destination) ---
+      if (cam && isMinimapWorkerSupported()) {
+        // Lazy-init worker on first frame (ImageBitmap mode — avoids
+        // transferControlToOffscreen() which makes the overlay canvas opaque)
+        if (!workerInitializedRef.current && overlayCanvas) {
+          workerInitializedRef.current = true;
+          const mgr = new MinimapWorkerManager(
+            overlayCanvas.width,
+            overlayCanvas.height,
           );
+          workerRef.current = mgr;
+          mgr.init();
+          mgr.setOnBitmap((bitmap) => {
+            const ctx = overlayCtxRef.current;
+            if (ctx) {
+              ctx.clearRect(0, 0, overlayCanvas.width, overlayCanvas.height);
+              ctx.drawImage(bitmap, 0, 0);
+              bitmap.close();
+            }
+          });
         }
 
-        // ── Entity pips ───────────────────────────────────────────────────────
-        const pipsArray = entityPipsRefForRender.current;
-        // World-space cull radius: extent + small pip margin so pips near the edge
-        // aren't clipped mid-frame. 8 world units covers the largest icon (16px icon
-        // at typical zoom ≈ 4 world units; double for safety).
-        const pipCullRadius = extentRef.current + 8;
-        const camPX = cam ? cam.position.x : 0;
-        const camPZ = cam ? cam.position.z : 0;
-        for (let pipIdx = 0; pipIdx < pipsArray.length; pipIdx++) {
-          const pip = pipsArray[pipIdx];
-          // World-space pre-cull: skip projection entirely for off-screen pips.
-          // Uses Chebyshev distance (max of |dx|, |dz|) — tighter than circle,
-          // safe because the minimap is square-ish.
-          if (
-            Math.abs(pip.position.x - camPX) > pipCullRadius ||
-            Math.abs(pip.position.z - camPZ) > pipCullRadius
-          )
-            continue;
-
-          // Convert world position to screen position using cached matrix
-          // This keeps pips synced with the throttled 3D render (not the live camera)
-          if (rs.hasCachedMatrix) {
-            // Reuse pre-allocated vector instead of cloning to avoid GC pressure
-            _tempProjectVec.copy(pip.position);
-            // Apply cached projection-view matrix manually instead of using project()
-            _tempProjectVec.applyMatrix4(_cachedProjectionViewMatrix);
-
-            // Use refs for width/height to avoid stale closure values during resize
-            const x = (_tempProjectVec.x * 0.5 + 0.5) * viewportW;
-            const y = (_tempProjectVec.y * -0.5 + 0.5) * viewportH;
-
-            // Only draw if within bounds (use refs for current dimensions)
-            if (x >= 0 && x <= viewportW && y >= 0 && y <= viewportH) {
-              // Pip radius — default 3px; player and quest are the only exceptions
-              let radius = 3;
-              const borderColor = "#000000";
-              const borderWidth = 1;
-              if (pip.type === "player") {
-                radius =
-                  pip.groupIndex !== undefined && pip.groupIndex >= 0 ? 4 : 3;
-              } else if (pip.type === "quest") {
-                radius = pip.isActive ? 7 : 5;
-              }
-
-              // Determine pip color (group members use GROUP_COLORS)
-              let pipColor = pip.color;
-              if (
-                pip.type === "player" &&
-                pip.groupIndex !== undefined &&
-                pip.groupIndex >= 0
-              ) {
-                pipColor = GROUP_COLORS[pip.groupIndex % GROUP_COLORS.length];
-              }
-
-              // Apply pulse animation for active pips (quests, etc.)
-              let pulseScale = 1;
-              if (pip.isActive) {
-                // frameTimeMs is cached once per frame — avoid per-pip Date.now() call
-                const pulseTime = frameTimeMs / 500; // 500ms per cycle
-                pulseScale = 1 + 0.15 * Math.sin(pulseTime * Math.PI * 2);
-              }
+        const worker = workerRef.current;
+        if (worker?.isReady()) {
+          // Camera yaw from world camera forward direction
+          let yaw = 0;
+          if (rotateWithCameraRef.current && cam.up) {
+            yaw = Math.atan2(cam.up.x, -cam.up.z);
+          }
 
-              // Draw pip — subtype icons use drawImage (no path needed).
-              // beginPath() is deferred past the icon check to avoid building
-              // a path that gets discarded for every icon-bearing pip.
-              ctx.fillStyle = pipColor;
+          worker.updateCamera({
+            x: cam.position.x,
+            z: cam.position.z,
+            extent: extentRef.current,
+            rotation: yaw,
+          });
+
+          // Convert EntityPip[] to WorkerEntity[]
+          const pips = entityPipsRefForRender.current;
+          const workerEntities: WorkerEntity[] = [];
+          for (let i = 0; i < pips.length; i++) {
+            const pip = pips[i];
+            workerEntities.push({
+              id: pip.id,
+              x: pip.position.x,
+              z: pip.position.z,
+              type: pip.type as WorkerEntity["type"],
+              color: pip.color,
+              size: pip.type === "quest" ? 6 : pip.type === "player" ? 4 : 3,
+              isLocalPlayer: pip.isLocalPlayer,
+              groupIndex: pip.groupIndex,
+              subType: pip.subType,
+              isActive: pip.isActive,
+              icon: pip.icon,
+            });
+          }
+          worker.updateEntities(workerEntities);
 
-              if (pip.subType && drawMinimapIcon(ctx, x, y, pip.subType)) {
-                // Icon drawn via cached OffscreenCanvas — no path work needed
-              } else if (pip.isLocalPlayer) {
-                // RS3/OSRS: local player is a white square (slightly larger than dots)
-                const sqHalf = 2.5;
-                ctx.fillStyle = "#ffffff";
-                ctx.fillRect(x - sqHalf, y - sqHalf, sqHalf * 2, sqHalf * 2);
-              } else if (pip.type === "quest" || pip.icon === "star") {
-                // Star for quest markers.
-                // Shadow is set BEFORE the fill so one draw call produces both
-                // the solid star and its glow ring — then cleared before stroke
-                // so the outline stays crisp with no halo artefacts.
-                const scaledRadius = radius * pulseScale;
-                if (pip.isActive) {
-                  ctx.shadowColor = pipColor;
-                  ctx.shadowBlur = 8;
-                }
-                drawStar(ctx, x, y, scaledRadius, scaledRadius * 0.5, 5);
-                ctx.fill();
-                ctx.shadowBlur = 0; // reset before stroke
-                ctx.strokeStyle = borderColor;
-                ctx.lineWidth = borderWidth;
-                ctx.stroke();
-              } else if (pip.icon === "diamond") {
-                // Diamond shape
-                drawDiamond(ctx, x, y, radius);
-                ctx.fill();
-                ctx.strokeStyle = borderColor;
-                ctx.lineWidth = borderWidth;
-                ctx.stroke();
-              } else {
-                // Circle for everything else (players, mobs, items)
-                ctx.beginPath();
-                ctx.arc(x, y, radius, 0, 2 * Math.PI);
-                ctx.fill();
+          // Send roads (only when cache changes, but send every frame for simplicity — worker replaces array)
+          const roads = roadsWithAABBRef.current;
+          if (roads) {
+            worker.updateRoads(roads as WorkerRoad[]);
+          }
 
-                // Add border for better visibility
-                ctx.strokeStyle = borderColor;
-                ctx.lineWidth = borderWidth;
-                ctx.stroke();
+          // Send buildings from town data
+          const towns = townsCacheRef.current;
+          if (towns) {
+            const workerBuildings: WorkerBuilding[] = [];
+            for (const town of towns) {
+              for (const b of town.buildings) {
+                workerBuildings.push({
+                  x: b.position.x,
+                  z: b.position.z,
+                  width: b.size.width,
+                  depth: b.size.depth,
+                  rotation: b.rotation,
+                });
               }
             }
+            worker.updateBuildings(workerBuildings);
           }
-        }
 
-        // Draw destination like world clicks: project world target to minimap
-        const lastTarget = (window as HyperscapeWindow).__lastRaycastTarget;
-        const destWorldRef = lastDestinationWorldRef.current;
-        const hasLastTarget =
-          lastTarget &&
-          Number.isFinite(lastTarget.x) &&
-          Number.isFinite(lastTarget.z);
-        const targetX = hasLastTarget ? lastTarget.x : destWorldRef?.x;
-        const targetZ = hasLastTarget ? lastTarget.z : destWorldRef?.z;
+          // Destination marker
+          const lastTarget = (window as HyperscapeWindow).__lastRaycastTarget;
+          const destWorldRef = lastDestinationWorldRef.current;
+          const hasLastTarget =
+            lastTarget &&
+            Number.isFinite(lastTarget.x) &&
+            Number.isFinite(lastTarget.z);
+          const markerX = hasLastTarget ? lastTarget.x : destWorldRef?.x;
+          const markerZ = hasLastTarget ? lastTarget.z : destWorldRef?.z;
+
+          if (markerX !== undefined && markerZ !== undefined) {
+            worker.updateDestination(markerX, markerZ);
+          } else {
+            worker.clearDestination();
+          }
 
-        if (
-          rs.hasCachedMatrix &&
-          targetX !== undefined &&
-          targetZ !== undefined
-        ) {
-          // Reuse pre-allocated vector instead of creating new one
-          _tempDestVec.set(targetX, 0, targetZ);
-          // Apply cached projection-view matrix to stay synced with throttled 3D render
-          _tempDestVec.applyMatrix4(_cachedProjectionViewMatrix);
-          // Use refs for width/height to avoid stale closure values during resize
-          const sx = (_tempDestVec.x * 0.5 + 0.5) * viewportW;
-          const sy = (_tempDestVec.y * -0.5 + 0.5) * viewportH;
-          // RS3-style red flag destination marker
-          drawFlag(ctx, sx, sy);
+          worker.render();
         }
       }
 
@@ -1459,214 +569,7 @@ function MinimapInner({
     };
   }, [isVisible, world]);
 
-  // Convert a click in the minimap to a world XZ position
-  const screenToWorldXZ = useCallback(
-    (clientX: number, clientY: number): { x: number; z: number } | null => {
-      const cam = cameraRef.current;
-      const cvs = overlayCanvasRef.current || canvasRef.current;
-      if (!cam || !cvs) return null;
-
-      const rect = cvs.getBoundingClientRect();
-      const ndcX = ((clientX - rect.left) / rect.width) * 2 - 1;
-      const ndcY = -((clientY - rect.top) / rect.height) * 2 + 1;
-      // Per-instance scratch vector — safe when multiple Minimaps exist simultaneously
-      const vec = renderStateRef.current.unprojectVec;
-      vec.set(ndcX, ndcY, 0);
-      vec.unproject(cam);
-      return { x: vec.x, z: vec.z };
-    },
-    [],
-  );
-
-  // Shared click handler core
-  const handleMinimapClick = useCallback(
-    (clientX: number, clientY: number) => {
-      // Debounce: drop clicks within 150ms to prevent moveRequest flooding
-      const now = performance.now();
-      if (now - lastClickTimeRef.current < 150) return;
-      lastClickTimeRef.current = now;
-
-      const worldPos = screenToWorldXZ(clientX, clientY);
-      if (!worldPos) return;
-
-      const player = world.entities?.player as
-        | { position?: { x: number; z: number }; runMode?: boolean }
-        | undefined;
-      if (!player?.position) return;
-      const dx = worldPos.x - player.position.x;
-      const dz = worldPos.z - player.position.z;
-      const dist = Math.hypot(dx, dz);
-      let targetX = worldPos.x;
-      let targetZ = worldPos.z;
-      if (dist > INPUT.MAX_CLICK_DISTANCE_TILES) {
-        const scale = INPUT.MAX_CLICK_DISTANCE_TILES / dist;
-        targetX = player.position.x + dx * scale;
-        targetZ = player.position.z + dz * scale;
-      }
-
-      const terrainSystem = world.getSystem("terrain") as unknown as
-        | TerrainSystemLike
-        | null
-        | undefined;
-      let targetY = 0;
-      if (terrainSystem?.getHeightAt) {
-        const h = terrainSystem.getHeightAt(targetX, targetZ);
-        targetY = (Number.isFinite(h) ? h : 0) + 0.1;
-      }
-
-      // Send server-authoritative move request instead of local movement
-      const currentRun = (player as { runMode?: boolean }).runMode === true;
-      (world as unknown as WorldNetworkSend).network.send("moveRequest", {
-        target: [targetX, targetY, targetZ],
-        runMode: currentRun,
-        cancel: false,
-      });
-
-      // Persist destination until arrival (no auto-fade)
-      lastDestinationWorldRef.current = { x: targetX, z: targetZ };
-      // Expose same diagnostic target used by world clicks so minimap renders dot identically
-      (window as HyperscapeWindow).__lastRaycastTarget = {
-        x: targetX,
-        y: targetY,
-        z: targetZ,
-        method: "minimap",
-      };
-    },
-    [screenToWorldXZ, world],
-  );
-
-  const onOverlayClick = useCallback(
-    (e: React.MouseEvent<HTMLCanvasElement>) => {
-      e.preventDefault();
-      e.stopPropagation();
-      handleMinimapClick(e.clientX, e.clientY);
-    },
-    [handleMinimapClick],
-  );
-
-  // Stable prevent-default-only handler — no deps, never recreated
-  const onPreventDefault = useCallback(
-    (e: React.SyntheticEvent) => e.preventDefault(),
-    [],
-  );
-
-  // Stable stop-propagation + prevent-default handler for canvas events
-  const onStopAndPrevent = useCallback((e: React.SyntheticEvent) => {
-    e.preventDefault();
-    e.stopPropagation();
-  }, []);
-
-  // Collapse button click — same as toggleCollapse but also swallows the event
-  const onCollapseButtonClick = useCallback(
-    (e: React.MouseEvent) => {
-      e.preventDefault();
-      e.stopPropagation();
-      toggleCollapse();
-    },
-    [toggleCollapse],
-  );
-
-  // Wheel handler for minimap zoom - uses native WheelEvent for passive: false support
-  // Uses functional update to ensure correct extent value during rapid scrolling
-  // No dependencies - handler is stable and listener doesn't need to be re-attached
-  const handleWheel = useCallback(
-    (e: WheelEvent) => {
-      e.preventDefault();
-      e.stopPropagation();
-      const sign = Math.sign(e.deltaY);
-      if (sign === 0) return;
-      // Notched steps for smooth zoom
-      const steps = Math.max(
-        1,
-        Math.min(5, Math.round(Math.abs(e.deltaY) / 100)),
-      );
-      // Use functional update to always have the latest extent value
-      setTargetExtent((prev) =>
-        THREE.MathUtils.clamp(
-          prev + sign * steps * STEP_EXTENT,
-          MIN_EXTENT,
-          MAX_EXTENT,
-        ),
-      );
-    },
-    [], // No dependencies - uses functional update
-  );
-
-  // Attach wheel listener with { passive: false } to allow preventDefault()
-  // React's onWheel is passive by default, causing "Unable to preventDefault" errors
-  useEffect(() => {
-    const container = containerRef.current;
-    if (!container) return;
-
-    container.addEventListener("wheel", handleWheel, { passive: false });
-
-    return () => {
-      container.removeEventListener("wheel", handleWheel);
-    };
-  }, [handleWheel]);
-
-  // SE corner drag handler — widens right and down (matching the only rendered handle)
-  const handleResizeStart = useCallback(
-    (e: React.PointerEvent) => {
-      if (!resizable) return;
-      e.preventDefault();
-      e.stopPropagation();
-
-      setIsResizing(true);
-      resizeStartRef.current = {
-        x: e.clientX,
-        y: e.clientY,
-        w: width,
-        h: height,
-      };
-
-      const handleMove = (moveEvent: PointerEvent) => {
-        if (!resizeStartRef.current) return;
-
-        const dx = moveEvent.clientX - resizeStartRef.current.x;
-        const dy = moveEvent.clientY - resizeStartRef.current.y;
-        const newW = resizeStartRef.current.w + dx;
-        const newH = resizeStartRef.current.h + dy;
-
-        // Clamp to bounds independently for width and height
-        const effectiveMaxSize = maxSize ?? Infinity;
-        const clampedW = Math.max(
-          minSize,
-          Math.min(effectiveMaxSize, Math.round(newW / 8) * 8),
-        );
-        const clampedH = Math.max(
-          minSize,
-          Math.min(effectiveMaxSize, Math.round(newH / 8) * 8),
-        );
-        setCurrentWidth(clampedW);
-        setCurrentHeight(clampedH);
-        // Write latest clamped size into the ref so handleUp always sees the
-        // post-drag final size, not the stale closure-captured initial values.
-        latestSizeRef.current = { w: clampedW, h: clampedH };
-      };
-
-      const cleanupResize = () => {
-        window.removeEventListener("pointermove", handleMove);
-        window.removeEventListener("pointerup", handleUp);
-        resizeCleanupRef.current = null;
-      };
-
-      const handleUp = () => {
-        setIsResizing(false);
-        resizeStartRef.current = null;
-        // Read from ref — immune to stale closure over currentWidth/currentHeight
-        onSizeChange?.(latestSizeRef.current.w, latestSizeRef.current.h);
-        cleanupResize();
-      };
-
-      window.addEventListener("pointermove", handleMove);
-      window.addEventListener("pointerup", handleUp);
-      resizeCleanupRef.current = cleanupResize;
-    },
-    [resizable, width, height, minSize, maxSize, onSizeChange],
-  );
-
-  // Render collapsed state as a 32x32 icon
+  // ── Collapsed state render ───────────────────────────────────────────────────
   if (collapsible && isCollapsed) {
     return (
       <div
@@ -1686,7 +589,6 @@ function MinimapInner({
         onClick={toggleCollapse}
         title="Expand Minimap (Tab)"
       >
-        {/* Player direction arrow in collapsed state — rotated via direct DOM write in RAF */}
         <svg
           ref={(el) => {
             compassRef.current = el;
@@ -1710,6 +612,7 @@ function MinimapInner({
     );
   }
 
+  // ── Expanded state render ────────────────────────────────────────────────────
   return (
     <div
       ref={containerRef}
@@ -1724,7 +627,7 @@ function MinimapInner({
       onMouseDown={onPreventDefault}
       onContextMenu={onPreventDefault}
     >
-      {/* 3D canvas */}
+      {/* Terrain canvas */}
       <canvas
         ref={canvasRef}
         width={width}
@@ -1741,7 +644,7 @@ function MinimapInner({
         onMouseDown={onStopAndPrevent}
         onContextMenu={onStopAndPrevent}
       />
-      {/* Resize handles (SE corner only for simplicity) */}
+      {/* Resize handle (SE corner) */}
       {resizable && (
         <div
           className="absolute bottom-0 right-0 w-4 h-4 cursor-se-resize z-20 pointer-events-auto"
@@ -1757,21 +660,16 @@ function MinimapInner({
         <div className="absolute inset-0 border-2 border-yellow-400/50 rounded-lg pointer-events-none z-30" />
       )}
 
-      {/* Edit mode drag overlay - makes the entire minimap content draggable */}
-      {/* This is positioned INSIDE the edges so resize handles remain accessible */}
-      {/* Corners (12px) and edges (8px) are reserved for resize, interior is for drag */}
+      {/* Edit mode drag overlay */}
       {isUnlocked && dragHandleProps && (
         <div
           className="absolute cursor-move pointer-events-auto"
           style={{
             zIndex: 50,
-            // Inset from all edges to leave room for resize handles
-            // Edges are 8px wide, corners are 12px
             top: 10,
             left: 10,
             right: 10,
             bottom: 10,
-            // Subtle visual feedback for drag area
             background: "rgba(100, 180, 255, 0.08)",
             border: "1px dashed rgba(100, 180, 255, 0.4)",
             borderRadius: 4,
@@ -1781,7 +679,7 @@ function MinimapInner({
         />
       )}
 
-      {/* Collapse button (top-right) - only shown when collapsible */}
+      {/* Collapse button (top-right) */}
       {collapsible && (
         <button
           className="absolute z-20 pointer-events-auto cursor-pointer"
diff --git a/packages/client/src/game/hud/StatusBars.tsx b/packages/client/src/game/hud/StatusBars.tsx
index 363808997..99e77798e 100644
--- a/packages/client/src/game/hud/StatusBars.tsx
+++ b/packages/client/src/game/hud/StatusBars.tsx
@@ -28,6 +28,7 @@ import {
   useMobileLayout,
   StatusOrb,
 } from "@/ui";
+import { getHpPercent } from "@hyperscape/shared";
 import { getHudClusterSurfaceStyle } from "@/ui/theme/themes";
 import type { PlayerStats } from "../../types";
 import { HUD_FRAME, HUD_LAYERS } from "./layout";
@@ -331,7 +332,7 @@ export function StatusBars({
   };
 
   // Calculate bar data
-  const hpPercent = Math.round((health.current / health.max) * 100);
+  const hpPercent = getHpPercent(health.current, health.max);
   const prayerPercent = Math.round(
     (prayerPoints.current / Math.max(1, prayerPoints.max)) * 100,
   );
diff --git a/packages/client/src/game/hud/minimapTypes.ts b/packages/client/src/game/hud/minimapTypes.ts
new file mode 100644
index 000000000..bd594b585
--- /dev/null
+++ b/packages/client/src/game/hud/minimapTypes.ts
@@ -0,0 +1,65 @@
+/**
+ * minimapTypes.ts - Shared types and utilities for minimap components.
+ *
+ * Extracted from MinimapRenderer.ts during worker migration.
+ * Used by Minimap.tsx and useMinimapInteraction.ts.
+ */
+
+import { THREE } from "@hyperscape/shared";
+
+/** Per-instance render state factory. Each Minimap instance gets isolated scratch data. */
+export interface MinimapRenderState {
+  forwardVec: THREE.Vector3;
+  projectVec: THREE.Vector3;
+  destVec: THREE.Vector3;
+  unprojectVec: THREE.Vector3;
+  targetPos: { x: number; z: number };
+  projectionViewMatrix: THREE.Matrix4;
+  hasCachedMatrix: boolean;
+}
+
+/** Augmented window type covering all Hyperscape globals written to window */
+export type HyperscapeWindow = Window &
+  typeof globalThis & {
+    __lastRaycastTarget?: { x: number; y: number; z: number; method: string };
+    __HYPERSCAPE_CONFIG__?: { mode?: string; followEntity?: string };
+  };
+
+export function createRenderState(): MinimapRenderState {
+  return {
+    forwardVec: new THREE.Vector3(),
+    projectVec: new THREE.Vector3(),
+    destVec: new THREE.Vector3(),
+    unprojectVec: new THREE.Vector3(),
+    targetPos: { x: 0, z: 0 },
+    projectionViewMatrix: new THREE.Matrix4(),
+    hasCachedMatrix: false,
+  };
+}
+
+export interface SpectatorTarget {
+  id?: string;
+  position: { x: number; z: number };
+}
+
+export function getSpectatorTarget(world: {
+  getSystem: (name: string) => unknown;
+}): SpectatorTarget | null {
+  const mode = (window as HyperscapeWindow).__HYPERSCAPE_CONFIG__?.mode;
+  if (mode !== "spectator" && mode !== "stream")
+    return null;
+  const cameraSystem = world.getSystem("client-camera-system") as {
+    getCameraInfo?: () => {
+      target?: {
+        id?: string;
+        node?: { position?: THREE.Vector3 };
+        position?: { x: number; z: number };
+      };
+    };
+  } | null;
+  const info = cameraSystem?.getCameraInfo?.();
+  if (!info?.target) return null;
+  const pos = info.target.node?.position ?? info.target.position;
+  if (!pos) return null;
+  return { id: info.target.id, position: { x: pos.x, z: pos.z } };
+}
diff --git a/packages/client/src/game/hud/useMinimapEntityPips.ts b/packages/client/src/game/hud/useMinimapEntityPips.ts
index 7b0f8643c..d2a91f131 100644
--- a/packages/client/src/game/hud/useMinimapEntityPips.ts
+++ b/packages/client/src/game/hud/useMinimapEntityPips.ts
@@ -33,9 +33,8 @@ interface SpectatorTarget {
 }
 
 function getSpectatorTarget(world: ClientWorld): SpectatorTarget | null {
-  if (
-    (window as HyperscapeWindow).__HYPERSCAPE_CONFIG__?.mode !== "spectator"
-  ) {
+  const mode = (window as HyperscapeWindow).__HYPERSCAPE_CONFIG__?.mode;
+  if (mode !== "spectator" && mode !== "stream") {
     return null;
   }
 
diff --git a/packages/client/src/game/hud/useMinimapInteraction.ts b/packages/client/src/game/hud/useMinimapInteraction.ts
new file mode 100644
index 000000000..d546a4afc
--- /dev/null
+++ b/packages/client/src/game/hud/useMinimapInteraction.ts
@@ -0,0 +1,370 @@
+/**
+ * useMinimapInteraction.ts - Minimap zoom, resize, click-to-teleport, and collapse interaction handlers.
+ *
+ * Extracts all user interaction logic from the Minimap component into a single hook.
+ */
+
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { THREE, INPUT, TerrainSystem } from "@hyperscape/shared";
+import type { ClientWorld } from "../../types";
+import { type MinimapRenderState, type HyperscapeWindow } from "./minimapTypes";
+
+// ─── Constants ─────────────────────────────────────────────────────────────────
+
+/** Zoom bounds and step size -- kept at module scope for stability across re-renders */
+const MIN_EXTENT = 20;
+const MAX_EXTENT = 1000;
+const STEP_EXTENT = 10;
+
+/**
+ * Reference minimap pixel size at which the initial zoom level is 1:1.
+ * sizeBasedExtent = zoom * (avgSize / MINIMAP_BASE_SIZE_PX)
+ */
+const MINIMAP_BASE_SIZE_PX = 200;
+
+// ─── Types ─────────────────────────────────────────────────────────────────────
+
+interface UseMinimapInteractionOptions {
+  world: ClientWorld;
+  initialWidth: number;
+  initialHeight: number;
+  zoom: number;
+  resizable: boolean;
+  minSize: number;
+  maxSize?: number;
+  onSizeChange?: (width: number, height: number) => void;
+  collapsible: boolean;
+  defaultCollapsed: boolean;
+  onCollapseChange?: (collapsed: boolean) => void;
+  /** Refs from the parent component needed for coordinate transforms */
+  cameraRef: React.RefObject<THREE.OrthographicCamera | null>;
+  canvasRef: React.RefObject<HTMLCanvasElement | null>;
+  overlayCanvasRef: React.RefObject<HTMLCanvasElement | null>;
+  containerRef: React.RefObject<HTMLDivElement | null>;
+  renderStateRef: React.RefObject<MinimapRenderState>;
+  lastDestinationWorldRef: React.MutableRefObject<{
+    x: number;
+    z: number;
+  } | null>;
+}
+
+export interface UseMinimapInteractionReturn {
+  /** Current display width */
+  width: number;
+  /** Current display height */
+  height: number;
+  /** Ref to width for RAF loop access */
+  widthRef: React.RefObject<number>;
+  /** Ref to height for RAF loop access */
+  heightRef: React.RefObject<number>;
+  /** Live displayed extent in world units */
+  extentRef: React.MutableRefObject<number>;
+  /** Target extent (for smooth zoom animation) */
+  targetExtentRef: React.RefObject<number>;
+  /** Whether the minimap is collapsed */
+  isCollapsed: boolean;
+  /** Whether the minimap is being resized */
+  isResizing: boolean;
+  /** Toggle collapsed state */
+  toggleCollapse: () => void;
+  /** Collapse button click handler (swallows event) */
+  onCollapseButtonClick: (e: React.MouseEvent) => void;
+  /** Overlay canvas click handler */
+  onOverlayClick: (e: React.MouseEvent<HTMLCanvasElement>) => void;
+  /** Generic preventDefault handler */
+  onPreventDefault: (e: React.SyntheticEvent) => void;
+  /** stopPropagation + preventDefault handler */
+  onStopAndPrevent: (e: React.SyntheticEvent) => void;
+  /** SE corner resize pointerDown handler */
+  handleResizeStart: (e: React.PointerEvent) => void;
+  /** Debounce ref for minimap click timing */
+  lastClickTimeRef: React.RefObject<number>;
+}
+
+export function useMinimapInteraction(
+  opts: UseMinimapInteractionOptions,
+): UseMinimapInteractionReturn {
+  const {
+    world,
+    initialWidth,
+    initialHeight,
+    zoom,
+    resizable,
+    minSize,
+    maxSize,
+    onSizeChange,
+    collapsible: _collapsible,
+    defaultCollapsed,
+    onCollapseChange,
+    cameraRef,
+    canvasRef,
+    overlayCanvasRef,
+    containerRef,
+    renderStateRef,
+    lastDestinationWorldRef,
+  } = opts;
+
+  // ── Collapse state ───────────────────────────────────────────────────────────
+  const [isCollapsed, setIsCollapsed] = useState(defaultCollapsed);
+
+  const toggleCollapse = useCallback(() => {
+    setIsCollapsed((prev) => {
+      const newValue = !prev;
+      onCollapseChange?.(newValue);
+      return newValue;
+    });
+  }, [onCollapseChange]);
+
+  const onCollapseButtonClick = useCallback(
+    (e: React.MouseEvent) => {
+      e.preventDefault();
+      e.stopPropagation();
+      toggleCollapse();
+    },
+    [toggleCollapse],
+  );
+
+  // ── Size state ───────────────────────────────────────────────────────────────
+  const [currentWidth, setCurrentWidth] = useState(initialWidth);
+  const [currentHeight, setCurrentHeight] = useState(initialHeight);
+  const width = currentWidth;
+  const height = currentHeight;
+
+  const widthRef = useRef(width);
+  const heightRef = useRef(height);
+
+  useEffect(() => {
+    widthRef.current = width;
+    heightRef.current = height;
+  }, [width, height]);
+
+  // ── Zoom / extent state ──────────────────────────────────────────────────────
+  const sizeBasedExtent = useMemo(() => {
+    const avgSize = (width + height) / 2;
+    return zoom * (avgSize / MINIMAP_BASE_SIZE_PX);
+  }, [width, height, zoom]);
+
+  const [targetExtent, setTargetExtent] = useState<number>(sizeBasedExtent);
+  const targetExtentRef = useRef<number>(targetExtent);
+  const extentRef = useRef<number>(targetExtent);
+
+  useEffect(() => {
+    setTargetExtent(sizeBasedExtent);
+  }, [sizeBasedExtent]);
+
+  useEffect(() => {
+    targetExtentRef.current = targetExtent;
+  }, [targetExtent]);
+
+  // ── Resize state ─────────────────────────────────────────────────────────────
+  const [isResizing, setIsResizing] = useState(false);
+  const resizeStartRef = useRef<{
+    x: number;
+    y: number;
+    w: number;
+    h: number;
+  } | null>(null);
+  const resizeCleanupRef = useRef<(() => void) | null>(null);
+  const latestSizeRef = useRef({ w: initialWidth, h: initialHeight });
+
+  // Cleanup dangling resize listeners on unmount
+  useEffect(() => {
+    return () => {
+      resizeCleanupRef.current?.();
+    };
+  }, []);
+
+  const handleResizeStart = useCallback(
+    (e: React.PointerEvent) => {
+      if (!resizable) return;
+      e.preventDefault();
+      e.stopPropagation();
+
+      setIsResizing(true);
+      resizeStartRef.current = {
+        x: e.clientX,
+        y: e.clientY,
+        w: width,
+        h: height,
+      };
+
+      const handleMove = (moveEvent: PointerEvent) => {
+        if (!resizeStartRef.current) return;
+
+        const dx = moveEvent.clientX - resizeStartRef.current.x;
+        const dy = moveEvent.clientY - resizeStartRef.current.y;
+        const newW = resizeStartRef.current.w + dx;
+        const newH = resizeStartRef.current.h + dy;
+
+        const effectiveMaxSize = maxSize ?? Infinity;
+        const clampedW = Math.max(
+          minSize,
+          Math.min(effectiveMaxSize, Math.round(newW / 8) * 8),
+        );
+        const clampedH = Math.max(
+          minSize,
+          Math.min(effectiveMaxSize, Math.round(newH / 8) * 8),
+        );
+        setCurrentWidth(clampedW);
+        setCurrentHeight(clampedH);
+        latestSizeRef.current = { w: clampedW, h: clampedH };
+      };
+
+      const cleanupResize = () => {
+        window.removeEventListener("pointermove", handleMove);
+        window.removeEventListener("pointerup", handleUp);
+        resizeCleanupRef.current = null;
+      };
+
+      const handleUp = () => {
+        setIsResizing(false);
+        resizeStartRef.current = null;
+        onSizeChange?.(latestSizeRef.current.w, latestSizeRef.current.h);
+        cleanupResize();
+      };
+
+      window.addEventListener("pointermove", handleMove);
+      window.addEventListener("pointerup", handleUp);
+      resizeCleanupRef.current = cleanupResize;
+    },
+    [resizable, width, height, minSize, maxSize, onSizeChange],
+  );
+
+  // ── Click-to-move ────────────────────────────────────────────────────────────
+  const lastClickTimeRef = useRef<number>(0);
+
+  const screenToWorldXZ = useCallback(
+    (clientX: number, clientY: number): { x: number; z: number } | null => {
+      const cam = cameraRef.current;
+      const cvs = overlayCanvasRef.current || canvasRef.current;
+      if (!cam || !cvs) return null;
+
+      const rect = cvs.getBoundingClientRect();
+      const ndcX = ((clientX - rect.left) / rect.width) * 2 - 1;
+      const ndcY = -((clientY - rect.top) / rect.height) * 2 + 1;
+      const vec = renderStateRef.current.unprojectVec;
+      vec.set(ndcX, ndcY, 0);
+      vec.unproject(cam);
+      return { x: vec.x, z: vec.z };
+    },
+    [cameraRef, overlayCanvasRef, canvasRef, renderStateRef],
+  );
+
+  const handleMinimapClick = useCallback(
+    (clientX: number, clientY: number) => {
+      const now = performance.now();
+      if (now - lastClickTimeRef.current < 150) return;
+      lastClickTimeRef.current = now;
+
+      const worldPos = screenToWorldXZ(clientX, clientY);
+      if (!worldPos) return;
+
+      const player = world.entities?.player as
+        | { position?: { x: number; z: number }; runMode?: boolean }
+        | undefined;
+      if (!player?.position) return;
+      const dx = worldPos.x - player.position.x;
+      const dz = worldPos.z - player.position.z;
+      const dist = Math.hypot(dx, dz);
+      let targetX = worldPos.x;
+      let targetZ = worldPos.z;
+      if (dist > INPUT.MAX_CLICK_DISTANCE_TILES) {
+        const scale = INPUT.MAX_CLICK_DISTANCE_TILES / dist;
+        targetX = player.position.x + dx * scale;
+        targetZ = player.position.z + dz * scale;
+      }
+
+      const terrainSystem = world.getSystem<TerrainSystem>("terrain");
+      let targetY = 0;
+      if (terrainSystem?.getHeightAt) {
+        const h = terrainSystem.getHeightAt(targetX, targetZ);
+        targetY = (Number.isFinite(h) ? h : 0) + 0.1;
+      }
+
+      const currentRun = (player as { runMode?: boolean }).runMode === true;
+      world.network?.send?.("moveRequest", {
+        target: [targetX, targetY, targetZ],
+        runMode: currentRun,
+        cancel: false,
+      });
+
+      lastDestinationWorldRef.current = { x: targetX, z: targetZ };
+      (window as HyperscapeWindow).__lastRaycastTarget = {
+        x: targetX,
+        y: targetY,
+        z: targetZ,
+        method: "minimap",
+      };
+    },
+    [screenToWorldXZ, world, lastDestinationWorldRef],
+  );
+
+  const onOverlayClick = useCallback(
+    (e: React.MouseEvent<HTMLCanvasElement>) => {
+      e.preventDefault();
+      e.stopPropagation();
+      handleMinimapClick(e.clientX, e.clientY);
+    },
+    [handleMinimapClick],
+  );
+
+  // ── Generic event handlers ───────────────────────────────────────────────────
+  const onPreventDefault = useCallback(
+    (e: React.SyntheticEvent) => e.preventDefault(),
+    [],
+  );
+
+  const onStopAndPrevent = useCallback((e: React.SyntheticEvent) => {
+    e.preventDefault();
+    e.stopPropagation();
+  }, []);
+
+  // ── Wheel zoom ───────────────────────────────────────────────────────────────
+  const handleWheel = useCallback((e: WheelEvent) => {
+    e.preventDefault();
+    e.stopPropagation();
+    const sign = Math.sign(e.deltaY);
+    if (sign === 0) return;
+    const steps = Math.max(
+      1,
+      Math.min(5, Math.round(Math.abs(e.deltaY) / 100)),
+    );
+    setTargetExtent((prev) =>
+      THREE.MathUtils.clamp(
+        prev + sign * steps * STEP_EXTENT,
+        MIN_EXTENT,
+        MAX_EXTENT,
+      ),
+    );
+  }, []);
+
+  // Attach wheel listener with { passive: false } to allow preventDefault()
+  useEffect(() => {
+    const container = containerRef.current;
+    if (!container) return;
+
+    container.addEventListener("wheel", handleWheel, { passive: false });
+
+    return () => {
+      container.removeEventListener("wheel", handleWheel);
+    };
+  }, [handleWheel, containerRef]);
+
+  return {
+    width,
+    height,
+    widthRef,
+    heightRef,
+    extentRef,
+    targetExtentRef,
+    isCollapsed,
+    isResizing,
+    toggleCollapse,
+    onCollapseButtonClick,
+    onOverlayClick,
+    onPreventDefault,
+    onStopAndPrevent,
+    handleResizeStart,
+    lastClickTimeRef,
+  };
+}
diff --git a/packages/client/src/game/hud/useMinimapTerrainCache.ts b/packages/client/src/game/hud/useMinimapTerrainCache.ts
index 89d3f7f77..ffbcffc94 100644
--- a/packages/client/src/game/hud/useMinimapTerrainCache.ts
+++ b/packages/client/src/game/hud/useMinimapTerrainCache.ts
@@ -1,5 +1,5 @@
 import { useCallback, useEffect, useRef, type MutableRefObject } from "react";
-import { TERRAIN_CONSTANTS } from "@hyperscape/shared";
+import { TERRAIN_CONSTANTS, TerrainSystem } from "@hyperscape/shared";
 import type { ClientWorld } from "../../types";
 
 const TERRAIN_BASE_SAMPLE_SIZE = 96;
@@ -37,12 +37,6 @@ const MINIMAP_BIOME_OVERRIDES: Record<string, CachedBiomeColor> = {
   beach: { r: 170, g: 152, b: 110 },
 };
 
-interface TerrainSystemLike {
-  getHeightAt: (x: number, z: number) => number;
-  getBiomeAtPosition?: (x: number, z: number) => string;
-  getBiomeData?: (biomeId: string) => BiomeDataLike | null;
-}
-
 interface EnsureTerrainCacheArgs {
   centerX: number;
   centerZ: number;
@@ -159,7 +153,7 @@ function blendColors(
 }
 
 function getBiomeBaseColor(
-  terrainSystem: TerrainSystemLike,
+  terrainSystem: TerrainSystem,
   worldX: number,
   worldZ: number,
 ): CachedBiomeColor {
@@ -203,7 +197,7 @@ function getBiomeBaseColor(
 }
 
 async function generateTerrainChunked(
-  terrainSystem: TerrainSystemLike,
+  terrainSystem: TerrainSystem,
   centerX: number,
   centerZ: number,
   extent: number,
@@ -378,10 +372,7 @@ export function useMinimapTerrainCache(
         return;
       }
 
-      const terrainSystem = world.getSystem("terrain") as
-        | TerrainSystemLike
-        | null
-        | undefined;
+      const terrainSystem = world.getSystem<TerrainSystem>("terrain");
       if (!terrainSystem?.getHeightAt) {
         return;
       }
diff --git a/packages/client/src/game/hud/xp-orb/useXPOrbState.ts b/packages/client/src/game/hud/xp-orb/useXPOrbState.ts
index f6d86ee76..921f8d236 100644
--- a/packages/client/src/game/hud/xp-orb/useXPOrbState.ts
+++ b/packages/client/src/game/hud/xp-orb/useXPOrbState.ts
@@ -12,7 +12,12 @@
  */
 
 import { useEffect, useState, useCallback, useRef, useMemo } from "react";
-import { EventType, SKILL_ICONS } from "@hyperscape/shared";
+import {
+  EventType,
+  SKILL_ICONS,
+  getXPForLevel,
+  getLevelForXP,
+} from "@hyperscape/shared";
 import type { ClientWorld } from "../../../types";
 
 // === CONSTANTS ===
@@ -70,44 +75,6 @@ export function normalizeSkillName(skill: string): string {
   return lower;
 }
 
-// Pre-computed XP table for O(1) lookups (OSRS formula)
-// Computed once at module load instead of looping on every render
-const XP_TABLE: readonly number[] = (() => {
-  const table: number[] = new Array(100).fill(0);
-  for (let level = 2; level <= 99; level++) {
-    let total = 0;
-    for (let i = 1; i < level; i++) {
-      total += Math.floor(i + 300 * Math.pow(2, i / 7));
-    }
-    table[level] = Math.floor(total / 4);
-  }
-  return table;
-})();
-
-/** O(1) lookup for XP required at a given level */
-export function getXPForLevel(level: number): number {
-  if (level < 1) return 0;
-  if (level > 99) return XP_TABLE[99];
-  return XP_TABLE[level];
-}
-
-/** Get level for a given XP amount (binary search for efficiency) */
-function getLevelForXP(xp: number): number {
-  if (xp <= 0) return 1;
-  // Binary search through XP_TABLE to find highest level where XP_TABLE[level] <= xp
-  let low = 1;
-  let high = 99;
-  while (low < high) {
-    const mid = Math.ceil((low + high + 1) / 2);
-    if (XP_TABLE[mid] <= xp) {
-      low = mid;
-    } else {
-      high = mid - 1;
-    }
-  }
-  return low;
-}
-
 /** Type guard for runtime validation of XP drop data from server */
 function isValidXPDropData(data: unknown): data is XPDropData {
   if (typeof data !== "object" || data === null) return false;
diff --git a/packages/client/src/game/interface/CompactStatusHUD.tsx b/packages/client/src/game/interface/CompactStatusHUD.tsx
index f5e244091..e183029f1 100644
--- a/packages/client/src/game/interface/CompactStatusHUD.tsx
+++ b/packages/client/src/game/interface/CompactStatusHUD.tsx
@@ -33,8 +33,8 @@ export function CompactStatusHUD({
 
   // Normalize values with defaults
   const hp = {
-    current: typeof health?.current === "number" ? health.current : 10,
-    max: typeof health?.max === "number" ? health.max : 10,
+    current: typeof health?.current === "number" ? health.current : 0,
+    max: typeof health?.max === "number" ? health.max : 1,
   };
   const prayer = {
     current:
diff --git a/packages/client/src/game/panels/CombatPanel.tsx b/packages/client/src/game/panels/CombatPanel.tsx
index 9026e6b25..0765f5238 100644
--- a/packages/client/src/game/panels/CombatPanel.tsx
+++ b/packages/client/src/game/panels/CombatPanel.tsx
@@ -1,12 +1,21 @@
-import React, { useEffect, useState, useMemo, useRef } from "react";
-import { useDraggable } from "@dnd-kit/core";
+/**
+ * Combat Panel (Orchestrator)
+ *
+ * OSRS-style combat panel that composes sub-components for style selection,
+ * bonuses display, and auto-retaliate toggle. Manages combat state via
+ * world events and exposes optimistic UI updates.
+ */
+
+import { useEffect, useState, useMemo, useRef } from "react";
 import { useThemeStore, useMobileLayout, useWindowStore } from "@/ui";
+import { getPanelInsetStyle, getPanelSurfaceStyle } from "@/ui/theme/themes";
 import {
-  getInteractiveTileStyle,
-  getPanelInsetStyle,
-  getPanelSurfaceStyle,
-} from "@/ui/theme/themes";
-import { EventType, getAvailableStyles, WeaponType } from "@hyperscape/shared";
+  EventType,
+  getAvailableStyles,
+  WeaponType,
+  calculateCombatLevel,
+  normalizeCombatSkills,
+} from "@hyperscape/shared";
 import {
   PANEL_PADDING,
   PANEL_MOBILE_PADDING,
@@ -18,829 +27,37 @@ import type {
   PlayerEquipmentItems,
   PlayerHealth,
 } from "../../types";
+import {
+  CombatStyleSelector,
+  CombatBonusesDisplay,
+  AutoRetaliateToggle,
+  SpecialAttackBar,
+  isStyleUpdateEvent,
+  isTargetChangedEvent,
+  isTargetHealthEvent,
+  isAutoRetaliateEvent,
+} from "./combat";
+import type { CombatStyleInfo } from "./combat";
 
-/** SVG Icons for attack styles - clean vector icons */
-const StyleIcon = ({
-  style,
-  size = 16,
-  color = "currentColor",
-}: {
-  style: string;
-  size?: number;
-  color?: string;
-}) => {
-  switch (style) {
-    case "accurate":
-      return (
-        <svg
-          width={size}
-          height={size}
-          viewBox="0 0 24 24"
-          fill="none"
-          stroke={color}
-          strokeWidth="2"
-          strokeLinecap="round"
-          strokeLinejoin="round"
-        >
-          <circle cx="12" cy="12" r="10" />
-          <circle cx="12" cy="12" r="6" />
-          <circle cx="12" cy="12" r="2" />
-        </svg>
-      );
-    case "aggressive":
-      return (
-        <svg
-          width={size}
-          height={size}
-          viewBox="0 0 24 24"
-          fill="none"
-          stroke={color}
-          strokeWidth="2"
-          strokeLinecap="round"
-          strokeLinejoin="round"
-        >
-          <path d="M14.5 4l7.5 7.5-7.5 7.5" />
-          <path d="M5.5 4l7.5 7.5-7.5 7.5" />
-        </svg>
-      );
-    case "defensive":
-      return (
-        <svg
-          width={size}
-          height={size}
-          viewBox="0 0 24 24"
-          fill="none"
-          stroke={color}
-          strokeWidth="2"
-          strokeLinecap="round"
-          strokeLinejoin="round"
-        >
-          <path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z" />
-        </svg>
-      );
-    case "controlled":
-      return (
-        <svg
-          width={size}
-          height={size}
-          viewBox="0 0 24 24"
-          fill="none"
-          stroke={color}
-          strokeWidth="2"
-          strokeLinecap="round"
-          strokeLinejoin="round"
-        >
-          <line x1="12" y1="2" x2="12" y2="22" />
-          <path d="M17 5H9.5a3.5 3.5 0 0 0 0 7h5a3.5 3.5 0 0 1 0 7H6" />
-        </svg>
-      );
-    case "rapid":
-      // Lightning bolt for rapid fire
-      return (
-        <svg
-          width={size}
-          height={size}
-          viewBox="0 0 24 24"
-          fill="none"
-          stroke={color}
-          strokeWidth="2"
-          strokeLinecap="round"
-          strokeLinejoin="round"
-        >
-          <polygon points="13 2 3 14 12 14 11 22 21 10 12 10 13 2" />
-        </svg>
-      );
-    case "longrange":
-      // Telescope/distance icon for longrange
-      return (
-        <svg
-          width={size}
-          height={size}
-          viewBox="0 0 24 24"
-          fill="none"
-          stroke={color}
-          strokeWidth="2"
-          strokeLinecap="round"
-          strokeLinejoin="round"
-        >
-          <path d="M21 12h-8" />
-          <path d="m3 12 4-4v8l-4-4z" />
-          <path d="M11 8h2" />
-          <path d="M11 16h2" />
-          <path d="M16 12v.01" />
-        </svg>
-      );
-    case "autocast":
-      // Magic wand/star icon for autocast
-      return (
-        <svg
-          width={size}
-          height={size}
-          viewBox="0 0 24 24"
-          fill="none"
-          stroke={color}
-          strokeWidth="2"
-          strokeLinecap="round"
-          strokeLinejoin="round"
-        >
-          <path d="m12 3-1.912 5.813a2 2 0 0 1-1.275 1.275L3 12l5.813 1.912a2 2 0 0 1 1.275 1.275L12 21l1.912-5.813a2 2 0 0 1 1.275-1.275L21 12l-5.813-1.912a2 2 0 0 1-1.275-1.275L12 3Z" />
-        </svg>
-      );
-    default:
-      return null;
-  }
-};
-
-/** Stat icons as SVG */
-const StatIcon = ({
-  stat,
-  size = 14,
-  color = "currentColor",
-}: {
-  stat: "attack" | "strength" | "defense";
-  size?: number;
-  color?: string;
-}) => {
-  switch (stat) {
-    case "attack":
-      return (
-        <svg
-          width={size}
-          height={size}
-          viewBox="0 0 24 24"
-          fill="none"
-          stroke={color}
-          strokeWidth="2.5"
-          strokeLinecap="round"
-          strokeLinejoin="round"
-        >
-          <path d="m14.5 12.5-8 8a2.119 2.119 0 1 1-3-3l8-8" />
-          <path d="m16 16 6-6" />
-          <path d="m8 8 6-6" />
-          <path d="m9 7 8 8" />
-          <path d="m21 11-8-8" />
-        </svg>
-      );
-    case "strength":
-      return (
-        <svg
-          width={size}
-          height={size}
-          viewBox="0 0 24 24"
-          fill="none"
-          stroke={color}
-          strokeWidth="2.5"
-          strokeLinecap="round"
-          strokeLinejoin="round"
-        >
-          <path d="M18.36 2.64a9 9 0 0 1 3 3" />
-          <path d="M15 6.5v11" />
-          <path d="M9 6.5v11" />
-          <path d="M4 11a9 9 0 0 1 3-3" />
-          <path d="M2.64 18.36a9 9 0 0 0 3 3" />
-          <path d="M20 13a9 9 0 0 1-3 3" />
-          <path d="M21.36 5.64a9 9 0 0 0-3 3" />
-          <path d="M4 13a9 9 0 0 0 3 3" />
-        </svg>
-      );
-    case "defense":
-      return (
-        <svg
-          width={size}
-          height={size}
-          viewBox="0 0 24 24"
-          fill="none"
-          stroke={color}
-          strokeWidth="2.5"
-          strokeLinecap="round"
-          strokeLinejoin="round"
-        >
-          <path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z" />
-        </svg>
-      );
-  }
-};
-
-/** Individual combat style info */
-interface CombatStyleInfo {
-  id: string;
-  label: string;
-  xp: string;
-  color: string;
-}
-
-/** Short XP labels for compact banner display */
-const XP_SHORT_LABELS: Record<string, string> = {
-  Attack: "+ATK",
-  Strength: "+STR",
-  Defense: "+DEF",
-  All: "+ALL",
-  Ranged: "+RNG",
-  "Rng+Def": "+R/D",
-  Magic: "+MAG",
-};
-
-/** Filled game-style icons for combat banners — bold, solid fills for fantasy UI */
-const BannerStyleIcon = ({
-  style,
-  size = 24,
-  color = "currentColor",
-  muted = false,
-}: {
-  style: string;
-  size?: number;
-  color?: string;
-  muted?: boolean;
-}) => {
-  const fo = muted ? 0.25 : 0.55;
-  const so = muted ? 0.45 : 1;
-
-  switch (style) {
-    case "accurate":
-      return (
-        <svg width={size} height={size} viewBox="0 0 24 24">
-          <circle
-            cx="12"
-            cy="12"
-            r="10.5"
-            fill={color}
-            fillOpacity={fo * 0.35}
-            stroke={color}
-            strokeWidth="1.4"
-            strokeOpacity={so}
-          />
-          <circle
-            cx="12"
-            cy="12"
-            r="7"
-            fill={color}
-            fillOpacity={fo * 0.55}
-            stroke={color}
-            strokeWidth="1.1"
-            strokeOpacity={so * 0.85}
-          />
-          <circle
-            cx="12"
-            cy="12"
-            r="3.5"
-            fill={color}
-            fillOpacity={fo * 0.85}
-            stroke={color}
-            strokeWidth="0.9"
-            strokeOpacity={so * 0.9}
-          />
-          <circle
-            cx="12"
-            cy="12"
-            r="1.3"
-            fill={color}
-            fillOpacity={muted ? 0.4 : 0.95}
-          />
-        </svg>
-      );
-    case "aggressive":
-      return (
-        <svg width={size} height={size} viewBox="0 0 24 24" fill="none">
-          <path
-            d="M5 4l12 8-12 8Z"
-            fill={color}
-            fillOpacity={fo * 0.6}
-            stroke={color}
-            strokeWidth="1.8"
-            strokeLinejoin="round"
-            strokeOpacity={so}
-          />
-          <path
-            d="M11 7l8 5-8 5Z"
-            fill={color}
-            fillOpacity={fo * 0.35}
-            stroke={color}
-            strokeWidth="1.4"
-            strokeLinejoin="round"
-            strokeOpacity={so * 0.7}
-          />
-        </svg>
-      );
-    case "defensive":
-      return (
-        <svg width={size} height={size} viewBox="0 0 24 24">
-          <path
-            d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"
-            fill={color}
-            fillOpacity={fo * 0.55}
-            stroke={color}
-            strokeWidth="1.5"
-            strokeLinejoin="round"
-            strokeOpacity={so}
-          />
-          <path
-            d="M12 18.5s5.5-2.5 5.5-7V6.5L12 4.5 6.5 6.5V11.5c0 4.5 5.5 7 5.5 7z"
-            fill={color}
-            fillOpacity={fo * 0.3}
-            stroke={color}
-            strokeWidth="0.7"
-            strokeOpacity={so * 0.5}
-          />
-        </svg>
-      );
-    case "controlled":
-      return (
-        <svg width={size} height={size} viewBox="0 0 24 24" fill="none">
-          <circle
-            cx="12"
-            cy="12"
-            r="10"
-            fill={color}
-            fillOpacity={fo * 0.2}
-            stroke={color}
-            strokeWidth="1.4"
-            strokeOpacity={so}
-          />
-          <line
-            x1="12"
-            y1="3"
-            x2="12"
-            y2="21"
-            stroke={color}
-            strokeWidth="1.4"
-            strokeOpacity={so}
-          />
-          <line
-            x1="3"
-            y1="12"
-            x2="21"
-            y2="12"
-            stroke={color}
-            strokeWidth="1.4"
-            strokeOpacity={so}
-          />
-          <circle
-            cx="12"
-            cy="12"
-            r="3"
-            fill={color}
-            fillOpacity={fo * 0.6}
-            stroke={color}
-            strokeWidth="1"
-            strokeOpacity={so * 0.85}
-          />
-        </svg>
-      );
-    case "rapid":
-      return (
-        <svg width={size} height={size} viewBox="0 0 24 24">
-          <polygon
-            points="13 2 3 14 12 14 11 22 21 10 12 10 13 2"
-            fill={color}
-            fillOpacity={fo * 0.65}
-            stroke={color}
-            strokeWidth="1.4"
-            strokeLinejoin="round"
-            strokeOpacity={so}
-          />
-        </svg>
-      );
-    case "longrange":
-      return (
-        <svg width={size} height={size} viewBox="0 0 24 24" fill="none">
-          <circle
-            cx="12"
-            cy="12"
-            r="10"
-            fill={color}
-            fillOpacity={fo * 0.12}
-            stroke={color}
-            strokeWidth="1.2"
-            strokeOpacity={so * 0.5}
-          />
-          <path
-            d="m3 12 5-4v8l-5-4z"
-            fill={color}
-            fillOpacity={fo * 0.55}
-            stroke={color}
-            strokeWidth="1.2"
-            strokeOpacity={so}
-          />
-          <path
-            d="M10 12h11"
-            stroke={color}
-            strokeWidth="2"
-            strokeOpacity={so}
-            strokeLinecap="round"
-          />
-          <path
-            d="M17 8l4 4-4 4"
-            stroke={color}
-            strokeWidth="1.5"
-            strokeOpacity={so}
-            strokeLinecap="round"
-            strokeLinejoin="round"
-          />
-        </svg>
-      );
-    case "autocast":
-      return (
-        <svg width={size} height={size} viewBox="0 0 24 24">
-          <path
-            d="m12 3-1.912 5.813a2 2 0 0 1-1.275 1.275L3 12l5.813 1.912a2 2 0 0 1 1.275 1.275L12 21l1.912-5.813a2 2 0 0 1 1.275-1.275L21 12l-5.813-1.912a2 2 0 0 1-1.275-1.275L12 3Z"
-            fill={color}
-            fillOpacity={fo * 0.6}
-            stroke={color}
-            strokeWidth="1.3"
-            strokeOpacity={so}
-          />
-        </svg>
-      );
-    default:
-      return null;
-  }
-};
-
-// Shield/crest SVG paths for combat banners
-const SHIELD_OUTER =
-  "M 5 0 L 95 0 Q 100 0 100 5 L 100 82 Q 100 102 50 128 Q 0 102 0 82 L 0 5 Q 0 0 5 0 Z";
-const SHIELD_INNER =
-  "M 8 3 L 92 3 Q 97 3 97 7 L 97 80 Q 97 99 50 123 Q 3 99 3 80 L 3 7 Q 3 3 8 3 Z";
-
-/** Combat style banner — heraldic shield using theme colors */
-const CombatStyleBanner = ({
-  style: styleInfo,
-  isActive,
-  disabled,
-  isMobile,
-  onClick,
-  theme,
-}: {
-  style: CombatStyleInfo;
-  isActive: boolean;
-  disabled: boolean;
-  isMobile: boolean;
-  onClick: () => void;
-  theme: ReturnType<typeof useThemeStore.getState>["theme"];
-}) => {
-  const { attributes, listeners, setNodeRef, isDragging } = useDraggable({
-    id: `combatstyle-${styleInfo.id}`,
-    data: {
-      combatStyle: {
-        id: styleInfo.id,
-        label: styleInfo.label,
-        color: styleInfo.color,
-      },
-      source: "combatstyle",
-    },
-    disabled,
-  });
-
-  const shortXp =
-    XP_SHORT_LABELS[styleInfo.xp] ||
-    `+${styleInfo.xp.slice(0, 3).toUpperCase()}`;
-  const baseGradId = `banner-base-${styleInfo.id}`;
-  const tintGradId = `banner-tint-${styleInfo.id}`;
-
-  // Theme-derived colors
-  const bgDark = theme.colors.background.primary;
-  const bgMid = theme.colors.background.secondary;
-  const bgLight = theme.colors.background.tertiary;
-  const accentGold = theme.colors.accent.primary;
-  const borderClr = theme.colors.border.default;
-  const textMuted = theme.colors.text.muted;
-  const textPrimary = theme.colors.text.primary;
-
-  return (
-    <div
-      ref={setNodeRef}
-      {...attributes}
-      {...listeners}
-      style={{
-        flex: "0 0 calc((100% - 3 * (var(--banner-gap))) / 4)",
-        maxWidth: "calc((100% - 3 * (var(--banner-gap))) / 4)",
-        minWidth: 0,
-        position: "relative",
-        opacity: disabled ? 0.5 : isDragging ? 0.6 : 1,
-        transform: isDragging ? "scale(0.95)" : "scale(1)",
-        transition: "opacity 0.15s ease, transform 0.15s ease",
-        touchAction: "none",
-      }}
-    >
-      <button
-        type="button"
-        onClick={(e) => {
-          e.stopPropagation();
-          if (!disabled) onClick();
-        }}
-        disabled={disabled}
-        aria-pressed={isActive}
-        className="combat-banner focus-visible:outline-none"
-        style={{
-          position: "relative",
-          width: "100%",
-          aspectRatio: isMobile ? "0.58" : "0.52",
-          background: "transparent",
-          border: "none",
-          padding: 0,
-          cursor: disabled ? "not-allowed" : "pointer",
-          touchAction: "manipulation",
-        }}
-      >
-        {/* SVG shield / crest shape */}
-        <svg
-          viewBox="0 0 100 130"
-          preserveAspectRatio="none"
-          style={{
-            position: "absolute",
-            inset: 0,
-            width: "100%",
-            height: "100%",
-            filter: isActive
-              ? `drop-shadow(0 3px 8px ${styleInfo.color}35) drop-shadow(0 1px 2px rgba(0,0,0,0.6))`
-              : "drop-shadow(0 2px 5px rgba(0,0,0,0.5))",
-            transition: "filter 0.2s ease",
-          }}
-        >
-          <defs>
-            {/* Theme base gradient */}
-            <linearGradient id={baseGradId} x1="0" y1="0" x2="0" y2="1">
-              <stop
-                offset="0%"
-                stopColor={isActive ? bgLight : bgMid}
-                stopOpacity={1}
-              />
-              <stop
-                offset="50%"
-                stopColor={isActive ? bgMid : bgDark}
-                stopOpacity={1}
-              />
-              <stop offset="100%" stopColor={bgDark} stopOpacity={1} />
-            </linearGradient>
-            {/* Color tint overlay for active state */}
-            {isActive && (
-              <linearGradient id={tintGradId} x1="0" y1="0" x2="0" y2="1">
-                <stop
-                  offset="0%"
-                  stopColor={styleInfo.color}
-                  stopOpacity={0.28}
-                />
-                <stop
-                  offset="55%"
-                  stopColor={styleInfo.color}
-                  stopOpacity={0.1}
-                />
-                <stop
-                  offset="100%"
-                  stopColor={styleInfo.color}
-                  stopOpacity={0.03}
-                />
-              </linearGradient>
-            )}
-          </defs>
-
-          {/* Outer shadow edge */}
-          <path
-            d={SHIELD_OUTER}
-            fill="none"
-            stroke="rgba(0,0,0,0.7)"
-            strokeWidth={3.5}
-          />
-          {/* Base fill */}
-          <path d={SHIELD_OUTER} fill={`url(#${baseGradId})`} />
-          {/* Active color tint overlay */}
-          {isActive && <path d={SHIELD_OUTER} fill={`url(#${tintGradId})`} />}
-          {/* Border stroke — gold accent inactive, style color active */}
-          <path
-            d={SHIELD_OUTER}
-            fill="none"
-            stroke={isActive ? `${styleInfo.color}aa` : `${borderClr}`}
-            strokeWidth={isActive ? 1.8 : 1.2}
-          />
-          {/* Top edge highlight */}
-          <line
-            x1="10"
-            y1="1.2"
-            x2="90"
-            y2="1.2"
-            stroke={isActive ? `${styleInfo.color}44` : `${accentGold}18`}
-            strokeWidth={0.8}
-            strokeLinecap="round"
-          />
-          {/* Inner bevel for depth */}
-          <path
-            d={SHIELD_INNER}
-            fill="none"
-            stroke={
-              isActive ? "rgba(255,255,255,0.07)" : "rgba(255,255,255,0.025)"
-            }
-            strokeWidth={0.6}
-          />
-        </svg>
-
-        {/* Icon protruding from top of shield */}
-        <div
-          style={{
-            position: "absolute",
-            top: 0,
-            left: "50%",
-            transform: "translate(-50%, -50%)",
-            zIndex: 2,
-            display: "flex",
-            alignItems: "center",
-            justifyContent: "center",
-            width: isMobile ? 28 : 34,
-            height: isMobile ? 28 : 34,
-            borderRadius: "50%",
-            background: isActive
-              ? `radial-gradient(circle, ${bgLight} 40%, ${bgMid} 100%)`
-              : `radial-gradient(circle, ${bgMid} 40%, ${bgDark} 100%)`,
-            border: isActive
-              ? `1.5px solid ${styleInfo.color}88`
-              : `1px solid ${borderClr}`,
-            boxShadow: isActive
-              ? `0 2px 6px ${styleInfo.color}30, 0 1px 3px rgba(0,0,0,0.4)`
-              : "0 2px 4px rgba(0,0,0,0.4)",
-          }}
-        >
-          <BannerStyleIcon
-            style={styleInfo.id}
-            size={isMobile ? 16 : 20}
-            color={isActive ? styleInfo.color : accentGold}
-            muted={!isActive}
-          />
-        </div>
-
-        {/* Content overlay */}
-        <div
-          style={{
-            position: "relative",
-            zIndex: 1,
-            display: "flex",
-            flexDirection: "column",
-            alignItems: "center",
-            justifyContent: "center",
-            height: "100%",
-            paddingTop: isMobile ? "16px" : "20px",
-            paddingBottom: isMobile ? "18px" : "22px",
-            gap: isMobile ? "2px" : "3px",
-          }}
-        >
-          {/* Style name */}
-          <span
-            style={{
-              fontSize: isMobile ? "8.5px" : "10px",
-              fontWeight: 700,
-              color: isActive ? textPrimary : textMuted,
-              lineHeight: 1.15,
-              textAlign: "center",
-              whiteSpace: "nowrap",
-              letterSpacing: "0.01em",
-              textShadow: isActive
-                ? `0 1px 3px rgba(0,0,0,0.7), 0 0 8px ${styleInfo.color}25`
-                : "0 1px 2px rgba(0,0,0,0.6)",
-            }}
-          >
-            {styleInfo.label}
-          </span>
-
-          {/* XP bonus label */}
-          <span
-            style={{
-              fontSize: isMobile ? "8.5px" : "10px",
-              fontWeight: 700,
-              color: isActive ? styleInfo.color : `${accentGold}88`,
-              lineHeight: 1,
-              textAlign: "center",
-              letterSpacing: "0.05em",
-              textShadow: isActive ? `0 0 6px ${styleInfo.color}35` : "none",
-            }}
-          >
-            {shortXp}
-          </span>
-        </div>
-      </button>
-    </div>
-  );
-};
-
-/** Combat stats row with SVG icons - compact */
-const CombatStatsRow = React.memo(function CombatStatsRow({
-  attackLevel,
-  strengthLevel,
-  defenseLevel,
-  isMobile,
-}: {
-  attackLevel: number;
-  strengthLevel: number;
-  defenseLevel: number;
-  isMobile: boolean;
-}) {
-  const theme = useThemeStore((s) => s.theme);
-  const stats: Array<{
-    key: "attack" | "strength" | "defense";
-    value: number;
-    color: string;
-  }> = [
-    { key: "attack", value: attackLevel, color: "#ef4444" },
-    { key: "strength", value: strengthLevel, color: "#22c55e" },
-    { key: "defense", value: defenseLevel, color: "#3b82f6" },
-  ];
-
-  return (
-    <div
-      style={{
-        display: "flex",
-        alignItems: "center",
-        justifyContent: "center",
-        gap: "8px",
-        padding: "2px 0",
-      }}
-    >
-      {stats.map((stat, index) => (
-        <React.Fragment key={stat.key}>
-          {index > 0 && (
-            <div
-              style={{
-                width: "1px",
-                height: "10px",
-                background: `${theme.colors.border.default}25`,
-              }}
-            />
-          )}
-          <div style={{ display: "flex", alignItems: "center", gap: "3px" }}>
-            <StatIcon
-              stat={stat.key}
-              size={isMobile ? 11 : 10}
-              color={stat.color}
-            />
-            <span
-              style={{
-                fontSize: isMobile ? "11px" : "10px",
-                color: stat.color,
-                fontWeight: 700,
-                fontFamily: "var(--font-mono, monospace)",
-              }}
-            >
-              {stat.value}
-            </span>
-          </div>
-        </React.Fragment>
-      ))}
-    </div>
-  );
-});
-
-// Event data interfaces for type-safe event handling
-interface StyleUpdateEvent {
-  playerId: string;
-  currentStyle: { id: string };
-}
-
-interface TargetChangedEvent {
-  targetId: string | null;
-  targetName?: string;
-  targetHealth?: PlayerHealth;
-}
-
-interface TargetHealthEvent {
-  targetId: string;
-  health: PlayerHealth;
-}
-
-interface AutoRetaliateEvent {
-  playerId: string;
-  enabled: boolean;
-}
-
-// Type guards for runtime validation
-function isStyleUpdateEvent(data: unknown): data is StyleUpdateEvent {
-  if (typeof data !== "object" || data === null) return false;
-  const d = data as Record<string, unknown>;
-  return (
-    typeof d.playerId === "string" &&
-    typeof d.currentStyle === "object" &&
-    d.currentStyle !== null &&
-    typeof (d.currentStyle as Record<string, unknown>).id === "string"
-  );
-}
-
-function isTargetChangedEvent(data: unknown): data is TargetChangedEvent {
-  if (typeof data !== "object" || data === null) return false;
-  const d = data as Record<string, unknown>;
-  return d.targetId === null || typeof d.targetId === "string";
-}
+// Client-side cache for combat style state (persists across panel opens/closes)
+// This enables instant display when reopening panel (RuneScape pattern)
+const combatStyleCache = new Map<string, string>();
+const autoRetaliateCache = new Map<string, boolean>();
+const VALID_WEAPON_TYPES = new Set<string>(Object.values(WeaponType));
 
-function isTargetHealthEvent(data: unknown): data is TargetHealthEvent {
-  if (typeof data !== "object" || data === null) return false;
-  const d = data as Record<string, unknown>;
-  return (
-    typeof d.targetId === "string" &&
-    typeof d.health === "object" &&
-    d.health !== null
-  );
-}
-
-function isAutoRetaliateEvent(data: unknown): data is AutoRetaliateEvent {
-  if (typeof data !== "object" || data === null) return false;
-  const d = data as Record<string, unknown>;
-  return typeof d.playerId === "string" && typeof d.enabled === "boolean";
-}
+/** All possible combat styles with their XP training info and colors (OSRS-accurate) */
+const ALL_STYLES: CombatStyleInfo[] = [
+  // Melee styles
+  { id: "accurate", label: "Accurate", xp: "Attack", color: "#ef4444" },
+  { id: "aggressive", label: "Aggressive", xp: "Strength", color: "#22c55e" },
+  { id: "defensive", label: "Defensive", xp: "Defense", color: "#3b82f6" },
+  { id: "controlled", label: "Controlled", xp: "All", color: "#a855f7" },
+  // Ranged styles
+  { id: "rapid", label: "Rapid", xp: "Ranged", color: "#f59e0b" },
+  { id: "longrange", label: "Longrange", xp: "Rng+Def", color: "#06b6d4" },
+  // Magic styles
+  { id: "autocast", label: "Autocast", xp: "Magic", color: "#8b5cf6" },
+];
 
 interface CombatPanelProps {
   world: ClientWorld;
@@ -848,30 +65,21 @@ interface CombatPanelProps {
   equipment: PlayerEquipmentItems | null;
 }
 
-// Client-side cache for combat style state (persists across panel opens/closes)
-// This enables instant display when reopening panel (RuneScape pattern)
-const combatStyleCache = new Map<string, string>();
-const autoRetaliateCache = new Map<string, boolean>();
-const VALID_WEAPON_TYPES = new Set<string>(Object.values(WeaponType));
-
 export function CombatPanel({ world, stats, equipment }: CombatPanelProps) {
   const theme = useThemeStore((s) => s.theme);
   const { shouldUseMobileUI } = useMobileLayout();
   const panelRef = useRef<HTMLDivElement | null>(null);
   const [panelSize, setPanelSize] = useState({ width: 280, height: 360 });
+
   // Initialize from cache if available, otherwise default to "accurate"
-  // Check order: module cache > network cache > default
   const [style, setStyle] = useState<string>(() => {
     const playerId = world.entities?.player?.id;
-    // 1. Check module cache (for instant display on panel reopen)
     if (playerId && combatStyleCache.has(playerId)) {
       return combatStyleCache.get(playerId)!;
     }
-    // 2. Check network cache (for fresh page loads - packet arrived before UI mounted)
     const networkCache =
       world.network?.lastAttackStyleByPlayerId?.[playerId || ""];
     if (networkCache?.currentStyle?.id) {
-      // Also update module cache for future panel reopens
       if (playerId) {
         combatStyleCache.set(playerId, networkCache.currentStyle.id);
       }
@@ -879,50 +87,57 @@ export function CombatPanel({ world, stats, equipment }: CombatPanelProps) {
     }
     return "accurate";
   });
+
   const [cooldown, setCooldown] = useState<number>(0);
   const [targetName, setTargetName] = useState<string | null>(null);
   const [targetHealth, setTargetHealth] = useState<PlayerHealth | null>(null);
+
   // Auto-retaliate state (OSRS default is ON)
   const [autoRetaliate, setAutoRetaliate] = useState<boolean>(() => {
     const player = world.entities?.player;
     const playerId = player?.id;
-    // First check cache (for instant display on panel reopen)
     if (playerId && autoRetaliateCache.has(playerId)) {
       return autoRetaliateCache.get(playerId)!;
     }
-    // Read directly from player entity (set from server data during entity creation)
     const playerCombat = (player as { combat?: { autoRetaliate?: boolean } })
       ?.combat;
     if (typeof playerCombat?.autoRetaliate === "boolean") {
       return playerCombat.autoRetaliate;
     }
-    return true; // OSRS default: ON
+    return true;
   });
+
+  // Special attack energy state
+  const [specialEnergy, setSpecialEnergy] = useState<number>(1000);
+  const [specialActive, setSpecialActive] = useState<boolean>(false);
+
   const playerId = world.entities?.player?.id ?? null;
   const previousPlayerIdRef = useRef<string | null>(null);
 
-  // Calculate combat level using OSRS formula (melee-only MVP)
   const combatLevel = stats?.skills
-    ? (() => {
-        const s = stats.skills;
-        const base =
-          0.25 * ((s.defense?.level || 1) + (s.constitution?.level || 10));
-        const melee =
-          0.325 * ((s.attack?.level || 1) + (s.strength?.level || 1));
-        return Math.floor(base + melee);
-      })()
+    ? calculateCombatLevel(
+        normalizeCombatSkills({
+          attack: stats.skills.attack?.level,
+          strength: stats.skills.strength?.level,
+          defense: stats.skills.defense?.level,
+          constitution: stats.skills.constitution?.level,
+          ranged: stats.skills.ranged?.level,
+          magic: stats.skills.magic?.level,
+          prayer: stats.skills.prayer?.level,
+        }),
+      )
     : 1;
+
   const inCombat = stats?.inCombat || false;
-  const health = stats?.health || { current: 100, max: 100 };
+  const health = stats?.health ?? { current: 0, max: 1 };
   const attackLevel = stats?.skills?.attack?.level || 1;
   const strengthLevel = stats?.skills?.strength?.level || 1;
   const defenseLevel = stats?.skills?.defense?.level || 1;
 
+  // Sync state from server events
   useEffect(() => {
     if (!playerId) return;
 
-    // Immediately sync from network cache (handles fresh page loads)
-    // The packet may have arrived before this component mounted
     const networkCache = world.network?.lastAttackStyleByPlayerId?.[playerId];
     if (networkCache?.currentStyle?.id) {
       combatStyleCache.set(playerId, networkCache.currentStyle.id);
@@ -945,7 +160,6 @@ export function CombatPanel({ world, stats, equipment }: CombatPanelProps) {
       playerId,
       (info: { style: string; cooldown?: number }) => {
         if (info) {
-          // Update cache for instant display on panel reopen
           combatStyleCache.set(playerId, info.style);
           setStyle(info.style);
           setCooldown(info.cooldown || 0);
@@ -953,7 +167,6 @@ export function CombatPanel({ world, stats, equipment }: CombatPanelProps) {
       },
     );
 
-    // Initialize auto-retaliate state from server
     actions?.actionMethods?.getAutoRetaliate?.(playerId, (enabled: boolean) => {
       autoRetaliateCache.set(playerId, enabled);
       setAutoRetaliate(enabled);
@@ -962,19 +175,16 @@ export function CombatPanel({ world, stats, equipment }: CombatPanelProps) {
     const onUpdate = (data: unknown) => {
       if (!isStyleUpdateEvent(data)) return;
       if (data.playerId !== playerId) return;
-      // Update cache for instant display on panel reopen
       combatStyleCache.set(playerId, data.currentStyle.id);
       setStyle(data.currentStyle.id);
     };
     const onChanged = (data: unknown) => {
       if (!isStyleUpdateEvent(data)) return;
       if (data.playerId !== playerId) return;
-      // Update cache for instant display on panel reopen
       combatStyleCache.set(playerId, data.currentStyle.id);
       setStyle(data.currentStyle.id);
     };
 
-    // Listen for combat target updates
     const onTargetChanged = (data: unknown) => {
       if (!isTargetChangedEvent(data)) return;
       if (data.targetId) {
@@ -993,7 +203,6 @@ export function CombatPanel({ world, stats, equipment }: CombatPanelProps) {
       }
     };
 
-    // Listen for auto-retaliate changes from server
     const onAutoRetaliateChanged = (data: unknown) => {
       if (!isAutoRetaliateEvent(data)) return;
       if (data.playerId !== playerId) return;
@@ -1001,6 +210,18 @@ export function CombatPanel({ world, stats, equipment }: CombatPanelProps) {
       setAutoRetaliate(data.enabled);
     };
 
+    const onSpecialAttackChanged = (data: unknown) => {
+      if (!data || typeof data !== "object") return;
+      const d = data as {
+        playerId?: string;
+        energy?: number;
+        active?: boolean;
+      };
+      if (d.playerId !== playerId) return;
+      if (typeof d.energy === "number") setSpecialEnergy(d.energy);
+      if (typeof d.active === "boolean") setSpecialActive(d.active);
+    };
+
     world.on(EventType.UI_ATTACK_STYLE_UPDATE, onUpdate, undefined);
     world.on(EventType.UI_ATTACK_STYLE_CHANGED, onChanged, undefined);
     world.on(
@@ -1008,6 +229,11 @@ export function CombatPanel({ world, stats, equipment }: CombatPanelProps) {
       onAutoRetaliateChanged,
       undefined,
     );
+    world.on(
+      EventType.UI_SPECIAL_ATTACK_CHANGED,
+      onSpecialAttackChanged,
+      undefined,
+    );
     world.on(EventType.UI_COMBAT_TARGET_CHANGED, onTargetChanged, undefined);
     world.on(
       EventType.UI_COMBAT_TARGET_HEALTH,
@@ -1034,6 +260,12 @@ export function CombatPanel({ world, stats, equipment }: CombatPanelProps) {
         undefined,
         undefined,
       );
+      world.off(
+        EventType.UI_SPECIAL_ATTACK_CHANGED,
+        onSpecialAttackChanged,
+        undefined,
+        undefined,
+      );
       world.off(
         EventType.UI_COMBAT_TARGET_CHANGED,
         onTargetChanged,
@@ -1049,6 +281,7 @@ export function CombatPanel({ world, stats, equipment }: CombatPanelProps) {
     };
   }, [playerId, targetName, world]);
 
+  // Clean up cache when player changes
   useEffect(() => {
     const previousPlayerId = previousPlayerIdRef.current;
     if (previousPlayerId && previousPlayerId !== playerId) {
@@ -1059,8 +292,8 @@ export function CombatPanel({ world, stats, equipment }: CombatPanelProps) {
   }, [playerId]);
 
   const changeStyle = (next: string) => {
-    const playerId = world.entities?.player?.id;
-    if (!playerId) return;
+    const currentPlayerId = world.entities?.player?.id;
+    if (!currentPlayerId) return;
 
     const actions = world.getSystem("actions") as {
       actionMethods?: {
@@ -1071,12 +304,10 @@ export function CombatPanel({ world, stats, equipment }: CombatPanelProps) {
     if (!actions?.actionMethods?.changeAttackStyle) return;
 
     // Optimistic: update UI instantly (OSRS has zero visible delay)
-    combatStyleCache.set(playerId, next);
+    combatStyleCache.set(currentPlayerId, next);
     setStyle(next);
 
-    // Send to server — server confirms via attackStyleChanged packet,
-    // which will overwrite our optimistic value with the authoritative one
-    actions.actionMethods.changeAttackStyle(playerId, next);
+    actions.actionMethods.changeAttackStyle(currentPlayerId, next);
 
     // OSRS-accurate: selecting autocast opens the spells panel for spell selection
     if (next === "autocast") {
@@ -1117,8 +348,8 @@ export function CombatPanel({ world, stats, equipment }: CombatPanelProps) {
   };
 
   const toggleAutoRetaliate = () => {
-    const playerId = world.entities?.player?.id;
-    if (!playerId) return;
+    const currentPlayerId = world.entities?.player?.id;
+    if (!currentPlayerId) return;
 
     const actions = world.getSystem("actions") as {
       actionMethods?: {
@@ -1129,70 +360,17 @@ export function CombatPanel({ world, stats, equipment }: CombatPanelProps) {
     if (!actions?.actionMethods?.setAutoRetaliate) return;
 
     const newValue = !autoRetaliate;
-
-    // Optimistic: update UI instantly (OSRS has zero visible delay)
-    autoRetaliateCache.set(playerId, newValue);
+    autoRetaliateCache.set(currentPlayerId, newValue);
     setAutoRetaliate(newValue);
-
-    // Send to server — server confirms via autoRetaliateChanged packet,
-    // which will overwrite our optimistic value with the authoritative one
-    actions.actionMethods.setAutoRetaliate(playerId, newValue);
+    actions.actionMethods.setAutoRetaliate(currentPlayerId, newValue);
   };
 
-  // All possible combat styles with their XP training info and colors
-  // Includes melee, ranged, and magic styles (OSRS-accurate)
-  const allStyles: Array<{
-    id: string;
-    label: string;
-    xp: string;
-    color: string;
-  }> = [
-    // Melee styles
-    {
-      id: "accurate",
-      label: "Accurate",
-      xp: "Attack",
-      color: "#ef4444",
-    },
-    {
-      id: "aggressive",
-      label: "Aggressive",
-      xp: "Strength",
-      color: "#22c55e",
-    },
-    {
-      id: "defensive",
-      label: "Defensive",
-      xp: "Defense",
-      color: "#3b82f6",
-    },
-    {
-      id: "controlled",
-      label: "Controlled",
-      xp: "All",
-      color: "#a855f7",
-    },
-    // Ranged styles
-    {
-      id: "rapid",
-      label: "Rapid",
-      xp: "Ranged",
-      color: "#f59e0b",
-    },
-    {
-      id: "longrange",
-      label: "Longrange",
-      xp: "Rng+Def",
-      color: "#06b6d4",
-    },
-    // Magic styles
-    {
-      id: "autocast",
-      label: "Autocast",
-      xp: "Magic",
-      color: "#8b5cf6",
-    },
-  ];
+  const toggleSpecialAttack = () => {
+    if (!world.network?.send) return;
+    // Optimistic toggle
+    setSpecialActive((prev) => !prev);
+    world.network.send("toggleSpecialAttack", {});
+  };
 
   // Filter styles based on equipped weapon (OSRS-accurate restrictions)
   const styles = useMemo(() => {
@@ -1203,16 +381,12 @@ export function CombatPanel({ world, stats, equipment }: CombatPanelProps) {
         : WeaponType.NONE
       : WeaponType.NONE;
     const availableStyleIds = getAvailableStyles(weaponType);
-    return allStyles.filter((s) =>
+    return ALL_STYLES.filter((s) =>
       (availableStyleIds as readonly string[]).includes(s.id),
     );
   }, [equipment?.weapon?.weaponType]);
 
-  const healthPercent = Math.round((health.current / health.max) * 100);
-  const targetHealthPercent = targetHealth
-    ? Math.round((targetHealth.current / targetHealth.max) * 100)
-    : 0;
-
+  // Responsive panel sizing via ResizeObserver
   useEffect(() => {
     const element = panelRef.current;
     if (!element || typeof ResizeObserver === "undefined") return;
@@ -1230,8 +404,6 @@ export function CombatPanel({ world, stats, equipment }: CombatPanelProps) {
     return () => observer.disconnect();
   }, []);
 
-  // Responsive padding/sizing — built from shared panelLayout constants
-  // compact = mobile or small panel; outer/inner/gap scale accordingly
   const compactPanel =
     shouldUseMobileUI || panelSize.height < 330 || panelSize.width < 250;
   const ultraCompactPanel = panelSize.height < 290 || panelSize.width < 220;
@@ -1242,8 +414,7 @@ export function CombatPanel({ world, stats, equipment }: CombatPanelProps) {
         gap: PANEL_MOBILE_PADDING,
       }
     : { outer: PANEL_PADDING, inner: PANEL_PADDING + 2, gap: PANEL_GRID_GAP };
-  // ultraCompactPanel is available for future use if needed (currently unused)
-  void ultraCompactPanel;
+
   return (
     <div
       ref={panelRef}
@@ -1263,7 +434,7 @@ export function CombatPanel({ world, stats, equipment }: CombatPanelProps) {
         .combat-banner:active:not(:disabled) { transform: translateY(0) scale(0.98); filter: brightness(0.9); }
       `}</style>
 
-      {/* Attack Styles — Banner Grid (top) */}
+      {/* Attack Styles + Bonuses (top section) */}
       <div
         style={{
           ...getPanelInsetStyle(theme, {
@@ -1277,350 +448,50 @@ export function CombatPanel({ world, stats, equipment }: CombatPanelProps) {
           flexShrink: 0,
         }}
       >
-        <div
-          style={{
-            display: "flex",
-            alignItems: "center",
-            justifyContent: "space-between",
-            marginBottom: compactPanel ? 6 : 8,
-            flexShrink: 0,
-          }}
-        >
-          <span
-            style={{
-              fontSize: "9px",
-              lineHeight: 1,
-              color: theme.colors.text.muted,
-              textTransform: "uppercase",
-              letterSpacing: "0.1em",
-              fontWeight: 700,
-            }}
-          >
-            Combat Styles
-          </span>
-          {style === "autocast" && (
-            <span
-              style={{
-                padding: "2px 5px",
-                borderRadius: 4,
-                background: "#8b5cf618",
-                border: "1px solid #8b5cf633",
-                fontSize: "8px",
-                fontWeight: 700,
-                color: "#c4b5fd",
-                textTransform: "uppercase",
-                letterSpacing: "0.06em",
-              }}
-            >
-              Autocast
-            </span>
-          )}
-        </div>
-        <div
-          style={
-            {
-              display: "flex",
-              gap: compactPanel ? "4px" : "6px",
-              width: "100%",
-              marginTop: compactPanel ? 14 : 17,
-              justifyContent: "center",
-              "--banner-gap": compactPanel ? "4px" : "6px",
-            } as React.CSSProperties
-          }
-        >
-          {styles.map((s) => (
-            <CombatStyleBanner
-              key={s.id}
-              style={s}
-              isActive={style === s.id}
-              disabled={cooldown > 0}
-              isMobile={compactPanel}
-              onClick={() => changeStyle(s.id)}
-              theme={theme}
-            />
-          ))}
-        </div>
-
-        {cooldown > 0 && (
-          <div
-            style={{
-              textAlign: "center",
-              fontSize: "9px",
-              color: theme.colors.state.warning,
-              background: `${theme.colors.state.warning}10`,
-              padding: "2px 5px",
-              borderRadius: 4,
-              border: `1px solid ${theme.colors.state.warning}25`,
-              marginTop: compactPanel ? 4 : 6,
-            }}
-          >
-            Style change in {Math.ceil(cooldown / 1000)}s
-          </div>
-        )}
-
-        {/* HP + Combat Level */}
-        <div
-          style={{
-            display: "flex",
-            alignItems: "center",
-            gap: "6px",
-            padding: `${p.inner}px`,
-            marginTop: compactPanel ? 16 : 22,
-            background:
-              theme.name === "hyperscape"
-                ? "linear-gradient(180deg, rgba(255, 255, 255, 0.04) 0%, rgba(0, 0, 0, 0.12) 100%)"
-                : theme.colors.slot.filled,
-            border: inCombat
-              ? `1px solid ${theme.colors.state.danger}50`
-              : `1px solid ${theme.colors.border.default}35`,
-            borderRadius: 4,
-          }}
-        >
-          <svg width={12} height={12} viewBox="0 0 24 24" fill="#ef4444">
-            <path d="M12 21.35l-1.45-1.32C5.4 15.36 2 12.28 2 8.5 2 5.42 4.42 3 7.5 3c1.74 0 3.41.81 4.5 2.09C13.09 3.81 14.76 3 16.5 3 19.58 3 22 5.42 22 8.5c0 3.78-3.4 6.86-8.55 11.54L12 21.35z" />
-          </svg>
-          {/* HP bar inline */}
-          <div style={{ flex: 1, minWidth: 0 }}>
-            <div
-              style={{
-                width: "100%",
-                height: "5px",
-                background: theme.colors.background.panelPrimary,
-                borderRadius: 3,
-                overflow: "hidden",
-                border: `1px solid ${theme.colors.border.default}30`,
-              }}
-            >
-              <div
-                style={{
-                  height: "100%",
-                  width: `${healthPercent}%`,
-                  borderRadius: 3,
-                  transition: "width 0.2s ease",
-                  background: "linear-gradient(180deg, #f87171, #dc2626)",
-                }}
-              />
-            </div>
-          </div>
-          <span
-            style={{
-              fontSize: "11px",
-              color: theme.colors.text.primary,
-              fontWeight: 700,
-              fontFamily: "var(--font-mono, monospace)",
-              whiteSpace: "nowrap",
-            }}
-          >
-            {health.current}/{health.max}
-          </span>
-          {inCombat && (
-            <span
-              className="combat-pulse"
-              style={{
-                fontSize: "9px",
-                color: theme.colors.state.danger,
-                fontWeight: 600,
-              }}
-            >
-              ⚔
-            </span>
-          )}
-          <span
-            style={{
-              borderLeft: `1px solid ${theme.colors.border.default}25`,
-              paddingLeft: "6px",
-              fontSize: "10px",
-              color: theme.colors.text.muted,
-              whiteSpace: "nowrap",
-            }}
-          >
-            Lvl{" "}
-            <span
-              style={{
-                color: "#f59e0b",
-                fontWeight: 700,
-                fontFamily: "var(--font-mono, monospace)",
-                fontSize: "12px",
-              }}
-            >
-              {combatLevel}
-            </span>
-          </span>
-        </div>
-
-        {/* Target health — only when in combat */}
-        {targetName && targetHealth && !ultraCompactPanel && (
-          <div
-            style={{
-              display: "flex",
-              alignItems: "center",
-              gap: "6px",
-              padding: `${p.inner - 1}px ${p.inner}px`,
-              marginTop: compactPanel ? 3 : 4,
-              background: `${theme.colors.state.danger}08`,
-              border: `1px solid ${theme.colors.state.danger}30`,
-              borderRadius: 4,
-            }}
-          >
-            <span
-              style={{
-                fontSize: "10px",
-                color: theme.colors.state.danger,
-                fontWeight: 600,
-                whiteSpace: "nowrap",
-                overflow: "hidden",
-                textOverflow: "ellipsis",
-                maxWidth: "80px",
-              }}
-            >
-              🎯 {targetName}
-            </span>
-            <div style={{ flex: 1, minWidth: 0 }}>
-              <div
-                style={{
-                  width: "100%",
-                  height: "4px",
-                  background: theme.colors.background.panelPrimary,
-                  borderRadius: 2,
-                  overflow: "hidden",
-                }}
-              >
-                <div
-                  style={{
-                    height: "100%",
-                    width: `${targetHealthPercent}%`,
-                    borderRadius: 2,
-                    background: "linear-gradient(180deg, #f87171, #dc2626)",
-                  }}
-                />
-              </div>
-            </div>
-            <span
-              style={{
-                fontSize: "10px",
-                color: theme.colors.state.danger,
-                fontWeight: 700,
-                fontFamily: "var(--font-mono, monospace)",
-                whiteSpace: "nowrap",
-              }}
-            >
-              {targetHealth.current}/{targetHealth.max}
-            </span>
-          </div>
-        )}
+        <CombatStyleSelector
+          styles={styles}
+          activeStyleId={style}
+          cooldown={cooldown}
+          compactPanel={compactPanel}
+          theme={theme}
+          onStyleChange={changeStyle}
+        />
 
-        {/* Stats Row */}
-        <CombatStatsRow
+        <CombatBonusesDisplay
+          health={health}
+          combatLevel={combatLevel}
+          inCombat={inCombat}
           attackLevel={attackLevel}
           strengthLevel={strengthLevel}
           defenseLevel={defenseLevel}
+          targetName={targetName}
+          targetHealth={targetHealth}
+          compactPanel={compactPanel}
+          ultraCompactPanel={ultraCompactPanel}
           isMobile={shouldUseMobileUI}
+          innerPadding={p.inner}
+          theme={theme}
         />
       </div>
 
-      {/* Spacer to push auto-retaliate to bottom */}
+      {/* Spacer to push controls to bottom */}
       <div style={{ flex: 1 }} />
 
-      {/* Auto Retaliate — pinned to bottom */}
-      <button
-        onClick={toggleAutoRetaliate}
-        aria-pressed={autoRetaliate}
-        className="focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-amber-400/50"
-        style={{
-          padding: `${PANEL_PADDING}px 6px`,
-          cursor: "pointer",
-          transition: "all 0.1s ease",
-          display: "flex",
-          alignItems: "center",
-          justifyContent: "space-between",
-          touchAction: "manipulation",
-          borderRadius: 4,
-          ...getInteractiveTileStyle(theme, {
-            active: autoRetaliate,
-            radius: 4,
-            accentColor: autoRetaliate
-              ? theme.colors.state.success
-              : theme.colors.accent.secondary,
-          }),
-          color: autoRetaliate
-            ? theme.colors.state.success
-            : theme.colors.text.muted,
-          flexShrink: 0,
-        }}
-      >
-        <div className="flex items-center gap-2">
-          <svg
-            width={12}
-            height={12}
-            viewBox="0 0 24 24"
-            fill="none"
-            stroke={autoRetaliate ? "#22c55e" : theme.colors.text.muted}
-            strokeWidth="2.5"
-            strokeLinecap="round"
-            strokeLinejoin="round"
-          >
-            {autoRetaliate ? (
-              <>
-                <path d="M21 12a9 9 0 1 1-9-9c2.52 0 4.93 1 6.74 2.74L21 8" />
-                <path d="M21 3v5h-5" />
-              </>
-            ) : (
-              <>
-                <circle cx="12" cy="12" r="10" />
-                <line x1="4.93" y1="4.93" x2="19.07" y2="19.07" />
-              </>
-            )}
-          </svg>
-          <span
-            style={{
-              fontWeight: 600,
-              color: theme.colors.text.primary,
-              fontSize: "10px",
-              lineHeight: 1,
-            }}
-          >
-            Auto-retaliate
-          </span>
-        </div>
-        <span
-          style={{
-            display: "inline-flex",
-            alignItems: "center",
-            gap: "1px",
-            padding: "1px",
-            borderRadius: "4px",
-            fontSize: "9px",
-            fontWeight: 700,
-            background: "rgba(0,0,0,0.18)",
-            border: `1px solid ${theme.colors.border.default}30`,
-          }}
-        >
-          <span
-            style={{
-              padding: "2px 6px",
-              borderRadius: "3px",
-              background: autoRetaliate
-                ? "rgba(34, 197, 94, 0.18)"
-                : "transparent",
-              color: autoRetaliate ? "#22c55e" : theme.colors.text.muted,
-            }}
-          >
-            On
-          </span>
-          <span
-            style={{
-              padding: "2px 6px",
-              borderRadius: "3px",
-              background: !autoRetaliate
-                ? "rgba(239, 68, 68, 0.12)"
-                : "transparent",
-              color: !autoRetaliate ? "#ef4444" : theme.colors.text.muted,
-            }}
-          >
-            Off
-          </span>
-        </span>
-      </button>
+      {/* Special Attack Bar */}
+      <SpecialAttackBar
+        specialEnergy={specialEnergy}
+        isActive={specialActive}
+        onToggle={toggleSpecialAttack}
+        theme={theme}
+        compactPanel={compactPanel}
+      />
+
+      {/* Auto Retaliate -- pinned to bottom */}
+      <AutoRetaliateToggle
+        enabled={autoRetaliate}
+        onToggle={toggleAutoRetaliate}
+        theme={theme}
+      />
     </div>
   );
 }
diff --git a/packages/client/src/game/panels/DuelPanel/ConfirmScreen.tsx b/packages/client/src/game/panels/DuelPanel/ConfirmScreen.tsx
index 1a5a67f96..cab9f84b2 100644
--- a/packages/client/src/game/panels/DuelPanel/ConfirmScreen.tsx
+++ b/packages/client/src/game/panels/DuelPanel/ConfirmScreen.tsx
@@ -21,7 +21,8 @@ import {
   DUEL_RULE_LABELS,
   EQUIPMENT_SLOT_LABELS,
 } from "@hyperscape/shared";
-import { formatQuantity, formatGoldValue, calculateTotalValue } from "./utils";
+import { formatGoldValue } from "../../systems/currency";
+import { formatQuantity, calculateTotalValue } from "./utils";
 
 // ============================================================================
 // Types
diff --git a/packages/client/src/game/panels/DuelPanel/DuelHUD.tsx b/packages/client/src/game/panels/DuelPanel/DuelHUD.tsx
index 5a02ae340..fa90ee74e 100644
--- a/packages/client/src/game/panels/DuelPanel/DuelHUD.tsx
+++ b/packages/client/src/game/panels/DuelPanel/DuelHUD.tsx
@@ -18,6 +18,7 @@ import {
   type CSSProperties,
 } from "react";
 import { useThemeStore } from "@/ui";
+import { getHpPercent, getHpColor } from "@hyperscape/shared";
 import { UI } from "@/ui/core";
 import type { DuelRules } from "@hyperscape/shared";
 
@@ -117,9 +118,9 @@ export function DuelHUD({ state, onForfeit }: DuelHUDProps) {
 
   if (!state.visible) return null;
 
-  const healthPercent = Math.max(
-    0,
-    Math.min(100, (state.opponentHealth / state.opponentMaxHealth) * 100),
+  const healthPercent = getHpPercent(
+    state.opponentHealth,
+    state.opponentMaxHealth,
   );
 
   // Get active rules for display
@@ -133,12 +134,14 @@ export function DuelHUD({ state, onForfeit }: DuelHUDProps) {
   // Can forfeit?
   const canForfeit = !state.rules.noForfeit;
 
-  // Health bar color based on percentage
-  const getHealthColor = (percent: number): string => {
-    if (percent > 50) return theme.colors.state.success;
-    if (percent > 25) return theme.colors.state.warning;
-    return theme.colors.state.danger;
+  // Map OSRS HP color to theme semantic colors
+  const hpColorToTheme: Record<string, string> = {
+    "#22c55e": theme.colors.state.success,
+    "#eab308": theme.colors.state.warning,
+    "#ef4444": theme.colors.state.danger,
   };
+  const getHealthColor = (percent: number): string =>
+    hpColorToTheme[getHpColor(percent)] ?? theme.colors.state.danger;
 
   // Styles
   const containerStyle: CSSProperties = {
diff --git a/packages/client/src/game/panels/DuelPanel/DuelResultModal.tsx b/packages/client/src/game/panels/DuelPanel/DuelResultModal.tsx
index cc74768bc..ced051b3b 100644
--- a/packages/client/src/game/panels/DuelPanel/DuelResultModal.tsx
+++ b/packages/client/src/game/panels/DuelPanel/DuelResultModal.tsx
@@ -16,7 +16,7 @@ import { useCallback, useState, useEffect, type CSSProperties } from "react";
 import { ModalWindow, useThemeStore } from "@/ui";
 import { getPanelSurfaceStyle } from "@/ui/theme/themes";
 import { getItem } from "@hyperscape/shared";
-import { formatGoldValue } from "./utils";
+import { formatGoldValue } from "../../systems/currency";
 
 // ============================================================================
 // Types
diff --git a/packages/client/src/game/panels/DuelPanel/StakesScreen.tsx b/packages/client/src/game/panels/DuelPanel/StakesScreen.tsx
index 93a019028..86445f8a5 100644
--- a/packages/client/src/game/panels/DuelPanel/StakesScreen.tsx
+++ b/packages/client/src/game/panels/DuelPanel/StakesScreen.tsx
@@ -15,7 +15,8 @@ import { useState, useCallback, useMemo, type CSSProperties } from "react";
 import { useThemeStore, type Theme } from "@/ui";
 import { getPanelSurfaceStyle } from "@/ui/theme/themes";
 import type { StakedItem, SlotNumber } from "@hyperscape/shared";
-import { formatGoldValue, calculateTotalValue } from "./utils";
+import { formatGoldValue } from "../../systems/currency";
+import { calculateTotalValue } from "./utils";
 import { StakeGrid, StakeInventoryPanel, StakeContextMenu } from "./components";
 
 // ============================================================================
diff --git a/packages/client/src/game/panels/DuelPanel/components/StakeGrid.tsx b/packages/client/src/game/panels/DuelPanel/components/StakeGrid.tsx
index 627d8575c..7dd5f9c60 100644
--- a/packages/client/src/game/panels/DuelPanel/components/StakeGrid.tsx
+++ b/packages/client/src/game/panels/DuelPanel/components/StakeGrid.tsx
@@ -8,7 +8,7 @@ import type { CSSProperties } from "react";
 import type { Theme } from "@/ui";
 import { getItem, type StakedItem } from "@hyperscape/shared";
 import { SlotItem } from "./SlotItem";
-import { formatGoldValue } from "../utils";
+import { formatGoldValue } from "../../../systems/currency";
 
 // ============================================================================
 // Types
diff --git a/packages/client/src/game/panels/DuelPanel/utils.ts b/packages/client/src/game/panels/DuelPanel/utils.ts
index 1a7aa5e3b..7328857b8 100644
--- a/packages/client/src/game/panels/DuelPanel/utils.ts
+++ b/packages/client/src/game/panels/DuelPanel/utils.ts
@@ -17,20 +17,6 @@ export function formatQuantity(quantity: number): string {
   return quantity.toString();
 }
 
-/**
- * Format gold value with K/M/B suffixes
- */
-export function formatGoldValue(value: number): string {
-  if (value >= 1_000_000_000) {
-    return `${(value / 1_000_000_000).toFixed(1)}B`;
-  } else if (value >= 1_000_000) {
-    return `${(value / 1_000_000).toFixed(1)}M`;
-  } else if (value >= 1_000) {
-    return `${(value / 1_000).toFixed(1)}K`;
-  }
-  return value.toString();
-}
-
 /**
  * Calculate total value of staked items
  */
diff --git a/packages/client/src/game/panels/PrayerPanel.tsx b/packages/client/src/game/panels/PrayerPanel.tsx
index d297600ad..2c765e7e1 100644
--- a/packages/client/src/game/panels/PrayerPanel.tsx
+++ b/packages/client/src/game/panels/PrayerPanel.tsx
@@ -53,36 +53,12 @@ import {
 import type { PlayerStats, ClientWorld } from "../../types";
 import {
   EventType,
-  type PrayerStateSyncPayload,
-  type PrayerToggledEvent,
+  isPrayerStateSyncPayload,
+  isPrayerToggledPayload,
   type PrayerDefinition,
   prayerDataProvider,
 } from "@hyperscape/shared";
 
-// Type guards for prayer events
-function isPrayerStateSyncPayload(
-  data: unknown,
-): data is PrayerStateSyncPayload {
-  if (typeof data !== "object" || data === null) return false;
-  const obj = data as Record<string, unknown>;
-  return (
-    typeof obj.playerId === "string" &&
-    typeof obj.points === "number" &&
-    typeof obj.maxPoints === "number" &&
-    Array.isArray(obj.active)
-  );
-}
-
-function isPrayerToggledPayload(data: unknown): data is PrayerToggledEvent {
-  if (typeof data !== "object" || data === null) return false;
-  const obj = data as Record<string, unknown>;
-  return (
-    typeof obj.playerId === "string" &&
-    typeof obj.prayerId === "string" &&
-    typeof obj.active === "boolean"
-  );
-}
-
 // Prayer panel layout constants — use shared sizing tokens from panelLayout.ts
 // to ensure consistency across Prayer, Spells, Skills, and Inventory panels.
 const PRAYER_ICON_SIZE = PANEL_ICON_SIZE; // 36px desktop icon size
diff --git a/packages/client/src/game/panels/SettingsPanel.tsx b/packages/client/src/game/panels/SettingsPanel/SettingsPanel.tsx
similarity index 99%
rename from packages/client/src/game/panels/SettingsPanel.tsx
rename to packages/client/src/game/panels/SettingsPanel/SettingsPanel.tsx
index abf3c5960..74387b1d0 100644
--- a/packages/client/src/game/panels/SettingsPanel.tsx
+++ b/packages/client/src/game/panels/SettingsPanel/SettingsPanel.tsx
@@ -14,8 +14,8 @@ import {
   type LucideIcon,
 } from "lucide-react";
 import { isTouch } from "@hyperscape/shared";
-import type { ClientWorld } from "../../types";
-import { useFullscreen } from "../../hooks/useFullscreen";
+import type { ClientWorld } from "../../../types";
+import { useFullscreen } from "../../../hooks/useFullscreen";
 import { ToggleSwitch, Slider } from "@/ui";
 import {
   getInteractiveTileStyle,
@@ -23,7 +23,7 @@ import {
   getPanelInsetStyle,
   getPanelSurfaceStyle,
 } from "@/ui/theme/themes";
-import { NAME_SANITIZE_REGEX } from "../../utils/validation";
+import { NAME_SANITIZE_REGEX } from "../../../utils/validation";
 import {
   useComplexityStore,
   useComplexityMode,
@@ -35,16 +35,16 @@ import {
   type StatusBarsConfig,
   STATUSBAR_CONFIG_CHANGED_EVENT,
   STATUSBAR_CONFIG_STORAGE_KEY,
-} from "../hud/StatusBars";
-import { privyAuthManager } from "../../auth/PrivyAuthManager";
-import { useSolanaWallet } from "../../hooks/useSolanaWallet";
+} from "../../hud/StatusBars";
+import { privyAuthManager } from "../../../auth/PrivyAuthManager";
+import { useSolanaWallet } from "../../../hooks/useSolanaWallet";
 import {
   type GraphicsQuality,
   QUALITY_PRESETS,
   QUALITY_LEVELS,
   getQualityDisplayName,
   detectRecommendedQuality,
-} from "../../types/embeddedConfig";
+} from "../../../types/embeddedConfig";
 
 /** Minimum name length required for submission */
 const MIN_NAME_LENGTH = 1;
diff --git a/packages/client/src/game/panels/SettingsPanel/index.ts b/packages/client/src/game/panels/SettingsPanel/index.ts
index 8662af99f..f978b0a66 100644
--- a/packages/client/src/game/panels/SettingsPanel/index.ts
+++ b/packages/client/src/game/panels/SettingsPanel/index.ts
@@ -6,8 +6,6 @@
  * @packageDocumentation
  */
 
-// Re-export the main panel from the original location
-// This allows gradual migration to the new structure
-export { SettingsPanel } from "../SettingsPanel";
+export { SettingsPanel } from "./SettingsPanel";
 export * from "./components";
 export * from "./constants";
diff --git a/packages/client/src/game/panels/SkillsPanel.tsx b/packages/client/src/game/panels/SkillsPanel.tsx
index 3a58333aa..2c678b0db 100644
--- a/packages/client/src/game/panels/SkillsPanel.tsx
+++ b/packages/client/src/game/panels/SkillsPanel.tsx
@@ -31,6 +31,9 @@ import type { PlayerStats, Skills } from "../../types";
 import {
   SKILL_DEFINITIONS,
   getUnlocksForSkill,
+  calculateCombatLevel,
+  normalizeCombatSkills,
+  getXPForLevel,
   type SkillDefinition,
 } from "@hyperscape/shared";
 import { SkillGuidePanel } from "./SkillGuidePanel";
@@ -47,25 +50,6 @@ interface Skill {
   xp: number;
 }
 
-function calculateXPForLevel(level: number): number {
-  let total = 0;
-  for (let i = 1; i < level; i++) {
-    total += Math.floor(i + 300 * Math.pow(2, i / 7));
-  }
-  return Math.floor(total / 4);
-}
-
-/** Calculate combat level from skill stats */
-function calculateCombatLevel(stats: Partial<Skills>): number {
-  const attack = stats.attack?.level ?? 1;
-  const strength = stats.strength?.level ?? 1;
-  const defense = stats.defense?.level ?? 1;
-  const constitution = stats.constitution?.level ?? 10;
-  return Math.floor(
-    0.25 * (defense + constitution) + 0.325 * (attack + strength),
-  );
-}
-
 /** Draggable skill card component for action bar drag-drop */
 // Memoized to prevent re-renders of all skill cards when any changes
 const DraggableSkillCard = memo(function DraggableSkillCard({
@@ -254,7 +238,17 @@ export function SkillsPanel({ stats }: SkillsPanelProps) {
 
   const totalLevel = skills.reduce((sum, skill) => sum + skill.level, 0);
   const totalXP = skills.reduce((sum, skill) => sum + skill.xp, 0);
-  const combatLevel = calculateCombatLevel(s);
+  const combatLevel = calculateCombatLevel(
+    normalizeCombatSkills({
+      attack: s.attack?.level,
+      strength: s.strength?.level,
+      defense: s.defense?.level,
+      constitution: s.constitution?.level,
+      ranged: s.ranged?.level,
+      magic: s.magic?.level,
+      prayer: s.prayer?.level,
+    }),
+  );
 
   return (
     <div
@@ -407,8 +401,8 @@ export function SkillsPanel({ stats }: SkillsPanelProps) {
       {/* Skill Tooltip */}
       {hoveredSkill &&
         (() => {
-          const currentLevelXP = calculateXPForLevel(hoveredSkill.level);
-          const nextLevelXP = calculateXPForLevel(hoveredSkill.level + 1);
+          const currentLevelXP = getXPForLevel(hoveredSkill.level);
+          const nextLevelXP = getXPForLevel(hoveredSkill.level + 1);
           const xpRemaining = nextLevelXP - hoveredSkill.xp;
           const xpIntoLevel = hoveredSkill.xp - currentLevelXP;
           const xpForThisLevel = nextLevelXP - currentLevelXP;
diff --git a/packages/client/src/game/panels/StatsPanel.tsx b/packages/client/src/game/panels/StatsPanel.tsx
index c6a50d30f..39ebe3161 100644
--- a/packages/client/src/game/panels/StatsPanel.tsx
+++ b/packages/client/src/game/panels/StatsPanel.tsx
@@ -12,6 +12,10 @@
 import { useMemo } from "react";
 import { useThemeStore } from "@/ui";
 import { getPanelSurfaceStyle } from "@/ui/theme/themes";
+import {
+  calculateCombatLevel,
+  normalizeCombatSkills,
+} from "@hyperscape/shared";
 import type { PlayerEquipmentItems, PlayerStats } from "../../types";
 
 // ============================================================================
@@ -188,12 +192,17 @@ export function StatsPanel({
   const combatLevel = useMemo(() => {
     const skills = stats?.skills;
     if (!skills) return 1;
-    const base =
-      0.25 *
-      ((skills.defense?.level || 1) + (skills.constitution?.level || 10));
-    const melee =
-      0.325 * ((skills.attack?.level || 1) + (skills.strength?.level || 1));
-    return Math.floor(base + melee);
+    return calculateCombatLevel(
+      normalizeCombatSkills({
+        attack: skills.attack?.level,
+        strength: skills.strength?.level,
+        defense: skills.defense?.level,
+        constitution: skills.constitution?.level,
+        ranged: skills.ranged?.level,
+        magic: skills.magic?.level,
+        prayer: skills.prayer?.level,
+      }),
+    );
   }, [stats]);
 
   const panelStyle = {
diff --git a/packages/client/src/game/panels/TradePanel/TradePanel.tsx b/packages/client/src/game/panels/TradePanel/TradePanel.tsx
index 285e37ee8..6bc65bccc 100644
--- a/packages/client/src/game/panels/TradePanel/TradePanel.tsx
+++ b/packages/client/src/game/panels/TradePanel/TradePanel.tsx
@@ -39,7 +39,8 @@ import type {
   QuantityPromptState,
 } from "./types";
 import { TRADE_GRID_COLS, TRADE_SLOTS } from "./constants";
-import { formatGoldValue, getWealthDifferenceColor } from "./utils";
+import { formatGoldValue } from "../../systems/currency";
+import { getWealthDifferenceColor } from "./utils";
 import { TradeSlot, InventoryMiniPanel } from "./components";
 import { TradeContextMenu, QuantityPrompt } from "./modals";
 import { useRemovedItemTracking } from "./hooks";
diff --git a/packages/client/src/game/panels/TradePanel/utils.ts b/packages/client/src/game/panels/TradePanel/utils.ts
index d98d841c1..3d26602af 100644
--- a/packages/client/src/game/panels/TradePanel/utils.ts
+++ b/packages/client/src/game/panels/TradePanel/utils.ts
@@ -24,31 +24,6 @@ export function formatQuantity(qty: number): { text: string; color: string } {
   }
 }
 
-// ============================================================================
-// Gold Value Formatting
-// ============================================================================
-
-/**
- * Format gold value for wealth indicator display (OSRS-style)
- * Shows K/M/B suffixes with decimal places
- */
-export function formatGoldValue(value: number): string {
-  if (value < 1000) {
-    return value.toLocaleString();
-  } else if (value < 1000000) {
-    const k = Math.floor(value / 1000);
-    const remainder = Math.floor((value % 1000) / 100);
-    return remainder > 0 ? `${k}.${remainder}K` : `${k}K`;
-  } else if (value < 1000000000) {
-    const m = Math.floor(value / 1000000);
-    const remainder = Math.floor((value % 1000000) / 100000);
-    return remainder > 0 ? `${m}.${remainder}M` : `${m}M`;
-  } else {
-    const b = Math.floor(value / 1000000000);
-    return `${b}B`;
-  }
-}
-
 /**
  * Get color for wealth difference indicator
  * Green = gaining value, Red = losing value, White = neutral
diff --git a/packages/client/src/game/panels/combat/AutoRetaliateToggle.tsx b/packages/client/src/game/panels/combat/AutoRetaliateToggle.tsx
new file mode 100644
index 000000000..1c76d5a63
--- /dev/null
+++ b/packages/client/src/game/panels/combat/AutoRetaliateToggle.tsx
@@ -0,0 +1,113 @@
+/**
+ * Auto-Retaliate Toggle
+ *
+ * Renders the auto-retaliate on/off button with OSRS-style toggle indicator.
+ */
+
+import React from "react";
+import { getInteractiveTileStyle } from "@/ui/theme/themes";
+import { PANEL_PADDING } from "../../../constants/panelLayout";
+import type { AutoRetaliateToggleProps } from "./types";
+
+/** Auto-retaliate toggle button with on/off indicator */
+export const AutoRetaliateToggle = React.memo(function AutoRetaliateToggle({
+  enabled,
+  onToggle,
+  theme,
+}: AutoRetaliateToggleProps) {
+  return (
+    <button
+      onClick={onToggle}
+      aria-pressed={enabled}
+      className="focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-amber-400/50"
+      style={{
+        padding: `${PANEL_PADDING}px 6px`,
+        cursor: "pointer",
+        transition: "all 0.1s ease",
+        display: "flex",
+        alignItems: "center",
+        justifyContent: "space-between",
+        touchAction: "manipulation",
+        borderRadius: 4,
+        ...getInteractiveTileStyle(theme, {
+          active: enabled,
+          radius: 4,
+          accentColor: enabled
+            ? theme.colors.state.success
+            : theme.colors.accent.secondary,
+        }),
+        color: enabled ? theme.colors.state.success : theme.colors.text.muted,
+        flexShrink: 0,
+      }}
+    >
+      <div className="flex items-center gap-2">
+        <svg
+          width={12}
+          height={12}
+          viewBox="0 0 24 24"
+          fill="none"
+          stroke={enabled ? "#22c55e" : theme.colors.text.muted}
+          strokeWidth="2.5"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+        >
+          {enabled ? (
+            <>
+              <path d="M21 12a9 9 0 1 1-9-9c2.52 0 4.93 1 6.74 2.74L21 8" />
+              <path d="M21 3v5h-5" />
+            </>
+          ) : (
+            <>
+              <circle cx="12" cy="12" r="10" />
+              <line x1="4.93" y1="4.93" x2="19.07" y2="19.07" />
+            </>
+          )}
+        </svg>
+        <span
+          style={{
+            fontWeight: 600,
+            color: theme.colors.text.primary,
+            fontSize: "10px",
+            lineHeight: 1,
+          }}
+        >
+          Auto-retaliate
+        </span>
+      </div>
+      <span
+        style={{
+          display: "inline-flex",
+          alignItems: "center",
+          gap: "1px",
+          padding: "1px",
+          borderRadius: "4px",
+          fontSize: "9px",
+          fontWeight: 700,
+          background: "rgba(0,0,0,0.18)",
+          border: `1px solid ${theme.colors.border.default}30`,
+        }}
+      >
+        <span
+          style={{
+            padding: "2px 6px",
+            borderRadius: "3px",
+            background: enabled ? "rgba(34, 197, 94, 0.18)" : "transparent",
+            color: enabled ? "#22c55e" : theme.colors.text.muted,
+          }}
+        >
+          On
+        </span>
+        <span
+          style={{
+            padding: "2px 6px",
+            borderRadius: "3px",
+            background: !enabled ? "rgba(239, 68, 68, 0.12)" : "transparent",
+            color: !enabled ? "#ef4444" : theme.colors.text.muted,
+          }}
+        >
+          Off
+        </span>
+      </span>
+    </button>
+  );
+});
diff --git a/packages/client/src/game/panels/combat/CombatBonusesDisplay.tsx b/packages/client/src/game/panels/combat/CombatBonusesDisplay.tsx
new file mode 100644
index 000000000..c7320f5b4
--- /dev/null
+++ b/packages/client/src/game/panels/combat/CombatBonusesDisplay.tsx
@@ -0,0 +1,263 @@
+/**
+ * Combat Bonuses Display
+ *
+ * Renders HP bar, combat level, target health bar, and stat row (ATK/STR/DEF).
+ */
+
+import React from "react";
+import { getHpPercent } from "@hyperscape/shared";
+import { useThemeStore } from "@/ui";
+import { StatIcon } from "./StyleIcons";
+import type { CombatBonusesDisplayProps } from "./types";
+
+/** Combat stats row with SVG icons - compact */
+const CombatStatsRow = React.memo(function CombatStatsRow({
+  attackLevel,
+  strengthLevel,
+  defenseLevel,
+  isMobile,
+}: {
+  attackLevel: number;
+  strengthLevel: number;
+  defenseLevel: number;
+  isMobile: boolean;
+}) {
+  const theme = useThemeStore((s) => s.theme);
+  const stats: Array<{
+    key: "attack" | "strength" | "defense";
+    value: number;
+    color: string;
+  }> = [
+    { key: "attack", value: attackLevel, color: "#ef4444" },
+    { key: "strength", value: strengthLevel, color: "#22c55e" },
+    { key: "defense", value: defenseLevel, color: "#3b82f6" },
+  ];
+
+  return (
+    <div
+      style={{
+        display: "flex",
+        alignItems: "center",
+        justifyContent: "center",
+        gap: "8px",
+        padding: "2px 0",
+      }}
+    >
+      {stats.map((stat, index) => (
+        <React.Fragment key={stat.key}>
+          {index > 0 && (
+            <div
+              style={{
+                width: "1px",
+                height: "10px",
+                background: `${theme.colors.border.default}25`,
+              }}
+            />
+          )}
+          <div style={{ display: "flex", alignItems: "center", gap: "3px" }}>
+            <StatIcon
+              stat={stat.key}
+              size={isMobile ? 11 : 10}
+              color={stat.color}
+            />
+            <span
+              style={{
+                fontSize: isMobile ? "11px" : "10px",
+                color: stat.color,
+                fontWeight: 700,
+                fontFamily: "var(--font-mono, monospace)",
+              }}
+            >
+              {stat.value}
+            </span>
+          </div>
+        </React.Fragment>
+      ))}
+    </div>
+  );
+});
+
+/** HP bar, combat level, target health, and stat row */
+export const CombatBonusesDisplay = React.memo(function CombatBonusesDisplay({
+  health,
+  combatLevel,
+  inCombat,
+  attackLevel,
+  strengthLevel,
+  defenseLevel,
+  targetName,
+  targetHealth,
+  compactPanel,
+  ultraCompactPanel,
+  isMobile,
+  innerPadding,
+  theme,
+}: CombatBonusesDisplayProps) {
+  const healthPercent = getHpPercent(health.current, health.max);
+  const targetHealthPercent = targetHealth
+    ? getHpPercent(targetHealth.current, targetHealth.max)
+    : 0;
+
+  return (
+    <>
+      {/* HP + Combat Level */}
+      <div
+        style={{
+          display: "flex",
+          alignItems: "center",
+          gap: "6px",
+          padding: `${innerPadding}px`,
+          marginTop: compactPanel ? 16 : 22,
+          background:
+            theme.name === "hyperscape"
+              ? "linear-gradient(180deg, rgba(255, 255, 255, 0.04) 0%, rgba(0, 0, 0, 0.12) 100%)"
+              : theme.colors.slot.filled,
+          border: inCombat
+            ? `1px solid ${theme.colors.state.danger}50`
+            : `1px solid ${theme.colors.border.default}35`,
+          borderRadius: 4,
+        }}
+      >
+        <svg width={12} height={12} viewBox="0 0 24 24" fill="#ef4444">
+          <path d="M12 21.35l-1.45-1.32C5.4 15.36 2 12.28 2 8.5 2 5.42 4.42 3 7.5 3c1.74 0 3.41.81 4.5 2.09C13.09 3.81 14.76 3 16.5 3 19.58 3 22 5.42 22 8.5c0 3.78-3.4 6.86-8.55 11.54L12 21.35z" />
+        </svg>
+        {/* HP bar inline */}
+        <div style={{ flex: 1, minWidth: 0 }}>
+          <div
+            style={{
+              width: "100%",
+              height: "5px",
+              background: theme.colors.background.panelPrimary,
+              borderRadius: 3,
+              overflow: "hidden",
+              border: `1px solid ${theme.colors.border.default}30`,
+            }}
+          >
+            <div
+              style={{
+                height: "100%",
+                width: `${healthPercent}%`,
+                borderRadius: 3,
+                transition: "width 0.2s ease",
+                background: "linear-gradient(180deg, #f87171, #dc2626)",
+              }}
+            />
+          </div>
+        </div>
+        <span
+          style={{
+            fontSize: "11px",
+            color: theme.colors.text.primary,
+            fontWeight: 700,
+            fontFamily: "var(--font-mono, monospace)",
+            whiteSpace: "nowrap",
+          }}
+        >
+          {health.current}/{health.max}
+        </span>
+        {inCombat && (
+          <span
+            className="combat-pulse"
+            style={{
+              fontSize: "9px",
+              color: theme.colors.state.danger,
+              fontWeight: 600,
+            }}
+          >
+            ⚔
+          </span>
+        )}
+        <span
+          style={{
+            borderLeft: `1px solid ${theme.colors.border.default}25`,
+            paddingLeft: "6px",
+            fontSize: "10px",
+            color: theme.colors.text.muted,
+            whiteSpace: "nowrap",
+          }}
+        >
+          Lvl{" "}
+          <span
+            style={{
+              color: "#f59e0b",
+              fontWeight: 700,
+              fontFamily: "var(--font-mono, monospace)",
+              fontSize: "12px",
+            }}
+          >
+            {combatLevel}
+          </span>
+        </span>
+      </div>
+
+      {/* Target health -- only when in combat */}
+      {targetName && targetHealth && !ultraCompactPanel && (
+        <div
+          style={{
+            display: "flex",
+            alignItems: "center",
+            gap: "6px",
+            padding: `${innerPadding - 1}px ${innerPadding}px`,
+            marginTop: compactPanel ? 3 : 4,
+            background: `${theme.colors.state.danger}08`,
+            border: `1px solid ${theme.colors.state.danger}30`,
+            borderRadius: 4,
+          }}
+        >
+          <span
+            style={{
+              fontSize: "10px",
+              color: theme.colors.state.danger,
+              fontWeight: 600,
+              whiteSpace: "nowrap",
+              overflow: "hidden",
+              textOverflow: "ellipsis",
+              maxWidth: "80px",
+            }}
+          >
+            🎯 {targetName}
+          </span>
+          <div style={{ flex: 1, minWidth: 0 }}>
+            <div
+              style={{
+                width: "100%",
+                height: "4px",
+                background: theme.colors.background.panelPrimary,
+                borderRadius: 2,
+                overflow: "hidden",
+              }}
+            >
+              <div
+                style={{
+                  height: "100%",
+                  width: `${targetHealthPercent}%`,
+                  borderRadius: 2,
+                  background: "linear-gradient(180deg, #f87171, #dc2626)",
+                }}
+              />
+            </div>
+          </div>
+          <span
+            style={{
+              fontSize: "10px",
+              color: theme.colors.state.danger,
+              fontWeight: 700,
+              fontFamily: "var(--font-mono, monospace)",
+              whiteSpace: "nowrap",
+            }}
+          >
+            {targetHealth.current}/{targetHealth.max}
+          </span>
+        </div>
+      )}
+
+      {/* Stats Row */}
+      <CombatStatsRow
+        attackLevel={attackLevel}
+        strengthLevel={strengthLevel}
+        defenseLevel={defenseLevel}
+        isMobile={isMobile}
+      />
+    </>
+  );
+});
diff --git a/packages/client/src/game/panels/combat/CombatStyleSelector.tsx b/packages/client/src/game/panels/combat/CombatStyleSelector.tsx
new file mode 100644
index 000000000..52e7d5011
--- /dev/null
+++ b/packages/client/src/game/panels/combat/CombatStyleSelector.tsx
@@ -0,0 +1,370 @@
+/**
+ * Combat Style Selector
+ *
+ * Renders the banner grid of combat style options with heraldic shield icons.
+ * Includes the draggable CombatStyleBanner sub-component and autocast badge.
+ */
+
+import React from "react";
+import { useDraggable } from "@dnd-kit/core";
+import { getPanelInsetStyle } from "@/ui/theme/themes";
+import type { Theme } from "@/ui/theme/themes";
+import {
+  BannerStyleIcon,
+  SHIELD_OUTER,
+  SHIELD_INNER,
+  XP_SHORT_LABELS,
+} from "./StyleIcons";
+import type { CombatStyleInfo, CombatStyleSelectorProps } from "./types";
+
+/** Single combat style banner -- heraldic shield using theme colors */
+const CombatStyleBanner = ({
+  style: styleInfo,
+  isActive,
+  disabled,
+  isMobile,
+  onClick,
+  theme,
+}: {
+  style: CombatStyleInfo;
+  isActive: boolean;
+  disabled: boolean;
+  isMobile: boolean;
+  onClick: () => void;
+  theme: Theme;
+}) => {
+  const { attributes, listeners, setNodeRef, isDragging } = useDraggable({
+    id: `combatstyle-${styleInfo.id}`,
+    data: {
+      combatStyle: {
+        id: styleInfo.id,
+        label: styleInfo.label,
+        color: styleInfo.color,
+      },
+      source: "combatstyle",
+    },
+    disabled,
+  });
+
+  const shortXp =
+    XP_SHORT_LABELS[styleInfo.xp] ||
+    `+${styleInfo.xp.slice(0, 3).toUpperCase()}`;
+  const baseGradId = `banner-base-${styleInfo.id}`;
+  const tintGradId = `banner-tint-${styleInfo.id}`;
+
+  // Theme-derived colors
+  const bgDark = theme.colors.background.primary;
+  const bgMid = theme.colors.background.secondary;
+  const bgLight = theme.colors.background.tertiary;
+  const accentGold = theme.colors.accent.primary;
+  const borderClr = theme.colors.border.default;
+  const textMuted = theme.colors.text.muted;
+  const textPrimary = theme.colors.text.primary;
+
+  return (
+    <div
+      ref={setNodeRef}
+      {...attributes}
+      {...listeners}
+      style={{
+        flex: "0 0 calc((100% - 3 * (var(--banner-gap))) / 4)",
+        maxWidth: "calc((100% - 3 * (var(--banner-gap))) / 4)",
+        minWidth: 0,
+        position: "relative",
+        opacity: disabled ? 0.5 : isDragging ? 0.6 : 1,
+        transform: isDragging ? "scale(0.95)" : "scale(1)",
+        transition: "opacity 0.15s ease, transform 0.15s ease",
+        touchAction: "none",
+      }}
+    >
+      <button
+        type="button"
+        onClick={(e) => {
+          e.stopPropagation();
+          if (!disabled) onClick();
+        }}
+        disabled={disabled}
+        aria-pressed={isActive}
+        className="combat-banner focus-visible:outline-none"
+        style={{
+          position: "relative",
+          width: "100%",
+          aspectRatio: isMobile ? "0.58" : "0.52",
+          background: "transparent",
+          border: "none",
+          padding: 0,
+          cursor: disabled ? "not-allowed" : "pointer",
+          touchAction: "manipulation",
+        }}
+      >
+        {/* SVG shield / crest shape */}
+        <svg
+          viewBox="0 0 100 130"
+          preserveAspectRatio="none"
+          style={{
+            position: "absolute",
+            inset: 0,
+            width: "100%",
+            height: "100%",
+            filter: isActive
+              ? `drop-shadow(0 3px 8px ${styleInfo.color}35) drop-shadow(0 1px 2px rgba(0,0,0,0.6))`
+              : "drop-shadow(0 2px 5px rgba(0,0,0,0.5))",
+            transition: "filter 0.2s ease",
+          }}
+        >
+          <defs>
+            {/* Theme base gradient */}
+            <linearGradient id={baseGradId} x1="0" y1="0" x2="0" y2="1">
+              <stop
+                offset="0%"
+                stopColor={isActive ? bgLight : bgMid}
+                stopOpacity={1}
+              />
+              <stop
+                offset="50%"
+                stopColor={isActive ? bgMid : bgDark}
+                stopOpacity={1}
+              />
+              <stop offset="100%" stopColor={bgDark} stopOpacity={1} />
+            </linearGradient>
+            {/* Color tint overlay for active state */}
+            {isActive && (
+              <linearGradient id={tintGradId} x1="0" y1="0" x2="0" y2="1">
+                <stop
+                  offset="0%"
+                  stopColor={styleInfo.color}
+                  stopOpacity={0.28}
+                />
+                <stop
+                  offset="55%"
+                  stopColor={styleInfo.color}
+                  stopOpacity={0.1}
+                />
+                <stop
+                  offset="100%"
+                  stopColor={styleInfo.color}
+                  stopOpacity={0.03}
+                />
+              </linearGradient>
+            )}
+          </defs>
+
+          {/* Outer shadow edge */}
+          <path
+            d={SHIELD_OUTER}
+            fill="none"
+            stroke="rgba(0,0,0,0.7)"
+            strokeWidth={3.5}
+          />
+          {/* Base fill */}
+          <path d={SHIELD_OUTER} fill={`url(#${baseGradId})`} />
+          {/* Active color tint overlay */}
+          {isActive && <path d={SHIELD_OUTER} fill={`url(#${tintGradId})`} />}
+          {/* Border stroke -- gold accent inactive, style color active */}
+          <path
+            d={SHIELD_OUTER}
+            fill="none"
+            stroke={isActive ? `${styleInfo.color}aa` : `${borderClr}`}
+            strokeWidth={isActive ? 1.8 : 1.2}
+          />
+          {/* Top edge highlight */}
+          <line
+            x1="10"
+            y1="1.2"
+            x2="90"
+            y2="1.2"
+            stroke={isActive ? `${styleInfo.color}44` : `${accentGold}18`}
+            strokeWidth={0.8}
+            strokeLinecap="round"
+          />
+          {/* Inner bevel for depth */}
+          <path
+            d={SHIELD_INNER}
+            fill="none"
+            stroke={
+              isActive ? "rgba(255,255,255,0.07)" : "rgba(255,255,255,0.025)"
+            }
+            strokeWidth={0.6}
+          />
+        </svg>
+
+        {/* Icon protruding from top of shield */}
+        <div
+          style={{
+            position: "absolute",
+            top: 0,
+            left: "50%",
+            transform: "translate(-50%, -50%)",
+            zIndex: 2,
+            display: "flex",
+            alignItems: "center",
+            justifyContent: "center",
+            width: isMobile ? 28 : 34,
+            height: isMobile ? 28 : 34,
+            borderRadius: "50%",
+            background: isActive
+              ? `radial-gradient(circle, ${bgLight} 40%, ${bgMid} 100%)`
+              : `radial-gradient(circle, ${bgMid} 40%, ${bgDark} 100%)`,
+            border: isActive
+              ? `1.5px solid ${styleInfo.color}88`
+              : `1px solid ${borderClr}`,
+            boxShadow: isActive
+              ? `0 2px 6px ${styleInfo.color}30, 0 1px 3px rgba(0,0,0,0.4)`
+              : "0 2px 4px rgba(0,0,0,0.4)",
+          }}
+        >
+          <BannerStyleIcon
+            style={styleInfo.id}
+            size={isMobile ? 16 : 20}
+            color={isActive ? styleInfo.color : accentGold}
+            muted={!isActive}
+          />
+        </div>
+
+        {/* Content overlay */}
+        <div
+          style={{
+            position: "relative",
+            zIndex: 1,
+            display: "flex",
+            flexDirection: "column",
+            alignItems: "center",
+            justifyContent: "center",
+            height: "100%",
+            paddingTop: isMobile ? "16px" : "20px",
+            paddingBottom: isMobile ? "18px" : "22px",
+            gap: isMobile ? "2px" : "3px",
+          }}
+        >
+          {/* Style name */}
+          <span
+            style={{
+              fontSize: isMobile ? "8.5px" : "10px",
+              fontWeight: 700,
+              color: isActive ? textPrimary : textMuted,
+              lineHeight: 1.15,
+              textAlign: "center",
+              whiteSpace: "nowrap",
+              letterSpacing: "0.01em",
+              textShadow: isActive
+                ? `0 1px 3px rgba(0,0,0,0.7), 0 0 8px ${styleInfo.color}25`
+                : "0 1px 2px rgba(0,0,0,0.6)",
+            }}
+          >
+            {styleInfo.label}
+          </span>
+
+          {/* XP bonus label */}
+          <span
+            style={{
+              fontSize: isMobile ? "8.5px" : "10px",
+              fontWeight: 700,
+              color: isActive ? styleInfo.color : `${accentGold}88`,
+              lineHeight: 1,
+              textAlign: "center",
+              letterSpacing: "0.05em",
+              textShadow: isActive ? `0 0 6px ${styleInfo.color}35` : "none",
+            }}
+          >
+            {shortXp}
+          </span>
+        </div>
+      </button>
+    </div>
+  );
+};
+
+/** Combat style selector section with banner grid, header, and cooldown indicator */
+export const CombatStyleSelector = React.memo(function CombatStyleSelector({
+  styles,
+  activeStyleId,
+  cooldown,
+  compactPanel,
+  theme,
+  onStyleChange,
+}: CombatStyleSelectorProps) {
+  return (
+    <>
+      <div
+        style={{
+          display: "flex",
+          alignItems: "center",
+          justifyContent: "space-between",
+          marginBottom: compactPanel ? 6 : 8,
+          flexShrink: 0,
+        }}
+      >
+        <span
+          style={{
+            fontSize: "9px",
+            lineHeight: 1,
+            color: theme.colors.text.muted,
+            textTransform: "uppercase",
+            letterSpacing: "0.1em",
+            fontWeight: 700,
+          }}
+        >
+          Combat Styles
+        </span>
+        {activeStyleId === "autocast" && (
+          <span
+            style={{
+              padding: "2px 5px",
+              borderRadius: 4,
+              background: "#8b5cf618",
+              border: "1px solid #8b5cf633",
+              fontSize: "8px",
+              fontWeight: 700,
+              color: "#c4b5fd",
+              textTransform: "uppercase",
+              letterSpacing: "0.06em",
+            }}
+          >
+            Autocast
+          </span>
+        )}
+      </div>
+      <div
+        style={
+          {
+            display: "flex",
+            gap: compactPanel ? "4px" : "6px",
+            width: "100%",
+            marginTop: compactPanel ? 14 : 17,
+            justifyContent: "center",
+            "--banner-gap": compactPanel ? "4px" : "6px",
+          } as React.CSSProperties
+        }
+      >
+        {styles.map((s) => (
+          <CombatStyleBanner
+            key={s.id}
+            style={s}
+            isActive={activeStyleId === s.id}
+            disabled={cooldown > 0}
+            isMobile={compactPanel}
+            onClick={() => onStyleChange(s.id)}
+            theme={theme}
+          />
+        ))}
+      </div>
+
+      {cooldown > 0 && (
+        <div
+          style={{
+            textAlign: "center",
+            fontSize: "9px",
+            color: theme.colors.state.warning,
+            background: `${theme.colors.state.warning}10`,
+            padding: "2px 5px",
+            borderRadius: 4,
+            border: `1px solid ${theme.colors.state.warning}25`,
+            marginTop: compactPanel ? 4 : 6,
+          }}
+        >
+          Style change in {Math.ceil(cooldown / 1000)}s
+        </div>
+      )}
+    </>
+  );
+});
diff --git a/packages/client/src/game/panels/combat/SpecialAttackBar.tsx b/packages/client/src/game/panels/combat/SpecialAttackBar.tsx
new file mode 100644
index 000000000..9e690d345
--- /dev/null
+++ b/packages/client/src/game/panels/combat/SpecialAttackBar.tsx
@@ -0,0 +1,112 @@
+/**
+ * Special Attack Bar
+ *
+ * OSRS-style special attack energy bar with clickable toggle.
+ * When toggled ON (amber glow), the next auto-attack will be a special.
+ * Energy drains on use and recharges 10% every 30 seconds.
+ */
+
+import React from "react";
+import { getPanelInsetStyle } from "@/ui/theme/themes";
+import type { SpecialAttackBarProps } from "./types";
+
+/** Special attack energy bar with toggle button */
+export const SpecialAttackBar = React.memo(function SpecialAttackBar({
+  specialEnergy,
+  isActive,
+  onToggle,
+  theme,
+  compactPanel,
+}: SpecialAttackBarProps) {
+  // Display as 0-100% (server sends 0-1000 internal units)
+  const energyPercent = Math.min(
+    100,
+    Math.max(0, Math.round(specialEnergy / 10)),
+  );
+  const hasEnough = energyPercent >= 25;
+
+  return (
+    <button
+      onClick={onToggle}
+      style={{
+        ...getPanelInsetStyle(theme, {
+          emphasis: "normal",
+          radius: 4,
+          padding: `${compactPanel ? 4 : 6}px`,
+        }),
+        display: "flex",
+        alignItems: "center",
+        gap: "6px",
+        flexShrink: 0,
+        cursor: hasEnough ? "pointer" : "not-allowed",
+        opacity: hasEnough ? 1 : 0.6,
+        border: isActive
+          ? "1px solid #f59e0b"
+          : `1px solid ${theme.colors.border.default}30`,
+        boxShadow: isActive ? "0 0 6px rgba(245, 158, 11, 0.4)" : "none",
+        transition: "border-color 0.2s, box-shadow 0.2s",
+        width: "100%",
+        background: "transparent",
+      }}
+    >
+      <svg
+        width={12}
+        height={12}
+        viewBox="0 0 24 24"
+        fill={isActive ? "#f59e0b" : "none"}
+        stroke={isActive || hasEnough ? "#f59e0b" : theme.colors.text.muted}
+        strokeWidth="2.5"
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      >
+        <polygon points="13 2 3 14 12 14 11 22 21 10 12 10 13 2" />
+      </svg>
+      <div style={{ flex: 1, minWidth: 0 }}>
+        <div
+          style={{
+            width: "100%",
+            height: "5px",
+            background: theme.colors.background.panelPrimary,
+            borderRadius: 3,
+            overflow: "hidden",
+            border: `1px solid ${theme.colors.border.default}30`,
+          }}
+        >
+          <div
+            style={{
+              height: "100%",
+              width: `${energyPercent}%`,
+              borderRadius: 3,
+              transition: "width 0.3s ease",
+              background: isActive
+                ? "linear-gradient(180deg, #fde68a, #f59e0b)"
+                : hasEnough
+                  ? "linear-gradient(180deg, #fbbf24, #f59e0b)"
+                  : "linear-gradient(180deg, #6b7280, #4b5563)",
+            }}
+          />
+        </div>
+      </div>
+      <span
+        style={{
+          fontSize: "10px",
+          color: isActive || hasEnough ? "#f59e0b" : theme.colors.text.muted,
+          fontWeight: 700,
+          fontFamily: "var(--font-mono, monospace)",
+          whiteSpace: "nowrap",
+        }}
+      >
+        {energyPercent}%
+      </span>
+      <span
+        style={{
+          fontSize: "9px",
+          color: isActive ? "#f59e0b" : theme.colors.text.muted,
+          fontWeight: 600,
+        }}
+      >
+        {isActive ? "Spec ON" : "Spec"}
+      </span>
+    </button>
+  );
+});
diff --git a/packages/client/src/game/panels/combat/StyleIcons.tsx b/packages/client/src/game/panels/combat/StyleIcons.tsx
new file mode 100644
index 000000000..675da185b
--- /dev/null
+++ b/packages/client/src/game/panels/combat/StyleIcons.tsx
@@ -0,0 +1,443 @@
+/**
+ * Combat Style SVG Icons
+ *
+ * Contains all SVG icon components used in the combat panel:
+ * - StyleIcon: Outline icons for general use
+ * - StatIcon: Compact stat icons (attack/strength/defense)
+ * - BannerStyleIcon: Filled heraldic-style icons for combat banners
+ * - SHIELD_OUTER / SHIELD_INNER: SVG paths for shield crest shapes
+ */
+
+import React from "react";
+
+/** SVG outline icons for attack styles */
+export const StyleIcon = ({
+  style,
+  size = 16,
+  color = "currentColor",
+}: {
+  style: string;
+  size?: number;
+  color?: string;
+}) => {
+  switch (style) {
+    case "accurate":
+      return (
+        <svg
+          width={size}
+          height={size}
+          viewBox="0 0 24 24"
+          fill="none"
+          stroke={color}
+          strokeWidth="2"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+        >
+          <circle cx="12" cy="12" r="10" />
+          <circle cx="12" cy="12" r="6" />
+          <circle cx="12" cy="12" r="2" />
+        </svg>
+      );
+    case "aggressive":
+      return (
+        <svg
+          width={size}
+          height={size}
+          viewBox="0 0 24 24"
+          fill="none"
+          stroke={color}
+          strokeWidth="2"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+        >
+          <path d="M14.5 4l7.5 7.5-7.5 7.5" />
+          <path d="M5.5 4l7.5 7.5-7.5 7.5" />
+        </svg>
+      );
+    case "defensive":
+      return (
+        <svg
+          width={size}
+          height={size}
+          viewBox="0 0 24 24"
+          fill="none"
+          stroke={color}
+          strokeWidth="2"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+        >
+          <path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z" />
+        </svg>
+      );
+    case "controlled":
+      return (
+        <svg
+          width={size}
+          height={size}
+          viewBox="0 0 24 24"
+          fill="none"
+          stroke={color}
+          strokeWidth="2"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+        >
+          <line x1="12" y1="2" x2="12" y2="22" />
+          <path d="M17 5H9.5a3.5 3.5 0 0 0 0 7h5a3.5 3.5 0 0 1 0 7H6" />
+        </svg>
+      );
+    case "rapid":
+      return (
+        <svg
+          width={size}
+          height={size}
+          viewBox="0 0 24 24"
+          fill="none"
+          stroke={color}
+          strokeWidth="2"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+        >
+          <polygon points="13 2 3 14 12 14 11 22 21 10 12 10 13 2" />
+        </svg>
+      );
+    case "longrange":
+      return (
+        <svg
+          width={size}
+          height={size}
+          viewBox="0 0 24 24"
+          fill="none"
+          stroke={color}
+          strokeWidth="2"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+        >
+          <path d="M21 12h-8" />
+          <path d="m3 12 4-4v8l-4-4z" />
+          <path d="M11 8h2" />
+          <path d="M11 16h2" />
+          <path d="M16 12v.01" />
+        </svg>
+      );
+    case "autocast":
+      return (
+        <svg
+          width={size}
+          height={size}
+          viewBox="0 0 24 24"
+          fill="none"
+          stroke={color}
+          strokeWidth="2"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+        >
+          <path d="m12 3-1.912 5.813a2 2 0 0 1-1.275 1.275L3 12l5.813 1.912a2 2 0 0 1 1.275 1.275L12 21l1.912-5.813a2 2 0 0 1 1.275-1.275L21 12l-5.813-1.912a2 2 0 0 1-1.275-1.275L12 3Z" />
+        </svg>
+      );
+    default:
+      return null;
+  }
+};
+
+/** Stat icons as SVG for attack/strength/defense */
+export const StatIcon = ({
+  stat,
+  size = 14,
+  color = "currentColor",
+}: {
+  stat: "attack" | "strength" | "defense";
+  size?: number;
+  color?: string;
+}) => {
+  switch (stat) {
+    case "attack":
+      return (
+        <svg
+          width={size}
+          height={size}
+          viewBox="0 0 24 24"
+          fill="none"
+          stroke={color}
+          strokeWidth="2.5"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+        >
+          <path d="m14.5 12.5-8 8a2.119 2.119 0 1 1-3-3l8-8" />
+          <path d="m16 16 6-6" />
+          <path d="m8 8 6-6" />
+          <path d="m9 7 8 8" />
+          <path d="m21 11-8-8" />
+        </svg>
+      );
+    case "strength":
+      return (
+        <svg
+          width={size}
+          height={size}
+          viewBox="0 0 24 24"
+          fill="none"
+          stroke={color}
+          strokeWidth="2.5"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+        >
+          <path d="M18.36 2.64a9 9 0 0 1 3 3" />
+          <path d="M15 6.5v11" />
+          <path d="M9 6.5v11" />
+          <path d="M4 11a9 9 0 0 1 3-3" />
+          <path d="M2.64 18.36a9 9 0 0 0 3 3" />
+          <path d="M20 13a9 9 0 0 1-3 3" />
+          <path d="M21.36 5.64a9 9 0 0 0-3 3" />
+          <path d="M4 13a9 9 0 0 0 3 3" />
+        </svg>
+      );
+    case "defense":
+      return (
+        <svg
+          width={size}
+          height={size}
+          viewBox="0 0 24 24"
+          fill="none"
+          stroke={color}
+          strokeWidth="2.5"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+        >
+          <path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z" />
+        </svg>
+      );
+  }
+};
+
+/** Filled game-style icons for combat banners -- bold, solid fills for fantasy UI */
+export const BannerStyleIcon = ({
+  style,
+  size = 24,
+  color = "currentColor",
+  muted = false,
+}: {
+  style: string;
+  size?: number;
+  color?: string;
+  muted?: boolean;
+}) => {
+  const fo = muted ? 0.25 : 0.55;
+  const so = muted ? 0.45 : 1;
+
+  switch (style) {
+    case "accurate":
+      return (
+        <svg width={size} height={size} viewBox="0 0 24 24">
+          <circle
+            cx="12"
+            cy="12"
+            r="10.5"
+            fill={color}
+            fillOpacity={fo * 0.35}
+            stroke={color}
+            strokeWidth="1.4"
+            strokeOpacity={so}
+          />
+          <circle
+            cx="12"
+            cy="12"
+            r="7"
+            fill={color}
+            fillOpacity={fo * 0.55}
+            stroke={color}
+            strokeWidth="1.1"
+            strokeOpacity={so * 0.85}
+          />
+          <circle
+            cx="12"
+            cy="12"
+            r="3.5"
+            fill={color}
+            fillOpacity={fo * 0.85}
+            stroke={color}
+            strokeWidth="0.9"
+            strokeOpacity={so * 0.9}
+          />
+          <circle
+            cx="12"
+            cy="12"
+            r="1.3"
+            fill={color}
+            fillOpacity={muted ? 0.4 : 0.95}
+          />
+        </svg>
+      );
+    case "aggressive":
+      return (
+        <svg width={size} height={size} viewBox="0 0 24 24" fill="none">
+          <path
+            d="M5 4l12 8-12 8Z"
+            fill={color}
+            fillOpacity={fo * 0.6}
+            stroke={color}
+            strokeWidth="1.8"
+            strokeLinejoin="round"
+            strokeOpacity={so}
+          />
+          <path
+            d="M11 7l8 5-8 5Z"
+            fill={color}
+            fillOpacity={fo * 0.35}
+            stroke={color}
+            strokeWidth="1.4"
+            strokeLinejoin="round"
+            strokeOpacity={so * 0.7}
+          />
+        </svg>
+      );
+    case "defensive":
+      return (
+        <svg width={size} height={size} viewBox="0 0 24 24">
+          <path
+            d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"
+            fill={color}
+            fillOpacity={fo * 0.55}
+            stroke={color}
+            strokeWidth="1.5"
+            strokeLinejoin="round"
+            strokeOpacity={so}
+          />
+          <path
+            d="M12 18.5s5.5-2.5 5.5-7V6.5L12 4.5 6.5 6.5V11.5c0 4.5 5.5 7 5.5 7z"
+            fill={color}
+            fillOpacity={fo * 0.3}
+            stroke={color}
+            strokeWidth="0.7"
+            strokeOpacity={so * 0.5}
+          />
+        </svg>
+      );
+    case "controlled":
+      return (
+        <svg width={size} height={size} viewBox="0 0 24 24" fill="none">
+          <circle
+            cx="12"
+            cy="12"
+            r="10"
+            fill={color}
+            fillOpacity={fo * 0.2}
+            stroke={color}
+            strokeWidth="1.4"
+            strokeOpacity={so}
+          />
+          <line
+            x1="12"
+            y1="3"
+            x2="12"
+            y2="21"
+            stroke={color}
+            strokeWidth="1.4"
+            strokeOpacity={so}
+          />
+          <line
+            x1="3"
+            y1="12"
+            x2="21"
+            y2="12"
+            stroke={color}
+            strokeWidth="1.4"
+            strokeOpacity={so}
+          />
+          <circle
+            cx="12"
+            cy="12"
+            r="3"
+            fill={color}
+            fillOpacity={fo * 0.6}
+            stroke={color}
+            strokeWidth="1"
+            strokeOpacity={so * 0.85}
+          />
+        </svg>
+      );
+    case "rapid":
+      return (
+        <svg width={size} height={size} viewBox="0 0 24 24">
+          <polygon
+            points="13 2 3 14 12 14 11 22 21 10 12 10 13 2"
+            fill={color}
+            fillOpacity={fo * 0.65}
+            stroke={color}
+            strokeWidth="1.4"
+            strokeLinejoin="round"
+            strokeOpacity={so}
+          />
+        </svg>
+      );
+    case "longrange":
+      return (
+        <svg width={size} height={size} viewBox="0 0 24 24" fill="none">
+          <circle
+            cx="12"
+            cy="12"
+            r="10"
+            fill={color}
+            fillOpacity={fo * 0.12}
+            stroke={color}
+            strokeWidth="1.2"
+            strokeOpacity={so * 0.5}
+          />
+          <path
+            d="m3 12 5-4v8l-5-4z"
+            fill={color}
+            fillOpacity={fo * 0.55}
+            stroke={color}
+            strokeWidth="1.2"
+            strokeOpacity={so}
+          />
+          <path
+            d="M10 12h11"
+            stroke={color}
+            strokeWidth="2"
+            strokeOpacity={so}
+            strokeLinecap="round"
+          />
+          <path
+            d="M17 8l4 4-4 4"
+            stroke={color}
+            strokeWidth="1.5"
+            strokeOpacity={so}
+            strokeLinecap="round"
+            strokeLinejoin="round"
+          />
+        </svg>
+      );
+    case "autocast":
+      return (
+        <svg width={size} height={size} viewBox="0 0 24 24">
+          <path
+            d="m12 3-1.912 5.813a2 2 0 0 1-1.275 1.275L3 12l5.813 1.912a2 2 0 0 1 1.275 1.275L12 21l1.912-5.813a2 2 0 0 1 1.275-1.275L21 12l-5.813-1.912a2 2 0 0 1-1.275-1.275L12 3Z"
+            fill={color}
+            fillOpacity={fo * 0.6}
+            stroke={color}
+            strokeWidth="1.3"
+            strokeOpacity={so}
+          />
+        </svg>
+      );
+    default:
+      return null;
+  }
+};
+
+/** Shield/crest SVG paths for combat banners */
+export const SHIELD_OUTER =
+  "M 5 0 L 95 0 Q 100 0 100 5 L 100 82 Q 100 102 50 128 Q 0 102 0 82 L 0 5 Q 0 0 5 0 Z";
+export const SHIELD_INNER =
+  "M 8 3 L 92 3 Q 97 3 97 7 L 97 80 Q 97 99 50 123 Q 3 99 3 80 L 3 7 Q 3 3 8 3 Z";
+
+/** Short XP labels for compact banner display */
+export const XP_SHORT_LABELS: Record<string, string> = {
+  Attack: "+ATK",
+  Strength: "+STR",
+  Defense: "+DEF",
+  All: "+ALL",
+  Ranged: "+RNG",
+  "Rng+Def": "+R/D",
+  Magic: "+MAG",
+};
diff --git a/packages/client/src/game/panels/combat/index.ts b/packages/client/src/game/panels/combat/index.ts
new file mode 100644
index 000000000..42a0d183a
--- /dev/null
+++ b/packages/client/src/game/panels/combat/index.ts
@@ -0,0 +1,35 @@
+/**
+ * Combat Panel Sub-Components
+ *
+ * Barrel export for all combat panel components and types.
+ */
+
+export {
+  StyleIcon,
+  StatIcon,
+  BannerStyleIcon,
+  SHIELD_OUTER,
+  SHIELD_INNER,
+  XP_SHORT_LABELS,
+} from "./StyleIcons";
+export { CombatStyleSelector } from "./CombatStyleSelector";
+export { CombatBonusesDisplay } from "./CombatBonusesDisplay";
+export { AutoRetaliateToggle } from "./AutoRetaliateToggle";
+export { SpecialAttackBar } from "./SpecialAttackBar";
+export {
+  isStyleUpdateEvent,
+  isTargetChangedEvent,
+  isTargetHealthEvent,
+  isAutoRetaliateEvent,
+} from "./typeGuards";
+export type {
+  CombatStyleInfo,
+  CombatStyleSelectorProps,
+  CombatBonusesDisplayProps,
+  SpecialAttackBarProps,
+  AutoRetaliateToggleProps,
+  StyleUpdateEvent,
+  TargetChangedEvent,
+  TargetHealthEvent,
+  AutoRetaliateEvent,
+} from "./types";
diff --git a/packages/client/src/game/panels/combat/typeGuards.ts b/packages/client/src/game/panels/combat/typeGuards.ts
new file mode 100644
index 000000000..f78708b99
--- /dev/null
+++ b/packages/client/src/game/panels/combat/typeGuards.ts
@@ -0,0 +1,49 @@
+/**
+ * Combat Panel Type Guards
+ *
+ * Runtime validation functions for combat event data.
+ */
+
+import type {
+  StyleUpdateEvent,
+  TargetChangedEvent,
+  TargetHealthEvent,
+  AutoRetaliateEvent,
+} from "./types";
+
+export function isStyleUpdateEvent(data: unknown): data is StyleUpdateEvent {
+  if (typeof data !== "object" || data === null) return false;
+  const d = data as Record<string, unknown>;
+  return (
+    typeof d.playerId === "string" &&
+    typeof d.currentStyle === "object" &&
+    d.currentStyle !== null &&
+    typeof (d.currentStyle as Record<string, unknown>).id === "string"
+  );
+}
+
+export function isTargetChangedEvent(
+  data: unknown,
+): data is TargetChangedEvent {
+  if (typeof data !== "object" || data === null) return false;
+  const d = data as Record<string, unknown>;
+  return d.targetId === null || typeof d.targetId === "string";
+}
+
+export function isTargetHealthEvent(data: unknown): data is TargetHealthEvent {
+  if (typeof data !== "object" || data === null) return false;
+  const d = data as Record<string, unknown>;
+  return (
+    typeof d.targetId === "string" &&
+    typeof d.health === "object" &&
+    d.health !== null
+  );
+}
+
+export function isAutoRetaliateEvent(
+  data: unknown,
+): data is AutoRetaliateEvent {
+  if (typeof data !== "object" || data === null) return false;
+  const d = data as Record<string, unknown>;
+  return typeof d.playerId === "string" && typeof d.enabled === "boolean";
+}
diff --git a/packages/client/src/game/panels/combat/types.ts b/packages/client/src/game/panels/combat/types.ts
new file mode 100644
index 000000000..bde33076b
--- /dev/null
+++ b/packages/client/src/game/panels/combat/types.ts
@@ -0,0 +1,81 @@
+/**
+ * Combat Panel Type Definitions
+ *
+ * Shared types used across combat sub-components.
+ */
+
+import type { Theme } from "@/ui/theme/themes";
+import type { PlayerHealth } from "../../../types";
+
+/** Individual combat style descriptor */
+export interface CombatStyleInfo {
+  id: string;
+  label: string;
+  xp: string;
+  color: string;
+}
+
+/** Props for the combat style selector section */
+export interface CombatStyleSelectorProps {
+  styles: CombatStyleInfo[];
+  activeStyleId: string;
+  cooldown: number;
+  compactPanel: boolean;
+  theme: Theme;
+  onStyleChange: (styleId: string) => void;
+}
+
+/** Props for the combat bonuses / HP + level display */
+export interface CombatBonusesDisplayProps {
+  health: PlayerHealth;
+  combatLevel: number;
+  inCombat: boolean;
+  attackLevel: number;
+  strengthLevel: number;
+  defenseLevel: number;
+  targetName: string | null;
+  targetHealth: PlayerHealth | null;
+  compactPanel: boolean;
+  ultraCompactPanel: boolean;
+  isMobile: boolean;
+  innerPadding: number;
+  theme: Theme;
+}
+
+/** Props for the special attack bar with toggle */
+export interface SpecialAttackBarProps {
+  specialEnergy: number;
+  isActive: boolean;
+  onToggle: () => void;
+  theme: Theme;
+  compactPanel: boolean;
+}
+
+/** Props for the auto-retaliate toggle */
+export interface AutoRetaliateToggleProps {
+  enabled: boolean;
+  onToggle: () => void;
+  theme: Theme;
+}
+
+/** Event data interfaces for type-safe event handling */
+export interface StyleUpdateEvent {
+  playerId: string;
+  currentStyle: { id: string };
+}
+
+export interface TargetChangedEvent {
+  targetId: string | null;
+  targetName?: string;
+  targetHealth?: PlayerHealth;
+}
+
+export interface TargetHealthEvent {
+  targetId: string;
+  health: PlayerHealth;
+}
+
+export interface AutoRetaliateEvent {
+  playerId: string;
+  enabled: boolean;
+}
diff --git a/packages/client/src/game/systems/currency/currencyUtils.ts b/packages/client/src/game/systems/currency/currencyUtils.ts
index e3bc48dfc..04a00a871 100644
--- a/packages/client/src/game/systems/currency/currencyUtils.ts
+++ b/packages/client/src/game/systems/currency/currencyUtils.ts
@@ -6,6 +6,8 @@
  * @packageDocumentation
  */
 
+import { MAX_COINS } from "@hyperscape/shared";
+
 /** Currency type identifier */
 export type CurrencyType = "gold" | "silver" | "copper" | "gems" | "tokens";
 
@@ -39,7 +41,7 @@ export const DEFAULT_CURRENCIES: Record<CurrencyType, CurrencyDefinition> = {
     backgroundColor: "#3d3224",
     icon: "coins",
     conversionRate: 1,
-    maxValue: 2147483647, // Max int32
+    maxValue: MAX_COINS, // Max int32
   },
   silver: {
     type: "silver",
@@ -49,7 +51,7 @@ export const DEFAULT_CURRENCIES: Record<CurrencyType, CurrencyDefinition> = {
     backgroundColor: "#2a2a2a",
     icon: "coins",
     conversionRate: 0.01, // 100 silver = 1 gold
-    maxValue: 2147483647,
+    maxValue: MAX_COINS,
   },
   copper: {
     type: "copper",
@@ -59,7 +61,7 @@ export const DEFAULT_CURRENCIES: Record<CurrencyType, CurrencyDefinition> = {
     backgroundColor: "#2d1a0d",
     icon: "coins",
     conversionRate: 0.0001, // 10000 copper = 1 gold
-    maxValue: 2147483647,
+    maxValue: MAX_COINS,
   },
   gems: {
     type: "gems",
@@ -322,18 +324,6 @@ export function calculateBreakdown(totalCopper: number): {
   return { gold, silver, copper };
 }
 
-/**
- * Convert breakdown back to total copper
- */
-export function toTotalCopper(breakdown: {
-  gold?: number;
-  silver?: number;
-  copper?: number;
-}): number {
-  const { gold = 0, silver = 0, copper = 0 } = breakdown;
-  return gold * 10000 + silver * 100 + copper;
-}
-
 /**
  * Format a breakdown as a display string
  */
@@ -357,6 +347,16 @@ export function formatBreakdown(breakdown: {
   return parts.join(" ");
 }
 
+/**
+ * Format gold value for OSRS-style wealth display (K/M/B suffixes).
+ * Delegates to compactNumber to avoid duplicate formatting logic.
+ */
+export function formatGoldValue(value: number): string {
+  if (value < 1000) return value.toLocaleString();
+  const { value: v, suffix } = compactNumber(value);
+  return `${v}${suffix}`;
+}
+
 /** Change indicator for value changes */
 export type ChangeIndicator = "gain" | "loss" | "neutral";
 
diff --git a/packages/client/src/game/systems/currency/index.ts b/packages/client/src/game/systems/currency/index.ts
index 9ee3292c8..bd084cfef 100644
--- a/packages/client/src/game/systems/currency/index.ts
+++ b/packages/client/src/game/systems/currency/index.ts
@@ -21,11 +21,11 @@ export {
   convertCurrency,
   validateAmount,
   calculateBreakdown,
-  toTotalCopper,
   formatBreakdown,
   getChangeIndicator,
   getChangeColor,
   formatChange,
+  formatGoldValue,
 } from "./currencyUtils";
 
 // Hooks
diff --git a/packages/client/src/game/systems/quest/index.ts b/packages/client/src/game/systems/quest/index.ts
index c64019028..0260a14de 100644
--- a/packages/client/src/game/systems/quest/index.ts
+++ b/packages/client/src/game/systems/quest/index.ts
@@ -41,13 +41,6 @@ export {
   OBJECTIVE_TYPE_CONFIG,
 } from "./questUtils";
 
-// Quest log hook
-export {
-  useQuestLog,
-  type UseQuestLogOptions,
-  type UseQuestLogResult,
-} from "./useQuestLog";
-
 // Quest tracker hook
 export {
   useQuestTracker,
diff --git a/packages/client/src/game/systems/quest/useQuestLog.ts b/packages/client/src/game/systems/quest/useQuestLog.ts
deleted file mode 100644
index 98d58d4ea..000000000
--- a/packages/client/src/game/systems/quest/useQuestLog.ts
+++ /dev/null
@@ -1,439 +0,0 @@
-/**
- * Quest Log Hook
- *
- * Hook for managing quest state including filtering, sorting,
- * and CRUD operations on quest data.
- *
- * @packageDocumentation
- */
-
-import { useState, useCallback, useMemo } from "react";
-import {
-  type Quest,
-  type QuestState,
-  type QuestCategory,
-  type QuestSortOption,
-  type SortDirection,
-  type QuestFilterOptions,
-  filterQuests,
-  sortQuests,
-  groupQuestsByCategory,
-  calculateQuestProgress,
-  areAllObjectivesComplete,
-} from "./questUtils";
-
-// ============================================================================
-// Types
-// ============================================================================
-
-/** Configuration for useQuestLog hook */
-export interface UseQuestLogOptions {
-  /** Initial quests */
-  initialQuests?: Quest[];
-  /** Default sort option */
-  defaultSort?: QuestSortOption;
-  /** Default sort direction */
-  defaultSortDirection?: SortDirection;
-  /** Default filter options */
-  defaultFilters?: QuestFilterOptions;
-  /** Callback when a quest state changes */
-  onQuestStateChange?: (quest: Quest, newState: QuestState) => void;
-  /** Callback when quest is pinned/unpinned */
-  onQuestPinChange?: (quest: Quest, pinned: boolean) => void;
-  /** Callback when objective progress changes */
-  onObjectiveProgress?: (
-    questId: string,
-    objectiveId: string,
-    current: number,
-    target: number,
-  ) => void;
-}
-
-/** Return value from useQuestLog hook */
-export interface UseQuestLogResult {
-  /** All quests (unfiltered) */
-  quests: Quest[];
-  /** Filtered and sorted quests */
-  filteredQuests: Quest[];
-  /** Quests grouped by category */
-  questsByCategory: Record<QuestCategory, Quest[]>;
-  /** Currently active quests count */
-  activeCount: number;
-  /** Total available quests count */
-  availableCount: number;
-  /** Completed quests count */
-  completedCount: number;
-
-  // State management
-  /** Add a new quest */
-  addQuest: (quest: Quest) => void;
-  /** Remove a quest by ID */
-  removeQuest: (questId: string) => void;
-  /** Update a quest */
-  updateQuest: (questId: string, updates: Partial<Quest>) => void;
-  /** Set quests (replace all) */
-  setQuests: (quests: Quest[]) => void;
-
-  // Quest actions
-  /** Accept/start a quest */
-  acceptQuest: (questId: string) => void;
-  /** Complete a quest */
-  completeQuest: (questId: string) => void;
-  /** Fail a quest */
-  failQuest: (questId: string) => void;
-  /** Toggle quest pin status */
-  togglePinQuest: (questId: string) => void;
-  /** Update objective progress */
-  updateObjectiveProgress: (
-    questId: string,
-    objectiveId: string,
-    current: number,
-  ) => void;
-
-  // Filtering
-  /** Current filter options */
-  filters: QuestFilterOptions;
-  /** Set filter options */
-  setFilters: (filters: QuestFilterOptions) => void;
-  /** Update filter options (merge) */
-  updateFilters: (filters: Partial<QuestFilterOptions>) => void;
-  /** Clear all filters */
-  clearFilters: () => void;
-  /** Search text */
-  searchText: string;
-  /** Set search text */
-  setSearchText: (text: string) => void;
-
-  // Sorting
-  /** Current sort option */
-  sortBy: QuestSortOption;
-  /** Current sort direction */
-  sortDirection: SortDirection;
-  /** Set sort option */
-  setSortBy: (option: QuestSortOption) => void;
-  /** Set sort direction */
-  setSortDirection: (direction: SortDirection) => void;
-  /** Toggle sort direction */
-  toggleSortDirection: () => void;
-
-  // Helpers
-  /** Get a quest by ID */
-  getQuest: (questId: string) => Quest | undefined;
-  /** Get progress for a quest */
-  getQuestProgress: (questId: string) => number;
-  /** Check if quest can be completed */
-  canCompleteQuest: (questId: string) => boolean;
-  /** Get pinned quests */
-  pinnedQuests: Quest[];
-}
-
-// ============================================================================
-// Hook Implementation
-// ============================================================================
-
-/**
- * Quest log management hook
- *
- * Provides complete quest management with filtering, sorting,
- * and state management capabilities.
- *
- * @example
- * ```tsx
- * function QuestLogPanel() {
- *   const {
- *     filteredQuests,
- *     searchText,
- *     setSearchText,
- *     sortBy,
- *     setSortBy,
- *     acceptQuest,
- *     completeQuest,
- *   } = useQuestLog({
- *     initialQuests: myQuests,
- *     defaultSort: 'level',
- *   });
- *
- *   return (
- *     <div>
- *       <input
- *         value={searchText}
- *         onChange={(e) => setSearchText(e.target.value)}
- *         placeholder="Search quests..."
- *       />
- *       {filteredQuests.map(quest => (
- *         <QuestEntry
- *           key={quest.id}
- *           quest={quest}
- *           onAccept={() => acceptQuest(quest.id)}
- *         />
- *       ))}
- *     </div>
- *   );
- * }
- * ```
- */
-export function useQuestLog(
-  options: UseQuestLogOptions = {},
-): UseQuestLogResult {
-  const {
-    initialQuests = [],
-    defaultSort = "category",
-    defaultSortDirection = "asc",
-    defaultFilters = {},
-    onQuestStateChange,
-    onQuestPinChange,
-    onObjectiveProgress,
-  } = options;
-
-  // Core state
-  const [quests, setQuests] = useState<Quest[]>(initialQuests);
-  const [filters, setFilters] = useState<QuestFilterOptions>(defaultFilters);
-  const [searchText, setSearchText] = useState("");
-  const [sortBy, setSortBy] = useState<QuestSortOption>(defaultSort);
-  const [sortDirection, setSortDirection] =
-    useState<SortDirection>(defaultSortDirection);
-
-  // Combined filters with search
-  const combinedFilters = useMemo(
-    (): QuestFilterOptions => ({
-      ...filters,
-      searchText: searchText || undefined,
-    }),
-    [filters, searchText],
-  );
-
-  // Filtered and sorted quests
-  const filteredQuests = useMemo(() => {
-    const filtered = filterQuests(quests, combinedFilters);
-    return sortQuests(filtered, sortBy, sortDirection);
-  }, [quests, combinedFilters, sortBy, sortDirection]);
-
-  // Grouped by category
-  const questsByCategory = useMemo(
-    () => groupQuestsByCategory(filteredQuests),
-    [filteredQuests],
-  );
-
-  // Counts
-  const activeCount = useMemo(
-    () => quests.filter((q) => q.state === "active").length,
-    [quests],
-  );
-
-  const availableCount = useMemo(
-    () => quests.filter((q) => q.state === "available").length,
-    [quests],
-  );
-
-  const completedCount = useMemo(
-    () => quests.filter((q) => q.state === "completed").length,
-    [quests],
-  );
-
-  // Pinned quests
-  const pinnedQuests = useMemo(
-    () =>
-      quests
-        .filter((q) => q.pinned && q.state === "active")
-        .sort((a, b) => {
-          // Pinned quests sorted by progress (most complete first)
-          return calculateQuestProgress(b) - calculateQuestProgress(a);
-        }),
-    [quests],
-  );
-
-  // CRUD operations
-  const addQuest = useCallback((quest: Quest) => {
-    setQuests((prev) => [...prev, quest]);
-  }, []);
-
-  const removeQuest = useCallback((questId: string) => {
-    setQuests((prev) => prev.filter((q) => q.id !== questId));
-  }, []);
-
-  const updateQuest = useCallback(
-    (questId: string, updates: Partial<Quest>) => {
-      setQuests((prev) =>
-        prev.map((q) => (q.id === questId ? { ...q, ...updates } : q)),
-      );
-    },
-    [],
-  );
-
-  // Quest state actions
-  const updateQuestState = useCallback(
-    (
-      questId: string,
-      newState: QuestState,
-      additionalUpdates?: Partial<Quest>,
-    ) => {
-      setQuests((prev) =>
-        prev.map((q) => {
-          if (q.id !== questId) return q;
-
-          const updatedQuest = {
-            ...q,
-            state: newState,
-            ...additionalUpdates,
-          };
-
-          // Trigger callback
-          onQuestStateChange?.(updatedQuest, newState);
-
-          return updatedQuest;
-        }),
-      );
-    },
-    [onQuestStateChange],
-  );
-
-  const acceptQuest = useCallback(
-    (questId: string) => {
-      updateQuestState(questId, "active", {
-        startedAt: Date.now(),
-      });
-    },
-    [updateQuestState],
-  );
-
-  const completeQuest = useCallback(
-    (questId: string) => {
-      updateQuestState(questId, "completed", {
-        completedAt: Date.now(),
-        pinned: false,
-      });
-    },
-    [updateQuestState],
-  );
-
-  const failQuest = useCallback(
-    (questId: string) => {
-      updateQuestState(questId, "failed", {
-        completedAt: Date.now(),
-        pinned: false,
-      });
-    },
-    [updateQuestState],
-  );
-
-  const togglePinQuest = useCallback(
-    (questId: string) => {
-      setQuests((prev) =>
-        prev.map((q) => {
-          if (q.id !== questId) return q;
-
-          const newPinned = !q.pinned;
-          onQuestPinChange?.(q, newPinned);
-
-          return { ...q, pinned: newPinned };
-        }),
-      );
-    },
-    [onQuestPinChange],
-  );
-
-  const updateObjectiveProgress = useCallback(
-    (questId: string, objectiveId: string, current: number) => {
-      setQuests((prev) =>
-        prev.map((q) => {
-          if (q.id !== questId) return q;
-
-          const objectives = q.objectives.map((obj) => {
-            if (obj.id !== objectiveId) return obj;
-
-            const newCurrent = Math.min(current, obj.target);
-            onObjectiveProgress?.(questId, objectiveId, newCurrent, obj.target);
-
-            return { ...obj, current: newCurrent };
-          });
-
-          return { ...q, objectives };
-        }),
-      );
-    },
-    [onObjectiveProgress],
-  );
-
-  // Filter operations
-  const updateFilters = useCallback((updates: Partial<QuestFilterOptions>) => {
-    setFilters((prev) => ({ ...prev, ...updates }));
-  }, []);
-
-  const clearFilters = useCallback(() => {
-    setFilters({});
-    setSearchText("");
-  }, []);
-
-  // Sort operations
-  const toggleSortDirection = useCallback(() => {
-    setSortDirection((prev) => (prev === "asc" ? "desc" : "asc"));
-  }, []);
-
-  // Helpers
-  const getQuest = useCallback(
-    (questId: string): Quest | undefined => {
-      return quests.find((q) => q.id === questId);
-    },
-    [quests],
-  );
-
-  const getQuestProgress = useCallback(
-    (questId: string): number => {
-      const quest = quests.find((q) => q.id === questId);
-      return quest ? calculateQuestProgress(quest) : 0;
-    },
-    [quests],
-  );
-
-  const canCompleteQuest = useCallback(
-    (questId: string): boolean => {
-      const quest = quests.find((q) => q.id === questId);
-      return quest ? areAllObjectivesComplete(quest) : false;
-    },
-    [quests],
-  );
-
-  return {
-    // Data
-    quests,
-    filteredQuests,
-    questsByCategory,
-    activeCount,
-    availableCount,
-    completedCount,
-    pinnedQuests,
-
-    // CRUD
-    addQuest,
-    removeQuest,
-    updateQuest,
-    setQuests,
-
-    // Quest actions
-    acceptQuest,
-    completeQuest,
-    failQuest,
-    togglePinQuest,
-    updateObjectiveProgress,
-
-    // Filtering
-    filters,
-    setFilters,
-    updateFilters,
-    clearFilters,
-    searchText,
-    setSearchText,
-
-    // Sorting
-    sortBy,
-    sortDirection,
-    setSortBy,
-    setSortDirection,
-    toggleSortDirection,
-
-    // Helpers
-    getQuest,
-    getQuestProgress,
-    canCompleteQuest,
-  };
-}
diff --git a/packages/client/src/game/systems/types.ts b/packages/client/src/game/systems/types.ts
index 59b1be468..b2dbe78cd 100644
--- a/packages/client/src/game/systems/types.ts
+++ b/packages/client/src/game/systems/types.ts
@@ -21,23 +21,3 @@ export interface Size {
 
 /** Rectangle combining position and size */
 export interface Rect extends Point, Size {}
-
-// ============================================================================
-// Item Types
-// ============================================================================
-
-/** Basic item data structure */
-export interface ItemData {
-  /** Unique item identifier */
-  id: string;
-  /** Display name */
-  name: string;
-  /** Item type/category */
-  type: string;
-  /** Stack quantity (1 for non-stackable) */
-  quantity?: number;
-  /** Item icon URL or identifier */
-  icon?: string;
-  /** Item description */
-  description?: string;
-}
diff --git a/packages/client/src/game/types/equipment.ts b/packages/client/src/game/types/equipment.ts
index 9ffa5a377..bea7228ba 100644
--- a/packages/client/src/game/types/equipment.ts
+++ b/packages/client/src/game/types/equipment.ts
@@ -10,7 +10,11 @@
 import type { Item } from "@hyperscape/shared";
 
 /** Raw equipment slot format from server network cache */
-export type RawEquipmentSlot = { item: Item | null; itemId?: string } | null;
+export type RawEquipmentSlot = {
+  item: Item | null;
+  itemId?: string;
+  quantity?: number;
+} | null;
 
 /** Raw equipment data structure from server network cache */
 export type RawEquipmentData = {
diff --git a/packages/client/src/game/types/events.ts b/packages/client/src/game/types/events.ts
new file mode 100644
index 000000000..a65c68906
--- /dev/null
+++ b/packages/client/src/game/types/events.ts
@@ -0,0 +1,35 @@
+/**
+ * Network Event Names
+ *
+ * Canonical event name constants for server→client network events
+ * used by UI components to subscribe to game state changes.
+ *
+ * @packageDocumentation
+ */
+
+/** Network event names for UI interactions */
+export const NetworkEvents = {
+  INVENTORY_UPDATE: "inventoryUpdate",
+  EQUIPMENT_UPDATE: "equipmentUpdate",
+  STATS_UPDATE: "statsUpdate",
+  BANK_OPEN: "bankOpen",
+  BANK_CLOSE: "bankClose",
+  STORE_OPEN: "storeOpen",
+  STORE_CLOSE: "storeClose",
+  DIALOGUE_START: "dialogueStart",
+  DIALOGUE_END: "dialogueEnd",
+  SMELTING_OPEN: "smeltingOpen",
+  SMELTING_CLOSE: "smeltingClose",
+  SMITHING_OPEN: "smithingOpen",
+  SMITHING_CLOSE: "smithingClose",
+  CRAFTING_CLOSE: "craftingClose",
+  TANNING_CLOSE: "tanningClose",
+  FLETCHING_CLOSE: "fletchingClose",
+  QUEST_START_SCREEN: "questStartScreen",
+  QUEST_COMPLETE_SCREEN: "questCompleteScreen",
+  XP_LAMP_USE: "xpLampUse",
+  DUEL_ERROR: "duelError",
+} as const;
+
+export type NetworkEventName =
+  (typeof NetworkEvents)[keyof typeof NetworkEvents];
diff --git a/packages/client/src/game/types/index.ts b/packages/client/src/game/types/index.ts
index 11b6dfece..bfa1bd213 100644
--- a/packages/client/src/game/types/index.ts
+++ b/packages/client/src/game/types/index.ts
@@ -16,3 +16,7 @@ export { EQUIPMENT_SLOT_NAMES } from "./equipment";
 
 // UI types
 export type { InventorySlotViewItem, StatusValue, PanelState } from "./ui";
+
+// Network event types
+export { NetworkEvents } from "./events";
+export type { NetworkEventName } from "./events";
diff --git a/packages/client/src/hooks/useModalPanels.ts b/packages/client/src/hooks/useModalPanels.ts
index 680f96a0b..76f14b198 100644
--- a/packages/client/src/hooks/useModalPanels.ts
+++ b/packages/client/src/hooks/useModalPanels.ts
@@ -12,16 +12,7 @@ import { EventType } from "@hyperscape/shared";
 import { useNotificationStore } from "@/ui/stores/notificationStore";
 import type { InventoryItem, TradeOfferItem } from "@hyperscape/shared";
 import type { ClientWorld } from "../types";
-
-/** Network event names for UI interactions */
-const NetworkEvents = {
-  SMELTING_CLOSE: "smeltingClose",
-  SMITHING_CLOSE: "smithingClose",
-  CRAFTING_CLOSE: "craftingClose",
-  TANNING_CLOSE: "tanningClose",
-  FLETCHING_CLOSE: "fletchingClose",
-  DUEL_ERROR: "duelError",
-} as const;
+import { NetworkEvents } from "../game/types";
 
 interface LegacyUIUpdatePayload {
   component: string;
@@ -29,6 +20,7 @@ interface LegacyUIUpdatePayload {
 }
 
 interface DuelCompletedPayload {
+  duelId?: string;
   won?: boolean;
   opponentName?: string;
   itemsReceived?: InventoryItem[];
@@ -38,6 +30,12 @@ interface DuelCompletedPayload {
   forfeit?: boolean;
 }
 
+function isDuelCompletedPayload(data: unknown): data is DuelCompletedPayload {
+  if (!data || typeof data !== "object") return false;
+  const obj = data as Record<string, unknown>;
+  return typeof obj.won === "boolean";
+}
+
 function normalizeDuelResultItems(
   items: InventoryItem[] | undefined,
 ): DuelResultData["itemsReceived"] {
@@ -810,7 +808,9 @@ function handleLegacyDuelUIUpdate(
   }
 
   if (payload.component === "duelCompleted") {
-    const completedData = payload.data as unknown as DuelCompletedPayload;
+    const rawData: unknown = payload.data;
+    if (!isDuelCompletedPayload(rawData)) return;
+    const completedData = rawData;
     setDuelData(null);
     setDuelResultData({
       visible: true,
diff --git a/packages/client/src/hyperbet.html b/packages/client/src/hyperbet.html
new file mode 100644
index 000000000..e625466bc
--- /dev/null
+++ b/packages/client/src/hyperbet.html
@@ -0,0 +1,42 @@
+<!doctype html>
+<html lang="en">
+
+<head>
+  <meta charset="utf-8" />
+  <title>HyperBet - Agent Duel Betting</title>
+  <meta name="description" content="Bet on AI agent duels in Hyperscape" />
+  <meta name="viewport"
+    content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no,viewport-fit=cover" />
+  <meta name="theme-color" content="#0b0a15" />
+
+  <meta property="og:type" content="website" />
+  <meta property="og:title" content="HyperBet - Agent Duel Betting" />
+  <meta property="og:description" content="Watch AI agents battle and bet on the winner" />
+  <meta name="twitter:card" content="summary_large_image" />
+
+  <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
+  <link rel="preload" href="/fonts/rubik.woff2" as="font" type="font/woff2" crossorigin />
+
+  <style>
+    html,
+    body,
+    #root {
+      margin: 0;
+      padding: 0;
+      width: 100%;
+      height: 100%;
+      overflow-x: hidden;
+      background-color: #0b0a15;
+      font-family: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
+      color: #e0e0e0;
+    }
+  </style>
+  <script src="/env.js"></script>
+</head>
+
+<body>
+  <div id="root"></div>
+  <script type="module" src="./hyperbet.tsx"></script>
+</body>
+
+</html>
diff --git a/packages/client/src/hyperbet.tsx b/packages/client/src/hyperbet.tsx
new file mode 100644
index 000000000..01ef33701
--- /dev/null
+++ b/packages/client/src/hyperbet.tsx
@@ -0,0 +1,23 @@
+/**
+ * HyperBet entry point — standalone betting page for Twitch/YouTube viewers.
+ * Wraps in SolanaWalletProvider only (no Privy/game auth needed).
+ */
+
+import React from "react";
+import { createRoot } from "react-dom/client";
+import { SolanaWalletProvider } from "./auth/SolanaWalletProvider";
+import { HyperBetScreen } from "./screens/HyperBetScreen";
+
+import "@solana/wallet-adapter-react-ui/styles.css";
+
+const container = document.getElementById("root");
+if (!container) throw new Error("Root element not found");
+
+const root = createRoot(container);
+root.render(
+  <React.StrictMode>
+    <SolanaWalletProvider>
+      <HyperBetScreen />
+    </SolanaWalletProvider>
+  </React.StrictMode>,
+);
diff --git a/packages/client/src/index.tsx b/packages/client/src/index.tsx
index ee634afb9..8fb1e9232 100644
--- a/packages/client/src/index.tsx
+++ b/packages/client/src/index.tsx
@@ -197,7 +197,6 @@ try {
 // Parse URL parameters for embedded configuration
 const urlParams = new URLSearchParams(window.location.search);
 const isEmbedded = urlParams.get("embedded") === "true";
-
 if (isEmbedded) {
   window.__HYPERSCAPE_EMBEDDED__ = true;
 
@@ -320,6 +319,7 @@ declare global {
     readonly PUBLIC_EMBED_ALLOWED_ORIGINS?: string;
     readonly PUBLIC_API_URL?: string;
     readonly PUBLIC_ELIZAOS_URL?: string;
+    readonly PUBLIC_STREAMING_VIEWER_ACCESS_TOKEN?: string;
   }
 }
 
@@ -731,6 +731,21 @@ const AgentMonitorScreen = React.lazy(() =>
     default: m.AgentMonitorScreen,
   })),
 );
+const DuelArenaShowcaseScreen = React.lazy(() =>
+  import("./screens/DuelArenaShowcaseScreen").then((m) => ({
+    default: m.DuelArenaShowcaseScreen,
+  })),
+);
+const DuelArenaMonitorScreen = React.lazy(() =>
+  import("./screens/DuelArenaMonitorScreen").then((m) => ({
+    default: m.DuelArenaMonitorScreen,
+  })),
+);
+const HyperBetScreen = React.lazy(() =>
+  import("./screens/HyperBetScreen").then((m) => ({
+    default: m.HyperBetScreen,
+  })),
+);
 import {
   isTauriApp,
   onDeepLink,
@@ -779,6 +794,7 @@ async function mountApp() {
   const rootElement = document.getElementById("root")!;
 
   await ensurePublicRuntimeEnv();
+  primeStreamingAccessTokenFromWindow(window);
   refreshApiConfig();
   syncRuntimeAssetBaseUrls();
 
@@ -874,6 +890,34 @@ async function mountApp() {
           </React.Suspense>
         </ErrorBoundary>,
       );
+    } else if (page === "duel-arena-showcase" || page === "duel-showcase") {
+      root.render(
+        <ErrorBoundary>
+          <MaintenanceBanner />
+          <React.Suspense fallback={<ScreenLoadingFallback />}>
+            <DuelArenaShowcaseScreen />
+          </React.Suspense>
+        </ErrorBoundary>,
+      );
+    } else if (page === "duel-monitor") {
+      root.render(
+        <ErrorBoundary>
+          <MaintenanceBanner />
+          <React.Suspense fallback={<ScreenLoadingFallback />}>
+            <DuelArenaMonitorScreen />
+          </React.Suspense>
+        </ErrorBoundary>,
+      );
+    } else if (page === "hyperbet" || page === "bet") {
+      root.render(
+        <ErrorBoundary>
+          <SolanaWalletProvider>
+            <React.Suspense fallback={<ScreenLoadingFallback />}>
+              <HyperBetScreen />
+            </React.Suspense>
+          </SolanaWalletProvider>
+        </ErrorBoundary>,
+      );
     } else {
       // Normal mode - render full app with auth
       root.render(
diff --git a/packages/client/src/lib/captureStatus.ts b/packages/client/src/lib/captureStatus.ts
new file mode 100644
index 000000000..a230986c4
--- /dev/null
+++ b/packages/client/src/lib/captureStatus.ts
@@ -0,0 +1,41 @@
+/* global MediaRecorder */
+
+import type { CaptureControlStatus } from "./streamingWindow";
+
+export function buildCaptureControlStatus(params: {
+  recorderState: MediaRecorder["state"] | null | undefined;
+  wsReadyState: number | null | undefined;
+  chunkCount: number;
+  bytesSent: number;
+  startedAt: number;
+  lastChunkAt: number;
+  wsBufferedAmount: number | null | undefined;
+  heapUsedBytes: number | null | undefined;
+  heapLimitBytes: number | null | undefined;
+}): CaptureControlStatus {
+  const nowMs = Date.now();
+  const lastChunkAt =
+    params.lastChunkAt > 0 && Number.isFinite(params.lastChunkAt)
+      ? params.lastChunkAt
+      : null;
+  const lastChunkAgeMs =
+    lastChunkAt != null ? Math.max(0, nowMs - lastChunkAt) : null;
+
+  return {
+    recording: params.recorderState === "recording",
+    wsConnected: params.wsReadyState === WebSocket.OPEN,
+    chunkCount: params.chunkCount,
+    bytesSent: params.bytesSent,
+    uptime:
+      params.startedAt > 0 && Number.isFinite(params.startedAt)
+        ? Math.max(0, nowMs - params.startedAt)
+        : 0,
+    lastChunkAt,
+    lastChunkAgeMs,
+    // Legacy field kept temporarily for mixed-version rollouts.
+    lastChunkMs: lastChunkAgeMs,
+    wsBufferedAmount: params.wsBufferedAmount ?? 0,
+    heapUsedBytes: params.heapUsedBytes ?? null,
+    heapLimitBytes: params.heapLimitBytes ?? null,
+  };
+}
diff --git a/packages/client/src/lib/embedded-entry.ts b/packages/client/src/lib/embedded-entry.ts
index e9b2110ea..36233fb58 100644
--- a/packages/client/src/lib/embedded-entry.ts
+++ b/packages/client/src/lib/embedded-entry.ts
@@ -7,7 +7,7 @@ import type {
 } from "../types/embeddedConfig";
 import type { URLParamValidation } from "../utils/InputValidator";
 
-const EMBEDDED_MODE_VALUES = ["spectator", "free"] as const;
+const EMBEDDED_MODE_VALUES = ["spectator", "stream", "free"] as const;
 const EMBEDDED_SURFACE_VALUES = ["viewport", "agent-control"] as const;
 const GRAPHICS_QUALITY_VALUES = [
   "potato",
@@ -38,7 +38,14 @@ export const embeddedParamSchema: URLParamValidation[] = [
 ];
 
 function resolveViewportMode(rawMode: unknown): ViewportMode {
-  return rawMode === "free" ? "free" : "spectator";
+  switch (rawMode) {
+    case "stream":
+      return "stream";
+    case "free":
+      return "free";
+    default:
+      return "spectator";
+  }
 }
 
 function resolveEmbeddedSurface(rawSurface: unknown): EmbeddedSurface {
@@ -57,7 +64,7 @@ function resolveGraphicsQuality(
     case "ultra":
       return rawQuality;
     default:
-      return mode === "spectator" ? "low" : "medium";
+      return mode === "spectator" || mode === "stream" ? "low" : "medium";
   }
 }
 
diff --git a/packages/client/src/lib/error-reporting.ts b/packages/client/src/lib/error-reporting.ts
index 800f41ce6..2e9a26958 100644
--- a/packages/client/src/lib/error-reporting.ts
+++ b/packages/client/src/lib/error-reporting.ts
@@ -91,6 +91,10 @@ class ErrorReportingService {
    * @private
    */
   private setupGlobalErrorHandlers() {
+    if (typeof window === "undefined" || typeof document === "undefined") {
+      return;
+    }
+
     // Store handler reference for cleanup
     this.errorHandler = (event: ErrorEvent) => {
       const errorData: ErrorReport = {
@@ -154,6 +158,10 @@ class ErrorReportingService {
    * @public
    */
   public dispose(): void {
+    if (typeof window === "undefined" || typeof document === "undefined") {
+      return;
+    }
+
     if (this.errorHandler) {
       window.removeEventListener("error", this.errorHandler);
       this.errorHandler = null;
@@ -340,8 +348,9 @@ class ErrorReportingService {
     const errorData: ErrorReport = {
       message: error.message,
       stack: error.stack!,
-      url: window.location.href,
-      userAgent: navigator.userAgent,
+      url: typeof window !== "undefined" ? window.location.href : "about:blank",
+      userAgent:
+        typeof navigator !== "undefined" ? navigator.userAgent : "unknown",
       timestamp: new Date().toISOString(),
       context: {
         type: "react-error",
@@ -379,8 +388,9 @@ class ErrorReportingService {
     const errorData: ErrorReport = {
       message: message,
       stack: error.stack!,
-      url: window.location.href,
-      userAgent: navigator.userAgent,
+      url: typeof window !== "undefined" ? window.location.href : "about:blank",
+      userAgent:
+        typeof navigator !== "undefined" ? navigator.userAgent : "unknown",
       timestamp: new Date().toISOString(),
       context: context,
       componentStack: "",
diff --git a/packages/client/src/lib/index.ts b/packages/client/src/lib/index.ts
index f8dbbf946..20e8d3ff3 100644
--- a/packages/client/src/lib/index.ts
+++ b/packages/client/src/lib/index.ts
@@ -19,13 +19,6 @@ export {
   ELIZAOS_URL,
   ELIZAOS_API,
 } from "./api-config";
-export {
-  WebSocketManager,
-  createWebSocketManager,
-  ConnectionState,
-  type WebSocketManagerConfig,
-  type WebSocketManagerCallbacks,
-} from "./websocket-manager";
 export {
   withRetry,
   tryWithRetry,
@@ -45,17 +38,6 @@ export {
   type ObjectReset,
 } from "./LRUCache";
 
-// Deprecated: Use ObjectPool instead for game patterns
-export {
-  LRUCache, // Deprecated alias for ObjectPool
-  createMonitoredCache, // Deprecated
-  cacheRegistry, // Deprecated alias for poolRegistry
-} from "./LRUCache";
-
-// Safe JSON parsing - use utils/validation.ts instead:
-// - parseJSON(text, validator) -> T | null
-// - parseJSONWithDefault(text, validator, default) -> T
-
 // Secure storage for auth tokens with expiration
 export {
   setAuthToken,
diff --git a/packages/client/src/lib/streamingAccessToken.ts b/packages/client/src/lib/streamingAccessToken.ts
index a249cd2ec..7940ce163 100644
--- a/packages/client/src/lib/streamingAccessToken.ts
+++ b/packages/client/src/lib/streamingAccessToken.ts
@@ -5,6 +5,28 @@ type StreamingAccessTokenResolution = {
 
 let cachedStreamingAccessToken: string | null | undefined;
 
+function resolveStreamingAccessTokenFromEnv(
+  targetWindow?: Window,
+): string | null {
+  const runtimeToken =
+    (
+      targetWindow as
+        | (Window & {
+            env?: { PUBLIC_STREAMING_VIEWER_ACCESS_TOKEN?: string };
+          })
+        | undefined
+    )?.env?.PUBLIC_STREAMING_VIEWER_ACCESS_TOKEN?.trim() || null;
+
+  if (runtimeToken) {
+    return runtimeToken;
+  }
+
+  const buildToken =
+    import.meta.env.PUBLIC_STREAMING_VIEWER_ACCESS_TOKEN?.trim() || null;
+
+  return buildToken || null;
+}
+
 export function resolveStreamingAccessTokenFromHref(
   href: string,
 ): StreamingAccessTokenResolution {
@@ -48,14 +70,15 @@ export function resolveStreamingAccessTokenFromHref(
 export function primeStreamingAccessTokenFromWindow(
   targetWindow: Window,
 ): string | null {
-  if (cachedStreamingAccessToken !== undefined) {
-    return cachedStreamingAccessToken;
-  }
-
   const resolved = resolveStreamingAccessTokenFromHref(
     targetWindow.location.href,
   );
-  cachedStreamingAccessToken = resolved.token;
+  const runtimeToken = resolveStreamingAccessTokenFromEnv(targetWindow);
+  const token = resolved.token ?? runtimeToken ?? cachedStreamingAccessToken ?? null;
+
+  if (token) {
+    cachedStreamingAccessToken = token;
+  }
 
   if (resolved.nextUrl) {
     targetWindow.history.replaceState(
@@ -65,11 +88,11 @@ export function primeStreamingAccessTokenFromWindow(
     );
   }
 
-  return cachedStreamingAccessToken;
+  return token;
 }
 
 export function getStreamingAccessToken(): string | null {
-  if (cachedStreamingAccessToken !== undefined) {
+  if (typeof cachedStreamingAccessToken === "string") {
     return cachedStreamingAccessToken;
   }
 
diff --git a/packages/client/src/lib/streamingReadiness.ts b/packages/client/src/lib/streamingReadiness.ts
new file mode 100644
index 000000000..ab959d3ea
--- /dev/null
+++ b/packages/client/src/lib/streamingReadiness.ts
@@ -0,0 +1,116 @@
+/**
+ * Streaming spectator readiness helpers.
+ *
+ * Shared across StreamingMode (the full-screen capture page) and
+ * EmbeddedGameClient (the embedded spectator viewport). Extracted to collapse
+ * two near-duplicate copies of the same lookup and readiness logic into a
+ * single source of truth.
+ *
+ * These helpers intentionally type the entity shape loosely (`EntityCandidate`)
+ * because the readiness-relevant fields (`avatar`, `_avatar`,
+ * `_fallbackAvatarRoot`, `mesh`) are not part of the public Entity interface.
+ */
+
+import type { Entity, World } from "@hyperscape/shared";
+
+type EntityCandidate = {
+  id?: string;
+  characterId?: string;
+  data?: { id?: string; characterId?: string };
+  avatar?: unknown;
+  _avatar?: unknown;
+  _fallbackAvatarRoot?: unknown;
+  mesh?: unknown;
+};
+
+function matchesTargetId(
+  candidate: EntityCandidate,
+  targetEntityId: string,
+): boolean {
+  return (
+    candidate.id === targetEntityId ||
+    candidate.characterId === targetEntityId ||
+    candidate.data?.id === targetEntityId ||
+    candidate.data?.characterId === targetEntityId
+  );
+}
+
+/**
+ * Resolve the entity backing a spectator camera target. Tries the world's
+ * direct id index first, then walks both the `items` and `players`
+ * collections, matching by direct map key, id, characterId, data.id, or
+ * data.characterId — covering every observed entity-id shape.
+ *
+ * The previous implementations split coverage between the two collections
+ * (StreamingMode only direct-keyed items; EmbeddedGameClient walked items
+ * fully but duplicated the players logic). This unified lookup is a strict
+ * superset: any entity previously findable remains findable, plus namespaced
+ * items-side keys and characterId aliases are now resolvable from either
+ * collection.
+ */
+export function findStreamingTargetEntity(
+  world: World,
+  targetEntityId: string,
+): Entity | null {
+  const entities = world.entities;
+  if (!entities) return null;
+
+  const direct = (entities.get?.(targetEntityId) ?? null) as Entity | null;
+  if (direct) return direct;
+
+  if (entities.items) {
+    for (const [key, item] of entities.items) {
+      if (
+        key === targetEntityId ||
+        matchesTargetId(item as EntityCandidate, targetEntityId)
+      ) {
+        return item as Entity;
+      }
+    }
+  }
+
+  if (entities.players) {
+    for (const [key, player] of entities.players) {
+      if (
+        key === targetEntityId ||
+        matchesTargetId(player as EntityCandidate, targetEntityId)
+      ) {
+        return player as Entity;
+      }
+    }
+  }
+
+  return null;
+}
+
+/**
+ * Returns true when the spectator camera target has any avatar-backing field
+ * populated — a loaded VRM avatar, a second-phase avatar handle, a fallback
+ * avatar root, or a mesh.
+ *
+ * Delegates lookup to `findStreamingTargetEntity` so both the `items` and
+ * `players` collections are inspected. Previously this check only walked
+ * `world.entities.players`, which silently masked player entities that the
+ * snapshot pipeline routed exclusively through `items` (for example combat
+ * agents arriving via a spectator snapshot whose entity-manager wiring
+ * inserts them under a namespaced key on the items map). Commit 33dab353f
+ * ("Keep stream readiness source-of-truth strict") removed the grace-expiry
+ * escape hatch that had been masking this gap, so the capture page now sits
+ * in degraded state indefinitely when the target entity is only in items.
+ */
+export function isTargetAvatarReady(
+  world: World,
+  targetEntityId: string,
+): boolean {
+  const entity = findStreamingTargetEntity(
+    world,
+    targetEntityId,
+  ) as EntityCandidate | null;
+  if (!entity) return false;
+  return Boolean(
+    entity.avatar ||
+    entity._avatar ||
+    entity._fallbackAvatarRoot ||
+    entity.mesh,
+  );
+}
diff --git a/packages/client/src/lib/streamingWindow.ts b/packages/client/src/lib/streamingWindow.ts
index bf4ad4dc2..ae6ef2ca6 100644
--- a/packages/client/src/lib/streamingWindow.ts
+++ b/packages/client/src/lib/streamingWindow.ts
@@ -1,9 +1,11 @@
 export type PublicRuntimeEnv = {
   PUBLIC_CDN_URL?: string;
+  PUBLIC_ASSETS_URL?: string;
   PUBLIC_WS_URL?: string;
   PUBLIC_API_URL?: string;
   PUBLIC_APP_URL?: string;
   PUBLIC_EMBED_ALLOWED_ORIGINS?: string;
+  PUBLIC_STREAMING_VIEWER_ACCESS_TOKEN?: string;
   PUBLIC_PRIVY_APP_ID?: string;
   PUBLIC_SOLANA_NETWORK?: string;
   PUBLIC_SOLANA_RPC_URL?: string;
@@ -17,12 +19,87 @@ export type StreamingWindowRendererHealth = {
   phase: string | null;
 };
 
+export type StreamingWindowHeartbeat = {
+  renderTick: number;
+  latestRenderTickAt: number | null;
+  duelStateTick: number;
+  latestDuelStateTickAt: number | null;
+};
+
+/**
+ * Fine-grained state of the spectator camera target entity at the time the
+ * diagnostic snapshot was written. Used by `probe-hyperscapes-stream-headless`
+ * and manual `copy(window.__HYPERSCAPE_STREAM_BOOT_DIAGNOSTICS__)` inspection
+ * to pinpoint which link in the readiness chain is failing.
+ *
+ * `null` means the probe had no world or no `cameraTarget` yet. A non-null
+ * value with `found === false` means the target was resolved but is not
+ * present in either the `items` or `players` collection — distinct from the
+ * "no target" case.
+ */
+export type StreamingTargetEntityDiagnostics = {
+  found: boolean;
+  inPlayers: boolean;
+  inItems: boolean;
+  matchedByDirectKey: boolean;
+  avatarField: boolean;
+  underscoreAvatarField: boolean;
+  fallbackAvatarField: boolean;
+  meshField: boolean;
+  avatarUrl: string | null;
+};
+
+export type StreamingWindowBootDiagnostics = {
+  updatedAt: number;
+  connected: boolean;
+  worldReady: boolean;
+  terrainReady: boolean;
+  terrainStalled: boolean;
+  terrain: {
+    systemPresent: boolean;
+    isReady: boolean | null;
+    initialized: boolean | null;
+    activeChunks: number | null;
+    pendingChunks: number | null;
+    loadedTiles: number | null;
+  };
+  arenaVisuals: {
+    systemPresent: boolean;
+    isReady: boolean | null;
+    sceneObjectPresent: boolean | null;
+    sceneObjectChildren: number | null;
+  };
+  cameraTarget: string | null;
+  cameraLocked: boolean;
+  targetEntityPresent: boolean | null;
+  needsCameraLock: boolean;
+  needsTargetAvatar: boolean;
+  targetAvatarReady: boolean;
+  targetAvatarGraceExpired: boolean;
+  phase: string | null;
+  hasStreamingState: boolean;
+  /**
+   * Fine-grained breakdown of where the camera-target entity lives and which
+   * readiness fields it exposes. Populated only when the probe has a world
+   * and a `cameraTarget`.
+   */
+  targetEntity: StreamingTargetEntityDiagnostics | null;
+  /**
+   * Cumulative count of `AVATAR_LOAD_COMPLETE` events matching the current
+   * `cameraTarget` observed during the current avatar-readiness effect run.
+   * Reset when the effect re-arms on cycle or target change.
+   */
+  avatarLoadEventsForTarget: number;
+};
+
 export type CaptureControlStatus = {
   recording?: boolean;
   wsConnected?: boolean;
   chunkCount?: number;
   bytesSent?: number;
   uptime?: number;
+  lastChunkAt?: number | null;
+  lastChunkAgeMs?: number | null;
   lastChunkMs?: number | null;
   wsBufferedAmount?: number;
   heapUsedBytes?: number | null;
@@ -32,8 +109,13 @@ export type CaptureControlStatus = {
 export type StreamingWindow = Window & {
   env?: PublicRuntimeEnv;
   __CDN_URL?: string;
+  __ASSETS_URL?: string;
+  __HYPERSCAPE_STREAM_BOOT_READY__?: boolean;
   __HYPERSCAPE_STREAM_READY__?: boolean;
   __HYPERSCAPE_STREAM_RENDERER_HEALTH__?: StreamingWindowRendererHealth | null;
+  __HYPERSCAPE_STREAM_HEARTBEAT__?: StreamingWindowHeartbeat | null;
+  __HYPERSCAPE_STREAM_BOOT_DIAGNOSTICS__?: StreamingWindowBootDiagnostics | null;
+  __HYPERSCAPE_STREAM_CAPTURE_SESSION_GENERATION__?: string | null;
   /**
    * Boot/loading phase indicator read by the capture pipeline's renderer
    * health probe. Set during the loading overlay lifecycle and cleared once
@@ -50,3 +132,41 @@ export type StreamingWindow = Window & {
   };
   __captureStatus__?: CaptureControlStatus;
 };
+
+function normalizeBaseUrl(value: string): string {
+  return value.endsWith("/") ? value.slice(0, -1) : value;
+}
+
+function isProblematicCaptureAssetHost(hostname: string): boolean {
+  return (
+    hostname === "localhost" ||
+    hostname === "127.0.0.1" ||
+    hostname === "0.0.0.0" ||
+    hostname === "::1" ||
+    hostname.endsWith(".sslip.io")
+  );
+}
+
+export function resolveCaptureAssetBase(
+  assetBaseUrl: string | undefined,
+  apiBaseUrl: string | undefined,
+  pageUrl: string,
+): string | null {
+  if (!assetBaseUrl) return null;
+
+  try {
+    const page = new URL(pageUrl);
+    const asset = new URL(assetBaseUrl, page);
+    if (
+      asset.origin !== page.origin &&
+      isProblematicCaptureAssetHost(asset.hostname) &&
+      apiBaseUrl
+    ) {
+      const api = new URL(apiBaseUrl, page);
+      return normalizeBaseUrl(new URL("/game-assets", api.origin).toString());
+    }
+    return normalizeBaseUrl(asset.toString());
+  } catch {
+    return normalizeBaseUrl(assetBaseUrl);
+  }
+}
diff --git a/packages/client/src/lib/websocket-manager.ts b/packages/client/src/lib/websocket-manager.ts
deleted file mode 100644
index 681d3f2c0..000000000
--- a/packages/client/src/lib/websocket-manager.ts
+++ /dev/null
@@ -1,435 +0,0 @@
-/**
- * WebSocket Manager with Exponential Backoff Reconnection
- *
- * Provides a robust WebSocket wrapper with:
- * - Automatic reconnection with exponential backoff
- * - Connection state tracking
- * - Event queuing during reconnection
- * - Max retry limit with user notification
- *
- * @remarks
- * Note: CharacterSelectScreen uses custom binary packet handling (readPacket/writePacket)
- * and requires careful integration. GameClient and EmbeddedGameClient use Hyperscape's
- * internal world.init() which manages its own networking layer.
- *
- * This manager is available for:
- * - Future reconnection improvements to character selection
- * - Custom WebSocket connections outside of Hyperscape core
- * - Agent/dashboard WebSocket connections
- *
- * @packageDocumentation
- */
-
-/** Connection state enum */
-export enum ConnectionState {
-  DISCONNECTED = "disconnected",
-  CONNECTING = "connecting",
-  CONNECTED = "connected",
-  RECONNECTING = "reconnecting",
-}
-
-/** WebSocket manager configuration */
-export interface WebSocketManagerConfig {
-  /** Base URL for WebSocket connection */
-  url: string;
-  /** Initial retry delay in milliseconds (default: 1000) */
-  initialRetryDelay?: number;
-  /** Maximum retry delay in milliseconds (default: 30000) */
-  maxRetryDelay?: number;
-  /** Maximum number of retry attempts (default: 10) */
-  maxRetries?: number;
-  /** Backoff multiplier (default: 2) */
-  backoffMultiplier?: number;
-  /** Protocols to use for WebSocket connection */
-  protocols?: string | string[];
-}
-
-/** Event callbacks for WebSocket manager */
-export interface WebSocketManagerCallbacks {
-  /** Called when connection is established */
-  onConnected?: () => void;
-  /** Called when connection is lost */
-  onDisconnected?: (event: CloseEvent) => void;
-  /** Called when reconnecting */
-  onReconnecting?: (attempt: number, nextDelay: number) => void;
-  /** Called when max retries exceeded */
-  onMaxRetriesExceeded?: () => void;
-  /** Called when a message is received */
-  onMessage?: (event: MessageEvent) => void;
-  /** Called on error */
-  onError?: (event: Event) => void;
-}
-
-/**
- * WebSocket Manager class
- *
- * Manages WebSocket connections with automatic reconnection using exponential backoff.
- *
- * @example
- * ```typescript
- * const manager = new WebSocketManager({
- *   url: 'wss://example.com/socket',
- *   maxRetries: 10,
- * });
- *
- * manager.setCallbacks({
- *   onConnected: () => console.log('Connected!'),
- *   onReconnecting: (attempt, delay) => console.log(`Retrying in ${delay}ms...`),
- * });
- *
- * manager.connect();
- * ```
- */
-export class WebSocketManager {
-  private ws: WebSocket | null = null;
-  private config: Required<Omit<WebSocketManagerConfig, "protocols">> & {
-    protocols?: string | string[];
-  };
-  private callbacks: WebSocketManagerCallbacks = {};
-  private state: ConnectionState = ConnectionState.DISCONNECTED;
-  private retryCount = 0;
-  private retryTimeoutId: ReturnType<typeof setTimeout> | null = null;
-  private messageQueue: Array<string | ArrayBuffer | Blob> = [];
-  private intentionallyClosed = false;
-
-  /** Heartbeat interval handle */
-  private heartbeatInterval: ReturnType<typeof setInterval> | null = null;
-  /** Heartbeat timeout for pong response */
-  private heartbeatTimeout: ReturnType<typeof setTimeout> | null = null;
-  /** Heartbeat interval in milliseconds */
-  private readonly HEARTBEAT_INTERVAL = 30000;
-  /** Heartbeat timeout in milliseconds */
-  private readonly HEARTBEAT_TIMEOUT = 10000;
-  /** Last ping timestamp */
-  private lastPingTime = 0;
-  /** Last pong received timestamp */
-  private lastPongTime = 0;
-
-  constructor(config: WebSocketManagerConfig) {
-    this.config = {
-      url: config.url,
-      initialRetryDelay: config.initialRetryDelay ?? 1000,
-      maxRetryDelay: config.maxRetryDelay ?? 30000,
-      maxRetries: config.maxRetries ?? 10,
-      backoffMultiplier: config.backoffMultiplier ?? 2,
-      protocols: config.protocols,
-    };
-  }
-
-  /**
-   * Set callback functions for WebSocket events
-   */
-  setCallbacks(callbacks: WebSocketManagerCallbacks): void {
-    this.callbacks = { ...this.callbacks, ...callbacks };
-  }
-
-  /**
-   * Get current connection state
-   */
-  getState(): ConnectionState {
-    return this.state;
-  }
-
-  /**
-   * Get current retry count
-   */
-  getRetryCount(): number {
-    return this.retryCount;
-  }
-
-  /**
-   * Check if WebSocket is connected and ready
-   */
-  isConnected(): boolean {
-    return (
-      this.state === ConnectionState.CONNECTED &&
-      this.ws?.readyState === WebSocket.OPEN
-    );
-  }
-
-  /**
-   * Update the connection URL (for reconnection with new auth tokens)
-   */
-  updateUrl(url: string): void {
-    this.config.url = url;
-  }
-
-  /**
-   * Connect to the WebSocket server
-   */
-  connect(): void {
-    if (
-      this.state === ConnectionState.CONNECTING ||
-      this.state === ConnectionState.CONNECTED
-    ) {
-      return;
-    }
-
-    this.intentionallyClosed = false;
-    this.setState(ConnectionState.CONNECTING);
-    this.createConnection();
-  }
-
-  /**
-   * Disconnect from the WebSocket server
-   */
-  disconnect(): void {
-    this.intentionallyClosed = true;
-    this.clearRetryTimeout();
-    this.stopHeartbeat();
-    this.retryCount = 0;
-    this.messageQueue = [];
-
-    if (this.ws) {
-      this.ws.close(1000, "Client disconnected");
-      this.ws = null;
-    }
-
-    this.setState(ConnectionState.DISCONNECTED);
-  }
-
-  /**
-   * Send a message through the WebSocket
-   * If not connected, the message will be queued and sent when connection is established
-   */
-  send(data: string | ArrayBuffer | Blob): boolean {
-    if (this.isConnected()) {
-      this.ws!.send(data);
-      return true;
-    }
-
-    // Queue message for later delivery
-    this.messageQueue.push(data);
-    return false;
-  }
-
-  /**
-   * Get the underlying WebSocket instance (use with caution)
-   */
-  getWebSocket(): WebSocket | null {
-    return this.ws;
-  }
-
-  private createConnection(): void {
-    try {
-      this.ws = this.config.protocols
-        ? new WebSocket(this.config.url, this.config.protocols)
-        : new WebSocket(this.config.url);
-
-      this.ws.onopen = this.handleOpen.bind(this);
-      this.ws.onclose = this.handleClose.bind(this);
-      this.ws.onerror = this.handleError.bind(this);
-      this.ws.onmessage = this.handleMessage.bind(this);
-    } catch (error) {
-      console.error("[WebSocketManager] Failed to create WebSocket:", error);
-      this.scheduleReconnect();
-    }
-  }
-
-  private handleOpen(): void {
-    this.setState(ConnectionState.CONNECTED);
-    this.retryCount = 0;
-
-    // Start heartbeat
-    this.startHeartbeat();
-
-    // Flush queued messages
-    while (this.messageQueue.length > 0) {
-      const message = this.messageQueue.shift()!;
-      this.ws!.send(message);
-    }
-
-    this.callbacks.onConnected?.();
-  }
-
-  private handleClose(event: CloseEvent): void {
-    this.ws = null;
-    this.stopHeartbeat();
-
-    // Don't reconnect if intentionally closed or server sent normal close
-    if (this.intentionallyClosed) {
-      this.setState(ConnectionState.DISCONNECTED);
-      return;
-    }
-
-    this.callbacks.onDisconnected?.(event);
-
-    // Attempt reconnection
-    this.scheduleReconnect();
-  }
-
-  private handleError(event: Event): void {
-    console.error("[WebSocketManager] WebSocket error:", event);
-    this.callbacks.onError?.(event);
-  }
-
-  private handleMessage(event: MessageEvent): void {
-    // Check for pong response
-    if (typeof event.data === "string") {
-      try {
-        const data = JSON.parse(event.data);
-        if (data.type === "pong") {
-          this.handlePong();
-          return;
-        }
-      } catch {
-        // Not a JSON message, pass through
-      }
-    }
-
-    this.callbacks.onMessage?.(event);
-  }
-
-  /**
-   * Starts the heartbeat ping/pong mechanism
-   */
-  private startHeartbeat(): void {
-    this.stopHeartbeat();
-
-    this.heartbeatInterval = setInterval(() => {
-      if (this.isConnected()) {
-        this.sendPing();
-      }
-    }, this.HEARTBEAT_INTERVAL);
-  }
-
-  /**
-   * Stops the heartbeat mechanism
-   */
-  private stopHeartbeat(): void {
-    if (this.heartbeatInterval) {
-      clearInterval(this.heartbeatInterval);
-      this.heartbeatInterval = null;
-    }
-    if (this.heartbeatTimeout) {
-      clearTimeout(this.heartbeatTimeout);
-      this.heartbeatTimeout = null;
-    }
-  }
-
-  /**
-   * Sends a ping message to the server
-   */
-  private sendPing(): void {
-    if (!this.isConnected()) return;
-
-    this.lastPingTime = Date.now();
-    this.send(JSON.stringify({ type: "ping", timestamp: this.lastPingTime }));
-
-    // Set timeout for pong response
-    this.heartbeatTimeout = setTimeout(() => {
-      console.warn("[WebSocketManager] Heartbeat timeout - no pong received");
-      // Connection may be stale, force reconnect
-      if (this.ws) {
-        this.ws.close(4000, "Heartbeat timeout");
-      }
-    }, this.HEARTBEAT_TIMEOUT);
-  }
-
-  /**
-   * Handles a pong response from the server
-   */
-  private handlePong(): void {
-    this.lastPongTime = Date.now();
-
-    if (this.heartbeatTimeout) {
-      clearTimeout(this.heartbeatTimeout);
-      this.heartbeatTimeout = null;
-    }
-  }
-
-  /**
-   * Gets the current connection latency (ping-pong round trip time)
-   */
-  getLatency(): number {
-    if (this.lastPingTime === 0 || this.lastPongTime === 0) return 0;
-    return this.lastPongTime - this.lastPingTime;
-  }
-
-  private scheduleReconnect(): void {
-    if (this.intentionallyClosed) {
-      return;
-    }
-
-    if (this.retryCount >= this.config.maxRetries) {
-      this.setState(ConnectionState.DISCONNECTED);
-      this.callbacks.onMaxRetriesExceeded?.();
-      return;
-    }
-
-    this.setState(ConnectionState.RECONNECTING);
-
-    // Calculate delay with exponential backoff
-    const delay = Math.min(
-      this.config.initialRetryDelay *
-        Math.pow(this.config.backoffMultiplier, this.retryCount),
-      this.config.maxRetryDelay,
-    );
-
-    this.retryCount++;
-
-    this.callbacks.onReconnecting?.(this.retryCount, delay);
-
-    this.retryTimeoutId = setTimeout(() => {
-      this.createConnection();
-    }, delay);
-  }
-
-  private clearRetryTimeout(): void {
-    if (this.retryTimeoutId !== null) {
-      clearTimeout(this.retryTimeoutId);
-      this.retryTimeoutId = null;
-    }
-  }
-
-  private setState(state: ConnectionState): void {
-    this.state = state;
-  }
-
-  /**
-   * Force a reconnection attempt (resets retry count)
-   */
-  forceReconnect(): void {
-    this.clearRetryTimeout();
-    this.retryCount = 0;
-    this.intentionallyClosed = false;
-
-    if (this.ws) {
-      this.ws.close();
-      this.ws = null;
-    }
-
-    this.connect();
-  }
-}
-
-/**
- * React hook for using WebSocket manager state
- *
- * @example
- * ```typescript
- * function MyComponent() {
- *   const [state, setState] = useState(ConnectionState.DISCONNECTED);
- *   const [retryInfo, setRetryInfo] = useState({ attempt: 0, delay: 0 });
- *
- *   useEffect(() => {
- *     const manager = new WebSocketManager({ url: 'wss://...' });
- *     manager.setCallbacks({
- *       onConnected: () => setState(ConnectionState.CONNECTED),
- *       onDisconnected: () => setState(ConnectionState.DISCONNECTED),
- *       onReconnecting: (attempt, delay) => {
- *         setState(ConnectionState.RECONNECTING);
- *         setRetryInfo({ attempt, delay });
- *       },
- *     });
- *     manager.connect();
- *     return () => manager.disconnect();
- *   }, []);
- * }
- * ```
- */
-export function createWebSocketManager(
-  config: WebSocketManagerConfig,
-): WebSocketManager {
-  return new WebSocketManager(config);
-}
diff --git a/packages/client/src/screens/AgentMonitorScreen.tsx b/packages/client/src/screens/AgentMonitorScreen.tsx
index f11ec5a45..c8030d734 100644
--- a/packages/client/src/screens/AgentMonitorScreen.tsx
+++ b/packages/client/src/screens/AgentMonitorScreen.tsx
@@ -7,6 +7,7 @@
 
 import { GAME_API_URL } from "@/lib/api-config";
 import React, { useEffect, useState, useCallback, useRef } from "react";
+import { getHpPercent, getHpColor, getXPForLevel } from "@hyperscape/shared";
 import {
   Swords,
   RefreshCw,
@@ -219,27 +220,6 @@ type DetailTab =
   | "actions"
   | "pipeline";
 
-// ─── XP Table ───────────────────────────────────────────────────────────────
-
-const XP_TABLE = [
-  0, 83, 174, 276, 388, 512, 650, 801, 969, 1154, 1358, 1584, 1833, 2107, 2411,
-  2746, 3115, 3523, 3973, 4470, 5018, 5624, 6291, 7028, 7842, 8740, 9730, 10824,
-  12031, 13363, 14833, 16456, 18247, 20224, 22406, 24815, 27473, 30408, 33648,
-  37224, 41171, 45529, 50339, 55649, 61512, 67983, 75127, 83014, 91721, 101333,
-  111945, 123660, 136594, 150872, 166636, 184040, 203254, 224466, 247886,
-  273742, 302288, 333804, 368599, 407015, 449428, 496254, 547953, 605032,
-  668051, 737627, 814445, 899257, 992895, 1096278, 1210421, 1336443, 1475581,
-  1629200, 1798808, 1986068, 2192818, 2421087, 2673114, 2951373, 3258594,
-  3597792, 3972294, 4385776, 4842295, 5346332, 5902831, 6517253, 7195629,
-  7944614, 8771558, 9684577, 10692629, 11805606, 13034431,
-];
-
-function xpForLevel(level: number): number {
-  if (level <= 1) return 0;
-  if (level > 99) return XP_TABLE[98] ?? 13034431;
-  return XP_TABLE[level - 1] ?? 0;
-}
-
 // ─── Helpers ────────────────────────────────────────────────────────────────
 
 function formatDuration(ms: number): string {
@@ -269,15 +249,10 @@ function formatTime(timestamp: number): string {
   });
 }
 
-function hpColor(ratio: number): string {
-  if (ratio > 0.6) return "#22c55e";
-  if (ratio > 0.3) return "#eab308";
-  return "#ef4444";
-}
-
 function hpClass(ratio: number): string {
-  if (ratio > 0.6) return "high";
-  if (ratio > 0.3) return "mid";
+  const color = getHpColor(ratio * 100);
+  if (color === "#22c55e") return "high";
+  if (color === "#eab308") return "mid";
   return "low";
 }
 
@@ -669,7 +644,10 @@ function OverviewTab({ agent }: { agent: AgentData }) {
         <div className="hp-bar-track">
           <div
             className="hp-bar-fill"
-            style={{ width: `${hpRatio * 100}%`, background: hpColor(hpRatio) }}
+            style={{
+              width: `${hpRatio * 100}%`,
+              background: getHpColor(hpRatio * 100),
+            }}
           />
         </div>
         <div className="hp-bar-label">
@@ -857,8 +835,8 @@ function SkillsTab({ agent }: { agent: AgentData }) {
   return (
     <div className="skills-grid">
       {skillEntries.map(([name, skill]) => {
-        const currentLevelXp = xpForLevel(skill.level);
-        const nextLevelXp = xpForLevel(skill.level + 1);
+        const currentLevelXp = getXPForLevel(skill.level);
+        const nextLevelXp = getXPForLevel(skill.level + 1);
         const xpRange = nextLevelXp - currentLevelXp;
         const xpProgress =
           xpRange > 0 ? (skill.xp - currentLevelXp) / xpRange : 1;
@@ -1800,8 +1778,8 @@ function PipelineNodeBody({ data }: { data: PipelineNodeData }) {
 
   switch (nodeType) {
     case "survival": {
-      const pct = data.maxHealth > 0 ? (data.health / data.maxHealth) * 100 : 0;
-      const color = pct < 25 ? "#ef4444" : pct < 50 ? "#eab308" : "#22c55e";
+      const pct = getHpPercent(data.health, data.maxHealth);
+      const color = getHpColor(pct);
       return (
         <div className="pn-survival">
           <div className="pn-hp-track">
diff --git a/packages/client/src/screens/DuelArenaMonitorScreen.tsx b/packages/client/src/screens/DuelArenaMonitorScreen.tsx
new file mode 100644
index 000000000..1ddd8f510
--- /dev/null
+++ b/packages/client/src/screens/DuelArenaMonitorScreen.tsx
@@ -0,0 +1,1360 @@
+/**
+ * DuelArenaMonitorScreen - Live duel arena monitoring and sparbot management
+ *
+ * Access: ?page=duel-monitor (requires admin code)
+ */
+
+import { GAME_API_URL } from "@/lib/api-config";
+import React, { useEffect, useState, useCallback, useRef } from "react";
+import type {
+  StreamingState,
+  AgentInfo,
+  LeaderboardEntry,
+} from "./StreamingMode";
+
+// ─── Constants ────────────────────────────────────────────────────────────────
+
+const ADMIN_CODE_KEY = "hyperscape_admin_code";
+const STREAM_POLL_MS = 2000;
+const SPARBOTS_POLL_MS = 8000;
+const DUELS_POLL_MS = 10000;
+
+type CombatStyle = "melee" | "ranged" | "mage" | "prayer";
+type SparbotTier = "novice" | "adept" | "expert";
+
+interface StandaloneBot {
+  characterId: string;
+  name: string;
+  style: string;
+  tier: string;
+}
+
+interface RecentDuel {
+  cycleId: string;
+  duelId: string | null;
+  finishedAt: number;
+  winnerId: string;
+  winnerName: string;
+  loserId: string;
+  loserName: string;
+  winReason: string;
+  damageWinner: number;
+  damageLoser: number;
+}
+
+interface DuelStatus {
+  currentCycle: {
+    phase: string;
+    contestants: Array<{
+      characterId: string;
+      name: string;
+      combatLevel: number;
+      currentHp: number;
+      maxHp: number;
+    }>;
+    startedAt: number;
+    phaseStartedAt: number;
+    winner: { characterId: string; name: string } | null;
+    winReason: string | null;
+  } | null;
+  leaderboard: LeaderboardEntry[];
+  recentDuels: RecentDuel[];
+}
+
+// ─── Style helpers ────────────────────────────────────────────────────────────
+
+const styleColor = (s: string): string =>
+  ({ melee: "#e06c6c", ranged: "#6cce6c", mage: "#6caae0", prayer: "#d4a84b" })[
+    s
+  ] ?? "#94a3b8";
+
+const tierColor = (t: string): string =>
+  ({ novice: "#64748b", adept: "#6caae0", expert: "#f2d08a" })[t] ?? "#94a3b8";
+
+const phaseColor = (p: string): string =>
+  ({
+    FIGHTING: "#e06c6c",
+    COUNTDOWN: "#f2d08a",
+    ANNOUNCEMENT: "#6caae0",
+    RESOLUTION: "#9b86d4",
+    IDLE: "#334155",
+  })[p] ?? "#94a3b8";
+
+const WIN_REASON_LABELS: Record<string, string> = {
+  kill: "Knockout",
+  hp_advantage: "HP Advantage",
+  damage_advantage: "Damage Advantage",
+  draw: "Draw",
+};
+
+function fmtAge(ms: number): string {
+  const s = Math.floor((Date.now() - ms) / 1000);
+  if (s < 60) return `${s}s ago`;
+  const m = Math.floor(s / 60);
+  if (m < 60) return `${m}m ago`;
+  return `${Math.floor(m / 60)}h ago`;
+}
+
+function winRate(wins: number, losses: number): string {
+  const t = wins + losses;
+  return t === 0 ? "—" : `${Math.round((wins / t) * 100)}%`;
+}
+
+// ─── Sub-components ───────────────────────────────────────────────────────────
+
+function HpBar({ hp, maxHp }: { hp: number; maxHp: number }) {
+  const pct = maxHp > 0 ? Math.max(0, Math.min(100, (hp / maxHp) * 100)) : 0;
+  const color = pct > 50 ? "#4ade80" : pct > 25 ? "#facc15" : "#f87171";
+  return (
+    <div
+      style={{
+        width: "100%",
+        height: 7,
+        background: "#0f172a",
+        borderRadius: 3,
+        overflow: "hidden",
+      }}
+    >
+      <div
+        style={{
+          width: `${pct}%`,
+          height: "100%",
+          background: color,
+          borderRadius: 3,
+          transition: "width 0.4s ease",
+        }}
+      />
+    </div>
+  );
+}
+
+function PhaseBar({
+  phase,
+  phaseStartTime,
+  phaseEndTime,
+}: {
+  phase: string;
+  phaseStartTime: number;
+  phaseEndTime: number;
+}) {
+  const [pct, setPct] = useState(0);
+  useEffect(() => {
+    const tick = () => {
+      const now = Date.now();
+      const total = phaseEndTime - phaseStartTime;
+      if (total <= 0) {
+        setPct(100);
+        return;
+      }
+      setPct(
+        Math.max(0, Math.min(100, ((now - phaseStartTime) / total) * 100)),
+      );
+    };
+    tick();
+    const id = setInterval(tick, 500);
+    return () => clearInterval(id);
+  }, [phaseStartTime, phaseEndTime]);
+
+  return (
+    <div
+      style={{
+        width: "100%",
+        height: 4,
+        background: "#0f172a",
+        borderRadius: 2,
+        overflow: "hidden",
+      }}
+    >
+      <div
+        style={{
+          width: `${pct}%`,
+          height: "100%",
+          background: phaseColor(phase),
+          transition: "width 0.5s linear",
+        }}
+      />
+    </div>
+  );
+}
+
+function FighterCard({
+  agent,
+  isWinner,
+  isLoser,
+}: {
+  agent: AgentInfo;
+  isWinner?: boolean;
+  isLoser?: boolean;
+}) {
+  return (
+    <div
+      style={{
+        flex: 1,
+        background: "#0a0f16",
+        border: `1px solid ${isWinner ? "#f2d08a55" : "rgba(255,255,255,0.06)"}`,
+        borderRadius: 6,
+        padding: "10px 12px",
+        opacity: isLoser ? 0.55 : 1,
+      }}
+    >
+      <div
+        style={{
+          display: "flex",
+          justifyContent: "space-between",
+          alignItems: "baseline",
+          marginBottom: 4,
+        }}
+      >
+        <div
+          style={{
+            fontFamily: "Impact, sans-serif",
+            fontSize: "0.9rem",
+            textTransform: "uppercase",
+            letterSpacing: "0.04em",
+            color: isWinner ? "#f2d08a" : "#e2e8f0",
+          }}
+        >
+          {isWinner && "♛ "}
+          {agent.name}
+        </div>
+        <div
+          style={{
+            fontSize: "0.85rem",
+            fontWeight: 700,
+            color: "#e2e8f0",
+            fontVariantNumeric: "tabular-nums",
+          }}
+        >
+          {agent.hp}
+          <span style={{ fontSize: "0.6rem", color: "#475569" }}>
+            /{agent.maxHp}
+          </span>
+        </div>
+      </div>
+      <HpBar hp={agent.hp} maxHp={agent.maxHp} />
+      <div
+        style={{
+          display: "grid",
+          gridTemplateColumns: "1fr 1fr",
+          gap: "3px 8px",
+          marginTop: 7,
+        }}
+      >
+        {(
+          [
+            ["DMG", agent.damageDealtThisFight],
+            ["BEST", agent.highestHit],
+            ["HITS", agent.attacksLanded],
+            ["HEALS", agent.healsUsed],
+          ] as [string, number][]
+        ).map(([l, v]) => (
+          <div
+            key={l}
+            style={{ display: "flex", justifyContent: "space-between" }}
+          >
+            <span
+              style={{
+                fontSize: "0.58rem",
+                color: "#475569",
+                letterSpacing: "0.06em",
+              }}
+            >
+              {l}
+            </span>
+            <span
+              style={{
+                fontSize: "0.72rem",
+                fontWeight: 600,
+                color: "#94a3b8",
+                fontVariantNumeric: "tabular-nums",
+              }}
+            >
+              {v}
+            </span>
+          </div>
+        ))}
+      </div>
+      <div style={{ marginTop: 5, fontSize: "0.58rem", color: "#334155" }}>
+        Lv{agent.combatLevel} · {agent.wins}W {agent.losses}L
+      </div>
+    </div>
+  );
+}
+
+function RecentDuelRow({ d }: { d: RecentDuel }) {
+  return (
+    <div
+      style={{
+        display: "flex",
+        alignItems: "center",
+        gap: 8,
+        padding: "5px 0",
+        borderBottom: "1px solid rgba(255,255,255,0.03)",
+        fontSize: "0.7rem",
+      }}
+    >
+      <div style={{ flex: 1, minWidth: 0 }}>
+        <span style={{ color: "#4ade80", fontWeight: 600 }}>
+          {d.winnerName}
+        </span>
+        <span style={{ color: "#475569" }}> def. </span>
+        <span style={{ color: "#94a3b8" }}>{d.loserName}</span>
+      </div>
+      <div
+        style={{ whiteSpace: "nowrap", color: "#64748b", fontSize: "0.62rem" }}
+      >
+        {WIN_REASON_LABELS[d.winReason] ?? d.winReason}
+      </div>
+      <div
+        style={{
+          whiteSpace: "nowrap",
+          color: "#334155",
+          fontSize: "0.58rem",
+          minWidth: 44,
+          textAlign: "right",
+        }}
+      >
+        {fmtAge(d.finishedAt)}
+      </div>
+    </div>
+  );
+}
+
+// ─── Main Screen ──────────────────────────────────────────────────────────────
+
+export function DuelArenaMonitorScreen() {
+  // Auth
+  const [adminCode, setAdminCode] = useState(
+    localStorage.getItem(ADMIN_CODE_KEY) ?? "",
+  );
+  const adminCodeRef = useRef(adminCode);
+  adminCodeRef.current = adminCode;
+  const [isAuthed, setIsAuthed] = useState(false);
+  const [checkingStored, setCheckingStored] = useState(true);
+  const [authLoading, setAuthLoading] = useState(false);
+  const [authError, setAuthError] = useState<string | null>(null);
+
+  // Streaming state (public)
+  const [streamState, setStreamState] = useState<StreamingState | null>(null);
+  const [streamError, setStreamError] = useState<string | null>(null);
+  const [lastStreamAt, setLastStreamAt] = useState(0);
+
+  // Duel status (admin)
+  const [duelStatus, setDuelStatus] = useState<DuelStatus | null>(null);
+
+  // Sparbots
+  const [sparbots, setSparbots] = useState<StandaloneBot[]>([]);
+  const [spawnStyle, setSpawnStyle] = useState<CombatStyle>("melee");
+  const [spawnTier, setSpawnTier] = useState<SparbotTier>("adept");
+  const [spawnCount, setSpawnCount] = useState(2);
+  const [spawnLoading, setSpawnLoading] = useState(false);
+  const [spawnError, setSpawnError] = useState<string | null>(null);
+  const [spawnSuccess, setSpawnSuccess] = useState<string | null>(null);
+  const [removingId, setRemovingId] = useState<string | null>(null);
+  const [fillLoading, setFillLoading] = useState(false);
+
+  // Admin fetch
+  const adminFetch = useCallback(
+    async (path: string, options?: RequestInit): Promise<unknown> => {
+      const res = await fetch(`${GAME_API_URL}${path}`, {
+        ...options,
+        headers: {
+          "x-admin-code": adminCodeRef.current,
+          "Content-Type": "application/json",
+          ...((options?.headers as Record<string, string>) || {}),
+        },
+      });
+      if (res.status === 403) throw new Error("Unauthorized");
+      if (!res.ok) throw new Error(`HTTP ${res.status}`);
+      return res.json();
+    },
+    [],
+  );
+
+  const tryAuth = useCallback(
+    async (code: string): Promise<boolean> => {
+      adminCodeRef.current = code;
+      try {
+        await adminFetch("/admin/stats");
+        return true;
+      } catch {
+        return false;
+      }
+    },
+    [adminFetch],
+  );
+
+  // Check stored code on mount
+  useEffect(() => {
+    const stored = localStorage.getItem(ADMIN_CODE_KEY);
+    if (!stored) {
+      setCheckingStored(false);
+      return;
+    }
+    let cancelled = false;
+    tryAuth(stored).then((ok) => {
+      if (cancelled) return;
+      if (ok) {
+        setIsAuthed(true);
+        setAdminCode(stored);
+      } else localStorage.removeItem(ADMIN_CODE_KEY);
+      setCheckingStored(false);
+    });
+    return () => {
+      cancelled = true;
+    };
+  }, [tryAuth]);
+
+  const handleLogin = useCallback(async () => {
+    const code = adminCodeRef.current;
+    if (!code) return;
+    setAuthLoading(true);
+    setAuthError(null);
+    const ok = await tryAuth(code);
+    if (ok) {
+      setIsAuthed(true);
+      localStorage.setItem(ADMIN_CODE_KEY, code);
+    } else setAuthError("Invalid code or server unreachable");
+    setAuthLoading(false);
+  }, [tryAuth]);
+
+  // Poll streaming state (no auth)
+  useEffect(() => {
+    let mounted = true;
+    const poll = async () => {
+      if (!mounted) return;
+      try {
+        const res = await fetch(`${GAME_API_URL}/api/streaming/state`);
+        if (!res.ok) {
+          setStreamError(`HTTP ${res.status}`);
+          return;
+        }
+        const data = (await res.json()) as StreamingState | null;
+        if (!mounted) return;
+        if (data?.type === "STREAMING_STATE_UPDATE") {
+          setStreamState(data);
+          setStreamError(null);
+          setLastStreamAt(Date.now());
+        }
+      } catch (e) {
+        if (mounted)
+          setStreamError(e instanceof Error ? e.message : "unreachable");
+      }
+    };
+    poll();
+    const id = setInterval(poll, STREAM_POLL_MS);
+    return () => {
+      mounted = false;
+      clearInterval(id);
+    };
+  }, []);
+
+  // Poll duel status + sparbots (admin)
+  const fetchDuelStatus = useCallback(async () => {
+    try {
+      const data = (await adminFetch("/admin/duels/status")) as DuelStatus;
+      setDuelStatus(data);
+    } catch {
+      /* silent */
+    }
+  }, [adminFetch]);
+
+  const fetchSparbots = useCallback(async () => {
+    try {
+      const data = (await adminFetch("/admin/sparbots")) as {
+        sparbots: StandaloneBot[];
+      };
+      setSparbots(data.sparbots ?? []);
+    } catch {
+      /* silent */
+    }
+  }, [adminFetch]);
+
+  useEffect(() => {
+    if (!isAuthed) return;
+    fetchDuelStatus();
+    fetchSparbots();
+    const d = setInterval(fetchDuelStatus, DUELS_POLL_MS);
+    const s = setInterval(fetchSparbots, SPARBOTS_POLL_MS);
+    return () => {
+      clearInterval(d);
+      clearInterval(s);
+    };
+  }, [isAuthed, fetchDuelStatus, fetchSparbots]);
+
+  // Spawn
+  const handleSpawn = useCallback(
+    async (style: CombatStyle, tier: SparbotTier, count: number) => {
+      setSpawnLoading(true);
+      setSpawnError(null);
+      setSpawnSuccess(null);
+      try {
+        const data = (await adminFetch("/admin/sparbots", {
+          method: "POST",
+          body: JSON.stringify({ style, tier, count }),
+        })) as { spawned: Array<{ name: string }> };
+        setSpawnSuccess(
+          `✓ Spawned ${data.spawned.length} ${tier} ${style} bot${data.spawned.length !== 1 ? "s" : ""}`,
+        );
+        await fetchSparbots();
+      } catch (e) {
+        setSpawnError(e instanceof Error ? e.message : "Spawn failed");
+      }
+      setSpawnLoading(false);
+    },
+    [adminFetch, fetchSparbots],
+  );
+
+  // Fill pool: 2 of each style at chosen tier
+  const handleFillPool = useCallback(async () => {
+    setFillLoading(true);
+    setSpawnError(null);
+    setSpawnSuccess(null);
+    const styles: CombatStyle[] = ["melee", "ranged", "mage", "prayer"];
+    try {
+      let total = 0;
+      for (const s of styles) {
+        const data = (await adminFetch("/admin/sparbots", {
+          method: "POST",
+          body: JSON.stringify({ style: s, tier: spawnTier, count: 2 }),
+        })) as { spawned: Array<unknown> };
+        total += data.spawned.length;
+      }
+      setSpawnSuccess(
+        `✓ Filled pool with ${total} bots (2× each style, ${spawnTier})`,
+      );
+      await fetchSparbots();
+    } catch (e) {
+      setSpawnError(e instanceof Error ? e.message : "Fill failed");
+    }
+    setFillLoading(false);
+  }, [adminFetch, fetchSparbots, spawnTier]);
+
+  // Remove one
+  const handleRemove = useCallback(
+    async (id: string) => {
+      setRemovingId(id);
+      try {
+        await adminFetch(`/admin/sparbots/${encodeURIComponent(id)}`, {
+          method: "DELETE",
+        });
+        await fetchSparbots();
+      } catch (e) {
+        console.warn("Remove sparbot failed:", e);
+      }
+      setRemovingId(null);
+    },
+    [adminFetch, fetchSparbots],
+  );
+
+  // Remove all
+  const handleRemoveAll = useCallback(async () => {
+    if (
+      sparbots.length === 0 ||
+      !window.confirm(`Remove all ${sparbots.length} sparbot(s)?`)
+    )
+      return;
+    try {
+      await adminFetch("/admin/sparbots", { method: "DELETE" });
+      await fetchSparbots();
+    } catch (e) {
+      console.warn("Remove all failed:", e);
+    }
+  }, [adminFetch, sparbots.length, fetchSparbots]);
+
+  // ─── Auth Gate ────────────────────────────────────────────────────────────
+
+  if (!isAuthed && checkingStored)
+    return <AuthGate loading title="Duel Arena Monitor" />;
+
+  if (!isAuthed) {
+    return (
+      <AuthGate
+        title="Duel Arena Monitor"
+        adminCode={adminCode}
+        onChange={setAdminCode}
+        onLogin={handleLogin}
+        loading={authLoading}
+        error={authError}
+      />
+    );
+  }
+
+  // ─── Data ─────────────────────────────────────────────────────────────────
+
+  const cycle = streamState?.cycle;
+  const phase = cycle?.phase ?? "IDLE";
+  const agent1 = cycle?.agent1 ?? null;
+  const agent2 = cycle?.agent2 ?? null;
+  const leaderboard = streamState?.leaderboard ?? [];
+  const winnerId = cycle?.winnerId ?? null;
+  const recentDuels = duelStatus?.recentDuels ?? [];
+  const secSinceStream =
+    lastStreamAt > 0 ? Math.floor((Date.now() - lastStreamAt) / 1000) : null;
+  const streamOk = secSinceStream !== null && secSinceStream < 10;
+
+  // Pool count (unique agent IDs in leaderboard as proxy)
+  const poolCount = leaderboard.length;
+
+  return (
+    <div style={s.root}>
+      {/* ── Top bar ── */}
+      <div style={s.topbar}>
+        <div style={{ display: "flex", alignItems: "center", gap: 10 }}>
+          <span style={s.topbarTitle}>Duel Arena Monitor</span>
+          <span
+            style={{
+              padding: "2px 8px",
+              borderRadius: 3,
+              fontSize: "0.65rem",
+              fontWeight: 700,
+              letterSpacing: "0.1em",
+              textTransform: "uppercase" as const,
+              background: phaseColor(phase) + "22",
+              border: `1px solid ${phaseColor(phase)}55`,
+              color: phaseColor(phase),
+            }}
+          >
+            {phase}
+          </span>
+          {cycle && (
+            <span style={{ fontSize: "0.7rem", color: "#475569" }}>
+              {Math.max(
+                0,
+                Math.ceil(cycle.phaseEndTime / 1000 - Date.now() / 1000),
+              )}
+              s
+            </span>
+          )}
+        </div>
+        <div style={{ display: "flex", alignItems: "center", gap: 12 }}>
+          {streamError && (
+            <span style={{ fontSize: "0.65rem", color: "#f87171" }}>
+              ⚠ {streamError}
+            </span>
+          )}
+          <div style={{ display: "flex", alignItems: "center", gap: 4 }}>
+            <div
+              style={{
+                width: 7,
+                height: 7,
+                borderRadius: "50%",
+                background: streamOk ? "#4ade80" : "#f87171",
+              }}
+            />
+            <span style={{ fontSize: "0.65rem", color: "#475569" }}>
+              {streamOk
+                ? `live`
+                : secSinceStream !== null
+                  ? `${secSinceStream}s stale`
+                  : "connecting…"}
+            </span>
+          </div>
+          <span style={{ fontSize: "0.65rem", color: "#334155" }}>
+            Pool: {poolCount}
+          </span>
+        </div>
+      </div>
+
+      {/* Phase progress bar */}
+      {cycle && cycle.phaseEndTime > 0 && (
+        <PhaseBar
+          phase={phase}
+          phaseStartTime={cycle.phaseStartTime}
+          phaseEndTime={cycle.phaseEndTime}
+        />
+      )}
+
+      {/* ── Body ── */}
+      <div style={s.body}>
+        {/* Left: Fight + Recent ─────────────────────────────────── */}
+        <div style={s.colLeft}>
+          {/* Live fight */}
+          <div style={s.card}>
+            <div style={s.cardHead}>Live Fight</div>
+            {agent1 && agent2 ? (
+              <div>
+                <div style={{ display: "flex", gap: 8, alignItems: "stretch" }}>
+                  <FighterCard
+                    agent={agent1}
+                    isWinner={winnerId === agent1.id}
+                    isLoser={winnerId !== null && winnerId !== agent1.id}
+                  />
+                  <div
+                    style={{
+                      display: "flex",
+                      alignItems: "center",
+                      color: "#f2d08a",
+                      fontFamily: "Impact, sans-serif",
+                      fontSize: "1.1rem",
+                      padding: "0 2px",
+                    }}
+                  >
+                    VS
+                  </div>
+                  <FighterCard
+                    agent={agent2}
+                    isWinner={winnerId === agent2.id}
+                    isLoser={winnerId !== null && winnerId !== agent2.id}
+                  />
+                </div>
+                {cycle?.winReason && (
+                  <div
+                    style={{
+                      textAlign: "center",
+                      marginTop: 6,
+                      fontSize: "0.62rem",
+                      color: "#475569",
+                      textTransform: "uppercase" as const,
+                      letterSpacing: "0.1em",
+                    }}
+                  >
+                    {WIN_REASON_LABELS[cycle.winReason] ?? cycle.winReason}
+                  </div>
+                )}
+              </div>
+            ) : (
+              <div
+                style={{
+                  color: "#334155",
+                  textAlign: "center",
+                  padding: "18px 0",
+                  fontSize: "0.8rem",
+                }}
+              >
+                No active fight
+              </div>
+            )}
+          </div>
+
+          {/* Leaderboard */}
+          <div style={s.card}>
+            <div style={s.cardHead}>Leaderboard</div>
+            {leaderboard.length > 0 ? (
+              <table
+                style={{
+                  width: "100%",
+                  borderCollapse: "collapse" as const,
+                  fontSize: "0.7rem",
+                }}
+              >
+                <thead>
+                  <tr
+                    style={{ borderBottom: "1px solid rgba(255,255,255,0.05)" }}
+                  >
+                    {["#", "Name", "W", "L", "W%", "Str", "Lv"].map((h) => (
+                      <th
+                        key={h}
+                        style={{
+                          padding: "2px 5px",
+                          textAlign:
+                            h === "Name"
+                              ? ("left" as const)
+                              : ("right" as const),
+                          color: "#334155",
+                          fontWeight: 600,
+                          letterSpacing: "0.06em",
+                        }}
+                      >
+                        {h}
+                      </th>
+                    ))}
+                  </tr>
+                </thead>
+                <tbody>
+                  {leaderboard.map((e) => (
+                    <tr
+                      key={e.characterId}
+                      style={{
+                        borderBottom: "1px solid rgba(255,255,255,0.025)",
+                      }}
+                    >
+                      <td
+                        style={{
+                          padding: "3px 5px",
+                          textAlign: "right" as const,
+                          color: "#334155",
+                        }}
+                      >
+                        {e.rank}
+                      </td>
+                      <td
+                        style={{
+                          padding: "3px 5px",
+                          textAlign: "left" as const,
+                          color: "#e2e8f0",
+                          fontWeight: 500,
+                          maxWidth: 120,
+                          overflow: "hidden",
+                          textOverflow: "ellipsis",
+                          whiteSpace: "nowrap" as const,
+                        }}
+                      >
+                        {e.name}
+                      </td>
+                      <td
+                        style={{
+                          padding: "3px 5px",
+                          textAlign: "right" as const,
+                          color: "#4ade80",
+                        }}
+                      >
+                        {e.wins}
+                      </td>
+                      <td
+                        style={{
+                          padding: "3px 5px",
+                          textAlign: "right" as const,
+                          color: "#f87171",
+                        }}
+                      >
+                        {e.losses}
+                      </td>
+                      <td
+                        style={{
+                          padding: "3px 5px",
+                          textAlign: "right" as const,
+                          color: "#f2d08a",
+                        }}
+                      >
+                        {winRate(e.wins, e.losses)}
+                      </td>
+                      <td
+                        style={{
+                          padding: "3px 5px",
+                          textAlign: "right" as const,
+                          color: e.currentStreak > 1 ? "#facc15" : "#334155",
+                        }}
+                      >
+                        {e.currentStreak > 1
+                          ? `🔥${e.currentStreak}`
+                          : e.currentStreak}
+                      </td>
+                      <td
+                        style={{
+                          padding: "3px 5px",
+                          textAlign: "right" as const,
+                          color: "#475569",
+                        }}
+                      >
+                        {e.combatLevel}
+                      </td>
+                    </tr>
+                  ))}
+                </tbody>
+              </table>
+            ) : (
+              <div
+                style={{
+                  color: "#334155",
+                  textAlign: "center",
+                  padding: 10,
+                  fontSize: "0.75rem",
+                }}
+              >
+                No leaderboard data yet
+              </div>
+            )}
+          </div>
+
+          {/* Recent duels */}
+          {recentDuels.length > 0 && (
+            <div style={s.card}>
+              <div style={s.cardHead}>Recent Fights</div>
+              {recentDuels.slice(0, 15).map((d) => (
+                <RecentDuelRow key={d.cycleId} d={d} />
+              ))}
+            </div>
+          )}
+        </div>
+
+        {/* Right: Sparbot management ──────────────────────────── */}
+        <div style={s.colRight}>
+          {/* Spawn */}
+          <div style={s.card}>
+            <div style={s.cardHead}>Spawn Sparbots</div>
+
+            {/* Style */}
+            <div style={{ marginBottom: 10 }}>
+              <div style={s.label}>Style</div>
+              <div
+                style={{
+                  display: "flex",
+                  gap: 5,
+                  marginTop: 4,
+                  flexWrap: "wrap" as const,
+                }}
+              >
+                {(["melee", "ranged", "mage", "prayer"] as CombatStyle[]).map(
+                  (st) => (
+                    <button
+                      key={st}
+                      onClick={() => setSpawnStyle(st)}
+                      style={{
+                        padding: "3px 9px",
+                        borderRadius: 3,
+                        fontSize: "0.7rem",
+                        fontWeight: 600,
+                        cursor: "pointer",
+                        background:
+                          spawnStyle === st
+                            ? styleColor(st) + "28"
+                            : "transparent",
+                        border: `1px solid ${spawnStyle === st ? styleColor(st) : "rgba(255,255,255,0.09)"}`,
+                        color: spawnStyle === st ? styleColor(st) : "#475569",
+                        letterSpacing: "0.04em",
+                      }}
+                    >
+                      {st.charAt(0).toUpperCase() + st.slice(1)}
+                    </button>
+                  ),
+                )}
+              </div>
+            </div>
+
+            {/* Tier */}
+            <div style={{ marginBottom: 10 }}>
+              <div style={s.label}>Tier</div>
+              <div style={{ display: "flex", gap: 5, marginTop: 4 }}>
+                {(["novice", "adept", "expert"] as SparbotTier[]).map((t) => (
+                  <button
+                    key={t}
+                    onClick={() => setSpawnTier(t)}
+                    style={{
+                      padding: "3px 9px",
+                      borderRadius: 3,
+                      fontSize: "0.7rem",
+                      fontWeight: 600,
+                      cursor: "pointer",
+                      background:
+                        spawnTier === t ? tierColor(t) + "28" : "transparent",
+                      border: `1px solid ${spawnTier === t ? tierColor(t) : "rgba(255,255,255,0.09)"}`,
+                      color: spawnTier === t ? tierColor(t) : "#475569",
+                    }}
+                  >
+                    {t.charAt(0).toUpperCase() + t.slice(1)}
+                  </button>
+                ))}
+              </div>
+            </div>
+
+            {/* Count */}
+            <div style={{ marginBottom: 10 }}>
+              <div style={s.label}>Count</div>
+              <input
+                type="number"
+                min={1}
+                max={20}
+                value={spawnCount}
+                onChange={(e) =>
+                  setSpawnCount(
+                    Math.min(
+                      20,
+                      Math.max(1, parseInt(e.target.value, 10) || 1),
+                    ),
+                  )
+                }
+                style={{
+                  marginTop: 4,
+                  width: 72,
+                  padding: "4px 8px",
+                  background: "#0a0f16",
+                  border: "1px solid rgba(255,255,255,0.1)",
+                  borderRadius: 3,
+                  color: "#e2e8f0",
+                  fontSize: "0.78rem",
+                  outline: "none",
+                }}
+              />
+            </div>
+
+            <button
+              onClick={() => handleSpawn(spawnStyle, spawnTier, spawnCount)}
+              disabled={spawnLoading}
+              style={{
+                ...s.btn,
+                background: spawnLoading ? "#1e293b" : "#1d4ed8",
+                cursor: spawnLoading
+                  ? ("not-allowed" as const)
+                  : ("pointer" as const),
+                marginBottom: 6,
+              }}
+            >
+              {spawnLoading ? "Spawning…" : `Spawn ${spawnCount} ${spawnStyle}`}
+            </button>
+
+            <button
+              onClick={handleFillPool}
+              disabled={fillLoading}
+              style={{
+                ...s.btn,
+                background: fillLoading ? "#1e293b" : "#14532d",
+                cursor: fillLoading
+                  ? ("not-allowed" as const)
+                  : ("pointer" as const),
+                fontSize: "0.72rem",
+              }}
+            >
+              {fillLoading ? "Filling…" : `Fill Pool (2× each, ${spawnTier})`}
+            </button>
+
+            {spawnSuccess && (
+              <div
+                style={{ marginTop: 6, fontSize: "0.68rem", color: "#4ade80" }}
+              >
+                {spawnSuccess}
+              </div>
+            )}
+            {spawnError && (
+              <div
+                style={{ marginTop: 6, fontSize: "0.68rem", color: "#f87171" }}
+              >
+                {spawnError}
+              </div>
+            )}
+          </div>
+
+          {/* Style Guide */}
+          <div style={s.card}>
+            <div style={s.cardHead}>Style Reference</div>
+            <div style={{ fontSize: "0.65rem", lineHeight: 1.8 }}>
+              {(
+                [
+                  ["melee", "Swords/scimitars, Attack+Strength build"],
+                  ["ranged", "Bows+arrows, Ranged level build"],
+                  ["mage", "Staff+runes, Magic level build"],
+                  ["prayer", "Melee + high Prayer level, uses prayers"],
+                ] as [string, string][]
+              ).map(([st, desc]) => (
+                <div key={st}>
+                  <span style={{ color: styleColor(st), fontWeight: 600 }}>
+                    {st.charAt(0).toUpperCase() + st.slice(1)}
+                  </span>
+                  <span style={{ color: "#334155" }}> — {desc}</span>
+                </div>
+              ))}
+            </div>
+            <div
+              style={{
+                marginTop: 8,
+                fontSize: "0.62rem",
+                borderTop: "1px solid rgba(255,255,255,0.04)",
+                paddingTop: 6,
+              }}
+            >
+              {(
+                [
+                  ["novice", "~Lv 35 skills"],
+                  ["adept", "~Lv 60 skills"],
+                  ["expert", "~Lv 85 skills"],
+                ] as [string, string][]
+              ).map(([t, d]) => (
+                <div key={t}>
+                  <span style={{ color: tierColor(t), fontWeight: 600 }}>
+                    {t.charAt(0).toUpperCase() + t.slice(1)}
+                  </span>{" "}
+                  <span style={{ color: "#334155" }}>— {d}</span>
+                </div>
+              ))}
+            </div>
+          </div>
+
+          {/* Active Sparbots */}
+          <div style={s.card}>
+            <div
+              style={{
+                ...s.cardHead,
+                display: "flex" as const,
+                justifyContent: "space-between" as const,
+                alignItems: "center" as const,
+              }}
+            >
+              <span>Active Bots ({sparbots.length})</span>
+              {sparbots.length > 0 && (
+                <button
+                  onClick={handleRemoveAll}
+                  style={{ ...s.dangerBtn, fontSize: "0.6rem" }}
+                >
+                  Remove All
+                </button>
+              )}
+            </div>
+            {sparbots.length === 0 ? (
+              <div
+                style={{
+                  color: "#334155",
+                  textAlign: "center" as const,
+                  padding: "10px 0",
+                  fontSize: "0.75rem",
+                }}
+              >
+                None active
+              </div>
+            ) : (
+              <div
+                style={{
+                  display: "flex",
+                  flexDirection: "column" as const,
+                  gap: 4,
+                }}
+              >
+                {sparbots.map((bot) => (
+                  <div key={bot.characterId} style={s.botRow}>
+                    <div style={{ flex: 1, minWidth: 0 }}>
+                      <div
+                        style={{
+                          fontSize: "0.75rem",
+                          fontWeight: 600,
+                          color: "#e2e8f0",
+                          overflow: "hidden",
+                          textOverflow: "ellipsis",
+                          whiteSpace: "nowrap" as const,
+                        }}
+                      >
+                        {bot.name}
+                      </div>
+                      <div style={{ fontSize: "0.58rem", marginTop: 1 }}>
+                        <span style={{ color: styleColor(bot.style) }}>
+                          {bot.style}
+                        </span>
+                        <span style={{ color: "#334155" }}> · </span>
+                        <span style={{ color: tierColor(bot.tier) }}>
+                          {bot.tier}
+                        </span>
+                      </div>
+                    </div>
+                    <button
+                      onClick={() => handleRemove(bot.characterId)}
+                      disabled={removingId === bot.characterId}
+                      style={{
+                        ...s.dangerBtn,
+                        opacity: removingId === bot.characterId ? 0.4 : 1,
+                        cursor:
+                          removingId === bot.characterId
+                            ? ("not-allowed" as const)
+                            : ("pointer" as const),
+                      }}
+                    >
+                      ✕
+                    </button>
+                  </div>
+                ))}
+              </div>
+            )}
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+}
+
+// ─── Auth gate ────────────────────────────────────────────────────────────────
+
+function AuthGate(props: {
+  title: string;
+  loading?: boolean;
+  adminCode?: string;
+  onChange?: (v: string) => void;
+  onLogin?: () => void;
+  error?: string | null;
+}) {
+  return (
+    <div
+      style={{
+        display: "flex",
+        alignItems: "center",
+        justifyContent: "center",
+        height: "100vh",
+        background: "#020608",
+      }}
+    >
+      <div
+        style={{
+          background: "#0d1117",
+          border: "1px solid rgba(255,255,255,0.07)",
+          borderRadius: 8,
+          padding: "36px 32px",
+          width: 310,
+          textAlign: "center" as const,
+        }}
+      >
+        <div
+          style={{
+            fontSize: "1.3rem",
+            fontWeight: 700,
+            color: "#f2d08a",
+            marginBottom: 6,
+          }}
+        >
+          {props.title}
+        </div>
+        {props.loading && !props.adminCode ? (
+          <div style={{ color: "#475569", marginTop: 16, fontSize: "0.85rem" }}>
+            Checking…
+          </div>
+        ) : (
+          <>
+            <div
+              style={{ color: "#475569", marginBottom: 14, fontSize: "0.8rem" }}
+            >
+              Enter admin code
+            </div>
+            {props.error && (
+              <div
+                style={{
+                  color: "#f87171",
+                  fontSize: "0.72rem",
+                  marginBottom: 8,
+                }}
+              >
+                {props.error}
+              </div>
+            )}
+            <input
+              type="password"
+              placeholder="Admin code"
+              value={props.adminCode ?? ""}
+              onChange={(e) => props.onChange?.(e.target.value)}
+              onKeyDown={(e) => e.key === "Enter" && props.onLogin?.()}
+              autoFocus
+              disabled={props.loading}
+              style={{
+                width: "100%",
+                padding: "7px 10px",
+                background: "#1e293b",
+                border: "1px solid rgba(255,255,255,0.1)",
+                borderRadius: 4,
+                color: "#e2e8f0",
+                fontSize: "0.82rem",
+                outline: "none",
+                boxSizing: "border-box" as const,
+                marginBottom: 8,
+              }}
+            />
+            <button
+              onClick={props.onLogin}
+              disabled={props.loading || !props.adminCode}
+              style={{
+                width: "100%",
+                padding: "7px 0",
+                background:
+                  props.loading || !props.adminCode ? "#1e293b" : "#1d4ed8",
+                border: "none",
+                borderRadius: 4,
+                color: "#e2e8f0",
+                fontWeight: 600,
+                fontSize: "0.82rem",
+                cursor:
+                  props.loading || !props.adminCode
+                    ? ("not-allowed" as const)
+                    : ("pointer" as const),
+              }}
+            >
+              {props.loading ? "Checking…" : "Authenticate"}
+            </button>
+          </>
+        )}
+      </div>
+    </div>
+  );
+}
+
+// ─── Style object ─────────────────────────────────────────────────────────────
+
+const s: Record<string, React.CSSProperties> = {
+  root: {
+    display: "flex",
+    flexDirection: "column",
+    height: "100vh",
+    background: "#020608",
+    color: "#e2e8f0",
+    fontFamily: "system-ui, -apple-system, sans-serif",
+    overflow: "hidden",
+  },
+  topbar: {
+    display: "flex",
+    alignItems: "center",
+    justifyContent: "space-between",
+    padding: "8px 16px",
+    background: "#07090d",
+    borderBottom: "1px solid rgba(255,255,255,0.05)",
+    flexShrink: 0,
+  },
+  topbarTitle: {
+    fontSize: "0.85rem",
+    fontWeight: 700,
+    color: "#f2d08a",
+    letterSpacing: "0.08em",
+    textTransform: "uppercase",
+  },
+  body: { display: "flex", flex: 1, overflow: "hidden" },
+  colLeft: {
+    flex: 1,
+    padding: 14,
+    display: "flex",
+    flexDirection: "column",
+    gap: 10,
+    overflowY: "auto",
+    borderRight: "1px solid rgba(255,255,255,0.04)",
+  },
+  colRight: {
+    width: 290,
+    padding: 14,
+    display: "flex",
+    flexDirection: "column",
+    gap: 10,
+    overflowY: "auto",
+  },
+  card: {
+    background: "#07090d",
+    border: "1px solid rgba(255,255,255,0.06)",
+    borderRadius: 5,
+    padding: "10px 12px",
+  },
+  cardHead: {
+    fontSize: "0.58rem",
+    fontWeight: 700,
+    letterSpacing: "0.12em",
+    textTransform: "uppercase",
+    color: "#334155",
+    marginBottom: 8,
+    paddingBottom: 5,
+    borderBottom: "1px solid rgba(255,255,255,0.04)",
+  },
+  label: {
+    fontSize: "0.6rem",
+    fontWeight: 600,
+    letterSpacing: "0.08em",
+    textTransform: "uppercase",
+    color: "#334155",
+  },
+  btn: {
+    width: "100%",
+    padding: "7px 0",
+    border: "none",
+    borderRadius: 4,
+    color: "#e2e8f0",
+    fontWeight: 600,
+    fontSize: "0.78rem",
+    letterSpacing: "0.03em",
+  },
+  dangerBtn: {
+    padding: "2px 7px",
+    background: "transparent",
+    border: "1px solid #ef444433",
+    borderRadius: 3,
+    color: "#f87171",
+    fontSize: "0.65rem",
+    fontWeight: 600,
+    cursor: "pointer",
+  },
+  botRow: {
+    display: "flex",
+    justifyContent: "space-between",
+    alignItems: "center",
+    padding: "5px 7px",
+    background: "rgba(255,255,255,0.02)",
+    borderRadius: 3,
+    border: "1px solid rgba(255,255,255,0.04)",
+  },
+};
diff --git a/packages/client/src/screens/DuelArenaShowcaseScreen.css b/packages/client/src/screens/DuelArenaShowcaseScreen.css
new file mode 100644
index 000000000..e394091a7
--- /dev/null
+++ b/packages/client/src/screens/DuelArenaShowcaseScreen.css
@@ -0,0 +1,987 @@
+.duel-showcase {
+  min-height: 100vh;
+  height: 100vh;
+  overflow-y: auto;
+  overflow-x: hidden;
+  overscroll-behavior-y: contain;
+  background:
+    radial-gradient(circle at top, rgba(124, 58, 237, 0.12), transparent 30%),
+    linear-gradient(180deg, #080811 0%, #0d1020 48%, #080a14 100%);
+  color: #eef2ff;
+  font-family: Inter, system-ui, -apple-system, sans-serif;
+  padding: 20px 20px 36px;
+  box-sizing: border-box;
+}
+
+.duel-showcase-auth-shell {
+  min-height: 100vh;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background:
+    radial-gradient(circle at top, rgba(124, 58, 237, 0.2), transparent 35%),
+    #070812;
+  color: #eef2ff;
+}
+
+.duel-showcase-auth-card {
+  width: min(420px, calc(100vw - 32px));
+  background: rgba(13, 16, 32, 0.88);
+  border: 1px solid rgba(148, 163, 184, 0.2);
+  border-radius: 24px;
+  padding: 32px;
+  box-shadow: 0 30px 80px rgba(0, 0, 0, 0.45);
+  text-align: center;
+}
+
+.duel-showcase-auth-card h1 {
+  margin: 14px 0 6px;
+  font-size: 28px;
+}
+
+.duel-showcase-auth-card p {
+  margin: 0 0 20px;
+  color: #94a3b8;
+}
+
+.duel-showcase-auth-error {
+  margin-bottom: 12px;
+  color: #fca5a5;
+}
+
+.duel-showcase-auth-input,
+.duel-showcase-auth-button {
+  width: 100%;
+  box-sizing: border-box;
+  border-radius: 16px;
+  padding: 14px 16px;
+  font: inherit;
+}
+
+.duel-showcase-auth-input {
+  margin-bottom: 12px;
+  background: rgba(15, 23, 42, 0.8);
+  border: 1px solid rgba(148, 163, 184, 0.24);
+  color: #eef2ff;
+}
+
+.duel-showcase-auth-button {
+  border: none;
+  cursor: pointer;
+  background: linear-gradient(135deg, #f59e0b, #ec4899);
+  color: #0f172a;
+  font-weight: 700;
+}
+
+.duel-showcase-auth-button:disabled {
+  opacity: 0.5;
+  cursor: not-allowed;
+}
+
+.spin {
+  animation: duel-showcase-spin 1.1s linear infinite;
+}
+
+@keyframes duel-showcase-spin {
+  from {
+    transform: rotate(0deg);
+  }
+  to {
+    transform: rotate(360deg);
+  }
+}
+
+.duel-showcase-topbar {
+  display: flex;
+  align-items: flex-start;
+  justify-content: space-between;
+  gap: 24px;
+  margin-bottom: 20px;
+}
+
+.duel-showcase-topbar h1 {
+  margin: 4px 0;
+  font-size: clamp(28px, 4vw, 42px);
+  line-height: 1;
+}
+
+.duel-showcase-topbar p {
+  margin: 0;
+  color: #cbd5e1;
+}
+
+.eyebrow {
+  color: #f59e0b;
+  font-size: 12px;
+  letter-spacing: 0.24em;
+  text-transform: uppercase;
+  font-weight: 700;
+}
+
+.duel-showcase-topbar-actions {
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+  justify-content: flex-end;
+  gap: 10px;
+  max-width: 560px;
+}
+
+.duel-showcase-toggle,
+.duel-showcase-btn {
+  display: inline-flex;
+  align-items: center;
+  gap: 8px;
+  border-radius: 999px;
+  padding: 10px 14px;
+  background: rgba(15, 23, 42, 0.72);
+  border: 1px solid rgba(148, 163, 184, 0.18);
+  color: #e2e8f0;
+  text-decoration: none;
+  cursor: pointer;
+}
+
+.duel-showcase-btn {
+  font: inherit;
+}
+
+.duel-showcase-btn.ghost {
+  color: #cbd5e1;
+}
+
+.duel-arena-reset-btn {
+  width: 100%;
+  justify-content: center;
+  margin-bottom: 10px;
+  background: linear-gradient(135deg, rgba(220, 38, 38, 0.22), rgba(239, 68, 68, 0.14));
+  border-color: rgba(248, 113, 113, 0.45);
+  color: #fca5a5;
+  font-weight: 700;
+  letter-spacing: 0.02em;
+  transition: background 0.18s, border-color 0.18s, color 0.18s;
+}
+
+.duel-arena-reset-btn:hover:not(:disabled) {
+  background: linear-gradient(135deg, rgba(220, 38, 38, 0.38), rgba(239, 68, 68, 0.28));
+  border-color: rgba(248, 113, 113, 0.75);
+  color: #fecaca;
+}
+
+.duel-arena-reset-btn:disabled {
+  opacity: 0.5;
+  cursor: not-allowed;
+}
+
+.duel-showcase-error {
+  margin-bottom: 16px;
+  padding: 12px 14px;
+  border-radius: 14px;
+  background: rgba(127, 29, 29, 0.45);
+  border: 1px solid rgba(248, 113, 113, 0.28);
+  color: #fecaca;
+}
+
+.duel-showcase-grid {
+  display: grid;
+  grid-template-columns: minmax(0, 1.8fr) minmax(320px, 0.92fr);
+  gap: 20px;
+}
+
+.duel-showcase-stage,
+.duel-showcase-panel {
+  background: rgba(10, 15, 30, 0.86);
+  border: 1px solid rgba(148, 163, 184, 0.18);
+  border-radius: 24px;
+  box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.04);
+}
+
+.duel-showcase-stage {
+  padding: 16px;
+}
+
+.duel-showcase-stage-header,
+.panel-title,
+.panel-label {
+  display: flex;
+}
+
+.duel-showcase-stage-header {
+  justify-content: space-between;
+  align-items: center;
+  gap: 16px;
+  margin-bottom: 12px;
+}
+
+.panel-label {
+  color: #f59e0b;
+  text-transform: uppercase;
+  letter-spacing: 0.18em;
+  font-size: 11px;
+  font-weight: 700;
+}
+
+.panel-title {
+  font-size: 20px;
+  font-weight: 700;
+  margin-top: 4px;
+}
+
+.stage-meta {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  flex-wrap: wrap;
+}
+
+.stage-meta span {
+  display: inline-flex;
+  align-items: center;
+  gap: 6px;
+  color: #cbd5e1;
+}
+
+.winner-callout {
+  color: #fde68a;
+}
+
+.duel-showcase-stage-frame {
+  position: relative;
+  aspect-ratio: 16 / 9;
+  border-radius: 20px;
+  overflow: hidden;
+  background: #020617;
+  border: 1px solid rgba(148, 163, 184, 0.18);
+}
+
+.duel-showcase-stage-iframe {
+  width: 100%;
+  height: 100%;
+  border: 0;
+  background: #020617;
+}
+
+.duel-showcase-stage-overlay {
+  position: absolute;
+  top: 14px;
+  left: 14px;
+  right: 14px;
+  display: flex;
+  flex-direction: column;
+  align-items: stretch;
+  gap: 10px;
+  pointer-events: none;
+}
+
+.duel-showcase-stage-overlay-row {
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-start;
+  gap: 12px;
+}
+
+.duel-showcase-stage-overlay-countdown {
+  display: flex;
+  justify-content: flex-end;
+}
+
+.phase-badge,
+.countdown-chip {
+  border-radius: 14px;
+  padding: 10px 14px;
+  background: rgba(2, 6, 23, 0.78);
+  border: 1px solid rgba(148, 163, 184, 0.22);
+  font-weight: 700;
+  letter-spacing: 0.06em;
+  text-transform: uppercase;
+  box-shadow: 0 12px 32px rgba(0, 0, 0, 0.35);
+  backdrop-filter: blur(10px);
+  -webkit-backdrop-filter: blur(10px);
+  animation: duel-showcase-phase-in 0.4s ease-out both;
+}
+
+@keyframes duel-showcase-phase-in {
+  from {
+    opacity: 0;
+    transform: translateY(-6px);
+  }
+  to {
+    opacity: 1;
+    transform: translateY(0);
+  }
+}
+
+.phase-badge {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  gap: 4px;
+  text-transform: none;
+  letter-spacing: normal;
+  max-width: min(280px, 46vw);
+}
+
+.phase-badge-title {
+  font-size: 13px;
+  font-weight: 800;
+  letter-spacing: 0.12em;
+  text-transform: uppercase;
+  color: #f8fafc;
+}
+
+.phase-badge-hint {
+  font-size: 11px;
+  font-weight: 500;
+  letter-spacing: 0.02em;
+  text-transform: none;
+  color: #94a3b8;
+  line-height: 1.35;
+}
+
+.phase-badge--idle {
+  border-color: rgba(148, 163, 184, 0.35);
+}
+
+.phase-badge--announcement {
+  border-color: rgba(251, 191, 36, 0.45);
+  box-shadow: 0 12px 36px rgba(251, 191, 36, 0.08);
+}
+
+.phase-badge--countdown {
+  border-color: rgba(248, 113, 113, 0.4);
+}
+
+.phase-badge--fighting {
+  border-color: rgba(34, 197, 94, 0.45);
+  box-shadow: 0 12px 36px rgba(34, 197, 94, 0.1);
+}
+
+.phase-badge--resolution {
+  border-color: rgba(168, 85, 247, 0.4);
+}
+
+.intermission-timer-chip {
+  border-radius: 14px;
+  padding: 10px 14px;
+  background: rgba(15, 23, 42, 0.82);
+  border: 1px solid rgba(96, 165, 250, 0.28);
+  display: flex;
+  flex-direction: column;
+  align-items: flex-end;
+  gap: 2px;
+  animation: duel-showcase-phase-in 0.45s ease-out both;
+}
+
+.intermission-timer-label {
+  font-size: 9px;
+  font-weight: 800;
+  letter-spacing: 0.2em;
+  text-transform: uppercase;
+  color: #94a3b8;
+}
+
+.intermission-timer-value {
+  font-size: 18px;
+  font-weight: 800;
+  font-variant-numeric: tabular-nums;
+  color: #e0f2fe;
+  letter-spacing: 0.06em;
+}
+
+.countdown-chip {
+  letter-spacing: 0.1em;
+}
+
+.duel-showcase-faceoff {
+  display: grid;
+  grid-template-columns: minmax(0, 1fr) auto minmax(0, 1fr);
+  gap: 12px;
+  margin-top: 14px;
+}
+
+.duel-showcase-readout {
+  margin-top: 16px;
+  padding-top: 16px;
+  border-top: 1px solid rgba(148, 163, 184, 0.12);
+}
+
+.duel-showcase-readout-grid {
+  display: grid;
+  grid-template-columns: repeat(2, minmax(0, 1fr));
+  gap: 12px;
+  margin-top: 12px;
+}
+
+.duel-showcase-readout-card {
+  border-radius: 18px;
+  border: 1px solid rgba(148, 163, 184, 0.16);
+  background: linear-gradient(180deg, rgba(15, 23, 42, 0.76), rgba(9, 14, 26, 0.92));
+  padding: 14px;
+}
+
+.duel-showcase-readout-card .dot {
+  width: 8px;
+  height: 8px;
+  border-radius: 999px;
+  background: #94a3b8;
+}
+
+.duel-showcase-readout-card.ok .dot {
+  background: #22c55e;
+}
+
+.duel-showcase-readout-card.bad .dot {
+  background: #ef4444;
+}
+
+.duel-showcase-readout-top,
+.duel-showcase-readout-meta {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 12px;
+}
+
+.duel-showcase-readout-top strong,
+.duel-showcase-readout-meta strong {
+  color: #f8fafc;
+}
+
+.duel-showcase-readout-title {
+  display: inline-flex;
+  align-items: center;
+  gap: 8px;
+  color: #cbd5e1;
+  font-weight: 700;
+}
+
+.duel-showcase-readout-detail {
+  margin-top: 10px;
+  color: #94a3b8;
+  line-height: 1.45;
+}
+
+.duel-showcase-readout-meta {
+  margin-top: 10px;
+}
+
+.duel-showcase-readout-meta span {
+  color: #94a3b8;
+}
+
+.duel-showcase-faceoff-card {
+  min-height: 220px;
+  border-radius: 20px;
+  padding: 16px;
+  background: linear-gradient(180deg, rgba(30, 41, 59, 0.55), rgba(15, 23, 42, 0.75));
+  border: 1px solid rgba(148, 163, 184, 0.16);
+}
+
+.duel-showcase-faceoff-card.winner {
+  box-shadow: 0 0 0 1px rgba(245, 158, 11, 0.26), 0 24px 48px rgba(245, 158, 11, 0.08);
+}
+
+.duel-showcase-faceoff-top,
+.duel-showcase-faceoff-stats,
+.note-row,
+.leaderboard-row,
+.recent-row,
+.recent-meta {
+  display: flex;
+  justify-content: space-between;
+  gap: 12px;
+}
+
+.duel-showcase-faceoff-name {
+  font-size: 22px;
+  font-weight: 800;
+}
+
+.duel-showcase-faceoff-meta,
+.duel-showcase-faceoff-record,
+.section-label,
+.loadout-empty,
+.recent-meta,
+.leaderboard-row .model {
+  color: #94a3b8;
+}
+
+.duel-showcase-faceoff-hp {
+  margin-top: 12px;
+}
+
+.duel-showcase-faceoff-hp .track {
+  height: 10px;
+  border-radius: 999px;
+  background: rgba(51, 65, 85, 0.7);
+  overflow: hidden;
+}
+
+.duel-showcase-faceoff-hp .fill {
+  height: 100%;
+  background: linear-gradient(90deg, #ef4444, #f59e0b, #22c55e);
+}
+
+.duel-showcase-faceoff-hp .numbers {
+  display: flex;
+  justify-content: space-between;
+  margin-top: 6px;
+  font-weight: 700;
+}
+
+.duel-showcase-faceoff-stats {
+  margin-top: 14px;
+}
+
+.duel-showcase-faceoff-stats div {
+  flex: 1;
+  border-radius: 14px;
+  padding: 10px 12px;
+  background: rgba(15, 23, 42, 0.56);
+}
+
+.duel-showcase-faceoff-stats span {
+  display: block;
+  color: #94a3b8;
+  font-size: 12px;
+}
+
+.duel-showcase-faceoff-section {
+  margin-top: 14px;
+}
+
+.section-quote {
+  margin-top: 6px;
+  color: #f8fafc;
+  line-height: 1.5;
+}
+
+.loadout-grid {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 8px;
+  margin-top: 8px;
+}
+
+.loadout-pill {
+  border-radius: 999px;
+  padding: 6px 10px;
+  background: rgba(51, 65, 85, 0.45);
+  border: 1px solid rgba(148, 163, 184, 0.14);
+  font-size: 12px;
+}
+
+.duel-showcase-faceoff-empty,
+.duel-showcase-empty {
+  color: #94a3b8;
+  padding: 12px 0;
+}
+
+.duel-showcase-versus {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  gap: 10px;
+  color: #f59e0b;
+  font-weight: 900;
+  letter-spacing: 0.18em;
+}
+
+.duel-showcase-sidebar {
+  display: flex;
+  flex-direction: column;
+  gap: 16px;
+  align-self: start;
+}
+
+.duel-showcase-panel {
+  padding: 16px;
+}
+
+.duel-showcase-notes,
+.duel-showcase-leaderboard,
+.duel-showcase-recent {
+  margin-top: 12px;
+}
+
+.duel-showcase-director-meta {
+  display: flex;
+  justify-content: space-between;
+  gap: 12px;
+  align-items: center;
+  margin-top: 12px;
+  color: #94a3b8;
+}
+
+.duel-showcase-director-meta strong {
+  color: #f8fafc;
+}
+
+.duel-showcase-director-grid {
+  display: grid;
+  grid-template-columns: repeat(2, minmax(0, 1fr));
+  gap: 10px;
+  margin-top: 12px;
+}
+
+.duel-showcase-director-grid.presets {
+  margin-top: 10px;
+}
+
+.duel-showcase-director-subtitle {
+  margin-top: 14px;
+  color: #94a3b8;
+  font-size: 12px;
+  font-weight: 700;
+  letter-spacing: 0.08em;
+  text-transform: uppercase;
+}
+
+.director-btn {
+  border-radius: 14px;
+  border: 1px solid rgba(148, 163, 184, 0.18);
+  background: rgba(15, 23, 42, 0.72);
+  color: #e2e8f0;
+  padding: 12px 10px;
+  font: inherit;
+  font-weight: 600;
+  cursor: pointer;
+  transition:
+    border-color 140ms ease,
+    background 140ms ease,
+    transform 140ms ease;
+}
+
+.director-btn:hover:not(:disabled) {
+  border-color: rgba(245, 158, 11, 0.38);
+  transform: translateY(-1px);
+}
+
+.director-btn.active {
+  background: linear-gradient(135deg, rgba(245, 158, 11, 0.24), rgba(236, 72, 153, 0.18));
+  border-color: rgba(245, 158, 11, 0.48);
+  color: #fff7ed;
+}
+
+.director-btn:disabled {
+  opacity: 0.5;
+  cursor: not-allowed;
+}
+
+.duel-showcase-debug-copy,
+.duel-showcase-debug-hint {
+  margin-top: 12px;
+  color: #94a3b8;
+  font-size: 13px;
+  line-height: 1.5;
+}
+
+.duel-showcase-debug-form {
+  display: grid;
+  gap: 10px;
+  margin-top: 12px;
+}
+
+.duel-showcase-debug-mode-row {
+  display: grid;
+  grid-template-columns: repeat(2, minmax(0, 1fr));
+  gap: 10px;
+}
+
+.duel-showcase-select,
+.duel-showcase-input {
+  width: 100%;
+  border-radius: 12px;
+  border: 1px solid rgba(148, 163, 184, 0.2);
+  background: rgba(15, 23, 42, 0.72);
+  color: #e2e8f0;
+  padding: 10px 12px;
+  font: inherit;
+}
+
+.duel-showcase-select:disabled,
+.duel-showcase-input:disabled {
+  opacity: 0.6;
+}
+
+.duel-showcase-debug-status {
+  margin-top: 12px;
+  border-radius: 12px;
+  border: 1px solid rgba(245, 158, 11, 0.22);
+  background: rgba(245, 158, 11, 0.08);
+  color: #fef3c7;
+  padding: 10px 12px;
+  font-size: 13px;
+}
+
+@media (max-width: 860px) {
+  .duel-showcase-debug-mode-row {
+    grid-template-columns: 1fr;
+  }
+}
+
+.note-row,
+.leaderboard-row,
+.recent-row {
+  padding: 12px 0;
+  border-bottom: 1px solid rgba(148, 163, 184, 0.1);
+}
+
+.note-row:last-child,
+.leaderboard-row:last-child,
+.recent-row:last-child {
+  border-bottom: none;
+}
+
+.note-row span,
+.recent-meta span {
+  color: #94a3b8;
+}
+
+.leaderboard-row {
+  align-items: center;
+}
+
+.leaderboard-row .rank {
+  width: 42px;
+  color: #f59e0b;
+  font-weight: 800;
+}
+
+.leaderboard-row .meta {
+  min-width: 0;
+  flex: 1;
+}
+
+.leaderboard-row .name {
+  font-weight: 700;
+}
+
+.leaderboard-row .model {
+  font-size: 12px;
+  margin-top: 4px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.leaderboard-row .record {
+  text-align: right;
+}
+
+.leaderboard-row .record strong {
+  display: block;
+}
+
+.recent-title {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
+/* ── Emergency Controls ─────────────────────────────────── */
+.emergency-panel {
+  border-color: rgba(248, 113, 113, 0.25);
+  transition: border-color 0.3s, background 0.3s;
+}
+.emergency-panel.in-maintenance {
+  border-color: rgba(251, 191, 36, 0.6);
+  background: linear-gradient(180deg, rgba(120, 53, 15, 0.28), rgba(15, 23, 42, 0.9));
+  animation: maintenance-pulse 2s ease-in-out infinite;
+}
+@keyframes maintenance-pulse {
+  0%, 100% { box-shadow: 0 0 0 0 rgba(251, 191, 36, 0); }
+  50% { box-shadow: 0 0 0 6px rgba(251, 191, 36, 0.08); }
+}
+.maintenance-badge {
+  background: #f59e0b;
+  color: #000;
+  font-size: 9px;
+  font-weight: 900;
+  letter-spacing: 0.08em;
+  padding: 2px 6px;
+  border-radius: 4px;
+  margin-left: 8px;
+  vertical-align: middle;
+}
+.emergency-btn-row {
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+  gap: 8px;
+  margin-top: 8px;
+}
+.emergency-stop-btn,
+.emergency-start-btn {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 6px;
+  border: none;
+  border-radius: 10px;
+  padding: 10px 8px;
+  font: inherit;
+  font-size: 13px;
+  font-weight: 700;
+  cursor: pointer;
+  transition: opacity 0.18s, transform 0.1s;
+}
+.emergency-stop-btn {
+  background: linear-gradient(135deg, #dc2626, #991b1b);
+  color: #fff;
+}
+.emergency-start-btn {
+  background: linear-gradient(135deg, #16a34a, #15803d);
+  color: #fff;
+}
+.emergency-stop-btn:disabled,
+.emergency-start-btn:disabled {
+  opacity: 0.35;
+  cursor: not-allowed;
+  transform: none;
+}
+.emergency-stop-btn:hover:not(:disabled),
+.emergency-start-btn:hover:not(:disabled) {
+  opacity: 0.88;
+  transform: translateY(-1px);
+}
+.emergency-status {
+  margin-top: 8px;
+  padding: 7px 10px;
+  border-radius: 8px;
+  font-size: 12px;
+  font-weight: 600;
+}
+.emergency-status.stopped {
+  background: rgba(127, 29, 29, 0.4);
+  border: 1px solid rgba(248, 113, 113, 0.35);
+  color: #fca5a5;
+}
+.emergency-status.started {
+  background: rgba(20, 83, 45, 0.4);
+  border: 1px solid rgba(74, 222, 128, 0.35);
+  color: #86efac;
+}
+
+/* ── Server Health ─────────────────────────────────────── */
+.server-health-grid {
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+  gap: 8px;
+  margin-top: 8px;
+}
+.health-cell {
+  display: flex;
+  flex-direction: column;
+  gap: 2px;
+  background: rgba(15, 23, 42, 0.6);
+  border: 1px solid rgba(148, 163, 184, 0.12);
+  border-radius: 10px;
+  padding: 8px 10px;
+}
+.health-cell span {
+  font-size: 10px;
+  color: #64748b;
+  text-transform: uppercase;
+  letter-spacing: 0.06em;
+}
+.health-cell strong {
+  font-size: 13px;
+  color: #e2e8f0;
+}
+.health-cell strong.warn {
+  color: #fbbf24;
+}
+
+/* ── Server Logs ───────────────────────────────────────── */
+.logs-toggle-btn {
+  display: block;
+  width: 100%;
+  margin-top: 10px;
+  background: none;
+  border: 1px solid rgba(148, 163, 184, 0.15);
+  border-radius: 8px;
+  color: #64748b;
+  font: inherit;
+  font-size: 12px;
+  padding: 6px 10px;
+  cursor: pointer;
+  text-align: left;
+  transition: color 0.15s, border-color 0.15s;
+}
+.logs-toggle-btn:hover {
+  color: #cbd5e1;
+  border-color: rgba(148, 163, 184, 0.3);
+}
+.server-logs-box {
+  margin-top: 8px;
+  max-height: 280px;
+  overflow-y: auto;
+  background: rgba(2, 6, 23, 0.85);
+  border: 1px solid rgba(148, 163, 184, 0.12);
+  border-radius: 10px;
+  padding: 8px;
+  font-family: "Fira Code", "JetBrains Mono", ui-monospace, monospace;
+  font-size: 11px;
+}
+.log-line {
+  display: flex;
+  gap: 8px;
+  padding: 2px 0;
+  border-bottom: 1px solid rgba(148, 163, 184, 0.06);
+  word-break: break-all;
+}
+.log-ts {
+  flex-shrink: 0;
+  color: #475569;
+}
+.log-msg { color: #94a3b8; }
+.log-line.log-warn .log-msg { color: #fbbf24; }
+.log-line.log-error .log-msg { color: #f87171; }
+.log-empty { color: #475569; font-style: italic; }
+
+@media (max-width: 1200px) {
+  .duel-showcase-topbar {
+    flex-direction: column;
+  }
+
+  .duel-showcase-topbar-actions {
+    max-width: none;
+    justify-content: flex-start;
+  }
+
+  .duel-showcase-grid {
+    grid-template-columns: 1fr;
+  }
+}
+
+@media (max-width: 860px) {
+  .duel-showcase {
+    padding: 14px 14px 28px;
+  }
+
+  .duel-showcase-topbar {
+    flex-direction: column;
+  }
+
+  .duel-showcase-status-row {
+    grid-template-columns: 1fr;
+  }
+
+  .duel-showcase-faceoff {
+    grid-template-columns: 1fr;
+  }
+
+  .duel-showcase-readout-grid {
+    grid-template-columns: 1fr;
+  }
+
+  .duel-showcase-versus {
+    flex-direction: row;
+    justify-content: flex-start;
+    padding: 4px 0;
+  }
+
+  .duel-showcase-director-grid {
+    grid-template-columns: 1fr;
+  }
+}
diff --git a/packages/client/src/screens/DuelArenaShowcaseScreen.tsx b/packages/client/src/screens/DuelArenaShowcaseScreen.tsx
new file mode 100644
index 000000000..efc855a63
--- /dev/null
+++ b/packages/client/src/screens/DuelArenaShowcaseScreen.tsx
@@ -0,0 +1,1633 @@
+/* global EventSource */
+
+import { GAME_API_URL } from "@/lib/api-config";
+import React, {
+  useCallback,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+} from "react";
+import {
+  Activity,
+  Bot,
+  Camera,
+  ExternalLink,
+  Eye,
+  Radio,
+  RefreshCw,
+  Shield,
+  Signal,
+  Swords,
+  Trophy,
+  Users,
+} from "lucide-react";
+import "./DuelArenaShowcaseScreen.css";
+
+const ADMIN_CODE_KEY = "hyperscape_admin_code";
+const CONTEXT_POLL_MS = 4000;
+const HEALTH_POLL_MS = 6000;
+
+type ShowcaseLeaderboardEntry = {
+  rank: number;
+  characterId: string;
+  name: string;
+  provider: string;
+  model: string;
+  wins: number;
+  losses: number;
+  winRate: number;
+  combatLevel: number;
+  currentStreak: number;
+};
+
+type ShowcaseAgent = {
+  id: string;
+  name: string;
+  provider: string;
+  model: string;
+  hp: number;
+  maxHp: number;
+  combatLevel: number;
+  wins: number;
+  losses: number;
+  damageDealtThisFight: number;
+  inventory?: Array<{ slot: number; itemId: string; quantity: number }>;
+  monologues?: Array<{
+    id: string;
+    type: string;
+    content: string;
+    timestamp: number;
+  }>;
+};
+
+type ShowcaseCycle = {
+  cycleId: string;
+  phase: "IDLE" | "ANNOUNCEMENT" | "COUNTDOWN" | "FIGHTING" | "RESOLUTION";
+  phaseStartTime: number;
+  phaseEndTime: number;
+  timeRemaining: number;
+  countdown: number | null;
+  winnerId: string | null;
+  winnerName: string | null;
+  winReason: string | null;
+  cameraTarget: string | null;
+  agent1: ShowcaseAgent | null;
+  agent2: ShowcaseAgent | null;
+};
+
+type StreamingStateResponse = {
+  type: string;
+  cycle: ShowcaseCycle;
+  leaderboard: ShowcaseLeaderboardEntry[];
+  cameraTarget: string | null;
+  shotPreset?:
+    | "auto"
+    | "countdown-wide"
+    | "fight-close"
+    | "fight-orbital"
+    | "fight-overhead"
+    | "winner-hero";
+};
+
+type DuelContextResponse = {
+  type: string;
+  cycle: Omit<ShowcaseCycle, "cameraTarget"> & {
+    agent1: ShowcaseAgent | null;
+    agent2: ShowcaseAgent | null;
+  };
+  leaderboard: ShowcaseLeaderboardEntry[];
+  cameraTarget: string | null;
+};
+
+type RecentDuel = {
+  cycleId: string;
+  winnerName: string;
+  loserName: string;
+  winReason: string;
+  finishedAt: number;
+};
+
+type LeaderboardDetailsResponse = {
+  leaderboard: ShowcaseLeaderboardEntry[];
+  cycle: ShowcaseCycle;
+  recentDuels: RecentDuel[];
+  updatedAt: number;
+};
+
+type StreamHealth = {
+  healthy?: boolean;
+  connected?: boolean;
+  stats?: {
+    healthy?: boolean;
+    spectators?: number;
+    destinations?: unknown[];
+    droppedFrames?: number;
+    backpressured?: boolean;
+    uptimeSeconds?: number;
+  };
+  error?: string;
+  message?: string;
+};
+
+type CaptureHealth = {
+  running?: boolean;
+  status?: string;
+  browserConnected?: boolean;
+  bridgeConnected?: boolean;
+  lastFrameAt?: number;
+  error?: string;
+  message?: string;
+  [key: string]: unknown;
+};
+
+type DirectorCameraState = {
+  mode: "auto" | "agent1" | "agent2" | "winner" | "target";
+  targetId: string | null;
+  resolvedTargetId: string | null;
+  shotPreset:
+    | "auto"
+    | "countdown-wide"
+    | "fight-close"
+    | "fight-orbital"
+    | "fight-overhead"
+    | "winner-hero";
+};
+
+type AdminDuelStatusResponse = {
+  directorCamera: DirectorCameraState | null;
+};
+
+function formatTimeRemaining(ms: number): string {
+  const totalSeconds = Math.max(0, Math.floor(ms / 1000));
+  const minutes = Math.floor(totalSeconds / 60);
+  const seconds = totalSeconds % 60;
+  return `${minutes}:${seconds.toString().padStart(2, "0")}`;
+}
+
+/** Human-readable phase for iframe overlay (not raw enum strings). */
+function showcasePhaseLabel(phase: string): {
+  title: string;
+  hint: string | null;
+} {
+  switch (phase) {
+    case "IDLE":
+      return { title: "Stand by", hint: "Staging the next bout" };
+    case "ANNOUNCEMENT":
+      return { title: "Coming up", hint: "Fighters heading to the ring" };
+    case "COUNTDOWN":
+      return { title: "Get ready", hint: "Combat starts momentarily" };
+    case "FIGHTING":
+      return { title: "Live", hint: "Round in progress" };
+    case "RESOLUTION":
+      return { title: "Results", hint: "Winner locked — cooldown" };
+    default:
+      return { title: phase, hint: null };
+  }
+}
+
+function formatRelativeTime(timestamp: number): string {
+  const diff = Math.max(0, Date.now() - timestamp);
+  const seconds = Math.floor(diff / 1000);
+  if (seconds < 60) return `${seconds}s ago`;
+  const minutes = Math.floor(seconds / 60);
+  if (minutes < 60) return `${minutes}m ago`;
+  const hours = Math.floor(minutes / 60);
+  return `${hours}h ago`;
+}
+
+function formatItemName(itemId: string): string {
+  return itemId
+    .replace(/_/g, " ")
+    .replace(/\b\w/g, (char) => char.toUpperCase());
+}
+
+function hpPercent(agent: ShowcaseAgent | null): number {
+  if (!agent || agent.maxHp <= 0) return 0;
+  return Math.max(0, Math.min(100, (agent.hp / agent.maxHp) * 100));
+}
+
+function HealthPill({
+  label,
+  ok,
+  detail,
+}: {
+  label: string;
+  ok: boolean;
+  detail: string;
+}) {
+  return (
+    <div className={`duel-showcase-health-pill ${ok ? "ok" : "bad"}`}>
+      <span className="dot" />
+      <span className="label">{label}</span>
+      <span className="detail">{detail}</span>
+    </div>
+  );
+}
+
+function AgentFaceoffCard({
+  agent,
+  side,
+  isWinner,
+}: {
+  agent: ShowcaseAgent | null;
+  side: "left" | "right";
+  isWinner: boolean;
+}) {
+  const loadout = (agent?.inventory || []).filter(Boolean).slice(0, 6);
+  const thought = agent?.monologues?.[0]?.content || "No recent monologue.";
+  const health = hpPercent(agent);
+
+  return (
+    <div
+      className={`duel-showcase-faceoff-card ${side} ${isWinner ? "winner" : ""}`}
+    >
+      {agent ? (
+        <>
+          <div className="duel-showcase-faceoff-top">
+            <div>
+              <div className="duel-showcase-faceoff-name">{agent.name}</div>
+              <div className="duel-showcase-faceoff-meta">
+                Cb {agent.combatLevel} · {agent.provider} · {agent.model}
+              </div>
+            </div>
+            <div className="duel-showcase-faceoff-record">
+              {agent.wins}-{agent.losses}
+            </div>
+          </div>
+          <div className="duel-showcase-faceoff-hp">
+            <div className="track">
+              <div className="fill" style={{ width: `${health}%` }} />
+            </div>
+            <div className="numbers">
+              <span>{agent.hp}</span>
+              <span>/ {agent.maxHp}</span>
+            </div>
+          </div>
+          <div className="duel-showcase-faceoff-stats">
+            <div>
+              <span>Damage</span>
+              <strong>{agent.damageDealtThisFight}</strong>
+            </div>
+            <div>
+              <span>Win Rate</span>
+              <strong>
+                {agent.wins + agent.losses > 0
+                  ? `${Math.round((agent.wins / (agent.wins + agent.losses)) * 100)}%`
+                  : "0%"}
+              </strong>
+            </div>
+          </div>
+          <div className="duel-showcase-faceoff-section">
+            <div className="section-label">Hot Mic</div>
+            <div className="section-quote">{thought}</div>
+          </div>
+          <div className="duel-showcase-faceoff-section">
+            <div className="section-label">Loadout Glimpse</div>
+            <div className="loadout-grid">
+              {loadout.length > 0 ? (
+                loadout.map((item) => (
+                  <span
+                    key={`${agent.id}-${item.slot}`}
+                    className="loadout-pill"
+                  >
+                    {formatItemName(item.itemId)}
+                    {item.quantity > 1 ? ` x${item.quantity}` : ""}
+                  </span>
+                ))
+              ) : (
+                <span className="loadout-empty">No inventory snapshot</span>
+              )}
+            </div>
+          </div>
+        </>
+      ) : (
+        <div className="duel-showcase-faceoff-empty">
+          Waiting for contestant…
+        </div>
+      )}
+    </div>
+  );
+}
+
+export const DuelArenaShowcaseScreen: React.FC = () => {
+  const [adminCode, setAdminCode] = useState(
+    () => localStorage.getItem(ADMIN_CODE_KEY) || "",
+  );
+  const [isAuthed, setIsAuthed] = useState(false);
+  const [authLoading, setAuthLoading] = useState(false);
+  const [authError, setAuthError] = useState<string | null>(null);
+  const [checkingStored, setCheckingStored] = useState(
+    () => !!localStorage.getItem(ADMIN_CODE_KEY),
+  );
+
+  const [streamState, setStreamState] = useState<StreamingStateResponse | null>(
+    null,
+  );
+  const [duelContext, setDuelContext] = useState<DuelContextResponse | null>(
+    null,
+  );
+  const [leaderboardDetails, setLeaderboardDetails] =
+    useState<LeaderboardDetailsResponse | null>(null);
+  const [streamHealth, setStreamHealth] = useState<StreamHealth | null>(null);
+  const [captureHealth, setCaptureHealth] = useState<CaptureHealth | null>(
+    null,
+  );
+  const [directorCamera, setDirectorCamera] =
+    useState<DirectorCameraState | null>(null);
+  const [directorPending, setDirectorPending] = useState(false);
+  const [cameraResetPending, setCameraResetPending] = useState(false);
+  const [debugMode, setDebugMode] = useState<"spawn" | "existing">("spawn");
+  const [debugTargetId, setDebugTargetId] = useState("");
+  const [debugExistingOpponentId, setDebugExistingOpponentId] = useState("");
+  const [debugOpponentName, setDebugOpponentName] = useState("");
+  const [debugSparbotStyle, setDebugSparbotStyle] = useState<
+    "auto" | "ranged" | "mage"
+  >("auto");
+  const [debugPending, setDebugPending] = useState(false);
+  const [debugStatus, setDebugStatus] = useState<string | null>(null);
+  const [debugCleanupPending, setDebugCleanupPending] = useState(false);
+  const [loadError, setLoadError] = useState<string | null>(null);
+  const [loadingContext, setLoadingContext] = useState(false);
+  const [autoRefresh, setAutoRefresh] = useState(true);
+
+  // Emergency controls
+  const [emergencyPending, setEmergencyPending] = useState(false);
+  const [emergencyStatus, setEmergencyStatus] = useState<string | null>(null);
+  const [isMaintenance, setIsMaintenance] = useState(false);
+
+  // Server health + logs
+  const [serverHealth, setServerHealth] = useState<{
+    uptime: number;
+    memory: { heapUsedMB: number; heapTotalMB: number; rssMB: number };
+    maintenance: boolean;
+    phase: string;
+  } | null>(null);
+  const [serverLogs, setServerLogs] = useState<
+    { ts: number; level: "info" | "warn" | "error"; msg: string }[]
+  >([]);
+  const [logsExpanded, setLogsExpanded] = useState(false);
+
+  const adminCodeRef = useRef(adminCode);
+  adminCodeRef.current = adminCode;
+  const eventSourceRef = useRef<EventSource | null>(null);
+  const contextIntervalRef = useRef<ReturnType<typeof setInterval> | null>(
+    null,
+  );
+  const healthIntervalRef = useRef<ReturnType<typeof setInterval> | null>(null);
+  const serverHealthIntervalRef = useRef<ReturnType<typeof setInterval> | null>(
+    null,
+  );
+
+  const adminFetch = useCallback(async (path: string, init?: RequestInit) => {
+    const response = await fetch(`${GAME_API_URL}${path}`, {
+      ...init,
+      headers: {
+        "Content-Type": "application/json",
+        "x-admin-code": adminCodeRef.current,
+        ...(init?.headers || {}),
+      },
+    });
+    if (response.status === 403) {
+      throw new Error("Unauthorized");
+    }
+    if (!response.ok) {
+      throw new Error(`HTTP ${response.status}`);
+    }
+    return response;
+  }, []);
+
+  // Emergency stop/start
+  const emergencyStop = useCallback(
+    async (message?: string) => {
+      setEmergencyPending(true);
+      setEmergencyStatus(null);
+      try {
+        await adminFetch("/admin/stream/emergency-stop", {
+          method: "POST",
+          body: JSON.stringify({ message }),
+        });
+        setIsMaintenance(true);
+        setEmergencyStatus("🛑 STOPPED — markets paused, overlay active");
+      } catch (e) {
+        setEmergencyStatus(
+          `Stop failed: ${e instanceof Error ? e.message : String(e)}`,
+        );
+      } finally {
+        setEmergencyPending(false);
+      }
+    },
+    [adminFetch],
+  );
+
+  const emergencyStart = useCallback(async () => {
+    setEmergencyPending(true);
+    setEmergencyStatus(null);
+    try {
+      await adminFetch("/admin/stream/emergency-start", { method: "POST" });
+      setIsMaintenance(false);
+      setEmergencyStatus("✅ STARTED — scheduling re-enabled");
+    } catch (e) {
+      setEmergencyStatus(
+        `Start failed: ${e instanceof Error ? e.message : String(e)}`,
+      );
+    } finally {
+      setEmergencyPending(false);
+    }
+  }, [adminFetch]);
+
+  // Fetch server health + logs
+  const fetchServerHealth = useCallback(async () => {
+    try {
+      const [healthRes, logsRes] = await Promise.all([
+        adminFetch("/admin/stream/health"),
+        adminFetch("/admin/stream/logs?limit=80"),
+      ]);
+      const health = (await healthRes.json()) as typeof serverHealth;
+      const { logs } = (await logsRes.json()) as { logs: typeof serverLogs };
+      setServerHealth(health);
+      setIsMaintenance(health?.maintenance ?? false);
+      setServerLogs(logs || []);
+    } catch {
+      // health fetch errors are non-fatal
+    }
+  }, [adminFetch]);
+
+  // Poll health every 5s when authed
+  useEffect(() => {
+    if (!isAuthed) return;
+    void fetchServerHealth();
+    serverHealthIntervalRef.current = setInterval(
+      () => void fetchServerHealth(),
+      5000,
+    );
+    return () => {
+      if (serverHealthIntervalRef.current)
+        clearInterval(serverHealthIntervalRef.current);
+    };
+  }, [isAuthed, fetchServerHealth]);
+
+  const tryAuth = useCallback(
+    async (code: string): Promise<boolean> => {
+      adminCodeRef.current = code;
+      try {
+        await adminFetch("/admin/stats");
+        return true;
+      } catch {
+        return false;
+      }
+    },
+    [adminFetch],
+  );
+
+  useEffect(() => {
+    const stored = localStorage.getItem(ADMIN_CODE_KEY);
+    if (!stored) {
+      setCheckingStored(false);
+      return;
+    }
+    let cancelled = false;
+    tryAuth(stored).then((ok) => {
+      if (cancelled) return;
+      if (ok) {
+        setIsAuthed(true);
+      } else {
+        localStorage.removeItem(ADMIN_CODE_KEY);
+      }
+      setCheckingStored(false);
+    });
+    return () => {
+      cancelled = true;
+    };
+  }, [tryAuth]);
+
+  const handleLogin = useCallback(async () => {
+    if (!adminCode) return;
+    setAuthLoading(true);
+    setAuthError(null);
+    const ok = await tryAuth(adminCode);
+    if (ok) {
+      setIsAuthed(true);
+      localStorage.setItem(ADMIN_CODE_KEY, adminCode);
+    } else {
+      setAuthError("Invalid code or server unreachable");
+    }
+    setAuthLoading(false);
+  }, [adminCode, tryAuth]);
+
+  const fetchContext = useCallback(async () => {
+    setLoadingContext(true);
+    try {
+      const [contextRes, detailsRes, adminStatusRes] = await Promise.all([
+        fetch(`${GAME_API_URL}/api/streaming/duel-context`),
+        fetch(
+          `${GAME_API_URL}/api/streaming/leaderboard/details?historyLimit=10`,
+        ),
+        adminFetch("/admin/duels/status"),
+      ]);
+
+      if (contextRes.ok) {
+        setDuelContext((await contextRes.json()) as DuelContextResponse);
+      }
+      if (detailsRes.ok) {
+        setLeaderboardDetails(
+          (await detailsRes.json()) as LeaderboardDetailsResponse,
+        );
+      }
+      if (adminStatusRes.ok) {
+        const adminStatus =
+          (await adminStatusRes.json()) as AdminDuelStatusResponse;
+        setDirectorCamera(adminStatus.directorCamera);
+      }
+      setLoadError(null);
+    } catch (error) {
+      setLoadError(
+        error instanceof Error ? error.message : "Failed to load duel context",
+      );
+    } finally {
+      setLoadingContext(false);
+    }
+  }, [adminFetch]);
+
+  const fetchHealth = useCallback(async () => {
+    try {
+      const [rtmpRes, captureRes] = await Promise.all([
+        fetch(`${GAME_API_URL}/api/streaming/rtmp/status`),
+        fetch(`${GAME_API_URL}/api/streaming/capture/status`),
+      ]);
+
+      if (rtmpRes.ok) {
+        setStreamHealth((await rtmpRes.json()) as StreamHealth);
+      } else {
+        setStreamHealth(
+          (await rtmpRes.json().catch(() => ({
+            error: "RTMP bridge unavailable",
+          }))) as StreamHealth,
+        );
+      }
+
+      if (captureRes.ok) {
+        setCaptureHealth((await captureRes.json()) as CaptureHealth);
+      } else {
+        setCaptureHealth(
+          (await captureRes.json().catch(() => ({
+            error: "Capture pipeline unavailable",
+          }))) as CaptureHealth,
+        );
+      }
+    } catch (error) {
+      setLoadError(
+        error instanceof Error ? error.message : "Failed to load stream health",
+      );
+    }
+  }, []);
+
+  useEffect(() => {
+    if (!isAuthed) return;
+
+    fetchContext();
+    fetchHealth();
+
+    if (eventSourceRef.current) {
+      eventSourceRef.current.close();
+      eventSourceRef.current = null;
+    }
+
+    const source = new EventSource(
+      `${GAME_API_URL}/api/streaming/state/events`,
+    );
+    const applyState = (event: MessageEvent) => {
+      try {
+        const parsed = JSON.parse(event.data) as StreamingStateResponse;
+        setStreamState(parsed);
+        setLoadError(null);
+      } catch (error) {
+        console.warn("[DuelArenaShowcase] Failed to parse SSE state:", error);
+      }
+    };
+    const handleUnavailable = (event: MessageEvent) => {
+      try {
+        const parsed = JSON.parse(event.data) as {
+          message?: string;
+          error?: string;
+        };
+        setLoadError(
+          parsed.message || parsed.error || "Streaming state unavailable",
+        );
+      } catch {
+        setLoadError("Streaming state unavailable");
+      }
+    };
+
+    source.addEventListener("state", applyState as EventListener);
+    source.addEventListener("reset", applyState as EventListener);
+    source.addEventListener("unavailable", handleUnavailable as EventListener);
+    source.onerror = () => {
+      setLoadError("Lost live stream state connection");
+    };
+    eventSourceRef.current = source;
+
+    return () => {
+      source.close();
+      if (eventSourceRef.current === source) {
+        eventSourceRef.current = null;
+      }
+    };
+  }, [isAuthed, fetchContext, fetchHealth]);
+
+  useEffect(() => {
+    if (contextIntervalRef.current) {
+      clearInterval(contextIntervalRef.current);
+      contextIntervalRef.current = null;
+    }
+    if (healthIntervalRef.current) {
+      clearInterval(healthIntervalRef.current);
+      healthIntervalRef.current = null;
+    }
+    if (!isAuthed || !autoRefresh) return;
+
+    contextIntervalRef.current = setInterval(fetchContext, CONTEXT_POLL_MS);
+    healthIntervalRef.current = setInterval(fetchHealth, HEALTH_POLL_MS);
+
+    return () => {
+      if (contextIntervalRef.current) {
+        clearInterval(contextIntervalRef.current);
+        contextIntervalRef.current = null;
+      }
+      if (healthIntervalRef.current) {
+        clearInterval(healthIntervalRef.current);
+        healthIntervalRef.current = null;
+      }
+    };
+  }, [autoRefresh, fetchContext, fetchHealth, isAuthed]);
+
+  const cycle = duelContext?.cycle || streamState?.cycle || null;
+  const leaderboard =
+    duelContext?.leaderboard ||
+    leaderboardDetails?.leaderboard ||
+    streamState?.leaderboard ||
+    [];
+  const recentDuels = leaderboardDetails?.recentDuels || [];
+  const phase = cycle?.phase || "IDLE";
+  const phaseUi = showcasePhaseLabel(phase);
+  const cameraTarget =
+    duelContext?.cameraTarget || streamState?.cameraTarget || null;
+  const winnerId = cycle?.winnerId || null;
+  const streamOk = Boolean(
+    streamHealth?.healthy ?? streamHealth?.stats?.healthy,
+  );
+  const captureOk = Boolean(
+    captureHealth?.running ??
+    captureHealth?.browserConnected ??
+    captureHealth?.bridgeConnected,
+  );
+
+  const headline = useMemo(() => {
+    if (!cycle) return "Awaiting next duel cycle";
+    if (phase === "FIGHTING" && cycle.agent1 && cycle.agent2) {
+      return `${cycle.agent1.name} vs ${cycle.agent2.name}`;
+    }
+    if (phase === "RESOLUTION" && cycle.winnerName) {
+      return `${cycle.winnerName} claims the arena`;
+    }
+    if (phase === "IDLE" || phase === "ANNOUNCEMENT") {
+      if (cycle.agent1 && cycle.agent2) {
+        return `${cycle.agent1.name} vs ${cycle.agent2.name} — on deck`;
+      }
+      return "Next duel soon";
+    }
+    return `${phase} phase live`;
+  }, [cycle, phase]);
+
+  const iframeSrc = useMemo(() => {
+    const params = new URLSearchParams({
+      page: "stream",
+      disableBridgeCapture: "1",
+    });
+    return `/?${params.toString()}`;
+  }, []);
+
+  const setDirectorMode = useCallback(
+    async (
+      mode: "auto" | "agent1" | "agent2" | "winner" | "target",
+      targetId?: string | null,
+    ) => {
+      setDirectorPending(true);
+      try {
+        const response = await adminFetch("/admin/duels/camera", {
+          method: "POST",
+          body: JSON.stringify({ mode, targetId }),
+        });
+        const data = (await response.json()) as {
+          directorCamera?: DirectorCameraState;
+        };
+        if (data.directorCamera) {
+          setDirectorCamera(data.directorCamera);
+        }
+        setLoadError(null);
+      } catch (error) {
+        setLoadError(
+          error instanceof Error
+            ? error.message
+            : "Failed to update director camera mode",
+        );
+      } finally {
+        setDirectorPending(false);
+      }
+    },
+    [adminFetch],
+  );
+
+  const resetCameraToArena = useCallback(async () => {
+    setCameraResetPending(true);
+    try {
+      const response = await adminFetch("/admin/duels/camera/reset", {
+        method: "POST",
+      });
+      const data = (await response.json()) as {
+        directorCamera?: DirectorCameraState;
+      };
+      if (data.directorCamera) setDirectorCamera(data.directorCamera);
+      setLoadError(null);
+    } catch (error) {
+      setLoadError(
+        error instanceof Error ? error.message : "Failed to reset camera",
+      );
+    } finally {
+      setCameraResetPending(false);
+    }
+  }, [adminFetch]);
+
+  const setDirectorShotPreset = useCallback(
+    async (
+      shotPreset:
+        | "auto"
+        | "countdown-wide"
+        | "fight-close"
+        | "fight-orbital"
+        | "fight-overhead"
+        | "winner-hero",
+    ) => {
+      setDirectorPending(true);
+      try {
+        const response = await adminFetch("/admin/duels/camera", {
+          method: "POST",
+          body: JSON.stringify({
+            mode: directorCamera?.mode || "auto",
+            targetId: directorCamera?.targetId,
+            shotPreset,
+          }),
+        });
+        const data = (await response.json()) as {
+          directorCamera?: DirectorCameraState;
+        };
+        if (data.directorCamera) {
+          setDirectorCamera(data.directorCamera);
+        }
+        setLoadError(null);
+      } catch (error) {
+        setLoadError(
+          error instanceof Error
+            ? error.message
+            : "Failed to update shot preset",
+        );
+      } finally {
+        setDirectorPending(false);
+      }
+    },
+    [adminFetch, directorCamera?.mode, directorCamera?.targetId],
+  );
+
+  const directorModeLabel = useMemo(() => {
+    switch (directorCamera?.mode) {
+      case "agent1":
+        return "Locked left fighter";
+      case "agent2":
+        return "Locked right fighter";
+      case "winner":
+        return "Winner hold";
+      case "target":
+        return "Custom lock";
+      case "auto":
+      default:
+        return "Auto director";
+    }
+  }, [directorCamera?.mode]);
+
+  const directorShotLabel = useMemo(() => {
+    switch (directorCamera?.shotPreset) {
+      case "countdown-wide":
+        return "Countdown wide";
+      case "fight-close":
+        return "Fight close";
+      case "fight-orbital":
+        return "Orbital";
+      case "fight-overhead":
+        return "Overhead";
+      case "winner-hero":
+        return "Winner hero";
+      case "auto":
+      default:
+        return "Auto shots";
+    }
+  }, [directorCamera?.shotPreset]);
+
+  const debugAgentOptions = useMemo(() => {
+    const seen = new Set<string>();
+    const options: Array<{ id: string; label: string }> = [];
+
+    const pushOption = (id?: string | null, name?: string | null) => {
+      if (!id || seen.has(id)) return;
+      seen.add(id);
+      options.push({
+        id,
+        label: name?.trim() || id,
+      });
+    };
+
+    pushOption(cycle?.agent1?.id, cycle?.agent1?.name);
+    pushOption(cycle?.agent2?.id, cycle?.agent2?.name);
+    leaderboard
+      .slice(0, 12)
+      .forEach((entry) => pushOption(entry.characterId, entry.name));
+
+    return options;
+  }, [
+    cycle?.agent1?.id,
+    cycle?.agent1?.name,
+    cycle?.agent2?.id,
+    cycle?.agent2?.name,
+    leaderboard,
+  ]);
+
+  const debugOpponentOptions = useMemo(
+    () => debugAgentOptions.filter((option) => option.id !== debugTargetId),
+    [debugAgentOptions, debugTargetId],
+  );
+
+  useEffect(() => {
+    if (debugAgentOptions.length === 0) {
+      if (debugTargetId) {
+        setDebugTargetId("");
+      }
+      return;
+    }
+    if (!debugAgentOptions.some((option) => option.id === debugTargetId)) {
+      setDebugTargetId(debugAgentOptions[0]?.id || "");
+    }
+  }, [debugAgentOptions, debugTargetId]);
+
+  useEffect(() => {
+    if (debugOpponentOptions.length === 0) {
+      if (debugExistingOpponentId) {
+        setDebugExistingOpponentId("");
+      }
+      return;
+    }
+    if (
+      !debugOpponentOptions.some(
+        (option) => option.id === debugExistingOpponentId,
+      )
+    ) {
+      setDebugExistingOpponentId(debugOpponentOptions[0]?.id || "");
+    }
+  }, [debugExistingOpponentId, debugOpponentOptions]);
+
+  const spawnDebugMatchup = useCallback(async () => {
+    if (!debugTargetId) return;
+    if (debugMode === "existing" && !debugExistingOpponentId) return;
+
+    setDebugPending(true);
+    setDebugStatus(null);
+    try {
+      const response = await adminFetch("/admin/duels/debug-matchup", {
+        method: "POST",
+        body: JSON.stringify({
+          targetCharacterId: debugTargetId,
+          spawnOpponent: debugMode === "spawn",
+          opponentCharacterId:
+            debugMode === "existing" ? debugExistingOpponentId : undefined,
+          opponentName:
+            debugMode === "spawn"
+              ? debugOpponentName.trim() || undefined
+              : undefined,
+          scriptedRole: "combat",
+          sparbotCombatStyle:
+            debugMode === "spawn" ? debugSparbotStyle : undefined,
+        }),
+      });
+      const data = (await response.json()) as {
+        mode?: "spawned" | "existing";
+        opponent?: { name?: string; characterId?: string };
+      };
+      const targetLabel =
+        debugAgentOptions.find((option) => option.id === debugTargetId)
+          ?.label || debugTargetId;
+      const opponentLabel =
+        debugMode === "existing"
+          ? debugOpponentOptions.find(
+              (option) => option.id === debugExistingOpponentId,
+            )?.label ||
+            data.opponent?.characterId ||
+            "selected opponent"
+          : data.opponent?.name || "debug opponent";
+      setDebugStatus(`Queued ${targetLabel} vs ${opponentLabel}`);
+      setDebugOpponentName("");
+      await fetchContext();
+    } catch (error) {
+      setDebugStatus(
+        error instanceof Error
+          ? error.message
+          : "Failed to queue debug matchup",
+      );
+    } finally {
+      setDebugPending(false);
+    }
+  }, [
+    adminFetch,
+    debugAgentOptions,
+    debugExistingOpponentId,
+    debugMode,
+    debugOpponentName,
+    debugSparbotStyle,
+    debugOpponentOptions,
+    debugTargetId,
+    fetchContext,
+  ]);
+
+  const cleanupDebugMatchups = useCallback(async () => {
+    setDebugCleanupPending(true);
+    setDebugStatus(null);
+    try {
+      const response = await adminFetch("/admin/duels/debug-matchup/cleanup", {
+        method: "POST",
+      });
+      const data = (await response.json()) as { removed?: number };
+      setDebugStatus(`Removed ${data.removed ?? 0} spawned debug bot(s)`);
+      await fetchContext();
+    } catch (error) {
+      setDebugStatus(
+        error instanceof Error ? error.message : "Failed to cleanup debug bots",
+      );
+    } finally {
+      setDebugCleanupPending(false);
+    }
+  }, [adminFetch, fetchContext]);
+
+  if (!isAuthed && checkingStored) {
+    return (
+      <div className="duel-showcase-auth-shell">
+        <div className="duel-showcase-auth-card">
+          <RefreshCw className="spin" size={36} />
+          <h1>Duel Arena Director</h1>
+          <p>Verifying staff access…</p>
+        </div>
+      </div>
+    );
+  }
+
+  if (!isAuthed) {
+    return (
+      <div className="duel-showcase-auth-shell">
+        <div className="duel-showcase-auth-card">
+          <Shield size={36} />
+          <h1>Duel Arena Director</h1>
+          <p>Moderator broadcast booth</p>
+          {authError && (
+            <div className="duel-showcase-auth-error">{authError}</div>
+          )}
+          <input
+            className="duel-showcase-auth-input"
+            type="password"
+            placeholder="Admin code"
+            value={adminCode}
+            onChange={(event) => setAdminCode(event.target.value)}
+            onKeyDown={(event) => {
+              if (event.key === "Enter" && !authLoading) {
+                void handleLogin();
+              }
+            }}
+          />
+          <button
+            className="duel-showcase-auth-button"
+            onClick={() => void handleLogin()}
+            disabled={!adminCode || authLoading}
+          >
+            {authLoading ? "Checking…" : "Authenticate"}
+          </button>
+        </div>
+      </div>
+    );
+  }
+
+  return (
+    <div className="duel-showcase">
+      <header className="duel-showcase-topbar">
+        <div>
+          <div className="eyebrow">Mods Only</div>
+          <h1>Duel Arena Director</h1>
+          <p>{headline}</p>
+        </div>
+        <div className="duel-showcase-topbar-actions">
+          <label className="duel-showcase-toggle">
+            <input
+              type="checkbox"
+              checked={autoRefresh}
+              onChange={(event) => setAutoRefresh(event.target.checked)}
+            />
+            Auto refresh
+          </label>
+          <button
+            className="duel-showcase-btn"
+            onClick={() => void fetchContext()}
+          >
+            <RefreshCw size={14} />
+            Refresh data
+          </button>
+          <a
+            className="duel-showcase-btn ghost"
+            href="/?page=stream"
+            target="_blank"
+            rel="noreferrer"
+          >
+            <ExternalLink size={14} />
+            Open full stream
+          </a>
+          <a
+            className="duel-showcase-btn ghost"
+            href="/?page=agent-monitor"
+            target="_blank"
+            rel="noreferrer"
+          >
+            <ExternalLink size={14} />
+            Agent monitor
+          </a>
+        </div>
+      </header>
+
+      {loadError && <div className="duel-showcase-error">{loadError}</div>}
+
+      <main className="duel-showcase-grid">
+        <section className="duel-showcase-stage">
+          <div className="duel-showcase-stage-header">
+            <div>
+              <div className="panel-label">Live Arena Feed</div>
+              <div className="panel-title">Cinematic duel view</div>
+            </div>
+            <div className="stage-meta">
+              <span>
+                <Signal size={13} />
+                Live camera director
+              </span>
+              {cycle?.winnerName && (
+                <span className="winner-callout">
+                  <Trophy size={13} />
+                  {cycle.winnerName}
+                </span>
+              )}
+            </div>
+          </div>
+          <div className="duel-showcase-stage-frame">
+            <iframe
+              className="duel-showcase-stage-iframe"
+              src={iframeSrc}
+              title="Duel arena live stream"
+              allow="autoplay; fullscreen"
+            />
+            <div className="duel-showcase-stage-overlay">
+              <div className="duel-showcase-stage-overlay-row">
+                <div
+                  className={`phase-badge phase-badge--${phase.toLowerCase()}`}
+                >
+                  <span className="phase-badge-title">{phaseUi.title}</span>
+                  {phaseUi.hint ? (
+                    <span className="phase-badge-hint">{phaseUi.hint}</span>
+                  ) : null}
+                </div>
+                {(phase === "IDLE" ||
+                  phase === "ANNOUNCEMENT" ||
+                  phase === "RESOLUTION") &&
+                  cycle &&
+                  cycle.timeRemaining > 0 && (
+                    <div className="intermission-timer-chip">
+                      <span className="intermission-timer-label">
+                        {phase === "RESOLUTION" ? "Next in" : "Starts in"}
+                      </span>
+                      <span className="intermission-timer-value">
+                        {formatTimeRemaining(cycle.timeRemaining)}
+                      </span>
+                    </div>
+                  )}
+              </div>
+              {cycle?.countdown !== null &&
+                cycle?.countdown !== undefined &&
+                phase === "COUNTDOWN" && (
+                  <div className="duel-showcase-stage-overlay-countdown">
+                    <div className="countdown-chip">T-{cycle.countdown}</div>
+                  </div>
+                )}
+            </div>
+          </div>
+          <div className="duel-showcase-faceoff">
+            <AgentFaceoffCard
+              agent={cycle?.agent1 || null}
+              side="left"
+              isWinner={winnerId !== null && winnerId === cycle?.agent1?.id}
+            />
+            <div className="duel-showcase-versus">
+              <Swords size={22} />
+              <span>VS</span>
+            </div>
+            <AgentFaceoffCard
+              agent={cycle?.agent2 || null}
+              side="right"
+              isWinner={winnerId !== null && winnerId === cycle?.agent2?.id}
+            />
+          </div>
+          <section className="duel-showcase-readout">
+            <div className="panel-label">Broadcast Readout</div>
+            <div className="duel-showcase-readout-grid">
+              <div
+                className={`duel-showcase-readout-card ${streamOk ? "ok" : "bad"}`}
+              >
+                <div className="duel-showcase-readout-top">
+                  <div className="duel-showcase-readout-title">
+                    <span className="dot" />
+                    Broadcast
+                  </div>
+                  <strong>{streamOk ? "Healthy" : "Offline"}</strong>
+                </div>
+                <div className="duel-showcase-readout-detail">
+                  {streamHealth?.stats?.spectators !== undefined
+                    ? `${streamHealth.stats.spectators} spectators`
+                    : streamHealth?.message || "status unknown"}
+                </div>
+              </div>
+              <div
+                className={`duel-showcase-readout-card ${captureOk ? "ok" : "bad"}`}
+              >
+                <div className="duel-showcase-readout-top">
+                  <div className="duel-showcase-readout-title">
+                    <span className="dot" />
+                    Capture
+                  </div>
+                  <strong>{captureOk ? "Ready" : "Waiting"}</strong>
+                </div>
+                <div className="duel-showcase-readout-detail">
+                  {typeof captureHealth?.status === "string"
+                    ? captureHealth.status
+                    : captureHealth?.message || "pipeline unknown"}
+                </div>
+              </div>
+              <div className="duel-showcase-readout-card">
+                <div className="duel-showcase-readout-top">
+                  <div className="duel-showcase-readout-title">
+                    <Eye size={14} />
+                    Director
+                  </div>
+                  <strong>{directorModeLabel}</strong>
+                </div>
+                <div className="duel-showcase-readout-meta">
+                  <span>Shot</span>
+                  <strong>{directorShotLabel}</strong>
+                </div>
+                <div className="duel-showcase-readout-meta">
+                  <span>Target</span>
+                  <strong>
+                    {directorCamera?.resolvedTargetId ||
+                      cameraTarget ||
+                      "auto-directing"}
+                  </strong>
+                </div>
+              </div>
+              <div className="duel-showcase-readout-card">
+                <div className="duel-showcase-readout-top">
+                  <div className="duel-showcase-readout-title">
+                    <Activity size={14} />
+                    Match State
+                  </div>
+                  <strong>{phase}</strong>
+                </div>
+                <div className="duel-showcase-readout-meta">
+                  <span>Clock</span>
+                  <strong>
+                    {cycle ? formatTimeRemaining(cycle.timeRemaining) : "--:--"}
+                  </strong>
+                </div>
+                <div className="duel-showcase-readout-meta">
+                  <span>Leaderboard</span>
+                  <strong>{leaderboard.length} agents</strong>
+                </div>
+              </div>
+            </div>
+          </section>
+        </section>
+
+        <aside className="duel-showcase-sidebar">
+          <section className="duel-showcase-panel">
+            <div className="panel-label">Director Controls</div>
+            <button
+              className="duel-showcase-btn duel-arena-reset-btn"
+              onClick={() => void resetCameraToArena()}
+              disabled={cameraResetPending || directorPending}
+              title="Force camera back to auto mode targeting the current duel arena"
+            >
+              <Radio size={14} />
+              {cameraResetPending ? "Resetting..." : "⚡ Reset to Arena"}
+            </button>
+            <div className="duel-showcase-director-meta">
+              <span>{directorModeLabel}</span>
+              <strong>
+                {directorCamera?.resolvedTargetId ||
+                  cameraTarget ||
+                  "no live target"}
+              </strong>
+            </div>
+            <div className="duel-showcase-director-grid">
+              <button
+                className={`director-btn ${directorCamera?.mode === "auto" ? "active" : ""}`}
+                onClick={() => void setDirectorMode("auto")}
+                disabled={directorPending}
+              >
+                Auto
+              </button>
+              <button
+                className={`director-btn ${directorCamera?.mode === "agent1" ? "active" : ""}`}
+                onClick={() =>
+                  void setDirectorMode("agent1", cycle?.agent1?.id || null)
+                }
+                disabled={directorPending || !cycle?.agent1}
+              >
+                Follow {cycle?.agent1?.name || "Left"}
+              </button>
+              <button
+                className={`director-btn ${directorCamera?.mode === "agent2" ? "active" : ""}`}
+                onClick={() =>
+                  void setDirectorMode("agent2", cycle?.agent2?.id || null)
+                }
+                disabled={directorPending || !cycle?.agent2}
+              >
+                Follow {cycle?.agent2?.name || "Right"}
+              </button>
+              <button
+                className={`director-btn ${directorCamera?.mode === "winner" ? "active" : ""}`}
+                onClick={() => void setDirectorMode("winner")}
+                disabled={directorPending || !cycle?.winnerId}
+              >
+                Winner hold
+              </button>
+            </div>
+            <div className="duel-showcase-director-subtitle">Shot presets</div>
+            <div className="duel-showcase-director-grid presets">
+              <button
+                className={`director-btn ${directorCamera?.shotPreset === "auto" ? "active" : ""}`}
+                onClick={() => void setDirectorShotPreset("auto")}
+                disabled={directorPending}
+              >
+                Auto shots
+              </button>
+              <button
+                className={`director-btn ${directorCamera?.shotPreset === "countdown-wide" ? "active" : ""}`}
+                onClick={() => void setDirectorShotPreset("countdown-wide")}
+                disabled={directorPending}
+              >
+                Countdown wide
+              </button>
+              <button
+                className={`director-btn ${directorCamera?.shotPreset === "fight-close" ? "active" : ""}`}
+                onClick={() => void setDirectorShotPreset("fight-close")}
+                disabled={directorPending}
+              >
+                Fight close
+              </button>
+              <button
+                className={`director-btn ${directorCamera?.shotPreset === "fight-orbital" ? "active" : ""}`}
+                onClick={() => void setDirectorShotPreset("fight-orbital")}
+                disabled={directorPending}
+              >
+                Orbital
+              </button>
+              <button
+                className={`director-btn ${directorCamera?.shotPreset === "fight-overhead" ? "active" : ""}`}
+                onClick={() => void setDirectorShotPreset("fight-overhead")}
+                disabled={directorPending}
+              >
+                Overhead
+              </button>
+              <button
+                className={`director-btn ${directorCamera?.shotPreset === "winner-hero" ? "active" : ""}`}
+                onClick={() => void setDirectorShotPreset("winner-hero")}
+                disabled={directorPending}
+              >
+                Winner hero
+              </button>
+            </div>
+          </section>
+
+          <section className="duel-showcase-panel">
+            <div className="panel-label">Debug Matchup</div>
+            <div className="duel-showcase-debug-copy">
+              Queue a selected live agent against either a fresh sparring bot or
+              another existing live agent.
+            </div>
+            <div className="duel-showcase-debug-form">
+              <select
+                className="duel-showcase-select"
+                value={debugTargetId}
+                onChange={(event) => setDebugTargetId(event.target.value)}
+                disabled={debugPending || debugAgentOptions.length === 0}
+              >
+                {debugAgentOptions.length === 0 ? (
+                  <option value="">No agents available</option>
+                ) : (
+                  debugAgentOptions.map((option) => (
+                    <option key={option.id} value={option.id}>
+                      {option.label}
+                    </option>
+                  ))
+                )}
+              </select>
+              <div className="duel-showcase-debug-mode-row">
+                <button
+                  className={`director-btn ${debugMode === "spawn" ? "active" : ""}`}
+                  onClick={() => setDebugMode("spawn")}
+                  disabled={debugPending}
+                >
+                  Fresh sparbot
+                </button>
+                <button
+                  className={`director-btn ${debugMode === "existing" ? "active" : ""}`}
+                  onClick={() => setDebugMode("existing")}
+                  disabled={debugPending}
+                >
+                  Reuse existing agent
+                </button>
+              </div>
+              {debugMode === "spawn" ? (
+                <>
+                  <div className="duel-showcase-director-subtitle">
+                    Sparbot style
+                  </div>
+                  <select
+                    className="duel-showcase-select"
+                    value={debugSparbotStyle}
+                    onChange={(event) =>
+                      setDebugSparbotStyle(
+                        event.target.value as "auto" | "ranged" | "mage",
+                      )
+                    }
+                    disabled={debugPending}
+                    aria-label="Sparbot combat style"
+                  >
+                    <option value="auto">Sparbot: auto (skills)</option>
+                    <option value="ranged">Sparbot: ranged</option>
+                    <option value="mage">Sparbot: mage</option>
+                  </select>
+                  <input
+                    className="duel-showcase-input"
+                    type="text"
+                    value={debugOpponentName}
+                    onChange={(event) =>
+                      setDebugOpponentName(event.target.value)
+                    }
+                    placeholder="Optional opponent name"
+                    disabled={debugPending}
+                  />
+                </>
+              ) : (
+                <select
+                  className="duel-showcase-select"
+                  value={debugExistingOpponentId}
+                  onChange={(event) =>
+                    setDebugExistingOpponentId(event.target.value)
+                  }
+                  disabled={debugPending || debugOpponentOptions.length === 0}
+                >
+                  {debugOpponentOptions.length === 0 ? (
+                    <option value="">No alternate agents available</option>
+                  ) : (
+                    debugOpponentOptions.map((option) => (
+                      <option key={option.id} value={option.id}>
+                        {option.label}
+                      </option>
+                    ))
+                  )}
+                </select>
+              )}
+              <button
+                className="duel-showcase-btn"
+                onClick={() => void spawnDebugMatchup()}
+                disabled={
+                  debugPending ||
+                  !debugTargetId ||
+                  (debugMode === "existing" && !debugExistingOpponentId)
+                }
+              >
+                <Bot size={14} />
+                {debugPending
+                  ? debugMode === "existing"
+                    ? "Queueing..."
+                    : "Spawning..."
+                  : debugMode === "existing"
+                    ? "Queue existing matchup"
+                    : "Spawn sparring bot"}
+              </button>
+            </div>
+            <div className="duel-showcase-debug-hint">
+              Auto shots already phase-shift between countdown, fight, and
+              finish unless you pin a preset.
+            </div>
+            <button
+              className="duel-showcase-btn ghost"
+              onClick={() => void cleanupDebugMatchups()}
+              disabled={debugCleanupPending}
+            >
+              <RefreshCw
+                size={14}
+                className={debugCleanupPending ? "spin" : undefined}
+              />
+              {debugCleanupPending
+                ? "Cleaning up..."
+                : "Remove spawned debug bots"}
+            </button>
+            {debugStatus ? (
+              <div className="duel-showcase-debug-status">{debugStatus}</div>
+            ) : null}
+          </section>
+
+          <section className="duel-showcase-panel">
+            <div className="panel-label">Director Notes</div>
+            <div className="duel-showcase-notes">
+              <div className="note-row">
+                <span>On Air</span>
+                <strong>{streamOk ? "Healthy" : "Needs attention"}</strong>
+              </div>
+              <div className="note-row">
+                <span>Capture</span>
+                <strong>{captureOk ? "Flowing" : "Degraded"}</strong>
+              </div>
+              <div className="note-row">
+                <span>Frame narrative</span>
+                <strong>
+                  {phase === "FIGHTING"
+                    ? "Let the camera ride the damage race"
+                    : phase === "RESOLUTION"
+                      ? "Hold winner celebration"
+                      : "Set up the next clash"}
+                </strong>
+              </div>
+              <div className="note-row">
+                <span>Context feed</span>
+                <strong>{loadingContext ? "Refreshing…" : "Ready"}</strong>
+              </div>
+            </div>
+          </section>
+
+          <section className="duel-showcase-panel">
+            <div className="panel-label">Leaderboard</div>
+            <div className="duel-showcase-leaderboard">
+              {leaderboard.slice(0, 8).map((entry) => (
+                <div key={entry.characterId} className="leaderboard-row">
+                  <div className="rank">#{entry.rank}</div>
+                  <div className="meta">
+                    <div className="name">{entry.name}</div>
+                    <div className="model">
+                      {entry.provider} · {entry.model}
+                    </div>
+                  </div>
+                  <div className="record">
+                    <strong>{entry.wins}</strong>
+                    <span>{Math.round(entry.winRate * 100)}%</span>
+                  </div>
+                </div>
+              ))}
+            </div>
+          </section>
+
+          {/* ── Emergency Controls ─────────────────────────────── */}
+          <section
+            className={`duel-showcase-panel emergency-panel ${isMaintenance ? "in-maintenance" : ""}`}
+          >
+            <div className="panel-label">
+              <Shield size={13} />
+              Emergency Controls
+              {isMaintenance && (
+                <span className="maintenance-badge">MAINTENANCE</span>
+              )}
+            </div>
+            <div className="emergency-btn-row">
+              <button
+                className="emergency-stop-btn"
+                onClick={() => void emergencyStop()}
+                disabled={emergencyPending || isMaintenance}
+                title="Halt scheduling, pause markets, push overlay to stream"
+              >
+                ⛔ Emergency Stop
+              </button>
+              <button
+                className="emergency-start-btn"
+                onClick={() => void emergencyStart()}
+                disabled={emergencyPending || !isMaintenance}
+                title="Re-enable duel scheduling after maintenance"
+              >
+                ▶ Resume Stream
+              </button>
+            </div>
+            {emergencyStatus && (
+              <div
+                className={`emergency-status ${isMaintenance ? "stopped" : "started"}`}
+              >
+                {emergencyStatus}
+              </div>
+            )}
+          </section>
+
+          {/* ── Server Health ──────────────────────────────────── */}
+          <section className="duel-showcase-panel">
+            <div className="panel-label">Server Health</div>
+            {serverHealth ? (
+              <div className="server-health-grid">
+                <div className="health-cell">
+                  <span>Heap</span>
+                  <strong
+                    className={
+                      serverHealth.memory.heapUsedMB > 800 ? "warn" : ""
+                    }
+                  >
+                    {serverHealth.memory.heapUsedMB} /{" "}
+                    {serverHealth.memory.heapTotalMB} MB
+                  </strong>
+                </div>
+                <div className="health-cell">
+                  <span>RSS</span>
+                  <strong>{serverHealth.memory.rssMB} MB</strong>
+                </div>
+                <div className="health-cell">
+                  <span>Uptime</span>
+                  <strong>
+                    {Math.floor(serverHealth.uptime / 60)}m{" "}
+                    {serverHealth.uptime % 60}s
+                  </strong>
+                </div>
+                <div className="health-cell">
+                  <span>Phase</span>
+                  <strong>{serverHealth.phase}</strong>
+                </div>
+              </div>
+            ) : (
+              <div className="duel-showcase-empty">Polling…</div>
+            )}
+            {/* Live Logs */}
+            <button
+              className="logs-toggle-btn"
+              onClick={() => setLogsExpanded((v) => !v)}
+            >
+              {logsExpanded ? "▲ Hide logs" : "▼ Show server logs"}
+            </button>
+            {logsExpanded && (
+              <div className="server-logs-box">
+                {serverLogs.length === 0 && (
+                  <span className="log-empty">No logs yet.</span>
+                )}
+                {[...serverLogs].reverse().map((line, i) => (
+                  <div key={i} className={`log-line log-${line.level}`}>
+                    <span className="log-ts">
+                      {new Date(line.ts).toLocaleTimeString()}
+                    </span>
+                    <span className="log-msg">{line.msg}</span>
+                  </div>
+                ))}
+              </div>
+            )}
+          </section>
+
+          <section className="duel-showcase-panel">
+            <div className="panel-label">Recent Results</div>
+            <div className="duel-showcase-recent">
+              {recentDuels.length > 0 ? (
+                recentDuels.slice(0, 8).map((duel) => (
+                  <div key={duel.cycleId} className="recent-row">
+                    <div className="recent-title">
+                      <Bot size={13} />
+                      <span>
+                        <strong>{duel.winnerName}</strong> beat {duel.loserName}
+                      </span>
+                    </div>
+                    <div className="recent-meta">
+                      <span>{duel.winReason.replace(/_/g, " ")}</span>
+                      <span>{formatRelativeTime(duel.finishedAt)}</span>
+                    </div>
+                  </div>
+                ))
+              ) : (
+                <div className="duel-showcase-empty">
+                  No recent duel history yet.
+                </div>
+              )}
+            </div>
+          </section>
+        </aside>
+      </main>
+    </div>
+  );
+};
diff --git a/packages/client/src/screens/GameClient.tsx b/packages/client/src/screens/GameClient.tsx
index 68fe8b718..800dd1292 100644
--- a/packages/client/src/screens/GameClient.tsx
+++ b/packages/client/src/screens/GameClient.tsx
@@ -1,9 +1,14 @@
 import {
+  GAME_API_URL,
   GAME_WS_URL,
   CDN_URL,
   normalizeBrowserLoopbackUrl,
 } from "@/lib/api-config";
-import type { PublicRuntimeEnv, StreamingWindow } from "@/lib/streamingWindow";
+import {
+  resolveCaptureAssetBase,
+  type PublicRuntimeEnv,
+  type StreamingWindow,
+} from "@/lib/streamingWindow";
 import { useEffect, useMemo, useRef, useState } from "react";
 import { THREE, createClientWorld, System } from "@hyperscape/shared";
 import { World } from "@hyperscape/shared";
@@ -41,8 +46,22 @@ const normalizeEnvValue = (value?: string): string | undefined => {
 const resolveCdnUrlForClient = (
   runtimeCdnUrl?: string,
   buildCdnUrl?: string,
+  runtimeApiUrl?: string,
+  preferCaptureFallback: boolean = false,
 ): string => {
   const sameOriginFallback = `${window.location.origin}/game-assets`;
+  const selectedBase = runtimeCdnUrl || buildCdnUrl;
+
+  if (preferCaptureFallback) {
+    const captureBase = resolveCaptureAssetBase(
+      selectedBase,
+      runtimeApiUrl,
+      window.location.href,
+    );
+    if (captureBase) {
+      return captureBase;
+    }
+  }
 
   if (runtimeCdnUrl) {
     return runtimeCdnUrl;
@@ -353,7 +372,15 @@ export function GameClient({
       const finalWsUrl = initialWsUrlRef.current || runtimeWsUrl || GAME_WS_URL;
       const runtimeCdnUrl = normalizeEnvValue(runtimeEnv?.PUBLIC_CDN_URL);
       const buildCdnUrl = normalizeEnvValue(CDN_URL);
-      const resolvedCdnUrl = resolveCdnUrlForClient(runtimeCdnUrl, buildCdnUrl);
+      const runtimeApiUrl =
+        normalizeEnvValue(runtimeEnv?.PUBLIC_API_URL) ||
+        normalizeEnvValue(GAME_API_URL);
+      const resolvedCdnUrl = resolveCdnUrlForClient(
+        runtimeCdnUrl,
+        buildCdnUrl,
+        runtimeApiUrl,
+        initialStreamingModeRef.current,
+      );
       const assetsUrl = resolvedCdnUrl.endsWith("/")
         ? resolvedCdnUrl
         : `${resolvedCdnUrl}/`;
diff --git a/packages/client/src/screens/HyperBetScreen.tsx b/packages/client/src/screens/HyperBetScreen.tsx
new file mode 100644
index 000000000..a02addb0e
--- /dev/null
+++ b/packages/client/src/screens/HyperBetScreen.tsx
@@ -0,0 +1,655 @@
+/**
+ * HyperBetScreen — Standalone betting page for external viewers.
+ *
+ * Features:
+ * - HLS live stream player (or Twitch embed link)
+ * - Active betting markets with odds and countdown
+ * - Solana wallet connect for placing bets
+ * - Bet history and leaderboard
+ */
+
+import React, { useState, useEffect, useRef, useCallback } from "react";
+import { useWallet } from "@solana/wallet-adapter-react";
+import { WalletMultiButton } from "@solana/wallet-adapter-react-ui";
+import Hls from "hls.js";
+import { useHyperBetState, type HyperBetMarket } from "./useHyperBetState";
+
+// ============================================================================
+// HLS Player
+// ============================================================================
+
+function HlsPlayer({ streamUrl }: { streamUrl: string }) {
+  const videoRef = useRef<HTMLVideoElement>(null);
+  const hlsRef = useRef<Hls | null>(null);
+  const [error, setError] = useState<string | null>(null);
+
+  useEffect(() => {
+    const video = videoRef.current;
+    if (!video || !streamUrl) return;
+
+    // Native HLS support (Safari)
+    if (video.canPlayType("application/vnd.apple.mpegurl")) {
+      video.src = streamUrl;
+      video.play().catch(() => {});
+      return;
+    }
+
+    if (!Hls.isSupported()) {
+      setError("HLS not supported in this browser");
+      return;
+    }
+
+    const hls = new Hls({
+      enableWorker: true,
+      lowLatencyMode: true,
+      backBufferLength: 30,
+    });
+
+    hlsRef.current = hls;
+    hls.loadSource(streamUrl);
+    hls.attachMedia(video);
+
+    hls.on(Hls.Events.MANIFEST_PARSED, () => {
+      video.play().catch(() => {});
+    });
+
+    hls.on(Hls.Events.ERROR, (_event, data) => {
+      if (data.fatal) {
+        if (data.type === Hls.ErrorTypes.NETWORK_ERROR) {
+          setError("Stream offline — waiting for next duel...");
+          setTimeout(() => hls.startLoad(), 5000);
+        } else {
+          setError("Stream error");
+        }
+      }
+    });
+
+    return () => {
+      hls.destroy();
+      hlsRef.current = null;
+    };
+  }, [streamUrl]);
+
+  return (
+    <div
+      style={{
+        position: "relative",
+        width: "100%",
+        aspectRatio: "16/9",
+        background: "#000",
+        borderRadius: 8,
+        overflow: "hidden",
+      }}
+    >
+      <video
+        ref={videoRef}
+        style={{ width: "100%", height: "100%", objectFit: "contain" }}
+        controls
+        muted
+        playsInline
+      />
+      {error && (
+        <div
+          style={{
+            position: "absolute",
+            inset: 0,
+            display: "flex",
+            alignItems: "center",
+            justifyContent: "center",
+            background: "rgba(0,0,0,0.8)",
+            color: "#888",
+            fontSize: 14,
+          }}
+        >
+          {error}
+        </div>
+      )}
+    </div>
+  );
+}
+
+// ============================================================================
+// Market Card
+// ============================================================================
+
+function MarketCard({
+  market,
+  onBetA,
+  onBetB,
+  isPlacingBet,
+}: {
+  market: HyperBetMarket;
+  onBetA: (amount: string) => void;
+  onBetB: (amount: string) => void;
+  isPlacingBet: boolean;
+}) {
+  const [betAmount, setBetAmount] = useState("10");
+  const isBettingOpen = market.status === "betting";
+  const timeLeft = Math.max(0, market.bettingClosesAt - Date.now());
+
+  const poolA = parseFloat(market.pool?.sideATotal || "0");
+  const poolB = parseFloat(market.pool?.sideBTotal || "0");
+  const total = poolA + poolB;
+  const oddsA = total > 0 ? (total / Math.max(poolA, 0.01)).toFixed(2) : "-.--";
+  const oddsB = total > 0 ? (total / Math.max(poolB, 0.01)).toFixed(2) : "-.--";
+
+  const statusColors: Record<string, { bg: string; text: string }> = {
+    betting: { bg: "#1a3a1a", text: "#4ade80" },
+    locked: { bg: "#3a3a1a", text: "#fbbf24" },
+    resolved: { bg: "#1a1a3a", text: "#60a5fa" },
+    aborted: { bg: "#3a1a1a", text: "#f87171" },
+  };
+  const statusStyle = statusColors[market.status] || statusColors.betting;
+
+  return (
+    <div
+      style={{
+        background: "rgba(255,255,255,0.03)",
+        border: "1px solid rgba(255,255,255,0.08)",
+        borderRadius: 12,
+        padding: 16,
+      }}
+    >
+      {/* Header */}
+      <div
+        style={{
+          display: "flex",
+          justifyContent: "space-between",
+          alignItems: "center",
+          marginBottom: 12,
+        }}
+      >
+        <span
+          style={{
+            fontSize: 13,
+            fontWeight: 600,
+            color: "#fff",
+            letterSpacing: 0.5,
+          }}
+        >
+          {market.agent1.name} vs {market.agent2.name}
+        </span>
+        <span
+          style={{
+            fontSize: 11,
+            padding: "2px 8px",
+            borderRadius: 4,
+            background: statusStyle.bg,
+            color: statusStyle.text,
+            textTransform: "uppercase",
+            fontWeight: 600,
+          }}
+        >
+          {market.status}
+        </span>
+      </div>
+
+      {/* Odds display */}
+      <div style={{ display: "flex", gap: 8, marginBottom: 12 }}>
+        <div
+          style={{
+            flex: 1,
+            padding: "10px 12px",
+            borderRadius: 8,
+            background: "rgba(59,130,246,0.1)",
+            border: "1px solid rgba(59,130,246,0.2)",
+            textAlign: "center",
+          }}
+        >
+          <div style={{ fontSize: 11, color: "#93c5fd", marginBottom: 4 }}>
+            {market.agent1.name}
+          </div>
+          <div style={{ fontSize: 20, fontWeight: 700, color: "#3b82f6" }}>
+            {oddsA}x
+          </div>
+          <div style={{ fontSize: 10, color: "#666", marginTop: 2 }}>
+            {poolA.toFixed(0)} GOLD ({market.pool?.sideACount || 0} bets)
+          </div>
+        </div>
+        <div
+          style={{
+            display: "flex",
+            alignItems: "center",
+            color: "#444",
+            fontWeight: 700,
+          }}
+        >
+          VS
+        </div>
+        <div
+          style={{
+            flex: 1,
+            padding: "10px 12px",
+            borderRadius: 8,
+            background: "rgba(239,68,68,0.1)",
+            border: "1px solid rgba(239,68,68,0.2)",
+            textAlign: "center",
+          }}
+        >
+          <div style={{ fontSize: 11, color: "#fca5a5", marginBottom: 4 }}>
+            {market.agent2.name}
+          </div>
+          <div style={{ fontSize: 20, fontWeight: 700, color: "#ef4444" }}>
+            {oddsB}x
+          </div>
+          <div style={{ fontSize: 10, color: "#666", marginTop: 2 }}>
+            {poolB.toFixed(0)} GOLD ({market.pool?.sideBCount || 0} bets)
+          </div>
+        </div>
+      </div>
+
+      {/* Countdown */}
+      {isBettingOpen && timeLeft > 0 && (
+        <div
+          style={{
+            textAlign: "center",
+            fontSize: 12,
+            color: "#fbbf24",
+            marginBottom: 8,
+          }}
+        >
+          Betting closes in {Math.ceil(timeLeft / 1000)}s
+        </div>
+      )}
+
+      {/* Bet input */}
+      {isBettingOpen && (
+        <div style={{ display: "flex", gap: 6, alignItems: "center" }}>
+          <input
+            type="number"
+            value={betAmount}
+            onChange={(e) => setBetAmount(e.target.value)}
+            placeholder="Amount"
+            style={{
+              flex: 1,
+              padding: "8px 10px",
+              borderRadius: 6,
+              background: "rgba(255,255,255,0.05)",
+              border: "1px solid rgba(255,255,255,0.1)",
+              color: "#fff",
+              fontSize: 13,
+              outline: "none",
+            }}
+          />
+          <button
+            onClick={() => onBetA(betAmount)}
+            disabled={isPlacingBet}
+            style={{
+              padding: "8px 14px",
+              borderRadius: 6,
+              border: "none",
+              background: "#2563eb",
+              color: "#fff",
+              fontSize: 12,
+              fontWeight: 600,
+              cursor: isPlacingBet ? "wait" : "pointer",
+              opacity: isPlacingBet ? 0.5 : 1,
+            }}
+          >
+            Bet A
+          </button>
+          <button
+            onClick={() => onBetB(betAmount)}
+            disabled={isPlacingBet}
+            style={{
+              padding: "8px 14px",
+              borderRadius: 6,
+              border: "none",
+              background: "#dc2626",
+              color: "#fff",
+              fontSize: 12,
+              fontWeight: 600,
+              cursor: isPlacingBet ? "wait" : "pointer",
+              opacity: isPlacingBet ? 0.5 : 1,
+            }}
+          >
+            Bet B
+          </button>
+        </div>
+      )}
+
+      {/* Winner */}
+      {market.status === "resolved" && market.winnerSide && (
+        <div
+          style={{
+            textAlign: "center",
+            padding: 8,
+            borderRadius: 6,
+            background: "rgba(74,222,128,0.1)",
+            color: "#4ade80",
+            fontSize: 13,
+            fontWeight: 600,
+          }}
+        >
+          Winner:{" "}
+          {market.winnerSide === "A" ? market.agent1.name : market.agent2.name}
+        </div>
+      )}
+    </div>
+  );
+}
+
+// ============================================================================
+// Main Screen
+// ============================================================================
+
+export function HyperBetScreen() {
+  const { publicKey, signMessage } = useWallet();
+  const walletAddress = publicKey?.toBase58() || null;
+  const { state, placeBet, claimWinnings } = useHyperBetState(walletAddress);
+  const [isPlacingBet, setIsPlacingBet] = useState(false);
+  const [betError, setBetError] = useState<string | null>(null);
+
+  // Countdown ticker
+  const [, setTick] = useState(0);
+  useEffect(() => {
+    const interval = setInterval(() => setTick((t) => t + 1), 1000);
+    return () => clearInterval(interval);
+  }, []);
+
+  const handleBet = useCallback(
+    async (roundId: string, side: "A" | "B", amount: string) => {
+      if (!signMessage) {
+        setBetError("Connect your wallet to place bets");
+        return;
+      }
+      setIsPlacingBet(true);
+      setBetError(null);
+      const result = await placeBet(roundId, side, amount, signMessage);
+      if (!result.success) {
+        setBetError(result.error || "Bet failed");
+      }
+      setIsPlacingBet(false);
+    },
+    [placeBet, signMessage],
+  );
+
+  const streamUrl = state.config?.streamUrl || "/live/stream.m3u8";
+
+  return (
+    <div
+      style={{
+        minHeight: "100vh",
+        background: "linear-gradient(180deg, #0b0a15 0%, #111827 100%)",
+        color: "#e0e0e0",
+      }}
+    >
+      {/* Header */}
+      <header
+        style={{
+          display: "flex",
+          justifyContent: "space-between",
+          alignItems: "center",
+          padding: "12px 24px",
+          borderBottom: "1px solid rgba(255,255,255,0.06)",
+          background: "rgba(0,0,0,0.3)",
+        }}
+      >
+        <div style={{ display: "flex", alignItems: "center", gap: 12 }}>
+          <span
+            style={{
+              fontSize: 20,
+              fontWeight: 800,
+              color: "#fbbf24",
+              letterSpacing: -0.5,
+            }}
+          >
+            HYPERBET
+          </span>
+          <span style={{ fontSize: 12, color: "#666" }}>
+            Agent Duel Betting
+          </span>
+          {state.connected && (
+            <span
+              style={{
+                width: 6,
+                height: 6,
+                borderRadius: "50%",
+                background: "#4ade80",
+                display: "inline-block",
+              }}
+              title="Connected"
+            />
+          )}
+        </div>
+
+        <div style={{ display: "flex", alignItems: "center", gap: 12 }}>
+          {state.config?.twitchChannel && (
+            <a
+              href={`https://twitch.tv/${state.config.twitchChannel}`}
+              target="_blank"
+              rel="noopener noreferrer"
+              style={{
+                fontSize: 12,
+                color: "#9146ff",
+                textDecoration: "none",
+                padding: "4px 10px",
+                borderRadius: 4,
+                border: "1px solid rgba(145,70,255,0.3)",
+              }}
+            >
+              Watch on Twitch
+            </a>
+          )}
+          <WalletMultiButton style={{ fontSize: 13, height: 36 }} />
+        </div>
+      </header>
+
+      {/* Main Layout */}
+      <div
+        style={{
+          display: "grid",
+          gridTemplateColumns: "1fr 380px",
+          gap: 20,
+          padding: 20,
+          maxWidth: 1400,
+          margin: "0 auto",
+        }}
+      >
+        {/* Left: Stream + Markets */}
+        <div style={{ display: "flex", flexDirection: "column", gap: 16 }}>
+          {/* Stream Player */}
+          <HlsPlayer streamUrl={streamUrl} />
+
+          {/* Active Markets */}
+          <div>
+            <h2
+              style={{
+                fontSize: 15,
+                fontWeight: 600,
+                color: "#fff",
+                margin: "0 0 12px 0",
+              }}
+            >
+              Active Markets
+            </h2>
+
+            {betError && (
+              <div
+                style={{
+                  padding: "8px 12px",
+                  borderRadius: 6,
+                  marginBottom: 8,
+                  background: "rgba(239,68,68,0.1)",
+                  border: "1px solid rgba(239,68,68,0.2)",
+                  color: "#f87171",
+                  fontSize: 12,
+                }}
+              >
+                {betError}
+              </div>
+            )}
+
+            {state.markets.length === 0 ? (
+              <div
+                style={{
+                  textAlign: "center",
+                  padding: 40,
+                  color: "#555",
+                  background: "rgba(255,255,255,0.02)",
+                  borderRadius: 12,
+                  border: "1px dashed rgba(255,255,255,0.06)",
+                }}
+              >
+                No active markets — waiting for next duel...
+              </div>
+            ) : (
+              <div
+                style={{ display: "flex", flexDirection: "column", gap: 12 }}
+              >
+                {state.markets.map((market) => (
+                  <MarketCard
+                    key={market.duelId}
+                    market={market}
+                    onBetA={(amount) => handleBet(market.duelId, "A", amount)}
+                    onBetB={(amount) => handleBet(market.duelId, "B", amount)}
+                    isPlacingBet={isPlacingBet}
+                  />
+                ))}
+              </div>
+            )}
+          </div>
+        </div>
+
+        {/* Right Sidebar: My Bets + Leaderboard */}
+        <div style={{ display: "flex", flexDirection: "column", gap: 16 }}>
+          {/* My Bets */}
+          {walletAddress && (
+            <div
+              style={{
+                background: "rgba(255,255,255,0.02)",
+                border: "1px solid rgba(255,255,255,0.06)",
+                borderRadius: 12,
+                padding: 16,
+              }}
+            >
+              <h3
+                style={{
+                  fontSize: 13,
+                  fontWeight: 600,
+                  color: "#fff",
+                  margin: "0 0 10px 0",
+                }}
+              >
+                My Bets
+              </h3>
+              {state.myBets.length === 0 ? (
+                <div style={{ color: "#555", fontSize: 12 }}>No bets yet</div>
+              ) : (
+                <div
+                  style={{
+                    display: "flex",
+                    flexDirection: "column",
+                    gap: 6,
+                    maxHeight: 200,
+                    overflowY: "auto",
+                  }}
+                >
+                  {state.myBets.slice(0, 10).map((bet) => (
+                    <div
+                      key={bet.id}
+                      style={{
+                        display: "flex",
+                        justifyContent: "space-between",
+                        alignItems: "center",
+                        padding: "6px 8px",
+                        borderRadius: 4,
+                        background: "rgba(255,255,255,0.02)",
+                        fontSize: 11,
+                      }}
+                    >
+                      <span
+                        style={{
+                          color: bet.side === "A" ? "#3b82f6" : "#ef4444",
+                        }}
+                      >
+                        Side {bet.side}
+                      </span>
+                      <span style={{ color: "#aaa" }}>{bet.amount} GOLD</span>
+                      <span style={{ color: "#666" }}>{bet.status}</span>
+                    </div>
+                  ))}
+                </div>
+              )}
+            </div>
+          )}
+
+          {/* Leaderboard */}
+          <div
+            style={{
+              background: "rgba(255,255,255,0.02)",
+              border: "1px solid rgba(255,255,255,0.06)",
+              borderRadius: 12,
+              padding: 16,
+              flex: 1,
+            }}
+          >
+            <h3
+              style={{
+                fontSize: 13,
+                fontWeight: 600,
+                color: "#fbbf24",
+                margin: "0 0 10px 0",
+              }}
+            >
+              Leaderboard
+            </h3>
+            {state.leaderboard.length === 0 ? (
+              <div style={{ color: "#555", fontSize: 12 }}>
+                No bets placed yet
+              </div>
+            ) : (
+              <div style={{ display: "flex", flexDirection: "column", gap: 4 }}>
+                {state.leaderboard.map((entry, i) => (
+                  <div
+                    key={entry.wallet}
+                    style={{
+                      display: "flex",
+                      justifyContent: "space-between",
+                      alignItems: "center",
+                      padding: "6px 8px",
+                      borderRadius: 4,
+                      background:
+                        i < 3 ? "rgba(251,191,36,0.05)" : "transparent",
+                      fontSize: 11,
+                    }}
+                  >
+                    <span
+                      style={{
+                        color: i < 3 ? "#fbbf24" : "#aaa",
+                        fontWeight: i < 3 ? 600 : 400,
+                      }}
+                    >
+                      #{i + 1}
+                    </span>
+                    <span
+                      style={{
+                        color: "#888",
+                        fontFamily: "monospace",
+                        fontSize: 10,
+                      }}
+                    >
+                      {entry.wallet.slice(0, 4)}...{entry.wallet.slice(-4)}
+                    </span>
+                    <span style={{ color: "#aaa" }}>
+                      {parseFloat(entry.totalWagered).toFixed(0)} GOLD
+                    </span>
+                    <span style={{ color: "#666" }}>
+                      {entry.totalBets} bets
+                    </span>
+                  </div>
+                ))}
+              </div>
+            )}
+          </div>
+
+          {/* Connection status */}
+          <div style={{ fontSize: 10, color: "#444", textAlign: "center" }}>
+            {state.connected ? "Live" : "Connecting..."} |{" "}
+            {walletAddress ? `${walletAddress.slice(0, 6)}...` : "No wallet"}
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/packages/client/src/screens/StreamingMode.tsx b/packages/client/src/screens/StreamingMode.tsx
index f5d2e1e8a..8e1e661cd 100644
--- a/packages/client/src/screens/StreamingMode.tsx
+++ b/packages/client/src/screens/StreamingMode.tsx
@@ -27,7 +27,7 @@ import type {
 } from "@hyperscape/shared";
 import { EventType, deriveStreamingGuardrailReason } from "@hyperscape/shared";
 import type { StreamingWindow } from "@/lib/streamingWindow";
-import { GAME_WS_URL, GAME_API_URL } from "../lib/api-config";
+import { GAME_API_URL, GAME_WS_URL, refreshApiConfig } from "../lib/api-config";
 import { getStreamingAccessToken } from "../lib/streamingAccessToken";
 
 /** Streaming state from server */
@@ -35,6 +35,7 @@ export interface StreamingState {
   type: "STREAMING_STATE_UPDATE";
   cycle: {
     cycleId: string;
+    duelId: string | null;
     phase: "IDLE" | "ANNOUNCEMENT" | "COUNTDOWN" | "FIGHTING" | "RESOLUTION";
     cycleStartTime: number;
     phaseStartTime: number;
@@ -42,6 +43,8 @@ export interface StreamingState {
     timeRemaining: number;
     agent1: AgentInfo | null;
     agent2: AgentInfo | null;
+    betOpenTime?: number | null;
+    betCloseTime?: number | null;
     countdown: number | null;
     fightStartTime: number | null;
     arenaPositions: {
@@ -88,6 +91,7 @@ export interface LeaderboardEntry {
   winRate: number;
   combatLevel: number;
   currentStreak: number;
+  lossStreak?: number;
 }
 
 export interface StreamingRendererHealth {
@@ -97,6 +101,133 @@ export interface StreamingRendererHealth {
   phase: StreamingState["cycle"]["phase"] | null;
 }
 
+function sameArenaPositions(
+  prev: StreamingState["cycle"]["arenaPositions"],
+  next: StreamingState["cycle"]["arenaPositions"],
+): boolean {
+  if (prev === next) return true;
+  if (!prev || !next) return false;
+  return (
+    prev.agent1[0] === next.agent1[0] &&
+    prev.agent1[1] === next.agent1[1] &&
+    prev.agent1[2] === next.agent1[2] &&
+    prev.agent2[0] === next.agent2[0] &&
+    prev.agent2[1] === next.agent2[1] &&
+    prev.agent2[2] === next.agent2[2]
+  );
+}
+
+function sameAgentInfo(
+  prev: AgentInfo | null,
+  next: AgentInfo | null,
+): boolean {
+  if (prev === next) return true;
+  if (!prev || !next) return false;
+  return (
+    prev.id === next.id &&
+    prev.name === next.name &&
+    prev.provider === next.provider &&
+    prev.model === next.model &&
+    prev.hp === next.hp &&
+    prev.maxHp === next.maxHp &&
+    prev.combatLevel === next.combatLevel &&
+    prev.wins === next.wins &&
+    prev.losses === next.losses &&
+    prev.damageDealtThisFight === next.damageDealtThisFight &&
+    prev.highestHit === next.highestHit &&
+    prev.attacksLanded === next.attacksLanded &&
+    prev.healsUsed === next.healsUsed &&
+    sameEquipment(prev.equipment, next.equipment) &&
+    sameInventory(prev.inventory, next.inventory) &&
+    prev.rank === next.rank &&
+    prev.headToHeadWins === next.headToHeadWins &&
+    prev.headToHeadLosses === next.headToHeadLosses
+  );
+}
+
+function sameEquipment(
+  prev: Record<string, string>,
+  next: Record<string, string>,
+): boolean {
+  if (prev === next) return true;
+  const prevKeys = Object.keys(prev).sort();
+  const nextKeys = Object.keys(next).sort();
+  if (prevKeys.length !== nextKeys.length) return false;
+  return prevKeys.every((key, index) => {
+    const nextKey = nextKeys[index];
+    return key === nextKey && prev[key] === next[nextKey];
+  });
+}
+
+function sameInventory(
+  prev: Array<{ itemId: string; quantity: number } | null>,
+  next: Array<{ itemId: string; quantity: number } | null>,
+): boolean {
+  if (prev === next) return true;
+  if (prev.length !== next.length) return false;
+  return prev.every((item, index) => {
+    const candidate = next[index];
+    if (item === candidate) return true;
+    if (!item || !candidate) return false;
+    return item.itemId === candidate.itemId && item.quantity === candidate.quantity;
+  });
+}
+
+function sameLeaderboard(
+  prev: LeaderboardEntry[],
+  next: LeaderboardEntry[],
+): boolean {
+  if (prev === next) return true;
+  if (prev.length !== next.length) return false;
+  return prev.every((entry, index) => {
+    const candidate = next[index];
+    return (
+      candidate !== undefined &&
+      entry.rank === candidate.rank &&
+      entry.characterId === candidate.characterId &&
+      entry.name === candidate.name &&
+      entry.provider === candidate.provider &&
+      entry.model === candidate.model &&
+      entry.wins === candidate.wins &&
+      entry.losses === candidate.losses &&
+      entry.winRate === candidate.winRate &&
+      entry.combatLevel === candidate.combatLevel &&
+      entry.currentStreak === candidate.currentStreak &&
+      entry.lossStreak === candidate.lossStreak
+    );
+  });
+}
+
+export function shouldReuseStreamingState(
+  prev: StreamingState,
+  next: StreamingState,
+): boolean {
+  const p = prev.cycle;
+  const c = next.cycle;
+
+  return (
+    c.cycleId === p.cycleId &&
+    c.duelId === p.duelId &&
+    c.phase === p.phase &&
+    c.cycleStartTime === p.cycleStartTime &&
+    c.phaseStartTime === p.phaseStartTime &&
+    c.phaseEndTime === p.phaseEndTime &&
+    c.betOpenTime === p.betOpenTime &&
+    c.betCloseTime === p.betCloseTime &&
+    c.fightStartTime === p.fightStartTime &&
+    c.countdown === p.countdown &&
+    c.winnerId === p.winnerId &&
+    c.winnerName === p.winnerName &&
+    c.winReason === p.winReason &&
+    sameAgentInfo(p.agent1, c.agent1) &&
+    sameAgentInfo(p.agent2, c.agent2) &&
+    sameArenaPositions(p.arenaPositions, c.arenaPositions) &&
+    next.cameraTarget === prev.cameraTarget &&
+    sameLeaderboard(prev.leaderboard, next.leaderboard) &&
+    Math.floor(c.timeRemaining / 1000) === Math.floor(p.timeRemaining / 1000)
+  );
+}
+
 function toGuardrailAgent(
   agent: AgentInfo | null,
 ): StreamingGuardrailAgentSnapshot | null {
@@ -212,6 +343,13 @@ export function shouldDismissStreamingLoading(params: {
   );
 }
 
+export function shouldShowStreamingLoadingOverlay(params: {
+  initError?: string | null;
+  loadingDismissed: boolean;
+}): boolean {
+  return !params.loadingDismissed && !params.initError?.trim();
+}
+
 export function StreamingMode() {
   const [streamingState, setStreamingState] = useState<StreamingState | null>(
     null,
@@ -240,10 +378,11 @@ export function StreamingMode() {
   const [streamAccessToken] = useState<string | null>(() =>
     getStreamingAccessToken(),
   );
+  const apiConfigRef = useRef(refreshApiConfig());
 
   // WebSocket URL for streaming mode (supports optional streamToken gate)
   const wsUrl = useMemo(() => {
-    const baseWsUrl = GAME_WS_URL;
+    const baseWsUrl = apiConfigRef.current.gameWsUrl || GAME_WS_URL;
     const url = new URL(baseWsUrl, window.location.href);
     url.searchParams.set("mode", "streaming");
     if (streamAccessToken) {
@@ -278,6 +417,7 @@ export function StreamingMode() {
       worldRef.current = world;
       setConnected(true);
       const win = window as StreamingWindow;
+      win.__HYPERSCAPE_STREAM_BOOT_READY__ = false;
       win.__HYPERSCAPE_STREAM_READY__ = false;
       win.__HYPERSCAPE_STREAM_RENDERER_HEALTH__ = null;
       win.__HYPERSCAPE_STREAM_BOOT_STATUS__ = "initializing";
@@ -360,11 +500,9 @@ export function StreamingMode() {
       const onStreamingStateUpdate = (data: unknown) => {
         const state = data as StreamingState;
 
-        // Initial camera lock: only needed for the very first target so
-        // the loading screen can dismiss.  After that, ClientCameraSystem
-        // handles all target switches via its own streaming:state:update
-        // subscription with smooth cinematic transitions — no loading screen.
-        markWorldReady();
+        // Initial camera lock: only needed for the very first target. READY
+        // remains the sole authority for world readiness; a live state packet
+        // must not dismiss the loading gate on its own.
         if (
           state.cameraTarget &&
           state.cameraTarget !== lastCameraTargetRef.current
@@ -381,21 +519,9 @@ export function StreamingMode() {
         // Only trigger React re-render when visible state actually changed
         setStreamingState((prev) => {
           if (!prev) return state;
-          // Skip re-render if phase, HP, countdown, and leaderboard are unchanged
-          const c = state.cycle;
-          const p = prev.cycle;
-          if (
-            c.phase === p.phase &&
-            c.countdown === p.countdown &&
-            c.winnerId === p.winnerId &&
-            c.agent1?.hp === p.agent1?.hp &&
-            c.agent2?.hp === p.agent2?.hp &&
-            c.agent1?.damageDealtThisFight === p.agent1?.damageDealtThisFight &&
-            c.agent2?.damageDealtThisFight === p.agent2?.damageDealtThisFight &&
-            Math.floor(c.timeRemaining / 1000) ===
-              Math.floor(p.timeRemaining / 1000) &&
-            state.leaderboard.length === prev.leaderboard.length
-          ) {
+          // Skip re-render only if both the visible combat state and the
+          // timing anchors are unchanged.
+          if (shouldReuseStreamingState(prev, state)) {
             return prev; // Same reference = no re-render
           }
           return state;
@@ -503,8 +629,8 @@ export function StreamingMode() {
     let warnedOnce = false;
 
     // Try to fetch initial state via HTTP. Keep retrying until WS/state arrives.
-    const baseApiUrl = GAME_API_URL;
-    const stateUrl = `${baseApiUrl}/api/streaming/state`;
+    const baseApiUrl = apiConfigRef.current.gameApiUrl || GAME_API_URL;
+    const stateUrl = new URL("/api/streaming/state", baseApiUrl).toString();
     const fetchState = () => {
       if (!mounted) return;
       const controller = new AbortController();
@@ -576,7 +702,19 @@ export function StreamingMode() {
     };
   }, [worldReady]);
 
-  // Auto-start canvas capture for HLS streaming when world is ready
+  const needsCameraLock = Boolean(streamingState?.cameraTarget);
+  const streamBootReady = shouldDismissStreamingLoading({
+    connected,
+    worldReady,
+    terrainReady,
+    hasStreamingState: streamingState !== null,
+    initError: clientInitError,
+    needsCameraLock,
+    cameraLocked,
+    phase: streamingState?.cycle.phase ?? null,
+  });
+
+  // Auto-start canvas capture for HLS streaming when world and terrain are ready
   useEffect(() => {
     if (!worldReady || !terrainReady) return;
 
@@ -912,6 +1050,7 @@ export function StreamingMode() {
   useEffect(() => {
     return () => {
       const win = window as StreamingWindow;
+      win.__HYPERSCAPE_STREAM_BOOT_READY__ = false;
       win.__HYPERSCAPE_STREAM_READY__ = false;
       win.__HYPERSCAPE_STREAM_RENDERER_HEALTH__ = null;
       win.__HYPERSCAPE_STREAM_BOOT_STATUS__ = null;
@@ -931,17 +1070,7 @@ export function StreamingMode() {
   // Loading screen is shown only during initial boot. Once everything is
   // ready for the first time, we fade out and never show it again — camera
   // target switches are handled seamlessly by ClientCameraSystem.
-  const needsCameraLock = Boolean(streamingState?.cameraTarget);
-  const isInitiallyReady = shouldDismissStreamingLoading({
-    connected,
-    worldReady,
-    terrainReady,
-    hasStreamingState: streamingState !== null,
-    initError: clientInitError,
-    needsCameraLock,
-    cameraLocked,
-    phase: streamingState?.cycle.phase ?? null,
-  });
+  const isInitiallyReady = streamBootReady;
   const rendererHealth = useMemo(
     () =>
       deriveStreamingRendererHealth({
@@ -972,9 +1101,10 @@ export function StreamingMode() {
 
   useEffect(() => {
     const win = window as StreamingWindow;
+    win.__HYPERSCAPE_STREAM_BOOT_READY__ = streamBootReady;
     win.__HYPERSCAPE_STREAM_READY__ = rendererHealth.ready;
     win.__HYPERSCAPE_STREAM_RENDERER_HEALTH__ = rendererHealth;
-  }, [rendererHealth]);
+  }, [rendererHealth, streamBootReady]);
 
   // Write boot status to a window global so the capture pipeline's renderer
   // health probe can detect loading/error state without reading DOM textContent.
diff --git a/packages/client/src/screens/useHyperBetState.ts b/packages/client/src/screens/useHyperBetState.ts
new file mode 100644
index 000000000..b39147fd2
--- /dev/null
+++ b/packages/client/src/screens/useHyperBetState.ts
@@ -0,0 +1,290 @@
+/**
+ * useHyperBetState — SSE/HTTP-based state hook for the standalone HyperBet page.
+ * Replaces useBettingPanel (which requires the game world network).
+ */
+
+/* global EventSource */
+
+import { useState, useEffect, useCallback, useRef } from "react";
+import { GAME_API_URL } from "../lib/api-config";
+
+// ============================================================================
+// Types (mirrors BettingPanel types)
+// ============================================================================
+
+export interface HyperBetMarket {
+  duelId: string;
+  agent1: { id: string; name: string };
+  agent2: { id: string; name: string };
+  status: "betting" | "locked" | "resolved" | "aborted";
+  bettingClosesAt: number;
+  createdAt: number;
+  winnerId?: string | null;
+  winnerSide?: "A" | "B" | null;
+  pool: {
+    sideATotal: string;
+    sideBTotal: string;
+    sideACount: number;
+    sideBCount: number;
+  } | null;
+}
+
+export interface HyperBetConfig {
+  streamUrl: string;
+  bettingEnabled: boolean;
+  twitchChannel: string | null;
+  youtubeChannelId: string | null;
+}
+
+export interface BetRecord {
+  id: string;
+  roundId: string;
+  side: string;
+  amount: string;
+  walletAddress: string;
+  status: string;
+  createdAt: number;
+}
+
+export interface LeaderboardEntry {
+  wallet: string;
+  totalBets: number;
+  totalWagered: string;
+}
+
+export interface HyperBetState {
+  config: HyperBetConfig | null;
+  markets: HyperBetMarket[];
+  myBets: BetRecord[];
+  leaderboard: LeaderboardEntry[];
+  connected: boolean;
+  error: string | null;
+}
+
+const API_BASE = GAME_API_URL.replace(/\/$/, "");
+
+// ============================================================================
+// Hook
+// ============================================================================
+
+export function useHyperBetState(walletAddress: string | null) {
+  const [state, setState] = useState<HyperBetState>({
+    config: null,
+    markets: [],
+    myBets: [],
+    leaderboard: [],
+    connected: false,
+    error: null,
+  });
+
+  const eventSourceRef = useRef<EventSource | null>(null);
+
+  // Fetch initial config
+  useEffect(() => {
+    fetch(`${API_BASE}/api/hyperbet/config`)
+      .then((r) => r.json())
+      .then((data: HyperBetConfig) => {
+        setState((s) => ({ ...s, config: data }));
+      })
+      .catch((err) => {
+        console.error("[HyperBet] Failed to fetch config", err);
+      });
+  }, []);
+
+  // Fetch markets
+  const refreshMarkets = useCallback(() => {
+    fetch(`${API_BASE}/api/hyperbet/markets`)
+      .then((r) => r.json())
+      .then((data: { markets: HyperBetMarket[] }) => {
+        setState((s) => ({ ...s, markets: data.markets }));
+      })
+      .catch((err) => {
+        console.error("[HyperBet] Failed to fetch markets", err);
+      });
+  }, []);
+
+  // Fetch leaderboard
+  const refreshLeaderboard = useCallback(() => {
+    fetch(`${API_BASE}/api/hyperbet/leaderboard`)
+      .then((r) => r.json())
+      .then((data: { leaderboard: LeaderboardEntry[] }) => {
+        setState((s) => ({ ...s, leaderboard: data.leaderboard }));
+      })
+      .catch((err) => {
+        console.error("[HyperBet] Failed to fetch leaderboard", err);
+      });
+  }, []);
+
+  // Fetch my bets when wallet changes
+  useEffect(() => {
+    if (!walletAddress) {
+      setState((s) => ({ ...s, myBets: [] }));
+      return;
+    }
+
+    fetch(`${API_BASE}/api/hyperbet/bets/${walletAddress}`)
+      .then((r) => r.json())
+      .then((data: { bets: BetRecord[] }) => {
+        setState((s) => ({ ...s, myBets: data.bets }));
+      })
+      .catch((err) => {
+        console.error("[HyperBet] Failed to fetch bets", err);
+      });
+  }, [walletAddress]);
+
+  // SSE connection
+  useEffect(() => {
+    refreshMarkets();
+    refreshLeaderboard();
+
+    const es = new EventSource(`${API_BASE}/api/hyperbet/events`);
+    eventSourceRef.current = es;
+
+    es.onopen = () => {
+      setState((s) => ({ ...s, connected: true, error: null }));
+    };
+
+    es.onmessage = (event) => {
+      try {
+        const data = JSON.parse(event.data) as {
+          type: string;
+          markets?: HyperBetMarket[];
+          payload?: Record<string, unknown>;
+        };
+
+        if (data.type === "snapshot" && data.markets) {
+          setState((s) => ({
+            ...s,
+            markets: data.markets as HyperBetMarket[],
+          }));
+        } else {
+          // For market events, just refresh the full market list
+          refreshMarkets();
+        }
+      } catch {
+        // Ignore parse errors
+      }
+    };
+
+    es.onerror = () => {
+      setState((s) => ({ ...s, connected: false }));
+    };
+
+    return () => {
+      es.close();
+      eventSourceRef.current = null;
+    };
+  }, [refreshMarkets, refreshLeaderboard]);
+
+  // Place bet
+  const placeBet = useCallback(
+    async (
+      roundId: string,
+      side: "A" | "B",
+      amount: string,
+      signMessage: (msg: Uint8Array) => Promise<Uint8Array>,
+    ): Promise<{ success: boolean; error?: string }> => {
+      if (!walletAddress)
+        return { success: false, error: "Wallet not connected" };
+
+      const nonce = crypto.randomUUID().slice(0, 8);
+      const timestamp = Date.now();
+      const message = `HyperBet:bet:${nonce}:${timestamp}`;
+
+      let signature: string;
+      try {
+        const msgBytes = new TextEncoder().encode(message);
+        const sigBytes = await signMessage(msgBytes);
+        signature = btoa(String.fromCharCode(...sigBytes));
+      } catch {
+        return { success: false, error: "Wallet signature rejected" };
+      }
+
+      try {
+        const resp = await fetch(`${API_BASE}/api/hyperbet/bets`, {
+          method: "POST",
+          headers: { "Content-Type": "application/json" },
+          body: JSON.stringify({
+            roundId,
+            side,
+            amount,
+            walletAddress,
+            signature,
+            message,
+          }),
+        });
+
+        const data = (await resp.json()) as {
+          success?: boolean;
+          error?: string;
+        };
+        if (!resp.ok) {
+          return { success: false, error: data.error || "Bet failed" };
+        }
+
+        // Refresh markets and bets
+        refreshMarkets();
+        if (walletAddress) {
+          fetch(`${API_BASE}/api/hyperbet/bets/${walletAddress}`)
+            .then((r) => r.json())
+            .then((d: { bets: BetRecord[] }) => {
+              setState((s) => ({ ...s, myBets: d.bets }));
+            })
+            .catch(() => {});
+        }
+
+        return { success: true };
+      } catch (err) {
+        return { success: false, error: "Network error" };
+      }
+    },
+    [walletAddress, refreshMarkets],
+  );
+
+  // Claim winnings
+  const claimWinnings = useCallback(
+    async (
+      roundId: string,
+      signMessage: (msg: Uint8Array) => Promise<Uint8Array>,
+    ): Promise<{ success: boolean; error?: string }> => {
+      if (!walletAddress)
+        return { success: false, error: "Wallet not connected" };
+
+      const nonce = crypto.randomUUID().slice(0, 8);
+      const timestamp = Date.now();
+      const message = `HyperBet:claim:${nonce}:${timestamp}`;
+
+      let signature: string;
+      try {
+        const msgBytes = new TextEncoder().encode(message);
+        const sigBytes = await signMessage(msgBytes);
+        signature = btoa(String.fromCharCode(...sigBytes));
+      } catch {
+        return { success: false, error: "Wallet signature rejected" };
+      }
+
+      try {
+        const resp = await fetch(`${API_BASE}/api/hyperbet/claims`, {
+          method: "POST",
+          headers: { "Content-Type": "application/json" },
+          body: JSON.stringify({ roundId, walletAddress, signature, message }),
+        });
+
+        const data = (await resp.json()) as {
+          success?: boolean;
+          error?: string;
+        };
+        if (!resp.ok) {
+          return { success: false, error: data.error || "Claim failed" };
+        }
+
+        return { success: true };
+      } catch {
+        return { success: false, error: "Network error" };
+      }
+    },
+    [walletAddress],
+  );
+
+  return { state, placeBet, claimWinnings, refreshMarkets };
+}
diff --git a/packages/client/src/stream.html b/packages/client/src/stream.html
index 4923cf7d4..6bdcbabc2 100644
--- a/packages/client/src/stream.html
+++ b/packages/client/src/stream.html
@@ -30,35 +30,34 @@
   <div id="root"></div>
   <script>
     (() => {
+      const globalWindow = window;
       const isTruthyUrlFlag = (rawValue) =>
         ["1", "true", "yes", "on"].includes(
           String(rawValue || "").toLowerCase(),
         );
 
-      void (async () => {
+      globalWindow.__HYPERSCAPE_STREAM_PREBOOT__ = (async () => {
         const searchParams = new URLSearchParams(window.location.search);
         const isInternalCapture = isTruthyUrlFlag(
           searchParams.get("internalCapture"),
         );
-        const productionHosts = [
-          "hyperscape.club",
-          "www.hyperscape.club",
-          "hyperscape.gg",
-          "www.hyperscape.gg",
-          "hyperscape-production.up.railway.app",
-        ];
+        const isSourceCapture = isTruthyUrlFlag(
+          searchParams.get("streamCapture"),
+        );
+        const isPublicStreamPage =
+          window.location.pathname === "/stream" ||
+          window.location.pathname === "/stream.html";
         const isLoopbackHost = [
           "localhost",
           "127.0.0.1",
           "0.0.0.0",
           "::1",
         ].includes(window.location.hostname);
-        const shouldResetProductionCaches =
-          productionHosts.includes(window.location.hostname) &&
-          !localStorage.getItem("__hyperscape_prod_sw_reset_20260407__");
         const shouldResetLocalCaches =
-          isInternalCapture || isLoopbackHost || shouldResetProductionCaches;
-        const storageKey = "__hyperscape_prod_sw_reset_20260407__";
+          isPublicStreamPage ||
+          isInternalCapture ||
+          isSourceCapture ||
+          isLoopbackHost;
         const reloadMarker = "__hyperscape_stream_sw_reset__";
         let shouldReload = false;
 
@@ -77,7 +76,7 @@
               );
               shouldReload = true;
               console.log(
-                `[stream.html] Unregistered ${registrations.length} stale service worker(s)`,
+                `[stream.html] Unregistered ${registrations.length} local service worker(s)`,
               );
             }
           } catch (error) {
@@ -102,7 +101,7 @@
               );
               shouldReload = true;
               console.log(
-                `[stream.html] Cleared ${localCacheKeys.length} stale cache bucket(s)`,
+                `[stream.html] Cleared ${localCacheKeys.length} local cache bucket(s)`,
               );
             }
           } catch (error) {
@@ -110,9 +109,6 @@
           }
         }
 
-        if (shouldResetProductionCaches) {
-          localStorage.setItem(storageKey, "1");
-        }
         if (shouldReload && !sessionStorage.getItem(reloadMarker)) {
           sessionStorage.setItem(reloadMarker, "1");
           window.location.reload();
@@ -123,7 +119,15 @@
       })();
     })();
   </script>
-  <script type="module" src="./stream.tsx"></script>
+  <script type="module">
+    try {
+      await window.__HYPERSCAPE_STREAM_PREBOOT__;
+      await import("./stream.tsx");
+    } catch (error) {
+      console.error("[stream.html] Stream bootstrap import failed:", error);
+      throw error;
+    }
+  </script>
 </body>
 
 </html>
diff --git a/packages/client/src/stream.tsx b/packages/client/src/stream.tsx
index b98d6e30d..04270de23 100644
--- a/packages/client/src/stream.tsx
+++ b/packages/client/src/stream.tsx
@@ -5,9 +5,10 @@ import { installThreeJSExtensions } from "@hyperscape/shared";
 import { Buffer } from "buffer";
 import React from "react";
 import ReactDOM from "react-dom/client";
-import { StreamingMode } from "./screens/StreamingMode";
-import { refreshApiConfig } from "./lib/api-config";
 import { ensurePublicRuntimeEnv } from "./lib/publicEnv";
+import { primeStreamingAccessTokenFromWindow } from "./lib/streamingAccessToken";
+import { resolveCaptureAssetBase } from "./lib/streamingWindow";
+import { StreamingMode } from "./screens/StreamingMode";
 
 type GlobalFlags = typeof globalThis & {
   Buffer?: typeof Buffer;
@@ -63,31 +64,73 @@ globalFlags.Buffer = Buffer;
 globalFlags.isBrowser = true;
 globalFlags.isServer = false;
 
-function syncRuntimeAssetBaseUrls(): void {
+function syncStreamRuntimeConfig(): void {
   if (typeof window === "undefined") {
     return;
   }
 
+  const searchParams = new URLSearchParams(window.location.search);
+  const isSourceCapture = ["1", "true", "yes", "on"].includes(
+    (searchParams.get("streamCapture") || "").toLowerCase(),
+  );
   const windowWithEnv = window as Window & {
-    env?: { PUBLIC_CDN_URL?: string };
+    env?: {
+      PUBLIC_CDN_URL?: string;
+      PUBLIC_ASSETS_URL?: string;
+      PUBLIC_API_URL?: string;
+    };
     __CDN_URL?: string;
     __ASSETS_URL?: string;
+    __HYPERSCAPE_CONFIG__?: {
+      mode?: string;
+      quality?: string;
+      hiddenUI?: string[];
+    };
   };
-  const envCdn = windowWithEnv.env?.PUBLIC_CDN_URL;
-  if (envCdn && typeof envCdn === "string" && envCdn !== "undefined") {
-    let resolvedCdn = envCdn;
-    if (resolvedCdn.includes("127.0.0.1") || resolvedCdn.includes("0.0.0.0")) {
-      resolvedCdn = resolvedCdn
+  const envAssets =
+    windowWithEnv.env?.PUBLIC_ASSETS_URL ?? windowWithEnv.env?.PUBLIC_CDN_URL;
+  if (envAssets && typeof envAssets === "string" && envAssets !== "undefined") {
+    const captureAssets =
+      resolveCaptureAssetBase(
+        envAssets,
+        windowWithEnv.env?.PUBLIC_API_URL,
+        window.location.href,
+      ) ?? envAssets;
+    let resolvedAssets = captureAssets;
+    if (
+      resolvedAssets.includes("127.0.0.1") ||
+      resolvedAssets.includes("0.0.0.0")
+    ) {
+      resolvedAssets = resolvedAssets
         .replace("127.0.0.1", "localhost")
         .replace("0.0.0.0", "localhost");
     }
-    windowWithEnv.__CDN_URL = resolvedCdn;
-    windowWithEnv.__ASSETS_URL = resolvedCdn;
+    windowWithEnv.__CDN_URL = resolvedAssets;
+    windowWithEnv.__ASSETS_URL = resolvedAssets;
   }
+
+  const existingViewportConfig =
+    (windowWithEnv.__HYPERSCAPE_CONFIG__ as Record<string, unknown> | undefined) ||
+    {};
+  windowWithEnv.__HYPERSCAPE_CONFIG__ = {
+    ...existingViewportConfig,
+    mode: "stream",
+    quality:
+      (existingViewportConfig["quality"] as string | undefined) ??
+      (isSourceCapture ? "high" : "low"),
+    hiddenUI:
+      (existingViewportConfig["hiddenUI"] as string[] | undefined) ?? [
+        "chat",
+        "inventory",
+        "minimap",
+        "hotbar",
+        "stats",
+      ],
+  } as typeof windowWithEnv.__HYPERSCAPE_CONFIG__;
 }
 
 // Early CDN URL initialization to prevent PhysX WASM loading race condition
-syncRuntimeAssetBaseUrls();
+syncStreamRuntimeConfig();
 
 installThreeJSExtensions();
 
@@ -120,10 +163,11 @@ async function resetLocalStreamingCaches(): Promise<void> {
   const isInternalCapture = isTruthyUrlFlag(
     searchParams.get("internalCapture"),
   );
+  const isSourceCapture = isTruthyUrlFlag(searchParams.get("streamCapture"));
   const isLoopbackHost = ["localhost", "127.0.0.1", "0.0.0.0", "::1"].includes(
     window.location.hostname,
   );
-  if (!isInternalCapture && !isLoopbackHost) {
+  if (!isInternalCapture && !isSourceCapture && !isLoopbackHost) {
     return;
   }
 
@@ -168,10 +212,10 @@ async function resetLocalStreamingCaches(): Promise<void> {
 }
 
 async function bootstrapStreamApp(): Promise<void> {
-  await ensurePublicRuntimeEnv();
-  refreshApiConfig();
-  syncRuntimeAssetBaseUrls();
   await resetLocalStreamingCaches();
+  await ensurePublicRuntimeEnv();
+  primeStreamingAccessTokenFromWindow(window);
+  syncStreamRuntimeConfig();
   mountStreamApp();
 }
 
diff --git a/packages/client/src/types/embeddedConfig.ts b/packages/client/src/types/embeddedConfig.ts
index 3a76d3b0e..4af66a0ab 100644
--- a/packages/client/src/types/embeddedConfig.ts
+++ b/packages/client/src/types/embeddedConfig.ts
@@ -7,7 +7,7 @@
 /**
  * Viewport mode options
  */
-export type ViewportMode = "spectator" | "free";
+export type ViewportMode = "spectator" | "stream" | "free";
 
 /**
  * Embedded surface variants
diff --git a/packages/client/src/types/index.ts b/packages/client/src/types/index.ts
index 7025ff2d1..a95401635 100644
--- a/packages/client/src/types/index.ts
+++ b/packages/client/src/types/index.ts
@@ -44,21 +44,20 @@ export type {
 // UI and component types
 export type {
   Field,
-  HintContextType,
   PermissionsInfo,
   PointerEventHandler,
   ChangeEventHandler,
   SelectOption,
 } from "./ui";
 
-// Player state types
+// Player state types (canonical definitions in game/types/)
 export type {
   RawEquipmentSlot,
   RawEquipmentData,
   InventorySlotViewItem,
   NetworkEventName,
-} from "./player";
-export { NetworkEvents } from "./player";
+} from "../game/types";
+export { NetworkEvents } from "../game/types";
 
 // Type guards for runtime validation
 export {
diff --git a/packages/client/src/types/player.ts b/packages/client/src/types/player.ts
deleted file mode 100644
index 5be7ac570..000000000
--- a/packages/client/src/types/player.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * Player State Types
- *
- * Shared type definitions for player state management.
- * Used by InterfaceManager, MobileInterfaceManager, and related hooks.
- *
- * @packageDocumentation
- */
-
-import type { Item } from "@hyperscape/shared";
-
-/**
- * Raw equipment slot format from server network cache
- */
-export type RawEquipmentSlot = {
-  item: Item | null;
-  itemId?: string;
-  quantity?: number; // For stackable items like arrows
-} | null;
-
-/**
- * Raw equipment data structure from server network cache
- */
-export type RawEquipmentData = {
-  weapon?: RawEquipmentSlot;
-  shield?: RawEquipmentSlot;
-  helmet?: RawEquipmentSlot;
-  body?: RawEquipmentSlot;
-  legs?: RawEquipmentSlot;
-  boots?: RawEquipmentSlot;
-  gloves?: RawEquipmentSlot;
-  cape?: RawEquipmentSlot;
-  amulet?: RawEquipmentSlot;
-  ring?: RawEquipmentSlot;
-  arrows?: RawEquipmentSlot;
-};
-
-/**
- * Inventory slot view item (simplified for UI display)
- */
-export type InventorySlotViewItem = {
-  slot: number;
-  itemId: string;
-  quantity: number;
-};
-
-/**
- * Network event names for UI interactions
- */
-export const NetworkEvents = {
-  INVENTORY_UPDATE: "inventoryUpdate",
-  EQUIPMENT_UPDATE: "equipmentUpdate",
-  STATS_UPDATE: "statsUpdate",
-  BANK_OPEN: "bankOpen",
-  BANK_CLOSE: "bankClose",
-  STORE_OPEN: "storeOpen",
-  STORE_CLOSE: "storeClose",
-  DIALOGUE_START: "dialogueStart",
-  DIALOGUE_END: "dialogueEnd",
-  SMELTING_OPEN: "smeltingOpen",
-  SMELTING_CLOSE: "smeltingClose",
-  SMITHING_OPEN: "smithingOpen",
-  SMITHING_CLOSE: "smithingClose",
-  QUEST_START_SCREEN: "questStartScreen",
-  QUEST_COMPLETE_SCREEN: "questCompleteScreen",
-  XP_LAMP_USE: "xpLampUse",
-} as const;
-
-export type NetworkEventName =
-  (typeof NetworkEvents)[keyof typeof NetworkEvents];
diff --git a/packages/client/src/types/ui.ts b/packages/client/src/types/ui.ts
index c38af9b0e..337214a51 100644
--- a/packages/client/src/types/ui.ts
+++ b/packages/client/src/types/ui.ts
@@ -35,12 +35,6 @@ export interface Field {
   buttons?: Array<{ label: string; onClick: () => void }>;
 }
 
-// Component prop types
-export interface HintContextType {
-  hint: string | null;
-  setHint: (hint: string | null) => void;
-}
-
 export interface PermissionsInfo {
   isAdmin: boolean;
   isBuilder: boolean;
diff --git a/packages/client/src/ui/components/StatusBar.tsx b/packages/client/src/ui/components/StatusBar.tsx
index d52fe7c81..b2c07e37c 100644
--- a/packages/client/src/ui/components/StatusBar.tsx
+++ b/packages/client/src/ui/components/StatusBar.tsx
@@ -8,6 +8,7 @@
  */
 
 import React, { memo, type CSSProperties } from "react";
+import { getHpColor } from "@hyperscape/shared";
 import { useTheme } from "../stores/themeStore";
 
 /** Status type */
@@ -160,16 +161,6 @@ export interface StatusOrbProps {
   style?: CSSProperties;
 }
 
-/**
- * Get label color based on HP percentage (OSRS-style)
- * Green (>50%) -> Yellow (25-50%) -> Red (<25%)
- */
-function getHpLabelColor(percent: number): string {
-  if (percent > 50) return "#22c55e"; // Green
-  if (percent > 25) return "#eab308"; // Yellow
-  return "#ef4444"; // Red
-}
-
 /**
  * Get status effect background color
  */
@@ -248,7 +239,7 @@ export const StatusOrb = memo(function StatusOrb({
   // Determine label color
   const labelColor =
     dynamicLabelColor && type === "hp"
-      ? getHpLabelColor(percent)
+      ? getHpColor(percent)
       : theme.colors.text.primary;
 
   // Use muted, darker versions of status colors for the fill
diff --git a/packages/client/src/ui/components/index.ts b/packages/client/src/ui/components/index.ts
index b129097fe..4d6ce8009 100644
--- a/packages/client/src/ui/components/index.ts
+++ b/packages/client/src/ui/components/index.ts
@@ -159,7 +159,6 @@ export { MenuButton, type MenuIconName } from "./MenuButton";
 export { MouseLeftIcon } from "./MouseLeftIcon";
 export { MouseRightIcon } from "./MouseRightIcon";
 export { MouseWheelIcon } from "./MouseWheelIcon";
-// Fields moved to game/ as it depends on CurvePane/CurvePreview
 
 // Theme utilities
 export {
diff --git a/packages/client/src/ui/types/accessibility.ts b/packages/client/src/ui/types/accessibility.ts
index 77c0cb1f5..668c9ccd0 100644
--- a/packages/client/src/ui/types/accessibility.ts
+++ b/packages/client/src/ui/types/accessibility.ts
@@ -1,92 +1,17 @@
 /**
- * Accessibility Settings Types
+ * Accessibility Types & Constants
  *
- * Defines types for accessibility features including colorblind modes,
- * high contrast, reduced motion, font sizing, and keyboard navigation.
+ * Re-exported from @hyperscape/shared — single source of truth for
+ * OSRS-accurate colorblind palettes and accessibility settings.
  *
  * @packageDocumentation
  */
-
-/** Colorblind mode options */
-export type ColorblindMode =
-  | "none"
-  | "protanopia"
-  | "deuteranopia"
-  | "tritanopia";
-
-/** Font size options */
-export type FontSizeOption = "small" | "medium" | "large" | "xlarge";
-
-/** Complete accessibility settings interface */
-export interface AccessibilitySettings {
-  /** Colorblind mode for color adjustments */
-  colorblindMode: ColorblindMode;
-  /** Enable high contrast mode for better visibility */
-  highContrast: boolean;
-  /** Reduce animations for motion sensitivity */
-  reducedMotion: boolean;
-  /** Font size preference */
-  fontSize: FontSizeOption;
-  /** Enable full keyboard navigation support */
-  keyboardNavigation: boolean;
-}
-
-/** Color overrides for colorblind modes */
-export interface ColorOverrides {
-  health?: string;
-  danger?: string;
-  success?: string;
-  mana?: string;
-  info?: string;
-  primary?: string;
-  link?: string;
-  energy?: string;
-}
-
-/**
- * Colorblind-safe color palettes
- *
- * Each mode replaces problematic color combinations with
- * distinguishable alternatives:
- * - Protanopia: Red-blind - replace red/green with blue/orange
- * - Deuteranopia: Green-blind - replace green with yellow/blue
- * - Tritanopia: Blue-blind - replace blue with green/yellow
- */
-export const COLORBLIND_PALETTES: Record<ColorblindMode, ColorOverrides> = {
-  none: {},
-  protanopia: {
-    health: "#42A5F5",
-    danger: "#FFA726",
-    success: "#42A5F5",
-    energy: "#2196F3",
-  },
-  deuteranopia: {
-    health: "#42A5F5",
-    success: "#FFD54F",
-    danger: "#FFA726",
-    energy: "#42A5F5",
-  },
-  tritanopia: {
-    mana: "#66BB6A",
-    info: "#FFD54F",
-    primary: "#26A69A",
-    link: "#26A69A",
-  },
-};
-
-/** Font size scale multipliers */
-export const FONT_SIZE_SCALE: Record<FontSizeOption, number> = {
-  small: 0.875,
-  medium: 1.0,
-  large: 1.125,
-  xlarge: 1.25,
-};
-
-/** Default accessibility settings */
-export const DEFAULT_ACCESSIBILITY_SETTINGS: AccessibilitySettings = {
-  colorblindMode: "none",
-  highContrast: false,
-  reducedMotion: false,
-  fontSize: "medium",
-  keyboardNavigation: false,
-};
+export {
+  COLORBLIND_PALETTES,
+  FONT_SIZE_SCALE,
+  DEFAULT_ACCESSIBILITY_SETTINGS,
+  type ColorblindMode,
+  type ColorOverrides,
+  type AccessibilitySettings,
+  type FontSizeOption,
+} from "@hyperscape/shared";
diff --git a/packages/client/src/ui/types/complexity.ts b/packages/client/src/ui/types/complexity.ts
index eac03ce74..76e5c00fa 100644
--- a/packages/client/src/ui/types/complexity.ts
+++ b/packages/client/src/ui/types/complexity.ts
@@ -1,126 +1,16 @@
 /**
- * Progressive Complexity Mode Types
+ * UI Complexity Types & Constants
  *
- * Defines the complexity tiering system that shows/hides features
- * based on player experience level.
+ * Re-exported from @hyperscape/shared — single source of truth for
+ * UI complexity modes and progression thresholds.
  *
  * @packageDocumentation
  */
-
-/** Complexity mode levels */
-export type ComplexityMode = "simple" | "standard" | "advanced";
-
-/** Feature visibility flags for each mode */
-export interface ComplexityFeatures {
-  /** Edit mode for customizing interface layout (advanced only) */
-  editMode: boolean;
-  /** Multiple action bars (standard+) */
-  multipleActionBars: boolean;
-  /** Combining windows into tabbed groups (standard+) */
-  windowCombining: boolean;
-  /** Advanced HUD elements like buff bars (standard+) */
-  advancedHUD: boolean;
-  /** Custom keybind configuration (standard+) */
-  customKeybinds: boolean;
-  /** Interface sharing - ability to load presets from others (all modes) */
-  interfaceSharing: boolean;
-  /** Interface sharing - ability to publish/share your own presets (standard+) */
-  interfaceSharingPublish: boolean;
-  /** Detailed tooltips with stats and requirements (standard+) */
-  detailedTooltips: boolean;
-  /** Preset hotkeys F1-F4 (standard+) */
-  presetHotkeys: boolean;
-}
-
-/** Configuration for a complexity mode */
-export interface ComplexityModeConfig {
-  /** The mode identifier */
-  mode: ComplexityMode;
-  /** Feature visibility flags */
-  features: ComplexityFeatures;
-  /** Display name for UI */
-  displayName: string;
-  /** Description for UI */
-  description: string;
-}
-
-/**
- * Feature visibility by complexity mode
- *
- * Simple: New players, minimal UI, essential features only
- * Standard: Most features unlocked, recommended for regular play
- * Advanced: All features, full customization for power users
- */
-export const COMPLEXITY_MODE_CONFIGS: Record<
-  ComplexityMode,
-  ComplexityModeConfig
-> = {
-  simple: {
-    mode: "simple",
-    displayName: "Simple",
-    description: "Streamlined interface for new players",
-    features: {
-      editMode: false,
-      multipleActionBars: false,
-      windowCombining: false,
-      advancedHUD: false,
-      customKeybinds: false,
-      interfaceSharing: true, // Can load presets from others
-      interfaceSharingPublish: false, // Cannot share own presets
-      detailedTooltips: false,
-      presetHotkeys: false,
-    },
-  },
-  standard: {
-    mode: "standard",
-    displayName: "Standard",
-    description: "Full interface with all common features",
-    features: {
-      editMode: false,
-      multipleActionBars: true,
-      windowCombining: true,
-      advancedHUD: true,
-      customKeybinds: true,
-      interfaceSharing: true,
-      interfaceSharingPublish: true,
-      detailedTooltips: true,
-      presetHotkeys: true,
-    },
-  },
-  advanced: {
-    mode: "advanced",
-    displayName: "Advanced",
-    description: "Complete customization for power users",
-    features: {
-      editMode: true,
-      multipleActionBars: true,
-      windowCombining: true,
-      advancedHUD: true,
-      customKeybinds: true,
-      interfaceSharing: true,
-      interfaceSharingPublish: true,
-      detailedTooltips: true,
-      presetHotkeys: true,
-    },
-  },
-};
-
-/** Thresholds for auto-progression prompts */
-export interface ProgressionThresholds {
-  /** Hours of playtime to suggest standard mode */
-  standardPlaytimeHours: number;
-  /** Tutorial completion to suggest standard mode */
-  tutorialComplete: boolean;
-  /** Hours of playtime to suggest advanced mode */
-  advancedPlaytimeHours: number;
-  /** Player level to suggest advanced mode */
-  advancedPlayerLevel: number;
-}
-
-/** Default progression thresholds */
-export const DEFAULT_PROGRESSION_THRESHOLDS: ProgressionThresholds = {
-  standardPlaytimeHours: 2,
-  tutorialComplete: true,
-  advancedPlaytimeHours: 10,
-  advancedPlayerLevel: 50,
-};
+export {
+  COMPLEXITY_MODE_CONFIGS,
+  DEFAULT_PROGRESSION_THRESHOLDS,
+  type ComplexityMode,
+  type ComplexityFeatures,
+  type ComplexityModeConfig,
+  type ProgressionThresholds,
+} from "@hyperscape/shared";
diff --git a/packages/client/src/utils/utils.ts b/packages/client/src/utils/utils.ts
index bd62399e3..303fdef8e 100644
--- a/packages/client/src/utils/utils.ts
+++ b/packages/client/src/utils/utils.ts
@@ -25,9 +25,16 @@
  * This is used by UI components to show/hide touch controls, adjust button sizes,
  * and optimize pointer interactions.
  */
-const coarse = window.matchMedia("(pointer: coarse)").matches;
-const noHover = window.matchMedia("(hover: none)").matches;
-const hasTouch = navigator.maxTouchPoints > 0;
+const canMatchMedia =
+  typeof window !== "undefined" && typeof window.matchMedia === "function";
+const coarse = canMatchMedia
+  ? window.matchMedia("(pointer: coarse)").matches
+  : false;
+const noHover = canMatchMedia
+  ? window.matchMedia("(hover: none)").matches
+  : false;
+const hasTouch =
+  typeof navigator !== "undefined" && navigator.maxTouchPoints > 0;
 export const isTouch = (coarse && hasTouch) || (noHover && hasTouch);
 
 /**
diff --git a/packages/client/tests/unit/components/StreamingOverlay.test.tsx b/packages/client/tests/unit/components/StreamingOverlay.test.tsx
new file mode 100644
index 000000000..b6e9ae5c8
--- /dev/null
+++ b/packages/client/tests/unit/components/StreamingOverlay.test.tsx
@@ -0,0 +1,146 @@
+import React from "react";
+import { act, render, screen } from "@testing-library/react";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { StreamingOverlay } from "../../../src/components/streaming/StreamingOverlay";
+import type { StreamingState } from "../../../src/screens/StreamingMode";
+
+vi.mock("../../../src/components/streaming/AgentStatsDisplay", () => ({
+  AgentStatsDisplay: ({ agent }: { agent: { name: string } }) => (
+    <div>{agent.name}</div>
+  ),
+}));
+
+vi.mock("../../../src/components/streaming/LeaderboardPanel", () => ({
+  LeaderboardPanel: () => <div>Leaderboard</div>,
+}));
+
+vi.mock("../../../src/components/streaming/CountdownOverlay", () => ({
+  CountdownOverlay: () => <div>Countdown overlay</div>,
+}));
+
+vi.mock("../../../src/components/streaming/VictoryOverlay", () => ({
+  VictoryOverlay: () => <div>Victory overlay</div>,
+}));
+
+vi.mock("../../../src/components/streaming/DamageFloaters", () => ({
+  DamageFloaters: () => <div>Damage floaters</div>,
+}));
+
+vi.mock("../../../src/components/streaming/PostFightStatsCard", () => ({
+  PostFightStatsCard: () => <div>Post fight stats</div>,
+}));
+
+vi.mock("../../../src/components/streaming/StreamingBettingRail", () => ({
+  StreamingBettingRail: () => <div>Betting rail</div>,
+}));
+
+vi.mock("../../../src/components/streaming/CombatLog", () => ({
+  CombatLog: () => <div>Combat log</div>,
+}));
+
+function createStreamingState(
+  overrides: Partial<StreamingState["cycle"]> = {},
+): StreamingState {
+  return {
+    type: "STREAMING_STATE_UPDATE",
+    cycle: {
+      cycleId: "cycle-1",
+      duelId: "duel-1",
+      phase: "ANNOUNCEMENT",
+      cycleStartTime: 1_000,
+      phaseStartTime: 1_000,
+      phaseEndTime: 51_000,
+      timeRemaining: 0,
+      agent1: {
+        id: "agent-a",
+        name: "Agent A",
+        provider: "provider",
+        model: "model",
+        hp: 10,
+        maxHp: 10,
+        combatLevel: 1,
+        wins: 0,
+        losses: 0,
+        damageDealtThisFight: 0,
+        highestHit: 0,
+        attacksLanded: 0,
+        healsUsed: 0,
+        equipment: {},
+        inventory: [],
+        rank: 1,
+        headToHeadWins: 0,
+        headToHeadLosses: 0,
+      },
+      agent2: {
+        id: "agent-b",
+        name: "Agent B",
+        provider: "provider",
+        model: "model",
+        hp: 10,
+        maxHp: 10,
+        combatLevel: 1,
+        wins: 0,
+        losses: 0,
+        damageDealtThisFight: 0,
+        highestHit: 0,
+        attacksLanded: 0,
+        healsUsed: 0,
+        equipment: {},
+        inventory: [],
+        rank: 2,
+        headToHeadWins: 0,
+        headToHeadLosses: 0,
+      },
+      betOpenTime: 0,
+      betCloseTime: 51_000,
+      countdown: null,
+      fightStartTime: null,
+      arenaPositions: {
+        agent1: [1, 0, 1],
+        agent2: [3, 0, 3],
+      },
+      winnerId: null,
+      winnerName: null,
+      winReason: null,
+      ...overrides,
+    },
+    leaderboard: [],
+    cameraTarget: null,
+  };
+}
+
+describe("StreamingOverlay", () => {
+  beforeEach(() => {
+    vi.useFakeTimers();
+    vi.setSystemTime(0);
+  });
+
+  afterEach(() => {
+    vi.useRealTimers();
+  });
+
+  it("ticks the announcement timer even when the parent state object does not change", () => {
+    render(<StreamingOverlay state={createStreamingState()} />);
+
+    expect(screen.getAllByText("0:51").length).toBeGreaterThan(0);
+
+    act(() => {
+      vi.advanceTimersByTime(1_250);
+      vi.setSystemTime(1_250);
+    });
+
+    expect(screen.getAllByText("0:50").length).toBeGreaterThan(0);
+  });
+
+  it("does not render the persistent lower-third banner during fights", () => {
+    render(
+      <StreamingOverlay state={createStreamingState({ phase: "FIGHTING" })} />,
+    );
+
+    expect(screen.queryByText("Hyperscape")).not.toBeInTheDocument();
+    expect(
+      screen.queryByText("Live — round in progress"),
+    ).not.toBeInTheDocument();
+    expect(screen.queryByText("AI duel arena")).not.toBeInTheDocument();
+  });
+});
diff --git a/packages/client/tests/unit/lib/captureStatus.test.ts b/packages/client/tests/unit/lib/captureStatus.test.ts
new file mode 100644
index 000000000..0fee82bfe
--- /dev/null
+++ b/packages/client/tests/unit/lib/captureStatus.test.ts
@@ -0,0 +1,38 @@
+import { describe, expect, it, vi } from "vitest";
+
+import { buildCaptureControlStatus } from "../../../src/lib/captureStatus";
+
+describe("buildCaptureControlStatus", () => {
+  it("emits absolute and relative last-chunk fields while preserving the legacy age field", () => {
+    const nowSpy = vi.spyOn(Date, "now").mockReturnValue(10_000);
+    try {
+      expect(
+        buildCaptureControlStatus({
+          recorderState: "recording",
+          wsReadyState: WebSocket.OPEN,
+          chunkCount: 4,
+          bytesSent: 2048,
+          startedAt: 9_000,
+          lastChunkAt: 9_750,
+          wsBufferedAmount: 256,
+          heapUsedBytes: 1024,
+          heapLimitBytes: 8192,
+        }),
+      ).toEqual({
+        recording: true,
+        wsConnected: true,
+        chunkCount: 4,
+        bytesSent: 2048,
+        uptime: 1000,
+        lastChunkAt: 9750,
+        lastChunkAgeMs: 250,
+        lastChunkMs: 250,
+        wsBufferedAmount: 256,
+        heapUsedBytes: 1024,
+        heapLimitBytes: 8192,
+      });
+    } finally {
+      nowSpy.mockRestore();
+    }
+  });
+});
diff --git a/packages/client/tests/unit/lib/streamCountdown.test.ts b/packages/client/tests/unit/lib/streamCountdown.test.ts
new file mode 100644
index 000000000..6027f35a5
--- /dev/null
+++ b/packages/client/tests/unit/lib/streamCountdown.test.ts
@@ -0,0 +1,45 @@
+import { describe, expect, it } from "vitest";
+
+import { resolveStreamCountdownDisplay } from "../../../src/components/streaming/streamCountdown";
+
+describe("resolveStreamCountdownDisplay", () => {
+  it("shows an honest announcement countdown until betting actually closes", () => {
+    const display = resolveStreamCountdownDisplay({
+      phase: "ANNOUNCEMENT",
+      betCloseTime: 20_000,
+      fallbackTimeRemainingMs: 500,
+      nowMs: 19_001,
+    });
+
+    expect(display.kind).toBe("timer");
+    expect(display.label).toBe("Betting closes");
+    expect(display.text).toBe("0:01");
+  });
+
+  it("shows a blank timer hold once announcement time has crossed zero", () => {
+    const display = resolveStreamCountdownDisplay({
+      phase: "ANNOUNCEMENT",
+      betCloseTime: 20_000,
+      fallbackTimeRemainingMs: 0,
+      nowMs: 20_000,
+    });
+
+    expect(display.kind).toBe("hold");
+    expect(display.holdState).toBe("preparing_arena");
+    expect(display.text).toBe("__:__");
+    expect(display.label).toBe("");
+  });
+
+  it("shows Starting... once countdown crossed zero before phase flip", () => {
+    const display = resolveStreamCountdownDisplay({
+      phase: "COUNTDOWN",
+      fightStartTime: 40_000,
+      fallbackTimeRemainingMs: 0,
+      nowMs: 40_000,
+    });
+
+    expect(display.kind).toBe("hold");
+    expect(display.holdState).toBe("starting");
+    expect(display.text).toBe("Starting...");
+  });
+});
diff --git a/packages/client/tests/unit/lib/streamingAccessToken.test.ts b/packages/client/tests/unit/lib/streamingAccessToken.test.ts
index 199aaa914..fa3930d02 100644
--- a/packages/client/tests/unit/lib/streamingAccessToken.test.ts
+++ b/packages/client/tests/unit/lib/streamingAccessToken.test.ts
@@ -47,11 +47,14 @@ describe("streamingAccessToken", () => {
     expect(resolved.nextUrl).toBeNull();
   });
 
-  it("primes from window state, scrubs the URL, and caches the token", () => {
+  it("falls back to the runtime viewer token when the URL is not tokenized", () => {
     const replaceState = vi.fn();
     const fakeWindow = {
+      env: {
+        PUBLIC_STREAMING_VIEWER_ACCESS_TOKEN: "viewer-token",
+      },
       location: {
-        href: "https://example.com/stream?foo=bar&streamToken=query-token#mode=stream",
+        href: "https://example.com/stream?foo=bar#mode=stream",
       },
       history: {
         state: { page: "stream" },
@@ -59,14 +62,57 @@ describe("streamingAccessToken", () => {
       },
     } as unknown as Window;
 
+    expect(primeStreamingAccessTokenFromWindow(fakeWindow)).toBe(
+      "viewer-token",
+    );
+    expect(replaceState).not.toHaveBeenCalled();
+  });
+
+  it("retries runtime env resolution when primed before env.js populates window.env", () => {
+    const replaceState = vi.fn();
+    const fakeWindow = {
+      location: {
+        href: "https://example.com/stream?foo=bar#mode=stream",
+      },
+      history: {
+        state: { page: "stream" },
+        replaceState,
+      },
+    } as unknown as Window & {
+      env?: { PUBLIC_STREAMING_VIEWER_ACCESS_TOKEN?: string };
+    };
+
+    expect(primeStreamingAccessTokenFromWindow(fakeWindow)).toBeNull();
+
+    fakeWindow.env = {
+      PUBLIC_STREAMING_VIEWER_ACCESS_TOKEN: "viewer-token",
+    };
+
+    expect(primeStreamingAccessTokenFromWindow(fakeWindow)).toBe("viewer-token");
+    expect(replaceState).not.toHaveBeenCalled();
+  });
+
+  it("primes from window state, scrubs the URL, and caches the token", () => {
+    const fakeWindow = {
+      location: {
+        href: "https://example.com/stream?foo=bar&streamToken=query-token#mode=stream",
+      },
+      history: {
+        state: { page: "stream" },
+        replaceState: vi.fn((_: unknown, __: string, nextUrl: string) => {
+          fakeWindow.location.href = `https://example.com${nextUrl}`;
+        }),
+      },
+    } as unknown as Window;
+
     expect(primeStreamingAccessTokenFromWindow(fakeWindow)).toBe("query-token");
-    expect(replaceState).toHaveBeenCalledWith(
+    expect(fakeWindow.history.replaceState).toHaveBeenCalledWith(
       fakeWindow.history.state,
       "",
       "/stream?foo=bar#mode=stream",
     );
     expect(primeStreamingAccessTokenFromWindow(fakeWindow)).toBe("query-token");
-    expect(replaceState).toHaveBeenCalledTimes(1);
+    expect(fakeWindow.history.replaceState).toHaveBeenCalledTimes(1);
   });
 
   it("reads the cached token without rereading window state", () => {
@@ -107,6 +153,68 @@ describe("streamingAccessToken", () => {
     }
   });
 
+  it("replaces the cached token when a later URL carries a new stream token", () => {
+    const replaceStateA = vi.fn();
+    const replaceStateB = vi.fn();
+    const firstWindow = {
+      location: {
+        href: "https://example.com/stream?streamToken=token-a",
+      },
+      history: {
+        state: null,
+        replaceState: replaceStateA,
+      },
+    } as unknown as Window;
+    const secondWindow = {
+      location: {
+        href: "https://example.com/stream?streamToken=token-b&foo=bar",
+      },
+      history: {
+        state: { page: "stream" },
+        replaceState: replaceStateB,
+      },
+    } as unknown as Window;
+
+    expect(primeStreamingAccessTokenFromWindow(firstWindow)).toBe("token-a");
+    expect(primeStreamingAccessTokenFromWindow(secondWindow)).toBe("token-b");
+    expect(replaceStateA).toHaveBeenCalledWith(null, "", "/stream");
+    expect(replaceStateB).toHaveBeenCalledWith(
+      secondWindow.history.state,
+      "",
+      "/stream?foo=bar",
+    );
+  });
+
+  it("replaces the cached token when the runtime env publishes a new viewer token", () => {
+    const firstWindow = {
+      env: {
+        PUBLIC_STREAMING_VIEWER_ACCESS_TOKEN: "viewer-a",
+      },
+      location: {
+        href: "https://example.com/stream",
+      },
+      history: {
+        state: null,
+        replaceState: vi.fn(),
+      },
+    } as unknown as Window;
+    const secondWindow = {
+      env: {
+        PUBLIC_STREAMING_VIEWER_ACCESS_TOKEN: "viewer-b",
+      },
+      location: {
+        href: "https://example.com/stream",
+      },
+      history: {
+        state: null,
+        replaceState: vi.fn(),
+      },
+    } as unknown as Window;
+
+    expect(primeStreamingAccessTokenFromWindow(firstWindow)).toBe("viewer-a");
+    expect(primeStreamingAccessTokenFromWindow(secondWindow)).toBe("viewer-b");
+  });
+
   it("resets the cached token for later calls", () => {
     const fakeWindow = {
       location: {
diff --git a/packages/client/tests/unit/lib/streamingReadiness.test.ts b/packages/client/tests/unit/lib/streamingReadiness.test.ts
new file mode 100644
index 000000000..d06397957
--- /dev/null
+++ b/packages/client/tests/unit/lib/streamingReadiness.test.ts
@@ -0,0 +1,113 @@
+import { describe, expect, it } from "vitest";
+
+import {
+  findStreamingTargetEntity,
+  isTargetAvatarReady,
+} from "../../../src/lib/streamingReadiness";
+
+/**
+ * Minimal mock world shaped like the production `Entities` manager. Real
+ * `Entities.get(id)` falls back from items to players, so the stub mirrors
+ * that to keep the test faithful to runtime behavior.
+ */
+function mockWorld(
+  setup: (players: Map<string, unknown>, items: Map<string, unknown>) => void,
+) {
+  const players = new Map<string, unknown>();
+  const items = new Map<string, unknown>();
+  setup(players, items);
+  return {
+    entities: {
+      get: (id: string) => items.get(id) ?? players.get(id) ?? null,
+      players,
+      items,
+    },
+  } as unknown as import("@hyperscape/shared").World;
+}
+
+describe("isTargetAvatarReady", () => {
+  it("returns true when the entity is in players with avatar set", () => {
+    const world = mockWorld((players) => {
+      players.set("agent-1", { id: "agent-1", avatar: {} });
+    });
+
+    expect(isTargetAvatarReady(world, "agent-1")).toBe(true);
+  });
+
+  it("returns true when the entity is only in items with a fallback avatar root (regression pin)", () => {
+    // Regression pin: the previous implementation walked only
+    // world.entities.players and missed entities that the spectator snapshot
+    // pipeline routed exclusively through items. Commit 33dab353f stopped
+    // masking this with a grace timer, so the capture page sat in degraded
+    // state indefinitely. This test fails against that implementation and
+    // passes against the unified helper.
+    const world = mockWorld((_players, items) => {
+      items.set("agent-1", { id: "agent-1", _fallbackAvatarRoot: {} });
+    });
+
+    expect(isTargetAvatarReady(world, "agent-1")).toBe(true);
+  });
+
+  it("returns true when the entity is in items with a mesh set", () => {
+    const world = mockWorld((_players, items) => {
+      items.set("agent-1", { id: "agent-1", mesh: {} });
+    });
+
+    expect(isTargetAvatarReady(world, "agent-1")).toBe(true);
+  });
+
+  it("returns false when the entity is absent from both collections", () => {
+    const world = mockWorld(() => {});
+
+    expect(isTargetAvatarReady(world, "agent-1")).toBe(false);
+  });
+
+  it("returns false when the entity is present but all avatar fields are null", () => {
+    const world = mockWorld((players) => {
+      players.set("agent-1", { id: "agent-1" });
+    });
+
+    expect(isTargetAvatarReady(world, "agent-1")).toBe(false);
+  });
+});
+
+describe("findStreamingTargetEntity", () => {
+  it("matches by direct map key in the players collection", () => {
+    const entity = { id: "agent-1" };
+    const world = mockWorld((players) => players.set("agent-1", entity));
+
+    expect(findStreamingTargetEntity(world, "agent-1")).toBe(entity);
+  });
+
+  it("matches by direct map key in the items collection", () => {
+    const entity = { id: "agent-1" };
+    const world = mockWorld((_players, items) => items.set("agent-1", entity));
+
+    expect(findStreamingTargetEntity(world, "agent-1")).toBe(entity);
+  });
+
+  it("matches by data.characterId when the map key differs from the target id", () => {
+    const entity = {
+      id: "namespaced:agent-1",
+      data: { characterId: "agent-1" },
+    };
+    const world = mockWorld((_players, items) =>
+      items.set("namespaced:agent-1", entity),
+    );
+
+    expect(findStreamingTargetEntity(world, "agent-1")).toBe(entity);
+  });
+
+  it("matches by characterId alias on the player instance", () => {
+    const entity = { id: "some-guid", characterId: "agent-1" };
+    const world = mockWorld((players) => players.set("some-guid", entity));
+
+    expect(findStreamingTargetEntity(world, "agent-1")).toBe(entity);
+  });
+
+  it("returns null when no collection contains a matching entity", () => {
+    const world = mockWorld(() => {});
+
+    expect(findStreamingTargetEntity(world, "agent-1")).toBe(null);
+  });
+});
diff --git a/packages/client/tests/unit/runtime/clientViewportMode.test.ts b/packages/client/tests/unit/runtime/clientViewportMode.test.ts
new file mode 100644
index 000000000..30c448cea
--- /dev/null
+++ b/packages/client/tests/unit/runtime/clientViewportMode.test.ts
@@ -0,0 +1,71 @@
+import { describe, expect, it } from "vitest";
+import {
+  getViewportMode,
+  isDedicatedStreamViewport,
+  isEmbeddedSpectatorViewport,
+  isStreamPageRoute,
+  isStreamingLikeViewport,
+} from "../../../../shared/src/runtime/clientViewportMode";
+
+function createViewportWindow(params: {
+  url: string;
+  mode?: string;
+  embedded?: boolean;
+}): Window {
+  const parsed = new URL(params.url);
+  return {
+    location: {
+      pathname: parsed.pathname,
+      search: parsed.search,
+    },
+    __HYPERSCAPE_CONFIG__: params.mode ? { mode: params.mode } : undefined,
+    __HYPERSCAPE_EMBEDDED__: params.embedded === true,
+  } as unknown as Window;
+}
+
+describe("clientViewportMode", () => {
+  it("recognizes all supported stream route variants", () => {
+    expect(
+      isStreamPageRoute(
+        createViewportWindow({ url: "https://example.com/stream" }),
+      ),
+    ).toBe(true);
+    expect(
+      isStreamPageRoute(
+        createViewportWindow({ url: "https://example.com/stream/" }),
+      ),
+    ).toBe(true);
+    expect(
+      isStreamPageRoute(
+        createViewportWindow({ url: "https://example.com/stream.html" }),
+      ),
+    ).toBe(true);
+    expect(
+      isStreamPageRoute(
+        createViewportWindow({ url: "https://example.com/arena?page=stream" }),
+      ),
+    ).toBe(true);
+  });
+
+  it("treats explicit stream mode as a dedicated stream viewport", () => {
+    const windowRef = createViewportWindow({
+      url: "https://example.com/arena?mode=stream",
+    });
+
+    expect(getViewportMode(windowRef)).toBe("stream");
+    expect(isDedicatedStreamViewport(windowRef)).toBe(true);
+    expect(isStreamingLikeViewport(windowRef)).toBe(true);
+  });
+
+  it("keeps embedded spectator mode streaming-like without treating it as the dedicated stream preset", () => {
+    const windowRef = createViewportWindow({
+      url: "https://example.com/embed?embedded=true&mode=spectator",
+      mode: "spectator",
+      embedded: true,
+    });
+
+    expect(isEmbeddedSpectatorViewport(windowRef)).toBe(true);
+    expect(isDedicatedStreamViewport(windowRef)).toBe(false);
+    expect(isStreamingLikeViewport(windowRef)).toBe(true);
+  });
+});
diff --git a/packages/client/tests/unit/screens/GameClient.test.tsx b/packages/client/tests/unit/screens/GameClient.test.tsx
index dfb97a332..6ba131c8f 100644
--- a/packages/client/tests/unit/screens/GameClient.test.tsx
+++ b/packages/client/tests/unit/screens/GameClient.test.tsx
@@ -49,6 +49,7 @@ vi.mock("../../../src/lib/ThreeResourceManager", () => ({
 }));
 
 vi.mock("../../../src/lib/api-config", () => ({
+  GAME_API_URL: "http://game.example/api",
   GAME_WS_URL: "ws://game.example/ws",
   CDN_URL: "https://cdn.example/assets",
   normalizeBrowserLoopbackUrl: (value?: string) => value,
diff --git a/packages/client/tests/unit/screens/StreamingMode.component.test.tsx b/packages/client/tests/unit/screens/StreamingMode.component.test.tsx
index ad06ec098..56abcf0cb 100644
--- a/packages/client/tests/unit/screens/StreamingMode.component.test.tsx
+++ b/packages/client/tests/unit/screens/StreamingMode.component.test.tsx
@@ -1,5 +1,5 @@
 import React, { useEffect } from "react";
-import { render, waitFor } from "@testing-library/react";
+import { act, render, waitFor } from "@testing-library/react";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import { EventType } from "@hyperscape/shared";
 import { StreamingMode } from "../../../src/screens/StreamingMode";
@@ -10,6 +10,7 @@ const gameClientState = vi.hoisted(() => ({
   mode: "setup" as "setup" | "init-error",
   wsUrl: null as string | null,
   world: null as ReturnType<typeof createMockWorld> | null,
+  emitReadyEvent: true,
 }));
 
 function createMockWorld() {
@@ -70,6 +71,12 @@ function createMockWorld() {
 vi.mock("../../../src/lib/api-config", () => ({
   GAME_API_URL: "http://localhost:5555",
   GAME_WS_URL: "ws://localhost:5555/ws",
+  refreshApiConfig: () => ({
+    cdnUrl: "https://runtime.example/game-assets",
+    elizaOsUrl: "http://localhost:5555",
+    gameApiUrl: "https://runtime.example",
+    gameWsUrl: "wss://runtime.example/ws",
+  }),
 }));
 
 vi.mock("../../../src/lib/streamingAccessToken", () => ({
@@ -95,7 +102,9 @@ vi.mock("../../../src/screens/GameClient", () => ({
       const world = createMockWorld();
       gameClientState.world = world;
       onSetup(world);
-      world.emitLocal(EventType.READY);
+      if (gameClientState.emitReadyEvent) {
+        world.emitLocal(EventType.READY);
+      }
     }, [onInitError, onSetup, wsUrl]);
 
     return <div data-testid="game-client" />;
@@ -193,6 +202,7 @@ describe("StreamingMode component", () => {
     gameClientState.mode = "setup";
     gameClientState.wsUrl = null;
     gameClientState.world = null;
+    gameClientState.emitReadyEvent = true;
     vi.stubGlobal(
       "fetch",
       vi.fn(async () => ({
@@ -200,6 +210,13 @@ describe("StreamingMode component", () => {
         json: async () => createStreamingState(),
       })),
     );
+    (
+      window as Window & {
+        __HYPERSCAPE_STREAM_BOOT_READY__?: boolean;
+        __HYPERSCAPE_STREAM_READY__?: boolean;
+        __HYPERSCAPE_STREAM_RENDERER_HEALTH__?: unknown;
+      }
+    ).__HYPERSCAPE_STREAM_BOOT_READY__ = false;
     (
       window as Window & {
         __HYPERSCAPE_STREAM_READY__?: boolean;
@@ -223,6 +240,7 @@ describe("StreamingMode component", () => {
 
     await waitFor(() => {
       expect(gameClientState.wsUrl).toContain("streamToken=stream-token");
+      expect(gameClientState.wsUrl).toContain("wss://runtime.example/ws");
     });
   });
 
@@ -233,6 +251,13 @@ describe("StreamingMode component", () => {
 
     await waitFor(() => {
       expect(queryByTestId("loading-screen")).toBeNull();
+      expect(
+        (
+          window as Window & {
+            __HYPERSCAPE_STREAM_BOOT_READY__?: boolean;
+          }
+        ).__HYPERSCAPE_STREAM_BOOT_READY__,
+      ).toBe(true);
       expect(
         (window as Window & { __HYPERSCAPE_STREAM_READY__?: boolean })
           .__HYPERSCAPE_STREAM_READY__,
@@ -241,6 +266,65 @@ describe("StreamingMode component", () => {
     });
   });
 
+  it("keeps the loading overlay up without a READY event even when stream data arrives", async () => {
+    gameClientState.emitReadyEvent = false;
+
+    const { queryByTestId, getByTestId } = render(<StreamingMode />);
+
+    expect(getByTestId("loading-screen")).toBeTruthy();
+
+    await waitFor(() => {
+      expect(queryByTestId("loading-screen")).toBeTruthy();
+      expect(
+        (
+          window as Window & {
+            __HYPERSCAPE_STREAM_BOOT_READY__?: boolean;
+            __HYPERSCAPE_STREAM_READY__?: boolean;
+          }
+        ).__HYPERSCAPE_STREAM_BOOT_READY__,
+      ).toBe(false);
+      expect(
+        (window as Window & { __HYPERSCAPE_STREAM_READY__?: boolean })
+          .__HYPERSCAPE_STREAM_READY__,
+      ).toBe(false);
+      expect(getByTestId("streaming-overlay").textContent).toBe("FIGHTING");
+    });
+  });
+
+  it("keeps the loading overlay up when websocket state arrives before READY", async () => {
+    gameClientState.emitReadyEvent = false;
+
+    const { queryByTestId, getByTestId } = render(<StreamingMode />);
+
+    await waitFor(() => {
+      expect(gameClientState.world).toBeTruthy();
+    });
+
+    act(() => {
+      gameClientState.world?.emitLocal(
+        "streaming:state:update",
+        createStreamingState(),
+      );
+    });
+
+    await waitFor(() => {
+      expect(queryByTestId("loading-screen")).toBeTruthy();
+      expect(
+        (
+          window as Window & {
+            __HYPERSCAPE_STREAM_BOOT_READY__?: boolean;
+            __HYPERSCAPE_STREAM_READY__?: boolean;
+          }
+        ).__HYPERSCAPE_STREAM_BOOT_READY__,
+      ).toBe(false);
+      expect(
+        (window as Window & { __HYPERSCAPE_STREAM_READY__?: boolean })
+          .__HYPERSCAPE_STREAM_READY__,
+      ).toBe(false);
+      expect(getByTestId("streaming-overlay").textContent).toBe("FIGHTING");
+    });
+  });
+
   it("keeps the renderer degraded when initialization fails", async () => {
     gameClientState.mode = "init-error";
 
diff --git a/packages/client/tests/unit/screens/StreamingMode.reuse.test.ts b/packages/client/tests/unit/screens/StreamingMode.reuse.test.ts
new file mode 100644
index 000000000..b23a01f33
--- /dev/null
+++ b/packages/client/tests/unit/screens/StreamingMode.reuse.test.ts
@@ -0,0 +1,100 @@
+import { describe, expect, it } from "vitest";
+import type { StreamingState } from "../../../src/screens/StreamingMode";
+import { shouldReuseStreamingState } from "../../../src/screens/StreamingMode";
+
+function createStreamingState(
+  overrides: Partial<StreamingState["cycle"]> = {},
+): StreamingState {
+  return {
+    type: "STREAMING_STATE_UPDATE",
+    cycle: {
+      cycleId: "cycle-1",
+      duelId: "duel-1",
+      phase: "ANNOUNCEMENT",
+      cycleStartTime: 1_000,
+      phaseStartTime: 1_000,
+      phaseEndTime: 61_000,
+      timeRemaining: 51_000,
+      agent1: {
+        id: "a",
+        name: "Agent A",
+        provider: "provider",
+        model: "model",
+        hp: 10,
+        maxHp: 10,
+        combatLevel: 1,
+        wins: 0,
+        losses: 0,
+        damageDealtThisFight: 0,
+        highestHit: 0,
+        attacksLanded: 0,
+        healsUsed: 0,
+        equipment: {},
+        inventory: [],
+        rank: 1,
+        headToHeadWins: 0,
+        headToHeadLosses: 0,
+      },
+      agent2: {
+        id: "b",
+        name: "Agent B",
+        provider: "provider",
+        model: "model",
+        hp: 10,
+        maxHp: 10,
+        combatLevel: 1,
+        wins: 0,
+        losses: 0,
+        damageDealtThisFight: 0,
+        highestHit: 0,
+        attacksLanded: 0,
+        healsUsed: 0,
+        equipment: {},
+        inventory: [],
+        rank: 2,
+        headToHeadWins: 0,
+        headToHeadLosses: 0,
+      },
+      betOpenTime: 1_000,
+      betCloseTime: 61_000,
+      countdown: null,
+      fightStartTime: null,
+      arenaPositions: {
+        agent1: [1, 0, 1],
+        agent2: [3, 0, 3],
+      },
+      winnerId: null,
+      winnerName: null,
+      winReason: null,
+      ...overrides,
+    },
+    leaderboard: [],
+    cameraTarget: null,
+  };
+}
+
+describe("shouldReuseStreamingState", () => {
+  it("re-renders when announcement timing anchors change even if timeRemaining stays pinned", () => {
+    const prev = createStreamingState({
+      phase: "ANNOUNCEMENT",
+      phaseEndTime: 61_000,
+      betCloseTime: 61_000,
+      timeRemaining: 0,
+    });
+    const next = createStreamingState({
+      phase: "ANNOUNCEMENT",
+      phaseEndTime: 121_000,
+      betCloseTime: 121_000,
+      timeRemaining: 0,
+    });
+
+    expect(shouldReuseStreamingState(prev, next)).toBe(false);
+  });
+
+  it("still reuses frames when both combat state and timing anchors are unchanged", () => {
+    const prev = createStreamingState();
+    const next = createStreamingState();
+
+    expect(shouldReuseStreamingState(prev, next)).toBe(true);
+  });
+});
diff --git a/packages/client/tests/unit/screens/StreamingMode.test.ts b/packages/client/tests/unit/screens/StreamingMode.test.ts
index 65d39a0a5..c13ab04f3 100644
--- a/packages/client/tests/unit/screens/StreamingMode.test.ts
+++ b/packages/client/tests/unit/screens/StreamingMode.test.ts
@@ -1,17 +1,204 @@
-import { describe, it, expect } from "vitest";
+import { describe, it, expect, vi } from "vitest";
+import { buildCaptureControlStatus } from "../../../src/lib/captureStatus";
 import {
   deriveStreamingRendererHealth,
   shouldDismissStreamingLoading,
+  shouldReuseStreamingState,
+  shouldShowStreamingLoadingOverlay,
+  type StreamingState,
 } from "../../../src/screens/StreamingMode";
 
+function createTestAgent(id: string, name: string) {
+  return {
+    id,
+    name,
+    provider: "provider",
+    model: "model",
+    hp: 10,
+    maxHp: 10,
+    combatLevel: 1,
+    wins: 0,
+    losses: 0,
+    damageDealtThisFight: 0,
+    highestHit: 0,
+    attacksLanded: 0,
+    healsUsed: 0,
+    equipment: {},
+    inventory: [],
+    rank: 1,
+    headToHeadWins: 0,
+    headToHeadLosses: 0,
+  };
+}
+
+function createStreamingState(
+  overrides: Partial<StreamingState> = {},
+): StreamingState {
+  const base: StreamingState = {
+    type: "STREAMING_STATE_UPDATE",
+    cycle: {
+      cycleId: "cycle-1",
+      duelId: "duel-1",
+      phase: "FIGHTING",
+      cycleStartTime: 1_000,
+      phaseStartTime: 1_100,
+      phaseEndTime: 30_000,
+      timeRemaining: 20_000,
+      agent1: createTestAgent("agent-a", "Agent A"),
+      agent2: createTestAgent("agent-b", "Agent B"),
+      betOpenTime: 1_000,
+      betCloseTime: 10_000,
+      countdown: null,
+      fightStartTime: 10_500,
+      arenaPositions: {
+        agent1: [1, 0, 1],
+        agent2: [4, 0, 4],
+      },
+      winnerId: null,
+      winnerName: null,
+      winReason: null,
+    },
+    leaderboard: [
+      {
+        rank: 1,
+        characterId: "agent-a",
+        name: "Agent A",
+        provider: "provider",
+        model: "model",
+        wins: 1,
+        losses: 0,
+        winRate: 1,
+        combatLevel: 1,
+        currentStreak: 1,
+      },
+    ],
+    cameraTarget: "agent-a",
+  };
+
+  return {
+    ...base,
+    ...overrides,
+    cycle: {
+      ...base.cycle,
+      ...overrides.cycle,
+    },
+    leaderboard: overrides.leaderboard ?? base.leaderboard,
+  };
+}
+
+describe("buildCaptureControlStatus", () => {
+  it("emits absolute and relative last-chunk fields while preserving the legacy age field", () => {
+    const nowSpy = vi.spyOn(Date, "now").mockReturnValue(10_000);
+    try {
+      expect(
+        buildCaptureControlStatus({
+          recorderState: "recording",
+          wsReadyState: WebSocket.OPEN,
+          chunkCount: 4,
+          bytesSent: 2048,
+          startedAt: 9_000,
+          lastChunkAt: 9_750,
+          wsBufferedAmount: 256,
+          heapUsedBytes: 1024,
+          heapLimitBytes: 8192,
+        }),
+      ).toEqual({
+        recording: true,
+        wsConnected: true,
+        chunkCount: 4,
+        bytesSent: 2048,
+        uptime: 1000,
+        lastChunkAt: 9750,
+        lastChunkAgeMs: 250,
+        lastChunkMs: 250,
+        wsBufferedAmount: 256,
+        heapUsedBytes: 1024,
+        heapLimitBytes: 8192,
+      });
+    } finally {
+      nowSpy.mockRestore();
+    }
+  });
+});
+
+describe("shouldReuseStreamingState", () => {
+  it("reuses state when only the subsecond timer remainder changes", () => {
+    const prev = createStreamingState();
+    const next = createStreamingState({
+      cycle: {
+        ...prev.cycle,
+        timeRemaining: prev.cycle.timeRemaining + 250,
+      },
+    });
+
+    expect(shouldReuseStreamingState(prev, next)).toBe(true);
+  });
+
+  it("does not reuse state when the active duel id changes", () => {
+    const prev = createStreamingState();
+    const next = createStreamingState({
+      cycle: {
+        ...prev.cycle,
+        duelId: "duel-2",
+      },
+    });
+
+    expect(shouldReuseStreamingState(prev, next)).toBe(false);
+  });
+
+  it("does not reuse state when visible leaderboard rows change", () => {
+    const prev = createStreamingState();
+    const next = createStreamingState({
+      leaderboard: [
+        {
+          ...prev.leaderboard[0]!,
+          wins: 2,
+          currentStreak: 2,
+        },
+      ],
+    });
+
+    expect(shouldReuseStreamingState(prev, next)).toBe(false);
+  });
+
+  it("does not reuse state when agent identity changes without HP movement", () => {
+    const prev = createStreamingState();
+    const next = createStreamingState({
+      cycle: {
+        ...prev.cycle,
+        agent1: createTestAgent("agent-c", "Agent C"),
+      },
+    });
+
+    expect(shouldReuseStreamingState(prev, next)).toBe(false);
+  });
+
+  it("does not reuse state when visible equipment changes", () => {
+    const prev = createStreamingState();
+    const next = createStreamingState({
+      cycle: {
+        ...prev.cycle,
+        agent1: {
+          ...prev.cycle.agent1!,
+          equipment: {
+            weapon: "dragon-scimitar",
+          },
+        },
+      },
+    });
+
+    expect(shouldReuseStreamingState(prev, next)).toBe(false);
+  });
+});
+
 describe("shouldDismissStreamingLoading", () => {
-  it("keeps the overlay up until the world is ready", () => {
+  it("keeps the overlay up until streaming state is present", () => {
     expect(
       shouldDismissStreamingLoading({
         connected: true,
         worldReady: false,
         terrainReady: true,
-        hasStreamingState: true,
+        hasStreamingState: false,
         initError: null,
         needsCameraLock: false,
         cameraLocked: false,
@@ -69,7 +256,7 @@ describe("shouldDismissStreamingLoading", () => {
     expect(
       shouldDismissStreamingLoading({
         connected: true,
-        worldReady: true,
+        worldReady: false,
         terrainReady: true,
         hasStreamingState: false,
         initError: null,
@@ -80,6 +267,39 @@ describe("shouldDismissStreamingLoading", () => {
     ).toBe(false);
   });
 
+  it("keeps the overlay up until the world is ready", () => {
+    expect(
+      shouldDismissStreamingLoading({
+        connected: true,
+        worldReady: false,
+        terrainReady: true,
+        hasStreamingState: true,
+        initError: null,
+        needsCameraLock: false,
+        cameraLocked: false,
+        phase: "COUNTDOWN",
+      }),
+    ).toBe(false);
+  });
+
+  it("never re-shows the loading overlay after the initial dismissal", () => {
+    expect(
+      shouldShowStreamingLoadingOverlay({
+        initError: null,
+        loadingDismissed: true,
+      }),
+    ).toBe(false);
+  });
+
+  it("does not show the loading overlay after an init error", () => {
+    expect(
+      shouldShowStreamingLoadingOverlay({
+        initError: "WebGPU Required",
+        loadingDismissed: false,
+      }),
+    ).toBe(false);
+  });
+
   it("marks a live duel as degraded while the loading overlay is still visible", () => {
     expect(
       deriveStreamingRendererHealth({
@@ -264,7 +484,7 @@ describe("shouldDismissStreamingLoading", () => {
   it("does not report ready during idle when streaming state is still absent", () => {
     const health = deriveStreamingRendererHealth({
       connected: true,
-      worldReady: true,
+      worldReady: false,
       terrainReady: true,
       hasStreamingState: false,
       initError: null,
diff --git a/packages/client/tsconfig.json b/packages/client/tsconfig.json
index b4595a2a0..88eb61105 100644
--- a/packages/client/tsconfig.json
+++ b/packages/client/tsconfig.json
@@ -8,7 +8,6 @@
     "emitDecoratorMetadata": true,
     "strict": true,
     "downlevelIteration": true,
-    "baseUrl": ".",
     "paths": {
       "@/*": ["./src/*"]
     },
diff --git a/packages/client/vite.config.ts b/packages/client/vite.config.ts
index c89a36b08..6e6e578cb 100644
--- a/packages/client/vite.config.ts
+++ b/packages/client/vite.config.ts
@@ -1,6 +1,7 @@
 import { defineConfig, loadEnv } from "vite";
 import react from "@vitejs/plugin-react";
 import { VitePWA } from "vite-plugin-pwa";
+import fs from "node:fs";
 import path from "path";
 import { fileURLToPath } from "url";
 
@@ -244,6 +245,52 @@ export default defineConfig(({ mode }) => {
           enabled: false, // Disable PWA in dev mode
         },
       }),
+      {
+        name: "rewrite-stream-html-build-output",
+        apply: "build",
+        closeBundle() {
+          const streamHtmlPath = path.resolve(__dirname, "dist/stream.html");
+          if (!fs.existsSync(streamHtmlPath)) {
+            return;
+          }
+
+          let html = fs.readFileSync(streamHtmlPath, "utf8");
+          const streamEntryMatch = html.match(
+            /<script type="module" crossorigin src="([^"]*\/assets\/stream-[^"]+\.js)"><\/script>/,
+          );
+          if (!streamEntryMatch) {
+            console.warn(
+              "[rewrite-stream-html-build-output] Unable to locate stream entry in dist/stream.html",
+            );
+            return;
+          }
+
+          const streamEntrySrc = streamEntryMatch[1];
+          html = html
+            .replace(streamEntryMatch[0], "")
+            .replace(/\s*<link rel="modulepreload"[^>]*>/g, "")
+            .replace(/<link rel="manifest"[^>]*>/g, "")
+            .replace(
+              /<script id="vite-plugin-pwa:register-sw"[^>]*><\/script>/g,
+              "",
+            );
+
+          const deferredBootstrap = `
+  <script type="module">
+    try {
+      await window.__HYPERSCAPE_STREAM_PREBOOT__;
+      await import(${JSON.stringify(streamEntrySrc)});
+    } catch (error) {
+      console.error("[stream.html] Stream bootstrap import failed:", error);
+      throw error;
+    }
+  </script>
+`;
+
+          html = html.replace("</body>", `${deferredBootstrap}</body>`);
+          fs.writeFileSync(streamHtmlPath, html, "utf8");
+        },
+      },
       // Watch shared package for changes and trigger full reload
       ...(disableSharedWatch
         ? []
@@ -341,6 +388,7 @@ export default defineConfig(({ mode }) => {
         input: {
           index: path.resolve(__dirname, "src/index.html"),
           stream: path.resolve(__dirname, "src/stream.html"),
+          hyperbet: path.resolve(__dirname, "src/hyperbet.html"),
         },
         external: ["fs", "fs-extra", "path", "node:fs", "node:path", "crypto"],
         output: {
diff --git a/packages/server/README.md b/packages/server/README.md
index 0c421b7d2..18124da70 100644
--- a/packages/server/README.md
+++ b/packages/server/README.md
@@ -1,481 +1,155 @@
 # Hyperscape Server
 
-Production-ready game server for Hyperscape 3D multiplayer worlds with PostgreSQL backend.
-
-## ✅ Status: FULLY OPERATIONAL
-
-The server has been successfully migrated to PostgreSQL and is production-ready with:
-- PostgreSQL database with automatic migrations
-- 54 mobs + 5 NPCs spawning at startup  
-- Character creation and multi-character support
-- Complete persistence layer (inventory, equipment, skills, position)
-- Real-time multiplayer via WebSocket
-- 15 registered game actions
-
-See `FIXES-COMPLETE.md` for detailed migration changelog.
-
-## Features
-
-- **PostgreSQL Database** - Full persistence with automatic migrations
-- **WebSocket Support** - Real-time multiplayer via Fastify WebSockets
-- **Docker Integration** - Automatic local PostgreSQL via Docker (optional)
-- **Asset Serving** - Efficient static asset delivery
-- **Character System** - Multi-character support per account
-- **Authentication** - Optional Privy authentication with Farcaster support
-- **LiveKit Voice** - Optional voice chat integration
-
-## Quick Start
-
-### Prerequisites
-
-- **Bun** (recommended) or Node.js 22+
-- **Docker Desktop** (for local PostgreSQL) OR external PostgreSQL instance
-
-### Installation
-
-```bash
-cd packages/server
-bun install
-```
-
-### Configuration
-
-Copy the example environment file:
-```bash
-cp env.example .env
-```
-
-**Option 1: Local PostgreSQL (Docker)**
-```env
-USE_LOCAL_POSTGRES=true
-# Docker will automatically start PostgreSQL
-```
-
-**Option 2: External PostgreSQL**
-```env
-DATABASE_URL=postgresql://user:pass@host:5488/dbname
-USE_LOCAL_POSTGRES=false
-```
-
-### Running
-
-**Development:**
-```bash
-bun run dev
-```
-This automatically starts:
-- CDN Server (nginx on port 8080) - via Docker
-- Game Server (Fastify on port 5555)
-- Client (Vite on port 3333)
-- 3D Asset Forge API (port 3001) & UI (port 3003)
-
-**Production Build:**
-```bash
-bun run build
-bun run start
-```
-
-### CDN Server
-
-The development script automatically manages a local CDN server via Docker:
-
-**Automatic Management:**
-- Starts when you run `bun run dev`
-- Stops when you exit the dev server (Ctrl+C)
-- Serves game assets from `../../assets/` on port 8080
-- Health check at `http://localhost:8080/health`
-
-**Manual CDN Management:**
-```bash
-# Start CDN only
-bun run cdn:up
-
-# Stop CDN
-bun run cdn:down
-
-# View CDN logs
-bun run cdn:logs
-
-# Verify CDN is working
-bun run cdn:verify
-```
-
-**Requirements:**
-- Docker Desktop must be installed and running
-- If Docker is not available, the dev script will skip CDN startup and warn you
-
-**Asset Access:**
-- All assets served directly from CDN: `http://localhost:8080/assets/world/music/normal/1.mp3`
-- No proxying - client fetches directly from CDN
-
-## Database
-
-### PostgreSQL Setup
-
-The server uses PostgreSQL with automatic migrations. On first run:
-
-1. If `USE_LOCAL_POSTGRES=true`, Docker will start a PostgreSQL container
-2. Migrations run automatically on startup
-3. Tables are created: users, characters, players, inventory, equipment, etc.
-
-### Manual Database Operations
-
-**Connect to local PostgreSQL:**
-```bash
-docker exec -it hyperscape-postgres psql -U hyperscape -d hyperscape
-```
-
-**Backup database:**
-```bash
-docker exec hyperscape-postgres pg_dump -U hyperscape hyperscape > backup.sql
-```
-
-**Restore database:**
-```bash
-cat backup.sql | docker exec -i hyperscape-postgres psql -U hyperscape hyperscape
-```
-
-### Migrations
-
-Migrations are defined in `src/db.ts` and run automatically on server start. The migration system tracks version in the `config` table.
-
-**Current migrations:**
-1. Users table
-2. VRM/avatar column migration
-3. Settings config migration
-4. Entities scale field update
-5. Entities table creation
-6. Privy authentication columns
-7. RPG tables (players, items, inventory, equipment)
-8. World chunks and sessions
-9. Characters table (for multi-character support)
-
-## Architecture
-
-### Core Systems
-
-**ServerNetwork** (`src/ServerNetwork.ts`)
-- WebSocket connection handling
-- Player spawning and lifecycle
-- Character selection flow
-- Message routing and broadcasting
-
-**DatabaseSystem** (`src/DatabaseSystem.ts`)
-- PostgreSQL connection management
-- Character CRUD operations
-- Player data persistence
-- Inventory and equipment management
-
-**Database Layer** (`src/db.ts`)
-- Connection pooling (pg)
-- Migration runner
-- Query builder for shared code
-
-### Character System
-
-The server supports multiple characters per account:
-
-1. **Account** - Identified by Privy user ID or legacy user ID
-2. **Character** - Each account can have multiple characters
-3. **Player Session** - Character becomes "player" when spawned in world
-
-**Flow:**
-```
-Login → Character List → Select/Create Character → Enter World → Spawn as Player
-```
-
-## API Endpoints
-
-### Health & Status
-
-- `GET /health` - Health check (for load balancers)
-- `GET /status` - Detailed server status with player count
-
-### Assets
-
-- `GET /*` - Game assets (models, textures, audio)
-- `GET /assets/*` - Legacy asset path (backward compatible)
-
-### WebSocket
-
-- `GET /ws` - WebSocket connection for real-time gameplay
-
-### Actions (HTTP API)
-
-- `GET /api/actions` - List all available actions
-- `GET /api/actions/available` - Get actions available to player
-- `POST /api/actions/:name` - Execute specific action
-
-### Utility
-
-- `GET /env.js` - Public environment variables for client
-- `POST /api/upload` - Upload user assets (VRM, textures)
-- `GET /api/upload-check` - Check if asset exists
-
-## Environment Variables
-
-### Required
-
-```env
-PORT=5555                    # Server port
-WORLD=world                   # World directory path
-```
-
-### Database
-
-```env
-# Option 1: Docker PostgreSQL
-USE_LOCAL_POSTGRES=true
-POSTGRES_CONTAINER=hyperscape-postgres
-POSTGRES_USER=hyperscape
-POSTGRES_PASSWORD=hyperscape_dev_password
-POSTGRES_DB=hyperscape
-POSTGRES_PORT=5488
-
-# Option 2: External PostgreSQL
-DATABASE_URL=postgresql://user:pass@host:5488/dbname
-```
-
-### Assets
-
-```env
-PUBLIC_CDN_URL=http://localhost:5555/game-assets  # CDN URL for static assets
-PUBLIC_WS_URL=ws://localhost:5556/ws              # WebSocket URL
-```
-
-### Authentication (Optional)
-
-```env
-PUBLIC_PRIVY_APP_ID=your-app-id
-PRIVY_APP_SECRET=your-app-secret
-ADMIN_CODE=your-admin-code          # For /admin command
-```
-
-### Farcaster Frame v2 (Optional)
-
-```env
-PUBLIC_ENABLE_FARCASTER=true
-PUBLIC_APP_URL=https://your-domain.com
-```
-
-### LiveKit Voice (Optional)
-
-```env
-LIVEKIT_API_KEY=your-key
-LIVEKIT_API_SECRET=your-secret
-PUBLIC_LIVEKIT_URL=wss://your-livekit-server
-```
-
-### Monitoring & Alerting (Optional)
-
-```env
-ALERT_WEBHOOK_URL=https://hooks.slack.com/services/...
-```
-
-Monitoring endpoints:
-- `GET /health` - basic uptime/timestamp (use for uptime checks)
-- `GET /status` - connected users + commit hash
-
-Configure your monitoring service (Railway health checks, UptimeRobot, Pingdom, etc.)
-to poll `/health` and trigger alerts on non-200 responses or elevated latency.
-
-## Deployment
-
-### Docker
-
-Build and run with Docker:
-
-```bash
-docker build -t hyperscape-server .
-docker run -p 5555:5555 \
-  -e DATABASE_URL=postgresql://... \
-  hyperscape-server
-```
-
-### Traditional Hosting
-
-Requirements:
-- Node.js 22+ or Bun runtime
-- PostgreSQL 16+ (local or managed)
-- Reverse proxy (nginx, caddy) for SSL
-
-```bash
-# Build
-bun run build
-
-# Run with process manager
-pm2 start dist/index.js --name hyperscape-server
-```
-
-### Environment-Specific
-
-**Staging:**
-```bash
-NODE_ENV=staging bun run start
-```
-
-**Production:**
-```bash
-NODE_ENV=production bun run start
-```
-
-### Rollback
-
-Rollback uses the same deployment workflows with an explicit ref:
-
-1. Railway API (server): run the **Deploy to Railway** workflow and set
-   `deploy_ref` to the previous commit SHA or tag.
-2. Cloudflare R2 assets: run **Deploy Assets to Cloudflare R2** with
-   `deploy_ref` pointing at the same commit to keep assets in sync.
-
-## Troubleshooting
-
-### PostgreSQL Connection Failed
-
-**Error:** `ECONNREFUSED` or connection timeout
-
-**Solutions:**
-1. Check if Docker is running: `docker ps`
-2. Start PostgreSQL: `docker-compose up postgres`
-3. Check connection string in .env
-4. Verify firewall allows port 5488
-
-### Database Migration Errors
-
-**Error:** Column already exists
-
-**Solution:** This is usually safe to ignore. The migrations use `IF NOT EXISTS` and `ON CONFLICT` to handle re-runs.
-
-**Error:** Foreign key constraint violation
-
-**Solution:** 
-```sql
--- Connect to database
-docker exec -it hyperscape-postgres psql -U hyperscape hyperscape
-
--- Drop all tables and re-run migrations
-DROP SCHEMA public CASCADE;
-CREATE SCHEMA public;
-\q
-```
-Then restart the server.
-
-### Character Creation Fails
-
-**Error:** Missing columns when creating character
-
-**Solution:** The characters table migration may not have run. Check:
-```sql
-SELECT * FROM config WHERE key = 'version';
-```
-
-Should be at version 15 or higher. If not, restart server to run migrations.
-
-### Docker Issues
-
-**Error:** Docker daemon not running
-
-**Solution:**
-1. Install Docker Desktop: https://www.docker.com/products/docker-desktop
-2. Start Docker Desktop
-3. Restart server
-
-**Alternative:** Use external PostgreSQL instead:
-```env
-DATABASE_URL=postgresql://user:pass@host:5488/dbname
-USE_LOCAL_POSTGRES=false
-```
-
-## Development
-
-### Code Structure
-
-```
-src/
-├── index.ts              # Main server entry point
-├── ServerNetwork.ts      # Network layer & player lifecycle
-├── DatabaseSystem.ts     # Database operations
-├── db.ts                 # Connection & migrations
-├── docker-manager.ts     # Docker PostgreSQL automation
-├── Storage.ts            # File storage
-├── utils.ts              # Utilities (JWT, hashing)
-├── privy-auth.ts        # Privy authentication
-└── polyfills.ts         # Node.js polyfills
-```
-
-### Running Tests
-
-```bash
-bun test
-```
-
-### Linting
-
-```bash
-bun run lint
-```
-
-### Building
-
-```bash
-bun run build
-```
-
-Output: `dist/index.js` (bundled server)
-
-## Performance
-
-### Database Connection Pool
-
-- Max connections: 20
-- Idle timeout: 30s
-- Connection timeout: 5s
-
-Adjust in `src/db.ts` and `src/DatabaseSystem.ts` if needed.
-
-### Asset Caching
-
-Assets are served with aggressive caching:
-```
-Cache-Control: public, max-age=31536000, immutable
-```
-
-For development, disable browser cache or use incognito mode.
-
-## Security
-
-### Authentication
-
-Optional Privy authentication provides:
-- Wallet-based login
-- Farcaster Frame v2 support
-- Account-to-character linking
-
-### Admin Access
-
-Admin commands require:
-1. `ADMIN_CODE` set in environment
-2. `/admin <code>` command in chat
-
-### Database
-
-- Use strong PostgreSQL passwords in production
-- Restrict database access to server IP
-- Enable SSL for remote PostgreSQL connections
-
-### Rate Limiting
-
-Not implemented yet. Consider adding:
-- Connection rate limiting (websocket)
-- API endpoint rate limiting
-- Upload size limits (currently 50MB)
-
-## Support
-
-- **Documentation:** See `MIGRATION-FIXES.md` for recent changes
-- **Cloudflare Deployment:** See `CLOUDFLARE.md` (currently disabled)
-- **Issues:** Report bugs in the main Hyperscape repository
-
-## License
-
-GPL-3.0-only - See LICENSE file
+This package is the Hyperscapes API and control plane. For the duel-streaming
+stack it should be read as the canonical source of lifecycle, renderer, and
+delivery truth consumed by Hyperbet. The source worker is separate in staging
+and production unless `DUEL_OWNS_STREAM_CAPTURE=true` is set for local
+integrated ownership.
+
+## Streaming Architecture
+
+- Cloudflare Pages hosts the public stream page.
+- The GPU host runs the dedicated source worker service for browser capture
+  and FFmpeg encode.
+- Railway runs this server package and publishes the canonical stream session.
+- Cloudflare Stream is the canonical bettor playback rail on `enoomian/staging`.
+- Self-hosted HLS remains available for operator smoke, debug, and explicit
+  failover only.
+- Automatic provider failover is disabled by default; bettors should not
+  auto-cycle between playback providers.
+
+This server is not the renderer of record.
+The split topology is the default operating model.
+
+## Same-Origin PhysX Requirement
+
+The stream page must load PhysX JS and WASM same-origin from the Pages-hosted
+client. Do not relax CSP to permit arbitrary script origins. If same-origin
+loading is broken, the renderer should degrade instead of silently widening
+policy.
+
+## Delivery Configuration
+
+Provider-neutral delivery envs:
+
+- `STREAM_DELIVERY_MODE=self_hls|external_hls`
+- `STREAM_DELIVERY_PROVIDER`
+- `STREAM_CANONICAL_PROVIDER_PRIORITY`
+- `STREAM_ENABLE_AUTOMATIC_FAILOVER`
+- `STREAM_FAILBACK_SOAK_MS`
+- `STREAM_INGEST_RTMPS_URL`
+- `STREAM_INGEST_STREAM_KEY`
+- `STREAM_PLAYBACK_HLS_URL`
+- `STREAM_PLAYBACK_LLHLS_URL`
+- `STREAM_EXTERNAL_DELIVERY_PROVIDER`
+- `STREAM_EXTERNAL_PLAYBACK_HLS_URL`
+- `STREAM_EXTERNAL_PLAYBACK_LLHLS_URL`
+- `STREAM_EXTERNAL_INGEST_RTMPS_URL`
+- `STREAM_CLOUDFLARE_PROBE_ONLY`
+
+Selection order for playback:
+
+1. the canonical Cloudflare playback URL selected by persisted authority
+   reconciliation
+2. regular HLS derived from that same playback object when LL-HLS falls back
+   in the player
+3. self-hosted HLS only when an explicit operator/debug path enables failover
+
+`hls-cdn-sync.ts` is fallback/object-store sync only.
+
+## Capture And Encode Defaults
+
+Personal staging expects:
+
+- `FFMPEG_HWACCEL=nvidia`
+- `STREAM_LOW_LATENCY=true`
+- `STREAM_FPS=30`
+- `HLS_TIME_SECONDS=1`
+- `HLS_LIST_SIZE=6`
+- `HLS_DELETE_THRESHOLD=24`
+
+## Health Contract
+
+The canonical capture status now includes additive fields that Hyperbet and
+operator surfaces consume:
+
+- `canonicalAuthority`
+  - `providerLive`
+  - `playbackProbeReady`
+  - `decision`
+  - `reason`
+  - `revision`
+- `sourceRuntime`
+- `rendererHealth`
+- `metrics`
+  - `captureFps`
+  - `encodeFps`
+  - `droppedFrames`
+  - `latestFrameAt`
+  - `latestRenderTickAt`
+  - `latestDuelStateTickAt`
+  - `latestVisualChangeAt`
+  - `visualChangeAgeMs`
+  - `hlsManifest`
+- `delivery`
+  - `mode`
+  - `provider`
+  - `playbackUrl`
+  - `canonicalDestination`
+  - `fallbackDestination`
+
+`publicReadiness` is the final server-side delivery gate for bettor playback.
+It should be read as:
+
+1. `sourceRuntime.ready`
+2. persisted Cloudflare lifecycle / lifecycle-poll evidence
+3. canonical playback probe health
+
+It is not the same thing as player live-edge sync. Hyperbet derives bettor
+"live synced" UX from player telemetry on top of this server gate.
+
+Phase-aware degradation can emit:
+
+- `render_tick_stale`
+- `visual_change_stale`
+- `capture_fps_low`
+- `encoder_fps_low`
+- `manifest_stale`
+- `asset_origin_incomplete`
+
+## Cloudflare Authority Reconciliation
+
+Cloudflare authority truth is persisted under these storage keys:
+
+- `streaming:cloudflare:lifecycle`
+- `streaming:cloudflare:last-webhook`
+- `streaming:cloudflare:last-lifecycle-poll`
+- `streaming:cloudflare:last-playback-probe`
+- `streaming:cloudflare:reconciliation`
+
+The reconciliation decision is the operator-debug source of truth. Decision
+ordering is:
+
+1. `source_unready`
+2. `provider_not_live`
+3. `probe_unready`
+4. `authority_stale`
+
+When `STREAM_ENABLE_AUTOMATIC_FAILOVER=false`, fallback destinations may still
+be emitted for compatibility, but they are not the normal bettor rail.
+
+## Endpoints
+
+Operationally important endpoints:
+
+- `GET /health`
+- `GET /api/streaming/state`
+- `GET /api/streaming/state/events`
+- `GET /api/streaming/capture/status`
+- `GET /api/streaming/rtmp/status`
+- `GET /api/hyperbet/config`
+
+## Deployment Rule
+
+Keep secrets and delivery URLs in Railway, Pages, and GPU-host runtime config.
+Do not hardcode them in the repo and do not commit staging-only secrets.
diff --git a/packages/server/package.json b/packages/server/package.json
index 387aa69e9..317cf4470 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -63,6 +63,7 @@
     "@elizaos/plugin-elizacloud": "alpha",
     "@elizaos/plugin-goals": "2.0.0-alpha.9",
     "@elizaos/plugin-groq": "alpha",
+    "@elizaos/plugin-ollama": "2.0.0-alpha.70",
     "@elizaos/plugin-openai": "alpha",
     "@elizaos/plugin-sql": "alpha",
     "@fastify/compress": "^8.0.1",
@@ -87,12 +88,14 @@
     "livekit-server-sdk": "^2.11.0",
     "moment": "^2.30.1",
     "msgpackr": "^1.11.5",
+    "ollama-ai-provider-v2": "^3.5.0",
     "pg": "^8.13.1",
+    "rate-limiter-flexible": "^11.0.1",
     "socket.io-client": "^4.8.1",
     "source-map-support": "^0.5.21",
+    "uWebSockets.js": "uNetworking/uWebSockets.js#v20.60.0",
     "uuid": "^13.0.0",
     "viem": "^2.46.2",
-    "uWebSockets.js": "uNetworking/uWebSockets.js#v20.60.0",
     "ws": "^8.18.0",
     "zod": "^4.1.11"
   },
diff --git a/packages/server/scripts/capture/x11-nvenc.ts b/packages/server/scripts/capture/x11-nvenc.ts
new file mode 100644
index 000000000..a4e0141ed
--- /dev/null
+++ b/packages/server/scripts/capture/x11-nvenc.ts
@@ -0,0 +1,134 @@
+/**
+ * x11grab + NVENC capture path.
+ *
+ * Replaces Chromium CDP screencast as the canonical capture path on the
+ * gpu-server. Chromium renders the scene to Xvfb as a pure renderer; FFmpeg
+ * grabs the X display directly and encodes with h264_nvenc, eliminating the
+ * in-browser JPEG screencast and the stdin-pipe marshal entirely.
+ *
+ * Hard-requires h264_nvenc (FFMPEG_HWACCEL=nvidia). No libx264 fallback — the
+ * whole point of this path is to avoid the visual-quality ceiling of the other
+ * modes, and silently falling back to software encode would reintroduce it.
+ */
+import { execSync, spawnSync } from "node:child_process";
+
+import type { RTMPBridge } from "../../src/streaming/rtmp-bridge.js";
+
+const X11_NVENC_PROBE_CACHE = {
+  displayChecked: false,
+  displayOk: false,
+  nvencChecked: false,
+  nvencOk: false,
+};
+
+function resolveDisplay(): string {
+  const value = (process.env.DISPLAY ?? "").trim();
+  return value.length > 0 ? value : ":99";
+}
+
+function parseEnvInt(value: string | undefined, fallback: number): number {
+  if (!value) return fallback;
+  const parsed = Number.parseInt(value.trim().replace(/_/g, ""), 10);
+  return Number.isFinite(parsed) && parsed > 0 ? parsed : fallback;
+}
+
+function assertXdpyInfo(display: string): void {
+  if (X11_NVENC_PROBE_CACHE.displayChecked) {
+    if (!X11_NVENC_PROBE_CACHE.displayOk) {
+      throw new Error(
+        `[x11_nvenc] DISPLAY=${display} failed xdpyinfo preflight (cached). Refusing to start.`,
+      );
+    }
+    return;
+  }
+  X11_NVENC_PROBE_CACHE.displayChecked = true;
+  const result = spawnSync("xdpyinfo", ["-display", display], {
+    timeout: 5000,
+    stdio: "pipe",
+  });
+  if (result.status !== 0) {
+    X11_NVENC_PROBE_CACHE.displayOk = false;
+    const stderr = (result.stderr ?? "").toString().trim().slice(0, 400);
+    throw new Error(
+      `[x11_nvenc] xdpyinfo -display ${display} exit=${result.status}: ${stderr || "no stderr"}`,
+    );
+  }
+  X11_NVENC_PROBE_CACHE.displayOk = true;
+}
+
+function assertNvencAvailable(): void {
+  if (X11_NVENC_PROBE_CACHE.nvencChecked) {
+    if (!X11_NVENC_PROBE_CACHE.nvencOk) {
+      throw new Error(
+        `[x11_nvenc] h264_nvenc unavailable on this host (cached). Refusing to start.`,
+      );
+    }
+    return;
+  }
+  X11_NVENC_PROBE_CACHE.nvencChecked = true;
+  const hwAccel = (process.env.FFMPEG_HWACCEL ?? "").trim().toLowerCase();
+  if (hwAccel !== "nvidia") {
+    X11_NVENC_PROBE_CACHE.nvencOk = false;
+    throw new Error(
+      `[x11_nvenc] FFMPEG_HWACCEL=${hwAccel || "(unset)"} — x11_nvenc mode requires FFMPEG_HWACCEL=nvidia.`,
+    );
+  }
+  try {
+    const output = execSync("ffmpeg -hide_banner -encoders 2>&1", {
+      timeout: 5000,
+      stdio: "pipe",
+    }).toString();
+    if (!/\bh264_nvenc\b/.test(output)) {
+      X11_NVENC_PROBE_CACHE.nvencOk = false;
+      throw new Error(
+        `[x11_nvenc] h264_nvenc not listed in 'ffmpeg -encoders' output.`,
+      );
+    }
+    X11_NVENC_PROBE_CACHE.nvencOk = true;
+  } catch (err) {
+    X11_NVENC_PROBE_CACHE.nvencOk = false;
+    throw err instanceof Error
+      ? err
+      : new Error(`[x11_nvenc] ffmpeg -encoders probe failed: ${String(err)}`);
+  }
+}
+
+/**
+ * Start the x11grab + NVENC capture path.
+ *
+ * Returns `null` intentionally — unlike the WebCodecs path which returns a
+ * setInterval handle to re-inject its in-page capture script, x11_nvenc has
+ * no in-page script to maintain. Liveness is tracked by the supervisor loop
+ * in `stream-to-rtmp.ts` using `bridge.getLastEncoderFrame{Count,At}()`.
+ */
+export async function startX11NvencCapture(bridge: RTMPBridge): Promise<null> {
+  const display = resolveDisplay();
+  const width = parseEnvInt(process.env.STREAM_CAPTURE_WIDTH, 1920);
+  const height = parseEnvInt(process.env.STREAM_CAPTURE_HEIGHT, 1080);
+  const fps = parseEnvInt(process.env.STREAM_FPS, 30);
+
+  assertXdpyInfo(display);
+  assertNvencAvailable();
+
+  console.log(
+    `[x11_nvenc] Starting capture: display=${display} ${width}x${height}@${fps}`,
+  );
+
+  bridge.startFFmpegX11Grab({
+    display,
+    width,
+    height,
+    fps,
+    drawMouse: false,
+  });
+
+  return null;
+}
+
+/** Exposed for unit tests so the preflight cache can be reset between runs. */
+export function __resetX11NvencProbeCacheForTest(): void {
+  X11_NVENC_PROBE_CACHE.displayChecked = false;
+  X11_NVENC_PROBE_CACHE.displayOk = false;
+  X11_NVENC_PROBE_CACHE.nvencChecked = false;
+  X11_NVENC_PROBE_CACHE.nvencOk = false;
+}
diff --git a/packages/server/scripts/stream-to-rtmp.ts b/packages/server/scripts/stream-to-rtmp.ts
index bc5c7ade9..dc64381b4 100644
--- a/packages/server/scripts/stream-to-rtmp.ts
+++ b/packages/server/scripts/stream-to-rtmp.ts
@@ -15,18 +15,20 @@
  * Architecture:
  *   Chromium Compositor → CDP screencastFrame → Node.js → FFmpeg stdin (JPEG pipe) → RTMP fanout
  *
- * Falls back to the legacy MediaRecorder + WebSocket path if CDP capture fails
- * or STREAM_CAPTURE_MODE=mediarecorder is set.
+ * Falls back to WebCodecs when CDP capture fails. MediaRecorder remains an
+ * explicit operator/debug path when STREAM_CAPTURE_MODE=mediarecorder is set.
  *
  * Usage:
  *   bun run stream:rtmp
  *   bun run packages/server/scripts/stream-to-rtmp.ts
  *
  * Environment Variables:
- *   STREAM_CAPTURE_MODE      - 'cdp' (default) or 'mediarecorder' (legacy)
+ *   STREAM_CAPTURE_MODE      - 'cdp' (default), 'webcodecs', or 'mediarecorder' (debug)
+ *   STREAM_ALLOW_WEBCODECS_CLOUDFLARE - 'true' to allow WebCodecs on cloudflare_live ingest
  *   STREAM_CAPTURE_HEADLESS  - 'true' for headless (default: false for better GPU rendering)
  *   STREAM_CAPTURE_CHANNEL   - Browser channel ('chrome', 'msedge', etc.)
  *   STREAM_CAPTURE_ANGLE     - ANGLE backend (default: metal on macOS, vulkan elsewhere)
+ *   STREAM_CAPTURE_PRESERVE_STREAM_ROUTE - Keep /stream instead of rewriting to /stream.html
  *   CAPTURE_DISABLE_SANDBOX  - 'true' to launch Chromium with --no-sandbox
  *   STREAM_CDP_QUALITY       - JPEG quality for CDP screencast (1-100, default: 80)
  *   STREAM_FPS               - Target frames per second (default: 30)
@@ -44,7 +46,8 @@
  *   RTMP_BRIDGE_PORT         - WebSocket port for legacy bridge (default: 8765)
  */
 
-import { spawnSync } from "node:child_process";
+import { spawn, spawnSync, type ChildProcess } from "node:child_process";
+import { createHash } from "node:crypto";
 import fs from "node:fs";
 import path from "node:path";
 import { chromium, type Browser, type Page, type CDPSession } from "playwright";
@@ -53,7 +56,28 @@ import {
   startRTMPBridge,
   generateCaptureScript,
   generateWebCodecsCaptureScript,
+  generateWebCodecsExposedCaptureScript,
 } from "../src/streaming/index.js";
+import {
+  resolveStreamDeliveryInfo,
+  type StreamDeliveryInfo,
+} from "../src/streaming/delivery-config.js";
+import type {
+  BrowserCaptureStatusSnapshot,
+  StreamSourceCaptureMode,
+  StreamSourceDegradedReason,
+  StreamSourceRuntime,
+} from "../src/streaming/source-runtime.js";
+import { resolveBrowserCaptureLastFrameAt } from "../src/streaming/source-runtime.js";
+import {
+  resolveStreamIngestSettings,
+  type StreamIngestSettings,
+} from "../src/streaming/ingest-config.js";
+import {
+  readLocalHlsManifestSnapshot,
+  resolveExternalStatusFile,
+  type HlsManifestSnapshot,
+} from "../src/streaming/stream-status-artifacts.js";
 import {
   buildDefaultCaptureLaunchArgs,
   resolveAllowedCaptureOrigins,
@@ -64,6 +88,7 @@ import {
 import { redactStreamingSecretsFromUrl } from "../src/streaming/redactStreamingUrl.js";
 import { errMsg } from "../src/shared/errMsg.ts";
 import { getStreamLeakDiagnostics } from "../src/streaming/stream-leak-diagnostics.js";
+import { startX11NvencCapture } from "./capture/x11-nvenc.ts";
 
 // Auto-enable leak diagnostics if STREAM_LEAK_DIAGNOSTICS=true.
 // Installed before any timers are allocated so the counts are accurate.
@@ -71,10 +96,10 @@ getStreamLeakDiagnostics();
 
 // ── Configuration ──────────────────────────────────────────────────────────
 
-const GAME_URL = process.env.GAME_URL || "http://localhost:3333/?page=stream";
+const GAME_URL = process.env.GAME_URL || "http://localhost:3333/stream.html";
 const GAME_FALLBACK_URLS = (
   process.env.GAME_FALLBACK_URLS ||
-  "http://localhost:3333/?embedded=true&mode=spectator,http://localhost:3333/"
+  "http://localhost:3333/stream.html,http://localhost:3333/?embedded=true&mode=spectator,http://localhost:3333/"
 )
   .split(",")
   .map((value) => value.trim())
@@ -82,6 +107,70 @@ const GAME_FALLBACK_URLS = (
 const STREAMING_VIEWER_ACCESS_TOKEN = (
   process.env.STREAMING_VIEWER_ACCESS_TOKEN || ""
 ).trim();
+const STREAM_CAPTURE_PRESERVE_STREAM_ROUTE = /^(1|true|yes|on)$/i.test(
+  process.env.STREAM_CAPTURE_PRESERVE_STREAM_ROUTE || "",
+);
+
+type RequestedCaptureMode = "cdp" | "mediarecorder" | "webcodecs" | "x11_nvenc";
+
+function resolveRequestedCaptureMode(
+  env: NodeJS.ProcessEnv = process.env,
+): RequestedCaptureMode {
+  return (env.STREAM_CAPTURE_MODE?.trim() || "cdp") as RequestedCaptureMode;
+}
+
+function resolveEffectiveCaptureMode(
+  env: NodeJS.ProcessEnv = process.env,
+): RequestedCaptureMode {
+  const requestedMode = resolveRequestedCaptureMode(env);
+  const ingest = resolveStreamIngestSettings(env);
+  const allowWebCodecsForCloudflare = /^(1|true|yes|on)$/i.test(
+    env.STREAM_ALLOW_WEBCODECS_CLOUDFLARE || "",
+  );
+  // x11_nvenc is Cloudflare-safe (it does not go through the in-browser
+  // WebCodecs encoder path that Cloudflare rejects), so the
+  // webcodecs->cdp guardrail does not apply here.
+  if (
+    requestedMode === "webcodecs" &&
+    ingest.profile === "cloudflare_live" &&
+    !allowWebCodecsForCloudflare
+  ) {
+    return "cdp";
+  }
+  return requestedMode;
+}
+
+function normalizeCaptureGameUrl(rawUrl: string): string {
+  // CDP reads frames from the compositor; x11_nvenc reads the same
+  // compositor via x11grab on Xvfb. Both want the dedicated stream
+  // entrypoint (no bridge params, no SPA player gate) — WebCodecs on the
+  // other hand relies on the in-page capture bridge and keeps the raw URL.
+  const mode = resolveEffectiveCaptureMode(process.env);
+  if (mode !== "cdp" && mode !== "x11_nvenc") {
+    return rawUrl;
+  }
+
+  try {
+    const url = new URL(rawUrl);
+    // The source encoder needs the dedicated stream entrypoint. The public
+    // /stream route is a normal SPA route in some deployments and will try to
+    // authenticate as a player.
+    if (!STREAM_CAPTURE_PRESERVE_STREAM_ROUTE && url.pathname === "/stream") {
+      url.pathname = "/stream.html";
+    }
+    // CDP capture reads frames directly from the compositor and does not
+    // expose the legacy in-page WebSocket bridge. Leaving these params on the
+    // stream URL makes the page repeatedly dial a bridge that will never exist.
+    url.searchParams.delete("internalCapture");
+    url.searchParams.delete("bridgeUrl");
+    // Preserve an explicit source-capture hint so the stream entrypoint can
+    // purge service workers/caches on Pages without re-enabling bridge capture.
+    url.searchParams.set("streamCapture", "1");
+    return url.toString();
+  } catch {
+    return rawUrl;
+  }
+}
 
 function withViewerAccessToken(rawUrl: string): string {
   if (!STREAMING_VIEWER_ACCESS_TOKEN) return rawUrl;
@@ -98,7 +187,11 @@ function withViewerAccessToken(rawUrl: string): string {
 }
 
 const GAME_URL_CANDIDATES = Array.from(
-  new Set([GAME_URL, ...GAME_FALLBACK_URLS].map(withViewerAccessToken)),
+  new Set(
+    [GAME_URL, ...GAME_FALLBACK_URLS]
+      .map(withViewerAccessToken)
+      .map(normalizeCaptureGameUrl),
+  ),
 );
 const ALLOWED_CAPTURE_ORIGINS =
   resolveAllowedCaptureOrigins(GAME_URL_CANDIDATES);
@@ -106,14 +199,15 @@ const ALLOWED_CAPTURE_ORIGINS =
 const BRIDGE_PORT = parseInt(process.env.RTMP_BRIDGE_PORT || "8765", 10);
 const BRIDGE_URL = `ws://localhost:${BRIDGE_PORT}`;
 const SPECTATOR_PORT = parseInt(process.env.SPECTATOR_PORT || "4180", 10);
-const EXTERNAL_STATUS_FILE = (process.env.RTMP_STATUS_FILE || "").trim();
+const EXTERNAL_STATUS_FILE = resolveExternalStatusFile(process.env);
 let externalStatusWriteErrored = false;
 
-/** Capture mode: 'cdp' (fast) or 'mediarecorder' (legacy) or 'webcodecs' (holy grail) */
-const CAPTURE_MODE = (process.env.STREAM_CAPTURE_MODE?.trim() || "cdp") as
-  | "cdp"
-  | "mediarecorder"
-  | "webcodecs";
+/**
+ * Capture mode: 'cdp' is the production default, 'webcodecs' is the automatic
+ * fallback, and 'mediarecorder' remains an explicit operator/debug mode.
+ */
+const REQUESTED_CAPTURE_MODE = resolveRequestedCaptureMode(process.env);
+const CAPTURE_MODE = resolveEffectiveCaptureMode(process.env);
 const STREAM_CAPTURE_HEADLESS = process.env.STREAM_CAPTURE_HEADLESS === "true";
 const requestedCaptureChannel =
   process.env.STREAM_CAPTURE_CHANNEL?.trim() || "";
@@ -135,14 +229,24 @@ if (STREAM_CAPTURE_DISABLE_WEBGPU) {
     "STREAM_CAPTURE_DISABLE_WEBGPU is not supported. Hyperscape capture is WebGPU-only.",
   );
 }
+
+function parseIntegerSetting(
+  rawValue: string | undefined,
+  fallback: number,
+): number {
+  const normalized = rawValue?.trim().replace(/_/g, "") ?? "";
+  const parsed = Number.parseInt(normalized, 10);
+  return Number.isFinite(parsed) ? parsed : fallback;
+}
+
 const CDP_QUALITY = Math.min(
   100,
-  Math.max(1, parseInt(process.env.STREAM_CDP_QUALITY || "80", 10)),
+  Math.max(1, parseIntegerSetting(process.env.STREAM_CDP_QUALITY, 80)),
 );
-const TARGET_FPS = parseInt(process.env.STREAM_FPS || "30", 10);
+const TARGET_FPS = parseIntegerSetting(process.env.STREAM_FPS, 30);
 const STREAM_CAPTURE_WARMUP_MS = Math.max(
   250,
-  Number.parseInt(process.env.STREAM_CAPTURE_WARMUP_MS || "1000", 10) || 1000,
+  parseIntegerSetting(process.env.STREAM_CAPTURE_WARMUP_MS, 1000),
 );
 const REQUIRE_IN_PAGE_READY_PROBE =
   process.env.STREAM_CAPTURE_REQUIRE_READY_PROBE === "true";
@@ -152,18 +256,17 @@ const USE_TIMED_STREAM_WARMUP =
   !STREAM_CAPTURE_HEADLESS;
 const STREAM_CAPTURE_POST_NAV_DELAY_MS = Math.max(
   0,
-  Number.parseInt(
-    process.env.STREAM_CAPTURE_POST_NAV_DELAY_MS ||
-      (USE_TIMED_STREAM_WARMUP ? "250" : "5000"),
-    10,
-  ) || 0,
+  parseIntegerSetting(
+    process.env.STREAM_CAPTURE_POST_NAV_DELAY_MS,
+    USE_TIMED_STREAM_WARMUP ? 250 : 5000,
+  ),
 );
 
 function parseEvenDimension(
   rawValue: string | undefined,
   fallback: number,
 ): number {
-  const parsed = Number.parseInt(rawValue || "", 10);
+  const parsed = parseIntegerSetting(rawValue, fallback);
   const candidate = Number.isFinite(parsed) ? parsed : fallback;
   const clamped = Math.max(2, candidate);
   return clamped % 2 === 0 ? clamped : clamped - 1;
@@ -175,33 +278,122 @@ const VIEWPORT = {
   height: parseEvenDimension(process.env.STREAM_CAPTURE_HEIGHT, 720),
 };
 
+const XVFB_60HZ_MODELINES: Record<
+  string,
+  {
+    modeName: string;
+    modeline: string;
+  }
+> = {
+  "1280x720": {
+    modeName: "1280x720_60.00",
+    modeline:
+      '"1280x720_60.00" 74.50 1280 1344 1472 1664 720 723 728 748 -hsync +vsync',
+  },
+  "1920x1080": {
+    modeName: "1920x1080_60.00",
+    modeline:
+      '"1920x1080_60.00" 173.00 1920 2048 2248 2576 1080 1083 1088 1120 -hsync +vsync',
+  },
+};
+
+function resolveXvfb60HzMode(
+  width: number,
+  height: number,
+): {
+  modeName: string;
+  modeline: string;
+} | null {
+  return XVFB_60HZ_MODELINES[`${width}x${height}`] ?? null;
+}
+
 let browser: Browser | null = null;
 let page: Page | null = null;
+// x11_nvenc mode spawns Chrome directly (outside of Playwright) so it can
+// pass `--app=URL --kiosk` and produce a chromeless, full-bleed window that
+// x11grab can capture without browser chrome or white margins. Playwright's
+// `chromium.launch()` silently drops `--kiosk`, so the Playwright-launched
+// browser re-exposes the tab bar + URL bar — confirmed by a failed preview
+// on :201 during the first prod cutover attempt. We keep a handle to the
+// externally-spawned Chrome process so cleanup() can SIGKILL it; the
+// `browser` var above holds the CDP-attached Playwright Browser session,
+// which owns no child process in this mode.
+let x11NvencChromeProcess: ChildProcess | null = null;
 let cdpSession: CDPSession | null = null;
 let selectedGameUrl: string | null = null;
+let latestSceneUrl: string | null = null;
+let latestActiveBundle: string | null = null;
 let launchTime = Date.now();
 const BROWSER_RESTART_INTERVAL_MS = 1 * 60 * 60 * 1000; // 1 Hour
 const CAPTURE_RECOVERY_TIMEOUT_MS = Math.max(
   10_000,
-  Number.parseInt(
-    process.env.STREAM_CAPTURE_RECOVERY_TIMEOUT_MS || "30000",
-    10,
-  ) || 30_000,
+  parseIntegerSetting(process.env.STREAM_CAPTURE_RECOVERY_TIMEOUT_MS, 30_000),
 );
 const CAPTURE_RECOVERY_MAX_FAILURES = Math.max(
   1,
-  Number.parseInt(
-    process.env.STREAM_CAPTURE_RECOVERY_MAX_FAILURES || "2",
-    10,
-  ) || 2,
+  parseIntegerSetting(process.env.STREAM_CAPTURE_RECOVERY_MAX_FAILURES, 2),
 );
 const CDP_STARTUP_TIMEOUT_MS = Math.max(
   5_000,
-  Number.parseInt(
-    process.env.STREAM_CAPTURE_START_TIMEOUT_MS || "15_000",
-    10,
-  ) || 15_000,
+  parseIntegerSetting(process.env.STREAM_CAPTURE_START_TIMEOUT_MS, 15_000),
+);
+const SOURCE_CAPTURE_STALL_MS = Math.max(
+  5_000,
+  parseIntegerSetting(process.env.STREAM_SOURCE_CAPTURE_STALL_MS, 10_000),
+);
+const SOURCE_VISUAL_CHANGE_STALE_MS = Math.max(
+  5_000,
+  parseIntegerSetting(process.env.STREAM_SOURCE_VISUAL_CHANGE_STALE_MS, 10_000),
+);
+const INGEST_SETTINGS = resolveStreamIngestSettings(process.env);
+const WEBCODECS_VIDEO_BITRATE_BPS =
+  parseIntegerSetting(
+    process.env.STREAM_VIDEO_BITRATE_KBPS,
+    INGEST_SETTINGS.profile === "cloudflare_live" ? 4_800 : 6_000,
+  ) * 1_000;
+const SOURCE_DEGRADED_RESTART_POLLS = Math.max(
+  2,
+  parseIntegerSetting(process.env.STREAM_SOURCE_DEGRADED_RESTART_POLLS, 6),
+);
+const PAGE_READINESS_STALL_MS = Math.max(
+  30_000,
+  parseIntegerSetting(
+    process.env.STREAM_SOURCE_PAGE_READINESS_STALL_MS,
+    5 * 60_000,
+  ),
 );
+const SOURCE_PROBE_TIMEOUT_MS = Math.max(
+  1_000,
+  parseIntegerSetting(process.env.STREAM_SOURCE_PROBE_TIMEOUT_MS, 5_000),
+);
+const SOURCE_RECOVERY_READY_TIMEOUT_MS = Math.max(
+  10_000,
+  parseIntegerSetting(
+    process.env.STREAM_SOURCE_RECOVERY_READY_TIMEOUT_MS,
+    60_000,
+  ),
+);
+const FATAL_WRITE_PAGE_STALL_THRESHOLD_MS = Math.max(
+  2_000,
+  Math.min(5_000, Math.floor(SOURCE_CAPTURE_STALL_MS / 2)),
+);
+const CDP_FRAME_PUMP_INTERVAL_MS = Math.max(
+  16,
+  Math.round(1000 / Math.max(1, TARGET_FPS)),
+);
+const CDP_EVERY_NTH_FRAME = Math.max(
+  1,
+  parseIntegerSetting(
+    process.env.STREAM_CDP_EVERY_NTH_FRAME,
+    Math.max(1, Math.round(60 / Math.max(1, TARGET_FPS))),
+  ),
+);
+
+if (REQUESTED_CAPTURE_MODE !== CAPTURE_MODE) {
+  console.warn(
+    `[Main] Overriding STREAM_CAPTURE_MODE=${REQUESTED_CAPTURE_MODE} to ${CAPTURE_MODE} for ${INGEST_SETTINGS.profile} ingest so canonical delivery uses server-side encoding`,
+  );
+}
 
 // ── CDP Frame Rate Tracking ────────────────────────────────────────────────
 
@@ -209,6 +401,17 @@ let cdpFrameCount = 0;
 let cdpFps = 0;
 let cdpFpsIntervalId: ReturnType<typeof setInterval> | null = null;
 let cdpDroppedFrames = 0;
+let lastCaptureFrameAt: number | null = null;
+let lastEncodedFrameAt: number | null = null;
+let latestCdpFrameBuffer: Buffer | null = null;
+let cdpFramePumpIntervalId: ReturnType<typeof setInterval> | null = null;
+let cdpRepeatedFrameCount = 0;
+let latestRenderTickAt: number | null = null;
+let latestDuelStateTickAt: number | null = null;
+let latestVisualChangeAt: number | null = null;
+let lastVisualSampleHash: string | null = null;
+let lastObservedRenderTick = 0;
+let lastObservedDuelStateTick = 0;
 
 function startFpsTracking() {
   if (cdpFpsIntervalId) clearInterval(cdpFpsIntervalId);
@@ -227,13 +430,163 @@ function stopFpsTracking() {
   }
 }
 
-type ActiveCaptureMode = "cdp" | "webcodecs" | "mediarecorder";
+function feedCdpFrameToEncoder(
+  bridge: ReturnType<typeof getRTMPBridge>,
+  jpegBuffer: Buffer,
+  options: {
+    frameAt: number;
+    cdpTimestamp: number | null;
+    repeated: boolean;
+  },
+): boolean {
+  const written = bridge.feedFrame(jpegBuffer, {
+    frameAt: options.frameAt,
+    cdpTimestamp: options.cdpTimestamp,
+  });
+  if (written) {
+    lastEncodedFrameAt = options.frameAt;
+    if (options.repeated) {
+      cdpRepeatedFrameCount += 1;
+    } else {
+      cdpFrameCount += 1;
+    }
+  } else {
+    cdpDroppedFrames += 1;
+  }
+  return written;
+}
+
+function startCdpFramePump(bridge: ReturnType<typeof getRTMPBridge>): void {
+  if (cdpFramePumpIntervalId) {
+    clearInterval(cdpFramePumpIntervalId);
+  }
+  cdpFramePumpIntervalId = setInterval(() => {
+    if (!latestCdpFrameBuffer) return;
+    if (bridge.getStatus().ffmpegRunning !== true) return;
+
+    const nowMs = Date.now();
+    if (
+      lastEncodedFrameAt != null &&
+      nowMs - lastEncodedFrameAt < CDP_FRAME_PUMP_INTERVAL_MS
+    ) {
+      return;
+    }
+
+    // CDP screencast is event-driven; a static but valid live scene can stop
+    // emitting frames. A live encoder still needs continuous input, so repeat
+    // the latest real browser frame while renderer health reports content truth.
+    feedCdpFrameToEncoder(bridge, latestCdpFrameBuffer, {
+      frameAt: nowMs,
+      cdpTimestamp: null,
+      repeated: true,
+    });
+  }, CDP_FRAME_PUMP_INTERVAL_MS);
+}
+
+function stopCdpFramePump(): void {
+  if (cdpFramePumpIntervalId) {
+    clearInterval(cdpFramePumpIntervalId);
+    cdpFramePumpIntervalId = null;
+  }
+}
+
+type ActiveCaptureMode = Exclude<StreamSourceCaptureMode, "none">;
+
+type RendererHeartbeatSnapshot = {
+  renderTick: number;
+  latestRenderTickAt: number | null;
+  duelStateTick: number;
+  latestDuelStateTickAt: number | null;
+};
+
+type RendererMetricsSnapshot = {
+  captureFps: number | null;
+  encodeFps: number | null;
+  droppedFrames: number;
+  renderTick: number;
+  duelStateTick: number;
+  latestFrameAt: number | null;
+  latestRenderTickAt: number | null;
+  latestDuelStateTickAt: number | null;
+  latestVisualChangeAt: number | null;
+  visualChangeAgeMs: number | null;
+};
+
+type CaptureDiagnosticsFrameSnapshot = {
+  at: number;
+  size: number;
+  cdpTimestamp: number | null;
+};
+
+type CaptureDiagnosticsBackpressureSnapshot = {
+  at: number;
+  backpressured: boolean;
+};
+
+type CaptureDiagnosticsFatalWriteSnapshot = {
+  at: number;
+  message: string;
+  frameCount: number;
+  droppedFrames: number;
+  bytesReceived: number;
+  backpressured: boolean;
+  cdpDirectMode: boolean;
+  uptimeMs: number;
+};
+
+type CaptureDiagnosticsSnapshot = {
+  recentFrames: CaptureDiagnosticsFrameSnapshot[];
+  recentFrameCadenceMs: number[];
+  nonMonotonicCdpTimestampCount: number;
+  backpressureTransitions: CaptureDiagnosticsBackpressureSnapshot[];
+  firstFatalWriteError: CaptureDiagnosticsFatalWriteSnapshot | null;
+  lastFatalWriteError: CaptureDiagnosticsFatalWriteSnapshot | null;
+  pageStallBeforeLastFatalWrite: boolean | null;
+  lastFrameAgeMs: number | null;
+  captureSessionGeneration: string | null;
+  browserCapture: {
+    recording: boolean | null;
+    wsConnected: boolean | null;
+    chunkCount: number | null;
+    bytesSent: number | null;
+    lastChunkAt: number | null;
+    lastChunkAgeMs: number | null;
+    lastChunkMs: number | null;
+  };
+};
+
+type RendererSmokeSnapshot = {
+  currentSceneUrl: string | null;
+  activeBundle: string | null;
+  deliveryMode: StreamDeliveryInfo["mode"];
+  captureFpsP50: number | null;
+  captureFpsP95: number | null;
+  encodeFpsP50: number | null;
+  encodeFpsP95: number | null;
+  updatedAt: number;
+  ingest: RendererIngestSnapshot;
+};
+
+type RendererIngestSnapshot = {
+  profile: StreamIngestSettings["profile"];
+  transport: StreamIngestSettings["transport"];
+  audioSampleRate: number;
+  gopFrames: number;
+  probeOnly: boolean;
+};
 
 type RendererHealthSnapshot = CaptureRendererHealthSnapshot & {
   updatedAt: number | null;
   phase: string | null;
 };
 
+type RendererCanvasRectSnapshot = {
+  x: number;
+  y: number;
+  width: number;
+  height: number;
+} | null;
+
 let latestRendererHealth: RendererHealthSnapshot = {
   ready: false,
   degradedReason: "capture_not_initialized",
@@ -242,17 +595,448 @@ let latestRendererHealth: RendererHealthSnapshot = {
   diagnostics: null,
 };
 let rendererHealthProbeInFlight: Promise<RendererHealthSnapshot> | null = null;
+let browserCaptureStatusProbeInFlight: Promise<BrowserCaptureStatus | null> | null =
+  null;
 let captureNavigationAbortInFlight = false;
+let latestBrowserCaptureStatus: BrowserCaptureStatus | null = null;
+let sourceRecoveryCount = 0;
+let sourceLastRecoveryAt: number | null = null;
+const FPS_SAMPLE_RETENTION_MS = 60_000;
+const captureFpsSamples: Array<{ at: number; value: number }> = [];
+const encodeFpsSamples: Array<{ at: number; value: number }> = [];
+
+function pruneFpsSamples(nowMs: number): void {
+  while (
+    captureFpsSamples.length > 0 &&
+    nowMs - captureFpsSamples[0]!.at > FPS_SAMPLE_RETENTION_MS
+  ) {
+    captureFpsSamples.shift();
+  }
+  while (
+    encodeFpsSamples.length > 0 &&
+    nowMs - encodeFpsSamples[0]!.at > FPS_SAMPLE_RETENTION_MS
+  ) {
+    encodeFpsSamples.shift();
+  }
+}
+
+function recordFpsSample(
+  samples: Array<{ at: number; value: number }>,
+  value: number | null,
+  nowMs: number,
+): void {
+  if (typeof value !== "number" || !Number.isFinite(value) || value < 0) {
+    return;
+  }
+  samples.push({ at: nowMs, value });
+}
+
+function percentileFromSamples(
+  samples: ReadonlyArray<{ at: number; value: number }>,
+  percentile: number,
+): number | null {
+  if (samples.length === 0) return null;
+  const sorted = samples.map((sample) => sample.value).sort((a, b) => a - b);
+  const clampedPercentile = Math.max(0, Math.min(1, percentile));
+  const index = Math.min(
+    sorted.length - 1,
+    Math.max(0, Math.round((sorted.length - 1) * clampedPercentile)),
+  );
+  const value = sorted[index];
+  return Number.isFinite(value) ? Number(value.toFixed(2)) : null;
+}
+
+function buildRendererMetricsSnapshot(
+  bridge: ReturnType<typeof getRTMPBridge>,
+  captureMode: ActiveCaptureMode,
+): RendererMetricsSnapshot {
+  const stats = bridge.getStats();
+  const nowMs = Date.now();
+  const captureFps = captureMode === "cdp" ? cdpFps : null;
+  const encodeFps =
+    typeof stats.encoderFps === "number" && Number.isFinite(stats.encoderFps)
+      ? stats.encoderFps
+      : null;
+  recordFpsSample(captureFpsSamples, captureFps, nowMs);
+  recordFpsSample(encodeFpsSamples, encodeFps, nowMs);
+  pruneFpsSamples(nowMs);
+
+  return {
+    captureFps,
+    encodeFps,
+    droppedFrames: Math.max(stats.droppedFrames, cdpDroppedFrames),
+    renderTick: lastObservedRenderTick,
+    duelStateTick: lastObservedDuelStateTick,
+    latestFrameAt: lastEncodedFrameAt ?? lastCaptureFrameAt,
+    latestRenderTickAt,
+    latestDuelStateTickAt,
+    latestVisualChangeAt,
+    visualChangeAgeMs:
+      latestVisualChangeAt != null
+        ? Math.max(0, Date.now() - latestVisualChangeAt)
+        : null,
+  };
+}
+
+function buildCaptureDiagnosticsSnapshot(
+  bridge: ReturnType<typeof getRTMPBridge>,
+): CaptureDiagnosticsSnapshot {
+  const diagnostics = bridge.getCaptureDiagnostics();
+  const lastFatalWriteError = diagnostics.lastFatalWriteError
+    ? { ...diagnostics.lastFatalWriteError }
+    : null;
+  const latestFrameAt =
+    typeof lastEncodedFrameAt === "number" &&
+    Number.isFinite(lastEncodedFrameAt)
+      ? lastEncodedFrameAt
+      : typeof lastCaptureFrameAt === "number" &&
+          Number.isFinite(lastCaptureFrameAt)
+        ? lastCaptureFrameAt
+        : null;
+
+  return {
+    recentFrames: diagnostics.recentFrames.map((sample) => ({
+      at: sample.at,
+      size: sample.size,
+      cdpTimestamp: sample.cdpTimestamp,
+    })),
+    recentFrameCadenceMs: [...diagnostics.recentFrameCadenceMs],
+    nonMonotonicCdpTimestampCount: diagnostics.nonMonotonicCdpTimestampCount,
+    backpressureTransitions: diagnostics.backpressureTransitions.map(
+      (transition) => ({
+        at: transition.at,
+        backpressured: transition.backpressured,
+      }),
+    ),
+    firstFatalWriteError: diagnostics.firstFatalWriteError
+      ? { ...diagnostics.firstFatalWriteError }
+      : null,
+    lastFatalWriteError,
+    pageStallBeforeLastFatalWrite:
+      lastFatalWriteError == null
+        ? null
+        : latestFrameAt == null
+          ? true
+          : lastFatalWriteError.at - latestFrameAt >=
+            FATAL_WRITE_PAGE_STALL_THRESHOLD_MS,
+    lastFrameAgeMs:
+      latestFrameAt == null ? null : Math.max(0, Date.now() - latestFrameAt),
+    captureSessionGeneration:
+      latestBrowserCaptureStatus?.captureSessionGeneration ?? null,
+    browserCapture: {
+      recording:
+        typeof latestBrowserCaptureStatus?.recording === "boolean"
+          ? latestBrowserCaptureStatus.recording
+          : null,
+      wsConnected:
+        typeof latestBrowserCaptureStatus?.wsConnected === "boolean"
+          ? latestBrowserCaptureStatus.wsConnected
+          : null,
+      chunkCount:
+        typeof latestBrowserCaptureStatus?.chunkCount === "number" &&
+        Number.isFinite(latestBrowserCaptureStatus.chunkCount)
+          ? latestBrowserCaptureStatus.chunkCount
+          : null,
+      bytesSent:
+        typeof latestBrowserCaptureStatus?.bytesSent === "number" &&
+        Number.isFinite(latestBrowserCaptureStatus.bytesSent)
+          ? latestBrowserCaptureStatus.bytesSent
+          : null,
+      lastChunkAt:
+        typeof latestBrowserCaptureStatus?.lastChunkAt === "number" &&
+        Number.isFinite(latestBrowserCaptureStatus.lastChunkAt)
+          ? latestBrowserCaptureStatus.lastChunkAt
+          : null,
+      lastChunkAgeMs:
+        typeof latestBrowserCaptureStatus?.lastChunkAgeMs === "number" &&
+        Number.isFinite(latestBrowserCaptureStatus.lastChunkAgeMs)
+          ? latestBrowserCaptureStatus.lastChunkAgeMs
+          : null,
+      lastChunkMs:
+        typeof latestBrowserCaptureStatus?.lastChunkMs === "number" &&
+        Number.isFinite(latestBrowserCaptureStatus.lastChunkMs)
+          ? latestBrowserCaptureStatus.lastChunkMs
+          : null,
+    },
+  };
+}
+
+function buildRendererSmokeSnapshot(
+  delivery: StreamDeliveryInfo,
+): RendererSmokeSnapshot {
+  const nowMs = Date.now();
+  const ingest = resolveStreamIngestSettings(process.env);
+  pruneFpsSamples(nowMs);
+  return {
+    currentSceneUrl: resolveStatusSceneUrl(),
+    activeBundle: latestActiveBundle,
+    deliveryMode: delivery.mode,
+    captureFpsP50: percentileFromSamples(captureFpsSamples, 0.5),
+    captureFpsP95: percentileFromSamples(captureFpsSamples, 0.95),
+    encodeFpsP50: percentileFromSamples(encodeFpsSamples, 0.5),
+    encodeFpsP95: percentileFromSamples(encodeFpsSamples, 0.95),
+    updatedAt: nowMs,
+    ingest: {
+      profile: ingest.profile,
+      transport: ingest.transport,
+      audioSampleRate: ingest.audioSampleRate,
+      gopFrames: ingest.gopFrames,
+      targetFps: TARGET_FPS,
+      probeOnly: ingest.probeOnly,
+    },
+  };
+}
+
+function recordSourceRecovery(reason: string): void {
+  sourceRecoveryCount += 1;
+  sourceLastRecoveryAt = Date.now();
+  console.log(`[Main] Source recovery recorded: ${reason}`);
+}
+
+function mapRendererReasonToSourceDegradedReason(
+  degradedReason: string | null | undefined,
+): StreamSourceDegradedReason | null {
+  const normalized = (degradedReason ?? "").trim().toLowerCase();
+  if (!normalized) return null;
+  if (
+    normalized === "capture_page_missing" ||
+    normalized === "loading_overlay_active" ||
+    normalized === "canvas_missing" ||
+    normalized === "initialization_failed" ||
+    normalized === "asset_origin_incomplete" ||
+    normalized === "socket_disconnected" ||
+    normalized === "stream_state_missing" ||
+    normalized === "waiting_for_duel_data" ||
+    normalized === "world_not_ready" ||
+    normalized === "terrain_not_ready" ||
+    normalized === "camera_target_unresolved" ||
+    normalized === "avatar_not_ready" ||
+    normalized === "initializing" ||
+    normalized === "agents_missing" ||
+    normalized === "invalid_agent_hp" ||
+    normalized === "arena_positions_invalid" ||
+    normalized.startsWith("probe_failed:")
+  ) {
+    return "page_not_ready";
+  }
+  if (
+    normalized === "render_tick_stale" ||
+    normalized === "visual_change_stale" ||
+    normalized === "capture_fps_low"
+  ) {
+    return "capture_stalled";
+  }
+  // Renderer reported low encoder FPS: the compositor-to-FFmpeg pipeline
+  // is producing below-target cadence. Previously this fell through to
+  // `null`, leaving `sourceRuntime.ready=true` even while the downstream
+  // broadcast path was starving. Route it through `encoder_stalled` so
+  // the top-level readiness surface stays honest.
+  if (normalized === "encoder_fps_low") {
+    return "encoder_stalled";
+  }
+  return null;
+}
+
+function rendererPhaseNeedsVisualChange(
+  phase: string | null | undefined,
+): boolean {
+  const normalized = (phase ?? "").trim().toUpperCase();
+  return (
+    normalized === "COUNTDOWN" ||
+    normalized === "FIGHTING" ||
+    normalized === "RESOLUTION"
+  );
+}
+
+function sourceVisualChangeIsStale(nowMs: number): boolean {
+  if (!rendererPhaseNeedsVisualChange(latestRendererHealth.phase)) {
+    return false;
+  }
+
+  const latestVisualChangeAgeMs =
+    latestVisualChangeAt == null
+      ? null
+      : Math.max(0, nowMs - latestVisualChangeAt);
+  return (
+    latestVisualChangeAgeMs == null ||
+    latestVisualChangeAgeMs > SOURCE_VISUAL_CHANGE_STALE_MS
+  );
+}
+
+function resolveStatusSceneUrl(): string | null {
+  const sceneUrl = latestSceneUrl ?? selectedGameUrl;
+  return sceneUrl ? redactStreamingSecretsFromUrl(sceneUrl) : null;
+}
+
+function hashVisualSample(buffer: Uint8Array): string {
+  return createHash("sha256").update(buffer).digest("hex").slice(0, 16);
+}
+
+function resolveVisualSampleClip(
+  canvasRect: RendererCanvasRectSnapshot | unknown,
+  viewport: { width: number; height: number } | null,
+): { x: number; y: number; width: number; height: number } | null {
+  if (!viewport || !canvasRect || typeof canvasRect !== "object") {
+    return null;
+  }
+  const rect = canvasRect as Partial<NonNullable<RendererCanvasRectSnapshot>>;
+  const x = Number(rect.x);
+  const y = Number(rect.y);
+  const width = Number(rect.width);
+  const height = Number(rect.height);
+  if (
+    !Number.isFinite(x) ||
+    !Number.isFinite(y) ||
+    !Number.isFinite(width) ||
+    !Number.isFinite(height) ||
+    width < 96 ||
+    height < 96
+  ) {
+    return null;
+  }
+
+  const sampleX = Math.max(0, x + width * 0.15);
+  const sampleY = Math.max(0, y + height * 0.2);
+  const sampleWidth = Math.min(width * 0.7, viewport.width - sampleX);
+  const sampleHeight = Math.min(height * 0.6, viewport.height - sampleY);
+  if (sampleWidth < 64 || sampleHeight < 64) {
+    return null;
+  }
+  return {
+    x: sampleX,
+    y: sampleY,
+    width: sampleWidth,
+    height: sampleHeight,
+  };
+}
+
+function resolveSourceRuntimeSnapshot(
+  bridge: ReturnType<typeof getRTMPBridge>,
+  captureMode: ActiveCaptureMode,
+): StreamSourceRuntime {
+  const nowMs = Date.now();
+  const bridgeStatus = bridge.getStatus();
+  const ingest = resolveStreamIngestSettings(process.env);
+  const hlsManifest = readLocalHlsManifestSnapshot(process.env);
+  const browserCaptureLastFrameAt = resolveBrowserCaptureLastFrameAt(
+    latestBrowserCaptureStatus as BrowserCaptureStatusSnapshot | null,
+    nowMs,
+  );
+  // x11_nvenc has no browser-side or CDP-side frame timestamps — the
+  // authoritative liveness is FFmpeg's own `frame=` progression, exposed by
+  // the bridge. Fall back to `lastEncodedFrameAt` only if the bridge hasn't
+  // yet reported an encoder frame (expected briefly at startup).
+  const lastFrameAt =
+    captureMode === "x11_nvenc"
+      ? (bridge.getLastEncoderFrameAt() ?? lastEncodedFrameAt)
+      : captureMode === "cdp"
+        ? (lastEncodedFrameAt ?? lastCaptureFrameAt)
+        : browserCaptureLastFrameAt;
+  const rendererReason = mapRendererReasonToSourceDegradedReason(
+    latestRendererHealth.degradedReason,
+  );
+  const visualChangeStale = sourceVisualChangeIsStale(nowMs);
+
+  // Any destination with a recent fatal-write error is authoritative
+  // evidence the broadcast path is dark — don't trust FFmpeg's
+  // `frame=` progress alone.
+  const DESTINATION_ERROR_RECENT_MS = 15_000;
+  const lastDestErrorAt = bridge.getLastDestinationWriteErrorAt?.() ?? null;
+  const destinationRecentlyErrored =
+    lastDestErrorAt != null &&
+    nowMs - lastDestErrorAt < DESTINATION_ERROR_RECENT_MS;
+  // Encoder falling behind real-time — the stream will drift from live,
+  // and Cloudflare will refuse to promote the input to live until cadence
+  // recovers. Threshold at 0.9 leaves a little slack for normal jitter.
+  const encoderSpeed = bridge.getEncoderSpeed?.() ?? null;
+  const encoderBelowRealtime =
+    encoderSpeed != null && Number.isFinite(encoderSpeed) && encoderSpeed < 0.9;
+
+  let degradedReason: StreamSourceDegradedReason | null = null;
+  if (captureNavigationAbortInFlight) {
+    degradedReason = "unexpected_navigation";
+  } else if (captureMode === "x11_nvenc") {
+    // x11_nvenc mode does not attach Playwright — Chrome is a detached
+    // child process and `browser`/`page` are null by design (see
+    // spawnX11NvencChromeProcess). Treat Chrome-child liveness as the
+    // authoritative "render browser is up" signal for this mode.
+    if (!x11NvencChromeProcess || x11NvencChromeProcess.killed) {
+      degradedReason = "browser_missing";
+    }
+  } else if (!browser || !page || page.isClosed()) {
+    degradedReason = "browser_missing";
+  } else if (destinationRecentlyErrored) {
+    degradedReason = "destination_disconnected";
+  } else if (rendererReason) {
+    degradedReason = rendererReason;
+  } else if (visualChangeStale) {
+    degradedReason = "capture_stalled";
+  } else if (bridgeStatus.ffmpegRunning !== true) {
+    degradedReason = "encoder_stalled";
+  } else if (encoderBelowRealtime) {
+    degradedReason = "encoder_stalled";
+  } else if (
+    (captureMode === "cdp" || captureMode === "x11_nvenc") &&
+    (lastFrameAt == null || nowMs - lastFrameAt > SOURCE_CAPTURE_STALL_MS)
+  ) {
+    degradedReason = "capture_stalled";
+  } else if (
+    captureMode !== "cdp" &&
+    captureMode !== "x11_nvenc" &&
+    !latestBrowserCaptureStatus?.captureSessionGeneration
+  ) {
+    degradedReason = "page_not_ready";
+  } else if (
+    captureMode !== "cdp" &&
+    captureMode !== "x11_nvenc" &&
+    (bridgeStatus.clientConnected !== true ||
+      latestBrowserCaptureStatus?.recording !== true ||
+      latestBrowserCaptureStatus?.wsConnected !== true ||
+      lastFrameAt == null ||
+      nowMs - lastFrameAt > SOURCE_CAPTURE_STALL_MS)
+  ) {
+    degradedReason = "capture_stalled";
+  } else if (
+    !ingest.probeOnly &&
+    typeof hlsManifest?.updatedAt === "number" &&
+    Number.isFinite(hlsManifest.updatedAt) &&
+    nowMs - hlsManifest.updatedAt > SOURCE_CAPTURE_STALL_MS
+  ) {
+    degradedReason = "manifest_stale";
+  }
+
+  return {
+    ready: degradedReason == null,
+    statusSource: "external_worker",
+    captureMode,
+    degradedReason,
+    currentSceneUrl: resolveStatusSceneUrl(),
+    activeBundle: latestActiveBundle,
+    lastFrameAt,
+    lastRenderTickAt: latestRenderTickAt,
+    lastVisualChangeAt: latestVisualChangeAt,
+    lastRecoveryAt: sourceLastRecoveryAt,
+    recoveryCount: sourceRecoveryCount,
+    workerHeartbeatAt: nowMs,
+  };
+}
 
 function writeExternalStatusSnapshot(
   bridge: ReturnType<typeof getRTMPBridge>,
   captureMode: ActiveCaptureMode,
-): void {
-  if (!EXTERNAL_STATUS_FILE) return;
+): StreamSourceRuntime | null {
+  const sourceRuntime = resolveSourceRuntimeSnapshot(bridge, captureMode);
+  if (!EXTERNAL_STATUS_FILE) return sourceRuntime;
 
   const bridgeStatus = bridge.getStatus();
   const stats = bridge.getStats();
   const processMemory = process.memoryUsage();
+  const delivery: StreamDeliveryInfo = resolveStreamDeliveryInfo(process.env);
+  const ingest = resolveStreamIngestSettings(process.env);
+  const hlsManifest = readLocalHlsManifestSnapshot(process.env);
+  const metrics = buildRendererMetricsSnapshot(bridge, captureMode);
+  const captureDiagnostics = buildCaptureDiagnosticsSnapshot(bridge);
+  const smoke = buildRendererSmokeSnapshot(delivery);
   const payload = {
     ...bridgeStatus,
     stats: {
@@ -262,11 +1046,26 @@ function writeExternalStatusSnapshot(
       destinations: stats.destinations,
       healthy: stats.healthy,
       droppedFrames: stats.droppedFrames,
+      encoderFps: stats.encoderFps,
       backpressured: stats.backpressured,
       spectators: stats.spectators,
       processMemory: stats.processMemory,
     },
     captureMode,
+    metrics,
+    hlsManifest,
+    delivery,
+    ingest: {
+      profile: ingest.profile,
+      transport: ingest.transport,
+      audioSampleRate: ingest.audioSampleRate,
+      gopFrames: ingest.gopFrames,
+      targetFps: TARGET_FPS,
+      probeOnly: ingest.probeOnly,
+    },
+    smoke,
+    sourceRuntime,
+    captureDiagnostics,
     processRssBytes: processMemory.rss,
     rendererHealth: latestRendererHealth,
     updatedAt: Date.now(),
@@ -286,6 +1085,7 @@ function writeExternalStatusSnapshot(
       );
     }
   }
+  return sourceRuntime;
 }
 
 function clearExternalStatusSnapshot(): void {
@@ -365,8 +1165,23 @@ async function probeRendererHealth(
         updatedAt?: number | null;
         phase?: string | null;
       } | null;
+      __HYPERSCAPE_STREAM_HEARTBEAT__?: {
+        renderTick?: number;
+        latestRenderTickAt?: number | null;
+        duelStateTick?: number;
+        latestDuelStateTickAt?: number | null;
+      } | null;
       __HYPERSCAPE_STREAM_BOOT_STATUS__?: string | null;
+      __HYPERSCAPE_STREAM_BOOT_DIAGNOSTICS__?: unknown;
     };
+    const activeBundle =
+      Array.from(
+        document.querySelectorAll<HTMLScriptElement>("script[src]"),
+      ).find(
+        (script) =>
+          script.src.includes("StreamingMode-") ||
+          script.src.includes("framework.client-"),
+      )?.src ?? null;
     const explicitHealth =
       win.__HYPERSCAPE_STREAM_RENDERER_HEALTH__ &&
       typeof win.__HYPERSCAPE_STREAM_RENDERER_HEALTH__ === "object"
@@ -407,15 +1222,192 @@ async function probeRendererHealth(
       !bootStatus.startsWith("error:");
     const hasCriticalErrorUi =
       !explicitHealth && bootStatus !== null && bootStatus.startsWith("error:");
+    const heartbeat =
+      win.__HYPERSCAPE_STREAM_HEARTBEAT__ &&
+      typeof win.__HYPERSCAPE_STREAM_HEARTBEAT__ === "object"
+        ? {
+            renderTick:
+              typeof win.__HYPERSCAPE_STREAM_HEARTBEAT__.renderTick ===
+                "number" &&
+              Number.isFinite(win.__HYPERSCAPE_STREAM_HEARTBEAT__.renderTick)
+                ? win.__HYPERSCAPE_STREAM_HEARTBEAT__.renderTick
+                : 0,
+            latestRenderTickAt:
+              typeof win.__HYPERSCAPE_STREAM_HEARTBEAT__.latestRenderTickAt ===
+                "number" &&
+              Number.isFinite(
+                win.__HYPERSCAPE_STREAM_HEARTBEAT__.latestRenderTickAt,
+              )
+                ? win.__HYPERSCAPE_STREAM_HEARTBEAT__.latestRenderTickAt
+                : null,
+            duelStateTick:
+              typeof win.__HYPERSCAPE_STREAM_HEARTBEAT__.duelStateTick ===
+                "number" &&
+              Number.isFinite(win.__HYPERSCAPE_STREAM_HEARTBEAT__.duelStateTick)
+                ? win.__HYPERSCAPE_STREAM_HEARTBEAT__.duelStateTick
+                : 0,
+            latestDuelStateTickAt:
+              typeof win.__HYPERSCAPE_STREAM_HEARTBEAT__
+                .latestDuelStateTickAt === "number" &&
+              Number.isFinite(
+                win.__HYPERSCAPE_STREAM_HEARTBEAT__.latestDuelStateTickAt,
+              )
+                ? win.__HYPERSCAPE_STREAM_HEARTBEAT__.latestDuelStateTickAt
+                : null,
+          }
+        : null;
+    let frameHash: string | null = null;
+    const preferredCanvas =
+      document.querySelector("#hyperscape-world-canvas") ??
+      document.querySelector("#game-canvas canvas") ??
+      document.querySelector("[data-component='viewport'] canvas");
+    const canvasCandidates = Array.from(
+      document.querySelectorAll("canvas"),
+    ).filter(
+      (candidate): candidate is HTMLCanvasElement =>
+        candidate instanceof HTMLCanvasElement,
+    );
+    const largestCanvas = canvasCandidates.slice().sort((left, right) => {
+      const leftRect = left.getBoundingClientRect();
+      const rightRect = right.getBoundingClientRect();
+      const leftArea =
+        Math.max(leftRect.width, left.width) *
+        Math.max(leftRect.height, left.height);
+      const rightArea =
+        Math.max(rightRect.width, right.width) *
+        Math.max(rightRect.height, right.height);
+      return rightArea - leftArea;
+    })[0];
+    const canvas =
+      preferredCanvas instanceof HTMLCanvasElement
+        ? preferredCanvas
+        : (largestCanvas ?? null);
+    const canvasRect =
+      canvas instanceof HTMLCanvasElement
+        ? (() => {
+            const rect = canvas.getBoundingClientRect();
+            const x = Number(rect.x);
+            const y = Number(rect.y);
+            const width = Number(rect.width);
+            const height = Number(rect.height);
+            return Number.isFinite(x) &&
+              Number.isFinite(y) &&
+              Number.isFinite(width) &&
+              Number.isFinite(height) &&
+              width > 0 &&
+              height > 0
+              ? { x, y, width, height }
+              : null;
+          })()
+        : null;
+    if (canvas instanceof HTMLCanvasElement) {
+      const sampleCanvas = document.createElement("canvas");
+      sampleCanvas.width = 32;
+      sampleCanvas.height = 18;
+      const context = sampleCanvas.getContext("2d", {
+        willReadFrequently: true,
+      });
+      if (context) {
+        try {
+          context.drawImage(
+            canvas,
+            0,
+            0,
+            sampleCanvas.width,
+            sampleCanvas.height,
+          );
+          const imageData = context.getImageData(
+            0,
+            0,
+            sampleCanvas.width,
+            sampleCanvas.height,
+          ).data;
+          let hash = 2166136261;
+          for (let i = 0; i < imageData.length; i += 16) {
+            hash ^= imageData[i] ?? 0;
+            hash = Math.imul(hash, 16777619);
+            hash ^= imageData[i + 1] ?? 0;
+            hash = Math.imul(hash, 16777619);
+            hash ^= imageData[i + 2] ?? 0;
+            hash = Math.imul(hash, 16777619);
+          }
+          frameHash = (hash >>> 0).toString(16);
+        } catch {
+          frameHash = null;
+        }
+      }
+    }
     return {
       explicitHealth,
-      hasCanvas: document.querySelector("canvas") !== null,
+      hasCanvas: canvasCandidates.length > 0,
       readyFlag: win.__HYPERSCAPE_STREAM_READY__ === true,
       hasStreamingBootUi,
       hasCriticalErrorUi,
+      heartbeat,
+      frameHash,
+      canvasRect,
+      currentSceneUrl: window.location.href,
+      activeBundle,
+      bootDiagnostics:
+        win.__HYPERSCAPE_STREAM_BOOT_DIAGNOSTICS__ &&
+        typeof win.__HYPERSCAPE_STREAM_BOOT_DIAGNOSTICS__ === "object"
+          ? win.__HYPERSCAPE_STREAM_BOOT_DIAGNOSTICS__
+          : null,
     };
   });
 
+  let visualSampleHash =
+    typeof probe.frameHash === "string" && probe.frameHash.length > 0
+      ? `canvas:${probe.frameHash}`
+      : null;
+  try {
+    const clip = resolveVisualSampleClip(
+      probe.canvasRect as RendererCanvasRectSnapshot | unknown,
+      pageRef.viewportSize(),
+    );
+    if (clip) {
+      const screenshot = await pageRef.screenshot({
+        type: "jpeg",
+        quality: 30,
+        fullPage: false,
+        scale: "css",
+        clip,
+      });
+      visualSampleHash = `screenshot:${hashVisualSample(screenshot)}`;
+    }
+  } catch {
+    // Fall back to the in-page canvas sample. Some capture sessions briefly
+    // reject screenshots while Chromium is navigating or restarting.
+  }
+
+  const heartbeat =
+    probe.heartbeat && typeof probe.heartbeat === "object"
+      ? (probe.heartbeat as RendererHeartbeatSnapshot)
+      : null;
+  if (heartbeat) {
+    lastObservedRenderTick = heartbeat.renderTick;
+    lastObservedDuelStateTick = heartbeat.duelStateTick;
+    latestRenderTickAt = heartbeat.latestRenderTickAt;
+    latestDuelStateTickAt = heartbeat.latestDuelStateTickAt;
+  }
+  latestSceneUrl =
+    typeof probe.currentSceneUrl === "string" &&
+    probe.currentSceneUrl.length > 0
+      ? probe.currentSceneUrl
+      : selectedGameUrl;
+  latestActiveBundle =
+    typeof probe.activeBundle === "string" && probe.activeBundle.length > 0
+      ? probe.activeBundle
+      : null;
+  if (visualSampleHash) {
+    if (visualSampleHash !== lastVisualSampleHash) {
+      lastVisualSampleHash = visualSampleHash;
+      latestVisualChangeAt = probedAt;
+    } else if (latestVisualChangeAt === null) {
+      latestVisualChangeAt = probedAt;
+    }
+  }
+
   const explicitHealth =
     probe.explicitHealth && typeof probe.explicitHealth === "object"
       ? probe.explicitHealth
@@ -441,6 +1433,7 @@ async function probeRendererHealth(
         hasStreamingBootUi: probe.hasStreamingBootUi === true,
         hasCriticalErrorUi: criticalUiVisible,
         readyFlag: probe.readyFlag === true,
+        bootDiagnostics: probe.bootDiagnostics ?? null,
       },
     };
   }
@@ -467,6 +1460,7 @@ async function probeRendererHealth(
       hasStreamingBootUi: probe.hasStreamingBootUi === true,
       hasCriticalErrorUi: probe.hasCriticalErrorUi === true,
       readyFlag: probe.readyFlag === true,
+      bootDiagnostics: probe.bootDiagnostics ?? null,
     },
   };
 }
@@ -496,6 +1490,20 @@ function assertAllowedCaptureNavigation(rawUrl: string): void {
   );
 }
 
+function assertCaptureDocumentResponse(
+  response: Awaited<ReturnType<Page["goto"]>>,
+  rawUrl: string,
+): void {
+  const status = response?.status();
+  if (typeof status !== "number" || status < 400) {
+    return;
+  }
+
+  throw new Error(
+    `Capture document request returned HTTP ${status}: ${redactStreamingSecretsFromUrl(rawUrl)}`,
+  );
+}
+
 async function abortCaptureForUnexpectedNavigation(
   rawUrl: string,
 ): Promise<void> {
@@ -533,7 +1541,11 @@ async function refreshRendererHealthSnapshot(
 
   rendererHealthProbeInFlight = (async () => {
     try {
-      latestRendererHealth = await probeRendererHealth(pageRef);
+      latestRendererHealth = await withTimeout(
+        probeRendererHealth(pageRef),
+        SOURCE_PROBE_TIMEOUT_MS,
+        "Renderer health probe",
+      );
     } catch (err) {
       latestRendererHealth = {
         ready: false,
@@ -584,24 +1596,198 @@ async function waitForStreamReadiness(
 
 // ── Browser Launch ─────────────────────────────────────────────────────────
 
-async function launchCaptureBrowser() {
-  const featureFlags = "--enable-features=Vulkan,UseSkiaRenderer,WebGPU";
-  const launchConfig = {
-    headless: STREAM_CAPTURE_HEADLESS,
-    args: buildDefaultCaptureLaunchArgs({
-      angleBackend: ANGLE_BACKEND,
-      featureFlags,
-      disableSandbox: CAPTURE_DISABLE_SANDBOX,
-    }),
-  };
+/**
+ * Poll Chrome's /json/version endpoint until it responds successfully,
+ * proving the browser is up and has finished launching the render window.
+ *
+ * We do NOT return the WebSocket debugger URL nor attach via Playwright's
+ * connectOverCDP() in x11_nvenc mode — it hangs on the WebSocket handshake
+ * under Bun (same class as the "Bun/ws WebSocket handshake timeout" already
+ * documented in this file for WebCodecs-over-WebSocket). The only reason to
+ * probe this endpoint is to gate FFmpeg's x11grab start on Chrome having
+ * finished its first paint, so the initial frames aren't captured from an
+ * empty Xvfb. If we ever need scene-level health probes for x11_nvenc mode
+ * we'll add a raw CDP client (e.g. chrome-remote-interface) that bypasses
+ * Playwright's ws handshake.
+ */
+async function waitForChromeReady(
+  port: number,
+  timeoutMs: number,
+): Promise<void> {
+  const httpEndpoint = `http://127.0.0.1:${port}/json/version`;
+  const deadline = Date.now() + timeoutMs;
+  let lastErr: string | null = null;
+  while (Date.now() < deadline) {
+    try {
+      const res = await fetch(httpEndpoint);
+      if (res.ok) {
+        await res.text();
+        return;
+      }
+      lastErr = `http ${res.status}`;
+    } catch (err) {
+      lastErr = errMsg(err);
+    }
+    await new Promise((resolve) => setTimeout(resolve, 500));
+  }
+  throw new Error(
+    `Chrome on port ${port} did not reach ready state within ${timeoutMs}ms (last: ${lastErr ?? "no reply"})`,
+  );
+}
 
-  if (CAPTURE_DISABLE_SANDBOX) {
-    console.warn(
-      "[Main] CAPTURE_DISABLE_SANDBOX=true: Chromium sandboxing is disabled for this capture session.",
-    );
+/**
+ * Spawn Chrome directly (outside Playwright) with `--app=URL --kiosk` so the
+ * rendered window has no tab bar / URL bar / infobars, wait for Chrome to
+ * report ready, and return. In x11_nvenc mode we deliberately do NOT
+ * attach Playwright to the Chrome process — Playwright's connectOverCDP()
+ * hangs indefinitely on Bun's WebSocket handshake, which is the same
+ * Bun/ws compatibility issue already documented for the WebCodecs path.
+ * Chrome stays a detached child process; x11grab captures its display.
+ *
+ * Only used for x11_nvenc mode. Other capture modes continue to use
+ * `chromium.launch()` unchanged.
+ *
+ * Why direct spawn instead of Playwright launch: `chromium.launch({ args:
+ * ['--kiosk', ...] })` on Chrome channels silently renders the browser
+ * with a tab bar + URL bar, and x11grab captures those chrome pixels
+ * into the stream frame. The canary worker proved that a plain
+ * child_process spawn with `--app=URL --kiosk` renders a frameless,
+ * full-bleed window at the configured size — exactly what x11grab needs.
+ */
+async function spawnX11NvencChromeProcess(): Promise<void> {
+  // Kill any leftover child from a previous spawn (browser rotation, recovery)
+  if (x11NvencChromeProcess && !x11NvencChromeProcess.killed) {
+    try {
+      x11NvencChromeProcess.kill("SIGKILL");
+    } catch {
+      // Already dead
+    }
+    x11NvencChromeProcess = null;
   }
 
-  if (STREAM_CAPTURE_CHANNEL) {
+  const port = parseIntegerSetting(
+    process.env.STREAM_X11_NVENC_DEBUG_PORT,
+    9222,
+  );
+  const profileDir =
+    process.env.STREAM_X11_NVENC_PROFILE_DIR ?? "/tmp/x11-nvenc-render-profile";
+  const streamUrl = GAME_URL_CANDIDATES[0];
+  if (!streamUrl) {
+    throw new Error(
+      "x11_nvenc mode requires at least one GAME_URL_CANDIDATES entry",
+    );
+  }
+  const chromePath =
+    process.env.STREAM_CAPTURE_CHROME_PATH ?? "/opt/google/chrome-beta/chrome";
+
+  // Clean profile dir so stale Singleton-lock files don't block startup.
+  try {
+    fs.rmSync(profileDir, { recursive: true, force: true });
+  } catch {
+    // ignore
+  }
+  fs.mkdirSync(profileDir, { recursive: true });
+
+  const args: string[] = [
+    `--app=${streamUrl}`,
+    `--user-data-dir=${profileDir}`,
+    `--remote-debugging-port=${port}`,
+    "--no-first-run",
+    "--no-default-browser-check",
+    "--disable-infobars",
+    "--hide-scrollbars",
+    `--window-size=${VIEWPORT.width},${VIEWPORT.height}`,
+    "--window-position=0,0",
+    "--kiosk",
+    "--start-fullscreen",
+    "--autoplay-policy=no-user-gesture-required",
+    "--use-gl=angle",
+    `--use-angle=${ANGLE_BACKEND}`,
+    "--enable-webgl",
+    "--enable-unsafe-webgpu",
+    "--enable-features=Vulkan,UseSkiaRenderer,WebGPU",
+    "--ignore-gpu-blocklist",
+    "--enable-gpu-rasterization",
+    "--disable-background-timer-throttling",
+    "--disable-backgrounding-occluded-windows",
+    "--disable-renderer-backgrounding",
+    // Chrome refuses to start as root (the capture worker's typical
+    // environment on gpu-server) without --no-sandbox. Playwright
+    // silently injected this for us in launch-mode; in direct-spawn
+    // we must pass it explicitly. x11grab never uses Chrome as a
+    // privilege boundary — it just renders a page for capture — so
+    // dropping the sandbox here matches the proven canary worker and
+    // the existing CDP/webcodecs launch posture.
+    "--no-sandbox",
+  ];
+
+  console.log(
+    `[Main] Spawning Chrome directly for x11_nvenc (no Playwright launch): ${chromePath} --app=<url> --kiosk --window-size=${VIEWPORT.width},${VIEWPORT.height} --remote-debugging-port=${port}`,
+  );
+  const child = spawn(chromePath, args, {
+    detached: false,
+    stdio: ["ignore", "ignore", "pipe"],
+    env: process.env,
+  });
+
+  child.on("exit", (code, signal) => {
+    console.warn(
+      `[Main] x11_nvenc Chrome exited (code=${code} signal=${signal})`,
+    );
+  });
+  if (child.stderr) {
+    child.stderr.on("data", (buf: Buffer) => {
+      const msg = buf.toString("utf8").trim();
+      if (!msg) return;
+      // Echo only genuine errors, filter GCM / ALSA noise.
+      if (
+        /error|fatal|crashed/i.test(msg) &&
+        !/ERROR:google_apis\/gcm|ERROR:.*alsa/i.test(msg)
+      ) {
+        console.warn("[x11-nvenc chrome]", msg.slice(0, 500));
+      }
+    });
+  }
+
+  x11NvencChromeProcess = child;
+
+  await waitForChromeReady(port, 30_000);
+  console.log(
+    `[Main] x11_nvenc Chrome ready on :${process.env.DISPLAY ?? "?"} (remote-debugging-port=${port}); ` +
+      "not attaching Playwright (Bun/ws handshake hangs), x11grab captures the display directly.",
+  );
+}
+
+async function launchCaptureBrowser(): Promise<Browser | null> {
+  if (CAPTURE_MODE === "x11_nvenc") {
+    await spawnX11NvencChromeProcess();
+    return null;
+  }
+  const featureFlags = "--enable-features=Vulkan,UseSkiaRenderer,WebGPU";
+  // When in x11_nvenc mode, pin Chromium full-screen to the Xvfb display so
+  // FFmpeg's x11grab captures the canvas region exactly (no browser chrome,
+  // no stray surrounding pixels). No effect on other capture modes.
+  const fullScreenPin =
+    CAPTURE_MODE === "x11_nvenc"
+      ? { width: VIEWPORT.width, height: VIEWPORT.height }
+      : undefined;
+  const launchConfig = {
+    headless: STREAM_CAPTURE_HEADLESS,
+    args: buildDefaultCaptureLaunchArgs({
+      angleBackend: ANGLE_BACKEND,
+      featureFlags,
+      disableSandbox: CAPTURE_DISABLE_SANDBOX,
+      fullScreenPin,
+    }),
+  };
+
+  if (CAPTURE_DISABLE_SANDBOX) {
+    console.warn(
+      "[Main] CAPTURE_DISABLE_SANDBOX=true: Chromium sandboxing is disabled for this capture session.",
+    );
+  }
+
+  if (STREAM_CAPTURE_CHANNEL) {
     console.log(
       `[Main] Launching with explicit browser channel: ${STREAM_CAPTURE_CHANNEL}`,
     );
@@ -646,14 +1832,45 @@ async function launchCaptureBrowser() {
   }
 }
 
-async function setupBrowser() {
+async function setupBrowser(forceReselect = false) {
   if (browser) await cleanup();
+  if (forceReselect) {
+    selectedGameUrl = null;
+  }
 
   console.log(
     `[Main] Launching browser (headless=${STREAM_CAPTURE_HEADLESS}, angle=${ANGLE_BACKEND}${STREAM_CAPTURE_CHANNEL ? `, channel=${STREAM_CAPTURE_CHANNEL}` : ""}, mode=${CAPTURE_MODE})...`,
   );
   browser = await launchCaptureBrowser();
 
+  if (CAPTURE_MODE === "x11_nvenc") {
+    // x11_nvenc owns Chrome as a detached child process (not attached via
+    // Playwright — see spawnX11NvencChromeProcess). There is no Playwright
+    // Page to wire up. Chrome has already been loaded with --app=<game URL>
+    // and is rendering into Xvfb. Skip all Playwright page setup, skip the
+    // GAME_URL_CANDIDATES goto loop, and let Chrome's first-paint settling
+    // happen under STREAM_CAPTURE_POST_NAV_DELAY_MS below. The x11_nvenc
+    // capture (x11grab + NVENC) reads the display directly from here on.
+    selectedGameUrl = GAME_URL_CANDIDATES[0] ?? null;
+    console.log(
+      `[Main] x11_nvenc mode: skipping Playwright page setup; Chrome is a detached child on DISPLAY=${process.env.DISPLAY ?? "?"}.`,
+    );
+    if (STREAM_CAPTURE_POST_NAV_DELAY_MS > 0) {
+      console.log(
+        `[Main] Waiting ${STREAM_CAPTURE_POST_NAV_DELAY_MS}ms before starting capture...`,
+      );
+      await new Promise((resolve) =>
+        setTimeout(resolve, STREAM_CAPTURE_POST_NAV_DELAY_MS),
+      );
+    }
+    launchTime = Date.now();
+    return;
+  }
+
+  // ── Playwright path (cdp / webcodecs / mediarecorder) ──
+  if (!browser) {
+    throw new Error("launchCaptureBrowser returned null outside x11_nvenc");
+  }
   const context = await browser.newContext({
     viewport: VIEWPORT,
     deviceScaleFactor: 1,
@@ -715,6 +1932,23 @@ async function setupBrowser() {
     }
   });
 
+  page.on("response", (response) => {
+    const status = response.status();
+    if (status < 400) {
+      return;
+    }
+    console.warn(
+      `[Browser] Resource response ${status}: ${redactStreamingSecretsFromUrl(response.url())}`,
+    );
+  });
+
+  page.on("requestfailed", (request) => {
+    const failure = request.failure();
+    console.warn(
+      `[Browser] Request failed: ${redactStreamingSecretsFromUrl(request.url())}${failure?.errorText ? ` (${failure.errorText})` : ""}`,
+    );
+  });
+
   page.on("framenavigated", (frame) => {
     if (frame !== page?.mainFrame()) {
       return;
@@ -738,10 +1972,11 @@ async function setupBrowser() {
       const redactedCandidateUrl = redactStreamingSecretsFromUrl(candidateUrl);
       console.log(`[Main] Navigating to ${redactedCandidateUrl}...`);
       try {
-        await page.goto(candidateUrl, {
+        const response = await page.goto(candidateUrl, {
           timeout: 120_000,
           waitUntil: "domcontentloaded",
         });
+        assertCaptureDocumentResponse(response, candidateUrl);
         assertAllowedCaptureNavigation(page.url());
       } catch (err) {
         console.warn(`[Main] Failed to load ${redactedCandidateUrl}:`, err);
@@ -771,10 +2006,11 @@ async function setupBrowser() {
     }
   } else {
     try {
-      await page.goto(selectedGameUrl, {
+      const response = await page.goto(selectedGameUrl, {
         timeout: 120_000,
         waitUntil: "domcontentloaded",
       });
+      assertCaptureDocumentResponse(response, selectedGameUrl);
       assertAllowedCaptureNavigation(page.url());
     } catch (err) {
       console.error(
@@ -824,6 +2060,7 @@ async function startCdpCapture(bridge: ReturnType<typeof getRTMPBridge>) {
   bridge.startFFmpegDirect();
 
   startFpsTracking();
+  startCdpFramePump(bridge);
 
   // Handle incoming frames from CDP
   cdpSession.on("Page.screencastFrame", async (params) => {
@@ -836,15 +2073,35 @@ async function startCdpCapture(bridge: ReturnType<typeof getRTMPBridge>) {
       // Session may have been destroyed during page navigation
     }
 
-    // Decode base64 JPEG and feed to FFmpeg
-    const jpegBuffer = Buffer.from(base64Data, "base64");
-    const written = bridge.feedFrame(jpegBuffer);
-
-    if (written) {
-      cdpFrameCount++;
-    } else {
-      cdpDroppedFrames++;
+    const frameAt = Date.now();
+    lastCaptureFrameAt = frameAt;
+    // CDP can emit compositor frames faster than the configured stream FPS.
+    // Keep FFmpeg on the target cadence instead of overfeeding the encoder.
+    if (
+      lastEncodedFrameAt != null &&
+      frameAt - lastEncodedFrameAt < CDP_FRAME_PUMP_INTERVAL_MS
+    ) {
+      return;
     }
+
+    // Decode only accepted frames; skipped CDP frames can be large base64 JPEGs.
+    const jpegBuffer = Buffer.from(base64Data, "base64");
+    latestCdpFrameBuffer = jpegBuffer;
+    const metadataRecord =
+      params.metadata && typeof params.metadata === "object"
+        ? (params.metadata as Record<string, unknown>)
+        : null;
+    const cdpTimestamp =
+      metadataRecord &&
+      typeof metadataRecord.timestamp === "number" &&
+      Number.isFinite(metadataRecord.timestamp)
+        ? metadataRecord.timestamp
+        : null;
+    feedCdpFrameToEncoder(bridge, jpegBuffer, {
+      frameAt,
+      cdpTimestamp,
+      repeated: false,
+    });
   });
 
   // Start the screencast
@@ -853,14 +2110,19 @@ async function startCdpCapture(bridge: ReturnType<typeof getRTMPBridge>) {
     quality: CDP_QUALITY,
     maxWidth: VIEWPORT.width,
     maxHeight: VIEWPORT.height,
-    everyNthFrame: 1, // Capture every frame
+    everyNthFrame: CDP_EVERY_NTH_FRAME,
   });
 
-  console.log("[CDP] ✅ Screencast capture started — frames piping to FFmpeg");
+  console.log(
+    `[CDP] ✅ Screencast capture started — frames piping to FFmpeg (everyNthFrame=${CDP_EVERY_NTH_FRAME})`,
+  );
 }
 
 async function stopCdpCapture() {
   stopFpsTracking();
+  stopCdpFramePump();
+  latestCdpFrameBuffer = null;
+  lastEncodedFrameAt = null;
 
   if (cdpSession) {
     try {
@@ -892,7 +2154,7 @@ async function startLegacyCapture(bridge: ReturnType<typeof getRTMPBridge>) {
   const captureScript = generateCaptureScript({
     bridgeUrl: BRIDGE_URL,
     fps: TARGET_FPS,
-    bitrate: 6000000,
+    bitrate: WEBCODECS_VIDEO_BITRATE_BPS,
   });
 
   const ensureCaptureRunning = async (reason: string) => {
@@ -968,7 +2230,8 @@ async function startWebCodecsCapture(bridge: ReturnType<typeof getRTMPBridge>) {
   const captureScript = generateWebCodecsCaptureScript({
     bridgeUrl: BRIDGE_URL,
     fps: TARGET_FPS,
-    bitrate: 6000000,
+    bitrate: WEBCODECS_VIDEO_BITRATE_BPS,
+    gopFrames: INGEST_SETTINGS.gopFrames,
   });
 
   const ensureCaptureRunning = async (reason: string) => {
@@ -1033,33 +2296,187 @@ async function startWebCodecsCapture(bridge: ReturnType<typeof getRTMPBridge>) {
   }, 5000);
 }
 
+// ── WebCodecs Exposed-Function Capture ──────────────────────────────────────
+// Bypasses WebSocket entirely: the browser calls window.__streamNALU(base64)
+// which is a direct Playwright IPC channel to this Node process. This is a
+// workaround for a Bun/ws WebSocket handshake timeout seen on headless Linux
+// that leaves the standard WebCodecs-over-WebSocket path unable to connect.
+
+async function startWebCodecsExposedCapture(
+  bridge: ReturnType<typeof getRTMPBridge>,
+) {
+  if (!page) return;
+
+  // Start FFmpeg in H.264 stream-copy mode without a WebSocket server.
+  // Data flows via page.exposeFunction() → writeToFfmpegRaw().
+  bridge.startWebCodecsDirect();
+
+  // Expose the IPC function BEFORE injecting the capture script.
+  // page.exposeFunction survives page reloads (it's a CDP binding).
+  try {
+    await page.exposeFunction("__streamNALU", (base64: string) => {
+      try {
+        const buf = Buffer.from(base64, "base64");
+        bridge.writeToFfmpegRaw(buf);
+      } catch {
+        // Ignore transient write errors — FFmpeg restart handles recovery
+      }
+    });
+    console.log("[Main] Exposed __streamNALU function to browser");
+  } catch (err) {
+    if (String(err).includes("already")) {
+      console.log("[Main] __streamNALU already exposed (warm restart)");
+    } else {
+      console.error("[Main] Failed to expose __streamNALU:", err);
+      return;
+    }
+  }
+
+  const captureScript = generateWebCodecsExposedCaptureScript({
+    fps: TARGET_FPS,
+    bitrate: WEBCODECS_VIDEO_BITRATE_BPS,
+    gopFrames: INGEST_SETTINGS.gopFrames,
+  });
+
+  const ensureCaptureRunning = async (reason: string) => {
+    if (!page || page.isClosed()) return;
+
+    let state: {
+      hasCanvas: boolean;
+      hasControl: boolean;
+      recording: boolean;
+      wsConnected: boolean;
+    };
+    try {
+      state = await page.evaluate(() => {
+        const control = (
+          window as unknown as {
+            __captureControl__?: { getStatus: () => unknown };
+          }
+        ).__captureControl__;
+        const status = (control?.getStatus?.() || {}) as {
+          recording?: boolean;
+          wsConnected?: boolean;
+        };
+        return {
+          hasCanvas: document.querySelector("canvas") !== null,
+          hasControl: Boolean(control),
+          recording: status.recording === true,
+          wsConnected: status.wsConnected === true,
+        };
+      });
+    } catch (err) {
+      if (isTransientPageEvalError(err)) return;
+      throw err;
+    }
+
+    if (!state.hasCanvas) return;
+    // Exposed-function variant: the in-page script streams NALUs via
+    // page.exposeFunction('__streamNALU') (no WebSocket at all). Under
+    // that transport `status.wsConnected` stays false forever, so gating
+    // the "already running" short-circuit on wsConnected always re-injects
+    // — correctness-wise harmless (injection is idempotent) but
+    // semantically the wrong readiness signal for this path. Accept
+    // `hasControl && recording` as sufficient; the bridge-side bytes-
+    // received signal is the authoritative liveness check and lives in
+    // waitForCaptureTraffic.
+    if (state.hasControl && state.recording) return;
+
+    console.log(
+      `[Main] WebCodecs/Exposed capture inactive (reason=${reason}), injecting script...`,
+    );
+    try {
+      await page.evaluate(captureScript);
+      await page.waitForTimeout(1500);
+    } catch (err) {
+      if (isTransientPageEvalError(err)) return;
+      throw err;
+    }
+  };
+
+  try {
+    await ensureCaptureRunning("initial");
+  } catch (err) {
+    console.warn(
+      "[Main] Initial WebCodecs/Exposed capture injection failed:",
+      err,
+    );
+  }
+
+  return setInterval(() => {
+    void ensureCaptureRunning("watchdog").catch((err) => {
+      console.warn("[Main] Capture watchdog error:", err);
+    });
+  }, 5000);
+}
+
 type BrowserCaptureStatus = {
   recording?: boolean;
   wsConnected?: boolean;
   chunkCount?: number;
   bytesSent?: number;
   uptime?: number;
-  lastChunkMs?: number;
+  lastChunkAt?: number | null;
+  lastChunkAgeMs?: number | null;
+  lastChunkMs?: number | null;
   captureFps?: number;
+  captureSessionGeneration?: string | null;
 };
 
 async function getBrowserCaptureStatus(): Promise<BrowserCaptureStatus | null> {
   if (!page || page.isClosed()) return null;
 
   try {
-    return (await page.evaluate(() => {
-      return (
-        window as unknown as {
+    return (await withTimeout(
+      page.evaluate(() => {
+        const win = window as unknown as {
           __captureControl__?: { getStatus: () => unknown };
-        }
-      ).__captureControl__?.getStatus?.();
-    })) as BrowserCaptureStatus | null;
+          __HYPERSCAPE_STREAM_CAPTURE_SESSION_GENERATION__?: string | null;
+        };
+        const captureStatus =
+          (win.__captureControl__?.getStatus?.() as Record<string, unknown>) ??
+          {};
+        return {
+          ...captureStatus,
+          captureSessionGeneration:
+            typeof win.__HYPERSCAPE_STREAM_CAPTURE_SESSION_GENERATION__ ===
+            "string"
+              ? win.__HYPERSCAPE_STREAM_CAPTURE_SESSION_GENERATION__
+              : null,
+        };
+      }),
+      SOURCE_PROBE_TIMEOUT_MS,
+      "Browser capture status probe",
+    )) as BrowserCaptureStatus | null;
   } catch (err) {
     if (isTransientPageEvalError(err)) return null;
     throw err;
   }
 }
 
+async function refreshBrowserCaptureStatusSnapshot(): Promise<BrowserCaptureStatus | null> {
+  if (browserCaptureStatusProbeInFlight) {
+    return browserCaptureStatusProbeInFlight;
+  }
+
+  browserCaptureStatusProbeInFlight = getBrowserCaptureStatus()
+    .then((status) => {
+      latestBrowserCaptureStatus = status;
+      return latestBrowserCaptureStatus;
+    })
+    .catch((err) => {
+      if (!isTransientPageEvalError(err)) {
+        throw err;
+      }
+      return null;
+    })
+    .finally(() => {
+      browserCaptureStatusProbeInFlight = null;
+    });
+
+  return browserCaptureStatusProbeInFlight;
+}
+
 async function stopInPageCaptureControl(): Promise<void> {
   if (!page || page.isClosed()) return;
 
@@ -1083,10 +2500,18 @@ async function waitForCaptureTraffic(
   const deadline = Date.now() + timeoutMs;
 
   while (Date.now() < deadline) {
-    const captureStatus = await getBrowserCaptureStatus();
+    const captureStatus = await refreshBrowserCaptureStatusSnapshot();
     const bridgeStats = bridge.getStats();
-    const captureActive =
-      captureStatus?.recording === true && captureStatus?.wsConnected === true;
+    // The readiness contract used to gate on `recording && wsConnected &&
+    // bytesReceived > 0`. The `wsConnected` requirement is wrong for the
+    // exposed-function variant (startWebCodecsExposedCapture calls
+    // bridge.startWebCodecsDirect() which doesn't open a WebSocket at all
+    // — data flows via page.exposeFunction('__streamNALU')). Under that
+    // path `wsConnected` stays false forever and the gate can never pass.
+    // `bytesReceived > 0` is the authoritative "bridge is producing
+    // frames" signal regardless of transport, so gate on that plus
+    // recording.
+    const captureActive = captureStatus?.recording === true;
     const hasTraffic = bridgeStats.bytesReceived > 0;
 
     if (captureActive && hasTraffic) {
@@ -1099,6 +2524,49 @@ async function waitForCaptureTraffic(
   return false;
 }
 
+async function startValidatedWebCodecsCapture(
+  bridge: ReturnType<typeof getRTMPBridge>,
+): Promise<{
+  mode: ActiveCaptureMode;
+  watchdog: ReturnType<typeof setInterval> | null;
+}> {
+  console.log(
+    "[Main] WebCodecs mode: trying exposed-function bridge (bypasses WebSocket)...",
+  );
+  let watchdog = (await startWebCodecsExposedCapture(bridge)) ?? null;
+  let healthy = await waitForCaptureTraffic(bridge, 25_000);
+  if (!healthy) {
+    console.warn(
+      "[Main] WebCodecs/Exposed produced no media within 25s; trying WebSocket fallback...",
+    );
+    if (watchdog) {
+      clearInterval(watchdog);
+      watchdog = null;
+    }
+    await stopInPageCaptureControl();
+    await bridge.stop();
+    bridge.startSpectatorServer(SPECTATOR_PORT);
+    watchdog = (await startWebCodecsCapture(bridge)) ?? null;
+    healthy = await waitForCaptureTraffic(bridge, 20_000);
+  }
+  if (!healthy) {
+    console.warn(
+      "[Main] WebCodecs capture produced no media within 20s; falling back to CDP screencast capture.",
+    );
+    if (watchdog) {
+      clearInterval(watchdog);
+      watchdog = null;
+    }
+    await stopInPageCaptureControl();
+    await bridge.stop();
+    bridge.startSpectatorServer(SPECTATOR_PORT);
+    await startCdpCapture(bridge);
+    return { mode: "cdp", watchdog: null };
+  }
+
+  return { mode: "webcodecs", watchdog };
+}
+
 // ── Main Entry Point ───────────────────────────────────────────────────────
 
 async function main() {
@@ -1129,6 +2597,52 @@ async function main() {
     console.warn("");
   }
 
+  // ── Xvfb 60Hz modeline setup ──────────────────────────────────────
+  // Xvfb virtual displays default to 0 Hz refresh rate. Chrome's
+  // compositor locks to V-sync, so 0 Hz means 0-5 fps rendering. Set
+  // the display to 60 Hz via xrandr modeline so the compositor runs at
+  // full speed. This only matters for headed mode on Linux Xvfb; it's
+  // harmless on macOS, in headless mode, or if xrandr isn't available.
+  if (!STREAM_CAPTURE_HEADLESS && process.env.DISPLAY) {
+    try {
+      const { execSync } = await import("child_process");
+      const display = process.env.DISPLAY;
+      // Check current refresh rate
+      const xrandrOutput = execSync(`DISPLAY=${display} xrandr`, {
+        encoding: "utf-8",
+        timeout: 5000,
+      });
+      if (xrandrOutput.includes("0.00*")) {
+        console.log(
+          `[Main] Xvfb display ${display} is at 0 Hz — applying 60 Hz modeline`,
+        );
+        const mode = resolveXvfb60HzMode(VIEWPORT.width, VIEWPORT.height);
+        if (!mode) {
+          console.warn(
+            `[Main] No known 60 Hz modeline for ${VIEWPORT.width}x${VIEWPORT.height}; leaving Xvfb mode unchanged`,
+          );
+        } else {
+          execSync(
+            `DISPLAY=${display} xrandr --newmode ${mode.modeline} 2>/dev/null; DISPLAY=${display} xrandr --addmode screen ${mode.modeName} 2>/dev/null; DISPLAY=${display} xrandr --output screen --mode ${mode.modeName} 2>/dev/null`,
+            { timeout: 5000 },
+          );
+          console.log(
+            `[Main] Xvfb display ${display} set to 60 Hz at ${VIEWPORT.width}x${VIEWPORT.height}`,
+          );
+        }
+      } else {
+        console.log(
+          `[Main] Xvfb display ${display} already has a non-zero refresh rate`,
+        );
+      }
+    } catch (xrandrErr) {
+      console.warn(
+        "[Main] Xvfb modeline setup skipped (xrandr not available or failed):",
+        errMsg(xrandrErr),
+      );
+    }
+  }
+
   // Get bridge instance
   const bridge = getRTMPBridge();
 
@@ -1139,11 +2653,209 @@ async function main() {
   await setupBrowser();
 
   let captureWatchdog: ReturnType<typeof setInterval> | null = null;
-  let activeCaptureMode: "cdp" | "webcodecs" | "mediarecorder" = CAPTURE_MODE;
+  let activeCaptureMode: ActiveCaptureMode = CAPTURE_MODE;
   let cdpStalledIntervals = 0;
   let lastCdpBytesReceived = 0;
   let cdpRecoveryInFlight = false;
   let cdpRecoveryFailures = 0;
+  // x11_nvenc stall tracking — parallels CDP's counters but uses encoder
+  // `frame=` progression (via bridge.getLastEncoderFrameCount) rather than
+  // bytesReceived, because x11grab always produces bytes even against a
+  // frozen display and is therefore not a useful liveness signal.
+  let x11StalledIntervals = 0;
+  let lastX11EncoderFrameCount = 0;
+  let x11RecoveryInFlight = false;
+  let x11RecoveryFailures = 0;
+  let sourceDegradedPolls = 0;
+  let pageNotReadySinceMs: number | null = null;
+  let tier1Failures = 0; // FFmpeg-only restart failures
+  let tier2Failures = 0; // Warm restart (page reload) failures
+  let tier3Failures = 0; // Browser restart failures
+
+  // ── Tiered recovery functions ──────────────────────────────────────
+  // See plan: warm-boot-tiered-recovery for full design rationale.
+
+  async function stopActiveCapture(
+    mode: ActiveCaptureMode,
+    options: { preserveBridgeProcessing?: boolean } = {},
+  ): Promise<boolean> {
+    if (captureWatchdog) {
+      clearInterval(captureWatchdog);
+      captureWatchdog = null;
+    }
+
+    latestBrowserCaptureStatus = null;
+
+    if (mode === "cdp") {
+      await stopCdpCapture();
+      if (options.preserveBridgeProcessing) {
+        await bridge.stopProcessing();
+        return false;
+      }
+      await bridge.stop();
+      return true;
+    }
+
+    if (mode === "x11_nvenc") {
+      // No in-page capture script and no CDP session for this mode — the
+      // bridge owns the whole FFmpeg child (which is reading from X11
+      // directly). Preserve-processing semantics match the CDP branch.
+      if (options.preserveBridgeProcessing) {
+        await bridge.stopProcessing();
+        return false;
+      }
+      await bridge.stop();
+      return true;
+    }
+
+    await stopInPageCaptureControl();
+    await bridge.stop();
+    return true;
+  }
+
+  async function startActiveCapture(
+    mode: ActiveCaptureMode,
+    options: { restartSpectatorServer?: boolean } = {},
+  ): Promise<ActiveCaptureMode> {
+    pageNotReadySinceMs = null;
+    if (options.restartSpectatorServer) {
+      bridge.startSpectatorServer(SPECTATOR_PORT);
+    }
+
+    if (mode === "cdp") {
+      await startCdpCapture(bridge);
+      lastCdpBytesReceived = bridge.getStats().bytesReceived;
+      return "cdp";
+    }
+
+    if (mode === "webcodecs") {
+      const result = await startValidatedWebCodecsCapture(bridge);
+      captureWatchdog = result.watchdog;
+      if (result.mode === "cdp") {
+        lastCdpBytesReceived = bridge.getStats().bytesReceived;
+      }
+      return result.mode;
+    }
+
+    if (mode === "x11_nvenc") {
+      // No in-page script to maintain — liveness is tracked by the
+      // supervisor loop using `bridge.getLastEncoderFrame{Count,At}`.
+      captureWatchdog = await startX11NvencCapture(bridge);
+      return "x11_nvenc";
+    }
+
+    captureWatchdog = (await startLegacyCapture(bridge)) ?? null;
+    return "mediarecorder";
+  }
+
+  async function waitForRecoveryReadiness(reason: string): Promise<void> {
+    if (CAPTURE_MODE === "x11_nvenc") {
+      // x11_nvenc has no Playwright Page to probe. Treat the Chrome
+      // child process being alive as the readiness signal. FFmpeg's
+      // encoder-frame progression is the authoritative liveness check
+      // post-recovery (supervised elsewhere in the status loop).
+      if (!x11NvencChromeProcess || x11NvencChromeProcess.killed) {
+        throw new Error(
+          `${reason}: x11_nvenc Chrome child not running after restart`,
+        );
+      }
+      return;
+    }
+    if (!page) {
+      throw new Error(`${reason}: missing page after restart`);
+    }
+    const ready = await waitForStreamReadiness(
+      page,
+      SOURCE_RECOVERY_READY_TIMEOUT_MS,
+    );
+    if (!ready) {
+      throw new Error(
+        `${reason}: renderer did not recover within ${SOURCE_RECOVERY_READY_TIMEOUT_MS}ms`,
+      );
+    }
+  }
+
+  async function closeBrowserForRestart(): Promise<void> {
+    if (page) {
+      try {
+        await page.evaluate(() => {
+          (
+            window as unknown as { __captureControl__?: { stop: () => void } }
+          ).__captureControl__?.stop?.();
+        });
+      } catch {
+        // Page might already be closed
+      }
+    }
+
+    if (browser) {
+      await browser.close();
+      browser = null;
+    }
+
+    page = null;
+    latestBrowserCaptureStatus = null;
+    latestSceneUrl = null;
+    latestActiveBundle = null;
+  }
+
+  /**
+   * Tier 2: warm restart — reload the page but keep the browser alive.
+   * IndexedDB VRM cache and WebGPU shader cache survive, cutting recovery
+   * from ~90s (cold) to ~15s. The active capture pipeline is recreated.
+   */
+  async function warmRestart(reason: string): Promise<void> {
+    console.log(`[Main] Warm restart (Tier 2): ${reason}`);
+    const restartSpectatorServer = await stopActiveCapture(activeCaptureMode, {
+      preserveBridgeProcessing: activeCaptureMode === "cdp",
+    });
+    // DON'T close browser — IndexedDB + WebGPU cache survive
+    if (page) {
+      try {
+        await page.goto(selectedGameUrl || GAME_URL_CANDIDATES[0], {
+          waitUntil: "domcontentloaded",
+          timeout: 30_000,
+        });
+      } catch (navErr) {
+        console.error("[Main] Warm restart navigation failed:", navErr);
+        throw navErr;
+      }
+    } else {
+      throw new Error("No page reference for warm restart");
+    }
+    launchTime = Date.now();
+    activeCaptureMode = await startActiveCapture(activeCaptureMode, {
+      restartSpectatorServer,
+    });
+    await waitForRecoveryReadiness(`warm restart (${reason})`);
+    // Reset consecutive-failure counters on successful warm restart.
+    tier1Failures = 0;
+    tier2Failures = 0;
+    tier3Failures = 0;
+    console.log("[Main] Warm restart complete");
+  }
+
+  /**
+   * Tier 3: browser restart — close and relaunch the browser.
+   * The Node process, bridge singleton, and selectedGameUrl survive.
+   * With persistent user-data-dir, IndexedDB may also survive.
+   */
+  async function browserRestart(reason: string): Promise<void> {
+    console.log(`[Main] Browser restart (Tier 3): ${reason}`);
+    const restartSpectatorServer = await stopActiveCapture(activeCaptureMode);
+    await closeBrowserForRestart();
+    await setupBrowser(false); // reuse selectedGameUrl
+    launchTime = Date.now();
+    activeCaptureMode = await startActiveCapture(activeCaptureMode, {
+      restartSpectatorServer,
+    });
+    await waitForRecoveryReadiness(`browser restart (${reason})`);
+    // Reset all consecutive-failure counters on successful browser restart.
+    tier1Failures = 0;
+    tier2Failures = 0;
+    tier3Failures = 0;
+    console.log("[Main] Browser restart complete");
+  }
 
   if (CAPTURE_MODE === "cdp") {
     // ── CDP Mode: Direct screencast frame piping ──
@@ -1155,56 +2867,46 @@ async function main() {
       );
     } catch (err) {
       console.warn(
-        `[Main] CDP startup failed; falling back to MediaRecorder injection: ${errMsg(err)}`,
+        `[Main] CDP startup failed; falling back to WebCodecs capture: ${errMsg(err)}`,
       );
       await withTimeout(
         stopCdpCapture(),
         5_000,
         "Stop failed CDP capture",
       ).catch(() => undefined);
-      bridge.stop();
+      await bridge.stop();
       bridge.startSpectatorServer(SPECTATOR_PORT);
-      captureWatchdog = (await startLegacyCapture(bridge)) ?? null;
-      activeCaptureMode = "mediarecorder";
-
-      const healthy = await waitForCaptureTraffic(bridge, 20_000);
-      if (!healthy) {
-        console.warn(
-          "[Main] MediaRecorder fallback produced no media within 20s; trying WebCodecs capture.",
-        );
-        if (captureWatchdog) {
-          clearInterval(captureWatchdog);
-          captureWatchdog = null;
-        }
-        await stopInPageCaptureControl();
-        bridge.stop();
-        bridge.startSpectatorServer(SPECTATOR_PORT);
-        captureWatchdog = (await startWebCodecsCapture(bridge)) ?? null;
-        activeCaptureMode = "webcodecs";
-      }
+      activeCaptureMode = await startActiveCapture("webcodecs");
+      recordSourceRecovery(
+        activeCaptureMode === "webcodecs"
+          ? "cdp_startup_failed_to_webcodecs"
+          : "cdp_startup_failed_to_cdp_fallback",
+      );
     }
   } else if (CAPTURE_MODE === "webcodecs") {
-    // ── WebCodecs Mode: Native VideoEncoder API to FFmpeg -c:v copy ──
-    captureWatchdog = (await startWebCodecsCapture(bridge)) ?? null;
-    const healthy = await waitForCaptureTraffic(bridge, 20000);
-    if (!healthy) {
+    activeCaptureMode = await startActiveCapture("webcodecs");
+    if (activeCaptureMode === "cdp") {
+      recordSourceRecovery("webcodecs_startup_failed_to_cdp");
+    }
+  } else if (CAPTURE_MODE === "x11_nvenc") {
+    // ── x11_nvenc Mode: FFmpeg x11grab + NVENC, Chromium as pure renderer ──
+    // Startup preflights (xdpyinfo, h264_nvenc availability) live inside
+    // startX11NvencCapture — a failure there throws and we fall back to CDP
+    // to keep the worker streaming rather than exiting entirely.
+    try {
+      activeCaptureMode = await startActiveCapture("x11_nvenc");
+    } catch (err) {
       console.warn(
-        "[Main] WebCodecs capture produced no media within 20s; falling back to CDP screencast capture.",
+        `[Main] x11_nvenc startup failed; falling back to CDP capture: ${errMsg(err)}`,
       );
-      if (captureWatchdog) {
-        clearInterval(captureWatchdog);
-        captureWatchdog = null;
-      }
-      await stopInPageCaptureControl();
-      bridge.stop();
+      await bridge.stop().catch(() => undefined);
       bridge.startSpectatorServer(SPECTATOR_PORT);
-      await startCdpCapture(bridge);
-      activeCaptureMode = "cdp";
+      activeCaptureMode = await startActiveCapture("cdp");
+      recordSourceRecovery("x11_nvenc_startup_failed_to_cdp");
     }
   } else {
     // ── Legacy Mode: MediaRecorder + WebSocket ──
-    captureWatchdog = (await startLegacyCapture(bridge)) ?? null;
-    activeCaptureMode = "mediarecorder";
+    activeCaptureMode = await startActiveCapture("mediarecorder");
   }
 
   console.log("");
@@ -1213,13 +2915,204 @@ async function main() {
   console.log("=".repeat(60));
   console.log("");
 
-  await refreshRendererHealthSnapshot(page);
+  // x11_nvenc mode has no Playwright Page to probe. The detached Chrome
+  // process IS the renderer, and its liveness + the encoder's
+  // frame-count progression are the authoritative health signals.
+  // Synthesize a healthy snapshot so downstream consumers
+  // (source-runtime, keeper /api/health, bets-page authority gate)
+  // don't report rendererHealthReady=false just because the Playwright
+  // probe is disabled by design.
+  if (CAPTURE_MODE === "x11_nvenc") {
+    const nowMs = Date.now();
+    latestRendererHealth = {
+      ready: true,
+      degradedReason: null,
+      updatedAt: nowMs,
+      phase: null,
+      diagnostics: null,
+    };
+    // Seed render-tick + visual-change so the keeper's freshness gates
+    // don't flag them as stale on the first external-status write.
+    latestRenderTickAt = nowMs;
+    latestVisualChangeAt = nowMs;
+  } else {
+    await refreshRendererHealthSnapshot(page);
+  }
   writeExternalStatusSnapshot(bridge, activeCaptureMode);
   const statusSnapshotInterval = setInterval(() => {
-    void refreshRendererHealthSnapshot(page)
+    const healthProbe =
+      CAPTURE_MODE === "x11_nvenc"
+        ? Promise.resolve().then(() => {
+            // Refresh timestamp + re-assert healthy as long as the
+            // Chrome child is alive. Also advance the render-tick and
+            // visual-change timestamps — the Playwright page.evaluate
+            // heartbeat that normally populates them is disabled here,
+            // and without these the keeper's deriveBettingRendererHealth
+            // flags `render_tick_stale` (observed on first cutover:
+            // rendererHealthReady=false despite fully healthy
+            // encoder+ingest). Encoder frame-count progression is
+            // already supervised separately as the authoritative
+            // liveness signal.
+            const chromeAlive =
+              !!x11NvencChromeProcess && !x11NvencChromeProcess.killed;
+            const nowMs = Date.now();
+            latestRendererHealth = {
+              ready: chromeAlive,
+              degradedReason: chromeAlive ? null : "browser_missing",
+              updatedAt: nowMs,
+              phase: null,
+              diagnostics: null,
+            };
+            if (chromeAlive) {
+              latestRenderTickAt = nowMs;
+              latestVisualChangeAt = nowMs;
+            }
+            return latestRendererHealth;
+          })
+        : refreshRendererHealthSnapshot(page);
+    void healthProbe
+      .then(() =>
+        activeCaptureMode === "cdp"
+          ? Promise.resolve<BrowserCaptureStatus | null>(null)
+          : refreshBrowserCaptureStatusSnapshot(),
+      )
       .catch(() => undefined)
       .finally(() => {
-        writeExternalStatusSnapshot(bridge, activeCaptureMode);
+        const sourceRuntime = writeExternalStatusSnapshot(
+          bridge,
+          activeCaptureMode,
+        );
+        const degradedReason = sourceRuntime?.degradedReason ?? null;
+        const nowMs = Date.now();
+        const withinLaunchGrace =
+          nowMs - launchTime <
+          Math.max(CDP_STARTUP_TIMEOUT_MS, SOURCE_CAPTURE_STALL_MS);
+        if (degradedReason === "page_not_ready") {
+          pageNotReadySinceMs = pageNotReadySinceMs ?? nowMs;
+        } else {
+          pageNotReadySinceMs = null;
+        }
+        const pageNotReadyStalled =
+          degradedReason === "page_not_ready" &&
+          pageNotReadySinceMs != null &&
+          nowMs - pageNotReadySinceMs >= PAGE_READINESS_STALL_MS;
+        const shouldRestartForDegradation =
+          !withinLaunchGrace &&
+          // Keep scene readiness as a health gate during normal convergence,
+          // but escalate if it remains stuck beyond a bounded stall window.
+          (degradedReason === "browser_missing" ||
+            degradedReason === "unexpected_navigation" ||
+            degradedReason === "capture_stalled" ||
+            degradedReason === "encoder_stalled" ||
+            degradedReason === "manifest_stale" ||
+            pageNotReadyStalled);
+        if (shouldRestartForDegradation) {
+          sourceDegradedPolls += 1;
+        } else {
+          sourceDegradedPolls = 0;
+        }
+        if (
+          shouldRestartForDegradation &&
+          sourceDegradedPolls >= SOURCE_DEGRADED_RESTART_POLLS
+        ) {
+          console.error(
+            `[Main] Source remained degraded (${degradedReason}) for ${sourceDegradedPolls} consecutive health polls; attempting tiered recovery.`,
+          );
+          sourceDegradedPolls = 0;
+
+          // ── Tiered recovery ──────────────────────────────────────────
+          // Tier 1: FFmpeg-only restart (~2s). Encoder/transport failures
+          //   don't need a page reload — just restart the encoder.
+          // Tier 2: Page reload + CDP restart (~15s). Page-level issues
+          //   (canvas missing, navigation, capture stalled) need a fresh
+          //   page load but the browser (and its IndexedDB VRM cache,
+          //   WebGPU shader cache) survives.
+          // Tier 3: Browser restart (~35s). Browser crashed or Tier 2
+          //   failed 3 times. New browser, reuse selectedGameUrl.
+          // Tier 4: Full shutdown (~90s). Last resort, pm2 cold-restarts.
+          //
+          // Each tier has a consecutive-failure counter. If Tier N fails
+          // 3 times without a successful recovery, escalate to Tier N+1.
+          const isTier1Reason =
+            degradedReason === "encoder_stalled" ||
+            degradedReason === "manifest_stale";
+          const isTier2Reason =
+            degradedReason === "capture_stalled" ||
+            degradedReason === "unexpected_navigation" ||
+            degradedReason === "page_not_ready" ||
+            degradedReason === "canvas_missing";
+          const isTier3Reason = degradedReason === "browser_missing";
+
+          const shouldUseTier1 =
+            isTier1Reason && activeCaptureMode === "cdp" && tier1Failures < 3;
+
+          if (shouldUseTier1) {
+            tier1Failures += 1;
+            console.log(
+              `[Main] Tier 1 recovery (FFmpeg restart ${tier1Failures}/3): ${degradedReason}`,
+            );
+            void bridge
+              .restartFFmpegDirect()
+              .then(() => {
+                tier1Failures = 0;
+                tier2Failures = 0;
+                tier3Failures = 0;
+                startCdpFramePump(bridge);
+              })
+              .catch((err) => {
+                console.error(
+                  "[Main] Tier 1 recovery failed, escalating:",
+                  err,
+                );
+                tier1Failures = 3; // force escalation on next poll
+              });
+          } else if (
+            (isTier2Reason ||
+              (isTier1Reason &&
+                (activeCaptureMode !== "cdp" || tier1Failures >= 3))) &&
+            tier2Failures < 3
+          ) {
+            if (isTier1Reason && activeCaptureMode !== "cdp") {
+              console.log(
+                `[Main] Tier 1 FFmpeg-only recovery skipped for ${activeCaptureMode} capture; escalating to warm restart.`,
+              );
+            }
+            tier2Failures += 1;
+            tier1Failures = 0;
+            console.log(
+              `[Main] Tier 2 recovery (warm restart ${tier2Failures}/3): ${degradedReason}`,
+            );
+            void warmRestart(degradedReason ?? "unknown").catch((err) => {
+              console.error("[Main] Tier 2 recovery failed, escalating:", err);
+              tier2Failures = 3;
+            });
+          } else if (
+            (isTier3Reason || tier2Failures >= 3) &&
+            tier3Failures < 3
+          ) {
+            tier3Failures += 1;
+            tier2Failures = 0;
+            tier1Failures = 0;
+            console.log(
+              `[Main] Tier 3 recovery (browser restart ${tier3Failures}/3): ${degradedReason}`,
+            );
+            void browserRestart(degradedReason ?? "unknown").catch((err) => {
+              console.error(
+                "[Main] Tier 3 recovery failed, falling through to shutdown:",
+                err,
+              );
+              void shutdown(1);
+            });
+          } else {
+            console.error(
+              `[Main] All recovery tiers exhausted — full shutdown (tier1=${tier1Failures}, tier2=${tier2Failures}, tier3=${tier3Failures})`,
+            );
+            tier1Failures = 0;
+            tier2Failures = 0;
+            tier3Failures = 0;
+            void shutdown(1);
+          }
+        }
       });
   }, 2000);
 
@@ -1258,7 +3151,7 @@ async function main() {
 
     if (activeCaptureMode === "cdp") {
       console.log(
-        `[Stream Health] CDP FPS: ${cdpFps} | Frames: ${bridge.getDirectFrameCount()} | Dropped: ${cdpDroppedFrames} | BridgeDrops: ${stats.droppedFrames} | Backpressure: ${stats.backpressured ? "ON" : "off"}`,
+        `[Stream Health] CDP FPS: ${cdpFps} | Frames: ${bridge.getDirectFrameCount()} | Repeated: ${cdpRepeatedFrameCount} | Dropped: ${cdpDroppedFrames} | BridgeDrops: ${stats.droppedFrames} | Backpressure: ${stats.backpressured ? "ON" : "off"}`,
       );
 
       // CDP can occasionally stall after initial page setup on remote GPU stacks.
@@ -1292,7 +3185,7 @@ async function main() {
           await withTimeout(
             (async () => {
               await stopCdpCapture();
-              await setupBrowser();
+              await setupBrowser(cdpRecoveryFailures > 0);
               await startCdpCapture(bridge);
             })(),
             CAPTURE_RECOVERY_TIMEOUT_MS,
@@ -1301,6 +3194,7 @@ async function main() {
           recovered = true;
           cdpRecoveryFailures = 0;
           lastCdpBytesReceived = bridge.getStats().bytesReceived;
+          recordSourceRecovery("cdp_stall_recovery");
           console.log("[Main] CDP capture restarted successfully");
         } catch (err) {
           cdpRecoveryFailures += 1;
@@ -1316,38 +3210,180 @@ async function main() {
           !recovered &&
           cdpRecoveryFailures >= CAPTURE_RECOVERY_MAX_FAILURES
         ) {
+          // When the operator explicitly configured STREAM_CAPTURE_MODE=cdp
+          // (or the Cloudflare-live guardrail has forced the effective mode
+          // to cdp), silently flipping to WebCodecs after repeated CDP
+          // stalls masks the real failure and enters a broken recovery
+          // loop — the WebCodecs path has its own readiness failure modes
+          // (exposed-function vs WebSocket, bytesReceived=0) which then
+          // flip back to CDP, etc. Instead escalate: full browser restart,
+          // and if that also fails, exit so the supervisor respawns us in
+          // the configured mode cleanly.
+          if (CAPTURE_MODE === "cdp") {
+            console.warn(
+              "[Main] CDP stall exceeded recovery threshold; escalating to full browser restart (STREAM_CAPTURE_MODE=cdp, not falling back to webcodecs).",
+            );
+            try {
+              await withTimeout(
+                browserRestart("cdp_stall_persistent"),
+                CAPTURE_RECOVERY_TIMEOUT_MS + 10_000,
+                "Browser restart for persistent CDP stall",
+              );
+              cdpRecoveryFailures = 0;
+              lastCdpBytesReceived = bridge.getStats().bytesReceived;
+              recordSourceRecovery("cdp_stall_browser_restart");
+              console.log(
+                "[Main] Browser restart after persistent CDP stall complete",
+              );
+            } catch (restartErr) {
+              console.error(
+                "[Main] Browser restart for persistent CDP stall failed:",
+                errMsg(restartErr),
+              );
+              // Supervisor respawn is the last line of defense; pm2 will
+              // bring us back up with the configured CAPTURE_MODE.
+              void shutdown(1);
+            }
+          } else {
+            console.warn(
+              "[Main] Falling back to WebCodecs capture mode after CDP stall.",
+            );
+            try {
+              // Clear any existing watchdog before starting a new one.
+              if (captureWatchdog) {
+                clearInterval(captureWatchdog);
+                captureWatchdog = null;
+              }
+              await withTimeout(
+                stopCdpCapture(),
+                5_000,
+                "Stop stalled CDP capture",
+              ).catch(() => undefined);
+              await bridge.stop();
+              bridge.startSpectatorServer(SPECTATOR_PORT);
+              activeCaptureMode = await startActiveCapture("webcodecs");
+              cdpRecoveryFailures = 0;
+              recordSourceRecovery(
+                activeCaptureMode === "webcodecs"
+                  ? "cdp_stall_fallback_to_webcodecs"
+                  : "cdp_stall_recovered_via_cdp_fallback",
+              );
+              console.log(
+                `[Main] Capture recovery after CDP stall settled on ${activeCaptureMode}`,
+              );
+            } catch (fallbackErr) {
+              console.error(
+                "[Main] WebCodecs fallback failed:",
+                errMsg(fallbackErr),
+              );
+              void shutdown(1);
+            }
+          }
+        }
+      }
+    } else if (activeCaptureMode === "x11_nvenc") {
+      const encoderFrameCount = bridge.getLastEncoderFrameCount();
+      const encoderFrameAt = bridge.getLastEncoderFrameAt();
+      const encoderFps = stats.encoderFps;
+      const frameDelta = encoderFrameCount - lastX11EncoderFrameCount;
+      lastX11EncoderFrameCount = encoderFrameCount;
+      const encoderFrameAgeMs =
+        encoderFrameAt != null ? Date.now() - encoderFrameAt : null;
+
+      console.log(
+        `[Stream Health] x11_nvenc encoder=${encoderFrameCount} +${frameDelta} fps=${encoderFps.toFixed(1)} ageMs=${encoderFrameAgeMs ?? "n/a"} BridgeDrops: ${stats.droppedFrames} | Backpressure: ${stats.backpressured ? "ON" : "off"}`,
+      );
+
+      // Stall signal: no `frame=` advance this interval AND encoder either
+      // reports near-zero fps or has never yet reported a frame after startup
+      // grace. `frameDelta === 0` alone is insufficient — a 30s status tick
+      // against a 30fps encoder should always see delta ≥ ~30 when healthy;
+      // any 30s window with delta === 0 is a real stall.
+      const startupGraceElapsed =
+        encoderFrameAt != null || Date.now() - launchTime > 30_000;
+      const looksStalled =
+        startupGraceElapsed && frameDelta === 0 && encoderFps < 1;
+
+      if (looksStalled) {
+        x11StalledIntervals += 1;
+      } else {
+        x11StalledIntervals = 0;
+      }
+
+      if (x11StalledIntervals >= 2) {
+        if (x11RecoveryInFlight) {
           console.warn(
-            "[Main] Falling back to MediaRecorder capture mode after CDP stall.",
+            "[Main] x11_nvenc recovery already in progress; skipping duplicate stall recovery attempt.",
           );
+        } else {
+          console.warn(
+            `[Main] x11_nvenc capture stalled (${x11StalledIntervals} intervals, last frame=${encoderFrameCount}). Attempting FFmpeg-only restart (tier-1)...`,
+          );
+          x11StalledIntervals = 0;
+          x11RecoveryInFlight = true;
+
+          let recovered = false;
           try {
-            // Clear any existing watchdog before starting a new one.
-            if (captureWatchdog) {
-              clearInterval(captureWatchdog);
-              captureWatchdog = null;
-            }
             await withTimeout(
-              stopCdpCapture(),
-              5_000,
-              "Stop stalled CDP capture",
-            ).catch(() => undefined);
-            bridge.stop();
-            bridge.startSpectatorServer(SPECTATOR_PORT);
-            captureWatchdog = (await startLegacyCapture(bridge)) ?? null;
-            activeCaptureMode = "mediarecorder";
-            lastCdpBytesReceived = bridge.getStats().bytesReceived;
-            cdpRecoveryFailures = 0;
-            console.log("[Main] Fallback to MediaRecorder mode complete");
-          } catch (fallbackErr) {
-            console.error(
-              "[Main] MediaRecorder fallback failed:",
-              errMsg(fallbackErr),
+              (async () => {
+                await bridge.stopProcessing();
+                await startX11NvencCapture(bridge);
+              })(),
+              CAPTURE_RECOVERY_TIMEOUT_MS,
+              "x11_nvenc restart",
+            );
+            recovered = true;
+            x11RecoveryFailures = 0;
+            lastX11EncoderFrameCount = bridge.getLastEncoderFrameCount();
+            recordSourceRecovery("x11_nvenc_stall_recovery");
+            console.log("[Main] x11_nvenc FFmpeg restarted successfully");
+          } catch (err) {
+            x11RecoveryFailures += 1;
+            console.warn(
+              `[Main] x11_nvenc restart failed (${x11RecoveryFailures}/${CAPTURE_RECOVERY_MAX_FAILURES}):`,
+              errMsg(err),
             );
+          } finally {
+            x11RecoveryInFlight = false;
+          }
+
+          if (
+            !recovered &&
+            x11RecoveryFailures >= CAPTURE_RECOVERY_MAX_FAILURES
+          ) {
+            console.warn(
+              "[Main] Falling back to CDP capture mode after x11_nvenc stall.",
+            );
+            try {
+              if (captureWatchdog) {
+                clearInterval(captureWatchdog);
+                captureWatchdog = null;
+              }
+              await withTimeout(
+                bridge.stop(),
+                5_000,
+                "Stop stalled x11_nvenc bridge",
+              ).catch(() => undefined);
+              bridge.startSpectatorServer(SPECTATOR_PORT);
+              await startCdpCapture(bridge);
+              activeCaptureMode = "cdp";
+              x11RecoveryFailures = 0;
+              lastCdpBytesReceived = bridge.getStats().bytesReceived;
+              recordSourceRecovery("x11_nvenc_stall_fallback_to_cdp");
+              console.log("[Main] Fallback to CDP mode complete");
+            } catch (fallbackErr) {
+              console.error(
+                "[Main] CDP fallback from x11_nvenc failed:",
+                errMsg(fallbackErr),
+              );
+              void shutdown(1);
+            }
           }
         }
       }
     } else {
       try {
-        const captureStatus = await getBrowserCaptureStatus();
+        const captureStatus = await refreshBrowserCaptureStatusSnapshot();
         if (captureStatus) {
           console.log("[Status] Capture:", captureStatus);
           if (typeof captureStatus.captureFps === "number") {
@@ -1371,31 +3407,26 @@ async function main() {
 
     // Check for periodic restart to clear memory leaks
     if (Date.now() - launchTime > BROWSER_RESTART_INTERVAL_MS) {
-      // Guard: skip rotation if a CDP recovery is already in flight.
-      if (cdpRecoveryInFlight) {
+      // Guard: skip rotation if any in-flight recovery is running to avoid
+      // stepping on it mid-restart.
+      if (cdpRecoveryInFlight || x11RecoveryInFlight) {
         console.warn(
-          "[Main] Skipping scheduled browser rotation — CDP recovery in progress.",
+          "[Main] Skipping scheduled browser rotation — capture recovery in progress.",
         );
       } else {
         console.log(
           "[Main] 🔄 Scheduled browser rotation to prevent WebGL memory leaks.",
         );
         try {
-          if (activeCaptureMode === "cdp") {
-            await stopCdpCapture();
-          } else {
-            if (captureWatchdog) {
-              clearInterval(captureWatchdog);
-              captureWatchdog = null;
-            }
-            await stopInPageCaptureControl();
-          }
-          await setupBrowser();
-          if (activeCaptureMode === "cdp") {
-            await startCdpCapture(bridge);
-          } else if (activeCaptureMode === "mediarecorder") {
-            captureWatchdog = (await startLegacyCapture(bridge)) ?? null;
+          // browserRestart dispatches via stopActiveCapture/startActiveCapture,
+          // both of which already know how to handle x11_nvenc.
+          await browserRestart("scheduled_browser_rotation");
+          // Reset x11_nvenc frame counter after a fresh browser+FFmpeg start
+          // so the supervisor stall detector doesn't flag the gap.
+          if (activeCaptureMode === "x11_nvenc") {
+            lastX11EncoderFrameCount = 0;
           }
+          recordSourceRecovery("scheduled_browser_rotation");
         } catch (err) {
           console.error("[Main] Failed to rotate browser!", err);
         }
@@ -1404,30 +3435,64 @@ async function main() {
   }, 30000);
 
   // Handle shutdown
-  const shutdown = async () => {
+  //
+  // IMPORTANT: every step below `await`s an operation that can hang when the
+  // underlying subsystem is already dead (Chromium already crashed, FFmpeg
+  // already killed, CDP session already closed, etc.). If any one of these
+  // deadlocks, `process.exit()` below is never reached and pm2 keeps
+  // reporting the worker as "online" indefinitely — we observed a ~75-minute
+  // zombie on gpu-server on 2026-04-15 where `[Main] Cleaning up...` was the
+  // last line ever emitted. The force-exit timer below caps the total
+  // graceful-shutdown time at SHUTDOWN_FORCE_EXIT_MS; if that elapses before
+  // we reach the clean process.exit at the bottom, we log and exit anyway so
+  // pm2 can auto-respawn the worker.
+  const SHUTDOWN_FORCE_EXIT_MS = Number(
+    process.env.STREAM_SHUTDOWN_FORCE_EXIT_MS ?? 15_000,
+  );
+  const shutdown = async (exitCodeOrSignal: number | NodeJS.Signals = 0) => {
+    const exitCode =
+      typeof exitCodeOrSignal === "number" ? exitCodeOrSignal : 0;
     console.log("\n[Main] Shutting down...");
-    if (captureWatchdog) clearInterval(captureWatchdog);
-    clearInterval(statusSnapshotInterval);
-    clearInterval(statusInterval);
-    await stopCdpCapture();
-    getRTMPBridge().stop();
-    clearExternalStatusSnapshot();
-    await cleanup();
 
-    // Final leak report: print and validate that no timers were orphaned.
-    const diag = getStreamLeakDiagnostics();
-    if (diag) {
-      diag.printReport();
-      try {
-        diag.assertNoLeaks("after shutdown");
-        console.log("[StreamLeakDiagnostics] ✅ No timer leaks detected.");
-      } catch (leakErr) {
-        console.error(String(leakErr));
+    const forceExitTimer = setTimeout(() => {
+      console.error(
+        `[Main] Graceful shutdown exceeded ${SHUTDOWN_FORCE_EXIT_MS}ms timeout; forcing process.exit(${exitCode}) so pm2 can respawn.`,
+      );
+      process.exit(exitCode);
+    }, SHUTDOWN_FORCE_EXIT_MS);
+    // Let the process exit naturally if this is the only outstanding timer.
+    if (typeof forceExitTimer.unref === "function") forceExitTimer.unref();
+
+    try {
+      if (captureWatchdog) clearInterval(captureWatchdog);
+      clearInterval(statusSnapshotInterval);
+      clearInterval(statusInterval);
+      await stopCdpCapture();
+      await getRTMPBridge().stop();
+      clearExternalStatusSnapshot();
+      await cleanup();
+
+      // Final leak report: print and validate that no timers were orphaned.
+      const diag = getStreamLeakDiagnostics();
+      if (diag) {
+        diag.printReport();
+        try {
+          diag.assertNoLeaks("after shutdown");
+          console.log("[StreamLeakDiagnostics] ✅ No timer leaks detected.");
+        } catch (leakErr) {
+          console.error(String(leakErr));
+        }
+        diag.uninstall();
       }
-      diag.uninstall();
+    } catch (shutdownErr) {
+      console.error(
+        "[Main] Error during graceful shutdown (will still exit):",
+        shutdownErr,
+      );
+    } finally {
+      clearTimeout(forceExitTimer);
+      process.exit(exitCode);
     }
-
-    process.exit(0);
   };
 
   process.on("SIGINT", shutdown);
@@ -1453,13 +3518,30 @@ async function cleanup() {
   }
 
   const bridge = getRTMPBridge();
-  bridge.stopProcessing();
+  await bridge.stopProcessing();
 
   if (browser) {
     await browser.close();
     browser = null;
   }
 
+  // In x11_nvenc mode Chrome is a detached child process attached via CDP,
+  // so `browser.close()` above only disconnects — it does NOT terminate the
+  // Chrome child. Kill the child explicitly. No-op for other capture modes.
+  if (x11NvencChromeProcess && !x11NvencChromeProcess.killed) {
+    try {
+      x11NvencChromeProcess.kill("SIGKILL");
+    } catch {
+      // Already dead
+    }
+    x11NvencChromeProcess = null;
+  }
+
+  page = null;
+  latestBrowserCaptureStatus = null;
+  latestSceneUrl = null;
+  latestActiveBundle = null;
+
   clearExternalStatusSnapshot();
   console.log("[Main] Cleanup complete");
 }
@@ -1467,5 +3549,28 @@ async function cleanup() {
 // Run
 main().catch((err) => {
   console.error("[Main] Fatal error:", err);
-  cleanup().then(() => process.exit(1));
+  // Same belt-and-suspenders pattern as shutdown(): if cleanup() hangs (because
+  // Chromium or the RTMP bridge has already crashed in a way that deadlocks
+  // the corresponding cleanup await), force-exit so pm2 can respawn us. Bug
+  // observed 2026-04-15.
+  const fatalForceExitMs = Number(
+    process.env.STREAM_SHUTDOWN_FORCE_EXIT_MS ?? 15_000,
+  );
+  const fatalForceExitTimer = setTimeout(() => {
+    console.error(
+      `[Main] Fatal cleanup exceeded ${fatalForceExitMs}ms; forcing exit(1).`,
+    );
+    process.exit(1);
+  }, fatalForceExitMs);
+  if (typeof fatalForceExitTimer.unref === "function") {
+    fatalForceExitTimer.unref();
+  }
+  cleanup()
+    .catch((cleanupErr) => {
+      console.error("[Main] Error during fatal cleanup:", cleanupErr);
+    })
+    .finally(() => {
+      clearTimeout(fatalForceExitTimer);
+      process.exit(1);
+    });
 });
diff --git a/packages/server/scripts/test-bridge-quick.ts b/packages/server/scripts/test-bridge-quick.ts
index f19621c1d..876f92207 100644
--- a/packages/server/scripts/test-bridge-quick.ts
+++ b/packages/server/scripts/test-bridge-quick.ts
@@ -55,8 +55,7 @@ async function main() {
         console.log("Stats:", bridge.getStats());
         console.log("\nClosing...");
         ws.close();
-        bridge.stop();
-        process.exit(0);
+        void bridge.stop().finally(() => process.exit(0));
         return;
       }
 
@@ -70,8 +69,7 @@ async function main() {
 
   ws.on("error", (err) => {
     console.error("WebSocket error:", err);
-    bridge.stop();
-    process.exit(1);
+    void bridge.stop().finally(() => process.exit(1));
   });
 
   ws.on("close", () => {
@@ -81,8 +79,7 @@ async function main() {
   // Timeout
   setTimeout(() => {
     console.log("\nTimeout - stopping");
-    bridge.stop();
-    process.exit(1);
+    void bridge.stop().finally(() => process.exit(1));
   }, 10000);
 }
 
diff --git a/packages/server/src/database/migrations/0055_add_duel_oracle_proof_to_history.sql b/packages/server/src/database/migrations/0055_add_duel_oracle_proof_to_history.sql
new file mode 100644
index 000000000..24a298996
--- /dev/null
+++ b/packages/server/src/database/migrations/0055_add_duel_oracle_proof_to_history.sql
@@ -0,0 +1,18 @@
+-- Persist oracle proof fields (duelKeyHex, duelEndTime, seed, replayHash)
+-- on streaming_duel_history so the hyperbet keeper can catch up a missed
+-- onDuelEnd event by querying a per-duel result endpoint.
+--
+-- Nullable: legacy rows from before this migration will not have these
+-- fields populated, and cannot be used for synthetic onDuelEnd replay.
+-- New rows from MatchmakingManager.recordRecentDuel will always populate
+-- them from the currentCycle's buildOracleProof() output.
+
+ALTER TABLE "streaming_duel_history" ADD COLUMN IF NOT EXISTS "duelKeyHex" text;
+--> statement-breakpoint
+ALTER TABLE "streaming_duel_history" ADD COLUMN IF NOT EXISTS "duelEndTime" bigint;
+--> statement-breakpoint
+ALTER TABLE "streaming_duel_history" ADD COLUMN IF NOT EXISTS "seed" text;
+--> statement-breakpoint
+ALTER TABLE "streaming_duel_history" ADD COLUMN IF NOT EXISTS "replayHash" text;
+--> statement-breakpoint
+CREATE INDEX IF NOT EXISTS "idx_streaming_duel_history_duelid" ON "streaming_duel_history" USING btree ("duelId");
diff --git a/packages/server/src/database/migrations/0056_add_streaming_duel_oracle_proof_integrity_check.sql b/packages/server/src/database/migrations/0056_add_streaming_duel_oracle_proof_integrity_check.sql
new file mode 100644
index 000000000..c8d5530ab
--- /dev/null
+++ b/packages/server/src/database/migrations/0056_add_streaming_duel_oracle_proof_integrity_check.sql
@@ -0,0 +1,28 @@
+-- Enforce oracle-proof row integrity for streaming duel history.
+--
+-- Legacy rows may have no proof material at all. Fresh catch-up rows must have
+-- the full tuple required for synthetic onDuelEnd replay. Mixed rows are
+-- invalid because they look present to operators but cannot settle safely.
+
+DO $$
+BEGIN
+  ALTER TABLE "streaming_duel_history"
+    ADD CONSTRAINT "streaming_duel_history_oracle_proof_all_or_none"
+    CHECK (
+      (
+        "duelKeyHex" IS NULL AND
+        "duelEndTime" IS NULL AND
+        "seed" IS NULL AND
+        "replayHash" IS NULL
+      )
+      OR
+      (
+        "duelKeyHex" IS NOT NULL AND
+        "duelEndTime" IS NOT NULL AND
+        "seed" IS NOT NULL AND
+        "replayHash" IS NOT NULL
+      )
+    );
+EXCEPTION
+  WHEN duplicate_object THEN NULL;
+END $$;
diff --git a/packages/server/src/database/migrations/meta/_journal.json b/packages/server/src/database/migrations/meta/_journal.json
index 29e19ed4c..4673eb898 100644
--- a/packages/server/src/database/migrations/meta/_journal.json
+++ b/packages/server/src/database/migrations/meta/_journal.json
@@ -379,6 +379,20 @@
       "when": 1772300000000,
       "tag": "0054_add_agent_thoughts",
       "breakpoints": true
+    },
+    {
+      "idx": 55,
+      "version": "7",
+      "when": 1776397800000,
+      "tag": "0055_add_duel_oracle_proof_to_history",
+      "breakpoints": true
+    },
+    {
+      "idx": 56,
+      "version": "7",
+      "when": 1776400000000,
+      "tag": "0056_add_streaming_duel_oracle_proof_integrity_check",
+      "breakpoints": true
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/packages/server/src/database/schema.ts b/packages/server/src/database/schema.ts
index ff839637d..e10f45c27 100644
--- a/packages/server/src/database/schema.ts
+++ b/packages/server/src/database/schema.ts
@@ -2562,6 +2562,15 @@ export const streamingDuelHistory = pgTable(
     winReason: text("winReason").notNull(),
     damageWinner: integer("damageWinner").notNull().default(0),
     damageLoser: integer("damageLoser").notNull().default(0),
+    // Oracle proof columns, populated at resolution time from buildOracleProof().
+    // Nullable for backwards-compatibility with rows created before this
+    // schema bump. The keeper catch-up endpoint requires these for any
+    // duel whose onDuelEnd was missed — without them, synthetic replay
+    // cannot propose a Solana result.
+    duelKeyHex: text("duelKeyHex"),
+    duelEndTime: bigint("duelEndTime", { mode: "number" }),
+    seed: text("seed"),
+    replayHash: text("replayHash"),
   },
   (table) => ({
     finishedAtIdx: index("idx_streaming_duel_history_finished").on(
@@ -2569,6 +2578,7 @@ export const streamingDuelHistory = pgTable(
     ),
     winnerIdx: index("idx_streaming_duel_history_winner").on(table.winnerId),
     loserIdx: index("idx_streaming_duel_history_loser").on(table.loserId),
+    duelIdIdx: index("idx_streaming_duel_history_duelid").on(table.duelId),
   }),
 );
 
diff --git a/packages/server/src/duel/DuelCombatAI.ts b/packages/server/src/duel/DuelCombatAI.ts
index ca84ebf70..d511562d0 100644
--- a/packages/server/src/duel/DuelCombatAI.ts
+++ b/packages/server/src/duel/DuelCombatAI.ts
@@ -59,6 +59,9 @@ const TRASH_TALK_THRESHOLDS = [90, 80, 70, 60, 50, 40, 30, 20, 10] as const;
 /** Minimum milliseconds between trash talk LLM calls. */
 const TRASH_TALK_COOLDOWN_MS = 4_000;
 
+/** Hard timeout for a single trash talk LLM call — abandon after this. */
+const TRASH_TALK_TIMEOUT_MS = 4_000;
+
 /** Ambient trash talk fires randomly every 5-12 ticks. */
 const AMBIENT_TAUNT_MIN_TICKS = 5;
 const AMBIENT_TAUNT_MAX_TICKS = 12;
@@ -1111,7 +1114,10 @@ export class DuelCombatAI {
       return;
     }
 
-    // LLM path — fire in background, using agent character for personality
+    // LLM path — fire in background, using agent character for personality.
+    // Dedup guard: skip if a call is already in-flight.
+    if (this._trashTalkInFlight) return;
+
     const oppPctStr =
       opponentData && opponentData.maxHealth > 0
         ? `${((opponentData.health / opponentData.maxHealth) * 100).toFixed(0)}%`
@@ -1146,7 +1152,9 @@ export class DuelCombatAI {
     this._trashTalkInFlight = true;
     this.lastTrashTalkTime = Date.now();
 
-    (async () => {
+    // Fire-and-forget — intentionally NOT awaited so the combat tick is never blocked.
+    void (async () => {
+      let timerId: ReturnType<typeof setTimeout> | undefined;
       try {
         const llmPromise = this.runtime!.useModel(ModelType.TEXT_SMALL, {
           prompt,
@@ -1154,16 +1162,14 @@ export class DuelCombatAI {
           temperature: 0.9,
         });
 
-        let timerId: ReturnType<typeof setTimeout>;
         const timeoutPromise = new Promise<never>((_, reject) => {
           timerId = setTimeout(
             () => reject(new Error("Trash talk LLM timeout")),
-            LLM_TIMEOUT_MS,
+            TRASH_TALK_TIMEOUT_MS,
           );
         });
 
         const response = await Promise.race([llmPromise, timeoutPromise]);
-        clearTimeout(timerId!);
 
         const text = (typeof response === "string" ? response : "")
           .trim()
@@ -1172,11 +1178,11 @@ export class DuelCombatAI {
           try {
             sendChatAction(text);
           } catch {
-            // Swallow
+            // Swallow — chat failure must not break combat
           }
         }
       } catch (err) {
-        // On failure, use a scripted fallback
+        // On failure / timeout, use a scripted fallback
         const pool =
           kind === "own_low"
             ? FALLBACK_TAUNTS_OWN_LOW
@@ -1192,6 +1198,7 @@ export class DuelCombatAI {
           // Swallow
         }
       } finally {
+        if (timerId !== undefined) clearTimeout(timerId);
         this._trashTalkInFlight = false;
       }
     })();
@@ -1317,7 +1324,11 @@ export class DuelCombatAI {
     }
 
     try {
-      void this.service.executeMove([targetX, ownPos[1], targetZ], run);
+      void this.service
+        .executeMove([targetX, ownPos[1], targetZ], run)
+        .catch((err) =>
+          duelLogDebug("DuelCombatAI", "Move failed:", errMsg(err)),
+        );
       this.lastMoveTime = now;
       this.strafeMoveCount++;
       // Flip orbit direction every 5 moves — creates longer, more readable arcs
diff --git a/packages/server/src/eliza/AgentManager.ts b/packages/server/src/eliza/AgentManager.ts
index 2cb8cddb8..dea03db94 100644
--- a/packages/server/src/eliza/AgentManager.ts
+++ b/packages/server/src/eliza/AgentManager.ts
@@ -23,8 +23,6 @@ import {
   stringToUuid,
   type Character,
   type Plugin,
-  // @ts-ignore - exported at runtime but missing from .d.ts
-  InMemoryDatabaseAdapter,
 } from "@elizaos/core";
 import { createJWT } from "../shared/utils.js";
 import { errMsg } from "../shared/errMsg.js";
@@ -40,6 +38,10 @@ import {
   ejectAgentFromCombatArena,
   recoverAgentFromDeathLoop,
 } from "./agentRecovery.js";
+import {
+  CharacterWithModelProvider,
+  InMemoryDatabaseAdapter,
+} from "./elizaCoreCompat.js";
 
 /**
  * Dynamically import the Hyperscape plugin to avoid hard dependency in dev.
@@ -354,40 +356,75 @@ async function getModelProviderPlugin(
     }
   }
 
-  // Fall back to Ollama when no cloud keys (env or character)
+  // Fall back to Ollama when no cloud keys (env or character).
+  //
+  // We try the local shim first — `./plugins/localOllama.ts` wraps
+  // `ollama-ai-provider-v2@^3.5.0` which implements AI SDK spec v2 and is
+  // compatible with our `ai@^6.0.97`. The upstream
+  // `@elizaos/plugin-ollama@2.0.0-alpha.70` bundles `ollama-ai-provider@^1.2.0`
+  // (spec v1), so it imports successfully but every model call fails at
+  // runtime with "Unsupported model version v1 for provider 'ollama.chat'".
+  // See `packages/server/src/eliza/plugins/localOllama.ts` for the shim
+  // contract and the rollback plan.
+  //
+  // If the shim import itself fails (e.g. `ollama-ai-provider-v2` not
+  // installed on the node_modules tree yet), we still try the upstream
+  // plugin as a second best — that way we don't regress the existing
+  // behaviour if the shim is missing for any reason.
+  const buildOllamaProviderRecord = (
+    plugin: Plugin,
+    source: string,
+  ): ResolvedChatModelProvider => {
+    const model =
+      (typeof charModel === "string" && charModel.trim()
+        ? charModel.trim()
+        : "") ||
+      process.env.OLLAMA_LARGE_MODEL?.trim() ||
+      process.env.OLLAMA_MODEL?.trim() ||
+      "provider default";
+    return {
+      plugin,
+      provider: "ollama",
+      model,
+      source,
+      secrets: {
+        ...(process.env.OLLAMA_BASE_URL
+          ? { OLLAMA_BASE_URL: process.env.OLLAMA_BASE_URL }
+          : {}),
+        ...(model === "provider default"
+          ? {}
+          : {
+              LARGE_MODEL: model,
+              OLLAMA_MODEL: model,
+            }),
+      },
+    };
+  };
+
+  try {
+    const localMod = await import("./plugins/localOllama.js");
+    const plugin = localMod.ollamaPlugin;
+    if (plugin) {
+      return buildOllamaProviderRecord(plugin, "local Ollama (shim)");
+    }
+  } catch (err) {
+    console.warn(
+      "[AgentManager] Failed to load local Ollama shim:",
+      errMsg(err),
+    );
+  }
+
   try {
     const mod = await import("@elizaos/plugin-ollama");
     const plugin = mod.ollamaPlugin;
     if (plugin) {
-      const model =
-        (typeof charModel === "string" && charModel.trim()
-          ? charModel.trim()
-          : "") ||
-        process.env.OLLAMA_LARGE_MODEL?.trim() ||
-        process.env.OLLAMA_MODEL?.trim() ||
-        "provider default";
-      return {
-        plugin,
-        provider: "ollama",
-        model,
-        source: "local Ollama",
-        secrets: {
-          ...(process.env.OLLAMA_BASE_URL
-            ? {
-                OLLAMA_BASE_URL: process.env.OLLAMA_BASE_URL,
-              }
-            : {}),
-          ...(model === "provider default"
-            ? {}
-            : {
-                LARGE_MODEL: model,
-                OLLAMA_MODEL: model,
-              }),
-        },
-      };
+      return buildOllamaProviderRecord(plugin, "local Ollama (upstream)");
     }
   } catch (err) {
-    console.warn("[AgentManager] Failed to load Ollama plugin:", errMsg(err));
+    console.warn(
+      "[AgentManager] Failed to load upstream Ollama plugin:",
+      errMsg(err),
+    );
   }
 
   console.warn(
@@ -1184,7 +1221,7 @@ export class AgentManager {
       instance.config.characterConfig?.system ||
       `You are ${instance.config.name}, an embedded Hyperscape agent. Respond as yourself, stay grounded in the current game world, and keep replies concise and useful.`;
 
-    return {
+    const character = {
       id: stringToUuid(`embedded-chat-${instance.config.characterId}`),
       name: instance.config.name,
       username:
@@ -1225,9 +1262,9 @@ export class AgentManager {
         },
       },
       plugins: [],
-      // @ts-ignore - runtime supports modelProvider even if core type lags.
       modelProvider: provider.provider,
-    } as unknown as Character;
+    } as unknown as CharacterWithModelProvider;
+    return character as Character;
   }
 
   private buildDashboardChatPrompt(
@@ -1420,12 +1457,18 @@ export class AgentManager {
       }
 
       const adapter = new InMemoryDatabaseAdapter();
+      const adapterWithLog = adapter as unknown as {
+        log?: (params: unknown) => Promise<void>;
+        logs?: unknown[];
+      };
       // Eliza 2.0 alpha.76+ InMemoryDatabaseAdapter may omit `log`; only wrap when present.
-      if (typeof adapter.log === "function") {
-        const originalLog = adapter.log.bind(adapter);
-        adapter.log = async (params: Parameters<typeof originalLog>[0]) => {
+      if (typeof adapterWithLog.log === "function") {
+        const originalLog = adapterWithLog.log.bind(adapterWithLog);
+        adapterWithLog.log = async (
+          params: Parameters<typeof originalLog>[0],
+        ) => {
           await originalLog(params);
-          const logs = (adapter as unknown as { logs?: unknown[] }).logs;
+          const logs = adapterWithLog.logs;
           if (logs && logs.length > 50) {
             logs.splice(0, logs.length - 50);
           }
@@ -1519,7 +1562,16 @@ export class AgentManager {
         return;
       }
       const mod = await import("./ModelAgentSpawner.js");
-      mod.startEmbeddedAgentLlmPlanningLoop(
+      (
+        mod as typeof mod & {
+          startEmbeddedAgentLlmPlanningLoop?: (
+            characterId: string,
+            runtime: AgentRuntime,
+            service: EmbeddedHyperscapeService,
+            name: string,
+          ) => void;
+        }
+      ).startEmbeddedAgentLlmPlanningLoop?.(
         characterId,
         runtime,
         instance.service,
@@ -1536,7 +1588,11 @@ export class AgentManager {
     this.stopCharacterVisionRefresh(characterId);
     try {
       const mod = await import("./ModelAgentSpawner.js");
-      mod.stopEmbeddedAgentLlmPlanningLoop(characterId);
+      (
+        mod as typeof mod & {
+          stopEmbeddedAgentLlmPlanningLoop?: (characterId: string) => void;
+        }
+      ).stopEmbeddedAgentLlmPlanningLoop?.(characterId);
     } catch {
       /* ignore */
     }
diff --git a/packages/server/src/eliza/ElizaDuelBot.ts b/packages/server/src/eliza/ElizaDuelBot.ts
index 2bac48d3c..a19934d3a 100644
--- a/packages/server/src/eliza/ElizaDuelBot.ts
+++ b/packages/server/src/eliza/ElizaDuelBot.ts
@@ -10,18 +10,14 @@
  * initiates challenges between bots.
  */
 
-import {
-  AgentRuntime,
-  type Plugin,
-  // @ts-ignore — InMemoryDatabaseAdapter is exported at runtime but not in .d.ts
-  InMemoryDatabaseAdapter,
-} from "@elizaos/core";
+import { AgentRuntime, type Plugin } from "@elizaos/core";
 import { EventEmitter } from "events";
 import { hyperscapePlugin } from "@hyperscape/plugin-hyperscape";
 import { createJWT } from "../shared/utils.js";
 import { errMsg } from "../shared/errMsg.js";
 import type { ModelProviderConfig } from "./ModelAgentSpawner.js";
 import { loadModelPlugin, createAgentCharacter } from "./agentHelpers.js";
+import { InMemoryDatabaseAdapter } from "./elizaCoreCompat.js";
 import { duelLogError, duelLogInfo, duelLogWarn } from "./logging.js";
 
 // Re-export for convenience
diff --git a/packages/server/src/eliza/EmbeddedHyperscapeService.ts b/packages/server/src/eliza/EmbeddedHyperscapeService.ts
index f8e93b5c2..f25ef4428 100644
--- a/packages/server/src/eliza/EmbeddedHyperscapeService.ts
+++ b/packages/server/src/eliza/EmbeddedHyperscapeService.ts
@@ -13,6 +13,8 @@ import {
   getDuelArenaConfig,
   getItem,
   isPositionInsideCombatArena,
+  normalizeAvatarAssetUrl,
+  DEFAULT_AVATAR_URL,
   ALL_WORLD_AREAS,
   type World,
 } from "@hyperscape/shared";
@@ -42,6 +44,13 @@ interface EmbeddedWorldMapData {
     position: { x: number; y: number; z: number };
     biome: string;
   }>;
+  pointsOfInterest?: Array<{
+    id: string;
+    name: string;
+    category: string;
+    position: { x: number; y: number; z: number };
+    biome: string;
+  }>;
   resources: Array<{
     type: string;
     resourceId: string;
@@ -106,7 +115,7 @@ function getSharedEntitySnapshot(
     now - cached.time < SHARED_SNAPSHOT_TTL_MS &&
     cached.snapshot.length > 0
   ) {
-    return cached.snapshot;
+    return cached.snapshot.slice();
   }
   const snapshot: EntitySnapshot[] = [];
   for (const [id, entity] of world.entities.items.entries()) {
@@ -117,7 +126,7 @@ function getSharedEntitySnapshot(
     snapshot.push({ id, position: pos, data, entity });
   }
   _snapshotCache.set(world, { snapshot, time: now });
-  return snapshot;
+  return snapshot.slice();
 }
 
 // Event handler type
@@ -228,6 +237,10 @@ export class EmbeddedHyperscapeService implements IEmbeddedHyperscapeService {
     this.name = name;
   }
 
+  setDisplayName(name: string): void {
+    this.name = name;
+  }
+
   /**
    * Initialize the service and spawn the agent's player entity
    */
@@ -430,10 +443,11 @@ export class EmbeddedHyperscapeService implements IEmbeddedHyperscapeService {
           name: savedData?.name || this.name,
           health,
           maxHealth: health,
-          avatar:
+          avatar: normalizeAvatarAssetUrl(
             savedData?.avatar ||
-            this.world.settings?.avatar?.url ||
-            "asset://avatars/avatar-male-01.vrm",
+              this.world.settings?.avatar?.url ||
+              DEFAULT_AVATAR_URL,
+          ),
           wallet: savedData?.wallet || undefined,
           roles: [],
           skills,
diff --git a/packages/server/src/eliza/ModelAgentSpawner.ts b/packages/server/src/eliza/ModelAgentSpawner.ts
index cdd5ca3bb..503b6d365 100644
--- a/packages/server/src/eliza/ModelAgentSpawner.ts
+++ b/packages/server/src/eliza/ModelAgentSpawner.ts
@@ -19,20 +19,20 @@ import {
   type Character,
   type Memory,
   type UUID,
-  // @ts-ignore — InMemoryDatabaseAdapter is exported at runtime but not in .d.ts
-  InMemoryDatabaseAdapter,
 } from "@elizaos/core";
 import { EventType, getDuelArenaConfig, type World } from "@hyperscape/shared";
 import { createJWT } from "../shared/utils.js";
 import { errMsg } from "../shared/errMsg.js";
 import { hyperscapePlugin } from "@hyperscape/plugin-hyperscape";
 import type { EmbeddedHyperscapeService } from "./EmbeddedHyperscapeService.js";
+import type { DatabaseSystem } from "../systems/DatabaseSystem/index.js";
 import {
   ejectAgentFromCombatArena,
   recoverAgentFromDeathLoop,
 } from "./agentRecovery.js";
 import { getAgentManager } from "./AgentManager.js";
 import { loadModelPlugin, createAgentCharacter } from "./agentHelpers.js";
+import { InMemoryDatabaseAdapter } from "./elizaCoreCompat.js";
 
 type BunRuntime = {
   gc?: (force?: boolean) => void;
@@ -273,8 +273,7 @@ export async function spawnModelAgents(
   // both cause unbounded memory growth (WASM heap + in-memory log accumulation).
 
   // Get database system for character creation
-  // @ts-ignore - Dynamic import to avoid circular dependency
-  const databaseSystem = world.getSystem("database");
+  const databaseSystem = world.getSystem<DatabaseSystem>("database");
   const db = databaseSystem?.getDb?.();
 
   if (!db) {
diff --git a/packages/server/src/eliza/__tests__/AgentManager.autonomy.test.ts b/packages/server/src/eliza/__tests__/AgentManager.autonomy.test.ts
index 9394c3ee7..da7bb75d3 100644
--- a/packages/server/src/eliza/__tests__/AgentManager.autonomy.test.ts
+++ b/packages/server/src/eliza/__tests__/AgentManager.autonomy.test.ts
@@ -5,6 +5,8 @@ import {
   isPositionInsideCombatArena,
 } from "@hyperscape/shared";
 import { AgentManager } from "../AgentManager";
+import { AgentBehaviorBridge } from "../managers/AgentBehaviorBridge";
+import { ejectAgentFromCombatArena } from "../agentRecovery";
 
 type Skill = { level: number; xp: number };
 
@@ -230,6 +232,16 @@ describe("AgentManager autonomous loop", () => {
   beforeEach(() => {
     vi.useFakeTimers();
     vi.setSystemTime(new Date("2026-01-01T00:00:00.000Z"));
+    vi.spyOn(AgentBehaviorBridge.prototype, "start").mockResolvedValue();
+    vi.spyOn(AgentBehaviorBridge.prototype, "stop").mockImplementation(
+      () => {},
+    );
+    vi.spyOn(AgentBehaviorBridge.prototype, "startAgent").mockImplementation(
+      () => {},
+    );
+    vi.spyOn(AgentBehaviorBridge.prototype, "stopAgent").mockImplementation(
+      () => {},
+    );
   });
 
   afterEach(() => {
@@ -243,8 +255,6 @@ describe("AgentManager autonomous loop", () => {
     ctx.addResource("resource-tree", [2, terrainHeight + 0.1, 0], "tree");
 
     const manager = new AgentManager(ctx.world as never);
-    const lobby = getDuelArenaConfig().lobbySpawnPoint;
-
     try {
       await manager.createAgent({
         characterId: "agent-loop",
@@ -277,62 +287,66 @@ describe("AgentManager autonomous loop", () => {
       expect(agent!.data.preventRespawn).toBe(false);
       expect(agent!.data.inCombat).toBe(false);
       expect(agent!.data.combatTarget).toBeNull();
-      expect(agent!.data.position[0]).toBeCloseTo(lobby.x, 5);
-      expect(agent!.data.position[1]).toBeCloseTo(terrainHeight + 0.1, 5);
-      expect(agent!.data.position[2]).toBeCloseTo(lobby.z, 5);
-    } finally {
-      await manager.shutdown();
-    }
-  });
-
-  it("teleports non-dueling agents out of combat arena tiles", async () => {
-    const terrainHeight = 9;
-    const ctx = createMockWorld(terrainHeight);
-    ctx.registerCharacter("acct-5", "agent-out", "Outside Agent");
-
-    const manager = new AgentManager(ctx.world as never);
-    const lobby = getDuelArenaConfig().lobbySpawnPoint;
-
-    try {
-      await manager.createAgent({
-        characterId: "agent-out",
-        accountId: "acct-5",
-        name: "Outside Agent",
-        scriptedRole: "combat",
-        autoStart: true,
-      });
-
-      await Promise.resolve();
-      await Promise.resolve();
-
-      const agent = ctx.entities.get("agent-out");
-      expect(agent).toBeDefined();
-
-      // Place agent inside arena 1 while not in a duel.
-      agent!.data.position = [70, terrainHeight + 0.1, 90];
-      agent!.data.inStreamingDuel = false;
-      agent!.data.preventRespawn = false;
-
-      await manager.executeBehaviorTick("agent-out");
-
       expect(
         isPositionInsideCombatArena(
           agent!.data.position[0],
           agent!.data.position[2],
         ),
       ).toBe(false);
+      expect(
+        Math.hypot(agent!.data.position[0], agent!.data.position[2]),
+      ).toBeLessThanOrEqual(8);
+      expect(agent!.data.position[1]).toBeCloseTo(terrainHeight + 0.1, 5);
       expect(agent!.data._teleport).toBe(true);
-      expect(agent!.data.inStreamingDuel).toBe(false);
-      expect(agent!.data.preventRespawn).toBe(false);
-
-      // Ejected agents should remain near the lobby area.
-      const distFromLobby = Math.hypot(
-        agent!.data.position[0] - lobby.x,
-        agent!.data.position[2] - lobby.z,
-      );
-      expect(distFromLobby).toBeLessThanOrEqual(40);
     } finally {
       await manager.shutdown();
     }
   });
+
+  it("teleports non-dueling agents out of combat arena tiles", async () => {
+    const terrainHeight = 9;
+    const ctx = createMockWorld(terrainHeight);
+    const arena = getDuelArenaConfig();
+    const arenaCenter = [
+      arena.baseX + Math.max(1, Math.floor(arena.arenaWidth / 2)),
+      terrainHeight + 0.1,
+      arena.baseZ + Math.max(1, Math.floor(arena.arenaLength / 2)),
+    ] as const;
+    ctx.world.entities.add({
+      id: "agent-out",
+      type: "player",
+      isAgent: true,
+      position: [...arenaCenter],
+      health: 20,
+      maxHealth: 20,
+      inStreamingDuel: false,
+      preventRespawn: false,
+    });
+
+    const agent = ctx.entities.get("agent-out");
+    expect(agent).toBeDefined();
+
+    const ejected = ejectAgentFromCombatArena(
+      ctx.world as never,
+      "agent-out",
+      "test",
+    );
+
+    expect(isPositionInsideCombatArena(arenaCenter[0], arenaCenter[2])).toBe(
+      true,
+    );
+    expect(ejected).toBe(true);
+    expect(
+      isPositionInsideCombatArena(
+        agent!.data.position[0],
+        agent!.data.position[2],
+      ),
+    ).toBe(false);
+    expect(agent!.data._teleport).toBe(true);
+    expect(agent!.data.inStreamingDuel).toBe(false);
+    expect(agent!.data.preventRespawn).toBe(false);
+    expect(
+      Math.hypot(agent!.data.position[0], agent!.data.position[2]),
+    ).toBeLessThanOrEqual(8);
+  });
 });
diff --git a/packages/server/src/eliza/__tests__/EmbeddedHyperscapeService.rpgMethods.test.ts b/packages/server/src/eliza/__tests__/EmbeddedHyperscapeService.rpgMethods.test.ts
index 8b116002e..25b90a834 100644
--- a/packages/server/src/eliza/__tests__/EmbeddedHyperscapeService.rpgMethods.test.ts
+++ b/packages/server/src/eliza/__tests__/EmbeddedHyperscapeService.rpgMethods.test.ts
@@ -9,7 +9,7 @@ function createMockWorld() {
     entities: {
       get: (id: string) => entities.get(id),
       add: vi.fn().mockReturnValue("new-entity-id"),
-      items: () => entities.entries(),
+      items: entities,
       [Symbol.iterator]: () => entities.entries(),
     },
     getSystem: (name: string) => systems.get(name) ?? null,
@@ -75,7 +75,15 @@ describe("EmbeddedHyperscapeService RPG methods", () => {
     });
 
     it("executeBankDepositAll emits BANK_DEPOSIT_ALL event", async () => {
-      const { service, world } = createActiveService();
+      const { service, world, entities } = createActiveService();
+      entities.get("agent-1").data.position = [0, 0, 0];
+      entities.set("bank-lumbridge", {
+        data: {
+          type: "bank",
+          name: "Bank Chest",
+          position: [2, 0, 2],
+        },
+      });
       const result = await service.executeBankDepositAll();
       expect(result).toBe(true);
       expect(world.emit).toHaveBeenCalledWith(
@@ -112,7 +120,27 @@ describe("EmbeddedHyperscapeService RPG methods", () => {
 
   describe("crafting", () => {
     it("executeCook emits cooking event", async () => {
-      const { service, world } = createActiveService();
+      const { service, world, entities, systems } = createActiveService();
+      entities.get("agent-1").data.position = [0, 0, 0];
+      entities.set("station-range", {
+        data: {
+          type: "object",
+          name: "Cooking Range",
+          position: [2, 0, 2],
+        },
+      });
+      systems.set("inventory", {
+        getInventory: () => ({
+          items: [
+            {
+              slot: 0,
+              itemId: "raw_shrimp",
+              quantity: 1,
+              item: { id: "raw_shrimp", name: "Raw Shrimp", type: "food" },
+            },
+          ],
+        }),
+      });
       const result = await service.executeCook("raw_shrimp");
       expect(result).toBe(true);
       expect(world.emit).toHaveBeenCalled();
diff --git a/packages/server/src/eliza/__tests__/EmbeddedHyperscapeService.test.ts b/packages/server/src/eliza/__tests__/EmbeddedHyperscapeService.test.ts
index 907f57fd1..4b85bae63 100644
--- a/packages/server/src/eliza/__tests__/EmbeddedHyperscapeService.test.ts
+++ b/packages/server/src/eliza/__tests__/EmbeddedHyperscapeService.test.ts
@@ -30,6 +30,16 @@ function createMockWorld() {
     return getCallCount <= 1 ? undefined : playerData;
   });
 
+  const characterSystem = {
+    getCharactersAsync: vi
+      .fn()
+      .mockResolvedValue([
+        { id: "char-1", name: "TestAgent", avatar: null, wallet: null },
+      ]),
+    getPlayerAsync: vi.fn().mockResolvedValue({}),
+    getHeightAt: vi.fn().mockReturnValue(10),
+  };
+
   return {
     entities: {
       get: entityGet,
@@ -45,16 +55,9 @@ function createMockWorld() {
       if (idx >= 0) listeners.splice(idx, 1);
     }),
     emit: vi.fn(),
-    getSystem: vi.fn().mockReturnValue({
-      getCharactersAsync: vi
-        .fn()
-        .mockResolvedValue([
-          { id: "char-1", name: "TestAgent", avatar: null, wallet: null },
-        ]),
-      getPlayerAsync: vi.fn().mockResolvedValue({}),
-      getHeightAt: vi.fn().mockReturnValue(10),
-    }),
+    getSystem: vi.fn().mockReturnValue(characterSystem),
     settings: { avatar: { url: "test.vrm" } },
+    _characterSystem: characterSystem,
     _listeners: listeners,
   };
 }
@@ -112,4 +115,71 @@ describe("EmbeddedHyperscapeService", () => {
     const result = service.getGameState();
     expect(result).toBeNull();
   });
+
+  it("normalizes stale saved avatar LOD URLs before spawning the entity", async () => {
+    const world = createMockWorld();
+    world._characterSystem.getPlayerAsync.mockResolvedValue({
+      id: "char-1",
+      name: "TestAgent",
+      avatar: "asset://avatars/avatar-female-01_lod2.vrm",
+      wallet: null,
+    });
+
+    const service = new EmbeddedHyperscapeService(
+      world as any,
+      "char-1",
+      "account-1",
+      "TestAgent",
+    );
+
+    await service.initialize();
+
+    expect(world.entities.add).toHaveBeenCalledWith(
+      expect.objectContaining({
+        avatar: "asset://avatars/avatar-female-01.vrm",
+      }),
+    );
+  });
+
+  it("normalizes world-settings avatar URLs before spawning the entity", async () => {
+    const world = createMockWorld();
+    world.settings.avatar.url = "avatars/avatar-female-02_lod1.vrm?cache=1";
+
+    const service = new EmbeddedHyperscapeService(
+      world as any,
+      "char-1",
+      "account-1",
+      "TestAgent",
+    );
+
+    await service.initialize();
+
+    expect(world.entities.add).toHaveBeenCalledWith(
+      expect.objectContaining({
+        avatar: "asset://avatars/avatar-female-02.vrm?cache=1",
+      }),
+    );
+  });
+
+  it("falls back to the default stock avatar when no avatar is configured", async () => {
+    const world = createMockWorld();
+    // Intentionally clearing avatar to exercise the fallback path; the
+    // production code treats the settings shape as partial.
+    (world as { settings: Record<string, unknown> }).settings = {};
+
+    const service = new EmbeddedHyperscapeService(
+      world as any,
+      "char-1",
+      "account-1",
+      "TestAgent",
+    );
+
+    await service.initialize();
+
+    expect(world.entities.add).toHaveBeenCalledWith(
+      expect.objectContaining({
+        avatar: "asset://avatars/avatar-male-01.vrm",
+      }),
+    );
+  });
 });
diff --git a/packages/server/src/eliza/agentHelpers.ts b/packages/server/src/eliza/agentHelpers.ts
index 5fd607466..354b2ce25 100644
--- a/packages/server/src/eliza/agentHelpers.ts
+++ b/packages/server/src/eliza/agentHelpers.ts
@@ -13,6 +13,7 @@ import {
 import path from "path";
 import fs from "fs";
 import { errMsg } from "../shared/errMsg.js";
+import { CharacterWithModelProvider } from "./elizaCoreCompat.js";
 
 import type { ModelProviderConfig } from "./ModelAgentSpawner.js";
 
@@ -251,7 +252,7 @@ export function createAgentCharacter(
 
   const modelSecrets = buildModelSecrets(config, overrides.smallModel);
 
-  const character: Character = {
+  const character = {
     id: stringToUuid(agentId),
     name: overrides.name || config.displayName,
     username: agentId,
@@ -262,7 +263,6 @@ export function createAgentCharacter(
     ],
     topics: ["combat strategy", "PvP tactics", "duel techniques"],
     adjectives: ["competitive", "ruthless", "strategic", "adaptive"],
-    // @ts-ignore - modelProvider not in core Character type yet
     modelProvider: config.provider,
     settings: {
       model: config.model,
@@ -283,7 +283,7 @@ export function createAgentCharacter(
       chat: ["Challenge strong players", "Accept all duels"],
     },
     plugins: [],
-  } as unknown as Character;
+  } as unknown as CharacterWithModelProvider;
 
-  return { character, agentId, characterId };
+  return { character: character as Character, agentId, characterId };
 }
diff --git a/packages/server/src/eliza/dashboardInterop.ts b/packages/server/src/eliza/dashboardInterop.ts
index 1bdace205..7591cf660 100644
--- a/packages/server/src/eliza/dashboardInterop.ts
+++ b/packages/server/src/eliza/dashboardInterop.ts
@@ -34,6 +34,36 @@ let thoughtFlushTimer: ReturnType<typeof setInterval> | null = null;
 // DB handle — set once via setThoughtDb() from server startup
 let _thoughtDb: Database | null = null;
 
+function normalizeDashboardThoughtType(
+  value: string,
+): DashboardThought["type"] {
+  switch (value) {
+    case "situation":
+    case "evaluation":
+    case "thinking":
+    case "decision":
+    case "action":
+      return value;
+    default:
+      return "thinking";
+  }
+}
+
+function normalizeDashboardDecisionPath(
+  value: string | null | undefined,
+): DashboardThought["decisionPath"] {
+  switch (value) {
+    case "short-circuit":
+    case "llm":
+    case "scripted":
+    case "planner":
+    case "curiosity":
+      return value;
+    default:
+      return undefined;
+  }
+}
+
 /** Set the Drizzle DB instance for thought persistence. Call once at startup. */
 export function setThoughtDb(db: Database): void {
   _thoughtDb = db;
@@ -109,10 +139,10 @@ export async function hydrateThoughtsFromDb(
       if (!existingIds.has(id)) {
         existing.push({
           id,
-          type: r.type,
+          type: normalizeDashboardThoughtType(r.type),
           content: r.content,
           timestamp: r.timestamp,
-          decisionPath: r.decisionPath ?? undefined,
+          decisionPath: normalizeDashboardDecisionPath(r.decisionPath),
         });
       }
     }
@@ -141,6 +171,10 @@ type CommandData = {
   message?: string;
   npcId?: string;
   interaction?: string;
+  questId?: string;
+  recipe?: string;
+  slot?: string;
+  description?: string;
 };
 
 type DistancePreference = "nearest" | "furthest";
@@ -241,13 +275,23 @@ export function recordAgentThought(
 
 /** Snapshot of embedded AgentBehaviorTicker.goal (avoid circular import of AgentInstance). */
 export type EmbeddedTickerGoalSnapshot = {
-  type: "questing" | "combat" | "gathering" | "idle";
+  type:
+    | "questing"
+    | "combat"
+    | "gathering"
+    | "banking"
+    | "cooking"
+    | "smelting"
+    | "smithing"
+    | "exploring"
+    | "idle";
   description: string;
   questId?: string;
   questName?: string;
   questStageType?: string;
   questStageTarget?: string;
   questStageCount?: number;
+  questStartNpc?: string;
 };
 
 const MAX_EMBEDDED_DASHBOARD_ACTIVITY = 100;
@@ -1162,7 +1206,7 @@ function findGlobalResourceTarget(
     getWorld?: () => { entities?: { items?: Map<string, WorldEntity> } };
   };
   const world = (service as ServiceWithWorld).getWorld?.();
-  const items = world?.entities?.items;
+  const items = world?.entities?.items as Map<string, WorldEntity> | undefined;
   if (!items) return null;
   const kws = typeKeywords.map((k) => k.toLowerCase());
   let bestId: string | null = null;
@@ -1236,7 +1280,7 @@ function findGlobalMobTarget(
     getWorld?: () => { entities?: { items?: Map<string, WorldEntity> } };
   };
   const world = (service as ServiceWithWorld).getWorld?.();
-  const items = world?.entities?.items;
+  const items = world?.entities?.items as Map<string, WorldEntity> | undefined;
   if (!items) return null;
   const tokens = tokenizeTarget(targetPhrase);
   let bestId: string | null = null;
@@ -1639,13 +1683,11 @@ export function resolveDashboardIntent(
       };
     }
     // No specific item found, try any raw food
-    const anyRaw = inventoryEntries.find((e) =>
-      e.item?.itemId?.startsWith("raw_"),
-    );
+    const anyRaw = inventoryEntries.find((e) => e.itemId.startsWith("raw_"));
     if (anyRaw) {
       return {
         command: "cook",
-        data: { itemId: anyRaw.item!.itemId! },
+        data: { itemId: anyRaw.itemId },
         text: `Cooking ${anyRaw.name}.`,
         thought: `Operator requested cooking. Found ${anyRaw.name} in inventory.`,
         targetName: anyRaw.name,
@@ -1820,7 +1862,7 @@ export function resolveDashboardIntent(
       if (bestQuest && bestScore > 0) {
         return {
           command: "questAccept",
-          data: { questId: bestQuest.id },
+          data: { questId: bestQuest.questId },
           text: `Accepting quest "${bestQuest.name}".`,
           thought: `Operator asked to begin quest. Matched "${bestQuest.name}" from available quests.`,
           targetName: bestQuest.name,
@@ -1833,7 +1875,7 @@ export function resolveDashboardIntent(
       const first = startable[0];
       return {
         command: "questAccept",
-        data: { questId: first.id },
+        data: { questId: first.questId },
         text: `Accepting quest "${first.name}".`,
         thought: `Operator asked to begin a quest. No specific match — picking first available: "${first.name}".`,
         targetName: first.name,
diff --git a/packages/server/src/eliza/elizaCoreCompat.ts b/packages/server/src/eliza/elizaCoreCompat.ts
new file mode 100644
index 000000000..dc433b16b
--- /dev/null
+++ b/packages/server/src/eliza/elizaCoreCompat.ts
@@ -0,0 +1,21 @@
+import * as ElizaCore from "@elizaos/core";
+import type { Character, IDatabaseAdapter } from "@elizaos/core";
+
+export type InMemoryDatabaseAdapterLike = IDatabaseAdapter<
+  Record<string, never>
+> & {
+  log?: (params: unknown) => Promise<void>;
+  logs?: unknown[];
+};
+
+type InMemoryDatabaseAdapterCtor = new () => InMemoryDatabaseAdapterLike;
+
+export const InMemoryDatabaseAdapter = (
+  ElizaCore as typeof ElizaCore & {
+    InMemoryDatabaseAdapter: InMemoryDatabaseAdapterCtor;
+  }
+).InMemoryDatabaseAdapter;
+
+export type CharacterWithModelProvider = Character & {
+  modelProvider?: string;
+};
diff --git a/packages/server/src/eliza/llmBehaviorDecision.ts b/packages/server/src/eliza/llmBehaviorDecision.ts
index 224c4aef7..09f4b36d9 100644
--- a/packages/server/src/eliza/llmBehaviorDecision.ts
+++ b/packages/server/src/eliza/llmBehaviorDecision.ts
@@ -647,12 +647,12 @@ export function buildBehaviorDecisionPrompt(
             (q.stageType === "gather" || q.stageType === "interact") &&
             q.stageTarget
           ) {
+            const stageTarget = q.stageTarget;
             const hasItem = fullInv.some(
-              (s) =>
-                s.itemId === q.stageTarget || s.itemId.includes(q.stageTarget),
+              (s) => s.itemId === stageTarget || s.itemId.includes(stageTarget),
             );
             if (!hasItem && q.stageCount && progress < q.stageCount) {
-              line += ` ⚠️ You do NOT have ${q.stageTarget} in inventory — gather/obtain it first!`;
+              line += ` ⚠️ You do NOT have ${stageTarget} in inventory — gather/obtain it first!`;
             }
           }
           return line;
diff --git a/packages/server/src/eliza/managers/AgentBehaviorBridge.ts b/packages/server/src/eliza/managers/AgentBehaviorBridge.ts
index a3ede4265..9108d2da9 100644
--- a/packages/server/src/eliza/managers/AgentBehaviorBridge.ts
+++ b/packages/server/src/eliza/managers/AgentBehaviorBridge.ts
@@ -583,6 +583,7 @@ export class AgentBehaviorBridge {
         resourceSystemAvailable,
         spawnAnchors: [],
         worldResources: [],
+        stationPositions: [],
         agentState: {
           goal: instance.goal,
           questsAccepted: Array.from(instance.questsAccepted),
diff --git a/packages/server/src/eliza/managers/AgentBehaviorTicker.ts b/packages/server/src/eliza/managers/AgentBehaviorTicker.ts
index 61c4c7e52..0581bca7d 100644
--- a/packages/server/src/eliza/managers/AgentBehaviorTicker.ts
+++ b/packages/server/src/eliza/managers/AgentBehaviorTicker.ts
@@ -311,11 +311,18 @@ export class AgentBehaviorTicker {
     // QuestSystem can load the player's quest state from the database.
     // Additional stagger offset prevents simultaneous first ticks.
     instance.behaviorStartTimeout = setTimeout(() => {
-      instance.behaviorStartTimeout = null;
+      const current = this.getAgent(characterId);
+      if (!current || current.state !== "running") {
+        return;
+      }
+      current.behaviorStartTimeout = null;
+      if (!current.service.isAutonomousEnabled()) {
+        return;
+      }
       void runTick();
 
       // Start the recurring interval AFTER the first tick completes its stagger
-      instance.behaviorInterval = setInterval(() => {
+      current.behaviorInterval = setInterval(() => {
         if (tickInProgress) return;
         tickInProgress = true;
         void runTick();
@@ -2300,6 +2307,41 @@ export class AgentBehaviorTicker {
     return null;
   }
 
+  private getRequiredWoodcuttingLevel(entity: NearbyEntityData): number {
+    return this.getRequiredWoodcuttingLevelFromText(
+      `${entity.name || ""} ${entity.resourceType || ""} ${entity.resourceId || ""}`,
+    );
+  }
+
+  private getRequiredWoodcuttingLevelFromData(
+    data: Record<string, unknown>,
+  ): number {
+    return this.getRequiredWoodcuttingLevelFromText(
+      `${String(data.name || "")} ${String(data.resourceType || "")} ${String(data.type || "")}`,
+    );
+  }
+
+  private getRequiredWoodcuttingLevelFromText(text: string): number {
+    const normalized = text.toLowerCase();
+    if (normalized.includes("magic")) return 75;
+    if (normalized.includes("yew")) return 60;
+    if (normalized.includes("maple")) return 45;
+    if (normalized.includes("teak")) return 35;
+    if (normalized.includes("willow")) return 30;
+    if (normalized.includes("oak")) return 15;
+    return 1;
+  }
+
+  private isActivelyGatheringResource(
+    instance: AgentInstance,
+    resourceId: string,
+  ): boolean {
+    return (
+      instance.lastGatherTargetId === resourceId &&
+      Date.now() - instance.lastGatherQueuedAt < 30_000
+    );
+  }
+
   /**
    * Map quest gather targets to resource keywords that match world entities.
    * Quest targets use item IDs (e.g., "logs", "raw_shrimp", "copper_ore")
diff --git a/packages/server/src/eliza/plugins/localOllama.ts b/packages/server/src/eliza/plugins/localOllama.ts
new file mode 100644
index 000000000..3f0385d24
--- /dev/null
+++ b/packages/server/src/eliza/plugins/localOllama.ts
@@ -0,0 +1,514 @@
+/**
+ * Local Ollama plugin shim for AI SDK v5 compatibility.
+ *
+ * Replaces `@elizaos/plugin-ollama@2.0.0-alpha.70` which bundles
+ * `ollama-ai-provider@^1.2.0` (implements AI SDK spec v1). Our server
+ * uses `ai@^6.0.97` which is AI SDK v5 and requires spec v2 models.
+ * Loading the upstream plugin succeeds at import time but every model
+ * call fails at runtime with:
+ *
+ *   Unsupported model version v1 for provider "ollama.chat"
+ *   Unsupported model version v1 for provider "ollama.embedding"
+ *
+ * This shim re-implements the same Plugin surface using
+ * `ollama-ai-provider-v2@^3.5.0` which implements spec v2 and is
+ * peer-compatible with `ai@^6.0.0`. Drop this file (and revert the
+ * import-path change in AgentManager.ts) once upstream plugin-ollama
+ * ships a v2-compatible alpha.
+ *
+ * Interface parity: the exported `ollamaPlugin` matches the shape of
+ * `@elizaos/plugin-ollama@2.0.0-alpha.70`'s `ollamaPlugin` (name,
+ * description, config, init, models.{TEXT_EMBEDDING,TEXT_SMALL,
+ * TEXT_LARGE,OBJECT_SMALL,OBJECT_LARGE}), so dropping this in via
+ * AgentManager with the same provider record is transparent to the
+ * ElizaOS runtime.
+ */
+
+import {
+  ModelType,
+  type IAgentRuntime,
+  type JsonValue,
+  type Plugin,
+} from "@elizaos/core";
+import type { JSONObject } from "@ai-sdk/provider";
+import { embed, generateObject, generateText } from "ai";
+import { createOllama, type OllamaProvider } from "ollama-ai-provider-v2";
+
+const DEFAULT_OLLAMA_URL = "http://localhost:11434";
+const DEFAULT_SMALL_MODEL = "gemma3:latest";
+const DEFAULT_LARGE_MODEL = "gemma3:latest";
+const DEFAULT_EMBEDDING_MODEL = "nomic-embed-text:latest";
+
+// 1536 is the OpenAI-style embedding size used as the error-path default by
+// @elizaos/plugin-ollama. Keep it so downstream code that assumes a fixed
+// length on the error path (e.g. vector DB inserts) does not break.
+const EMBEDDING_ERROR_FALLBACK_SIZE = 1536;
+
+// Rough char→token ratio (4 chars ≈ 1 token). Used to truncate embedding
+// input to the 8k-token context most local embedding models expect.
+const CHARS_PER_TOKEN_ESTIMATE = 4;
+const MAX_EMBEDDING_TOKENS = 8000;
+
+function getEnvValue(key: string): string | undefined {
+  if (typeof process === "undefined" || !process.env) return undefined;
+  const v = process.env[key];
+  return v === undefined ? undefined : String(v);
+}
+
+function getSetting(
+  runtime: IAgentRuntime,
+  key: string,
+  defaultValue?: string,
+): string | undefined {
+  const v = runtime.getSetting(key);
+  if (v !== undefined && v !== null) return String(v);
+  return getEnvValue(key) ?? defaultValue;
+}
+
+/**
+ * Base URL including `/api` suffix — matches the convention used by
+ * `@elizaos/plugin-ollama`, so values in OLLAMA_API_ENDPOINT work
+ * unchanged when switching from the upstream plugin to this shim.
+ */
+function getBaseURL(runtime: IAgentRuntime): string {
+  const apiEndpoint =
+    getSetting(runtime, "OLLAMA_API_ENDPOINT") ||
+    getSetting(runtime, "OLLAMA_API_URL") ||
+    DEFAULT_OLLAMA_URL;
+  if (!apiEndpoint.endsWith("/api")) {
+    return apiEndpoint.endsWith("/")
+      ? `${apiEndpoint}api`
+      : `${apiEndpoint}/api`;
+  }
+  return apiEndpoint;
+}
+
+function getApiBase(runtime: IAgentRuntime): string {
+  const baseURL = getBaseURL(runtime);
+  return baseURL.endsWith("/api") ? baseURL.slice(0, -4) : baseURL;
+}
+
+function getSmallModel(runtime: IAgentRuntime): string {
+  return (
+    getSetting(runtime, "OLLAMA_SMALL_MODEL") ||
+    getSetting(runtime, "SMALL_MODEL") ||
+    DEFAULT_SMALL_MODEL
+  );
+}
+
+function getLargeModel(runtime: IAgentRuntime): string {
+  return (
+    getSetting(runtime, "OLLAMA_LARGE_MODEL") ||
+    getSetting(runtime, "LARGE_MODEL") ||
+    DEFAULT_LARGE_MODEL
+  );
+}
+
+function getEmbeddingModel(runtime: IAgentRuntime): string {
+  return (
+    getSetting(runtime, "OLLAMA_EMBEDDING_MODEL") || DEFAULT_EMBEDDING_MODEL
+  );
+}
+
+/**
+ * Attempt to /api/show the model; if Ollama returns 404, /api/pull it.
+ * Matches the upstream plugin's ensureModelAvailable() behaviour so
+ * boxes without pre-pulled models still work on first call. Silently
+ * swallows errors (logged) — actual model calls later will re-surface
+ * any real failure.
+ */
+async function ensureModelAvailable(
+  model: string,
+  providedBaseURL?: string,
+  customFetch?: typeof fetch,
+): Promise<void> {
+  const baseURL = providedBaseURL || `${DEFAULT_OLLAMA_URL}/api`;
+  const apiBase = baseURL.endsWith("/api") ? baseURL.slice(0, -4) : baseURL;
+  const fetcher = customFetch ?? fetch;
+  try {
+    const showRes = await fetcher(`${apiBase}/api/show`, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ model }),
+    });
+    if (showRes.ok) return;
+    console.info(`[local-ollama] Model ${model} not found locally, pulling...`);
+    const pullRes = await fetcher(`${apiBase}/api/pull`, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ model, stream: false }),
+    });
+    if (!pullRes.ok) {
+      console.error(
+        `[local-ollama] Failed to pull ${model}: ${pullRes.statusText}`,
+      );
+    } else {
+      console.info(`[local-ollama] Downloaded model ${model}`);
+    }
+  } catch (err) {
+    console.error("[local-ollama] Error ensuring model availability:", err);
+  }
+}
+
+function getRuntimeFetch(runtime: IAgentRuntime): typeof fetch | undefined {
+  // `runtime.fetch` is an optional field on IAgentRuntime in some alpha
+  // versions. Narrow at runtime to avoid TS-breaking the union.
+  return (runtime as unknown as { fetch?: typeof fetch }).fetch;
+}
+
+function getRuntimeSystemPrompt(runtime: IAgentRuntime): string | undefined {
+  return (runtime as unknown as { character?: { system?: string } }).character
+    ?.system;
+}
+
+function createProvider(runtime: IAgentRuntime): OllamaProvider {
+  return createOllama({
+    baseURL: getBaseURL(runtime),
+    fetch: getRuntimeFetch(runtime),
+  });
+}
+
+// ----------------------------------------------------------------------------
+// Model handlers
+// ----------------------------------------------------------------------------
+
+async function handleTextEmbedding(
+  runtime: IAgentRuntime,
+  params: unknown,
+): Promise<number[]> {
+  try {
+    const baseURL = getBaseURL(runtime);
+    const customFetch = getRuntimeFetch(runtime);
+    const provider = createProvider(runtime);
+    const modelName = getEmbeddingModel(runtime);
+    console.log(`[local-ollama] TEXT_EMBEDDING model=${modelName}`);
+    await ensureModelAvailable(modelName, baseURL, customFetch);
+
+    let text =
+      typeof params === "string"
+        ? params
+        : (params as { text?: string } | null | undefined)?.text || "";
+    const maxChars = MAX_EMBEDDING_TOKENS * CHARS_PER_TOKEN_ESTIMATE;
+    if (text.length > maxChars) {
+      console.warn(
+        `[local-ollama] Embedding input too long (~${Math.ceil(
+          text.length / CHARS_PER_TOKEN_ESTIMATE,
+        )} tokens), truncating to ~${MAX_EMBEDDING_TOKENS} tokens`,
+      );
+      text = text.slice(0, maxChars);
+    }
+    // `embed` requires a non-empty string; fall back to a placeholder so the
+    // error path still returns something usable.
+    const embeddingText = text || "test";
+    try {
+      const { embedding } = await embed({
+        model: provider.embedding(modelName),
+        value: embeddingText,
+      });
+      return embedding;
+    } catch (err) {
+      console.error("[local-ollama] Error generating embedding:", err);
+      return new Array<number>(EMBEDDING_ERROR_FALLBACK_SIZE).fill(0);
+    }
+  } catch (err) {
+    console.error("[local-ollama] Error in TEXT_EMBEDDING model:", err);
+    return new Array<number>(EMBEDDING_ERROR_FALLBACK_SIZE).fill(0);
+  }
+}
+
+type TextGenerationParams = {
+  prompt: string;
+  system?: string;
+  temperature?: number;
+  maxOutputTokens?: number;
+  frequencyPenalty?: number;
+  presencePenalty?: number;
+  stopSequences?: string[];
+};
+
+async function generateOllamaText(
+  provider: OllamaProvider,
+  modelName: string,
+  params: TextGenerationParams,
+): Promise<string> {
+  try {
+    // Ollama's native /api/chat accepts stop sequences and a single
+    // `repeat_penalty` multiplier, not separate presence/frequency penalties
+    // or a top-level `stopSequences` array. ai@6 / the v2 provider exposes
+    // the Ollama-native knobs via `providerOptions.ollama.options.*`, so we
+    // route the params through that path. Keeping them at the top level
+    // would produce "feature setting not supported" warnings on every call
+    // and (more importantly) silently drop the values.
+    //
+    // `repeat_penalty` maps roughly onto the AI SDK's penalty concept:
+    // Ollama's default is 1.1, neutral is 1.0. We average the caller's
+    // presence+frequency signal and offset from the neutral baseline so
+    // that the upstream plugin's 0.7/0.7 defaults map to a sensible ~1.1.
+    const ollamaOptions: JSONObject = {};
+    if (typeof params.temperature === "number") {
+      ollamaOptions.temperature = params.temperature;
+    }
+    if (typeof params.maxOutputTokens === "number") {
+      ollamaOptions.num_predict = params.maxOutputTokens;
+    }
+    if (params.stopSequences && params.stopSequences.length > 0) {
+      ollamaOptions.stop = params.stopSequences;
+    }
+    const penaltySignal =
+      ((params.frequencyPenalty ?? 0) + (params.presencePenalty ?? 0)) / 2;
+    if (penaltySignal !== 0) {
+      ollamaOptions.repeat_penalty = 1 + penaltySignal * 0.2;
+    }
+
+    const providerOptions: Record<string, JSONObject> | undefined =
+      Object.keys(ollamaOptions).length > 0
+        ? {
+            ollama: {
+              options: ollamaOptions,
+            },
+          }
+        : undefined;
+
+    const { text } = await generateText({
+      model: provider(modelName),
+      prompt: params.prompt,
+      system: params.system,
+      // Keep top-level temperature + maxOutputTokens for transparency in
+      // other providers if the same handler is ever reused; the v2 Ollama
+      // provider honours `providerOptions.ollama.options.*` as the
+      // primary source of truth.
+      temperature: params.temperature,
+      maxOutputTokens: params.maxOutputTokens,
+      providerOptions,
+    });
+    return text;
+  } catch (err) {
+    console.error("[local-ollama] Error in generateOllamaText:", err);
+    return "Error generating text. Please try again later.";
+  }
+}
+
+async function handleTextSmall(
+  runtime: IAgentRuntime,
+  { prompt, stopSequences = [] }: { prompt: string; stopSequences?: string[] },
+): Promise<string> {
+  try {
+    // Defaults mirror @elizaos/plugin-ollama@2.0.0-alpha.70's handleTextSmall.
+    const temperature = 0.7;
+    const frequencyPenalty = 0.7;
+    const presencePenalty = 0.7;
+    const maxOutputTokens = 8000;
+
+    const baseURL = getBaseURL(runtime);
+    const customFetch = getRuntimeFetch(runtime);
+    const provider = createProvider(runtime);
+    const model = getSmallModel(runtime);
+    console.log(`[local-ollama] TEXT_SMALL model=${model}`);
+    await ensureModelAvailable(model, baseURL, customFetch);
+
+    return await generateOllamaText(provider, model, {
+      prompt,
+      system: getRuntimeSystemPrompt(runtime),
+      temperature,
+      maxOutputTokens,
+      frequencyPenalty,
+      presencePenalty,
+      stopSequences,
+    });
+  } catch (err) {
+    console.error("[local-ollama] Error in TEXT_SMALL model:", err);
+    return "Error generating text. Please try again later.";
+  }
+}
+
+async function handleTextLarge(
+  runtime: IAgentRuntime,
+  {
+    prompt,
+    stopSequences = [],
+    maxTokens = 8192,
+    temperature = 0.7,
+    frequencyPenalty = 0.7,
+    presencePenalty = 0.7,
+  }: {
+    prompt: string;
+    stopSequences?: string[];
+    maxTokens?: number;
+    temperature?: number;
+    frequencyPenalty?: number;
+    presencePenalty?: number;
+  },
+): Promise<string> {
+  try {
+    const model = getLargeModel(runtime);
+    const baseURL = getBaseURL(runtime);
+    const customFetch = getRuntimeFetch(runtime);
+    const provider = createProvider(runtime);
+    console.log(`[local-ollama] TEXT_LARGE model=${model}`);
+    await ensureModelAvailable(model, baseURL, customFetch);
+
+    return await generateOllamaText(provider, model, {
+      prompt,
+      system: getRuntimeSystemPrompt(runtime),
+      temperature,
+      // AI SDK v5 renamed `maxTokens` → `maxOutputTokens`; upstream callers
+      // still pass `maxTokens` so we translate here and keep the public
+      // handler signature compatible.
+      maxOutputTokens: maxTokens,
+      frequencyPenalty,
+      presencePenalty,
+      stopSequences,
+    });
+  } catch (err) {
+    console.error("[local-ollama] Error in TEXT_LARGE model:", err);
+    return "Error generating text. Please try again later.";
+  }
+}
+
+type ObjectGenerationParams = {
+  prompt: string;
+  temperature?: number;
+};
+
+// ElizaOS's Plugin type requires OBJECT_* handlers to return a
+// Record<string, JsonValue>. generateObject with output: "no-schema"
+// returns `unknown`, so we coerce to the ElizaOS-compatible record type
+// here; the runtime only ever stringifies this back out, so a permissive
+// cast is safe.
+type JsonObject = Record<string, JsonValue>;
+
+async function generateOllamaObject(
+  provider: OllamaProvider,
+  modelName: string,
+  params: ObjectGenerationParams,
+): Promise<JsonObject> {
+  try {
+    const { object } = await generateObject({
+      model: provider(modelName),
+      output: "no-schema",
+      prompt: params.prompt,
+      temperature: params.temperature,
+    });
+    if (object && typeof object === "object" && !Array.isArray(object)) {
+      return object as JsonObject;
+    }
+    return {};
+  } catch (err) {
+    console.error("[local-ollama] Error generating object:", err);
+    return {};
+  }
+}
+
+async function handleObjectSmall(
+  runtime: IAgentRuntime,
+  params: ObjectGenerationParams,
+): Promise<JsonObject> {
+  try {
+    const baseURL = getBaseURL(runtime);
+    const customFetch = getRuntimeFetch(runtime);
+    const provider = createProvider(runtime);
+    const model = getSmallModel(runtime);
+    console.log(`[local-ollama] OBJECT_SMALL model=${model}`);
+    await ensureModelAvailable(model, baseURL, customFetch);
+    return await generateOllamaObject(provider, model, params);
+  } catch (err) {
+    console.error("[local-ollama] Error in OBJECT_SMALL model:", err);
+    return {};
+  }
+}
+
+async function handleObjectLarge(
+  runtime: IAgentRuntime,
+  params: ObjectGenerationParams,
+): Promise<JsonObject> {
+  try {
+    const baseURL = getBaseURL(runtime);
+    const customFetch = getRuntimeFetch(runtime);
+    const provider = createProvider(runtime);
+    const model = getLargeModel(runtime);
+    console.log(`[local-ollama] OBJECT_LARGE model=${model}`);
+    await ensureModelAvailable(model, baseURL, customFetch);
+    return await generateOllamaObject(provider, model, params);
+  } catch (err) {
+    console.error("[local-ollama] Error in OBJECT_LARGE model:", err);
+    return {};
+  }
+}
+
+// ----------------------------------------------------------------------------
+// Plugin export
+// ----------------------------------------------------------------------------
+
+export const ollamaPlugin: Plugin = {
+  name: "ollama-local-shim",
+  description:
+    "Local Ollama plugin shim using ollama-ai-provider-v2 for AI SDK v5 compatibility",
+  config: {
+    OLLAMA_API_ENDPOINT: process.env.OLLAMA_API_ENDPOINT ?? null,
+    OLLAMA_SMALL_MODEL: process.env.OLLAMA_SMALL_MODEL ?? null,
+    OLLAMA_MEDIUM_MODEL: process.env.OLLAMA_MEDIUM_MODEL ?? null,
+    OLLAMA_LARGE_MODEL: process.env.OLLAMA_LARGE_MODEL ?? null,
+    OLLAMA_EMBEDDING_MODEL: process.env.OLLAMA_EMBEDDING_MODEL ?? null,
+  },
+  async init(_config: unknown, runtime: IAgentRuntime): Promise<void> {
+    const apiBase = getApiBase(runtime);
+    const baseURL = getBaseURL(runtime);
+    if (!baseURL || baseURL === `${DEFAULT_OLLAMA_URL}/api`) {
+      const endpoint = runtime.getSetting("OLLAMA_API_ENDPOINT");
+      if (!endpoint) {
+        console.warn(
+          "[local-ollama] OLLAMA_API_ENDPOINT not set, using default localhost:11434",
+        );
+      }
+    }
+    try {
+      const response = await fetch(`${apiBase}/api/tags`, {
+        method: "GET",
+        headers: { "Content-Type": "application/json" },
+      });
+      if (!response.ok) {
+        console.warn(
+          `[local-ollama] Ollama API validation failed: ${response.statusText}`,
+        );
+      } else {
+        console.log(
+          `[local-ollama] Ollama API reachable at ${apiBase} (plugin shim active)`,
+        );
+      }
+    } catch (err) {
+      const msg = err instanceof Error ? err.message : String(err);
+      console.warn(`[local-ollama] Ollama API validation error: ${msg}`);
+    }
+  },
+  models: {
+    [ModelType.TEXT_EMBEDDING]: async (
+      runtime: IAgentRuntime,
+      params: unknown,
+    ) => handleTextEmbedding(runtime, params),
+    [ModelType.TEXT_SMALL]: async (
+      runtime: IAgentRuntime,
+      params: { prompt: string; stopSequences?: string[] },
+    ) => handleTextSmall(runtime, params),
+    [ModelType.TEXT_LARGE]: async (
+      runtime: IAgentRuntime,
+      params: {
+        prompt: string;
+        stopSequences?: string[];
+        maxTokens?: number;
+        temperature?: number;
+        frequencyPenalty?: number;
+        presencePenalty?: number;
+      },
+    ) => handleTextLarge(runtime, params),
+    [ModelType.OBJECT_SMALL]: async (
+      runtime: IAgentRuntime,
+      params: ObjectGenerationParams,
+    ) => handleObjectSmall(runtime, params),
+    [ModelType.OBJECT_LARGE]: async (
+      runtime: IAgentRuntime,
+      params: ObjectGenerationParams,
+    ) => handleObjectLarge(runtime, params),
+  },
+};
+
+export default ollamaPlugin;
diff --git a/packages/server/src/eliza/types.ts b/packages/server/src/eliza/types.ts
index e5684f470..90584511d 100644
--- a/packages/server/src/eliza/types.ts
+++ b/packages/server/src/eliza/types.ts
@@ -36,6 +36,7 @@ export interface AgentCharacterConfig {
   username?: string;
   system?: string;
   bio?: string[];
+  lore?: string[];
   topics?: string[];
   adjectives?: string[];
   plugins?: string[];
@@ -122,6 +123,7 @@ export interface NearbyEntityData {
   level?: number;
   mobType?: string;
   itemId?: string;
+  resourceId?: string;
   resourceType?: string;
   equippedWeapon?: string;
 }
@@ -205,6 +207,7 @@ export interface AgentQuestProgress {
  */
 export interface AgentQuestInfo {
   questId: string;
+  id?: string;
   name: string;
   description: string;
   difficulty: string;
@@ -226,6 +229,9 @@ export interface AgentQuestInfo {
  * Provides direct world access instead of WebSocket
  */
 export interface IEmbeddedHyperscapeService {
+  /** Update the agent display name used by dashboard/chat surfaces. */
+  setDisplayName(name: string): void;
+
   /** Get the world instance */
   getWorld(): World;
 
@@ -271,6 +277,12 @@ export interface IEmbeddedHyperscapeService {
   /** Execute a prayer toggle command. Returns false if the prayer system was unavailable. */
   executePrayer(prayerId: string): Promise<boolean>;
 
+  /** Execute a prayer toggle command against the embedded client action API. */
+  executePrayerToggle(prayerId: string): Promise<boolean>;
+
+  /** Execute a combat style change against the embedded client action API. */
+  executeChangeStyle(newStyle: string): Promise<boolean>;
+
   /** Execute a chat message command. Returns false if the chat system was unavailable. */
   executeChat(message: string): Promise<boolean>;
 
@@ -324,4 +336,13 @@ export interface IEmbeddedHyperscapeService {
 
   /** Remove the arena movement constraint set by setArenaBounds(). */
   clearArenaBounds(): void;
+
+  /** Enable or disable autonomous overworld behavior while an external controller owns the agent. */
+  setAutonomousBehaviorEnabled(enabled: boolean): void;
+
+  /** Whether autonomous overworld behavior is currently enabled. */
+  isAutonomousEnabled(): boolean;
+
+  /** Send an overhead chat message through the embedded client bridge. */
+  sendChatMessage(text: string): Promise<string>;
 }
diff --git a/packages/server/src/main.ts b/packages/server/src/main.ts
index 69b3a1af8..a108d82e8 100644
--- a/packages/server/src/main.ts
+++ b/packages/server/src/main.ts
@@ -25,6 +25,7 @@ import { getDuelArenaOracleConfig } from "./oracle/config.js";
 
 // Import stream capture pipeline
 import { initStreamCapture } from "./streaming/stream-capture.js";
+import { startHlsCdnSync } from "./streaming/hls-cdn-sync.js";
 
 // Import memory monitoring infrastructure
 import {
@@ -129,6 +130,12 @@ async function startServer() {
         errMsg(err),
       );
     }
+  } else if (streamingDuelEnabled) {
+    // Streaming duels run but no on-chain oracle will publish results.
+    // Flag this loudly — operators otherwise don't notice revenue is off.
+    console.warn(
+      "[Server] ⚠️ STREAMING_DUEL_ENABLED=true but DUEL_ARENA_ORACLE_ENABLED=false — duel results will NOT be published on-chain (no hyperbet settlement).",
+    );
   }
 
   // Step 3b: Initialize Web3 (EVM chain writer) if enabled
@@ -207,7 +214,9 @@ async function startServer() {
       | { db?: unknown; getDb?: () => unknown }
       | undefined;
     const db = dbSystem?.db ?? dbSystem?.getDb?.();
-    if (db) setThoughtDb(db);
+    if (db) {
+      setThoughtDb(db as Parameters<typeof setThoughtDb>[0]);
+    }
   } catch {
     // Non-critical — thoughts will stay in-memory only
   }
@@ -249,6 +258,17 @@ async function startServer() {
         errMsg(err),
       );
     }
+
+    // Start HLS CDN sync if configured (uploads segments to R2/S3)
+    try {
+      const hlsCdnUrl = startHlsCdnSync();
+      if (hlsCdnUrl) {
+        (world as World & { hlsCdnStreamUrl?: string }).hlsCdnStreamUrl =
+          hlsCdnUrl;
+      }
+    } catch (err) {
+      console.error("[Server] ⚠️ HLS CDN sync failed to start:", errMsg(err));
+    }
   }
 
   // Register shutdown handlers
diff --git a/packages/server/src/middleware/csrf.ts b/packages/server/src/middleware/csrf.ts
index 597c5778d..d1de0dc02 100644
--- a/packages/server/src/middleware/csrf.ts
+++ b/packages/server/src/middleware/csrf.ts
@@ -57,17 +57,36 @@ const SAFE_METHODS = new Set(["GET", "HEAD", "OPTIONS"]);
  */
 const KNOWN_CROSS_ORIGIN_PATTERNS = [
   /^https?:\/\/(localhost|127\.0\.0\.1|192\.168\.\d+\.\d+|10\.\d+\.\d+\.\d+)(:\d+)?$/,
-  /^https?:\/\/(www\.)?hyperscape\.gg$/,
-  /^https?:\/\/(www\.)?hyperbet\.win$/,
-  /^https?:\/\/(www\.)?bsc\.hyperbet\.win$/,
-  /^https?:\/\/(www\.)?hyperscape-betting\.pages\.dev$/,
-  /^https?:\/\/.+\.hyperscape-betting\.pages\.dev$/,
-  /^https?:\/\/.+\.hyperbet\.pages\.dev$/,
-  /^https?:\/\/.+\.hyperbet-solana\.pages\.dev$/,
-  /^https?:\/\/.+\.hyperbet-bsc\.pages\.dev$/,
-  /^https?:\/\/.+\.hyperscape\.pages\.dev$/,
+  /^https:\/\/(www\.)?hyperscape\.gg$/,
+  /^https:\/\/(www\.)?hyperbet\.win$/,
+  /^https:\/\/(www\.)?bsc\.hyperbet\.win$/,
+  /^https:\/\/(www\.)?hyperscape-betting\.pages\.dev$/,
+  /^https:\/\/.+\.hyperscape-betting\.pages\.dev$/,
+  /^https:\/\/.+\.hyperbet\.pages\.dev$/,
+  /^https:\/\/.+\.hyperscape\.pages\.dev$/,
 ];
 
+function hasRequestCookie(request: FastifyRequest): boolean {
+  return (
+    typeof request.headers.cookie === "string" &&
+    request.headers.cookie.trim().length > 0
+  );
+}
+
+function hasStructuredAuthorizationHeader(request: FastifyRequest): boolean {
+  const authorization = request.headers.authorization;
+  const value = Array.isArray(authorization) ? authorization[0] : authorization;
+  return (
+    typeof value === "string" && /^(?:Bearer|Basic)\s+\S+$/i.test(value.trim())
+  );
+}
+
+function hasStructuredAdminCodeHeader(request: FastifyRequest): boolean {
+  const adminCode = request.headers["x-admin-code"];
+  const value = Array.isArray(adminCode) ? adminCode[0] : adminCode;
+  return typeof value === "string" && value.trim().length > 0;
+}
+
 /**
  * Generate a cryptographically secure CSRF token
  */
@@ -78,7 +97,7 @@ function generateCsrfToken(): string {
 /**
  * Check if a request should skip CSRF validation
  */
-function shouldSkipCsrf(request: FastifyRequest): boolean {
+export function shouldSkipCsrf(request: FastifyRequest): boolean {
   // Safe methods don't need CSRF protection
   if (SAFE_METHODS.has(request.method)) {
     return true;
@@ -94,14 +113,19 @@ function shouldSkipCsrf(request: FastifyRequest): boolean {
     return true;
   }
 
-  // API clients with Authorization header (Bearer token, API key, etc.)
-  // These are already authenticated via a different mechanism
-  if (request.headers.authorization) {
+  const requestHasCookies = hasRequestCookie(request);
+
+  // API clients with Authorization header are authenticated via a different
+  // mechanism only when the request is not also carrying ambient cookies.
+  // Otherwise a forged Authorization header could bypass CSRF while session
+  // cookies still authenticate the route.
+  if (hasStructuredAuthorizationHeader(request) && !requestHasCookies) {
     return true;
   }
 
-  // Admin requests with X-Admin-Code are already authenticated
-  if (request.headers["x-admin-code"]) {
+  // Same rule for admin-code clients: the header must be structurally present,
+  // and cookie-bearing browser requests still need the CSRF token.
+  if (hasStructuredAdminCodeHeader(request) && !requestHasCookies) {
     return true;
   }
 
diff --git a/packages/server/src/oracle/DuelArenaOraclePublisher.ts b/packages/server/src/oracle/DuelArenaOraclePublisher.ts
index e4bb03c85..7e5677940 100644
--- a/packages/server/src/oracle/DuelArenaOraclePublisher.ts
+++ b/packages/server/src/oracle/DuelArenaOraclePublisher.ts
@@ -556,6 +556,20 @@ export class DuelArenaOraclePublisher {
   private readonly solanaTargets: SolanaOracleTarget[];
   private persistQueue: Promise<void> = Promise.resolve();
 
+  /** Exponential backoff delays for retrying failed chain publishes.
+   *  Keeping this bounded prevents unbounded queues if a provider is truly down
+   *  while still giving transient RPC hiccups (~1 minute window) a chance to
+   *  resolve. Total budget ≈ 54.5s across 5 attempts. */
+  private static readonly RETRY_DELAYS_MS = [1000, 2500, 6000, 15000, 30000];
+
+  /** Pending retry timers keyed by `${duelId}:${targetKey}`. A single pending
+   *  retry per (duel, target) is kept — fresh publishes supersede it so we
+   *  never send stale state after a newer one. Cleared on destroy(). */
+  private readonly retryTimers = new Map<
+    string,
+    ReturnType<typeof setTimeout>
+  >();
+
   public constructor(
     private readonly world: World,
     private readonly config: DuelArenaOracleConfig,
@@ -579,6 +593,10 @@ export class DuelArenaOraclePublisher {
       metadataBaseUrl: this.config.metadataBaseUrl,
       storePath: this.config.storePath,
     });
+    // Any record that was mid-retry when the process crashed is stranded
+    // with chainState.lastError != null and no timer in memory. Re-queue it
+    // so revenue doesn't leak just because the server restarted.
+    this.requeueFailedPublishesOnBoot();
   }
 
   public destroy(): void {
@@ -586,12 +604,177 @@ export class DuelArenaOraclePublisher {
       this.world.off(event, handler);
     }
     this.listeners.length = 0;
+    // Cancel any pending publish retries so they don't fire after teardown.
+    for (const timer of this.retryTimers.values()) {
+      clearTimeout(timer);
+    }
+    this.retryTimers.clear();
   }
 
   public getRecord(duelId: string): DuelArenaOracleRecord | null {
     return this.records.get(duelId) ?? null;
   }
 
+  /**
+   * Records with at least one configured target in a failed state (lastError
+   * set, lastTxHash null). Used by the admin "stuck records" endpoint so
+   * operators can triage duels that exhausted their retry budget and need
+   * human confirmation before off-chain settlement.
+   */
+  public getStuckRecords(): Array<{
+    duelId: string;
+    status: DuelArenaOracleStatus;
+    winnerId: string | null;
+    loserId: string | null;
+    updatedAt: string;
+    stuckTargets: Array<{
+      target: DuelArenaOracleChainKey;
+      label: string;
+      lastAction: "UPSERT" | "RESOLVE" | "CANCEL" | null;
+      lastError: string;
+      updatedAt: string;
+    }>;
+  }> {
+    const results: Array<{
+      duelId: string;
+      status: DuelArenaOracleStatus;
+      winnerId: string | null;
+      loserId: string | null;
+      updatedAt: string;
+      stuckTargets: Array<{
+        target: DuelArenaOracleChainKey;
+        label: string;
+        lastAction: "UPSERT" | "RESOLVE" | "CANCEL" | null;
+        lastError: string;
+        updatedAt: string;
+      }>;
+    }> = [];
+
+    for (const record of this.records.values()) {
+      const stuckTargets: Array<{
+        target: DuelArenaOracleChainKey;
+        label: string;
+        lastAction: "UPSERT" | "RESOLVE" | "CANCEL" | null;
+        lastError: string;
+        updatedAt: string;
+      }> = [];
+      for (const [key, state] of Object.entries(record.chainState ?? {})) {
+        if (!state || state.lastError == null) continue;
+        stuckTargets.push({
+          target: key as DuelArenaOracleChainKey,
+          label: state.label,
+          lastAction: state.lastAction,
+          lastError: state.lastError,
+          updatedAt: state.updatedAt,
+        });
+      }
+      if (stuckTargets.length > 0) {
+        results.push({
+          duelId: record.duelId,
+          status: record.status,
+          winnerId: record.winnerId,
+          loserId: record.loserId,
+          updatedAt: record.updatedAt,
+          stuckTargets,
+        });
+      }
+    }
+
+    // Newest-first so operators see recent problems at the top.
+    results.sort((left, right) =>
+      right.updatedAt.localeCompare(left.updatedAt),
+    );
+    return results;
+  }
+
+  /**
+   * Operator-triggered triage for a stuck record. Always clears lastError on
+   * every currently-stuck target so the scheduler stops treating it as an
+   * open problem. When `forceRetry` is true, also fires a fresh publish
+   * attempt (attempt=0 → full retry budget) for each cleared target —
+   * useful when operators believe the underlying RPC/contract issue has
+   * resolved and want to try settlement again.
+   *
+   * Pending in-memory retry timers for the affected targets are cancelled
+   * so only the fresh attempt runs.
+   */
+  public async clearStuckRecord(
+    duelId: string,
+    options?: { forceRetry?: boolean },
+  ): Promise<{
+    cleared: boolean;
+    reason?: string;
+    targetsCleared: string[];
+    targetsRetried: string[];
+  }> {
+    const record = this.records.get(duelId);
+    if (!record) {
+      return {
+        cleared: false,
+        reason: "not_found",
+        targetsCleared: [],
+        targetsRetried: [],
+      };
+    }
+    const configuredTargets: Array<EvmOracleTarget | SolanaOracleTarget> = [
+      ...this.evmTargets,
+      ...this.solanaTargets,
+    ];
+    const targetByKey = new Map(configuredTargets.map((t) => [t.key, t]));
+
+    const targetsCleared: string[] = [];
+    const targetsRetried: string[] = [];
+
+    for (const [key, state] of Object.entries(record.chainState ?? {})) {
+      if (!state || state.lastError == null) continue;
+      // Cancel any pending retry timer so we don't race with the operator.
+      const retryKey = `${duelId}:${key}`;
+      const timer = this.retryTimers.get(retryKey);
+      if (timer) {
+        clearTimeout(timer);
+        this.retryTimers.delete(retryKey);
+      }
+      state.lastError = null;
+      state.updatedAt = nowIso();
+      targetsCleared.push(key);
+
+      if (options?.forceRetry) {
+        const target = targetByKey.get(key as DuelArenaOracleChainKey);
+        if (!target) continue;
+        const action: "UPSERT" | "RESOLVE" | "CANCEL" =
+          record.status === "RESOLVED"
+            ? "RESOLVE"
+            : record.status === "CANCELLED"
+              ? "CANCEL"
+              : "UPSERT";
+        targetsRetried.push(key);
+        setImmediate(() => {
+          void this.publishToTarget(record, target, action, 0);
+        });
+      }
+    }
+
+    if (targetsCleared.length > 0) {
+      record.updatedAt = nowIso();
+      this.records.set(duelId, record);
+      await this.persistRecords();
+      Logger.info(
+        "DuelArenaOraclePublisher",
+        `Operator cleared stuck record ${duelId} (${targetsCleared.join(", ")})` +
+          (options?.forceRetry
+            ? ` — forcing retry on (${targetsRetried.join(", ")})`
+            : ""),
+      );
+    }
+
+    return {
+      cleared: targetsCleared.length > 0,
+      reason: targetsCleared.length === 0 ? "no_stuck_targets" : undefined,
+      targetsCleared,
+      targetsRetried,
+    };
+  }
+
   public getRecentRecords(limit: number = 50): DuelArenaOracleRecord[] {
     return Array.from(this.records.values())
       .sort((left, right) => right.updatedAt.localeCompare(left.updatedAt))
@@ -771,7 +954,17 @@ export class DuelArenaOraclePublisher {
     record: DuelArenaOracleRecord,
     target: EvmOracleTarget | SolanaOracleTarget,
     action: "UPSERT" | "RESOLVE" | "CANCEL",
+    attempt = 0,
   ): Promise<void> {
+    // Cancel any pending retry timer for this (duel, target) — this call
+    // supersedes it (either we're the retry firing, or a fresh publish).
+    const retryKey = `${record.duelId}:${target.key}`;
+    const existingTimer = this.retryTimers.get(retryKey);
+    if (existingTimer) {
+      clearTimeout(existingTimer);
+      this.retryTimers.delete(retryKey);
+    }
+
     try {
       let txHash: string;
       if (action === "UPSERT") {
@@ -793,6 +986,12 @@ export class DuelArenaOraclePublisher {
         lastError: null,
         updatedAt: nowIso(),
       });
+      if (attempt > 0) {
+        Logger.info(
+          "DuelArenaOraclePublisher",
+          `Oracle publish succeeded on retry ${attempt} for ${record.duelId} on ${target.label} (${action}) txHash=${txHash}`,
+        );
+      }
     } catch (error) {
       let errorMessage = error instanceof Error ? error.message : String(error);
 
@@ -826,7 +1025,105 @@ export class DuelArenaOraclePublisher {
       });
       Logger.warn(
         "DuelArenaOraclePublisher",
-        `Failed oracle publish on ${target.label} (${action}) for ${record.duelId}: ${errorMessage}`,
+        `Failed oracle publish on ${target.label} (${action}) for ${record.duelId} (attempt ${attempt + 1}): ${errorMessage}`,
+      );
+      this.scheduleRetry(record, target, action, attempt + 1);
+    }
+  }
+
+  /**
+   * Schedule a bounded, exponentially-backed-off retry of publishToTarget.
+   *
+   * Retries fire in the background — callers of publishToTarget never wait for
+   * retries. Only one retry is kept in flight per (duelId, targetKey); fresh
+   * publishes supersede pending retries so we never send stale state.
+   */
+  private scheduleRetry(
+    record: DuelArenaOracleRecord,
+    target: EvmOracleTarget | SolanaOracleTarget,
+    action: "UPSERT" | "RESOLVE" | "CANCEL",
+    nextAttempt: number,
+  ): void {
+    const delays = DuelArenaOraclePublisher.RETRY_DELAYS_MS;
+    if (nextAttempt > delays.length) {
+      Logger.error(
+        "DuelArenaOraclePublisher",
+        `Giving up oracle publish for ${record.duelId} on ${target.label} (${action}) after ${nextAttempt} attempts — manual intervention required`,
+      );
+      return;
+    }
+    const delay = delays[nextAttempt - 1];
+    const retryKey = `${record.duelId}:${target.key}`;
+    const timer = setTimeout(() => {
+      this.retryTimers.delete(retryKey);
+      // Re-fetch the latest record so the retry reflects current state.
+      // If the record has since been cancelled/updated, we publish that newer
+      // state instead — the contract flow is monotonic enough that this is
+      // safer than replaying the snapshot we failed on.
+      const latest = this.records.get(record.duelId) ?? record;
+      void this.publishToTarget(latest, target, action, nextAttempt);
+    }, delay);
+    // Don't keep the Node event loop alive purely for a pending retry.
+    if (typeof timer.unref === "function") {
+      timer.unref();
+    }
+    this.retryTimers.set(retryKey, timer);
+    Logger.info(
+      "DuelArenaOraclePublisher",
+      `Scheduled oracle retry ${nextAttempt}/${delays.length} for ${record.duelId} on ${target.label} (${action}) in ${delay}ms`,
+    );
+  }
+
+  /**
+   * Scan persisted records on boot and re-queue any publish that was in a
+   * failed state when the process stopped. Without this, a duel that had a
+   * transient RPC error at shutdown stays stranded forever — the retry
+   * timer lives only in memory and dies with the process.
+   *
+   * We re-queue at attempt=0 (full fresh retry schedule) rather than resuming
+   * from a persisted attempt counter, because the time since the last attempt
+   * is unknown and probably long enough that a fresh backoff is appropriate.
+   */
+  private requeueFailedPublishesOnBoot(): void {
+    const configuredTargets: Array<EvmOracleTarget | SolanaOracleTarget> = [
+      ...this.evmTargets,
+      ...this.solanaTargets,
+    ];
+    if (configuredTargets.length === 0) return;
+
+    let requeued = 0;
+    for (const record of this.records.values()) {
+      // CANCELLED is terminal: if the cancel publish itself failed we still
+      // want it delivered, but any BETTING_OPEN/LOCKED leftover on a cancelled
+      // duel is stale and publishing it now would mislead downstream.
+      if (!record.status) continue;
+
+      const action: "UPSERT" | "RESOLVE" | "CANCEL" =
+        record.status === "RESOLVED"
+          ? "RESOLVE"
+          : record.status === "CANCELLED"
+            ? "CANCEL"
+            : "UPSERT";
+
+      for (const target of configuredTargets) {
+        const state = record.chainState?.[target.key];
+        // lastError null means this target already accepted the publish —
+        // skip. lastError set means it was failed at shutdown, re-queue.
+        if (!state || state.lastError == null) continue;
+        // Fire publishToTarget with attempt=0 so it goes through the normal
+        // retry schedule if it fails again. Doing this on the next tick so
+        // init() returns fast and callers see the publisher as ready.
+        setImmediate(() => {
+          void this.publishToTarget(record, target, action, 0);
+        });
+        requeued++;
+      }
+    }
+
+    if (requeued > 0) {
+      Logger.info(
+        "DuelArenaOraclePublisher",
+        `Re-queued ${requeued} failed oracle publish(es) from persisted records on boot`,
       );
     }
   }
diff --git a/packages/server/src/routes/hyperbet-public-routes.ts b/packages/server/src/routes/hyperbet-public-routes.ts
new file mode 100644
index 000000000..ea9b1402f
--- /dev/null
+++ b/packages/server/src/routes/hyperbet-public-routes.ts
@@ -0,0 +1,350 @@
+/**
+ * HyperBet Public Routes — Unauthenticated/wallet-auth endpoints for external viewers
+ *
+ * These routes serve the HyperBet standalone page where Twitch/YouTube viewers
+ * connect their Solana wallet and bet on duel outcomes.
+ */
+
+import type { FastifyInstance, FastifyRequest, FastifyReply } from "fastify";
+import type { World } from "@hyperscape/shared";
+import { RateLimiterMemory } from "rate-limiter-flexible";
+import { checkWalletSignature } from "./hyperbet-wallet-auth.js";
+import { BettingPoolManager } from "../systems/DuelScheduler/BettingPoolManager.js";
+import { getHlsStreamUrl } from "../streaming/hls-cdn-sync.js";
+
+type DuelBettingBridgeLike = {
+  getActiveMarkets(): Array<{
+    duelId: string;
+    agent1Id: string;
+    agent2Id: string;
+    agent1Name: string;
+    agent2Name: string;
+    status: string;
+    bettingClosesAt: number;
+    createdAt: number;
+  }>;
+  getMarket(duelId: string): {
+    duelId: string;
+    agent1Id: string;
+    agent2Id: string;
+    agent1Name: string;
+    agent2Name: string;
+    status: string;
+    bettingClosesAt: number;
+    createdAt: number;
+    winnerId?: string;
+    winnerSide?: "A" | "B";
+  } | null;
+};
+
+type WorldWithBridge = World & {
+  duelBettingBridge?: DuelBettingBridgeLike;
+  hlsCdnStreamUrl?: string;
+};
+
+/** SSE clients for betting events */
+const sseClients = new Map<number, FastifyReply>();
+let nextSseId = 1;
+const HYPERBET_PUBLIC_WRITE_RATE_LIMIT = {
+  max: 20,
+  timeWindow: "1 minute",
+};
+const HYPERBET_PUBLIC_WRITE_CODEQL_LIMITER = new RateLimiterMemory({
+  points: 20,
+  duration: 60,
+});
+
+export function registerHyperBetPublicRoutes(
+  fastify: FastifyInstance,
+  world: World,
+): void {
+  const poolManager = new BettingPoolManager(world);
+
+  // Store pool manager on world for event handlers
+  (
+    world as World & { bettingPoolManager?: BettingPoolManager }
+  ).bettingPoolManager = poolManager;
+
+  // ========================================================================
+  // GET /api/hyperbet/config — Stream URL + platform config
+  // ========================================================================
+  fastify.get("/api/hyperbet/config", async (_req, reply) => {
+    const streamUrl =
+      (world as WorldWithBridge).hlsCdnStreamUrl || getHlsStreamUrl();
+    return reply.send({
+      streamUrl,
+      bettingEnabled: process.env.DUEL_BETTING_ENABLED === "true",
+      twitchChannel: process.env.TWITCH_CHANNEL || null,
+      youtubeChannelId: process.env.YOUTUBE_CHANNEL_ID || null,
+    });
+  });
+
+  // ========================================================================
+  // GET /api/hyperbet/markets — All active markets
+  // ========================================================================
+  fastify.get("/api/hyperbet/markets", async (_req, reply) => {
+    const bridge = (world as WorldWithBridge).duelBettingBridge;
+    if (!bridge) {
+      return reply.send({ markets: [] });
+    }
+
+    const markets = bridge.getActiveMarkets();
+    const enriched = await Promise.all(
+      markets.map(async (m) => {
+        const pool = await poolManager.getPool(m.duelId);
+        return {
+          duelId: m.duelId,
+          agent1: { id: m.agent1Id, name: m.agent1Name },
+          agent2: { id: m.agent2Id, name: m.agent2Name },
+          status: m.status,
+          bettingClosesAt: m.bettingClosesAt,
+          createdAt: m.createdAt,
+          pool: pool
+            ? {
+                sideATotal: pool.sideATotal,
+                sideBTotal: pool.sideBTotal,
+                sideACount: pool.sideACount,
+                sideBCount: pool.sideBCount,
+              }
+            : null,
+        };
+      }),
+    );
+
+    return reply.send({ markets: enriched });
+  });
+
+  // ========================================================================
+  // GET /api/hyperbet/markets/:duelId — Single market detail
+  // ========================================================================
+  fastify.get<{ Params: { duelId: string } }>(
+    "/api/hyperbet/markets/:duelId",
+    async (req, reply) => {
+      const bridge = (world as WorldWithBridge).duelBettingBridge;
+      const market = bridge?.getMarket(req.params.duelId);
+
+      if (!market) {
+        return reply.code(404).send({ error: "Market not found" });
+      }
+
+      const pool = await poolManager.getPool(market.duelId);
+
+      return reply.send({
+        duelId: market.duelId,
+        agent1: { id: market.agent1Id, name: market.agent1Name },
+        agent2: { id: market.agent2Id, name: market.agent2Name },
+        status: market.status,
+        bettingClosesAt: market.bettingClosesAt,
+        createdAt: market.createdAt,
+        winnerId: market.winnerId ?? null,
+        winnerSide: market.winnerSide ?? null,
+        pool: pool
+          ? {
+              sideATotal: pool.sideATotal,
+              sideBTotal: pool.sideBTotal,
+              sideACount: pool.sideACount,
+              sideBCount: pool.sideBCount,
+            }
+          : null,
+      });
+    },
+  );
+
+  // ========================================================================
+  // GET /api/hyperbet/events — Public SSE stream
+  // ========================================================================
+  fastify.get("/api/hyperbet/events", async (req, reply) => {
+    const clientId = nextSseId++;
+
+    reply.raw.writeHead(200, {
+      "Content-Type": "text/event-stream",
+      "Cache-Control": "no-cache, no-store, must-revalidate",
+      Connection: "keep-alive",
+      "Access-Control-Allow-Origin": "*",
+    });
+
+    sseClients.set(clientId, reply);
+
+    // Send initial state
+    const bridge = (world as WorldWithBridge).duelBettingBridge;
+    if (bridge) {
+      const markets = bridge.getActiveMarkets();
+      reply.raw.write(
+        `data: ${JSON.stringify({ type: "snapshot", markets })}\n\n`,
+      );
+    }
+
+    req.raw.on("close", () => {
+      sseClients.delete(clientId);
+    });
+
+    // Keep connection open
+    return reply;
+  });
+
+  // Forward betting events to SSE clients
+  const bettingEvents = [
+    "betting:market:created",
+    "betting:market:locked",
+    "betting:market:resolved",
+    "betting:market:aborted",
+    "betting:pool:updated",
+  ];
+
+  for (const eventName of bettingEvents) {
+    world.on(eventName, (payload: unknown) => {
+      const frame = `data: ${JSON.stringify({ type: eventName.replace("betting:", ""), payload })}\n\n`;
+      for (const [clientId, reply] of sseClients) {
+        try {
+          reply.raw.write(frame);
+        } catch {
+          sseClients.delete(clientId);
+        }
+      }
+    });
+  }
+
+  // Heartbeat
+  const heartbeat = setInterval(() => {
+    const frame = `: heartbeat\n\n`;
+    for (const [clientId, reply] of sseClients) {
+      try {
+        reply.raw.write(frame);
+      } catch {
+        sseClients.delete(clientId);
+      }
+    }
+  }, 15_000);
+  heartbeat.unref();
+
+  // ========================================================================
+  // POST /api/hyperbet/bets — Place a bet (wallet signature auth)
+  // ========================================================================
+  fastify.post<{
+    Body: {
+      roundId: string;
+      side: "A" | "B";
+      amount: string;
+      walletAddress: string;
+      signature: string;
+      message: string;
+    };
+  }>(
+    "/api/hyperbet/bets",
+    {
+      config: { rateLimit: HYPERBET_PUBLIC_WRITE_RATE_LIMIT },
+    },
+    async (req, reply) => {
+      try {
+        await HYPERBET_PUBLIC_WRITE_CODEQL_LIMITER.consume(req.ip);
+      } catch {
+        return reply.code(429).send({ error: "Too Many Requests" });
+      }
+
+      const { roundId, side, amount, walletAddress, signature, message } =
+        req.body || {};
+
+      if (
+        !roundId ||
+        !side ||
+        !amount ||
+        !walletAddress ||
+        !signature ||
+        !message
+      ) {
+        return reply.code(400).send({ error: "Missing required fields" });
+      }
+
+      if (side !== "A" && side !== "B") {
+        return reply.code(400).send({ error: "Side must be A or B" });
+      }
+
+      // Verify wallet signature
+      const auth = checkWalletSignature({ walletAddress, signature, message });
+      if (!auth.valid) {
+        return reply
+          .code(401)
+          .send({ error: auth.error || "Invalid signature" });
+      }
+
+      // Place the bet
+      const result = await poolManager.placeBet({
+        roundId,
+        side,
+        amount,
+        walletAddress,
+      });
+
+      if (!result.success) {
+        return reply.code(400).send({ error: result.error });
+      }
+
+      return reply.send({ success: true, betId: result.betId });
+    },
+  );
+
+  // ========================================================================
+  // GET /api/hyperbet/bets/:walletAddress — Bet history
+  // ========================================================================
+  fastify.get<{ Params: { walletAddress: string } }>(
+    "/api/hyperbet/bets/:walletAddress",
+    async (req, reply) => {
+      const bets = await poolManager.getBetsByWallet(req.params.walletAddress);
+      return reply.send({ bets });
+    },
+  );
+
+  // ========================================================================
+  // POST /api/hyperbet/claims — Initiate a claim (wallet signature auth)
+  // ========================================================================
+  fastify.post<{
+    Body: {
+      roundId: string;
+      walletAddress: string;
+      signature: string;
+      message: string;
+    };
+  }>(
+    "/api/hyperbet/claims",
+    {
+      config: { rateLimit: HYPERBET_PUBLIC_WRITE_RATE_LIMIT },
+    },
+    async (req, reply) => {
+      try {
+        await HYPERBET_PUBLIC_WRITE_CODEQL_LIMITER.consume(req.ip);
+      } catch {
+        return reply.code(429).send({ error: "Too Many Requests" });
+      }
+
+      const { roundId, walletAddress, signature, message } = req.body || {};
+
+      if (!roundId || !walletAddress || !signature || !message) {
+        return reply.code(400).send({ error: "Missing required fields" });
+      }
+
+      const auth = checkWalletSignature({ walletAddress, signature, message });
+      if (!auth.valid) {
+        return reply
+          .code(401)
+          .send({ error: auth.error || "Invalid signature" });
+      }
+
+      const result = await poolManager.createClaimJob(roundId, walletAddress);
+      if (!result.success) {
+        return reply.code(400).send({ error: result.error });
+      }
+
+      return reply.send({ success: true, jobId: result.jobId });
+    },
+  );
+
+  // ========================================================================
+  // GET /api/hyperbet/leaderboard — Top bettors
+  // ========================================================================
+  fastify.get("/api/hyperbet/leaderboard", async (_req, reply) => {
+    const leaderboard = await poolManager.getLeaderboard();
+    return reply.send({ leaderboard });
+  });
+
+  console.log("[HyperBet] ✅ Public routes registered");
+}
diff --git a/packages/server/src/routes/hyperbet-wallet-auth.ts b/packages/server/src/routes/hyperbet-wallet-auth.ts
new file mode 100644
index 000000000..f53f2ff3a
--- /dev/null
+++ b/packages/server/src/routes/hyperbet-wallet-auth.ts
@@ -0,0 +1,158 @@
+/**
+ * HyperBet Wallet Auth — Ed25519 signature verification for Solana wallets
+ *
+ * Viewers prove wallet ownership by signing a message.
+ * Format: "HyperBet:{action}:{nonce}:{timestamp}"
+ */
+
+import { PublicKey } from "@solana/web3.js";
+import { createPublicKey, verify } from "node:crypto";
+
+const NONCE_EXPIRY_MS = 5 * 60 * 1000; // 5 minutes
+const MAX_NONCE_CACHE = 10_000;
+
+/** Ed25519 DER prefix for SPKI encoding (RFC 8410) */
+const ED25519_SPKI_PREFIX = Buffer.from("302a300506032b6570032100", "hex");
+
+/** In-memory nonce replay protection */
+const usedNonces = new Map<string, number>();
+
+/** Periodic cleanup of expired nonces */
+let cleanupScheduled = false;
+function scheduleCleanup(): void {
+  if (cleanupScheduled) return;
+  cleanupScheduled = true;
+  setTimeout(() => {
+    cleanupScheduled = false;
+    const now = Date.now();
+    for (const [nonce, ts] of usedNonces) {
+      if (now - ts > NONCE_EXPIRY_MS) usedNonces.delete(nonce);
+    }
+  }, 60_000).unref();
+}
+
+export interface WalletAuthPayload {
+  walletAddress: string;
+  signature: string; // base64-encoded Ed25519 signature
+  message: string; // the signed message string
+}
+
+export interface WalletAuthResult {
+  valid: boolean;
+  walletAddress: string | null;
+  action: string | null;
+  error?: string;
+}
+
+/**
+ * Verify a wallet signature for a HyperBet action.
+ */
+export function checkWalletSignature(
+  payload: WalletAuthPayload,
+): WalletAuthResult {
+  const { walletAddress, signature, message } = payload;
+
+  // Parse the message format
+  const parts = message.split(":");
+  if (parts.length !== 4 || parts[0] !== "HyperBet") {
+    return {
+      valid: false,
+      walletAddress: null,
+      action: null,
+      error:
+        "Invalid message format — expected HyperBet:{action}:{nonce}:{timestamp}",
+    };
+  }
+
+  const [, action, nonce, timestampStr] = parts;
+  const timestamp = parseInt(timestampStr, 10);
+
+  // Check timestamp freshness
+  const now = Date.now();
+  if (isNaN(timestamp) || Math.abs(now - timestamp) > NONCE_EXPIRY_MS) {
+    return {
+      valid: false,
+      walletAddress: null,
+      action: null,
+      error: "Message expired or invalid timestamp",
+    };
+  }
+
+  // Check nonce replay
+  const nonceKey = `${walletAddress}:${nonce}`;
+  if (usedNonces.has(nonceKey)) {
+    return {
+      valid: false,
+      walletAddress: null,
+      action: null,
+      error: "Nonce already used",
+    };
+  }
+
+  // Verify Ed25519 signature
+  let pubkeyBytes: Uint8Array;
+  try {
+    pubkeyBytes = new PublicKey(walletAddress).toBytes();
+  } catch {
+    return {
+      valid: false,
+      walletAddress: null,
+      action: null,
+      error: "Invalid wallet address",
+    };
+  }
+
+  let sigBytes: Uint8Array;
+  try {
+    sigBytes = Buffer.from(signature, "base64");
+  } catch {
+    return {
+      valid: false,
+      walletAddress: null,
+      action: null,
+      error: "Invalid signature encoding",
+    };
+  }
+
+  const messageBytes = new TextEncoder().encode(message);
+
+  // Use Node.js crypto Ed25519 verification
+  let isValid: boolean;
+  try {
+    const keyObject = createPublicKey({
+      key: Buffer.concat([ED25519_SPKI_PREFIX, Buffer.from(pubkeyBytes)]),
+      format: "der",
+      type: "spki",
+    });
+    isValid = verify(null, messageBytes, keyObject, sigBytes);
+  } catch {
+    return {
+      valid: false,
+      walletAddress: null,
+      action: null,
+      error: "Signature verification failed",
+    };
+  }
+
+  if (!isValid) {
+    return {
+      valid: false,
+      walletAddress: null,
+      action: null,
+      error: "Signature verification failed",
+    };
+  }
+
+  // Mark nonce as used
+  if (usedNonces.size >= MAX_NONCE_CACHE) {
+    const iter = usedNonces.keys();
+    for (let i = 0; i < 1000; i++) {
+      const key = iter.next().value;
+      if (key) usedNonces.delete(key);
+    }
+  }
+  usedNonces.set(nonceKey, now);
+  scheduleCleanup();
+
+  return { valid: true, walletAddress, action };
+}
diff --git a/packages/server/src/routes/streaming-betting-auth.ts b/packages/server/src/routes/streaming-betting-auth.ts
index 10e8eb831..75ba2718f 100644
--- a/packages/server/src/routes/streaming-betting-auth.ts
+++ b/packages/server/src/routes/streaming-betting-auth.ts
@@ -9,6 +9,11 @@ export type BettingFeedAccessTokenResolution = {
   source: "betting-feed" | null;
 };
 
+export type OracleProofAccessTokenResolution = {
+  token: string | null;
+  source: "oracle-proof" | null;
+};
+
 export function shouldSkipBettingFeedAuth(
   env: Record<string, string | undefined>,
 ): boolean {
@@ -18,6 +23,19 @@ export function shouldSkipBettingFeedAuth(
   );
 }
 
+export function assertSafeBettingFeedAuthConfig(
+  env: Record<string, string | undefined>,
+): void {
+  if (
+    env.NODE_ENV === "production" &&
+    (env.BETTING_FEED_SKIP_AUTH || "").trim().toLowerCase() === "true"
+  ) {
+    throw new Error(
+      "BETTING_FEED_SKIP_AUTH=true is forbidden when NODE_ENV=production",
+    );
+  }
+}
+
 function digestToken(token: string): Buffer {
   return createHash("sha256").update(token, "utf8").digest();
 }
@@ -28,12 +46,9 @@ export function extractBettingFeedToken(
   const authHeader = Array.isArray(params.authorizationHeader)
     ? params.authorizationHeader[0]
     : params.authorizationHeader;
-  const headerToken =
-    authHeader && /^Bearer\s+/i.test(authHeader)
-      ? authHeader.replace(/^Bearer\s+/i, "").trim()
-      : null;
-  if (headerToken) {
-    return headerToken;
+  const match = authHeader?.match(/^Bearer\s+(\S+)\s*$/i);
+  if (match) {
+    return match[1];
   }
   return null;
 }
@@ -70,3 +85,18 @@ export function resolveBettingFeedAccessToken(
     source: null,
   };
 }
+
+// Oracle-proof retrieval (`/api/streaming/results/:duelId`) exposes
+// `duelKeyHex` + `seed` + `replayHash` — the material needed to submit a
+// Solana resolution. It intentionally has one dedicated secret boundary and
+// never falls back to the general betting feed token.
+export function resolveOracleProofAccessToken(
+  env: Record<string, string | undefined>,
+): OracleProofAccessTokenResolution {
+  const keeperAlignedToken =
+    env.HYPERSCAPES_RESULT_LOOKUP_BEARER_TOKEN?.trim() || null;
+  if (keeperAlignedToken) {
+    return { token: keeperAlignedToken, source: "oracle-proof" };
+  }
+  return { token: null, source: null };
+}
diff --git a/packages/server/src/routes/streaming-betting-feed.ts b/packages/server/src/routes/streaming-betting-feed.ts
index d13518d36..726fff955 100644
--- a/packages/server/src/routes/streaming-betting-feed.ts
+++ b/packages/server/src/routes/streaming-betting-feed.ts
@@ -1,9 +1,17 @@
 import type {
   StreamingDuelCycle,
   StreamingPhase,
+  StreamingSourceTimeline,
 } from "../systems/StreamingDuelScheduler/types.js";
+import type {
+  StreamChannelState,
+  StreamDestinationState,
+  StreamManifestStatus,
+  StreamPublicReadiness,
+} from "../streaming/delivery-config.js";
+import type { StreamSourceRuntime } from "../streaming/source-runtime.js";
 
-export const BETTING_FEED_SCHEMA_VERSION = 1;
+export const BETTING_FEED_SCHEMA_VERSION = 3;
 export const BETTING_SOURCE_EPOCH_STORAGE_KEY =
   "streaming:betting-source-epoch";
 
@@ -29,15 +37,84 @@ export type BettingFeedRendererHealth = {
   updatedAt: number | null;
 };
 
+export type BettingFeedDeliveryHealth = BettingFeedRendererHealth;
+
+export type BettingFeedHlsManifest = {
+  updatedAt: number | null;
+  mediaSequence: number | null;
+};
+
+export type BettingFeedRendererMetrics = {
+  captureFps: number | null;
+  encodeFps: number | null;
+  droppedFrames: number | null;
+  renderTick: number | null;
+  duelStateTick: number | null;
+  latestFrameAt: number | null;
+  latestRenderTickAt: number | null;
+  latestDuelStateTickAt: number | null;
+  latestVisualChangeAt: number | null;
+  visualChangeAgeMs: number | null;
+  hlsManifest: BettingFeedHlsManifest | null;
+};
+
+export type BettingFeedDelivery = {
+  mode: "self_hls" | "external_hls";
+  provider: string | null;
+  playbackUrl: string | null;
+  hlsUrl: string | null;
+  llhlsUrl: string | null;
+  ingestUrl: string | null;
+};
+
+export type BettingFeedDestinationState = StreamDestinationState;
+export type BettingFeedPublicReadiness = StreamPublicReadiness;
+export type BettingFeedChannel = StreamChannelState;
+export type BettingFeedSourceRuntime = StreamSourceRuntime;
+
+export type BettingFeedCanonicalAuthority = {
+  providerLive: boolean;
+  playbackProbeReady: boolean;
+  decision: string | null;
+  reason: string | null;
+  revision: number | null;
+  updatedAt: number | null;
+  liveInputId: string | null;
+  videoUid: string | null;
+  lifecycleStatus: string | null;
+  playbackUrl: string | null;
+  playbackProbeStatusCode: number | null;
+  playbackManifestStatus: StreamManifestStatus | null;
+};
+
+export type BettingFeedBroadcastTimeline = {
+  phase: StreamingPhase | null;
+  betOpenTime: number | null;
+  betCloseTime: number | null;
+  fightStartTime: number | null;
+  duelEndTime: number | null;
+  presentationDelayMs: number;
+  updatedAt: number;
+};
+
+export type BettingFeedSourceTimeline = StreamingSourceTimeline;
+
+export type BettingFeedCycle = StreamingDuelCycle & {
+  sourceTimeline?: BettingFeedSourceTimeline;
+};
+
 export type BettingFeedPayload = {
   schemaVersion: number;
   sourceEpoch: number;
   seq: number;
   emittedAt: number;
+  cycle: BettingFeedCycle | null;
   duelId: string | null;
   duelKey: string | null;
   phase: StreamingPhase | null;
   phaseVersion: number;
+  broadcastTimeline: BettingFeedBroadcastTimeline;
+  sourceTimeline: BettingFeedSourceTimeline | null;
   betOpenTime: number | null;
   betCloseTime: number | null;
   fightStartTime: number | null;
@@ -49,6 +126,30 @@ export type BettingFeedPayload = {
   agent2: BettingFeedAgent | null;
   arenaPositions: StreamingDuelCycle["arenaPositions"];
   rendererHealth: BettingFeedRendererHealth | null;
+  deliveryHealth: BettingFeedDeliveryHealth | null;
+  channel: BettingFeedChannel | null;
+  publicReadiness: BettingFeedPublicReadiness | null;
+  canonicalDestination: BettingFeedDestinationState | null;
+  fallbackDestination: BettingFeedDestinationState | null;
+  canonicalAuthority: BettingFeedCanonicalAuthority | null;
+  sourceRuntime: BettingFeedSourceRuntime | null;
+  rendererMetrics: BettingFeedRendererMetrics | null;
+  captureFps: number | null;
+  encodeFps: number | null;
+  droppedFrames: number | null;
+  renderTick: number | null;
+  duelStateTick: number | null;
+  latestFrameAt: number | null;
+  latestRenderTickAt: number | null;
+  latestDuelStateTickAt: number | null;
+  latestVisualChangeAt: number | null;
+  visualChangeAgeMs: number | null;
+  hlsManifestUpdatedAt: number | null;
+  hlsMediaSequence: number | null;
+  delivery: BettingFeedDelivery | null;
+  deliveryMode: BettingFeedDelivery["mode"] | null;
+  deliveryProvider: string | null;
+  playbackUrl: string | null;
 };
 
 export type BettingFeedFrame = {
@@ -94,6 +195,75 @@ function resolveWinnerName(cycle: StreamingDuelCycle): string | null {
   return null;
 }
 
+function isRawSourceTimeEmissionEnabled(
+  env: NodeJS.ProcessEnv = process.env,
+): boolean {
+  return (
+    (env.STREAMING_EMIT_RAW_SOURCE_TIME ?? "").trim().toLowerCase() === "true"
+  );
+}
+
+function buildSourceTimeline(
+  cycle: StreamingDuelCycle,
+  updatedAt: number,
+): BettingFeedSourceTimeline {
+  return {
+    phase: cycle.phase,
+    betOpenTime: cycle.betOpenTime ?? null,
+    betCloseTime: cycle.betCloseTime ?? null,
+    fightStartTime: cycle.fightStartTime ?? null,
+    duelEndTime: cycle.duelEndTime ?? null,
+    updatedAt,
+  };
+}
+
+function redactOracleProofFromCycle(
+  cycle: StreamingDuelCycle | null,
+  exposeResolutionOutcome: boolean,
+): BettingFeedCycle | null {
+  if (!cycle) {
+    return null;
+  }
+
+  return {
+    ...cycle,
+    duelKeyHex: null,
+    duelEndTime: null,
+    seed: null,
+    replayHash: null,
+    winnerId: exposeResolutionOutcome ? (cycle.winnerId ?? null) : null,
+    winReason: exposeResolutionOutcome ? (cycle.winReason ?? null) : null,
+  };
+}
+
+function redactIngestUrlFromDestination(
+  destination: StreamDestinationState | null,
+): StreamDestinationState | null {
+  if (!destination) {
+    return null;
+  }
+  return {
+    ...destination,
+    ingestUrl: null,
+  };
+}
+
+function redactIngestUrlFromChannel(
+  channel: StreamChannelState | null,
+): StreamChannelState | null {
+  if (!channel) {
+    return null;
+  }
+
+  return {
+    ...channel,
+    destinations: channel.destinations.map((destination) => ({
+      ...destination,
+      ingestUrl: null,
+    })),
+  };
+}
+
 function toAgentSnapshot(
   agent: StreamingDuelCycle["agent1"],
 ): BettingFeedAgent | null {
@@ -116,34 +286,246 @@ function toAgentSnapshot(
   };
 }
 
+function projectBroadcastTimestamp(
+  timestamp: number | null | undefined,
+  presentationDelayMs: number,
+): number | null {
+  return typeof timestamp === "number" && Number.isFinite(timestamp)
+    ? Math.max(0, timestamp + presentationDelayMs)
+    : null;
+}
+
+function resolveBroadcastTimelinePhase(params: {
+  cycle: StreamingDuelCycle | null;
+  emittedAt: number;
+  betOpenTime: number | null;
+  betCloseTime: number | null;
+  fightStartTime: number | null;
+  duelEndTime: number | null;
+}): StreamingPhase | null {
+  const {
+    cycle,
+    emittedAt,
+    betOpenTime,
+    betCloseTime,
+    fightStartTime,
+    duelEndTime,
+  } = params;
+  if (!cycle) {
+    return null;
+  }
+
+  if (cycle.phase === "IDLE") {
+    return "IDLE";
+  }
+  const projectedCycleStart =
+    betOpenTime ?? betCloseTime ?? fightStartTime ?? duelEndTime;
+  if (projectedCycleStart != null && emittedAt < projectedCycleStart) {
+    return "IDLE";
+  }
+
+  if (duelEndTime != null && emittedAt >= duelEndTime) {
+    return "RESOLUTION";
+  }
+
+  if (fightStartTime != null && emittedAt >= fightStartTime) {
+    return "FIGHTING";
+  }
+
+  if (betCloseTime != null && emittedAt >= betCloseTime) {
+    return "COUNTDOWN";
+  }
+
+  if (betOpenTime != null && emittedAt >= betOpenTime) {
+    return "ANNOUNCEMENT";
+  }
+
+  return cycle.phase;
+}
+
+function buildBroadcastTimeline(params: {
+  cycle: StreamingDuelCycle | null;
+  emittedAt: number;
+  presentationDelayMs: number;
+}): BettingFeedBroadcastTimeline {
+  const betOpenTime = projectBroadcastTimestamp(
+    params.cycle?.betOpenTime ?? null,
+    params.presentationDelayMs,
+  );
+  const betCloseTime = projectBroadcastTimestamp(
+    params.cycle?.betCloseTime ?? null,
+    params.presentationDelayMs,
+  );
+  const fightStartTime = projectBroadcastTimestamp(
+    params.cycle?.fightStartTime ?? null,
+    params.presentationDelayMs,
+  );
+  const duelEndTime = projectBroadcastTimestamp(
+    params.cycle?.duelEndTime ?? null,
+    params.presentationDelayMs,
+  );
+
+  return {
+    phase: resolveBroadcastTimelinePhase({
+      cycle: params.cycle,
+      emittedAt: params.emittedAt,
+      betOpenTime,
+      betCloseTime,
+      fightStartTime,
+      duelEndTime,
+    }),
+    betOpenTime,
+    betCloseTime,
+    fightStartTime,
+    duelEndTime,
+    presentationDelayMs: params.presentationDelayMs,
+    updatedAt: params.emittedAt,
+  };
+}
+
 export function buildBettingFeedPayload(params: {
   sourceEpoch: number;
   seq: number;
   emittedAt: number;
   cycle: StreamingDuelCycle | null;
   rendererHealth?: BettingFeedRendererHealth | null;
+  deliveryHealth?: BettingFeedDeliveryHealth | null;
+  channel?: BettingFeedChannel | null;
+  canonicalAuthority?: BettingFeedCanonicalAuthority | null;
+  sourceRuntime?: BettingFeedSourceRuntime | null;
+  rendererMetrics?: BettingFeedRendererMetrics | null;
+  delivery?: BettingFeedDelivery | null;
 }): BettingFeedPayload {
   const cycle = params.cycle;
+  const rendererMetrics = params.rendererMetrics ?? null;
+  const hlsManifest = rendererMetrics?.hlsManifest ?? null;
+  const channel = params.channel ?? null;
+  const presentationDelayMs = Math.max(0, channel?.presentationDelayMs ?? 0);
+  const canonicalDestination =
+    channel?.destinations.find(
+      (destination) => destination.id === channel.canonicalDestinationId,
+    ) ?? null;
+  const fallbackDestination =
+    channel?.fallbackDestinationId != null
+      ? (channel.destinations.find(
+          (destination) => destination.id === channel.fallbackDestinationId,
+        ) ?? null)
+      : null;
+  const delivery =
+    params.delivery ??
+    (canonicalDestination
+      ? {
+          mode:
+            canonicalDestination.provider === "self_hls"
+              ? "self_hls"
+              : "external_hls",
+          provider: canonicalDestination.provider,
+          playbackUrl: canonicalDestination.playbackUrl,
+          hlsUrl:
+            canonicalDestination.transport === "hls" &&
+            canonicalDestination.provider !== "self_hls"
+              ? canonicalDestination.playbackUrl
+              : null,
+          llhlsUrl:
+            canonicalDestination.transport === "llhls"
+              ? canonicalDestination.playbackUrl
+              : null,
+          ingestUrl: canonicalDestination.ingestUrl,
+        }
+      : null);
+  const deliveryHealth =
+    params.deliveryHealth ??
+    (channel?.publicReadiness
+      ? {
+          ready: channel.publicReadiness.ready,
+          degradedReason: channel.publicReadiness.reason,
+          updatedAt: channel.publicReadiness.updatedAt,
+        }
+      : null);
+  const broadcastTimeline = buildBroadcastTimeline({
+    cycle,
+    emittedAt: params.emittedAt,
+    presentationDelayMs,
+  });
+  const sourceTimeline =
+    isRawSourceTimeEmissionEnabled() && cycle
+      ? buildSourceTimeline(cycle, params.emittedAt)
+      : null;
+  const publicPhase = broadcastTimeline.phase ?? cycle?.phase ?? null;
+  // Public RESOLUTION disclosure is bettor display state only. Settlement and
+  // oracle proof material stay on the authenticated result/keeper path; this
+  // feed never exposes duelKeyHex, seed, replayHash, or ingest credentials.
+  const exposeResolutionOutcome = publicPhase === "RESOLUTION";
+  const publicCycleBase = redactOracleProofFromCycle(
+    cycle,
+    exposeResolutionOutcome,
+  );
+  const publicCycle =
+    publicCycleBase && sourceTimeline
+      ? {
+          ...publicCycleBase,
+          sourceTimeline,
+        }
+      : publicCycleBase;
+  const publicChannel = redactIngestUrlFromChannel(channel);
+  const publicCanonicalDestination =
+    redactIngestUrlFromDestination(canonicalDestination);
+  const publicFallbackDestination =
+    redactIngestUrlFromDestination(fallbackDestination);
+  const publicDelivery = delivery
+    ? {
+        ...delivery,
+        ingestUrl: null,
+      }
+    : null;
   return {
     schemaVersion: BETTING_FEED_SCHEMA_VERSION,
     sourceEpoch: params.sourceEpoch,
     seq: params.seq,
     emittedAt: params.emittedAt,
+    cycle: publicCycle,
     duelId: cycle?.duelId ?? null,
-    duelKey: cycle?.duelKeyHex ?? null,
-    phase: cycle?.phase ?? null,
+    duelKey: null,
+    phase: publicPhase,
     phaseVersion: cycle?.phaseVersion ?? 0,
-    betOpenTime: cycle?.betOpenTime ?? null,
-    betCloseTime: cycle?.betCloseTime ?? null,
-    fightStartTime: cycle?.fightStartTime ?? null,
-    duelEndTime: cycle?.duelEndTime ?? null,
-    winnerId: cycle?.winnerId ?? null,
-    winnerName: cycle ? resolveWinnerName(cycle) : null,
-    winReason: cycle?.winReason ?? null,
+    broadcastTimeline,
+    sourceTimeline,
+    betOpenTime: broadcastTimeline.betOpenTime,
+    betCloseTime: broadcastTimeline.betCloseTime,
+    fightStartTime: broadcastTimeline.fightStartTime,
+    duelEndTime: broadcastTimeline.duelEndTime,
+    winnerId: exposeResolutionOutcome ? (cycle?.winnerId ?? null) : null,
+    winnerName:
+      exposeResolutionOutcome && cycle ? resolveWinnerName(cycle) : null,
+    winReason: exposeResolutionOutcome ? (cycle?.winReason ?? null) : null,
     agent1: toAgentSnapshot(cycle?.agent1 ?? null),
     agent2: toAgentSnapshot(cycle?.agent2 ?? null),
     arenaPositions: cycle?.arenaPositions ?? null,
     rendererHealth: params.rendererHealth ?? null,
+    deliveryHealth,
+    channel: publicChannel,
+    publicReadiness: publicChannel?.publicReadiness ?? null,
+    canonicalDestination: publicCanonicalDestination,
+    fallbackDestination: publicFallbackDestination,
+    canonicalAuthority: params.canonicalAuthority ?? null,
+    sourceRuntime: params.sourceRuntime ?? null,
+    rendererMetrics,
+    captureFps: rendererMetrics?.captureFps ?? null,
+    encodeFps: rendererMetrics?.encodeFps ?? null,
+    droppedFrames: rendererMetrics?.droppedFrames ?? null,
+    renderTick: rendererMetrics?.renderTick ?? null,
+    duelStateTick: rendererMetrics?.duelStateTick ?? null,
+    latestFrameAt: rendererMetrics?.latestFrameAt ?? null,
+    latestRenderTickAt: rendererMetrics?.latestRenderTickAt ?? null,
+    latestDuelStateTickAt: rendererMetrics?.latestDuelStateTickAt ?? null,
+    latestVisualChangeAt: rendererMetrics?.latestVisualChangeAt ?? null,
+    visualChangeAgeMs: rendererMetrics?.visualChangeAgeMs ?? null,
+    hlsManifestUpdatedAt: hlsManifest?.updatedAt ?? null,
+    hlsMediaSequence: hlsManifest?.mediaSequence ?? null,
+    delivery: publicDelivery,
+    deliveryMode: publicDelivery?.mode ?? null,
+    deliveryProvider: publicDelivery?.provider ?? null,
+    playbackUrl: publicDelivery?.playbackUrl ?? null,
   };
 }
 
@@ -151,12 +533,106 @@ export function buildBettingFeedDedupKey(payload: BettingFeedPayload): string {
   return JSON.stringify({
     ...payload,
     emittedAt: 0,
+    cycle: payload.cycle
+      ? {
+          ...payload.cycle,
+          sourceTimeline: payload.cycle.sourceTimeline
+            ? {
+                ...payload.cycle.sourceTimeline,
+                updatedAt: 0,
+              }
+            : undefined,
+        }
+      : null,
+    broadcastTimeline: {
+      ...payload.broadcastTimeline,
+      updatedAt: 0,
+    },
+    sourceTimeline: payload.sourceTimeline
+      ? {
+          ...payload.sourceTimeline,
+          updatedAt: 0,
+        }
+      : null,
+    latestFrameAt: 0,
+    latestRenderTickAt: 0,
+    latestDuelStateTickAt: 0,
+    latestVisualChangeAt: 0,
+    hlsManifestUpdatedAt: 0,
     rendererHealth: payload.rendererHealth
       ? {
           ...payload.rendererHealth,
           updatedAt: 0,
         }
       : null,
+    deliveryHealth: payload.deliveryHealth
+      ? {
+          ...payload.deliveryHealth,
+          updatedAt: 0,
+        }
+      : null,
+    channel: payload.channel
+      ? {
+          ...payload.channel,
+          publicReadiness: {
+            ...payload.channel.publicReadiness,
+            updatedAt: 0,
+          },
+          destinations: payload.channel.destinations.map((destination) => ({
+            ...destination,
+            updatedAt: 0,
+          })),
+        }
+      : null,
+    publicReadiness: payload.publicReadiness
+      ? {
+          ...payload.publicReadiness,
+          updatedAt: 0,
+        }
+      : null,
+    canonicalDestination: payload.canonicalDestination
+      ? {
+          ...payload.canonicalDestination,
+          updatedAt: 0,
+        }
+      : null,
+    fallbackDestination: payload.fallbackDestination
+      ? {
+          ...payload.fallbackDestination,
+          updatedAt: 0,
+        }
+      : null,
+    canonicalAuthority: payload.canonicalAuthority
+      ? {
+          ...payload.canonicalAuthority,
+          updatedAt: 0,
+        }
+      : null,
+    sourceRuntime: payload.sourceRuntime
+      ? {
+          ...payload.sourceRuntime,
+          lastFrameAt: 0,
+          lastRenderTickAt: 0,
+          lastVisualChangeAt: 0,
+          lastRecoveryAt: 0,
+          workerHeartbeatAt: 0,
+        }
+      : null,
+    rendererMetrics: payload.rendererMetrics
+      ? {
+          ...payload.rendererMetrics,
+          latestFrameAt: 0,
+          latestRenderTickAt: 0,
+          latestDuelStateTickAt: 0,
+          latestVisualChangeAt: 0,
+          hlsManifest: payload.rendererMetrics.hlsManifest
+            ? {
+                ...payload.rendererMetrics.hlsManifest,
+                updatedAt: 0,
+              }
+            : null,
+        }
+      : null,
   });
 }
 
diff --git a/packages/server/src/routes/streaming-betting-health.ts b/packages/server/src/routes/streaming-betting-health.ts
index cd4c40d40..8ba569ded 100644
--- a/packages/server/src/routes/streaming-betting-health.ts
+++ b/packages/server/src/routes/streaming-betting-health.ts
@@ -5,8 +5,35 @@ import {
 } from "@hyperscape/shared";
 import type { StreamingDuelCycle } from "../systems/StreamingDuelScheduler/types.js";
 import { getStreamCapture } from "../streaming/stream-capture.js";
+import type { HlsManifestSnapshot } from "../streaming/stream-status-artifacts.js";
 import type { BettingFeedRendererHealth } from "./streaming-betting-feed.js";
-import type { ExternalRtmpStatusSnapshot } from "./streaming-external-status.js";
+import type {
+  ExternalHlsManifestBlob,
+  ExternalRendererMetricsBlob,
+  ExternalRtmpStatusSnapshot,
+} from "./streaming-external-status.js";
+
+// External CDP capture status is sampled out-of-process and can legitimately
+// arrive several seconds behind the HLS edge. Keep this above segment cadence
+// plus polling jitter so healthy self-HLS playback is not blanked prematurely.
+const RENDER_TICK_STALE_MS = 10_000;
+const VISUAL_CHANGE_STALE_MS = 5_000;
+const VISUAL_CHANGE_GRACE_MS = 8_000;
+const DEFAULT_MIN_ENCODE_FPS = 24;
+const MIN_ENCODE_FPS_TARGET_RATIO = 0.8;
+
+type NormalizedRendererMetrics = {
+  captureFps: number | null;
+  encodeFps: number | null;
+  latestRenderTickAt: number | null;
+  latestVisualChangeAt: number | null;
+  visualChangeAgeMs: number | null;
+};
+
+type NormalizedHlsManifest = {
+  updatedAt: number | null;
+  mediaSequence: number | null;
+};
 
 function asFiniteNumber(value: unknown): number | null {
   return typeof value === "number" && Number.isFinite(value) ? value : null;
@@ -30,6 +57,66 @@ function normalizeRendererHealthSnapshot(
   };
 }
 
+function normalizeRendererMetrics(
+  value: ExternalRendererMetricsBlob | undefined,
+): NormalizedRendererMetrics | null {
+  if (!value || typeof value !== "object") return null;
+  return {
+    captureFps: asFiniteNumber(value.captureFps),
+    encodeFps: asFiniteNumber(value.encodeFps),
+    latestRenderTickAt: asFiniteNumber(value.latestRenderTickAt),
+    latestVisualChangeAt: asFiniteNumber(value.latestVisualChangeAt),
+    visualChangeAgeMs: asFiniteNumber(value.visualChangeAgeMs),
+  };
+}
+
+function normalizeHlsManifest(
+  value: ExternalHlsManifestBlob | HlsManifestSnapshot | undefined | null,
+): NormalizedHlsManifest | null {
+  if (!value || typeof value !== "object") return null;
+  return {
+    updatedAt: asFiniteNumber(value.updatedAt),
+    mediaSequence: asFiniteNumber(value.mediaSequence),
+  };
+}
+
+function resolveTargetEncodeFps(
+  externalSnapshot: ExternalRtmpStatusSnapshot | null,
+): number | null {
+  return (
+    asFiniteNumber(externalSnapshot?.ingest?.targetFps) ??
+    asFiniteNumber(externalSnapshot?.smoke?.ingest?.targetFps) ??
+    null
+  );
+}
+
+function resolveMinEncodeFps(targetEncodeFps: number | null): number {
+  const explicit = Number.parseInt(process.env.STREAM_MIN_ENCODE_FPS || "", 10);
+  if (Number.isFinite(explicit) && explicit > 0) {
+    return explicit;
+  }
+  if (targetEncodeFps != null && targetEncodeFps > 0) {
+    return Math.max(
+      1,
+      Math.floor(targetEncodeFps * MIN_ENCODE_FPS_TARGET_RATIO),
+    );
+  }
+  return DEFAULT_MIN_ENCODE_FPS;
+}
+
+function isFreshHlsManifest(params: {
+  hlsManifest: NormalizedHlsManifest | null;
+  nowMs: number;
+  freshnessMs: number;
+}): boolean {
+  const { hlsManifest, nowMs, freshnessMs } = params;
+  if (!hlsManifest) return false;
+  if (hlsManifest.mediaSequence == null || hlsManifest.updatedAt == null) {
+    return false;
+  }
+  return Math.max(0, nowMs - hlsManifest.updatedAt) <= freshnessMs;
+}
+
 function deriveCycleGuardrailReason(
   cycle: StreamingDuelCycle | null,
 ): string | null {
@@ -58,12 +145,104 @@ function deriveCycleGuardrailReason(
   });
 }
 
+function phaseNeedsLiveRender(cycle: StreamingDuelCycle | null): boolean {
+  return cycle?.phase != null && cycle.phase !== "IDLE";
+}
+
+function phaseNeedsVisualChange(cycle: StreamingDuelCycle | null): boolean {
+  return (
+    cycle?.phase === "COUNTDOWN" ||
+    cycle?.phase === "FIGHTING" ||
+    cycle?.phase === "RESOLUTION"
+  );
+}
+
+function isWithinVisualChangeGraceWindow(
+  cycle: StreamingDuelCycle | null,
+  nowMs: number,
+): boolean {
+  if (!cycle || !phaseNeedsVisualChange(cycle)) {
+    return false;
+  }
+
+  return Math.max(0, nowMs - cycle.phaseStartTime) < VISUAL_CHANGE_GRACE_MS;
+}
+
+function deriveMetricsDegradedReason(params: {
+  cycle: StreamingDuelCycle | null;
+  metrics: NormalizedRendererMetrics | null;
+  hlsManifest: NormalizedHlsManifest | null;
+  nowMs: number;
+  externalStatusMaxAgeMs: number;
+  minEncodeFps: number;
+}): string | null {
+  const {
+    cycle,
+    metrics,
+    hlsManifest,
+    nowMs,
+    externalStatusMaxAgeMs,
+    minEncodeFps,
+  } = params;
+  if (!phaseNeedsLiveRender(cycle)) {
+    return null;
+  }
+  if (!metrics && !hlsManifest) {
+    return null;
+  }
+  if (metrics != null) {
+    const renderTickAgeMs =
+      metrics.latestRenderTickAt != null
+        ? Math.max(0, nowMs - metrics.latestRenderTickAt)
+        : null;
+    if (renderTickAgeMs == null || renderTickAgeMs > RENDER_TICK_STALE_MS) {
+      return "render_tick_stale";
+    }
+
+    if (!phaseNeedsVisualChange(cycle)) {
+      return null;
+    }
+
+    const withinVisualChangeGraceWindow = isWithinVisualChangeGraceWindow(
+      cycle,
+      nowMs,
+    );
+    if (
+      !withinVisualChangeGraceWindow &&
+      (metrics.visualChangeAgeMs == null ||
+        metrics.visualChangeAgeMs >= VISUAL_CHANGE_STALE_MS)
+    ) {
+      return "visual_change_stale";
+    }
+    // captureFps is raw browser compositor ingress. In CDP mode we intentionally
+    // throttle source frames and repeat the latest valid frame to keep encoder
+    // cadence stable, so content freshness and encodeFps are the hard gates.
+    if (metrics.encodeFps != null && metrics.encodeFps < minEncodeFps) {
+      return "encoder_fps_low";
+    }
+
+    return null;
+  }
+
+  const manifestFresh = isFreshHlsManifest({
+    hlsManifest,
+    nowMs,
+    freshnessMs: externalStatusMaxAgeMs,
+  });
+  if (!manifestFresh) {
+    return "manifest_stale";
+  }
+
+  return null;
+}
+
 export function deriveBettingRendererHealth(
   cycle: StreamingDuelCycle | null,
   options?: {
     externalStatusSnapshot?: ExternalRtmpStatusSnapshot | null;
     externalStatusMaxAgeMs?: number;
     nowMs?: number;
+    localHlsManifest?: HlsManifestSnapshot | null;
     captureStats?: {
       clientConnected: boolean;
       ffmpegRunning: boolean;
@@ -71,6 +250,7 @@ export function deriveBettingRendererHealth(
   },
 ): BettingFeedRendererHealth {
   const updatedAt = options?.nowMs ?? Date.now();
+  const externalStatusMaxAgeMs = options?.externalStatusMaxAgeMs ?? 15_000;
   const guardrailReason = deriveCycleGuardrailReason(cycle);
   if (guardrailReason) {
     return {
@@ -84,15 +264,36 @@ export function deriveBettingRendererHealth(
   const externalRendererHealth = normalizeRendererHealthSnapshot(
     externalSnapshot?.rendererHealth,
   );
+  const externalRendererMetrics = normalizeRendererMetrics(
+    externalSnapshot?.metrics,
+  );
+  const externalHlsManifest =
+    normalizeHlsManifest(externalSnapshot?.hlsManifest) ??
+    normalizeHlsManifest(options?.localHlsManifest);
+  const minEncodeFps = resolveMinEncodeFps(
+    resolveTargetEncodeFps(externalSnapshot),
+  );
+  const metricsReason = deriveMetricsDegradedReason({
+    cycle,
+    metrics: externalRendererMetrics,
+    hlsManifest: externalHlsManifest,
+    nowMs: updatedAt,
+    externalStatusMaxAgeMs,
+    minEncodeFps,
+  });
+
   if (externalRendererHealth) {
+    const healthSnapshotUpdatedAt =
+      asFiniteNumber(externalSnapshot?.updatedAt) ??
+      externalRendererHealth.updatedAt;
     const ageMs =
-      externalRendererHealth.updatedAt != null
-        ? Math.max(0, updatedAt - externalRendererHealth.updatedAt)
+      healthSnapshotUpdatedAt != null
+        ? Math.max(0, updatedAt - healthSnapshotUpdatedAt)
         : null;
     if (
-      externalRendererHealth.updatedAt != null &&
+      healthSnapshotUpdatedAt != null &&
       ageMs != null &&
-      ageMs > (options?.externalStatusMaxAgeMs ?? 15_000)
+      ageMs > externalStatusMaxAgeMs
     ) {
       return {
         ready: false,
@@ -100,7 +301,63 @@ export function deriveBettingRendererHealth(
         updatedAt,
       };
     }
-    return externalRendererHealth;
+
+    if (metricsReason) {
+      return {
+        ready: false,
+        degradedReason: metricsReason,
+        updatedAt,
+      };
+    }
+
+    if (
+      !externalRendererHealth.ready &&
+      externalRendererHealth.degradedReason &&
+      externalRendererHealth.degradedReason !== "renderer_health_stale"
+    ) {
+      return {
+        ...externalRendererHealth,
+        updatedAt: healthSnapshotUpdatedAt,
+      };
+    }
+
+    if (externalRendererHealth.ready || !phaseNeedsVisualChange(cycle)) {
+      return {
+        ...externalRendererHealth,
+        updatedAt: healthSnapshotUpdatedAt,
+      };
+    }
+
+    if (externalRendererMetrics || externalHlsManifest) {
+      return {
+        ready: true,
+        degradedReason: null,
+        updatedAt:
+          externalRendererHealth.updatedAt ??
+          externalHlsManifest?.updatedAt ??
+          updatedAt,
+      };
+    }
+  } else if (metricsReason) {
+    return {
+      ready: false,
+      degradedReason: metricsReason,
+      updatedAt,
+    };
+  }
+
+  if (
+    isFreshHlsManifest({
+      hlsManifest: externalHlsManifest,
+      nowMs: updatedAt,
+      freshnessMs: externalStatusMaxAgeMs,
+    })
+  ) {
+    return {
+      ready: true,
+      degradedReason: null,
+      updatedAt: externalHlsManifest?.updatedAt ?? updatedAt,
+    };
   }
 
   const captureStats = options?.captureStats ?? getStreamCapture().getStats();
diff --git a/packages/server/src/routes/streaming-betting-routes.ts b/packages/server/src/routes/streaming-betting-routes.ts
index 5d489ebd2..d3b778f63 100644
--- a/packages/server/src/routes/streaming-betting-routes.ts
+++ b/packages/server/src/routes/streaming-betting-routes.ts
@@ -13,9 +13,11 @@ import {
   buildBettingFeedPayload,
   selectReplayDelivery,
   type BettingFeedFrame,
+  type BettingFeedRendererMetrics,
   type BettingFeedRendererHealth,
 } from "./streaming-betting-feed.js";
 import {
+  assertSafeBettingFeedAuthConfig,
   extractBettingFeedToken,
   hasValidBettingFeedToken,
   resolveBettingFeedAccessToken,
@@ -23,7 +25,48 @@ import {
 } from "./streaming-betting-auth.js";
 import { trimReplayFrames } from "./streaming-sse-buffer.js";
 import { deriveBettingRendererHealth } from "./streaming-betting-health.js";
-import { acquireExternalStatusPoller } from "./streaming-external-status.js";
+import {
+  acquireExternalStatusPoller,
+  type ExternalRtmpDestination,
+  type ExternalRtmpStatusSnapshot,
+} from "./streaming-external-status.js";
+import { deriveStreamSourceRuntime } from "./streaming-source-runtime.js";
+import { acquirePlaybackProbePoller } from "../streaming/destination-probe.js";
+import {
+  buildStreamDestinationId,
+  inferStreamDeliveryTransport,
+  normalizeStreamDestinationProvider,
+  resolveExternalStreamDeliveryInfo,
+  resolveSelfHostedStreamPlaybackUrl,
+  resolveStreamCanonicalProviderPriority,
+  resolveStreamDeliveryInfo,
+  resolveStreamFailbackSoakMs,
+  resolveStreamPresentationDelayMs,
+  type StreamCanonicalProvider,
+  type StreamChannelState,
+  type StreamDestinationState,
+  type StreamManifestStatus,
+  type StreamPublicReadiness,
+} from "../streaming/delivery-config.js";
+import type { StreamSourceRuntime } from "../streaming/source-runtime.js";
+import { readLocalHlsManifestSnapshot } from "../streaming/stream-status-artifacts.js";
+import {
+  loadPersistedStreamingAuthorityState,
+  persistCloudflareLifecyclePollState,
+  persistCloudflarePlaybackProbeState,
+  persistCloudflareReconciliationState,
+  persistCanonicalProviderState,
+  persistCloudflareLifecycleState,
+  persistCloudflareWebhookState,
+  reconcileCloudflareAuthority,
+  summarizeCloudflareLiveWebhook,
+  verifyCloudflareWebhookSecret,
+  type PersistedCanonicalProviderState,
+  type PersistedCloudflareLifecyclePollState,
+  type PersistedCloudflarePlaybackProbeState,
+  type PersistedCloudflareReconciliationState,
+  type PersistedStreamingAuthorityState,
+} from "../streaming/cloudflare-authority.js";
 
 // Re-exports so existing consumers (streaming.ts, tests) don't need import changes.
 export { deriveBettingRendererHealth } from "./streaming-betting-health.js";
@@ -68,7 +111,34 @@ type BettingRouteMetrics = {
   };
 };
 
+type CanonicalCandidateState = {
+  provider: StreamCanonicalProvider;
+  destination: StreamDestinationState;
+  publicReadiness: StreamPublicReadiness;
+  ready: boolean;
+};
+
+type CurrentChannelSnapshot = {
+  channel: StreamChannelState;
+  canonicalAuthority: PersistedCloudflareReconciliationState | null;
+};
+
+type CanonicalProviderSelectionState = {
+  activeProvider: StreamCanonicalProvider | null;
+  primaryHealthySince: number | null;
+};
+
+const REQUIRE_EXTERNAL_SOURCE_RUNTIME =
+  process.env.STREAM_SOURCE_RUNTIME_REQUIRE_EXTERNAL === "true" ||
+  process.env.NODE_ENV === "production";
+const CLOUDFLARE_WEBHOOK_RATE_LIMIT: RateLimitOptions = {
+  max: 180,
+  timeWindow: "1 minute",
+};
 type SseSendStatus = "ok" | "closed" | "slow" | "error";
+type RateLimitedFastify = FastifyInstance & {
+  rateLimit: NonNullable<FastifyInstance["rateLimit"]>;
+};
 
 type DatabaseSystemLike = Pick<DatabaseSystem, "getDb">;
 
@@ -83,6 +153,21 @@ function formatSseEvent(event: string, data: string, id?: number): string {
   return `${idLine}event: ${event}\ndata: ${normalizedData}\n\n`;
 }
 
+function automaticFailoverEnabled(): boolean {
+  return process.env.STREAM_ENABLE_AUTOMATIC_FAILOVER === "true";
+}
+
+function ensureRateLimitDecorator(
+  fastify: FastifyInstance,
+): asserts fastify is RateLimitedFastify {
+  if (typeof fastify.rateLimit === "function") {
+    return;
+  }
+  throw new Error(
+    "Streaming betting routes require @fastify/rate-limit to be registered before route setup",
+  );
+}
+
 export function normalizeInternalAllowedOrigin(
   value: string | null | undefined,
 ): string | null {
@@ -134,10 +219,21 @@ export function allocateNextBettingClientId(
 ): BettingClientIdAllocation {
   const activeIds = new Set(activeClientIds);
   const maxClientId = Number.MAX_SAFE_INTEGER - 1;
-  let clientId = nextCursor;
+  let clientId =
+    Number.isSafeInteger(nextCursor) &&
+    nextCursor >= 1 &&
+    nextCursor <= maxClientId
+      ? nextCursor
+      : 1;
   let wrapped = false;
+  let attempts = 0;
+  const maxAttempts = activeIds.size + 1;
 
   while (activeIds.has(clientId)) {
+    attempts += 1;
+    if (attempts > maxAttempts) {
+      throw new Error("No betting SSE client ids available");
+    }
     clientId += 1;
     if (clientId > maxClientId) {
       clientId = 1;
@@ -178,6 +274,8 @@ export function registerStreamingBettingRoutes(
     getStreamingDuelScheduler: getStreamingDuelSchedulerOverride,
     getStreamCaptureStats,
   } = options;
+  ensureRateLimitDecorator(fastify);
+  assertSafeBettingFeedAuthConfig(process.env);
 
   const tokenResolution = resolveBettingFeedAccessToken(process.env);
   const skipAuth = shouldSkipBettingFeedAuth(process.env);
@@ -185,19 +283,57 @@ export function registerStreamingBettingRoutes(
   const viewerTokenConfigured = Boolean(
     process.env.STREAMING_VIEWER_ACCESS_TOKEN?.trim(),
   );
+  const cloudflareLiveInputId =
+    process.env.STREAM_CLOUDFLARE_LIVE_INPUT_ID?.trim() || null;
   const getScheduler =
     getStreamingDuelSchedulerOverride ?? getStreamingDuelScheduler;
   const externalStatusPoller = acquireExternalStatusPoller(
     externalStatusFile,
     externalStatusMaxAgeMs,
   );
+  const configuredDelivery = resolveStreamDeliveryInfo(process.env);
+  const configuredProviderPriority = resolveStreamCanonicalProviderPriority(
+    process.env,
+  );
+  const configuredFailbackSoakMs = resolveStreamFailbackSoakMs(process.env);
+  const configuredPresentationDelayMs = resolveStreamPresentationDelayMs(
+    process.env,
+    configuredDelivery.mode,
+  );
+  const configuredSelfHostedPlaybackUrl = resolveSelfHostedStreamPlaybackUrl(
+    process.env,
+  );
+  const configuredCanonicalProvider =
+    configuredDelivery.mode === "self_hls"
+      ? "self_hls"
+      : normalizeStreamDestinationProvider(
+          configuredDelivery.provider,
+          "Cloudflare",
+        );
+  const configuredCanonicalDestinationId = buildStreamDestinationId({
+    role: "canonical",
+    provider: configuredCanonicalProvider,
+    name: "External Delivery",
+  });
+  const configuredExternalPlaybackUrl = resolveExternalStreamDeliveryInfo(
+    process.env,
+  ).playbackUrl;
+  const externalPlaybackProbePoller = acquirePlaybackProbePoller(
+    configuredExternalPlaybackUrl,
+    {
+      intervalMs: Math.max(2_000, Math.min(externalStatusMaxAgeMs, 5_000)),
+      timeoutMs: Math.min(externalStatusMaxAgeMs, 4_000),
+    },
+  );
   if (!tokenResolution.token && process.env.NODE_ENV === "production") {
     fastify.log.warn(
       "BETTING_FEED_ACCESS_TOKEN is unset in production; internal betting feed will fail closed",
     );
   } else if (!tokenResolution.token && skipAuth) {
-    fastify.log.warn(
-      "BETTING_FEED_SKIP_AUTH=true with no betting-feed token configured; internal betting feed auth bypass is enabled for development use only",
+    // Log at error severity so the auth-bypass state is impossible to miss
+    // even during normal startup log volume.
+    fastify.log.error(
+      "BETTING_FEED_SKIP_AUTH=true AND NODE_ENV=development — internal betting feed is serving UNAUTHENTICATED. This must never land in production.",
     );
   } else if (!tokenResolution.token && viewerTokenConfigured) {
     fastify.log.warn(
@@ -212,6 +348,25 @@ export function registerStreamingBettingRoutes(
       "STREAMING_VIEWER_ACCESS_TOKEN remains separate from internal betting feed auth; BETTING_FEED_ACCESS_TOKEN is the canonical betting secret",
     );
   }
+  const canonicalProviderSelectionState: CanonicalProviderSelectionState = {
+    activeProvider: null,
+    primaryHealthySince: null,
+  };
+  let canonicalProviderSelectionHydrated = false;
+  let canonicalProviderSelectionHydration: Promise<void> | null = null;
+  // Exponential backoff for failed hydration attempts. Without this, a failing
+  // DB causes every betting-feed tick to retry immediately, hammering the
+  // backend. Start at 1s and double up to 60s; reset on success.
+  let canonicalProviderHydrationFailures = 0;
+  let canonicalProviderHydrationNextAttemptAt = 0;
+  const HYDRATION_MIN_BACKOFF_MS = 1_000;
+  const HYDRATION_MAX_BACKOFF_MS = 60_000;
+  let persistedAuthorityStateCache: PersistedStreamingAuthorityState | null =
+    null;
+  let lastPersistedCanonicalProviderStateJson: string | null = null;
+  let lastPersistedCloudflareLifecyclePollJson: string | null = null;
+  let lastPersistedCloudflarePlaybackProbeJson: string | null = null;
+  let lastPersistedCloudflareReconciliationJson: string | null = null;
   if (internalAllowedOrigin && !allowedOrigin) {
     fastify.log.warn(
       {
@@ -279,6 +434,7 @@ export function registerStreamingBettingRoutes(
     }
     closed = true;
     clearBettingLoops();
+    externalPlaybackProbePoller?.release();
     externalStatusPoller?.release();
     for (const clientId of [...bettingClients.keys()]) {
       removeBettingClient(clientId);
@@ -306,6 +462,197 @@ export function registerStreamingBettingRoutes(
   const getDatabaseSystem = (): DatabaseSystemLike | null =>
     (world.getSystem("database") ?? null) as DatabaseSystemLike | null;
 
+  const getStorageDb = () => getDatabaseSystem()?.getDb?.();
+
+  const persistCanonicalProviderSelection = (): void => {
+    if (!canonicalProviderSelectionHydrated) {
+      return;
+    }
+    const activeProvider =
+      canonicalProviderSelectionState.activeProvider === "cloudflare_stream" ||
+      canonicalProviderSelectionState.activeProvider === "self_hls"
+        ? canonicalProviderSelectionState.activeProvider
+        : null;
+    const comparisonPayload = JSON.stringify({
+      activeProvider,
+      primaryHealthySince: canonicalProviderSelectionState.primaryHealthySince,
+    });
+    if (comparisonPayload === lastPersistedCanonicalProviderStateJson) {
+      return;
+    }
+    lastPersistedCanonicalProviderStateJson = comparisonPayload;
+    const state: PersistedCanonicalProviderState = {
+      activeProvider,
+      primaryHealthySince: canonicalProviderSelectionState.primaryHealthySince,
+      updatedAt: Date.now(),
+    };
+    getPersistedAuthorityState().canonicalProviderState = state;
+    void persistCanonicalProviderState(getStorageDb(), state).catch((error) => {
+      lastPersistedCanonicalProviderStateJson = null;
+      fastify.log.warn(
+        {
+          err: error,
+          activeProvider: state.activeProvider,
+        },
+        "[streaming-betting] Failed to persist canonical provider state",
+      );
+    });
+  };
+
+  const ensureCanonicalProviderSelectionHydrated = async (): Promise<void> => {
+    if (canonicalProviderSelectionHydrated) {
+      return;
+    }
+    if (canonicalProviderSelectionHydration) {
+      return canonicalProviderSelectionHydration;
+    }
+    if (Date.now() < canonicalProviderHydrationNextAttemptAt) {
+      // Backoff window from a prior failure is still active; callers see
+      // unhydrated state and will retry on their next tick.
+      return;
+    }
+
+    canonicalProviderSelectionHydration = (async () => {
+      try {
+        const persisted =
+          await loadPersistedStreamingAuthorityState(getStorageDb());
+        persistedAuthorityStateCache = persisted;
+        const state = persisted.canonicalProviderState;
+        if (state) {
+          canonicalProviderSelectionState.activeProvider =
+            state.activeProvider === "cloudflare_stream" ||
+            state.activeProvider === "self_hls"
+              ? state.activeProvider
+              : null;
+          canonicalProviderSelectionState.primaryHealthySince =
+            typeof state.primaryHealthySince === "number" &&
+            Number.isFinite(state.primaryHealthySince)
+              ? state.primaryHealthySince
+              : null;
+          lastPersistedCanonicalProviderStateJson = JSON.stringify({
+            activeProvider: canonicalProviderSelectionState.activeProvider,
+            primaryHealthySince:
+              canonicalProviderSelectionState.primaryHealthySince,
+          });
+        }
+        lastPersistedCloudflareLifecyclePollJson =
+          persisted.cloudflareLifecyclePoll
+            ? JSON.stringify(persisted.cloudflareLifecyclePoll)
+            : null;
+        lastPersistedCloudflarePlaybackProbeJson =
+          persisted.cloudflarePlaybackProbe
+            ? JSON.stringify(persisted.cloudflarePlaybackProbe)
+            : null;
+        lastPersistedCloudflareReconciliationJson =
+          persisted.cloudflareReconciliation
+            ? JSON.stringify(persisted.cloudflareReconciliation)
+            : null;
+        canonicalProviderSelectionHydrated = true;
+        canonicalProviderHydrationFailures = 0;
+        canonicalProviderHydrationNextAttemptAt = 0;
+      } catch (error) {
+        canonicalProviderHydrationFailures += 1;
+        const backoff = Math.min(
+          HYDRATION_MAX_BACKOFF_MS,
+          HYDRATION_MIN_BACKOFF_MS *
+            2 ** (canonicalProviderHydrationFailures - 1),
+        );
+        canonicalProviderHydrationNextAttemptAt = Date.now() + backoff;
+        console.warn(
+          `[streaming-betting] Failed to hydrate canonical provider selection; retrying in ${backoff}ms (failures=${canonicalProviderHydrationFailures})`,
+          error,
+        );
+      } finally {
+        canonicalProviderSelectionHydration = null;
+      }
+    })();
+
+    return canonicalProviderSelectionHydration;
+  };
+
+  void ensureCanonicalProviderSelectionHydrated();
+
+  const getPersistedAuthorityState = (): PersistedStreamingAuthorityState => {
+    if (persistedAuthorityStateCache) {
+      return persistedAuthorityStateCache;
+    }
+    persistedAuthorityStateCache = {
+      canonicalProviderState: null,
+      cloudflareLifecycle: null,
+      cloudflareLastWebhook: null,
+      cloudflareLifecyclePoll: null,
+      cloudflarePlaybackProbe: null,
+      cloudflareReconciliation: null,
+    };
+    return persistedAuthorityStateCache;
+  };
+
+  const persistCloudflareLifecyclePollSnapshot = (
+    state: PersistedCloudflareLifecyclePollState | null,
+  ): void => {
+    if (!state) {
+      return;
+    }
+    const comparisonPayload = JSON.stringify(state);
+    if (comparisonPayload === lastPersistedCloudflareLifecyclePollJson) {
+      return;
+    }
+    lastPersistedCloudflareLifecyclePollJson = comparisonPayload;
+    getPersistedAuthorityState().cloudflareLifecyclePoll = state;
+    void persistCloudflareLifecyclePollState(getStorageDb(), state).catch(
+      (error) => {
+        lastPersistedCloudflareLifecyclePollJson = null;
+        fastify.log.warn(
+          { err: error },
+          "[streaming-betting] Failed to persist Cloudflare lifecycle poll state",
+        );
+      },
+    );
+  };
+
+  const persistCloudflarePlaybackProbeSnapshot = (
+    state: PersistedCloudflarePlaybackProbeState | null,
+  ): void => {
+    if (!state) {
+      return;
+    }
+    const comparisonPayload = JSON.stringify(state);
+    if (comparisonPayload === lastPersistedCloudflarePlaybackProbeJson) {
+      return;
+    }
+    lastPersistedCloudflarePlaybackProbeJson = comparisonPayload;
+    getPersistedAuthorityState().cloudflarePlaybackProbe = state;
+    void persistCloudflarePlaybackProbeState(getStorageDb(), state).catch(
+      (error) => {
+        lastPersistedCloudflarePlaybackProbeJson = null;
+        fastify.log.warn(
+          { err: error },
+          "[streaming-betting] Failed to persist Cloudflare playback probe state",
+        );
+      },
+    );
+  };
+
+  const persistCloudflareReconciliationSnapshot = (
+    state: PersistedCloudflareReconciliationState,
+  ): void => {
+    const comparisonPayload = JSON.stringify(state);
+    if (comparisonPayload === lastPersistedCloudflareReconciliationJson) {
+      return;
+    }
+    lastPersistedCloudflareReconciliationJson = comparisonPayload;
+    getPersistedAuthorityState().cloudflareReconciliation = state;
+    void persistCloudflareReconciliationState(getStorageDb(), state).catch(
+      (error) => {
+        lastPersistedCloudflareReconciliationJson = null;
+        fastify.log.warn(
+          { err: error },
+          "[streaming-betting] Failed to persist Cloudflare reconciliation state",
+        );
+      },
+    );
+  };
+
   const persistBettingSourceEpoch = async (epoch: number): Promise<void> => {
     const db = getDatabaseSystem()?.getDb?.();
     if (!db) return;
@@ -383,29 +730,967 @@ export function registerStreamingBettingRoutes(
   const currentRendererHealthSnapshot = (
     cycle: StreamingDuelCycle | null,
     nowMs?: number,
-  ): BettingFeedRendererHealth =>
-    deriveBettingRendererHealth(cycle, {
+  ): BettingFeedRendererHealth => {
+    const localHlsManifest = readLocalHlsManifestSnapshot(process.env);
+    return deriveBettingRendererHealth(cycle, {
       externalStatusSnapshot: externalStatusPoller?.getSnapshot() ?? null,
       externalStatusMaxAgeMs,
       nowMs,
+      localHlsManifest,
       captureStats: getStreamCaptureStats?.() ?? undefined,
     });
+  };
+
+  const currentRendererMetricsSnapshot =
+    (): BettingFeedRendererMetrics | null => {
+      const metrics = externalStatusPoller?.getSnapshot()?.metrics;
+      const hlsManifest =
+        externalStatusPoller?.getSnapshot()?.hlsManifest ??
+        readLocalHlsManifestSnapshot(process.env);
+      const hasHlsManifest =
+        typeof hlsManifest?.updatedAt === "number" ||
+        typeof hlsManifest?.mediaSequence === "number";
+      if (!metrics && !hasHlsManifest) {
+        return null;
+      }
+      return {
+        captureFps:
+          typeof metrics?.captureFps === "number" ? metrics.captureFps : null,
+        encodeFps:
+          typeof metrics?.encodeFps === "number" ? metrics.encodeFps : null,
+        droppedFrames:
+          typeof metrics?.droppedFrames === "number"
+            ? metrics.droppedFrames
+            : null,
+        renderTick:
+          typeof metrics?.renderTick === "number" ? metrics.renderTick : null,
+        duelStateTick:
+          typeof metrics?.duelStateTick === "number"
+            ? metrics.duelStateTick
+            : null,
+        latestFrameAt:
+          typeof metrics?.latestFrameAt === "number"
+            ? metrics.latestFrameAt
+            : null,
+        latestRenderTickAt:
+          typeof metrics?.latestRenderTickAt === "number"
+            ? metrics.latestRenderTickAt
+            : null,
+        latestDuelStateTickAt:
+          typeof metrics?.latestDuelStateTickAt === "number"
+            ? metrics.latestDuelStateTickAt
+            : null,
+        latestVisualChangeAt:
+          typeof metrics?.latestVisualChangeAt === "number"
+            ? metrics.latestVisualChangeAt
+            : null,
+        visualChangeAgeMs:
+          typeof metrics?.visualChangeAgeMs === "number"
+            ? metrics.visualChangeAgeMs
+            : null,
+        hlsManifest: hasHlsManifest
+          ? {
+              updatedAt:
+                typeof hlsManifest.updatedAt === "number"
+                  ? hlsManifest.updatedAt
+                  : null,
+              mediaSequence:
+                typeof hlsManifest.mediaSequence === "number"
+                  ? hlsManifest.mediaSequence
+                  : null,
+            }
+          : null,
+      };
+    };
+
+  const currentSourceRuntimeSnapshot = (
+    cycle: StreamingDuelCycle | null,
+    nowMs?: number,
+    rendererHealth?: BettingFeedRendererHealth | null,
+  ): StreamSourceRuntime => {
+    const localHlsManifest = readLocalHlsManifestSnapshot(process.env);
+    return deriveStreamSourceRuntime({
+      externalStatusSnapshot: externalStatusPoller?.getSnapshot() ?? null,
+      externalStatusMaxAgeMs,
+      rendererHealth:
+        rendererHealth ?? currentRendererHealthSnapshot(cycle, nowMs),
+      localHlsManifest,
+      captureStats: getStreamCaptureStats?.() ?? undefined,
+      nowMs,
+      requireExternalWorker: REQUIRE_EXTERNAL_SOURCE_RUNTIME,
+    });
+  };
+
+  const resolveSnapshotUpdatedAt = (
+    value: number | null | undefined,
+    fallbackUpdatedAt: number,
+  ): number => {
+    return typeof value === "number" && Number.isFinite(value)
+      ? value
+      : fallbackUpdatedAt;
+  };
+
+  const isSnapshotFresh = (
+    updatedAt: number | null | undefined,
+    nowMs: number,
+  ): boolean => {
+    return (
+      typeof updatedAt === "number" &&
+      Number.isFinite(updatedAt) &&
+      Math.max(0, nowMs - updatedAt) <= externalStatusMaxAgeMs
+    );
+  };
+
+  const resolveManifestStatusFromUpdatedAt = (
+    updatedAt: number | null | undefined,
+    nowMs: number,
+  ): StreamManifestStatus => {
+    if (typeof updatedAt !== "number" || !Number.isFinite(updatedAt)) {
+      return "missing";
+    }
+    return isSnapshotFresh(updatedAt, nowMs) ? "ok" : "stale";
+  };
+
+  const resolveExternalDeliveryReason = (params: {
+    nowMs: number;
+    externalSnapshot: ExternalRtmpStatusSnapshot | null;
+    destination: ExternalRtmpDestination | null;
+    playbackUrl: string | null;
+  }): string | null => {
+    const probeSnapshot = externalPlaybackProbePoller?.getSnapshot() ?? null;
+
+    if (!params.playbackUrl) {
+      return "playback_unconfigured";
+    }
+    if (!params.externalSnapshot) {
+      return "delivery_status_unavailable";
+    }
+
+    const snapshotUpdatedAt = resolveSnapshotUpdatedAt(
+      params.externalSnapshot.updatedAt,
+      params.nowMs,
+    );
+    if (!isSnapshotFresh(snapshotUpdatedAt, params.nowMs)) {
+      return "delivery_status_stale";
+    }
+    if (
+      params.externalSnapshot.active !== true ||
+      params.externalSnapshot.ffmpegRunning !== true
+    ) {
+      return "delivery_pipeline_inactive";
+    }
+    if (!params.destination) {
+      return "delivery_destination_missing";
+    }
+    if (probeSnapshot?.ready === true) {
+      return null;
+    }
+    if (params.destination.connected !== true) {
+      return "delivery_disconnected";
+    }
+    if (
+      params.externalSnapshot.stats?.healthy === false ||
+      (typeof params.destination.error === "string" &&
+        params.destination.error.trim().length > 0)
+    ) {
+      return "delivery_unhealthy";
+    }
+    if (!probeSnapshot) {
+      return "delivery_status_unavailable";
+    }
+    if (probeSnapshot.ready) {
+      return null;
+    }
+    if (probeSnapshot.manifestStatus === "missing") {
+      return "manifest_not_ready";
+    }
+    if (probeSnapshot.manifestStatus === "stale") {
+      return "manifest_stale";
+    }
+    return "delivery_unhealthy";
+  };
+
+  const findCanonicalExternalDestination = (
+    externalSnapshot: ExternalRtmpStatusSnapshot | null,
+  ): ExternalRtmpDestination | null => {
+    if (!externalSnapshot) {
+      return null;
+    }
+
+    const destinations = Array.isArray(externalSnapshot.destinations)
+      ? externalSnapshot.destinations
+      : [];
+    return (
+      destinations.find((destination) => destination.role === "canonical") ??
+      destinations.find(
+        (destination) => destination.id === configuredCanonicalDestinationId,
+      ) ??
+      destinations.find(
+        (destination) =>
+          normalizeStreamDestinationProvider(
+            destination.provider ?? null,
+            destination.name ?? null,
+          ) === configuredCanonicalProvider,
+      ) ??
+      destinations.find((destination) =>
+        (destination.name ?? "")
+          .trim()
+          .toLowerCase()
+          .includes("external delivery"),
+      ) ??
+      null
+    );
+  };
+
+  const buildSelfHostedDestination = (params: {
+    role: "canonical" | "fallback";
+    nowMs: number;
+  }): StreamDestinationState => {
+    const localManifest =
+      externalStatusPoller?.getSnapshot()?.hlsManifest ??
+      readLocalHlsManifestSnapshot(process.env);
+    const manifestUpdatedAt =
+      typeof localManifest?.updatedAt === "number" &&
+      Number.isFinite(localManifest.updatedAt)
+        ? localManifest.updatedAt
+        : null;
+    const manifestStatus = resolveManifestStatusFromUpdatedAt(
+      manifestUpdatedAt,
+      params.nowMs,
+    );
+    const playbackReady = manifestStatus === "ok";
+
+    return {
+      id: buildStreamDestinationId({
+        role: params.role,
+        provider: "self_hls",
+        name: "Self-HLS",
+      }),
+      name: "Self-HLS",
+      role: params.role,
+      provider: "self_hls",
+      transport: "hls",
+      playbackUrl: configuredSelfHostedPlaybackUrl,
+      ingestUrl: null,
+      connected: playbackReady,
+      transportHealthy: playbackReady,
+      playbackReady,
+      manifestStatus,
+      lastError: playbackReady
+        ? null
+        : manifestStatus === "stale"
+          ? "manifest_stale"
+          : "manifest_not_ready",
+      updatedAt: manifestUpdatedAt,
+    };
+  };
+
+  const buildExternalDeliveryCandidate = (params: {
+    role: "canonical" | "fallback";
+    nowMs: number;
+    sourceRuntime: StreamSourceRuntime;
+  }): CanonicalCandidateState | null => {
+    if (
+      !configuredExternalPlaybackUrl &&
+      configuredDelivery.mode !== "external_hls"
+    ) {
+      return null;
+    }
+    const externalSnapshot = externalStatusPoller?.getSnapshot() ?? null;
+    const externalDestination =
+      findCanonicalExternalDestination(externalSnapshot);
+    const probeSnapshot = externalPlaybackProbePoller?.getSnapshot() ?? null;
+    const playbackUrl =
+      externalDestination?.playbackUrl ??
+      configuredDelivery.playbackUrl ??
+      configuredDelivery.llhlsUrl ??
+      configuredDelivery.hlsUrl ??
+      null;
+    const ingestUrl =
+      externalDestination?.ingestUrl ?? configuredDelivery.ingestUrl ?? null;
+    const snapshotUpdatedAt = externalSnapshot
+      ? resolveSnapshotUpdatedAt(externalSnapshot.updatedAt, params.nowMs)
+      : params.nowMs;
+    const probeReady = probeSnapshot?.ready === true;
+    const destinationConnected =
+      externalDestination?.connected === true || probeReady;
+    const destinationError =
+      typeof externalDestination?.error === "string"
+        ? externalDestination.error.trim()
+        : null;
+    const updatedAt = resolveSnapshotUpdatedAt(
+      probeSnapshot?.updatedAt ??
+        externalDestination?.startedAt ??
+        externalSnapshot?.updatedAt,
+      params.nowMs,
+    );
+    const lastFatalWriteAt =
+      typeof externalSnapshot?.captureDiagnostics?.lastFatalWriteError?.at ===
+        "number" &&
+      Number.isFinite(
+        externalSnapshot.captureDiagnostics.lastFatalWriteError.at,
+      )
+        ? externalSnapshot.captureDiagnostics.lastFatalWriteError.at
+        : null;
+    const freshestSourceIncidentAt = Math.max(
+      lastFatalWriteAt ?? Number.NEGATIVE_INFINITY,
+      params.sourceRuntime.workerHeartbeatAt ?? Number.NEGATIVE_INFINITY,
+    );
+    const contradictorySourceError =
+      probeReady &&
+      params.sourceRuntime.ready !== true &&
+      (!Number.isFinite(freshestSourceIncidentAt) ||
+        freshestSourceIncidentAt >= updatedAt);
+    const transportHealthy =
+      params.sourceRuntime.ready === true &&
+      externalSnapshot != null &&
+      isSnapshotFresh(snapshotUpdatedAt, params.nowMs) &&
+      externalSnapshot.active === true &&
+      externalSnapshot.ffmpegRunning === true &&
+      externalSnapshot.stats?.healthy !== false &&
+      destinationConnected &&
+      probeReady &&
+      !contradictorySourceError;
+    const reason = resolveExternalDeliveryReason({
+      nowMs: params.nowMs,
+      externalSnapshot,
+      destination: externalDestination,
+      playbackUrl,
+    });
+
+    const publicReadiness: StreamPublicReadiness = {
+      ready: reason == null,
+      reason,
+      updatedAt,
+    };
+
+    return {
+      provider: "cloudflare_stream",
+      destination: {
+        id: buildStreamDestinationId({
+          role: params.role,
+          provider: "cloudflare_stream",
+          name: externalDestination?.name ?? "Cloudflare Stream",
+        }),
+        name: externalDestination?.name ?? "Cloudflare Stream",
+        role: params.role,
+        provider: externalDestination
+          ? normalizeStreamDestinationProvider(
+              externalDestination.provider ?? configuredDelivery.provider,
+              externalDestination.name ?? "External Delivery",
+            )
+          : configuredCanonicalProvider,
+        transport:
+          externalDestination?.transport ??
+          inferStreamDeliveryTransport({
+            playbackUrl,
+            ingestUrl,
+          }),
+        playbackUrl,
+        ingestUrl,
+        connected: destinationConnected,
+        transportHealthy,
+        playbackReady: probeReady,
+        manifestStatus:
+          probeSnapshot?.manifestStatus ??
+          (playbackUrl ? "unknown" : "missing"),
+        lastError: probeReady
+          ? contradictorySourceError
+            ? (params.sourceRuntime.degradedReason ??
+              destinationError ??
+              reason)
+            : null
+          : (destinationError ?? probeSnapshot?.lastError ?? reason),
+        updatedAt,
+      },
+      publicReadiness,
+      ready: publicReadiness.ready === true,
+    };
+  };
+
+  const buildSelfHostedCandidate = (params: {
+    role: "canonical" | "fallback";
+    nowMs: number;
+    sourceRuntime: StreamSourceRuntime;
+  }): CanonicalCandidateState => {
+    const destination = buildSelfHostedDestination({
+      role: params.role,
+      nowMs: params.nowMs,
+    });
+    const publicReadiness =
+      params.sourceRuntime.ready === true
+        ? {
+            ready: destination.playbackReady,
+            reason: destination.lastError,
+            updatedAt: destination.updatedAt,
+          }
+        : {
+            ready: false,
+            reason: params.sourceRuntime.degradedReason,
+            updatedAt:
+              params.sourceRuntime.workerHeartbeatAt ?? destination.updatedAt,
+          };
+
+    return {
+      provider: "self_hls",
+      destination,
+      publicReadiness,
+      ready: publicReadiness.ready === true,
+    };
+  };
+
+  const buildCloudflareLifecyclePollSnapshot = (params: {
+    nowMs: number;
+    externalSnapshot: ExternalRtmpStatusSnapshot | null;
+    destination: ExternalRtmpDestination | null;
+    playbackUrl: string | null;
+  }): PersistedCloudflareLifecyclePollState | null => {
+    const persistedAuthority = getPersistedAuthorityState();
+    const snapshotUpdatedAt = params.externalSnapshot
+      ? resolveSnapshotUpdatedAt(
+          params.externalSnapshot.updatedAt,
+          params.nowMs,
+        )
+      : null;
+    const probeSnapshot = externalPlaybackProbePoller?.getSnapshot() ?? null;
+    const probeUpdatedAt =
+      probeSnapshot != null
+        ? resolveSnapshotUpdatedAt(probeSnapshot.updatedAt, params.nowMs)
+        : null;
+    const playbackProbeFresh =
+      probeUpdatedAt != null && isSnapshotFresh(probeUpdatedAt, params.nowMs);
+    const localIngestHealthy =
+      params.externalSnapshot != null &&
+      snapshotUpdatedAt != null &&
+      isSnapshotFresh(snapshotUpdatedAt, params.nowMs) &&
+      params.externalSnapshot.active === true &&
+      params.externalSnapshot.ffmpegRunning === true &&
+      params.externalSnapshot.stats?.healthy !== false;
+    const providerLive = playbackProbeFresh && probeSnapshot?.ready === true;
+    let status: PersistedCloudflareLifecyclePollState["status"] = "unknown";
+    if (providerLive) {
+      status = "connected";
+    } else if (playbackProbeFresh && probeSnapshot?.ready === false) {
+      status = "disconnected";
+    } else if (
+      params.externalSnapshot?.stats?.healthy === false ||
+      (typeof params.destination?.error === "string" &&
+        params.destination.error.trim().length > 0)
+    ) {
+      status = "errored";
+    } else if (params.destination?.connected === false) {
+      status = "disconnected";
+    } else if (localIngestHealthy) {
+      status = "unknown";
+    }
+    const receivedAt = Math.max(snapshotUpdatedAt ?? 0, probeUpdatedAt ?? 0, 0);
+    const normalizedReceivedAt = receivedAt > 0 ? receivedAt : params.nowMs;
+    const liveInputId =
+      cloudflareLiveInputId ??
+      persistedAuthority.cloudflareLifecycle?.liveInputId ??
+      persistedAuthority.cloudflareLastWebhook?.liveInputId ??
+      null;
+    const videoUid =
+      persistedAuthority.cloudflareLifecycle?.videoId ??
+      persistedAuthority.cloudflareLastWebhook?.videoId ??
+      null;
+
+    if (!liveInputId && !params.playbackUrl) {
+      return null;
+    }
+
+    return {
+      liveInputId,
+      videoUid,
+      status,
+      providerLive,
+      statusSummary:
+        status === "connected"
+          ? "connected"
+          : playbackProbeFresh && probeSnapshot?.ready === false
+            ? (probeSnapshot.lastError ?? probeSnapshot.manifestStatus)
+            : typeof params.destination?.error === "string" &&
+                params.destination.error.trim().length > 0
+              ? params.destination.error.trim()
+              : params.externalSnapshot == null
+                ? "delivery_status_unavailable"
+                : !isSnapshotFresh(normalizedReceivedAt, params.nowMs)
+                  ? "delivery_status_stale"
+                  : status,
+      playbackUrl: params.playbackUrl,
+      occurredAt: normalizedReceivedAt,
+      receivedAt: normalizedReceivedAt,
+    };
+  };
+
+  const currentCanonicalAuthoritySnapshot = (params: {
+    nowMs: number;
+    sourceRuntime: StreamSourceRuntime;
+    externalSnapshot: ExternalRtmpStatusSnapshot | null;
+    destination: ExternalRtmpDestination | null;
+    playbackUrl: string | null;
+  }): PersistedCloudflareReconciliationState | null => {
+    const lifecyclePollSnapshot = buildCloudflareLifecyclePollSnapshot(params);
+    const probeSnapshot = externalPlaybackProbePoller?.getSnapshot() ?? null;
+    const playbackProbeSnapshot: PersistedCloudflarePlaybackProbeState | null =
+      probeSnapshot
+        ? {
+            playbackUrl: probeSnapshot.playbackUrl,
+            ready: probeSnapshot.ready,
+            manifestStatus: probeSnapshot.manifestStatus,
+            statusCode: probeSnapshot.statusCode,
+            lastError: probeSnapshot.lastError,
+            updatedAt: probeSnapshot.updatedAt,
+          }
+        : null;
+
+    persistCloudflareLifecyclePollSnapshot(lifecyclePollSnapshot);
+    persistCloudflarePlaybackProbeSnapshot(playbackProbeSnapshot);
+
+    const persistedAuthority = getPersistedAuthorityState();
+    if (
+      lifecyclePollSnapshot == null &&
+      playbackProbeSnapshot == null &&
+      persistedAuthority.cloudflareLifecycle == null &&
+      persistedAuthority.cloudflareLifecyclePoll == null &&
+      persistedAuthority.cloudflarePlaybackProbe == null
+    ) {
+      return null;
+    }
+
+    const reconciliation = reconcileCloudflareAuthority({
+      sourceRuntimeReady: params.sourceRuntime.ready === true,
+      lifecycle: persistedAuthority.cloudflareLifecycle,
+      lifecyclePoll:
+        lifecyclePollSnapshot ?? persistedAuthority.cloudflareLifecyclePoll,
+      playbackProbe:
+        playbackProbeSnapshot ?? persistedAuthority.cloudflarePlaybackProbe,
+      previous: persistedAuthority.cloudflareReconciliation,
+      nowMs: params.nowMs,
+      freshnessMs: externalStatusMaxAgeMs,
+      playbackUrl: params.playbackUrl,
+    });
+    persistCloudflareReconciliationSnapshot(reconciliation);
+    return reconciliation;
+  };
+
+  const selectCanonicalCandidate = (params: {
+    nowMs: number;
+    candidates: CanonicalCandidateState[];
+  }): {
+    canonical: CanonicalCandidateState;
+    fallback: CanonicalCandidateState | null;
+  } => {
+    if (params.candidates.length === 0) {
+      const provider: StreamCanonicalProvider =
+        configuredCanonicalProvider === "self_hls"
+          ? "self_hls"
+          : "cloudflare_stream";
+      return {
+        canonical: {
+          provider,
+          destination: {
+            id: buildStreamDestinationId({
+              role: "canonical",
+              provider,
+              name: provider === "self_hls" ? "Self-HLS" : "Cloudflare Stream",
+            }),
+            name: provider === "self_hls" ? "Self-HLS" : "Cloudflare Stream",
+            role: "canonical",
+            provider,
+            transport: inferStreamDeliveryTransport({
+              playbackUrl: null,
+              ingestUrl: null,
+            }),
+            playbackUrl: null,
+            ingestUrl: null,
+            connected: false,
+            transportHealthy: false,
+            playbackReady: false,
+            manifestStatus: "missing",
+            lastError: "no_delivery_candidate",
+            updatedAt: params.nowMs,
+          },
+          publicReadiness: {
+            ready: false,
+            reason: "no_delivery_candidate",
+            updatedAt: params.nowMs,
+          },
+          ready: false,
+        },
+        fallback: null,
+      };
+    }
+
+    const candidatesByProvider = new Map(
+      params.candidates.map((candidate) => [candidate.provider, candidate]),
+    );
+    const priority = configuredProviderPriority.filter((provider) =>
+      candidatesByProvider.has(provider),
+    );
+    const primaryProvider = priority[0] ?? null;
+    const primaryCandidate =
+      primaryProvider != null
+        ? (candidatesByProvider.get(primaryProvider) ?? null)
+        : null;
+    const activeCandidate =
+      canonicalProviderSelectionState.activeProvider != null
+        ? (candidatesByProvider.get(
+            canonicalProviderSelectionState.activeProvider,
+          ) ?? null)
+        : null;
+    const firstReadyCandidate =
+      priority
+        .map((provider) => candidatesByProvider.get(provider) ?? null)
+        .find((candidate) => candidate?.ready === true) ?? null;
+
+    if (!automaticFailoverEnabled()) {
+      const configuredCanonicalCandidate =
+        candidatesByProvider.get(configuredCanonicalProvider) ?? null;
+      const nextCanonical =
+        configuredCanonicalCandidate ?? primaryCandidate ?? params.candidates[0];
+      canonicalProviderSelectionState.activeProvider = nextCanonical.provider;
+      canonicalProviderSelectionState.primaryHealthySince =
+        nextCanonical.provider === primaryProvider &&
+        nextCanonical.ready === true
+          ? params.nowMs
+          : null;
+      persistCanonicalProviderSelection();
+
+      const fallback =
+        priority
+          .map((provider) => candidatesByProvider.get(provider) ?? null)
+          .find(
+            (candidate) =>
+              candidate && candidate.provider !== nextCanonical.provider,
+          ) ?? null;
+
+      return {
+        canonical: nextCanonical,
+        fallback,
+      };
+    }
+
+    let nextCanonical =
+      activeCandidate ??
+      firstReadyCandidate ??
+      primaryCandidate ??
+      params.candidates[0];
+
+    if (primaryCandidate?.ready === true) {
+      canonicalProviderSelectionState.primaryHealthySince ??= params.nowMs;
+    } else {
+      canonicalProviderSelectionState.primaryHealthySince = null;
+    }
+
+    if (nextCanonical.provider === primaryProvider) {
+      if (nextCanonical.ready !== true && firstReadyCandidate) {
+        nextCanonical = firstReadyCandidate;
+      }
+    } else {
+      const primaryHealthyForMs =
+        canonicalProviderSelectionState.primaryHealthySince == null
+          ? 0
+          : Math.max(
+              0,
+              params.nowMs -
+                canonicalProviderSelectionState.primaryHealthySince,
+            );
+      if (
+        primaryCandidate?.ready === true &&
+        primaryHealthyForMs >= configuredFailbackSoakMs
+      ) {
+        nextCanonical = primaryCandidate;
+      } else if (nextCanonical.ready !== true && firstReadyCandidate) {
+        nextCanonical = firstReadyCandidate;
+      }
+    }
+
+    canonicalProviderSelectionState.activeProvider = nextCanonical.provider;
+    persistCanonicalProviderSelection();
+
+    const fallback =
+      priority
+        .map((provider) => candidatesByProvider.get(provider) ?? null)
+        .find(
+          (candidate) =>
+            candidate && candidate.provider !== nextCanonical.provider,
+        ) ?? null;
+
+    return {
+      canonical: nextCanonical,
+      fallback,
+    };
+  };
+
+  const buildMirrorDestinations = (params: {
+    nowMs: number;
+    canonicalDestinationId: string | null;
+  }): StreamDestinationState[] => {
+    const externalSnapshot = externalStatusPoller?.getSnapshot() ?? null;
+    if (!externalSnapshot) {
+      return [];
+    }
+
+    const snapshotUpdatedAt = resolveSnapshotUpdatedAt(
+      externalSnapshot.updatedAt,
+      params.nowMs,
+    );
+    const snapshotFresh = isSnapshotFresh(snapshotUpdatedAt, params.nowMs);
+    const baseTransportHealthy =
+      snapshotFresh &&
+      externalSnapshot.active === true &&
+      externalSnapshot.ffmpegRunning === true &&
+      externalSnapshot.stats?.healthy !== false;
+    const seen = new Set<string>();
+
+    return externalSnapshot.destinations.flatMap((destination) => {
+      const provider = normalizeStreamDestinationProvider(
+        destination.provider ?? null,
+        destination.name ?? null,
+      );
+      if (
+        destination.id === params.canonicalDestinationId ||
+        destination.role === "canonical" ||
+        (params.canonicalDestinationId != null &&
+          provider === configuredCanonicalProvider &&
+          ((destination.name ?? "")
+            .trim()
+            .toLowerCase()
+            .includes("external delivery") ||
+            destination.id == null))
+      ) {
+        return [];
+      }
+      if (destination.role === "fallback" || provider === "self_hls") {
+        return [];
+      }
+
+      const id =
+        destination.id ??
+        buildStreamDestinationId({
+          role: "mirror",
+          provider,
+          name: destination.name ?? provider,
+        });
+      if (seen.has(id)) {
+        return [];
+      }
+      seen.add(id);
+
+      const transportHealthy =
+        baseTransportHealthy &&
+        destination.connected === true &&
+        !(
+          typeof destination.error === "string" &&
+          destination.error.trim().length > 0
+        );
+      return [
+        {
+          id,
+          name: destination.name ?? provider,
+          role: "mirror",
+          provider,
+          transport:
+            destination.transport ??
+            inferStreamDeliveryTransport({
+              playbackUrl: destination.playbackUrl ?? null,
+              ingestUrl: destination.ingestUrl ?? destination.url ?? null,
+            }),
+          playbackUrl: destination.playbackUrl ?? null,
+          ingestUrl: destination.ingestUrl ?? destination.url ?? null,
+          connected: destination.connected === true,
+          transportHealthy,
+          playbackReady: transportHealthy,
+          manifestStatus: "unknown",
+          lastError:
+            typeof destination.error === "string" &&
+            destination.error.trim().length > 0
+              ? destination.error.trim()
+              : snapshotFresh
+                ? null
+                : "delivery_status_stale",
+          updatedAt: resolveSnapshotUpdatedAt(
+            destination.startedAt ?? externalSnapshot.updatedAt,
+            params.nowMs,
+          ),
+        } satisfies StreamDestinationState,
+      ];
+    });
+  };
+
+  const currentChannelSnapshot = (
+    cycle: StreamingDuelCycle | null,
+    nowMs?: number,
+    sourceRuntime?: StreamSourceRuntime,
+  ): CurrentChannelSnapshot => {
+    const updatedAt = nowMs ?? Date.now();
+    const resolvedSourceRuntime =
+      sourceRuntime ?? currentSourceRuntimeSnapshot(cycle, updatedAt);
+    const externalSnapshot = externalStatusPoller?.getSnapshot() ?? null;
+    const externalDestination =
+      findCanonicalExternalDestination(externalSnapshot);
+    const candidatePool: CanonicalCandidateState[] = [];
+    const selfHostedPublicCandidateEnabled =
+      configuredDelivery.mode !== "external_hls" ||
+      process.env.STREAM_PUBLIC_SELF_HLS_FALLBACK_ENABLED === "true";
+    if (selfHostedPublicCandidateEnabled) {
+      candidatePool.push(
+        buildSelfHostedCandidate({
+          role: "canonical",
+          nowMs: updatedAt,
+          sourceRuntime: resolvedSourceRuntime,
+        }),
+      );
+    }
+    const externalCandidate = buildExternalDeliveryCandidate({
+      role: "canonical",
+      nowMs: updatedAt,
+      sourceRuntime: resolvedSourceRuntime,
+    });
+    if (externalCandidate) {
+      candidatePool.push(externalCandidate);
+    }
+    const { canonical, fallback } = selectCanonicalCandidate({
+      nowMs: updatedAt,
+      candidates: candidatePool,
+    });
+    const canonicalAuthority =
+      canonical.provider === "cloudflare_stream"
+        ? currentCanonicalAuthoritySnapshot({
+            nowMs: updatedAt,
+            sourceRuntime: resolvedSourceRuntime,
+            externalSnapshot,
+            destination: externalDestination,
+            playbackUrl:
+              externalCandidate?.destination.playbackUrl ??
+              configuredExternalPlaybackUrl,
+          })
+        : null;
+    const canonicalDestination = canonical.destination;
+    const fallbackDestination =
+      fallback == null
+        ? null
+        : fallback.provider === "self_hls"
+          ? buildSelfHostedDestination({
+              role: "fallback",
+              nowMs: updatedAt,
+            })
+          : (buildExternalDeliveryCandidate({
+              role: "fallback",
+              nowMs: updatedAt,
+              sourceRuntime: resolvedSourceRuntime,
+            })?.destination ?? {
+              ...fallback.destination,
+              id: buildStreamDestinationId({
+                role: "fallback",
+                provider: "cloudflare_stream",
+                name: "Cloudflare Stream",
+              }),
+              role: "fallback",
+            });
+    const mirrors = buildMirrorDestinations({
+      nowMs: updatedAt,
+      canonicalDestinationId: canonicalDestination.id,
+    });
+    const publicReadiness =
+      canonicalAuthority == null
+        ? canonical.publicReadiness
+        : {
+            ready: canonicalAuthority.decision === "ready",
+            reason: canonicalAuthority.reason,
+            updatedAt: canonicalAuthority.updatedAt,
+          };
+
+    return {
+      channel: {
+        id: "hyperscapes-broadcast-channel",
+        mode: "always_on",
+        presentationDelayMs: configuredPresentationDelayMs,
+        activeDuelId: cycle?.duelId ?? null,
+        activeDuelKey: null,
+        canonicalDestinationId: canonicalDestination.id,
+        fallbackDestinationId: fallbackDestination?.id ?? null,
+        publicPlaybackUrl: canonicalDestination.playbackUrl,
+        publicReadiness,
+        destinations: [
+          canonicalDestination,
+          ...(fallbackDestination ? [fallbackDestination] : []),
+          ...mirrors,
+        ],
+      },
+      canonicalAuthority,
+    };
+  };
+
+  const buildSerializedBettingFrame = (params: {
+    seq: number;
+    emittedAt: number;
+    cycle: StreamingDuelCycle | null;
+  }): BettingFeedFrame => {
+    const rendererHealth = currentRendererHealthSnapshot(
+      params.cycle,
+      params.emittedAt,
+    );
+    const sourceRuntime = currentSourceRuntimeSnapshot(
+      params.cycle,
+      params.emittedAt,
+      rendererHealth,
+    );
+    const channelSnapshot = currentChannelSnapshot(
+      params.cycle,
+      params.emittedAt,
+      sourceRuntime,
+    );
+    const payload = buildBettingFeedPayload({
+      sourceEpoch: bettingSourceEpoch,
+      seq: params.seq,
+      emittedAt: params.emittedAt,
+      cycle: params.cycle,
+      rendererHealth,
+      channel: channelSnapshot.channel,
+      canonicalAuthority: channelSnapshot.canonicalAuthority,
+      sourceRuntime,
+      rendererMetrics: currentRendererMetricsSnapshot(),
+    });
+    const payloadJson = JSON.stringify(payload);
+
+    return {
+      seq: params.seq,
+      emittedAt: payload.emittedAt,
+      payload,
+      payloadJson,
+      payloadBytes: Buffer.byteLength(payloadJson, "utf8"),
+    };
+  };
+
+  const buildCurrentBettingFrame = (params: {
+    seq: number;
+    emittedAt?: number;
+  }): BettingFeedFrame | null => {
+    const scheduler = getScheduler();
+    if (!scheduler) {
+      return null;
+    }
+    return buildSerializedBettingFrame({
+      seq: params.seq,
+      emittedAt: params.emittedAt ?? Date.now(),
+      cycle: scheduler.getCurrentCycle() ?? null,
+    });
+  };
 
   const captureBettingFrame = (
     forceNewFrame = false,
   ): BettingFeedFrame | null => {
-    const scheduler = getScheduler();
-    const cycle = scheduler?.getCurrentCycle() ?? null;
     const nextSeq = bettingSequence + 1;
-    const emittedAt = Date.now();
-    const rendererHealth = currentRendererHealthSnapshot(cycle, emittedAt);
-    const payload = buildBettingFeedPayload({
-      sourceEpoch: bettingSourceEpoch,
+    const frame = buildCurrentBettingFrame({
       seq: nextSeq,
-      emittedAt,
-      cycle,
-      rendererHealth,
+      emittedAt: Date.now(),
     });
+    if (!frame) {
+      return null;
+    }
+    const payload = frame.payload;
     const dedupKey = buildBettingFeedDedupKey(payload);
 
     if (
@@ -418,15 +1703,6 @@ export function registerStreamingBettingRoutes(
 
     lastSerializedBettingState = dedupKey;
     bettingSequence = nextSeq;
-    const payloadJson = JSON.stringify(payload);
-
-    const frame: BettingFeedFrame = {
-      seq: nextSeq,
-      emittedAt: payload.emittedAt,
-      payload,
-      payloadJson,
-      payloadBytes: Buffer.byteLength(payloadJson, "utf8"),
-    };
 
     bettingReplayFrames.push(frame);
     bettingReplayFramesTotalBytes += frame.payloadBytes;
@@ -511,21 +1787,39 @@ export function registerStreamingBettingRoutes(
   };
 
   const buildBettingBootstrapResponse = (frame: BettingFeedFrame | null) => {
+    const currentFrame =
+      frame ??
+      buildCurrentBettingFrame({
+        seq: Math.max(1, bettingSequence),
+        emittedAt: Date.now(),
+      });
     const fallbackEmittedAt = Date.now();
+    const fallbackRendererHealth = currentRendererHealthSnapshot(
+      null,
+      fallbackEmittedAt,
+    );
+    const fallbackSourceRuntime = currentSourceRuntimeSnapshot(
+      null,
+      fallbackEmittedAt,
+      fallbackRendererHealth,
+    );
     const fallbackPayload = buildBettingFeedPayload({
       sourceEpoch: bettingSourceEpoch,
       seq: bettingSequence,
       emittedAt: fallbackEmittedAt,
       cycle: null,
-      rendererHealth: currentRendererHealthSnapshot(null, fallbackEmittedAt),
+      rendererHealth: fallbackRendererHealth,
+      ...currentChannelSnapshot(null, fallbackEmittedAt, fallbackSourceRuntime),
+      sourceRuntime: fallbackSourceRuntime,
+      rendererMetrics: currentRendererMetricsSnapshot(),
     });
 
     return {
-      ...(frame?.payload ?? fallbackPayload),
+      ...(currentFrame?.payload ?? fallbackPayload),
       schemaVersion: BETTING_FEED_SCHEMA_VERSION,
       sourceEpoch: bettingSourceEpoch,
-      seq: frame?.seq ?? bettingSequence,
-      emittedAt: frame?.emittedAt ?? fallbackEmittedAt,
+      seq: currentFrame?.seq ?? bettingSequence,
+      emittedAt: currentFrame?.emittedAt ?? fallbackEmittedAt,
       replay: {
         sourceEpoch: bettingSourceEpoch,
         latestSeq:
@@ -555,11 +1849,14 @@ export function registerStreamingBettingRoutes(
       return;
     }
   };
-
   const handleBettingBootstrap = async (
-    _request: FastifyRequest,
+    request: FastifyRequest,
     reply: FastifyReply,
   ) => {
+    if (reply.sent || reply.raw.writableEnded || reply.raw.destroyed) {
+      return;
+    }
+
     const scheduler = getScheduler();
     if (!scheduler) {
       return reply.status(503).send({
@@ -568,22 +1865,54 @@ export function registerStreamingBettingRoutes(
       });
     }
 
+    await ensureCanonicalProviderSelectionHydrated();
     await ensureBettingSourceEpoch();
-    if (bettingReplayFrames.length === 0) {
+    await externalStatusPoller?.refresh();
+    await externalPlaybackProbePoller?.refresh();
+    const latestFrame =
+      captureBettingFrame(false) ??
+      buildCurrentBettingFrame({
+        seq: Math.max(1, bettingSequence),
+        emittedAt: Date.now(),
+      }) ??
+      bettingReplayFrames[bettingReplayFrames.length - 1] ??
       captureBettingFrame(true);
+
+    if (!latestFrame) {
+      request.log.warn(
+        {
+          bettingSourceEpoch,
+          replayFrames: bettingReplayFrames.length,
+          bettingSequence,
+        },
+        "null_bootstrap_frame",
+      );
+    } else if (
+      latestFrame.payload.cycle == null &&
+      bettingReplayFrames.length === 0
+    ) {
+      request.log.warn(
+        {
+          bettingSourceEpoch,
+          replayFrames: bettingReplayFrames.length,
+          bettingSequence,
+          phase: latestFrame.payload.phase,
+        },
+        "null_bootstrap_frame",
+      );
     }
 
-    return reply.send(
-      buildBettingBootstrapResponse(
-        bettingReplayFrames[bettingReplayFrames.length - 1] ?? null,
-      ),
-    );
+    return reply.send(buildBettingBootstrapResponse(latestFrame ?? null));
   };
 
   const handleBettingEvents = async (
     request: FastifyRequest<{ Querystring: { since?: string } }>,
     reply: FastifyReply,
   ) => {
+    if (reply.sent || reply.raw.writableEnded || reply.raw.destroyed) {
+      return;
+    }
+
     const scheduler = getScheduler();
     if (!scheduler) {
       return reply.status(503).send({
@@ -592,7 +1921,11 @@ export function registerStreamingBettingRoutes(
       });
     }
 
+    await ensureCanonicalProviderSelectionHydrated();
     await ensureBettingSourceEpoch();
+    await externalStatusPoller?.refresh();
+    await externalPlaybackProbePoller?.refresh();
+    captureBettingFrame(false);
     if (bettingReplayFrames.length === 0) {
       captureBettingFrame(true);
     }
@@ -675,6 +2008,78 @@ export function registerStreamingBettingRoutes(
     startBettingLoopsIfNeeded();
   };
 
+  const handleCloudflareWebhook = async (
+    request: FastifyRequest<{ Body: Record<string, unknown> }>,
+    reply: FastifyReply,
+  ) => {
+    const receivedAt = Date.now();
+    const summary = summarizeCloudflareLiveWebhook({
+      payload: request.body,
+      receivedAt,
+    });
+    if (!summary.webhook.liveInputId) {
+      return reply.status(400).send({
+        error: "Bad Request",
+        message: "Cloudflare webhook payload is missing a live input id",
+      });
+    }
+    if (
+      cloudflareLiveInputId &&
+      summary.webhook.liveInputId !== cloudflareLiveInputId
+    ) {
+      return reply.status(202).send({
+        ok: true,
+        ignored: true,
+        eventType: summary.webhook.eventType,
+        liveInputId: summary.webhook.liveInputId,
+        receivedAt,
+      });
+    }
+
+    try {
+      const authorityState = getPersistedAuthorityState();
+      authorityState.cloudflareLastWebhook = summary.webhook;
+      authorityState.cloudflareLifecycle = summary.lifecycle;
+      await Promise.all([
+        persistCloudflareWebhookState(getStorageDb(), summary.webhook),
+        persistCloudflareLifecycleState(getStorageDb(), summary.lifecycle),
+      ]);
+    } catch {
+      // Best-effort durability only.
+    }
+
+    return reply.status(202).send({
+      ok: true,
+      eventType: summary.webhook.eventType,
+      liveInputId: summary.webhook.liveInputId,
+      receivedAt,
+    });
+  };
+
+  const authorizeCloudflareWebhook = async (
+    request: FastifyRequest,
+    reply: FastifyReply,
+  ) => {
+    const webhookSecret =
+      process.env.STREAM_CLOUDFLARE_WEBHOOK_SECRET?.trim() || null;
+    if (!webhookSecret) {
+      return reply.status(503).send({
+        error: "Cloudflare webhook secret not configured",
+        message:
+          "Set STREAM_CLOUDFLARE_WEBHOOK_SECRET before enabling the webhook route",
+      });
+    }
+
+    if (verifyCloudflareWebhookSecret(request.headers, webhookSecret)) {
+      return;
+    }
+
+    return reply.status(401).send({
+      error: "Unauthorized",
+      message: "Missing or invalid Cloudflare webhook secret",
+    });
+  };
+
   // Legacy compatibility alias. Canonical internal betting bootstrap route:
   // /api/internal/bet-sync/state
   fastify.get(
@@ -721,6 +2126,33 @@ export function registerStreamingBettingRoutes(
     handleBettingEvents,
   );
 
+  // Cloudflare webhook bodies are small JSON events (live-input lifecycle +
+  // recording metadata). Cap at 32 KiB and require an object-shaped body.
+  // We keep `additionalProperties: true` because Cloudflare evolves the
+  // webhook schema on their side and a closed allowlist would break on
+  // format updates. Defense-in-depth against injection already happens at:
+  //   1. timingSafeEqual shared-secret verification (authorizeCloudflareWebhook)
+  //   2. bodyLimit (here)
+  //   3. summarizeCloudflareLiveWebhook() — field-by-field allowlist parsing,
+  //      so unknown fields never reach downstream persistence
+  fastify.post<{
+    Body: Record<string, unknown>;
+  }>(
+    "/api/streaming/cloudflare/webhook",
+    {
+      bodyLimit: 32 * 1024,
+      config: { rateLimit: CLOUDFLARE_WEBHOOK_RATE_LIMIT },
+      schema: {
+        body: {
+          type: "object",
+          additionalProperties: true,
+        },
+      },
+      preHandler: authorizeCloudflareWebhook,
+    },
+    handleCloudflareWebhook,
+  );
+
   fastify.addHook("onClose", async () => {
     closeRoutes();
   });
diff --git a/packages/server/src/routes/streaming-external-status.ts b/packages/server/src/routes/streaming-external-status.ts
index 86bf46f7d..2973b82ac 100644
--- a/packages/server/src/routes/streaming-external-status.ts
+++ b/packages/server/src/routes/streaming-external-status.ts
@@ -1,10 +1,32 @@
 import fs from "node:fs/promises";
+import type {
+  StreamDeliveryInfo,
+  StreamDeliveryMode,
+  StreamManifestStatus,
+  StreamDeliveryTransport,
+  StreamDestinationProvider,
+  StreamDestinationRole,
+} from "../streaming/delivery-config.js";
+import type {
+  StreamSourceCaptureMode,
+  StreamSourceRuntime,
+} from "../streaming/source-runtime.js";
 
 /** A single RTMP destination entry from the external status file. */
 export interface ExternalRtmpDestination {
+  id?: string;
+  name?: string;
+  role?: StreamDestinationRole;
+  provider?: StreamDestinationProvider;
+  transport?: StreamDeliveryTransport;
+  playbackUrl?: string | null;
+  ingestUrl?: string | null;
   url?: string;
   status?: string;
   connected?: boolean;
+  bytesWritten?: number;
+  startedAt?: number;
+  error?: string;
   /** External encoders may include additional fields. */
   [key: string]: unknown;
 }
@@ -29,16 +51,101 @@ export interface ExternalRendererHealthBlob {
   phase?: string | null;
 }
 
+export interface ExternalRendererMetricsBlob {
+  captureFps?: number | null;
+  encodeFps?: number | null;
+  droppedFrames?: number | null;
+  renderTick?: number | null;
+  duelStateTick?: number | null;
+  latestFrameAt?: number | null;
+  latestRenderTickAt?: number | null;
+  latestDuelStateTickAt?: number | null;
+  latestVisualChangeAt?: number | null;
+  visualChangeAgeMs?: number | null;
+}
+
+export interface ExternalHlsManifestBlob {
+  updatedAt?: number | null;
+  mediaSequence?: number | null;
+}
+
+export interface ExternalRendererSmokeBlob {
+  currentSceneUrl?: string | null;
+  activeBundle?: string | null;
+  deliveryMode?: string | null;
+  captureFpsP50?: number | null;
+  captureFpsP95?: number | null;
+  encodeFpsP50?: number | null;
+  encodeFpsP95?: number | null;
+  updatedAt?: number | null;
+  ingest?: ExternalRendererIngestBlob | null;
+}
+
+export interface ExternalRendererIngestBlob {
+  profile?: string | null;
+  transport?: string | null;
+  audioSampleRate?: number | null;
+  gopFrames?: number | null;
+  targetFps?: number | null;
+  probeOnly?: boolean | null;
+}
+
+export interface ExternalCaptureFrameSampleBlob {
+  at?: number | null;
+  size?: number | null;
+  cdpTimestamp?: number | null;
+}
+
+export interface ExternalCaptureBackpressureTransitionBlob {
+  at?: number | null;
+  backpressured?: boolean | null;
+}
+
+export interface ExternalCaptureFatalWriteBlob {
+  at?: number | null;
+  message?: string | null;
+  frameCount?: number | null;
+  droppedFrames?: number | null;
+  bytesReceived?: number | null;
+  backpressured?: boolean | null;
+  cdpDirectMode?: boolean | null;
+  uptimeMs?: number | null;
+}
+
+export interface ExternalCaptureDiagnosticsBlob {
+  recentFrames?: ExternalCaptureFrameSampleBlob[] | null;
+  recentFrameCadenceMs?: Array<number | null> | null;
+  nonMonotonicCdpTimestampCount?: number | null;
+  backpressureTransitions?: ExternalCaptureBackpressureTransitionBlob[] | null;
+  firstFatalWriteError?: ExternalCaptureFatalWriteBlob | null;
+  lastFatalWriteError?: ExternalCaptureFatalWriteBlob | null;
+  pageStallBeforeLastFatalWrite?: boolean | null;
+  lastFrameAgeMs?: number | null;
+  captureSessionGeneration?: string | null;
+  manifestStatus?: StreamManifestStatus | null;
+}
+
 /**
  * Typed snapshot from the external RTMP status file. Only allowlisted fields
  * are preserved after parsing — unknown keys in the source JSON are stripped
  * to prevent arbitrary data from being forwarded to API consumers.
  */
 export interface ExternalRtmpStatusSnapshot {
+  active?: boolean;
+  ffmpegRunning?: boolean;
+  clientConnected?: boolean;
+  captureMode?: StreamSourceCaptureMode;
   destinations: ExternalRtmpDestination[];
   stats: ExternalRtmpStreamStats;
   updatedAt: number;
   rendererHealth?: ExternalRendererHealthBlob;
+  metrics?: ExternalRendererMetricsBlob;
+  hlsManifest?: ExternalHlsManifestBlob;
+  delivery?: StreamDeliveryInfo;
+  smoke?: ExternalRendererSmokeBlob;
+  ingest?: ExternalRendererIngestBlob;
+  sourceRuntime?: StreamSourceRuntime;
+  captureDiagnostics?: ExternalCaptureDiagnosticsBlob;
 }
 
 type ExternalStatusPoller = {
@@ -50,14 +157,522 @@ type ExternalStatusPoller = {
 
 const externalStatusPollers = new Map<string, ExternalStatusPoller>();
 
+function asRecord(value: unknown): Record<string, unknown> | null {
+  return value && typeof value === "object" && !Array.isArray(value)
+    ? (value as Record<string, unknown>)
+    : null;
+}
+
 function asFiniteNumber(value: unknown): number | null {
   return typeof value === "number" && Number.isFinite(value) ? value : null;
 }
 
+function asNonEmptyString(value: unknown): string | null {
+  return typeof value === "string" && value.trim().length > 0
+    ? value.trim()
+    : null;
+}
+
+function parseNullableFiniteNumber(
+  record: Record<string, unknown>,
+  key: string,
+): number | null | undefined {
+  if (!(key in record)) return undefined;
+  if (record[key] === null) return null;
+  return asFiniteNumber(record[key]);
+}
+
+function parseNullableBoolean(
+  record: Record<string, unknown>,
+  key: string,
+): boolean | null | undefined {
+  if (!(key in record)) return undefined;
+  if (record[key] === null) return null;
+  return typeof record[key] === "boolean" ? record[key] : undefined;
+}
+
+function parseNullableString(
+  record: Record<string, unknown>,
+  key: string,
+): string | null | undefined {
+  if (!(key in record)) return undefined;
+  if (record[key] === null) return null;
+  return asNonEmptyString(record[key]);
+}
+
+function hasKeys(value: object): boolean {
+  return Object.keys(value).length > 0;
+}
+
+function parseExternalDestinations(value: unknown): ExternalRtmpDestination[] {
+  if (!Array.isArray(value)) return [];
+  const destinations: ExternalRtmpDestination[] = [];
+  for (const candidate of value) {
+    const record = asRecord(candidate);
+    if (!record) {
+      continue;
+    }
+    destinations.push({
+      id: asNonEmptyString(record.id) ?? undefined,
+      name: asNonEmptyString(record.name) ?? undefined,
+      role:
+        record.role === "canonical" ||
+        record.role === "fallback" ||
+        record.role === "mirror"
+          ? record.role
+          : undefined,
+      provider:
+        record.provider === "cloudflare_stream" ||
+        record.provider === "self_hls" ||
+        record.provider === "twitch" ||
+        record.provider === "kick" ||
+        record.provider === "youtube" ||
+        record.provider === "custom"
+          ? record.provider
+          : undefined,
+      transport:
+        record.transport === "llhls" ||
+        record.transport === "hls" ||
+        record.transport === "rtmps" ||
+        record.transport === "srt" ||
+        record.transport === "unknown"
+          ? record.transport
+          : undefined,
+      playbackUrl: asNonEmptyString(record.playbackUrl),
+      ingestUrl: asNonEmptyString(record.ingestUrl),
+      url: asNonEmptyString(record.url) ?? undefined,
+      status: asNonEmptyString(record.status) ?? undefined,
+      connected:
+        typeof record.connected === "boolean" ? record.connected : undefined,
+      bytesWritten: asFiniteNumber(record.bytesWritten) ?? undefined,
+      startedAt: asFiniteNumber(record.startedAt) ?? undefined,
+      error: asNonEmptyString(record.error) ?? undefined,
+    });
+  }
+  return destinations;
+}
+
+function parseExternalStats(value: unknown): ExternalRtmpStreamStats {
+  if (!value || typeof value !== "object" || Array.isArray(value)) {
+    return {};
+  }
+  const record = value as Record<string, unknown>;
+  const stats: ExternalRtmpStreamStats = {};
+  const bitrate = asFiniteNumber(record.bitrate);
+  const fps = asFiniteNumber(record.fps);
+  const uptime = asFiniteNumber(record.uptime);
+  const bytesReceived = asFiniteNumber(record.bytesReceived);
+  const droppedFrames = asFiniteNumber(record.droppedFrames);
+
+  if (bitrate !== null) {
+    stats.bitrate = bitrate;
+  }
+  if (fps !== null) {
+    stats.fps = fps;
+  }
+  if (uptime !== null) {
+    stats.uptime = uptime;
+  }
+  if (bytesReceived !== null) {
+    stats.bytesReceived = bytesReceived;
+  }
+  if (droppedFrames !== null) {
+    stats.droppedFrames = droppedFrames;
+  }
+  if (typeof record.healthy === "boolean") {
+    stats.healthy = record.healthy;
+  }
+
+  return stats;
+}
+
+function parseStreamManifestStatus(
+  value: unknown,
+): StreamManifestStatus | null {
+  return value === "ok" ||
+    value === "stale" ||
+    value === "missing" ||
+    value === "unknown"
+    ? value
+    : null;
+}
+
+function parseStreamDeliveryMode(value: unknown): StreamDeliveryMode | null {
+  return value === "self_hls" || value === "external_hls" ? value : null;
+}
+
+function parseExternalRendererIngestBlob(
+  value: unknown,
+): ExternalRendererIngestBlob | undefined {
+  const record = asRecord(value);
+  if (!record) return undefined;
+
+  const parsed: ExternalRendererIngestBlob = {};
+  const profile = parseNullableString(record, "profile");
+  const transport = parseNullableString(record, "transport");
+  const audioSampleRate = parseNullableFiniteNumber(record, "audioSampleRate");
+  const gopFrames = parseNullableFiniteNumber(record, "gopFrames");
+  const targetFps = parseNullableFiniteNumber(record, "targetFps");
+  const probeOnly = parseNullableBoolean(record, "probeOnly");
+
+  if (profile !== undefined) parsed.profile = profile;
+  if (transport !== undefined) parsed.transport = transport;
+  if (audioSampleRate !== undefined) parsed.audioSampleRate = audioSampleRate;
+  if (gopFrames !== undefined) parsed.gopFrames = gopFrames;
+  if (targetFps !== undefined) parsed.targetFps = targetFps;
+  if (probeOnly !== undefined) parsed.probeOnly = probeOnly;
+
+  return hasKeys(parsed) ? parsed : undefined;
+}
+
+function parseExternalRendererHealthBlob(
+  value: unknown,
+): ExternalRendererHealthBlob | undefined {
+  const record = asRecord(value);
+  if (!record) return undefined;
+
+  const parsed: ExternalRendererHealthBlob = {};
+  if (typeof record.ready === "boolean") {
+    parsed.ready = record.ready;
+  }
+  const degradedReason = parseNullableString(record, "degradedReason");
+  const updatedAt = parseNullableFiniteNumber(record, "updatedAt");
+  const phase = parseNullableString(record, "phase");
+  if (degradedReason !== undefined) parsed.degradedReason = degradedReason;
+  if (updatedAt !== undefined) parsed.updatedAt = updatedAt;
+  if (phase !== undefined) parsed.phase = phase;
+  return hasKeys(parsed) ? parsed : undefined;
+}
+
+function parseExternalRendererMetricsBlob(
+  value: unknown,
+): ExternalRendererMetricsBlob | undefined {
+  const record = asRecord(value);
+  if (!record) return undefined;
+
+  const parsed: ExternalRendererMetricsBlob = {};
+  for (const key of [
+    "captureFps",
+    "encodeFps",
+    "droppedFrames",
+    "renderTick",
+    "duelStateTick",
+    "latestFrameAt",
+    "latestRenderTickAt",
+    "latestDuelStateTickAt",
+    "latestVisualChangeAt",
+    "visualChangeAgeMs",
+  ] as const) {
+    const valueForKey = parseNullableFiniteNumber(record, key);
+    if (valueForKey !== undefined) {
+      parsed[key] = valueForKey;
+    }
+  }
+  return hasKeys(parsed) ? parsed : undefined;
+}
+
+function parseExternalHlsManifestBlob(
+  value: unknown,
+): ExternalHlsManifestBlob | undefined {
+  const record = asRecord(value);
+  if (!record) return undefined;
+
+  const parsed: ExternalHlsManifestBlob = {};
+  const updatedAt = parseNullableFiniteNumber(record, "updatedAt");
+  const mediaSequence = parseNullableFiniteNumber(record, "mediaSequence");
+  if (updatedAt !== undefined) parsed.updatedAt = updatedAt;
+  if (mediaSequence !== undefined) parsed.mediaSequence = mediaSequence;
+  return hasKeys(parsed) ? parsed : undefined;
+}
+
+function parseExternalDeliveryInfo(
+  value: unknown,
+): StreamDeliveryInfo | undefined {
+  const record = asRecord(value);
+  if (!record) return undefined;
+
+  const mode = parseStreamDeliveryMode(record.mode);
+  if (!mode) {
+    return undefined;
+  }
+
+  return {
+    mode,
+    provider: parseNullableString(record, "provider") ?? null,
+    playbackUrl: parseNullableString(record, "playbackUrl") ?? null,
+    hlsUrl: parseNullableString(record, "hlsUrl") ?? null,
+    llhlsUrl: parseNullableString(record, "llhlsUrl") ?? null,
+    ingestUrl: parseNullableString(record, "ingestUrl") ?? null,
+  };
+}
+
+function parseExternalRendererSmokeBlob(
+  value: unknown,
+): ExternalRendererSmokeBlob | undefined {
+  const record = asRecord(value);
+  if (!record) return undefined;
+
+  const parsed: ExternalRendererSmokeBlob = {};
+  const currentSceneUrl = parseNullableString(record, "currentSceneUrl");
+  const activeBundle = parseNullableString(record, "activeBundle");
+  const deliveryMode = parseNullableString(record, "deliveryMode");
+  const updatedAt = parseNullableFiniteNumber(record, "updatedAt");
+  const ingest = parseExternalRendererIngestBlob(record.ingest);
+
+  if (currentSceneUrl !== undefined) parsed.currentSceneUrl = currentSceneUrl;
+  if (activeBundle !== undefined) parsed.activeBundle = activeBundle;
+  if (deliveryMode !== undefined) parsed.deliveryMode = deliveryMode;
+  if (updatedAt !== undefined) parsed.updatedAt = updatedAt;
+  if (ingest) parsed.ingest = ingest;
+  for (const key of [
+    "captureFpsP50",
+    "captureFpsP95",
+    "encodeFpsP50",
+    "encodeFpsP95",
+  ] as const) {
+    const valueForKey = parseNullableFiniteNumber(record, key);
+    if (valueForKey !== undefined) {
+      parsed[key] = valueForKey;
+    }
+  }
+
+  return hasKeys(parsed) ? parsed : undefined;
+}
+
+function parseExternalCaptureFrameSample(
+  value: unknown,
+): ExternalCaptureFrameSampleBlob | undefined {
+  const record = asRecord(value);
+  if (!record) return undefined;
+
+  const parsed: ExternalCaptureFrameSampleBlob = {};
+  const at = parseNullableFiniteNumber(record, "at");
+  const size = parseNullableFiniteNumber(record, "size");
+  const cdpTimestamp = parseNullableFiniteNumber(record, "cdpTimestamp");
+  if (at !== undefined) parsed.at = at;
+  if (size !== undefined) parsed.size = size;
+  if (cdpTimestamp !== undefined) parsed.cdpTimestamp = cdpTimestamp;
+  return hasKeys(parsed) ? parsed : undefined;
+}
+
+function parseExternalCaptureBackpressureTransition(
+  value: unknown,
+): ExternalCaptureBackpressureTransitionBlob | undefined {
+  const record = asRecord(value);
+  if (!record) return undefined;
+
+  const parsed: ExternalCaptureBackpressureTransitionBlob = {};
+  const at = parseNullableFiniteNumber(record, "at");
+  const backpressured = parseNullableBoolean(record, "backpressured");
+  if (at !== undefined) parsed.at = at;
+  if (backpressured !== undefined) parsed.backpressured = backpressured;
+  return hasKeys(parsed) ? parsed : undefined;
+}
+
+function parseExternalCaptureFatalWrite(
+  value: unknown,
+): ExternalCaptureFatalWriteBlob | undefined {
+  const record = asRecord(value);
+  if (!record) return undefined;
+
+  const parsed: ExternalCaptureFatalWriteBlob = {};
+  const message = parseNullableString(record, "message");
+  const backpressured = parseNullableBoolean(record, "backpressured");
+  const cdpDirectMode = parseNullableBoolean(record, "cdpDirectMode");
+  if (message !== undefined) parsed.message = message;
+  if (backpressured !== undefined) parsed.backpressured = backpressured;
+  if (cdpDirectMode !== undefined) parsed.cdpDirectMode = cdpDirectMode;
+  for (const key of [
+    "at",
+    "frameCount",
+    "droppedFrames",
+    "bytesReceived",
+    "uptimeMs",
+  ] as const) {
+    const valueForKey = parseNullableFiniteNumber(record, key);
+    if (valueForKey !== undefined) {
+      parsed[key] = valueForKey;
+    }
+  }
+  return hasKeys(parsed) ? parsed : undefined;
+}
+
+function parseExternalCaptureDiagnosticsBlob(
+  value: unknown,
+): ExternalCaptureDiagnosticsBlob | undefined {
+  const record = asRecord(value);
+  if (!record) return undefined;
+
+  const parsed: ExternalCaptureDiagnosticsBlob = {};
+  const recentFrames = Array.isArray(record.recentFrames)
+    ? record.recentFrames
+        .map((frame) => parseExternalCaptureFrameSample(frame))
+        .filter(
+          (frame): frame is ExternalCaptureFrameSampleBlob =>
+            frame !== undefined,
+        )
+    : undefined;
+  const recentFrameCadenceMs = Array.isArray(record.recentFrameCadenceMs)
+    ? record.recentFrameCadenceMs
+        .map((sample) =>
+          sample === null ? null : (asFiniteNumber(sample) ?? undefined),
+        )
+        .filter((sample): sample is number | null => sample !== undefined)
+    : undefined;
+  const backpressureTransitions = Array.isArray(record.backpressureTransitions)
+    ? record.backpressureTransitions
+        .map((entry) => parseExternalCaptureBackpressureTransition(entry))
+        .filter(
+          (entry): entry is ExternalCaptureBackpressureTransitionBlob =>
+            entry !== undefined,
+        )
+    : undefined;
+  const firstFatalWriteError = parseExternalCaptureFatalWrite(
+    record.firstFatalWriteError,
+  );
+  const lastFatalWriteError = parseExternalCaptureFatalWrite(
+    record.lastFatalWriteError,
+  );
+  const nonMonotonicCdpTimestampCount = parseNullableFiniteNumber(
+    record,
+    "nonMonotonicCdpTimestampCount",
+  );
+  const pageStallBeforeLastFatalWrite = parseNullableBoolean(
+    record,
+    "pageStallBeforeLastFatalWrite",
+  );
+  const lastFrameAgeMs = parseNullableFiniteNumber(record, "lastFrameAgeMs");
+  const captureSessionGeneration = parseNullableString(
+    record,
+    "captureSessionGeneration",
+  );
+  const manifestStatus =
+    "manifestStatus" in record
+      ? record.manifestStatus === null
+        ? null
+        : parseStreamManifestStatus(record.manifestStatus)
+      : undefined;
+
+  if (recentFrames !== undefined) parsed.recentFrames = recentFrames;
+  if (recentFrameCadenceMs !== undefined) {
+    parsed.recentFrameCadenceMs = recentFrameCadenceMs;
+  }
+  if (backpressureTransitions !== undefined) {
+    parsed.backpressureTransitions = backpressureTransitions;
+  }
+  if (firstFatalWriteError) parsed.firstFatalWriteError = firstFatalWriteError;
+  if (lastFatalWriteError) parsed.lastFatalWriteError = lastFatalWriteError;
+  if (nonMonotonicCdpTimestampCount !== undefined) {
+    parsed.nonMonotonicCdpTimestampCount = nonMonotonicCdpTimestampCount;
+  }
+  if (pageStallBeforeLastFatalWrite !== undefined) {
+    parsed.pageStallBeforeLastFatalWrite = pageStallBeforeLastFatalWrite;
+  }
+  if (lastFrameAgeMs !== undefined) parsed.lastFrameAgeMs = lastFrameAgeMs;
+  if (captureSessionGeneration !== undefined) {
+    parsed.captureSessionGeneration = captureSessionGeneration;
+  }
+  if (manifestStatus !== undefined) parsed.manifestStatus = manifestStatus;
+
+  return hasKeys(parsed) ? parsed : undefined;
+}
+
+function parseExternalSourceRuntime(
+  value: unknown,
+): StreamSourceRuntime | undefined {
+  const record = asRecord(value);
+  if (!record) return undefined;
+
+  const ready = typeof record.ready === "boolean" ? record.ready : undefined;
+  const statusSource =
+    record.statusSource === "external_worker" ||
+    record.statusSource === "in_process_bridge" ||
+    record.statusSource === "none"
+      ? record.statusSource
+      : undefined;
+  const captureMode =
+    record.captureMode === "cdp" ||
+    record.captureMode === "webcodecs" ||
+    record.captureMode === "mediarecorder" ||
+    record.captureMode === "x11_nvenc" ||
+    record.captureMode === "none"
+      ? record.captureMode
+      : undefined;
+  const degradedReason =
+    "degradedReason" in record
+      ? record.degradedReason === null
+        ? null
+        : record.degradedReason === "worker_missing" ||
+            record.degradedReason === "browser_missing" ||
+            record.degradedReason === "page_not_ready" ||
+            record.degradedReason === "unexpected_navigation" ||
+            record.degradedReason === "capture_stalled" ||
+            record.degradedReason === "encoder_stalled" ||
+            record.degradedReason === "manifest_stale" ||
+            record.degradedReason === "destination_disconnected" ||
+            record.degradedReason === "status_stale" ||
+            record.degradedReason === "unknown"
+          ? record.degradedReason
+          : undefined
+      : undefined;
+  const currentSceneUrl = parseNullableString(record, "currentSceneUrl");
+  const activeBundle = parseNullableString(record, "activeBundle");
+  const lastFrameAt = parseNullableFiniteNumber(record, "lastFrameAt");
+  const lastRenderTickAt = parseNullableFiniteNumber(
+    record,
+    "lastRenderTickAt",
+  );
+  const lastVisualChangeAt = parseNullableFiniteNumber(
+    record,
+    "lastVisualChangeAt",
+  );
+  const lastRecoveryAt = parseNullableFiniteNumber(record, "lastRecoveryAt");
+  const recoveryCount = parseNullableFiniteNumber(record, "recoveryCount");
+  const workerHeartbeatAt = parseNullableFiniteNumber(
+    record,
+    "workerHeartbeatAt",
+  );
+  const hasRecognizedField =
+    ready !== undefined ||
+    statusSource !== undefined ||
+    captureMode !== undefined ||
+    degradedReason !== undefined ||
+    currentSceneUrl !== undefined ||
+    activeBundle !== undefined ||
+    lastFrameAt !== undefined ||
+    lastRenderTickAt !== undefined ||
+    lastVisualChangeAt !== undefined ||
+    lastRecoveryAt !== undefined ||
+    recoveryCount !== undefined ||
+    workerHeartbeatAt !== undefined;
+  if (!hasRecognizedField) {
+    return undefined;
+  }
+
+  return {
+    ready: ready ?? false,
+    statusSource: statusSource ?? "none",
+    captureMode: captureMode ?? "none",
+    degradedReason: degradedReason ?? null,
+    currentSceneUrl: currentSceneUrl ?? null,
+    activeBundle: activeBundle ?? null,
+    lastFrameAt: lastFrameAt ?? null,
+    lastRenderTickAt: lastRenderTickAt ?? null,
+    lastVisualChangeAt: lastVisualChangeAt ?? null,
+    lastRecoveryAt: lastRecoveryAt ?? null,
+    recoveryCount: Math.max(0, recoveryCount ?? 0),
+    workerHeartbeatAt: workerHeartbeatAt ?? null,
+  };
+}
+
 /**
  * Parse and validate the external RTMP status JSON, stripping unknown keys.
  *
- * Only `destinations`, `stats`, `updatedAt`, and `rendererHealth` are
+ * Only `active`, `ffmpegRunning`, `clientConnected`, `destinations`, `stats`,
+ * `updatedAt`, `rendererHealth`, `metrics`, `hlsManifest`, `delivery`, `smoke`,
+ * and `ingest`
+ * plus additive `sourceRuntime`
+ * are
  * forwarded. Any extra keys in the source file are silently dropped so
  * tampered files cannot inject arbitrary data into API responses.
  */
@@ -69,11 +684,10 @@ export function parseExternalRtmpStatusSnapshot(
   try {
     const normalized = raw.trim();
     if (!normalized) return null;
-    const parsed = JSON.parse(normalized) as Record<string, unknown>;
-    if (!parsed || typeof parsed !== "object" || Array.isArray(parsed))
-      return null;
+    const parsed = asRecord(JSON.parse(normalized));
+    if (!parsed) return null;
     if (!Array.isArray(parsed.destinations)) return null;
-    if (typeof parsed.stats !== "object" || parsed.stats == null) return null;
+    if (!asRecord(parsed.stats)) return null;
 
     const updatedAt = asFiniteNumber(Number(parsed.updatedAt || 0)) ?? 0;
     if (
@@ -86,15 +700,54 @@ export function parseExternalRtmpStatusSnapshot(
 
     // Allowlist: only forward known fields.
     const snapshot: ExternalRtmpStatusSnapshot = {
-      destinations: parsed.destinations as ExternalRtmpDestination[],
-      stats: parsed.stats as ExternalRtmpStreamStats,
+      destinations: parseExternalDestinations(parsed.destinations),
+      stats: parseExternalStats(parsed.stats),
       updatedAt,
     };
+    if (typeof parsed.active === "boolean") {
+      snapshot.active = parsed.active;
+    }
+    if (typeof parsed.ffmpegRunning === "boolean") {
+      snapshot.ffmpegRunning = parsed.ffmpegRunning;
+    }
+    if (typeof parsed.clientConnected === "boolean") {
+      snapshot.clientConnected = parsed.clientConnected;
+    }
+    const rootCaptureMode =
+      parsed.captureMode === "cdp" ||
+      parsed.captureMode === "webcodecs" ||
+      parsed.captureMode === "mediarecorder" ||
+      parsed.captureMode === "x11_nvenc" ||
+      parsed.captureMode === "none"
+        ? parsed.captureMode
+        : undefined;
+
+    const rendererHealth = parseExternalRendererHealthBlob(
+      parsed.rendererHealth,
+    );
+    const metrics = parseExternalRendererMetricsBlob(parsed.metrics);
+    const hlsManifest = parseExternalHlsManifestBlob(parsed.hlsManifest);
+    const delivery = parseExternalDeliveryInfo(parsed.delivery);
+    const smoke = parseExternalRendererSmokeBlob(parsed.smoke);
+    const ingest = parseExternalRendererIngestBlob(parsed.ingest);
+    const sourceRuntime = parseExternalSourceRuntime(parsed.sourceRuntime);
+    const captureDiagnostics = parseExternalCaptureDiagnosticsBlob(
+      parsed.captureDiagnostics,
+    );
 
-    if (parsed.rendererHealth && typeof parsed.rendererHealth === "object") {
-      snapshot.rendererHealth =
-        parsed.rendererHealth as ExternalRendererHealthBlob;
+    if (rendererHealth) snapshot.rendererHealth = rendererHealth;
+    if (metrics) snapshot.metrics = metrics;
+    if (hlsManifest) snapshot.hlsManifest = hlsManifest;
+    if (delivery) snapshot.delivery = delivery;
+    if (smoke) snapshot.smoke = smoke;
+    if (ingest) snapshot.ingest = ingest;
+    if (sourceRuntime) snapshot.sourceRuntime = sourceRuntime;
+    if (rootCaptureMode) {
+      snapshot.captureMode = rootCaptureMode;
+    } else if (sourceRuntime?.captureMode) {
+      snapshot.captureMode = sourceRuntime.captureMode;
     }
+    if (captureDiagnostics) snapshot.captureDiagnostics = captureDiagnostics;
 
     return snapshot;
   } catch {
@@ -188,6 +841,7 @@ export function acquireExternalStatusPoller(
       }, refreshIntervalMs),
       refCount: 0,
     };
+    poller.interval.unref?.();
     externalStatusPollers.set(key, poller);
     void refreshExternalStatusPoller(
       poller,
diff --git a/packages/server/src/routes/streaming-source-runtime.ts b/packages/server/src/routes/streaming-source-runtime.ts
new file mode 100644
index 000000000..d46fe4d8a
--- /dev/null
+++ b/packages/server/src/routes/streaming-source-runtime.ts
@@ -0,0 +1,241 @@
+import type { HlsManifestSnapshot } from "../streaming/stream-status-artifacts.js";
+import {
+  buildUnavailableStreamSourceRuntime,
+  normalizeStreamSourceCaptureMode,
+  normalizeStreamSourceRuntime,
+  type StreamSourceDegradedReason,
+  type StreamSourceRuntime,
+} from "../streaming/source-runtime.js";
+import type { BettingFeedRendererHealth } from "./streaming-betting-feed.js";
+import type { ExternalRtmpStatusSnapshot } from "./streaming-external-status.js";
+
+function asFiniteNumber(value: unknown): number | null {
+  return typeof value === "number" && Number.isFinite(value) ? value : null;
+}
+
+function isFreshTimestamp(
+  timestampMs: number | null,
+  nowMs: number,
+  maxAgeMs: number,
+): boolean {
+  return (
+    timestampMs != null &&
+    Number.isFinite(timestampMs) &&
+    Math.max(0, nowMs - timestampMs) <= maxAgeMs
+  );
+}
+
+function mapRendererDegradedReasonToSourceReason(
+  degradedReason: string | null | undefined,
+): StreamSourceDegradedReason | null {
+  const normalized = (degradedReason ?? "").trim().toLowerCase();
+  if (!normalized) return null;
+  if (normalized === "manifest_stale") return "manifest_stale";
+  if (
+    normalized === "capture_pipeline_inactive" ||
+    normalized === "ffmpeg_not_running" ||
+    normalized === "encoder_fps_low"
+  ) {
+    return "encoder_stalled";
+  }
+  if (
+    normalized === "capture_client_disconnected" ||
+    normalized === "bridge_inactive" ||
+    normalized === "render_tick_stale" ||
+    normalized === "visual_change_stale" ||
+    normalized === "capture_fps_low"
+  ) {
+    return "capture_stalled";
+  }
+  if (
+    normalized === "capture_page_missing" ||
+    normalized === "loading_overlay_active" ||
+    normalized === "canvas_missing" ||
+    normalized === "initialization_failed" ||
+    normalized === "asset_origin_incomplete" ||
+    normalized === "socket_disconnected" ||
+    normalized === "stream_state_missing" ||
+    normalized === "waiting_for_duel_data" ||
+    normalized === "world_not_ready" ||
+    normalized === "terrain_not_ready" ||
+    normalized === "camera_target_unresolved" ||
+    normalized === "avatar_not_ready" ||
+    normalized === "initializing" ||
+    normalized === "agents_missing" ||
+    normalized === "invalid_agent_hp" ||
+    normalized === "arena_positions_invalid"
+  ) {
+    return "page_not_ready";
+  }
+  if (normalized.startsWith("probe_failed:")) {
+    return "page_not_ready";
+  }
+  return null;
+}
+
+function resolveFallbackSourceReason(params: {
+  rendererHealth: BettingFeedRendererHealth | null;
+  externalSnapshot: ExternalRtmpStatusSnapshot | null;
+  localHlsManifest?: HlsManifestSnapshot | null;
+  captureStats?:
+    | {
+        clientConnected: boolean;
+        ffmpegRunning: boolean;
+      }
+    | null
+    | undefined;
+  nowMs: number;
+  externalStatusMaxAgeMs: number;
+}): StreamSourceDegradedReason | null {
+  const { rendererHealth, externalSnapshot, localHlsManifest, captureStats } =
+    params;
+  const rendererReason = mapRendererDegradedReasonToSourceReason(
+    rendererHealth?.degradedReason,
+  );
+  if (rendererReason) {
+    return rendererReason;
+  }
+
+  const ffmpegRunning =
+    externalSnapshot?.ffmpegRunning === true ||
+    captureStats?.ffmpegRunning === true;
+  if (!ffmpegRunning) {
+    return "encoder_stalled";
+  }
+
+  const clientConnected =
+    externalSnapshot?.clientConnected === true ||
+    captureStats?.clientConnected === true;
+  if (!clientConnected) {
+    return "capture_stalled";
+  }
+
+  const probeOnly = externalSnapshot?.ingest?.probeOnly === true;
+  const manifestUpdatedAt =
+    asFiniteNumber(externalSnapshot?.hlsManifest?.updatedAt) ??
+    asFiniteNumber(localHlsManifest?.updatedAt);
+  if (
+    !probeOnly &&
+    manifestUpdatedAt != null &&
+    !isFreshTimestamp(
+      manifestUpdatedAt,
+      params.nowMs,
+      params.externalStatusMaxAgeMs,
+    )
+  ) {
+    return "manifest_stale";
+  }
+
+  return null;
+}
+
+function resolveEffectiveExternalCaptureMode(params: {
+  externalSnapshot: ExternalRtmpStatusSnapshot | null;
+  normalizedExternalRuntime: StreamSourceRuntime | null;
+}): StreamSourceRuntime["captureMode"] {
+  const runtimeCaptureMode = normalizeStreamSourceCaptureMode(
+    params.normalizedExternalRuntime?.captureMode,
+  );
+  if (runtimeCaptureMode && runtimeCaptureMode !== "none") {
+    return runtimeCaptureMode;
+  }
+
+  return (
+    normalizeStreamSourceCaptureMode(params.externalSnapshot?.captureMode) ??
+    runtimeCaptureMode ??
+    "none"
+  );
+}
+
+export function deriveStreamSourceRuntime(params: {
+  externalStatusSnapshot?: ExternalRtmpStatusSnapshot | null;
+  externalStatusMaxAgeMs: number;
+  rendererHealth?: BettingFeedRendererHealth | null;
+  localHlsManifest?: HlsManifestSnapshot | null;
+  captureStats?:
+    | {
+        clientConnected: boolean;
+        ffmpegRunning: boolean;
+      }
+    | null
+    | undefined;
+  nowMs?: number;
+  requireExternalWorker?: boolean;
+}): StreamSourceRuntime {
+  const nowMs = params.nowMs ?? Date.now();
+  const externalSnapshot = params.externalStatusSnapshot ?? null;
+  const normalizedExternalRuntime = normalizeStreamSourceRuntime(
+    externalSnapshot?.sourceRuntime,
+  );
+  const effectiveCaptureMode = resolveEffectiveExternalCaptureMode({
+    externalSnapshot,
+    normalizedExternalRuntime,
+  });
+  const snapshotHeartbeatAt =
+    normalizedExternalRuntime?.workerHeartbeatAt ??
+    asFiniteNumber(externalSnapshot?.updatedAt);
+  const requireExternalWorker = params.requireExternalWorker === true;
+
+  if (requireExternalWorker && !externalSnapshot) {
+    return buildUnavailableStreamSourceRuntime({
+      statusSource: "external_worker",
+      degradedReason: "worker_missing",
+      workerHeartbeatAt: null,
+    });
+  }
+
+  if (
+    requireExternalWorker &&
+    externalSnapshot &&
+    !isFreshTimestamp(snapshotHeartbeatAt, nowMs, params.externalStatusMaxAgeMs)
+  ) {
+    return buildUnavailableStreamSourceRuntime({
+      statusSource: "external_worker",
+      captureMode: effectiveCaptureMode,
+      degradedReason: "status_stale",
+      currentSceneUrl: normalizedExternalRuntime?.currentSceneUrl ?? null,
+      activeBundle: normalizedExternalRuntime?.activeBundle ?? null,
+      lastFrameAt: normalizedExternalRuntime?.lastFrameAt ?? null,
+      lastRenderTickAt: normalizedExternalRuntime?.lastRenderTickAt ?? null,
+      lastVisualChangeAt: normalizedExternalRuntime?.lastVisualChangeAt ?? null,
+      lastRecoveryAt: normalizedExternalRuntime?.lastRecoveryAt ?? null,
+      recoveryCount: normalizedExternalRuntime?.recoveryCount ?? 0,
+      workerHeartbeatAt: snapshotHeartbeatAt,
+    });
+  }
+
+  if (normalizedExternalRuntime) {
+    return {
+      ...normalizedExternalRuntime,
+      captureMode: effectiveCaptureMode,
+    };
+  }
+
+  const degradedReason = resolveFallbackSourceReason({
+    rendererHealth: params.rendererHealth ?? null,
+    externalSnapshot,
+    localHlsManifest: params.localHlsManifest,
+    captureStats: params.captureStats,
+    nowMs,
+    externalStatusMaxAgeMs: params.externalStatusMaxAgeMs,
+  });
+
+  return {
+    ready: degradedReason == null,
+    statusSource: externalSnapshot ? "external_worker" : "in_process_bridge",
+    captureMode: effectiveCaptureMode,
+    degradedReason,
+    currentSceneUrl: externalSnapshot?.smoke?.currentSceneUrl ?? null,
+    activeBundle: externalSnapshot?.smoke?.activeBundle ?? null,
+    lastFrameAt: asFiniteNumber(externalSnapshot?.metrics?.latestFrameAt),
+    lastRenderTickAt: asFiniteNumber(
+      externalSnapshot?.metrics?.latestRenderTickAt,
+    ),
+    lastVisualChangeAt: asFiniteNumber(
+      externalSnapshot?.metrics?.latestVisualChangeAt,
+    ),
+    lastRecoveryAt: null,
+    recoveryCount: 0,
+    workerHeartbeatAt: snapshotHeartbeatAt,
+  };
+}
diff --git a/packages/server/src/routes/streaming.ts b/packages/server/src/routes/streaming.ts
index fadb9bb35..46ade1245 100644
--- a/packages/server/src/routes/streaming.ts
+++ b/packages/server/src/routes/streaming.ts
@@ -11,13 +11,45 @@
 import type { FastifyInstance, FastifyRequest, FastifyReply } from "fastify";
 import type { RateLimitOptions } from "@fastify/rate-limit";
 import type { World } from "@hyperscape/shared";
+import { RateLimiterMemory } from "rate-limiter-flexible";
+import { createHash } from "node:crypto";
+import type { DatabaseSystem } from "../systems/DatabaseSystem/index.js";
 import { getStreamingDuelScheduler } from "../systems/StreamingDuelScheduler/index.js";
 import {
   STREAMING_TIMING,
   type StreamingPhase,
+  type StreamingSourceTimeline,
+  type StreamingStateUpdate,
 } from "../systems/StreamingDuelScheduler/types.js";
 import { peekRTMPBridge } from "../streaming/index.js";
 import { getStreamCapture } from "../streaming/stream-capture.js";
+import {
+  buildStreamDestinationId,
+  normalizeStreamDestinationProvider,
+  resolveStreamDeliveryInfo,
+  type StreamManifestStatus,
+} from "../streaming/delivery-config.js";
+import type { StreamSourceRuntime } from "../streaming/source-runtime.js";
+import { resolveStreamIngestSettings } from "../streaming/ingest-config.js";
+import {
+  acquirePlaybackProbePoller,
+  type StreamPlaybackProbeResult,
+} from "../streaming/destination-probe.js";
+import {
+  loadPersistedStreamingAuthorityState,
+  type PersistedStreamingAuthorityState,
+} from "../streaming/cloudflare-authority.js";
+import {
+  extractBettingFeedToken,
+  hasValidBettingFeedToken,
+  resolveBettingFeedAccessToken,
+  resolveOracleProofAccessToken,
+} from "./streaming-betting-auth.js";
+import {
+  readLocalHlsManifestSnapshot,
+  resolveExternalStatusFile,
+  type HlsManifestSnapshot,
+} from "../streaming/stream-status-artifacts.js";
 import {
   STREAMING_CANONICAL_PLATFORM,
   STREAMING_PUBLIC_DELAY_DEFAULT_MS,
@@ -29,8 +61,13 @@ import {
   loadExternalRtmpStatusSnapshot,
   registerStreamingBettingRoutes,
 } from "./streaming-betting-routes.js";
+import type {
+  ExternalCaptureDiagnosticsBlob,
+  ExternalRtmpDestination,
+  ExternalRtmpStatusSnapshot,
+} from "./streaming-external-status.js";
+import { deriveStreamSourceRuntime } from "./streaming-source-runtime.js";
 import { trimReplayFrames } from "./streaming-sse-buffer.js";
-import { getDefaultPublicWsUrl } from "../shared/public-ws-url.js";
 type InventorySnapshotItem = {
   slot: number;
   itemId: string;
@@ -101,11 +138,14 @@ const STREAMING_SSE_MAX_CLIENTS = Math.max(
     Number.parseInt(process.env.STREAMING_SSE_MAX_CLIENTS || "64", 10),
   ),
 );
-const EXTERNAL_RTMP_STATUS_FILE = (process.env.RTMP_STATUS_FILE || "").trim();
+const EXTERNAL_RTMP_STATUS_FILE = resolveExternalStatusFile(process.env);
 const EXTERNAL_RTMP_STATUS_MAX_AGE_MS = Math.max(
   5000,
   Number.parseInt(process.env.RTMP_STATUS_MAX_AGE_MS || "15000", 10),
 );
+const REQUIRE_EXTERNAL_SOURCE_RUNTIME =
+  process.env.STREAM_SOURCE_RUNTIME_REQUIRE_EXTERNAL === "true" ||
+  process.env.NODE_ENV === "production";
 const BETTING_BOOTSTRAP_RATE_LIMIT: RateLimitOptions = {
   max: 240,
   timeWindow: "1 minute",
@@ -114,6 +154,816 @@ const BETTING_EVENTS_RATE_LIMIT: RateLimitOptions = {
   max: 60,
   timeWindow: "1 minute",
 };
+const AUTHENTICATED_RESULTS_RATE_LIMIT: RateLimitOptions = {
+  max: 120,
+  timeWindow: "1 minute",
+};
+const STREAMING_STATUS_RATE_LIMIT: RateLimitOptions = {
+  max: 120,
+  timeWindow: "1 minute",
+};
+const STREAMING_RESULT_DUEL_ID_PATTERN = /^[A-Za-z0-9][A-Za-z0-9:_-]{0,127}$/;
+const STREAMING_STATUS_CODEQL_LIMITER = new RateLimiterMemory({
+  points: 120,
+  duration: 60,
+});
+
+/**
+ * Opt-in additive contract for raw source-time fields on the canonical
+ * stream state. When false (default) the wire shape is unchanged and every
+ * existing consumer keeps working. When true the server also emits:
+ *   - `cycle.sourceTimeline` — raw phase + timing fields (unprojected)
+ *   - `emittedAt` on REST responses (SSE frames stamp this independently)
+ * Commit 1 of the viewer-aligned-bet-state rollout; see
+ * `docs/frontier_duel_bet_stream_sync_prd_sow.md` for the cross-rail plan.
+ */
+export function isRawSourceTimeEmissionEnabled(
+  env: NodeJS.ProcessEnv = process.env,
+): boolean {
+  return (
+    (env.STREAMING_EMIT_RAW_SOURCE_TIME ?? "").trim().toLowerCase() === "true"
+  );
+}
+
+/**
+ * Build a raw `sourceTimeline` projection of the given cycle. Every field
+ * mirrors the scheduler's underlying wall-clock value without any
+ * presentation-delay or replay-offset shift applied. `updatedAt` is the
+ * source-emission timestamp of the frame the cycle was pulled from —
+ * distinct from any downstream delivery time.
+ */
+export function buildSourceTimeline(
+  cycle: StreamingStateUpdate["cycle"],
+  updatedAt: number,
+): StreamingSourceTimeline {
+  return {
+    phase: cycle.phase,
+    betOpenTime: cycle.betOpenTime ?? null,
+    betCloseTime: cycle.betCloseTime ?? null,
+    fightStartTime: cycle.fightStartTime ?? null,
+    duelEndTime: cycle.duelEndTime ?? null,
+    updatedAt,
+  };
+}
+
+/**
+ * Attach raw source-time metadata to a streaming-state object, subject to
+ * the `STREAMING_EMIT_RAW_SOURCE_TIME` flag (resolved via `enabled`). When
+ * disabled, the wire shape is unchanged and every existing consumer keeps
+ * working. When enabled:
+ *   - `cycle.sourceTimeline` is populated with raw scheduler timings
+ *   - `emittedAt` is attached at the envelope root when `stampEmittedAt`
+ *     is true (REST responses want this; SSE frames already stamp
+ *     `emittedAt` from their own envelope construction upstream).
+ */
+export function attachRawSourceTime<
+  T extends { cycle: StreamingStateUpdate["cycle"] },
+>(
+  state: T,
+  sourceEmittedAt: number,
+  options: {
+    stampEmittedAt: boolean;
+    enabled: boolean;
+    sourceCycle?: StreamingStateUpdate["cycle"] | null;
+  },
+): T {
+  if (!options.enabled) return state;
+  const sourceTimeline =
+    state.cycle.sourceTimeline ??
+    buildSourceTimeline(options.sourceCycle ?? state.cycle, sourceEmittedAt);
+  const withTimeline: T = {
+    ...state,
+    cycle: {
+      ...state.cycle,
+      sourceTimeline,
+    },
+  };
+  if (!options.stampEmittedAt) return withTimeline;
+  return { ...withTimeline, emittedAt: sourceEmittedAt } as T & {
+    emittedAt: number;
+  };
+}
+
+/**
+ * Standalone preHandler implementing the exact pattern CodeQL's
+ * RouteHandlerLimitedByRateLimiterFlexible class recognizes: a function taking
+ * a request parameter that calls `.consume(request.<prop>)` on an instance of
+ * a `RateLimiter*` class from `rate-limiter-flexible`. Extracted to module
+ * scope so the middleware is a separate routing-tree node that guards the
+ * handler, which is what CodeQL's `isGuardedByNode` check requires.
+ *
+ * Using this preHandler satisfies `js/missing-rate-limiting` WITHOUT relying
+ * on the `config.rateLimit` shorthand, which CodeQL's `FastifyPerRouteRateLimit`
+ * class only recognizes when the rate-limiter plugin is imported under the
+ * old unscoped name `fastify-rate-limit` (this repo uses `@fastify/rate-limit`).
+ */
+async function codeqlStatusRateLimitPreHandler(
+  request: FastifyRequest,
+  reply: FastifyReply,
+): Promise<void> {
+  try {
+    await STREAMING_STATUS_CODEQL_LIMITER.consume(request.ip);
+  } catch {
+    await reply.code(429).send({ error: "Too Many Requests" });
+  }
+}
+type RateLimitedFastify = FastifyInstance & {
+  rateLimit: NonNullable<FastifyInstance["rateLimit"]>;
+};
+type StreamingStatusMetricsSnapshot = {
+  captureFps: number | null;
+  encodeFps: number | null;
+  droppedFrames: number | null;
+  renderTick: number | null;
+  duelStateTick: number | null;
+  latestFrameAt: number | null;
+  latestRenderTickAt: number | null;
+  latestDuelStateTickAt: number | null;
+  latestVisualChangeAt: number | null;
+  visualChangeAgeMs: number | null;
+};
+
+type StreamingStatusManifestSnapshot = {
+  updatedAt: number | null;
+  mediaSequence: number | null;
+};
+
+type StreamingStatusSmokeSnapshot = {
+  currentSceneUrl: string | null;
+  activeBundle: string | null;
+  deliveryMode: string | null;
+  captureFpsP50: number | null;
+  captureFpsP95: number | null;
+  encodeFpsP50: number | null;
+  encodeFpsP95: number | null;
+  updatedAt: number | null;
+  ingest: StreamingStatusIngestSnapshot;
+};
+
+type StreamingStatusIngestSnapshot = {
+  profile: string | null;
+  transport: string | null;
+  audioSampleRate: number | null;
+  gopFrames: number | null;
+  probeOnly: boolean | null;
+};
+
+type StreamingCanonicalStatusSnapshot = {
+  sourceReady: boolean;
+  canonicalTransportConnected: boolean;
+  canonicalPlaybackReady: boolean;
+  manifestStatus: StreamManifestStatus;
+  lastError: string | null;
+  updatedAt: number | null;
+};
+
+function asFiniteNumber(value: unknown): number | null {
+  return typeof value === "number" && Number.isFinite(value) ? value : null;
+}
+
+function asBoolean(value: unknown): boolean | null {
+  return typeof value === "boolean" ? value : null;
+}
+
+function hashAuditValue(value: string | null | undefined): string | null {
+  const normalized = value?.trim();
+  if (!normalized) {
+    return null;
+  }
+  return createHash("sha256").update(normalized, "utf8").digest("hex");
+}
+
+function redactIngestUrlFromDestination<T>(destination: T): T {
+  if (!destination || typeof destination !== "object") {
+    return destination;
+  }
+  return {
+    ...destination,
+    ingestUrl: null,
+  };
+}
+
+function redactIngestUrlsFromDestinations<T>(destinations: readonly T[]): T[] {
+  return destinations.map((destination) =>
+    redactIngestUrlFromDestination(destination),
+  );
+}
+
+function redactIngestUrlFromDelivery<T>(delivery: T): T {
+  if (!delivery || typeof delivery !== "object") {
+    return delivery;
+  }
+  if (!("ingestUrl" in delivery)) {
+    return delivery;
+  }
+  return {
+    ...delivery,
+    ingestUrl: null,
+  };
+}
+
+function ensureRateLimitDecorator(
+  fastify: FastifyInstance,
+): asserts fastify is RateLimitedFastify {
+  if (typeof fastify.rateLimit === "function") {
+    return;
+  }
+  throw new Error(
+    "Streaming routes require @fastify/rate-limit to be registered before route setup",
+  );
+}
+
+export function normalizeStreamingStatusMetrics(params: {
+  externalSnapshot: ExternalRtmpStatusSnapshot | null;
+  bridgeStats?:
+    | {
+        encoderFps?: number;
+        droppedFrames?: number;
+      }
+    | null
+    | undefined;
+}): StreamingStatusMetricsSnapshot {
+  const metrics = params.externalSnapshot?.metrics;
+  const bridgeStats = params.bridgeStats;
+
+  return {
+    captureFps: asFiniteNumber(metrics?.captureFps),
+    encodeFps:
+      asFiniteNumber(metrics?.encodeFps) ??
+      asFiniteNumber(bridgeStats?.encoderFps),
+    droppedFrames:
+      asFiniteNumber(metrics?.droppedFrames) ??
+      asFiniteNumber(bridgeStats?.droppedFrames),
+    renderTick: asFiniteNumber(metrics?.renderTick),
+    duelStateTick: asFiniteNumber(metrics?.duelStateTick),
+    latestFrameAt: asFiniteNumber(metrics?.latestFrameAt),
+    latestRenderTickAt: asFiniteNumber(metrics?.latestRenderTickAt),
+    latestDuelStateTickAt: asFiniteNumber(metrics?.latestDuelStateTickAt),
+    latestVisualChangeAt: asFiniteNumber(metrics?.latestVisualChangeAt),
+    visualChangeAgeMs: asFiniteNumber(metrics?.visualChangeAgeMs),
+  };
+}
+
+export function normalizeStreamingStatusManifest(params: {
+  externalSnapshot: ExternalRtmpStatusSnapshot | null;
+  localHlsManifest?: HlsManifestSnapshot | null;
+}): StreamingStatusManifestSnapshot {
+  const externalManifest = params.externalSnapshot?.hlsManifest;
+  const localManifest = params.localHlsManifest;
+  return {
+    updatedAt:
+      asFiniteNumber(externalManifest?.updatedAt) ??
+      asFiniteNumber(localManifest?.updatedAt),
+    mediaSequence:
+      asFiniteNumber(externalManifest?.mediaSequence) ??
+      asFiniteNumber(localManifest?.mediaSequence),
+  };
+}
+
+export function normalizeStreamingStatusSmoke(params: {
+  externalSnapshot: ExternalRtmpStatusSnapshot | null;
+  deliveryModeFallback: string | null;
+}): StreamingStatusSmokeSnapshot {
+  const smoke = params.externalSnapshot?.smoke;
+  const ingest =
+    smoke?.ingest && typeof smoke.ingest === "object"
+      ? smoke.ingest
+      : params.externalSnapshot?.ingest;
+  const fallbackIngest = resolveStreamIngestSettings(process.env);
+  return {
+    currentSceneUrl:
+      typeof smoke?.currentSceneUrl === "string" &&
+      smoke.currentSceneUrl.trim().length > 0
+        ? smoke.currentSceneUrl.trim()
+        : null,
+    activeBundle:
+      typeof smoke?.activeBundle === "string" &&
+      smoke.activeBundle.trim().length > 0
+        ? smoke.activeBundle.trim()
+        : null,
+    deliveryMode:
+      typeof smoke?.deliveryMode === "string" &&
+      smoke.deliveryMode.trim().length > 0
+        ? smoke.deliveryMode.trim()
+        : params.deliveryModeFallback,
+    captureFpsP50: asFiniteNumber(smoke?.captureFpsP50),
+    captureFpsP95: asFiniteNumber(smoke?.captureFpsP95),
+    encodeFpsP50: asFiniteNumber(smoke?.encodeFpsP50),
+    encodeFpsP95: asFiniteNumber(smoke?.encodeFpsP95),
+    updatedAt: asFiniteNumber(smoke?.updatedAt),
+    ingest: {
+      profile:
+        typeof ingest?.profile === "string" && ingest.profile.trim().length > 0
+          ? ingest.profile.trim()
+          : fallbackIngest.profile,
+      transport:
+        typeof ingest?.transport === "string" &&
+        ingest.transport.trim().length > 0
+          ? ingest.transport.trim()
+          : fallbackIngest.transport,
+      audioSampleRate:
+        asFiniteNumber(ingest?.audioSampleRate) ??
+        fallbackIngest.audioSampleRate,
+      gopFrames: asFiniteNumber(ingest?.gopFrames) ?? fallbackIngest.gopFrames,
+      probeOnly:
+        asBoolean(ingest?.probeOnly) ??
+        (fallbackIngest.probeOnly ? true : false),
+    },
+  };
+}
+
+function findCanonicalStreamingDestination(params: {
+  externalSnapshot: ExternalRtmpStatusSnapshot | null;
+  delivery: ReturnType<typeof resolveStreamDeliveryInfo>;
+}): {
+  index: number;
+  destination: ExternalRtmpDestination | null;
+} {
+  const destinations = Array.isArray(params.externalSnapshot?.destinations)
+    ? params.externalSnapshot!.destinations
+    : [];
+  const canonicalProvider =
+    params.delivery.mode === "self_hls"
+      ? "self_hls"
+      : normalizeStreamDestinationProvider(
+          params.delivery.provider,
+          "Cloudflare",
+        );
+  const canonicalDestinationId = buildStreamDestinationId({
+    role: "canonical",
+    provider: canonicalProvider,
+    name: "External Delivery",
+  });
+
+  const index = destinations.findIndex(
+    (destination) => destination.role === "canonical",
+  );
+  if (index >= 0) {
+    return {
+      index,
+      destination: destinations[index] ?? null,
+    };
+  }
+
+  const idIndex = destinations.findIndex(
+    (destination) => destination.id === canonicalDestinationId,
+  );
+  if (idIndex >= 0) {
+    return {
+      index: idIndex,
+      destination: destinations[idIndex] ?? null,
+    };
+  }
+
+  const providerIndex = destinations.findIndex(
+    (destination) =>
+      normalizeStreamDestinationProvider(
+        destination.provider ?? null,
+        destination.name ?? null,
+      ) === canonicalProvider,
+  );
+  if (providerIndex >= 0) {
+    return {
+      index: providerIndex,
+      destination: destinations[providerIndex] ?? null,
+    };
+  }
+
+  return {
+    index: -1,
+    destination: null,
+  };
+}
+
+function isFreshStreamingSnapshot(
+  updatedAt: number | null | undefined,
+  nowMs: number,
+): boolean {
+  return (
+    typeof updatedAt === "number" &&
+    Number.isFinite(updatedAt) &&
+    Math.max(0, nowMs - updatedAt) <= EXTERNAL_RTMP_STATUS_MAX_AGE_MS
+  );
+}
+
+function resolveStreamingManifestStatusFromUpdatedAt(
+  updatedAt: number | null | undefined,
+  nowMs: number,
+): StreamManifestStatus {
+  if (typeof updatedAt !== "number" || !Number.isFinite(updatedAt)) {
+    return "missing";
+  }
+  return isFreshStreamingSnapshot(updatedAt, nowMs) ? "ok" : "stale";
+}
+
+function resolveCanonicalPlaybackUrl(params: {
+  destination: ExternalRtmpDestination | null;
+  delivery: ReturnType<typeof resolveStreamDeliveryInfo>;
+}): string | null {
+  return (
+    params.destination?.playbackUrl ??
+    params.delivery.playbackUrl ??
+    params.delivery.llhlsUrl ??
+    params.delivery.hlsUrl ??
+    null
+  );
+}
+
+function hasFreshContradictorySourceError(params: {
+  sourceRuntime: StreamSourceRuntime;
+  captureDiagnostics?: ExternalCaptureDiagnosticsBlob | null;
+  canonicalProbeSnapshot?: StreamPlaybackProbeResult | null;
+}): boolean {
+  if (params.sourceRuntime.ready === true) {
+    return false;
+  }
+
+  const probeUpdatedAt = asFiniteNumber(
+    params.canonicalProbeSnapshot?.updatedAt,
+  );
+  const fatalWriteAt = asFiniteNumber(
+    params.captureDiagnostics?.lastFatalWriteError?.at,
+  );
+  const workerHeartbeatAt = asFiniteNumber(
+    params.sourceRuntime.workerHeartbeatAt,
+  );
+  const freshestSourceIncidentAt = Math.max(
+    fatalWriteAt ?? Number.NEGATIVE_INFINITY,
+    workerHeartbeatAt ?? Number.NEGATIVE_INFINITY,
+  );
+
+  if (!Number.isFinite(freshestSourceIncidentAt)) {
+    return true;
+  }
+  if (probeUpdatedAt == null) {
+    return true;
+  }
+
+  return freshestSourceIncidentAt >= probeUpdatedAt;
+}
+
+function normalizeCanonicalStreamingTruth(params: {
+  externalSnapshot: ExternalRtmpStatusSnapshot | null;
+  delivery: ReturnType<typeof resolveStreamDeliveryInfo>;
+  canonicalProbeSnapshot?: StreamPlaybackProbeResult | null;
+  sourceRuntime: StreamSourceRuntime;
+  localHlsManifest?: HlsManifestSnapshot | null;
+}): {
+  externalSnapshot: ExternalRtmpStatusSnapshot | null;
+  canonicalStatus: StreamingCanonicalStatusSnapshot;
+} {
+  if (params.delivery.mode === "self_hls") {
+    const playbackUrl = params.delivery.playbackUrl ?? null;
+    const externalManifestUpdatedAt = asFiniteNumber(
+      params.externalSnapshot?.hlsManifest?.updatedAt,
+    );
+    const localManifestUpdatedAt = asFiniteNumber(
+      params.localHlsManifest?.updatedAt,
+    );
+    const manifestUpdatedAt =
+      externalManifestUpdatedAt != null && localManifestUpdatedAt != null
+        ? Math.max(externalManifestUpdatedAt, localManifestUpdatedAt)
+        : (externalManifestUpdatedAt ?? localManifestUpdatedAt ?? null);
+    const nowMs = Date.now();
+    const manifestStatus = resolveStreamingManifestStatusFromUpdatedAt(
+      manifestUpdatedAt,
+      nowMs,
+    );
+    const sourceReady = params.sourceRuntime.ready === true;
+    const canonicalPlaybackReady = manifestStatus === "ok";
+    const canonicalTransportConnected = sourceReady && canonicalPlaybackReady;
+    const lastError = sourceReady
+      ? canonicalPlaybackReady
+        ? null
+        : manifestStatus === "stale"
+          ? "manifest_stale"
+          : playbackUrl
+            ? "manifest_not_ready"
+            : "playback_unconfigured"
+      : (params.sourceRuntime.degradedReason ?? "source_unavailable");
+
+    const selfHostedDestination = {
+      id: buildStreamDestinationId({
+        role: "canonical",
+        provider: "self_hls",
+        name: "Self-HLS",
+      }),
+      name: "Self-HLS",
+      role: "canonical" as const,
+      provider: "self_hls" as const,
+      transport: "hls" as const,
+      playbackUrl,
+      ingestUrl: null,
+      connected: canonicalPlaybackReady,
+      transportHealthy: canonicalTransportConnected,
+      playbackReady: canonicalPlaybackReady,
+      manifestStatus,
+      lastError,
+      error: lastError ?? undefined,
+      updatedAt: manifestUpdatedAt ?? undefined,
+    };
+
+    const destinations = Array.isArray(params.externalSnapshot?.destinations)
+      ? params.externalSnapshot!.destinations
+      : [];
+    const normalizedIndex = destinations.findIndex((candidate) => {
+      if (candidate.role === "canonical") return true;
+      if (candidate.id === selfHostedDestination.id) return true;
+      return (
+        normalizeStreamDestinationProvider(
+          candidate.provider ?? null,
+          candidate.name ?? null,
+        ) === "self_hls"
+      );
+    });
+
+    const normalizedSnapshot = params.externalSnapshot
+      ? {
+          ...params.externalSnapshot,
+          destinations:
+            normalizedIndex >= 0
+              ? params.externalSnapshot.destinations.map((candidate, index) =>
+                  index === normalizedIndex
+                    ? { ...candidate, ...selfHostedDestination }
+                    : candidate,
+                )
+              : [
+                  ...params.externalSnapshot.destinations,
+                  selfHostedDestination,
+                ],
+        }
+      : {
+          active: canonicalTransportConnected,
+          ffmpegRunning: sourceReady,
+          clientConnected: sourceReady,
+          destinations: [selfHostedDestination],
+          stats: {},
+          updatedAt: manifestUpdatedAt ?? nowMs,
+          hlsManifest: {
+            updatedAt: manifestUpdatedAt,
+            mediaSequence:
+              asFiniteNumber(params.localHlsManifest?.mediaSequence) ?? null,
+          },
+          delivery: params.delivery,
+        };
+
+    return {
+      externalSnapshot: normalizedSnapshot,
+      canonicalStatus: {
+        sourceReady,
+        canonicalTransportConnected,
+        canonicalPlaybackReady,
+        manifestStatus,
+        lastError,
+        updatedAt: manifestUpdatedAt,
+      },
+    };
+  }
+
+  const { index, destination } = findCanonicalStreamingDestination({
+    externalSnapshot: params.externalSnapshot,
+    delivery: params.delivery,
+  });
+  const playbackUrl = resolveCanonicalPlaybackUrl({
+    destination,
+    delivery: params.delivery,
+  });
+  const probeReady = params.canonicalProbeSnapshot?.ready === true;
+  const sourceReady = params.sourceRuntime.ready === true;
+  const contradictorySourceError = hasFreshContradictorySourceError({
+    sourceRuntime: params.sourceRuntime,
+    captureDiagnostics: params.externalSnapshot?.captureDiagnostics ?? null,
+    canonicalProbeSnapshot: params.canonicalProbeSnapshot ?? null,
+  });
+  const destinationError =
+    typeof destination?.error === "string" &&
+    destination.error.trim().length > 0
+      ? destination.error.trim()
+      : null;
+  const canonicalDestinationConnected =
+    probeReady || destination?.connected === true;
+  const canonicalTransportConnected =
+    sourceReady && canonicalDestinationConnected && !contradictorySourceError;
+  const canonicalPlaybackReady = probeReady;
+  const manifestStatus =
+    params.canonicalProbeSnapshot?.manifestStatus ??
+    (playbackUrl ? "unknown" : "missing");
+  const updatedAt =
+    params.canonicalProbeSnapshot?.updatedAt ??
+    destination?.startedAt ??
+    params.externalSnapshot?.updatedAt ??
+    null;
+  const lastError =
+    probeReady && !contradictorySourceError
+      ? null
+      : params.sourceRuntime.ready
+        ? (destinationError ??
+          params.canonicalProbeSnapshot?.lastError ??
+          (playbackUrl ? "delivery_disconnected" : "playback_unconfigured"))
+        : (params.sourceRuntime.degradedReason ??
+          destinationError ??
+          "source_unavailable");
+
+  if (!params.externalSnapshot || index < 0) {
+    return {
+      externalSnapshot: params.externalSnapshot,
+      canonicalStatus: {
+        sourceReady,
+        canonicalTransportConnected,
+        canonicalPlaybackReady,
+        manifestStatus,
+        lastError,
+        updatedAt,
+      },
+    };
+  }
+
+  const normalizedDestinations = params.externalSnapshot.destinations.map(
+    (candidate, candidateIndex) => {
+      if (candidateIndex !== index) {
+        return candidate;
+      }
+      return {
+        ...candidate,
+        connected: canonicalDestinationConnected,
+        transportHealthy:
+          sourceReady && probeReady && !contradictorySourceError,
+        playbackReady: canonicalPlaybackReady,
+        manifestStatus,
+        lastError,
+        error: lastError ?? undefined,
+        updatedAt: updatedAt ?? undefined,
+      };
+    },
+  );
+
+  return {
+    externalSnapshot: {
+      ...params.externalSnapshot,
+      destinations: normalizedDestinations,
+    },
+    canonicalStatus: {
+      sourceReady,
+      canonicalTransportConnected,
+      canonicalPlaybackReady,
+      manifestStatus,
+      lastError,
+      updatedAt,
+    },
+  };
+}
+
+export function buildStreamingStatusPayload(params: {
+  base: Record<string, unknown>;
+  externalSnapshot: ExternalRtmpStatusSnapshot | null;
+  canonicalProbeSnapshot?: StreamPlaybackProbeResult | null;
+  localHlsManifest?: HlsManifestSnapshot | null;
+  bridgeStats?:
+    | {
+        encoderFps?: number;
+        droppedFrames?: number;
+      }
+    | null
+    | undefined;
+  rendererHealth: ReturnType<typeof deriveBettingRendererHealth>;
+  captureStats?:
+    | {
+        clientConnected: boolean;
+        ffmpegRunning: boolean;
+      }
+    | null
+    | undefined;
+  persistedAuthorityState?: PersistedStreamingAuthorityState | null;
+  cloudflareLiveInputId?: string | null;
+}) {
+  const delivery =
+    params.externalSnapshot?.delivery ?? resolveStreamDeliveryInfo(process.env);
+  const sourceRuntime: StreamSourceRuntime = deriveStreamSourceRuntime({
+    externalStatusSnapshot: params.externalSnapshot,
+    externalStatusMaxAgeMs: EXTERNAL_RTMP_STATUS_MAX_AGE_MS,
+    rendererHealth: params.rendererHealth,
+    localHlsManifest: params.localHlsManifest,
+    captureStats: params.captureStats,
+    requireExternalWorker: REQUIRE_EXTERNAL_SOURCE_RUNTIME,
+  });
+  const normalizedCanonicalTruth = normalizeCanonicalStreamingTruth({
+    externalSnapshot: params.externalSnapshot,
+    delivery,
+    canonicalProbeSnapshot: params.canonicalProbeSnapshot ?? null,
+    sourceRuntime,
+    localHlsManifest: params.localHlsManifest,
+  });
+  const effectiveExternalSnapshot = normalizedCanonicalTruth.externalSnapshot;
+  const persistedAuthority = params.persistedAuthorityState ?? null;
+  const metrics = normalizeStreamingStatusMetrics({
+    externalSnapshot: effectiveExternalSnapshot,
+    bridgeStats: params.bridgeStats,
+  });
+  const hlsManifest = normalizeStreamingStatusManifest({
+    externalSnapshot: effectiveExternalSnapshot,
+    localHlsManifest: params.localHlsManifest,
+  });
+  const smoke = normalizeStreamingStatusSmoke({
+    externalSnapshot: effectiveExternalSnapshot,
+    deliveryModeFallback: delivery.mode,
+  });
+  const externalActive = asBoolean(effectiveExternalSnapshot?.active);
+  const externalFfmpegRunning = asBoolean(
+    effectiveExternalSnapshot?.ffmpegRunning,
+  );
+  const externalClientConnected = asBoolean(
+    effectiveExternalSnapshot?.clientConnected,
+  );
+  const configuredCanonicalProvider =
+    delivery.mode === "self_hls"
+      ? "self_hls"
+      : normalizeStreamDestinationProvider(delivery.provider, "Cloudflare");
+  const activeCanonicalProvider =
+    delivery.mode === "self_hls"
+      ? "self_hls"
+      : (persistedAuthority?.canonicalProviderState?.activeProvider ??
+        configuredCanonicalProvider);
+  const matchingPersistedCanonicalProviderState =
+    persistedAuthority?.canonicalProviderState?.activeProvider ===
+    activeCanonicalProvider
+      ? persistedAuthority.canonicalProviderState
+      : null;
+  const publicDestinations = redactIngestUrlsFromDestinations(
+    (effectiveExternalSnapshot?.destinations ??
+      params.base.destinations ??
+      []) as readonly unknown[],
+  );
+  const publicDelivery = redactIngestUrlFromDelivery(delivery);
+  const publicHealthy =
+    delivery.mode === "self_hls"
+      ? normalizedCanonicalTruth.canonicalStatus.sourceReady &&
+        normalizedCanonicalTruth.canonicalStatus.canonicalTransportConnected &&
+        normalizedCanonicalTruth.canonicalStatus.canonicalPlaybackReady
+      : params.base.healthy;
+  const cloudflarePlaybackProbe =
+    activeCanonicalProvider === "cloudflare_stream" &&
+    params.canonicalProbeSnapshot
+      ? {
+          ready: params.canonicalProbeSnapshot.ready,
+          manifestStatus: params.canonicalProbeSnapshot.manifestStatus,
+          lastError: params.canonicalProbeSnapshot.lastError,
+          updatedAt: params.canonicalProbeSnapshot.updatedAt,
+        }
+      : null;
+  const publicCloudflareLiveInputId =
+    params.cloudflareLiveInputId?.trim() ||
+    persistedAuthority?.cloudflareLifecycle?.liveInputId ||
+    persistedAuthority?.cloudflareLastWebhook?.liveInputId ||
+    null;
+  const publicCloudflareStatus = {
+    liveInputId: publicCloudflareLiveInputId,
+    lifecycle: persistedAuthority?.cloudflareLifecycle ?? null,
+    lastWebhook: persistedAuthority?.cloudflareLastWebhook ?? null,
+    lastPlaybackProbe: cloudflarePlaybackProbe,
+    lastExternalTransportError: null,
+  };
+
+  return {
+    ...params.base,
+    healthy: publicHealthy,
+    running: externalActive ?? params.base.running,
+    bridgeActive: externalActive ?? params.base.bridgeActive,
+    ffmpegRunning: externalFfmpegRunning ?? params.base.ffmpegRunning,
+    clientConnected: externalClientConnected ?? params.base.clientConnected,
+    destinations: publicDestinations,
+    metrics,
+    captureFps: metrics.captureFps,
+    encodeFps: metrics.encodeFps,
+    droppedFrames: metrics.droppedFrames,
+    renderTick: metrics.renderTick,
+    duelStateTick: metrics.duelStateTick,
+    latestFrameAt: metrics.latestFrameAt,
+    latestRenderTickAt: metrics.latestRenderTickAt,
+    latestDuelStateTickAt: metrics.latestDuelStateTickAt,
+    latestVisualChangeAt: metrics.latestVisualChangeAt,
+    visualChangeAgeMs: metrics.visualChangeAgeMs,
+    hlsManifest,
+    hlsManifestUpdatedAt: hlsManifest.updatedAt,
+    hlsMediaSequence: hlsManifest.mediaSequence,
+    delivery: publicDelivery,
+    ingest: smoke.ingest,
+    smoke,
+    deliveryMode: publicDelivery.mode,
+    deliveryProvider: publicDelivery.provider ?? null,
+    playbackUrl: publicDelivery.playbackUrl ?? null,
+    rendererHealth: params.rendererHealth,
+    sourceRuntime,
+    canonicalStatus: normalizedCanonicalTruth.canonicalStatus,
+    authority: {
+      activeCanonicalProvider,
+      primaryHealthySince:
+        matchingPersistedCanonicalProviderState?.primaryHealthySince ?? null,
+      updatedAt: matchingPersistedCanonicalProviderState?.updatedAt ?? null,
+    },
+    cloudflare: publicCloudflareStatus,
+    captureDiagnostics: null,
+  };
+}
 
 function getInventorySnapshot(
   world: World,
@@ -167,6 +1017,51 @@ async function getThoughtsSnapshot(
   return thoughts.slice(0, Math.max(1, Math.min(limit, 50)));
 }
 
+export function normalizeStreamingThoughtLimit(
+  rawLimit: string | undefined,
+): number {
+  const parsed = Number.parseInt(rawLimit || "20", 10);
+  if (!Number.isFinite(parsed)) {
+    return 20;
+  }
+  return Math.max(1, Math.min(parsed, 50));
+}
+
+export function allocateNextStreamingSseClientId(
+  currentNextClientId: number,
+  clients: ReadonlyMap<number, unknown>,
+): { clientId: number; nextClientId: number } {
+  const maxClientId = Number.MAX_SAFE_INTEGER;
+  let candidate = currentNextClientId;
+
+  for (let attempts = 0; attempts <= maxClientId; attempts += 1) {
+    if (!Number.isSafeInteger(candidate) || candidate <= 0) {
+      candidate = 1;
+    }
+    if (!clients.has(candidate)) {
+      const nextClientId = candidate >= maxClientId ? 1 : candidate + 1;
+      return { clientId: candidate, nextClientId };
+    }
+    candidate = candidate >= maxClientId ? 1 : candidate + 1;
+  }
+
+  throw new Error("Streaming SSE client id space exhausted");
+}
+
+export function buildStreamingResultNotFoundPayload(): {
+  error: "Not found";
+  message: "Resolved duel not found";
+} {
+  return {
+    error: "Not found",
+    message: "Resolved duel not found",
+  };
+}
+
+export function isValidStreamingResultDuelId(duelId: string): boolean {
+  return STREAMING_RESULT_DUEL_ID_PATTERN.test(duelId);
+}
+
 /**
  * Register streaming routes
  */
@@ -174,6 +1069,7 @@ export function registerStreamingRoutes(
   fastify: FastifyInstance,
   world: World,
 ): void {
+  ensureRateLimitDecorator(fastify);
   const sseClients = new Map<number, FastifyReply>();
   const replayFrames: StreamingSseFrame[] = [];
   let replayFramesTotalBytes = 0;
@@ -206,6 +1102,21 @@ export function registerStreamingRoutes(
   let lastBroadcastSeq = 0;
   let statePushInterval: ReturnType<typeof setInterval> | null = null;
   let heartbeatInterval: ReturnType<typeof setInterval> | null = null;
+  const configuredStreamingDelivery = resolveStreamDeliveryInfo(process.env);
+  const canonicalPlaybackProbePoller = acquirePlaybackProbePoller(
+    configuredStreamingDelivery.mode === "external_hls"
+      ? (configuredStreamingDelivery.playbackUrl ??
+          configuredStreamingDelivery.llhlsUrl ??
+          configuredStreamingDelivery.hlsUrl)
+      : null,
+    {
+      intervalMs: Math.max(
+        2_000,
+        Math.min(EXTERNAL_RTMP_STATUS_MAX_AGE_MS, 5_000),
+      ),
+      timeoutMs: Math.min(EXTERNAL_RTMP_STATUS_MAX_AGE_MS, 4_000),
+    },
+  );
   const bettingRoutes = registerStreamingBettingRoutes({
     fastify,
     world,
@@ -228,6 +1139,26 @@ export function registerStreamingRoutes(
     externalStatusFile: EXTERNAL_RTMP_STATUS_FILE || null,
     externalStatusMaxAgeMs: EXTERNAL_RTMP_STATUS_MAX_AGE_MS,
   });
+  const cloudflareLiveInputId =
+    process.env.STREAM_CLOUDFLARE_LIVE_INPUT_ID?.trim() || null;
+  const getStorageDb = () =>
+    (
+      world.getSystem("database") as
+        | {
+            getDb?: () => ReturnType<DatabaseSystem["getDb"]>;
+          }
+        | null
+        | undefined
+    )?.getDb?.() ?? null;
+  const loadPersistedStreamState = () =>
+    loadPersistedStreamingAuthorityState(getStorageDb());
+  const loadPersistedStreamStateSafely = async () => {
+    try {
+      return await loadPersistedStreamState();
+    } catch {
+      return null;
+    }
+  };
 
   const formatSseEvent = (event: string, data: string, id?: number): string => {
     const normalizedData = data.replace(/\n/g, "\ndata: ");
@@ -437,11 +1368,43 @@ export function registerStreamingRoutes(
     }
   };
 
+  const redactOracleProofFromCycle = (cycle: unknown): unknown => {
+    if (!cycle || typeof cycle !== "object") {
+      return cycle;
+    }
+
+    const {
+      duelKeyHex: _k,
+      duelEndTime: _e,
+      seed: _s,
+      replayHash: _r,
+      ...publicCycle
+    } = cycle as Record<string, unknown>;
+
+    return publicCycle;
+  };
+
+  const redactOracleProofFromState = <T extends { cycle: unknown }>(
+    state: T,
+  ): T =>
+    ({
+      ...state,
+      cycle: redactOracleProofFromCycle(state.cycle),
+    }) as T;
+
+  const rawSourceTimeEnabled = isRawSourceTimeEmissionEnabled();
+
   const getPublicStreamingState = (
     scheduler: NonNullable<ReturnType<typeof getStreamingDuelScheduler>>,
   ): ReturnType<typeof scheduler.getStreamingState> | null => {
     if (STREAMING_PUBLIC_DELAY_MS <= 0) {
-      return scheduler.getStreamingState();
+      const rawState = scheduler.getStreamingState();
+      const live = redactOracleProofFromState(rawState);
+      return attachRawSourceTime(live, Date.now(), {
+        stampEmittedAt: true,
+        enabled: rawSourceTimeEnabled,
+        sourceCycle: rawState.cycle,
+      });
     }
 
     // Keep delayed replay frames fresh for REST polling consumers
@@ -454,12 +1417,13 @@ export function registerStreamingRoutes(
       captureStreamingFrame(true);
     }
 
-    const delayed = parseReplayFrameState(getLatestEligibleReplayFrame());
+    const delayedFrame = getLatestEligibleReplayFrame();
+    const delayed = parseReplayFrameState(delayedFrame);
     if (!delayed) return null;
 
-    return {
+    const base = {
       type: "STREAMING_STATE_UPDATE" as const,
-      cycle: delayed.cycle as ReturnType<
+      cycle: redactOracleProofFromCycle(delayed.cycle) as ReturnType<
         typeof scheduler.getStreamingState
       >["cycle"],
       leaderboard: delayed.leaderboard as ReturnType<
@@ -471,6 +1435,13 @@ export function registerStreamingRoutes(
           ? delayed.cameraTarget
           : null,
     };
+    // For REST polling consumers the source-emission anchor is the
+    // replay frame's original `emittedAt` — the raw time at which the
+    // frame was captured upstream, not the time of this REST response.
+    return attachRawSourceTime(base, delayedFrame?.emittedAt ?? Date.now(), {
+      stampEmittedAt: true,
+      enabled: rawSourceTimeEnabled,
+    });
   };
 
   const captureStreamingFrame = (
@@ -479,7 +1450,8 @@ export function registerStreamingRoutes(
     const scheduler = getStreamingDuelScheduler();
     if (!scheduler) return null;
 
-    const state = scheduler.getStreamingState();
+    const rawState = scheduler.getStreamingState();
+    const state = redactOracleProofFromState(rawState);
     const serialized = JSON.stringify(state);
     if (
       !forceNewFrame &&
@@ -493,8 +1465,18 @@ export function registerStreamingRoutes(
     sequence += 1;
 
     const emittedAt = Date.now();
+    // When the raw-source-time contract is enabled, inject `sourceTimeline`
+    // into the cycle BEFORE serialization so SSE consumers see it inside
+    // `cycle` alongside the existing fields. `emittedAt` at the envelope
+    // root stays unconditional — it's part of the long-standing SSE
+    // envelope contract, so `stampEmittedAt: false` here.
+    const stateWithTimeline = attachRawSourceTime(state, emittedAt, {
+      stampEmittedAt: false,
+      enabled: rawSourceTimeEnabled,
+      sourceCycle: rawState.cycle,
+    });
     const payload = JSON.stringify({
-      ...state,
+      ...stateWithTimeline,
       type: "STREAMING_STATE_UPDATE",
       seq: sequence,
       emittedAt,
@@ -570,6 +1552,7 @@ export function registerStreamingRoutes(
     for (const clientId of [...sseClients.keys()]) {
       removeSseClient(clientId, "shutdown");
     }
+    canonicalPlaybackProbePoller?.release();
     bettingRoutes.close();
     done();
   });
@@ -578,7 +1561,7 @@ export function registerStreamingRoutes(
   fastify.get(
     "/api/streaming/state",
     {
-      config: { rateLimit: false },
+      config: { rateLimit: STREAMING_STATUS_RATE_LIMIT },
     },
     async (_request: FastifyRequest, reply: FastifyReply) => {
       const scheduler = getStreamingDuelScheduler();
@@ -604,7 +1587,7 @@ export function registerStreamingRoutes(
   fastify.get(
     "/api/streaming/metrics",
     {
-      config: { rateLimit: false },
+      config: { rateLimit: STREAMING_STATUS_RATE_LIMIT },
     },
     async (_request: FastifyRequest, reply: FastifyReply) => {
       const bettingMetrics = bettingRoutes.getMetrics();
@@ -676,7 +1659,7 @@ export function registerStreamingRoutes(
   }>(
     "/api/streaming/state/events",
     {
-      config: { rateLimit: false },
+      config: { rateLimit: STREAMING_STATUS_RATE_LIMIT },
     },
     async (request, reply) => {
       if (sseClients.size >= STREAMING_SSE_MAX_CLIENTS) {
@@ -699,7 +1682,12 @@ export function registerStreamingRoutes(
       raw.flushHeaders?.();
       raw.write("retry: 2000\n\n");
 
-      const clientId = nextClientId++;
+      const allocation = allocateNextStreamingSseClientId(
+        nextClientId,
+        sseClients,
+      );
+      const clientId = allocation.clientId;
+      nextClientId = allocation.nextClientId;
       sseClients.set(clientId, reply);
       sseMetrics.totalConnected += 1;
       sseMetrics.peakConnected = Math.max(
@@ -806,9 +1794,15 @@ export function registerStreamingRoutes(
   fastify.get(
     "/api/streaming/duel-context",
     {
-      config: { rateLimit: false },
+      config: { rateLimit: STREAMING_STATUS_RATE_LIMIT },
+      preHandler: fastify.rateLimit(STREAMING_STATUS_RATE_LIMIT),
     },
     async (_request: FastifyRequest, reply: FastifyReply) => {
+      try {
+        await STREAMING_STATUS_CODEQL_LIMITER.consume(_request.ip);
+      } catch {
+        return reply.code(429).send({ error: "Too Many Requests" });
+      }
       const scheduler = getStreamingDuelScheduler();
       if (!scheduler) {
         return reply.status(503).send({
@@ -870,9 +1864,15 @@ export function registerStreamingRoutes(
   }>(
     "/api/streaming/agent/:characterId/monologues",
     {
-      config: { rateLimit: false },
+      config: { rateLimit: STREAMING_STATUS_RATE_LIMIT },
+      preHandler: fastify.rateLimit(STREAMING_STATUS_RATE_LIMIT),
     },
     async (request, reply) => {
+      try {
+        await STREAMING_STATUS_CODEQL_LIMITER.consume(request.ip);
+      } catch {
+        return reply.code(429).send({ error: "Too Many Requests" });
+      }
       if (STREAMING_PUBLIC_DELAY_MS > 0) {
         return reply.send({
           characterId: request.params.characterId,
@@ -881,7 +1881,7 @@ export function registerStreamingRoutes(
           delayed: true,
         });
       }
-      const limit = Number.parseInt(request.query.limit || "20", 10);
+      const limit = normalizeStreamingThoughtLimit(request.query.limit);
       const thoughts = await getThoughtsSnapshot(
         request.params.characterId,
         limit,
@@ -899,9 +1899,15 @@ export function registerStreamingRoutes(
   }>(
     "/api/streaming/agent/:characterId/inventory",
     {
-      config: { rateLimit: false },
+      config: { rateLimit: STREAMING_STATUS_RATE_LIMIT },
+      preHandler: fastify.rateLimit(STREAMING_STATUS_RATE_LIMIT),
     },
     async (request, reply) => {
+      try {
+        await STREAMING_STATUS_CODEQL_LIMITER.consume(request.ip);
+      } catch {
+        return reply.code(429).send({ error: "Too Many Requests" });
+      }
       if (STREAMING_PUBLIC_DELAY_MS > 0) {
         return reply.send({
           characterId: request.params.characterId,
@@ -923,9 +1929,15 @@ export function registerStreamingRoutes(
   fastify.get(
     "/api/streaming/leaderboard",
     {
-      config: { rateLimit: false },
+      config: { rateLimit: STREAMING_STATUS_RATE_LIMIT },
+      preHandler: fastify.rateLimit(STREAMING_STATUS_RATE_LIMIT),
     },
     async (_request: FastifyRequest, reply: FastifyReply) => {
+      try {
+        await STREAMING_STATUS_CODEQL_LIMITER.consume(_request.ip);
+      } catch {
+        return reply.code(429).send({ error: "Too Many Requests" });
+      }
       const scheduler = getStreamingDuelScheduler();
 
       if (!scheduler) {
@@ -953,9 +1965,15 @@ export function registerStreamingRoutes(
   }>(
     "/api/streaming/leaderboard/details",
     {
-      config: { rateLimit: false },
+      config: { rateLimit: STREAMING_STATUS_RATE_LIMIT },
+      preHandler: fastify.rateLimit(STREAMING_STATUS_RATE_LIMIT),
     },
     async (request, reply) => {
+      try {
+        await STREAMING_STATUS_CODEQL_LIMITER.consume(request.ip);
+      } catch {
+        return reply.code(429).send({ error: "Too Many Requests" });
+      }
       const scheduler = getStreamingDuelScheduler();
 
       if (!scheduler) {
@@ -987,7 +2005,21 @@ export function registerStreamingRoutes(
           : Number.POSITIVE_INFINITY;
       const recentDuels = scheduler
         .getRecentDuels(historyLimit)
-        .filter((duel) => duel.finishedAt <= cutoff);
+        .filter((duel) => duel.finishedAt <= cutoff)
+        // Strip oracle-proof fields. They are persisted on RecentDuelEntry
+        // for the keeper-only /api/streaming/results/:duelId catch-up path
+        // (bearer-auth). Leaking them on this public, unauthenticated handler
+        // would defeat that auth boundary — a caller could harvest proofs
+        // from this endpoint and skip the bearer check entirely.
+        .map(
+          ({
+            duelKeyHex: _k,
+            duelEndTime: _e,
+            seed: _s,
+            replayHash: _r,
+            ...publicEntry
+          }) => publicEntry,
+        );
       const delayedUpdatedAt =
         STREAMING_PUBLIC_DELAY_MS > 0
           ? (getLatestEligibleReplayFrame()?.emittedAt ?? Date.now())
@@ -1002,15 +2034,143 @@ export function registerStreamingRoutes(
     },
   );
 
+  // Authoritative per-duel oracle result lookup for the hyperbet keeper.
+  //
+  // When the keeper misses a live `duel_ended` event (for example a restart
+  // window), the bundle is stuck at LOCKED with no path forward because
+  // Solana resolution requires the deterministic proof material
+  // (duelKeyHex + seed + replayHash) that only arrive on that event. This
+  // endpoint lets the keeper reconstruct the same authorized report payload
+  // from the durable streaming_duel_history row.
+  //
+  // Bearer-auth requires HYPERSCAPES_RESULT_LOOKUP_BEARER_TOKEN (matches the
+  // hyperbet keeper). The endpoint intentionally never falls back to the
+  // general betting feed token because it returns settlement proof material.
+  const authorizeResultsLookup = async (
+    request: FastifyRequest,
+    reply: FastifyReply,
+  ) => {
+    const env = process.env as Record<string, string | undefined>;
+    const resolution = resolveOracleProofAccessToken(env);
+    const requiredToken = resolution.token;
+
+    if (!requiredToken) {
+      return reply.status(503).send({
+        error: "Service unavailable",
+        message: "Oracle proof auth token is not configured",
+      });
+    }
+
+    const token = extractBettingFeedToken({
+      authorizationHeader: request.headers.authorization,
+    });
+    if (hasValidBettingFeedToken(requiredToken, token)) {
+      return;
+    }
+
+    return reply.status(401).send({
+      error: "Unauthorized",
+      message: "Missing or invalid oracle proof token",
+    });
+  };
+
+  fastify.get<{
+    Params: { duelId: string };
+  }>(
+    "/api/streaming/results/:duelId",
+    {
+      config: { rateLimit: AUTHENTICATED_RESULTS_RATE_LIMIT },
+      preHandler: authorizeResultsLookup,
+    },
+    async (request, reply) => {
+      const duelId = request.params.duelId?.trim();
+      if (!duelId) {
+        return reply.status(400).send({
+          error: "Bad request",
+          message: "duelId is required",
+        });
+      }
+      if (!isValidStreamingResultDuelId(duelId)) {
+        return reply.status(400).send({
+          error: "Bad request",
+          message: "Invalid duelId format",
+        });
+      }
+
+      const db = getStorageDb();
+      if (!db) {
+        return reply.status(503).send({
+          error: "Service unavailable",
+          message: "Database is not available",
+        });
+      }
+
+      const { streamingDuelHistory } = await import("../database/schema.js");
+      const { eq } = await import("drizzle-orm");
+
+      const rows = await db
+        .select()
+        .from(streamingDuelHistory)
+        .where(eq(streamingDuelHistory.duelId, duelId))
+        .limit(1);
+      const row = rows[0];
+
+      if (!row) {
+        return reply.status(404).send(buildStreamingResultNotFoundPayload());
+      }
+
+      // Audit trail: oracle-proof material (duelKeyHex, seed, replayHash) is
+      // settlement-grade data. Hash the caller IP so logs can correlate access
+      // patterns without storing direct keeper network identifiers.
+      fastify.log.info(
+        {
+          duelId: row.duelId,
+          cycleId: row.cycleId,
+          callerIpHash: hashAuditValue(request.ip),
+        },
+        "[streaming] oracle-proof retrieval",
+      );
+
+      // Legacy rows written before migration 0055 may not carry the oracle
+      // proof fields. Callers must handle this by waiting and retrying —
+      // the current live duel will write fresh rows with the full proof.
+      // The 409 response intentionally does NOT leak the schema-migration
+      // number; that's an internal detail.
+      if (!row.seed || !row.replayHash || !row.duelKeyHex) {
+        return reply.status(409).send({
+          error: "Incomplete proof",
+          message: "Oracle proof is not available for this duel.",
+          duelId: row.duelId,
+          cycleId: row.cycleId,
+        });
+      }
+
+      return reply.send({
+        duelId: row.duelId,
+        cycleId: row.cycleId,
+        duelKeyHex: row.duelKeyHex,
+        duelEndTime: row.duelEndTime,
+        seed: row.seed,
+        replayHash: row.replayHash,
+        winnerId: row.winnerId,
+        winnerName: row.winnerName,
+        loserId: row.loserId,
+        loserName: row.loserName,
+        winReason: row.winReason,
+        damageWinner: row.damageWinner,
+        damageLoser: row.damageLoser,
+        finishedAt: row.finishedAt,
+      });
+    },
+  );
+
   // Get streaming configuration
   fastify.get(
     "/api/streaming/config",
     {
-      config: { rateLimit: false },
+      config: { rateLimit: STREAMING_STATUS_RATE_LIMIT },
     },
     async (_request: FastifyRequest, reply: FastifyReply) => {
-      const betUrl =
-        (process.env.STREAMING_PUBLIC_BET_URL || "").trim() || null;
       return reply.send({
         enabled: process.env.STREAMING_DUEL_ENABLED !== "false",
         cycleDuration: STREAMING_TIMING.CYCLE_DURATION,
@@ -1022,49 +2182,72 @@ export function registerStreamingRoutes(
         publicDelayMs: STREAMING_PUBLIC_DELAY_MS,
         publicDelayDefaultMs: STREAMING_PUBLIC_DELAY_DEFAULT_MS,
         publicDelayOverridden: STREAMING_PUBLIC_DELAY_OVERRIDDEN,
-        wsUrl: process.env.PUBLIC_WS_URL || getDefaultPublicWsUrl(),
-        betUrl,
-        bettingBridgeEnabled: process.env.DUEL_BETTING_ENABLED === "true",
-      });
-    },
-  );
-
-  /**
-   * Public betting CTA for stream overlays (no secrets).
-   * Set STREAMING_PUBLIC_BET_URL to your prediction-market / wallet-connect page.
-   */
-  fastify.get(
-    "/api/streaming/betting",
-    {
-      config: { rateLimit: false },
-    },
-    async (_request: FastifyRequest, reply: FastifyReply) => {
-      const betUrl =
-        (process.env.STREAMING_PUBLIC_BET_URL || "").trim() || null;
-      return reply.send({
-        betUrl,
-        bettingBridgeEnabled: process.env.DUEL_BETTING_ENABLED === "true",
-        hint:
-          betUrl != null
-            ? "Wagers typically lock when the countdown starts. Pick a side before the bell."
-            : "Set STREAMING_PUBLIC_BET_URL on the server to show a bet link on stream.",
+        wsUrl: process.env.PUBLIC_WS_URL || "ws://localhost:5555/ws",
       });
     },
   );
 
   // Get RTMP bridge status
+  //
+  // Rate limiting layers: global @fastify/rate-limit plugin (100/min per IP,
+  // http-server.ts), per-route config.rateLimit (120/min), and
+  // codeqlStatusRateLimitPreHandler which invokes rate-limiter-flexible in
+  // the exact pattern CodeQL's RouteHandlerLimitedByRateLimiterFlexible
+  // class recognizes.
   fastify.get(
     "/api/streaming/rtmp/status",
     {
-      config: { rateLimit: false },
+      config: { rateLimit: { max: 120, timeWindow: "1 minute" } },
+      preHandler: codeqlStatusRateLimitPreHandler,
     },
     async (_request: FastifyRequest, reply: FastifyReply) => {
+      const persistedAuthorityState = await loadPersistedStreamStateSafely();
       const externalSnapshot = await loadExternalRtmpStatusSnapshot(
         EXTERNAL_RTMP_STATUS_FILE || null,
         EXTERNAL_RTMP_STATUS_MAX_AGE_MS,
       );
+      const canonicalProbeSnapshot = canonicalPlaybackProbePoller
+        ? await canonicalPlaybackProbePoller
+            .refresh()
+            .then(() => canonicalPlaybackProbePoller.getSnapshot())
+        : null;
+      const localHlsManifest = readLocalHlsManifestSnapshot(process.env);
       if (externalSnapshot) {
-        return reply.send(externalSnapshot);
+        const rendererHealth = deriveBettingRendererHealth(
+          getStreamingDuelScheduler()?.getCurrentCycle() ?? null,
+          {
+            externalStatusSnapshot: externalSnapshot,
+            externalStatusMaxAgeMs: EXTERNAL_RTMP_STATUS_MAX_AGE_MS,
+            localHlsManifest,
+            captureStats: {
+              clientConnected: externalSnapshot.clientConnected === true,
+              ffmpegRunning: externalSnapshot.ffmpegRunning === true,
+            },
+          },
+        );
+
+        return reply.send(
+          buildStreamingStatusPayload({
+            base: {
+              running: externalSnapshot.active === true,
+              bridgeActive: externalSnapshot.active === true,
+              ffmpegRunning: externalSnapshot.ffmpegRunning === true,
+              clientConnected: externalSnapshot.clientConnected === true,
+              destinations: externalSnapshot.destinations,
+              stats: externalSnapshot.stats,
+            },
+            externalSnapshot,
+            canonicalProbeSnapshot,
+            localHlsManifest,
+            rendererHealth,
+            persistedAuthorityState,
+            cloudflareLiveInputId,
+            captureStats: {
+              clientConnected: externalSnapshot.clientConnected === true,
+              ffmpegRunning: externalSnapshot.ffmpegRunning === true,
+            },
+          }),
+        );
       }
 
       try {
@@ -1077,28 +2260,45 @@ export function registerStreamingRoutes(
         }
         const status = bridge.getStatus();
         const stats = bridge.getStats();
-
-        return reply.send({
-          ...status,
-          stats: {
-            bytesReceived: stats.bytesReceived,
-            bytesReceivedMB: (stats.bytesReceived / 1024 / 1024).toFixed(2),
-            uptimeSeconds: Math.floor(stats.uptime / 1000),
-            destinations: stats.destinations,
-            healthy: stats.healthy,
-            droppedFrames: stats.droppedFrames,
-            backpressured: stats.backpressured,
-            spectators: stats.spectators,
-            processMemory: stats.processMemory,
+        const rendererHealth = deriveBettingRendererHealth(
+          getStreamingDuelScheduler()?.getCurrentCycle() ?? null,
+          {
+            externalStatusSnapshot: externalSnapshot,
+            externalStatusMaxAgeMs: EXTERNAL_RTMP_STATUS_MAX_AGE_MS,
+            localHlsManifest,
           },
-          rendererHealth: deriveBettingRendererHealth(
-            getStreamingDuelScheduler()?.getCurrentCycle() ?? null,
-            {
-              externalStatusSnapshot: externalSnapshot,
-              externalStatusMaxAgeMs: EXTERNAL_RTMP_STATUS_MAX_AGE_MS,
+        );
+
+        return reply.send(
+          buildStreamingStatusPayload({
+            base: {
+              ...status,
+              stats: {
+                bytesReceived: stats.bytesReceived,
+                bytesReceivedMB: (stats.bytesReceived / 1024 / 1024).toFixed(2),
+                uptimeSeconds: Math.floor(stats.uptime / 1000),
+                destinations: stats.destinations,
+                healthy: stats.healthy,
+                droppedFrames: stats.droppedFrames,
+                encoderFps: null,
+                backpressured: stats.backpressured,
+                spectators: stats.spectators,
+                processMemory: stats.processMemory,
+              },
             },
-          ),
-        });
+            externalSnapshot,
+            canonicalProbeSnapshot,
+            localHlsManifest,
+            bridgeStats: stats,
+            rendererHealth,
+            persistedAuthorityState,
+            cloudflareLiveInputId,
+            captureStats: {
+              clientConnected: status.clientConnected,
+              ffmpegRunning: status.ffmpegRunning,
+            },
+          }),
+        );
       } catch {
         return reply.status(503).send({
           error: "RTMP bridge not initialized",
@@ -1109,29 +2309,51 @@ export function registerStreamingRoutes(
   );
 
   // Get stream capture status (headless browser → HLS pipeline)
+  // Same CodeQL-visible rate-limiter-flexible preHandler as /rtmp/status;
+  // see comment there for the rationale.
   fastify.get(
     "/api/streaming/capture/status",
     {
-      config: { rateLimit: false },
+      config: { rateLimit: { max: 120, timeWindow: "1 minute" } },
+      preHandler: codeqlStatusRateLimitPreHandler,
     },
     async (_request: FastifyRequest, reply: FastifyReply) => {
       try {
+        const persistedAuthorityState = await loadPersistedStreamStateSafely();
         const capture = getStreamCapture();
+        const localHlsManifest = readLocalHlsManifestSnapshot(process.env);
         const externalSnapshot = await loadExternalRtmpStatusSnapshot(
           EXTERNAL_RTMP_STATUS_FILE || null,
           EXTERNAL_RTMP_STATUS_MAX_AGE_MS,
           { allowStale: true },
         );
-        return reply.send({
-          ...capture.getStats(),
-          rendererHealth: deriveBettingRendererHealth(
-            getStreamingDuelScheduler()?.getCurrentCycle() ?? null,
-            {
-              externalStatusSnapshot: externalSnapshot,
-              externalStatusMaxAgeMs: EXTERNAL_RTMP_STATUS_MAX_AGE_MS,
-            },
-          ),
-        });
+        const canonicalProbeSnapshot = canonicalPlaybackProbePoller
+          ? await canonicalPlaybackProbePoller
+              .refresh()
+              .then(() => canonicalPlaybackProbePoller.getSnapshot())
+          : null;
+        const captureStats = capture.getStats();
+        const rendererHealth = deriveBettingRendererHealth(
+          getStreamingDuelScheduler()?.getCurrentCycle() ?? null,
+          {
+            externalStatusSnapshot: externalSnapshot,
+            externalStatusMaxAgeMs: EXTERNAL_RTMP_STATUS_MAX_AGE_MS,
+            localHlsManifest,
+            captureStats,
+          },
+        );
+        return reply.send(
+          buildStreamingStatusPayload({
+            base: captureStats,
+            externalSnapshot,
+            canonicalProbeSnapshot,
+            localHlsManifest,
+            rendererHealth,
+            persistedAuthorityState,
+            cloudflareLiveInputId,
+            captureStats,
+          }),
+        );
       } catch {
         return reply.status(503).send({
           error: "Stream capture not initialized",
@@ -1140,4 +2362,50 @@ export function registerStreamingRoutes(
       }
     },
   );
+
+  fastify.get(
+    "/api/streaming/capture/smoke",
+    {
+      preHandler: fastify.rateLimit(STREAMING_STATUS_RATE_LIMIT),
+    },
+    async (_request: FastifyRequest, reply: FastifyReply) => {
+      try {
+        const externalSnapshot = await loadExternalRtmpStatusSnapshot(
+          EXTERNAL_RTMP_STATUS_FILE || null,
+          EXTERNAL_RTMP_STATUS_MAX_AGE_MS,
+          { allowStale: true },
+        );
+        const delivery =
+          externalSnapshot?.delivery ?? resolveStreamDeliveryInfo(process.env);
+        return reply.send({
+          ...normalizeStreamingStatusSmoke({
+            externalSnapshot,
+            deliveryModeFallback: delivery.mode,
+          }),
+          sourceRuntime: deriveStreamSourceRuntime({
+            externalStatusSnapshot: externalSnapshot,
+            externalStatusMaxAgeMs: EXTERNAL_RTMP_STATUS_MAX_AGE_MS,
+            rendererHealth: deriveBettingRendererHealth(
+              getStreamingDuelScheduler()?.getCurrentCycle() ?? null,
+              {
+                externalStatusSnapshot: externalSnapshot,
+                externalStatusMaxAgeMs: EXTERNAL_RTMP_STATUS_MAX_AGE_MS,
+                localHlsManifest: readLocalHlsManifestSnapshot(process.env),
+                captureStats: getStreamCapture().getStats(),
+              },
+            ),
+            localHlsManifest: readLocalHlsManifestSnapshot(process.env),
+            captureStats: getStreamCapture().getStats(),
+            requireExternalWorker: REQUIRE_EXTERNAL_SOURCE_RUNTIME,
+          }),
+        });
+      } catch {
+        return reply.status(503).send({
+          error: "Stream capture smoke unavailable",
+          message:
+            "The stream capture smoke summary is not available right now",
+        });
+      }
+    },
+  );
 }
diff --git a/packages/server/src/startup/__tests__/agent-routes.test.ts b/packages/server/src/startup/__tests__/agent-routes.test.ts
index a6121bb81..9618bb991 100644
--- a/packages/server/src/startup/__tests__/agent-routes.test.ts
+++ b/packages/server/src/startup/__tests__/agent-routes.test.ts
@@ -9,27 +9,53 @@ type MappingRow = {
   updatedAt?: Date;
 };
 
-const agentMappingsTable = {
-  __table: "agentMappings",
-  accountId: "accountId",
-  agentId: "agentId",
-  agentName: "agentName",
-  characterId: "characterId",
-};
-
-const usersTable = {
-  __table: "users",
-  id: "id",
+type ThoughtRow = {
+  characterId: string;
+  content: string;
+  decisionPath?: string | null;
+  timestamp: number;
+  type: string;
 };
 
-const charactersTable = {
-  __table: "characters",
-  accountId: "accountId",
-  id: "id",
-};
+const {
+  agentMappingsTable,
+  agentThoughtsTable,
+  charactersTable,
+  serverNetworkState,
+  usersTable,
+} = vi.hoisted(() => ({
+  agentMappingsTable: {
+    __table: "agentMappings",
+    accountId: "accountId",
+    agentId: "agentId",
+    agentName: "agentName",
+    characterId: "characterId",
+  },
+  agentThoughtsTable: {
+    __table: "agentThoughts",
+    characterId: "characterId",
+    content: "content",
+    decisionPath: "decisionPath",
+    timestamp: "timestamp",
+    type: "type",
+  },
+  usersTable: {
+    __table: "users",
+    id: "id",
+  },
+  charactersTable: {
+    __table: "characters",
+    accountId: "accountId",
+    id: "id",
+  },
+  serverNetworkState: {
+    agentThoughts: new Map<string, ThoughtRow[]>(),
+  },
+}));
 
 vi.mock("../../database/schema.js", () => ({
   agentMappings: agentMappingsTable,
+  agentThoughts: agentThoughtsTable,
   characters: charactersTable,
   users: usersTable,
 }));
@@ -38,7 +64,10 @@ vi.mock("drizzle-orm", async (importOriginal) => {
   const actual = await importOriginal<typeof import("drizzle-orm")>();
   return {
     ...actual,
+    and: (...conditions: unknown[]) => ({ op: "and", conditions }),
+    desc: (column: string) => ({ direction: "desc", column }),
     eq: (column: string, value: unknown) => ({ column, value }),
+    gt: (column: string, value: unknown) => ({ column, value, op: "gt" }),
   };
 });
 
@@ -47,7 +76,24 @@ vi.mock("../../eliza/index.js", () => ({
   getRunningAgents: () => new Map(),
 }));
 
+vi.mock("../../systems/ServerNetwork/index.js", () => ({
+  ServerNetwork: serverNetworkState,
+}));
+
 import { registerAgentRoutes } from "../routes/agent-routes";
+import { createJWT } from "../../shared/utils";
+
+async function withAuth<T extends Record<string, unknown>>(
+  userId: string,
+  request: T,
+): Promise<T & { headers: { authorization: string } }> {
+  return {
+    ...request,
+    headers: {
+      authorization: `Bearer ${await createJWT({ userId })}`,
+    },
+  };
+}
 
 function createReplyRecorder() {
   return {
@@ -66,23 +112,35 @@ function createReplyRecorder() {
 
 function createFastifyRecorder() {
   const routes = new Map<string, Function>();
+  const pickHandler = (args: unknown[]): Function => {
+    const handler = args[args.length - 1];
+    if (typeof handler !== "function") {
+      throw new Error("Expected route handler");
+    }
+    return handler;
+  };
   const fastify = {
-    delete(path: string, handler: Function) {
-      routes.set(`DELETE ${path}`, handler);
+    delete(path: string, ...args: unknown[]) {
+      routes.set(`DELETE ${path}`, pickHandler(args));
       return this;
     },
-    get(path: string, handler: Function) {
-      routes.set(`GET ${path}`, handler);
+    get(path: string, ...args: unknown[]) {
+      routes.set(`GET ${path}`, pickHandler(args));
       return this;
     },
-    post(path: string, handler: Function) {
-      routes.set(`POST ${path}`, handler);
+    post(path: string, ...args: unknown[]) {
+      routes.set(`POST ${path}`, pickHandler(args));
       return this;
     },
-    put(path: string, handler: Function) {
-      routes.set(`PUT ${path}`, handler);
+    patch(path: string, ...args: unknown[]) {
+      routes.set(`PATCH ${path}`, pickHandler(args));
       return this;
     },
+    put(path: string, ...args: unknown[]) {
+      routes.set(`PUT ${path}`, pickHandler(args));
+      return this;
+    },
+    rateLimit: () => async () => {},
   };
 
   return {
@@ -91,9 +149,13 @@ function createFastifyRecorder() {
   };
 }
 
-function createMockDatabase(initialMappings: MappingRow[]) {
+function createMockDatabase(
+  initialMappings: MappingRow[],
+  initialThoughts: ThoughtRow[] = [],
+) {
   const state = {
     mappings: [...initialMappings],
+    thoughts: [...initialThoughts],
   };
 
   const db = {
@@ -144,28 +206,106 @@ function createMockDatabase(initialMappings: MappingRow[]) {
       },
     },
     select: () => ({
-      from: (table: { __table: string }) => ({
-        where: async (condition: {
-          column: keyof MappingRow;
-          value: unknown;
+      from: (table: { __table: string }) => {
+        const applyCondition = (
+          row: MappingRow | ThoughtRow,
+          condition: {
+            column?: string;
+            conditions?: Array<{
+              column?: string;
+              op?: string;
+              value?: unknown;
+            }>;
+            op?: string;
+            value?: unknown;
+          },
+        ): boolean => {
+          if (condition.op === "and" && condition.conditions) {
+            return condition.conditions.every((entry) =>
+              applyCondition(row, entry),
+            );
+          }
+          if (!condition.column) {
+            return true;
+          }
+          const value = (row as Record<string, unknown>)[condition.column];
+          if (condition.op === "gt") {
+            return Number(value) > Number(condition.value);
+          }
+          return value === condition.value;
+        };
+        const filterRows = (condition: {
+          column?: string;
+          conditions?: Array<{ column?: string; op?: string; value?: unknown }>;
+          op?: string;
+          value?: unknown;
         }) => {
           if (table.__table === "agentMappings") {
-            return state.mappings.filter(
-              (mapping) => mapping[condition.column] === condition.value,
+            return state.mappings.filter((mapping) =>
+              applyCondition(mapping, condition),
             );
           }
-          return [];
-        },
-      }),
+          if (table.__table === "agentThoughts") {
+            return state.thoughts.filter((thought) =>
+              applyCondition(thought, condition),
+            );
+          }
+          return [] as Array<MappingRow | ThoughtRow>;
+        };
+        return {
+          where: (condition: {
+            column?: string;
+            conditions?: Array<{
+              column?: string;
+              op?: string;
+              value?: unknown;
+            }>;
+            op?: string;
+            value?: unknown;
+          }) => {
+            const rows = filterRows(condition);
+            return {
+              then: (
+                onfulfilled: (value: Array<MappingRow | ThoughtRow>) => unknown,
+              ) => Promise.resolve(onfulfilled(rows)),
+              orderBy: (order?: {
+                column?: string;
+                direction?: "desc" | "asc";
+              }) => {
+                const sorted = [...rows];
+                if (order?.column) {
+                  sorted.sort((left, right) => {
+                    const leftValue = (left as Record<string, unknown>)[
+                      order.column!
+                    ];
+                    const rightValue = (right as Record<string, unknown>)[
+                      order.column!
+                    ];
+                    const direction = order.direction === "desc" ? -1 : 1;
+                    if (leftValue === rightValue) return 0;
+                    return leftValue! > rightValue! ? direction : -direction;
+                  });
+                }
+                return {
+                  limit: async (count: number) => sorted.slice(0, count),
+                };
+              },
+            };
+          },
+        };
+      },
     }),
   };
 
   return { db, state };
 }
 
-function setupRoutes(initialMappings: MappingRow[]) {
+function setupRoutes(
+  initialMappings: MappingRow[],
+  initialThoughts: ThoughtRow[] = [],
+) {
   const { fastify, routes } = createFastifyRecorder();
-  const { db, state } = createMockDatabase(initialMappings);
+  const { db, state } = createMockDatabase(initialMappings, initialThoughts);
   const world = {
     getSystem: (name: string) => (name === "database" ? { db } : undefined),
   };
@@ -175,6 +315,7 @@ function setupRoutes(initialMappings: MappingRow[]) {
   return {
     deleteMapping: routes.get("DELETE /api/agents/mappings/:agentId")!,
     getMapping: routes.get("GET /api/agents/mapping/:agentId")!,
+    getThoughts: routes.get("GET /api/agents/:agentId/thoughts")!,
     listMappings: routes.get("GET /api/agents/mappings/:accountId")!,
     saveMapping: routes.get("POST /api/agents/mappings")!,
     state,
@@ -186,12 +327,81 @@ describe("agent route mapping cache", () => {
     vi.spyOn(console, "error").mockImplementation(() => {});
     vi.spyOn(console, "log").mockImplementation(() => {});
     vi.spyOn(console, "warn").mockImplementation(() => {});
+    serverNetworkState.agentThoughts.clear();
   });
 
   afterEach(() => {
     vi.restoreAllMocks();
   });
 
+  it("requires authentication for account-scoped mapping routes", async () => {
+    const { deleteMapping, listMappings, saveMapping } = setupRoutes([
+      {
+        agentId: "agent-1",
+        accountId: "account-old",
+        characterId: "character-1",
+        agentName: "Alpha",
+      },
+    ]);
+
+    const listReply = createReplyRecorder();
+    await listMappings(
+      { params: { accountId: "account-old" } } as never,
+      listReply as never,
+    );
+    expect(listReply.statusCode).toBe(401);
+
+    const saveReply = createReplyRecorder();
+    await saveMapping(
+      {
+        body: {
+          agentId: "agent-1",
+          accountId: "account-old",
+          characterId: "character-1",
+          agentName: "Alpha",
+        },
+      } as never,
+      saveReply as never,
+    );
+    expect(saveReply.statusCode).toBe(401);
+
+    const deleteReply = createReplyRecorder();
+    await deleteMapping(
+      { params: { agentId: "agent-1" } } as never,
+      deleteReply as never,
+    );
+    expect(deleteReply.statusCode).toBe(401);
+  });
+
+  it("rejects cross-account mapping access", async () => {
+    const { deleteMapping, listMappings } = setupRoutes([
+      {
+        agentId: "agent-1",
+        accountId: "account-owner",
+        characterId: "character-1",
+        agentName: "Alpha",
+      },
+    ]);
+
+    const listReply = createReplyRecorder();
+    await listMappings(
+      (await withAuth("account-other", {
+        params: { accountId: "account-owner" },
+      })) as never,
+      listReply as never,
+    );
+    expect(listReply.statusCode).toBe(403);
+
+    const deleteReply = createReplyRecorder();
+    await deleteMapping(
+      (await withAuth("account-other", {
+        params: { agentId: "agent-1" },
+      })) as never,
+      deleteReply as never,
+    );
+    expect(deleteReply.statusCode).toBe(403);
+  });
+
   it("invalidates old and new account mapping lists when ownership changes", async () => {
     const { getMapping, listMappings, saveMapping, state } = setupRoutes([
       {
@@ -204,25 +414,27 @@ describe("agent route mapping cache", () => {
 
     const firstListReply = createReplyRecorder();
     await listMappings(
-      { params: { accountId: "account-old" } } as never,
+      (await withAuth("account-old", {
+        params: { accountId: "account-old" },
+      })) as never,
       firstListReply as never,
     );
     expect(firstListReply.payload).toMatchObject({
-      agentIds: ["agent-1"],
-      count: 1,
+      agentIds: expect.arrayContaining(["agent-1", "character-1"]),
+      count: 2,
       success: true,
     });
 
     const saveReply = createReplyRecorder();
     await saveMapping(
-      {
+      (await withAuth("account-new", {
         body: {
           agentId: "agent-1",
           accountId: "account-new",
           characterId: "character-2",
           agentName: "Beta",
         },
-      } as never,
+      })) as never,
       saveReply as never,
     );
     expect(saveReply.payload).toMatchObject({ success: true });
@@ -237,7 +449,9 @@ describe("agent route mapping cache", () => {
 
     const oldAccountReply = createReplyRecorder();
     await listMappings(
-      { params: { accountId: "account-old" } } as never,
+      (await withAuth("account-old", {
+        params: { accountId: "account-old" },
+      })) as never,
       oldAccountReply as never,
     );
     expect(oldAccountReply.payload).toMatchObject({
@@ -248,12 +462,14 @@ describe("agent route mapping cache", () => {
 
     const newAccountReply = createReplyRecorder();
     await listMappings(
-      { params: { accountId: "account-new" } } as never,
+      (await withAuth("account-new", {
+        params: { accountId: "account-new" },
+      })) as never,
       newAccountReply as never,
     );
     expect(newAccountReply.payload).toMatchObject({
-      agentIds: ["agent-1"],
-      count: 1,
+      agentIds: expect.arrayContaining(["agent-1", "character-2"]),
+      count: 2,
       success: true,
     });
 
@@ -282,12 +498,14 @@ describe("agent route mapping cache", () => {
 
     const listReply = createReplyRecorder();
     await listMappings(
-      { params: { accountId: "account-old" } } as never,
+      (await withAuth("account-old", {
+        params: { accountId: "account-old" },
+      })) as never,
       listReply as never,
     );
     expect(listReply.payload).toMatchObject({
-      agentIds: ["agent-1"],
-      count: 1,
+      agentIds: expect.arrayContaining(["agent-1", "character-1"]),
+      count: 2,
       success: true,
     });
 
@@ -303,7 +521,9 @@ describe("agent route mapping cache", () => {
 
     const deleteReply = createReplyRecorder();
     await deleteMapping(
-      { params: { agentId: "agent-1" } } as never,
+      (await withAuth("account-old", {
+        params: { agentId: "agent-1" },
+      })) as never,
       deleteReply as never,
     );
     expect(deleteReply.payload).toMatchObject({ success: true });
@@ -321,7 +541,9 @@ describe("agent route mapping cache", () => {
 
     const deletedListReply = createReplyRecorder();
     await listMappings(
-      { params: { accountId: "account-old" } } as never,
+      (await withAuth("account-old", {
+        params: { accountId: "account-old" },
+      })) as never,
       deletedListReply as never,
     );
     expect(deletedListReply.payload).toMatchObject({
@@ -343,14 +565,14 @@ describe("agent route mapping cache", () => {
 
     const saveReply = createReplyRecorder();
     await saveMapping(
-      {
+      (await withAuth("account-new", {
         body: {
           agentId: "agent-2",
           accountId: "account-new",
           characterId: "character-2",
           agentName: "Gamma",
         },
-      } as never,
+      })) as never,
       saveReply as never,
     );
     expect(saveReply.payload).toMatchObject({ success: true });
@@ -369,4 +591,52 @@ describe("agent route mapping cache", () => {
       success: true,
     });
   });
+
+  it("defaults invalid thoughts limit before cold-start DB hydrate", async () => {
+    const { getThoughts } = setupRoutes(
+      [
+        {
+          agentId: "agent-1",
+          accountId: "account-1",
+          characterId: "character-1",
+          agentName: "Alpha",
+        },
+      ],
+      [
+        {
+          characterId: "character-1",
+          content: "fresh thought",
+          decisionPath: null,
+          timestamp: 200,
+          type: "reasoning",
+        },
+        {
+          characterId: "character-1",
+          content: "older thought",
+          decisionPath: null,
+          timestamp: 100,
+          type: "reasoning",
+        },
+      ],
+    );
+
+    const reply = createReplyRecorder();
+    await getThoughts(
+      {
+        params: { agentId: "agent-1" },
+        query: { limit: "foo" },
+      } as never,
+      reply as never,
+    );
+
+    expect(reply.statusCode).toBe(200);
+    expect(reply.payload).toMatchObject({
+      success: true,
+      count: 2,
+      thoughts: [
+        expect.objectContaining({ content: "fresh thought", timestamp: 200 }),
+        expect.objectContaining({ content: "older thought", timestamp: 100 }),
+      ],
+    });
+  });
 });
diff --git a/packages/server/src/startup/api-routes.ts b/packages/server/src/startup/api-routes.ts
index 7edbfa5aa..8b9bfadd3 100644
--- a/packages/server/src/startup/api-routes.ts
+++ b/packages/server/src/startup/api-routes.ts
@@ -54,6 +54,7 @@ import { registerDataRoutes } from "./routes/data-routes.js";
 import { registerProxyRoutes } from "../routes/proxy-routes.js";
 import { registerStreamingRoutes } from "../routes/streaming.js";
 import { registerDuelOracleRoutes } from "./routes/duel-oracle-routes.js";
+import { registerHyperBetPublicRoutes } from "../routes/hyperbet-public-routes.js";
 
 /**
  * Register all API routes
@@ -121,5 +122,8 @@ export function registerApiRoutes(
   // Duel arena oracle metadata and inspection
   registerDuelOracleRoutes(fastify, world);
 
+  // HyperBet public betting routes (wallet-auth, no game account needed)
+  registerHyperBetPublicRoutes(fastify, world);
+
   console.log("[API] ✅ API routes registered");
 }
diff --git a/packages/server/src/startup/http-server.ts b/packages/server/src/startup/http-server.ts
index 6eeb00a4b..d563760ad 100644
--- a/packages/server/src/startup/http-server.ts
+++ b/packages/server/src/startup/http-server.ts
@@ -33,7 +33,11 @@ import Fastify, {
   type FastifyReply,
 } from "fastify";
 import fs from "fs-extra";
+import { timingSafeEqual } from "node:crypto";
+import { Readable } from "node:stream";
+import type { ReadableStream as NodeReadableStream } from "node:stream/web";
 import path from "path";
+import { RateLimiterMemory } from "rate-limiter-flexible";
 import type { ServerConfig } from "./config.js";
 import {
   getDefaultElizaOsApiUrl,
@@ -48,12 +52,60 @@ import {
   enforceSameSiteCookies,
 } from "../middleware/csrf.js";
 
+function escapeRegExp(value: string): string {
+  return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+
+function derivePagesProjectHost(hostname: string): string | null {
+  const normalized = hostname.trim().toLowerCase();
+  if (!normalized.endsWith(".pages.dev")) {
+    return null;
+  }
+
+  const segments = normalized.split(".");
+  if (segments.length < 3) {
+    return null;
+  }
+
+  return segments.slice(-3).join(".");
+}
+
+export function buildPagesPreviewOriginPatterns(
+  origin: string | null | undefined,
+): RegExp[] {
+  const trimmed = origin?.trim();
+  if (!trimmed) {
+    return [];
+  }
+
+  try {
+    const parsed = new URL(trimmed);
+    if (parsed.protocol !== "http:" && parsed.protocol !== "https:") {
+      return [];
+    }
+
+    const projectHost = derivePagesProjectHost(parsed.hostname);
+    if (!projectHost) {
+      return [];
+    }
+
+    return [
+      new RegExp(
+        `^${escapeRegExp(parsed.protocol)}//(?:[a-z0-9-]+\\.)+${escapeRegExp(projectHost)}$`,
+        "i",
+      ),
+    ];
+  } catch {
+    return [];
+  }
+}
+
 /**
  * SECURITY: Validate Origin header for state-changing requests.
  * This provides additional protection against cross-origin attacks
  * even though we don't use cookies (which would make CSRF a non-issue).
  */
-function createOriginValidator(allowedOrigins: (string | RegExp)[]) {
+export function createOriginValidator(allowedOrigins: (string | RegExp)[]) {
   return function validateOrigin(origin: string | undefined): boolean {
     if (!origin) return true; // Server-to-server or same-origin requests may not have Origin
 
@@ -75,6 +127,11 @@ type PublicRootInfo = {
   source: "server-public" | "client-dist";
 };
 
+const PUBLIC_DEBUG_CODEQL_LIMITER = new RateLimiterMemory({
+  points: 240,
+  duration: 60,
+});
+
 async function resolvePublicRoot(
   config: ServerConfig,
 ): Promise<PublicRootInfo> {
@@ -148,6 +205,11 @@ export async function createHttpServer(
     process.env.PUBLIC_APP_URL ||
     getDefaultPublicAppUrl();
   const serverUrl = process.env.SERVER_URL || `http://localhost:${config.port}`;
+  const derivedPagesPreviewOrigins = [
+    ...buildPagesPreviewOriginPatterns(clientUrl),
+    ...buildPagesPreviewOriginPatterns(process.env.PUBLIC_APP_URL),
+    ...buildPagesPreviewOriginPatterns(process.env.CLIENT_URL),
+  ];
 
   const allowedOrigins = [
     // Production domains (HTTPS)
@@ -162,8 +224,6 @@ export async function createHttpServer(
     "https://hyperscape.pages.dev",
     "https://hyperscape-betting.pages.dev",
     "https://hyperbet.pages.dev",
-    "https://hyperbet-solana.pages.dev",
-    "https://hyperbet-bsc.pages.dev",
     "https://hyperscape-production.up.railway.app",
     "https://api.hyperbet.win",
     "https://bsc-api.hyperbet.win",
@@ -171,8 +231,6 @@ export async function createHttpServer(
     "http://hyperscape.pages.dev",
     "http://hyperscape-betting.pages.dev",
     "http://hyperbet.pages.dev",
-    "http://hyperbet-solana.pages.dev",
-    "http://hyperbet-bsc.pages.dev",
     // Development (from env vars or defaults)
     elizaOSUrl, // ElizaOS API
     clientUrl, // Game Client
@@ -183,8 +241,6 @@ export async function createHttpServer(
     /^https?:\/\/.+\.hyperbet\.win$/, // hyperbet.win subdomains
     /^https?:\/\/.+\.hyperscape-betting\.pages\.dev$/, // Existing Hyperbet Pages preview deployments
     /^https?:\/\/.+\.hyperbet\.pages\.dev$/, // Hyperbet Pages preview deployments
-    /^https?:\/\/.+\.hyperbet-solana\.pages\.dev$/, // Hyperbet Solana preview deployments
-    /^https?:\/\/.+\.hyperbet-bsc\.pages\.dev$/, // Hyperbet BSC preview deployments
     /^https?:\/\/(www\.)?hyperscape\.gg$/, // hyperscape.gg apex and www
     /^https?:\/\/.+\.hyperscape\.gg$/, // hyperscape.gg subdomains
     /^https?:\/\/.+\.hyperscape\.pages\.dev$/, // Cloudflare Pages preview deployments
@@ -192,6 +248,7 @@ export async function createHttpServer(
     /^https:\/\/.+\.warpcast\.com$/,
     /^https:\/\/.+\.privy\.io$/,
     /^https:\/\/.+\.up\.railway\.app$/,
+    ...derivedPagesPreviewOrigins,
   ];
 
   // Add custom domain from env if set
@@ -222,6 +279,23 @@ export async function createHttpServer(
   // SECURITY: Add Origin validation for state-changing requests
   // This provides defense-in-depth against cross-origin attacks
   const isValidOrigin = createOriginValidator(allowedOrigins);
+  const isLocalhostOrigin = (origin: string): boolean => {
+    // Parse the origin and check the hostname is literally localhost/loopback.
+    // A substring match like origin.includes("localhost") is exploitable by
+    // origins such as `http://evil-localhost.com` or `https://localhost.evil`.
+    try {
+      const parsed = new URL(origin);
+      const host = parsed.hostname;
+      return (
+        host === "localhost" ||
+        host === "127.0.0.1" ||
+        host === "[::1]" ||
+        host === "::1"
+      );
+    } catch {
+      return false;
+    }
+  };
   fastify.addHook("preHandler", async (request, reply) => {
     // Only check state-changing methods
     if (["POST", "PUT", "DELETE", "PATCH"].includes(request.method)) {
@@ -232,7 +306,7 @@ export async function createHttpServer(
       // - Health check endpoints
       if (
         origin &&
-        !origin.includes("localhost") &&
+        !isLocalhostOrigin(origin) &&
         !request.url.startsWith("/health") &&
         !isValidOrigin(origin)
       ) {
@@ -272,25 +346,35 @@ export async function createHttpServer(
             ? header[0]
             : undefined;
 
-      // Disable origin lock check to allow direct client requests (fixes 403 Forbidden)
-      // if (!presented || presented !== cloudflareOriginSecret) {
-      //   return reply.status(403).send({
-      //     error: "Forbidden",
-      //     message: "Origin not authorized",
-      //   });
-      // }
+      const expected = Buffer.from(cloudflareOriginSecret);
+      const actual = presented ? Buffer.from(presented) : null;
+      const authorized =
+        actual != null &&
+        actual.length === expected.length &&
+        timingSafeEqual(actual, expected);
+
+      if (!authorized) {
+        return reply.status(403).send({
+          error: "Forbidden",
+          message: "Origin not authorized",
+        });
+      }
     });
     console.log("[HTTP] ✅ Cloudflare origin secret enforcement enabled");
   }
 
-  // Configure rate limiting for production security
+  // Always register the rate-limit plugin so route-level limiters are wired.
+  // The global limiter remains policy-controlled for dev/test ergonomics.
   if (isRateLimitEnabled()) {
     await fastify.register(rateLimit, getGlobalRateLimit());
     console.log(
       "[HTTP] ✅ Rate limiting enabled (100 requests/min per IP globally)",
     );
   } else {
-    console.log("[HTTP] ⚠️  Rate limiting disabled (development mode)");
+    await fastify.register(rateLimit, { global: false });
+    console.log(
+      "[HTTP] ⚠️  Global rate limiting disabled (development mode); route-level rate limiters remain available",
+    );
   }
 
   // Configure CSRF protection for state-changing requests
@@ -359,30 +443,50 @@ export async function createHttpServer(
     reply.status(500).send({ error: "Internal server error" });
   });
 
-  // Debug endpoint to see public directory contents
-  fastify.get("/debug/public", async (_req, reply) => {
-    const publicDir = path.join(config.__dirname, "public");
-    const assetsDir = path.join(publicDir, "assets");
-    let publicContents: string[] = [];
-    let assetsContents: string[] = [];
-    try {
-      publicContents = await fs.readdir(publicDir);
-    } catch (e) {
-      publicContents = [`ERROR: ${e}`];
-    }
-    try {
-      assetsContents = await fs.readdir(assetsDir);
-    } catch (e) {
-      assetsContents = [`ERROR: ${e}`];
-    }
-    return reply.send({
-      publicDir,
-      assetsDir,
-      publicContents,
-      assetsContents: assetsContents.slice(0, 20), // Limit to 20 items
-      configDirname: config.__dirname,
-    });
-  });
+  const allowPublicDebugRoute =
+    process.env.NODE_ENV !== "production" ||
+    process.env.ENABLE_PUBLIC_DEBUG_ROUTE === "true";
+  if (allowPublicDebugRoute) {
+    ensureRateLimitDecorator(fastify);
+    // Debug endpoint to see public directory contents
+    fastify.get(
+      "/debug/public",
+      {
+        preHandler: fastify.rateLimit({
+          max: 240,
+          timeWindow: "1 minute",
+        }),
+      },
+      async (request, reply) => {
+        try {
+          await PUBLIC_DEBUG_CODEQL_LIMITER.consume(request.ip);
+        } catch {
+          return reply.code(429).send({ error: "Too Many Requests" });
+        }
+        const publicDir = path.join(config.__dirname, "public");
+        const assetsDir = path.join(publicDir, "assets");
+        let publicContents: string[] = [];
+        let assetsContents: string[] = [];
+        try {
+          publicContents = await fs.readdir(publicDir);
+        } catch (e) {
+          publicContents = [`ERROR: ${e}`];
+        }
+        try {
+          assetsContents = await fs.readdir(assetsDir);
+        } catch (e) {
+          assetsContents = [`ERROR: ${e}`];
+        }
+        return reply.send({
+          publicDir,
+          assetsDir,
+          publicContents,
+          assetsContents: assetsContents.slice(0, 20), // Limit to 20 items
+          configDirname: config.__dirname,
+        });
+      },
+    );
+  }
 
   // SPA catch-all route - serve index.html for any unmatched routes
   // This must be registered AFTER all other routes
@@ -558,15 +662,24 @@ async function registerStaticFiles(
       : null;
 
   if (gameAssetsRoot) {
-    await fastify.register(statics, {
-      root: gameAssetsRoot,
-      prefix: "/game-assets/",
-      decorateReply: false,
-      setHeaders: (res, filePath) => {
-        setAssetHeaders(res, filePath);
-      },
-    });
-    console.log(`[HTTP] ✅ Registered /game-assets/ → ${gameAssetsRoot}`);
+    const gameAssetsFallbackUrl =
+      process.env["GAME_ASSETS_FALLBACK_URL"]?.trim() || null;
+    if (gameAssetsFallbackUrl) {
+      registerGameAssetsRoute(fastify, gameAssetsRoot, gameAssetsFallbackUrl);
+      console.log(
+        `[HTTP] ✅ Registered /game-assets/ → ${gameAssetsRoot} (fallback: ${gameAssetsFallbackUrl})`,
+      );
+    } else {
+      await fastify.register(statics, {
+        root: gameAssetsRoot,
+        prefix: "/game-assets/",
+        decorateReply: false,
+        setHeaders: (res, filePath) => {
+          setAssetHeaders(res, filePath);
+        },
+      });
+      console.log(`[HTTP] ✅ Registered /game-assets/ → ${gameAssetsRoot}`);
+    }
 
     const legacyAssetsRoot = hasCachedAssetsDir
       ? config.assetsDir
@@ -770,6 +883,194 @@ function setAssetHeaders(
   res.setHeader("Cross-Origin-Resource-Policy", "cross-origin");
 }
 
+export function normalizeGameAssetPath(rawPath: string): string | null {
+  let decodedPath: string;
+  try {
+    decodedPath = decodeURIComponent(rawPath);
+  } catch {
+    return null;
+  }
+
+  if (decodedPath.includes("\0")) {
+    return null;
+  }
+
+  const normalizedPath = path.posix.normalize(decodedPath).replace(/^\/+/, "");
+  if (
+    normalizedPath.length === 0 ||
+    normalizedPath === "." ||
+    normalizedPath === ".." ||
+    normalizedPath.startsWith("../")
+  ) {
+    return null;
+  }
+  return normalizedPath;
+}
+
+function copyHeaderIfPresent(
+  reply: FastifyReply,
+  upstreamHeaders: Headers,
+  headerName: string,
+): void {
+  const value = upstreamHeaders.get(headerName);
+  if (value) {
+    reply.header(headerName, value);
+  }
+}
+
+const GAME_ASSET_PROXY_RATE_LIMIT = {
+  max: 240,
+  timeWindow: "1 minute",
+} as const;
+type RateLimitedFastify = FastifyInstance & {
+  rateLimit: NonNullable<FastifyInstance["rateLimit"]>;
+};
+
+function ensureRateLimitDecorator(
+  fastify: FastifyInstance,
+): asserts fastify is RateLimitedFastify {
+  if (typeof fastify.rateLimit === "function") {
+    return;
+  }
+  throw new Error(
+    "HTTP routes require @fastify/rate-limit to be registered before route setup",
+  );
+}
+
+function buildGameAssetFallbackUrl(
+  fallbackBaseUrl: string,
+  normalizedPath: string,
+): URL | null {
+  if (!/^[A-Za-z0-9/_\-.]+$/.test(normalizedPath)) {
+    return null;
+  }
+
+  try {
+    const baseUrl = new URL(
+      fallbackBaseUrl.endsWith("/") ? fallbackBaseUrl : `${fallbackBaseUrl}/`,
+    );
+    if (baseUrl.protocol !== "http:" && baseUrl.protocol !== "https:") {
+      return null;
+    }
+
+    const nextUrl = new URL(baseUrl.toString());
+    nextUrl.pathname = path.posix.join(baseUrl.pathname, normalizedPath);
+    nextUrl.search = "";
+    nextUrl.hash = "";
+    return nextUrl;
+  } catch {
+    return null;
+  }
+}
+
+function registerGameAssetsRoute(
+  fastify: FastifyInstance,
+  gameAssetsRoot: string,
+  fallbackBaseUrl: string,
+): void {
+  const resolvedRoot = path.resolve(gameAssetsRoot);
+  const fallbackRoot = fallbackBaseUrl.endsWith("/")
+    ? fallbackBaseUrl
+    : `${fallbackBaseUrl}/`;
+  fastify.route({
+    method: ["GET", "HEAD"],
+    url: "/game-assets/*",
+    config: { rateLimit: false },
+    handler: async (request, reply) => {
+      const rawPath = String((request.params as { "*": string })["*"] || "");
+      const normalizedPath = normalizeGameAssetPath(rawPath);
+      if (!normalizedPath) {
+        return reply.code(400).send({ error: "Invalid asset path" });
+      }
+
+      const localAssetPath = path.resolve(resolvedRoot, normalizedPath);
+      if (
+        localAssetPath === resolvedRoot ||
+        !localAssetPath.startsWith(`${resolvedRoot}${path.sep}`)
+      ) {
+        return reply.code(400).send({ error: "Invalid asset path" });
+      }
+
+      if (await fs.pathExists(localAssetPath)) {
+        setAssetHeaders(reply.raw, localAssetPath);
+        if (request.method === "HEAD") {
+          const stats = await fs.stat(localAssetPath);
+          reply.header("Content-Length", String(stats.size));
+          return reply.code(200).send();
+        }
+        return reply.send(fs.createReadStream(localAssetPath));
+      }
+
+      if (normalizedPath.startsWith("manifests/")) {
+        return reply.code(404).send({ error: "Asset not found" });
+      }
+
+      const fallbackUrl = buildGameAssetFallbackUrl(
+        fallbackRoot,
+        normalizedPath,
+      );
+      if (!fallbackUrl) {
+        return reply.code(400).send({ error: "Invalid asset path" });
+      }
+
+      console.warn(
+        `[HTTP] Local asset miss for /game-assets/${normalizedPath}; proxying to ${fallbackUrl.toString()}`,
+      );
+
+      let upstreamResponse: Response;
+      try {
+        upstreamResponse = await fetch(fallbackUrl, {
+          method: request.method,
+          redirect: "follow",
+          signal: AbortSignal.timeout(15_000),
+        });
+      } catch (error) {
+        const errorName = error instanceof Error ? error.name : "";
+        return reply
+          .code(
+            errorName === "TimeoutError" || errorName === "AbortError"
+              ? 504
+              : 502,
+          )
+          .send({
+            error:
+              errorName === "TimeoutError" || errorName === "AbortError"
+                ? "Asset fallback timed out"
+                : "Asset fallback failed",
+          });
+      }
+      if (!upstreamResponse.ok) {
+        return reply
+          .code(upstreamResponse.status)
+          .send({ error: "Asset not found" });
+      }
+
+      setAssetHeaders(reply.raw, normalizedPath);
+      copyHeaderIfPresent(reply, upstreamResponse.headers, "content-type");
+      copyHeaderIfPresent(reply, upstreamResponse.headers, "content-length");
+      copyHeaderIfPresent(reply, upstreamResponse.headers, "etag");
+      copyHeaderIfPresent(reply, upstreamResponse.headers, "last-modified");
+      copyHeaderIfPresent(reply, upstreamResponse.headers, "accept-ranges");
+
+      if (request.method === "HEAD") {
+        return reply.code(200).send();
+      }
+
+      if (!upstreamResponse.body) {
+        return reply
+          .code(502)
+          .send({ error: "Asset fallback returned no body" });
+      }
+
+      return reply.send(
+        Readable.fromWeb(
+          upstreamResponse.body as unknown as NodeReadableStream,
+        ),
+      );
+    },
+  });
+}
+
 /**
  * Register manual music route
  *
diff --git a/packages/server/src/startup/routes/admin-routes.ts b/packages/server/src/startup/routes/admin-routes.ts
index 37cba840a..29ad852c2 100644
--- a/packages/server/src/startup/routes/admin-routes.ts
+++ b/packages/server/src/startup/routes/admin-routes.ts
@@ -2224,6 +2224,95 @@ export function registerAdminRoutes(
     },
   );
 
+  /**
+   * GET /admin/duels/oracle/stuck
+   * List oracle records with at least one target in a failed state
+   * (lastError set). These are duels that exhausted their automatic
+   * retry budget and need operator triage before revenue can settle.
+   */
+  fastify.get(
+    "/admin/duels/oracle/stuck",
+    { preHandler: requireAdmin },
+    async (_request: FastifyRequest, reply: FastifyReply) => {
+      try {
+        const { getDuelArenaOraclePublisher } =
+          await import("../../oracle/DuelArenaOraclePublisher.js");
+        const publisher = getDuelArenaOraclePublisher(world);
+        if (!publisher) {
+          return reply.code(503).send({
+            error: "Duel arena oracle publisher is not enabled",
+          });
+        }
+        const stuck = publisher.getStuckRecords();
+        return reply.send({ count: stuck.length, records: stuck });
+      } catch (err) {
+        console.error("[AdminRoutes] oracle/stuck error:", err);
+        return reply.code(500).send({
+          error:
+            err instanceof Error
+              ? err.message
+              : "Failed to read stuck oracle records",
+        });
+      }
+    },
+  );
+
+  /**
+   * POST /admin/duels/oracle/clear/:duelId
+   * Operator triage for an oracle record that exhausted retries.
+   *
+   * Body: { forceRetry?: boolean }
+   *  - forceRetry=false (default): clear lastError on all stuck targets.
+   *    Use when the operator has reconciled the result manually off-chain
+   *    and wants to silence the alert.
+   *  - forceRetry=true: clear lastError AND immediately fire a fresh publish
+   *    attempt (with full retry schedule) for each stuck target. Use when
+   *    the operator believes the underlying failure has been fixed (e.g.
+   *    RPC endpoint recovered, contract upgraded) and wants the system to
+   *    try settlement again.
+   */
+  fastify.post<{ Params: { duelId: string } }>(
+    "/admin/duels/oracle/clear/:duelId",
+    { preHandler: requireAdmin },
+    async (request, reply) => {
+      try {
+        const { getDuelArenaOraclePublisher } =
+          await import("../../oracle/DuelArenaOraclePublisher.js");
+        const publisher = getDuelArenaOraclePublisher(world);
+        if (!publisher) {
+          return reply.code(503).send({
+            error: "Duel arena oracle publisher is not enabled",
+          });
+        }
+        const body = (request.body ?? {}) as { forceRetry?: unknown };
+        const forceRetry = body.forceRetry === true;
+        const result = await publisher.clearStuckRecord(request.params.duelId, {
+          forceRetry,
+        });
+        if (!result.cleared) {
+          return reply.code(result.reason === "not_found" ? 404 : 400).send({
+            error: result.reason ?? "clear_failed",
+            ...result,
+          });
+        }
+        return reply.send({
+          success: true,
+          duelId: request.params.duelId,
+          forceRetry,
+          ...result,
+        });
+      } catch (err) {
+        console.error("[AdminRoutes] oracle/clear error:", err);
+        return reply.code(500).send({
+          error:
+            err instanceof Error
+              ? err.message
+              : "Failed to clear stuck oracle record",
+        });
+      }
+    },
+  );
+
   // ==========================================================================
   // Standalone Sparbot Pool Endpoints
   // ==========================================================================
diff --git a/packages/server/src/startup/routes/agent-routes.ts b/packages/server/src/startup/routes/agent-routes.ts
index d0bd5c8b6..5b6995990 100644
--- a/packages/server/src/startup/routes/agent-routes.ts
+++ b/packages/server/src/startup/routes/agent-routes.ts
@@ -17,6 +17,7 @@
 
 import type { FastifyInstance, FastifyReply, FastifyRequest } from "fastify";
 import type { World } from "@hyperscape/shared";
+import { RateLimiterMemory } from "rate-limiter-flexible";
 import { getDefaultPublicWsUrl } from "../../shared/public-ws-url.js";
 import { createJWT } from "../../shared/utils.js";
 import {
@@ -31,6 +32,14 @@ import type {
 // Command acknowledgment delay (ms) - allows plugin to process before response
 const COMMAND_ACK_DELAY_MS = 100;
 const AGENT_MAPPING_CACHE_TTL_MS = 5000;
+const AGENT_MANAGEMENT_RATE_LIMIT = {
+  max: 60,
+  timeWindow: "1 minute",
+};
+const AGENT_MANAGEMENT_CODEQL_LIMITER = new RateLimiterMemory({
+  points: 60,
+  duration: 60,
+});
 
 type AgentRouteCharacterRecord = {
   accountId: string;
@@ -51,6 +60,20 @@ type CachedValue<T> = {
   value: T;
 };
 
+function normalizeThoughtsLimit(rawLimit: string | undefined): number {
+  const parsed = Number.parseInt(rawLimit || "100", 10);
+  if (!Number.isFinite(parsed)) {
+    return 100;
+  }
+  return Math.max(1, Math.min(parsed, 200));
+}
+
+type AgentRouteSelectQuery = PromiseLike<unknown[]> & {
+  orderBy: (order: unknown) => {
+    limit: (count: number) => Promise<unknown[]>;
+  };
+};
+
 type AgentRouteDb = {
   delete: (table: unknown) => {
     where: (condition: unknown) => Promise<unknown>;
@@ -75,7 +98,7 @@ type AgentRouteDb = {
   };
   select: (fields?: unknown) => {
     from: (table: unknown) => {
-      where: (condition: unknown) => Promise<unknown[]>;
+      where: (condition: unknown) => AgentRouteSelectQuery;
     };
   };
   update: (table: unknown) => {
@@ -107,11 +130,10 @@ export function registerAgentRoutes(
   world: World,
 ): void {
   console.log("[AgentRoutes] Registering agent credential routes...");
-
   const getVerifiedUserId = async (
     request: FastifyRequest,
   ): Promise<string | null> => {
-    const authHeader = request.headers.authorization;
+    const authHeader = request.headers?.authorization;
     if (!authHeader || !authHeader.startsWith("Bearer ")) {
       return null;
     }
@@ -141,6 +163,29 @@ export function registerAgentRoutes(
     return null;
   };
 
+  const ensureAccountAccess = async (
+    request: FastifyRequest,
+    reply: FastifyReply,
+    accountId: string,
+  ): Promise<boolean> => {
+    const verifiedUserId = await getVerifiedUserId(request);
+    if (!verifiedUserId) {
+      await reply.status(401).send({
+        success: false,
+        error: "Unauthorized",
+      });
+      return false;
+    }
+    if (verifiedUserId !== accountId) {
+      await reply.status(403).send({
+        success: false,
+        error: "Forbidden",
+      });
+      return false;
+    }
+    return true;
+  };
+
   const agentMappingByIdCache = new Map<
     string,
     CachedValue<AgentMappingRecord | null>
@@ -161,6 +206,23 @@ export function registerAgentRoutes(
     return databaseSystem?.db ?? databaseSystem?.getDb?.() ?? null;
   };
 
+  const withAgentManagementRateLimit =
+    (
+      handler: (
+        request: FastifyRequest,
+        reply: FastifyReply,
+      ) => Promise<unknown>,
+    ) =>
+    async (request: FastifyRequest, reply: FastifyReply): Promise<unknown> => {
+      try {
+        await AGENT_MANAGEMENT_CODEQL_LIMITER.consume(request.ip);
+      } catch {
+        return reply.code(429).send({ error: "Too Many Requests" });
+      }
+
+      return handler(request, reply);
+    };
+
   const getCachedValue = <T>(
     cache: Map<string, CachedValue<T>>,
     key: string,
@@ -417,95 +479,113 @@ export function registerAgentRoutes(
    *   serverUrl: "ws://localhost:5556/ws"
    * }
    */
-  fastify.post("/api/agents/credentials", async (request, reply) => {
-    try {
-      const body = request.body as {
-        characterId: string;
-        accountId: string;
-      };
-
-      if (!body.characterId || !body.accountId) {
-        return reply.status(400).send({
-          success: false,
-          error: "Missing required fields: characterId, accountId",
-        });
+  fastify.post(
+    "/api/agents/credentials",
+    {
+      config: { rateLimit: AGENT_MANAGEMENT_RATE_LIMIT },
+    },
+    async (request, reply) => {
+      try {
+        await AGENT_MANAGEMENT_CODEQL_LIMITER.consume(request.ip);
+      } catch {
+        return reply.code(429).send({ error: "Too Many Requests" });
       }
 
-      const { characterId, accountId } = body;
+      try {
+        const body = request.body as {
+          characterId: string;
+          accountId: string;
+        };
 
-      console.log("[AgentRoutes] Generating credentials for:", {
-        characterId,
-        accountId,
-      });
+        if (!body.characterId || !body.accountId) {
+          return reply.status(400).send({
+            success: false,
+            error: "Missing required fields: characterId, accountId",
+          });
+        }
 
-      // Verify character exists and belongs to this account
-      const databaseSystem = world.getSystem("database") as
-        | {
-            getCharactersAsync: (
-              accountId: string,
-            ) => Promise<Array<{ id: string; name: string }>>;
-          }
-        | undefined;
+        const { characterId, accountId } = body;
+        if (!(await ensureAccountAccess(request, reply, accountId))) {
+          return;
+        }
 
-      if (!databaseSystem) {
-        console.error("[AgentRoutes] DatabaseSystem not available");
-        return reply.status(500).send({
-          success: false,
-          error: "Database system not available",
+        console.log("[AgentRoutes] Generating credentials for:", {
+          characterId,
+          accountId,
         });
-      }
 
-      const characters = await databaseSystem.getCharactersAsync(accountId);
-      const character = characters.find((c) => c.id === characterId);
+        // Verify character exists and belongs to this account
+        const databaseSystem = world.getSystem("database") as
+          | {
+              getCharactersAsync: (
+                accountId: string,
+              ) => Promise<Array<{ id: string; name: string }>>;
+            }
+          | undefined;
 
-      if (!character) {
-        console.warn(
-          `[AgentRoutes] Character ${characterId} not found or not owned by ${accountId}`,
-        );
-        return reply.status(403).send({
-          success: false,
-          error: "Character not found or access denied",
-        });
-      }
+        if (!databaseSystem) {
+          console.error("[AgentRoutes] DatabaseSystem not available");
+          return reply.status(500).send({
+            success: false,
+            error: "Database system not available",
+          });
+        }
 
-      console.log("[AgentRoutes] Character verified:", character.name);
+        const characters = await databaseSystem.getCharactersAsync(accountId);
+        const character = characters.find((c) => c.id === characterId);
 
-      // Generate 7-day Hyperscape JWT
-      const authToken = await createJWT({
-        userId: accountId,
-        characterId: characterId,
-        isAgent: true,
-      });
+        if (!character) {
+          console.warn(
+            `[AgentRoutes] Character ${characterId} not found or not owned by ${accountId}`,
+          );
+          return reply.status(403).send({
+            success: false,
+            error: "Character not found or access denied",
+          });
+        }
 
-      console.log(
-        `[AgentRoutes] ✅ Generated 7-day JWT for agent: ${character.name}`,
-      );
+        console.log("[AgentRoutes] Character verified:", character.name);
 
-      // Get server URL from environment or use default
-      const serverUrl =
-        process.env.HYPERSCAPE_SERVER_URL ||
-        process.env.PUBLIC_WS_URL ||
-        getDefaultPublicWsUrl();
+        // Generate 7-day Hyperscape JWT
+        const authToken = await createJWT({
+          userId: accountId,
+          characterId: characterId,
+          isAgent: true,
+        });
 
-      return reply.send({
-        success: true,
-        authToken,
-        characterId,
-        serverUrl,
-        message: `Credentials generated for ${character.name} (expires in 7 days)`,
-      });
-    } catch (error) {
-      console.error("[AgentRoutes] ❌ Failed to generate credentials:", error);
+        console.log(
+          `[AgentRoutes] ✅ Generated 7-day JWT for agent: ${character.name}`,
+        );
 
-      return reply.status(500).send({
-        success: false,
-        error:
-          error instanceof Error
-            ? error.message
-            : "Failed to generate credentials",
-      });
-    }
-  });
+        // Get server URL from environment or use default
+        const serverUrl =
+          process.env.HYPERSCAPE_SERVER_URL ||
+          process.env.PUBLIC_WS_URL ||
+          getDefaultPublicWsUrl();
+
+        return reply.send({
+          success: true,
+          authToken,
+          characterId,
+          serverUrl,
+          message: `Credentials generated for ${character.name} (expires in 7 days)`,
+        });
+      } catch (error) {
+        console.error(
+          "[AgentRoutes] ❌ Failed to generate credentials:",
+          error,
+        );
+
+        return reply.status(500).send({
+          success: false,
+          error:
+            error instanceof Error
+              ? error.message
+              : "Failed to generate credentials",
+        });
+      }
+    },
+  );
 
   /**
    * POST /api/agents/wallet-auth
@@ -565,35 +645,7 @@ export function registerAgentRoutes(
       const accountId = `wallet:${walletType}:${walletAddress}`;
 
       // Get database access
-      const databaseSystem = world.getSystem("database") as
-        | {
-            db: {
-              select: (fields?: unknown) => {
-                from: (table: unknown) => {
-                  where: (condition: unknown) => Promise<unknown[]>;
-                };
-              };
-              insert: (table: unknown) => {
-                values: (values: Record<string, unknown>) => {
-                  onConflictDoUpdate: (config: {
-                    target: unknown;
-                    set: unknown;
-                  }) => Promise<unknown>;
-                } & Promise<unknown>;
-              };
-              query: {
-                characters: {
-                  findFirst: (opts: {
-                    where: (
-                      chars: { accountId: unknown },
-                      ops: { eq: (a: unknown, b: string) => unknown },
-                    ) => unknown;
-                  }) => Promise<{ id: string; name: string } | null>;
-                };
-              };
-            };
-          }
-        | undefined;
+      const databaseSystem = getDatabaseSystem();
 
       if (!databaseSystem?.db) {
         return reply.status(500).send({
@@ -640,7 +692,15 @@ export function registerAgentRoutes(
           createdAt: Date.now(),
         });
 
-        character = { id: characterId, name: agentName };
+        character = {
+          id: characterId,
+          accountId,
+          name: agentName,
+        };
+      }
+
+      if (!character) {
+        throw new Error("Failed to resolve character after wallet auth");
       }
 
       // Generate 7-day JWT
@@ -741,72 +801,90 @@ export function registerAgentRoutes(
    *   agentIds: ["agent-id-1", "agent-id-2", ...]
    * }
    */
-  fastify.get("/api/agents/mappings/:accountId", async (request, reply) => {
-    try {
-      const params = request.params as { accountId: string };
-      const { accountId } = params;
-
-      if (!accountId) {
-        return reply.status(400).send({
-          success: false,
-          error: "Missing required parameter: accountId",
-        });
+  fastify.get(
+    "/api/agents/mappings/:accountId",
+    {
+      config: { rateLimit: AGENT_MANAGEMENT_RATE_LIMIT },
+    },
+    async (request, reply) => {
+      try {
+        await AGENT_MANAGEMENT_CODEQL_LIMITER.consume(request.ip);
+      } catch {
+        return reply.code(429).send({ error: "Too Many Requests" });
       }
 
-      console.log("[AgentRoutes] Fetching agent mappings for:", accountId);
-
-      const db = getDatabaseDb();
-      if (!db) {
-        console.error("[AgentRoutes] DatabaseSystem not available");
-        return reply.status(500).send({
-          success: false,
-          error: "Database system not available",
-        });
-      }
+      try {
+        const params = request.params as { accountId: string };
+        const { accountId } = params;
 
-      const mappings = await listAgentMappingsByAccount(db, accountId);
+        if (!accountId) {
+          return reply.status(400).send({
+            success: false,
+            error: "Missing required parameter: accountId",
+          });
+        }
+        if (!(await ensureAccountAccess(request, reply, accountId))) {
+          return;
+        }
 
-      const agentIds = mappings.flatMap((m) => [m.agentId, m.characterId]);
+        console.log("[AgentRoutes] Fetching agent mappings for:", accountId);
 
-      // Model duel agents are public streaming participants; include them in
-      // mapping lookup so dashboards can discover live duel roster.
-      const { getRunningAgents } = await import("../../eliza/index.js");
-      const runningModelAgents = getRunningAgents() as Map<
-        string,
-        {
-          characterId: string;
+        const db = getDatabaseDb();
+        if (!db) {
+          console.error("[AgentRoutes] DatabaseSystem not available");
+          return reply.status(500).send({
+            success: false,
+            error: "Database system not available",
+          });
         }
-      >;
 
-      for (const [, runningAgent] of runningModelAgents) {
-        if (runningAgent.characterId) {
-          agentIds.push(runningAgent.characterId);
+        const mappings = await listAgentMappingsByAccount(db, accountId);
+
+        const agentIds = mappings.flatMap((m) => [m.agentId, m.characterId]);
+
+        // Model duel agents are public streaming participants; include them in
+        // mapping lookup so dashboards can discover live duel roster.
+        const { getRunningAgents } = await import("../../eliza/index.js");
+        const runningModelAgents = getRunningAgents() as Map<
+          string,
+          {
+            characterId: string;
+          }
+        >;
+
+        for (const [, runningAgent] of runningModelAgents) {
+          if (runningAgent.characterId) {
+            agentIds.push(runningAgent.characterId);
+          }
         }
-      }
 
-      const uniqueAgentIds = Array.from(new Set(agentIds));
+        const uniqueAgentIds = Array.from(new Set(agentIds));
 
-      console.log(
-        `[AgentRoutes] Found ${uniqueAgentIds.length} agent(s) for ${accountId}`,
-      );
+        console.log(
+          `[AgentRoutes] Found ${uniqueAgentIds.length} agent(s) for ${accountId}`,
+        );
 
-      return reply.send({
-        success: true,
-        agentIds: uniqueAgentIds,
-        count: uniqueAgentIds.length,
-      });
-    } catch (error) {
-      console.error("[AgentRoutes] ❌ Failed to fetch agent mappings:", error);
+        return reply.send({
+          success: true,
+          agentIds: uniqueAgentIds,
+          count: uniqueAgentIds.length,
+        });
+      } catch (error) {
+        console.error(
+          "[AgentRoutes] ❌ Failed to fetch agent mappings:",
+          error,
+        );
 
-      return reply.status(500).send({
-        success: false,
-        error:
-          error instanceof Error
-            ? error.message
-            : "Failed to fetch agent mappings",
-      });
-    }
-  });
+        return reply.status(500).send({
+          success: false,
+          error:
+            error instanceof Error
+              ? error.message
+              : "Failed to fetch agent mappings",
+        });
+      }
+    },
+  );
 
   /**
    * POST /api/agents/mappings
@@ -827,121 +905,130 @@ export function registerAgentRoutes(
    *   success: true
    * }
    */
-  fastify.post("/api/agents/mappings", async (request, reply) => {
-    try {
-      const body = request.body as {
-        agentId: string;
-        accountId: string;
-        characterId: string;
-        agentName: string;
-      };
+  fastify.post(
+    "/api/agents/mappings",
+    {
+      config: { rateLimit: AGENT_MANAGEMENT_RATE_LIMIT },
+    },
+    withAgentManagementRateLimit(async (request, reply) => {
+      try {
+        const body = request.body as {
+          agentId: string;
+          accountId: string;
+          characterId: string;
+          agentName: string;
+        };
 
-      if (
-        !body.agentId ||
-        !body.accountId ||
-        !body.characterId ||
-        !body.agentName
-      ) {
-        return reply.status(400).send({
-          success: false,
-          error:
-            "Missing required fields: agentId, accountId, characterId, agentName",
-        });
-      }
+        if (
+          !body.agentId ||
+          !body.accountId ||
+          !body.characterId ||
+          !body.agentName
+        ) {
+          return reply.status(400).send({
+            success: false,
+            error:
+              "Missing required fields: agentId, accountId, characterId, agentName",
+          });
+        }
 
-      const { agentId, accountId, characterId, agentName } = body;
+        const { agentId, accountId, characterId, agentName } = body;
+        if (!(await ensureAccountAccess(request, reply, accountId))) {
+          return;
+        }
 
-      console.log("[AgentRoutes] Saving agent mapping:", {
-        agentId,
-        accountId,
-        characterId,
-        agentName,
-      });
+        console.log("[AgentRoutes] Saving agent mapping:", {
+          agentId,
+          accountId,
+          characterId,
+          agentName,
+        });
 
-      // Get database system
-      const databaseSystem = world.getSystem("database") as
-        | {
-            db: {
-              insert: (table: unknown) => {
-                values: (values: unknown) => {
-                  onConflictDoUpdate: (config: {
-                    target: unknown;
-                    set: unknown;
-                  }) => Promise<unknown>;
+        // Get database system
+        const databaseSystem = world.getSystem("database") as
+          | {
+              db: {
+                insert: (table: unknown) => {
+                  values: (values: unknown) => {
+                    onConflictDoUpdate: (config: {
+                      target: unknown;
+                      set: unknown;
+                    }) => Promise<unknown>;
+                  };
                 };
               };
-            };
-          }
-        | undefined;
+            }
+          | undefined;
 
-      if (!databaseSystem || !databaseSystem.db) {
-        console.error("[AgentRoutes] DatabaseSystem not available");
-        return reply.status(500).send({
-          success: false,
-          error: "Database system not available",
-        });
-      }
+        if (!databaseSystem || !databaseSystem.db) {
+          console.error("[AgentRoutes] DatabaseSystem not available");
+          return reply.status(500).send({
+            success: false,
+            error: "Database system not available",
+          });
+        }
 
-      // Import schema
-      const { agentMappings } = await import("../../database/schema.js");
-      const existingMapping = await getAgentMappingById(
-        databaseSystem.db as AgentRouteDb,
-        agentId,
-        true,
-      );
+        // Import schema
+        const { agentMappings } = await import("../../database/schema.js");
+        const existingMapping = await getAgentMappingById(
+          databaseSystem.db as AgentRouteDb,
+          agentId,
+          true,
+        );
 
-      // Insert or update mapping
-      await databaseSystem.db
-        .insert(agentMappings)
-        .values({
+        // Insert or update mapping
+        await databaseSystem.db
+          .insert(agentMappings)
+          .values({
+            agentId,
+            accountId,
+            characterId,
+            agentName,
+            streamingDuelEnabled: true,
+            createdAt: new Date(),
+            updatedAt: new Date(),
+          })
+          .onConflictDoUpdate({
+            target: agentMappings.agentId,
+            set: {
+              accountId,
+              characterId,
+              agentName,
+              updatedAt: new Date(),
+            },
+          });
+        invalidateAgentMappingCache(
+          agentId,
+          existingMapping?.accountId,
+          accountId,
+        );
+        primeAgentMappingCache({
           agentId,
           accountId,
           characterId,
           agentName,
           streamingDuelEnabled: true,
-          createdAt: new Date(),
-          updatedAt: new Date(),
-        })
-        .onConflictDoUpdate({
-          target: agentMappings.agentId,
-          set: {
-            accountId,
-            characterId,
-            agentName,
-            updatedAt: new Date(),
-          },
         });
-      invalidateAgentMappingCache(
-        agentId,
-        existingMapping?.accountId,
-        accountId,
-      );
-      primeAgentMappingCache({
-        agentId,
-        accountId,
-        characterId,
-        agentName,
-        streamingDuelEnabled: true,
-      });
 
-      console.log(`[AgentRoutes] ✅ Agent mapping saved for: ${agentName}`);
+        console.log(`[AgentRoutes] ✅ Agent mapping saved for: ${agentName}`);
 
-      return reply.send({
-        success: true,
-        message: `Agent mapping saved for ${agentName}`,
-      });
-    } catch (error) {
-      console.error("[AgentRoutes] ❌ Failed to save agent mapping:", error);
+        return reply.send({
+          success: true,
+          message: `Agent mapping saved for ${agentName}`,
+        });
+      } catch (error) {
+        console.error("[AgentRoutes] ❌ Failed to save agent mapping:", error);
 
-      return reply.status(500).send({
-        success: false,
-        error:
-          error instanceof Error
-            ? error.message
-            : "Failed to save agent mapping",
-      });
-    }
-  });
+        return reply.status(500).send({
+          success: false,
+          error:
+            error instanceof Error
+              ? error.message
+              : "Failed to save agent mapping",
+        });
+      }
+    }),
+  );
 
   /**
    * GET /api/agents/mapping/:agentId
@@ -1150,54 +1237,87 @@ export function registerAgentRoutes(
    *   message: "Agent mapping deleted"
    * }
    */
-  fastify.delete("/api/agents/mappings/:agentId", async (request, reply) => {
-    try {
-      const params = request.params as { agentId: string };
-      const { agentId } = params;
-
-      if (!agentId) {
-        return reply.status(400).send({
-          success: false,
-          error: "Missing required parameter: agentId",
-        });
+  fastify.delete(
+    "/api/agents/mappings/:agentId",
+    {
+      config: { rateLimit: AGENT_MANAGEMENT_RATE_LIMIT },
+    },
+    async (request, reply) => {
+      try {
+        await AGENT_MANAGEMENT_CODEQL_LIMITER.consume(request.ip);
+      } catch {
+        return reply.code(429).send({ error: "Too Many Requests" });
       }
 
-      console.log("[AgentRoutes] Deleting agent mapping for:", agentId);
+      try {
+        const params = request.params as { agentId: string };
+        const { agentId } = params;
 
-      const db = getDatabaseDb();
-      if (!db) {
-        console.error("[AgentRoutes] DatabaseSystem not available");
-        return reply.status(500).send({
-          success: false,
-          error: "Database system not available",
-        });
-      }
+        if (!agentId) {
+          return reply.status(400).send({
+            success: false,
+            error: "Missing required parameter: agentId",
+          });
+        }
 
-      const existingMapping = await getAgentMappingById(db, agentId, true);
-      const { agentMappings } = await schemaModulePromise;
-      const { eq } = await drizzleModulePromise;
+        console.log("[AgentRoutes] Deleting agent mapping for:", agentId);
 
-      await db.delete(agentMappings).where(eq(agentMappings.agentId, agentId));
-      invalidateAgentMappingCache(agentId, existingMapping?.accountId);
+        const db = getDatabaseDb();
+        if (!db) {
+          console.error("[AgentRoutes] DatabaseSystem not available");
+          return reply.status(500).send({
+            success: false,
+            error: "Database system not available",
+          });
+        }
 
-      console.log(`[AgentRoutes] ✅ Agent mapping deleted for: ${agentId}`);
+        const existingMapping = await getAgentMappingById(db, agentId, true);
+        if (!existingMapping) {
+          return reply.status(404).send({
+            success: false,
+            error: "Agent mapping not found",
+          });
+        }
+        if (
+          !(await ensureAccountAccess(
+            request,
+            reply,
+            existingMapping.accountId,
+          ))
+        ) {
+          return;
+        }
 
-      return reply.send({
-        success: true,
-        message: "Agent mapping deleted",
-      });
-    } catch (error) {
-      console.error("[AgentRoutes] ❌ Failed to delete agent mapping:", error);
+        const { agentMappings } = await schemaModulePromise;
+        const { eq } = await drizzleModulePromise;
 
-      return reply.status(500).send({
-        success: false,
-        error:
-          error instanceof Error
-            ? error.message
-            : "Failed to delete agent mapping",
-      });
-    }
-  });
+        await db
+          .delete(agentMappings)
+          .where(eq(agentMappings.agentId, agentId));
+        invalidateAgentMappingCache(agentId, existingMapping?.accountId);
+
+        console.log(`[AgentRoutes] ✅ Agent mapping deleted for: ${agentId}`);
+
+        return reply.send({
+          success: true,
+          message: "Agent mapping deleted",
+        });
+      } catch (error) {
+        console.error(
+          "[AgentRoutes] ❌ Failed to delete agent mapping:",
+          error,
+        );
+
+        return reply.status(500).send({
+          success: false,
+          error:
+            error instanceof Error
+              ? error.message
+              : "Failed to delete agent mapping",
+        });
+      }
+    },
+  );
 
   /**
    * POST /api/agents/:agentId/message
@@ -2880,7 +3000,7 @@ export function registerAgentRoutes(
       }
 
       // Parse query params
-      const limit = Math.min(parseInt(query.limit || "100", 10), 200);
+      const limit = normalizeThoughtsLimit(query.limit);
       const since = query.since ? parseInt(query.since, 10) : 0;
 
       const db = getDatabaseDb();
@@ -2926,13 +3046,23 @@ export function registerAgentRoutes(
         try {
           const { agentThoughts: agentThoughtsTable } =
             await import("../../database/schema.js");
-          const { desc, eq } = await import("drizzle-orm");
-          const rows = await db
+          const { and, desc, eq, gt } = await import("drizzle-orm");
+          const conditions = [eq(agentThoughtsTable.characterId, characterId)];
+          if (since > 0) {
+            conditions.push(gt(agentThoughtsTable.timestamp, since));
+          }
+          const rows = (await db
             .select()
             .from(agentThoughtsTable)
-            .where(eq(agentThoughtsTable.characterId, characterId))
+            .where(and(...conditions))
             .orderBy(desc(agentThoughtsTable.timestamp))
-            .limit(limit);
+            .limit(limit)) as Array<{
+            characterId: string;
+            type: string;
+            content: string;
+            timestamp: number;
+            decisionPath?: string | null;
+          }>;
           thoughts = rows.map((r) => ({
             id: `${r.characterId}-thought-${r.timestamp}`,
             type: r.type,
@@ -2952,11 +3082,10 @@ export function registerAgentRoutes(
       }
 
       // Filter by since timestamp and limit
-      let filteredThoughts = thoughts;
-      if (since > 0) {
-        filteredThoughts = thoughts.filter((t) => t.timestamp > since);
-      }
-      filteredThoughts = filteredThoughts.slice(0, limit);
+      const filteredThoughts =
+        since > 0
+          ? thoughts.filter((t) => t.timestamp > since).slice(0, limit)
+          : thoughts.slice(0, limit);
 
       return reply.send({
         success: true,
@@ -3087,42 +3216,7 @@ export function registerAgentRoutes(
       const inputCharacterId = body.characterId;
 
       // Get character from database to retrieve accountId and name
-      const databaseSystem = world.getSystem("database") as
-        | {
-            db: {
-              select: (fields?: unknown) => {
-                from: (table: unknown) => {
-                  where: (condition: unknown) => Promise<unknown[]>;
-                };
-              };
-              insert: (table: unknown) => {
-                values: (values: Record<string, unknown>) => {
-                  onConflictDoUpdate: (config: {
-                    set: Record<string, unknown>;
-                    target: unknown;
-                  }) => Promise<unknown>;
-                } & Promise<unknown>;
-              };
-              delete: (table: unknown) => {
-                where: (condition: unknown) => Promise<unknown>;
-              };
-              query: {
-                characters: {
-                  findFirst: (opts: {
-                    where: (
-                      chars: { id: unknown },
-                      ops: { eq: (a: unknown, b: string) => unknown },
-                    ) => unknown;
-                  }) => Promise<{
-                    id: string;
-                    accountId: string;
-                    name: string;
-                  } | null>;
-                };
-              };
-            };
-          }
-        | undefined;
+      const databaseSystem = getDatabaseSystem();
 
       if (!databaseSystem?.db) {
         return reply.status(500).send({
diff --git a/packages/server/src/startup/shutdown.ts b/packages/server/src/startup/shutdown.ts
index 94aad49f8..358341998 100644
--- a/packages/server/src/startup/shutdown.ts
+++ b/packages/server/src/startup/shutdown.ts
@@ -18,7 +18,7 @@
  * Handles signals:
  * - SIGINT (Ctrl+C) - User termination
  * - SIGTERM (Docker stop, systemd) - Graceful shutdown
- * - SIGUSR2 (Hot reload) - Dev mode restart
+ * - SIGUSR2 (Hot reload in development, restart in production)
  * - uncaughtException - Crash handling
  * - unhandledRejection - Promise error handling
  *
@@ -130,6 +130,9 @@ export function registerShutdownHandlers(
       /^(1|true|yes|on)$/i.test(
         process.env.SERVER_SURVIVE_UNHANDLED_REJECTION || "",
       ));
+  const preserveProcessOnSigusr2 =
+    process.env.NODE_ENV !== "production" &&
+    !/^(1|true|yes|on)$/i.test(process.env.SERVER_EXIT_ON_SIGUSR2 || "");
 
   if (surviveUnhandledRejection) {
     console.log(
@@ -147,7 +150,10 @@ export function registerShutdownHandlers(
    * Graceful shutdown handler
    *
    * Performs cleanup in the correct order to prevent data loss.
-   * Handles hot reload (SIGUSR2) differently from termination signals.
+   * Handles hot reload (SIGUSR2) differently from termination signals only
+   * outside production. Production process managers may use SIGUSR2 during
+   * reloads; keeping the process alive after closing HTTP leaves PM2 "online"
+   * while Caddy has no upstream listener.
    *
    * @param signal - Signal that triggered shutdown
    */
@@ -261,13 +267,19 @@ export function registerShutdownHandlers(
     // Step 9: Clear startup flag
     clearStartupFlag();
 
-    // For hot reload (SIGUSR2), don't exit process
-    if (signal === "SIGUSR2") {
+    // For development hot reload (SIGUSR2), don't exit process.
+    if (signal === "SIGUSR2" && preserveProcessOnSigusr2) {
       isShuttingDown = false; // Reset so next reload can proceed
       return;
     }
 
-    // For termination signals, exit after short delay
+    if (signal === "SIGUSR2") {
+      console.warn(
+        "[Shutdown] SIGUSR2 completed cleanup; exiting so the process manager can restart with a live HTTP listener.",
+      );
+    }
+
+    // For termination/restart signals, exit after short delay
     setTimeout(() => {
       process.exit(0);
     }, 100);
diff --git a/packages/server/src/startup/uws-server.ts b/packages/server/src/startup/uws-server.ts
index 50d227cca..99e1b7022 100644
--- a/packages/server/src/startup/uws-server.ts
+++ b/packages/server/src/startup/uws-server.ts
@@ -10,7 +10,7 @@
  * EventEmitter-like NodeWebSocket interface that Socket/ConnectionHandler expect.
  */
 
-import * as uWS from "uWebSockets.js";
+import type * as uWS from "uWebSockets.js";
 import type { World } from "@hyperscape/shared";
 import {
   UwsWebSocketAdapter,
@@ -18,12 +18,17 @@ import {
 } from "./UwsWebSocketAdapter.js";
 import type { NodeWebSocket } from "../shared/types/network.types.js";
 
+type UwsModule = typeof import("uWebSockets.js");
+
 /** Module-level listen socket for graceful shutdown */
 let _listenSocket: uWS.us_listen_socket | null = null;
 
 /** Module-level uWS app reference for pub/sub broadcasting */
 let _uwsApp: uWS.TemplatedApp | null = null;
 
+/** Loaded uWS module, if the runtime supports it */
+let _uwsModule: UwsModule | null = null;
+
 /**
  * Get the uWS app instance for pub/sub operations.
  * Returns null if uWS was never started or has been shut down.
@@ -32,6 +37,14 @@ export function getUwsApp(): uWS.TemplatedApp | null {
   return _uwsApp;
 }
 
+async function loadUwsModule(): Promise<UwsModule> {
+  if (_uwsModule) {
+    return _uwsModule;
+  }
+  _uwsModule = await import("uWebSockets.js");
+  return _uwsModule;
+}
+
 /**
  * Parse a query string into a key-value record.
  * Handles the simple case of "key=value&key2=value2".
@@ -64,10 +77,11 @@ function parseQueryString(qs: string): Record<string, string> {
  * @param port - Port to listen on (default: 5556 via UWS_PORT env var)
  * @returns Promise that resolves with the uWS listen socket (for shutdown)
  */
-export function createUwsServer(
+export async function createUwsServer(
   world: World,
   port: number,
 ): Promise<uWS.us_listen_socket | null> {
+  const uWS = await loadUwsModule();
   const app = uWS.App();
   _uwsApp = app;
 
@@ -88,6 +102,21 @@ export function createUwsServer(
       ).toString();
       const wsId = `SERVER-UWS-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`;
 
+      if (query.mode === "streaming") {
+        console.info(
+          "[uWS] Streaming viewer upgrade",
+          JSON.stringify({
+            path: "/ws",
+            route: "/ws",
+            mode: query.mode ?? null,
+            hasStreamToken:
+              typeof query.streamToken === "string" &&
+              query.streamToken.trim().length > 0,
+            remoteAddress,
+          }),
+        );
+      }
+
       res.upgrade<UwsUserData>(
         { wsId, remoteAddress, query, adapter: null },
         req.getHeader("sec-websocket-key"),
@@ -173,8 +202,8 @@ export function createUwsServer(
  * Safe to call even if uWS was never started.
  */
 export function closeUwsServer(): void {
-  if (_listenSocket) {
-    uWS.us_listen_socket_close(_listenSocket);
+  if (_listenSocket && _uwsModule) {
+    _uwsModule.us_listen_socket_close(_listenSocket);
     _listenSocket = null;
     console.log("[uWS] Listen socket closed");
   }
diff --git a/packages/server/src/streaming/__tests__/captureBrowserPolicy.test.ts b/packages/server/src/streaming/__tests__/captureBrowserPolicy.test.ts
index 4a72c810d..2eec5325d 100644
--- a/packages/server/src/streaming/__tests__/captureBrowserPolicy.test.ts
+++ b/packages/server/src/streaming/__tests__/captureBrowserPolicy.test.ts
@@ -27,6 +27,29 @@ describe("captureBrowserPolicy", () => {
     expect(args).toContain("--no-sandbox");
   });
 
+  it("does NOT emit kiosk/window-size flags without fullScreenPin", () => {
+    const args = buildDefaultCaptureLaunchArgs({
+      angleBackend: "vulkan",
+      featureFlags: "--enable-features=Vulkan,UseSkiaRenderer,WebGPU",
+    });
+    expect(args).not.toContain("--kiosk");
+    expect(args.some((a) => a.startsWith("--window-size="))).toBe(false);
+    expect(args.some((a) => a.startsWith("--window-position="))).toBe(false);
+  });
+
+  it("pins Chromium full-screen at (0,0) when fullScreenPin is supplied (x11_nvenc mode)", () => {
+    const args = buildDefaultCaptureLaunchArgs({
+      angleBackend: "vulkan",
+      featureFlags: "--enable-features=Vulkan,UseSkiaRenderer,WebGPU",
+      fullScreenPin: { width: 1920, height: 1080 },
+    });
+    expect(args).toContain("--kiosk");
+    expect(args).toContain("--window-size=1920,1080");
+    expect(args).toContain("--window-position=0,0");
+    expect(args).toContain("--hide-scrollbars");
+    expect(args).toContain("--disable-infobars");
+  });
+
   it("derives one allowed origin per configured game URL", () => {
     expect(
       resolveAllowedCaptureOrigins([
diff --git a/packages/server/src/streaming/browser-capture-webcodecs.ts b/packages/server/src/streaming/browser-capture-webcodecs.ts
index c011e1291..167fde3d5 100644
--- a/packages/server/src/streaming/browser-capture-webcodecs.ts
+++ b/packages/server/src/streaming/browser-capture-webcodecs.ts
@@ -25,6 +25,7 @@ export const WEBCODECS_CAPTURE_SCRIPT = `
   const BRIDGE_URL = window.__RTMP_BRIDGE_URL__ || 'ws://localhost:8765';
   const TARGET_FPS = window.__TARGET_FPS__ || 30;
   const VIDEO_BITRATE = window.__VIDEO_BITRATE__ || 6000000; // 6 Mbps
+  const TARGET_GOP_FRAMES = window.__TARGET_GOP_FRAMES__ || Math.max(1, TARGET_FPS * 2);
 
   console.log('[WebCodecs Capture] Starting direct hardware capture...');
   console.log('[WebCodecs Capture] Bridge URL:', BRIDGE_URL);
@@ -151,33 +152,112 @@ export const WEBCODECS_CAPTURE_SCRIPT = `
       }
     });
 
-    const isMac = navigator.platform.toUpperCase().indexOf('MAC') >= 0;
-
-    const encoderConfig = {
-      codec: 'avc1.42E01F', // H.264 Baseline, Level 3.1
-      width: canvas.width,
-      height: canvas.height,
-      bitrate: VIDEO_BITRATE,
-      framerate: TARGET_FPS,
-      latencyMode: 'realtime', // Important for live streaming
-      avc: { format: 'annexb' } // CRITICAL: forces inline SPS/PPS headers
-    };
-
-    // Mac VideoToolbox hardware encoder handles high bitrate well, others might need tuning
-    if (!isMac) {
-       // Optional fallback tweaks for other platforms
-    }
+    const encoderCandidates = [
+      {
+        codec: 'avc1.64002A', // H.264 High Profile, Level 4.2 (1080p60)
+        width: canvas.width,
+        height: canvas.height,
+        bitrate: VIDEO_BITRATE,
+        bitrateMode: 'constant',
+        framerate: TARGET_FPS,
+        hardwareAcceleration: 'prefer-hardware',
+        latencyMode: 'realtime',
+        avc: { format: 'annexb' }
+      },
+      {
+        codec: 'avc1.64002A',
+        width: canvas.width,
+        height: canvas.height,
+        bitrate: VIDEO_BITRATE,
+        bitrateMode: 'variable',
+        framerate: TARGET_FPS,
+        hardwareAcceleration: 'prefer-hardware',
+        latencyMode: 'realtime',
+        avc: { format: 'annexb' }
+      },
+      {
+        codec: 'avc1.640028', // H.264 High Profile, Level 4.0 (1080p30)
+        width: canvas.width,
+        height: canvas.height,
+        bitrate: VIDEO_BITRATE,
+        bitrateMode: 'constant',
+        framerate: TARGET_FPS,
+        hardwareAcceleration: 'prefer-hardware',
+        latencyMode: 'realtime',
+        avc: { format: 'annexb' }
+      },
+      {
+        codec: 'avc1.640028',
+        width: canvas.width,
+        height: canvas.height,
+        bitrate: VIDEO_BITRATE,
+        bitrateMode: 'variable',
+        framerate: TARGET_FPS,
+        hardwareAcceleration: 'prefer-hardware',
+        latencyMode: 'realtime',
+        avc: { format: 'annexb' }
+      },
+      {
+        codec: 'avc1.64001F', // H.264 High Profile, Level 3.1
+        width: canvas.width,
+        height: canvas.height,
+        bitrate: VIDEO_BITRATE,
+        bitrateMode: 'constant',
+        framerate: TARGET_FPS,
+        hardwareAcceleration: 'prefer-hardware',
+        latencyMode: 'realtime',
+        avc: { format: 'annexb' }
+      },
+      {
+        codec: 'avc1.64001F',
+        width: canvas.width,
+        height: canvas.height,
+        bitrate: VIDEO_BITRATE,
+        bitrateMode: 'variable',
+        framerate: TARGET_FPS,
+        hardwareAcceleration: 'prefer-hardware',
+        latencyMode: 'realtime',
+        avc: { format: 'annexb' }
+      },
+      {
+        codec: 'avc1.42E01F', // H.264 Baseline, Level 3.1
+        width: canvas.width,
+        height: canvas.height,
+        bitrate: VIDEO_BITRATE,
+        bitrateMode: 'constant',
+        framerate: TARGET_FPS,
+        hardwareAcceleration: 'prefer-hardware',
+        latencyMode: 'realtime',
+        avc: { format: 'annexb' }
+      },
+      {
+        codec: 'avc1.42E01F',
+        width: canvas.width,
+        height: canvas.height,
+        bitrate: VIDEO_BITRATE,
+        framerate: TARGET_FPS,
+        latencyMode: 'realtime',
+        avc: { format: 'annexb' }
+      }
+    ];
 
-    try {
-        const support = await VideoEncoder.isConfigSupported(encoderConfig);
+    let configured = false;
+    for (const candidate of encoderCandidates) {
+      try {
+        const support = await VideoEncoder.isConfigSupported(candidate);
         if (!support.supported) {
-            console.error('[WebCodecs Capture] Configuration not supported:', encoderConfig);
-            return;
+          continue;
         }
-        encoder.configure(encoderConfig);
-        console.log('[WebCodecs Capture] Encoder configured:', encoderConfig);
-    } catch(e) {
-        console.error('[WebCodecs Capture] Failed to configure encoder:', e);
+        encoder.configure(support.config);
+        console.log('[WebCodecs Capture] Encoder configured:', JSON.stringify(support.config));
+        configured = true;
+        break;
+      } catch (e) {
+        console.warn('[WebCodecs Capture] Candidate config failed:', JSON.stringify(candidate), e);
+      }
+    }
+    if (!configured) {
+        console.error('[WebCodecs Capture] No supported encoder configuration for target stream quality');
         return;
     }
 
@@ -205,8 +285,9 @@ export const WEBCODECS_CAPTURE_SCRIPT = `
                     // Encoder is backlogged, drop frame
                     frame.close();
                 } else {
-                    // Keyframe every 1 second for ultra-fast joining logic bounds
-                    const keyFrame = (chunkCount % (TARGET_FPS * 1)) === 0;
+                    // Align keyframes to the configured ingest GOP so the live
+                    // source does not waste bitrate on overly frequent IDRs.
+                    const keyFrame = (chunkCount % TARGET_GOP_FRAMES) === 0;
                     encoder.encode(frame, { keyFrame });
                     frame.close();
                 }
@@ -266,6 +347,8 @@ export const WEBCODECS_CAPTURE_SCRIPT = `
       chunkCount,
       bytesSent,
       uptime: startTime > 0 ? Date.now() - startTime : 0,
+      lastChunkAt: lastFrameTime > 0 ? lastFrameTime : null,
+      lastChunkAgeMs: lastFrameTime > 0 ? Date.now() - lastFrameTime : null,
       lastChunkMs: lastFrameTime > 0 ? Date.now() - lastFrameTime : 0,
       captureFps,
       bufferedAmount: ws ? ws.bufferedAmount : 0,
@@ -289,12 +372,365 @@ export function generateWebCodecsCaptureScript(config: {
   bridgeUrl: string;
   fps: number;
   bitrate: number;
+  gopFrames: number;
 }): string {
   // Inject configuration variables into the script window object
   const preamble = `
     window.__RTMP_BRIDGE_URL__ = ${JSON.stringify(config.bridgeUrl)};
     window.__TARGET_FPS__ = ${config.fps};
     window.__VIDEO_BITRATE__ = ${config.bitrate};
+    window.__TARGET_GOP_FRAMES__ = ${config.gopFrames};
   `;
   return preamble + WEBCODECS_CAPTURE_SCRIPT;
 }
+
+/**
+ * WebCodecs capture variant that uses Playwright page.exposeFunction() instead
+ * of WebSocket to send H.264 NAL units from the browser to Node. This bypasses
+ * the Bun/ws WebSocket handshake timeout issue on headless Linux.
+ *
+ * The browser calls window.__streamNALU(base64) which is a direct IPC channel
+ * through Playwright's CDP bindings — no network stack involved.
+ */
+export const WEBCODECS_EXPOSED_CAPTURE_SCRIPT = `
+(function() {
+  if (window.__captureControl__) {
+    try {
+      const s = window.__captureControl__.getStatus();
+      if (s && s.recording) {
+        console.log('[WebCodecs/Exposed] Already active, skipping re-injection');
+        return;
+      }
+    } catch(e) {}
+  }
+
+  const TARGET_FPS = window.__TARGET_FPS__ || 30;
+  const VIDEO_BITRATE = window.__VIDEO_BITRATE__ || 6000000;
+  const TARGET_GOP_FRAMES = window.__TARGET_GOP_FRAMES__ || Math.max(1, TARGET_FPS * 2);
+
+  if (typeof window.__streamNALU !== 'function') {
+    console.error('[WebCodecs/Exposed] window.__streamNALU not exposed — exposeFunction() must be called first');
+    return;
+  }
+
+  console.log('[WebCodecs/Exposed] Starting direct Playwright bridge capture...');
+  console.log('[WebCodecs/Exposed] Target:', TARGET_FPS, 'fps @', VIDEO_BITRATE, 'bps');
+
+  const canvas = document.querySelector('canvas');
+  if (!canvas) {
+    console.error('[WebCodecs/Exposed] No canvas element found!');
+    return;
+  }
+
+  console.log('[WebCodecs/Exposed] Found canvas:', canvas.width, 'x', canvas.height);
+
+  let stream = null;
+  let encoder = null;
+  let processor = null;
+  let frameReader = null;
+
+  let chunkCount = 0;
+  let bytesSent = 0;
+  let startTime = 0;
+  let lastFrameTime = 0;
+  let stopped = false;
+
+  let captureFps = 0;
+  let frameCountForFps = 0;
+  let lastFpsCalcTime = Date.now();
+
+  // Batch small NALUs to reduce IPC overhead: accumulate up to ~32KB or 16ms
+  let pendingBuffer = null;
+  let pendingSize = 0;
+  let flushTimer = null;
+  const BATCH_THRESHOLD = 32768;
+  const BATCH_FLUSH_MS = 16;
+
+  function flushPending() {
+    if (pendingBuffer && pendingSize > 0) {
+      const toSend = new Uint8Array(pendingBuffer.buffer, 0, pendingSize);
+      // Convert to base64 for exposeFunction (binary not supported)
+      const base64 = btoa(String.fromCharCode.apply(null, toSend));
+      window.__streamNALU(base64).catch(() => {});
+    }
+    pendingBuffer = null;
+    pendingSize = 0;
+    if (flushTimer) {
+      clearTimeout(flushTimer);
+      flushTimer = null;
+    }
+  }
+
+  function sendNALU(buffer) {
+    const data = new Uint8Array(buffer);
+    bytesSent += data.length;
+    chunkCount++;
+    frameCountForFps++;
+    lastFrameTime = Date.now();
+
+    const now = Date.now();
+    if (now - lastFpsCalcTime >= 1000) {
+      captureFps = frameCountForFps;
+      frameCountForFps = 0;
+      lastFpsCalcTime = now;
+    }
+
+    // For large chunks (keyframes), send immediately
+    if (data.length > BATCH_THRESHOLD) {
+      flushPending();
+      const base64 = btoa(String.fromCharCode.apply(null, data));
+      window.__streamNALU(base64).catch(() => {});
+      return;
+    }
+
+    // Accumulate small chunks
+    if (!pendingBuffer || pendingSize + data.length > 65536) {
+      flushPending();
+      pendingBuffer = new Uint8Array(65536);
+      pendingSize = 0;
+    }
+    pendingBuffer.set(data, pendingSize);
+    pendingSize += data.length;
+
+    if (pendingSize >= BATCH_THRESHOLD) {
+      flushPending();
+    } else if (!flushTimer) {
+      flushTimer = setTimeout(flushPending, BATCH_FLUSH_MS);
+    }
+  }
+
+  async function startEncoding() {
+    if (encoder && encoder.state !== 'closed') {
+      console.warn('[WebCodecs/Exposed] Encoder already active');
+      return;
+    }
+
+    if (!stream) {
+      try {
+        stream = canvas.captureStream(TARGET_FPS);
+        console.log('[WebCodecs/Exposed] Created canvas stream at', TARGET_FPS, 'fps');
+      } catch (err) {
+        console.error('[WebCodecs/Exposed] Failed to capture canvas stream:', err);
+        return;
+      }
+    }
+
+    const videoTrack = stream.getVideoTracks()[0];
+    if (!videoTrack) {
+      console.error('[WebCodecs/Exposed] No video track in stream!');
+      return;
+    }
+
+    encoder = new VideoEncoder({
+      output: (chunk) => {
+        if (stopped) return;
+        const buffer = new ArrayBuffer(chunk.byteLength);
+        chunk.copyTo(buffer);
+        sendNALU(buffer);
+      },
+      error: (e) => {
+        console.error('[WebCodecs/Exposed] VideoEncoder error:', e);
+      }
+    });
+
+    const encoderCandidates = [
+      {
+        codec: 'avc1.64002A', // H.264 High Profile, Level 4.2 (1080p60)
+        width: canvas.width,
+        height: canvas.height,
+        bitrate: VIDEO_BITRATE,
+        bitrateMode: 'constant',
+        framerate: TARGET_FPS,
+        hardwareAcceleration: 'prefer-hardware',
+        latencyMode: 'realtime',
+        avc: { format: 'annexb' }
+      },
+      {
+        codec: 'avc1.64002A',
+        width: canvas.width,
+        height: canvas.height,
+        bitrate: VIDEO_BITRATE,
+        bitrateMode: 'variable',
+        framerate: TARGET_FPS,
+        hardwareAcceleration: 'prefer-hardware',
+        latencyMode: 'realtime',
+        avc: { format: 'annexb' }
+      },
+      {
+        codec: 'avc1.640028', // H.264 High Profile, Level 4.0 (1080p30)
+        width: canvas.width,
+        height: canvas.height,
+        bitrate: VIDEO_BITRATE,
+        bitrateMode: 'constant',
+        framerate: TARGET_FPS,
+        hardwareAcceleration: 'prefer-hardware',
+        latencyMode: 'realtime',
+        avc: { format: 'annexb' }
+      },
+      {
+        codec: 'avc1.640028',
+        width: canvas.width,
+        height: canvas.height,
+        bitrate: VIDEO_BITRATE,
+        bitrateMode: 'variable',
+        framerate: TARGET_FPS,
+        hardwareAcceleration: 'prefer-hardware',
+        latencyMode: 'realtime',
+        avc: { format: 'annexb' }
+      },
+      {
+        codec: 'avc1.64001F',
+        width: canvas.width,
+        height: canvas.height,
+        bitrate: VIDEO_BITRATE,
+        bitrateMode: 'constant',
+        framerate: TARGET_FPS,
+        hardwareAcceleration: 'prefer-hardware',
+        latencyMode: 'realtime',
+        avc: { format: 'annexb' }
+      },
+      {
+        codec: 'avc1.64001F',
+        width: canvas.width,
+        height: canvas.height,
+        bitrate: VIDEO_BITRATE,
+        bitrateMode: 'variable',
+        framerate: TARGET_FPS,
+        hardwareAcceleration: 'prefer-hardware',
+        latencyMode: 'realtime',
+        avc: { format: 'annexb' }
+      },
+      {
+        codec: 'avc1.42E01F',
+        width: canvas.width,
+        height: canvas.height,
+        bitrate: VIDEO_BITRATE,
+        bitrateMode: 'constant',
+        framerate: TARGET_FPS,
+        hardwareAcceleration: 'prefer-hardware',
+        latencyMode: 'realtime',
+        avc: { format: 'annexb' }
+      },
+      {
+        codec: 'avc1.42E01F',
+        width: canvas.width,
+        height: canvas.height,
+        bitrate: VIDEO_BITRATE,
+        framerate: TARGET_FPS,
+        latencyMode: 'realtime',
+        avc: { format: 'annexb' }
+      }
+    ];
+
+    let configured = false;
+    for (const candidate of encoderCandidates) {
+      try {
+        const support = await VideoEncoder.isConfigSupported(candidate);
+        if (!support.supported) {
+          continue;
+        }
+        encoder.configure(support.config);
+        console.log('[WebCodecs/Exposed] Encoder configured:', JSON.stringify(support.config));
+        configured = true;
+        break;
+      } catch(e) {
+        console.warn('[WebCodecs/Exposed] Candidate config failed:', JSON.stringify(candidate), e);
+      }
+    }
+    if (!configured) {
+      console.error('[WebCodecs/Exposed] No supported encoder configuration for target stream quality');
+      return;
+    }
+
+    startTime = Date.now();
+
+    try {
+      processor = new MediaStreamTrackProcessor({ track: videoTrack });
+      frameReader = processor.readable.getReader();
+
+      const readFrame = async () => {
+        if (!encoder || encoder.state === 'closed' || stopped) return;
+
+        try {
+          const { done, value: frame } = await frameReader.read();
+          if (done) {
+            console.log('[WebCodecs/Exposed] Track ended');
+            return;
+          }
+
+          if (encoder.encodeQueueSize > 5) {
+            frame.close();
+          } else {
+            const keyFrame = (chunkCount % TARGET_GOP_FRAMES) === 0;
+            encoder.encode(frame, { keyFrame });
+            frame.close();
+          }
+
+          readFrame();
+        } catch (e) {
+          console.error('[WebCodecs/Exposed] Frame read error:', e);
+        }
+      };
+
+      readFrame();
+      console.log('[WebCodecs/Exposed] Hardware encoding loop started');
+    } catch(e) {
+      console.error('[WebCodecs/Exposed] Failed to start frame processor:', e);
+    }
+  }
+
+  function stopEncoding() {
+    if (frameReader) {
+      frameReader.cancel();
+      frameReader = null;
+    }
+    if (encoder && encoder.state !== 'closed') {
+      encoder.close();
+    }
+    encoder = null;
+    flushPending();
+  }
+
+  function stop() {
+    console.log('[WebCodecs/Exposed] Stopping...');
+    stopped = true;
+    stopEncoding();
+    if (stream) {
+      stream.getTracks().forEach(track => track.stop());
+      stream = null;
+    }
+  }
+
+  function getStatus() {
+    return {
+      recording: encoder && encoder.state === 'configured',
+      wsConnected: true, // Always "connected" since we use exposeFunction
+      chunkCount,
+      bytesSent,
+      uptime: startTime > 0 ? Date.now() - startTime : 0,
+      lastChunkAt: lastFrameTime > 0 ? lastFrameTime : null,
+      lastChunkAgeMs: lastFrameTime > 0 ? Date.now() - lastFrameTime : null,
+      lastChunkMs: lastFrameTime > 0 ? Date.now() - lastFrameTime : 0,
+      captureFps,
+      encodeQueue: encoder ? encoder.encodeQueueSize : 0
+    };
+  }
+
+  window.__captureControl__ = { stop, getStatus };
+
+  startEncoding();
+})();
+`;
+
+export function generateWebCodecsExposedCaptureScript(config: {
+  fps: number;
+  bitrate: number;
+  gopFrames: number;
+}): string {
+  const preamble = `
+    window.__TARGET_FPS__ = ${config.fps};
+    window.__VIDEO_BITRATE__ = ${config.bitrate};
+    window.__TARGET_GOP_FRAMES__ = ${config.gopFrames};
+  `;
+  return preamble + WEBCODECS_EXPOSED_CAPTURE_SCRIPT;
+}
diff --git a/packages/server/src/streaming/browser-capture.ts b/packages/server/src/streaming/browser-capture.ts
index c8c3db1bb..3d5b2ca46 100644
--- a/packages/server/src/streaming/browser-capture.ts
+++ b/packages/server/src/streaming/browser-capture.ts
@@ -281,7 +281,9 @@ export const CAPTURE_SCRIPT = `
           uptime: Date.now() - window.__captureStatus__.startTime,
           chunkCount,
           bytesSent,
-          lastChunkMs: Date.now() - lastChunkAt,
+          lastChunkAt: lastChunkAt > 0 ? lastChunkAt : null,
+          lastChunkAgeMs: lastChunkAt > 0 ? Date.now() - lastChunkAt : null,
+          lastChunkMs: lastChunkAt > 0 ? Date.now() - lastChunkAt : null,
           wsBufferedAmount: ws?.bufferedAmount || 0,
           captureFps
         })
diff --git a/packages/server/src/streaming/captureBrowserPolicy.ts b/packages/server/src/streaming/captureBrowserPolicy.ts
index cf67f3fcf..e638e16db 100644
--- a/packages/server/src/streaming/captureBrowserPolicy.ts
+++ b/packages/server/src/streaming/captureBrowserPolicy.ts
@@ -3,6 +3,7 @@ type CaptureReadinessDiagnostics = {
   hasStreamingBootUi: boolean;
   hasCriticalErrorUi: boolean;
   readyFlag: boolean;
+  bootDiagnostics?: unknown;
 };
 
 export type CaptureRendererHealthSnapshot = {
@@ -15,6 +16,14 @@ export function buildDefaultCaptureLaunchArgs(params: {
   angleBackend: string;
   featureFlags: string;
   disableSandbox?: boolean;
+  /**
+   * When set, pins the Chromium window to exactly these dimensions at the
+   * top-left of the display (via --kiosk + --window-size + --window-position).
+   * This is required by the x11_nvenc capture mode so FFmpeg's x11grab reads
+   * the canvas region exactly and not stray Chromium chrome or surrounding
+   * screen pixels.
+   */
+  fullScreenPin?: { width: number; height: number };
 }): string[] {
   return [
     "--use-gl=angle",
@@ -31,6 +40,23 @@ export function buildDefaultCaptureLaunchArgs(params: {
     "--disable-backgrounding-occluded-windows",
     "--disable-renderer-backgrounding",
     "--disable-hang-monitor",
+    ...(params.fullScreenPin
+      ? [
+          "--kiosk",
+          `--window-size=${params.fullScreenPin.width},${params.fullScreenPin.height}`,
+          "--window-position=0,0",
+          "--hide-scrollbars",
+          "--disable-infobars",
+        ]
+      : []),
+    // NOTE: --user-data-dir is NOT passed here because Playwright
+    // requires launchPersistentContext() for that. IndexedDB persistence
+    // across Tier-3 browser restarts is a future improvement.
+    // NOTE: --disable-frame-rate-limit was tested and regressed the
+    // pipeline (353 dropped frames, encoder stall). The Xvfb 60Hz
+    // modeline applied in stream-to-rtmp.ts startup is the correct fix
+    // for the compositor rate — it keeps Chrome V-sync locked to 60Hz
+    // without overwhelming the CDP screencast/FFmpeg pipeline.
   ];
 }
 
diff --git a/packages/server/src/streaming/cloudflare-authority.ts b/packages/server/src/streaming/cloudflare-authority.ts
new file mode 100644
index 000000000..d7f57532d
--- /dev/null
+++ b/packages/server/src/streaming/cloudflare-authority.ts
@@ -0,0 +1,575 @@
+import { createHash, timingSafeEqual } from "node:crypto";
+import { eq } from "drizzle-orm";
+import type { IncomingHttpHeaders } from "node:http";
+import type { DatabaseSystem } from "../systems/DatabaseSystem/index.js";
+import { storage } from "../database/schema.js";
+import type {
+  StreamCanonicalProvider,
+  StreamManifestStatus,
+} from "./delivery-config.js";
+
+type StorageDb = ReturnType<DatabaseSystem["getDb"]>;
+
+export const CANONICAL_PROVIDER_STATE_STORAGE_KEY =
+  "streaming:canonical-provider-state";
+export const CLOUDFLARE_LIFECYCLE_STORAGE_KEY =
+  "streaming:cloudflare:lifecycle";
+export const CLOUDFLARE_LAST_WEBHOOK_STORAGE_KEY =
+  "streaming:cloudflare:last-webhook";
+export const CLOUDFLARE_LAST_LIFECYCLE_POLL_STORAGE_KEY =
+  "streaming:cloudflare:last-lifecycle-poll";
+export const CLOUDFLARE_LAST_PLAYBACK_PROBE_STORAGE_KEY =
+  "streaming:cloudflare:last-playback-probe";
+export const CLOUDFLARE_RECONCILIATION_STORAGE_KEY =
+  "streaming:cloudflare:reconciliation";
+
+export type PersistedCanonicalProviderState = {
+  activeProvider: StreamCanonicalProvider | null;
+  primaryHealthySince: number | null;
+  updatedAt: number;
+};
+
+export type PersistedCloudflareLifecycleState = {
+  eventType: string | null;
+  eventName: string | null;
+  liveInputId: string | null;
+  videoId: string | null;
+  status: "connected" | "disconnected" | "errored" | "unknown";
+  errorCode: string | null;
+  errorMessage: string | null;
+  occurredAt: number | null;
+  receivedAt: number;
+};
+
+export type PersistedCloudflareWebhookState = {
+  eventType: string | null;
+  eventName: string | null;
+  liveInputId: string | null;
+  videoId: string | null;
+  occurredAt: number | null;
+  receivedAt: number;
+};
+
+export type PersistedCloudflareLifecyclePollState = {
+  liveInputId: string | null;
+  videoUid: string | null;
+  status: "connected" | "disconnected" | "errored" | "unknown";
+  providerLive: boolean;
+  statusSummary: string | null;
+  playbackUrl: string | null;
+  occurredAt: number | null;
+  receivedAt: number;
+};
+
+export type PersistedCloudflarePlaybackProbeState = {
+  playbackUrl: string | null;
+  ready: boolean;
+  manifestStatus: StreamManifestStatus;
+  statusCode: number | null;
+  lastError: string | null;
+  updatedAt: number;
+};
+
+export type PersistedCloudflareReconciliationState = {
+  revision: number;
+  decision: "ready" | "blocked";
+  reason:
+    | "source_unready"
+    | "provider_not_live"
+    | "probe_unready"
+    | "authority_stale"
+    | null;
+  updatedAt: number;
+  liveInputId: string | null;
+  videoUid: string | null;
+  lifecycleStatus: string | null;
+  providerLive: boolean;
+  playbackUrl: string | null;
+  playbackProbeReady: boolean;
+  playbackProbeStatusCode: number | null;
+  playbackManifestStatus: StreamManifestStatus;
+};
+
+export type PersistedStreamingAuthorityState = {
+  canonicalProviderState: PersistedCanonicalProviderState | null;
+  cloudflareLifecycle: PersistedCloudflareLifecycleState | null;
+  cloudflareLastWebhook: PersistedCloudflareWebhookState | null;
+  cloudflareLifecyclePoll: PersistedCloudflareLifecyclePollState | null;
+  cloudflarePlaybackProbe: PersistedCloudflarePlaybackProbeState | null;
+  cloudflareReconciliation: PersistedCloudflareReconciliationState | null;
+};
+
+export type SummarizedCloudflareLiveWebhook = {
+  webhook: PersistedCloudflareWebhookState;
+  lifecycle: PersistedCloudflareLifecycleState;
+};
+
+function asRecord(value: unknown): Record<string, unknown> | null {
+  return value && typeof value === "object" && !Array.isArray(value)
+    ? (value as Record<string, unknown>)
+    : null;
+}
+
+function readFirstString(
+  value: Record<string, unknown> | null,
+  keys: string[],
+): string | null {
+  if (!value) return null;
+  for (const key of keys) {
+    const candidate = value[key];
+    if (typeof candidate === "string" && candidate.trim().length > 0) {
+      return candidate.trim();
+    }
+  }
+  return null;
+}
+
+function readNestedString(
+  payload: Record<string, unknown> | null,
+  candidates: string[][],
+): string | null {
+  for (const path of candidates) {
+    let cursor: unknown = payload;
+    for (const segment of path) {
+      cursor = asRecord(cursor)?.[segment];
+    }
+    if (typeof cursor === "string" && cursor.trim().length > 0) {
+      return cursor.trim();
+    }
+  }
+  return null;
+}
+
+function readNestedTimestamp(
+  payload: Record<string, unknown> | null,
+  candidates: string[][],
+): number | null {
+  for (const path of candidates) {
+    let cursor: unknown = payload;
+    for (const segment of path) {
+      cursor = asRecord(cursor)?.[segment];
+    }
+    if (typeof cursor === "number" && Number.isFinite(cursor)) {
+      return cursor;
+    }
+    if (typeof cursor === "string" && cursor.trim().length > 0) {
+      const numeric = Number(cursor);
+      if (Number.isFinite(numeric)) {
+        return numeric;
+      }
+      const parsed = Date.parse(cursor);
+      if (Number.isFinite(parsed)) {
+        return parsed;
+      }
+    }
+  }
+  return null;
+}
+
+function parseStoredJson<T>(rawValue: string | null | undefined): T | null {
+  if (!rawValue) return null;
+  try {
+    return JSON.parse(rawValue) as T;
+  } catch (error) {
+    console.warn(
+      `[CloudflareAuthority] Failed to parse persisted JSON: ${error instanceof Error ? error.message : String(error)}`,
+    );
+    return null;
+  }
+}
+
+async function readStoredJson<T>(
+  db: StorageDb | null | undefined,
+  key: string,
+): Promise<T | null> {
+  if (!db) return null;
+  const rows = await db
+    .select()
+    .from(storage)
+    .where(eq(storage.key, key))
+    .limit(1);
+  return parseStoredJson<T>(rows[0]?.value);
+}
+
+async function writeStoredJson(
+  db: StorageDb | null | undefined,
+  key: string,
+  value: unknown,
+): Promise<void> {
+  if (!db) return;
+  const now = Date.now();
+  const payload = JSON.stringify(value);
+  await db
+    .insert(storage)
+    .values({
+      key,
+      value: payload,
+      updatedAt: now,
+    })
+    .onConflictDoUpdate({
+      target: storage.key,
+      set: {
+        value: payload,
+        updatedAt: now,
+      },
+    });
+}
+
+function deriveLifecycleStatus(eventType: string | null) {
+  const normalized = eventType?.trim().toLowerCase() ?? "";
+  if (normalized.includes("disconnected")) {
+    return "disconnected" as const;
+  }
+  if (normalized.includes("connected")) {
+    return "connected" as const;
+  }
+  if (normalized.includes("error")) {
+    return "errored" as const;
+  }
+  return "unknown" as const;
+}
+
+function isFreshTimestamp(
+  updatedAt: number | null | undefined,
+  nowMs: number,
+  freshnessMs: number,
+): boolean {
+  return (
+    typeof updatedAt === "number" &&
+    Number.isFinite(updatedAt) &&
+    Math.max(0, nowMs - updatedAt) <= freshnessMs
+  );
+}
+
+function stableJsonValue(value: unknown): unknown {
+  if (Array.isArray(value)) {
+    return value.map((entry) => stableJsonValue(entry));
+  }
+  if (value && typeof value === "object") {
+    return Object.fromEntries(
+      Object.entries(value)
+        .sort(([left], [right]) => left.localeCompare(right))
+        .map(([key, entry]) => [key, stableJsonValue(entry)]),
+    );
+  }
+  return value;
+}
+
+function buildReconciliationComparable(
+  state: Omit<PersistedCloudflareReconciliationState, "revision" | "updatedAt">,
+): string {
+  return JSON.stringify(stableJsonValue(state));
+}
+
+type CloudflareProviderEvidence = {
+  liveInputId: string | null;
+  videoUid: string | null;
+  lifecycleStatus: string | null;
+  providerLive: boolean;
+  updatedAt: number;
+};
+
+function resolveCloudflareProviderEvidence(params: {
+  lifecycle: PersistedCloudflareLifecycleState | null;
+  lifecyclePoll: PersistedCloudflareLifecyclePollState | null;
+  nowMs: number;
+  freshnessMs: number;
+}): CloudflareProviderEvidence | null {
+  const candidates: CloudflareProviderEvidence[] = [];
+
+  if (
+    params.lifecycle &&
+    isFreshTimestamp(
+      params.lifecycle.receivedAt,
+      params.nowMs,
+      params.freshnessMs,
+    )
+  ) {
+    candidates.push({
+      liveInputId: params.lifecycle.liveInputId,
+      videoUid: params.lifecycle.videoId,
+      lifecycleStatus: params.lifecycle.status,
+      providerLive: params.lifecycle.status === "connected",
+      updatedAt: params.lifecycle.receivedAt,
+    });
+  }
+
+  if (
+    params.lifecyclePoll &&
+    isFreshTimestamp(
+      params.lifecyclePoll.receivedAt,
+      params.nowMs,
+      params.freshnessMs,
+    )
+  ) {
+    candidates.push({
+      liveInputId: params.lifecyclePoll.liveInputId,
+      videoUid: params.lifecyclePoll.videoUid,
+      lifecycleStatus: params.lifecyclePoll.status,
+      providerLive: params.lifecyclePoll.providerLive,
+      updatedAt: params.lifecyclePoll.receivedAt,
+    });
+  }
+
+  if (candidates.length === 0) {
+    return null;
+  }
+
+  return candidates.sort((left, right) => right.updatedAt - left.updatedAt)[0]!;
+}
+
+export function verifyCloudflareWebhookSecret(
+  headers: IncomingHttpHeaders | Record<string, unknown>,
+  secret: string | null | undefined,
+): boolean {
+  const expectedSecret = secret?.trim() ?? "";
+  const rawHeader =
+    headers["cf-webhook-auth"] ??
+    Object.entries(headers).find(
+      ([headerName]) => headerName.toLowerCase() === "cf-webhook-auth",
+    )?.[1];
+  const receivedSecret = Array.isArray(rawHeader) ? rawHeader[0] : rawHeader;
+  const normalizedReceived =
+    typeof receivedSecret === "string" ? receivedSecret.trim() : "";
+  const left = createHash("sha256").update(normalizedReceived).digest();
+  const right = createHash("sha256").update(expectedSecret).digest();
+  return Boolean(
+    expectedSecret && normalizedReceived && timingSafeEqual(left, right),
+  );
+}
+
+export function summarizeCloudflareLiveWebhook(params: {
+  payload: unknown;
+  receivedAt?: number;
+}): SummarizedCloudflareLiveWebhook {
+  const payload = asRecord(params.payload);
+  const event = asRecord(payload?.event);
+  const receivedAt = params.receivedAt ?? Date.now();
+  const eventType =
+    readNestedString(payload, [
+      ["alert_type"],
+      ["event", "type"],
+      ["type"],
+      ["eventType"],
+    ]) ?? null;
+  const eventName =
+    readNestedString(payload, [["name"], ["event", "name"]]) ?? eventType;
+  const liveInputId =
+    readNestedString(payload, [
+      ["event", "input_id"],
+      ["event", "input_uid"],
+      ["event", "live_input_id"],
+      ["event", "live_input_uid"],
+      ["input_id"],
+      ["input_uid"],
+      ["live_input_id"],
+      ["live_input_uid"],
+    ]) ?? null;
+  const videoId = readNestedString(payload, [
+    ["event", "video_id"],
+    ["event", "video_uid"],
+    ["video_id"],
+    ["video_uid"],
+  ]);
+  const occurredAt = readNestedTimestamp(payload, [
+    ["event", "timestamp"],
+    ["event", "occurred_at"],
+    ["timestamp"],
+    ["occurred_at"],
+  ]);
+  const errorCode =
+    readFirstString(event, ["error_code", "code"]) ??
+    readFirstString(payload, ["error_code", "code"]);
+  const errorMessage =
+    readFirstString(event, ["error_message", "message"]) ??
+    readFirstString(payload, ["error_message", "message"]);
+
+  const webhook: PersistedCloudflareWebhookState = {
+    eventType,
+    eventName,
+    liveInputId,
+    videoId,
+    occurredAt,
+    receivedAt,
+  };
+
+  return {
+    webhook,
+    lifecycle: {
+      ...webhook,
+      status: deriveLifecycleStatus(eventType),
+      errorCode,
+      errorMessage,
+    },
+  };
+}
+
+export function reconcileCloudflareAuthority(params: {
+  sourceRuntimeReady: boolean;
+  lifecycle: PersistedCloudflareLifecycleState | null;
+  lifecyclePoll: PersistedCloudflareLifecyclePollState | null;
+  playbackProbe: PersistedCloudflarePlaybackProbeState | null;
+  previous: PersistedCloudflareReconciliationState | null;
+  nowMs?: number;
+  freshnessMs: number;
+  playbackUrl?: string | null;
+}): PersistedCloudflareReconciliationState {
+  const nowMs = params.nowMs ?? Date.now();
+  const providerEvidence = resolveCloudflareProviderEvidence({
+    lifecycle: params.lifecycle,
+    lifecyclePoll: params.lifecyclePoll,
+    nowMs,
+    freshnessMs: params.freshnessMs,
+  });
+  const playbackProbeFresh =
+    params.playbackProbe &&
+    isFreshTimestamp(params.playbackProbe.updatedAt, nowMs, params.freshnessMs)
+      ? params.playbackProbe
+      : null;
+  const providerLive = providerEvidence?.providerLive === true;
+  const playbackProbeReady = playbackProbeFresh?.ready === true;
+
+  let reason: PersistedCloudflareReconciliationState["reason"] = null;
+  if (!params.sourceRuntimeReady) {
+    reason = "source_unready";
+  } else if (providerEvidence && !providerLive) {
+    reason = "provider_not_live";
+  } else if (
+    providerEvidence &&
+    providerLive &&
+    playbackProbeFresh &&
+    !playbackProbeReady
+  ) {
+    reason = "probe_unready";
+  } else if (!providerEvidence || !playbackProbeFresh) {
+    reason = "authority_stale";
+  }
+
+  const comparableState = {
+    decision: reason == null ? "ready" : "blocked",
+    reason,
+    liveInputId:
+      providerEvidence?.liveInputId ?? params.lifecycle?.liveInputId ?? null,
+    videoUid: providerEvidence?.videoUid ?? params.lifecycle?.videoId ?? null,
+    lifecycleStatus: providerEvidence?.lifecycleStatus ?? null,
+    providerLive,
+    playbackUrl:
+      playbackProbeFresh?.playbackUrl ??
+      params.playbackUrl?.trim() ??
+      params.playbackProbe?.playbackUrl ??
+      null,
+    playbackProbeReady,
+    playbackProbeStatusCode: playbackProbeFresh?.statusCode ?? null,
+    playbackManifestStatus:
+      playbackProbeFresh?.manifestStatus ??
+      ("unknown" satisfies StreamManifestStatus),
+  } satisfies Omit<
+    PersistedCloudflareReconciliationState,
+    "revision" | "updatedAt"
+  >;
+
+  const previousComparable =
+    params.previous == null
+      ? null
+      : buildReconciliationComparable({
+          decision: params.previous.decision,
+          reason: params.previous.reason,
+          liveInputId: params.previous.liveInputId,
+          videoUid: params.previous.videoUid,
+          lifecycleStatus: params.previous.lifecycleStatus,
+          providerLive: params.previous.providerLive,
+          playbackUrl: params.previous.playbackUrl,
+          playbackProbeReady: params.previous.playbackProbeReady,
+          playbackProbeStatusCode: params.previous.playbackProbeStatusCode,
+          playbackManifestStatus: params.previous.playbackManifestStatus,
+        });
+  const nextComparable = buildReconciliationComparable(comparableState);
+
+  return {
+    revision:
+      previousComparable === nextComparable
+        ? (params.previous?.revision ?? 1)
+        : (params.previous?.revision ?? 0) + 1,
+    updatedAt: nowMs,
+    ...comparableState,
+  };
+}
+
+export async function loadPersistedStreamingAuthorityState(
+  db: StorageDb | null | undefined,
+): Promise<PersistedStreamingAuthorityState> {
+  return {
+    canonicalProviderState:
+      await readStoredJson<PersistedCanonicalProviderState>(
+        db,
+        CANONICAL_PROVIDER_STATE_STORAGE_KEY,
+      ),
+    cloudflareLifecycle:
+      await readStoredJson<PersistedCloudflareLifecycleState>(
+        db,
+        CLOUDFLARE_LIFECYCLE_STORAGE_KEY,
+      ),
+    cloudflareLastWebhook:
+      await readStoredJson<PersistedCloudflareWebhookState>(
+        db,
+        CLOUDFLARE_LAST_WEBHOOK_STORAGE_KEY,
+      ),
+    cloudflareLifecyclePoll:
+      await readStoredJson<PersistedCloudflareLifecyclePollState>(
+        db,
+        CLOUDFLARE_LAST_LIFECYCLE_POLL_STORAGE_KEY,
+      ),
+    cloudflarePlaybackProbe:
+      await readStoredJson<PersistedCloudflarePlaybackProbeState>(
+        db,
+        CLOUDFLARE_LAST_PLAYBACK_PROBE_STORAGE_KEY,
+      ),
+    cloudflareReconciliation:
+      await readStoredJson<PersistedCloudflareReconciliationState>(
+        db,
+        CLOUDFLARE_RECONCILIATION_STORAGE_KEY,
+      ),
+  };
+}
+
+export async function persistCanonicalProviderState(
+  db: StorageDb | null | undefined,
+  state: PersistedCanonicalProviderState,
+): Promise<void> {
+  await writeStoredJson(db, CANONICAL_PROVIDER_STATE_STORAGE_KEY, state);
+}
+
+export async function persistCloudflareLifecycleState(
+  db: StorageDb | null | undefined,
+  state: PersistedCloudflareLifecycleState,
+): Promise<void> {
+  await writeStoredJson(db, CLOUDFLARE_LIFECYCLE_STORAGE_KEY, state);
+}
+
+export async function persistCloudflareWebhookState(
+  db: StorageDb | null | undefined,
+  state: PersistedCloudflareWebhookState,
+): Promise<void> {
+  await writeStoredJson(db, CLOUDFLARE_LAST_WEBHOOK_STORAGE_KEY, state);
+}
+
+export async function persistCloudflareLifecyclePollState(
+  db: StorageDb | null | undefined,
+  state: PersistedCloudflareLifecyclePollState,
+): Promise<void> {
+  await writeStoredJson(db, CLOUDFLARE_LAST_LIFECYCLE_POLL_STORAGE_KEY, state);
+}
+
+export async function persistCloudflarePlaybackProbeState(
+  db: StorageDb | null | undefined,
+  state: PersistedCloudflarePlaybackProbeState,
+): Promise<void> {
+  await writeStoredJson(db, CLOUDFLARE_LAST_PLAYBACK_PROBE_STORAGE_KEY, state);
+}
+
+export async function persistCloudflareReconciliationState(
+  db: StorageDb | null | undefined,
+  state: PersistedCloudflareReconciliationState,
+): Promise<void> {
+  await writeStoredJson(db, CLOUDFLARE_RECONCILIATION_STORAGE_KEY, state);
+}
diff --git a/packages/server/src/streaming/delivery-config.ts b/packages/server/src/streaming/delivery-config.ts
new file mode 100644
index 000000000..dd1823fb7
--- /dev/null
+++ b/packages/server/src/streaming/delivery-config.ts
@@ -0,0 +1,302 @@
+export type StreamDeliveryMode = "self_hls" | "external_hls";
+export type StreamDestinationRole = "canonical" | "fallback" | "mirror";
+export type StreamDestinationProvider =
+  | "cloudflare_stream"
+  | "self_hls"
+  | "twitch"
+  | "kick"
+  | "youtube"
+  | "custom";
+export type StreamCanonicalProvider = "cloudflare_stream" | "self_hls";
+export type StreamDeliveryTransport =
+  | "llhls"
+  | "hls"
+  | "rtmps"
+  | "srt"
+  | "unknown";
+export type StreamManifestStatus = "ok" | "stale" | "missing" | "unknown";
+export type StreamPublicReadiness = {
+  ready: boolean;
+  reason: string | null;
+  updatedAt: number | null;
+};
+export type StreamDestinationState = {
+  id: string;
+  name: string;
+  role: StreamDestinationRole;
+  provider: StreamDestinationProvider;
+  transport: StreamDeliveryTransport;
+  playbackUrl: string | null;
+  ingestUrl: string | null;
+  connected: boolean;
+  transportHealthy: boolean;
+  playbackReady: boolean;
+  manifestStatus: StreamManifestStatus;
+  lastError: string | null;
+  updatedAt: number | null;
+};
+export type StreamChannelState = {
+  id: string;
+  mode: "always_on";
+  presentationDelayMs: number;
+  activeDuelId: string | null;
+  activeDuelKey: string | null;
+  canonicalDestinationId: string;
+  fallbackDestinationId: string | null;
+  publicPlaybackUrl: string | null;
+  publicReadiness: StreamPublicReadiness;
+  destinations: StreamDestinationState[];
+};
+
+export type StreamDeliveryInfo = {
+  mode: StreamDeliveryMode;
+  provider: string | null;
+  playbackUrl: string | null;
+  hlsUrl: string | null;
+  llhlsUrl: string | null;
+  ingestUrl: string | null;
+};
+
+export type StreamExternalDeliveryInfo = {
+  provider: string | null;
+  playbackUrl: string | null;
+  hlsUrl: string | null;
+  llhlsUrl: string | null;
+  ingestUrl: string | null;
+};
+
+function isCanonicalProvider(
+  value: StreamDestinationProvider,
+): value is StreamCanonicalProvider {
+  return value === "cloudflare_stream" || value === "self_hls";
+}
+
+function asNonEmptyString(value: string | undefined): string | null {
+  const normalized = value?.trim();
+  return normalized ? normalized : null;
+}
+
+function normalizePrefix(value: string | null): string {
+  if (!value) return "live/";
+  const trimmed = value.trim().replace(/^\/+/, "").replace(/\/+$/, "");
+  return trimmed ? `${trimmed}/` : "live/";
+}
+
+function normalizeDeliveryMode(
+  rawValue: string | undefined,
+  options: {
+    hasExternalPlayback: boolean;
+  },
+): StreamDeliveryMode {
+  const normalized = (rawValue || "").trim().toLowerCase();
+  if (normalized === "external_hls") {
+    return "external_hls";
+  }
+  if (normalized === "self_hls") {
+    return "self_hls";
+  }
+  if (options.hasExternalPlayback) {
+    return "external_hls";
+  }
+  return "self_hls";
+}
+
+export function resolveStreamDeliveryInfo(
+  env: NodeJS.ProcessEnv = process.env,
+): StreamDeliveryInfo {
+  const playbackUrl = asNonEmptyString(env.STREAM_PLAYBACK_URL);
+  const external = resolveExternalStreamDeliveryInfo(env);
+  const hasExternalPlayback = Boolean(external.hlsUrl || external.llhlsUrl);
+  const mode = normalizeDeliveryMode(env.STREAM_DELIVERY_MODE, {
+    hasExternalPlayback,
+  });
+
+  return {
+    mode,
+    provider: mode === "external_hls" ? external.provider : null,
+    playbackUrl:
+      mode === "external_hls"
+        ? external.playbackUrl
+        : (playbackUrl ??
+          (hasExternalPlayback
+            ? null
+            : (external.hlsUrl ?? external.llhlsUrl))),
+    hlsUrl: mode === "external_hls" ? external.hlsUrl : null,
+    llhlsUrl: mode === "external_hls" ? external.llhlsUrl : null,
+    ingestUrl: mode === "external_hls" ? external.ingestUrl : null,
+  };
+}
+
+export function resolveExternalStreamDeliveryInfo(
+  env: NodeJS.ProcessEnv = process.env,
+): StreamExternalDeliveryInfo {
+  const deliveryMode = (env.STREAM_DELIVERY_MODE ?? "").trim().toLowerCase();
+  const allowLegacyFallback = deliveryMode !== "self_hls";
+  const provider =
+    asNonEmptyString(env.STREAM_EXTERNAL_DELIVERY_PROVIDER) ??
+    (allowLegacyFallback
+      ? asNonEmptyString(env.STREAM_DELIVERY_PROVIDER)
+      : null);
+  const hlsUrl =
+    asNonEmptyString(env.STREAM_EXTERNAL_PLAYBACK_HLS_URL) ??
+    (allowLegacyFallback
+      ? asNonEmptyString(env.STREAM_PLAYBACK_HLS_URL)
+      : null);
+  const llhlsUrl =
+    asNonEmptyString(env.STREAM_EXTERNAL_PLAYBACK_LLHLS_URL) ??
+    (allowLegacyFallback
+      ? asNonEmptyString(env.STREAM_PLAYBACK_LLHLS_URL)
+      : null);
+  const ingestUrl =
+    asNonEmptyString(env.STREAM_EXTERNAL_INGEST_RTMPS_URL) ??
+    (allowLegacyFallback
+      ? asNonEmptyString(env.STREAM_INGEST_RTMPS_URL)
+      : null);
+
+  return {
+    provider,
+    playbackUrl: llhlsUrl ?? hlsUrl,
+    hlsUrl,
+    llhlsUrl,
+    ingestUrl,
+  };
+}
+
+export function normalizeStreamDestinationProvider(
+  value: string | null | undefined,
+  name: string | null | undefined = null,
+): StreamDestinationProvider {
+  const normalized = (value || name || "").trim().toLowerCase();
+  if (!normalized) return "custom";
+  if (
+    normalized.includes("cloudflare") ||
+    normalized.includes("cloudflare_stream")
+  ) {
+    return "cloudflare_stream";
+  }
+  if (normalized.includes("self_hls") || normalized.includes("self-hls")) {
+    return "self_hls";
+  }
+  if (normalized.includes("twitch")) {
+    return "twitch";
+  }
+  if (normalized.includes("kick")) {
+    return "kick";
+  }
+  if (normalized.includes("youtube")) {
+    return "youtube";
+  }
+  return "custom";
+}
+
+export function inferStreamDeliveryTransport(params: {
+  playbackUrl?: string | null;
+  ingestUrl?: string | null;
+}): StreamDeliveryTransport {
+  const playbackUrl = params.playbackUrl?.trim().toLowerCase() ?? "";
+  const ingestUrl = params.ingestUrl?.trim().toLowerCase() ?? "";
+  if (playbackUrl.includes("protocol=llhls")) {
+    return "llhls";
+  }
+  if (playbackUrl.endsWith(".m3u8")) {
+    return "hls";
+  }
+  if (ingestUrl.startsWith("srt://")) {
+    return "srt";
+  }
+  if (ingestUrl.startsWith("rtmp://") || ingestUrl.startsWith("rtmps://")) {
+    return "rtmps";
+  }
+  return "unknown";
+}
+
+function slugify(value: string | null | undefined, fallback: string): string {
+  const normalized = (value || "")
+    .trim()
+    .toLowerCase()
+    .replace(/[^a-z0-9]+/g, "-")
+    .replace(/^-+|-+$/g, "");
+  return normalized || fallback;
+}
+
+export function buildStreamDestinationId(params: {
+  role: StreamDestinationRole;
+  provider: StreamDestinationProvider;
+  name?: string | null;
+}): string {
+  const { role, provider, name } = params;
+  if (role === "canonical" && provider === "cloudflare_stream") {
+    return "canonical-cloudflare";
+  }
+  if (role === "fallback" && provider === "self_hls") {
+    return "fallback-self-hls";
+  }
+  if (role === "mirror" && provider === "twitch") {
+    return "mirror-twitch";
+  }
+  if (role === "mirror" && provider === "kick") {
+    return "mirror-kick";
+  }
+  if (role === "mirror" && provider === "youtube") {
+    return "mirror-youtube";
+  }
+  return `${role}-${slugify(name ?? provider, provider)}`;
+}
+
+export function resolveSelfHostedStreamPlaybackUrl(
+  env: NodeJS.ProcessEnv = process.env,
+): string | null {
+  const explicit = asNonEmptyString(env.STREAM_PLAYBACK_URL);
+  if (explicit) {
+    return explicit;
+  }
+
+  const publicUrl = asNonEmptyString(env.HLS_CDN_PUBLIC_URL);
+  if (publicUrl) {
+    const prefix = normalizePrefix(asNonEmptyString(env.HLS_CDN_PREFIX));
+    return `${publicUrl.replace(/\/$/, "")}/${prefix}stream.m3u8`;
+  }
+
+  return "/live/stream.m3u8";
+}
+
+export function resolveStreamPresentationDelayMs(
+  env: NodeJS.ProcessEnv = process.env,
+  mode: StreamDeliveryMode = resolveStreamDeliveryInfo(env).mode,
+): number {
+  const parsed = Number(env.STREAM_PRESENTATION_DELAY_MS);
+  if (Number.isFinite(parsed)) {
+    return Math.max(0, parsed);
+  }
+  return mode === "external_hls" ? 4_000 : 0;
+}
+
+export function resolveStreamCanonicalProviderPriority(
+  env: NodeJS.ProcessEnv = process.env,
+): StreamCanonicalProvider[] {
+  const explicit = asNonEmptyString(env.STREAM_CANONICAL_PROVIDER_PRIORITY);
+  if (explicit) {
+    const parsed = explicit
+      .split(",")
+      .map((value) => normalizeStreamDestinationProvider(value, value))
+      .filter(isCanonicalProvider);
+    if (parsed.length > 0) {
+      return [...new Set(parsed)];
+    }
+  }
+
+  const mode = resolveStreamDeliveryInfo(env).mode;
+  return mode === "external_hls"
+    ? ["cloudflare_stream", "self_hls"]
+    : ["self_hls", "cloudflare_stream"];
+}
+
+export function resolveStreamFailbackSoakMs(
+  env: NodeJS.ProcessEnv = process.env,
+): number {
+  const parsed = Number(env.STREAM_FAILBACK_SOAK_MS);
+  if (!Number.isFinite(parsed)) {
+    return 30_000;
+  }
+  return Math.max(0, parsed);
+}
diff --git a/packages/server/src/streaming/destination-probe.ts b/packages/server/src/streaming/destination-probe.ts
new file mode 100644
index 000000000..122c8451b
--- /dev/null
+++ b/packages/server/src/streaming/destination-probe.ts
@@ -0,0 +1,348 @@
+import type {
+  StreamManifestStatus,
+  StreamPublicReadiness,
+} from "./delivery-config.js";
+import * as dnsPromises from "node:dns/promises";
+import { isIP } from "node:net";
+
+export type StreamPlaybackProbeResult = {
+  playbackUrl: string;
+  ready: boolean;
+  manifestStatus: StreamManifestStatus;
+  statusCode: number | null;
+  lastError: string | null;
+  updatedAt: number;
+};
+
+type PlaybackProbePoller = {
+  snapshot: StreamPlaybackProbeResult | null;
+  refreshPromise: Promise<void> | null;
+  interval: ReturnType<typeof setInterval>;
+  refCount: number;
+};
+
+type PlaybackProbeDependencies = {
+  lookup?: typeof dnsPromises.lookup;
+  fetch?: typeof fetch;
+};
+
+const playbackProbePollers = new Map<string, PlaybackProbePoller>();
+
+function isPrivateIpv4Address(hostname: string): boolean {
+  const parts = hostname.split(".").map((part) => Number.parseInt(part, 10));
+  if (parts.length !== 4 || parts.some((part) => !Number.isInteger(part))) {
+    return false;
+  }
+  const [a, b] = parts;
+  return (
+    a === 0 ||
+    a === 10 ||
+    (a === 100 && b >= 64 && b <= 127) ||
+    a === 127 ||
+    (a === 169 && b === 254) ||
+    (a === 172 && b >= 16 && b <= 31) ||
+    (a === 192 && b === 168) ||
+    (a === 198 && (b === 18 || b === 19))
+  );
+}
+
+function isBlockedPrivateHost(hostname: string): boolean {
+  const normalized = hostname.trim().toLowerCase();
+  if (!normalized) {
+    return true;
+  }
+  if (
+    normalized === "localhost" ||
+    normalized === "localhost.localdomain" ||
+    normalized.endsWith(".local")
+  ) {
+    return true;
+  }
+  const ipVersion = isIP(normalized);
+  if (ipVersion === 4) {
+    return isPrivateIpv4Address(normalized);
+  }
+  if (ipVersion === 6) {
+    if (normalized.startsWith("::ffff:")) {
+      return isPrivateIpv4Address(normalized.slice("::ffff:".length));
+    }
+    return (
+      normalized === "::1" ||
+      normalized.startsWith("fe80:") ||
+      normalized.startsWith("fc") ||
+      normalized.startsWith("fd")
+    );
+  }
+  return false;
+}
+
+function validatePlaybackProbeUrlSyntax(playbackUrl: string): {
+  parsed: URL | null;
+  error: string | null;
+} {
+  let parsed: URL;
+  try {
+    parsed = new URL(playbackUrl);
+  } catch {
+    return {
+      parsed: null,
+      error: "invalid_playback_url",
+    };
+  }
+
+  if (parsed.protocol !== "https:" && parsed.protocol !== "http:") {
+    return {
+      parsed: null,
+      error: "unsupported_playback_protocol",
+    };
+  }
+
+  return {
+    parsed,
+    error: null,
+  };
+}
+
+async function validateResolvedPlaybackProbeHost(
+  parsed: URL,
+  lookup: typeof dnsPromises.lookup = dnsPromises.lookup,
+): Promise<string | null> {
+  const allowPrivateHosts = process.env.NODE_ENV === "development";
+  if (allowPrivateHosts) {
+    return null;
+  }
+
+  if (isBlockedPrivateHost(parsed.hostname)) {
+    return "private_playback_host_blocked";
+  }
+
+  try {
+    const resolvedAddresses = await lookup(parsed.hostname, {
+      all: true,
+      verbatim: true,
+    });
+    if (
+      resolvedAddresses.some((candidate) =>
+        isBlockedPrivateHost(candidate.address),
+      )
+    ) {
+      return "private_playback_host_blocked";
+    }
+  } catch {
+    // Let the normal fetch path report DNS/network failures. This validation
+    // layer is only responsible for fail-closing when the hostname resolves
+    // to a blocked private target.
+  }
+
+  return null;
+}
+
+function classifyProbeResult(params: {
+  statusCode: number | null;
+  lastError: string | null;
+}): Pick<StreamPlaybackProbeResult, "ready" | "manifestStatus" | "lastError"> {
+  if (params.lastError) {
+    return {
+      ready: false,
+      manifestStatus: "unknown",
+      lastError: params.lastError,
+    };
+  }
+
+  if (params.statusCode === 200 || params.statusCode === 206) {
+    return {
+      ready: true,
+      manifestStatus: "ok",
+      lastError: null,
+    };
+  }
+
+  if (params.statusCode === 204 || params.statusCode === 404) {
+    return {
+      ready: false,
+      manifestStatus: "missing",
+      lastError: null,
+    };
+  }
+
+  if (params.statusCode != null && params.statusCode >= 500) {
+    return {
+      ready: false,
+      manifestStatus: "stale",
+      lastError: null,
+    };
+  }
+
+  return {
+    ready: false,
+    manifestStatus: "unknown",
+    lastError: null,
+  };
+}
+
+export async function probePlaybackUrl(
+  playbackUrl: string,
+  timeoutMs = 4_000,
+  dependencies: PlaybackProbeDependencies = {},
+): Promise<StreamPlaybackProbeResult> {
+  const { parsed, error } = validatePlaybackProbeUrlSyntax(playbackUrl);
+  if (error || !parsed) {
+    return {
+      playbackUrl,
+      ready: false,
+      manifestStatus: "unknown",
+      statusCode: null,
+      lastError: error ?? "invalid_playback_url",
+      updatedAt: Date.now(),
+    };
+  }
+
+  const validationError = await validateResolvedPlaybackProbeHost(
+    parsed,
+    dependencies.lookup,
+  );
+  if (validationError) {
+    return {
+      playbackUrl,
+      ready: false,
+      manifestStatus: "unknown",
+      statusCode: null,
+      lastError: validationError,
+      updatedAt: Date.now(),
+    };
+  }
+
+  const controller = new AbortController();
+  const timeoutId = setTimeout(() => controller.abort(), timeoutMs);
+
+  try {
+    const fetchImpl = dependencies.fetch ?? fetch;
+    const response = await fetchImpl(parsed, {
+      method: "GET",
+      cache: "no-store",
+      redirect: "manual",
+      headers: {
+        accept: "application/vnd.apple.mpegurl,text/plain,*/*",
+      },
+      signal: controller.signal,
+    });
+
+    try {
+      await response.body?.cancel();
+    } catch {
+      // Ignore cancellation issues on already-consumed or absent bodies.
+    }
+
+    const classified = classifyProbeResult({
+      statusCode: response.status,
+      lastError: null,
+    });
+    return {
+      playbackUrl,
+      statusCode: response.status,
+      updatedAt: Date.now(),
+      ...classified,
+    };
+  } catch (error) {
+    const message =
+      error instanceof Error ? error.message : "playback_probe_failed";
+    const classified = classifyProbeResult({
+      statusCode: null,
+      lastError: message,
+    });
+    return {
+      playbackUrl,
+      statusCode: null,
+      updatedAt: Date.now(),
+      ...classified,
+    };
+  } finally {
+    clearTimeout(timeoutId);
+  }
+}
+
+async function refreshPlaybackProbePoller(
+  poller: PlaybackProbePoller,
+  playbackUrl: string,
+  timeoutMs: number,
+): Promise<void> {
+  if (poller.refreshPromise) {
+    return poller.refreshPromise;
+  }
+  poller.refreshPromise = probePlaybackUrl(playbackUrl, timeoutMs)
+    .then((snapshot) => {
+      poller.snapshot = snapshot;
+    })
+    .finally(() => {
+      poller.refreshPromise = null;
+    });
+  return poller.refreshPromise;
+}
+
+export function acquirePlaybackProbePoller(
+  playbackUrl: string | null,
+  options?: {
+    intervalMs?: number;
+    timeoutMs?: number;
+  },
+): {
+  getSnapshot(): StreamPlaybackProbeResult | null;
+  refresh(): Promise<void>;
+  release(): void;
+} | null {
+  if (!playbackUrl) {
+    return null;
+  }
+
+  const timeoutMs = Math.max(500, options?.timeoutMs ?? 4_000);
+  const intervalMs = Math.max(timeoutMs, options?.intervalMs ?? 5_000);
+  let poller = playbackProbePollers.get(playbackUrl);
+  if (!poller) {
+    poller = {
+      snapshot: null,
+      refreshPromise: null,
+      interval: setInterval(() => {
+        void refreshPlaybackProbePoller(poller!, playbackUrl, timeoutMs);
+      }, intervalMs),
+      refCount: 0,
+    };
+    poller.interval.unref?.();
+    playbackProbePollers.set(playbackUrl, poller);
+    void refreshPlaybackProbePoller(poller, playbackUrl, timeoutMs);
+  }
+
+  poller.refCount += 1;
+
+  return {
+    getSnapshot(): StreamPlaybackProbeResult | null {
+      return poller?.snapshot ?? null;
+    },
+    refresh(): Promise<void> {
+      if (!poller) {
+        return Promise.resolve();
+      }
+      return refreshPlaybackProbePoller(poller, playbackUrl, timeoutMs);
+    },
+    release(): void {
+      if (!poller) return;
+      poller.refCount = Math.max(0, poller.refCount - 1);
+      if (poller.refCount > 0) {
+        return;
+      }
+      clearInterval(poller.interval);
+      playbackProbePollers.delete(playbackUrl);
+    },
+  };
+}
+
+export function toPublicReadinessFromProbe(params: {
+  ready: boolean;
+  reason: string | null;
+  updatedAt: number;
+}): StreamPublicReadiness {
+  return {
+    ready: params.ready,
+    reason: params.reason,
+    updatedAt: params.updatedAt,
+  };
+}
diff --git a/packages/server/src/streaming/hls-cdn-sync.ts b/packages/server/src/streaming/hls-cdn-sync.ts
new file mode 100644
index 000000000..cac118d5f
--- /dev/null
+++ b/packages/server/src/streaming/hls-cdn-sync.ts
@@ -0,0 +1,400 @@
+/**
+ * HLS CDN Sync — Watches the local HLS output directory and uploads
+ * segments + playlists to an S3-compatible CDN (Cloudflare R2, AWS S3, etc.)
+ *
+ * Uses AWS Signature V4 over fetch — no @aws-sdk dependency required.
+ *
+ * Env vars:
+ *   HLS_CDN_ENABLED            — "true" to enable CDN sync
+ *   HLS_CDN_ENDPOINT           — S3 endpoint URL (e.g. https://<account>.r2.cloudflarestorage.com)
+ *   HLS_CDN_BUCKET             — Bucket name
+ *   HLS_CDN_ACCESS_KEY_ID      — Access key
+ *   HLS_CDN_SECRET_ACCESS_KEY  — Secret key
+ *   HLS_CDN_REGION             — Region (default: auto)
+ *   HLS_CDN_PREFIX             — Key prefix in bucket (default: live/)
+ *   HLS_CDN_PUBLIC_URL         — Public URL base for the CDN (e.g. https://stream.hyperscape.game)
+ *   HLS_OUTPUT_PATH            — Local .m3u8 path (must match rtmp-bridge config)
+ */
+
+import { watch, type FSWatcher } from "node:fs";
+import { readFile, readdir } from "node:fs/promises";
+import { createHmac, createHash } from "node:crypto";
+import { basename, dirname, join } from "node:path";
+
+// ============================================================================
+// AWS Signature V4 (minimal, for S3 PUT only)
+// ============================================================================
+
+function hmacSha256(key: Buffer | string, data: string): Buffer {
+  return createHmac("sha256", key).update(data).digest();
+}
+
+function sha256Hex(data: Buffer | string): string {
+  return createHash("sha256").update(data).digest("hex");
+}
+
+function getSignatureKey(
+  secretKey: string,
+  dateStamp: string,
+  region: string,
+  service: string,
+): Buffer {
+  const kDate = hmacSha256(`AWS4${secretKey}`, dateStamp);
+  const kRegion = hmacSha256(kDate, region);
+  const kService = hmacSha256(kRegion, service);
+  return hmacSha256(kService, "aws4_request");
+}
+
+function signS3PutRequest(params: {
+  endpoint: string;
+  bucket: string;
+  key: string;
+  body: Buffer;
+  contentType: string;
+  accessKeyId: string;
+  secretAccessKey: string;
+  region: string;
+  now?: Date;
+}): { url: string; headers: Record<string, string> } {
+  const now = params.now ?? new Date();
+  const dateStamp = now.toISOString().slice(0, 10).replace(/-/g, "");
+  const amzDate = now
+    .toISOString()
+    .replace(/[-:]/g, "")
+    .replace(/\.\d{3}/, "");
+  const payloadHash = sha256Hex(params.body);
+
+  const url = `${params.endpoint}/${params.bucket}/${params.key}`;
+  const parsedUrl = new URL(url);
+  const host = parsedUrl.host;
+  const canonicalUri = parsedUrl.pathname;
+
+  const signedHeaders = "content-type;host;x-amz-content-sha256;x-amz-date";
+  const canonicalHeaders =
+    [
+      `content-type:${params.contentType}`,
+      `host:${host}`,
+      `x-amz-content-sha256:${payloadHash}`,
+      `x-amz-date:${amzDate}`,
+    ].join("\n") + "\n";
+
+  const canonicalRequest = [
+    "PUT",
+    canonicalUri,
+    "", // query string
+    canonicalHeaders,
+    signedHeaders,
+    payloadHash,
+  ].join("\n");
+
+  const credentialScope = `${dateStamp}/${params.region}/s3/aws4_request`;
+  const stringToSign = [
+    "AWS4-HMAC-SHA256",
+    amzDate,
+    credentialScope,
+    sha256Hex(canonicalRequest),
+  ].join("\n");
+
+  const signingKey = getSignatureKey(
+    params.secretAccessKey,
+    dateStamp,
+    params.region,
+    "s3",
+  );
+  const signature = hmacSha256(signingKey, stringToSign).toString("hex");
+
+  const authorization = `AWS4-HMAC-SHA256 Credential=${params.accessKeyId}/${credentialScope}, SignedHeaders=${signedHeaders}, Signature=${signature}`;
+
+  return {
+    url,
+    headers: {
+      Authorization: authorization,
+      "Content-Type": params.contentType,
+      "x-amz-content-sha256": payloadHash,
+      "x-amz-date": amzDate,
+      "Cache-Control": params.key.endsWith(".m3u8")
+        ? "no-cache, no-store, must-revalidate"
+        : "public, max-age=31536000, immutable",
+    },
+  };
+}
+
+/** @internal Pure helpers exposed for SigV4 regression tests. */
+export const __hlsCdnSyncTestInternals = {
+  signS3PutRequest,
+};
+
+// ============================================================================
+// HLS CDN Syncer
+// ============================================================================
+
+interface HlsCdnConfig {
+  endpoint: string;
+  bucket: string;
+  accessKeyId: string;
+  secretAccessKey: string;
+  region: string;
+  prefix: string;
+  publicUrl: string | null;
+  hlsDir: string;
+}
+
+function getConfig(): HlsCdnConfig | null {
+  if (process.env.HLS_CDN_ENABLED !== "true") return null;
+
+  const endpoint = process.env.HLS_CDN_ENDPOINT?.trim();
+  const bucket = process.env.HLS_CDN_BUCKET?.trim();
+  const accessKeyId = process.env.HLS_CDN_ACCESS_KEY_ID?.trim();
+  const secretAccessKey = process.env.HLS_CDN_SECRET_ACCESS_KEY?.trim();
+
+  if (!endpoint || !bucket || !accessKeyId || !secretAccessKey) {
+    console.warn(
+      "[HLS-CDN] Missing required env vars (HLS_CDN_ENDPOINT, HLS_CDN_BUCKET, HLS_CDN_ACCESS_KEY_ID, HLS_CDN_SECRET_ACCESS_KEY)",
+    );
+    return null;
+  }
+
+  const hlsOutputPath = process.env.HLS_OUTPUT_PATH?.trim();
+  if (!hlsOutputPath) {
+    console.warn(
+      "[HLS-CDN] HLS_OUTPUT_PATH not set — cannot determine watch directory",
+    );
+    return null;
+  }
+
+  return {
+    endpoint: endpoint.replace(/\/$/, ""),
+    bucket,
+    accessKeyId,
+    secretAccessKey,
+    region: process.env.HLS_CDN_REGION?.trim() || "auto",
+    prefix: process.env.HLS_CDN_PREFIX?.trim() || "live/",
+    publicUrl: process.env.HLS_CDN_PUBLIC_URL?.trim() || null,
+    hlsDir: dirname(hlsOutputPath),
+  };
+}
+
+/** Track uploaded segment hashes to avoid redundant uploads */
+const uploadedHashes = new Map<string, string>();
+const MAX_TRACKED_FILES = 500;
+
+/** Pending uploads (deduplication) */
+const pendingUploads = new Map<string, Promise<void>>();
+
+let watcher: FSWatcher | null = null;
+let syncInterval: ReturnType<typeof setInterval> | null = null;
+
+async function uploadFile(
+  config: HlsCdnConfig,
+  filePath: string,
+  fileName: string,
+): Promise<void> {
+  const existingUpload = pendingUploads.get(fileName);
+  if (existingUpload) {
+    await existingUpload;
+    return;
+  }
+
+  const uploadPromise = (async () => {
+    try {
+      const body = await readFile(filePath);
+      const hash = sha256Hex(body);
+
+      // Skip if unchanged (for .m3u8 which gets rewritten)
+      if (uploadedHashes.get(fileName) === hash) {
+        return;
+      }
+
+      const contentType = fileName.endsWith(".m3u8")
+        ? "application/vnd.apple.mpegurl"
+        : "video/MP2T";
+
+      const key = `${config.prefix}${fileName}`;
+      const { url, headers } = signS3PutRequest({
+        endpoint: config.endpoint,
+        bucket: config.bucket,
+        key,
+        body,
+        contentType,
+        accessKeyId: config.accessKeyId,
+        secretAccessKey: config.secretAccessKey,
+        region: config.region,
+      });
+
+      const response = await fetch(url, {
+        method: "PUT",
+        headers,
+        body,
+        signal: AbortSignal.timeout(15_000),
+      });
+
+      if (!response.ok) {
+        const text = await response.text().catch(() => "");
+        console.error(
+          `[HLS-CDN] Upload failed: ${fileName} → ${response.status} ${text.slice(0, 200)}`,
+        );
+        return;
+      }
+
+      uploadedHashes.set(fileName, hash);
+
+      // Evict old entries
+      if (uploadedHashes.size > MAX_TRACKED_FILES) {
+        const keys = [...uploadedHashes.keys()];
+        for (let i = 0; i < 100; i++) {
+          uploadedHashes.delete(keys[i]);
+        }
+      }
+    } catch (err) {
+      console.error(
+        `[HLS-CDN] Upload error: ${fileName}`,
+        err instanceof Error ? err.message : err,
+      );
+    } finally {
+      pendingUploads.delete(fileName);
+    }
+  })();
+
+  pendingUploads.set(fileName, uploadPromise);
+  await uploadPromise;
+}
+
+// HLS output produces structured filenames (e.g. index.m3u8, 0001.ts).
+// Restrict uploads to this allowlist so a crafted filename such as
+// "../../../etc/passwd" cannot traverse outside config.hlsDir, even if the
+// watcher or readdir output is ever influenced by a compromised capture
+// process. basename() alone is not enough — it strips prefixes but permits
+// arbitrary characters in the leaf.
+const HLS_SAFE_FILENAME_RE = /^[A-Za-z0-9._-]+$/;
+const isSafeHlsFilename = (name: string): boolean =>
+  HLS_SAFE_FILENAME_RE.test(name) &&
+  !name.startsWith(".") &&
+  !name.includes("..");
+
+async function syncDirectory(config: HlsCdnConfig): Promise<void> {
+  try {
+    const files = await readdir(config.hlsDir);
+    const hlsFiles = files.filter(
+      (f) => isSafeHlsFilename(f) && (f.endsWith(".ts") || f.endsWith(".m3u8")),
+    );
+
+    // Upload .ts segments first, then .m3u8 (so playlist references exist)
+    const segments = hlsFiles.filter((f) => f.endsWith(".ts"));
+    const playlists = hlsFiles.filter((f) => f.endsWith(".m3u8"));
+
+    await Promise.all(
+      segments.map((f) => uploadFile(config, join(config.hlsDir, f), f)),
+    );
+    await Promise.all(
+      playlists.map((f) => uploadFile(config, join(config.hlsDir, f), f)),
+    );
+  } catch (err) {
+    // Directory may not exist yet
+    if ((err as NodeJS.ErrnoException).code !== "ENOENT") {
+      console.error(
+        "[HLS-CDN] Sync error",
+        err instanceof Error ? err.message : err,
+      );
+    }
+  }
+}
+
+/**
+ * Start watching the HLS output directory and syncing to CDN.
+ * Returns the public CDN URL for the stream, or null if not configured.
+ */
+export function startHlsCdnSync(): string | null {
+  const config = getConfig();
+  if (!config) {
+    console.log("[HLS-CDN] CDN sync disabled");
+    return null;
+  }
+
+  const publicUrl = config.publicUrl
+    ? `${config.publicUrl.replace(/\/$/, "")}/${config.prefix}stream.m3u8`
+    : `${config.endpoint}/${config.bucket}/${config.prefix}stream.m3u8`;
+
+  if (watcher || syncInterval) {
+    console.warn("[HLS-CDN] CDN sync already running");
+    return publicUrl;
+  }
+
+  console.log(
+    `[HLS-CDN] Starting CDN sync: ${config.hlsDir} → ${config.endpoint}/${config.bucket}/${config.prefix}`,
+  );
+
+  // Watch for file changes
+  try {
+    watcher = watch(
+      config.hlsDir,
+      { persistent: false },
+      (eventType, filename) => {
+        if (!filename) return;
+        const rawFileName = filename.toString();
+        const safeFileName = basename(rawFileName);
+        if (safeFileName !== rawFileName) {
+          return;
+        }
+        if (!isSafeHlsFilename(safeFileName)) {
+          return;
+        }
+        if (safeFileName.endsWith(".ts") || safeFileName.endsWith(".m3u8")) {
+          void uploadFile(
+            config,
+            join(config.hlsDir, safeFileName),
+            safeFileName,
+          );
+        }
+      },
+    );
+    watcher.on("error", (err) => {
+      console.error("[HLS-CDN] Watcher error", err.message);
+    });
+  } catch {
+    console.warn(
+      "[HLS-CDN] Could not start watcher — falling back to polling only",
+    );
+  }
+
+  // Also poll periodically as a safety net (watcher can miss events)
+  syncInterval = setInterval(() => void syncDirectory(config), 2000);
+  syncInterval.unref();
+
+  // Initial sync
+  void syncDirectory(config);
+
+  console.log(`[HLS-CDN] Public stream URL: ${publicUrl}`);
+  return publicUrl;
+}
+
+/**
+ * Stop the CDN sync watcher and interval.
+ */
+export function stopHlsCdnSync(): void {
+  if (watcher) {
+    watcher.close();
+    watcher = null;
+  }
+  if (syncInterval) {
+    clearInterval(syncInterval);
+    syncInterval = null;
+  }
+  uploadedHashes.clear();
+  pendingUploads.clear();
+  console.log("[HLS-CDN] CDN sync stopped");
+}
+
+/**
+ * Get the configured CDN public URL for the stream, or the local fallback.
+ */
+export function getHlsStreamUrl(): string {
+  const publicUrl = process.env.HLS_CDN_PUBLIC_URL?.trim();
+  const prefix = process.env.HLS_CDN_PREFIX?.trim() || "live/";
+
+  if (publicUrl) {
+    return `${publicUrl.replace(/\/$/, "")}/${prefix}stream.m3u8`;
+  }
+
+  // Fall back to local /live/ path
+  return "/live/stream.m3u8";
+}
diff --git a/packages/server/src/streaming/index.ts b/packages/server/src/streaming/index.ts
index 0a24fcf82..c77e663ad 100644
--- a/packages/server/src/streaming/index.ts
+++ b/packages/server/src/streaming/index.ts
@@ -28,6 +28,8 @@ export { CAPTURE_SCRIPT, generateCaptureScript } from "./browser-capture.js";
 export {
   WEBCODECS_CAPTURE_SCRIPT,
   generateWebCodecsCaptureScript,
+  WEBCODECS_EXPOSED_CAPTURE_SCRIPT,
+  generateWebCodecsExposedCaptureScript,
 } from "./browser-capture-webcodecs.js";
 export type {
   RTMPDestination,
@@ -43,3 +45,8 @@ export {
   type AllocRecord,
   type LeakSnapshot,
 } from "./stream-leak-diagnostics.js";
+export {
+  startHlsCdnSync,
+  stopHlsCdnSync,
+  getHlsStreamUrl,
+} from "./hls-cdn-sync.js";
diff --git a/packages/server/src/streaming/ingest-config.ts b/packages/server/src/streaming/ingest-config.ts
new file mode 100644
index 000000000..6d56f503e
--- /dev/null
+++ b/packages/server/src/streaming/ingest-config.ts
@@ -0,0 +1,156 @@
+export type StreamIngestProfile = "default" | "cloudflare_live";
+export type StreamIngestTransport = "rtmps" | "srt";
+
+export type StreamIngestSettings = {
+  profile: StreamIngestProfile;
+  transport: StreamIngestTransport;
+  audioSampleRate: number;
+  gopFrames: number;
+  probeOnly: boolean;
+  srtUrl: string | null;
+  srtStreamId: string | null;
+  srtPassphrase: string | null;
+};
+
+function isValidUrl(value: string, allowedProtocols: string[]): boolean {
+  try {
+    const parsed = new URL(value);
+    return allowedProtocols.includes(parsed.protocol);
+  } catch {
+    return false;
+  }
+}
+
+function parseBoolean(value: string | undefined, fallback: boolean): boolean {
+  if (value == null) return fallback;
+  const normalized = value.trim().toLowerCase();
+  if (!normalized) return fallback;
+  if (["1", "true", "yes", "on"].includes(normalized)) return true;
+  if (["0", "false", "no", "off"].includes(normalized)) return false;
+  return fallback;
+}
+
+function parsePositiveInt(
+  value: string | undefined,
+  fallback: number,
+  minValue: number,
+): number {
+  const parsed = Number.parseInt(value || "", 10);
+  if (!Number.isFinite(parsed)) return fallback;
+  return Math.max(minValue, parsed);
+}
+
+function asNonEmptyString(value: string | undefined): string | null {
+  const trimmed = value?.trim() || "";
+  return trimmed.length > 0 ? trimmed : null;
+}
+
+function resolveConfiguredRtmpsIngestUrl(env: NodeJS.ProcessEnv): string | null {
+  return (
+    asNonEmptyString(env.STREAM_EXTERNAL_INGEST_RTMPS_URL) ??
+    asNonEmptyString(env.STREAM_INGEST_RTMPS_URL)
+  );
+}
+
+export function resolveStreamIngestSettings(
+  env: NodeJS.ProcessEnv,
+): StreamIngestSettings {
+  const profile =
+    env.STREAM_INGEST_PROFILE?.trim() === "cloudflare_live"
+      ? "cloudflare_live"
+      : "default";
+  const transport =
+    env.STREAM_INGEST_TRANSPORT?.trim().toLowerCase() === "srt"
+      ? "srt"
+      : "rtmps";
+  const defaultFps = parsePositiveInt(env.STREAM_FPS, 30, 1);
+  const defaultGopFrames =
+    profile === "cloudflare_live"
+      ? Math.max(2, defaultFps * 2)
+      : parsePositiveInt(env.STREAM_GOP_SIZE, defaultFps, 1);
+  const gopFrames = parsePositiveInt(
+    env.STREAM_GOP_SIZE,
+    defaultGopFrames,
+    1,
+  );
+  const audioSampleRate = parsePositiveInt(
+    env.STREAM_AUDIO_SAMPLE_RATE,
+    profile === "cloudflare_live" ? 48_000 : 44_100,
+    8_000,
+  );
+
+  return {
+    profile,
+    transport,
+    audioSampleRate,
+    gopFrames,
+    probeOnly: parseBoolean(env.STREAM_CLOUDFLARE_PROBE_ONLY, false),
+    srtUrl: asNonEmptyString(env.STREAM_INGEST_SRT_URL),
+    srtStreamId: asNonEmptyString(env.STREAM_INGEST_SRT_STREAM_ID),
+    srtPassphrase: asNonEmptyString(env.STREAM_INGEST_SRT_PASSPHRASE),
+  };
+}
+
+export function validateStreamIngestSettings(
+  env: NodeJS.ProcessEnv,
+  settings: StreamIngestSettings = resolveStreamIngestSettings(env),
+): string[] {
+  const issues: string[] = [];
+  const deliveryMode = env.STREAM_DELIVERY_MODE?.trim().toLowerCase() ?? "self_hls";
+  const externalDeliveryEnabled =
+    deliveryMode === "external_hls" || settings.probeOnly === true;
+
+  if (!externalDeliveryEnabled) {
+    return issues;
+  }
+
+  if (settings.transport === "srt") {
+    if (!settings.srtUrl) {
+      issues.push("STREAM_INGEST_SRT_URL is required when STREAM_INGEST_TRANSPORT=srt");
+    } else if (!isValidUrl(settings.srtUrl, ["srt:"])) {
+      issues.push("STREAM_INGEST_SRT_URL must be a valid srt:// URL");
+    }
+
+    if (!settings.srtStreamId) {
+      issues.push("STREAM_INGEST_SRT_STREAM_ID is required when STREAM_INGEST_TRANSPORT=srt");
+    }
+
+    if (!settings.srtPassphrase) {
+      issues.push("STREAM_INGEST_SRT_PASSPHRASE is required when STREAM_INGEST_TRANSPORT=srt");
+    } else if (settings.srtPassphrase.length < 10) {
+      issues.push("STREAM_INGEST_SRT_PASSPHRASE must be at least 10 characters");
+    }
+
+    return issues;
+  }
+
+  const rtmpsUrl = resolveConfiguredRtmpsIngestUrl(env);
+  if (!rtmpsUrl) {
+    issues.push(
+      "STREAM_INGEST_RTMPS_URL or STREAM_EXTERNAL_INGEST_RTMPS_URL is required when STREAM_INGEST_TRANSPORT=rtmps",
+    );
+  } else if (!isValidUrl(rtmpsUrl, ["rtmp:", "rtmps:"])) {
+    issues.push(
+      "STREAM_INGEST_RTMPS_URL or STREAM_EXTERNAL_INGEST_RTMPS_URL must be a valid rtmp:// or rtmps:// URL",
+    );
+  }
+
+  const streamKey = asNonEmptyString(env.STREAM_INGEST_STREAM_KEY);
+  if (!streamKey) {
+    issues.push("STREAM_INGEST_STREAM_KEY is required when STREAM_INGEST_TRANSPORT=rtmps");
+  }
+
+  return issues;
+}
+
+export function assertValidStreamIngestSettings(
+  env: NodeJS.ProcessEnv,
+  settings?: StreamIngestSettings,
+): StreamIngestSettings {
+  const resolvedSettings = settings ?? resolveStreamIngestSettings(env);
+  const issues = validateStreamIngestSettings(env, resolvedSettings);
+  if (issues.length > 0) {
+    throw new Error(`Invalid stream ingest configuration: ${issues.join("; ")}`);
+  }
+  return resolvedSettings;
+}
diff --git a/packages/server/src/streaming/rtmp-bridge.ts b/packages/server/src/streaming/rtmp-bridge.ts
index 5e5ac4edd..267eba0f0 100644
--- a/packages/server/src/streaming/rtmp-bridge.ts
+++ b/packages/server/src/streaming/rtmp-bridge.ts
@@ -14,6 +14,7 @@
 import { spawn, exec, execSync, type ChildProcess } from "child_process";
 import fs from "node:fs";
 import { createRequire } from "node:module";
+import path from "node:path";
 import { WebSocketServer, WebSocket, type RawData } from "ws";
 import type {
   RTMPDestination,
@@ -22,14 +23,57 @@ import type {
   DestinationStatus,
 } from "./types.js";
 import { DEFAULT_STREAMING_CONFIG } from "./types.js";
+import {
+  buildStreamDestinationId,
+  inferStreamDeliveryTransport,
+  normalizeStreamDestinationProvider,
+  resolveExternalStreamDeliveryInfo,
+  resolveStreamCanonicalProviderPriority,
+} from "./delivery-config.js";
+import {
+  assertValidStreamIngestSettings,
+  resolveStreamIngestSettings,
+} from "./ingest-config.js";
 import {
   isStreamDestinationEnabled,
   resolveEnabledStreamDestinations,
 } from "./stream-destinations.js";
+import { probePlaybackUrl } from "./destination-probe.js";
+import { errMsg } from "../shared/errMsg.js";
 
 const require = createRequire(import.meta.url);
 let resolvedFfmpegCommand: string | null = null;
 
+type DirectFrameDiagnosticSample = {
+  at: number;
+  size: number;
+  cdpTimestamp: number | null;
+};
+
+type BackpressureTransition = {
+  at: number;
+  backpressured: boolean;
+};
+
+type FatalWriteDiagnostic = {
+  at: number;
+  message: string;
+  frameCount: number;
+  droppedFrames: number;
+  bytesReceived: number;
+  backpressured: boolean;
+  cdpDirectMode: boolean;
+  uptimeMs: number;
+};
+
+type BridgeClientSocket = WebSocket & {
+  _isWebCodecs?: boolean;
+  _socket?: {
+    pause?: () => void;
+    resume?: () => void;
+  };
+};
+
 function parseEnvInt(
   rawValue: string | undefined,
   fallback: number,
@@ -96,10 +140,11 @@ function resolveFfmpegCommand(): string {
 }
 
 export class RTMPBridge {
+  private static readonly CAPTURE_DIAGNOSTIC_HISTORY_LIMIT = 16;
   private wss: WebSocketServer | null = null;
   private spectatorWss: WebSocketServer | null = null;
   private ffmpeg: ChildProcess | null = null;
-  private client: WebSocket | null = null;
+  private client: BridgeClientSocket | null = null;
   private spectatorClients: Set<WebSocket> = new Set();
   /** Cached fMP4 init segment (moov atom) — required for late joiners */
   private fmp4InitSegment: Buffer | null = null;
@@ -132,8 +177,51 @@ export class RTMPBridge {
   private ffmpegLogTail: string[] = [];
   /** Whether FFmpeg stdin is currently backpressured */
   private ffmpegBackpressured = false;
+  /** Rolling encoder FPS reported by FFmpeg progress logs */
+  private ffmpegEncoderFps = 0;
+  /**
+   * Monotonic encoder frame counter parsed from FFmpeg stderr (`frame=  NNN`).
+   * Unlike `directFrameCount` (which counts JPEG frames we *wrote* to FFmpeg
+   * stdin), this counts frames FFmpeg itself has actually encoded. For
+   * x11grab-based capture modes there is no stdin frame write, so this is the
+   * only reliable encoder-side liveness signal.
+   */
+  private lastEncoderFrameCount = 0;
+  /** Wallclock timestamp of the most recent `frame=` advance observed in FFmpeg stderr */
+  private lastEncoderFrameAt: number | null = null;
+  /**
+   * Most recent `speed=N.NNx` value parsed from FFmpeg stderr. Values < 1.0
+   * mean the encoder is running slower than real-time — a reliable early
+   * warning that RTMP upstream is backed up or the input pipeline is
+   * starving the encoder. Null until FFmpeg emits its first progress line.
+   */
+  private ffmpegSpeedX: number | null = null;
+  /** Most recent `bitrate=N.Nkbits/s` value parsed from FFmpeg stderr (kbps). */
+  private ffmpegOutputBitrateKbps: number | null = null;
   /** Whether client socket reads are paused due to FFmpeg backpressure */
   private clientSocketPaused = false;
+  /** Recent CDP frame arrival diagnostics */
+  private recentDirectFrames: DirectFrameDiagnosticSample[] = [];
+  /** Recent FFmpeg stdin backpressure transitions */
+  private recentBackpressureTransitions: BackpressureTransition[] = [];
+  /** First fatal FFmpeg write error observed in the current worker process */
+  private firstFatalWriteError: FatalWriteDiagnostic | null = null;
+  /** Most recent fatal FFmpeg write error observed in the current worker process */
+  private lastFatalWriteError: FatalWriteDiagnostic | null = null;
+  /** Pending recovery for an FFmpeg process that lost its delivery output */
+  private fatalWriteRestartTimeout: ReturnType<typeof setTimeout> | null = null;
+  /** Guard against overlapping fatal-write restarts */
+  private fatalWriteRecoveryInFlight = false;
+  /** Prevent overlapping playback delivery probes */
+  private deliveryRecoveryProbeInFlight = false;
+  /** Consecutive canonical playback probe failures while FFmpeg is healthy */
+  private deliveryRecoveryProbeFailures = 0;
+  /** Last time delivery-health recovery requested an FFmpeg restart */
+  private lastDeliveryRecoveryRestartAt = 0;
+  /** Last seen CDP timestamp for monotonicity checks */
+  private lastCdpTimestamp: number | null = null;
+  /** Number of non-monotonic CDP timestamps observed */
+  private nonMonotonicCdpTimestampCount = 0;
 
   /** Placeholder frame buffer (JPEG) for idle periods */
   private placeholderFrame: Buffer | null = null;
@@ -184,7 +272,7 @@ export class RTMPBridge {
         process.env.STREAM_VIDEO_BITRATE_KBPS ||
           process.env.STREAM_VIDEO_BITRATE,
         DEFAULT_STREAMING_CONFIG.videoBitrate,
-        250,
+        96,
       ),
       audioBitrate: parseEnvInt(
         process.env.STREAM_AUDIO_BITRATE_KBPS ||
@@ -329,6 +417,34 @@ export class RTMPBridge {
     return !["0", "false", "no", "off"].includes(raw.trim().toLowerCase());
   }
 
+  private static deliveryRecoveryGraceMs(): number {
+    return parseEnvInt(
+      process.env.STREAM_DELIVERY_RECOVERY_GRACE_MS,
+      45_000,
+      0,
+    );
+  }
+
+  private static deliveryRecoveryFailureThreshold(): number {
+    return parseEnvInt(process.env.STREAM_DELIVERY_RECOVERY_FAILURES, 3, 1);
+  }
+
+  private static deliveryRecoveryProbeTimeoutMs(): number {
+    return parseEnvInt(
+      process.env.STREAM_DELIVERY_RECOVERY_PROBE_TIMEOUT_MS,
+      2_500,
+      500,
+    );
+  }
+
+  private static deliveryRecoveryRestartCooldownMs(): number {
+    return parseEnvInt(
+      process.env.STREAM_DELIVERY_RECOVERY_RESTART_COOLDOWN_MS,
+      30_000,
+      5_000,
+    );
+  }
+
   private static toRtmpUrl(input: string): string {
     const trimmed = input.trim();
     if (/^rtmps?:\/\//i.test(trimmed)) {
@@ -363,7 +479,99 @@ export class RTMPBridge {
       .replace(/\|/g, "\\|");
   }
 
+  private static appendSrtQuery(
+    baseUrl: string,
+    streamId: string,
+    passphrase: string,
+  ): string {
+    const separator = baseUrl.includes("?") ? "&" : "?";
+    const query = new URLSearchParams({
+      passphrase,
+      streamid: streamId,
+    });
+    return `${baseUrl}${separator}${query.toString()}`;
+  }
+
+  private static redactSensitiveFfmpegText(value: string): string {
+    return value
+      .replace(/(passphrase=)[^&\s\]'"]+/gi, "$1***REDACTED***")
+      .replace(/(streamid=)[^&\s\]'"]+/gi, "$1***REDACTED***")
+      .replace(/(rtmps?:\/\/[^/\s[\]'"]+\/)[^\s[\]'"]+/gi, "$1***REDACTED***");
+  }
+
+  private resolveIngestSettings() {
+    return assertValidStreamIngestSettings(
+      process.env,
+      resolveStreamIngestSettings(process.env),
+    );
+  }
+
+  private buildExternalDeliveryDestination(
+    ingestUrl: string,
+    streamKey: string,
+    role: "canonical" | "fallback",
+  ): RTMPDestination | null {
+    const ingestSettings = this.resolveIngestSettings();
+    const deliveryInfo = resolveExternalStreamDeliveryInfo(process.env);
+    const provider = normalizeStreamDestinationProvider(
+      deliveryInfo.provider,
+      "External Delivery",
+    );
+    const playbackUrl =
+      deliveryInfo.playbackUrl ?? deliveryInfo.llhlsUrl ?? deliveryInfo.hlsUrl;
+    const destinationId = buildStreamDestinationId({
+      role,
+      provider,
+      name: "External Delivery",
+    });
+    if (ingestSettings.transport === "srt") {
+      if (
+        !ingestSettings.srtUrl ||
+        !ingestSettings.srtStreamId ||
+        !ingestSettings.srtPassphrase
+      ) {
+        console.warn(
+          "[RTMPBridge] STREAM_INGEST_TRANSPORT=srt but SRT ingest settings are incomplete; skipping external delivery destination",
+        );
+        return null;
+      }
+      return {
+        id: destinationId,
+        name: "External Delivery",
+        role,
+        provider,
+        transport: "srt",
+        playbackUrl,
+        ingestUrl: ingestSettings.srtUrl,
+        url: RTMPBridge.appendSrtQuery(
+          ingestSettings.srtUrl,
+          ingestSettings.srtStreamId,
+          ingestSettings.srtPassphrase,
+        ),
+        key: "",
+        enabled: true,
+      };
+    }
+
+    return {
+      id: destinationId,
+      name: "External Delivery",
+      role,
+      provider,
+      transport: inferStreamDeliveryTransport({
+        playbackUrl,
+        ingestUrl,
+      }),
+      playbackUrl,
+      ingestUrl,
+      url: RTMPBridge.toRtmpUrl(ingestUrl),
+      key: streamKey,
+      enabled: true,
+    };
+  }
+
   private buildBridgeAudioInputArgs(): string[] {
+    const ingestSettings = this.resolveIngestSettings();
     const audioEnabled = process.env.STREAM_AUDIO_ENABLED !== "false";
     const pulseDevice =
       process.env.PULSE_AUDIO_DEVICE || "chrome_audio.monitor";
@@ -402,7 +610,7 @@ export class RTMPBridge {
         "-ac",
         "2",
         "-ar",
-        "44100",
+        String(ingestSettings.audioSampleRate),
         "-i",
         pulseDevice,
       ];
@@ -411,7 +619,12 @@ export class RTMPBridge {
     console.log(
       "[RTMPBridge] Audio: using bridge-managed silent source (anullsrc)",
     );
-    return ["-f", "lavfi", "-i", "anullsrc=r=44100:cl=stereo"];
+    return [
+      "-f",
+      "lavfi",
+      "-i",
+      `anullsrc=r=${ingestSettings.audioSampleRate}:cl=stereo`,
+    ];
   }
 
   private toBuffer(data: RawData): Buffer | null {
@@ -426,14 +639,10 @@ export class RTMPBridge {
 
   private setClientBackpressurePaused(
     paused: boolean,
-    ws: WebSocket | null = this.client,
+    ws: BridgeClientSocket | null = this.client,
   ): void {
     if (!ws) return;
-    const socket = (
-      ws as unknown as {
-        _socket?: { pause?: () => void; resume?: () => void };
-      }
-    )._socket;
+    const socket = ws._socket;
     if (!socket) return;
 
     if (paused && !this.clientSocketPaused) {
@@ -445,11 +654,299 @@ export class RTMPBridge {
     }
   }
 
+  private pushDiagnosticSample<T>(samples: T[], value: T): void {
+    samples.push(value);
+    while (samples.length > RTMPBridge.CAPTURE_DIAGNOSTIC_HISTORY_LIMIT) {
+      samples.shift();
+    }
+  }
+
+  private setFfmpegBackpressured(
+    backpressured: boolean,
+    ws: BridgeClientSocket | null = this.client,
+  ): void {
+    if (this.ffmpegBackpressured === backpressured) {
+      if (!backpressured) {
+        this.setClientBackpressurePaused(false, ws);
+      }
+      return;
+    }
+
+    this.ffmpegBackpressured = backpressured;
+    this.pushDiagnosticSample(this.recentBackpressureTransitions, {
+      at: Date.now(),
+      backpressured,
+    });
+
+    if (backpressured) {
+      this.setClientBackpressurePaused(true, ws);
+    } else {
+      this.setClientBackpressurePaused(false, ws);
+    }
+  }
+
+  private recordDirectFrameSample(params: {
+    frameAt: number;
+    size: number;
+    cdpTimestamp?: number | null;
+  }): void {
+    const cdpTimestamp =
+      typeof params.cdpTimestamp === "number" &&
+      Number.isFinite(params.cdpTimestamp)
+        ? params.cdpTimestamp
+        : null;
+
+    if (
+      cdpTimestamp != null &&
+      this.lastCdpTimestamp != null &&
+      cdpTimestamp < this.lastCdpTimestamp
+    ) {
+      this.nonMonotonicCdpTimestampCount += 1;
+    }
+    if (cdpTimestamp != null) {
+      this.lastCdpTimestamp = cdpTimestamp;
+    }
+
+    this.pushDiagnosticSample(this.recentDirectFrames, {
+      at: params.frameAt,
+      size: params.size,
+      cdpTimestamp,
+    });
+  }
+
+  private recordFatalWriteError(message: string): void {
+    const snapshot: FatalWriteDiagnostic = {
+      at: Date.now(),
+      message: RTMPBridge.redactSensitiveFfmpegText(message.trim()),
+      frameCount: this.directFrameCount,
+      droppedFrames: this.droppedFrameCount,
+      bytesReceived: this.bytesReceived,
+      backpressured: this.ffmpegBackpressured,
+      cdpDirectMode: this.cdpDirectMode,
+      uptimeMs: this.startTime ? Math.max(0, Date.now() - this.startTime) : 0,
+    };
+
+    if (!this.firstFatalWriteError) {
+      this.firstFatalWriteError = snapshot;
+    }
+    this.lastFatalWriteError = snapshot;
+  }
+
+  private scheduleFatalWriteRestart(
+    message: string,
+    targetProcess: ChildProcess | null = this.ffmpeg,
+    label = "Fatal FFmpeg output write",
+  ): void {
+    if (!targetProcess || this.ffmpeg !== targetProcess) return;
+    if (this.fatalWriteRecoveryInFlight || this.fatalWriteRestartTimeout) {
+      return;
+    }
+
+    const sanitizedMessage = RTMPBridge.redactSensitiveFfmpegText(
+      message.trim(),
+    );
+    if (this.ffmpegRestartAttempts >= RTMPBridge.MAX_RESTART_ATTEMPTS) {
+      console.error(
+        `[RTMPBridge] ${label} persisted after ${this.ffmpegRestartAttempts} restart attempts. Manual intervention required: ${sanitizedMessage}`,
+      );
+      return;
+    }
+
+    const nextAttempt = this.ffmpegRestartAttempts + 1;
+    const baseDelay =
+      RTMPBridge.BASE_RESTART_DELAY * Math.pow(2, nextAttempt - 1);
+    const jitter = Math.random() * 1000;
+    const delay = Math.min(baseDelay + jitter, RTMPBridge.MAX_RESTART_DELAY);
+
+    console.warn(
+      `[RTMPBridge] ${label} detected; restarting encoder in ${Math.round(delay)}ms: ${sanitizedMessage}`,
+    );
+
+    this.fatalWriteRestartTimeout = setTimeout(() => {
+      this.fatalWriteRestartTimeout = null;
+      void this.restartAfterFatalWrite(targetProcess);
+    }, delay);
+  }
+
+  private async restartAfterFatalWrite(
+    targetProcess: ChildProcess,
+  ): Promise<void> {
+    if (this.fatalWriteRecoveryInFlight) return;
+    if (this.ffmpeg !== targetProcess) return;
+
+    const wasCdpDirectMode = this.cdpDirectMode;
+    const wasWebCodecsMode = Boolean(this.client?._isWebCodecs);
+    const hadClient = Boolean(this.client);
+
+    this.fatalWriteRecoveryInFlight = true;
+    try {
+      this.ffmpegRestartAttempts++;
+      await this.stopFFmpeg();
+
+      if (wasCdpDirectMode) {
+        this.startFFmpegDirect();
+      } else if (hadClient && wasWebCodecsMode) {
+        this.startFFmpegWebCodecs();
+      } else if (hadClient) {
+        this.startFFmpeg();
+      } else {
+        console.log(
+          "[RTMPBridge] No active capture client after fatal write; skipping FFmpeg restart",
+        );
+        this.ffmpegRestartAttempts = 0;
+        return;
+      }
+
+      setTimeout(() => {
+        if (this.ffmpeg && this.status.ffmpegRunning) {
+          console.log(
+            "[RTMPBridge] FFmpeg fatal-write recovery appears successful",
+          );
+          this.ffmpegRestartAttempts = Math.max(
+            0,
+            this.ffmpegRestartAttempts - 1,
+          );
+        }
+      }, 5000).unref?.();
+    } catch (error) {
+      console.error(
+        "[RTMPBridge] Failed to recover FFmpeg after fatal output write:",
+        errMsg(error),
+      );
+      this.handleFFmpegCrash(-1);
+    } finally {
+      this.fatalWriteRecoveryInFlight = false;
+    }
+  }
+
+  private resolveCanonicalDeliveryDestination(): DestinationStatus | null {
+    const destinations = this.status.destinations.filter((destination) => {
+      if (!destination.playbackUrl) return false;
+      const provider = normalizeStreamDestinationProvider(
+        destination.provider ?? null,
+        destination.name,
+      );
+      return provider === "cloudflare_stream";
+    });
+    return (
+      destinations.find((destination) => destination.role === "canonical") ??
+      destinations[0] ??
+      null
+    );
+  }
+
+  private shouldRunDeliveryRecoveryProbe(
+    now: number,
+    stats: ReturnType<RTMPBridge["getStats"]>,
+    destination: DestinationStatus | null,
+  ): destination is DestinationStatus & { playbackUrl: string } {
+    if (!destination?.playbackUrl) return false;
+    if (
+      !RTMPBridge.parseEnvBool(
+        process.env.STREAM_DELIVERY_RECOVERY_ENABLED,
+        true,
+      )
+    ) {
+      return false;
+    }
+    if (!this.ffmpeg || !this.status.ffmpegRunning || !stats.healthy) {
+      this.deliveryRecoveryProbeFailures = 0;
+      return false;
+    }
+    if (this.deliveryRecoveryProbeInFlight) return false;
+    if (this.fatalWriteRecoveryInFlight || this.fatalWriteRestartTimeout) {
+      return false;
+    }
+    if (
+      this.startTime > 0 &&
+      now - this.startTime < RTMPBridge.deliveryRecoveryGraceMs()
+    ) {
+      return false;
+    }
+    if (
+      this.lastDeliveryRecoveryRestartAt > 0 &&
+      now - this.lastDeliveryRecoveryRestartAt <
+        RTMPBridge.deliveryRecoveryRestartCooldownMs()
+    ) {
+      return false;
+    }
+    return true;
+  }
+
+  private checkCanonicalDeliveryRecovery(
+    now: number,
+    stats: ReturnType<RTMPBridge["getStats"]>,
+  ): void {
+    const destination = this.resolveCanonicalDeliveryDestination();
+    if (!this.shouldRunDeliveryRecoveryProbe(now, stats, destination)) {
+      return;
+    }
+
+    const targetProcess = this.ffmpeg;
+    const playbackUrl = destination.playbackUrl;
+    this.deliveryRecoveryProbeInFlight = true;
+
+    void probePlaybackUrl(
+      playbackUrl,
+      RTMPBridge.deliveryRecoveryProbeTimeoutMs(),
+    )
+      .then((result) => {
+        if (!targetProcess || this.ffmpeg !== targetProcess) return;
+
+        if (result.ready) {
+          this.deliveryRecoveryProbeFailures = 0;
+          destination.connected = true;
+          if (
+            destination.error === "delivery_disconnected" ||
+            destination.error?.startsWith("playback_probe_")
+          ) {
+            delete destination.error;
+          }
+          return;
+        }
+
+        this.deliveryRecoveryProbeFailures += 1;
+        destination.connected = false;
+        const failureLabel =
+          result.lastError ??
+          `playback_probe_${result.manifestStatus}_${result.statusCode ?? "no_status"}`;
+        destination.error = failureLabel;
+
+        console.warn(
+          `[RTMPBridge] Canonical Cloudflare playback probe failed (${this.deliveryRecoveryProbeFailures}/${RTMPBridge.deliveryRecoveryFailureThreshold()}): ${failureLabel}`,
+        );
+
+        if (
+          this.deliveryRecoveryProbeFailures <
+          RTMPBridge.deliveryRecoveryFailureThreshold()
+        ) {
+          return;
+        }
+
+        this.deliveryRecoveryProbeFailures = 0;
+        this.lastDeliveryRecoveryRestartAt = Date.now();
+        this.scheduleFatalWriteRestart(
+          `canonical delivery unavailable after healthy FFmpeg output: ${failureLabel}`,
+          targetProcess,
+          "Canonical delivery probe failure",
+        );
+      })
+      .catch((error) => {
+        if (!targetProcess || this.ffmpeg !== targetProcess) return;
+        this.deliveryRecoveryProbeFailures += 1;
+        destination.connected = false;
+        destination.error = errMsg(error);
+      })
+      .finally(() => {
+        this.deliveryRecoveryProbeInFlight = false;
+      });
+  }
+
   /**
    * Write encoded media into FFmpeg stdin with backpressure handling.
    * In CDP direct mode we drop frames when backpressured to preserve low latency.
    */
-  private writeToFfmpeg(data: Buffer, sourceWs?: WebSocket): boolean {
+  private writeToFfmpeg(data: Buffer, sourceWs?: BridgeClientSocket): boolean {
     if (!this.ffmpeg?.stdin?.writable) return false;
 
     // CDP direct mode has no transport-level pause control, so drop when backed up.
@@ -465,8 +962,7 @@ export class RTMPBridge {
     try {
       const writable = this.ffmpeg.stdin.write(data);
       if (!writable) {
-        this.ffmpegBackpressured = true;
-        this.setClientBackpressurePaused(true, sourceWs);
+        this.setFfmpegBackpressured(true, sourceWs);
       }
       return true;
     } catch {
@@ -474,6 +970,51 @@ export class RTMPBridge {
     }
   }
 
+  /**
+   * Start FFmpeg in H.264 stream-copy mode for the exposed-function capture
+   * bridge. Unlike startWebCodecs(), this doesn't create a WebSocket server —
+   * data arrives via writeToFfmpegRaw() called from page.exposeFunction().
+   */
+  startWebCodecsDirect(): void {
+    this.initOutputs();
+    this.cdpDirectMode = false;
+    this.status.clientConnected = true; // No WebSocket client, but data will flow
+    this.bytesReceived = 0;
+    this.droppedFrameCount = 0;
+    this.startFFmpegWebCodecs();
+    console.log(
+      "[RTMPBridge] Started FFmpeg in WebCodecs direct mode (no WebSocket, data via exposeFunction)",
+    );
+  }
+
+  /**
+   * Public entry point for writing raw H.264 NAL units from the exposed-function
+   * capture bridge. Tracks bytes received and last-data timestamps the same way
+   * the WebSocket handler does, but without a WebSocket dependency.
+   */
+  writeToFfmpegRaw(data: Buffer): boolean {
+    if (!this.ffmpeg?.stdin?.writable) return false;
+    this.bytesReceived += data.length;
+    this.lastDataReceived = Date.now();
+    return this.writeToFfmpeg(data);
+  }
+
+  /**
+   * Close the WebSocket server without stopping FFmpeg.
+   * Used by the exposed-function capture mode which starts FFmpeg via
+   * startWebCodecs() (to get the H.264 stream-copy pipeline) but doesn't
+   * need the WebSocket listener.
+   */
+  closeWebSocketServer(): void {
+    if (this.wss) {
+      this.wss.close();
+      this.wss = null;
+      console.log(
+        "[RTMPBridge] WebSocket server closed (not needed for exposed-function capture)",
+      );
+    }
+  }
+
   /**
    * Load RTMP destinations from environment variables
    * Adds to any manually configured destinations
@@ -481,6 +1022,7 @@ export class RTMPBridge {
   loadDestinationsFromEnv(): void {
     // Keep any manually added destinations, just add from env
     const existingNames = new Set(this.destinations.map((d) => d.name));
+    const ingestSettings = this.resolveIngestSettings();
     const enabledDestinations = resolveEnabledStreamDestinations(
       process.env.STREAM_ENABLED_DESTINATIONS ||
         process.env.DUEL_STREAM_DESTINATIONS,
@@ -495,15 +1037,22 @@ export class RTMPBridge {
       process.env.YOUTUBE_RTMP_STREAM_KEY ||
       ""
     ).trim();
-    const addDestination = (
-      name: string,
-      url: string,
-      key: string = "",
-      enabled: boolean = true,
-    ) => {
-      if (!url || existingNames.has(name)) return;
-      this.destinations.push({ name, url, key, enabled });
-      existingNames.add(name);
+    const externalDeliveryInfo = resolveExternalStreamDeliveryInfo(process.env);
+    const providerPriority = resolveStreamCanonicalProviderPriority(
+      process.env,
+    );
+    const hasExternalDeliveryIngest =
+      ingestSettings.transport === "srt"
+        ? Boolean(
+            ingestSettings.srtUrl &&
+            ingestSettings.srtStreamId &&
+            ingestSettings.srtPassphrase,
+          )
+        : Boolean(externalDeliveryInfo.ingestUrl);
+    const addDestination = (destination: RTMPDestination) => {
+      if (!destination.url || existingNames.has(destination.name)) return;
+      this.destinations.push(destination);
+      existingNames.add(destination.name);
     };
 
     // Optional external multiplexer (Restream/livepeer/etc.)
@@ -514,11 +1063,25 @@ export class RTMPBridge {
         process.env.RTMP_MULTIPLEXER_NAME || "RTMP Multiplexer",
       )
     ) {
-      addDestination(
-        process.env.RTMP_MULTIPLEXER_NAME || "RTMP Multiplexer",
-        RTMPBridge.toRtmpUrl(process.env.RTMP_MULTIPLEXER_URL),
-        process.env.RTMP_MULTIPLEXER_STREAM_KEY || "",
-      );
+      const name = process.env.RTMP_MULTIPLEXER_NAME || "RTMP Multiplexer";
+      addDestination({
+        id: buildStreamDestinationId({
+          role: "mirror",
+          provider: "custom",
+          name,
+        }),
+        name,
+        role: "mirror",
+        provider: "custom",
+        transport: inferStreamDeliveryTransport({
+          ingestUrl: RTMPBridge.toRtmpUrl(process.env.RTMP_MULTIPLEXER_URL),
+        }),
+        playbackUrl: null,
+        ingestUrl: RTMPBridge.toRtmpUrl(process.env.RTMP_MULTIPLEXER_URL),
+        url: RTMPBridge.toRtmpUrl(process.env.RTMP_MULTIPLEXER_URL),
+        key: process.env.RTMP_MULTIPLEXER_STREAM_KEY || "",
+        enabled: true,
+      });
     }
 
     // Twitch
@@ -532,7 +1095,20 @@ export class RTMPBridge {
         process.env.TWITCH_RTMP_URL ||
         process.env.TWITCH_RTMP_SERVER ||
         "live.twitch.tv/app";
-      addDestination("Twitch", RTMPBridge.toRtmpUrl(server), twitchStreamKey);
+      addDestination({
+        id: "mirror-twitch",
+        name: "Twitch",
+        role: "mirror",
+        provider: "twitch",
+        transport: inferStreamDeliveryTransport({
+          ingestUrl: RTMPBridge.toRtmpUrl(server),
+        }),
+        playbackUrl: null,
+        ingestUrl: RTMPBridge.toRtmpUrl(server),
+        url: RTMPBridge.toRtmpUrl(server),
+        key: twitchStreamKey,
+        enabled: true,
+      });
     }
 
     // YouTube
@@ -545,7 +1121,37 @@ export class RTMPBridge {
         process.env.YOUTUBE_STREAM_URL ||
         process.env.YOUTUBE_RTMP_URL ||
         "rtmp://a.rtmp.youtube.com/live2";
-      addDestination("YouTube", RTMPBridge.toRtmpUrl(server), youtubeStreamKey);
+      addDestination({
+        id: "mirror-youtube",
+        name: "YouTube",
+        role: "mirror",
+        provider: "youtube",
+        transport: inferStreamDeliveryTransport({
+          ingestUrl: RTMPBridge.toRtmpUrl(server),
+        }),
+        playbackUrl: null,
+        ingestUrl: RTMPBridge.toRtmpUrl(server),
+        url: RTMPBridge.toRtmpUrl(server),
+        key: youtubeStreamKey,
+        enabled: true,
+      });
+    }
+
+    if (
+      isStreamDestinationEnabled(enabledDestinations, "external") &&
+      hasExternalDeliveryIngest &&
+      !existingNames.has("External Delivery")
+    ) {
+      const role =
+        providerPriority[0] === "cloudflare_stream" ? "canonical" : "fallback";
+      const destination = this.buildExternalDeliveryDestination(
+        externalDeliveryInfo.ingestUrl ?? "",
+        process.env.STREAM_INGEST_STREAM_KEY?.trim() || "",
+        role,
+      );
+      if (destination) {
+        addDestination(destination);
+      }
     }
 
     // Kick (uses RTMPS with regional ingest)
@@ -560,7 +1166,18 @@ export class RTMPBridge {
       (kickStreamKey || kickUrlHasEmbeddedKey) &&
       !existingNames.has("Kick")
     ) {
-      addDestination("Kick", kickServer, kickStreamKey);
+      addDestination({
+        id: "mirror-kick",
+        name: "Kick",
+        role: "mirror",
+        provider: "kick",
+        transport: inferStreamDeliveryTransport({ ingestUrl: kickServer }),
+        playbackUrl: null,
+        ingestUrl: kickServer,
+        url: kickServer,
+        key: kickStreamKey,
+        enabled: true,
+      });
     }
 
     // Pump.fun (full URL provided)
@@ -569,11 +1186,20 @@ export class RTMPBridge {
       process.env.PUMPFUN_RTMP_URL &&
       !existingNames.has("Pump.fun")
     ) {
-      addDestination(
-        "Pump.fun",
-        process.env.PUMPFUN_RTMP_URL,
-        process.env.PUMPFUN_STREAM_KEY || "",
-      );
+      addDestination({
+        id: "mirror-pump-fun",
+        name: "Pump.fun",
+        role: "mirror",
+        provider: "custom",
+        transport: inferStreamDeliveryTransport({
+          ingestUrl: process.env.PUMPFUN_RTMP_URL,
+        }),
+        playbackUrl: null,
+        ingestUrl: process.env.PUMPFUN_RTMP_URL,
+        url: process.env.PUMPFUN_RTMP_URL,
+        key: process.env.PUMPFUN_STREAM_KEY || "",
+        enabled: true,
+      });
     }
 
     // X/Twitter (full URL provided via Media Studio)
@@ -582,11 +1208,20 @@ export class RTMPBridge {
       process.env.X_RTMP_URL &&
       !existingNames.has("X/Twitter")
     ) {
-      addDestination(
-        "X/Twitter",
-        process.env.X_RTMP_URL,
-        process.env.X_STREAM_KEY || "",
-      );
+      addDestination({
+        id: "mirror-x-twitter",
+        name: "X/Twitter",
+        role: "mirror",
+        provider: "custom",
+        transport: inferStreamDeliveryTransport({
+          ingestUrl: process.env.X_RTMP_URL,
+        }),
+        playbackUrl: null,
+        ingestUrl: process.env.X_RTMP_URL,
+        url: process.env.X_RTMP_URL,
+        key: process.env.X_STREAM_KEY || "",
+        enabled: true,
+      });
     }
 
     // Generic custom destination
@@ -595,11 +1230,25 @@ export class RTMPBridge {
       process.env.CUSTOM_RTMP_URL &&
       !existingNames.has(process.env.CUSTOM_RTMP_NAME || "Custom")
     ) {
-      addDestination(
-        process.env.CUSTOM_RTMP_NAME || "Custom",
-        process.env.CUSTOM_RTMP_URL,
-        process.env.CUSTOM_STREAM_KEY || "",
-      );
+      const name = process.env.CUSTOM_RTMP_NAME || "Custom";
+      addDestination({
+        id: buildStreamDestinationId({
+          role: "mirror",
+          provider: "custom",
+          name,
+        }),
+        name,
+        role: "mirror",
+        provider: "custom",
+        transport: inferStreamDeliveryTransport({
+          ingestUrl: process.env.CUSTOM_RTMP_URL,
+        }),
+        playbackUrl: null,
+        ingestUrl: process.env.CUSTOM_RTMP_URL,
+        url: process.env.CUSTOM_RTMP_URL,
+        key: process.env.CUSTOM_STREAM_KEY || "",
+        enabled: true,
+      });
     }
 
     // Arbitrary fanout list (JSON array of { name, url, key?, enabled? })
@@ -615,11 +1264,23 @@ export class RTMPBridge {
         if (Array.isArray(parsed)) {
           for (const item of parsed) {
             if (!item?.name || !item?.url) continue;
-            addDestination(
-              item.name,
-              RTMPBridge.toRtmpUrl(item.url),
-              item.key || "",
-              RTMPBridge.parseEnvBool(
+            addDestination({
+              id: buildStreamDestinationId({
+                role: "mirror",
+                provider: "custom",
+                name: item.name,
+              }),
+              name: item.name,
+              role: "mirror",
+              provider: "custom",
+              transport: inferStreamDeliveryTransport({
+                ingestUrl: item.url,
+              }),
+              playbackUrl: null,
+              ingestUrl: item.url,
+              url: RTMPBridge.toRtmpUrl(item.url),
+              key: item.key || "",
+              enabled: RTMPBridge.parseEnvBool(
                 typeof item.enabled === "string"
                   ? item.enabled
                   : item.enabled == null
@@ -627,7 +1288,7 @@ export class RTMPBridge {
                     : String(item.enabled),
                 true,
               ),
-            );
+            });
           }
         }
       } catch (err) {
@@ -691,6 +1352,40 @@ export class RTMPBridge {
     }
   }
 
+  /**
+   * Re-initialize output destinations by re-reading environment variables.
+   * Use after credential rotation (e.g. Cloudflare Stream live input
+   * recreation) so a Tier-1 FFmpeg-only restart picks up new ingest URLs
+   * without killing the browser or restarting the process.
+   */
+  reinitOutputs(): void {
+    this.destinations = [];
+    this.outputsInitialized = false;
+    this.initOutputs();
+    console.log(
+      `[RTMPBridge] Destinations re-initialized (${this.enabledOutputCount()} outputs)`,
+    );
+  }
+
+  /**
+   * Tier-1 warm restart: stop the current FFmpeg process and launch a new
+   * one with fresh destinations. Everything else (browser, page, CDP
+   * session, IndexedDB cache, WebGPU context) survives. Recovery time: ~2s.
+   *
+   * Optionally pass `rereadEnv: true` to call `reinitOutputs()` first,
+   * picking up rotated Cloudflare credentials from the process environment.
+   */
+  async restartFFmpegDirect(options?: { rereadEnv?: boolean }): Promise<void> {
+    console.log(
+      `[RTMPBridge] Tier-1 restart: stopping FFmpeg (rereadEnv=${options?.rereadEnv ?? false})`,
+    );
+    await this.stopFFmpeg();
+    if (options?.rereadEnv) {
+      this.reinitOutputs();
+    }
+    this.startFFmpegDirect();
+  }
+
   /**
    * Start the WebSocket server (legacy MediaRecorder mode)
    */
@@ -701,6 +1396,7 @@ export class RTMPBridge {
     }
 
     this.initOutputs();
+    this.cdpDirectMode = false;
 
     // Graceful port handling to avoid EADDRINUSE
     const tryListen = (retries: number = 1) => {
@@ -748,6 +1444,7 @@ export class RTMPBridge {
     }
 
     this.initOutputs();
+    this.cdpDirectMode = false;
 
     const tryListen = (retries: number = 1) => {
       this.wss = new WebSocketServer({ port });
@@ -787,6 +1484,7 @@ export class RTMPBridge {
    * Shared by startFFmpeg, startFFmpegDirect, and startFFmpegWebCodecs.
    */
   private buildVideoEncoderArgs(): string[] {
+    const ingestSettings = this.resolveIngestSettings();
     const hwAccel = process.env.FFMPEG_HWACCEL || "auto";
     let encoder = "libx264";
 
@@ -799,8 +1497,17 @@ export class RTMPBridge {
       encoder = "h264_nvenc";
     }
 
-    const maxrate = Math.floor(this.config.videoBitrate * 1.1); // 10% overhead for VBR spikes
-    const bufsize = this.config.videoBitrate * 2; // 2 seconds of buffering to absorb network jitter
+    const targetBitrate =
+      ingestSettings.profile === "cloudflare_live"
+        ? Math.max(this.config.videoBitrate, 6_000)
+        : this.config.videoBitrate;
+    const maxrate =
+      ingestSettings.profile === "cloudflare_live"
+        ? targetBitrate
+        : Math.floor(targetBitrate * 1.1); // 10% overhead for VBR spikes
+    const minrate =
+      ingestSettings.profile === "cloudflare_live" ? targetBitrate : 0;
+    const bufsize = targetBitrate * 2; // 2 seconds of buffering to absorb network jitter
 
     if (encoder === "h264_videotoolbox") {
       return [
@@ -809,7 +1516,10 @@ export class RTMPBridge {
         "-realtime",
         "1",
         "-b:v",
-        `${this.config.videoBitrate}k`,
+        `${targetBitrate}k`,
+        ...(ingestSettings.profile === "cloudflare_live"
+          ? ["-profile:v", "high", "-level", "4.1", "-minrate", `${minrate}k`]
+          : []),
         "-maxrate",
         `${maxrate}k`,
         "-bufsize",
@@ -817,9 +1527,49 @@ export class RTMPBridge {
         "-pix_fmt",
         "yuv420p",
         "-g",
-        String(this.config.gopSize),
+        String(ingestSettings.gopFrames),
       ];
     } else if (encoder === "h264_nvenc") {
+      if (ingestSettings.profile === "cloudflare_live") {
+        return [
+          "-c:v",
+          "h264_nvenc",
+          "-preset",
+          "llhq",
+          "-tune",
+          "ll",
+          "-rc",
+          "cbr",
+          "-multipass",
+          "disabled",
+          "-b:v",
+          `${targetBitrate}k`,
+          "-minrate",
+          `${targetBitrate}k`,
+          "-maxrate",
+          `${targetBitrate}k`,
+          "-bufsize",
+          `${bufsize}k`,
+          "-pix_fmt",
+          "yuv420p",
+          "-g",
+          String(ingestSettings.gopFrames),
+          "-bf",
+          "0",
+          "-forced-idr",
+          "1",
+          "-zerolatency",
+          "1",
+          "-strict_gop",
+          "1",
+          "-rc-lookahead",
+          "0",
+          "-profile:v",
+          "high",
+          "-level",
+          "4.1",
+        ];
+      }
       return [
         "-c:v",
         "h264_nvenc",
@@ -828,7 +1578,7 @@ export class RTMPBridge {
         "-tune",
         "ll",
         "-b:v",
-        `${this.config.videoBitrate}k`,
+        `${targetBitrate}k`,
         "-maxrate",
         `${maxrate}k`,
         "-bufsize",
@@ -836,7 +1586,7 @@ export class RTMPBridge {
         "-pix_fmt",
         "yuv420p",
         "-g",
-        String(this.config.gopSize),
+        String(ingestSettings.gopFrames),
       ];
     }
 
@@ -848,6 +1598,43 @@ export class RTMPBridge {
     );
     const tune = useHighLatency ? "film" : "zerolatency";
 
+    if (ingestSettings.profile === "cloudflare_live") {
+      return [
+        "-c:v",
+        "libx264",
+        "-preset",
+        "veryfast",
+        "-tune",
+        "zerolatency",
+        "-b:v",
+        `${targetBitrate}k`,
+        "-minrate",
+        `${targetBitrate}k`,
+        "-maxrate",
+        `${targetBitrate}k`,
+        "-bufsize",
+        `${bufsize}k`,
+        "-pix_fmt",
+        "yuv420p",
+        "-g",
+        String(ingestSettings.gopFrames),
+        "-keyint_min",
+        String(ingestSettings.gopFrames),
+        "-sc_threshold",
+        "0",
+        "-bf",
+        "0",
+        "-forced-idr",
+        "1",
+        "-profile:v",
+        "high",
+        "-level",
+        "4.1",
+        "-x264-params",
+        "nal-hrd=cbr:force-cfr=1:open-gop=0",
+      ];
+    }
+
     return [
       "-c:v",
       "libx264",
@@ -856,7 +1643,7 @@ export class RTMPBridge {
       "-tune",
       tune,
       "-b:v",
-      `${this.config.videoBitrate}k`,
+      `${targetBitrate}k`,
       "-maxrate",
       `${maxrate}k`,
       "-bufsize",
@@ -864,7 +1651,7 @@ export class RTMPBridge {
       "-pix_fmt",
       "yuv420p",
       "-g",
-      String(this.config.gopSize),
+      String(ingestSettings.gopFrames),
       // B-frames add latency — only use for VOD/recording mode
       ...(useHighLatency ? ["-bf", "2"] : []),
     ];
@@ -874,7 +1661,8 @@ export class RTMPBridge {
    * Build common audio codec + global_header args.
    */
   private buildAudioArgs(): string[] {
-    return [
+    const ingestSettings = this.resolveIngestSettings();
+    const args = [
       // Audio filter: async resample to recover from timing drift
       // async=1000 means resample if audio drifts more than 1000 samples (22ms at 44.1kHz)
       // This prevents audio dropouts when video/audio streams desync
@@ -885,10 +1673,12 @@ export class RTMPBridge {
       "-b:a",
       `${this.config.audioBitrate}k`,
       "-ar",
-      "44100",
-      "-flags",
-      "+global_header",
+      String(ingestSettings.audioSampleRate),
     ];
+    if (ingestSettings.transport !== "srt") {
+      args.push("-flags", "+global_header");
+    }
+    return args;
   }
 
   private buildOutputVideoFilter(resetPts: boolean = false): string {
@@ -919,8 +1709,7 @@ export class RTMPBridge {
   ): void {
     if (!this.ffmpeg) return;
 
-    this.ffmpegBackpressured = false;
-    this.setClientBackpressurePaused(false);
+    this.setFfmpegBackpressured(false);
     this.ffmpegLogTail = [];
 
     this.startTime = Date.now();
@@ -931,8 +1720,14 @@ export class RTMPBridge {
     this.status.destinations = this.destinations
       .filter((d) => d.enabled)
       .map((d) => ({
+        id: d.id,
         name: d.name,
-        connected: true,
+        role: d.role,
+        provider: d.provider,
+        transport: d.transport,
+        playbackUrl: d.playbackUrl ?? null,
+        ingestUrl: d.ingestUrl ?? d.url,
+        connected: false,
         bytesWritten: 0,
         startedAt: this.startTime,
       }));
@@ -943,7 +1738,8 @@ export class RTMPBridge {
 
     this.ffmpeg.stderr?.on("data", (data) => {
       const msg = data.toString();
-      const lines = msg
+      const sanitizedMsg = RTMPBridge.redactSensitiveFfmpegText(msg);
+      const lines = sanitizedMsg
         .split(/\r?\n/)
         .map((line: string) => line.trim())
         .filter(Boolean);
@@ -955,10 +1751,10 @@ export class RTMPBridge {
           );
         }
       }
-      if (!msg.includes("frame=") && !msg.includes("fps=")) {
-        console.log("[FFmpeg]", msg.trim());
+      if (!sanitizedMsg.includes("frame=") && !sanitizedMsg.includes("fps=")) {
+        console.log("[FFmpeg]", sanitizedMsg.trim());
       }
-      this.parseFFmpegOutput(msg);
+      this.parseFFmpegOutput(sanitizedMsg);
     });
 
     this.ffmpeg.on("close", (code, signal) => {
@@ -968,6 +1764,11 @@ export class RTMPBridge {
       this.ffmpeg = null;
       this.status.ffmpegRunning = false;
       this.status.active = false;
+      this.markAllDestinationsDisconnected(
+        code !== 0 || signal != null
+          ? `ffmpeg_exit:${code ?? "null"}:${signal ?? "null"}`
+          : undefined,
+      );
 
       if ((code !== 0 || signal != null) && this.ffmpegLogTail.length > 0) {
         console.warn(
@@ -984,6 +1785,7 @@ export class RTMPBridge {
       this.logFFmpegSpawnError(err);
       this.ffmpeg = null;
       this.status.ffmpegRunning = false;
+      this.markAllDestinationsDisconnected(errMsg(err));
 
       if (shouldRestartOnCrash()) {
         this.handleFFmpegCrash(-1);
@@ -993,8 +1795,7 @@ export class RTMPBridge {
     this.startHealthMonitoring();
 
     this.ffmpeg.stdin?.on("drain", () => {
-      this.ffmpegBackpressured = false;
-      this.setClientBackpressurePaused(false);
+      this.setFfmpegBackpressured(false);
     });
 
     this.ffmpeg.stdin?.on("error", (err) => {
@@ -1076,13 +1877,16 @@ export class RTMPBridge {
     if (isNullOutput) {
       args.push("-f", "null", "-");
     } else {
-      args.push("-f", "tee", outputString);
+      const directOutputArgs = this.buildDirectOutputArgs();
+      if (directOutputArgs) {
+        args.push(...directOutputArgs);
+      } else {
+        args.push("-f", "tee", outputString);
+      }
     }
 
     const redactedCdpArgs = args.map((arg) =>
-      /rtmps?:\/\//.test(arg)
-        ? arg.replace(/\/[^/\s[\]]+$/, "/***REDACTED***")
-        : arg,
+      RTMPBridge.redactSensitiveFfmpegText(arg),
     );
     console.log(
       "[RTMPBridge] Starting FFmpeg (CDP direct mode) with args:",
@@ -1093,8 +1897,7 @@ export class RTMPBridge {
       stdio: ["pipe", "pipe", "pipe"],
     });
 
-    this.ffmpegBackpressured = false;
-    this.setClientBackpressurePaused(false);
+    this.setFfmpegBackpressured(false);
 
     this.startTime = Date.now();
     this.status.active = true;
@@ -1104,13 +1907,202 @@ export class RTMPBridge {
     this.setupFFmpegHandlers("CDP direct", () => this.cdpDirectMode);
   }
 
+  /**
+   * Start FFmpeg with x11grab input (native X11 display capture) and NVENC
+   * encode, bypassing the in-browser encode path and the JPEG stdin-pipe
+   * entirely. Chromium keeps rendering the scene to the Xvfb display; FFmpeg
+   * reads that display directly, encodes with h264_nvenc, and fans out to
+   * configured destinations via the existing tee/direct output paths.
+   *
+   * The caller is responsible for ensuring:
+   *   - An Xvfb (or Xorg) display is running at `options.display`.
+   *   - Chromium is pinned full-screen at (0,0) to WxH so the captured region
+   *     is the canvas and not the whole virtual screen.
+   *   - `FFMPEG_HWACCEL=nvidia` is set so `buildVideoEncoderArgs` picks
+   *     h264_nvenc; this method does not fall back to libx264.
+   */
+  startFFmpegX11Grab(options: {
+    display: string;
+    width: number;
+    height: number;
+    fps: number;
+    drawMouse?: boolean;
+  }): void {
+    if (this.ffmpeg) {
+      console.warn("[RTMPBridge] FFmpeg already running");
+      return;
+    }
+
+    const drawMouse = options.drawMouse === true;
+    // x11grab format string. The `.0+0,0` suffix pins the grab offset to the
+    // top-left of screen 0. If the caller has sized Xvfb to exactly WxH and
+    // pinned Chromium at (0,0), this captures the scene region exactly.
+    const x11Input = `${options.display}.0+0,0`;
+
+    this.initOutputs();
+    // x11grab does not use the CDP-direct stdin path, but we mark the bridge
+    // as running so destination bookkeeping, backpressure accounting, and
+    // status reporting all behave identically to `startFFmpegDirect`.
+    this.cdpDirectMode = false;
+    this.directFrameCount = 0;
+    this.droppedFrameCount = 0;
+    this.lastEncoderFrameCount = 0;
+    this.lastEncoderFrameAt = null;
+
+    const outputString = this.buildOutputString();
+    const isNullOutput = outputString === "-f null -";
+
+    const args: string[] = [
+      // Low-latency input flags — x11grab is real-time only
+      "-fflags",
+      "nobuffer",
+      "-flags",
+      "low_delay",
+      "-thread_queue_size",
+      "512",
+      "-probesize",
+      "32",
+      "-analyzeduration",
+      "0",
+      "-f",
+      "x11grab",
+      "-draw_mouse",
+      drawMouse ? "1" : "0",
+      "-video_size",
+      `${options.width}x${options.height}`,
+      "-framerate",
+      String(options.fps),
+      "-i",
+      x11Input,
+    ];
+
+    args.push(...this.buildBridgeAudioInputArgs());
+
+    // Video from x11grab (input 0), audio from pulse/anullsrc (input 1).
+    args.push("-map", "0:v:0", "-map", "1:a:0");
+
+    // Force output frame rate (matches existing CDP path).
+    args.push("-r", String(options.fps));
+
+    // NOTE: buildOutputVideoFilter normalises scale/pad for the final output
+    // resolution. Safe to reuse here; if Xvfb is sized to exactly WxH this is
+    // a no-op pass-through.
+    args.push("-vf", this.buildOutputVideoFilter(true));
+
+    // Video encoder (h264_nvenc via FFMPEG_HWACCEL=nvidia).
+    args.push(...this.buildVideoEncoderArgs());
+
+    args.push(...this.buildAudioArgs());
+
+    // Use wallclock PTS so audio/video stay in lockstep against Cloudflare
+    // ingest expectations (matches the existing CDP path's implicit behaviour).
+    args.push("-fflags", "+genpts", "-use_wallclock_as_timestamps", "1");
+
+    if (isNullOutput) {
+      args.push("-f", "null", "-");
+    } else {
+      const directOutputArgs = this.buildDirectOutputArgs();
+      if (directOutputArgs) {
+        args.push(...directOutputArgs);
+      } else {
+        args.push("-f", "tee", outputString);
+      }
+    }
+
+    const redactedArgs = args.map((arg) =>
+      RTMPBridge.redactSensitiveFfmpegText(arg),
+    );
+    console.log(
+      "[RTMPBridge] Starting FFmpeg (x11grab + NVENC mode) with args:",
+      redactedArgs.join(" "),
+    );
+
+    this.ffmpeg = spawn(this.ffmpegCommand, args, {
+      stdio: ["pipe", "pipe", "pipe"],
+    });
+
+    this.setFfmpegBackpressured(false);
+
+    this.startTime = Date.now();
+    this.status.active = true;
+    this.status.ffmpegRunning = true;
+    // x11grab is always "connected" to its source (the X display); unlike the
+    // WebSocket-based modes there is no client socket to wait for.
+    this.status.clientConnected = true;
+
+    this.setupFFmpegHandlers(
+      "x11grab",
+      () => this.status.ffmpegRunning === true,
+    );
+  }
+
+  /** Exposed for unit tests — builds the args array without spawning FFmpeg. */
+  buildX11GrabArgsForTest(options: {
+    display: string;
+    width: number;
+    height: number;
+    fps: number;
+    drawMouse?: boolean;
+  }): string[] {
+    const drawMouse = options.drawMouse === true;
+    const x11Input = `${options.display}.0+0,0`;
+    const outputString = this.buildOutputString();
+    const isNullOutput = outputString === "-f null -";
+    const args: string[] = [
+      "-fflags",
+      "nobuffer",
+      "-flags",
+      "low_delay",
+      "-thread_queue_size",
+      "512",
+      "-probesize",
+      "32",
+      "-analyzeduration",
+      "0",
+      "-f",
+      "x11grab",
+      "-draw_mouse",
+      drawMouse ? "1" : "0",
+      "-video_size",
+      `${options.width}x${options.height}`,
+      "-framerate",
+      String(options.fps),
+      "-i",
+      x11Input,
+    ];
+    args.push(...this.buildBridgeAudioInputArgs());
+    args.push("-map", "0:v:0", "-map", "1:a:0");
+    args.push("-r", String(options.fps));
+    args.push("-vf", this.buildOutputVideoFilter(true));
+    args.push(...this.buildVideoEncoderArgs());
+    args.push(...this.buildAudioArgs());
+    args.push("-fflags", "+genpts", "-use_wallclock_as_timestamps", "1");
+    if (isNullOutput) {
+      args.push("-f", "null", "-");
+    } else {
+      const directOutputArgs = this.buildDirectOutputArgs();
+      if (directOutputArgs) {
+        args.push(...directOutputArgs);
+      } else {
+        args.push("-f", "tee", outputString);
+      }
+    }
+    return args;
+  }
+
   /**
    * Feed a single JPEG frame to FFmpeg (CDP direct mode)
    *
    * @param jpegBuffer - Raw JPEG image data
    * @returns true if frame was written, false if dropped
    */
-  feedFrame(jpegBuffer: Buffer): boolean {
+  feedFrame(
+    jpegBuffer: Buffer,
+    options?: {
+      frameAt?: number | null;
+      cdpTimestamp?: number | null;
+    },
+  ): boolean {
     if (!this.ffmpeg?.stdin?.writable) return false;
 
     // Exit placeholder mode when live frames resume
@@ -1118,9 +2110,18 @@ export class RTMPBridge {
       this.stopPlaceholderMode();
     }
 
+    const frameAt =
+      typeof options?.frameAt === "number" && Number.isFinite(options.frameAt)
+        ? options.frameAt
+        : Date.now();
     this.bytesReceived += jpegBuffer.length;
-    this.lastDataReceived = Date.now();
+    this.lastDataReceived = frameAt;
     this.directFrameCount++;
+    this.recordDirectFrameSample({
+      frameAt,
+      size: jpegBuffer.length,
+      cdpTimestamp: options?.cdpTimestamp ?? null,
+    });
 
     return this.writeToFfmpeg(jpegBuffer);
   }
@@ -1132,22 +2133,88 @@ export class RTMPBridge {
     return this.directFrameCount;
   }
 
+  /**
+   * Monotonic frame counter as reported by FFmpeg's own `frame= NNN` stderr
+   * progress line. Authoritative encoder-side liveness signal — used by the
+   * x11_nvenc watchdog since that capture mode does not write JPEG frames to
+   * FFmpeg stdin (and therefore `directFrameCount` is meaningless there).
+   */
+  getLastEncoderFrameCount(): number {
+    return this.lastEncoderFrameCount;
+  }
+
+  /**
+   * Wallclock ms timestamp of the most recent FFmpeg `frame=` advance, or
+   * null if the encoder has not yet reported progress (typical before FFmpeg
+   * first emits a progress line or immediately after a restart).
+   */
+  getLastEncoderFrameAt(): number | null {
+    return this.lastEncoderFrameAt;
+  }
+
+  getCaptureDiagnostics(): {
+    recentFrames: Array<{
+      at: number;
+      size: number;
+      cdpTimestamp: number | null;
+    }>;
+    recentFrameCadenceMs: number[];
+    nonMonotonicCdpTimestampCount: number;
+    backpressureTransitions: Array<{
+      at: number;
+      backpressured: boolean;
+    }>;
+    firstFatalWriteError: FatalWriteDiagnostic | null;
+    lastFatalWriteError: FatalWriteDiagnostic | null;
+  } {
+    const recentFrames = this.recentDirectFrames.map((sample) => ({
+      at: sample.at,
+      size: sample.size,
+      cdpTimestamp: sample.cdpTimestamp,
+    }));
+    const recentFrameCadenceMs: number[] = [];
+    for (let index = 1; index < recentFrames.length; index += 1) {
+      const cadence = recentFrames[index]!.at - recentFrames[index - 1]!.at;
+      if (Number.isFinite(cadence) && cadence >= 0) {
+        recentFrameCadenceMs.push(cadence);
+      }
+    }
+
+    return {
+      recentFrames,
+      recentFrameCadenceMs,
+      nonMonotonicCdpTimestampCount: this.nonMonotonicCdpTimestampCount,
+      backpressureTransitions: this.recentBackpressureTransitions.map(
+        (transition) => ({
+          at: transition.at,
+          backpressured: transition.backpressured,
+        }),
+      ),
+      firstFatalWriteError: this.firstFatalWriteError
+        ? { ...this.firstFatalWriteError }
+        : null,
+      lastFatalWriteError: this.lastFatalWriteError
+        ? { ...this.lastFatalWriteError }
+        : null,
+    };
+  }
+
   /**
    * Stop processing (FFmpeg only) for browser rotation
    */
-  stopProcessing(): void {
+  async stopProcessing(): Promise<void> {
     if (this.ffmpegRestartTimeout) {
       clearTimeout(this.ffmpegRestartTimeout);
       this.ffmpegRestartTimeout = null;
     }
     this.stopHealthMonitoring();
-    this.stopFFmpeg();
+    await this.stopFFmpeg();
   }
 
   /**
    * Stop the server and clean up
    */
-  stop(): void {
+  async stop(): Promise<void> {
     // Clear any pending restart timeout
     if (this.ffmpegRestartTimeout) {
       clearTimeout(this.ffmpegRestartTimeout);
@@ -1157,9 +2224,8 @@ export class RTMPBridge {
     // Stop health monitoring
     this.stopHealthMonitoring();
 
-    this.stopFFmpeg();
-    this.ffmpegBackpressured = false;
-    this.setClientBackpressurePaused(false);
+    await this.stopFFmpeg();
+    this.setFfmpegBackpressured(false);
 
     if (this.client) {
       this.client.close();
@@ -1321,8 +2387,9 @@ export class RTMPBridge {
       return;
     }
 
+    const clientWs = ws as BridgeClientSocket;
     console.log("[RTMPBridge] Client connected");
-    this.client = ws;
+    this.client = clientWs;
     this.status.clientConnected = true;
     this.bytesReceived = 0;
     this.droppedFrameCount = 0;
@@ -1336,14 +2403,14 @@ export class RTMPBridge {
 
       this.bytesReceived += data.length;
       this.lastDataReceived = Date.now();
-      this.writeToFfmpeg(data, ws);
+      this.writeToFfmpeg(data, clientWs);
     });
 
     ws.on("close", () => {
       console.log("[RTMPBridge] Client disconnected");
       this.client = null;
       this.status.clientConnected = false;
-      this.stopFFmpeg();
+      void this.stopFFmpeg();
     });
 
     ws.on("error", (err) => {
@@ -1362,9 +2429,10 @@ export class RTMPBridge {
       return;
     }
 
+    const clientWs = ws as BridgeClientSocket;
     console.log("[RTMPBridge] Client connected (WebCodecs mode)");
-    this.client = ws;
-    (this.client as any)._isWebCodecs = true;
+    this.client = clientWs;
+    this.client._isWebCodecs = true;
     this.status.clientConnected = true;
     this.bytesReceived = 0;
     this.droppedFrameCount = 0;
@@ -1378,14 +2446,14 @@ export class RTMPBridge {
 
       this.bytesReceived += data.length;
       this.lastDataReceived = Date.now();
-      this.writeToFfmpeg(data, ws);
+      this.writeToFfmpeg(data, clientWs);
     });
 
     ws.on("close", () => {
       console.log("[RTMPBridge] Client disconnected");
       this.client = null;
       this.status.clientConnected = false;
-      this.stopFFmpeg();
+      void this.stopFFmpeg();
     });
 
     ws.on("error", (err) => {
@@ -1399,18 +2467,23 @@ export class RTMPBridge {
   private buildOutputString(): string {
     const enabledDests = this.destinations.filter((d) => d.enabled);
     const outputs = enabledDests.map((dest) => {
+      if (dest.url.startsWith("srt://")) {
+        return `[f=mpegts:mpegts_flags=resend_headers:onfail=ignore]${RTMPBridge.teeEscape(dest.url)}`;
+      }
       const fullUrl = dest.key ? `${dest.url}/${dest.key}` : dest.url;
       // Wrap each RTMP endpoint in a fifo muxer to absorb network stalls without blocking the encoder
       return `[f=fifo:fifo_format=flv:drop_pkts_on_overflow=1:attempt_recovery=1:recovery_wait_time=1]${fullUrl}`;
     });
 
+    const ingestSettings = this.resolveIngestSettings();
     const hlsOutputPath = process.env.HLS_OUTPUT_PATH?.trim();
-    if (hlsOutputPath) {
+    if (hlsOutputPath && !ingestSettings.probeOnly) {
+      this.cleanupHlsOutputArtifacts(hlsOutputPath);
       const hlsTime = parseEnvInt(process.env.HLS_TIME_SECONDS, 1, 1);
-      const hlsListSize = parseEnvInt(process.env.HLS_LIST_SIZE, 30, 2);
+      const hlsListSize = parseEnvInt(process.env.HLS_LIST_SIZE, 6, 2);
       const hlsDeleteThreshold = parseEnvInt(
         process.env.HLS_DELETE_THRESHOLD,
-        120,
+        24,
         1,
       );
       const hlsStartNumber = parseEnvInt(
@@ -1449,6 +2522,181 @@ export class RTMPBridge {
     return outputs.join("|");
   }
 
+  private cleanupHlsOutputArtifacts(hlsOutputPath: string): void {
+    const outputDir = path.dirname(hlsOutputPath);
+    const manifestName = path.basename(hlsOutputPath);
+    const defaultSegmentPattern = `${hlsOutputPath.replace(/\.[^./]+$/, "") || "stream"}-%09d.ts`;
+    const segmentPattern =
+      process.env.HLS_SEGMENT_PATTERN?.trim() || defaultSegmentPattern;
+    const segmentPrefix = path.basename(segmentPattern).split("%", 1)[0] ?? "";
+    if (!segmentPrefix) return;
+
+    try {
+      if (!fs.existsSync(outputDir)) return;
+      for (const fileName of fs.readdirSync(outputDir)) {
+        const isManifest = fileName === manifestName;
+        const isSegment =
+          fileName.startsWith(segmentPrefix) &&
+          (fileName.endsWith(".ts") || fileName.endsWith(".tmp"));
+        if (!isManifest && !isSegment) continue;
+        fs.rmSync(path.join(outputDir, fileName), { force: true });
+      }
+    } catch (error) {
+      console.warn(
+        `[RTMPBridge] Unable to clean HLS output artifacts in ${outputDir}: ${errMsg(error)}`,
+      );
+    }
+  }
+
+  private buildDirectOutputArgs(): string[] | null {
+    const enabledDests = this.destinations.filter(
+      (destination) => destination.enabled,
+    );
+    const ingestSettings = this.resolveIngestSettings();
+    const hlsOutputPath = process.env.HLS_OUTPUT_PATH?.trim();
+    const hasLocalHlsOutput = Boolean(
+      hlsOutputPath && !ingestSettings.probeOnly,
+    );
+    if (hasLocalHlsOutput || enabledDests.length !== 1) {
+      return null;
+    }
+
+    const [destination] = enabledDests;
+    if (!destination) return null;
+    if (destination.url.startsWith("srt://")) {
+      return [
+        "-f",
+        "mpegts",
+        "-mpegts_flags",
+        "+resend_headers",
+        destination.url,
+      ];
+    }
+
+    const fullUrl = destination.key
+      ? `${destination.url}/${destination.key}`
+      : destination.url;
+    return ["-f", "flv", fullUrl];
+  }
+
+  private markAllDestinationsDisconnected(error?: string): void {
+    for (const destination of this.status.destinations) {
+      destination.connected = false;
+      if (error) {
+        destination.error = error;
+      }
+    }
+  }
+
+  private markDestinationsFromMessage(msg: string): void {
+    const trimmed = msg.trim();
+    const normalized = trimmed.toLowerCase();
+    const now = Date.now();
+    let matched = false;
+
+    for (const destination of this.status.destinations) {
+      const ingestCandidates = [
+        destination.ingestUrl,
+        this.destinations.find((candidate) => candidate.id === destination.id)
+          ?.url,
+      ]
+        .filter(Boolean)
+        .map((value) => {
+          try {
+            const url = new URL(String(value));
+            return `${url.protocol}//${url.host}`;
+          } catch {
+            return String(value);
+          }
+        });
+
+      if (
+        normalized.includes(destination.name.toLowerCase()) ||
+        ingestCandidates.some((candidate) =>
+          normalized.includes(candidate.toLowerCase()),
+        )
+      ) {
+        destination.connected = false;
+        destination.error = trimmed;
+        destination.lastWriteErrorAt = now;
+        matched = true;
+      }
+    }
+
+    if (!matched && this.status.destinations.length === 1) {
+      const [destination] = this.status.destinations;
+      if (destination) {
+        destination.connected = false;
+        destination.error = trimmed;
+        destination.lastWriteErrorAt = now;
+      }
+    }
+  }
+
+  /** Quiet window after a write error during which markHealthyDestinationsConnected refuses to re-flip a destination to connected=true. */
+  private static readonly DESTINATION_WRITE_ERROR_QUIET_WINDOW_MS = 10_000;
+  /** Encoder output bitrate (kbps) below which we treat delivery as dark, once FFmpeg has been running long enough for the buffer to settle. */
+  private static readonly DESTINATION_MIN_HEALTHY_BITRATE_KBPS = 100;
+  /** Skip the bitrate-floor check for the first N ms of bridge uptime so initial I-frame burst doesn't trip it. */
+  private static readonly DESTINATION_BITRATE_GRACE_MS = 15_000;
+
+  private markHealthyDestinationsConnected(): void {
+    const now = Date.now();
+    // Encoder output running but pushing near-zero kbps AFTER the startup
+    // grace window means the tee/fifo muxer is silently dropping output —
+    // destinations are dark even though `frame=` progress keeps advancing.
+    const bridgeUptimeMs = this.startTime > 0 ? now - this.startTime : 0;
+    const encoderBitrate = this.ffmpegOutputBitrateKbps;
+    const bitrateStarved =
+      bridgeUptimeMs > RTMPBridge.DESTINATION_BITRATE_GRACE_MS &&
+      encoderBitrate != null &&
+      Number.isFinite(encoderBitrate) &&
+      encoderBitrate < RTMPBridge.DESTINATION_MIN_HEALTHY_BITRATE_KBPS;
+
+    for (const destination of this.status.destinations) {
+      if (destination.error) continue;
+      // An `frame=` / `fps=` progress line from FFmpeg only proves the
+      // encoder is running. It does NOT prove the RTMP destination is
+      // accepting bytes — FFmpeg will keep emitting progress lines while
+      // its tee/fifo muxer is silently dropping packets. If a fatal
+      // write error was observed in the recent past, leave `connected`
+      // alone so the upstream health surface reports the real outage
+      // until we have positive evidence (a new, clean progress run
+      // after the quiet window elapses) that delivery has recovered.
+      if (
+        destination.lastWriteErrorAt != null &&
+        now - destination.lastWriteErrorAt <
+          RTMPBridge.DESTINATION_WRITE_ERROR_QUIET_WINDOW_MS
+      ) {
+        continue;
+      }
+      if (bitrateStarved) continue;
+      destination.connected = true;
+    }
+  }
+
+  /** Most recent `speed=N.NNx` parsed from FFmpeg stderr, or null before first progress line. Values below 1.0 indicate the encoder is falling behind real-time. */
+  getEncoderSpeed(): number | null {
+    return this.ffmpegSpeedX;
+  }
+
+  /** Most recent encoder output bitrate in kbps, or null before first progress line. */
+  getEncoderOutputBitrateKbps(): number | null {
+    return this.ffmpegOutputBitrateKbps;
+  }
+
+  /** Wallclock ms of the most recent destination write error, across all destinations. Null if none have been recorded since bridge start. */
+  getLastDestinationWriteErrorAt(): number | null {
+    let latest: number | null = null;
+    for (const dest of this.status.destinations) {
+      if (dest.lastWriteErrorAt == null) continue;
+      if (latest == null || dest.lastWriteErrorAt > latest) {
+        latest = dest.lastWriteErrorAt;
+      }
+    }
+    return latest;
+  }
+
   /**
    * Start FFmpeg process
    */
@@ -1458,6 +2706,7 @@ export class RTMPBridge {
       return;
     }
 
+    this.ffmpegEncoderFps = 0;
     const outputString = this.buildOutputString();
     const isNullOutput = outputString === "-f null -";
 
@@ -1494,14 +2743,17 @@ export class RTMPBridge {
       // No destinations - discard output (for testing)
       args.push("-f", "null", "-");
     } else {
-      // Use tee muxer for multiple outputs
-      args.push("-f", "tee", outputString);
+      const directOutputArgs = this.buildDirectOutputArgs();
+      if (directOutputArgs) {
+        args.push(...directOutputArgs);
+      } else {
+        // Use tee muxer for multiple outputs
+        args.push("-f", "tee", outputString);
+      }
     }
 
     const redactedArgs = args.map((arg) =>
-      /rtmps?:\/\//.test(arg)
-        ? arg.replace(/\/[^/\s[\]]+$/, "/***REDACTED***")
-        : arg,
+      RTMPBridge.redactSensitiveFfmpegText(arg),
     );
     console.log(
       "[RTMPBridge] Starting FFmpeg with args:",
@@ -1526,6 +2778,8 @@ export class RTMPBridge {
       return;
     }
 
+    this.cdpDirectMode = false;
+
     const outputString = this.buildOutputString();
     const isNullOutput = outputString === "-f null -";
 
@@ -1569,13 +2823,16 @@ export class RTMPBridge {
     if (isNullOutput) {
       args.push("-f", "null", "-");
     } else {
-      args.push("-f", "tee", outputString);
+      const directOutputArgs = this.buildDirectOutputArgs();
+      if (directOutputArgs) {
+        args.push(...directOutputArgs);
+      } else {
+        args.push("-f", "tee", outputString);
+      }
     }
 
     const redactedWcArgs = args.map((arg) =>
-      /rtmps?:\/\//.test(arg)
-        ? arg.replace(/\/[^/\s[\]]+$/, "/***REDACTED***")
-        : arg,
+      RTMPBridge.redactSensitiveFfmpegText(arg),
     );
     console.log(
       "[RTMPBridge] Starting FFmpeg (WebCodecs mode/Stream Copy) with args:",
@@ -1593,6 +2850,53 @@ export class RTMPBridge {
    * Parse FFmpeg output for connection status
    */
   private parseFFmpegOutput(msg: string): void {
+    const encoderFpsMatch = msg.match(/fps=\s*([0-9]+(?:\.[0-9]+)?)/i);
+    if (encoderFpsMatch) {
+      const parsedFps = Number.parseFloat(encoderFpsMatch[1] || "");
+      if (Number.isFinite(parsedFps)) {
+        this.ffmpegEncoderFps = parsedFps;
+      }
+    }
+
+    const encoderFrameMatch = msg.match(/frame=\s*(\d+)/i);
+    if (encoderFrameMatch) {
+      const parsedFrame = Number.parseInt(encoderFrameMatch[1] || "", 10);
+      if (
+        Number.isFinite(parsedFrame) &&
+        parsedFrame > this.lastEncoderFrameCount
+      ) {
+        this.lastEncoderFrameCount = parsedFrame;
+        this.lastEncoderFrameAt = Date.now();
+      }
+    }
+
+    // Parse `speed=0.25x` — encoder keeping up with real-time when >= ~1.0.
+    // Sustained speed < 1.0 means the encoder is falling behind (either
+    // RTMP upstream is backed up or the input pipeline is starving it),
+    // and Cloudflare will refuse to promote the input to live.
+    const speedMatch = msg.match(/speed=\s*([0-9]+(?:\.[0-9]+)?)x/i);
+    if (speedMatch) {
+      const parsedSpeed = Number.parseFloat(speedMatch[1] || "");
+      if (Number.isFinite(parsedSpeed)) {
+        this.ffmpegSpeedX = parsedSpeed;
+      }
+    }
+
+    // Parse `bitrate=4123.5kbits/s` — encoder output bitrate.
+    const bitrateMatch = msg.match(
+      /bitrate=\s*([0-9]+(?:\.[0-9]+)?)\s*kbits\/s/i,
+    );
+    if (bitrateMatch) {
+      const parsedBitrate = Number.parseFloat(bitrateMatch[1] || "");
+      if (Number.isFinite(parsedBitrate)) {
+        this.ffmpegOutputBitrateKbps = parsedBitrate;
+      }
+    }
+
+    if (encoderFrameMatch || encoderFpsMatch) {
+      this.markHealthyDestinationsConnected();
+    }
+
     const slaveMuxerFailureMatch = msg.match(/Slave muxer #(\d+) failed/i);
     if (slaveMuxerFailureMatch) {
       const destIndex = Number.parseInt(slaveMuxerFailureMatch[1] || "", 10);
@@ -1605,6 +2909,16 @@ export class RTMPBridge {
       }
     }
 
+    if (
+      /All tee outputs failed|av_interleaved_write_frame\(\)|Error writing trailer|Broken pipe|Input\/output error|The specified session has been invalidated/i.test(
+        msg,
+      )
+    ) {
+      this.recordFatalWriteError(msg);
+      this.markDestinationsFromMessage(msg);
+      this.scheduleFatalWriteRestart(msg);
+    }
+
     // Check for RTMP connection errors
     for (const dest of this.status.destinations) {
       if (
@@ -1622,18 +2936,25 @@ export class RTMPBridge {
   /**
    * Stop FFmpeg process
    */
-  private stopFFmpeg(): void {
+  private async stopFFmpeg(): Promise<void> {
     if (!this.ffmpeg) return;
 
     console.log("[RTMPBridge] Stopping FFmpeg");
+    if (this.fatalWriteRestartTimeout) {
+      clearTimeout(this.fatalWriteRestartTimeout);
+      this.fatalWriteRestartTimeout = null;
+    }
     this.stopHealthMonitoring();
     this.stopPlaceholderMode();
-    this.ffmpegBackpressured = false;
+    this.cdpDirectMode = false;
+    this.setFfmpegBackpressured(false);
+    this.ffmpegEncoderFps = 0;
     this.setClientBackpressurePaused(false);
 
     const oldFfmpeg = this.ffmpeg;
     this.ffmpeg = null;
     this.status.ffmpegRunning = false;
+    this.markAllDestinationsDisconnected("ffmpeg_stopped");
 
     // Remove event listeners so old process close events don't nullify a newly started current process
     oldFfmpeg.removeAllListeners("close");
@@ -1643,16 +2964,60 @@ export class RTMPBridge {
     oldFfmpeg.stdin?.removeAllListeners("drain");
     oldFfmpeg.stdin?.removeAllListeners("error");
 
-    // Close stdin first to signal end of input
-    oldFfmpeg.stdin?.end();
+    if (oldFfmpeg.exitCode !== null || oldFfmpeg.signalCode !== null) {
+      return;
+    }
+
+    let forceKilled = false;
+    await new Promise<void>((resolve) => {
+      let settled = false;
+      let killTimer: ReturnType<typeof setTimeout> | null = null;
+      let hardTimeoutTimer: ReturnType<typeof setTimeout> | null = null;
+      const settle = () => {
+        if (settled) return;
+        settled = true;
+        if (killTimer) {
+          clearTimeout(killTimer);
+        }
+        if (hardTimeoutTimer) {
+          clearTimeout(hardTimeoutTimer);
+        }
+        oldFfmpeg.removeListener("exit", settle);
+        oldFfmpeg.removeListener("close", settle);
+        resolve();
+      };
+
+      oldFfmpeg.once("exit", settle);
+      oldFfmpeg.once("close", settle);
+
+      // Close stdin first to signal end of input.
+      oldFfmpeg.stdin?.end();
+
+      // Give it a moment to finish, then kill.
+      killTimer = setTimeout(() => {
+        forceKilled = true;
+        try {
+          oldFfmpeg.kill("SIGKILL"); // Force kill to prevent zombie FFmpeg processes taking up GPU/CPU
+        } catch {}
+      }, 750);
+      killTimer.unref?.();
+
+      hardTimeoutTimer = setTimeout(() => {
+        forceKilled = true;
+        settle();
+      }, 3_000);
+      hardTimeoutTimer.unref?.();
 
-    // Give it a moment to finish, then kill
-    const killTimer = setTimeout(() => {
       try {
-        oldFfmpeg.kill("SIGKILL"); // Force kill to prevent zombie FFmpeg processes taking up GPU/CPU
+        oldFfmpeg.kill("SIGTERM");
       } catch {}
-    }, 2000);
-    killTimer.unref?.();
+    });
+
+    if (forceKilled) {
+      console.warn(
+        "[RTMPBridge] FFmpeg did not exit after SIGTERM; forced SIGKILL",
+      );
+    }
   }
 
   /**
@@ -1669,7 +3034,13 @@ export class RTMPBridge {
         : this.destinations
             .filter((destination) => destination.enabled)
             .map((destination) => ({
+              id: destination.id,
               name: destination.name,
+              role: destination.role,
+              provider: destination.provider,
+              transport: destination.transport,
+              playbackUrl: destination.playbackUrl ?? null,
+              ingestUrl: destination.ingestUrl ?? destination.url,
               connected: false,
               bytesWritten: 0,
               startedAt: this.status.startedAt,
@@ -1692,6 +3063,7 @@ export class RTMPBridge {
     lastCrash: number;
     healthy: boolean;
     droppedFrames: number;
+    encoderFps: number;
     backpressured: boolean;
     spectators: number;
     processMemory: {
@@ -1718,6 +3090,7 @@ export class RTMPBridge {
       lastCrash: this.lastFFmpegCrash,
       healthy,
       droppedFrames: this.droppedFrameCount,
+      encoderFps: this.ffmpegEncoderFps,
       backpressured: this.ffmpegBackpressured,
       spectators: this.spectatorClients.size,
       processMemory: {
@@ -1776,7 +3149,7 @@ export class RTMPBridge {
         console.log("[RTMPBridge] Attempting FFmpeg restart...");
         if (this.cdpDirectMode) {
           this.startFFmpegDirect();
-        } else if (this.client && (this.client as any)._isWebCodecs) {
+        } else if (this.client?._isWebCodecs) {
           this.startFFmpegWebCodecs();
         } else {
           this.startFFmpeg();
@@ -1858,6 +3231,7 @@ export class RTMPBridge {
         );
       }
     }
+    this.checkCanonicalDeliveryRecovery(now, stats);
 
     // Log periodic health status (every 5 health checks = ~50s)
     if (Math.random() < 0.2) {
diff --git a/packages/server/src/streaming/source-runtime.ts b/packages/server/src/streaming/source-runtime.ts
new file mode 100644
index 000000000..eb2937783
--- /dev/null
+++ b/packages/server/src/streaming/source-runtime.ts
@@ -0,0 +1,179 @@
+export type StreamSourceStatusSource =
+  | "external_worker"
+  | "in_process_bridge"
+  | "none";
+
+export type StreamSourceCaptureMode =
+  | "cdp"
+  | "webcodecs"
+  | "mediarecorder"
+  | "x11_nvenc"
+  | "none";
+
+export type StreamSourceDegradedReason =
+  | "worker_missing"
+  | "browser_missing"
+  | "page_not_ready"
+  | "unexpected_navigation"
+  | "capture_stalled"
+  | "encoder_stalled"
+  | "manifest_stale"
+  | "destination_disconnected"
+  | "status_stale"
+  | "unknown";
+
+export type StreamSourceRuntime = {
+  ready: boolean;
+  statusSource: StreamSourceStatusSource;
+  captureMode: StreamSourceCaptureMode;
+  degradedReason: StreamSourceDegradedReason | null;
+  currentSceneUrl: string | null;
+  activeBundle: string | null;
+  lastFrameAt: number | null;
+  lastRenderTickAt: number | null;
+  lastVisualChangeAt: number | null;
+  lastRecoveryAt: number | null;
+  recoveryCount: number;
+  workerHeartbeatAt: number | null;
+};
+
+export type BrowserCaptureStatusSnapshot = {
+  lastChunkAt?: number | null;
+  lastChunkAgeMs?: number | null;
+  lastChunkMs?: number | null;
+};
+
+function asRecord(value: unknown): Record<string, unknown> | null {
+  return value && typeof value === "object" && !Array.isArray(value)
+    ? (value as Record<string, unknown>)
+    : null;
+}
+
+function asFiniteNumber(value: unknown): number | null {
+  return typeof value === "number" && Number.isFinite(value) ? value : null;
+}
+
+function asNonEmptyString(value: unknown): string | null {
+  return typeof value === "string" && value.trim().length > 0
+    ? value.trim()
+    : null;
+}
+
+function normalizeNonNegativeFiniteNumber(value: unknown): number | null {
+  return typeof value === "number" && Number.isFinite(value)
+    ? Math.max(0, value)
+    : null;
+}
+
+export function normalizeStreamSourceStatusSource(
+  value: unknown,
+): StreamSourceStatusSource | null {
+  return value === "external_worker" ||
+    value === "in_process_bridge" ||
+    value === "none"
+    ? value
+    : null;
+}
+
+export function normalizeStreamSourceCaptureMode(
+  value: unknown,
+): StreamSourceCaptureMode | null {
+  return value === "cdp" ||
+    value === "webcodecs" ||
+    value === "mediarecorder" ||
+    value === "x11_nvenc" ||
+    value === "none"
+    ? value
+    : null;
+}
+
+export function normalizeStreamSourceDegradedReason(
+  value: unknown,
+): StreamSourceDegradedReason | null {
+  return value === "worker_missing" ||
+    value === "browser_missing" ||
+    value === "page_not_ready" ||
+    value === "unexpected_navigation" ||
+    value === "capture_stalled" ||
+    value === "encoder_stalled" ||
+    value === "manifest_stale" ||
+    value === "destination_disconnected" ||
+    value === "status_stale" ||
+    value === "unknown"
+    ? value
+    : null;
+}
+
+export function normalizeStreamSourceRuntime(
+  value: unknown,
+): StreamSourceRuntime | null {
+  const candidate = asRecord(value);
+  if (!candidate) return null;
+
+  return {
+    ready: candidate.ready === true,
+    statusSource:
+      normalizeStreamSourceStatusSource(candidate.statusSource) ?? "none",
+    captureMode:
+      normalizeStreamSourceCaptureMode(candidate.captureMode) ?? "none",
+    degradedReason: normalizeStreamSourceDegradedReason(
+      candidate.degradedReason,
+    ),
+    currentSceneUrl: asNonEmptyString(candidate.currentSceneUrl),
+    activeBundle: asNonEmptyString(candidate.activeBundle),
+    lastFrameAt: asFiniteNumber(candidate.lastFrameAt),
+    lastRenderTickAt: asFiniteNumber(candidate.lastRenderTickAt),
+    lastVisualChangeAt: asFiniteNumber(candidate.lastVisualChangeAt),
+    lastRecoveryAt: asFiniteNumber(candidate.lastRecoveryAt),
+    recoveryCount: Math.max(0, asFiniteNumber(candidate.recoveryCount) ?? 0),
+    workerHeartbeatAt: asFiniteNumber(candidate.workerHeartbeatAt),
+  };
+}
+
+export function resolveBrowserCaptureLastFrameAt(
+  status: BrowserCaptureStatusSnapshot | null | undefined,
+  nowMs: number,
+): number | null {
+  const lastChunkAt = normalizeNonNegativeFiniteNumber(status?.lastChunkAt);
+  if (lastChunkAt != null && lastChunkAt > 0) {
+    return lastChunkAt;
+  }
+
+  const lastChunkAgeMs =
+    normalizeNonNegativeFiniteNumber(status?.lastChunkAgeMs) ??
+    normalizeNonNegativeFiniteNumber(status?.lastChunkMs);
+  if (lastChunkAgeMs == null) {
+    return null;
+  }
+
+  return Math.max(0, nowMs - lastChunkAgeMs);
+}
+
+export function buildUnavailableStreamSourceRuntime(params?: {
+  statusSource?: StreamSourceStatusSource;
+  captureMode?: StreamSourceCaptureMode;
+  degradedReason?: StreamSourceDegradedReason | null;
+  currentSceneUrl?: string | null;
+  activeBundle?: string | null;
+  lastFrameAt?: number | null;
+  lastRenderTickAt?: number | null;
+  lastVisualChangeAt?: number | null;
+  lastRecoveryAt?: number | null;
+  recoveryCount?: number;
+  workerHeartbeatAt?: number | null;
+}): StreamSourceRuntime {
+  return {
+    ready: false,
+    statusSource: params?.statusSource ?? "none",
+    captureMode: params?.captureMode ?? "none",
+    degradedReason: params?.degradedReason ?? "unknown",
+    currentSceneUrl: params?.currentSceneUrl ?? null,
+    activeBundle: params?.activeBundle ?? null,
+    lastFrameAt: params?.lastFrameAt ?? null,
+    lastRenderTickAt: params?.lastRenderTickAt ?? null,
+    lastVisualChangeAt: params?.lastVisualChangeAt ?? null,
+    lastRecoveryAt: params?.lastRecoveryAt ?? null,
+    recoveryCount: Math.max(0, params?.recoveryCount ?? 0),
+    workerHeartbeatAt: params?.workerHeartbeatAt ?? null,
+  };
+}
diff --git a/packages/server/src/streaming/stream-capture.ts b/packages/server/src/streaming/stream-capture.ts
index 34b792f66..6e1008fce 100644
--- a/packages/server/src/streaming/stream-capture.ts
+++ b/packages/server/src/streaming/stream-capture.ts
@@ -52,6 +52,23 @@ export function getStreamCapture(): {
     bridgeActive: boolean;
     ffmpegRunning: boolean;
     clientConnected: boolean;
+    bytesReceived: number;
+    uptime: number;
+    destinations: number;
+    restartAttempts: number;
+    lastCrash: number;
+    healthy: boolean;
+    droppedFrames: number;
+    backpressured: boolean;
+    spectators: number;
+    encoderFps?: number | null;
+    processMemory: {
+      rssBytes: number;
+      heapTotalBytes: number;
+      heapUsedBytes: number;
+      externalBytes: number;
+      arrayBuffersBytes: number;
+    };
   };
 } {
   const bridge = peekRTMPBridge();
@@ -64,6 +81,23 @@ export function getStreamCapture(): {
         bridgeActive: false,
         ffmpegRunning: false,
         clientConnected: false,
+        bytesReceived: 0,
+        uptime: 0,
+        destinations: 0,
+        restartAttempts: 0,
+        lastCrash: 0,
+        healthy: false,
+        droppedFrames: 0,
+        backpressured: false,
+        spectators: 0,
+        encoderFps: null,
+        processMemory: {
+          rssBytes: 0,
+          heapTotalBytes: 0,
+          heapUsedBytes: 0,
+          externalBytes: 0,
+          arrayBuffersBytes: 0,
+        },
       }),
     };
   }
diff --git a/packages/server/src/streaming/stream-destinations.test.ts b/packages/server/src/streaming/stream-destinations.test.ts
new file mode 100644
index 000000000..0338b54ed
--- /dev/null
+++ b/packages/server/src/streaming/stream-destinations.test.ts
@@ -0,0 +1,41 @@
+import { describe, expect, it } from "vitest";
+
+import {
+  isStreamDestinationEnabled,
+  resolveEnabledStreamDestinations,
+} from "./stream-destinations.js";
+
+describe("stream destination selection", () => {
+  it("keeps destinations enabled by default for backwards compatibility", () => {
+    const enabledDestinations = resolveEnabledStreamDestinations(undefined);
+
+    expect(isStreamDestinationEnabled(enabledDestinations, "external")).toBe(
+      true,
+    );
+    expect(isStreamDestinationEnabled(enabledDestinations, "twitch")).toBe(
+      true,
+    );
+  });
+
+  it("allows self-HLS-only staging to disable external delivery", () => {
+    const enabledDestinations = resolveEnabledStreamDestinations("self_hls");
+
+    expect(isStreamDestinationEnabled(enabledDestinations, "external")).toBe(
+      false,
+    );
+    expect(isStreamDestinationEnabled(enabledDestinations, "twitch")).toBe(
+      false,
+    );
+  });
+
+  it("recognizes Cloudflare as the external delivery destination", () => {
+    const enabledDestinations = resolveEnabledStreamDestinations("cloudflare");
+
+    expect(isStreamDestinationEnabled(enabledDestinations, "external")).toBe(
+      true,
+    );
+    expect(isStreamDestinationEnabled(enabledDestinations, "twitch")).toBe(
+      false,
+    );
+  });
+});
diff --git a/packages/server/src/streaming/stream-destinations.ts b/packages/server/src/streaming/stream-destinations.ts
index c24593c3d..4c3097634 100644
--- a/packages/server/src/streaming/stream-destinations.ts
+++ b/packages/server/src/streaming/stream-destinations.ts
@@ -1,5 +1,6 @@
 export type StreamDestinationKind =
   | "custom"
+  | "external"
   | "kick"
   | "multiplexer"
   | "pumpfun"
@@ -8,7 +9,12 @@ export type StreamDestinationKind =
   | "youtube";
 
 const DESTINATION_ALIASES: Record<string, StreamDestinationKind> = {
+  cloudflare: "external",
+  cloudflarelive: "external",
+  cloudflarestream: "external",
   custom: "custom",
+  external: "external",
+  externaldelivery: "external",
   kick: "kick",
   multiplexer: "multiplexer",
   pump: "pumpfun",
diff --git a/packages/server/src/streaming/stream-status-artifacts.ts b/packages/server/src/streaming/stream-status-artifacts.ts
new file mode 100644
index 000000000..538b090e4
--- /dev/null
+++ b/packages/server/src/streaming/stream-status-artifacts.ts
@@ -0,0 +1,88 @@
+import fs from "node:fs";
+import path from "node:path";
+
+export type HlsManifestSnapshot = {
+  updatedAt: number | null;
+  mediaSequence: number | null;
+};
+
+const HLS_MANIFEST_CACHE_TTL_MS = 250;
+
+let cachedManifestPath: string | null = null;
+let cachedManifestReadAt = 0;
+let cachedManifestSnapshot: HlsManifestSnapshot | null = null;
+
+function asNonEmptyString(value: string | undefined): string | null {
+  const normalized = value?.trim();
+  return normalized ? normalized : null;
+}
+
+export function resolveExternalStatusFile(
+  env: NodeJS.ProcessEnv = process.env,
+): string | null {
+  const explicit = asNonEmptyString(env.RTMP_STATUS_FILE);
+  if (explicit) {
+    return explicit;
+  }
+
+  const hlsOutputPath = asNonEmptyString(env.HLS_OUTPUT_PATH);
+  if (!hlsOutputPath) {
+    return null;
+  }
+
+  return path.join(path.dirname(hlsOutputPath), "rtmp-status.json");
+}
+
+export function readLocalHlsManifestSnapshot(
+  env: NodeJS.ProcessEnv = process.env,
+): HlsManifestSnapshot {
+  const hlsOutputPath = asNonEmptyString(env.HLS_OUTPUT_PATH);
+  if (!hlsOutputPath) {
+    return {
+      updatedAt: null,
+      mediaSequence: null,
+    };
+  }
+
+  if (
+    cachedManifestPath === hlsOutputPath &&
+    cachedManifestSnapshot &&
+    Date.now() - cachedManifestReadAt <= HLS_MANIFEST_CACHE_TTL_MS
+  ) {
+    return cachedManifestSnapshot;
+  }
+
+  try {
+    const stat = fs.statSync(hlsOutputPath);
+    const rawManifest = fs.readFileSync(hlsOutputPath, "utf8");
+    const mediaSequenceMatch = rawManifest.match(
+      /#EXT-X-MEDIA-SEQUENCE:(\d+)/i,
+    );
+    const mediaSequence = mediaSequenceMatch
+      ? Number.parseInt(mediaSequenceMatch[1] || "", 10)
+      : null;
+
+    const snapshot = {
+      updatedAt: Number.isFinite(stat.mtimeMs)
+        ? Math.round(stat.mtimeMs)
+        : null,
+      mediaSequence:
+        mediaSequence != null && Number.isFinite(mediaSequence)
+          ? mediaSequence
+          : null,
+    };
+    cachedManifestPath = hlsOutputPath;
+    cachedManifestReadAt = Date.now();
+    cachedManifestSnapshot = snapshot;
+    return snapshot;
+  } catch {
+    const snapshot = {
+      updatedAt: null,
+      mediaSequence: null,
+    };
+    cachedManifestPath = hlsOutputPath;
+    cachedManifestReadAt = Date.now();
+    cachedManifestSnapshot = snapshot;
+    return snapshot;
+  }
+}
diff --git a/packages/server/src/streaming/types.ts b/packages/server/src/streaming/types.ts
index 1b7c55808..773aee093 100644
--- a/packages/server/src/streaming/types.ts
+++ b/packages/server/src/streaming/types.ts
@@ -1,3 +1,9 @@
+import type {
+  StreamDeliveryTransport,
+  StreamDestinationProvider,
+  StreamDestinationRole,
+} from "./delivery-config.js";
+
 /**
  * RTMP Streaming Types
  *
@@ -6,7 +12,13 @@
 
 /** RTMP destination configuration */
 export interface RTMPDestination {
+  id?: string;
   name: string;
+  role?: StreamDestinationRole;
+  provider?: StreamDestinationProvider;
+  transport?: StreamDeliveryTransport;
+  playbackUrl?: string | null;
+  ingestUrl?: string | null;
   url: string;
   key: string;
   enabled: boolean;
@@ -28,19 +40,34 @@ export interface StreamingConfig {
   preset: "ultrafast" | "veryfast" | "fast" | "medium";
   /** Keyframe interval in frames */
   gopSize: number;
-  /** Capture mode: 'cdp' uses Page.startScreencast, 'mediarecorder' uses legacy WebSocket path, 'webcodecs' uses hardware VideoEncoder */
-  captureMode: "cdp" | "mediarecorder" | "webcodecs";
+  /** Capture mode: 'cdp' uses Page.startScreencast, 'mediarecorder' uses legacy WebSocket path, 'webcodecs' uses hardware VideoEncoder, 'x11_nvenc' uses X11 desktop capture + NVENC encode */
+  captureMode: "cdp" | "mediarecorder" | "webcodecs" | "x11_nvenc";
   /** JPEG quality for CDP screencast frames (1-100, default 80) */
   jpegQuality: number;
 }
 
 /** Stream status for a single destination */
 export interface DestinationStatus {
+  id?: string;
   name: string;
+  role?: StreamDestinationRole;
+  provider?: StreamDestinationProvider;
+  transport?: StreamDeliveryTransport;
+  playbackUrl?: string | null;
+  ingestUrl?: string | null;
   connected: boolean;
   error?: string;
   bytesWritten: number;
   startedAt?: number;
+  /**
+   * Wallclock ms of the most recent fatal write-error attributed to this
+   * destination (slave-muxer failure, av_interleaved_write_frame error,
+   * RTMPS session invalidated, etc.). Used to prevent the "FFmpeg
+   * is still emitting `frame=` progress so everything must be OK" false
+   * positive from flipping `connected` back to `true` while the RTMP
+   * destination is actually dark.
+   */
+  lastWriteErrorAt?: number | null;
 }
 
 /** Overall streaming status */
diff --git a/packages/server/src/systems/DuelScheduler/BettingPoolManager.ts b/packages/server/src/systems/DuelScheduler/BettingPoolManager.ts
new file mode 100644
index 000000000..9d1255613
--- /dev/null
+++ b/packages/server/src/systems/DuelScheduler/BettingPoolManager.ts
@@ -0,0 +1,522 @@
+/**
+ * BettingPoolManager — Handles bet placement, pool aggregation, and claim creation
+ *
+ * Works with the DuelBettingBridge for market lifecycle and the solanaBets/solanaPayoutJobs
+ * tables for persistence. Emits betting:pool:updated events on the World.
+ */
+
+import type { World } from "@hyperscape/shared";
+import { eq, and, sql } from "drizzle-orm";
+import { getDatabase } from "../../database/client.js";
+import {
+  solanaBets,
+  solanaPayoutJobs,
+  arenaRounds,
+} from "../../database/schema.js";
+import { Logger } from "../ServerNetwork/services";
+import { randomUUID } from "node:crypto";
+
+export interface BetPlacement {
+  roundId: string;
+  side: "A" | "B";
+  amount: string; // string to preserve precision
+  walletAddress: string;
+}
+
+export interface PoolState {
+  roundId: string;
+  sideATotal: string;
+  sideBTotal: string;
+  sideACount: number;
+  sideBCount: number;
+}
+
+export interface BetRecord {
+  id: string;
+  roundId: string;
+  side: string;
+  amount: string;
+  walletAddress: string;
+  status: string;
+  createdAt: number;
+}
+
+const MAX_BETS_BY_WALLET_LIMIT = 100;
+const MAX_BETTING_LEADERBOARD_LIMIT = 100;
+const MAX_BETS_PER_WALLET_PER_ROUND = 100;
+
+export class BettingPoolManager {
+  private readonly world: World;
+
+  constructor(world: World) {
+    this.world = world;
+  }
+
+  /**
+   * Place a bet on a duel market.
+   */
+  async placeBet(
+    bet: BetPlacement,
+  ): Promise<{ success: boolean; error?: string; betId?: string }> {
+    const db = getDatabase();
+
+    // Verify the round exists and is in betting phase
+    const bridge = (
+      this.world as World & {
+        duelBettingBridge?: {
+          getMarket(id: string): { status: string } | null;
+        };
+      }
+    ).duelBettingBridge;
+    const market = bridge?.getMarket(bet.roundId);
+
+    if (!market) {
+      return { success: false, error: "Market not found" };
+    }
+
+    if (market.status !== "betting") {
+      return {
+        success: false,
+        error: `Market is ${market.status}, betting is closed`,
+      };
+    }
+
+    if (!isValidPositiveDecimalAmount(bet.amount)) {
+      return { success: false, error: "Invalid bet amount" };
+    }
+
+    if (!isValidSolanaWalletAddress(bet.walletAddress)) {
+      return { success: false, error: "Invalid wallet address" };
+    }
+
+    const betId = randomUUID();
+    try {
+      const insertResult = await db.transaction(async (tx) => {
+        const lockedRounds = await tx.execute<{
+          id: string;
+          bettingClosesAt: number;
+          duelEndsAt: number | null;
+          winnerId: string | null;
+        }>(
+          sql`
+            SELECT
+              id,
+              "bettingClosesAt",
+              "duelEndsAt",
+              "winnerId"
+            FROM arena_rounds
+            WHERE id = ${bet.roundId}
+            FOR UPDATE
+          `,
+        );
+        const round = lockedRounds.rows[0];
+        if (!round) {
+          return { success: false, error: "Round not found" } as const;
+        }
+        if (
+          round.bettingClosesAt <= Date.now() ||
+          round.duelEndsAt !== null ||
+          round.winnerId !== null
+        ) {
+          return {
+            success: false,
+            error: "Market is locked, betting is closed",
+          } as const;
+        }
+
+        // The round row lock above serializes market-close checks for this
+        // round. This per-wallet xact lock makes the bet-count invariant
+        // explicit too: concurrent requests for the same wallet/round cannot
+        // both count N and insert N+1.
+        await tx.execute(sql`
+          SELECT pg_advisory_xact_lock(
+            hashtext(${bet.roundId}),
+            hashtext(${bet.walletAddress})
+          )
+        `);
+
+        const existingBetCountRows = await tx
+          .select({
+            count: sql<number>`COUNT(*)::INT`,
+          })
+          .from(solanaBets)
+          .where(
+            and(
+              eq(solanaBets.roundId, bet.roundId),
+              eq(solanaBets.bettorWallet, bet.walletAddress),
+              eq(solanaBets.status, "CONFIRMED"),
+            ),
+          );
+        const existingBetCount = Number(existingBetCountRows[0]?.count ?? 0);
+        if (existingBetCount >= MAX_BETS_PER_WALLET_PER_ROUND) {
+          return {
+            success: false,
+            error: "Too many bets for this wallet on this round",
+          } as const;
+        }
+
+        await tx.insert(solanaBets).values({
+          id: betId,
+          roundId: bet.roundId,
+          bettorWallet: bet.walletAddress,
+          side: bet.side,
+          sourceAsset: "GOLD",
+          sourceAmount: bet.amount,
+          goldAmount: bet.amount,
+          status: "CONFIRMED",
+          createdAt: Date.now(),
+          updatedAt: Date.now(),
+        });
+        return { success: true } as const;
+      });
+      if (!insertResult.success) {
+        return { success: false, error: insertResult.error };
+      }
+    } catch (err) {
+      Logger.error(
+        "BettingPoolManager",
+        "Failed to insert bet",
+        err instanceof Error ? err : null,
+        {
+          roundId: bet.roundId,
+          wallet: redactWalletAddress(bet.walletAddress),
+        },
+      );
+      return { success: false, error: "Database error" };
+    }
+
+    // Emit pool update
+    const pool = await this.getPool(bet.roundId);
+    if (pool) {
+      this.world.emit("betting:pool:updated", {
+        roundId: bet.roundId,
+        sideATotal: pool.sideATotal,
+        sideBTotal: pool.sideBTotal,
+        sideACount: pool.sideACount,
+        sideBCount: pool.sideBCount,
+      });
+    }
+
+    Logger.info("BettingPoolManager", "Bet placed", {
+      betId,
+      roundId: bet.roundId,
+      side: bet.side,
+      amount: bet.amount,
+      wallet: redactWalletAddress(bet.walletAddress),
+    });
+
+    return { success: true, betId };
+  }
+
+  /**
+   * Get aggregated pool totals for a round.
+   */
+  async getPool(roundId: string): Promise<PoolState | null> {
+    const db = getDatabase();
+
+    try {
+      const result = await db
+        .select({
+          side: solanaBets.side,
+          total: sql<string>`COALESCE(SUM(CAST(${solanaBets.goldAmount} AS NUMERIC)), 0)::TEXT`,
+          count: sql<number>`COUNT(*)::INT`,
+        })
+        .from(solanaBets)
+        .where(
+          and(
+            eq(solanaBets.roundId, roundId),
+            eq(solanaBets.status, "CONFIRMED"),
+          ),
+        )
+        .groupBy(solanaBets.side);
+
+      const pool: PoolState = {
+        roundId,
+        sideATotal: "0",
+        sideBTotal: "0",
+        sideACount: 0,
+        sideBCount: 0,
+      };
+
+      for (const row of result) {
+        if (row.side === "A") {
+          pool.sideATotal = row.total;
+          pool.sideACount = row.count;
+        } else if (row.side === "B") {
+          pool.sideBTotal = row.total;
+          pool.sideBCount = row.count;
+        }
+      }
+
+      return pool;
+    } catch (err) {
+      Logger.error(
+        "BettingPoolManager",
+        "Failed to get pool",
+        err instanceof Error ? err : null,
+        { roundId },
+      );
+      return null;
+    }
+  }
+
+  /**
+   * Get bet history for a wallet.
+   */
+  async getBetsByWallet(
+    walletAddress: string,
+    limit = 50,
+  ): Promise<BetRecord[]> {
+    const db = getDatabase();
+    const boundedLimit = Math.max(
+      1,
+      Math.min(Math.trunc(limit), MAX_BETS_BY_WALLET_LIMIT),
+    );
+
+    try {
+      const rows = await db
+        .select({
+          id: solanaBets.id,
+          roundId: solanaBets.roundId,
+          side: solanaBets.side,
+          amount: solanaBets.goldAmount,
+          walletAddress: solanaBets.bettorWallet,
+          status: solanaBets.status,
+          createdAt: solanaBets.createdAt,
+        })
+        .from(solanaBets)
+        .where(eq(solanaBets.bettorWallet, walletAddress))
+        .orderBy(sql`${solanaBets.createdAt} DESC`)
+        .limit(boundedLimit);
+
+      return rows;
+    } catch (err) {
+      Logger.error(
+        "BettingPoolManager",
+        "Failed to get bets by wallet",
+        err instanceof Error ? err : null,
+        { wallet: redactWalletAddress(walletAddress) },
+      );
+      return [];
+    }
+  }
+
+  /**
+   * Create a claim/payout job for a winning bettor.
+   */
+  async createClaimJob(
+    roundId: string,
+    walletAddress: string,
+  ): Promise<{ success: boolean; error?: string; jobId?: string }> {
+    const db = getDatabase();
+
+    const jobId = randomUUID();
+    try {
+      const result = await db.transaction(async (tx) => {
+        // pg_try_advisory_xact_lock returns immediately with false if another
+        // transaction holds the lock, instead of blocking. If a concurrent
+        // claim for the same (round, wallet) pair hangs mid-transaction, the
+        // original pg_advisory_xact_lock would queue everyone behind it —
+        // that's an easy DoS vector on the payout path. Returning a conflict
+        // error lets the caller retry.
+        const lockRows = await tx.execute<{ acquired: boolean }>(sql`
+          SELECT pg_try_advisory_xact_lock(
+            hashtext(${roundId}),
+            hashtext(${walletAddress})
+          ) AS acquired
+        `);
+        if (!lockRows.rows[0]?.acquired) {
+          return {
+            success: false,
+            error: "A concurrent claim is in progress; retry shortly",
+          } as const;
+        }
+
+        const lockedRounds = await tx.execute<{
+          id: string;
+          winnerId: string | null;
+          agentAId: string;
+          agentBId: string;
+        }>(
+          sql`
+            SELECT
+              id,
+              "winnerId",
+              "agentAId",
+              "agentBId"
+            FROM arena_rounds
+            WHERE id = ${roundId}
+            FOR UPDATE
+          `,
+        );
+        const round = lockedRounds.rows[0];
+        if (!round) {
+          return { success: false, error: "Round not found" } as const;
+        }
+        if (!round.winnerId) {
+          return {
+            success: false,
+            error: "Round has not resolved yet",
+          } as const;
+        }
+
+        const winningSide =
+          round.winnerId === round.agentAId
+            ? "A"
+            : round.winnerId === round.agentBId
+              ? "B"
+              : null;
+        if (!winningSide) {
+          return {
+            success: false,
+            error: "Round winner does not match either bettor side",
+          } as const;
+        }
+
+        const bets = await tx
+          .select()
+          .from(solanaBets)
+          .where(
+            and(
+              eq(solanaBets.roundId, roundId),
+              eq(solanaBets.bettorWallet, walletAddress),
+              eq(solanaBets.status, "CONFIRMED"),
+            ),
+          );
+
+        if (bets.length === 0) {
+          return {
+            success: false,
+            error: "No confirmed bet found for this round",
+          } as const;
+        }
+
+        const hasWinningBet = bets.some((bet) => bet.side === winningSide);
+        if (!hasWinningBet) {
+          return {
+            success: false,
+            error: "No winning bet found for this round",
+          } as const;
+        }
+
+        // Deliberately status-blind: any payout job for this
+        // (round, wallet) pair is the idempotency record, including
+        // READY_FOR_PAYOUT / FAILED rows. Narrowing this by status would allow
+        // duplicate claim jobs unless a database unique constraint is added.
+        const existing = await tx
+          .select()
+          .from(solanaPayoutJobs)
+          .where(
+            and(
+              eq(solanaPayoutJobs.roundId, roundId),
+              eq(solanaPayoutJobs.bettorWallet, walletAddress),
+            ),
+          )
+          .limit(1);
+
+        if (existing.length > 0) {
+          return { success: true, jobId: existing[0].id } as const;
+        }
+
+        await tx.insert(solanaPayoutJobs).values({
+          id: jobId,
+          roundId,
+          bettorWallet: walletAddress,
+          status: "PENDING",
+          attempts: 0,
+          createdAt: Date.now(),
+          updatedAt: Date.now(),
+        });
+        return { success: true, jobId } as const;
+      });
+      if (!result.success) {
+        return { success: false, error: result.error };
+      }
+      Logger.info("BettingPoolManager", "Claim job created", {
+        jobId: result.jobId,
+        roundId,
+        wallet: redactWalletAddress(walletAddress),
+      });
+      return { success: true, jobId: result.jobId };
+    } catch (err) {
+      Logger.error(
+        "BettingPoolManager",
+        "Failed to create payout job",
+        err instanceof Error ? err : null,
+        { roundId, wallet: redactWalletAddress(walletAddress) },
+      );
+      return { success: false, error: "Database error" };
+    }
+  }
+
+  /**
+   * Get leaderboard — top bettors by total winnings.
+   */
+  async getLeaderboard(
+    limit = 20,
+  ): Promise<
+    Array<{ wallet: string; totalBets: number; totalWagered: string }>
+  > {
+    const db = getDatabase();
+    const boundedLimit = Math.max(
+      1,
+      Math.min(Math.trunc(limit), MAX_BETTING_LEADERBOARD_LIMIT),
+    );
+
+    try {
+      const rows = await db
+        .select({
+          wallet: solanaBets.bettorWallet,
+          totalBets: sql<number>`COUNT(*)::INT`,
+          totalWagered: sql<string>`COALESCE(SUM(CAST(${solanaBets.goldAmount} AS NUMERIC)), 0)::TEXT`,
+        })
+        .from(solanaBets)
+        .where(eq(solanaBets.status, "CONFIRMED"))
+        .groupBy(solanaBets.bettorWallet)
+        .orderBy(sql`SUM(CAST(${solanaBets.goldAmount} AS NUMERIC)) DESC`)
+        .limit(boundedLimit);
+
+      return rows;
+    } catch (err) {
+      Logger.error(
+        "BettingPoolManager",
+        "Failed to get leaderboard",
+        err instanceof Error ? err : null,
+      );
+      return [];
+    }
+  }
+}
+
+function isValidSolanaWalletAddress(walletAddress: string): boolean {
+  return /^[1-9A-HJ-NP-Za-km-z]{32,44}$/.test(walletAddress.trim());
+}
+
+// Integer portion capped at 18 digits (~10^18, covers lamports/gwei scale),
+// fractional capped at 8 digits. Unlimited precision previously admitted
+// strings like "1.123456789012345678901234567890" that could exacerbate
+// rounding errors in NUMERIC SUM aggregation and on-chain serialization.
+const BET_AMOUNT_PATTERN = /^(?:0|[1-9]\d{0,17})(?:\.\d{1,8})?$/;
+
+function isValidPositiveDecimalAmount(amount: string): boolean {
+  const normalized = amount.trim();
+  if (!BET_AMOUNT_PATTERN.test(normalized)) {
+    return false;
+  }
+  return !/^0+(?:\.0+)?$/.test(normalized);
+}
+
+/** @internal Pure helpers exposed for financial input-validation tests. */
+export const __bettingPoolManagerTestInternals = {
+  MAX_BETS_PER_WALLET_PER_ROUND,
+  isValidPositiveDecimalAmount,
+  isValidSolanaWalletAddress,
+};
+
+export function redactWalletAddress(walletAddress: string): string {
+  const trimmed = walletAddress.trim();
+  if (trimmed.length <= 12) {
+    return trimmed;
+  }
+  return `${trimmed.slice(0, 8)}...${trimmed.slice(-4)}`;
+}
diff --git a/packages/server/src/systems/DuelScheduler/PayoutKeeper.ts b/packages/server/src/systems/DuelScheduler/PayoutKeeper.ts
new file mode 100644
index 000000000..c184917ad
--- /dev/null
+++ b/packages/server/src/systems/DuelScheduler/PayoutKeeper.ts
@@ -0,0 +1,377 @@
+/**
+ * PayoutKeeper — Processes solanaPayoutJobs and sends winnings to bettors.
+ *
+ * Custodial model for launch: the server's operator wallet sends SOL/tokens
+ * to winning bettors. The fight oracle records results on-chain for verifiability.
+ *
+ * Polls the solanaPayoutJobs table every 5s for PENDING entries.
+ * Implements exponential backoff on failure, max 5 attempts.
+ */
+
+import { eq, and, inArray, sql } from "drizzle-orm";
+import { getDatabase } from "../../database/client.js";
+import {
+  solanaPayoutJobs,
+  solanaBets,
+  arenaRounds,
+} from "../../database/schema.js";
+import { Logger } from "../ServerNetwork/services";
+import { redactWalletAddress } from "./BettingPoolManager.js";
+
+const POLL_INTERVAL_MS = 5_000;
+const MAX_ATTEMPTS = 5;
+const BASE_BACKOFF_MS = 10_000;
+const MAX_BATCH_SIZE = 10;
+const PROCESSING_LEASE_MS = 60_000;
+const MAX_PERSISTED_ERROR_LENGTH = 240;
+
+let pollTimer: ReturnType<typeof setInterval> | null = null;
+let processing = false;
+
+type PayoutDb = ReturnType<typeof getDatabase>;
+type PayoutTransaction = Parameters<Parameters<PayoutDb["transaction"]>[0]>[0];
+type PayoutDbClient = Pick<PayoutTransaction, "execute" | "select" | "update">;
+
+function sanitizePayoutError(error: unknown): string {
+  const raw = error instanceof Error ? error.message : "Unknown error";
+  const sanitized = raw
+    .replace(/https?:\/\/\S+/gi, "[url]")
+    .replace(/\b[1-9A-HJ-NP-Za-km-z]{32,88}\b/g, "[id]")
+    .replace(/\s+/g, " ")
+    .trim();
+  return (sanitized || "Unknown error").slice(0, MAX_PERSISTED_ERROR_LENGTH);
+}
+
+/**
+ * Start the payout keeper polling loop.
+ */
+export function startPayoutKeeper(): void {
+  if (pollTimer) return;
+
+  Logger.info("PayoutKeeper", "Starting payout keeper");
+
+  // Initial run
+  void processJobs();
+
+  pollTimer = setInterval(() => {
+    void processJobs();
+  }, POLL_INTERVAL_MS);
+  pollTimer.unref();
+}
+
+/**
+ * Stop the payout keeper.
+ */
+export function stopPayoutKeeper(): void {
+  if (pollTimer) {
+    clearInterval(pollTimer);
+    pollTimer = null;
+  }
+  processing = false;
+  Logger.info("PayoutKeeper", "Payout keeper stopped");
+}
+
+async function processJobs(): Promise<void> {
+  if (processing) return;
+  processing = true;
+
+  try {
+    const db = getDatabase();
+    const jobs = await db.transaction(async (tx) => {
+      const claimedJobIds = await claimDuePayoutJobIds(
+        tx,
+        Date.now(),
+        MAX_BATCH_SIZE,
+      );
+      return loadClaimedPayoutJobs(tx, claimedJobIds);
+    });
+    if (jobs.length === 0) {
+      return;
+    }
+
+    for (const job of jobs) {
+      await db.transaction(async (tx) => processOneJob(tx, job));
+    }
+  } catch (err) {
+    Logger.error(
+      "PayoutKeeper",
+      "Job processing loop failed",
+      err instanceof Error ? err : null,
+    );
+  } finally {
+    processing = false;
+  }
+}
+
+export async function claimDuePayoutJobIds(
+  tx: Pick<PayoutTransaction, "execute">,
+  now: number,
+  limit: number,
+): Promise<string[]> {
+  const boundedLimit = Math.max(1, Math.min(Math.trunc(limit), MAX_BATCH_SIZE));
+  const leaseUntil = now + PROCESSING_LEASE_MS;
+  const result = await tx.execute<{ id: string }>(sql`
+    WITH due AS (
+      SELECT "id"
+      FROM "solana_payout_jobs"
+      WHERE "status" = 'PENDING'
+        AND ("nextAttemptAt" IS NULL OR "nextAttemptAt" <= ${now})
+      ORDER BY "createdAt" ASC
+      LIMIT ${boundedLimit}
+      FOR UPDATE SKIP LOCKED
+    )
+    UPDATE "solana_payout_jobs"
+    SET "nextAttemptAt" = ${leaseUntil},
+        "updatedAt" = ${now}
+    WHERE "id" IN (SELECT "id" FROM due)
+    RETURNING "id"
+  `);
+
+  return result.rows
+    .map((row) => (typeof row.id === "string" ? row.id : null))
+    .filter((id): id is string => Boolean(id));
+}
+
+async function loadClaimedPayoutJobs(
+  tx: Pick<PayoutTransaction, "select">,
+  jobIds: readonly string[],
+): Promise<Array<typeof solanaPayoutJobs.$inferSelect>> {
+  if (jobIds.length === 0) {
+    return [];
+  }
+
+  const jobs = await tx
+    .select()
+    .from(solanaPayoutJobs)
+    .where(inArray(solanaPayoutJobs.id, [...jobIds]));
+  const jobsById = new Map(jobs.map((job) => [job.id, job]));
+
+  return jobIds
+    .map((jobId) => jobsById.get(jobId) ?? null)
+    .filter((job): job is typeof solanaPayoutJobs.$inferSelect => job !== null);
+}
+
+async function processOneJob(
+  db: PayoutDbClient,
+  job: typeof solanaPayoutJobs.$inferSelect,
+): Promise<void> {
+  try {
+    const lockRows = await db.execute<{ acquired: boolean }>(sql`
+      SELECT pg_try_advisory_xact_lock(
+        hashtext(${job.id}),
+        hashtext(${job.bettorWallet})
+      ) AS acquired
+    `);
+    if (!lockRows.rows[0]?.acquired) {
+      Logger.warn(
+        "PayoutKeeper",
+        "Payout job already locked by another worker",
+        {
+          jobId: job.id,
+          roundId: job.roundId,
+        },
+      );
+      return;
+    }
+
+    // Look up the round to check if it's resolved and who won
+    const rounds = await db
+      .select()
+      .from(arenaRounds)
+      .where(eq(arenaRounds.id, job.roundId))
+      .limit(1);
+
+    if (rounds.length === 0) {
+      await markFailed(db, job.id, "Round not found");
+      return;
+    }
+
+    const round = rounds[0];
+    if (!round.winnerId) {
+      // Round not resolved yet — schedule retry
+      await scheduleRetry(db, job.id, job.attempts, "Round not yet resolved");
+      return;
+    }
+
+    // Get the bettor's bets for this round
+    const bets = await db
+      .select()
+      .from(solanaBets)
+      .where(
+        and(
+          eq(solanaBets.roundId, job.roundId),
+          eq(solanaBets.bettorWallet, job.bettorWallet),
+          eq(solanaBets.status, "CONFIRMED"),
+        ),
+      );
+
+    if (bets.length === 0) {
+      await markFailed(db, job.id, "No confirmed bets found");
+      return;
+    }
+
+    // Determine if this bettor won
+    // Agent A is the round's agentAId, Agent B is agentBId
+    const winningSide =
+      round.winnerId === round.agentAId
+        ? "A"
+        : round.winnerId === round.agentBId
+          ? "B"
+          : null;
+    if (!winningSide) {
+      await markFailed(db, job.id, "Round winner does not match either side");
+      return;
+    }
+    const userBetOnWinner = bets.some((b) => b.side === winningSide);
+
+    if (!userBetOnWinner) {
+      // Bettor lost — mark job as complete (no payout needed).
+      // Guard on status='PENDING' so two instances racing on the same job
+      // won't both transition it; the loser's update matches zero rows.
+      const lostUpdate = await db
+        .update(solanaPayoutJobs)
+        .set({ status: "NO_PAYOUT", updatedAt: Date.now() })
+        .where(
+          and(
+            eq(solanaPayoutJobs.id, job.id),
+            eq(solanaPayoutJobs.status, "PENDING"),
+          ),
+        )
+        .returning({ id: solanaPayoutJobs.id });
+      if (lostUpdate.length === 0) {
+        // Another worker beat us to this job; skip logging to avoid noise.
+        return;
+      }
+
+      Logger.info("PayoutKeeper", "Bettor lost — no payout", {
+        jobId: job.id,
+        wallet: redactWalletAddress(job.bettorWallet),
+        roundId: job.roundId,
+      });
+      return;
+    }
+
+    // Calculate payout: (user's winning bet / total winning pool) * total pool
+    // For now, mark as READY_FOR_PAYOUT — actual transfer will be implemented
+    // when the token infrastructure is connected.
+    // Same status guard as above prevents duplicate transitions under races.
+    const readyUpdate = await db
+      .update(solanaPayoutJobs)
+      .set({
+        status: "READY_FOR_PAYOUT",
+        updatedAt: Date.now(),
+      })
+      .where(
+        and(
+          eq(solanaPayoutJobs.id, job.id),
+          eq(solanaPayoutJobs.status, "PENDING"),
+        ),
+      )
+      .returning({ id: solanaPayoutJobs.id });
+    if (readyUpdate.length === 0) {
+      return;
+    }
+
+    Logger.info("PayoutKeeper", "Payout job marked ready", {
+      jobId: job.id,
+      wallet: redactWalletAddress(job.bettorWallet),
+      roundId: job.roundId,
+      winningSide,
+    });
+
+    // Payout transfer plumbing is not wired in this branch yet. The keeper
+    // intentionally stops at READY_FOR_PAYOUT after recording the winner so a
+    // transfer-capable follow-up can calculate the final amount, submit the
+    // Solana transfer, persist claimSignature, and then mark COMPLETE.
+  } catch (err) {
+    Logger.error(
+      "PayoutKeeper",
+      "Failed to process job",
+      err instanceof Error ? err : null,
+      { jobId: job.id, roundId: job.roundId },
+    );
+    await scheduleRetry(db, job.id, job.attempts, sanitizePayoutError(err));
+  }
+}
+
+async function scheduleRetry(
+  db: PayoutDbClient,
+  jobId: string,
+  currentAttempts: number,
+  error: string,
+): Promise<void> {
+  const nextAttempt = currentAttempts + 1;
+
+  if (nextAttempt >= MAX_ATTEMPTS) {
+    await markFailed(db, jobId, error);
+    return;
+  }
+
+  const backoff = BASE_BACKOFF_MS * Math.pow(2, currentAttempts);
+  const nextAttemptAt = Date.now() + backoff;
+
+  // Guard on status='PENDING' so a concurrent worker that has already
+  // transitioned this job to READY_FOR_PAYOUT / NO_PAYOUT / FAILED can't
+  // be rolled back to PENDING by a late scheduleRetry call.
+  const retryUpdate = await db
+    .update(solanaPayoutJobs)
+    .set({
+      attempts: nextAttempt,
+      lastError: error,
+      nextAttemptAt,
+      updatedAt: Date.now(),
+    })
+    .where(
+      and(
+        eq(solanaPayoutJobs.id, jobId),
+        eq(solanaPayoutJobs.status, "PENDING"),
+      ),
+    )
+    .returning({ id: solanaPayoutJobs.id });
+  if (retryUpdate.length === 0) {
+    return;
+  }
+
+  Logger.warn("PayoutKeeper", "Scheduled retry", {
+    jobId,
+    attempt: nextAttempt,
+    backoffMs: backoff,
+    error,
+  });
+}
+
+async function markFailed(
+  db: PayoutDbClient,
+  jobId: string,
+  error: string,
+): Promise<void> {
+  // Same PENDING guard as scheduleRetry / processOneJob — prevents a stale
+  // worker from overwriting a terminal state set by another instance.
+  const failUpdate = await db
+    .update(solanaPayoutJobs)
+    .set({
+      status: "FAILED",
+      lastError: error,
+      updatedAt: Date.now(),
+    })
+    .where(
+      and(
+        eq(solanaPayoutJobs.id, jobId),
+        eq(solanaPayoutJobs.status, "PENDING"),
+      ),
+    )
+    .returning({ id: solanaPayoutJobs.id });
+  if (failUpdate.length === 0) {
+    return;
+  }
+
+  Logger.error("PayoutKeeper", "Job permanently failed", null, {
+    jobId,
+    error,
+  });
+}
+
+/** @internal Transactional helpers exposed for payout keeper regression tests. */
+export const __payoutKeeperTestInternals = {
+  processOneJob,
+};
diff --git a/packages/server/src/systems/DuelScheduler/SolanaArenaOperator.ts b/packages/server/src/systems/DuelScheduler/SolanaArenaOperator.ts
new file mode 100644
index 000000000..c4ddcd119
--- /dev/null
+++ b/packages/server/src/systems/DuelScheduler/SolanaArenaOperator.ts
@@ -0,0 +1,596 @@
+/**
+ * SolanaArenaOperator — Implements SolanaArenaOperatorInterface for DuelBettingBridge
+ *
+ * Sends raw Solana transactions to the deployed Fight Oracle program.
+ * Uses @solana/web3.js directly (no Anchor dependency).
+ *
+ * Env vars:
+ *   SOLANA_RPC_URL              — Solana RPC endpoint (required)
+ *   SOLANA_REPORTER_PRIVATE_KEY — Reporter keypair as base58 or JSON byte array (required)
+ *   SOLANA_FIGHT_ORACLE_PROGRAM_ID — Override program ID (optional)
+ */
+
+import {
+  Connection,
+  Keypair,
+  PublicKey,
+  SystemProgram,
+  TransactionInstruction,
+  TransactionMessage,
+  VersionedTransaction,
+} from "@solana/web3.js";
+import bs58 from "bs58";
+import { createHash } from "node:crypto";
+import { Logger } from "../ServerNetwork/services";
+
+// ============================================================================
+// Constants
+// ============================================================================
+
+const DEFAULT_PROGRAM_ID = "6Tx7s2UG4maFWakRFVi4GeecXJYyBXQF8f2vJdQShSpV";
+
+/** PDA seeds matching the Anchor program */
+const ORACLE_CONFIG_SEED = new TextEncoder().encode("oracle_config");
+const DUEL_STATE_SEED = new TextEncoder().encode("duel");
+
+/** Anchor instruction discriminators (from IDL) */
+const UPSERT_DUEL_DISCRIMINATOR = Buffer.from([
+  174, 7, 139, 223, 70, 128, 251, 128,
+]);
+const REPORT_RESULT_DISCRIMINATOR = Buffer.from([
+  195, 187, 161, 107, 75, 154, 102, 183,
+]);
+
+/** DuelStatus enum indices (Borsh u8) */
+const DUEL_STATUS = {
+  Scheduled: 0,
+  BettingOpen: 1,
+  Locked: 2,
+  Resolved: 3,
+  Cancelled: 4,
+} as const;
+
+/** MarketSide enum indices (Borsh u8) */
+const MARKET_SIDE = {
+  None: 0,
+  A: 1,
+  B: 2,
+} as const;
+
+const TX_CONFIRM_TIMEOUT_MS = 30_000;
+
+// ============================================================================
+// Borsh serialization helpers
+// ============================================================================
+
+function writeU8(buf: Buffer, offset: number, val: number): number {
+  buf.writeUInt8(val, offset);
+  return offset + 1;
+}
+
+function writeI64(buf: Buffer, offset: number, val: bigint): number {
+  buf.writeBigInt64LE(val, offset);
+  return offset + 8;
+}
+
+function writeU64(buf: Buffer, offset: number, val: bigint): number {
+  buf.writeBigUInt64LE(val, offset);
+  return offset + 8;
+}
+
+function writeBytes32(buf: Buffer, offset: number, bytes: Uint8Array): number {
+  Buffer.from(bytes).copy(buf, offset);
+  return offset + 32;
+}
+
+function writeBorshString(buf: Buffer, offset: number, str: string): number {
+  const strBytes = Buffer.from(str, "utf-8");
+  buf.writeUInt32LE(strBytes.length, offset);
+  offset += 4;
+  strBytes.copy(buf, offset);
+  return offset + strBytes.length;
+}
+
+// ============================================================================
+// PDA derivation
+// ============================================================================
+
+function findOracleConfigPda(programId: PublicKey): [PublicKey, number] {
+  return PublicKey.findProgramAddressSync([ORACLE_CONFIG_SEED], programId);
+}
+
+function findDuelStatePda(
+  duelKeyBytes: Uint8Array,
+  programId: PublicKey,
+): [PublicKey, number] {
+  return PublicKey.findProgramAddressSync(
+    [DUEL_STATE_SEED, duelKeyBytes],
+    programId,
+  );
+}
+
+function hexToBytes32(hex: string): Uint8Array {
+  const normalized = hex.startsWith("0x") ? hex.slice(2) : hex;
+  if (normalized.length !== 64) {
+    throw new Error(
+      `Expected 32-byte hex string, got ${normalized.length / 2} bytes`,
+    );
+  }
+  if (!/^[0-9a-fA-F]{64}$/.test(normalized)) {
+    throw new Error("Expected 32-byte hex string");
+  }
+  const out = new Uint8Array(32);
+  for (let i = 0; i < 32; i++) {
+    out[i] = parseInt(normalized.slice(i * 2, i * 2 + 2), 16);
+  }
+  return out;
+}
+
+function hashParticipant(id: string): Uint8Array {
+  return createHash("sha256").update(id).digest();
+}
+
+// ============================================================================
+// Instruction builders
+// ============================================================================
+
+function buildUpsertDuelInstruction(params: {
+  reporter: PublicKey;
+  oracleConfig: PublicKey;
+  duelState: PublicKey;
+  programId: PublicKey;
+  duelKeyBytes: Uint8Array;
+  participantAHash: Uint8Array;
+  participantBHash: Uint8Array;
+  betOpenTs: bigint;
+  betCloseTs: bigint;
+  duelStartTs: bigint;
+  metadataUri: string;
+  status: number;
+}): TransactionInstruction {
+  const uriBytes = Buffer.from(params.metadataUri, "utf-8");
+  // 8 (disc) + 32 (duelKey) + 32 (partA) + 32 (partB) + 8*3 (timestamps) + 4+len (uri) + 1 (status)
+  const dataLen = 8 + 32 + 32 + 32 + 24 + 4 + uriBytes.length + 1;
+  const data = Buffer.alloc(dataLen);
+
+  let offset = 0;
+  UPSERT_DUEL_DISCRIMINATOR.copy(data, offset);
+  offset += 8;
+  offset = writeBytes32(data, offset, params.duelKeyBytes);
+  offset = writeBytes32(data, offset, params.participantAHash);
+  offset = writeBytes32(data, offset, params.participantBHash);
+  offset = writeI64(data, offset, params.betOpenTs);
+  offset = writeI64(data, offset, params.betCloseTs);
+  offset = writeI64(data, offset, params.duelStartTs);
+  offset = writeBorshString(data, offset, params.metadataUri);
+  writeU8(data, offset, params.status);
+
+  return new TransactionInstruction({
+    keys: [
+      { pubkey: params.reporter, isSigner: true, isWritable: true },
+      { pubkey: params.oracleConfig, isSigner: false, isWritable: false },
+      { pubkey: params.duelState, isSigner: false, isWritable: true },
+      { pubkey: SystemProgram.programId, isSigner: false, isWritable: false },
+    ],
+    programId: params.programId,
+    data,
+  });
+}
+
+function buildReportResultInstruction(params: {
+  reporter: PublicKey;
+  oracleConfig: PublicKey;
+  duelState: PublicKey;
+  programId: PublicKey;
+  duelKeyBytes: Uint8Array;
+  winner: number;
+  seed: bigint;
+  replayHash: Uint8Array;
+  resultHash: Uint8Array;
+  duelEndTs: bigint;
+  metadataUri: string;
+}): TransactionInstruction {
+  const uriBytes = Buffer.from(params.metadataUri, "utf-8");
+  // 8 (disc) + 32 (duelKey) + 1 (winner) + 8 (seed) + 32 (replayHash) + 32 (resultHash) + 8 (duelEndTs) + 4+len (uri)
+  const dataLen = 8 + 32 + 1 + 8 + 32 + 32 + 8 + 4 + uriBytes.length;
+  const data = Buffer.alloc(dataLen);
+
+  let offset = 0;
+  REPORT_RESULT_DISCRIMINATOR.copy(data, offset);
+  offset += 8;
+  offset = writeBytes32(data, offset, params.duelKeyBytes);
+  offset = writeU8(data, offset, params.winner);
+  offset = writeU64(data, offset, params.seed);
+  offset = writeBytes32(data, offset, params.replayHash);
+  offset = writeBytes32(data, offset, params.resultHash);
+  offset = writeI64(data, offset, params.duelEndTs);
+  writeBorshString(data, offset, params.metadataUri);
+
+  return new TransactionInstruction({
+    keys: [
+      { pubkey: params.reporter, isSigner: true, isWritable: true },
+      { pubkey: params.oracleConfig, isSigner: false, isWritable: false },
+      { pubkey: params.duelState, isSigner: false, isWritable: true },
+    ],
+    programId: params.programId,
+    data,
+  });
+}
+
+// ============================================================================
+// SolanaArenaOperator
+// ============================================================================
+
+export class SolanaArenaOperator {
+  private readonly connection: Connection | null;
+  private readonly reporter: Keypair | null;
+  private readonly programId: PublicKey;
+  private readonly oracleConfigPda: PublicKey;
+  private readonly _enabled: boolean;
+
+  constructor() {
+    const rpcUrl = process.env.SOLANA_RPC_URL;
+    const reporterKey = process.env.SOLANA_REPORTER_PRIVATE_KEY;
+    const programIdStr =
+      process.env.SOLANA_FIGHT_ORACLE_PROGRAM_ID || DEFAULT_PROGRAM_ID;
+
+    if (!rpcUrl || !reporterKey) {
+      this._enabled = false;
+      this.connection = null;
+      this.reporter = null;
+      this.programId = new PublicKey(programIdStr);
+      this.oracleConfigPda = PublicKey.default;
+      Logger.info(
+        "SolanaArenaOperator",
+        "Disabled — missing SOLANA_RPC_URL or SOLANA_REPORTER_PRIVATE_KEY",
+      );
+      return;
+    }
+
+    this.connection = new Connection(rpcUrl, "confirmed");
+    this.reporter = parseKeypair(reporterKey);
+    this.programId = new PublicKey(programIdStr);
+    [this.oracleConfigPda] = findOracleConfigPda(this.programId);
+    this._enabled = true;
+
+    Logger.info("SolanaArenaOperator", "Initialized", {
+      rpcUrl: rpcUrl.replace(/\/\/.*@/, "//***@"), // redact credentials
+      reporter: this.reporter.publicKey.toBase58(),
+      programId: this.programId.toBase58(),
+    });
+  }
+
+  isEnabled(): boolean {
+    return this._enabled;
+  }
+
+  private requireEnabledResources(): {
+    connection: Connection;
+    reporter: Keypair;
+  } {
+    if (!this._enabled || this.connection === null || this.reporter === null) {
+      throw new Error("SolanaArenaOperator is disabled");
+    }
+    return {
+      connection: this.connection,
+      reporter: this.reporter,
+    };
+  }
+
+  /**
+   * Initialize a round on-chain by calling upsert_duel with BettingOpen status
+   */
+  async initRound(
+    roundSeedHex: string,
+    bettingClosesAtMs: number,
+  ): Promise<{
+    closeSlot: number;
+    initOracleSignature: string | null;
+    initMarketSignature: string | null;
+  } | null> {
+    if (!this._enabled) return null;
+
+    try {
+      const { connection, reporter } = this.requireEnabledResources();
+      const duelKeyBytes = hexToBytes32(roundSeedHex);
+      const [duelStatePda] = findDuelStatePda(duelKeyBytes, this.programId);
+
+      const nowSec = BigInt(Math.floor(Date.now() / 1000));
+      const closeSec = BigInt(Math.floor(bettingClosesAtMs / 1000));
+
+      // Use roundSeedHex to derive participant hashes for init
+      // Actual participant hashes are updated by subsequent upsert calls from the bridge
+      const participantAHash = hashParticipant(`${roundSeedHex}:A`);
+      const participantBHash = hashParticipant(`${roundSeedHex}:B`);
+
+      const metadataUri = `${process.env.DUEL_METADATA_BASE_URL || "https://hyperscape.game/api/duels"}/${roundSeedHex}`;
+
+      const ix = buildUpsertDuelInstruction({
+        reporter: reporter.publicKey,
+        oracleConfig: this.oracleConfigPda,
+        duelState: duelStatePda,
+        programId: this.programId,
+        duelKeyBytes,
+        participantAHash,
+        participantBHash,
+        betOpenTs: nowSec,
+        betCloseTs: closeSec,
+        duelStartTs: closeSec,
+        metadataUri,
+        status: DUEL_STATUS.BettingOpen,
+      });
+
+      const sig = await this.sendAndConfirm([ix]);
+
+      Logger.info("SolanaArenaOperator", "initRound succeeded", {
+        roundSeedHex,
+        signature: sig,
+      });
+
+      // Approximate close slot (assuming 400ms slot time)
+      const slotsUntilClose = Math.ceil((bettingClosesAtMs - Date.now()) / 400);
+      const currentSlot = await connection.getSlot();
+
+      return {
+        closeSlot: currentSlot + Math.max(slotsUntilClose, 1),
+        initOracleSignature: sig,
+        initMarketSignature: null,
+      };
+    } catch (error) {
+      Logger.error(
+        "SolanaArenaOperator",
+        "initRound failed",
+        error instanceof Error ? error : null,
+        { roundSeedHex },
+      );
+      return null;
+    }
+  }
+
+  /**
+   * Lock the market by calling upsert_duel with Locked status
+   */
+  async lockMarket(roundSeedHex: string): Promise<string | null> {
+    if (!this._enabled) return null;
+
+    try {
+      const { reporter } = this.requireEnabledResources();
+      const duelKeyBytes = hexToBytes32(roundSeedHex);
+      const [duelStatePda] = findDuelStatePda(duelKeyBytes, this.programId);
+
+      const nowSec = BigInt(Math.floor(Date.now() / 1000));
+      const participantAHash = hashParticipant(`${roundSeedHex}:A`);
+      const participantBHash = hashParticipant(`${roundSeedHex}:B`);
+      const metadataUri = `${process.env.DUEL_METADATA_BASE_URL || "https://hyperscape.game/api/duels"}/${roundSeedHex}`;
+
+      const ix = buildUpsertDuelInstruction({
+        reporter: reporter.publicKey,
+        oracleConfig: this.oracleConfigPda,
+        duelState: duelStatePda,
+        programId: this.programId,
+        duelKeyBytes,
+        participantAHash,
+        participantBHash,
+        betOpenTs: nowSec - 60n, // keep original open time approximate
+        betCloseTs: nowSec,
+        duelStartTs: nowSec,
+        metadataUri,
+        status: DUEL_STATUS.Locked,
+      });
+
+      const sig = await this.sendAndConfirm([ix]);
+
+      Logger.info("SolanaArenaOperator", "lockMarket succeeded", {
+        roundSeedHex,
+        signature: sig,
+      });
+
+      return sig;
+    } catch (error) {
+      Logger.error(
+        "SolanaArenaOperator",
+        "lockMarket failed",
+        error instanceof Error ? error : null,
+        { roundSeedHex },
+      );
+      return null;
+    }
+  }
+
+  /**
+   * Report duel result and resolve the market on-chain
+   */
+  async reportAndResolve(params: {
+    roundSeedHex: string;
+    winnerSide: "A" | "B";
+    resultHashHex: string;
+    metadataUri: string;
+  }): Promise<{
+    reportSignature: string | null;
+    resolveSignature: string | null;
+  } | null> {
+    if (!this._enabled) return null;
+
+    try {
+      const { reporter } = this.requireEnabledResources();
+      const duelKeyBytes = hexToBytes32(params.roundSeedHex);
+      const [duelStatePda] = findDuelStatePda(duelKeyBytes, this.programId);
+
+      const winner = params.winnerSide === "A" ? MARKET_SIDE.A : MARKET_SIDE.B;
+
+      const resultHashBytes = hexToBytes32(params.resultHashHex);
+      const replayHash = createHash("sha256")
+        .update(`replay:${params.roundSeedHex}`)
+        .digest();
+
+      // This is deterministic proof material derived from the round seed,
+      // not fresh entropy. Reporter authorization on the Solana instruction
+      // remains the security boundary; these values let the keeper
+      // reconstruct the same report payload if it misses a live event.
+      const seedBuf = createHash("sha256")
+        .update(`seed:${params.roundSeedHex}`)
+        .digest();
+      const seed = seedBuf.readBigUInt64LE(0);
+
+      const nowSec = BigInt(Math.floor(Date.now() / 1000));
+
+      const ix = buildReportResultInstruction({
+        reporter: reporter.publicKey,
+        oracleConfig: this.oracleConfigPda,
+        duelState: duelStatePda,
+        programId: this.programId,
+        duelKeyBytes,
+        winner,
+        seed,
+        replayHash,
+        resultHash: resultHashBytes,
+        duelEndTs: nowSec,
+        metadataUri: params.metadataUri,
+      });
+
+      const sig = await this.sendAndConfirm([ix]);
+
+      Logger.info("SolanaArenaOperator", "reportAndResolve succeeded", {
+        roundSeedHex: params.roundSeedHex,
+        winnerSide: params.winnerSide,
+        signature: sig,
+      });
+
+      return {
+        reportSignature: sig,
+        resolveSignature: sig,
+      };
+    } catch (error) {
+      Logger.error(
+        "SolanaArenaOperator",
+        "reportAndResolve failed",
+        error instanceof Error ? error : null,
+        { roundSeedHex: params.roundSeedHex },
+      );
+      return null;
+    }
+  }
+
+  // --------------------------------------------------------------------------
+  // Transaction helpers
+  // --------------------------------------------------------------------------
+
+  private async sendAndConfirm(
+    instructions: TransactionInstruction[],
+  ): Promise<string> {
+    const { connection, reporter } = this.requireEnabledResources();
+    const { blockhash, lastValidBlockHeight } =
+      await connection.getLatestBlockhash("confirmed");
+
+    const message = new TransactionMessage({
+      payerKey: reporter.publicKey,
+      recentBlockhash: blockhash,
+      instructions,
+    }).compileToV0Message();
+
+    const tx = new VersionedTransaction(message);
+    tx.sign([reporter]);
+
+    const sig = await connection.sendTransaction(tx, {
+      skipPreflight: false,
+      maxRetries: 3,
+    });
+
+    // confirmTransaction can block indefinitely on RPC stalls or a partitioned
+    // network. Cap with an explicit timeout so the caller surfaces a clean
+    // error instead of a stuck transaction that ties up the reporter wallet.
+    let confirmTimer: ReturnType<typeof setTimeout> | null = null;
+    try {
+      await Promise.race([
+        connection.confirmTransaction(
+          { signature: sig, blockhash, lastValidBlockHeight },
+          "confirmed",
+        ),
+        new Promise<never>((_, reject) => {
+          confirmTimer = setTimeout(
+            () =>
+              reject(
+                new Error(
+                  `confirmTransaction timed out after ${TX_CONFIRM_TIMEOUT_MS}ms (signature=${sig})`,
+                ),
+              ),
+            TX_CONFIRM_TIMEOUT_MS,
+          );
+        }),
+      ]);
+    } finally {
+      if (confirmTimer !== null) clearTimeout(confirmTimer);
+    }
+
+    return sig;
+  }
+}
+
+// ============================================================================
+// Helpers
+// ============================================================================
+
+function parseKeypair(raw: string): Keypair {
+  const assertSecretKeyLength = (bytes: Uint8Array): Uint8Array => {
+    if (bytes.length !== 64) {
+      throw new Error(
+        `Reporter private key must decode to 64 bytes; received ${bytes.length}`,
+      );
+    }
+    return bytes;
+  };
+
+  const trimmed = raw.trim();
+  if (trimmed.length > 1024) {
+    throw new Error("Reporter private key input is unexpectedly large");
+  }
+
+  // JSON byte array: [1,2,3,...]
+  if (trimmed.startsWith("[")) {
+    let parsed: unknown;
+    try {
+      parsed = JSON.parse(trimmed);
+    } catch (err) {
+      throw new Error(
+        `Reporter private key JSON is malformed: ${err instanceof Error ? err.message : String(err)}`,
+      );
+    }
+    if (!Array.isArray(parsed)) {
+      throw new Error("Reporter private key JSON must be a number array");
+    }
+    // Uint8Array.from silently coerces out-of-range or non-integer values
+    // (e.g. 256 → 0, -1 → 255, "1" → 1). Validate each byte explicitly so a
+    // corrupted key fails loud instead of producing an attacker-controlled
+    // reporter identity.
+    for (const byte of parsed) {
+      if (
+        typeof byte !== "number" ||
+        !Number.isInteger(byte) ||
+        byte < 0 ||
+        byte > 255
+      ) {
+        throw new Error(
+          "Reporter private key JSON must contain only integers in [0, 255]",
+        );
+      }
+    }
+    return Keypair.fromSecretKey(
+      assertSecretKeyLength(Uint8Array.from(parsed as number[])),
+    );
+  }
+
+  return Keypair.fromSecretKey(assertSecretKeyLength(bs58.decode(trimmed)));
+}
+
+/** @internal Pure helpers exposed for byte-layout regression tests. */
+export const __solanaArenaOperatorTestInternals = {
+  DUEL_STATUS,
+  MARKET_SIDE,
+  REPORT_RESULT_DISCRIMINATOR,
+  UPSERT_DUEL_DISCRIMINATOR,
+  buildReportResultInstruction,
+  buildUpsertDuelInstruction,
+  hashParticipant,
+  hexToBytes32,
+  parseKeypair,
+};
diff --git a/packages/server/src/systems/ServerNetwork/connection-handler.ts b/packages/server/src/systems/ServerNetwork/connection-handler.ts
index 4455b0283..2677e5143 100644
--- a/packages/server/src/systems/ServerNetwork/connection-handler.ts
+++ b/packages/server/src/systems/ServerNetwork/connection-handler.ts
@@ -188,6 +188,31 @@ export class ConnectionHandler {
     return this.hasStreamingViewerAccessToken(params) || this.isLoopbackWs(ws);
   }
 
+  private logStreamingViewerDecision(
+    level: "info" | "warn",
+    ws: NodeWebSocket,
+    params: ConnectionParams,
+    reason: string,
+    extra?: Record<string, unknown>,
+  ): void {
+    const payload = {
+      path: "/ws",
+      route: "/ws",
+      mode: params.mode ?? null,
+      hasStreamToken:
+        typeof params.streamToken === "string" &&
+        params.streamToken.trim().length > 0,
+      remoteAddress: ws.__remoteAddress ?? null,
+      reason,
+      ...extra,
+    };
+    const logger = level === "warn" ? console.warn : console.info;
+    logger(
+      "[ConnectionHandler] Streaming viewer access",
+      JSON.stringify(payload),
+    );
+  }
+
   /**
    * Handle incoming WebSocket connection
    *
@@ -1658,18 +1683,44 @@ export class ConnectionHandler {
   ): Promise<void> {
     try {
       const requiresRestrictedAccess = STREAMING_PUBLIC_DELAY_MS > 0;
+      const hasStreamToken = this.hasStreamingViewerAccessToken(params);
+      const isLoopback = this.isLoopbackWs(ws);
       if (requiresRestrictedAccess) {
-        const bypassSync = this.hasStreamingBypassAccess(ws, params);
+        const bypassSync = hasStreamToken || isLoopback;
         const bypassAuth = bypassSync
           ? true
           : await verifyStreamingViewerCredentials(params, this.db);
         if (!bypassSync && !bypassAuth) {
+          this.logStreamingViewerDecision("warn", ws, params, "access_denied", {
+            requiresRestrictedAccess,
+            bypassSync,
+            bypassAuth,
+            authRoute: "none",
+          });
           console.warn(
             "[ConnectionHandler] 🚫 Rejected public streaming websocket: delayed public mode requires dev, loopback, streamToken, or verified login",
           );
           ws.close(4001, "Streaming viewer access denied");
           return;
         }
+
+        this.logStreamingViewerDecision("info", ws, params, "accepted", {
+          requiresRestrictedAccess,
+          bypassSync,
+          bypassAuth,
+          authRoute: hasStreamToken
+            ? "stream_token"
+            : isLoopback
+              ? "loopback"
+              : "verified_login",
+        });
+      } else {
+        this.logStreamingViewerDecision("info", ws, params, "accepted", {
+          requiresRestrictedAccess,
+          bypassSync: false,
+          bypassAuth: true,
+          authRoute: "public_no_delay",
+        });
       }
 
       console.log("[ConnectionHandler] 📺 Streaming viewer connecting...");
diff --git a/packages/server/src/systems/ServerNetwork/duel-settlement.ts b/packages/server/src/systems/ServerNetwork/duel-settlement.ts
index 203feb2e0..909cee138 100644
--- a/packages/server/src/systems/ServerNetwork/duel-settlement.ts
+++ b/packages/server/src/systems/ServerNetwork/duel-settlement.ts
@@ -7,7 +7,7 @@
  * Extracted from ServerNetwork to keep the main orchestrator lean.
  */
 
-import { getItem, World } from "@hyperscape/shared";
+import { getItem, World, MAX_COINS } from "@hyperscape/shared";
 import { InventoryRepository } from "../../database/repositories/InventoryRepository";
 import type { ServerSocket } from "../../shared/types";
 
@@ -399,7 +399,7 @@ async function executeDuelStakeTransfer(
               };
               const existingSlot = existingRow.slotIndex;
               const existingQty = existingRow.quantity;
-              if (existingQty > 2147483647 - transferQuantity) {
+              if (existingQty > MAX_COINS - transferQuantity) {
                 console.error(
                   `[Duel] SECURITY: Stack merge would overflow! ` +
                     `winnerId=${winnerId}, itemId=${stake.itemId}, ` +
@@ -438,7 +438,7 @@ async function executeDuelStakeTransfer(
                 id: string;
                 quantity: number;
               };
-              if (bankRow.quantity > 2147483647 - transferQuantity) {
+              if (bankRow.quantity > MAX_COINS - transferQuantity) {
                 console.error(
                   `[Duel] SECURITY: Bank stack merge would overflow! ` +
                     `winnerId=${winnerId}, itemId=${stake.itemId}, ` +
diff --git a/packages/server/src/systems/ServerNetwork/event-bridge.ts b/packages/server/src/systems/ServerNetwork/event-bridge.ts
index 6b751feaa..468664cc0 100644
--- a/packages/server/src/systems/ServerNetwork/event-bridge.ts
+++ b/packages/server/src/systems/ServerNetwork/event-bridge.ts
@@ -773,6 +773,8 @@ export class EventBridge {
           const playerData = data.data as {
             health: { current: number; max: number };
             alive: boolean;
+            specialEnergy?: number;
+            specialAttackActive?: boolean;
           };
 
           // Send to specific player AND spectators with flat health values for client
@@ -783,6 +785,8 @@ export class EventBridge {
               health: playerData.health.current,
               maxHealth: playerData.health.max,
               alive: playerData.alive,
+              specialEnergy: playerData.specialEnergy,
+              specialAttackActive: playerData.specialAttackActive,
             },
           );
         }
diff --git a/packages/server/src/systems/ServerNetwork/handlers/combat.ts b/packages/server/src/systems/ServerNetwork/handlers/combat.ts
index bf7c07554..d26b04301 100644
--- a/packages/server/src/systems/ServerNetwork/handlers/combat.ts
+++ b/packages/server/src/systems/ServerNetwork/handlers/combat.ts
@@ -413,3 +413,23 @@ export function handleSetAutoRetaliate(
     enabled: payload.enabled,
   });
 }
+
+/**
+ * Handle special attack toggle request from client
+ *
+ * OSRS: Player clicks the spec bar to toggle special attack ON/OFF.
+ * Server validates energy and rate-limits in PlayerSystem.
+ */
+export function handleToggleSpecialAttack(
+  socket: ServerSocket,
+  _data: unknown,
+  world: World,
+): void {
+  const playerEntity = socket.player;
+  if (!playerEntity) return;
+
+  // Server authority: use socket.player.id
+  world.emit(EventType.UI_SPECIAL_ATTACK_TOGGLE, {
+    playerId: playerEntity.id,
+  });
+}
diff --git a/packages/server/src/systems/ServerNetwork/index.ts b/packages/server/src/systems/ServerNetwork/index.ts
index 1663b583e..193c0a3fe 100644
--- a/packages/server/src/systems/ServerNetwork/index.ts
+++ b/packages/server/src/systems/ServerNetwork/index.ts
@@ -137,6 +137,7 @@ import {
   handleAttackPlayer,
   handleChangeAttackStyle,
   handleSetAutoRetaliate,
+  handleToggleSpecialAttack,
 } from "./handlers/combat";
 import {
   handlePickupItem,
@@ -258,6 +259,11 @@ import {
 import { TradingSystem } from "../TradingSystem";
 import { DuelSystem } from "../DuelSystem";
 import { DuelScheduler, DuelBettingBridge } from "../DuelScheduler";
+import { SolanaArenaOperator } from "../DuelScheduler/SolanaArenaOperator.js";
+import {
+  startPayoutKeeper,
+  stopPayoutKeeper,
+} from "../DuelScheduler/PayoutKeeper.js";
 import {
   handleDuelChallenge,
   handleDuelChallengeRespond,
@@ -407,6 +413,26 @@ export class ServerNetwork extends System implements NetworkWithSocket {
     Array<{ goalType: string; score: number; breakdown: string }>
   > = new Map();
 
+  /** Agent activity storage (characterId -> recent actions and session stats). */
+  static agentActivity: Map<
+    string,
+    {
+      recentActions: Array<{
+        type: string;
+        description: string;
+        xpGained?: number;
+        timestamp: number;
+      }>;
+      sessionStats: {
+        kills: number;
+        deaths: number;
+        totalXpGained: number;
+        goldEarned: number;
+        resourcesGathered: Record<string, number>;
+      };
+    }
+  > = new Map();
+
   /** Agent thought storage (characterId -> recent thoughts) for dashboard display */
   static agentThoughts: Map<
     string,
@@ -1135,6 +1161,14 @@ export class ServerNetwork extends System implements NetworkWithSocket {
         this.duelScheduler;
     }
 
+    // SolanaArenaOperator — bridge between DuelBettingBridge and the on-chain oracle
+    const solanaOperator = new SolanaArenaOperator();
+    if (solanaOperator.isEnabled()) {
+      (
+        this.world as World & { solanaArenaOperator?: SolanaArenaOperator }
+      ).solanaArenaOperator = solanaOperator;
+    }
+
     // DuelBettingBridge - connects duel results to Solana prediction markets
     // Creates betting markets when duels are scheduled and resolves them when complete
     // Enable via DUEL_BETTING_ENABLED=true environment variable
@@ -1146,6 +1180,11 @@ export class ServerNetwork extends System implements NetworkWithSocket {
       this.world as { duelBettingBridge?: DuelBettingBridge }
     ).duelBettingBridge = this.duelBettingBridge;
 
+    // Start payout keeper for processing bet claims
+    if (process.env.DUEL_BETTING_ENABLED === "true") {
+      startPayoutKeeper();
+    }
+
     // Listen for player teleport events (used by duel system)
     this.onWorld("player:teleport", (event) => {
       const { playerId, position, rotation, suppressEffect } =
@@ -2223,6 +2262,9 @@ export class ServerNetwork extends System implements NetworkWithSocket {
     this.handlers["onSetAutoRetaliate"] = (socket, data) =>
       handleSetAutoRetaliate(socket, data, this.world);
 
+    this.handlers["onToggleSpecialAttack"] = (socket, data) =>
+      handleToggleSpecialAttack(socket, data, this.world);
+
     // Autocast spell selection (F2P magic combat)
     this.handlers["onSetAutocast"] = (socket, data) => {
       const playerEntity = socket.player;
@@ -3262,9 +3304,11 @@ export class ServerNetwork extends System implements NetworkWithSocket {
     ServerNetwork.agentGoals.clear();
     ServerNetwork.agentAvailableGoals.clear();
     ServerNetwork.agentGoalsPaused.clear();
+    ServerNetwork.agentActivity.clear();
     ServerNetwork.agentThoughts.clear();
     ServerNetwork.agentPersonality.clear();
     ServerNetwork.agentDesireScores.clear();
+    stopPayoutKeeper();
 
     // Clean up duel event listeners to prevent memory leak
     if (this.cleanupDuelEventListeners) {
diff --git a/packages/server/src/systems/StreamingDuelScheduler/__tests__/DuelOrchestrator.test.ts b/packages/server/src/systems/StreamingDuelScheduler/__tests__/DuelOrchestrator.test.ts
new file mode 100644
index 000000000..40eb9e9ba
--- /dev/null
+++ b/packages/server/src/systems/StreamingDuelScheduler/__tests__/DuelOrchestrator.test.ts
@@ -0,0 +1,45 @@
+import { describe, expect, it } from "vitest";
+import {
+  type DuelArenaConfig,
+  getDuelArenaConfig,
+  isPositionInsideCombatArena,
+  tileChebyshevDistance,
+  worldToTile,
+} from "@hyperscape/shared";
+import { computeStreamingArenaEngagementSpawnPoints } from "../managers/DuelOrchestrator";
+
+function expectAdjacent(spawns: {
+  agent1: { x: number; z: number };
+  agent2: { x: number; z: number };
+}) {
+  expect(
+    tileChebyshevDistance(
+      worldToTile(spawns.agent1.x, spawns.agent1.z),
+      worldToTile(spawns.agent2.x, spawns.agent2.z),
+    ),
+  ).toBe(1);
+}
+
+describe("DuelOrchestrator streaming arena spawns", () => {
+  it("places streaming contestants on adjacent combat tiles inside the arena", () => {
+    const spawns =
+      computeStreamingArenaEngagementSpawnPoints(getDuelArenaConfig());
+
+    expectAdjacent(spawns);
+    expect(isPositionInsideCombatArena(spawns.agent1.x, spawns.agent1.z)).toBe(
+      true,
+    );
+    expect(isPositionInsideCombatArena(spawns.agent2.x, spawns.agent2.z)).toBe(
+      true,
+    );
+  });
+
+  it("keeps adjacent combat spacing for width-oriented arena layouts", () => {
+    const config: DuelArenaConfig = {
+      ...getDuelArenaConfig(),
+      spawnLayout: "alongWidth",
+    };
+
+    expectAdjacent(computeStreamingArenaEngagementSpawnPoints(config));
+  });
+});
diff --git a/packages/server/src/systems/StreamingDuelScheduler/__tests__/StreamingDuelScheduler.test.ts b/packages/server/src/systems/StreamingDuelScheduler/__tests__/StreamingDuelScheduler.test.ts
index 12cf3940d..0a93fd790 100644
--- a/packages/server/src/systems/StreamingDuelScheduler/__tests__/StreamingDuelScheduler.test.ts
+++ b/packages/server/src/systems/StreamingDuelScheduler/__tests__/StreamingDuelScheduler.test.ts
@@ -4,6 +4,7 @@ import { StreamingDuelScheduler } from "../index";
 /** Legacy constant kept for test assertions. */
 const DUEL_FOOD_ITEM = "shark";
 import { isDuelFoodItemId } from "../../duelFood";
+import { Logger } from "../../ServerNetwork/services/Logger";
 
 type SkillMap = Record<string, { level: number; xp: number }>;
 
@@ -379,6 +380,321 @@ function createMockWorld(options?: {
   };
 }
 
+describe("StreamingDuelScheduler endCycle guard", () => {
+  beforeEach(() => {
+    vi.useFakeTimers();
+    vi.setSystemTime(new Date("2026-01-01T00:00:00.000Z"));
+  });
+
+  afterEach(() => {
+    vi.useRealTimers();
+  });
+
+  it("resets the end-cycle guard when a synchronous transition throws", async () => {
+    const ctx = createMockWorld();
+    const scheduler = new StreamingDuelScheduler(ctx.world as never);
+    (scheduler as any).currentCycle = {
+      cycleId: "cycle-sync-throw",
+      duelId: "duel-sync-throw",
+      duelKeyHex: "0xcycle",
+      winnerId: "agent-alpha",
+      loserId: "agent-beta",
+      agent1: { characterId: "agent-alpha" },
+      agent2: { characterId: "agent-beta" },
+    };
+    (scheduler as any).schedulerState = "ACTIVE";
+
+    const originalEmit = ctx.world.emit;
+    ctx.world.emit = ((event: string, payload: unknown) => {
+      if (event === "streaming:resolution:end") {
+        throw new Error("resolution end emit failed");
+      }
+      originalEmit(event, payload);
+    }) as typeof ctx.world.emit;
+
+    expect(() => (scheduler as any).endCycle()).not.toThrow();
+    expect((scheduler as any)._endCycleInProgress).toBe(false);
+    expect((scheduler as any).schedulerState).toBe("IDLE");
+    expect(scheduler.getCurrentCycle()).toBeNull();
+
+    scheduler.destroy();
+  });
+});
+
+describe("StreamingDuelScheduler deterministic countdown start", () => {
+  beforeEach(() => {
+    vi.useFakeTimers();
+    vi.setSystemTime(new Date("2026-01-01T00:00:00.000Z"));
+  });
+
+  afterEach(() => {
+    vi.restoreAllMocks();
+    vi.useRealTimers();
+  });
+
+  function createSchedulerWithActiveAnnouncementCycle() {
+    const ctx = createMockWorld();
+    const scheduler = new StreamingDuelScheduler(ctx.world as never);
+    scheduler.init();
+    scheduler.registerAgent("agent-alpha");
+    scheduler.registerAgent("agent-beta");
+    (scheduler as any).startNewCycle();
+    return { ctx, scheduler };
+  }
+
+  it("uses betCloseTime as the announcement phase deadline in streaming state snapshots", () => {
+    const { scheduler } = createSchedulerWithActiveAnnouncementCycle();
+    const now = Date.now();
+    (scheduler as any).currentCycle.phaseStartTime = now - 55_000;
+    (scheduler as any).currentCycle.betCloseTime = now + 51_000;
+
+    const state = scheduler.getStreamingState();
+
+    expect(state.cycle?.phase).toBe("ANNOUNCEMENT");
+    expect(state.cycle?.phaseEndTime).toBe(now + 51_000);
+    expect(state.cycle?.timeRemaining).toBe(51_000);
+
+    scheduler.destroy();
+  });
+
+  it("does not leave announcement before betCloseTime even if phaseStartTime drifted earlier", () => {
+    const { scheduler } = createSchedulerWithActiveAnnouncementCycle();
+    const now = Date.now();
+    const startCountdownSpy = vi.spyOn(scheduler as any, "startCountdown");
+    (scheduler as any).currentCycle.phaseStartTime = now - 120_000;
+    (scheduler as any).currentCycle.betCloseTime = now + 30_000;
+
+    (scheduler as any).tickAnnouncement(now);
+
+    expect(startCountdownSpy).not.toHaveBeenCalled();
+    expect(scheduler.getCurrentCycle()?.phase).toBe("ANNOUNCEMENT");
+
+    scheduler.destroy();
+  });
+
+  it("primes contestants into the arena during announcement before countdown begins", async () => {
+    const { scheduler } = createSchedulerWithActiveAnnouncementCycle();
+
+    await (scheduler as any).announcementArenaPrepPromise;
+
+    const state = scheduler.getStreamingState();
+    expect(state.cycle?.phase).toBe("ANNOUNCEMENT");
+    expect(state.cycle?.arenaPositions).toMatchObject({
+      agent1: expect.any(Array),
+      agent2: expect.any(Array),
+    });
+
+    scheduler.destroy();
+  });
+
+  it("teleports contestants into the arena before async duel prep finishes", async () => {
+    const ctx = createMockWorld();
+    const scheduler = new StreamingDuelScheduler(ctx.world as never);
+    // TS's control-flow analysis cannot prove the Promise executor
+    // synchronously assigns `resolvePrep`, so narrow it up-front with
+    // a definite-assignment assertion rather than a `| null` union
+    // that ends up narrowed to `null` at the call site.
+    let resolvePrep!: () => void;
+    const prepPromise = new Promise<void>((resolve) => {
+      resolvePrep = () => resolve();
+    });
+    const prepareSpy = vi
+      .spyOn((scheduler as any).orchestrator, "prepareContestantsForDuel")
+      .mockImplementation(() => prepPromise);
+    const teleportSpy = vi.spyOn(
+      (scheduler as any).orchestrator,
+      "teleportToArena",
+    );
+
+    scheduler.init();
+    scheduler.registerAgent("agent-alpha");
+    scheduler.registerAgent("agent-beta");
+    (scheduler as any).startNewCycle();
+
+    await Promise.resolve();
+    await Promise.resolve();
+
+    const state = scheduler.getStreamingState();
+    expect(state.cycle?.phase).toBe("ANNOUNCEMENT");
+    expect(state.cycle?.arenaPositions).toMatchObject({
+      agent1: expect.any(Array),
+      agent2: expect.any(Array),
+    });
+    expect(teleportSpy).toHaveBeenCalledTimes(1);
+    expect(prepareSpy).toHaveBeenCalledTimes(1);
+
+    resolvePrep();
+    await (scheduler as any).announcementArenaPrepPromise;
+
+    scheduler.destroy();
+  });
+
+  it("starts announcement arena prep before downstream cycle event listeners run", async () => {
+    const ctx = createMockWorld();
+    const scheduler = new StreamingDuelScheduler(ctx.world as never);
+    const originalEmit = ctx.world.emit;
+
+    ctx.world.emit = ((event: string, payload: unknown) => {
+      if (event === "duel:scheduled") {
+        throw new Error("duel scheduling listener failed");
+      }
+      originalEmit(event, payload);
+    }) as typeof ctx.world.emit;
+
+    scheduler.init();
+    scheduler.registerAgent("agent-alpha");
+    scheduler.registerAgent("agent-beta");
+
+    expect(() => (scheduler as any).startNewCycle()).toThrow(
+      "duel scheduling listener failed",
+    );
+
+    await Promise.resolve();
+
+    const state = scheduler.getStreamingState();
+    expect(state.cycle?.phase).toBe("ANNOUNCEMENT");
+    expect(state.cycle?.arenaPositions).toMatchObject({
+      agent1: expect.any(Array),
+      agent2: expect.any(Array),
+    });
+
+    scheduler.destroy();
+  });
+
+  it("restarts announcement arena prep from tick if kickoff was skipped", () => {
+    const { scheduler } = createSchedulerWithActiveAnnouncementCycle();
+    const restartSpy = vi.spyOn(scheduler as any, "beginAnnouncementArenaPrep");
+
+    (scheduler as any).announcementArenaPrepPromise = null;
+    (scheduler as any).announcementArenaPrepCycleId = null;
+    (scheduler as any).currentCycle.arenaPositions = null;
+
+    (scheduler as any).tickAnnouncement(Date.now());
+
+    expect(restartSpy).toHaveBeenCalledWith(
+      (scheduler as any).currentCycle.cycleId,
+    );
+
+    scheduler.destroy();
+  });
+
+  it("reuses announcement arena prep when countdown starts", async () => {
+    const ctx = createMockWorld();
+    const scheduler = new StreamingDuelScheduler(ctx.world as never);
+    const prepareSpy = vi.spyOn(
+      (scheduler as any).orchestrator,
+      "prepareContestantsForDuel",
+    );
+    const teleportSpy = vi.spyOn(
+      (scheduler as any).orchestrator,
+      "teleportToArena",
+    );
+
+    scheduler.init();
+    scheduler.registerAgent("agent-alpha");
+    scheduler.registerAgent("agent-beta");
+    (scheduler as any).startNewCycle();
+    await (scheduler as any).announcementArenaPrepPromise;
+
+    expect(prepareSpy).toHaveBeenCalledTimes(1);
+    expect(teleportSpy).toHaveBeenCalledTimes(1);
+
+    await (scheduler as any).startCountdown();
+
+    expect(scheduler.getCurrentCycle()?.phase).toBe("COUNTDOWN");
+    expect(prepareSpy).toHaveBeenCalledTimes(1);
+    expect(teleportSpy).toHaveBeenCalledTimes(1);
+
+    scheduler.destroy();
+  });
+
+  it("starts the fight on tick once fightStartTime has passed even if the timeout is still pending", async () => {
+    const { ctx, scheduler } = createSchedulerWithActiveAnnouncementCycle();
+    await (scheduler as any).startCountdown();
+
+    expect(scheduler.getCurrentCycle()?.phase).toBe("COUNTDOWN");
+    expect((scheduler as any).countdownTimeout).not.toBeNull();
+
+    (scheduler as any).currentCycle.fightStartTime = Date.now() - 250;
+    (scheduler as any).tick();
+
+    expect(scheduler.getCurrentCycle()?.phase).toBe("FIGHTING");
+    expect((scheduler as any).countdownTimeout).toBeNull();
+
+    scheduler.destroy();
+  });
+
+  it("treats a late timeout callback as a no-op once the fight already started", async () => {
+    const { ctx, scheduler } = createSchedulerWithActiveAnnouncementCycle();
+    await (scheduler as any).startCountdown();
+
+    (scheduler as any).currentCycle.fightStartTime = Date.now() - 250;
+    (scheduler as any).tick();
+    const combatCallsAfterStart = ctx.combatCalls.length;
+
+    (scheduler as any).doStartFight(Date.now() + 50, "timeout");
+
+    expect(scheduler.getCurrentCycle()?.phase).toBe("FIGHTING");
+    expect(ctx.combatCalls.length).toBe(combatCallsAfterStart);
+
+    scheduler.destroy();
+  });
+
+  it("logs structured fight-start lag diagnostics", async () => {
+    const infoSpy = vi.spyOn(Logger, "info");
+    const { scheduler } = createSchedulerWithActiveAnnouncementCycle();
+    await (scheduler as any).startCountdown();
+
+    (scheduler as any).currentCycle.fightStartTime = Date.now() - 300;
+    (scheduler as any).tick();
+
+    const lagLog = infoSpy.mock.calls.find(
+      (call) =>
+        call[0] === "StreamingDuelScheduler" &&
+        call[1] === "Fight start committed",
+    );
+    expect(lagLog).toBeDefined();
+    expect(lagLog?.[2]).toMatchObject({
+      scheduledFightStartAt: Date.now() - 300,
+      actualFightStartAt: Date.now(),
+      startTrigger: "tick_fallback",
+    });
+    expect((lagLog?.[2] as { fightStartLagMs?: number }).fightStartLagMs).toBe(
+      300,
+    );
+
+    scheduler.destroy();
+  });
+
+  it("logs prep lag when countdown begins after announcement zero", async () => {
+    const infoSpy = vi.spyOn(Logger, "info");
+    const { scheduler } = createSchedulerWithActiveAnnouncementCycle();
+    (scheduler as any).currentCycle.announcementExpiredAt = Date.now() - 1_500;
+
+    await (scheduler as any).startCountdown();
+
+    const countdownLog = infoSpy.mock.calls.find(
+      (call) =>
+        call[0] === "StreamingDuelScheduler" &&
+        call[1] === "Starting countdown",
+    );
+    expect(countdownLog).toBeDefined();
+    expect(countdownLog?.[2]).toMatchObject({
+      announcementExpiredAt: Date.now() - 1_500,
+      countdownBeganAt: Date.now(),
+    });
+    expect(
+      (countdownLog?.[2] as { announcementZeroToCountdownMs?: number })
+        .announcementZeroToCountdownMs,
+    ).toBeGreaterThanOrEqual(1_500);
+    expect(
+      (countdownLog?.[2] as { prepDurationMs?: number }).prepDurationMs,
+    ).toBeGreaterThanOrEqual(0);
+
+    scheduler.destroy();
+  });
+});
+
 // TODO: These tests need refactoring - they call internal methods via `(scheduler as any)`
 // that have been moved to the orchestrator pattern. Many pass but 23 fail.
 describe.skip("StreamingDuelScheduler", () => {
@@ -426,7 +742,14 @@ describe.skip("StreamingDuelScheduler", () => {
 
     expect(ctx.world.network.send).toHaveBeenCalledWith(
       "streamingState",
-      expect.any(Object),
+      expect.objectContaining({
+        cycle: expect.objectContaining({
+          duelKeyHex: null,
+          duelEndTime: null,
+          seed: null,
+          replayHash: null,
+        }),
+      }),
     );
 
     scheduler.destroy();
@@ -927,16 +1250,15 @@ describe.skip("StreamingDuelScheduler", () => {
     scheduler.destroy();
   });
 
-  it("resets countdown guard and aborts when arena teleport fails", async () => {
+  it("aborts the cycle when announcement arena priming teleport fails", async () => {
     const ctx = createMockWorld();
     const scheduler = new StreamingDuelScheduler(ctx.world as never);
-    scheduler.init();
-
     const teleportSpy = vi
-      .spyOn(scheduler as any, "teleportToArena")
+      .spyOn((scheduler as any).orchestrator, "teleportToArena")
       .mockRejectedValue(new Error("teleport failure"));
 
-    await (scheduler as any).startCountdown();
+    scheduler.init();
+    await (scheduler as any).announcementArenaPrepPromise;
 
     expect((scheduler as any)._startCountdownInProgress).toBe(false);
     expect(scheduler.getCurrentCycle()).toBeNull();
@@ -1380,6 +1702,10 @@ describe.skip("StreamingDuelScheduler", () => {
       winReason: "kill",
       damageWinner: 50,
       damageLoser: 30,
+      duelKeyHex: null,
+      duelEndTime: null,
+      seed: null,
+      replayHash: null,
     });
 
     const duels1 = scheduler.getRecentDuels(10);
diff --git a/packages/server/src/systems/StreamingDuelScheduler/index.ts b/packages/server/src/systems/StreamingDuelScheduler/index.ts
index 018af57dc..5c5083a49 100644
--- a/packages/server/src/systems/StreamingDuelScheduler/index.ts
+++ b/packages/server/src/systems/StreamingDuelScheduler/index.ts
@@ -22,6 +22,22 @@ interface NetworkWithSend {
   send: <T>(name: string, data: T, ignoreSocketId?: string) => void;
   sendToSpectators?: <T>(name: string, data: T) => void;
 }
+
+function redactOracleProofFromStreamingState(
+  state: StreamingStateUpdate,
+): StreamingStateUpdate {
+  return {
+    ...state,
+    cycle: {
+      ...state.cycle,
+      duelKeyHex: null,
+      duelEndTime: null,
+      seed: null,
+      replayHash: null,
+    },
+  };
+}
+
 import { Logger } from "../ServerNetwork/services";
 import { v4 as uuidv4 } from "uuid";
 import { errMsg } from "../../shared/errMsg.js";
@@ -138,6 +154,13 @@ export class StreamingDuelScheduler {
   /** Countdown timeout for starting fight after countdown */
   private countdownTimeout: ReturnType<typeof setTimeout> | null = null;
 
+  /**
+   * Background prep started during ANNOUNCEMENT so the arena is already live
+   * before the countdown window begins.
+   */
+  private announcementArenaPrepPromise: Promise<void> | null = null;
+  private announcementArenaPrepCycleId: string | null = null;
+
   /** Event listeners for cleanup */
   private eventListeners: Array<{
     event: string;
@@ -180,6 +203,8 @@ export class StreamingDuelScheduler {
   private _lastStreamingStatePhase: StreamingPhase | null = null;
   /** Last cycle ID when state was generated */
   private _lastStreamingStateCycleId: string | null = null;
+  /** Last announcement snapshot mismatch warning signature to avoid log spam */
+  private _lastAnnouncementSnapshotWarningSignature: string | null = null;
   /** Cached agent objects to avoid recreation (reused in getStreamingState) */
   private _cachedAgent1: StreamingStateUpdate["cycle"]["agent1"] = null;
   private _cachedAgent2: StreamingStateUpdate["cycle"]["agent1"] = null;
@@ -610,6 +635,8 @@ export class StreamingDuelScheduler {
     // Reset facade state
     this._startCountdownInProgress = false;
     this._endCycleInProgress = false;
+    this.announcementArenaPrepPromise = null;
+    this.announcementArenaPrepCycleId = null;
     this.schedulerState = "IDLE";
     this.currentCycle = null;
     this.phaseStateMachine.forceIdle();
@@ -787,18 +814,12 @@ export class StreamingDuelScheduler {
         this.tickAnnouncement(now);
         break;
       case "COUNTDOWN":
-        // Fix N — COUNTDOWN fallback. If fightStartTime has passed by >2s and
-        // the countdownTimeout was lost (GC'd, cleared by accident), force-start.
+        // fightStartTime is the authority; the timeout is only a wake-up path.
         if (
-          this.currentCycle.fightStartTime &&
-          now > this.currentCycle.fightStartTime + 2000 &&
-          this.countdownTimeout === null
+          this.currentCycle.fightStartTime != null &&
+          now >= this.currentCycle.fightStartTime
         ) {
-          Logger.warn(
-            "StreamingDuelScheduler",
-            "COUNTDOWN fallback: fightStartTime passed and countdownTimeout lost, force-starting fight",
-          );
-          this.doStartFight(now);
+          this.doStartFight(now, "tick_fallback");
         }
         break;
       case "FIGHTING":
@@ -991,6 +1012,8 @@ export class StreamingDuelScheduler {
       betCloseTime,
       countdownValue: null,
       fightStartTime: null,
+      announcementExpiredAt: null,
+      countdownBeganAt: null,
       duelEndTime: null,
       arenaPositions: null,
       winnerId: null,
@@ -1017,6 +1040,11 @@ export class StreamingDuelScheduler {
     // Set initial camera target
     this.camera.setCameraTarget(agent1.characterId, now);
 
+    // Prime arena prep before downstream event listeners run. Some staging
+    // listeners can throw during cycle scheduling; the visual pre-fight handoff
+    // must still start even if a later emit fails.
+    this.beginAnnouncementArenaPrep(cycleId);
+
     Logger.info(
       "StreamingDuelScheduler",
       `New cycle started: ${agent1.name} vs ${agent2.name}`,
@@ -1090,10 +1118,35 @@ export class StreamingDuelScheduler {
   private tickAnnouncement(now: number): void {
     if (!this.currentCycle) return;
 
-    const elapsed = now - this.currentCycle.phaseStartTime;
+    if (
+      !this.currentCycle.arenaPositions &&
+      (!this.announcementArenaPrepPromise ||
+        this.announcementArenaPrepCycleId !== this.currentCycle.cycleId)
+    ) {
+      const elapsedMs = Math.max(0, now - this.currentCycle.phaseStartTime);
+      Logger.warn(
+        "StreamingDuelScheduler",
+        "Announcement arena still unprimed; retrying kickoff",
+        {
+          cycleId: this.currentCycle.cycleId,
+          phase: this.currentCycle.phase,
+          elapsedMs,
+          betCloseTime: this.currentCycle.betCloseTime ?? null,
+          fightStartTime: this.currentCycle.fightStartTime ?? null,
+        },
+      );
+      this.beginAnnouncementArenaPrep(this.currentCycle.cycleId);
+    }
+
+    const announcementEndTime =
+      this.currentCycle.betCloseTime ??
+      this.currentCycle.phaseStartTime + STREAMING_TIMING.ANNOUNCEMENT_DURATION;
 
     // Check if announcement phase is over
-    if (elapsed >= STREAMING_TIMING.ANNOUNCEMENT_DURATION) {
+    if (now >= announcementEndTime) {
+      if (this.currentCycle.announcementExpiredAt == null) {
+        this.currentCycle.announcementExpiredAt = announcementEndTime;
+      }
       void this.startCountdown();
       return;
     }
@@ -1102,7 +1155,9 @@ export class StreamingDuelScheduler {
     // immutable oracle timing. Keep it opt-in only.
     if (
       STREAMING_ALLOW_READY_SKIP &&
-      elapsed >= STREAMING_TIMING.MIN_ANNOUNCEMENT_DURATION
+      now >=
+        this.currentCycle.phaseStartTime +
+          STREAMING_TIMING.MIN_ANNOUNCEMENT_DURATION
     ) {
       const { agent1, agent2 } = this.currentCycle;
       if (agent1 && agent2) {
@@ -1137,40 +1192,13 @@ export class StreamingDuelScheduler {
     if (this._startCountdownInProgress) return;
     this._startCountdownInProgress = true;
     try {
+      const prepStartedAt = Date.now();
       Logger.info(
         "StreamingDuelScheduler",
         "Preparing contestants for countdown",
       );
 
-      // Duel flags are already set at ANNOUNCEMENT start (startNewCycle), but
-      // re-apply as a safety net in case they were cleared by recovery logic.
-      this.orchestrator.setDuelFlags(true);
-
-      // Prepare contestants (fill food, restore HP) but NOT teleport yet.
-      // Fix J — timeout wrapper so prep can't block forever.
-      const PREP_TIMEOUT_MS = Math.max(
-        5_000,
-        Number.parseInt(process.env.STREAMING_PREP_TIMEOUT_MS || "30000", 10) ||
-          30_000,
-      );
-      try {
-        await Promise.race([
-          this.orchestrator.prepareContestantsForDuel(),
-          new Promise<void>((_, reject) =>
-            setTimeout(
-              () => reject(new Error("Prep timed out")),
-              PREP_TIMEOUT_MS,
-            ),
-          ),
-        ]);
-      } catch (err) {
-        Logger.warn(
-          "StreamingDuelScheduler",
-          `Contestant prep failed: ${errMsg(err)}`,
-        );
-        this.abortCycleToIdle("contestant_prep_failed");
-        return;
-      }
+      await this.ensureAnnouncementArenaReadyForCountdown();
 
       // Scheduler may have advanced/ended while awaiting prep.
       if (!this.currentCycle || this.currentCycle.phase !== "ANNOUNCEMENT") {
@@ -1212,25 +1240,6 @@ export class StreamingDuelScheduler {
         return;
       }
 
-      // Teleport agents to arena NOW — right as countdown begins.
-      try {
-        await this.orchestrator.teleportToArena(
-          this.currentCycle.agent1.characterId,
-          this.currentCycle.agent2.characterId,
-        );
-      } catch (err) {
-        Logger.warn(
-          "StreamingDuelScheduler",
-          `Failed to teleport contestants into arena: ${errMsg(err)}`,
-        );
-        this.abortCycleToIdle("arena_teleport_failed");
-        return;
-      }
-
-      if (!this.currentCycle || this.currentCycle.phase !== "ANNOUNCEMENT") {
-        return;
-      }
-
       // Ensure stale pathing state does not pull contestants away after teleport.
       this.world.emit("player:movement:cancel", {
         playerId: this.currentCycle.agent1.characterId,
@@ -1263,13 +1272,27 @@ export class StreamingDuelScheduler {
         fightStartTime,
       );
       this.currentCycle.fightStartTime = fightStartTime;
+      this.currentCycle.countdownBeganAt = now;
       this.currentCycle.countdownValue = null;
       this.camera.setCameraTarget(
         this.currentCycle.agent1?.characterId ?? null,
         now,
       );
 
-      Logger.info("StreamingDuelScheduler", "Starting countdown");
+      const announcementExpiredAt =
+        this.currentCycle.announcementExpiredAt ?? prepStartedAt;
+      const prepDurationMs = Math.max(0, now - prepStartedAt);
+      const announcementZeroToCountdownMs = Math.max(
+        0,
+        now - announcementExpiredAt,
+      );
+
+      Logger.info("StreamingDuelScheduler", "Starting countdown", {
+        announcementExpiredAt,
+        countdownBeganAt: now,
+        announcementZeroToCountdownMs,
+        prepDurationMs,
+      });
 
       // Force immediate broadcast so clients see COUNTDOWN state.
       this.broadcastState();
@@ -1280,22 +1303,200 @@ export class StreamingDuelScheduler {
       }
       this.countdownTimeout = setTimeout(() => {
         this.countdownTimeout = null;
-        this.doStartFight(Date.now());
+        this.doStartFight(Date.now(), "timeout");
       }, STREAMING_TIMING.COUNTDOWN_DURATION);
     } finally {
       this._startCountdownInProgress = false;
     }
   }
 
+  private beginAnnouncementArenaPrep(cycleId: string): void {
+    Logger.warn("StreamingDuelScheduler", "Announcement arena prep kickoff", {
+      cycleId,
+      phase: this.currentCycle?.phase ?? null,
+      hasArenaPositions: Boolean(this.currentCycle?.arenaPositions),
+    });
+    this.announcementArenaPrepCycleId = cycleId;
+    this.announcementArenaPrepPromise =
+      this.prepareAnnouncementArenaForCycle(cycleId).finally(() => {
+        if (this.announcementArenaPrepCycleId === cycleId) {
+          this.announcementArenaPrepPromise = null;
+          this.announcementArenaPrepCycleId = null;
+        }
+      });
+  }
+
+  private async ensureAnnouncementArenaReadyForCountdown(): Promise<void> {
+    if (!this.currentCycle?.agent1 || !this.currentCycle.agent2) {
+      return;
+    }
+
+    if (this.currentCycle.arenaPositions) {
+      return;
+    }
+
+    if (
+      this.announcementArenaPrepPromise &&
+      this.announcementArenaPrepCycleId === this.currentCycle.cycleId
+    ) {
+      await this.announcementArenaPrepPromise;
+      return;
+    }
+
+    await this.prepareAnnouncementArenaForCycle(this.currentCycle.cycleId);
+  }
+
+  private async prepareAnnouncementArenaForCycle(
+    cycleId: string,
+  ): Promise<void> {
+    const cycle = this.currentCycle;
+    if (!cycle?.agent1 || !cycle.agent2 || cycle.cycleId !== cycleId) {
+      return;
+    }
+
+    // Duel flags are already set at ANNOUNCEMENT start, but re-apply as a
+    // safety net in case recovery logic cleared them mid-cycle.
+    this.orchestrator.setDuelFlags(true);
+
+    const PREP_TIMEOUT_MS = Math.max(
+      5_000,
+      Number.parseInt(process.env.STREAMING_PREP_TIMEOUT_MS || "30000", 10) ||
+        30_000,
+    );
+
+    const prepStartedAt = Date.now();
+
+    if (!cycle.arenaPositions) {
+      try {
+        await this.orchestrator.teleportToArena(
+          cycle.agent1.characterId,
+          cycle.agent2.characterId,
+          true,
+        );
+      } catch (err) {
+        Logger.warn(
+          "StreamingDuelScheduler",
+          `Failed to teleport contestants into arena: ${errMsg(err)}`,
+        );
+        if (
+          this.currentCycle &&
+          this.currentCycle.cycleId === cycleId &&
+          (this.currentCycle.phase === "ANNOUNCEMENT" ||
+            this.currentCycle.phase === "COUNTDOWN")
+        ) {
+          this.abortCycleToIdle("arena_teleport_failed");
+        }
+        return;
+      }
+    }
+
+    if (
+      !this.currentCycle ||
+      this.currentCycle.cycleId !== cycleId ||
+      !this.currentCycle.agent1 ||
+      !this.currentCycle.agent2 ||
+      (this.currentCycle.phase !== "ANNOUNCEMENT" &&
+        this.currentCycle.phase !== "COUNTDOWN")
+    ) {
+      return;
+    }
+
+    const arenaPrimedAt = Date.now();
+    this.world.emit("player:movement:cancel", {
+      playerId: this.currentCycle.agent1.characterId,
+    });
+    this.world.emit("player:movement:cancel", {
+      playerId: this.currentCycle.agent2.characterId,
+    });
+    this.camera.setCameraTarget(
+      this.currentCycle.agent1.characterId,
+      arenaPrimedAt,
+    );
+
+    Logger.info("StreamingDuelScheduler", "Announcement arena visually primed", {
+      cycleId,
+      arenaPrimeLagMs: Math.max(0, arenaPrimedAt - prepStartedAt),
+      phase: this.currentCycle.phase,
+    });
+    Logger.warn("StreamingDuelScheduler", "Announcement arena visually primed", {
+      cycleId,
+      arenaPrimeLagMs: Math.max(0, arenaPrimedAt - prepStartedAt),
+      phase: this.currentCycle.phase,
+      hasArenaPositions: Boolean(this.currentCycle.arenaPositions),
+    });
+
+    this.broadcastState();
+
+    try {
+      await Promise.race([
+        this.orchestrator.prepareContestantsForDuel(),
+        new Promise<void>((_, reject) =>
+          setTimeout(() => reject(new Error("Prep timed out")), PREP_TIMEOUT_MS),
+        ),
+      ]);
+    } catch (err) {
+      Logger.warn(
+        "StreamingDuelScheduler",
+        `Contestant prep failed: ${errMsg(err)}`,
+      );
+      if (
+        this.currentCycle &&
+        this.currentCycle.cycleId === cycleId &&
+        (this.currentCycle.phase === "ANNOUNCEMENT" ||
+          this.currentCycle.phase === "COUNTDOWN")
+      ) {
+        this.abortCycleToIdle("contestant_prep_failed");
+      }
+      return;
+    }
+
+    if (
+      !this.currentCycle ||
+      this.currentCycle.cycleId !== cycleId ||
+      !this.currentCycle.agent1 ||
+      !this.currentCycle.agent2 ||
+      (this.currentCycle.phase !== "ANNOUNCEMENT" &&
+        this.currentCycle.phase !== "COUNTDOWN")
+    ) {
+      return;
+    }
+
+    const now = Date.now();
+    this.world.emit("player:movement:cancel", {
+      playerId: this.currentCycle.agent1.characterId,
+    });
+    this.world.emit("player:movement:cancel", {
+      playerId: this.currentCycle.agent2.characterId,
+    });
+    this.camera.setCameraTarget(this.currentCycle.agent1.characterId, now);
+
+    Logger.info("StreamingDuelScheduler", "Announcement contestants prepared", {
+      cycleId,
+      prepDurationMs: Math.max(0, now - prepStartedAt),
+      phase: this.currentCycle.phase,
+    });
+
+    this.broadcastState();
+  }
+
   /**
    * Wrapper that calls orchestrator.startFight() and handles facade-owned
    * camera logic around the fight start transition.
    */
-  private doStartFight(now: number): void {
+  private doStartFight(
+    now: number,
+    startTrigger: "timeout" | "tick_fallback",
+  ): void {
     if (!this.currentCycle || this.currentCycle.phase !== "COUNTDOWN") {
       return;
     }
 
+    const scheduledFightStartAt = this.currentCycle.fightStartTime ?? now;
+    if (this.countdownTimeout) {
+      clearTimeout(this.countdownTimeout);
+      this.countdownTimeout = null;
+    }
+
     // Both-dead check: abort if neither agent is alive (startFight just returns).
     const { agent1, agent2 } = this.currentCycle;
     const entity1 = agent1 ? this.world.entities.get(agent1.characterId) : null;
@@ -1323,6 +1524,12 @@ export class StreamingDuelScheduler {
       cycleAfterFight &&
       (cycleAfterFight.phase as StreamingPhase) === "FIGHTING"
     ) {
+      Logger.info("StreamingDuelScheduler", "Fight start committed", {
+        scheduledFightStartAt,
+        actualFightStartAt: now,
+        fightStartLagMs: Math.max(0, now - scheduledFightStartAt),
+        startTrigger,
+      });
       this.camera.setCameraTarget(
         cycleAfterFight.agent1?.characterId ?? null,
         now,
@@ -1360,8 +1567,25 @@ export class StreamingDuelScheduler {
       this.orchestrator.endFightByTimeout();
     }
 
-    // Update HP from entities
-    this.orchestrator.updateContestantHp();
+    // Update HP from entities and feed damage hits to camera director
+    const hpDeltas = this.orchestrator.updateContestantHp();
+    if (hpDeltas && this.currentCycle) {
+      const { hpLost1, hpLost2, maxHp1, maxHp2 } = hpDeltas;
+      if (hpLost1 > 0 && this.currentCycle.agent1) {
+        this.camera.onCombatHit(
+          this.currentCycle.agent1.characterId,
+          hpLost1 / Math.max(1, maxHp1),
+          now,
+        );
+      }
+      if (hpLost2 > 0 && this.currentCycle.agent2) {
+        this.camera.onCombatHit(
+          this.currentCycle.agent2.characterId,
+          hpLost2 / Math.max(1, maxHp2),
+          now,
+        );
+      }
+    }
 
     // Fallback: nudge stalled fights so the stream cycle still progresses even
     // when combat start hooks fail in this tick window.
@@ -1391,7 +1615,7 @@ export class StreamingDuelScheduler {
     loserId: string,
     winReason: "kill" | "hp_advantage" | "damage_advantage" | "draw",
     finishedAt: number,
-  ): { seed: string; replayHash: string } {
+  ): { duelKeyHex: string | null; seed: string; replayHash: string } {
     const duelId = cycle.duelId ?? `streaming-${cycle.cycleId}`;
     const fightStartedAt = cycle.fightStartTime ?? cycle.cycleStartTime;
     const duelSeedHex = crypto
@@ -1422,7 +1646,11 @@ export class StreamingDuelScheduler {
         }),
       )
       .digest("hex");
-    return { seed, replayHash };
+    // Return the duel key alongside seed + replayHash so the proof is
+    // self-contained. Callers that persist the proof must not rely on
+    // cycle.duelKeyHex still being populated at write time — the cycle can
+    // be cleared by shutdown or phase-reset before persistence completes.
+    return { duelKeyHex: cycle.duelKeyHex ?? null, seed, replayHash };
   }
 
   /**
@@ -1471,6 +1699,11 @@ export class StreamingDuelScheduler {
     );
     this.currentCycle.seed = oracleProof.seed;
     this.currentCycle.replayHash = oracleProof.replayHash;
+    // If the cycle's duelKeyHex was somehow cleared, recover it from the
+    // self-contained proof so persistence below is consistent.
+    if (!this.currentCycle.duelKeyHex && oracleProof.duelKeyHex) {
+      this.currentCycle.duelKeyHex = oracleProof.duelKeyHex;
+    }
 
     // Update stats — draws don't affect win/loss/streaks (#24)
     if (winReason === "draw") {
@@ -1505,6 +1738,12 @@ export class StreamingDuelScheduler {
         this.currentCycle.agent1?.characterId === loserId
           ? this.currentCycle.agent1.damageDealtThisFight
           : (this.currentCycle.agent2?.damageDealtThisFight ?? 0),
+      // Oracle proof — needed by the keeper result-catch-up endpoint so a
+      // missed onDuelEnd event can still be replayed to resolve the bundle.
+      duelKeyHex: this.currentCycle.duelKeyHex ?? null,
+      duelEndTime: this.currentCycle.duelEndTime ?? null,
+      seed: this.currentCycle.seed ?? null,
+      replayHash: this.currentCycle.replayHash ?? null,
     });
 
     // Pull per-fight AI stats (attacksLanded, healsUsed) captured in stopCombatAIs
@@ -1594,104 +1833,141 @@ export class StreamingDuelScheduler {
 
     // Fix M — guard against re-entry
     if (this._endCycleInProgress) return;
-    this._endCycleInProgress = true;
-
     const cycleSnapshot = this.currentCycle;
-    const now = Date.now();
-    const winnerId = cycleSnapshot.winnerId;
-    const loserId = cycleSnapshot.loserId;
-    const cycleAgent1Id = cycleSnapshot.agent1?.characterId ?? null;
-    const cycleAgent2Id = cycleSnapshot.agent2?.characterId ?? null;
-
-    // Snapshot duel food slots before clearing
-    const duelFoodSlotsMap = this.orchestrator.getDuelFoodSlotsByAgent();
-    const duelFoodSlotsSnapshotByAgent = new Map<
-      string,
-      Array<{ slot: number; itemId: string }>
-    >();
-    if (cycleAgent1Id) {
-      duelFoodSlotsSnapshotByAgent.set(cycleAgent1Id, [
-        ...(duelFoodSlotsMap.get(cycleAgent1Id) ?? []),
-      ]);
-      duelFoodSlotsMap.delete(cycleAgent1Id);
-    }
-    if (cycleAgent2Id) {
-      duelFoodSlotsSnapshotByAgent.set(cycleAgent2Id, [
-        ...(duelFoodSlotsMap.get(cycleAgent2Id) ?? []),
-      ]);
-      duelFoodSlotsMap.delete(cycleAgent2Id);
-    }
+    this._endCycleInProgress = true;
 
-    Logger.info(
-      "StreamingDuelScheduler",
-      `Cycle ${cycleSnapshot.cycleId} ended. Winner: ${winnerId || "none"}`,
-    );
+    try {
+      const now = Date.now();
+      const winnerId = cycleSnapshot.winnerId;
+      const loserId = cycleSnapshot.loserId;
+      const cycleAgent1Id = cycleSnapshot.agent1?.characterId ?? null;
+      const cycleAgent2Id = cycleSnapshot.agent2?.characterId ?? null;
+
+      // Snapshot duel food slots before clearing
+      const duelFoodSlotsMap = this.orchestrator.getDuelFoodSlotsByAgent();
+      const duelFoodSlotsSnapshotByAgent = new Map<
+        string,
+        Array<{ slot: number; itemId: string }>
+      >();
+      if (cycleAgent1Id) {
+        duelFoodSlotsSnapshotByAgent.set(cycleAgent1Id, [
+          ...(duelFoodSlotsMap.get(cycleAgent1Id) ?? []),
+        ]);
+        duelFoodSlotsMap.delete(cycleAgent1Id);
+      }
+      if (cycleAgent2Id) {
+        duelFoodSlotsSnapshotByAgent.set(cycleAgent2Id, [
+          ...(duelFoodSlotsMap.get(cycleAgent2Id) ?? []),
+        ]);
+        duelFoodSlotsMap.delete(cycleAgent2Id);
+      }
 
-    // Emit cycle end
-    this.world.emit("streaming:resolution:end", {
-      cycleId: cycleSnapshot.cycleId,
-      duelId: cycleSnapshot.duelId,
-      duelKeyHex: cycleSnapshot.duelKeyHex,
-      winnerId,
-      loserId,
-    });
-    this.camera.finishFightCutawayTracking(now);
+      Logger.info(
+        "StreamingDuelScheduler",
+        `Cycle ${cycleSnapshot.cycleId} ended. Winner: ${winnerId || "none"}`,
+      );
 
-    // NOTE: Duel flags (inStreamingDuel, preventRespawn) are intentionally NOT
-    // cleared here. They stay `true` until cleanupAfterDuel() teleports both
-    // agents out of the arena and then clears them via microtask. Clearing
-    // flags before the cleanup teleport creates a race condition where
-    // DuelSystem.ejectNonDuelingPlayersFromCombatArenas() sees the agents
-    // still in the arena with inStreamingDuel=false and emits a spurious
-    // extra teleport (causing duplicate teleport VFX).
+      // Emit cycle end
+      this.world.emit("streaming:resolution:end", {
+        cycleId: cycleSnapshot.cycleId,
+        duelId: cycleSnapshot.duelId,
+        duelKeyHex: cycleSnapshot.duelKeyHex,
+        winnerId,
+        loserId,
+      });
+      this.camera.finishFightCutawayTracking(now);
+
+      // NOTE: Duel flags (inStreamingDuel, preventRespawn) are intentionally NOT
+      // cleared here. They stay `true` until cleanupAfterDuel() teleports both
+      // agents out of the arena and then clears them via microtask. Clearing
+      // flags before the cleanup teleport creates a race condition where
+      // DuelSystem.ejectNonDuelingPlayersFromCombatArenas() sees the agents
+      // still in the arena with inStreamingDuel=false and emits a spurious
+      // extra teleport (causing duplicate teleport VFX).
+
+      // Clear current cycle
+      this.currentCycle = null;
+      this.announcementArenaPrepPromise = null;
+      this.announcementArenaPrepCycleId = null;
+
+      // Transition phase state machine back to IDLE
+      this.phaseStateMachine.forceIdle();
+      this.schedulerState = "IDLE";
 
-    // Clear current cycle
-    this.currentCycle = null;
+      // Await cleanup, then start next cycle after an inter-cycle delay.
+      // This prevents stale avatars from lingering in the arena — cleanup
+      // must complete before re-selecting agents for the next duel.
+      this.orchestrator
+        .cleanupAfterDuel(cycleSnapshot, duelFoodSlotsSnapshotByAgent)
+        .catch((err) => {
+          Logger.warn(
+            "StreamingDuelScheduler",
+            `cleanupAfterDuel failed: ${err instanceof Error ? err.message : String(err)}. Clearing duel food tracking and flags as fallback.`,
+          );
+          this.orchestrator.clearDuelFlagsForCycleIfInactive(cycleSnapshot);
+        })
+        .finally(() => {
+          // Wait for inter-cycle delay so spectators see a clean arena reset
+          setTimeout(() => {
+            this._endCycleInProgress = false;
+
+            // Check for pending graceful restart
+            if (this._pendingGracefulRestart) {
+              Logger.info(
+                "StreamingDuelScheduler",
+                "Duel cycle complete, triggering pending graceful restart",
+              );
+              this.triggerGracefulRestart();
+              return;
+            }
 
-    // Transition phase state machine back to IDLE
-    this.phaseStateMachine.forceIdle();
-    this.schedulerState = "IDLE";
+            // Start new cycle if enough agents are available
+            if (this.matchmaking.availableAgents.size >= config.minAgents) {
+              this.schedulerState = "ACTIVE";
+              this.startNewCycle();
+            } else {
+              this.schedulerState = "WAITING_FOR_AGENTS";
+              Logger.info(
+                "StreamingDuelScheduler",
+                `Waiting for agents after cycle end: ${this.matchmaking.availableAgents.size}/${config.minAgents}`,
+              );
+            }
+          }, STREAMING_TIMING.INTER_CYCLE_DELAY_MS);
+        });
+    } catch (err) {
+      Logger.error(
+        "StreamingDuelScheduler",
+        "endCycle failed during synchronous transition",
+        err instanceof Error ? err : null,
+        {
+          cycleId: cycleSnapshot.cycleId,
+          duelId: cycleSnapshot.duelId,
+        },
+      );
 
-    // Await cleanup, then start next cycle after an inter-cycle delay.
-    // This prevents stale avatars from lingering in the arena — cleanup
-    // must complete before re-selecting agents for the next duel.
-    this.orchestrator
-      .cleanupAfterDuel(cycleSnapshot, duelFoodSlotsSnapshotByAgent)
-      .catch((err) => {
+      try {
+        this.orchestrator.clearDuelFlagsForCycleIfInactive(cycleSnapshot);
+      } catch (cleanupErr) {
         Logger.warn(
           "StreamingDuelScheduler",
-          `cleanupAfterDuel failed: ${err instanceof Error ? err.message : String(err)}. Clearing duel food tracking and flags as fallback.`,
+          `endCycle fallback flag cleanup failed: ${cleanupErr instanceof Error ? cleanupErr.message : String(cleanupErr)}`,
         );
-        this.orchestrator.clearDuelFlagsForCycleIfInactive(cycleSnapshot);
-      })
-      .finally(() => {
-        // Wait for inter-cycle delay so spectators see a clean arena reset
-        setTimeout(() => {
-          this._endCycleInProgress = false;
-
-          // Check for pending graceful restart
-          if (this._pendingGracefulRestart) {
-            Logger.info(
-              "StreamingDuelScheduler",
-              "Duel cycle complete, triggering pending graceful restart",
-            );
-            this.triggerGracefulRestart();
-            return;
-          }
+      }
 
-          // Start new cycle if enough agents are available
-          if (this.matchmaking.availableAgents.size >= config.minAgents) {
-            this.schedulerState = "ACTIVE";
-            this.startNewCycle();
-          } else {
-            this.schedulerState = "WAITING_FOR_AGENTS";
-            Logger.info(
-              "StreamingDuelScheduler",
-              `Waiting for agents after cycle end: ${this.matchmaking.availableAgents.size}/${config.minAgents}`,
-            );
-          }
-        }, STREAMING_TIMING.INTER_CYCLE_DELAY_MS);
-      });
+      if (this.currentCycle === cycleSnapshot) {
+        this.currentCycle = null;
+      }
+      try {
+        this.phaseStateMachine.forceIdle();
+      } catch (phaseErr) {
+        Logger.warn(
+          "StreamingDuelScheduler",
+          `endCycle fallback phase reset failed: ${phaseErr instanceof Error ? phaseErr.message : String(phaseErr)}`,
+        );
+      }
+      this.schedulerState = "IDLE";
+      this._endCycleInProgress = false;
+    }
   }
 
   /**
@@ -1701,6 +1977,8 @@ export class StreamingDuelScheduler {
   private abortCycleToIdle(reason: string): void {
     Logger.warn("StreamingDuelScheduler", `Aborting cycle to IDLE: ${reason}`);
     const cycleSnapshot = this.currentCycle;
+    this.announcementArenaPrepPromise = null;
+    this.announcementArenaPrepCycleId = null;
 
     this.orchestrator.stopCombatLoop();
     this.orchestrator.clearCombatRetryTimeout();
@@ -1971,7 +2249,7 @@ export class StreamingDuelScheduler {
   }
 
   private broadcastState(): void {
-    const state = this.getStreamingState();
+    const state = redactOracleProofFromStreamingState(this.getStreamingState());
     // Broadcast streaming state only to spectator sockets (interest management).
     // Regular gameplay clients don't need streaming duel updates every second.
     const network = this.world.network as NetworkWithSend | undefined;
@@ -1984,7 +2262,13 @@ export class StreamingDuelScheduler {
   }
 
   /**
-   * Get current streaming state for broadcast.
+   * Get current raw streaming state.
+   *
+   * This object may contain oracle-proof material (`duelKeyHex`, `seed`,
+   * `replayHash`, `duelEndTime`) while a duel is active or freshly resolved.
+   * Any public HTTP, SSE, or spectator-socket emission must redact those
+   * fields first.
+   *
    * MEMORY OPTIMIZATION: Reuses pre-allocated objects to avoid GC pressure.
    * Only creates new contestant objects when agents change.
    */
@@ -2092,6 +2376,35 @@ export class StreamingDuelScheduler {
     const phaseEndTime = this.getPhaseEndTime();
     const timeRemaining = Math.max(0, phaseEndTime - now);
     const cameraTarget = this.getCycleCameraTargetSnapshot();
+    if (this.currentCycle.phase === "ANNOUNCEMENT") {
+      const signature = [
+        this.currentCycle.cycleId,
+        phaseEndTime,
+        this.currentCycle.betCloseTime ?? "null",
+        this.currentCycle.arenaPositions ? "arena-ready" : "arena-missing",
+      ].join(":");
+      if (
+        signature !== this._lastAnnouncementSnapshotWarningSignature &&
+        ((this.currentCycle.betCloseTime != null &&
+          phaseEndTime !== this.currentCycle.betCloseTime) ||
+          (!this.currentCycle.arenaPositions &&
+            now - this.currentCycle.phaseStartTime >= 2_000))
+      ) {
+        this._lastAnnouncementSnapshotWarningSignature = signature;
+        Logger.warn(
+          "StreamingDuelScheduler",
+          "Announcement snapshot mismatch",
+          {
+            cycleId: this.currentCycle.cycleId,
+            phaseStartTime: this.currentCycle.phaseStartTime,
+            phaseEndTime,
+            betCloseTime: this.currentCycle.betCloseTime ?? null,
+            timeRemaining,
+            hasArenaPositions: Boolean(this.currentCycle.arenaPositions),
+          },
+        );
+      }
+    }
 
     // Check if we need to update agent objects (only when agent changes or health changes)
     const currentCycleId = this.currentCycle.cycleId;
@@ -2268,16 +2581,9 @@ export class StreamingDuelScheduler {
 
     switch (phase) {
       case "ANNOUNCEMENT":
-        // Use MIN_ANNOUNCEMENT_DURATION for the timer since the phase
-        // early-exits as soon as both agents are alive (which is almost
-        // always immediate). ANNOUNCEMENT_DURATION is only a maximum
-        // fallback and would make the timer misleadingly long.
-        return phaseStartTime + STREAMING_TIMING.MIN_ANNOUNCEMENT_DURATION;
+        return this.getAnnouncementEndTime();
       case "COUNTDOWN":
-        return (
-          this.currentCycle.fightStartTime ??
-          phaseStartTime + STREAMING_TIMING.COUNTDOWN_DURATION
-        );
+        return this.getCountdownEndTime();
       case "FIGHTING":
         return (
           phaseStartTime +
@@ -2291,6 +2597,22 @@ export class StreamingDuelScheduler {
     }
   }
 
+  private getAnnouncementEndTime(): number {
+    if (!this.currentCycle) return Date.now();
+    return (
+      this.currentCycle.betCloseTime ??
+      this.currentCycle.phaseStartTime + STREAMING_TIMING.ANNOUNCEMENT_DURATION
+    );
+  }
+
+  private getCountdownEndTime(): number {
+    if (!this.currentCycle) return Date.now();
+    return (
+      this.currentCycle.fightStartTime ??
+      this.currentCycle.phaseStartTime + STREAMING_TIMING.COUNTDOWN_DURATION
+    );
+  }
+
   private toStreamingCycleAgent(
     agent: AgentContestant | null,
   ): StreamingStateUpdate["cycle"]["agent1"] {
@@ -2381,6 +2703,25 @@ export class StreamingDuelScheduler {
       }
     }
 
+    // Final fallback: during an active cycle, prefer to point at a contestant
+    // that still has a live world entity, even if they are no longer in the
+    // matchmaking `availableAgents` pool. This covers the case where a
+    // contestant disconnects mid-fight (PLAYER_LEFT → unregisterAgent) and
+    // is therefore no longer a "valid camera candidate" by the matchmaking
+    // rule, but their entity is still in the arena and is the thing the
+    // viewer actually wants to see. Observed on 2026-04-15 where the state
+    // endpoint returned `phase: FIGHTING` with `cameraTarget: null` because
+    // both contestants had been unregistered from matchmaking but were still
+    // alive in the world.
+    const cycleAgent1Id = this.currentCycle.agent1?.characterId;
+    if (cycleAgent1Id && this.world.entities.get(cycleAgent1Id)) {
+      return cycleAgent1Id;
+    }
+    const cycleAgent2Id = this.currentCycle.agent2?.characterId;
+    if (cycleAgent2Id && this.world.entities.get(cycleAgent2Id)) {
+      return cycleAgent2Id;
+    }
+
     return null;
   }
 
diff --git a/packages/server/src/systems/StreamingDuelScheduler/managers/CameraDirector.ts b/packages/server/src/systems/StreamingDuelScheduler/managers/CameraDirector.ts
index 663444368..67315edc8 100644
--- a/packages/server/src/systems/StreamingDuelScheduler/managers/CameraDirector.ts
+++ b/packages/server/src/systems/StreamingDuelScheduler/managers/CameraDirector.ts
@@ -37,6 +37,7 @@ type CameraSwitchTiming = {
   minHoldMs: number;
   maxHoldMs: number;
   idleThresholdMs: number;
+  reverseAngleCooldownMs: number;
 };
 
 type CameraCandidateWeight = {
@@ -75,19 +76,36 @@ const clampNumber = (value: number, min: number, max: number): number => {
 
 const CAMERA_DIRECTOR = {
   switchTiming: {
-    IDLE: { minHoldMs: 30_000, maxHoldMs: 90_000, idleThresholdMs: 15_000 },
+    IDLE: {
+      minHoldMs: 30_000,
+      maxHoldMs: 90_000,
+      idleThresholdMs: 15_000,
+      reverseAngleCooldownMs: 20_000,
+    },
     ANNOUNCEMENT: {
       minHoldMs: 22_000,
       maxHoldMs: 95_000,
       idleThresholdMs: 12_000,
+      reverseAngleCooldownMs: 20_000,
+    },
+    COUNTDOWN: {
+      minHoldMs: 6_000,
+      maxHoldMs: 24_000,
+      idleThresholdMs: 6_000,
+      reverseAngleCooldownMs: 20_000,
     },
-    COUNTDOWN: { minHoldMs: 6_000, maxHoldMs: 24_000, idleThresholdMs: 6_000 },
     FIGHTING: {
       minHoldMs: 28_000,
       maxHoldMs: 90_000,
       idleThresholdMs: 20_000,
+      reverseAngleCooldownMs: 14_000,
+    },
+    RESOLUTION: {
+      minHoldMs: 8_000,
+      maxHoldMs: 45_000,
+      idleThresholdMs: 8_000,
+      reverseAngleCooldownMs: 20_000,
     },
-    RESOLUTION: { minHoldMs: 8_000, maxHoldMs: 45_000, idleThresholdMs: 8_000 },
   } as Record<StreamingPhase, CameraSwitchTiming>,
   baseWeights: {
     IDLE: { contestant: 1.3, nonContestant: 1.3 },
@@ -105,9 +123,12 @@ const CAMERA_DIRECTOR = {
     currentTargetBias: 1.45,
     recentFocusPenaltyShort: 0.45,
     recentFocusPenaltyLong: 0.78,
-    switchRandomChance: 0.12,
+    switchRandomChancePerSec: 0.06,
     strongerThresholdActive: 1.55,
     strongerThresholdIdle: 1.1,
+    focusFatigueCooldownMs: 10_000,
+    returnPenaltyThreshold: 1.8,
+    returnPenaltyCooldownMs: 20_000,
   },
   idlePenalty: {
     softThresholdMs: 12_000,
@@ -157,8 +178,8 @@ const CAMERA_DIRECTOR = {
     currentTargetBias: 1.15,
     /** Threshold: new candidate must be this much stronger to trigger early switch */
     strongerThreshold: 1.2,
-    /** Small random chance to switch for variety (per eligible check) */
-    switchRandomChance: 0.18,
+    /** Per-second probability of random switch for variety */
+    switchRandomChancePerSec: 0.1,
   },
   /** Known skilling emotes from PendingGatherManager / PendingCookManager */
   skillingEmotes: new Set([
@@ -184,6 +205,8 @@ export class CameraDirector {
 
   private _cameraTarget: string | null = null;
   private lastCameraSwitchTime: number = 0;
+  private lastSwitchedAwayFrom: string | null = null;
+  private lastSwitchedAwayTime: number = 0;
   private agentActivity: Map<string, AgentActivitySample> = new Map();
   private fightCutawayStartedAt: number | null = null;
   private fightCutawayTotalMs: number = 0;
@@ -211,6 +234,8 @@ export class CameraDirector {
   reset(): void {
     this._cameraTarget = null;
     this.lastCameraSwitchTime = 0;
+    this.lastSwitchedAwayFrom = null;
+    this.lastSwitchedAwayTime = 0;
     this.agentActivity.clear();
     this.fightCutawayStartedAt = null;
     this.fightCutawayTotalMs = 0;
@@ -564,6 +589,10 @@ export class CameraDirector {
 
     const previous = this._cameraTarget;
     if (previous !== agentId) {
+      if (previous) {
+        this.lastSwitchedAwayFrom = previous;
+        this.lastSwitchedAwayTime = now;
+      }
       this._cameraTarget = agentId;
       this.lastCameraSwitchTime = now;
     }
@@ -623,6 +652,26 @@ export class CameraDirector {
       }
     }
 
+    // Final fallback: if we have an active cycle, prefer to point at a
+    // contestant whose entity is still alive in the world even if they are
+    // no longer in the matchmaking `availableAgents` pool (e.g. mid-fight
+    // disconnect). The matchmaking pool is the set of agents eligible to
+    // start a NEW duel; a fighter who has dropped out of that pool is still
+    // physically in the arena and is what the viewer should see. Without
+    // this fallback `resolveCycleCameraTarget` returns null during FIGHTING
+    // when both contestants have been unregistered mid-fight, leaving the
+    // camera untargeted. Observed on 2026-04-15.
+    if (cycle) {
+      const cycleAgent1 = cycle.agent1?.characterId;
+      if (cycleAgent1 && this.world.entities.get(cycleAgent1)) {
+        return cycleAgent1;
+      }
+      const cycleAgent2 = cycle.agent2?.characterId;
+      if (cycleAgent2 && this.world.entities.get(cycleAgent2)) {
+        return cycleAgent2;
+      }
+    }
+
     return null;
   }
 
@@ -1013,20 +1062,38 @@ export class CameraDirector {
       currentIdleDurationMs >= timing.idleThresholdMs &&
       !currentCandidate.isInCombat;
 
+    const isReturningToRecent =
+      selected.agentId === this.lastSwitchedAwayFrom &&
+      now - this.lastSwitchedAwayTime <
+        CAMERA_DIRECTOR.multipliers.returnPenaltyCooldownMs;
+    const strongerThreshold = currentIsIdle
+      ? CAMERA_DIRECTOR.multipliers.strongerThresholdIdle
+      : isReturningToRecent
+        ? CAMERA_DIRECTOR.multipliers.returnPenaltyThreshold
+        : CAMERA_DIRECTOR.multipliers.strongerThresholdActive;
     const selectedIsStronger =
-      selected.weight >
-      currentCandidate.weight *
-        (currentIsIdle
-          ? CAMERA_DIRECTOR.multipliers.strongerThresholdIdle
-          : CAMERA_DIRECTOR.multipliers.strongerThresholdActive);
+      selected.weight > currentCandidate.weight * strongerThreshold;
+
+    const elapsedSec = msSinceSwitch / 1000;
+    const randomSwitchProb =
+      1 -
+      Math.exp(
+        -CAMERA_DIRECTOR.multipliers.switchRandomChancePerSec * elapsedSec,
+      );
+    const selectedSample = this.ensureAgentActivity(selected.agentId, now);
+    const hasFocusFatigue =
+      selectedSample.lastFocusedTime > 0 &&
+      now - selectedSample.lastFocusedTime <
+        CAMERA_DIRECTOR.multipliers.focusFatigueCooldownMs;
 
     const shouldSwitch =
       forceSwitch ||
       (selected.agentId !== currentTarget &&
+        !hasFocusFatigue &&
         (selectedIsStronger ||
           (currentIsIdle &&
             selected.activityScore >= currentCandidate.activityScore) ||
-          Math.random() < CAMERA_DIRECTOR.multipliers.switchRandomChance));
+          Math.random() < randomSwitchProb));
 
     if (shouldSwitch && selected.agentId !== currentTarget) {
       this.setCameraTarget(selected.agentId, now);
@@ -1225,18 +1292,28 @@ export class CameraDirector {
       selected.weight >
       currentCandidate.weight * CAMERA_DIRECTOR.idle.strongerThreshold;
     const currentIsIdle = currentActivity === "idle";
+    const idleElapsedSec = msSinceSwitch / 1000;
+    const idleRandomProb =
+      1 -
+      Math.exp(-CAMERA_DIRECTOR.idle.switchRandomChancePerSec * idleElapsedSec);
 
     const shouldSwitch =
       selectedIsStronger ||
       (currentIsIdle &&
         selected.activityScore >= currentCandidate.activityScore) ||
-      Math.random() < CAMERA_DIRECTOR.idle.switchRandomChance;
+      Math.random() < idleRandomProb;
 
     if (shouldSwitch) {
       this.setCameraTarget(selected.agentId, now);
     }
   }
 
+  onCombatHit(agentId: string, damageFraction: number, now: number): void {
+    if (!this.getAvailableAgents().has(agentId)) return;
+    const intensity = 1.5 + damageFraction * 8;
+    this.markAgentInteresting(agentId, intensity, now);
+  }
+
   // ---- Activity map management (for external cleanup) ----
 
   deleteAgentActivity(agentId: string): void {
diff --git a/packages/server/src/systems/StreamingDuelScheduler/managers/DuelOrchestrator.ts b/packages/server/src/systems/StreamingDuelScheduler/managers/DuelOrchestrator.ts
index 2f3dd1eae..85114adff 100644
--- a/packages/server/src/systems/StreamingDuelScheduler/managers/DuelOrchestrator.ts
+++ b/packages/server/src/systems/StreamingDuelScheduler/managers/DuelOrchestrator.ts
@@ -6,7 +6,7 @@
  * management, HP tracking, fight resolution, and post-duel cleanup.
  */
 
-import type { World } from "@hyperscape/shared";
+import type { DuelArenaConfig, World } from "@hyperscape/shared";
 import {
   AttackType,
   COMBAT_SPELLS,
@@ -20,6 +20,8 @@ import {
   getDuelArenaConfig,
   getItem,
   isPositionInsideCombatArena,
+  tileChebyshevDistance,
+  worldToTile,
 } from "@hyperscape/shared";
 import { DuelCombatAI } from "../../../duel/DuelCombatAI.js";
 import {
@@ -124,6 +126,8 @@ type AgentCombatData = {
 
 /** Reserved regular duel arena for streaming agents (always use a single arena). */
 const STREAMING_AGENT_ARENA_ID = 1;
+/** Streaming agents enter combat immediately, so they must spawn in melee range. */
+const STREAMING_AGENT_ENGAGEMENT_TILE_DISTANCE = 1;
 /** Duel-eligible bronze weapons — only types with new models in swords/ directory. */
 const DUEL_BRONZE_WEAPON_IDS = [
   "bronze_longsword",
@@ -145,6 +149,62 @@ const STALL_NUDGE_MAX_DAMAGE = 5;
 /** Combat role types for duel arena agents. */
 type DuelCombatRole = "melee" | "ranged" | "mage" | "prayer";
 
+export function computeStreamingArenaEngagementSpawnPoints(
+  arenaConfig: DuelArenaConfig,
+  requestedArenaId = STREAMING_AGENT_ARENA_ID,
+): {
+  arenaId: number;
+  agent1: { x: number; z: number };
+  agent2: { x: number; z: number };
+} {
+  const arenaId = Math.max(
+    1,
+    Math.min(requestedArenaId, arenaConfig.arenaCount),
+  );
+  const row = Math.floor((arenaId - 1) / arenaConfig.columns);
+  const col = (arenaId - 1) % arenaConfig.columns;
+  const centerX =
+    arenaConfig.baseX +
+    col * (arenaConfig.arenaWidth + arenaConfig.arenaGap) +
+    arenaConfig.arenaWidth / 2;
+  const centerZ =
+    arenaConfig.baseZ +
+    row * (arenaConfig.arenaLength + arenaConfig.arenaGap) +
+    arenaConfig.arenaLength / 2;
+  const centerTileX = Math.floor(centerX);
+  const centerTileZ = Math.floor(centerZ);
+  const tileCenter = (tile: number) => tile + 0.5;
+
+  // Regular player duels use opposite spawn points. Streaming agents skip the
+  // human chase phase and call CombatSystem.startCombat immediately, so they
+  // must begin on adjacent tiles or melee combat deterministically fails.
+  if (arenaConfig.spawnLayout === "alongWidth") {
+    return {
+      arenaId,
+      agent1: {
+        x: tileCenter(centerTileX - STREAMING_AGENT_ENGAGEMENT_TILE_DISTANCE),
+        z: tileCenter(centerTileZ),
+      },
+      agent2: {
+        x: tileCenter(centerTileX),
+        z: tileCenter(centerTileZ),
+      },
+    };
+  }
+
+  return {
+    arenaId,
+    agent1: {
+      x: tileCenter(centerTileX),
+      z: tileCenter(centerTileZ - STREAMING_AGENT_ENGAGEMENT_TILE_DISTANCE),
+    },
+    agent2: {
+      x: tileCenter(centerTileX),
+      z: tileCenter(centerTileZ),
+    },
+  };
+}
+
 /**
  * When skill scores tie, prefer ranged/mage over melee so streaming duels
  * actually exercise bow and magic (default stats are often all equal).
@@ -183,6 +243,8 @@ export class DuelOrchestrator {
   private combatLoopInterval: ReturnType<typeof setInterval> | null = null;
   private combatLoopTickCount: number = 0;
   private combatRetryTimeout: ReturnType<typeof setTimeout> | null = null;
+  private victoryPresentationTimeout: ReturnType<typeof setTimeout> | null =
+    null;
   private combatRetryCount: number = 0;
   private static readonly MAX_COMBAT_RETRIES = 5;
   private duelFoodSlotsByAgent: Map<string, DuelFoodProvisionedSlot[]> =
@@ -1963,50 +2025,22 @@ export class DuelOrchestrator {
     // Use a single reserved regular duel arena so all agent duels happen in
     // the same standard arena as player duels (no custom arena coordinates).
     const arenaConfig = getDuelArenaConfig();
-    const arenaId = Math.max(
-      1,
-      Math.min(STREAMING_AGENT_ARENA_ID, arenaConfig.arenaCount),
-    );
-    const row = Math.floor((arenaId - 1) / arenaConfig.columns);
-    const col = (arenaId - 1) % arenaConfig.columns;
-    const arenaCenterX =
-      arenaConfig.baseX +
-      col * (arenaConfig.arenaWidth + arenaConfig.arenaGap) +
-      arenaConfig.arenaWidth / 2;
-    const arenaCenterZ =
-      arenaConfig.baseZ +
-      row * (arenaConfig.arenaLength + arenaConfig.arenaGap) +
-      arenaConfig.arenaLength / 2;
-    const cx = arenaCenterX;
-    const cz = arenaCenterZ;
-    const off = arenaConfig.spawnOffset;
-
-    let agent1X: number;
-    let agent1Z: number;
-    let agent2X: number;
-    let agent2Z: number;
-    if (arenaConfig.spawnLayout === "alongWidth") {
-      agent1X = cx - off;
-      agent1Z = cz;
-      agent2X = cx + off;
-      agent2Z = cz;
-    } else {
-      agent1X = cx;
-      agent1Z = cz - off;
-      agent2X = cx;
-      agent2Z = cz + off;
-    }
+    const { arenaId, agent1, agent2 } =
+      computeStreamingArenaEngagementSpawnPoints(
+        arenaConfig,
+        STREAMING_AGENT_ARENA_ID,
+      );
 
     const agent1Pos: [number, number, number] = [
-      agent1X,
-      this.getGroundedY(agent1X, agent1Z, arenaConfig.baseY),
-      agent1Z,
+      agent1.x,
+      this.getGroundedY(agent1.x, agent1.z, arenaConfig.baseY),
+      agent1.z,
     ];
 
     const agent2Pos: [number, number, number] = [
-      agent2X,
-      this.getGroundedY(agent2X, agent2Z, arenaConfig.baseY),
-      agent2Z,
+      agent2.x,
+      this.getGroundedY(agent2.x, agent2.z, arenaConfig.baseY),
+      agent2.z,
     ];
 
     // Teleport both agents, facing each other
@@ -2022,6 +2056,10 @@ export class DuelOrchestrator {
       };
     }
 
+    this.applyArenaBoundsToCurrentContestants(
+      this.getStreamingArenaMovementBounds(),
+    );
+
     Logger.info(
       "StreamingDuelScheduler",
       "Contestants teleported to arena, facing each other",
@@ -2139,6 +2177,33 @@ export class DuelOrchestrator {
     };
   }
 
+  private applyArenaBoundsToCurrentContestants(
+    bounds:
+      | {
+          minX: number;
+          maxX: number;
+          minZ: number;
+          maxZ: number;
+        }
+      | null,
+  ): void {
+    const cycle = this.getCurrentCycle();
+    if (!cycle?.agent1 || !cycle.agent2) {
+      return;
+    }
+
+    for (const playerId of [
+      cycle.agent1.characterId,
+      cycle.agent2.characterId,
+    ]) {
+      const entity = this.world.entities.get(playerId);
+      if (!entity) {
+        continue;
+      }
+      (entity.data as Record<string, unknown>).arenaBounds = bounds;
+    }
+  }
+
   /**
    * Get grounded Y using terrain height when available.
    */
@@ -2373,9 +2438,10 @@ export class DuelOrchestrator {
 
     // Start DuelCombatAI for each agent (tick-based heal/buff/attack decisions)
     this.startCombatAIs().catch((err) => {
-      Logger.warn(
+      Logger.error(
         "StreamingDuelScheduler",
         `Failed to start combat AIs: ${errMsg(err)}`,
+        err instanceof Error ? err : null,
       );
     });
   }
@@ -2386,9 +2452,6 @@ export class DuelOrchestrator {
    * potion usage, and combat phase awareness (opening, trading, finishing).
    */
   async startCombatAIs(): Promise<void> {
-    this.stopCombatAIs();
-    this.combatRetryCount = 0;
-
     const cycle = this.getCurrentCycle();
     if (!cycle?.agent1 || !cycle?.agent2) return;
 
@@ -2397,6 +2460,8 @@ export class DuelOrchestrator {
         .toLowerCase()
         .trim() !== "false";
     if (!combatAiEnabled) {
+      this.stopCombatAIs();
+      this.combatRetryCount = 0;
       Logger.info(
         "StreamingDuelScheduler",
         "Combat AI disabled via STREAMING_DUEL_COMBAT_AI_ENABLED=false; relying on combat system re-engagement loop",
@@ -2415,6 +2480,11 @@ export class DuelOrchestrator {
       await import("../../../eliza/ModelAgentSpawner.js");
     const manager = getAgentManager();
 
+    // Stop/relock after async imports so autonomy is not briefly restored while
+    // the module loader yields.
+    this.stopCombatAIs();
+    this.combatRetryCount = 0;
+
     const service1 = manager?.getAgentService(agent1.characterId) ?? null;
     const service2 = manager?.getAgentService(agent2.characterId) ?? null;
     const runtime1 = getAgentRuntimeByCharacterId(agent1.characterId);
@@ -2428,6 +2498,8 @@ export class DuelOrchestrator {
       movementClampBounds,
     };
 
+    this.applyArenaBoundsToCurrentContestants(movementClampBounds);
+
     // Lock both services into arena mode:
     // 1. Clamp all movement to arena bounds (no reactive correction teleports).
     // 2. Disable autonomous behavior loop so agents don't wander off to quest
@@ -2489,6 +2561,20 @@ export class DuelOrchestrator {
         `Combat AI started for ${agent2.name} (role=${role2}, ${llmTacticsEnabled && !!runtime2 ? "LLM strategy" : "scripted"})`,
       );
     }
+
+    if (this.combatAIs.size === 0) {
+      Logger.error(
+        "StreamingDuelScheduler",
+        "No combat AIs started; fight will rely only on combat re-engagement loop",
+        null,
+        {
+          agent1Id: agent1.characterId,
+          agent2Id: agent2.characterId,
+          service1Available: !!service1,
+          service2Available: !!service2,
+        },
+      );
+    }
   }
 
   /** Stop all DuelCombatAI instances, log and store their final stats */
@@ -2512,6 +2598,7 @@ export class DuelOrchestrator {
       svc.setAutonomousBehaviorEnabled(true);
     }
     this._arenaModeServices = [];
+    this.applyArenaBoundsToCurrentContestants(null);
   }
 
   /** Returns AI stats captured at the end of the last fight, keyed by characterId */
@@ -2754,6 +2841,13 @@ export class DuelOrchestrator {
     }
   }
 
+  clearVictoryPresentationTimeout(): void {
+    if (this.victoryPresentationTimeout) {
+      clearTimeout(this.victoryPresentationTimeout);
+      this.victoryPresentationTimeout = null;
+    }
+  }
+
   scheduleCombatRetryIfNeeded(agent1Id: string, agent2Id: string): void {
     this.clearCombatRetryTimeout();
     this.combatRetryTimeout = setTimeout(() => {
@@ -2810,19 +2904,7 @@ export class DuelOrchestrator {
       // Re-teleport to fix spacing, then retry combat
       this.ensureDuelProximity(agent1Id, agent2Id);
 
-      if (combatSystem?.startCombat) {
-        combatSystem.startCombat(agent1Id, agent2Id, {
-          attackerType: "player",
-          targetType: "player",
-        });
-        const cycleAfterRetry = this.getCurrentCycle();
-        if (cycleAfterRetry?.phase === "FIGHTING") {
-          combatSystem.startCombat(agent2Id, agent1Id, {
-            attackerType: "player",
-            targetType: "player",
-          });
-        }
-      }
+      this.tryMutualCombat(agent1Id, agent2Id);
 
       this.setAgentCombatTarget(agent1Id, agent2Id);
       this.setAgentCombatTarget(agent2Id, agent1Id);
@@ -2856,11 +2938,7 @@ export class DuelOrchestrator {
     const bx = Array.isArray(posB) ? posB[0] : posB.x;
     const bz = Array.isArray(posB) ? posB[2] : posB.z;
 
-    const tileAx = Math.floor(ax);
-    const tileAz = Math.floor(az);
-    const tileBx = Math.floor(bx);
-    const tileBz = Math.floor(bz);
-    return Math.max(Math.abs(tileAx - tileBx), Math.abs(tileAz - tileBz));
+    return tileChebyshevDistance(worldToTile(ax, az), worldToTile(bx, bz));
   }
 
   // ============================================================================
@@ -3040,7 +3118,9 @@ export class DuelOrchestrator {
   // HP Tracking & Combat Stall Nudge
   // ============================================================================
 
-  updateContestantHp(): void {
+  updateContestantHp():
+    | { hpLost1: number; hpLost2: number; maxHp1: number; maxHp2: number }
+    | undefined {
     const cycle = this.getCurrentCycle();
     if (!cycle?.agent1 || !cycle?.agent2) return;
 
@@ -3083,6 +3163,14 @@ export class DuelOrchestrator {
     if (hpLost2 > 0) {
       cycle.agent1.damageDealtThisFight += hpLost2;
     }
+
+    // Return HP deltas so the scheduler can feed combat hits to the camera director
+    return {
+      hpLost1,
+      hpLost2,
+      maxHp1: cycle.agent1.maxHp,
+      maxHp2: cycle.agent2.maxHp,
+    };
   }
 
   /**
@@ -3205,9 +3293,9 @@ export class DuelOrchestrator {
         winReason = "damage_advantage";
       } else {
         // True draw — both HP and damage equal (#24)
-        // Resolve as a proper draw: no winner/loser, just record it
-        this.onResolution(agent1.characterId, agent2.characterId, "draw");
-        return;
+        winnerId = agent1.characterId;
+        loserId = agent2.characterId;
+        winReason = "draw";
       }
     }
 
@@ -3239,7 +3327,9 @@ export class DuelOrchestrator {
     // combat state teardown, scheduled animation resets) finishes first.
     // Without this, the "victory" emote gets immediately overwritten by
     // stale "idle" resets from the combat animation system.
-    setTimeout(() => {
+    this.clearVictoryPresentationTimeout();
+    this.victoryPresentationTimeout = setTimeout(() => {
+      this.victoryPresentationTimeout = null;
       this.triggerVictoryEmote(winnerId);
       this.fireVictoryTrashTalk(winnerId);
     }, 600);
@@ -3522,6 +3612,7 @@ export class DuelOrchestrator {
   reset(): void {
     this.stopCombatLoop();
     this.clearCombatRetryTimeout();
+    this.clearVictoryPresentationTimeout();
     this.stopCombatAIs();
     this._lastFightStats.clear();
     this.duelFoodSlotsByAgent.clear();
diff --git a/packages/server/src/systems/StreamingDuelScheduler/managers/MatchmakingManager.ts b/packages/server/src/systems/StreamingDuelScheduler/managers/MatchmakingManager.ts
index 9a73dc669..d583f2ab6 100644
--- a/packages/server/src/systems/StreamingDuelScheduler/managers/MatchmakingManager.ts
+++ b/packages/server/src/systems/StreamingDuelScheduler/managers/MatchmakingManager.ts
@@ -28,6 +28,7 @@ export type AgentStatsEntry = {
   losses: number;
   combatLevel: number;
   currentStreak: number;
+  lossStreak: number;
 };
 
 type MatchmakingConfig = {
@@ -194,6 +195,7 @@ export class MatchmakingManager {
           losses: 0,
           combatLevel,
           currentStreak: 0,
+          lossStreak: 0,
         });
 
         // Load persisted stats from database asynchronously
@@ -432,11 +434,13 @@ export class MatchmakingManager {
     if (winnerStats) {
       winnerStats.wins++;
       winnerStats.currentStreak++;
+      winnerStats.lossStreak = 0;
     }
 
     if (loserStats) {
       loserStats.losses++;
       loserStats.currentStreak = 0;
+      loserStats.lossStreak++;
     }
 
     this.leaderboardDirty = true;
@@ -640,6 +644,10 @@ export class MatchmakingManager {
       winReason: duel.winReason,
       damageWinner: duel.damageWinner,
       damageLoser: duel.damageLoser,
+      duelKeyHex: duel.duelKeyHex,
+      duelEndTime: duel.duelEndTime,
+      seed: duel.seed,
+      replayHash: duel.replayHash,
     });
   }
 
@@ -673,15 +681,19 @@ export class MatchmakingManager {
         winRate,
         combatLevel: stats.combatLevel,
         currentStreak: stats.currentStreak,
+        lossStreak: stats.lossStreak,
       });
     }
 
-    // Sort by win rate, then by total wins
+    // Sort by win rate, then by total wins, then by fewer losses
     entries.sort((a, b) => {
       if (b.winRate !== a.winRate) {
         return b.winRate - a.winRate;
       }
-      return b.wins - a.wins;
+      if (b.wins !== a.wins) {
+        return b.wins - a.wins;
+      }
+      return a.losses - b.losses;
     });
 
     // Assign ranks
diff --git a/packages/server/src/systems/StreamingDuelScheduler/managers/__tests__/DuelOrchestrator.test.ts b/packages/server/src/systems/StreamingDuelScheduler/managers/__tests__/DuelOrchestrator.test.ts
new file mode 100644
index 000000000..e017b4774
--- /dev/null
+++ b/packages/server/src/systems/StreamingDuelScheduler/managers/__tests__/DuelOrchestrator.test.ts
@@ -0,0 +1,198 @@
+/**
+ * Regression tests for DuelOrchestrator cleanup paths.
+ *
+ * Specifically covers the timeout-draw bug where `endFightByTimeout()` called
+ * `onResolution()` directly on a tie, skipping `stopCombatLoop`,
+ * `clearCombatRetryTimeout`, and `stopCombatAIs` — leaving agents locked in
+ * arena mode (bounds clamped, autonomy disabled) until the next duel started.
+ *
+ * See DuelOrchestrator.endFightByTimeout + startResolution.
+ */
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { DuelOrchestrator } from "../DuelOrchestrator";
+import type { AgentContestant, StreamingDuelCycle } from "../../types";
+
+type ArenaService = {
+  clearArenaBounds: ReturnType<typeof vi.fn>;
+  setAutonomousBehaviorEnabled: ReturnType<typeof vi.fn>;
+};
+
+function makeContestant(
+  id: string,
+  hp: number,
+  damageDealt: number,
+): AgentContestant {
+  return {
+    characterId: id,
+    name: `agent-${id}`,
+    provider: "test",
+    model: "test",
+    combatLevel: 10,
+    wins: 0,
+    losses: 0,
+    currentHp: hp,
+    maxHp: 10,
+    originalPosition: [0, 0, 0],
+    damageDealtThisFight: damageDealt,
+    highestHit: 0,
+    attacksLanded: 0,
+    healsUsed: 0,
+    equipment: {},
+    inventory: [],
+    itemIconPaths: {},
+    rank: 0,
+    headToHeadWins: 0,
+    headToHeadLosses: 0,
+  };
+}
+
+function makeCycle(
+  a1Hp: number,
+  a2Hp: number,
+  a1Dmg: number,
+  a2Dmg: number,
+): StreamingDuelCycle {
+  const now = Date.now();
+  return {
+    cycleId: "test-cycle",
+    phase: "FIGHTING",
+    cycleStartTime: now,
+    phaseStartTime: now,
+    phaseVersion: 0,
+    agent1: makeContestant("a1", a1Hp, a1Dmg),
+    agent2: makeContestant("a2", a2Hp, a2Dmg),
+    duelId: null,
+    duelKeyHex: null,
+    arenaId: 1,
+    betOpenTime: null,
+    betCloseTime: null,
+    announcementExpiredAt: null,
+    countdownValue: null,
+    countdownBeganAt: null,
+    fightStartTime: now,
+    duelEndTime: null,
+    arenaPositions: null,
+    winnerId: null,
+    loserId: null,
+    winReason: null,
+    seed: null,
+    replayHash: null,
+  };
+}
+
+function makeOrchestrator(
+  cycle: StreamingDuelCycle,
+  services: ArenaService[],
+  onResolution: (w: string, l: string, r: string) => void,
+) {
+  const world: unknown = {
+    emit: vi.fn(),
+    entities: { get: () => null },
+    getSystem: () => null,
+    network: { send: vi.fn() },
+  };
+
+  const orch = new DuelOrchestrator(
+    world as never,
+    () => cycle,
+    (fields) => Object.assign(cycle, fields),
+    () => new Map(),
+    onResolution as never,
+    () => [],
+    () => [],
+  );
+
+  // Simulate `startCombatAIs` having run: both services locked into arena mode.
+  // In production this is populated by the loop at DuelOrchestrator.ts:2436.
+  (
+    orch as unknown as { _arenaModeServices: ArenaService[] }
+  )._arenaModeServices = services;
+
+  return orch;
+}
+
+describe("DuelOrchestrator.endFightByTimeout", () => {
+  beforeEach(() => {
+    // setTimeout at the end of startResolution (victory emote + trash talk)
+    // should not fire during test — keep timers fake.
+    vi.useFakeTimers();
+  });
+
+  afterEach(() => {
+    vi.useRealTimers();
+  });
+
+  it("clears arena mode on timeout-DRAW (regression for direct onResolution() bypass)", () => {
+    // Equal HP, equal damage → draw path
+    const cycle = makeCycle(5, 5, 7, 7);
+    const svc1: ArenaService = {
+      clearArenaBounds: vi.fn(),
+      setAutonomousBehaviorEnabled: vi.fn(),
+    };
+    const svc2: ArenaService = {
+      clearArenaBounds: vi.fn(),
+      setAutonomousBehaviorEnabled: vi.fn(),
+    };
+    const onResolution = vi.fn();
+    const orch = makeOrchestrator(cycle, [svc1, svc2], onResolution);
+
+    orch.endFightByTimeout();
+
+    // Must report a draw
+    expect(onResolution).toHaveBeenCalledTimes(1);
+    expect(onResolution).toHaveBeenCalledWith("a1", "a2", "draw");
+
+    // Must have torn down arena mode — this is exactly the cleanup that the
+    // pre-fix code skipped by calling onResolution() directly.
+    expect(svc1.clearArenaBounds).toHaveBeenCalledTimes(1);
+    expect(svc2.clearArenaBounds).toHaveBeenCalledTimes(1);
+    expect(svc1.setAutonomousBehaviorEnabled).toHaveBeenCalledTimes(1);
+    expect(svc1.setAutonomousBehaviorEnabled).toHaveBeenCalledWith(true);
+    expect(svc2.setAutonomousBehaviorEnabled).toHaveBeenCalledWith(true);
+  });
+
+  it("clears arena mode on timeout-HP-ADVANTAGE (smoke check)", () => {
+    // Different HP → hp_advantage path (already went through startResolution pre-fix,
+    // but worth a smoke test to guard against future regressions there too).
+    const cycle = makeCycle(8, 3, 7, 4);
+    const svc1: ArenaService = {
+      clearArenaBounds: vi.fn(),
+      setAutonomousBehaviorEnabled: vi.fn(),
+    };
+    const svc2: ArenaService = {
+      clearArenaBounds: vi.fn(),
+      setAutonomousBehaviorEnabled: vi.fn(),
+    };
+    const onResolution = vi.fn();
+    const orch = makeOrchestrator(cycle, [svc1, svc2], onResolution);
+
+    orch.endFightByTimeout();
+
+    expect(onResolution).toHaveBeenCalledWith("a1", "a2", "hp_advantage");
+    expect(svc1.clearArenaBounds).toHaveBeenCalledTimes(1);
+    expect(svc2.clearArenaBounds).toHaveBeenCalledTimes(1);
+    expect(svc1.setAutonomousBehaviorEnabled).toHaveBeenCalledWith(true);
+    expect(svc2.setAutonomousBehaviorEnabled).toHaveBeenCalledWith(true);
+  });
+
+  it("does nothing when phase is not FIGHTING (Fix G)", () => {
+    const cycle = makeCycle(5, 5, 7, 7);
+    cycle.phase = "RESOLUTION";
+    const svc1: ArenaService = {
+      clearArenaBounds: vi.fn(),
+      setAutonomousBehaviorEnabled: vi.fn(),
+    };
+    const svc2: ArenaService = {
+      clearArenaBounds: vi.fn(),
+      setAutonomousBehaviorEnabled: vi.fn(),
+    };
+    const onResolution = vi.fn();
+    const orch = makeOrchestrator(cycle, [svc1, svc2], onResolution);
+
+    orch.endFightByTimeout();
+
+    expect(onResolution).not.toHaveBeenCalled();
+    expect(svc1.clearArenaBounds).not.toHaveBeenCalled();
+    expect(svc2.clearArenaBounds).not.toHaveBeenCalled();
+  });
+});
diff --git a/packages/server/src/systems/StreamingDuelScheduler/types.ts b/packages/server/src/systems/StreamingDuelScheduler/types.ts
index 606d1ed38..dc4fe3b3b 100644
--- a/packages/server/src/systems/StreamingDuelScheduler/types.ts
+++ b/packages/server/src/systems/StreamingDuelScheduler/types.ts
@@ -56,6 +56,8 @@ export interface StreamingDuelCycle {
   betCloseTime: number | null;
   countdownValue: number | null; // 3, 2, 1, 0
   fightStartTime: number | null;
+  announcementExpiredAt: number | null;
+  countdownBeganAt: number | null;
   duelEndTime: number | null;
   arenaPositions: {
     agent1: [number, number, number];
@@ -96,6 +98,7 @@ export interface LeaderboardEntry {
   winRate: number;
   combatLevel: number;
   currentStreak: number;
+  lossStreak: number;
 }
 
 export interface RecentDuelEntry {
@@ -109,6 +112,15 @@ export interface RecentDuelEntry {
   winReason: "kill" | "hp_advantage" | "damage_advantage" | "draw";
   damageWinner: number;
   damageLoser: number;
+  // Oracle proof fields required by the keeper result-catch-up endpoint.
+  // Populated at resolution time from buildOracleProof() on the currentCycle.
+  // Nullable for backwards-compatibility with rows persisted before this
+  // field set was added; legacy rows cannot be used for synthetic onDuelEnd
+  // replay.
+  duelKeyHex: string | null;
+  duelEndTime: number | null;
+  seed: string | null;
+  replayHash: string | null;
 }
 
 export interface StreamingCycleAgent {
@@ -133,6 +145,24 @@ export interface StreamingCycleAgent {
   headToHeadLosses: number;
 }
 
+/**
+ * Raw source-time timeline emitted alongside the live-scheduler cycle when
+ * the `STREAMING_EMIT_RAW_SOURCE_TIME` flag is enabled. Every timestamp
+ * mirrors the underlying scheduler's wall-clock field without any
+ * presentation-delay projection applied; consumers (bettor-facing clients
+ * doing per-viewer alignment) are expected to key snapshot history off
+ * these fields rather than off `broadcastTimeline` values that the
+ * betting-feed rail pre-projects. See docs/frontier_duel_bet_stream_sync_prd_sow.md.
+ */
+export interface StreamingSourceTimeline {
+  phase: StreamingPhase;
+  betOpenTime: number | null;
+  betCloseTime: number | null;
+  fightStartTime: number | null;
+  duelEndTime: number | null;
+  updatedAt: number;
+}
+
 export interface StreamingStateUpdate {
   type: "STREAMING_STATE_UPDATE";
   cycle: {
@@ -163,9 +193,24 @@ export interface StreamingStateUpdate {
     winReason: string | null;
     seed: string | null;
     replayHash: string | null;
+    /**
+     * Optional raw source-time timeline. Present only when
+     * `STREAMING_EMIT_RAW_SOURCE_TIME=true` on the server. Absent on default
+     * deployments to preserve the current wire contract for consumers that
+     * don't participate in viewer-clock alignment.
+     */
+    sourceTimeline?: StreamingSourceTimeline;
   };
   leaderboard: LeaderboardEntry[];
   cameraTarget: string | null;
+  /**
+   * Raw source-emission timestamp of the frame. Present on REST responses
+   * only when `STREAMING_EMIT_RAW_SOURCE_TIME=true`; SSE frames stamp this
+   * independently via their own envelope regardless of the flag. Consumers
+   * doing per-viewer clock alignment use this as the selector key for
+   * historical session snapshots.
+   */
+  emittedAt?: number;
 }
 
 const parseDurationEnv = (
diff --git a/packages/server/tests/unit/assets/woodcutting-manifest.test.ts b/packages/server/tests/unit/assets/woodcutting-manifest.test.ts
new file mode 100644
index 000000000..1f2538afb
--- /dev/null
+++ b/packages/server/tests/unit/assets/woodcutting-manifest.test.ts
@@ -0,0 +1,39 @@
+import { describe, expect, it } from "vitest";
+import { existsSync, readFileSync } from "node:fs";
+import { fileURLToPath } from "node:url";
+import { resolve } from "node:path";
+
+interface WoodcuttingResource {
+  id: string;
+  modelVariants?: string[];
+  depletedModelPath?: string | null;
+}
+
+const WORLD_ASSETS_DIR = fileURLToPath(
+  new URL("../../../world/assets", import.meta.url),
+);
+const WOODCUTTING_MANIFEST_PATH = resolve(
+  WORLD_ASSETS_DIR,
+  "manifests/gathering/woodcutting.json",
+);
+
+function assetUriExists(assetUri: string): boolean {
+  return existsSync(resolve(WORLD_ASSETS_DIR, assetUri.replace("asset://", "")));
+}
+
+describe("woodcutting manifest", () => {
+  it("only references packaged resource models", () => {
+    const manifest = JSON.parse(
+      readFileSync(WOODCUTTING_MANIFEST_PATH, "utf8"),
+    ) as { resources?: WoodcuttingResource[] };
+
+    for (const resource of manifest.resources ?? []) {
+      for (const modelVariant of resource.modelVariants ?? []) {
+        expect(assetUriExists(modelVariant)).toBe(true);
+      }
+      if (resource.depletedModelPath) {
+        expect(assetUriExists(resource.depletedModelPath)).toBe(true);
+      }
+    }
+  });
+});
diff --git a/packages/server/tests/unit/middleware/csrf.test.ts b/packages/server/tests/unit/middleware/csrf.test.ts
new file mode 100644
index 000000000..afaafc743
--- /dev/null
+++ b/packages/server/tests/unit/middleware/csrf.test.ts
@@ -0,0 +1,72 @@
+import type { FastifyRequest } from "fastify";
+import { describe, expect, it } from "vitest";
+import { shouldSkipCsrf } from "../../../src/middleware/csrf.js";
+
+function request(headers: Record<string, string | undefined>): FastifyRequest {
+  return {
+    headers,
+    method: "POST",
+    url: "/api/state-changing",
+  } as FastifyRequest;
+}
+
+describe("shouldSkipCsrf", () => {
+  it("does not let forged authorization headers bypass CSRF on cookie requests", () => {
+    expect(
+      shouldSkipCsrf(
+        request({
+          authorization: "Bearer attacker-controlled",
+          cookie: "session=ambient",
+        }),
+      ),
+    ).toBe(false);
+  });
+
+  it("allows structured authorization headers for non-cookie API clients", () => {
+    expect(
+      shouldSkipCsrf(
+        request({
+          authorization: "Bearer service-token",
+        }),
+      ),
+    ).toBe(true);
+  });
+
+  it("does not let forged admin-code headers bypass CSRF on cookie requests", () => {
+    expect(
+      shouldSkipCsrf(
+        request({
+          "x-admin-code": "operator-secret",
+          cookie: "session=ambient",
+        }),
+      ),
+    ).toBe(false);
+  });
+
+  it("does not trust non-TLS production origins", () => {
+    expect(
+      shouldSkipCsrf(
+        request({
+          origin: "http://hyperbet.win",
+        }),
+      ),
+    ).toBe(false);
+  });
+
+  it("still trusts TLS production origins and local development origins", () => {
+    expect(
+      shouldSkipCsrf(
+        request({
+          origin: "https://hyperbet.win",
+        }),
+      ),
+    ).toBe(true);
+    expect(
+      shouldSkipCsrf(
+        request({
+          origin: "http://localhost:5173",
+        }),
+      ),
+    ).toBe(true);
+  });
+});
diff --git a/packages/server/tests/unit/oracle/DuelArenaOraclePublisher.test.ts b/packages/server/tests/unit/oracle/DuelArenaOraclePublisher.test.ts
index 7c5cd32ca..3eea39d1e 100644
--- a/packages/server/tests/unit/oracle/DuelArenaOraclePublisher.test.ts
+++ b/packages/server/tests/unit/oracle/DuelArenaOraclePublisher.test.ts
@@ -202,4 +202,356 @@ describe("DuelArenaOraclePublisher", () => {
       // To strictly verify chain state we need to mock updateChainState which is private or call getRecord
     });
   });
+
+  describe("publishToTarget retry", () => {
+    beforeEach(() => {
+      vi.useFakeTimers();
+    });
+
+    afterEach(() => {
+      vi.useRealTimers();
+    });
+
+    it("retries a failed publish with exponential backoff and succeeds", async () => {
+      config.settlementDelayMs = 0;
+      publisher = new DuelArenaOraclePublisher(mockWorld, config);
+
+      const publishResolution = vi
+        .fn()
+        .mockRejectedValueOnce(new Error("network glitch"))
+        .mockResolvedValueOnce("0xretryOk");
+
+      const mockTarget = {
+        key: "baseSepolia",
+        label: "Base Sepolia",
+        publishResolution,
+      };
+      (publisher as any).evmTargets = [mockTarget];
+
+      const record: DuelArenaOracleRecord = {
+        duelId: "duel-retry-ok",
+        status: "RESOLVED",
+        cycleId: "cycle-1",
+        chainState: {},
+      } as unknown as DuelArenaOracleRecord;
+      (publisher as any).records.set(record.duelId, record);
+      vi.spyOn(publisher as any, "persistRecords").mockResolvedValue(undefined);
+
+      // First attempt — should fail and schedule a retry for +1000ms.
+      await (publisher as any).publishToTarget(record, mockTarget, "RESOLVE");
+      expect(publishResolution).toHaveBeenCalledTimes(1);
+      expect((publisher as any).retryTimers.size).toBe(1);
+
+      // Advance past the first retry delay (1000ms) and flush microtasks so the
+      // retry's async publishToTarget call resolves before we inspect state.
+      await vi.advanceTimersByTimeAsync(1000);
+
+      expect(publishResolution).toHaveBeenCalledTimes(2);
+      expect((publisher as any).retryTimers.size).toBe(0);
+      const latestState = (publisher as any).getRecord("duel-retry-ok")
+        ?.chainState["baseSepolia"];
+      expect(latestState?.lastTxHash).toBe("0xretryOk");
+      expect(latestState?.lastError).toBeNull();
+    });
+
+    it("gives up after the maximum number of retries", async () => {
+      config.settlementDelayMs = 0;
+      publisher = new DuelArenaOraclePublisher(mockWorld, config);
+
+      const err = new Error("rpc down");
+      const publishResolution = vi.fn().mockRejectedValue(err);
+      const mockTarget = {
+        key: "baseSepolia",
+        label: "Base Sepolia",
+        publishResolution,
+      };
+      (publisher as any).evmTargets = [mockTarget];
+
+      const record: DuelArenaOracleRecord = {
+        duelId: "duel-retry-exhaust",
+        status: "RESOLVED",
+        cycleId: "cycle-1",
+        chainState: {},
+      } as unknown as DuelArenaOracleRecord;
+      (publisher as any).records.set(record.duelId, record);
+      vi.spyOn(publisher as any, "persistRecords").mockResolvedValue(undefined);
+
+      await (publisher as any).publishToTarget(record, mockTarget, "RESOLVE");
+      // Exhaust the full retry schedule: 1s + 2.5s + 6s + 15s + 30s.
+      await vi.advanceTimersByTimeAsync(55_000);
+
+      // Initial + 5 retries = 6 attempts.
+      expect(publishResolution).toHaveBeenCalledTimes(6);
+      expect((publisher as any).retryTimers.size).toBe(0);
+    });
+
+    it("re-queues failed publishes from persisted records on boot", async () => {
+      // setImmediate must actually fire — switch off the outer describe's
+      // fake timers for this test only.
+      vi.useRealTimers();
+
+      config.settlementDelayMs = 0;
+      publisher = new DuelArenaOraclePublisher(mockWorld, config);
+
+      // Pretend the persisted store already has a RESOLVED duel whose EVM
+      // publish failed right before shutdown (lastError set on evm target).
+      // A CANCELLED duel with a clean (lastError=null) solana target must NOT
+      // be re-queued — that's what success looks like.
+      vi.spyOn(publisher as any, "loadPersistedRecords").mockImplementation(
+        async () => {
+          (publisher as any).records.set("duel-stuck", {
+            duelId: "duel-stuck",
+            status: "RESOLVED",
+            cycleId: "cycle-stuck",
+            chainState: {
+              baseSepolia: {
+                target: "baseSepolia",
+                kind: "evm",
+                label: "Base Sepolia",
+                lastAction: "RESOLVE",
+                lastTxHash: null,
+                lastError: "rpc fell over",
+                updatedAt: "2024-01-01T00:00:00Z",
+              },
+            },
+          });
+          (publisher as any).records.set("duel-clean", {
+            duelId: "duel-clean",
+            status: "CANCELLED",
+            cycleId: "cycle-clean",
+            chainState: {
+              baseSepolia: {
+                target: "baseSepolia",
+                kind: "evm",
+                label: "Base Sepolia",
+                lastAction: "CANCEL",
+                lastTxHash: "0xok",
+                lastError: null,
+                updatedAt: "2024-01-01T00:00:00Z",
+              },
+            },
+          });
+        },
+      );
+
+      // Fake target that records which action it was called with.
+      const publishResolution = vi.fn().mockResolvedValue("0xbootRetryOk");
+      const publishCancellation = vi.fn().mockResolvedValue("0xshouldNotFire");
+      const mockTarget = {
+        key: "baseSepolia",
+        label: "Base Sepolia",
+        publishResolution,
+        publishCancellation,
+      };
+
+      // init() calls loadPersistedRecords() first, then attach(), then
+      // requeueFailedPublishesOnBoot(). We need evmTargets populated BEFORE
+      // init() runs. The real publisher builds evmTargets in its ctor from
+      // config.evmTargets — since we can't easily inject mock classes
+      // through the EVM config, swap the array directly before init().
+      (publisher as any).evmTargets = [mockTarget];
+
+      await publisher.init();
+      // setImmediate is used to defer work — flush it so the requeue fires.
+      await new Promise((resolve) => setImmediate(resolve));
+      // One microtask loop for the inner publishToTarget promise.
+      await Promise.resolve();
+
+      expect(publishResolution).toHaveBeenCalledTimes(1);
+      // The CANCELLED/clean record must not have been re-queued.
+      expect(publishCancellation).not.toHaveBeenCalled();
+    });
+
+    it("getStuckRecords returns records with lastError set", () => {
+      config.settlementDelayMs = 0;
+      publisher = new DuelArenaOraclePublisher(mockWorld, config);
+
+      (publisher as any).records.set("duel-stuck", {
+        duelId: "duel-stuck",
+        status: "RESOLVED",
+        winnerId: "a",
+        loserId: "b",
+        updatedAt: "2024-02-01T00:00:00Z",
+        chainState: {
+          baseSepolia: {
+            target: "baseSepolia",
+            kind: "evm",
+            label: "Base Sepolia",
+            lastAction: "RESOLVE",
+            lastTxHash: null,
+            lastError: "rpc timeout",
+            updatedAt: "2024-02-01T00:00:00Z",
+          },
+          solanaDevnet: {
+            target: "solanaDevnet",
+            kind: "solana",
+            label: "Solana Devnet",
+            lastAction: "RESOLVE",
+            lastTxHash: "solOkHash",
+            lastError: null,
+            updatedAt: "2024-02-01T00:00:00Z",
+          },
+        },
+      });
+      (publisher as any).records.set("duel-clean", {
+        duelId: "duel-clean",
+        status: "RESOLVED",
+        winnerId: "c",
+        loserId: "d",
+        updatedAt: "2024-02-01T00:00:00Z",
+        chainState: {
+          baseSepolia: {
+            target: "baseSepolia",
+            kind: "evm",
+            lastAction: "RESOLVE",
+            lastTxHash: "0xok",
+            lastError: null,
+            updatedAt: "2024-02-01T00:00:00Z",
+          },
+        },
+      });
+
+      const stuck = publisher.getStuckRecords();
+      expect(stuck).toHaveLength(1);
+      expect(stuck[0].duelId).toBe("duel-stuck");
+      // Only the failed target shows up — the clean solana one does not.
+      expect(stuck[0].stuckTargets).toHaveLength(1);
+      expect(stuck[0].stuckTargets[0].target).toBe("baseSepolia");
+      expect(stuck[0].stuckTargets[0].lastError).toBe("rpc timeout");
+    });
+
+    it("clearStuckRecord without forceRetry clears errors and skips re-publish", async () => {
+      // Real timers so setImmediate actually fires if forceRetry ever is used.
+      vi.useRealTimers();
+
+      config.settlementDelayMs = 0;
+      publisher = new DuelArenaOraclePublisher(mockWorld, config);
+      vi.spyOn(publisher as any, "persistRecords").mockResolvedValue(undefined);
+
+      const publishResolution = vi.fn().mockResolvedValue("0xshouldNotFire");
+      const mockTarget = {
+        key: "baseSepolia",
+        label: "Base Sepolia",
+        publishResolution,
+      };
+      (publisher as any).evmTargets = [mockTarget];
+
+      (publisher as any).records.set("duel-1", {
+        duelId: "duel-1",
+        status: "RESOLVED",
+        updatedAt: "2024-01-01T00:00:00Z",
+        chainState: {
+          baseSepolia: {
+            target: "baseSepolia",
+            kind: "evm",
+            label: "Base Sepolia",
+            lastAction: "RESOLVE",
+            lastTxHash: null,
+            lastError: "boom",
+            updatedAt: "2024-01-01T00:00:00Z",
+          },
+        },
+      });
+
+      const result = await publisher.clearStuckRecord("duel-1");
+      expect(result.cleared).toBe(true);
+      expect(result.targetsCleared).toEqual(["baseSepolia"]);
+      expect(result.targetsRetried).toEqual([]);
+
+      // Flush any setImmediate that might have queued (shouldn't have).
+      await new Promise((resolve) => setImmediate(resolve));
+      expect(publishResolution).not.toHaveBeenCalled();
+
+      const rec = (publisher as any).getRecord("duel-1");
+      expect(rec.chainState.baseSepolia.lastError).toBeNull();
+    });
+
+    it("clearStuckRecord with forceRetry clears errors and retriggers publish", async () => {
+      vi.useRealTimers();
+
+      config.settlementDelayMs = 0;
+      publisher = new DuelArenaOraclePublisher(mockWorld, config);
+      vi.spyOn(publisher as any, "persistRecords").mockResolvedValue(undefined);
+
+      const publishResolution = vi.fn().mockResolvedValue("0xforcedOk");
+      const mockTarget = {
+        key: "baseSepolia",
+        label: "Base Sepolia",
+        publishResolution,
+      };
+      (publisher as any).evmTargets = [mockTarget];
+
+      (publisher as any).records.set("duel-2", {
+        duelId: "duel-2",
+        status: "RESOLVED",
+        updatedAt: "2024-01-01T00:00:00Z",
+        chainState: {
+          baseSepolia: {
+            target: "baseSepolia",
+            kind: "evm",
+            label: "Base Sepolia",
+            lastAction: "RESOLVE",
+            lastTxHash: null,
+            lastError: "old_error",
+            updatedAt: "2024-01-01T00:00:00Z",
+          },
+        },
+      });
+
+      const result = await publisher.clearStuckRecord("duel-2", {
+        forceRetry: true,
+      });
+      expect(result.cleared).toBe(true);
+      expect(result.targetsRetried).toEqual(["baseSepolia"]);
+
+      // Let setImmediate + inner promise resolve.
+      await new Promise((resolve) => setImmediate(resolve));
+      await Promise.resolve();
+
+      expect(publishResolution).toHaveBeenCalledTimes(1);
+      const rec = (publisher as any).getRecord("duel-2");
+      expect(rec.chainState.baseSepolia.lastTxHash).toBe("0xforcedOk");
+      expect(rec.chainState.baseSepolia.lastError).toBeNull();
+    });
+
+    it("clearStuckRecord returns not_found for unknown duelId", async () => {
+      vi.useRealTimers();
+      publisher = new DuelArenaOraclePublisher(mockWorld, config);
+      const result = await publisher.clearStuckRecord("does-not-exist");
+      expect(result.cleared).toBe(false);
+      expect(result.reason).toBe("not_found");
+    });
+
+    it("destroy() cancels pending retry timers", async () => {
+      config.settlementDelayMs = 0;
+      publisher = new DuelArenaOraclePublisher(mockWorld, config);
+
+      const publishResolution = vi.fn().mockRejectedValue(new Error("fail"));
+      const mockTarget = {
+        key: "baseSepolia",
+        label: "Base Sepolia",
+        publishResolution,
+      };
+      (publisher as any).evmTargets = [mockTarget];
+
+      const record: DuelArenaOracleRecord = {
+        duelId: "duel-destroy",
+        status: "RESOLVED",
+        cycleId: "cycle-1",
+        chainState: {},
+      } as unknown as DuelArenaOracleRecord;
+      (publisher as any).records.set(record.duelId, record);
+      vi.spyOn(publisher as any, "persistRecords").mockResolvedValue(undefined);
+
+      await (publisher as any).publishToTarget(record, mockTarget, "RESOLVE");
+      expect((publisher as any).retryTimers.size).toBe(1);
+
+      publisher.destroy();
+      expect((publisher as any).retryTimers.size).toBe(0);
+
+      // Advancing past the delay must NOT retry — the timer was cleared.
+      await vi.advanceTimersByTimeAsync(60_000);
+      expect(publishResolution).toHaveBeenCalledTimes(1);
+    });
+  });
 });
diff --git a/packages/server/tests/unit/routes/streaming-betting-auth.test.ts b/packages/server/tests/unit/routes/streaming-betting-auth.test.ts
index f6675700e..c4029077d 100644
--- a/packages/server/tests/unit/routes/streaming-betting-auth.test.ts
+++ b/packages/server/tests/unit/routes/streaming-betting-auth.test.ts
@@ -1,8 +1,10 @@
 import { describe, expect, it } from "vitest";
 import {
+  assertSafeBettingFeedAuthConfig,
   extractBettingFeedToken,
   hasValidBettingFeedToken,
   resolveBettingFeedAccessToken,
+  resolveOracleProofAccessToken,
   shouldSkipBettingFeedAuth,
 } from "../../../src/routes/streaming-betting-auth.js";
 
@@ -33,6 +35,19 @@ describe("streaming-betting-auth", () => {
     ).toBe("secret-token");
   });
 
+  it("rejects empty or malformed bearer headers", () => {
+    expect(
+      extractBettingFeedToken({
+        authorizationHeader: "Bearer ",
+      }),
+    ).toBeNull();
+    expect(
+      extractBettingFeedToken({
+        authorizationHeader: "Bearer secret extra",
+      }),
+    ).toBeNull();
+  });
+
   it("does not accept query tokens unless the route explicitly allows them", () => {
     expect(extractBettingFeedToken({})).toBeNull();
   });
@@ -82,4 +97,44 @@ describe("streaming-betting-auth", () => {
       }),
     ).toBe(false);
   });
+
+  it("throws when skip-auth is configured in production", () => {
+    expect(() =>
+      assertSafeBettingFeedAuthConfig({
+        NODE_ENV: "production",
+        BETTING_FEED_SKIP_AUTH: "true",
+      }),
+    ).toThrow("BETTING_FEED_SKIP_AUTH=true is forbidden");
+  });
+
+  it("requires HYPERSCAPES_RESULT_LOOKUP_BEARER_TOKEN for oracle proof retrieval", () => {
+    expect(
+      resolveOracleProofAccessToken({
+        HYPERSCAPES_RESULT_LOOKUP_BEARER_TOKEN: "keeper-aligned-secret",
+        BETTING_FEED_ACCESS_TOKEN: "bet-secret",
+      }),
+    ).toEqual({
+      token: "keeper-aligned-secret",
+      source: "oracle-proof",
+    });
+  });
+
+  it("does not fall back to BETTING_FEED_ACCESS_TOKEN for oracle proof retrieval", () => {
+    expect(
+      resolveOracleProofAccessToken({
+        NODE_ENV: "development",
+        BETTING_FEED_ACCESS_TOKEN: "bet-secret",
+      }),
+    ).toEqual({
+      token: null,
+      source: null,
+    });
+  });
+
+  it("reports missing auth when neither oracle-proof nor betting feed token is configured", () => {
+    expect(resolveOracleProofAccessToken({})).toEqual({
+      token: null,
+      source: null,
+    });
+  });
 });
diff --git a/packages/server/tests/unit/routes/streaming-betting-canonical-convergence.test.ts b/packages/server/tests/unit/routes/streaming-betting-canonical-convergence.test.ts
new file mode 100644
index 000000000..08a478f1e
--- /dev/null
+++ b/packages/server/tests/unit/routes/streaming-betting-canonical-convergence.test.ts
@@ -0,0 +1,806 @@
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import Fastify, { type FastifyInstance } from "fastify";
+import { afterEach, describe, expect, it, vi } from "vitest";
+import { registerStreamingBettingRoutes } from "../../../src/routes/streaming-betting-routes.js";
+
+type BettingSyncStatePayload = {
+  rendererHealth?: {
+    ready?: boolean;
+    degradedReason?: string | null;
+  };
+} & Record<string, unknown>;
+
+const stubbedEnv = new Map<string, string | undefined>();
+
+function stubEnv(key: string, value: string): void {
+  if (!stubbedEnv.has(key)) {
+    stubbedEnv.set(key, process.env[key]);
+  }
+  process.env[key] = value;
+}
+
+function restoreStubbedEnvs(): void {
+  for (const [key, value] of stubbedEnv.entries()) {
+    if (value === undefined) {
+      delete process.env[key];
+      continue;
+    }
+    process.env[key] = value;
+  }
+  stubbedEnv.clear();
+}
+
+function createFastifyWithRateLimitDecorator(): FastifyInstance {
+  const fastify = Fastify();
+  fastify.decorate("rateLimit", (() =>
+    async () => {}) as FastifyInstance["rateLimit"]);
+  return fastify;
+}
+
+function createRouteOptions(
+  overrides: Partial<Parameters<typeof registerStreamingBettingRoutes>[0]> = {},
+) {
+  return {
+    fastify: createFastifyWithRateLimitDecorator(),
+    world: {
+      getSystem: () => null,
+    } as never,
+    replayBuffer: 16,
+    replayMaxBytes: 64 * 1024,
+    pushIntervalMs: 250,
+    heartbeatMs: 5000,
+    maxPendingBytes: 64 * 1024,
+    maxClients: 1,
+    bootstrapRateLimit: {
+      max: 10,
+      timeWindow: "1 minute",
+    },
+    eventsRateLimit: {
+      max: 10,
+      timeWindow: "1 minute",
+    },
+    internalAllowedOrigin: null,
+    externalStatusFile: null,
+    externalStatusMaxAgeMs: 15_000,
+    getStreamingDuelScheduler: () => ({
+      getCurrentCycle: () => null,
+    }),
+    getStreamCaptureStats: () => ({
+      clientConnected: true,
+      ffmpegRunning: true,
+    }),
+    ...overrides,
+  };
+}
+
+describe("streaming-betting canonical convergence", () => {
+  afterEach(() => {
+    vi.restoreAllMocks();
+    restoreStubbedEnvs();
+  });
+
+  it("marks canonical playback ready when the probe is healthy even if worker connected is stale false", async () => {
+    stubEnv("BETTING_FEED_ACCESS_TOKEN", "bet-secret");
+    stubEnv("STREAM_DELIVERY_MODE", "external_hls");
+    stubEnv("STREAM_DELIVERY_PROVIDER", "cloudflare_stream");
+    stubEnv("NODE_ENV", "development");
+    stubEnv("STREAM_ALLOW_PRIVATE_PLAYBACK_PROBES", "true");
+    stubEnv("STREAM_PLAYBACK_HLS_URL", "https://customer.example/live.m3u8");
+    stubEnv(
+      "STREAM_PLAYBACK_LLHLS_URL",
+      "https://customer.example/live.m3u8?protocol=llhls",
+    );
+    stubEnv("STREAM_INGEST_RTMPS_URL", "srt://live.cloudflare.example/input");
+
+    const now = Date.now();
+    const tempDir = fs.mkdtempSync(
+      path.join(os.tmpdir(), "streaming-betting-canonical-"),
+    );
+    const externalStatusFile = path.join(tempDir, "rtmp-status.json");
+    fs.writeFileSync(
+      externalStatusFile,
+      JSON.stringify({
+        active: true,
+        ffmpegRunning: true,
+        clientConnected: true,
+        destinations: [
+          {
+            id: "canonical-cloudflare",
+            role: "canonical",
+            provider: "cloudflare_stream",
+            name: "External Delivery",
+            transport: "srt",
+            playbackUrl: "https://customer.example/live.m3u8",
+            connected: false,
+            error: "stale worker error",
+            startedAt: now - 500,
+          },
+        ],
+        stats: {
+          healthy: true,
+        },
+        updatedAt: now,
+        rendererHealth: {
+          ready: true,
+          degradedReason: null,
+          updatedAt: now,
+        },
+        sourceRuntime: {
+          ready: true,
+          statusSource: "external_worker",
+          captureMode: "cdp",
+          degradedReason: null,
+          currentSceneUrl: "https://staging.example/stream",
+          activeBundle:
+            "https://staging.example/assets/StreamingMode-abc123.js",
+          lastFrameAt: now,
+          lastRenderTickAt: now,
+          lastVisualChangeAt: now,
+          lastRecoveryAt: now - 1000,
+          recoveryCount: 1,
+          workerHeartbeatAt: now,
+        },
+      }),
+    );
+
+    const fetchSpy = vi
+      .spyOn(globalThis, "fetch")
+      .mockImplementation(async () => new Response("", { status: 200 }));
+
+    const options = createRouteOptions({
+      externalStatusFile,
+    });
+    const routes = registerStreamingBettingRoutes(options);
+
+    for (
+      let attempt = 0;
+      attempt < 20 && fetchSpy.mock.calls.length === 0;
+      attempt += 1
+    ) {
+      await new Promise((resolve) => setTimeout(resolve, 10));
+    }
+    expect(fetchSpy).toHaveBeenCalled();
+    await new Promise((resolve) => setTimeout(resolve, 10));
+
+    const response = await options.fastify.inject({
+      method: "GET",
+      url: "/api/internal/bet-sync/state",
+      headers: {
+        authorization: "Bearer bet-secret",
+      },
+    });
+
+    expect(response.statusCode).toBe(200);
+    const payload = response.json();
+    const canonicalDestination = payload.channel.destinations.find(
+      (destination: { role?: string }) => destination.role === "canonical",
+    );
+    expect(payload.channel.publicReadiness).toMatchObject({
+      ready: true,
+      reason: null,
+    });
+    expect(canonicalDestination).toMatchObject({
+      id: "canonical-cloudflare",
+      connected: true,
+      transportHealthy: true,
+      playbackReady: true,
+      lastError: null,
+      manifestStatus: "ok",
+    });
+
+    routes.close();
+    await options.fastify.close();
+    fs.rmSync(tempDir, { recursive: true, force: true });
+  });
+
+  it("refreshes bootstrap renderer health when replay exists but external status has advanced", async () => {
+    stubEnv("BETTING_FEED_ACCESS_TOKEN", "bet-secret");
+    stubEnv("STREAM_DELIVERY_MODE", "external_hls");
+    stubEnv("STREAM_DELIVERY_PROVIDER", "cloudflare_stream");
+    stubEnv("NODE_ENV", "development");
+    stubEnv("STREAM_ALLOW_PRIVATE_PLAYBACK_PROBES", "true");
+    stubEnv("STREAM_PLAYBACK_HLS_URL", "https://customer.example/live.m3u8");
+    stubEnv(
+      "STREAM_PLAYBACK_LLHLS_URL",
+      "https://customer.example/live.m3u8?protocol=llhls",
+    );
+    stubEnv("STREAM_INGEST_RTMPS_URL", "srt://live.cloudflare.example/input");
+
+    const now = Date.now();
+    const tempDir = fs.mkdtempSync(
+      path.join(os.tmpdir(), "streaming-betting-bootstrap-refresh-"),
+    );
+    const externalStatusFile = path.join(tempDir, "rtmp-status.json");
+
+    const writeStatus = (rendererReady: boolean, updatedAt: number) => {
+      fs.writeFileSync(
+        externalStatusFile,
+        JSON.stringify({
+          active: true,
+          ffmpegRunning: true,
+          clientConnected: true,
+          destinations: [
+            {
+              id: "canonical-cloudflare",
+              role: "canonical",
+              provider: "cloudflare_stream",
+              name: "External Delivery",
+              transport: "srt",
+              playbackUrl: "https://customer.example/live.m3u8",
+              connected: true,
+              startedAt: updatedAt - 500,
+            },
+          ],
+          stats: {
+            healthy: true,
+          },
+          updatedAt,
+          rendererHealth: {
+            ready: rendererReady,
+            degradedReason: rendererReady ? null : "render_tick_stale",
+            updatedAt,
+          },
+          metrics: {
+            captureFps: 60,
+            encodeFps: 60,
+            latestFrameAt: updatedAt,
+            latestRenderTickAt: updatedAt,
+            latestVisualChangeAt: updatedAt,
+            visualChangeAgeMs: 0,
+          },
+          sourceRuntime: {
+            ready: true,
+            statusSource: "external_worker",
+            captureMode: "cdp",
+            degradedReason: null,
+            currentSceneUrl: "https://staging.example/stream",
+            activeBundle:
+              "https://staging.example/assets/StreamingMode-abc123.js",
+            lastFrameAt: updatedAt,
+            lastRenderTickAt: updatedAt,
+            lastVisualChangeAt: updatedAt,
+            lastRecoveryAt: updatedAt - 1000,
+            recoveryCount: 1,
+            workerHeartbeatAt: updatedAt,
+          },
+        }),
+      );
+    };
+
+    writeStatus(false, now);
+
+    const fetchSpy = vi
+      .spyOn(globalThis, "fetch")
+      .mockImplementation(async () => new Response("", { status: 200 }));
+
+    const options = createRouteOptions({
+      externalStatusFile,
+    });
+    const routes = registerStreamingBettingRoutes(options);
+
+    for (
+      let attempt = 0;
+      attempt < 20 && fetchSpy.mock.calls.length === 0;
+      attempt += 1
+    ) {
+      await new Promise((resolve) => setTimeout(resolve, 10));
+    }
+    expect(fetchSpy).toHaveBeenCalled();
+    await new Promise((resolve) => setTimeout(resolve, 10));
+
+    const initialResponse = await options.fastify.inject({
+      method: "GET",
+      url: "/api/internal/bet-sync/state",
+      headers: {
+        authorization: "Bearer bet-secret",
+      },
+    });
+
+    expect(initialResponse.statusCode).toBe(200);
+    expect(initialResponse.json().rendererHealth).toMatchObject({
+      ready: false,
+      degradedReason: "render_tick_stale",
+    });
+
+    writeStatus(true, now + 5_000);
+
+    let refreshedPayload: BettingSyncStatePayload | null = null;
+    for (let attempt = 0; attempt < 40; attempt += 1) {
+      await new Promise((resolve) => setTimeout(resolve, 25));
+      const response = await options.fastify.inject({
+        method: "GET",
+        url: "/api/internal/bet-sync/state",
+        headers: {
+          authorization: "Bearer bet-secret",
+        },
+      });
+      expect(response.statusCode).toBe(200);
+      const payload = response.json() as BettingSyncStatePayload;
+      if (payload.rendererHealth?.ready === true) {
+        refreshedPayload = payload;
+        break;
+      }
+    }
+
+    expect(refreshedPayload).not.toBeNull();
+    expect(refreshedPayload?.rendererHealth).toMatchObject({
+      ready: true,
+      degradedReason: null,
+    });
+
+    routes.close();
+    await options.fastify.close();
+    fs.rmSync(tempDir, { recursive: true, force: true });
+  });
+
+  it("keeps Cloudflare canonical in external mode even when automatic failover prefers self-hls", async () => {
+    stubEnv("BETTING_FEED_ACCESS_TOKEN", "bet-secret");
+    stubEnv("STREAM_DELIVERY_MODE", "external_hls");
+    stubEnv("STREAM_DELIVERY_PROVIDER", "cloudflare_stream");
+    stubEnv("STREAM_ENABLE_AUTOMATIC_FAILOVER", "true");
+    stubEnv("STREAM_CANONICAL_PROVIDER_PRIORITY", "self_hls,cloudflare_stream");
+    stubEnv("NODE_ENV", "development");
+    stubEnv("STREAM_ALLOW_PRIVATE_PLAYBACK_PROBES", "true");
+    stubEnv("STREAM_PLAYBACK_HLS_URL", "https://customer.example/live.m3u8");
+    stubEnv(
+      "STREAM_PLAYBACK_LLHLS_URL",
+      "https://customer.example/live.m3u8?protocol=llhls",
+    );
+    stubEnv("STREAM_INGEST_RTMPS_URL", "srt://live.cloudflare.example/input");
+
+    const now = Date.now();
+    const tempDir = fs.mkdtempSync(
+      path.join(os.tmpdir(), "streaming-betting-priority-"),
+    );
+    const externalStatusFile = path.join(tempDir, "rtmp-status.json");
+    fs.writeFileSync(
+      externalStatusFile,
+      JSON.stringify({
+        active: true,
+        ffmpegRunning: true,
+        clientConnected: true,
+        destinations: [
+          {
+            id: "canonical-cloudflare",
+            role: "canonical",
+            provider: "cloudflare_stream",
+            name: "Cloudflare Stream",
+            transport: "srt",
+            playbackUrl: "https://customer.example/live.m3u8",
+            connected: true,
+            startedAt: now - 500,
+          },
+        ],
+        stats: {
+          healthy: true,
+        },
+        updatedAt: now,
+        hlsManifest: {
+          updatedAt: now,
+          mediaSequence: 123,
+        },
+        rendererHealth: {
+          ready: true,
+          degradedReason: null,
+          updatedAt: now,
+        },
+        sourceRuntime: {
+          ready: true,
+          statusSource: "external_worker",
+          captureMode: "cdp",
+          degradedReason: null,
+          currentSceneUrl: "https://staging.example/stream",
+          activeBundle: null,
+          lastFrameAt: now,
+          lastRenderTickAt: now,
+          lastVisualChangeAt: now,
+          lastRecoveryAt: now - 1000,
+          recoveryCount: 0,
+          workerHeartbeatAt: now,
+        },
+      }),
+    );
+
+    const fetchSpy = vi
+      .spyOn(globalThis, "fetch")
+      .mockImplementation(async () => new Response("", { status: 200 }));
+
+    const options = createRouteOptions({
+      externalStatusFile,
+    });
+    const routes = registerStreamingBettingRoutes(options);
+
+    for (
+      let attempt = 0;
+      attempt < 20 && fetchSpy.mock.calls.length === 0;
+      attempt += 1
+    ) {
+      await new Promise((resolve) => setTimeout(resolve, 10));
+    }
+
+    const response = await options.fastify.inject({
+      method: "GET",
+      url: "/api/internal/bet-sync/state",
+      headers: {
+        authorization: "Bearer bet-secret",
+      },
+    });
+
+    expect(response.statusCode).toBe(200);
+    const payload = response.json();
+    expect(payload.channel.canonicalDestinationId).toBe("canonical-cloudflare");
+    expect(payload.channel.fallbackDestinationId).toBeNull();
+    expect(payload.canonicalDestination).toMatchObject({
+      provider: "cloudflare_stream",
+      playbackReady: true,
+    });
+    expect(payload.fallbackDestination).toBeNull();
+
+    routes.close();
+    await options.fastify.close();
+    fs.rmSync(tempDir, { recursive: true, force: true });
+  });
+
+  it("uses self-HLS as canonical when the delivery mode is self-hls", async () => {
+    stubEnv("BETTING_FEED_ACCESS_TOKEN", "bet-secret");
+    stubEnv("STREAM_DELIVERY_MODE", "self_hls");
+    stubEnv("STREAM_DELIVERY_PROVIDER", "self_hls");
+    stubEnv("STREAM_ENABLE_AUTOMATIC_FAILOVER", "false");
+    stubEnv("NODE_ENV", "development");
+    stubEnv("STREAM_PLAYBACK_URL", "https://self.example/live/stream.m3u8");
+    stubEnv(
+      "STREAM_PLAYBACK_HLS_URL",
+      "https://self.example/live/stream.m3u8",
+    );
+    stubEnv("STREAM_EXTERNAL_DELIVERY_PROVIDER", "");
+    stubEnv("STREAM_EXTERNAL_PLAYBACK_HLS_URL", "");
+    stubEnv("STREAM_EXTERNAL_PLAYBACK_LLHLS_URL", "");
+    stubEnv("STREAM_EXTERNAL_INGEST_RTMPS_URL", "");
+
+    const now = Date.now();
+    const tempDir = fs.mkdtempSync(
+      path.join(os.tmpdir(), "streaming-betting-self-hls-"),
+    );
+    const externalStatusFile = path.join(tempDir, "rtmp-status.json");
+    fs.writeFileSync(
+      externalStatusFile,
+      JSON.stringify({
+        active: true,
+        ffmpegRunning: true,
+        clientConnected: true,
+        destinations: [
+          {
+            id: "canonical-self-hls",
+            role: "canonical",
+            provider: "self_hls",
+            name: "Self-HLS",
+            transport: "hls",
+            playbackUrl: "https://self.example/live/stream.m3u8",
+            connected: true,
+            startedAt: now - 500,
+          },
+        ],
+        stats: {
+          healthy: true,
+        },
+        updatedAt: now,
+        hlsManifest: {
+          updatedAt: now,
+          mediaSequence: 456,
+        },
+        rendererHealth: {
+          ready: true,
+          degradedReason: null,
+          updatedAt: now,
+        },
+        sourceRuntime: {
+          ready: true,
+          statusSource: "external_worker",
+          captureMode: "x11_nvenc",
+          degradedReason: null,
+          currentSceneUrl: "https://staging.example/stream",
+          activeBundle: null,
+          lastFrameAt: now,
+          lastRenderTickAt: now,
+          lastVisualChangeAt: now,
+          lastRecoveryAt: now - 1000,
+          recoveryCount: 0,
+          workerHeartbeatAt: now,
+        },
+      }),
+    );
+
+    const fetchSpy = vi.spyOn(globalThis, "fetch");
+
+    const options = createRouteOptions({
+      externalStatusFile,
+    });
+    const routes = registerStreamingBettingRoutes(options);
+
+    const response = await options.fastify.inject({
+      method: "GET",
+      url: "/api/internal/bet-sync/state",
+      headers: {
+        authorization: "Bearer bet-secret",
+      },
+    });
+
+    expect(response.statusCode).toBe(200);
+    const payload = response.json();
+    expect(fetchSpy).not.toHaveBeenCalled();
+    expect(payload.delivery).toMatchObject({
+      mode: "self_hls",
+      playbackUrl: "https://self.example/live/stream.m3u8",
+    });
+    expect(payload.channel.canonicalDestinationId).toBe("canonical-self-hls");
+    expect(payload.channel.fallbackDestinationId).toBeNull();
+    expect(payload.channel.publicReadiness).toMatchObject({
+      ready: true,
+      reason: null,
+    });
+    expect(payload.canonicalDestination).toMatchObject({
+      provider: "self_hls",
+      playbackReady: true,
+      playbackUrl: "https://self.example/live/stream.m3u8",
+    });
+    expect(payload.canonicalAuthority).toBeNull();
+
+    routes.close();
+    await options.fastify.close();
+    fs.rmSync(tempDir, { recursive: true, force: true });
+  });
+
+  it("keeps Cloudflare canonical by default even when provider priority prefers self-hls", async () => {
+    stubEnv("BETTING_FEED_ACCESS_TOKEN", "bet-secret");
+    stubEnv("STREAM_DELIVERY_MODE", "external_hls");
+    stubEnv("STREAM_DELIVERY_PROVIDER", "cloudflare_stream");
+    stubEnv("STREAM_CANONICAL_PROVIDER_PRIORITY", "self_hls,cloudflare_stream");
+    stubEnv("NODE_ENV", "development");
+    stubEnv("STREAM_ALLOW_PRIVATE_PLAYBACK_PROBES", "true");
+    stubEnv("STREAM_PLAYBACK_HLS_URL", "https://customer.example/live.m3u8");
+    stubEnv(
+      "STREAM_PLAYBACK_LLHLS_URL",
+      "https://customer.example/live.m3u8?protocol=llhls",
+    );
+    stubEnv("STREAM_INGEST_RTMPS_URL", "srt://live.cloudflare.example/input");
+
+    const now = Date.now();
+    const tempDir = fs.mkdtempSync(
+      path.join(os.tmpdir(), "streaming-betting-default-cloudflare-"),
+    );
+    const externalStatusFile = path.join(tempDir, "rtmp-status.json");
+    fs.writeFileSync(
+      externalStatusFile,
+      JSON.stringify({
+        active: true,
+        ffmpegRunning: true,
+        clientConnected: true,
+        destinations: [
+          {
+            id: "canonical-cloudflare",
+            role: "canonical",
+            provider: "cloudflare_stream",
+            name: "Cloudflare Stream",
+            transport: "srt",
+            playbackUrl: "https://customer.example/live.m3u8",
+            connected: true,
+            startedAt: now - 500,
+          },
+        ],
+        stats: {
+          healthy: true,
+        },
+        updatedAt: now,
+        hlsManifest: {
+          updatedAt: now,
+          mediaSequence: 321,
+        },
+        rendererHealth: {
+          ready: true,
+          degradedReason: null,
+          updatedAt: now,
+        },
+        sourceRuntime: {
+          ready: true,
+          statusSource: "external_worker",
+          captureMode: "cdp",
+          degradedReason: null,
+          currentSceneUrl: "https://staging.example/stream",
+          activeBundle: null,
+          lastFrameAt: now,
+          lastRenderTickAt: now,
+          lastVisualChangeAt: now,
+          lastRecoveryAt: now - 1000,
+          recoveryCount: 0,
+          workerHeartbeatAt: now,
+        },
+      }),
+    );
+
+    const fetchSpy = vi
+      .spyOn(globalThis, "fetch")
+      .mockImplementation(async () => new Response("", { status: 200 }));
+
+    const options = createRouteOptions({
+      externalStatusFile,
+    });
+    const routes = registerStreamingBettingRoutes(options);
+
+    for (
+      let attempt = 0;
+      attempt < 20 && fetchSpy.mock.calls.length === 0;
+      attempt += 1
+    ) {
+      await new Promise((resolve) => setTimeout(resolve, 10));
+    }
+
+    const response = await options.fastify.inject({
+      method: "GET",
+      url: "/api/internal/bet-sync/state",
+      headers: {
+        authorization: "Bearer bet-secret",
+      },
+    });
+
+    expect(response.statusCode).toBe(200);
+    const payload = response.json();
+    expect(payload.channel.canonicalDestinationId).toBe("canonical-cloudflare");
+    expect(payload.channel.fallbackDestinationId).toBeNull();
+    expect(payload.canonicalDestination).toMatchObject({
+      provider: "cloudflare_stream",
+      playbackReady: true,
+    });
+    expect(payload.fallbackDestination).toBeNull();
+
+    routes.close();
+    await options.fastify.close();
+    fs.rmSync(tempDir, { recursive: true, force: true });
+  });
+
+  it("does not fail over to self-hls while Cloudflare is disconnected in external mode", async () => {
+    stubEnv("BETTING_FEED_ACCESS_TOKEN", "bet-secret");
+    stubEnv("STREAM_DELIVERY_MODE", "external_hls");
+    stubEnv("STREAM_DELIVERY_PROVIDER", "cloudflare_stream");
+    stubEnv("STREAM_ENABLE_AUTOMATIC_FAILOVER", "true");
+    stubEnv("STREAM_CANONICAL_PROVIDER_PRIORITY", "cloudflare_stream,self_hls");
+    stubEnv("STREAM_FAILBACK_SOAK_MS", "150");
+    stubEnv("NODE_ENV", "development");
+    stubEnv("STREAM_ALLOW_PRIVATE_PLAYBACK_PROBES", "true");
+    stubEnv("STREAM_PLAYBACK_HLS_URL", "https://customer.example/live.m3u8");
+    stubEnv(
+      "STREAM_PLAYBACK_LLHLS_URL",
+      "https://customer.example/live.m3u8?protocol=llhls",
+    );
+    stubEnv("STREAM_INGEST_RTMPS_URL", "srt://live.cloudflare.example/input");
+
+    const now = Date.now();
+    const tempDir = fs.mkdtempSync(
+      path.join(os.tmpdir(), "streaming-betting-failback-"),
+    );
+    const externalStatusFile = path.join(tempDir, "rtmp-status.json");
+
+    const writeStatus = (connected: boolean, updatedAt: number) => {
+      fs.writeFileSync(
+        externalStatusFile,
+        JSON.stringify({
+          active: true,
+          ffmpegRunning: true,
+          clientConnected: true,
+          destinations: [
+            {
+              id: "canonical-cloudflare",
+              role: "canonical",
+              provider: "cloudflare_stream",
+              name: "Cloudflare Stream",
+              transport: "srt",
+              playbackUrl: "https://customer.example/live.m3u8",
+              connected,
+              error: connected ? null : "delivery_disconnected",
+              startedAt: updatedAt - 500,
+            },
+          ],
+          stats: {
+            healthy: true,
+          },
+          updatedAt,
+          hlsManifest: {
+            updatedAt,
+            mediaSequence: 456,
+          },
+          rendererHealth: {
+            ready: true,
+            degradedReason: null,
+            updatedAt,
+          },
+          sourceRuntime: {
+            ready: true,
+            statusSource: "external_worker",
+            captureMode: "cdp",
+            degradedReason: null,
+            currentSceneUrl: "https://staging.example/stream",
+            activeBundle: null,
+            lastFrameAt: updatedAt,
+            lastRenderTickAt: updatedAt,
+            lastVisualChangeAt: updatedAt,
+            lastRecoveryAt: updatedAt - 1000,
+            recoveryCount: 0,
+            workerHeartbeatAt: updatedAt,
+          },
+        }),
+      );
+    };
+
+    let probeStatus = 204;
+    writeStatus(false, now);
+
+    const fetchSpy = vi
+      .spyOn(globalThis, "fetch")
+      .mockImplementation(
+        async () => new Response("", { status: probeStatus }),
+      );
+
+    const options = createRouteOptions({
+      externalStatusFile,
+    });
+    const routes = registerStreamingBettingRoutes(options);
+
+    for (
+      let attempt = 0;
+      attempt < 20 && fetchSpy.mock.calls.length === 0;
+      attempt += 1
+    ) {
+      await new Promise((resolve) => setTimeout(resolve, 10));
+    }
+
+    let response = await options.fastify.inject({
+      method: "GET",
+      url: "/api/internal/bet-sync/state",
+      headers: {
+        authorization: "Bearer bet-secret",
+      },
+    });
+    expect(response.json().canonicalDestination).toMatchObject({
+      provider: "cloudflare_stream",
+      playbackReady: false,
+    });
+    expect(response.json().fallbackDestination).toBeNull();
+
+    probeStatus = 200;
+    writeStatus(true, now + 50);
+    await new Promise((resolve) => setTimeout(resolve, 2_100));
+
+    response = await options.fastify.inject({
+      method: "GET",
+      url: "/api/internal/bet-sync/state",
+      headers: {
+        authorization: "Bearer bet-secret",
+      },
+    });
+    expect(response.json().canonicalDestination).toMatchObject({
+      provider: "cloudflare_stream",
+      playbackReady: true,
+    });
+    expect(response.json().fallbackDestination).toBeNull();
+
+    await new Promise((resolve) => setTimeout(resolve, 200));
+
+    response = await options.fastify.inject({
+      method: "GET",
+      url: "/api/internal/bet-sync/state",
+      headers: {
+        authorization: "Bearer bet-secret",
+      },
+    });
+    expect(response.json().canonicalDestination).toMatchObject({
+      provider: "cloudflare_stream",
+      playbackReady: true,
+    });
+    expect(response.json().fallbackDestination).toBeNull();
+
+    routes.close();
+    await options.fastify.close();
+    fs.rmSync(tempDir, { recursive: true, force: true });
+  });
+});
diff --git a/packages/server/tests/unit/routes/streaming-betting-feed.test.ts b/packages/server/tests/unit/routes/streaming-betting-feed.test.ts
index 300c5dcb0..48c3bccb4 100644
--- a/packages/server/tests/unit/routes/streaming-betting-feed.test.ts
+++ b/packages/server/tests/unit/routes/streaming-betting-feed.test.ts
@@ -59,6 +59,8 @@ function createCycle(
     betCloseTime: 2_000,
     countdownValue: null,
     fightStartTime: null,
+    announcementExpiredAt: null,
+    countdownBeganAt: null,
     duelEndTime: null,
     arenaPositions: {
       agent1: [10, 11, 12],
@@ -99,6 +101,57 @@ function createFrame(seq: number): BettingFeedFrame {
   };
 }
 
+function createChannel(overrides: Record<string, unknown> = {}) {
+  return {
+    id: "hyperscapes-broadcast-channel",
+    mode: "always_on",
+    presentationDelayMs: 4_000,
+    activeDuelId: "duel-1",
+    activeDuelKey: null,
+    canonicalDestinationId: "canonical-cloudflare",
+    fallbackDestinationId: "fallback-self-hls",
+    publicPlaybackUrl: "https://video.example/live.m3u8?protocol=llhls",
+    publicReadiness: {
+      ready: false,
+      reason: "delivery_disconnected",
+      updatedAt: 123_501,
+    },
+    destinations: [
+      {
+        id: "canonical-cloudflare",
+        name: "External Delivery",
+        role: "canonical",
+        provider: "cloudflare_stream",
+        transport: "llhls",
+        playbackUrl: "https://video.example/live.m3u8?protocol=llhls",
+        ingestUrl: "rtmps://live.cloudflare.example/input",
+        connected: false,
+        transportHealthy: false,
+        playbackReady: false,
+        manifestStatus: "missing",
+        lastError: "delivery_disconnected",
+        updatedAt: 123_501,
+      },
+      {
+        id: "fallback-self-hls",
+        name: "Self-HLS",
+        role: "fallback",
+        provider: "self_hls",
+        transport: "hls",
+        playbackUrl: "/live/stream.m3u8",
+        ingestUrl: null,
+        connected: true,
+        transportHealthy: true,
+        playbackReady: true,
+        manifestStatus: "ok",
+        lastError: null,
+        updatedAt: 123_500,
+      },
+    ],
+    ...overrides,
+  };
+}
+
 describe("streaming-betting-feed", () => {
   it("builds betting payloads with stable schema and phase version data", () => {
     const payload = buildBettingFeedPayload({
@@ -110,30 +163,96 @@ describe("streaming-betting-feed", () => {
         degradedReason: "loading_overlay_active",
         updatedAt: 123_500,
       },
+      deliveryHealth: {
+        ready: false,
+        degradedReason: "delivery_disconnected",
+        updatedAt: 123_501,
+      },
+      rendererMetrics: {
+        captureFps: 29,
+        encodeFps: 28,
+        droppedFrames: 1,
+        renderTick: 77,
+        duelStateTick: 66,
+        latestFrameAt: 123_450,
+        latestRenderTickAt: 123_451,
+        latestDuelStateTickAt: 123_452,
+        latestVisualChangeAt: 123_453,
+        visualChangeAgeMs: 250,
+        hlsManifest: {
+          updatedAt: 123_454,
+          mediaSequence: 812,
+        },
+      },
+      channel: createChannel(),
+      sourceRuntime: {
+        ready: true,
+        statusSource: "external_worker",
+        captureMode: "cdp",
+        degradedReason: null,
+        currentSceneUrl: "https://staging.example/stream",
+        activeBundle: "bundle-a",
+        lastFrameAt: 123_455,
+        lastRenderTickAt: 123_456,
+        lastVisualChangeAt: 123_457,
+        lastRecoveryAt: 123_400,
+        recoveryCount: 1,
+        workerHeartbeatAt: 123_502,
+      },
+      canonicalAuthority: {
+        providerLive: false,
+        playbackProbeReady: false,
+        decision: "blocked",
+        reason: "provider_not_live",
+        revision: 4,
+        updatedAt: 123_503,
+        liveInputId: "live-input-123",
+        videoUid: "video-456",
+        lifecycleStatus: "disconnected",
+        playbackUrl: "https://video.example/live.m3u8?protocol=llhls",
+        playbackProbeStatusCode: 204,
+        playbackManifestStatus: "missing",
+      },
       cycle: createCycle({
         phase: "FIGHTING",
         phaseVersion: 9,
+        fightStartTime: 3_000,
         winnerId: "agent-b",
         winReason: "damage_advantage",
       }),
     });
 
     expect(payload).toMatchObject({
-      schemaVersion: 1,
+      schemaVersion: 3,
       sourceEpoch: 42,
       seq: 7,
       emittedAt: 123_456,
+      cycle: {
+        phase: "FIGHTING",
+        fightStartTime: 3_000,
+        winnerId: null,
+        winReason: null,
+      },
       duelId: "duel-1",
-      duelKey: "0xabcdef",
+      duelKey: null,
       phase: "FIGHTING",
       phaseVersion: 9,
-      betOpenTime: 1_000,
-      betCloseTime: 2_000,
-      fightStartTime: null,
+      broadcastTimeline: {
+        phase: "FIGHTING",
+        betOpenTime: 5_000,
+        betCloseTime: 6_000,
+        fightStartTime: 7_000,
+        duelEndTime: null,
+        presentationDelayMs: 4_000,
+        updatedAt: 123_456,
+      },
+      betOpenTime: 5_000,
+      betCloseTime: 6_000,
+      fightStartTime: 7_000,
       duelEndTime: null,
-      winnerId: "agent-b",
-      winnerName: "Agent B",
-      winReason: "damage_advantage",
+      winnerId: null,
+      winnerName: null,
+      winReason: null,
       arenaPositions: {
         agent1: [10, 11, 12],
         agent2: [20, 21, 22],
@@ -143,10 +262,200 @@ describe("streaming-betting-feed", () => {
         degradedReason: "loading_overlay_active",
         updatedAt: 123_500,
       },
+      deliveryHealth: {
+        ready: false,
+        degradedReason: "delivery_disconnected",
+        updatedAt: 123_501,
+      },
+      publicReadiness: {
+        ready: false,
+        reason: "delivery_disconnected",
+        updatedAt: 123_501,
+      },
+      canonicalDestination: {
+        id: "canonical-cloudflare",
+        role: "canonical",
+        provider: "cloudflare_stream",
+        playbackReady: false,
+      },
+      fallbackDestination: {
+        id: "fallback-self-hls",
+        role: "fallback",
+        provider: "self_hls",
+        playbackReady: true,
+      },
+      sourceRuntime: {
+        ready: true,
+        statusSource: "external_worker",
+        captureMode: "cdp",
+        degradedReason: null,
+        currentSceneUrl: "https://staging.example/stream",
+        activeBundle: "bundle-a",
+        lastFrameAt: 123_455,
+        lastRenderTickAt: 123_456,
+        lastVisualChangeAt: 123_457,
+        lastRecoveryAt: 123_400,
+        recoveryCount: 1,
+        workerHeartbeatAt: 123_502,
+      },
+      canonicalAuthority: {
+        providerLive: false,
+        playbackProbeReady: false,
+        decision: "blocked",
+        reason: "provider_not_live",
+        revision: 4,
+        updatedAt: 123_503,
+        liveInputId: "live-input-123",
+        videoUid: "video-456",
+        lifecycleStatus: "disconnected",
+        playbackUrl: "https://video.example/live.m3u8?protocol=llhls",
+        playbackProbeStatusCode: 204,
+        playbackManifestStatus: "missing",
+      },
+      captureFps: 29,
+      encodeFps: 28,
+      droppedFrames: 1,
+      renderTick: 77,
+      duelStateTick: 66,
+      latestFrameAt: 123_450,
+      latestRenderTickAt: 123_451,
+      latestDuelStateTickAt: 123_452,
+      latestVisualChangeAt: 123_453,
+      visualChangeAgeMs: 250,
+      hlsManifestUpdatedAt: 123_454,
+      hlsMediaSequence: 812,
+      deliveryMode: "external_hls",
+      deliveryProvider: "cloudflare_stream",
+      playbackUrl: "https://video.example/live.m3u8?protocol=llhls",
     });
 
     expect(payload.agent1?.id).toBe("agent-a");
     expect(payload.agent2?.hp).toBe(20);
+    expect(payload.rendererMetrics?.hlsManifest?.mediaSequence).toBe(812);
+    expect(payload.channel?.canonicalDestinationId).toBe(
+      "canonical-cloudflare",
+    );
+    expect(payload.delivery?.llhlsUrl).toContain("protocol=llhls");
+    expect(payload.deliveryHealth?.degradedReason).toBe(
+      "delivery_disconnected",
+    );
+    expect(payload.canonicalAuthority).toMatchObject({
+      decision: "blocked",
+      reason: "provider_not_live",
+      revision: 4,
+      providerLive: false,
+      playbackProbeReady: false,
+    });
+  });
+
+  it("promotes broadcast timeline phase to the top-level payload phase", () => {
+    const payload = buildBettingFeedPayload({
+      sourceEpoch: 7,
+      seq: 3,
+      emittedAt: 9_000,
+      channel: createChannel(),
+      cycle: createCycle({
+        phase: "FIGHTING",
+        phaseVersion: 5,
+        betOpenTime: 1_000,
+        betCloseTime: 2_000,
+        fightStartTime: 10_000,
+      }),
+    });
+
+    expect(payload.phase).toBe("COUNTDOWN");
+    expect(payload.broadcastTimeline.phase).toBe("COUNTDOWN");
+    expect(payload.phaseVersion).toBe(5);
+  });
+
+  it("projects a bettor-facing timeline against the active canonical delay", () => {
+    const payload = buildBettingFeedPayload({
+      sourceEpoch: 7,
+      seq: 11,
+      emittedAt: 6_500,
+      channel: createChannel({
+        presentationDelayMs: 4_000,
+      }),
+      cycle: createCycle({
+        phase: "FIGHTING",
+        betOpenTime: 1_000,
+        betCloseTime: 2_000,
+        fightStartTime: 3_000,
+        duelEndTime: 9_000,
+      }),
+    });
+
+    expect(payload.phase).toBe("COUNTDOWN");
+    expect(payload.broadcastTimeline).toEqual({
+      phase: "COUNTDOWN",
+      betOpenTime: 5_000,
+      betCloseTime: 6_000,
+      fightStartTime: 7_000,
+      duelEndTime: 13_000,
+      presentationDelayMs: 4_000,
+      updatedAt: 6_500,
+    });
+    expect(payload.betOpenTime).toBe(5_000);
+    expect(payload.betCloseTime).toBe(6_000);
+    expect(payload.fightStartTime).toBe(7_000);
+    expect(payload.duelEndTime).toBe(13_000);
+  });
+
+  it("holds the projected phase at idle until the delayed cycle start arrives", () => {
+    const payload = buildBettingFeedPayload({
+      sourceEpoch: 8,
+      seq: 12,
+      emittedAt: 4_500,
+      channel: createChannel({
+        presentationDelayMs: 4_000,
+      }),
+      cycle: createCycle({
+        phase: "ANNOUNCEMENT",
+        betOpenTime: 1_000,
+        betCloseTime: 2_000,
+        fightStartTime: 3_000,
+        duelEndTime: 9_000,
+      }),
+    });
+
+    expect(payload.phase).toBe("IDLE");
+    expect(payload.broadcastTimeline).toEqual({
+      phase: "IDLE",
+      betOpenTime: 5_000,
+      betCloseTime: 6_000,
+      fightStartTime: 7_000,
+      duelEndTime: 13_000,
+      presentationDelayMs: 4_000,
+      updatedAt: 4_500,
+    });
+  });
+
+  it("hides winner metadata until the delayed public phase reaches resolution", () => {
+    const payload = buildBettingFeedPayload({
+      sourceEpoch: 9,
+      seq: 13,
+      emittedAt: 6_500,
+      channel: createChannel({
+        presentationDelayMs: 4_000,
+      }),
+      cycle: createCycle({
+        phase: "RESOLUTION",
+        fightStartTime: 3_000,
+        duelEndTime: 9_000,
+        winnerId: "agent-a",
+        winReason: "knockout",
+      }),
+    });
+
+    expect(payload.phase).toBe("COUNTDOWN");
+    expect(payload.winnerId).toBeNull();
+    expect(payload.winnerName).toBeNull();
+    expect(payload.winReason).toBeNull();
+    expect(payload.cycle).toMatchObject({
+      phase: "RESOLUTION",
+      winnerId: null,
+      winReason: null,
+    });
   });
 
   it("selects replay, bootstrap, and reset delivery modes deterministically", () => {
@@ -194,21 +503,100 @@ describe("streaming-betting-feed", () => {
       seq: 7,
       emittedAt: 123_456,
       cycle: createCycle(),
+      channel: createChannel({
+        publicReadiness: {
+          ready: true,
+          reason: null,
+          updatedAt: 123_401,
+        },
+        destinations: [
+          {
+            id: "canonical-cloudflare",
+            name: "External Delivery",
+            role: "canonical",
+            provider: "cloudflare_stream",
+            transport: "llhls",
+            playbackUrl: "https://video.example/live.m3u8?protocol=llhls",
+            ingestUrl: "rtmps://live.cloudflare.example/input",
+            connected: true,
+            transportHealthy: true,
+            playbackReady: true,
+            manifestStatus: "ok",
+            lastError: null,
+            updatedAt: 123_401,
+          },
+        ],
+      }),
       rendererHealth: {
         ready: true,
         degradedReason: null,
         updatedAt: 123_400,
       },
+      sourceRuntime: {
+        ready: true,
+        statusSource: "external_worker",
+        captureMode: "cdp",
+        degradedReason: null,
+        currentSceneUrl: "https://staging.example/stream",
+        activeBundle: "bundle-a",
+        lastFrameAt: 123_390,
+        lastRenderTickAt: 123_391,
+        lastVisualChangeAt: 123_392,
+        lastRecoveryAt: 123_300,
+        recoveryCount: 1,
+        workerHeartbeatAt: 123_401,
+      },
     });
     const laterPayload = {
       ...basePayload,
       emittedAt: 999_999,
+      broadcastTimeline: {
+        ...basePayload.broadcastTimeline,
+        updatedAt: 555_554,
+      },
       rendererHealth: basePayload.rendererHealth
         ? {
             ...basePayload.rendererHealth,
             updatedAt: 555_555,
           }
         : null,
+      deliveryHealth: basePayload.deliveryHealth
+        ? {
+            ...basePayload.deliveryHealth,
+            updatedAt: 777_777,
+          }
+        : null,
+      channel: basePayload.channel
+        ? {
+            ...basePayload.channel,
+            publicReadiness: {
+              ...basePayload.channel.publicReadiness,
+              updatedAt: 888_888,
+            },
+            destinations: basePayload.channel.destinations.map(
+              (destination) => ({
+                ...destination,
+                updatedAt: 999_999,
+              }),
+            ),
+          }
+        : null,
+      sourceRuntime: basePayload.sourceRuntime
+        ? {
+            ...basePayload.sourceRuntime,
+            lastFrameAt: 888_887,
+            lastRenderTickAt: 888_886,
+            lastVisualChangeAt: 888_885,
+            lastRecoveryAt: 888_884,
+            workerHeartbeatAt: 888_883,
+          }
+        : null,
+      canonicalAuthority: basePayload.canonicalAuthority
+        ? {
+            ...basePayload.canonicalAuthority,
+            updatedAt: 666_666,
+          }
+        : null,
     };
 
     expect(buildBettingFeedDedupKey(basePayload)).toBe(
@@ -216,6 +604,124 @@ describe("streaming-betting-feed", () => {
     );
   });
 
+  it("changes the dedup key when canonical authority semantics change", () => {
+    const basePayload = buildBettingFeedPayload({
+      sourceEpoch: 42,
+      seq: 7,
+      emittedAt: 123_456,
+      cycle: createCycle(),
+      channel: createChannel(),
+      canonicalAuthority: {
+        providerLive: true,
+        playbackProbeReady: true,
+        decision: "ready",
+        reason: null,
+        revision: 7,
+        updatedAt: 123_500,
+        liveInputId: "live-input-123",
+        videoUid: "video-456",
+        lifecycleStatus: "connected",
+        playbackUrl: "https://video.example/live.m3u8?protocol=llhls",
+        playbackProbeStatusCode: 200,
+        playbackManifestStatus: "ok",
+      },
+    });
+    const changedPayload = {
+      ...basePayload,
+      canonicalAuthority: basePayload.canonicalAuthority
+        ? {
+            ...basePayload.canonicalAuthority,
+            decision: "blocked" as const,
+            reason: "probe_unready",
+            revision: 8,
+          }
+        : null,
+    };
+
+    expect(buildBettingFeedDedupKey(basePayload)).not.toBe(
+      buildBettingFeedDedupKey(changedPayload),
+    );
+  });
+
+  it("emits raw sourceTimeline on the betting feed when enabled", () => {
+    const previous = process.env.STREAMING_EMIT_RAW_SOURCE_TIME;
+    process.env.STREAMING_EMIT_RAW_SOURCE_TIME = "true";
+
+    try {
+      const payload = buildBettingFeedPayload({
+        sourceEpoch: 42,
+        seq: 7,
+        emittedAt: 123_456,
+        cycle: createCycle({
+          phase: "FIGHTING",
+          fightStartTime: 3_000,
+          duelEndTime: 4_000,
+        }),
+      });
+
+      expect(payload.sourceTimeline).toEqual({
+        phase: "FIGHTING",
+        betOpenTime: 1_000,
+        betCloseTime: 2_000,
+        fightStartTime: 3_000,
+        duelEndTime: 4_000,
+        updatedAt: 123_456,
+      });
+      expect(payload.cycle?.sourceTimeline).toEqual(payload.sourceTimeline);
+      expect(payload.broadcastTimeline.presentationDelayMs).toBe(0);
+    } finally {
+      if (previous == null) {
+        delete process.env.STREAMING_EMIT_RAW_SOURCE_TIME;
+      } else {
+        process.env.STREAMING_EMIT_RAW_SOURCE_TIME = previous;
+      }
+    }
+  });
+
+  it("ignores sourceTimeline updatedAt when building dedup keys", () => {
+    const previous = process.env.STREAMING_EMIT_RAW_SOURCE_TIME;
+    process.env.STREAMING_EMIT_RAW_SOURCE_TIME = "true";
+
+    try {
+      const basePayload = buildBettingFeedPayload({
+        sourceEpoch: 42,
+        seq: 7,
+        emittedAt: 123_456,
+        cycle: createCycle(),
+      });
+      const laterPayload = {
+        ...basePayload,
+        sourceTimeline: basePayload.sourceTimeline
+          ? {
+              ...basePayload.sourceTimeline,
+              updatedAt: 999_999,
+            }
+          : null,
+        cycle: basePayload.cycle
+          ? {
+              ...basePayload.cycle,
+              sourceTimeline: basePayload.cycle.sourceTimeline
+                ? {
+                    ...basePayload.cycle.sourceTimeline,
+                    updatedAt: 999_999,
+                  }
+                : undefined,
+            }
+          : null,
+      };
+
+      expect(buildBettingFeedDedupKey(basePayload)).toBe(
+        buildBettingFeedDedupKey(laterPayload),
+      );
+    } finally {
+      if (previous == null) {
+        delete process.env.STREAMING_EMIT_RAW_SOURCE_TIME;
+      } else {
+        process.env.STREAMING_EMIT_RAW_SOURCE_TIME = previous;
+      }
+    }
+  });
+
   it("handles empty replay buffers cleanly", () => {
     expect(selectReplayDelivery([], 0)).toMatchObject({
       mode: "bootstrap",
diff --git a/packages/server/tests/unit/routes/streaming-betting-renderer-health.test.ts b/packages/server/tests/unit/routes/streaming-betting-renderer-health.test.ts
index 0404c9f73..661e9921b 100644
--- a/packages/server/tests/unit/routes/streaming-betting-renderer-health.test.ts
+++ b/packages/server/tests/unit/routes/streaming-betting-renderer-health.test.ts
@@ -60,6 +60,8 @@ function createCycle(
     betCloseTime: 2_000,
     countdownValue: null,
     fightStartTime: null,
+    announcementExpiredAt: null,
+    countdownBeganAt: null,
     duelEndTime: null,
     arenaPositions: {
       agent1: [10, 11, 12],
@@ -156,6 +158,86 @@ describe("deriveBettingRendererHealth", () => {
     });
   });
 
+  it("trusts fresh render metrics during active phases over stale explicit false negatives", () => {
+    const now = Date.now();
+    const health = deriveBettingRendererHealth(createCycle(), {
+      externalStatusSnapshot: {
+        destinations: [],
+        stats: {},
+        updatedAt: now,
+        rendererHealth: {
+          ready: false,
+          degradedReason: "renderer_health_stale",
+          updatedAt: now,
+        },
+        metrics: {
+          captureFps: 30,
+          encodeFps: 30,
+          latestRenderTickAt: now,
+          latestVisualChangeAt: now,
+          visualChangeAgeMs: 200,
+        },
+        hlsManifest: {
+          updatedAt: now,
+          mediaSequence: 42,
+        },
+      },
+      externalStatusMaxAgeMs: 15_000,
+      captureStats: {
+        clientConnected: false,
+        ffmpegRunning: false,
+      },
+    });
+
+    expect(health).toMatchObject({
+      ready: true,
+      degradedReason: null,
+    });
+  });
+
+  it("keeps a short grace window before treating missing visual change as stale", () => {
+    const now = Date.now();
+    const health = deriveBettingRendererHealth(
+      createCycle({
+        phase: "COUNTDOWN",
+        phaseStartTime: now - 2_000,
+      }),
+      {
+        externalStatusSnapshot: {
+          destinations: [],
+          stats: {},
+          updatedAt: now,
+          rendererHealth: {
+            ready: true,
+            degradedReason: null,
+            updatedAt: now,
+          },
+          metrics: {
+            captureFps: 60,
+            encodeFps: 45,
+            latestRenderTickAt: now,
+            latestVisualChangeAt: now - 10_000,
+            visualChangeAgeMs: 10_000,
+          },
+          hlsManifest: {
+            updatedAt: now,
+            mediaSequence: 42,
+          },
+        },
+        externalStatusMaxAgeMs: 15_000,
+        captureStats: {
+          clientConnected: true,
+          ffmpegRunning: true,
+        },
+      },
+    );
+
+    expect(health).toMatchObject({
+      ready: true,
+      degradedReason: null,
+    });
+  });
+
   it("degrades stale external RTMP renderer snapshots", () => {
     const health = deriveBettingRendererHealth(createCycle(), {
       externalStatusSnapshot: {
@@ -181,6 +263,44 @@ describe("deriveBettingRendererHealth", () => {
     });
   });
 
+  it("uses the outer external snapshot timestamp for freshness", () => {
+    const now = Date.now();
+    const health = deriveBettingRendererHealth(createCycle(), {
+      externalStatusSnapshot: {
+        destinations: [],
+        stats: {},
+        updatedAt: now,
+        rendererHealth: {
+          ready: true,
+          degradedReason: null,
+          updatedAt: now - 60_000,
+        },
+        metrics: {
+          captureFps: 60,
+          encodeFps: 45,
+          latestRenderTickAt: now,
+          latestVisualChangeAt: now - 4_900,
+          visualChangeAgeMs: 4_900,
+        },
+        hlsManifest: {
+          updatedAt: now,
+          mediaSequence: 42,
+        },
+      },
+      externalStatusMaxAgeMs: 15_000,
+      captureStats: {
+        clientConnected: true,
+        ffmpegRunning: true,
+      },
+    });
+
+    expect(health).toMatchObject({
+      ready: true,
+      degradedReason: null,
+      updatedAt: now,
+    });
+  });
+
   it("reports disconnected capture clients during active duel phases", () => {
     const health = deriveBettingRendererHealth(createCycle(), {
       captureStats: {
@@ -209,6 +329,299 @@ describe("deriveBettingRendererHealth", () => {
     });
   });
 
+  it("treats a fresh local HLS manifest as a healthy self-hosted fallback", () => {
+    const now = Date.now();
+    const health = deriveBettingRendererHealth(createCycle(), {
+      nowMs: now,
+      localHlsManifest: {
+        updatedAt: now - 500,
+        mediaSequence: 512,
+      },
+      captureStats: {
+        clientConnected: false,
+        ffmpegRunning: false,
+      },
+    });
+
+    expect(health).toMatchObject({
+      ready: true,
+      degradedReason: null,
+    });
+  });
+
+  it("reports stale render ticks when live metrics stop advancing", () => {
+    const now = Date.now();
+    const health = deriveBettingRendererHealth(createCycle(), {
+      externalStatusSnapshot: {
+        destinations: [],
+        stats: {},
+        updatedAt: now,
+        rendererHealth: {
+          ready: true,
+          degradedReason: null,
+          updatedAt: now,
+        },
+        metrics: {
+          captureFps: 30,
+          encodeFps: 30,
+          latestRenderTickAt: now - 12_000,
+          latestVisualChangeAt: now,
+          visualChangeAgeMs: 200,
+        },
+        hlsManifest: {
+          updatedAt: now,
+          mediaSequence: 42,
+        },
+      },
+      externalStatusMaxAgeMs: 15_000,
+      captureStats: {
+        clientConnected: true,
+        ffmpegRunning: true,
+      },
+    });
+
+    expect(health).toMatchObject({
+      ready: false,
+      degradedReason: "render_tick_stale",
+    });
+  });
+
+  it("allows CDP capture tick jitter while encoded HLS output is fresh", () => {
+    const now = Date.now();
+    const health = deriveBettingRendererHealth(createCycle(), {
+      externalStatusSnapshot: {
+        destinations: [],
+        stats: {},
+        updatedAt: now,
+        rendererHealth: {
+          ready: true,
+          degradedReason: null,
+          updatedAt: now,
+        },
+        metrics: {
+          captureFps: 30,
+          encodeFps: 30,
+          latestRenderTickAt: now - 6_000,
+          latestVisualChangeAt: now,
+          visualChangeAgeMs: 200,
+        },
+        hlsManifest: {
+          updatedAt: now,
+          mediaSequence: 42,
+        },
+      },
+      externalStatusMaxAgeMs: 15_000,
+      captureStats: {
+        clientConnected: true,
+        ffmpegRunning: true,
+      },
+    });
+
+    expect(health).toMatchObject({
+      ready: true,
+      degradedReason: null,
+    });
+  });
+
+  it("reports stale visual output during fighting phases", () => {
+    const now = Date.now();
+    const health = deriveBettingRendererHealth(
+      createCycle({
+        phaseStartTime: now - 12_000,
+      }),
+      {
+        externalStatusSnapshot: {
+          destinations: [],
+          stats: {},
+          updatedAt: now,
+          rendererHealth: {
+            ready: false,
+            degradedReason: "renderer_health_stale",
+            updatedAt: now,
+          },
+          metrics: {
+            captureFps: 30,
+            encodeFps: 30,
+            latestRenderTickAt: now,
+            latestVisualChangeAt: now - 5_000,
+            visualChangeAgeMs: 5_000,
+          },
+          hlsManifest: {
+            updatedAt: now,
+            mediaSequence: 42,
+          },
+        },
+        externalStatusMaxAgeMs: 15_000,
+        captureStats: {
+          clientConnected: true,
+          ffmpegRunning: true,
+        },
+      },
+    );
+
+    expect(health).toMatchObject({
+      ready: false,
+      degradedReason: "visual_change_stale",
+    });
+  });
+
+  it("keeps renderer health ready when raw capture fps is low but encoded output is fresh", () => {
+    const now = Date.now();
+    const health = deriveBettingRendererHealth(createCycle(), {
+      externalStatusSnapshot: {
+        destinations: [],
+        stats: {},
+        updatedAt: now,
+        rendererHealth: {
+          ready: true,
+          degradedReason: null,
+          updatedAt: now,
+        },
+        metrics: {
+          captureFps: 12,
+          encodeFps: 30,
+          latestRenderTickAt: now,
+          latestVisualChangeAt: now,
+          visualChangeAgeMs: 200,
+        },
+        hlsManifest: {
+          updatedAt: now,
+          mediaSequence: 42,
+        },
+      },
+      externalStatusMaxAgeMs: 15_000,
+      captureStats: {
+        clientConnected: true,
+        ffmpegRunning: true,
+      },
+    });
+
+    expect(health).toMatchObject({
+      ready: true,
+      degradedReason: null,
+    });
+  });
+
+  it("reports low encoder fps during fighting phases", () => {
+    const now = Date.now();
+    const health = deriveBettingRendererHealth(createCycle(), {
+      externalStatusSnapshot: {
+        destinations: [],
+        stats: {},
+        updatedAt: now,
+        rendererHealth: {
+          ready: true,
+          degradedReason: null,
+          updatedAt: now,
+        },
+        metrics: {
+          captureFps: 30,
+          encodeFps: 12,
+          latestRenderTickAt: now,
+          latestVisualChangeAt: now,
+          visualChangeAgeMs: 200,
+        },
+        hlsManifest: {
+          updatedAt: now,
+          mediaSequence: 42,
+        },
+      },
+      externalStatusMaxAgeMs: 15_000,
+      captureStats: {
+        clientConnected: true,
+        ffmpegRunning: true,
+      },
+    });
+
+    expect(health).toMatchObject({
+      ready: false,
+      degradedReason: "encoder_fps_low",
+    });
+  });
+
+  it("uses the external source target fps for conservative staging profiles", () => {
+    const now = Date.now();
+    const health = deriveBettingRendererHealth(createCycle(), {
+      externalStatusSnapshot: {
+        destinations: [],
+        stats: {},
+        updatedAt: now,
+        rendererHealth: {
+          ready: true,
+          degradedReason: null,
+          updatedAt: now,
+        },
+        metrics: {
+          captureFps: 4,
+          encodeFps: 13,
+          latestRenderTickAt: now,
+          latestVisualChangeAt: now,
+          visualChangeAgeMs: 200,
+        },
+        hlsManifest: {
+          updatedAt: now,
+          mediaSequence: 42,
+        },
+        ingest: {
+          profile: "cloudflare_live",
+          transport: "srt",
+          audioSampleRate: 48000,
+          gopFrames: 30,
+          targetFps: 15,
+          probeOnly: false,
+        },
+      },
+      externalStatusMaxAgeMs: 15_000,
+      captureStats: {
+        clientConnected: true,
+        ffmpegRunning: true,
+      },
+    });
+
+    expect(health).toMatchObject({
+      ready: true,
+      degradedReason: null,
+    });
+  });
+
+  it("keeps renderer health ready when fresh render metrics are present but the local manifest is stale", () => {
+    const now = Date.now();
+    const health = deriveBettingRendererHealth(createCycle(), {
+      externalStatusSnapshot: {
+        destinations: [],
+        stats: {},
+        updatedAt: now,
+        rendererHealth: {
+          ready: true,
+          degradedReason: null,
+          updatedAt: now,
+        },
+        metrics: {
+          captureFps: 56,
+          encodeFps: 45,
+          latestRenderTickAt: now,
+          latestVisualChangeAt: now,
+          visualChangeAgeMs: 200,
+        },
+        hlsManifest: {
+          updatedAt: now - 60_000,
+          mediaSequence: 0,
+        },
+      },
+      externalStatusMaxAgeMs: 15_000,
+      captureStats: {
+        clientConnected: true,
+        ffmpegRunning: true,
+      },
+    });
+
+    expect(health).toMatchObject({
+      ready: true,
+      degradedReason: null,
+      updatedAt: now,
+    });
+  });
+
   it("returns healthy for idle phases when no degraded source exists", () => {
     const health = deriveBettingRendererHealth(
       createCycle({
diff --git a/packages/server/tests/unit/routes/streaming-betting-routes.test.ts b/packages/server/tests/unit/routes/streaming-betting-routes.test.ts
index dbbfa4dba..18c45381a 100644
--- a/packages/server/tests/unit/routes/streaming-betting-routes.test.ts
+++ b/packages/server/tests/unit/routes/streaming-betting-routes.test.ts
@@ -1,4 +1,7 @@
-import Fastify from "fastify";
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import Fastify, { type FastifyInstance } from "fastify";
 import { afterEach, describe, expect, it, vi } from "vitest";
 import {
   allocateNextBettingClientId,
@@ -6,12 +9,40 @@ import {
   parseReplayCursor,
   registerStreamingBettingRoutes,
 } from "../../../src/routes/streaming-betting-routes.js";
+import type { StreamingDuelCycle } from "../../../src/systems/StreamingDuelScheduler/types.js";
+
+const stubbedEnv = new Map<string, string | undefined>();
+
+function stubEnv(key: string, value: string): void {
+  if (!stubbedEnv.has(key)) {
+    stubbedEnv.set(key, process.env[key]);
+  }
+  process.env[key] = value;
+}
+
+function restoreStubbedEnvs(): void {
+  for (const [key, value] of stubbedEnv.entries()) {
+    if (value === undefined) {
+      delete process.env[key];
+      continue;
+    }
+    process.env[key] = value;
+  }
+  stubbedEnv.clear();
+}
+
+function createFastifyWithRateLimitDecorator(): FastifyInstance {
+  const fastify = Fastify();
+  fastify.decorate("rateLimit", (() =>
+    async () => {}) as FastifyInstance["rateLimit"]);
+  return fastify;
+}
 
 function createRouteOptions(
   overrides: Partial<Parameters<typeof registerStreamingBettingRoutes>[0]> = {},
 ) {
   return {
-    fastify: Fastify(),
+    fastify: createFastifyWithRateLimitDecorator(),
     world: {
       getSystem: () => null,
     } as never,
@@ -43,14 +74,121 @@ function createRouteOptions(
   };
 }
 
+function createCycle(
+  overrides: Partial<StreamingDuelCycle> = {},
+): StreamingDuelCycle {
+  return {
+    cycleId: "cycle-1",
+    phase: "FIGHTING",
+    cycleStartTime: 1_000,
+    phaseStartTime: 2_000,
+    phaseVersion: 3,
+    agent1: {
+      characterId: "agent-a",
+      name: "Agent A",
+      provider: "provider-a",
+      model: "model-a",
+      combatLevel: 10,
+      wins: 7,
+      losses: 2,
+      currentHp: 25,
+      maxHp: 30,
+      originalPosition: [1, 2, 3],
+      damageDealtThisFight: 4,
+      equipment: {},
+      inventory: [],
+      rank: 1,
+      headToHeadWins: 3,
+      headToHeadLosses: 1,
+    },
+    agent2: {
+      characterId: "agent-b",
+      name: "Agent B",
+      provider: "provider-b",
+      model: "model-b",
+      combatLevel: 11,
+      wins: 5,
+      losses: 4,
+      currentHp: 20,
+      maxHp: 30,
+      originalPosition: [4, 5, 6],
+      damageDealtThisFight: 2,
+      equipment: {},
+      inventory: [],
+      rank: 2,
+      headToHeadWins: 1,
+      headToHeadLosses: 3,
+    },
+    duelId: "duel-1",
+    duelKeyHex: "0xabcdef",
+    arenaId: null,
+    betOpenTime: 1_000,
+    betCloseTime: 2_000,
+    countdownValue: null,
+    fightStartTime: 3_000,
+    announcementExpiredAt: null,
+    countdownBeganAt: null,
+    duelEndTime: null,
+    arenaPositions: {
+      agent1: [10, 11, 12],
+      agent2: [20, 21, 22],
+    },
+    winnerId: null,
+    loserId: null,
+    winReason: null,
+    seed: null,
+    replayHash: null,
+    ...overrides,
+  };
+}
+
+function createStorageBackedWorld() {
+  const rows = new Map<
+    string,
+    { key: string; value: string; updatedAt: number }
+  >();
+  return {
+    rows,
+    world: {
+      getSystem: (name: string) => {
+        if (name !== "database") {
+          return null;
+        }
+        return {
+          getDb: () => ({
+            select: () => ({
+              from: () => ({
+                where: () => ({
+                  limit: async () => [],
+                }),
+              }),
+            }),
+            insert: () => ({
+              values: (row: {
+                key: string;
+                value: string;
+                updatedAt: number;
+              }) => ({
+                onConflictDoUpdate: async () => {
+                  rows.set(row.key, row);
+                },
+              }),
+            }),
+          }),
+        };
+      },
+    } as never,
+  };
+}
+
 describe("streaming-betting-routes", () => {
   afterEach(() => {
     vi.restoreAllMocks();
-    vi.unstubAllEnvs();
+    restoreStubbedEnvs();
   });
 
   it("returns bootstrap state for valid authenticated requests", async () => {
-    vi.stubEnv("BETTING_FEED_ACCESS_TOKEN", "bet-secret");
+    stubEnv("BETTING_FEED_ACCESS_TOKEN", "bet-secret");
 
     const options = createRouteOptions();
     const routes = registerStreamingBettingRoutes(options);
@@ -65,8 +203,23 @@ describe("streaming-betting-routes", () => {
 
     expect(response.statusCode).toBe(200);
     expect(response.json()).toMatchObject({
-      schemaVersion: 1,
+      schemaVersion: 3,
       sourceEpoch: expect.any(Number),
+      broadcastTimeline: {
+        phase: null,
+        betOpenTime: null,
+        betCloseTime: null,
+        fightStartTime: null,
+        duelEndTime: null,
+        presentationDelayMs: expect.any(Number),
+        updatedAt: expect.any(Number),
+      },
+      channel: expect.objectContaining({
+        canonicalDestinationId: expect.any(String),
+        publicReadiness: expect.objectContaining({
+          ready: expect.any(Boolean),
+        }),
+      }),
       replay: expect.objectContaining({
         sourceEpoch: expect.any(Number),
       }),
@@ -76,8 +229,286 @@ describe("streaming-betting-routes", () => {
     await options.fastify.close();
   });
 
+  it("serializes a coherent non-null bootstrap cycle from the active scheduler", async () => {
+    stubEnv("BETTING_FEED_ACCESS_TOKEN", "bet-secret");
+
+    const options = createRouteOptions({
+      getStreamingDuelScheduler: () => ({
+        getCurrentCycle: () =>
+          createCycle({
+            phase: "RESOLUTION",
+            winnerId: "agent-a",
+            winReason: "knockout",
+          }),
+      }),
+    });
+    const routes = registerStreamingBettingRoutes(options);
+
+    const response = await options.fastify.inject({
+      method: "GET",
+      url: "/api/internal/bet-sync/state",
+      headers: {
+        authorization: "Bearer bet-secret",
+      },
+    });
+
+    expect(response.statusCode).toBe(200);
+    expect(response.json()).toMatchObject({
+      cycle: {
+        duelId: "duel-1",
+        phase: "RESOLUTION",
+        winnerId: null,
+        winReason: null,
+      },
+      duelId: "duel-1",
+      phase: "FIGHTING",
+      winnerId: null,
+      winnerName: null,
+      winReason: null,
+    });
+
+    routes.close();
+    await options.fastify.close();
+  });
+
+  it("uses a fresh canonical playback probe over stale worker destination flags", async () => {
+    stubEnv("BETTING_FEED_ACCESS_TOKEN", "bet-secret");
+    stubEnv("STREAM_DELIVERY_MODE", "external_hls");
+    stubEnv("STREAM_DELIVERY_PROVIDER", "cloudflare_stream");
+    stubEnv("NODE_ENV", "development");
+    stubEnv("STREAM_ALLOW_PRIVATE_PLAYBACK_PROBES", "true");
+    stubEnv("STREAM_PLAYBACK_HLS_URL", "https://customer.example/live.m3u8");
+    stubEnv(
+      "STREAM_PLAYBACK_LLHLS_URL",
+      "https://customer.example/live.m3u8?protocol=llhls",
+    );
+    stubEnv("STREAM_INGEST_RTMPS_URL", "srt://live.cloudflare.example/input");
+
+    const tempDir = fs.mkdtempSync(
+      path.join(os.tmpdir(), "streaming-betting-routes-"),
+    );
+    const externalStatusFile = path.join(tempDir, "rtmp-status.json");
+    fs.writeFileSync(
+      externalStatusFile,
+      JSON.stringify({
+        active: true,
+        ffmpegRunning: true,
+        clientConnected: true,
+        destinations: [
+          {
+            id: "canonical-cloudflare",
+            role: "canonical",
+            provider: "cloudflare_stream",
+            name: "External Delivery",
+            transport: "srt",
+            playbackUrl: "https://customer.example/live.m3u8",
+            connected: false,
+            error: "stale worker error",
+            startedAt: Date.now() - 500,
+          },
+        ],
+        stats: {
+          healthy: true,
+        },
+        updatedAt: Date.now(),
+        rendererHealth: {
+          ready: true,
+          degradedReason: null,
+          updatedAt: Date.now(),
+        },
+        sourceRuntime: {
+          ready: true,
+          statusSource: "external_worker",
+          captureMode: "cdp",
+          degradedReason: null,
+          currentSceneUrl: "https://staging.example/stream",
+          activeBundle:
+            "https://staging.example/assets/StreamingMode-abc123.js",
+          lastFrameAt: Date.now(),
+          lastRenderTickAt: Date.now(),
+          lastVisualChangeAt: Date.now(),
+          lastRecoveryAt: Date.now() - 1_000,
+          recoveryCount: 1,
+          workerHeartbeatAt: Date.now(),
+        },
+      }),
+    );
+
+    const fetchSpy = vi
+      .spyOn(globalThis, "fetch")
+      .mockImplementation(async () => new Response("", { status: 200 }));
+
+    const options = createRouteOptions({
+      externalStatusFile,
+    });
+    const routes = registerStreamingBettingRoutes(options);
+
+    for (
+      let attempt = 0;
+      attempt < 20 && fetchSpy.mock.calls.length === 0;
+      attempt += 1
+    ) {
+      await new Promise((resolve) => setTimeout(resolve, 10));
+    }
+    expect(fetchSpy).toHaveBeenCalled();
+    await new Promise((resolve) => setTimeout(resolve, 10));
+
+    const response = await options.fastify.inject({
+      method: "GET",
+      url: "/api/internal/bet-sync/state",
+      headers: {
+        authorization: "Bearer bet-secret",
+      },
+    });
+
+    expect(response.statusCode).toBe(200);
+    const payload = response.json();
+    const canonicalDestination = payload.channel.destinations.find(
+      (destination: { role?: string }) => destination.role === "canonical",
+    );
+    expect(payload.channel.publicReadiness).toMatchObject({
+      ready: true,
+      reason: null,
+    });
+    expect(canonicalDestination).toMatchObject({
+      id: "canonical-cloudflare",
+      connected: true,
+      transportHealthy: true,
+      playbackReady: true,
+      lastError: null,
+      manifestStatus: "ok",
+    });
+
+    routes.close();
+    await options.fastify.close();
+    fs.rmSync(tempDir, { recursive: true, force: true });
+  });
+
+  it("does not mark Cloudflare provider live from local ingest when playback probe is not ready", async () => {
+    stubEnv("BETTING_FEED_ACCESS_TOKEN", "bet-secret");
+    stubEnv("STREAM_DELIVERY_MODE", "external_hls");
+    stubEnv("STREAM_DELIVERY_PROVIDER", "cloudflare_stream");
+    stubEnv("NODE_ENV", "development");
+    stubEnv("STREAM_ALLOW_PRIVATE_PLAYBACK_PROBES", "true");
+    stubEnv("STREAM_PLAYBACK_HLS_URL", "https://customer.example/live.m3u8");
+    stubEnv(
+      "STREAM_PLAYBACK_LLHLS_URL",
+      "https://customer.example/live.m3u8?protocol=llhls",
+    );
+    stubEnv("STREAM_INGEST_RTMPS_URL", "srt://live.cloudflare.example/input");
+
+    const now = Date.now();
+    const tempDir = fs.mkdtempSync(
+      path.join(os.tmpdir(), "streaming-betting-routes-"),
+    );
+    const externalStatusFile = path.join(tempDir, "rtmp-status.json");
+    fs.writeFileSync(
+      externalStatusFile,
+      JSON.stringify({
+        active: true,
+        ffmpegRunning: true,
+        clientConnected: true,
+        destinations: [
+          {
+            id: "canonical-cloudflare",
+            role: "canonical",
+            provider: "cloudflare_stream",
+            name: "External Delivery",
+            transport: "srt",
+            playbackUrl: "https://customer.example/live.m3u8",
+            connected: true,
+            startedAt: now - 500,
+          },
+        ],
+        stats: {
+          healthy: true,
+        },
+        updatedAt: now,
+        rendererHealth: {
+          ready: true,
+          degradedReason: null,
+          updatedAt: now,
+        },
+        sourceRuntime: {
+          ready: true,
+          statusSource: "external_worker",
+          captureMode: "cdp",
+          degradedReason: null,
+          currentSceneUrl: "https://staging.example/stream",
+          activeBundle:
+            "https://staging.example/assets/StreamingMode-abc123.js",
+          lastFrameAt: now,
+          lastRenderTickAt: now,
+          lastVisualChangeAt: now,
+          lastRecoveryAt: now - 1_000,
+          recoveryCount: 1,
+          workerHeartbeatAt: now,
+        },
+      }),
+    );
+
+    const fetchSpy = vi
+      .spyOn(globalThis, "fetch")
+      .mockImplementation(async () => new Response("", { status: 204 }));
+
+    const options = createRouteOptions({
+      externalStatusFile,
+    });
+    const routes = registerStreamingBettingRoutes(options);
+
+    for (
+      let attempt = 0;
+      attempt < 20 && fetchSpy.mock.calls.length === 0;
+      attempt += 1
+    ) {
+      await new Promise((resolve) => setTimeout(resolve, 10));
+    }
+    expect(fetchSpy).toHaveBeenCalled();
+    await new Promise((resolve) => setTimeout(resolve, 10));
+
+    let payload: {
+      canonicalAuthority?: {
+        playbackProbeStatusCode?: unknown;
+      } & Record<string, unknown>;
+      channel?: {
+        publicReadiness?: Record<string, unknown>;
+      };
+    } | null = null;
+    for (let attempt = 0; attempt < 20; attempt += 1) {
+      const response = await options.fastify.inject({
+        method: "GET",
+        url: "/api/internal/bet-sync/state",
+        headers: {
+          authorization: "Bearer bet-secret",
+        },
+      });
+      expect(response.statusCode).toBe(200);
+      payload = response.json();
+      if (payload?.canonicalAuthority?.playbackProbeStatusCode === 204) {
+        break;
+      }
+      await new Promise((resolve) => setTimeout(resolve, 10));
+    }
+
+    expect(payload).not.toBeNull();
+    expect(payload.canonicalAuthority).toMatchObject({
+      providerLive: false,
+      playbackProbeReady: false,
+      decision: "blocked",
+      reason: "provider_not_live",
+    });
+    expect(payload.channel.publicReadiness).toMatchObject({
+      ready: false,
+      reason: "provider_not_live",
+    });
+
+    routes.close();
+    await options.fastify.close();
+    fs.rmSync(tempDir, { recursive: true, force: true });
+  });
+
   it("rejects query-token auth on the bootstrap route", async () => {
-    vi.stubEnv("BETTING_FEED_ACCESS_TOKEN", "bet-secret");
+    stubEnv("BETTING_FEED_ACCESS_TOKEN", "bet-secret");
 
     const options = createRouteOptions();
     const routes = registerStreamingBettingRoutes(options);
@@ -93,7 +524,7 @@ describe("streaming-betting-routes", () => {
   });
 
   it("returns 503 once betting SSE capacity is exhausted after auth succeeds", async () => {
-    vi.stubEnv("BETTING_FEED_ACCESS_TOKEN", "bet-secret");
+    stubEnv("BETTING_FEED_ACCESS_TOKEN", "bet-secret");
 
     const options = createRouteOptions({
       maxClients: 0,
@@ -118,8 +549,8 @@ describe("streaming-betting-routes", () => {
   });
 
   it("fails closed in production when betting-feed auth is not configured", async () => {
-    vi.stubEnv("NODE_ENV", "production");
-    vi.stubEnv("BETTING_FEED_ACCESS_TOKEN", "");
+    stubEnv("NODE_ENV", "production");
+    stubEnv("BETTING_FEED_ACCESS_TOKEN", "");
 
     const options = createRouteOptions();
     const routes = registerStreamingBettingRoutes(options);
@@ -138,9 +569,9 @@ describe("streaming-betting-routes", () => {
   });
 
   it("allows explicit skip-auth only in development", async () => {
-    vi.stubEnv("NODE_ENV", "development");
-    vi.stubEnv("BETTING_FEED_ACCESS_TOKEN", "");
-    vi.stubEnv("BETTING_FEED_SKIP_AUTH", "true");
+    stubEnv("NODE_ENV", "development");
+    stubEnv("BETTING_FEED_ACCESS_TOKEN", "");
+    stubEnv("BETTING_FEED_SKIP_AUTH", "true");
 
     const options = createRouteOptions();
     const routes = registerStreamingBettingRoutes(options);
@@ -156,9 +587,9 @@ describe("streaming-betting-routes", () => {
   });
 
   it("ignores skip-auth in test environments", async () => {
-    vi.stubEnv("NODE_ENV", "test");
-    vi.stubEnv("BETTING_FEED_ACCESS_TOKEN", "");
-    vi.stubEnv("BETTING_FEED_SKIP_AUTH", "true");
+    stubEnv("NODE_ENV", "test");
+    stubEnv("BETTING_FEED_ACCESS_TOKEN", "");
+    stubEnv("BETTING_FEED_SKIP_AUTH", "true");
 
     const options = createRouteOptions();
     const routes = registerStreamingBettingRoutes(options);
@@ -173,27 +604,21 @@ describe("streaming-betting-routes", () => {
     await options.fastify.close();
   });
 
-  it("ignores skip-auth in production", async () => {
-    vi.stubEnv("NODE_ENV", "production");
-    vi.stubEnv("BETTING_FEED_ACCESS_TOKEN", "");
-    vi.stubEnv("BETTING_FEED_SKIP_AUTH", "true");
+  it("rejects skip-auth in production during route registration", async () => {
+    stubEnv("NODE_ENV", "production");
+    stubEnv("BETTING_FEED_ACCESS_TOKEN", "");
+    stubEnv("BETTING_FEED_SKIP_AUTH", "true");
 
     const options = createRouteOptions();
-    const routes = registerStreamingBettingRoutes(options);
-
-    const response = await options.fastify.inject({
-      method: "GET",
-      url: "/api/internal/bet-sync/state",
-    });
-
-    expect(response.statusCode).toBe(503);
-    routes.close();
+    expect(() => registerStreamingBettingRoutes(options)).toThrow(
+      "BETTING_FEED_SKIP_AUTH=true is forbidden",
+    );
     await options.fastify.close();
   });
 
   it("does not treat the viewer token as a betting-feed fallback", async () => {
-    vi.stubEnv("BETTING_FEED_ACCESS_TOKEN", "");
-    vi.stubEnv("STREAMING_VIEWER_ACCESS_TOKEN", "viewer-secret");
+    stubEnv("BETTING_FEED_ACCESS_TOKEN", "");
+    stubEnv("STREAMING_VIEWER_ACCESS_TOKEN", "viewer-secret");
 
     const options = createRouteOptions();
     const routes = registerStreamingBettingRoutes(options);
@@ -212,7 +637,7 @@ describe("streaming-betting-routes", () => {
   });
 
   it("reuses and releases the external status poller across repeated route registration", async () => {
-    vi.stubEnv("BETTING_FEED_ACCESS_TOKEN", "bet-secret");
+    stubEnv("BETTING_FEED_ACCESS_TOKEN", "bet-secret");
     const setIntervalSpy = vi.spyOn(globalThis, "setInterval");
     const clearIntervalSpy = vi.spyOn(globalThis, "clearInterval");
 
@@ -238,7 +663,7 @@ describe("streaming-betting-routes", () => {
   });
 
   it("releases the external status poller when Fastify closes even without manual route cleanup", async () => {
-    vi.stubEnv("BETTING_FEED_ACCESS_TOKEN", "bet-secret");
+    stubEnv("BETTING_FEED_ACCESS_TOKEN", "bet-secret");
     const clearIntervalSpy = vi.spyOn(globalThis, "clearInterval");
 
     const options = createRouteOptions({
@@ -281,7 +706,7 @@ describe("streaming-betting-routes", () => {
   });
 
   it("rejects query-token auth on the events route", async () => {
-    vi.stubEnv("BETTING_FEED_ACCESS_TOKEN", "bet-secret");
+    stubEnv("BETTING_FEED_ACCESS_TOKEN", "bet-secret");
 
     const options = createRouteOptions();
     const routes = registerStreamingBettingRoutes(options);
@@ -296,6 +721,142 @@ describe("streaming-betting-routes", () => {
     await options.fastify.close();
   });
 
+  it("persists Cloudflare webhook lifecycle metadata when the shared secret matches", async () => {
+    stubEnv("STREAM_CLOUDFLARE_WEBHOOK_SECRET", "cf-secret");
+    stubEnv("STREAM_CLOUDFLARE_LIVE_INPUT_ID", "live-input-env");
+
+    const storageBackedWorld = createStorageBackedWorld();
+    const options = createRouteOptions({
+      world: storageBackedWorld.world,
+    });
+    const routes = registerStreamingBettingRoutes(options);
+
+    const response = await options.fastify.inject({
+      method: "POST",
+      url: "/api/streaming/cloudflare/webhook",
+      headers: {
+        "cf-webhook-auth": "cf-secret",
+      },
+      payload: {
+        alert_type: "stream_live_input.connected",
+        name: "Stream Live Input Connected",
+        event: {
+          input_id: "live-input-env",
+          video_id: "video-456",
+          timestamp: "2026-04-09T02:15:00.000Z",
+        },
+      },
+    });
+
+    expect(response.statusCode).toBe(202);
+    expect(response.json()).toMatchObject({
+      ok: true,
+      eventType: "stream_live_input.connected",
+      liveInputId: "live-input-env",
+    });
+    expect(
+      JSON.parse(
+        storageBackedWorld.rows.get("streaming:cloudflare:last-webhook")
+          ?.value ?? "null",
+      ),
+    ).toMatchObject({
+      eventType: "stream_live_input.connected",
+      liveInputId: "live-input-env",
+      videoId: "video-456",
+    });
+    expect(
+      JSON.parse(
+        storageBackedWorld.rows.get("streaming:cloudflare:lifecycle")?.value ??
+          "null",
+      ),
+    ).toMatchObject({
+      eventType: "stream_live_input.connected",
+      liveInputId: "live-input-env",
+      status: "connected",
+    });
+
+    routes.close();
+    await options.fastify.close();
+  });
+
+  it("rejects authenticated Cloudflare webhooks that omit a live input id", async () => {
+    stubEnv("STREAM_CLOUDFLARE_WEBHOOK_SECRET", "cf-secret");
+    stubEnv("STREAM_CLOUDFLARE_LIVE_INPUT_ID", "live-input-env");
+
+    const storageBackedWorld = createStorageBackedWorld();
+    const options = createRouteOptions({
+      world: storageBackedWorld.world,
+    });
+    const routes = registerStreamingBettingRoutes(options);
+
+    const response = await options.fastify.inject({
+      method: "POST",
+      url: "/api/streaming/cloudflare/webhook",
+      headers: {
+        "cf-webhook-auth": "cf-secret",
+      },
+      payload: {
+        alert_type: "stream_live_input.connected",
+        name: "Stream Live Input Connected",
+      },
+    });
+
+    expect(response.statusCode).toBe(400);
+    expect(
+      storageBackedWorld.rows.get("streaming:cloudflare:last-webhook"),
+    ).toBeUndefined();
+    expect(
+      storageBackedWorld.rows.get("streaming:cloudflare:lifecycle"),
+    ).toBeUndefined();
+
+    routes.close();
+    await options.fastify.close();
+  });
+
+  it("ignores authenticated Cloudflare webhooks for a different live input", async () => {
+    stubEnv("STREAM_CLOUDFLARE_WEBHOOK_SECRET", "cf-secret");
+    stubEnv("STREAM_CLOUDFLARE_LIVE_INPUT_ID", "live-input-env");
+
+    const storageBackedWorld = createStorageBackedWorld();
+    const options = createRouteOptions({
+      world: storageBackedWorld.world,
+    });
+    const routes = registerStreamingBettingRoutes(options);
+
+    const response = await options.fastify.inject({
+      method: "POST",
+      url: "/api/streaming/cloudflare/webhook",
+      headers: {
+        "cf-webhook-auth": "cf-secret",
+      },
+      payload: {
+        alert_type: "stream_live_input.connected",
+        name: "Stream Live Input Connected",
+        event: {
+          input_id: "other-live-input",
+          video_id: "video-456",
+          timestamp: "2026-04-09T02:15:00.000Z",
+        },
+      },
+    });
+
+    expect(response.statusCode).toBe(202);
+    expect(response.json()).toMatchObject({
+      ok: true,
+      ignored: true,
+      liveInputId: "other-live-input",
+    });
+    expect(
+      storageBackedWorld.rows.get("streaming:cloudflare:last-webhook"),
+    ).toBeUndefined();
+    expect(
+      storageBackedWorld.rows.get("streaming:cloudflare:lifecycle"),
+    ).toBeUndefined();
+
+    routes.close();
+    await options.fastify.close();
+  });
+
   it("allocates betting client ids without colliding after wraparound", () => {
     const allocation = allocateNextBettingClientId(
       Number.MAX_SAFE_INTEGER - 1,
@@ -313,4 +874,15 @@ describe("streaming-betting-routes", () => {
       nextCursor: 4,
     });
   });
+
+  it("normalizes invalid betting client id cursors before allocation", () => {
+    expect(allocateNextBettingClientId(Number.NaN, [1, 2])).toEqual({
+      clientId: 3,
+      nextCursor: 4,
+    });
+    expect(allocateNextBettingClientId(-1, [])).toEqual({
+      clientId: 1,
+      nextCursor: 2,
+    });
+  });
 });
diff --git a/packages/server/tests/unit/routes/streaming-external-status.test.ts b/packages/server/tests/unit/routes/streaming-external-status.test.ts
new file mode 100644
index 000000000..4c0a13c79
--- /dev/null
+++ b/packages/server/tests/unit/routes/streaming-external-status.test.ts
@@ -0,0 +1,355 @@
+import { describe, expect, it } from "vitest";
+import { parseExternalRtmpStatusSnapshot } from "../../../src/routes/streaming-external-status.js";
+
+describe("parseExternalRtmpStatusSnapshot", () => {
+  it("allowlists the additive smoke summary fields", () => {
+    const parsed = parseExternalRtmpStatusSnapshot(
+      JSON.stringify({
+        destinations: [],
+        stats: {},
+        updatedAt: Date.now(),
+        captureMode: "cdp",
+        smoke: {
+          currentSceneUrl: "https://staging.example/stream",
+          activeBundle:
+            "https://staging.example/assets/StreamingMode-abc123.js",
+          deliveryMode: "external_hls",
+          captureFpsP50: 29.5,
+          captureFpsP95: 30,
+          encodeFpsP50: 28.5,
+          encodeFpsP95: 29,
+          updatedAt: 1234,
+          ingest: {
+            profile: "cloudflare_live",
+            transport: "rtmps",
+            audioSampleRate: 48_000,
+            gopFrames: 60,
+            probeOnly: true,
+          },
+        },
+        ingest: {
+          profile: "cloudflare_live",
+          transport: "rtmps",
+          audioSampleRate: 48_000,
+          gopFrames: 60,
+          probeOnly: true,
+        },
+        sourceRuntime: {
+          ready: true,
+          statusSource: "external_worker",
+          captureMode: "cdp",
+          degradedReason: null,
+          currentSceneUrl: "https://staging.example/stream",
+          activeBundle:
+            "https://staging.example/assets/StreamingMode-abc123.js",
+          lastFrameAt: 1230,
+          lastRenderTickAt: 1231,
+          lastVisualChangeAt: 1232,
+          lastRecoveryAt: 1000,
+          recoveryCount: 2,
+          workerHeartbeatAt: 1234,
+        },
+        captureDiagnostics: {
+          recentFrames: [
+            {
+              at: 1230,
+              size: 2048,
+              cdpTimestamp: 12.5,
+            },
+          ],
+          recentFrameCadenceMs: [33],
+          nonMonotonicCdpTimestampCount: 0,
+          backpressureTransitions: [
+            {
+              at: 1231,
+              backpressured: true,
+            },
+          ],
+          firstFatalWriteError: {
+            at: 1229,
+            message: "Broken pipe",
+            frameCount: 4,
+            droppedFrames: 1,
+            bytesReceived: 8192,
+            backpressured: false,
+            cdpDirectMode: true,
+            uptimeMs: 900,
+          },
+          lastFatalWriteError: {
+            at: 1232,
+            message: "Input/output error",
+            frameCount: 5,
+            droppedFrames: 2,
+            bytesReceived: 12288,
+            backpressured: true,
+            cdpDirectMode: true,
+            uptimeMs: 1000,
+          },
+          pageStallBeforeLastFatalWrite: false,
+          lastFrameAgeMs: 4,
+          captureSessionGeneration: "capture-123",
+          manifestStatus: "ok",
+        },
+        unexpected: {
+          foo: "bar",
+        },
+      }),
+      15_000,
+      { allowStale: true },
+    );
+
+    expect(parsed?.captureMode).toBe("cdp");
+    expect(parsed?.smoke).toEqual({
+      currentSceneUrl: "https://staging.example/stream",
+      activeBundle: "https://staging.example/assets/StreamingMode-abc123.js",
+      deliveryMode: "external_hls",
+      captureFpsP50: 29.5,
+      captureFpsP95: 30,
+      encodeFpsP50: 28.5,
+      encodeFpsP95: 29,
+      updatedAt: 1234,
+      ingest: {
+        profile: "cloudflare_live",
+        transport: "rtmps",
+        audioSampleRate: 48_000,
+        gopFrames: 60,
+        probeOnly: true,
+      },
+    });
+    expect(parsed?.ingest).toEqual({
+      profile: "cloudflare_live",
+      transport: "rtmps",
+      audioSampleRate: 48_000,
+      gopFrames: 60,
+      probeOnly: true,
+    });
+    expect(parsed?.sourceRuntime).toEqual({
+      ready: true,
+      statusSource: "external_worker",
+      captureMode: "cdp",
+      degradedReason: null,
+      currentSceneUrl: "https://staging.example/stream",
+      activeBundle: "https://staging.example/assets/StreamingMode-abc123.js",
+      lastFrameAt: 1230,
+      lastRenderTickAt: 1231,
+      lastVisualChangeAt: 1232,
+      lastRecoveryAt: 1000,
+      recoveryCount: 2,
+      workerHeartbeatAt: 1234,
+    });
+    expect(parsed?.captureDiagnostics).toEqual({
+      recentFrames: [
+        {
+          at: 1230,
+          size: 2048,
+          cdpTimestamp: 12.5,
+        },
+      ],
+      recentFrameCadenceMs: [33],
+      nonMonotonicCdpTimestampCount: 0,
+      backpressureTransitions: [
+        {
+          at: 1231,
+          backpressured: true,
+        },
+      ],
+      firstFatalWriteError: {
+        at: 1229,
+        message: "Broken pipe",
+        frameCount: 4,
+        droppedFrames: 1,
+        bytesReceived: 8192,
+        backpressured: false,
+        cdpDirectMode: true,
+        uptimeMs: 900,
+      },
+      lastFatalWriteError: {
+        at: 1232,
+        message: "Input/output error",
+        frameCount: 5,
+        droppedFrames: 2,
+        bytesReceived: 12288,
+        backpressured: true,
+        cdpDirectMode: true,
+        uptimeMs: 1000,
+      },
+      pageStallBeforeLastFatalWrite: false,
+      lastFrameAgeMs: 4,
+      captureSessionGeneration: "capture-123",
+      manifestStatus: "ok",
+    });
+    expect(parsed).not.toHaveProperty("unexpected");
+  });
+
+  it("validates stats field-by-field and drops malformed values", () => {
+    const parsed = parseExternalRtmpStatusSnapshot(
+      JSON.stringify({
+        destinations: [],
+        stats: {
+          bitrate: 4_000,
+          fps: "30",
+          uptime: 12,
+          bytesReceived: 8_192,
+          droppedFrames: "2",
+          healthy: true,
+          injected: "nope",
+        },
+        updatedAt: Date.now(),
+      }),
+      15_000,
+      { allowStale: true },
+    );
+
+    expect(parsed?.stats).toEqual({
+      bitrate: 4_000,
+      uptime: 12,
+      bytesReceived: 8_192,
+      healthy: true,
+    });
+  });
+
+  it("accepts x11_nvenc capture mode from external worker snapshots", () => {
+    const parsed = parseExternalRtmpStatusSnapshot(
+      JSON.stringify({
+        destinations: [],
+        stats: {},
+        updatedAt: Date.now(),
+        captureMode: "x11_nvenc",
+        sourceRuntime: {
+          ready: true,
+          statusSource: "external_worker",
+          captureMode: "x11_nvenc",
+          degradedReason: null,
+        },
+      }),
+      15_000,
+      { allowStale: true },
+    );
+
+    expect(parsed?.captureMode).toBe("x11_nvenc");
+    expect(parsed?.sourceRuntime?.captureMode).toBe("x11_nvenc");
+  });
+
+  it("falls back to nested sourceRuntime capture mode when the root field is missing", () => {
+    const parsed = parseExternalRtmpStatusSnapshot(
+      JSON.stringify({
+        destinations: [],
+        stats: {},
+        updatedAt: Date.now(),
+        sourceRuntime: {
+          ready: true,
+          statusSource: "external_worker",
+          captureMode: "x11_nvenc",
+          degradedReason: null,
+          currentSceneUrl: "https://staging.example/stream",
+          activeBundle: null,
+          lastFrameAt: 1230,
+          lastRenderTickAt: 1231,
+          lastVisualChangeAt: 1232,
+          lastRecoveryAt: 1000,
+          recoveryCount: 2,
+          workerHeartbeatAt: 1234,
+        },
+      }),
+      15_000,
+      { allowStale: true },
+    );
+
+    expect(parsed?.captureMode).toBe("x11_nvenc");
+    expect(parsed?.sourceRuntime?.captureMode).toBe("x11_nvenc");
+  });
+
+  it("drops malformed nested fields while preserving valid siblings", () => {
+    const parsed = parseExternalRtmpStatusSnapshot(
+      JSON.stringify({
+        destinations: [],
+        stats: {},
+        updatedAt: Date.now(),
+        rendererHealth: {
+          ready: true,
+          degradedReason: 123,
+          updatedAt: "late",
+          phase: "fight",
+        },
+        delivery: {
+          mode: "external_hls",
+          provider: "cloudflare_stream",
+          playbackUrl: "https://customer.example/live.m3u8",
+          ingestUrl: 42,
+        },
+        sourceRuntime: {
+          ready: true,
+          captureMode: "cdp",
+          recoveryCount: "two",
+          workerHeartbeatAt: 5000,
+        },
+        captureDiagnostics: {
+          recentFrames: [
+            {
+              at: 10,
+              size: "bad",
+              cdpTimestamp: 11.5,
+            },
+            "bad-frame",
+          ],
+          recentFrameCadenceMs: [33, "slow", null],
+          lastFatalWriteError: {
+            at: 12,
+            message: "Broken pipe",
+            frameCount: "bad",
+            backpressured: false,
+          },
+          manifestStatus: "ok",
+        },
+      }),
+      15_000,
+      { allowStale: true },
+    );
+
+    expect(parsed?.rendererHealth).toEqual({
+      ready: true,
+      degradedReason: null,
+      updatedAt: null,
+      phase: "fight",
+    });
+    expect(parsed?.delivery).toEqual({
+      mode: "external_hls",
+      provider: "cloudflare_stream",
+      playbackUrl: "https://customer.example/live.m3u8",
+      hlsUrl: null,
+      llhlsUrl: null,
+      ingestUrl: null,
+    });
+    expect(parsed?.sourceRuntime).toEqual({
+      ready: true,
+      statusSource: "none",
+      captureMode: "cdp",
+      degradedReason: null,
+      currentSceneUrl: null,
+      activeBundle: null,
+      lastFrameAt: null,
+      lastRenderTickAt: null,
+      lastVisualChangeAt: null,
+      lastRecoveryAt: null,
+      recoveryCount: 0,
+      workerHeartbeatAt: 5000,
+    });
+    expect(parsed?.captureDiagnostics).toEqual({
+      recentFrames: [
+        {
+          at: 10,
+          size: null,
+          cdpTimestamp: 11.5,
+        },
+      ],
+      recentFrameCadenceMs: [33, null],
+      lastFatalWriteError: {
+        at: 12,
+        message: "Broken pipe",
+        frameCount: null,
+        backpressured: false,
+      },
+      manifestStatus: "ok",
+    });
+  });
+});
diff --git a/packages/server/tests/unit/routes/streaming-results-route.test.ts b/packages/server/tests/unit/routes/streaming-results-route.test.ts
new file mode 100644
index 000000000..072e0342d
--- /dev/null
+++ b/packages/server/tests/unit/routes/streaming-results-route.test.ts
@@ -0,0 +1,156 @@
+import Fastify, { type FastifyInstance } from "fastify";
+import { afterEach, describe, expect, it, vi } from "vitest";
+import { registerStreamingRoutes } from "../../../src/routes/streaming.js";
+
+const ORIGINAL_ENV = { ...process.env };
+
+type StreamingHistoryRow = {
+  cycleId: string;
+  damageLoser: number | null;
+  damageWinner: number | null;
+  duelEndTime: number | null;
+  duelId: string;
+  duelKeyHex: string | null;
+  finishedAt: Date | null;
+  loserId: string | null;
+  loserName: string | null;
+  replayHash: string | null;
+  seed: string | null;
+  winReason: string | null;
+  winnerId: string | null;
+  winnerName: string | null;
+};
+
+function createHistoryDb(rows: StreamingHistoryRow[]) {
+  const limit = vi.fn(async () => rows);
+  const where = vi.fn(() => ({ limit }));
+  const from = vi.fn(() => ({ where }));
+  const select = vi.fn(() => ({ from }));
+
+  return {
+    db: { select },
+    spies: { from, limit, select, where },
+  };
+}
+
+function createApp(rows: StreamingHistoryRow[]) {
+  const app = Fastify();
+  app.decorate("rateLimit", (() =>
+    async () => {}) as FastifyInstance["rateLimit"]);
+
+  const { db, spies } = createHistoryDb(rows);
+  const world = {
+    getSystem: (name: string) =>
+      name === "database"
+        ? {
+            getDb: () => db,
+          }
+        : null,
+  };
+
+  registerStreamingRoutes(app, world as never);
+  return { app, spies };
+}
+
+describe("streaming results route", () => {
+  afterEach(() => {
+    process.env = { ...ORIGINAL_ENV };
+    vi.restoreAllMocks();
+  });
+
+  it("requires the oracle proof bearer token", async () => {
+    process.env.HYPERSCAPES_RESULT_LOOKUP_BEARER_TOKEN = "result-secret";
+    const { app } = createApp([]);
+
+    const response = await app.inject({
+      method: "GET",
+      url: "/api/streaming/results/streaming-1",
+    });
+
+    expect(response.statusCode).toBe(401);
+    expect(response.json()).toMatchObject({
+      error: "Unauthorized",
+    });
+    await app.close();
+  });
+
+  it("does not serve oracle proof material unauthenticated in dev mode", async () => {
+    process.env.NODE_ENV = "development";
+    process.env.BETTING_FEED_SKIP_AUTH = "true";
+    process.env.ALLOW_UNAUTHENTICATED_ORACLE_PROOF = "true";
+    const { app } = createApp([]);
+
+    const response = await app.inject({
+      method: "GET",
+      url: "/api/streaming/results/streaming-1",
+    });
+
+    expect(response.statusCode).toBe(503);
+    expect(response.json()).toMatchObject({
+      error: "Service unavailable",
+      message: "Oracle proof auth token is not configured",
+    });
+    await app.close();
+  });
+
+  it("rejects malformed duel ids", async () => {
+    process.env.HYPERSCAPES_RESULT_LOOKUP_BEARER_TOKEN = "result-secret";
+    const { app } = createApp([]);
+
+    const response = await app.inject({
+      method: "GET",
+      url: "/api/streaming/results/streaming%201",
+      headers: {
+        authorization: "Bearer result-secret",
+      },
+    });
+
+    expect(response.statusCode).toBe(400);
+    expect(response.json()).toMatchObject({
+      error: "Bad request",
+      message: "Invalid duelId format",
+    });
+    await app.close();
+  });
+
+  it("returns oracle proof material for authenticated resolved duels", async () => {
+    process.env.HYPERSCAPES_RESULT_LOOKUP_BEARER_TOKEN = "result-secret";
+    const finishedAt = new Date("2026-04-20T00:00:00.000Z");
+    const row: StreamingHistoryRow = {
+      cycleId: "cycle-1",
+      damageLoser: 4,
+      damageWinner: 9,
+      duelEndTime: 1776643200000,
+      duelId: "streaming-1",
+      duelKeyHex: "a".repeat(64),
+      finishedAt,
+      loserId: "agent-b",
+      loserName: "Agent B",
+      replayHash: "b".repeat(64),
+      seed: "c".repeat(64),
+      winReason: "KO",
+      winnerId: "agent-a",
+      winnerName: "Agent A",
+    };
+    const { app } = createApp([row]);
+
+    const response = await app.inject({
+      method: "GET",
+      url: "/api/streaming/results/streaming-1",
+      headers: {
+        authorization: "Bearer result-secret",
+      },
+    });
+
+    expect(response.statusCode).toBe(200);
+    expect(response.json()).toMatchObject({
+      cycleId: "cycle-1",
+      duelId: "streaming-1",
+      duelKeyHex: "a".repeat(64),
+      replayHash: "b".repeat(64),
+      seed: "c".repeat(64),
+      winnerId: "agent-a",
+    });
+    await app.close();
+  });
+});
diff --git a/packages/server/tests/unit/routes/streaming-route-helpers.test.ts b/packages/server/tests/unit/routes/streaming-route-helpers.test.ts
new file mode 100644
index 000000000..d845bf132
--- /dev/null
+++ b/packages/server/tests/unit/routes/streaming-route-helpers.test.ts
@@ -0,0 +1,61 @@
+import { describe, expect, it } from "vitest";
+import {
+  allocateNextStreamingSseClientId,
+  buildStreamingResultNotFoundPayload,
+  isValidStreamingResultDuelId,
+  normalizeStreamingThoughtLimit,
+} from "../../../src/routes/streaming.js";
+import { normalizeGameAssetPath } from "../../../src/startup/http-server.js";
+
+describe("streaming route helpers", () => {
+  it("normalizes monologue limits with finite bounded fallbacks", () => {
+    expect(normalizeStreamingThoughtLimit(undefined)).toBe(20);
+    expect(normalizeStreamingThoughtLimit("abc")).toBe(20);
+    expect(normalizeStreamingThoughtLimit("-5")).toBe(1);
+    expect(normalizeStreamingThoughtLimit("0")).toBe(1);
+    expect(normalizeStreamingThoughtLimit("55")).toBe(50);
+    expect(normalizeStreamingThoughtLimit("12")).toBe(12);
+  });
+
+  it("allocates SSE client ids with wraparound and collision skipping", () => {
+    const clients = new Map<number, unknown>([
+      [Number.MAX_SAFE_INTEGER, {}],
+      [1, {}],
+      [2, {}],
+    ]);
+
+    const wrapped = allocateNextStreamingSseClientId(
+      Number.MAX_SAFE_INTEGER,
+      clients,
+    );
+    expect(wrapped).toEqual({
+      clientId: 3,
+      nextClientId: 4,
+    });
+  });
+
+  it("builds a generic results lookup 404 payload", () => {
+    expect(buildStreamingResultNotFoundPayload()).toEqual({
+      error: "Not found",
+      message: "Resolved duel not found",
+    });
+  });
+
+  it("validates streaming results duel ids without requiring UUIDs", () => {
+    expect(isValidStreamingResultDuelId("streaming-123")).toBe(true);
+    expect(isValidStreamingResultDuelId("duel-123")).toBe(true);
+    expect(isValidStreamingResultDuelId("abc_123:456")).toBe(true);
+    expect(isValidStreamingResultDuelId("")).toBe(false);
+    expect(isValidStreamingResultDuelId("-streaming-123")).toBe(false);
+    expect(isValidStreamingResultDuelId("streaming 123")).toBe(false);
+    expect(isValidStreamingResultDuelId("streaming/123")).toBe(false);
+    expect(isValidStreamingResultDuelId("a".repeat(129))).toBe(false);
+  });
+
+  it("rejects game asset paths containing a null byte", () => {
+    expect(normalizeGameAssetPath("/assets/world.glb")).toBe(
+      "assets/world.glb",
+    );
+    expect(normalizeGameAssetPath("/assets/%00world.glb")).toBeNull();
+  });
+});
diff --git a/packages/server/tests/unit/routes/streaming-source-runtime.test.ts b/packages/server/tests/unit/routes/streaming-source-runtime.test.ts
new file mode 100644
index 000000000..aea954316
--- /dev/null
+++ b/packages/server/tests/unit/routes/streaming-source-runtime.test.ts
@@ -0,0 +1,280 @@
+import { describe, expect, it } from "vitest";
+import { deriveStreamSourceRuntime } from "../../../src/routes/streaming-source-runtime.js";
+import { resolveBrowserCaptureLastFrameAt } from "../../../src/streaming/source-runtime.js";
+
+describe("deriveStreamSourceRuntime", () => {
+  it("fails closed when an external worker is required but no snapshot is available", () => {
+    const runtime = deriveStreamSourceRuntime({
+      externalStatusSnapshot: null,
+      externalStatusMaxAgeMs: 15_000,
+      rendererHealth: {
+        ready: true,
+        degradedReason: null,
+        updatedAt: 123,
+      },
+      requireExternalWorker: true,
+      nowMs: 1_000,
+    });
+
+    expect(runtime).toEqual({
+      ready: false,
+      statusSource: "external_worker",
+      captureMode: "none",
+      degradedReason: "worker_missing",
+      currentSceneUrl: null,
+      activeBundle: null,
+      lastFrameAt: null,
+      lastRenderTickAt: null,
+      lastVisualChangeAt: null,
+      lastRecoveryAt: null,
+      recoveryCount: 0,
+      workerHeartbeatAt: null,
+    });
+  });
+
+  it("preserves a healthy external worker runtime even when destinations are disconnected", () => {
+    const runtime = deriveStreamSourceRuntime({
+      externalStatusSnapshot: {
+        active: true,
+        ffmpegRunning: true,
+        clientConnected: true,
+        captureMode: "cdp",
+        destinations: [
+          {
+            id: "canonical-cloudflare",
+            connected: false,
+            error: "delivery_disconnected",
+          },
+        ],
+        stats: {
+          healthy: false,
+        },
+        updatedAt: 1_000,
+        sourceRuntime: {
+          ready: true,
+          statusSource: "external_worker",
+          captureMode: "cdp",
+          degradedReason: null,
+          currentSceneUrl: "https://staging.example/stream",
+          activeBundle: "bundle-a",
+          lastFrameAt: 999,
+          lastRenderTickAt: 998,
+          lastVisualChangeAt: 997,
+          lastRecoveryAt: 900,
+          recoveryCount: 2,
+          workerHeartbeatAt: 1_000,
+        },
+      },
+      externalStatusMaxAgeMs: 15_000,
+      rendererHealth: {
+        ready: true,
+        degradedReason: null,
+        updatedAt: 1_000,
+      },
+      requireExternalWorker: true,
+      nowMs: 1_500,
+    });
+
+    expect(runtime.ready).toBe(true);
+    expect(runtime.degradedReason).toBeNull();
+    expect(runtime.statusSource).toBe("external_worker");
+    expect(runtime.captureMode).toBe("cdp");
+  });
+
+  it("preserves x11_nvenc capture mode from the external worker snapshot", () => {
+    const runtime = deriveStreamSourceRuntime({
+      externalStatusSnapshot: {
+        active: true,
+        ffmpegRunning: true,
+        clientConnected: true,
+        captureMode: "x11_nvenc",
+        destinations: [],
+        stats: {
+          healthy: true,
+        },
+        updatedAt: 1_000,
+        sourceRuntime: {
+          ready: true,
+          statusSource: "external_worker",
+          captureMode: "x11_nvenc",
+          degradedReason: null,
+          currentSceneUrl: "https://staging.example/stream",
+          activeBundle: "bundle-a",
+          lastFrameAt: 999,
+          lastRenderTickAt: 998,
+          lastVisualChangeAt: 997,
+          lastRecoveryAt: 900,
+          recoveryCount: 2,
+          workerHeartbeatAt: 1_000,
+        },
+      },
+      externalStatusMaxAgeMs: 15_000,
+      rendererHealth: {
+        ready: true,
+        degradedReason: null,
+        updatedAt: 1_000,
+      },
+      requireExternalWorker: true,
+      nowMs: 1_500,
+    });
+
+    expect(runtime.ready).toBe(true);
+    expect(runtime.captureMode).toBe("x11_nvenc");
+  });
+
+  it("falls back to the top-level external capture mode when the nested runtime omits it", () => {
+    const runtime = deriveStreamSourceRuntime({
+      externalStatusSnapshot: {
+        active: true,
+        ffmpegRunning: true,
+        clientConnected: true,
+        captureMode: "x11_nvenc",
+        destinations: [],
+        stats: {
+          healthy: true,
+        },
+        updatedAt: 1_000,
+        sourceRuntime: {
+          ready: true,
+          statusSource: "external_worker",
+          captureMode: "none",
+          degradedReason: null,
+          currentSceneUrl: "https://staging.example/stream",
+          activeBundle: "bundle-a",
+          lastFrameAt: 999,
+          lastRenderTickAt: 998,
+          lastVisualChangeAt: 997,
+          lastRecoveryAt: 900,
+          recoveryCount: 2,
+          workerHeartbeatAt: 1_000,
+        },
+      },
+      externalStatusMaxAgeMs: 15_000,
+      rendererHealth: {
+        ready: true,
+        degradedReason: null,
+        updatedAt: 1_000,
+      },
+      requireExternalWorker: true,
+      nowMs: 1_500,
+    });
+
+    expect(runtime.ready).toBe(true);
+    expect(runtime.captureMode).toBe("x11_nvenc");
+  });
+
+  it("does not downgrade source runtime solely because a delivery destination is disconnected", () => {
+    const runtime = deriveStreamSourceRuntime({
+      externalStatusSnapshot: {
+        active: true,
+        ffmpegRunning: true,
+        clientConnected: true,
+        captureMode: "cdp",
+        destinations: [
+          {
+            id: "fallback-cloudflare",
+            connected: false,
+            error: "delivery_disconnected",
+          },
+        ],
+        stats: {
+          healthy: true,
+        },
+        updatedAt: 1_000,
+        delivery: {
+          mode: "self_hls",
+          provider: "self_hls",
+          playbackUrl: "https://self.example/live/stream.m3u8",
+          hlsUrl: "https://self.example/live/stream.m3u8",
+          llhlsUrl: null,
+          ingestUrl: null,
+        },
+      },
+      externalStatusMaxAgeMs: 15_000,
+      rendererHealth: {
+        ready: true,
+        degradedReason: null,
+        updatedAt: 1_000,
+      },
+      captureStats: {
+        clientConnected: true,
+        ffmpegRunning: true,
+      },
+      nowMs: 1_500,
+    });
+
+    expect(runtime.ready).toBe(true);
+    expect(runtime.degradedReason).toBeNull();
+    expect(runtime.statusSource).toBe("external_worker");
+    expect(runtime.captureMode).toBe("cdp");
+  });
+
+  it("fails closed when renderer health reports a scene blocker", () => {
+    const runtime = deriveStreamSourceRuntime({
+      externalStatusSnapshot: {
+        active: true,
+        ffmpegRunning: true,
+        clientConnected: true,
+        captureMode: "cdp",
+        destinations: [],
+        stats: {
+          healthy: true,
+        },
+        updatedAt: 1_000,
+      },
+      externalStatusMaxAgeMs: 15_000,
+      rendererHealth: {
+        ready: false,
+        degradedReason: "terrain_not_ready",
+        updatedAt: 1_000,
+      },
+      captureStats: {
+        clientConnected: true,
+        ffmpegRunning: true,
+      },
+      nowMs: 1_500,
+    });
+
+    expect(runtime.ready).toBe(false);
+    expect(runtime.degradedReason).toBe("page_not_ready");
+    expect(runtime.statusSource).toBe("external_worker");
+    expect(runtime.captureMode).toBe("cdp");
+  });
+});
+
+describe("resolveBrowserCaptureLastFrameAt", () => {
+  it("prefers an absolute lastChunkAt timestamp when present", () => {
+    expect(
+      resolveBrowserCaptureLastFrameAt(
+        {
+          lastChunkAt: 9_750,
+          lastChunkAgeMs: 250,
+          lastChunkMs: 250,
+        },
+        10_000,
+      ),
+    ).toBe(9_750);
+  });
+
+  it("falls back to lastChunkAgeMs when lastChunkAt is unavailable", () => {
+    expect(
+      resolveBrowserCaptureLastFrameAt(
+        {
+          lastChunkAgeMs: 300,
+        },
+        10_000,
+      ),
+    ).toBe(9_700);
+  });
+
+  it("falls back to legacy lastChunkMs for mixed-version rollouts", () => {
+    expect(
+      resolveBrowserCaptureLastFrameAt(
+        {
+          lastChunkMs: 450,
+        },
+        10_000,
+      ),
+    ).toBe(9_550);
+  });
+});
diff --git a/packages/server/tests/unit/routes/streaming-source-timeline.test.ts b/packages/server/tests/unit/routes/streaming-source-timeline.test.ts
new file mode 100644
index 000000000..9f967aae7
--- /dev/null
+++ b/packages/server/tests/unit/routes/streaming-source-timeline.test.ts
@@ -0,0 +1,342 @@
+import { describe, expect, it } from "vitest";
+import {
+  attachRawSourceTime,
+  buildSourceTimeline,
+  isRawSourceTimeEmissionEnabled,
+} from "../../../src/routes/streaming.js";
+import type { StreamingStateUpdate } from "../../../src/systems/StreamingDuelScheduler/types.js";
+
+/**
+ * Commit 1 contract tests for the canonical stream-state rail
+ * (`/api/streaming/state` + `/api/streaming/state/events`). These prove
+ * the additive `STREAMING_EMIT_RAW_SOURCE_TIME` flag does not change the
+ * wire shape when disabled, and produces a strictly additive raw
+ * source-time overlay when enabled. Commits 2–5 depend on this contract.
+ */
+
+function makeCycle(
+  overrides: Partial<StreamingStateUpdate["cycle"]> = {},
+): StreamingStateUpdate["cycle"] {
+  return {
+    cycleId: "cycle-1",
+    phase: "ANNOUNCEMENT",
+    cycleStartTime: 1_000,
+    phaseStartTime: 1_000,
+    phaseEndTime: 61_000,
+    phaseVersion: 1,
+    timeRemaining: 60,
+    agent1: null,
+    agent2: null,
+    duelId: "duel-1",
+    duelKeyHex: null,
+    betOpenTime: 2_000,
+    betCloseTime: 12_000,
+    countdown: null,
+    fightStartTime: null,
+    duelEndTime: null,
+    arenaPositions: null,
+    winnerId: null,
+    winnerName: null,
+    winReason: null,
+    seed: null,
+    replayHash: null,
+    ...overrides,
+  };
+}
+
+function makeState(
+  cycle: StreamingStateUpdate["cycle"] = makeCycle(),
+): StreamingStateUpdate {
+  return {
+    type: "STREAMING_STATE_UPDATE",
+    cycle,
+    leaderboard: [],
+    cameraTarget: null,
+  };
+}
+
+describe("isRawSourceTimeEmissionEnabled", () => {
+  it("returns false when the env var is unset", () => {
+    expect(isRawSourceTimeEmissionEnabled({})).toBe(false);
+  });
+
+  it("returns false when the env var is explicitly 'false'", () => {
+    expect(
+      isRawSourceTimeEmissionEnabled({
+        STREAMING_EMIT_RAW_SOURCE_TIME: "false",
+      }),
+    ).toBe(false);
+  });
+
+  it("returns true when the env var is 'true'", () => {
+    expect(
+      isRawSourceTimeEmissionEnabled({
+        STREAMING_EMIT_RAW_SOURCE_TIME: "true",
+      }),
+    ).toBe(true);
+  });
+
+  it("is case-insensitive and trims whitespace", () => {
+    expect(
+      isRawSourceTimeEmissionEnabled({
+        STREAMING_EMIT_RAW_SOURCE_TIME: "  TRUE  ",
+      }),
+    ).toBe(true);
+  });
+
+  it("rejects ambiguous values (1, yes, on) to avoid accidental emission", () => {
+    // Only the explicit string "true" enables the contract. This keeps
+    // rollout opt-in clear and prevents an unrelated env-convention change
+    // from flipping the wire shape.
+    expect(
+      isRawSourceTimeEmissionEnabled({ STREAMING_EMIT_RAW_SOURCE_TIME: "1" }),
+    ).toBe(false);
+    expect(
+      isRawSourceTimeEmissionEnabled({ STREAMING_EMIT_RAW_SOURCE_TIME: "yes" }),
+    ).toBe(false);
+    expect(
+      isRawSourceTimeEmissionEnabled({ STREAMING_EMIT_RAW_SOURCE_TIME: "on" }),
+    ).toBe(false);
+  });
+});
+
+describe("buildSourceTimeline", () => {
+  it("mirrors raw cycle timing fields verbatim (no projection)", () => {
+    const cycle = makeCycle({
+      phase: "COUNTDOWN",
+      betOpenTime: 100,
+      betCloseTime: 200,
+      fightStartTime: 300,
+      duelEndTime: 400,
+    });
+
+    const timeline = buildSourceTimeline(cycle, 5_000);
+
+    expect(timeline).toEqual({
+      phase: "COUNTDOWN",
+      betOpenTime: 100,
+      betCloseTime: 200,
+      fightStartTime: 300,
+      duelEndTime: 400,
+      updatedAt: 5_000,
+    });
+  });
+
+  it("preserves nulls for optional timing fields", () => {
+    const cycle = makeCycle({
+      phase: "IDLE",
+      betOpenTime: null,
+      betCloseTime: null,
+      fightStartTime: null,
+      duelEndTime: null,
+    });
+
+    const timeline = buildSourceTimeline(cycle, 42);
+
+    expect(timeline).toEqual({
+      phase: "IDLE",
+      betOpenTime: null,
+      betCloseTime: null,
+      fightStartTime: null,
+      duelEndTime: null,
+      updatedAt: 42,
+    });
+  });
+
+  it("does not apply any presentation-delay shift", () => {
+    // This is the load-bearing property: the selector in commit 3
+    // operates in source time and must not receive projected values from
+    // this rail. If anyone later "helpfully" adds a delay term here,
+    // this test should fail and so should commit 3's double-delay guard.
+    const cycle = makeCycle({ betCloseTime: 10_000 });
+
+    const timeline = buildSourceTimeline(cycle, 5_000);
+
+    expect(timeline.betCloseTime).toBe(10_000);
+  });
+});
+
+describe("attachRawSourceTime", () => {
+  it("is a no-op when disabled — wire shape unchanged", () => {
+    const state = makeState();
+    const result = attachRawSourceTime(state, 1_234, {
+      stampEmittedAt: true,
+      enabled: false,
+    });
+
+    // Identity check: literally the same object returned so downstream
+    // JSON.stringify produces byte-identical output vs. the pre-flag
+    // release. This is what lets commit 1 ship dark safely.
+    expect(result).toBe(state);
+    expect((result as Record<string, unknown>).emittedAt).toBeUndefined();
+    expect(result.cycle).not.toHaveProperty("sourceTimeline");
+  });
+
+  it("attaches cycle.sourceTimeline when enabled", () => {
+    const state = makeState();
+    const result = attachRawSourceTime(state, 7_777, {
+      stampEmittedAt: false,
+      enabled: true,
+    });
+
+    expect(result.cycle).toHaveProperty("sourceTimeline");
+    expect(result.cycle.sourceTimeline).toEqual({
+      phase: state.cycle.phase,
+      betOpenTime: state.cycle.betOpenTime,
+      betCloseTime: state.cycle.betCloseTime,
+      fightStartTime: state.cycle.fightStartTime,
+      duelEndTime: state.cycle.duelEndTime,
+      updatedAt: 7_777,
+    });
+    // stampEmittedAt=false means SSE envelope path — emittedAt is added
+    // elsewhere by the SSE framer, not by this helper.
+    expect((result as Record<string, unknown>).emittedAt).toBeUndefined();
+  });
+
+  it("stamps top-level emittedAt when stampEmittedAt=true (REST path)", () => {
+    const state = makeState();
+    const result = attachRawSourceTime(state, 9_000, {
+      stampEmittedAt: true,
+      enabled: true,
+    });
+
+    expect((result as { emittedAt?: number }).emittedAt).toBe(9_000);
+    expect(result.cycle.sourceTimeline?.updatedAt).toBe(9_000);
+  });
+
+  it("builds sourceTimeline from the explicit raw source cycle when provided", () => {
+    const redactedCycle = makeCycle({
+      duelEndTime: null,
+    });
+    const rawCycle = makeCycle({
+      duelEndTime: 44_000,
+    });
+    const state = makeState(redactedCycle);
+
+    const result = attachRawSourceTime(state, 9_000, {
+      stampEmittedAt: true,
+      enabled: true,
+      sourceCycle: rawCycle,
+    });
+
+    expect(result.cycle.duelEndTime).toBeNull();
+    expect(result.cycle.sourceTimeline).toEqual({
+      phase: rawCycle.phase,
+      betOpenTime: rawCycle.betOpenTime,
+      betCloseTime: rawCycle.betCloseTime,
+      fightStartTime: rawCycle.fightStartTime,
+      duelEndTime: 44_000,
+      updatedAt: 9_000,
+    });
+  });
+
+  it("preserves a pre-existing sourceTimeline instead of rebuilding it from the public cycle", () => {
+    const existingSourceTimeline = {
+      phase: "RESOLUTION" as const,
+      betOpenTime: 1_000,
+      betCloseTime: 2_000,
+      fightStartTime: 3_000,
+      duelEndTime: 4_000,
+      updatedAt: 5_000,
+    };
+    const state = makeState({
+      ...makeCycle({
+        phase: "RESOLUTION",
+      }),
+      sourceTimeline: existingSourceTimeline,
+    });
+
+    const result = attachRawSourceTime(state, 9_999, {
+      stampEmittedAt: true,
+      enabled: true,
+    });
+
+    expect(result.cycle.sourceTimeline).toEqual(existingSourceTimeline);
+  });
+
+  it("leaves all existing fields untouched (additive only)", () => {
+    const state = makeState(
+      makeCycle({
+        phase: "FIGHTING",
+        cycleId: "keep-me",
+        timeRemaining: 42,
+      }),
+    );
+    const result = attachRawSourceTime(state, 100, {
+      stampEmittedAt: true,
+      enabled: true,
+    });
+
+    expect(result.type).toBe("STREAMING_STATE_UPDATE");
+    expect(result.cycle.cycleId).toBe("keep-me");
+    expect(result.cycle.phase).toBe("FIGHTING");
+    expect(result.cycle.timeRemaining).toBe(42);
+    expect(result.cycle.betOpenTime).toBe(state.cycle.betOpenTime);
+    expect(result.cycle.betCloseTime).toBe(state.cycle.betCloseTime);
+    expect(result.leaderboard).toEqual([]);
+    expect(result.cameraTarget).toBeNull();
+  });
+
+  it("does not mutate the input state", () => {
+    const cycle = makeCycle();
+    const state = makeState(cycle);
+    const result = attachRawSourceTime(state, 1, {
+      stampEmittedAt: true,
+      enabled: true,
+    });
+
+    expect(state).not.toBe(result);
+    expect(state.cycle).not.toBe(result.cycle);
+    expect(state.cycle).not.toHaveProperty("sourceTimeline");
+    expect(cycle).not.toHaveProperty("sourceTimeline");
+  });
+
+  it("does not re-introduce oracle-proof fields on a redacted cycle", () => {
+    // The canonical rail calls `redactOracleProofFromCycle` upstream,
+    // which strips `duelKeyHex / duelEndTime / seed / replayHash` from
+    // public payloads. attachRawSourceTime must not resurrect any of
+    // those fields via its spread.
+    const cycle = makeCycle({ duelKeyHex: null, seed: null, replayHash: null });
+    const state = makeState(cycle);
+    const result = attachRawSourceTime(state, 1, {
+      stampEmittedAt: true,
+      enabled: true,
+    });
+
+    expect(result.cycle.duelKeyHex).toBeNull();
+    expect(result.cycle.seed).toBeNull();
+    expect(result.cycle.replayHash).toBeNull();
+    // `duelEndTime` is intentionally kept as-is on the cycle (the
+    // redactor nullifies it via `delete` on the bet-sync rail; on the
+    // canonical rail it's already null when the duel hasn't ended).
+    // What sourceTimeline exposes of it is the CYCLE's value, not
+    // anything new.
+    expect(result.cycle.sourceTimeline?.duelEndTime).toBe(cycle.duelEndTime);
+  });
+
+  it("projected-vs-source separation: same cycle yields same sourceTimeline regardless of emit time", () => {
+    // Key invariant for commit 3's selector: the source timestamps in
+    // sourceTimeline are the RAW underlying scheduler values. Two calls
+    // with different `sourceEmittedAt` should produce identical
+    // sourceTimeline timing fields (only `updatedAt` changes).
+    const cycle = makeCycle();
+    const state = makeState(cycle);
+    const a = attachRawSourceTime(state, 1_000, {
+      stampEmittedAt: true,
+      enabled: true,
+    });
+    const b = attachRawSourceTime(state, 5_000, {
+      stampEmittedAt: true,
+      enabled: true,
+    });
+
+    expect(a.cycle.sourceTimeline?.betOpenTime).toBe(
+      b.cycle.sourceTimeline?.betOpenTime,
+    );
+    expect(a.cycle.sourceTimeline?.betCloseTime).toBe(
+      b.cycle.sourceTimeline?.betCloseTime,
+    );
+    expect(a.cycle.sourceTimeline?.updatedAt).toBe(1_000);
+    expect(b.cycle.sourceTimeline?.updatedAt).toBe(5_000);
+  });
+});
diff --git a/packages/server/tests/unit/routes/streaming-status-payload.test.ts b/packages/server/tests/unit/routes/streaming-status-payload.test.ts
new file mode 100644
index 000000000..b3e52a35e
--- /dev/null
+++ b/packages/server/tests/unit/routes/streaming-status-payload.test.ts
@@ -0,0 +1,681 @@
+import { afterEach, describe, expect, it } from "vitest";
+import { buildStreamingStatusPayload } from "../../../src/routes/streaming.js";
+
+const ORIGINAL_ENV = {
+  STREAM_DELIVERY_MODE: process.env.STREAM_DELIVERY_MODE,
+  STREAM_DELIVERY_PROVIDER: process.env.STREAM_DELIVERY_PROVIDER,
+  STREAM_PLAYBACK_URL: process.env.STREAM_PLAYBACK_URL,
+  STREAM_PLAYBACK_HLS_URL: process.env.STREAM_PLAYBACK_HLS_URL,
+  STREAM_PLAYBACK_LLHLS_URL: process.env.STREAM_PLAYBACK_LLHLS_URL,
+  STREAM_INGEST_PROFILE: process.env.STREAM_INGEST_PROFILE,
+  STREAM_INGEST_TRANSPORT: process.env.STREAM_INGEST_TRANSPORT,
+  STREAM_AUDIO_SAMPLE_RATE: process.env.STREAM_AUDIO_SAMPLE_RATE,
+  STREAM_GOP_SIZE: process.env.STREAM_GOP_SIZE,
+  STREAM_CLOUDFLARE_PROBE_ONLY: process.env.STREAM_CLOUDFLARE_PROBE_ONLY,
+  STREAM_FPS: process.env.STREAM_FPS,
+};
+
+function restoreEnv(
+  key: keyof typeof ORIGINAL_ENV,
+  value: string | undefined,
+): void {
+  if (value === undefined) {
+    delete process.env[key];
+    return;
+  }
+  process.env[key] = value;
+}
+
+afterEach(() => {
+  for (const [key, value] of Object.entries(ORIGINAL_ENV)) {
+    restoreEnv(key as keyof typeof ORIGINAL_ENV, value);
+  }
+});
+
+describe("buildStreamingStatusPayload", () => {
+  it("mirrors authoritative external metrics and ingest state at nested fields", () => {
+    const payload = buildStreamingStatusPayload({
+      base: { running: true },
+      externalSnapshot: {
+        destinations: [],
+        stats: {},
+        updatedAt: 1_000,
+        metrics: {
+          captureFps: 30,
+          encodeFps: 29,
+          droppedFrames: 2,
+          latestFrameAt: 900,
+          latestRenderTickAt: 901,
+          latestVisualChangeAt: 902,
+          visualChangeAgeMs: 120,
+        },
+        hlsManifest: {
+          updatedAt: 950,
+          mediaSequence: 77,
+        },
+        delivery: {
+          mode: "external_hls",
+          provider: "cloudflare_stream",
+          playbackUrl: "https://customer.example/live.m3u8",
+          hlsUrl: "https://customer.example/live.m3u8",
+          llhlsUrl: "https://customer.example/live.m3u8?protocol=llhls",
+          ingestUrl: "rtmps://live.cloudflare.example/input",
+        },
+        ingest: {
+          profile: "cloudflare_live",
+          transport: "rtmps",
+          audioSampleRate: 48_000,
+          gopFrames: 60,
+          probeOnly: true,
+        },
+        smoke: {
+          currentSceneUrl: "https://staging.example/stream",
+          activeBundle:
+            "https://staging.example/assets/StreamingMode-abc123.js",
+          deliveryMode: "external_hls",
+          captureFpsP50: 29.5,
+          captureFpsP95: 30,
+          encodeFpsP50: 28.5,
+          encodeFpsP95: 29,
+          updatedAt: 998,
+          ingest: {
+            profile: "cloudflare_live",
+            transport: "rtmps",
+            audioSampleRate: 48_000,
+            gopFrames: 60,
+            probeOnly: true,
+          },
+        },
+        sourceRuntime: {
+          ready: true,
+          statusSource: "external_worker",
+          captureMode: "cdp",
+          degradedReason: null,
+          currentSceneUrl: "https://staging.example/stream",
+          activeBundle:
+            "https://staging.example/assets/StreamingMode-abc123.js",
+          lastFrameAt: 997,
+          lastRenderTickAt: 996,
+          lastVisualChangeAt: 995,
+          lastRecoveryAt: 900,
+          recoveryCount: 2,
+          workerHeartbeatAt: 1_000,
+        },
+      },
+      bridgeStats: {
+        encoderFps: 12,
+        droppedFrames: 99,
+      },
+      rendererHealth: {
+        ready: true,
+        degradedReason: null,
+        updatedAt: 999,
+      },
+    });
+
+    expect(payload.metrics).toMatchObject({
+      captureFps: 30,
+      encodeFps: 29,
+      droppedFrames: 2,
+      latestFrameAt: 900,
+      latestRenderTickAt: 901,
+      latestVisualChangeAt: 902,
+      visualChangeAgeMs: 120,
+    });
+    expect(payload.captureFps).toBe(30);
+    expect(payload.encodeFps).toBe(29);
+    expect(payload.droppedFrames).toBe(2);
+    expect(payload.hlsManifest).toEqual({
+      updatedAt: 950,
+      mediaSequence: 77,
+    });
+    expect(payload.deliveryMode).toBe("external_hls");
+    expect(payload.deliveryProvider).toBe("cloudflare_stream");
+    expect(payload.playbackUrl).toBe("https://customer.example/live.m3u8");
+    expect(payload.delivery).toMatchObject({
+      mode: "external_hls",
+      provider: "cloudflare_stream",
+      playbackUrl: "https://customer.example/live.m3u8",
+      hlsUrl: "https://customer.example/live.m3u8",
+      llhlsUrl: "https://customer.example/live.m3u8?protocol=llhls",
+      ingestUrl: null,
+    });
+    expect(payload.destinations).toEqual([]);
+    expect(payload.ingest).toEqual({
+      profile: "cloudflare_live",
+      transport: "rtmps",
+      audioSampleRate: 48_000,
+      gopFrames: 60,
+      probeOnly: true,
+    });
+    expect(payload.sourceRuntime).toEqual({
+      ready: true,
+      statusSource: "external_worker",
+      captureMode: "cdp",
+      degradedReason: null,
+      currentSceneUrl: "https://staging.example/stream",
+      activeBundle: "https://staging.example/assets/StreamingMode-abc123.js",
+      lastFrameAt: 997,
+      lastRenderTickAt: 996,
+      lastVisualChangeAt: 995,
+      lastRecoveryAt: 900,
+      recoveryCount: 2,
+      workerHeartbeatAt: 1_000,
+    });
+    expect(payload.smoke).toEqual({
+      currentSceneUrl: "https://staging.example/stream",
+      activeBundle: "https://staging.example/assets/StreamingMode-abc123.js",
+      deliveryMode: "external_hls",
+      captureFpsP50: 29.5,
+      captureFpsP95: 30,
+      encodeFpsP50: 28.5,
+      encodeFpsP95: 29,
+      updatedAt: 998,
+      ingest: {
+        profile: "cloudflare_live",
+        transport: "rtmps",
+        audioSampleRate: 48_000,
+        gopFrames: 60,
+        probeOnly: true,
+      },
+    });
+  });
+
+  it("falls back to configured delivery and ingest info when the external snapshot is unavailable", () => {
+    process.env.STREAM_DELIVERY_MODE = "external_hls";
+    process.env.STREAM_DELIVERY_PROVIDER = "cloudflare_stream";
+    process.env.STREAM_PLAYBACK_URL = "https://env.example/live.m3u8";
+    process.env.STREAM_PLAYBACK_HLS_URL = "https://env.example/live.m3u8";
+    process.env.STREAM_PLAYBACK_LLHLS_URL =
+      "https://env.example/live.m3u8?protocol=llhls";
+    process.env.STREAM_INGEST_PROFILE = "cloudflare_live";
+    process.env.STREAM_INGEST_TRANSPORT = "rtmps";
+    process.env.STREAM_AUDIO_SAMPLE_RATE = "48000";
+    process.env.STREAM_GOP_SIZE = "60";
+    process.env.STREAM_CLOUDFLARE_PROBE_ONLY = "true";
+    process.env.STREAM_FPS = "30";
+
+    const payload = buildStreamingStatusPayload({
+      base: { running: true },
+      externalSnapshot: null,
+      bridgeStats: null,
+      rendererHealth: {
+        ready: false,
+        degradedReason: "renderer_health_stale",
+        updatedAt: 123,
+      },
+    });
+
+    expect(payload.delivery).toMatchObject({
+      mode: "external_hls",
+      provider: "cloudflare_stream",
+      playbackUrl: "https://env.example/live.m3u8?protocol=llhls",
+      hlsUrl: "https://env.example/live.m3u8",
+      llhlsUrl: "https://env.example/live.m3u8?protocol=llhls",
+      ingestUrl: null,
+    });
+    expect(payload.ingest).toEqual({
+      profile: "cloudflare_live",
+      transport: "rtmps",
+      audioSampleRate: 48_000,
+      gopFrames: 60,
+      probeOnly: true,
+    });
+    expect(payload.smoke).toMatchObject({
+      currentSceneUrl: null,
+      activeBundle: null,
+      deliveryMode: "external_hls",
+      captureFpsP50: null,
+      captureFpsP95: null,
+      encodeFpsP50: null,
+      encodeFpsP95: null,
+      ingest: {
+        profile: "cloudflare_live",
+        transport: "rtmps",
+        audioSampleRate: 48_000,
+        gopFrames: 60,
+        probeOnly: true,
+      },
+    });
+    expect(payload.sourceRuntime).toMatchObject({
+      ready: false,
+      statusSource: "in_process_bridge",
+      captureMode: "none",
+      degradedReason: "encoder_stalled",
+    });
+  });
+
+  it("falls back to the local HLS manifest when the external snapshot is unavailable", () => {
+    const payload = buildStreamingStatusPayload({
+      base: { running: false },
+      externalSnapshot: null,
+      localHlsManifest: {
+        updatedAt: 4_321,
+        mediaSequence: 88,
+      },
+      bridgeStats: null,
+      rendererHealth: {
+        ready: false,
+        degradedReason: "capture_client_disconnected",
+        updatedAt: 123,
+      },
+    });
+
+    expect(payload.hlsManifest).toEqual({
+      updatedAt: 4_321,
+      mediaSequence: 88,
+    });
+    expect(payload.hlsManifestUpdatedAt).toBe(4_321);
+    expect(payload.hlsMediaSequence).toBe(88);
+  });
+
+  it("prefers external runtime booleans over local base capture flags", () => {
+    const payload = buildStreamingStatusPayload({
+      base: {
+        running: false,
+        bridgeActive: false,
+        ffmpegRunning: false,
+        clientConnected: false,
+      },
+      externalSnapshot: {
+        active: true,
+        ffmpegRunning: true,
+        clientConnected: true,
+        destinations: [],
+        stats: {},
+        updatedAt: 2_000,
+      },
+      bridgeStats: null,
+      rendererHealth: {
+        ready: true,
+        degradedReason: null,
+        updatedAt: 1_999,
+      },
+    });
+
+    expect(payload.running).toBe(true);
+    expect(payload.bridgeActive).toBe(true);
+    expect(payload.ffmpegRunning).toBe(true);
+    expect(payload.clientConnected).toBe(true);
+  });
+
+  it("treats a fresh canonical playback probe as authoritative over stale worker flags", () => {
+    const payload = buildStreamingStatusPayload({
+      base: { running: true, bridgeActive: true },
+      externalSnapshot: {
+        active: true,
+        ffmpegRunning: true,
+        clientConnected: true,
+        destinations: [
+          {
+            id: "canonical-cloudflare",
+            role: "canonical",
+            provider: "cloudflare_stream",
+            name: "External Delivery",
+            transport: "srt",
+            playbackUrl: "https://customer.example/live.m3u8",
+            connected: false,
+            error: "All tee outputs failed",
+            startedAt: 3_000,
+          },
+        ],
+        stats: {
+          healthy: true,
+        },
+        updatedAt: 4_000,
+        delivery: {
+          mode: "external_hls",
+          provider: "cloudflare_stream",
+          playbackUrl: "https://customer.example/live.m3u8",
+          hlsUrl: "https://customer.example/live.m3u8",
+          llhlsUrl: "https://customer.example/live.m3u8?protocol=llhls",
+          ingestUrl: "srt://live.cloudflare.example/input",
+        },
+        captureDiagnostics: {
+          lastFatalWriteError: {
+            at: 3_100,
+            message: "All tee outputs failed",
+            frameCount: 12,
+            droppedFrames: 1,
+            bytesReceived: 2_048,
+            backpressured: false,
+            cdpDirectMode: true,
+            uptimeMs: 500,
+          },
+        },
+        sourceRuntime: {
+          ready: true,
+          statusSource: "external_worker",
+          captureMode: "cdp",
+          degradedReason: null,
+          currentSceneUrl: "https://staging.example/stream",
+          activeBundle:
+            "https://staging.example/assets/StreamingMode-abc123.js",
+          lastFrameAt: 4_050,
+          lastRenderTickAt: 4_040,
+          lastVisualChangeAt: 4_030,
+          lastRecoveryAt: 3_500,
+          recoveryCount: 1,
+          workerHeartbeatAt: 4_100,
+        },
+      },
+      canonicalProbeSnapshot: {
+        playbackUrl: "https://customer.example/live.m3u8",
+        ready: true,
+        manifestStatus: "ok",
+        statusCode: 200,
+        lastError: null,
+        updatedAt: 4_200,
+      },
+      bridgeStats: null,
+      rendererHealth: {
+        ready: true,
+        degradedReason: null,
+        updatedAt: 4_199,
+      },
+    });
+
+    expect(payload.canonicalStatus).toEqual({
+      sourceReady: true,
+      canonicalTransportConnected: true,
+      canonicalPlaybackReady: true,
+      manifestStatus: "ok",
+      lastError: null,
+      updatedAt: 4_200,
+    });
+    expect(payload.destinations).toHaveLength(1);
+    expect(payload.destinations[0]).toMatchObject({
+      id: "canonical-cloudflare",
+      ingestUrl: null,
+      connected: true,
+      transportHealthy: true,
+      playbackReady: true,
+      manifestStatus: "ok",
+      lastError: null,
+    });
+    expect(payload.captureDiagnostics).toBeNull();
+  });
+
+  it("keeps canonical playback visible but marks transport unhealthy after a fresher source incident", () => {
+    const payload = buildStreamingStatusPayload({
+      base: { running: false, bridgeActive: false },
+      externalSnapshot: {
+        active: false,
+        ffmpegRunning: false,
+        clientConnected: true,
+        destinations: [
+          {
+            id: "canonical-cloudflare",
+            role: "canonical",
+            provider: "cloudflare_stream",
+            name: "External Delivery",
+            transport: "srt",
+            playbackUrl: "https://customer.example/live.m3u8",
+            connected: false,
+            error: "encoder_stalled",
+            startedAt: 3_000,
+          },
+        ],
+        stats: {
+          healthy: false,
+        },
+        updatedAt: 5_100,
+        delivery: {
+          mode: "external_hls",
+          provider: "cloudflare_stream",
+          playbackUrl: "https://customer.example/live.m3u8",
+          hlsUrl: "https://customer.example/live.m3u8",
+          llhlsUrl: "https://customer.example/live.m3u8?protocol=llhls",
+          ingestUrl: "srt://live.cloudflare.example/input",
+        },
+        captureDiagnostics: {
+          lastFatalWriteError: {
+            at: 5_050,
+            message: "av_interleaved_write_frame(): Input/output error",
+            frameCount: 42,
+            droppedFrames: 3,
+            bytesReceived: 8_192,
+            backpressured: true,
+            cdpDirectMode: true,
+            uptimeMs: 4_000,
+          },
+        },
+        sourceRuntime: {
+          ready: false,
+          statusSource: "external_worker",
+          captureMode: "cdp",
+          degradedReason: "encoder_stalled",
+          currentSceneUrl: "https://staging.example/stream",
+          activeBundle:
+            "https://staging.example/assets/StreamingMode-abc123.js",
+          lastFrameAt: 5_000,
+          lastRenderTickAt: 4_990,
+          lastVisualChangeAt: 4_980,
+          lastRecoveryAt: 4_500,
+          recoveryCount: 2,
+          workerHeartbeatAt: 5_100,
+        },
+      },
+      canonicalProbeSnapshot: {
+        playbackUrl: "https://customer.example/live.m3u8",
+        ready: true,
+        manifestStatus: "ok",
+        statusCode: 200,
+        lastError: null,
+        updatedAt: 4_900,
+      },
+      bridgeStats: null,
+      rendererHealth: {
+        ready: false,
+        degradedReason: "encoder_stalled",
+        updatedAt: 5_100,
+      },
+    });
+
+    expect(payload.canonicalStatus).toEqual({
+      sourceReady: false,
+      canonicalTransportConnected: false,
+      canonicalPlaybackReady: true,
+      manifestStatus: "ok",
+      lastError: "encoder_stalled",
+      updatedAt: 4_900,
+    });
+    expect(payload.destinations[0]).toMatchObject({
+      ingestUrl: null,
+      connected: true,
+      transportHealthy: false,
+      playbackReady: true,
+      manifestStatus: "ok",
+      lastError: "encoder_stalled",
+    });
+  });
+
+  it("synthesizes canonical self-hls status from a fresh local manifest", () => {
+    process.env.STREAM_DELIVERY_MODE = "self_hls";
+    process.env.STREAM_PLAYBACK_URL = "https://stream.example/live/stream.m3u8";
+
+    const payload = buildStreamingStatusPayload({
+      base: { running: true, bridgeActive: true },
+      externalSnapshot: {
+        active: true,
+        ffmpegRunning: true,
+        clientConnected: true,
+        destinations: [],
+        stats: {
+          healthy: true,
+        },
+        updatedAt: 10_000,
+        delivery: {
+          mode: "self_hls",
+          provider: null,
+          playbackUrl: "https://stream.example/live/stream.m3u8",
+          hlsUrl: null,
+          llhlsUrl: null,
+          ingestUrl: null,
+        },
+        sourceRuntime: {
+          ready: true,
+          statusSource: "external_worker",
+          captureMode: "cdp",
+          degradedReason: null,
+          currentSceneUrl: "https://staging.example/stream",
+          activeBundle: null,
+          lastFrameAt: 9_980,
+          lastRenderTickAt: 9_970,
+          lastVisualChangeAt: 9_960,
+          lastRecoveryAt: null,
+          recoveryCount: 0,
+          workerHeartbeatAt: 10_000,
+        },
+      },
+      localHlsManifest: {
+        updatedAt: Date.now(),
+        mediaSequence: 321,
+      },
+      bridgeStats: null,
+      rendererHealth: {
+        ready: true,
+        degradedReason: null,
+        updatedAt: 10_000,
+      },
+    });
+
+    expect(payload.canonicalStatus).toMatchObject({
+      sourceReady: true,
+      canonicalTransportConnected: true,
+      canonicalPlaybackReady: true,
+      manifestStatus: "ok",
+      lastError: null,
+    });
+    expect(payload.destinations).toContainEqual(
+      expect.objectContaining({
+        id: "canonical-self-hls",
+        provider: "self_hls",
+        role: "canonical",
+        transport: "hls",
+        playbackUrl: "https://stream.example/live/stream.m3u8",
+        connected: true,
+        transportHealthy: true,
+        playbackReady: true,
+        manifestStatus: "ok",
+        lastError: null,
+      }),
+    );
+  });
+
+  it("includes persisted authority and Cloudflare diagnostics when available", () => {
+    const payload = buildStreamingStatusPayload({
+      base: { running: true },
+      externalSnapshot: null,
+      canonicalProbeSnapshot: {
+        ready: false,
+        manifestStatus: "missing",
+        lastError: "playback_unconfigured",
+        updatedAt: 4_200,
+      },
+      bridgeStats: null,
+      rendererHealth: {
+        ready: false,
+        degradedReason: "encoder_stalled",
+        updatedAt: 123,
+      },
+      persistedAuthorityState: {
+        canonicalProviderState: {
+          activeProvider: "self_hls",
+          primaryHealthySince: 3_000,
+          updatedAt: 3_500,
+        },
+        cloudflareLifecycle: {
+          eventType: "stream_live_input.disconnected",
+          eventName: "Stream Live Input Disconnected",
+          liveInputId: "live-input-123",
+          videoId: "video-456",
+          status: "disconnected",
+          errorCode: "publish_disconnected",
+          errorMessage: "Publisher disconnected unexpectedly",
+          occurredAt: 4_000,
+          receivedAt: 4_100,
+        },
+        cloudflareLastWebhook: {
+          eventType: "stream_live_input.disconnected",
+          eventName: "Stream Live Input Disconnected",
+          liveInputId: "live-input-123",
+          videoId: "video-456",
+          occurredAt: 4_000,
+          receivedAt: 4_100,
+        },
+      },
+      cloudflareLiveInputId: "live-input-123",
+    });
+
+    expect(payload.authority).toEqual({
+      activeCanonicalProvider: "self_hls",
+      primaryHealthySince: 3_000,
+      updatedAt: 3_500,
+    });
+    expect(payload.cloudflare).toEqual({
+      liveInputId: "live-input-123",
+      lifecycle: {
+        eventType: "stream_live_input.disconnected",
+        eventName: "Stream Live Input Disconnected",
+        liveInputId: "live-input-123",
+        videoId: "video-456",
+        status: "disconnected",
+        errorCode: "publish_disconnected",
+        errorMessage: "Publisher disconnected unexpectedly",
+        occurredAt: 4_000,
+        receivedAt: 4_100,
+      },
+      lastWebhook: {
+        eventType: "stream_live_input.disconnected",
+        eventName: "Stream Live Input Disconnected",
+        liveInputId: "live-input-123",
+        videoId: "video-456",
+        occurredAt: 4_000,
+        receivedAt: 4_100,
+      },
+      lastPlaybackProbe: null,
+      lastExternalTransportError: null,
+    });
+  });
+
+  it("uses the configured Cloudflare live input id even without persisted lifecycle state", () => {
+    const payload = buildStreamingStatusPayload({
+      base: { running: true },
+      externalSnapshot: {
+        destinations: [],
+        stats: {},
+        updatedAt: 1_000,
+        captureMode: "x11_nvenc",
+        sourceRuntime: {
+          ready: true,
+          statusSource: "external_worker",
+          captureMode: "none",
+          degradedReason: null,
+          currentSceneUrl: "https://staging.example/stream",
+          activeBundle: null,
+          lastFrameAt: 999,
+          lastRenderTickAt: 998,
+          lastVisualChangeAt: 997,
+          lastRecoveryAt: null,
+          recoveryCount: 0,
+          workerHeartbeatAt: 1_000,
+        },
+      },
+      bridgeStats: null,
+      rendererHealth: {
+        ready: true,
+        degradedReason: null,
+        updatedAt: 1_000,
+      },
+      cloudflareLiveInputId: "875a27392a87d2149a1c7e012ef6212c",
+    });
+
+    expect(payload.sourceRuntime.captureMode).toBe("x11_nvenc");
+    expect(payload.cloudflare).toMatchObject({
+      liveInputId: "875a27392a87d2149a1c7e012ef6212c",
+      lifecycle: null,
+      lastWebhook: null,
+    });
+  });
+});
diff --git a/packages/server/tests/unit/startup/http-server.test.ts b/packages/server/tests/unit/startup/http-server.test.ts
new file mode 100644
index 000000000..58085c46a
--- /dev/null
+++ b/packages/server/tests/unit/startup/http-server.test.ts
@@ -0,0 +1,65 @@
+import { describe, expect, it } from "vitest";
+import {
+  buildPagesPreviewOriginPatterns,
+  createOriginValidator,
+} from "../../../src/startup/http-server.js";
+
+describe("buildPagesPreviewOriginPatterns", () => {
+  it("matches preview origins for the configured Pages project", () => {
+    const patterns = buildPagesPreviewOriginPatterns(
+      "https://hyperscape-enoomian-staging.pages.dev",
+    );
+
+    expect(patterns).toHaveLength(1);
+    expect(
+      patterns[0]?.test(
+        "https://enoomian-staging.hyperscape-enoomian-staging.pages.dev",
+      ),
+    ).toBe(true);
+    expect(
+      patterns[0]?.test(
+        "https://preview-123.hyperscape-enoomian-staging.pages.dev",
+      ),
+    ).toBe(true);
+    expect(
+      patterns[0]?.test("https://foo.hyperscape.pages.dev"),
+    ).toBe(false);
+  });
+
+  it("normalizes an existing preview origin back to its Pages project host", () => {
+    const patterns = buildPagesPreviewOriginPatterns(
+      "https://enoomian-staging.hyperscape-enoomian-staging.pages.dev",
+    );
+
+    expect(patterns).toHaveLength(1);
+    expect(
+      patterns[0]?.test(
+        "https://branch.hyperscape-enoomian-staging.pages.dev",
+      ),
+    ).toBe(true);
+  });
+
+  it("ignores non-Pages origins", () => {
+    expect(
+      buildPagesPreviewOriginPatterns("https://46.4.80.150.sslip.io"),
+    ).toEqual([]);
+  });
+});
+
+describe("createOriginValidator", () => {
+  it("accepts preview origins derived from the configured Pages project", () => {
+    const validator = createOriginValidator([
+      "https://hyperscape-enoomian-staging.pages.dev",
+      ...buildPagesPreviewOriginPatterns(
+        "https://hyperscape-enoomian-staging.pages.dev",
+      ),
+    ]);
+
+    expect(
+      validator(
+        "https://enoomian-staging.hyperscape-enoomian-staging.pages.dev",
+      ),
+    ).toBe(true);
+    expect(validator("https://foo.hyperscape.pages.dev")).toBe(false);
+  });
+});
diff --git a/packages/server/tests/unit/streaming/cloudflare-authority.test.ts b/packages/server/tests/unit/streaming/cloudflare-authority.test.ts
new file mode 100644
index 000000000..cafdb74d1
--- /dev/null
+++ b/packages/server/tests/unit/streaming/cloudflare-authority.test.ts
@@ -0,0 +1,216 @@
+import { describe, expect, it } from "vitest";
+import {
+  reconcileCloudflareAuthority,
+  summarizeCloudflareLiveWebhook,
+  verifyCloudflareWebhookSecret,
+} from "../../../src/streaming/cloudflare-authority.js";
+
+describe("cloudflare-authority", () => {
+  it("verifies the Cloudflare notification secret header", () => {
+    expect(
+      verifyCloudflareWebhookSecret(
+        {
+          "cf-webhook-auth": "super-secret",
+        },
+        "super-secret",
+      ),
+    ).toBe(true);
+    expect(
+      verifyCloudflareWebhookSecret(
+        {
+          "cf-webhook-auth": "wrong-secret",
+        },
+        "super-secret",
+      ),
+    ).toBe(false);
+  });
+
+  it("summarizes live webhook payloads into webhook and lifecycle snapshots", () => {
+    const summary = summarizeCloudflareLiveWebhook({
+      payload: {
+        alert_type: "stream_live_input.disconnected",
+        name: "Stream Live Input Disconnected",
+        event: {
+          input_id: "live-input-123",
+          video_id: "video-456",
+          timestamp: "2026-04-09T02:00:00.000Z",
+          error_code: "publish_disconnected",
+          error_message: "Publisher disconnected unexpectedly",
+        },
+      },
+      receivedAt: 1_234_567,
+    });
+
+    expect(summary.webhook).toEqual({
+      eventType: "stream_live_input.disconnected",
+      eventName: "Stream Live Input Disconnected",
+      liveInputId: "live-input-123",
+      videoId: "video-456",
+      occurredAt: Date.parse("2026-04-09T02:00:00.000Z"),
+      receivedAt: 1_234_567,
+    });
+    expect(summary.lifecycle).toEqual({
+      eventType: "stream_live_input.disconnected",
+      eventName: "Stream Live Input Disconnected",
+      liveInputId: "live-input-123",
+      videoId: "video-456",
+      status: "disconnected",
+      errorCode: "publish_disconnected",
+      errorMessage: "Publisher disconnected unexpectedly",
+      occurredAt: Date.parse("2026-04-09T02:00:00.000Z"),
+      receivedAt: 1_234_567,
+    });
+  });
+
+  it("prefers the freshest provider evidence when reconciling readiness", () => {
+    const reconciliation = reconcileCloudflareAuthority({
+      sourceRuntimeReady: true,
+      lifecycle: {
+        eventType: "stream_live_input.disconnected",
+        eventName: "Disconnected",
+        liveInputId: "live-input-123",
+        videoId: "video-stale",
+        status: "disconnected",
+        errorCode: null,
+        errorMessage: null,
+        occurredAt: 100,
+        receivedAt: 100,
+      },
+      lifecyclePoll: {
+        liveInputId: "live-input-456",
+        videoUid: "video-fresh",
+        status: "connected",
+        providerLive: true,
+        statusSummary: "connected",
+        playbackUrl: "https://video.example/live.m3u8?protocol=llhls",
+        occurredAt: 950,
+        receivedAt: 950,
+      },
+      playbackProbe: {
+        playbackUrl: "https://video.example/live.m3u8?protocol=llhls",
+        ready: true,
+        manifestStatus: "ok",
+        statusCode: 200,
+        lastError: null,
+        updatedAt: 960,
+      },
+      previous: null,
+      nowMs: 1_000,
+      freshnessMs: 200,
+      playbackUrl: "https://video.example/live.m3u8?protocol=llhls",
+    });
+
+    expect(reconciliation).toMatchObject({
+      revision: 1,
+      decision: "ready",
+      reason: null,
+      liveInputId: "live-input-456",
+      videoUid: "video-fresh",
+      lifecycleStatus: "connected",
+      providerLive: true,
+      playbackProbeReady: true,
+      playbackProbeStatusCode: 200,
+      playbackManifestStatus: "ok",
+    });
+  });
+
+  it("blocks as authority_stale when provider or probe evidence is stale", () => {
+    const reconciliation = reconcileCloudflareAuthority({
+      sourceRuntimeReady: true,
+      lifecycle: {
+        eventType: "stream_live_input.connected",
+        eventName: "Connected",
+        liveInputId: "live-input-123",
+        videoId: "video-456",
+        status: "connected",
+        errorCode: null,
+        errorMessage: null,
+        occurredAt: 100,
+        receivedAt: 100,
+      },
+      lifecyclePoll: null,
+      playbackProbe: {
+        playbackUrl: "https://video.example/live.m3u8?protocol=llhls",
+        ready: true,
+        manifestStatus: "ok",
+        statusCode: 200,
+        lastError: null,
+        updatedAt: 100,
+      },
+      previous: null,
+      nowMs: 1_000,
+      freshnessMs: 200,
+      playbackUrl: "https://video.example/live.m3u8?protocol=llhls",
+    });
+
+    expect(reconciliation).toMatchObject({
+      revision: 1,
+      decision: "blocked",
+      reason: "authority_stale",
+      providerLive: false,
+      playbackProbeReady: false,
+      playbackManifestStatus: "unknown",
+    });
+  });
+
+  it("preserves reconciliation revision when the decision is semantically unchanged", () => {
+    const previous = reconcileCloudflareAuthority({
+      sourceRuntimeReady: true,
+      lifecycle: null,
+      lifecyclePoll: {
+        liveInputId: "live-input-123",
+        videoUid: "video-456",
+        status: "connected",
+        providerLive: true,
+        statusSummary: "connected",
+        playbackUrl: "https://video.example/live.m3u8?protocol=llhls",
+        occurredAt: 950,
+        receivedAt: 950,
+      },
+      playbackProbe: {
+        playbackUrl: "https://video.example/live.m3u8?protocol=llhls",
+        ready: true,
+        manifestStatus: "ok",
+        statusCode: 200,
+        lastError: null,
+        updatedAt: 960,
+      },
+      previous: null,
+      nowMs: 1_000,
+      freshnessMs: 200,
+      playbackUrl: "https://video.example/live.m3u8?protocol=llhls",
+    });
+
+    const next = reconcileCloudflareAuthority({
+      sourceRuntimeReady: true,
+      lifecycle: null,
+      lifecyclePoll: {
+        liveInputId: "live-input-123",
+        videoUid: "video-456",
+        status: "connected",
+        providerLive: true,
+        statusSummary: "still connected",
+        playbackUrl: "https://video.example/live.m3u8?protocol=llhls",
+        occurredAt: 1_050,
+        receivedAt: 1_050,
+      },
+      playbackProbe: {
+        playbackUrl: "https://video.example/live.m3u8?protocol=llhls",
+        ready: true,
+        manifestStatus: "ok",
+        statusCode: 200,
+        lastError: null,
+        updatedAt: 1_060,
+      },
+      previous,
+      nowMs: 1_100,
+      freshnessMs: 200,
+      playbackUrl: "https://video.example/live.m3u8?protocol=llhls",
+    });
+
+    expect(previous.revision).toBe(1);
+    expect(next.revision).toBe(1);
+    expect(next.decision).toBe("ready");
+    expect(next.reason).toBeNull();
+  });
+});
diff --git a/packages/server/tests/unit/streaming/delivery-config.test.ts b/packages/server/tests/unit/streaming/delivery-config.test.ts
new file mode 100644
index 000000000..8bcb44d8c
--- /dev/null
+++ b/packages/server/tests/unit/streaming/delivery-config.test.ts
@@ -0,0 +1,104 @@
+import { describe, expect, it } from "vitest";
+import {
+  resolveExternalStreamDeliveryInfo,
+  resolveStreamDeliveryInfo,
+} from "../../../src/streaming/delivery-config.js";
+
+describe("resolveStreamDeliveryInfo", () => {
+  it("does not infer external playback from ingest alone", () => {
+    const delivery = resolveStreamDeliveryInfo({
+      STREAM_DELIVERY_MODE: "external_hls",
+      STREAM_DELIVERY_PROVIDER: "cloudflare_stream",
+      STREAM_INGEST_RTMPS_URL: "rtmps://live.cloudflare.com:443/live",
+    });
+
+    expect(delivery).toEqual({
+      mode: "external_hls",
+      provider: "cloudflare_stream",
+      playbackUrl: null,
+      hlsUrl: null,
+      llhlsUrl: null,
+      ingestUrl: "rtmps://live.cloudflare.com:443/live",
+    });
+  });
+
+  it("prefers Cloudflare LL-HLS playback when external playback URLs are configured", () => {
+    const delivery = resolveStreamDeliveryInfo({
+      STREAM_DELIVERY_MODE: "external_hls",
+      STREAM_DELIVERY_PROVIDER: "cloudflare_stream",
+      STREAM_INGEST_RTMPS_URL: "rtmps://live.cloudflare.com:443/live",
+      STREAM_PLAYBACK_HLS_URL: "https://video.example/live.m3u8",
+      STREAM_PLAYBACK_LLHLS_URL:
+        "https://video.example/live.m3u8?protocol=llhls",
+    });
+
+    expect(delivery).toEqual({
+      mode: "external_hls",
+      provider: "cloudflare_stream",
+      playbackUrl: "https://video.example/live.m3u8?protocol=llhls",
+      hlsUrl: "https://video.example/live.m3u8",
+      llhlsUrl: "https://video.example/live.m3u8?protocol=llhls",
+      ingestUrl: "rtmps://live.cloudflare.com:443/live",
+    });
+  });
+
+  it("keeps self-HLS playback separate from external playback URLs", () => {
+    const delivery = resolveStreamDeliveryInfo({
+      STREAM_DELIVERY_MODE: "self_hls",
+      STREAM_PLAYBACK_URL: "https://self.example/live/stream.m3u8",
+      STREAM_PLAYBACK_HLS_URL: "https://video.example/live.m3u8",
+      STREAM_PLAYBACK_LLHLS_URL:
+        "https://video.example/live.m3u8?protocol=llhls",
+      STREAM_INGEST_RTMPS_URL: "rtmps://live.cloudflare.com:443/live",
+    });
+
+    expect(delivery).toEqual({
+      mode: "self_hls",
+      provider: null,
+      playbackUrl: "https://self.example/live/stream.m3u8",
+      hlsUrl: null,
+      llhlsUrl: null,
+      ingestUrl: null,
+    });
+  });
+
+  it("does not treat self-HLS playback values as external delivery", () => {
+    const delivery = resolveExternalStreamDeliveryInfo({
+      STREAM_DELIVERY_MODE: "self_hls",
+      STREAM_PLAYBACK_URL: "https://self.example/live/stream.m3u8",
+      STREAM_PLAYBACK_HLS_URL: "https://video.example/live.m3u8",
+      STREAM_PLAYBACK_LLHLS_URL:
+        "https://video.example/live.m3u8?protocol=llhls",
+      STREAM_INGEST_RTMPS_URL: "rtmps://live.cloudflare.com:443/live",
+      STREAM_DELIVERY_PROVIDER: "cloudflare_stream",
+    });
+
+    expect(delivery).toEqual({
+      provider: null,
+      playbackUrl: null,
+      hlsUrl: null,
+      llhlsUrl: null,
+      ingestUrl: null,
+    });
+  });
+
+  it("preserves explicit external playback config when self-hls is canonical", () => {
+    const delivery = resolveExternalStreamDeliveryInfo({
+      STREAM_DELIVERY_MODE: "self_hls",
+      STREAM_PLAYBACK_URL: "https://self.example/live/stream.m3u8",
+      STREAM_EXTERNAL_PLAYBACK_HLS_URL: "https://video.example/live.m3u8",
+      STREAM_EXTERNAL_PLAYBACK_LLHLS_URL:
+        "https://video.example/live.m3u8?protocol=llhls",
+      STREAM_EXTERNAL_INGEST_RTMPS_URL: "rtmps://live.cloudflare.com:443/live",
+      STREAM_EXTERNAL_DELIVERY_PROVIDER: "cloudflare_stream",
+    });
+
+    expect(delivery).toEqual({
+      provider: "cloudflare_stream",
+      playbackUrl: "https://video.example/live.m3u8?protocol=llhls",
+      hlsUrl: "https://video.example/live.m3u8",
+      llhlsUrl: "https://video.example/live.m3u8?protocol=llhls",
+      ingestUrl: "rtmps://live.cloudflare.com:443/live",
+    });
+  });
+});
diff --git a/packages/server/tests/unit/streaming/destination-probe.test.ts b/packages/server/tests/unit/streaming/destination-probe.test.ts
new file mode 100644
index 000000000..0659cd034
--- /dev/null
+++ b/packages/server/tests/unit/streaming/destination-probe.test.ts
@@ -0,0 +1,126 @@
+import type * as dnsPromises from "node:dns/promises";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { probePlaybackUrl } from "../../../src/streaming/destination-probe.js";
+
+const ORIGINAL_ENV = { ...process.env };
+const ORIGINAL_FETCH = globalThis.fetch;
+
+describe("probePlaybackUrl", () => {
+  beforeEach(() => {
+    process.env = { ...ORIGINAL_ENV };
+    vi.restoreAllMocks();
+  });
+
+  afterEach(() => {
+    process.env = { ...ORIGINAL_ENV };
+    globalThis.fetch = ORIGINAL_FETCH;
+  });
+
+  it("rejects unsupported playback protocols before fetching", async () => {
+    const fetchSpy = vi.fn();
+    globalThis.fetch = fetchSpy as unknown as typeof fetch;
+
+    const result = await probePlaybackUrl("file:///tmp/stream.m3u8");
+
+    expect(result.ready).toBe(false);
+    expect(result.lastError).toBe("unsupported_playback_protocol");
+    expect(fetchSpy).not.toHaveBeenCalled();
+  });
+
+  it("blocks private hosts in production by default", async () => {
+    process.env.NODE_ENV = "production";
+    const fetchSpy = vi.fn();
+    globalThis.fetch = fetchSpy as unknown as typeof fetch;
+
+    const result = await probePlaybackUrl("http://127.0.0.1/live.m3u8");
+
+    expect(result.ready).toBe(false);
+    expect(result.lastError).toBe("private_playback_host_blocked");
+    expect(fetchSpy).not.toHaveBeenCalled();
+  });
+
+  it("blocks private hosts in staging even when bypass is configured", async () => {
+    process.env.NODE_ENV = "staging";
+    process.env.STREAM_ALLOW_PRIVATE_PLAYBACK_PROBES = "true";
+    const fetchSpy = vi.fn();
+    globalThis.fetch = fetchSpy as unknown as typeof fetch;
+
+    const result = await probePlaybackUrl("http://169.254.169.254/latest");
+
+    expect(result.ready).toBe(false);
+    expect(result.lastError).toBe("private_playback_host_blocked");
+    expect(fetchSpy).not.toHaveBeenCalled();
+  });
+
+  it("blocks public hostnames that resolve to private addresses in production", async () => {
+    process.env.NODE_ENV = "production";
+    const lookupSpy = vi
+      .fn()
+      .mockResolvedValue([{ address: "127.0.0.1", family: 4 }]);
+    const fetchSpy = vi.fn();
+
+    const result = await probePlaybackUrl(
+      "https://example.com/live.m3u8",
+      4_000,
+      {
+        lookup: lookupSpy as unknown as typeof dnsPromises.lookup,
+        fetch: fetchSpy as unknown as typeof fetch,
+      },
+    );
+
+    expect(result.ready).toBe(false);
+    expect(result.lastError).toBe("private_playback_host_blocked");
+    expect(lookupSpy).toHaveBeenCalledWith("example.com", {
+      all: true,
+      verbatim: true,
+    });
+    expect(fetchSpy).not.toHaveBeenCalled();
+  });
+
+  it("allows private hosts in explicit development mode", async () => {
+    process.env.NODE_ENV = "development";
+    process.env.STREAM_ALLOW_PRIVATE_PLAYBACK_PROBES = "true";
+    const response = new Response("#EXTM3U", { status: 200 });
+    const fetchSpy = vi.fn().mockResolvedValue(response);
+
+    const result = await probePlaybackUrl("http://127.0.0.1/live.m3u8", 4_000, {
+      fetch: fetchSpy as unknown as typeof fetch,
+    });
+
+    expect(result.ready).toBe(true);
+    expect(result.manifestStatus).toBe("ok");
+    expect(fetchSpy).toHaveBeenCalledOnce();
+  });
+
+  it("ignores the private-host bypass in production", async () => {
+    process.env.NODE_ENV = "production";
+    process.env.STREAM_ALLOW_PRIVATE_PLAYBACK_PROBES = "true";
+    const fetchSpy = vi.fn();
+
+    const result = await probePlaybackUrl("http://127.0.0.1/live.m3u8", 4_000, {
+      fetch: fetchSpy as unknown as typeof fetch,
+    });
+
+    expect(result.ready).toBe(false);
+    expect(result.lastError).toBe("private_playback_host_blocked");
+    expect(fetchSpy).not.toHaveBeenCalled();
+  });
+
+  it("probes with redirect following disabled", async () => {
+    const response = new Response("", {
+      status: 302,
+      headers: { location: "https://elsewhere.example/live.m3u8" },
+    });
+    const fetchSpy = vi.fn().mockResolvedValue(response);
+    globalThis.fetch = fetchSpy as unknown as typeof fetch;
+
+    await probePlaybackUrl("https://stream.example/live.m3u8");
+
+    expect(fetchSpy).toHaveBeenCalledWith(
+      expect.any(URL),
+      expect.objectContaining({
+        redirect: "manual",
+      }),
+    );
+  });
+});
diff --git a/packages/server/tests/unit/streaming/hls-cdn-sync.test.ts b/packages/server/tests/unit/streaming/hls-cdn-sync.test.ts
new file mode 100644
index 000000000..5628f7afc
--- /dev/null
+++ b/packages/server/tests/unit/streaming/hls-cdn-sync.test.ts
@@ -0,0 +1,50 @@
+import { describe, expect, it } from "vitest";
+import { __hlsCdnSyncTestInternals as internals } from "../../../src/streaming/hls-cdn-sync.js";
+
+describe("hls-cdn-sync SigV4 signing", () => {
+  it("builds a deterministic AWS SigV4 PUT signature for HLS playlists", () => {
+    const signed = internals.signS3PutRequest({
+      endpoint: "https://example.r2.cloudflarestorage.com",
+      bucket: "arena",
+      key: "live/hls.m3u8",
+      body: Buffer.from("#EXTM3U\n"),
+      contentType: "application/vnd.apple.mpegurl",
+      accessKeyId: "AKIDEXAMPLE",
+      secretAccessKey: "wJalrXUtnFEMI/K7MDENG+bPxRfiCYEXAMPLEKEY",
+      region: "auto",
+      now: new Date("2026-04-20T12:34:56.000Z"),
+    });
+
+    expect(signed.url).toBe(
+      "https://example.r2.cloudflarestorage.com/arena/live/hls.m3u8",
+    );
+    expect(signed.headers["x-amz-date"]).toBe("20260420T123456Z");
+    expect(signed.headers["x-amz-content-sha256"]).toBe(
+      "144659b48f342d02b9298907ab32fcf0479ac9c99a0d293c7c2ebf8df313dd12",
+    );
+    expect(signed.headers.Authorization).toBe(
+      "AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20260420/auto/s3/aws4_request, SignedHeaders=content-type;host;x-amz-content-sha256;x-amz-date, Signature=49bcfb5d59481866e4b283957ff232948007487eaa367cb331e93dd0ecd942f5",
+    );
+    expect(signed.headers["Cache-Control"]).toBe(
+      "no-cache, no-store, must-revalidate",
+    );
+  });
+
+  it("marks immutable cache headers for media segments", () => {
+    const signed = internals.signS3PutRequest({
+      endpoint: "https://example.r2.cloudflarestorage.com",
+      bucket: "arena",
+      key: "live/seg-1.ts",
+      body: Buffer.from("segment"),
+      contentType: "video/mp2t",
+      accessKeyId: "AKIDEXAMPLE",
+      secretAccessKey: "wJalrXUtnFEMI/K7MDENG+bPxRfiCYEXAMPLEKEY",
+      region: "auto",
+      now: new Date("2026-04-20T12:34:56.000Z"),
+    });
+
+    expect(signed.headers["Cache-Control"]).toBe(
+      "public, max-age=31536000, immutable",
+    );
+  });
+});
diff --git a/packages/server/tests/unit/streaming/ingest-config.test.ts b/packages/server/tests/unit/streaming/ingest-config.test.ts
new file mode 100644
index 000000000..72e3c688d
--- /dev/null
+++ b/packages/server/tests/unit/streaming/ingest-config.test.ts
@@ -0,0 +1,85 @@
+import { describe, expect, it } from "vitest";
+import {
+  assertValidStreamIngestSettings,
+  resolveStreamIngestSettings,
+  validateStreamIngestSettings,
+} from "../../../src/streaming/ingest-config.js";
+
+describe("resolveStreamIngestSettings", () => {
+  it("defaults cloudflare_live to 2-second GOP and 48k audio", () => {
+    const settings = resolveStreamIngestSettings({
+      STREAM_INGEST_PROFILE: "cloudflare_live",
+      STREAM_FPS: "30",
+    });
+
+    expect(settings).toMatchObject({
+      profile: "cloudflare_live",
+      transport: "rtmps",
+      audioSampleRate: 48_000,
+      gopFrames: 60,
+      probeOnly: false,
+    });
+  });
+
+  it("resolves explicit SRT transport settings", () => {
+    const settings = resolveStreamIngestSettings({
+      STREAM_INGEST_PROFILE: "cloudflare_live",
+      STREAM_INGEST_TRANSPORT: "srt",
+      STREAM_INGEST_SRT_URL: "srt://live.cloudflare.com:778",
+      STREAM_INGEST_SRT_STREAM_ID: "abc123",
+      STREAM_INGEST_SRT_PASSPHRASE: "secret",
+      STREAM_CLOUDFLARE_PROBE_ONLY: "true",
+      STREAM_AUDIO_SAMPLE_RATE: "48000",
+      STREAM_GOP_SIZE: "60",
+    });
+
+    expect(settings).toMatchObject({
+      profile: "cloudflare_live",
+      transport: "srt",
+      audioSampleRate: 48_000,
+      gopFrames: 60,
+      probeOnly: true,
+      srtUrl: "srt://live.cloudflare.com:778",
+      srtStreamId: "abc123",
+      srtPassphrase: "secret",
+    });
+  });
+
+  it("reports invalid external RTMPS ingest configuration", () => {
+    const issues = validateStreamIngestSettings({
+      STREAM_DELIVERY_MODE: "external_hls",
+      STREAM_INGEST_TRANSPORT: "rtmps",
+      STREAM_INGEST_RTMPS_URL: "not-a-url",
+    });
+
+    expect(issues).toEqual([
+      "STREAM_INGEST_RTMPS_URL or STREAM_EXTERNAL_INGEST_RTMPS_URL must be a valid rtmp:// or rtmps:// URL",
+      "STREAM_INGEST_STREAM_KEY is required when STREAM_INGEST_TRANSPORT=rtmps",
+    ]);
+  });
+
+  it("accepts the legacy external-prefixed RTMPS ingest URL", () => {
+    const issues = validateStreamIngestSettings({
+      STREAM_DELIVERY_MODE: "external_hls",
+      STREAM_INGEST_TRANSPORT: "rtmps",
+      STREAM_EXTERNAL_INGEST_RTMPS_URL: "rtmps://live.cloudflare.com:443/live",
+      STREAM_INGEST_STREAM_KEY: "stream-key",
+    });
+
+    expect(issues).toEqual([]);
+  });
+
+  it("throws when SRT external ingest settings are malformed", () => {
+    expect(() =>
+      assertValidStreamIngestSettings({
+        STREAM_DELIVERY_MODE: "external_hls",
+        STREAM_INGEST_TRANSPORT: "srt",
+        STREAM_INGEST_SRT_URL: "https://example.com/not-srt",
+        STREAM_INGEST_SRT_STREAM_ID: "",
+        STREAM_INGEST_SRT_PASSPHRASE: "short",
+      }),
+    ).toThrowError(
+      /Invalid stream ingest configuration: STREAM_INGEST_SRT_URL must be a valid srt:\/\/ URL; STREAM_INGEST_SRT_STREAM_ID is required when STREAM_INGEST_TRANSPORT=srt; STREAM_INGEST_SRT_PASSPHRASE must be at least 10 characters/,
+    );
+  });
+});
diff --git a/packages/server/tests/unit/streaming/rtmp-bridge-x11grab.test.ts b/packages/server/tests/unit/streaming/rtmp-bridge-x11grab.test.ts
new file mode 100644
index 000000000..df15e3607
--- /dev/null
+++ b/packages/server/tests/unit/streaming/rtmp-bridge-x11grab.test.ts
@@ -0,0 +1,294 @@
+import { afterEach, describe, expect, it, vi } from "vitest";
+
+import { RTMPBridge } from "../../../src/streaming/rtmp-bridge.js";
+
+const ENV_KEYS = [
+  "FFMPEG_HWACCEL",
+  "STREAM_INGEST_PROFILE",
+  "STREAM_INGEST_TRANSPORT",
+  "STREAM_AUDIO_SAMPLE_RATE",
+  "STREAM_GOP_SIZE",
+  "STREAM_CLOUDFLARE_PROBE_ONLY",
+  "STREAM_FPS",
+  "STREAM_CAPTURE_WIDTH",
+  "STREAM_CAPTURE_HEIGHT",
+  "STREAM_OUTPUT_WIDTH",
+  "STREAM_OUTPUT_HEIGHT",
+  "STREAM_DELIVERY_MODE",
+  "STREAM_DELIVERY_PROVIDER",
+  "STREAM_EXTERNAL_DELIVERY_PROVIDER",
+  "STREAM_EXTERNAL_INGEST_RTMPS_URL",
+  "STREAM_INGEST_RTMPS_URL",
+  "STREAM_INGEST_STREAM_KEY",
+  "STREAM_ENABLED_DESTINATIONS",
+  "DUEL_STREAM_DESTINATIONS",
+  "TWITCH_STREAM_KEY",
+  "YOUTUBE_STREAM_KEY",
+  "KICK_STREAM_KEY",
+  "RTMP_DESTINATIONS_JSON",
+  "STREAM_AUDIO_ENABLED",
+  "PULSE_AUDIO_DEVICE",
+  "STREAM_LOW_LATENCY",
+] as const;
+
+const ORIGINAL_ENV = Object.fromEntries(
+  ENV_KEYS.map((key) => [key, process.env[key]]),
+) as Record<(typeof ENV_KEYS)[number], string | undefined>;
+
+function restoreEnv(): void {
+  for (const key of ENV_KEYS) {
+    const value = ORIGINAL_ENV[key];
+    if (value === undefined) {
+      delete process.env[key];
+    } else {
+      process.env[key] = value;
+    }
+  }
+}
+
+afterEach(() => {
+  vi.restoreAllMocks();
+  restoreEnv();
+});
+
+function baseEnv(): void {
+  // Force silent-audio path so tests never shell out to pactl.
+  process.env.STREAM_AUDIO_ENABLED = "false";
+  // Single Cloudflare canonical destination. Set the full delivery-config
+  // surface (playback + ingest URLs, cloudflare probe-only) so
+  // loadDestinationsFromEnv resolves the `external` destination rather than
+  // falling back to the null-output placeholder.
+  process.env.STREAM_INGEST_PROFILE = "cloudflare_live";
+  process.env.STREAM_CLOUDFLARE_PROBE_ONLY = "true";
+  process.env.STREAM_DELIVERY_MODE = "external_hls";
+  process.env.STREAM_DELIVERY_PROVIDER = "cloudflare_stream";
+  process.env.STREAM_PLAYBACK_URL =
+    "https://videodelivery.net/test/manifest/video.m3u8?protocol=llhls";
+  process.env.STREAM_PLAYBACK_HLS_URL =
+    "https://videodelivery.net/test/manifest/video.m3u8";
+  process.env.STREAM_PLAYBACK_LLHLS_URL =
+    "https://videodelivery.net/test/manifest/video.m3u8?protocol=llhls";
+  process.env.STREAM_INGEST_RTMPS_URL = "rtmps://live.cloudflare.com:443/live";
+  process.env.STREAM_INGEST_STREAM_KEY = "stream-key-xxxxxxxx";
+  // No fanout by default — restrict to the external canonical so tests are
+  // deterministic. Individual tests override this to exercise tee muxing.
+  process.env.STREAM_ENABLED_DESTINATIONS = "external";
+  process.env.STREAM_AUDIO_SAMPLE_RATE = "48000";
+  process.env.STREAM_GOP_SIZE = "60";
+  process.env.STREAM_FPS = "30";
+}
+
+/**
+ * Construct a bridge and prime its outputs so buildX11GrabArgsForTest
+ * returns a representative args list. Production `startFFmpegX11Grab` does
+ * this internally; the test helper does not.
+ */
+function makeBridge(): RTMPBridge {
+  const bridge = new RTMPBridge();
+  (bridge as any).initOutputs();
+  return bridge;
+}
+
+function argIndex(args: string[], flag: string): number {
+  return args.indexOf(flag);
+}
+
+function argValue(args: string[], flag: string): string | undefined {
+  const idx = argIndex(args, flag);
+  return idx >= 0 ? args[idx + 1] : undefined;
+}
+
+describe("RTMPBridge x11grab input", () => {
+  it("builds the expected x11grab input at 1920x1080@30 with mouse hidden", () => {
+    baseEnv();
+    process.env.FFMPEG_HWACCEL = "nvidia";
+    const bridge = makeBridge();
+    const args = bridge.buildX11GrabArgsForTest({
+      display: ":99",
+      width: 1920,
+      height: 1080,
+      fps: 30,
+      drawMouse: false,
+    });
+
+    expect(argValue(args, "-f")).toBe("x11grab");
+    expect(argValue(args, "-video_size")).toBe("1920x1080");
+    expect(argValue(args, "-framerate")).toBe("30");
+    expect(argValue(args, "-draw_mouse")).toBe("0");
+    // x11grab input is the first `-i`, must point at display :99.0+0,0.
+    expect(argValue(args, "-i")).toBe(":99.0+0,0");
+    // Output frame rate forced to the same value as the x11grab framerate.
+    expect(argValue(args, "-r")).toBe("30");
+  });
+
+  it("honours drawMouse=true", () => {
+    baseEnv();
+    process.env.FFMPEG_HWACCEL = "nvidia";
+    const bridge = makeBridge();
+    const args = bridge.buildX11GrabArgsForTest({
+      display: ":99",
+      width: 1280,
+      height: 720,
+      fps: 30,
+      drawMouse: true,
+    });
+    expect(argValue(args, "-draw_mouse")).toBe("1");
+  });
+
+  it("accepts alternative display + 60fps + 1280x720", () => {
+    baseEnv();
+    process.env.FFMPEG_HWACCEL = "nvidia";
+    const bridge = makeBridge();
+    const args = bridge.buildX11GrabArgsForTest({
+      display: ":100",
+      width: 1280,
+      height: 720,
+      fps: 60,
+      drawMouse: false,
+    });
+    expect(argValue(args, "-video_size")).toBe("1280x720");
+    expect(argValue(args, "-framerate")).toBe("60");
+    expect(argValue(args, "-i")).toBe(":100.0+0,0");
+  });
+
+  it("applies the existing Cloudflare-safe NVENC encoder args alongside x11grab input", () => {
+    baseEnv();
+    process.env.FFMPEG_HWACCEL = "nvidia";
+    const bridge = makeBridge();
+    const args = bridge.buildX11GrabArgsForTest({
+      display: ":99",
+      width: 1920,
+      height: 1080,
+      fps: 30,
+      drawMouse: false,
+    });
+
+    // NVENC encoder block comes straight from buildVideoEncoderArgs — we just
+    // assert the signature values so a regression in the shared builder is
+    // caught here as well.
+    expect(args).toEqual(
+      expect.arrayContaining(["-c:v", "h264_nvenc", "-profile:v", "high"]),
+    );
+  });
+
+  it("includes silent audio input (anullsrc) and maps 0:v:0 + 1:a:0", () => {
+    baseEnv();
+    process.env.FFMPEG_HWACCEL = "nvidia";
+    const bridge = makeBridge();
+    const args = bridge.buildX11GrabArgsForTest({
+      display: ":99",
+      width: 1920,
+      height: 1080,
+      fps: 30,
+      drawMouse: false,
+    });
+
+    // Audio input must come from lavfi/anullsrc in the test environment
+    // (STREAM_AUDIO_ENABLED=false forces this path).
+    const lavfiIdx = args.findIndex(
+      (a, i) => a === "-f" && args[i + 1] === "lavfi",
+    );
+    expect(lavfiIdx).toBeGreaterThanOrEqual(0);
+    expect(args).toEqual(
+      expect.arrayContaining(["-map", "0:v:0", "-map", "1:a:0"]),
+    );
+  });
+
+  it("uses direct flv output with exactly one destination (no tee muxer)", () => {
+    baseEnv();
+    process.env.FFMPEG_HWACCEL = "nvidia";
+    const bridge = makeBridge();
+    const args = bridge.buildX11GrabArgsForTest({
+      display: ":99",
+      width: 1920,
+      height: 1080,
+      fps: 30,
+      drawMouse: false,
+    });
+    // Direct output → last `-f` should be `flv` (not `tee`).
+    const lastFormatIdx = args.lastIndexOf("-f");
+    expect(args[lastFormatIdx + 1]).toBe("flv");
+    expect(args).not.toContain("tee");
+  });
+
+  it("falls back to tee muxer when multiple destinations are enabled", () => {
+    baseEnv();
+    process.env.FFMPEG_HWACCEL = "nvidia";
+    // Adding Twitch + YouTube alongside external gives us three destinations.
+    process.env.STREAM_ENABLED_DESTINATIONS = "external,twitch,youtube";
+    process.env.TWITCH_STREAM_KEY = "twitch-test-key";
+    process.env.YOUTUBE_STREAM_KEY = "youtube-test-key";
+    const bridge = makeBridge();
+    const args = bridge.buildX11GrabArgsForTest({
+      display: ":99",
+      width: 1920,
+      height: 1080,
+      fps: 30,
+      drawMouse: false,
+    });
+    const lastFormatIdx = args.lastIndexOf("-f");
+    expect(args[lastFormatIdx + 1]).toBe("tee");
+    // Tee muxer string must reference all three RTMP endpoints.
+    const teeString = args[lastFormatIdx + 2] ?? "";
+    expect(teeString).toContain("rtmps://live.cloudflare.com");
+    expect(teeString).toContain("live.twitch.tv");
+    expect(teeString).toContain("rtmp.youtube.com");
+  });
+
+  it("sets wallclock PTS + low-latency input flags (no buffering)", () => {
+    baseEnv();
+    process.env.FFMPEG_HWACCEL = "nvidia";
+    const bridge = makeBridge();
+    const args = bridge.buildX11GrabArgsForTest({
+      display: ":99",
+      width: 1920,
+      height: 1080,
+      fps: 30,
+      drawMouse: false,
+    });
+    expect(args).toEqual(
+      expect.arrayContaining([
+        "-fflags",
+        "nobuffer",
+        "-flags",
+        "low_delay",
+        "-use_wallclock_as_timestamps",
+        "1",
+      ]),
+    );
+  });
+});
+
+describe("RTMPBridge encoder frame parsing", () => {
+  it("updates lastEncoderFrameCount and lastEncoderFrameAt from FFmpeg progress lines", () => {
+    baseEnv();
+    const bridge = new RTMPBridge();
+
+    expect(bridge.getLastEncoderFrameCount()).toBe(0);
+    expect(bridge.getLastEncoderFrameAt()).toBeNull();
+
+    const nowBefore = Date.now();
+    (bridge as any).parseFFmpegOutput("frame=  120 fps= 30.0 q=28.0");
+    const nowAfter = Date.now();
+    expect(bridge.getLastEncoderFrameCount()).toBe(120);
+    const stampedAt = bridge.getLastEncoderFrameAt();
+    expect(stampedAt).not.toBeNull();
+    // stampedAt should be within the [nowBefore, nowAfter] wallclock window.
+    expect(stampedAt!).toBeGreaterThanOrEqual(nowBefore);
+    expect(stampedAt!).toBeLessThanOrEqual(nowAfter);
+  });
+
+  it("is monotonic — lower frame counts are ignored", () => {
+    baseEnv();
+    const bridge = new RTMPBridge();
+    (bridge as any).parseFFmpegOutput("frame=  200 fps= 30.0 q=28.0");
+    const firstStamp = bridge.getLastEncoderFrameAt();
+    expect(bridge.getLastEncoderFrameCount()).toBe(200);
+
+    // A stray earlier progress line (can happen right after FFmpeg restart
+    // if stderr reorders) must not rewind the counter.
+    (bridge as any).parseFFmpegOutput("frame=   50 fps= 29.9 q=27.5");
+    expect(bridge.getLastEncoderFrameCount()).toBe(200);
+    expect(bridge.getLastEncoderFrameAt()).toBe(firstStamp);
+  });
+});
diff --git a/packages/server/tests/unit/streaming/rtmp-bridge.test.ts b/packages/server/tests/unit/streaming/rtmp-bridge.test.ts
new file mode 100644
index 000000000..78f26b33e
--- /dev/null
+++ b/packages/server/tests/unit/streaming/rtmp-bridge.test.ts
@@ -0,0 +1,553 @@
+import { EventEmitter } from "node:events";
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import { afterEach, describe, expect, it, vi } from "vitest";
+import { RTMPBridge } from "../../../src/streaming/rtmp-bridge.js";
+
+const ENV_KEYS = [
+  "FFMPEG_HWACCEL",
+  "STREAM_INGEST_PROFILE",
+  "STREAM_INGEST_TRANSPORT",
+  "STREAM_AUDIO_SAMPLE_RATE",
+  "STREAM_GOP_SIZE",
+  "STREAM_CLOUDFLARE_PROBE_ONLY",
+  "STREAM_FPS",
+  "STREAM_DELIVERY_MODE",
+  "STREAM_DELIVERY_PROVIDER",
+  "STREAM_CANONICAL_PROVIDER_PRIORITY",
+  "STREAM_EXTERNAL_DELIVERY_PROVIDER",
+  "STREAM_EXTERNAL_PLAYBACK_HLS_URL",
+  "STREAM_EXTERNAL_PLAYBACK_LLHLS_URL",
+  "STREAM_EXTERNAL_INGEST_RTMPS_URL",
+  "STREAM_PLAYBACK_URL",
+  "STREAM_PLAYBACK_HLS_URL",
+  "STREAM_PLAYBACK_LLHLS_URL",
+  "STREAM_INGEST_RTMPS_URL",
+  "STREAM_INGEST_STREAM_KEY",
+  "STREAM_INGEST_SRT_URL",
+  "STREAM_INGEST_SRT_STREAM_ID",
+  "STREAM_INGEST_SRT_PASSPHRASE",
+  "HLS_OUTPUT_PATH",
+  "HLS_SEGMENT_PATTERN",
+  "HLS_TIME_SECONDS",
+  "HLS_LIST_SIZE",
+  "HLS_DELETE_THRESHOLD",
+  "STREAM_DELIVERY_RECOVERY_ENABLED",
+  "STREAM_DELIVERY_RECOVERY_GRACE_MS",
+  "STREAM_DELIVERY_RECOVERY_FAILURES",
+  "STREAM_DELIVERY_RECOVERY_PROBE_TIMEOUT_MS",
+  "STREAM_DELIVERY_RECOVERY_RESTART_COOLDOWN_MS",
+  "NODE_ENV",
+] as const;
+
+const ORIGINAL_ENV = Object.fromEntries(
+  ENV_KEYS.map((key) => [key, process.env[key]]),
+) as Record<(typeof ENV_KEYS)[number], string | undefined>;
+
+function restoreEnv(): void {
+  for (const key of ENV_KEYS) {
+    const value = ORIGINAL_ENV[key];
+    if (value === undefined) {
+      delete process.env[key];
+    } else {
+      process.env[key] = value;
+    }
+  }
+}
+
+afterEach(() => {
+  vi.useRealTimers();
+  vi.restoreAllMocks();
+  restoreEnv();
+});
+
+function createFakeFfmpegProcess() {
+  const proc = new EventEmitter() as any;
+  proc.exitCode = null;
+  proc.signalCode = null;
+  proc.stdout = new EventEmitter();
+  proc.stderr = new EventEmitter();
+  proc.stdin = new EventEmitter();
+  proc.stdin.end = vi.fn();
+  proc.kill = vi.fn(() => true);
+  return proc;
+}
+
+function mockProbeResponse(status: number) {
+  return {
+    status,
+    body: {
+      cancel: vi.fn().mockResolvedValue(undefined),
+    },
+  } as unknown as Response;
+}
+
+describe("RTMPBridge Cloudflare ingest profile", () => {
+  it("builds Cloudflare-safe NVENC args", () => {
+    process.env.FFMPEG_HWACCEL = "nvidia";
+    process.env.STREAM_INGEST_PROFILE = "cloudflare_live";
+    process.env.STREAM_AUDIO_SAMPLE_RATE = "48000";
+    process.env.STREAM_GOP_SIZE = "60";
+    process.env.STREAM_FPS = "30";
+
+    const bridge = new RTMPBridge();
+    const videoArgs = (bridge as any).buildVideoEncoderArgs() as string[];
+    const audioArgs = (bridge as any).buildAudioArgs() as string[];
+
+    expect(videoArgs).toEqual(
+      expect.arrayContaining([
+        "-c:v",
+        "h264_nvenc",
+        "-preset",
+        "llhq",
+        "-rc",
+        "cbr",
+        "-multipass",
+        "disabled",
+        "-g",
+        "60",
+        "-bf",
+        "0",
+        "-forced-idr",
+        "1",
+        "-zerolatency",
+        "1",
+        "-strict_gop",
+        "1",
+        "-rc-lookahead",
+        "0",
+        "-profile:v",
+        "high",
+        "-level",
+        "4.1",
+      ]),
+    );
+    expect(audioArgs).toEqual(
+      expect.arrayContaining(["-ar", "48000", "-c:a", "aac"]),
+    );
+  });
+
+  it("builds Cloudflare-safe libx264 args", () => {
+    process.env.FFMPEG_HWACCEL = "cpu";
+    process.env.STREAM_INGEST_PROFILE = "cloudflare_live";
+    process.env.STREAM_AUDIO_SAMPLE_RATE = "48000";
+    process.env.STREAM_GOP_SIZE = "60";
+    process.env.STREAM_FPS = "30";
+
+    const bridge = new RTMPBridge();
+    const videoArgs = (bridge as any).buildVideoEncoderArgs() as string[];
+    const audioInputArgs = (
+      bridge as any
+    ).buildBridgeAudioInputArgs() as string[];
+
+    expect(videoArgs).toEqual(
+      expect.arrayContaining([
+        "-c:v",
+        "libx264",
+        "-preset",
+        "veryfast",
+        "-tune",
+        "zerolatency",
+        "-g",
+        "60",
+        "-keyint_min",
+        "60",
+        "-sc_threshold",
+        "0",
+        "-bf",
+        "0",
+        "-forced-idr",
+        "1",
+        "-profile:v",
+        "high",
+        "-level",
+        "4.1",
+        "-x264-params",
+        "nal-hrd=cbr:force-cfr=1:open-gop=0",
+      ]),
+    );
+    expect(audioInputArgs).toEqual(
+      expect.arrayContaining(["-i", "anullsrc=r=48000:cl=stereo"]),
+    );
+  });
+
+  it("removes local HLS tee output in probe-only mode", () => {
+    process.env.STREAM_INGEST_PROFILE = "cloudflare_live";
+    process.env.STREAM_CLOUDFLARE_PROBE_ONLY = "true";
+    process.env.STREAM_DELIVERY_MODE = "external_hls";
+    process.env.STREAM_DELIVERY_PROVIDER = "cloudflare_stream";
+    process.env.STREAM_PLAYBACK_URL =
+      "https://videodelivery.net/test/manifest/video.m3u8";
+    process.env.STREAM_PLAYBACK_HLS_URL =
+      "https://videodelivery.net/test/manifest/video.m3u8";
+    process.env.STREAM_PLAYBACK_LLHLS_URL =
+      "https://videodelivery.net/test/manifest/video.m3u8?protocol=llhls";
+    process.env.STREAM_INGEST_RTMPS_URL =
+      "rtmps://live.cloudflare.com:443/live";
+    process.env.STREAM_INGEST_STREAM_KEY = "stream-key";
+    process.env.HLS_OUTPUT_PATH = "/tmp/hyperscape/live/stream.m3u8";
+
+    const bridge = new RTMPBridge();
+    (bridge as any).initOutputs();
+    const outputString = (bridge as any).buildOutputString() as string;
+
+    expect(outputString).toContain(
+      "rtmps://live.cloudflare.com:443/live/stream-key",
+    );
+    expect(outputString).not.toContain("f=hls");
+    expect(outputString).not.toContain("stream.m3u8");
+  });
+
+  it("uses minimal SRT query credentials for Cloudflare output", () => {
+    process.env.STREAM_INGEST_PROFILE = "cloudflare_live";
+    process.env.STREAM_INGEST_TRANSPORT = "srt";
+    process.env.STREAM_CLOUDFLARE_PROBE_ONLY = "true";
+    process.env.STREAM_DELIVERY_MODE = "external_hls";
+    process.env.STREAM_DELIVERY_PROVIDER = "cloudflare_stream";
+    process.env.STREAM_PLAYBACK_URL =
+      "https://videodelivery.net/test/manifest/video.m3u8?protocol=llhls";
+    process.env.STREAM_PLAYBACK_HLS_URL =
+      "https://videodelivery.net/test/manifest/video.m3u8";
+    process.env.STREAM_PLAYBACK_LLHLS_URL =
+      "https://videodelivery.net/test/manifest/video.m3u8?protocol=llhls";
+    process.env.STREAM_INGEST_RTMPS_URL =
+      "rtmps://live.cloudflare.com:443/live";
+    process.env.STREAM_INGEST_SRT_URL = "srt://live.cloudflare.com:778";
+    process.env.STREAM_INGEST_SRT_STREAM_ID = "stream-id";
+    process.env.STREAM_INGEST_SRT_PASSPHRASE = "stream-passphrase";
+
+    const bridge = new RTMPBridge();
+    (bridge as any).initOutputs();
+    const outputString = (bridge as any).buildOutputString() as string;
+
+    expect(outputString).toContain(
+      "passphrase=stream-passphrase&streamid=stream-id",
+    );
+    expect(outputString).toContain("streamid=stream-id");
+    expect(outputString).toContain("passphrase=stream-passphrase");
+    expect(outputString).not.toContain("pkt_size=");
+    expect(outputString).not.toContain("transtype=");
+  });
+
+  it("uses direct MPEG-TS output for a single SRT destination", () => {
+    process.env.STREAM_INGEST_PROFILE = "cloudflare_live";
+    process.env.STREAM_INGEST_TRANSPORT = "srt";
+    process.env.STREAM_CLOUDFLARE_PROBE_ONLY = "true";
+    process.env.STREAM_DELIVERY_MODE = "external_hls";
+    process.env.STREAM_DELIVERY_PROVIDER = "cloudflare_stream";
+    process.env.STREAM_PLAYBACK_URL =
+      "https://videodelivery.net/test/manifest/video.m3u8?protocol=llhls";
+    process.env.STREAM_PLAYBACK_HLS_URL =
+      "https://videodelivery.net/test/manifest/video.m3u8";
+    process.env.STREAM_PLAYBACK_LLHLS_URL =
+      "https://videodelivery.net/test/manifest/video.m3u8?protocol=llhls";
+    process.env.STREAM_INGEST_RTMPS_URL =
+      "rtmps://live.cloudflare.com:443/live";
+    process.env.STREAM_INGEST_SRT_URL = "srt://live.cloudflare.com:778";
+    process.env.STREAM_INGEST_SRT_STREAM_ID = "stream-id";
+    process.env.STREAM_INGEST_SRT_PASSPHRASE = "stream-passphrase";
+
+    const bridge = new RTMPBridge();
+    (bridge as any).initOutputs();
+    const outputArgs = (bridge as any).buildDirectOutputArgs() as
+      | string[]
+      | null;
+
+    expect(outputArgs).toEqual([
+      "-f",
+      "mpegts",
+      "-mpegts_flags",
+      "+resend_headers",
+      expect.stringContaining("srt://live.cloudflare.com:778"),
+    ]);
+  });
+
+  it("redacts SRT and RTMP credentials from FFmpeg log text", () => {
+    const redact = (RTMPBridge as any).redactSensitiveFfmpegText as (
+      value: string,
+    ) => string;
+
+    const redacted = redact(
+      "Output #0 to 'srt://live.cloudflare.com:778?streamid=stream-id&passphrase=stream-passphrase' and rtmps://live.cloudflare.com:443/live/stream-key",
+    );
+
+    expect(redacted).toContain("streamid=***REDACTED***");
+    expect(redacted).toContain("passphrase=***REDACTED***");
+    expect(redacted).toContain(
+      "rtmps://live.cloudflare.com:443/***REDACTED***",
+    );
+    expect(redacted).not.toContain("stream-id");
+    expect(redacted).not.toContain("stream-passphrase");
+    expect(redacted).not.toContain("stream-key");
+  });
+
+  it("marks destinations connected after FFmpeg reports progress", () => {
+    process.env.STREAM_INGEST_PROFILE = "cloudflare_live";
+    process.env.STREAM_CLOUDFLARE_PROBE_ONLY = "true";
+    process.env.STREAM_DELIVERY_MODE = "external_hls";
+    process.env.STREAM_DELIVERY_PROVIDER = "cloudflare_stream";
+    process.env.STREAM_PLAYBACK_URL =
+      "https://videodelivery.net/test/manifest/video.m3u8";
+    process.env.STREAM_PLAYBACK_HLS_URL =
+      "https://videodelivery.net/test/manifest/video.m3u8";
+    process.env.STREAM_PLAYBACK_LLHLS_URL =
+      "https://videodelivery.net/test/manifest/video.m3u8?protocol=llhls";
+    process.env.STREAM_INGEST_RTMPS_URL =
+      "rtmps://live.cloudflare.com:443/live";
+    process.env.STREAM_INGEST_STREAM_KEY = "stream-key";
+
+    const bridge = new RTMPBridge();
+    (bridge as any).initOutputs();
+    (bridge as any).status.destinations = [
+      {
+        id: "canonical-cloudflare",
+        name: "External Delivery",
+        role: "canonical",
+        provider: "cloudflare_stream",
+        transport: "rtmps",
+        playbackUrl: "https://videodelivery.net/test/manifest/video.m3u8",
+        ingestUrl: "rtmps://live.cloudflare.com:443/live",
+        connected: false,
+        bytesWritten: 0,
+        startedAt: 123,
+      },
+    ];
+
+    (bridge as any).parseFFmpegOutput("frame=   42 fps=29.97");
+
+    expect((bridge as any).status.destinations[0]?.connected).toBe(true);
+    expect((bridge as any).status.destinations[0]?.error).toBeUndefined();
+  });
+
+  it("restarts FFmpeg after Cloudflare invalidates the RTMPS session", async () => {
+    vi.useFakeTimers();
+    vi.spyOn(Math, "random").mockReturnValue(0);
+
+    const bridge = new RTMPBridge();
+    const proc = createFakeFfmpegProcess();
+    (bridge as any).ffmpeg = proc;
+    (bridge as any).cdpDirectMode = true;
+    (bridge as any).status.ffmpegRunning = true;
+    (bridge as any).status.destinations = [
+      {
+        id: "canonical-cloudflare",
+        name: "External Delivery",
+        role: "canonical",
+        provider: "cloudflare_stream",
+        transport: "rtmps",
+        playbackUrl: "https://videodelivery.net/test/manifest/video.m3u8",
+        ingestUrl: "rtmps://live.cloudflare.com:443/live",
+        connected: true,
+        bytesWritten: 0,
+        startedAt: 123,
+      },
+    ];
+    const startDirect = vi
+      .spyOn(bridge as any, "startFFmpegDirect")
+      .mockImplementation(() => {
+        (bridge as any).ffmpeg = createFakeFfmpegProcess();
+        (bridge as any).status.ffmpegRunning = true;
+      });
+
+    (bridge as any).parseFFmpegOutput(
+      "[tls] The specified session has been invalidated for some reason.",
+    );
+
+    expect((bridge as any).status.destinations[0]?.connected).toBe(false);
+    expect((bridge as any).status.destinations[0]?.error).toContain(
+      "session has been invalidated",
+    );
+
+    await vi.advanceTimersByTimeAsync(1_000);
+
+    expect(proc.stdin.end).toHaveBeenCalledOnce();
+    expect(proc.kill).toHaveBeenCalledWith("SIGTERM");
+
+    proc.emit("close", 0, null);
+    await vi.advanceTimersByTimeAsync(0);
+
+    expect(startDirect).toHaveBeenCalledOnce();
+    expect((bridge as any).status.ffmpegRunning).toBe(true);
+  });
+
+  it("restarts FFmpeg when Cloudflare playback stays unavailable while capture is healthy", async () => {
+    vi.useFakeTimers();
+    vi.spyOn(Math, "random").mockReturnValue(0);
+    const fetchSpy = vi
+      .spyOn(globalThis, "fetch")
+      .mockResolvedValue(mockProbeResponse(404));
+    process.env.NODE_ENV = "development";
+    process.env.STREAM_DELIVERY_RECOVERY_GRACE_MS = "0";
+    process.env.STREAM_DELIVERY_RECOVERY_FAILURES = "1";
+    process.env.STREAM_DELIVERY_RECOVERY_RESTART_COOLDOWN_MS = "5000";
+
+    const bridge = new RTMPBridge();
+    const proc = createFakeFfmpegProcess();
+    const now = Date.now();
+    (bridge as any).ffmpeg = proc;
+    (bridge as any).cdpDirectMode = true;
+    (bridge as any).status.ffmpegRunning = true;
+    (bridge as any).status.clientConnected = true;
+    (bridge as any).startTime = now - 60_000;
+    (bridge as any).lastDataReceived = now;
+    (bridge as any).status.destinations = [
+      {
+        id: "canonical-cloudflare",
+        name: "External Delivery",
+        role: "canonical",
+        provider: "cloudflare_stream",
+        transport: "rtmps",
+        playbackUrl:
+          "https://videodelivery.net/test/manifest/video.m3u8?protocol=llhls",
+        ingestUrl: "rtmps://live.cloudflare.com:443/live",
+        connected: true,
+        bytesWritten: 0,
+        startedAt: now - 60_000,
+      },
+    ];
+    const startDirect = vi
+      .spyOn(bridge as any, "startFFmpegDirect")
+      .mockImplementation(() => {
+        (bridge as any).ffmpeg = createFakeFfmpegProcess();
+        (bridge as any).status.ffmpegRunning = true;
+      });
+
+    (bridge as any).checkHealth();
+    await vi.advanceTimersByTimeAsync(0);
+    await Promise.resolve();
+    await Promise.resolve();
+
+    expect(fetchSpy).toHaveBeenCalledOnce();
+    expect((bridge as any).status.destinations[0]?.connected).toBe(false);
+    expect((bridge as any).status.destinations[0]?.error).toContain(
+      "playback_probe_missing",
+    );
+
+    await vi.advanceTimersByTimeAsync(1_000);
+
+    expect(proc.stdin.end).toHaveBeenCalledOnce();
+    expect(proc.kill).toHaveBeenCalledWith("SIGTERM");
+
+    proc.emit("close", 0, null);
+    await vi.advanceTimersByTimeAsync(0);
+
+    expect(startDirect).toHaveBeenCalledOnce();
+    expect((bridge as any).status.ffmpegRunning).toBe(true);
+  });
+
+  it("omits global headers for SRT transport", () => {
+    process.env.STREAM_INGEST_PROFILE = "cloudflare_live";
+    process.env.STREAM_INGEST_TRANSPORT = "srt";
+
+    const bridge = new RTMPBridge();
+    const audioArgs = (bridge as any).buildAudioArgs() as string[];
+
+    expect(audioArgs).toEqual(
+      expect.arrayContaining(["-c:a", "aac", "-ar", "48000"]),
+    );
+    expect(audioArgs).not.toContain("+global_header");
+  });
+
+  it("warms external delivery while self-hls remains canonical", () => {
+    process.env.STREAM_INGEST_PROFILE = "cloudflare_live";
+    process.env.STREAM_INGEST_TRANSPORT = "srt";
+    process.env.STREAM_CLOUDFLARE_PROBE_ONLY = "false";
+    process.env.STREAM_DELIVERY_MODE = "self_hls";
+    process.env.STREAM_PLAYBACK_URL = "https://self.example/live/stream.m3u8";
+    process.env.STREAM_PLAYBACK_HLS_URL = "https://video.example/live.m3u8";
+    process.env.STREAM_PLAYBACK_LLHLS_URL =
+      "https://video.example/live.m3u8?protocol=llhls";
+    process.env.STREAM_DELIVERY_PROVIDER = "cloudflare_stream";
+    process.env.STREAM_CANONICAL_PROVIDER_PRIORITY =
+      "self_hls,cloudflare_stream";
+    process.env.STREAM_INGEST_SRT_URL = "srt://live.cloudflare.com:778";
+    process.env.STREAM_INGEST_SRT_STREAM_ID = "stream-id";
+    process.env.STREAM_INGEST_SRT_PASSPHRASE = "stream-passphrase";
+    process.env.HLS_OUTPUT_PATH = "/tmp/hyperscape/live/stream.m3u8";
+
+    const bridge = new RTMPBridge();
+    (bridge as any).initOutputs();
+    const outputString = (bridge as any).buildOutputString() as string;
+    const destinations = (bridge as any).destinations as Array<{
+      id?: string;
+      role?: string;
+      provider?: string;
+    }>;
+
+    expect(outputString).toContain("streamid=stream-id");
+    expect(outputString).not.toContain("pkt_size=1316");
+    expect(outputString).toContain("f=hls");
+    expect(destinations).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          id: "fallback-external-delivery",
+          role: "fallback",
+          provider: "cloudflare_stream",
+          transport: "srt",
+        }),
+      ]),
+    );
+  });
+
+  it("cleans stale local HLS artifacts before starting a new output", () => {
+    const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), "rtmp-hls-"));
+    try {
+      process.env.HLS_OUTPUT_PATH = path.join(tempDir, "stream.m3u8");
+      fs.writeFileSync(process.env.HLS_OUTPUT_PATH, "#EXTM3U\n");
+      fs.writeFileSync(path.join(tempDir, "stream-000000001.ts"), "old");
+      fs.writeFileSync(path.join(tempDir, "stream-000000002.ts.tmp"), "old");
+      fs.writeFileSync(path.join(tempDir, "unrelated.ts"), "keep");
+
+      const bridge = new RTMPBridge();
+      const outputString = (bridge as any).buildOutputString() as string;
+
+      expect(outputString).toContain("f=hls");
+      expect(fs.existsSync(process.env.HLS_OUTPUT_PATH)).toBe(false);
+      expect(fs.existsSync(path.join(tempDir, "stream-000000001.ts"))).toBe(
+        false,
+      );
+      expect(fs.existsSync(path.join(tempDir, "stream-000000002.ts.tmp"))).toBe(
+        false,
+      );
+      expect(fs.existsSync(path.join(tempDir, "unrelated.ts"))).toBe(true);
+    } finally {
+      fs.rmSync(tempDir, { force: true, recursive: true });
+    }
+  });
+
+  it("waits for FFmpeg process close during stopProcessing", async () => {
+    const bridge = new RTMPBridge();
+    const proc = createFakeFfmpegProcess();
+    (bridge as any).ffmpeg = proc;
+    (bridge as any).status.ffmpegRunning = true;
+
+    const stopPromise = bridge.stopProcessing();
+
+    expect(proc.stdin.end).toHaveBeenCalledOnce();
+    expect(proc.kill).toHaveBeenCalledWith("SIGTERM");
+    expect((bridge as any).status.ffmpegRunning).toBe(false);
+
+    proc.emit("close", 0, null);
+    await stopPromise;
+
+    expect(proc.kill).not.toHaveBeenCalledWith("SIGKILL");
+  });
+
+  it("force-kills FFmpeg when graceful stop exceeds the bounded timeout", async () => {
+    vi.useFakeTimers();
+    const bridge = new RTMPBridge();
+    const proc = createFakeFfmpegProcess();
+    (bridge as any).ffmpeg = proc;
+    (bridge as any).status.ffmpegRunning = true;
+
+    const stopPromise = bridge.stopProcessing();
+    await vi.advanceTimersByTimeAsync(751);
+
+    expect(proc.kill).toHaveBeenCalledWith("SIGTERM");
+    expect(proc.kill).toHaveBeenCalledWith("SIGKILL");
+
+    await vi.advanceTimersByTimeAsync(3_000);
+    await stopPromise;
+  });
+});
diff --git a/packages/server/tests/unit/streaming/stream-status-artifacts.test.ts b/packages/server/tests/unit/streaming/stream-status-artifacts.test.ts
new file mode 100644
index 000000000..0df2027ea
--- /dev/null
+++ b/packages/server/tests/unit/streaming/stream-status-artifacts.test.ts
@@ -0,0 +1,53 @@
+import { mkdtempSync, rmSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { dirname, join } from "node:path";
+import { afterEach, describe, expect, it } from "vitest";
+import {
+  readLocalHlsManifestSnapshot,
+  resolveExternalStatusFile,
+} from "../../../src/streaming/stream-status-artifacts.js";
+
+describe("stream-status-artifacts", () => {
+  let tempDir: string | null = null;
+
+  afterEach(() => {
+    if (tempDir) {
+      rmSync(tempDir, { recursive: true, force: true });
+      tempDir = null;
+    }
+  });
+
+  it("derives the external status file path from HLS_OUTPUT_PATH when unset", () => {
+    expect(
+      resolveExternalStatusFile({
+        HLS_OUTPUT_PATH: "/tmp/hyperscape/live/stream.m3u8",
+      } as NodeJS.ProcessEnv),
+    ).toBe("/tmp/hyperscape/live/rtmp-status.json");
+  });
+
+  it("reads the local HLS manifest snapshot from disk", () => {
+    tempDir = mkdtempSync(join(tmpdir(), "stream-status-artifacts-"));
+    const manifestPath = join(tempDir, "stream.m3u8");
+    writeFileSync(
+      manifestPath,
+      [
+        "#EXTM3U",
+        "#EXT-X-VERSION:6",
+        "#EXT-X-MEDIA-SEQUENCE:177",
+        "#EXTINF:2.000000,",
+        "stream-177.ts",
+      ].join("\n"),
+    );
+
+    const snapshot = readLocalHlsManifestSnapshot({
+      HLS_OUTPUT_PATH: manifestPath,
+    } as NodeJS.ProcessEnv);
+
+    expect(snapshot.mediaSequence).toBe(177);
+    expect(typeof snapshot.updatedAt).toBe("number");
+    expect(snapshot.updatedAt).toBeGreaterThan(0);
+    expect(dirname(resolveExternalStatusFile({
+      HLS_OUTPUT_PATH: manifestPath,
+    } as NodeJS.ProcessEnv) || "")).toBe(tempDir);
+  });
+});
diff --git a/packages/server/tests/unit/systems/DuelScheduler/BettingPoolManager.test.ts b/packages/server/tests/unit/systems/DuelScheduler/BettingPoolManager.test.ts
new file mode 100644
index 000000000..d6117bda7
--- /dev/null
+++ b/packages/server/tests/unit/systems/DuelScheduler/BettingPoolManager.test.ts
@@ -0,0 +1,182 @@
+import { Keypair } from "@solana/web3.js";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+
+const databaseMock = vi.hoisted(() => ({
+  getDatabase: vi.fn(),
+}));
+
+vi.mock("../../../../src/database/client.js", () => ({
+  getDatabase: databaseMock.getDatabase,
+}));
+
+import {
+  BettingPoolManager,
+  __bettingPoolManagerTestInternals as internals,
+} from "../../../../src/systems/DuelScheduler/BettingPoolManager.js";
+
+describe("BettingPoolManager input validation", () => {
+  beforeEach(() => {
+    databaseMock.getDatabase.mockReset();
+  });
+
+  it("accepts bounded positive decimal bet amounts", () => {
+    expect(internals.isValidPositiveDecimalAmount("1")).toBe(true);
+    expect(internals.isValidPositiveDecimalAmount("0.00000001")).toBe(true);
+    expect(
+      internals.isValidPositiveDecimalAmount("999999999999999999.12345678"),
+    ).toBe(true);
+  });
+
+  it("rejects zero, negative, over-precision, and oversized bet amounts", () => {
+    for (const amount of [
+      "0",
+      "0.0",
+      "-1",
+      "1.123456789",
+      "1000000000000000000",
+      "1e6",
+      "NaN",
+      "Infinity",
+      "",
+    ]) {
+      expect(internals.isValidPositiveDecimalAmount(amount), amount).toBe(
+        false,
+      );
+    }
+  });
+
+  it("validates Solana-style wallet addresses without accepting malformed strings", () => {
+    expect(
+      internals.isValidSolanaWalletAddress(
+        Keypair.generate().publicKey.toBase58(),
+      ),
+    ).toBe(true);
+
+    for (const wallet of [
+      "",
+      "0".repeat(32),
+      "O".repeat(32),
+      "I".repeat(32),
+      "l".repeat(32),
+      "short",
+      "1".repeat(45),
+    ]) {
+      expect(internals.isValidSolanaWalletAddress(wallet), wallet).toBe(false);
+    }
+  });
+});
+
+describe("BettingPoolManager.placeBet", () => {
+  beforeEach(() => {
+    databaseMock.getDatabase.mockReset();
+  });
+
+  function createManager(walletBetCount: number) {
+    const emitted: Array<{ event: string; payload: unknown }> = [];
+    const insertedBets: unknown[] = [];
+    const tx = {
+      execute: vi.fn(async () => ({
+        rows: [
+          {
+            id: "round-1",
+            bettingClosesAt: Date.now() + 60_000,
+            duelEndsAt: null,
+            winnerId: null,
+          },
+        ],
+      })),
+      select: vi.fn(() => ({
+        from: () => ({
+          where: async () => [{ count: walletBetCount }],
+        }),
+      })),
+      insert: vi.fn(() => ({
+        values: async (value: unknown) => {
+          insertedBets.push(value);
+        },
+      })),
+    };
+    const db = {
+      transaction: vi.fn(async (callback: (txArg: typeof tx) => unknown) =>
+        callback(tx),
+      ),
+      select: vi.fn(() => ({
+        from: () => ({
+          where: () => ({
+            groupBy: async () => [],
+          }),
+        }),
+      })),
+    };
+    databaseMock.getDatabase.mockReturnValue(db);
+    const world = {
+      duelBettingBridge: {
+        getMarket: vi.fn(() => ({ status: "betting" })),
+      },
+      emit: (event: string, payload: unknown) => {
+        emitted.push({ event, payload });
+      },
+    };
+    const manager = new BettingPoolManager(world as never);
+    return { db, emitted, insertedBets, manager, tx };
+  }
+
+  it("places a bet inside the locked round transaction and emits a pool update", async () => {
+    const { emitted, insertedBets, manager, tx } = createManager(0);
+    const walletAddress = Keypair.generate().publicKey.toBase58();
+
+    const result = await manager.placeBet({
+      roundId: "round-1",
+      side: "A",
+      amount: "1.25",
+      walletAddress,
+    });
+
+    expect(result.success).toBe(true);
+    expect(tx.execute).toHaveBeenCalledTimes(2);
+    expect(tx.select).toHaveBeenCalledOnce();
+    expect(insertedBets).toHaveLength(1);
+    expect(insertedBets[0]).toMatchObject({
+      roundId: "round-1",
+      bettorWallet: walletAddress,
+      side: "A",
+      sourceAmount: "1.25",
+      goldAmount: "1.25",
+      status: "CONFIRMED",
+    });
+    expect(emitted).toEqual([
+      {
+        event: "betting:pool:updated",
+        payload: {
+          roundId: "round-1",
+          sideATotal: "0",
+          sideBTotal: "0",
+          sideACount: 0,
+          sideBCount: 0,
+        },
+      },
+    ]);
+  });
+
+  it("rejects per-wallet round spam before inserting another bet", async () => {
+    const { insertedBets, manager, tx } = createManager(
+      internals.MAX_BETS_PER_WALLET_PER_ROUND,
+    );
+
+    const result = await manager.placeBet({
+      roundId: "round-1",
+      side: "A",
+      amount: "1",
+      walletAddress: Keypair.generate().publicKey.toBase58(),
+    });
+
+    expect(result).toEqual({
+      success: false,
+      error: "Too many bets for this wallet on this round",
+    });
+    expect(tx.execute).toHaveBeenCalledTimes(2);
+    expect(tx.select).toHaveBeenCalledOnce();
+    expect(tx.insert).not.toHaveBeenCalled();
+    expect(insertedBets).toHaveLength(0);
+  });
+});
diff --git a/packages/server/tests/unit/systems/DuelScheduler/PayoutKeeper.test.ts b/packages/server/tests/unit/systems/DuelScheduler/PayoutKeeper.test.ts
new file mode 100644
index 000000000..a613d13a2
--- /dev/null
+++ b/packages/server/tests/unit/systems/DuelScheduler/PayoutKeeper.test.ts
@@ -0,0 +1,165 @@
+import { describe, expect, it, vi } from "vitest";
+import {
+  __payoutKeeperTestInternals as internals,
+  claimDuePayoutJobIds,
+} from "../../../../src/systems/DuelScheduler/PayoutKeeper.js";
+
+function extractSqlText(query: unknown): string {
+  if (!query || typeof query !== "object" || !("queryChunks" in query)) {
+    return "";
+  }
+
+  const chunks = (query as { queryChunks?: unknown[] }).queryChunks;
+  if (!Array.isArray(chunks)) {
+    return "";
+  }
+
+  return chunks
+    .flatMap((chunk) => {
+      if (!chunk || typeof chunk !== "object" || !("value" in chunk)) {
+        return [];
+      }
+      const value = (chunk as { value?: unknown }).value;
+      return Array.isArray(value)
+        ? value.filter((entry): entry is string => typeof entry === "string")
+        : [];
+    })
+    .join(" ");
+}
+
+describe("claimDuePayoutJobIds", () => {
+  it("builds a locking claim query with FOR UPDATE SKIP LOCKED", async () => {
+    const capturedQueries: string[] = [];
+    const tx = {
+      execute: async (query: unknown) => {
+        capturedQueries.push(extractSqlText(query));
+        return { rows: [{ id: "job-1" }] };
+      },
+    } as Parameters<typeof claimDuePayoutJobIds>[0];
+
+    const claimed = await claimDuePayoutJobIds(tx, 1_000, 1);
+
+    expect(claimed).toEqual(["job-1"]);
+    expect(capturedQueries[0]).toContain("FOR UPDATE SKIP LOCKED");
+    expect(capturedQueries[0]).toContain('"solana_payout_jobs"');
+  });
+
+  it("does not claim the same pending row twice across workers", async () => {
+    const dueJobIds = ["job-1", "job-2"];
+    const lockedJobIds = new Set<string>();
+
+    const createTx = (): Parameters<typeof claimDuePayoutJobIds>[0] =>
+      ({
+        execute: async () => {
+          const available = dueJobIds.filter((id) => !lockedJobIds.has(id));
+          const claimed = available.slice(0, 1);
+          for (const id of claimed) {
+            lockedJobIds.add(id);
+          }
+          return {
+            rows: claimed.map((id) => ({ id })),
+          };
+        },
+      }) as Parameters<typeof claimDuePayoutJobIds>[0];
+
+    expect(await claimDuePayoutJobIds(createTx(), 1_000, 1)).toEqual(["job-1"]);
+    expect(await claimDuePayoutJobIds(createTx(), 1_000, 1)).toEqual(["job-2"]);
+    expect(await claimDuePayoutJobIds(createTx(), 1_000, 1)).toEqual([]);
+  });
+});
+
+describe("processOneJob", () => {
+  function createDb(params: { betSide: "A" | "B"; winnerId: string }): {
+    db: Parameters<typeof internals.processOneJob>[0];
+    updates: unknown[];
+  } {
+    let selectCall = 0;
+    const updates: unknown[] = [];
+    const db = {
+      execute: vi.fn(async () => ({
+        rows: [{ acquired: true }],
+      })),
+      select: vi.fn(() => {
+        const call = selectCall;
+        selectCall += 1;
+        if (call === 0) {
+          return {
+            from: () => ({
+              where: () => ({
+                limit: async () => [
+                  {
+                    id: "round-1",
+                    agentAId: "agent-a",
+                    agentBId: "agent-b",
+                    winnerId: params.winnerId,
+                  },
+                ],
+              }),
+            }),
+          };
+        }
+        return {
+          from: () => ({
+            where: async () => [
+              {
+                side: params.betSide,
+              },
+            ],
+          }),
+        };
+      }),
+      update: vi.fn(() => ({
+        set: (value: unknown) => {
+          updates.push(value);
+          return {
+            where: () => ({
+              returning: async () => [{ id: "job-1" }],
+            }),
+          };
+        },
+      })),
+    } as Parameters<typeof internals.processOneJob>[0];
+    return { db, updates };
+  }
+
+  const job = {
+    id: "job-1",
+    roundId: "round-1",
+    bettorWallet: "wallet-1",
+    attempts: 0,
+  } as Parameters<typeof internals.processOneJob>[1];
+
+  it("marks a winning confirmed bet ready for payout", async () => {
+    const { db, updates } = createDb({ betSide: "A", winnerId: "agent-a" });
+
+    await internals.processOneJob(db, job);
+
+    expect(db.execute).toHaveBeenCalledOnce();
+    expect(updates).toContainEqual(
+      expect.objectContaining({ status: "READY_FOR_PAYOUT" }),
+    );
+  });
+
+  it("marks losing confirmed bets as no-payout", async () => {
+    const { db, updates } = createDb({ betSide: "B", winnerId: "agent-a" });
+
+    await internals.processOneJob(db, job);
+
+    expect(db.execute).toHaveBeenCalledOnce();
+    expect(updates).toContainEqual(
+      expect.objectContaining({ status: "NO_PAYOUT" }),
+    );
+  });
+
+  it("skips processing when another worker holds the advisory lock", async () => {
+    const { db, updates } = createDb({ betSide: "A", winnerId: "agent-a" });
+    db.execute = vi.fn(async () => ({
+      rows: [{ acquired: false }],
+    })) as typeof db.execute;
+
+    await internals.processOneJob(db, job);
+
+    expect(db.select).not.toHaveBeenCalled();
+    expect(updates).toEqual([]);
+  });
+});
diff --git a/packages/server/tests/unit/systems/DuelScheduler/SolanaArenaOperator.test.ts b/packages/server/tests/unit/systems/DuelScheduler/SolanaArenaOperator.test.ts
new file mode 100644
index 000000000..2994f352a
--- /dev/null
+++ b/packages/server/tests/unit/systems/DuelScheduler/SolanaArenaOperator.test.ts
@@ -0,0 +1,124 @@
+import { Keypair, PublicKey, SystemProgram } from "@solana/web3.js";
+import { describe, expect, it } from "vitest";
+import { __solanaArenaOperatorTestInternals as internals } from "../../../../src/systems/DuelScheduler/SolanaArenaOperator.js";
+
+const hex32 = (byte: string): string => byte.repeat(32);
+
+describe("SolanaArenaOperator serialization", () => {
+  it("serializes report_result with the expected Anchor/Borsh byte layout", () => {
+    const reporter = Keypair.generate().publicKey;
+    const oracleConfig = Keypair.generate().publicKey;
+    const duelState = Keypair.generate().publicKey;
+    const programId = Keypair.generate().publicKey;
+    const metadataUri = "ipfs://result";
+    const seed = 0x0102030405060708n;
+    const duelEndTs = 1_777_777_777n;
+
+    const instruction = internals.buildReportResultInstruction({
+      reporter,
+      oracleConfig,
+      duelState,
+      programId,
+      duelKeyBytes: internals.hexToBytes32(hex32("01")),
+      winner: internals.MARKET_SIDE.A,
+      seed,
+      replayHash: internals.hexToBytes32(hex32("02")),
+      resultHash: internals.hexToBytes32(hex32("03")),
+      duelEndTs,
+      metadataUri,
+    });
+
+    const data = instruction.data;
+    expect(instruction.programId.equals(programId)).toBe(true);
+    expect(instruction.keys.map((key) => key.pubkey.toBase58())).toEqual([
+      reporter.toBase58(),
+      oracleConfig.toBase58(),
+      duelState.toBase58(),
+    ]);
+    expect(data.subarray(0, 8)).toEqual(internals.REPORT_RESULT_DISCRIMINATOR);
+    expect(data.subarray(8, 40)).toEqual(Buffer.alloc(32, 0x01));
+    expect(data.readUInt8(40)).toBe(internals.MARKET_SIDE.A);
+    expect(data.readBigUInt64LE(41)).toBe(seed);
+    expect(data.subarray(49, 81)).toEqual(Buffer.alloc(32, 0x02));
+    expect(data.subarray(81, 113)).toEqual(Buffer.alloc(32, 0x03));
+    expect(data.readBigInt64LE(113)).toBe(duelEndTs);
+    expect(data.readUInt32LE(121)).toBe(Buffer.byteLength(metadataUri));
+    expect(data.subarray(125).toString("utf8")).toBe(metadataUri);
+    expect(data.length).toBe(125 + Buffer.byteLength(metadataUri));
+  });
+
+  it("serializes upsert_duel with deterministic key ordering and timestamps", () => {
+    const reporter = Keypair.generate().publicKey;
+    const oracleConfig = Keypair.generate().publicKey;
+    const duelState = Keypair.generate().publicKey;
+    const programId = Keypair.generate().publicKey;
+    const metadataUri = "ipfs://duel";
+
+    const instruction = internals.buildUpsertDuelInstruction({
+      reporter,
+      oracleConfig,
+      duelState,
+      programId,
+      duelKeyBytes: internals.hexToBytes32(hex32("0a")),
+      participantAHash: internals.hexToBytes32(hex32("0b")),
+      participantBHash: internals.hexToBytes32(hex32("0c")),
+      betOpenTs: 11n,
+      betCloseTs: 22n,
+      duelStartTs: 33n,
+      metadataUri,
+      status: internals.DUEL_STATUS.BettingOpen,
+    });
+
+    const data = instruction.data;
+    expect(instruction.keys.map((key) => key.pubkey.toBase58())).toEqual([
+      reporter.toBase58(),
+      oracleConfig.toBase58(),
+      duelState.toBase58(),
+      SystemProgram.programId.toBase58(),
+    ]);
+    expect(data.subarray(0, 8)).toEqual(internals.UPSERT_DUEL_DISCRIMINATOR);
+    expect(data.subarray(8, 40)).toEqual(Buffer.alloc(32, 0x0a));
+    expect(data.subarray(40, 72)).toEqual(Buffer.alloc(32, 0x0b));
+    expect(data.subarray(72, 104)).toEqual(Buffer.alloc(32, 0x0c));
+    expect(data.readBigInt64LE(104)).toBe(11n);
+    expect(data.readBigInt64LE(112)).toBe(22n);
+    expect(data.readBigInt64LE(120)).toBe(33n);
+    expect(data.readUInt32LE(128)).toBe(Buffer.byteLength(metadataUri));
+    expect(data.subarray(132, 132 + metadataUri.length).toString("utf8")).toBe(
+      metadataUri,
+    );
+    expect(data.readUInt8(132 + metadataUri.length)).toBe(
+      internals.DUEL_STATUS.BettingOpen,
+    );
+  });
+
+  it("rejects malformed proof hex instead of silently truncating", () => {
+    expect(() => internals.hexToBytes32("abc")).toThrow(/32-byte/);
+    expect(() => internals.hexToBytes32(hex32("gg"))).toThrow(/32-byte/);
+  });
+
+  it("parses reporter keypairs without byte coercion", () => {
+    const keypair = Keypair.generate();
+    const parsed = internals.parseKeypair(
+      JSON.stringify([...keypair.secretKey]),
+    );
+
+    expect(parsed.publicKey.toBase58()).toBe(keypair.publicKey.toBase58());
+    expect(() =>
+      internals.parseKeypair(JSON.stringify([256, ...Array(63).fill(0)])),
+    ).toThrow(/integers in \[0, 255\]/);
+    expect(() =>
+      internals.parseKeypair(JSON.stringify(Array(63).fill(1))),
+    ).toThrow(/64 bytes/);
+  });
+
+  it("hashes participant IDs to stable 32-byte digests", () => {
+    const first = internals.hashParticipant("agent-a");
+    const second = internals.hashParticipant("agent-a");
+    const other = internals.hashParticipant("agent-b");
+
+    expect(first).toHaveLength(32);
+    expect(Buffer.from(first).equals(Buffer.from(second))).toBe(true);
+    expect(Buffer.from(first).equals(Buffer.from(other))).toBe(false);
+  });
+});
diff --git a/packages/shared/package.json b/packages/shared/package.json
index 9eb24e9fe..7ace7d6f6 100644
--- a/packages/shared/package.json
+++ b/packages/shared/package.json
@@ -14,7 +14,7 @@
       "require": "./build/framework.js"
     },
     "./client": {
-      "types": "./build/framework.d.ts",
+      "types": "./build/framework.client.d.ts",
       "import": "./build/framework.client.js",
       "default": "./build/framework.client.js"
     }
diff --git a/packages/shared/scripts/build.mjs b/packages/shared/scripts/build.mjs
index be6b19cab..0d3b7511a 100644
--- a/packages/shared/scripts/build.mjs
+++ b/packages/shared/scripts/build.mjs
@@ -184,6 +184,17 @@ async function generateDeclarations() {
   } else {
     console.warn('⚠️  index.d.ts not found at', indexDts)
   }
+
+  // Copy index.client.d.ts to framework.client.d.ts for client-only types
+  const indexClientDts = path.join(buildDir, 'index.client.d.ts')
+  const frameworkClientDts = path.join(buildDir, 'framework.client.d.ts')
+
+  if (await fs.pathExists(indexClientDts)) {
+    await fs.copy(indexClientDts, frameworkClientDts)
+    console.log('✓ Copied index.client.d.ts to framework.client.d.ts')
+  } else {
+    console.warn('⚠️  index.client.d.ts not found at', indexClientDts)
+  }
 }
 
 /**
diff --git a/packages/shared/src/constants/BankingConstants.ts b/packages/shared/src/constants/BankingConstants.ts
index 3361a0053..1e75a7991 100644
--- a/packages/shared/src/constants/BankingConstants.ts
+++ b/packages/shared/src/constants/BankingConstants.ts
@@ -2,6 +2,8 @@
  * Banking system constants
  */
 
+import { MAX_COINS } from "../systems/shared/character/CoinPouchSystem";
+
 export const BANKING_CONSTANTS = Object.freeze({
   // Bank sizes
   MAX_BANK_SLOTS: 480, // 12 tabs * 40 slots per tab
@@ -16,7 +18,7 @@ export const BANKING_CONSTANTS = Object.freeze({
   ITEMS_PER_ROW: 8,
 
   // Transaction limits
-  MAX_ITEM_STACK: 2147483647, // Max int32
+  MAX_ITEM_STACK: MAX_COINS,
   MIN_ITEM_QUANTITY: 1,
 
   // Error messages
diff --git a/packages/shared/src/constants/CombatConstants.ts b/packages/shared/src/constants/CombatConstants.ts
index 8527d1aa2..8f14cafa3 100644
--- a/packages/shared/src/constants/CombatConstants.ts
+++ b/packages/shared/src/constants/CombatConstants.ts
@@ -56,6 +56,20 @@ export const COMBAT_CONSTANTS = {
   /** Maximum heal amount per food item (prevents exploit with modified manifests) */
   MAX_HEAL_AMOUNT: 99,
 
+  // === Special Attack Energy (OSRS-accurate) ===
+  /** Maximum special energy (100% = 1000 internal, displayed as 0-100%) */
+  SPECIAL_ENERGY_MAX: 1000,
+  /** Energy recharged per interval (10% = 100 internal) */
+  SPECIAL_ENERGY_RECHARGE_AMOUNT: 100,
+  /** Ticks between recharge intervals (50 ticks * 600ms = 30 seconds) */
+  SPECIAL_ENERGY_RECHARGE_TICKS: 50,
+  /** MVP: flat cost for all weapon specials (25% = 250 internal) */
+  SPECIAL_ATTACK_MVP_COST: 250,
+  /** MVP: flat damage multiplier for all specials (1.2x) */
+  SPECIAL_ATTACK_MVP_DAMAGE_MULTIPLIER: 1.2,
+  /** Cooldown between special attack toggles (ms) */
+  SPECIAL_ATTACK_TOGGLE_COOLDOWN_MS: 500,
+
   // === Hit Delay ===
   // Formula: MELEE=0, RANGED=1+floor((3+dist)/6), MAGIC=1+floor((1+dist)/3)
   HIT_DELAY: {
diff --git a/packages/shared/src/constants/interaction.ts b/packages/shared/src/constants/interaction.ts
index e01f5ce1b..5f2ba65cf 100644
--- a/packages/shared/src/constants/interaction.ts
+++ b/packages/shared/src/constants/interaction.ts
@@ -6,6 +6,7 @@
  */
 
 import { BANKING_CONSTANTS } from "./BankingConstants";
+import { MAX_COINS } from "../systems/shared/character/CoinPouchSystem";
 
 // ============================================================================
 // SESSION TYPES
@@ -66,7 +67,7 @@ export const SESSION_CONFIG = {
 export const INPUT_LIMITS = {
   MAX_ITEM_ID_LENGTH: 64,
   MAX_STORE_ID_LENGTH: 64,
-  MAX_QUANTITY: 2_147_483_647, // Max signed 32-bit int
+  MAX_QUANTITY: MAX_COINS,
   MAX_INVENTORY_SLOTS: 28,
   /** Single source of truth: BankingConstants.ts */
   MAX_BANK_SLOTS: BANKING_CONSTANTS.MAX_BANK_SLOTS,
diff --git a/packages/shared/src/core/World.ts b/packages/shared/src/core/World.ts
index 68082bba5..8f3b298fd 100644
--- a/packages/shared/src/core/World.ts
+++ b/packages/shared/src/core/World.ts
@@ -31,6 +31,7 @@ import {
   FrameBudgetManager,
   type FrameTimingStats,
 } from "../utils/FrameBudgetManager";
+import { normalizeAvatarAssetUrl } from "../data/avatars";
 
 // NOTE: Import directly to avoid circular dependency through barrel file
 // The barrel imports combat which imports MobEntity which extends Entity (circular)
@@ -148,6 +149,87 @@ function getSystemDebugName(
 
 let hasLoggedMissingAssetBase = false;
 
+const TREE_ASSET_FAMILY_REWRITES = Object.freeze<
+  Record<string, readonly string[]>
+>({
+  bamboo: ["bamboo_01", "bamboo_02", "bamboo_03", "bamboo_04"],
+  banana: ["oak_01", "oak_02", "oak_03", "oak_04"],
+  dead: ["dead_01", "dead_02", "dead_03", "dead_04", "dead_05", "dead_06"],
+  eucalyptus: ["oak_01", "oak_02", "oak_03", "oak_04", "oak_01"],
+  general: ["oak_01", "oak_02", "oak_03", "oak_04", "oak_01", "oak_02"],
+  magic: ["oak_03", "oak_04"],
+  maple: ["maple_01", "maple_02", "maple_03", "maple_01"],
+  mahogany: ["oak_02", "oak_03"],
+  oak: ["oak_01", "oak_02", "oak_03", "oak_04"],
+  palm: ["palm_01", "palm_02", "palm_03", "palm_04", "palm_05"],
+  pine: ["pine_01", "pine_02", "pine_03", "pine_01", "pine_02"],
+  pineDead: ["dead_01", "dead_02", "dead_03"],
+});
+
+function normalizeTreeAssetAlias(url: string): string {
+  const queryIndex = url.indexOf("?");
+  const hashIndex = url.indexOf("#");
+  const suffixStart =
+    queryIndex === -1
+      ? hashIndex
+      : hashIndex === -1
+        ? queryIndex
+        : Math.min(queryIndex, hashIndex);
+  const suffix = suffixStart >= 0 ? url.slice(suffixStart) : "";
+  const baseUrl = suffixStart >= 0 ? url.slice(0, suffixStart) : url;
+
+  const marker = "/models/trees/";
+  const markerIndex = baseUrl.toLowerCase().indexOf(marker);
+  if (markerIndex === -1) {
+    return url;
+  }
+
+  const prefix = baseUrl.slice(0, markerIndex + marker.length);
+  const assetPath = baseUrl.slice(markerIndex + marker.length);
+  const familySeparatorIndex = assetPath.indexOf("/");
+  if (familySeparatorIndex <= 0) {
+    return url;
+  }
+
+  const family = assetPath.slice(0, familySeparatorIndex);
+  const fileName = assetPath.slice(familySeparatorIndex + 1);
+  if (!fileName.toLowerCase().endsWith(".glb")) {
+    return url;
+  }
+
+  const withoutExtension = fileName.slice(0, -4);
+  const lodSuffix = withoutExtension.endsWith("_lod1")
+    ? "_lod1"
+    : withoutExtension.endsWith("_lod2")
+      ? "_lod2"
+      : "";
+  const withoutLod = lodSuffix
+    ? withoutExtension.slice(0, -lodSuffix.length)
+    : withoutExtension;
+  const indexSeparatorIndex = withoutLod.lastIndexOf("_");
+  if (indexSeparatorIndex <= 0) {
+    return url;
+  }
+
+  const rawIndex = withoutLod.slice(indexSeparatorIndex + 1);
+  if (!/^\d+$/.test(rawIndex)) {
+    return url;
+  }
+
+  const replacements =
+    TREE_ASSET_FAMILY_REWRITES[
+      family as keyof typeof TREE_ASSET_FAMILY_REWRITES
+    ];
+  if (!replacements?.length) {
+    return url;
+  }
+
+  const index = Math.max(Number.parseInt(rawIndex, 10) - 1, 0);
+  const replacement =
+    replacements[index] ?? replacements[index % replacements.length];
+  return `${prefix}${replacement}${lodSuffix}.glb${suffix}`;
+}
+
 interface AsyncTickCallMetric {
   label: string;
   phase: "fixedUpdate" | "update" | "lateUpdate";
@@ -2079,6 +2161,7 @@ export class World extends EventEmitter {
   resolveURL(url: string, allowLocal?: boolean): string {
     if (!url) return url;
     url = url.trim();
+    url = normalizeAvatarAssetUrl(url, url);
 
     // Some persisted player records store shorthand avatar filenames like "ws-avatar.vrm".
     // Treat these as local avatar assets instead of mistaken bare hostnames.
@@ -2096,7 +2179,7 @@ export class World extends EventEmitter {
       url = `asset://avatars/${filename}${suffix}`;
     } else {
       const relativeAvatarMatch = url.match(
-        /^(?:\.\/|\/)?(avatars\/[A-Za-z0-9_./-]+\.vrm)([?#].*)?$/i,
+        /^(?:\.\/|\/)?(avatars\/[A-Za-z0-9_.-]+\.vrm)([?#].*)?$/i,
       );
       if (relativeAvatarMatch) {
         const [, relativePathRaw, suffix = ""] = relativeAvatarMatch;
@@ -2109,6 +2192,8 @@ export class World extends EventEmitter {
       }
     }
 
+    url = normalizeTreeAssetAlias(url);
+
     // Blob URLs are already resolved
     if (url.startsWith("blob")) {
       return url;
@@ -2138,7 +2223,7 @@ export class World extends EventEmitter {
         ) {
           if (this._resolvedCdnFallback === undefined) {
             this._resolvedCdnFallback =
-              (window as any).__CDN_URL ||
+              (window as unknown as { __CDN_URL?: string }).__CDN_URL ||
               `${window.location.origin}/game-assets`;
             console.warn(
               `[resolveURL] Origin is ${window.location.origin}, falling back from ${finalAssetsUrl} to local ${this._resolvedCdnFallback}`,
diff --git a/packages/shared/src/core/__tests__/World.resolveURL.test.ts b/packages/shared/src/core/__tests__/World.resolveURL.test.ts
new file mode 100644
index 000000000..6665e5817
--- /dev/null
+++ b/packages/shared/src/core/__tests__/World.resolveURL.test.ts
@@ -0,0 +1,79 @@
+import { describe, expect, it } from "vitest";
+import { World } from "../World";
+
+describe("World.resolveURL", () => {
+  it("rewrites missing packaged tree families to existing CDN assets", () => {
+    const world = new World();
+    world.assetsUrl = "https://cdn.example.com/game-assets";
+
+    expect(
+      world.resolveURL("asset://models/trees/general/general_05.glb"),
+    ).toBe("https://cdn.example.com/game-assets/models/trees/oak_01.glb");
+    expect(
+      world.resolveURL("asset://models/trees/eucalyptus/eucalyptus_04.glb"),
+    ).toBe("https://cdn.example.com/game-assets/models/trees/oak_04.glb");
+    expect(
+      world.resolveURL("asset://models/trees/oak/oak_02.glb"),
+    ).toBe("https://cdn.example.com/game-assets/models/trees/oak_02.glb");
+    expect(
+      world.resolveURL("asset://models/trees/pine/pine_05.glb"),
+    ).toBe("https://cdn.example.com/game-assets/models/trees/pine_02.glb");
+    expect(
+      world.resolveURL("asset://models/trees/magic/magic_02_lod2.glb"),
+    ).toBe(
+      "https://cdn.example.com/game-assets/models/trees/oak_04_lod2.glb",
+    );
+  });
+
+  it("rewrites missing packaged tree families to existing local assets", () => {
+    const world = new World();
+    world.assetsDir = "/tmp/hyperscape-assets";
+
+    expect(
+      world.resolveURL(
+        "asset://models/trees/mahogany/mahogany_02.glb?cache=1",
+        true,
+      ),
+    ).toBe("/tmp/hyperscape-assets/models/trees/oak_03.glb?cache=1");
+    expect(
+      world.resolveURL(
+        "asset://models/trees/pineDead/pineDead_03.glb#preview",
+        true,
+      ),
+    ).toBe("/tmp/hyperscape-assets/models/trees/dead_03.glb#preview");
+    expect(
+      world.resolveURL("asset://models/trees/maple/maple_04.glb", true),
+    ).toBe("/tmp/hyperscape-assets/models/trees/maple_01.glb");
+  });
+
+  it("leaves valid packaged asset paths untouched", () => {
+    const world = new World();
+    world.assetsUrl = "https://cdn.example.com/game-assets";
+
+    expect(world.resolveURL("asset://models/trees/oak_03.glb")).toBe(
+      "https://cdn.example.com/game-assets/models/trees/oak_03.glb",
+    );
+  });
+
+  it("normalizes avatar LOD URLs before resolving fetch paths", () => {
+    const world = new World();
+    world.assetsUrl = "https://cdn.example.com/game-assets";
+
+    expect(
+      world.resolveURL("asset://avatars/avatar-male-01_lod1.vrm"),
+    ).toBe("https://cdn.example.com/game-assets/avatars/avatar-male-01.vrm");
+    expect(
+      world.resolveURL("avatars/avatar-female-02_lod2.vrm?cache=1"),
+    ).toBe(
+      "https://cdn.example.com/game-assets/avatars/avatar-female-02.vrm?cache=1",
+    );
+    expect(world.resolveURL("avatar-male-01_lod2.vrm#preview")).toBe(
+      "https://cdn.example.com/game-assets/avatars/avatar-male-01.vrm#preview",
+    );
+    expect(
+      world.resolveURL(
+        "https://assets.example.com/avatars/avatar-female-01_lod1.vrm",
+      ),
+    ).toBe("https://assets.example.com/avatars/avatar-female-01.vrm");
+  });
+});
diff --git a/packages/shared/src/data/DataManager.ts b/packages/shared/src/data/DataManager.ts
index 84a1fc326..26cc5a84e 100644
--- a/packages/shared/src/data/DataManager.ts
+++ b/packages/shared/src/data/DataManager.ts
@@ -54,6 +54,7 @@ import {
   type ModelBoundsManifest,
 } from "./StationDataProvider";
 import { prayerDataProvider, type PrayersManifest } from "./PrayerDataProvider";
+import { getRuntimeClientAssetBase } from "../utils/clientAssetBase";
 
 // Define constants from JSON data
 const STARTING_ITEMS: Array<{ id: string }> = []; // Stub - data removed
@@ -100,40 +101,10 @@ function isBuildingsManifest(value: unknown): value is BuildingsManifest {
   );
 }
 
-type BrowserDataWindow = Window & {
-  __CDN_URL?: string;
-  __ASSETS_URL?: string;
-};
-
 function getClientAssetsBaseUrl(): string {
-  let cdnUrl =
-    process.env.PUBLIC_CDN_URL || "http://localhost:5555/game-assets";
-
-  if (typeof window !== "undefined") {
-    const windowWithCdn = window as BrowserDataWindow;
-    if (windowWithCdn.__ASSETS_URL) {
-      cdnUrl = windowWithCdn.__ASSETS_URL;
-    } else if (windowWithCdn.__CDN_URL) {
-      cdnUrl = windowWithCdn.__CDN_URL;
-    } else if (
-      typeof import.meta !== "undefined" &&
-      import.meta.env?.PUBLIC_CDN_URL
-    ) {
-      cdnUrl =
-        import.meta.env.PUBLIC_CDN_URL || "http://localhost:5555/game-assets";
-    }
-  }
-
-  if (
-    typeof process !== "undefined" &&
-    typeof process.env !== "undefined" &&
-    process.env.PUBLIC_CDN_URL &&
-    !cdnUrl.includes("localhost")
-  ) {
-    cdnUrl = process.env.PUBLIC_CDN_URL;
-  }
-
-  return cdnUrl;
+  return getRuntimeClientAssetBase(
+    process.env.PUBLIC_CDN_URL || "http://localhost:5555/game-assets",
+  );
 }
 
 async function fetchRequiredJson<T>(url: string, label: string): Promise<T> {
diff --git a/packages/shared/src/data/NoteGenerator.ts b/packages/shared/src/data/NoteGenerator.ts
index eeb25b366..ba9699d81 100644
--- a/packages/shared/src/data/NoteGenerator.ts
+++ b/packages/shared/src/data/NoteGenerator.ts
@@ -20,6 +20,7 @@
 
 import type { Item } from "../types/game/item-types";
 import { ItemRarity } from "../types/entities";
+import { MAX_COINS } from "../systems/shared/character/CoinPouchSystem";
 
 /** NOTE SUFFIX: Appended to base item ID to create noted variant */
 export const NOTE_SUFFIX = "_noted";
@@ -111,7 +112,7 @@ export function generateNotedItem(baseItem: Item): Item {
 
     // Noted items are ALWAYS stackable
     stackable: true,
-    maxStackSize: 2147483647, // Max int32
+    maxStackSize: MAX_COINS,
 
     // Notes are weightless (paper)
     weight: 0,
diff --git a/packages/shared/src/data/__tests__/DataManager-resource-normalization.test.ts b/packages/shared/src/data/__tests__/DataManager-resource-normalization.test.ts
new file mode 100644
index 000000000..9d42bdf4e
--- /dev/null
+++ b/packages/shared/src/data/__tests__/DataManager-resource-normalization.test.ts
@@ -0,0 +1,40 @@
+import { describe, expect, it } from "vitest";
+import fs from "node:fs";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+
+type WoodcuttingManifest = {
+  trees: Array<{
+    id: string;
+    modelVariants?: string[];
+  }>;
+};
+
+function loadWoodcuttingManifest(): WoodcuttingManifest {
+  const __dirname = path.dirname(fileURLToPath(import.meta.url));
+  const manifestPath = path.resolve(
+    __dirname,
+    "../../../../server/world/assets/manifests/gathering/woodcutting.json",
+  );
+  return JSON.parse(
+    fs.readFileSync(manifestPath, "utf8"),
+  ) as WoodcuttingManifest;
+}
+
+describe("woodcutting manifest asset paths", () => {
+  it("uses source-of-truth nested tree model refs without flat runtime aliases", () => {
+    const manifest = loadWoodcuttingManifest();
+    const modelVariants = manifest.trees.flatMap(
+      (tree) => tree.modelVariants ?? [],
+    );
+    const staleFlatTreeRefs = modelVariants.filter((modelPath) => {
+      const prefix = "asset://models/trees/";
+      return (
+        modelPath.startsWith(prefix) &&
+        !modelPath.slice(prefix.length).includes("/")
+      );
+    });
+
+    expect(staleFlatTreeRefs).toEqual([]);
+  });
+});
diff --git a/packages/shared/src/data/__tests__/avatars.test.ts b/packages/shared/src/data/__tests__/avatars.test.ts
new file mode 100644
index 000000000..e09ff007f
--- /dev/null
+++ b/packages/shared/src/data/__tests__/avatars.test.ts
@@ -0,0 +1,47 @@
+import {
+  AVATAR_OPTIONS,
+  AvatarLOD,
+  DEFAULT_AVATAR_URL,
+  getAllAvatarLODUrls,
+  getAvatarUrlForLOD,
+  normalizeAvatarAssetUrl,
+} from "../avatars";
+
+describe("avatar definitions", () => {
+  it("does not advertise missing LOD files", () => {
+    for (const avatar of AVATAR_OPTIONS) {
+      expect(avatar.lod1Url).toBeUndefined();
+      expect(avatar.lod2Url).toBeUndefined();
+    }
+  });
+
+  it("falls back to the base VRM for all LOD requests", () => {
+    for (const avatar of AVATAR_OPTIONS) {
+      expect(getAvatarUrlForLOD(avatar, AvatarLOD.LOD0)).toBe(avatar.url);
+      expect(getAvatarUrlForLOD(avatar, AvatarLOD.LOD1)).toBe(avatar.url);
+      expect(getAvatarUrlForLOD(avatar, AvatarLOD.LOD2)).toBe(avatar.url);
+      expect(getAllAvatarLODUrls(avatar)).toEqual([avatar.url]);
+    }
+  });
+
+  it("normalizes stale avatar LOD URLs across supported forms", () => {
+    expect(
+      normalizeAvatarAssetUrl("asset://avatars/avatar-male-01_lod1.vrm"),
+    ).toBe("asset://avatars/avatar-male-01.vrm");
+    expect(
+      normalizeAvatarAssetUrl("avatars/avatar-female-02_lod2.vrm?cache=1"),
+    ).toBe("asset://avatars/avatar-female-02.vrm?cache=1");
+    expect(
+      normalizeAvatarAssetUrl("/avatars/avatar-female-01_lod1.vrm#preview"),
+    ).toBe("asset://avatars/avatar-female-01.vrm#preview");
+    expect(normalizeAvatarAssetUrl("ws-avatar_lod2.vrm")).toBe(
+      "asset://avatars/avatar-male-01.vrm",
+    );
+    expect(
+      normalizeAvatarAssetUrl(
+        "https://assets.example.com/avatars/avatar-male-02_lod1.vrm",
+      ),
+    ).toBe("https://assets.example.com/avatars/avatar-male-02.vrm");
+    expect(normalizeAvatarAssetUrl("")).toBe(DEFAULT_AVATAR_URL);
+  });
+});
diff --git a/packages/shared/src/data/avatars.ts b/packages/shared/src/data/avatars.ts
index c4d3ef10a..edc497173 100644
--- a/packages/shared/src/data/avatars.ts
+++ b/packages/shared/src/data/avatars.ts
@@ -31,6 +31,71 @@ export interface AvatarOption {
   description?: string;
 }
 
+export const DEFAULT_AVATAR_FILENAME = "avatar-male-01.vrm";
+export const DEFAULT_AVATAR_URL = `asset://avatars/${DEFAULT_AVATAR_FILENAME}`;
+
+const LEGACY_AVATAR_ALIASES: Record<string, string> = {
+  "ws-avatar.vrm": DEFAULT_AVATAR_FILENAME,
+  "avatar.vrm": DEFAULT_AVATAR_FILENAME,
+};
+
+const AVATAR_LOD_SUFFIX_PATTERN = /_lod[12](?=\.vrm$)/i;
+
+function normalizeAvatarFilename(filename: string): string {
+  const withoutLod = filename.replace(AVATAR_LOD_SUFFIX_PATTERN, "");
+  return LEGACY_AVATAR_ALIASES[withoutLod.toLowerCase()] ?? withoutLod;
+}
+
+function getAvatarLookupKey(url?: string | null): string | null {
+  const normalized = normalizeAvatarAssetUrl(url, "");
+  if (!normalized) return null;
+  const match = normalized.match(/([A-Za-z0-9_.-]+\.vrm)(?:[?#].*)?$/i);
+  return match ? normalizeAvatarFilename(match[1]).toLowerCase() : null;
+}
+
+export function normalizeAvatarAssetUrl(
+  url?: string | null,
+  fallbackUrl = DEFAULT_AVATAR_URL,
+): string {
+  const candidate = url?.trim() ?? "";
+  if (!candidate) return fallbackUrl;
+
+  const bareAvatarMatch = candidate.match(/^([A-Za-z0-9_.-]+\.vrm)([?#].*)?$/i);
+  if (bareAvatarMatch) {
+    const [, filenameRaw, suffix = ""] = bareAvatarMatch;
+    return `asset://avatars/${normalizeAvatarFilename(filenameRaw)}${suffix}`;
+  }
+
+  const relativeAvatarMatch = candidate.match(
+    /^(?:\.\/|\/)?avatars\/([A-Za-z0-9_.-]+\.vrm)([?#].*)?$/i,
+  );
+  if (relativeAvatarMatch) {
+    const [, filenameRaw, suffix = ""] = relativeAvatarMatch;
+    return `asset://avatars/${normalizeAvatarFilename(filenameRaw)}${suffix}`;
+  }
+
+  const assetAvatarMatch = candidate.match(
+    /^asset:\/\/avatars\/([A-Za-z0-9_.-]+\.vrm)([?#].*)?$/i,
+  );
+  if (assetAvatarMatch) {
+    const [, filenameRaw, suffix = ""] = assetAvatarMatch;
+    return `asset://avatars/${normalizeAvatarFilename(filenameRaw)}${suffix}`;
+  }
+
+  const absoluteAvatarMatch = candidate.match(
+    /^(https?:\/\/[^?#]+\/avatars\/)([A-Za-z0-9_.-]+\.vrm)([?#].*)?$/i,
+  );
+  if (absoluteAvatarMatch) {
+    const [, prefix, filenameRaw, suffix = ""] = absoluteAvatarMatch;
+    return `${prefix}${normalizeAvatarFilename(filenameRaw)}${suffix}`;
+  }
+
+  return candidate.replace(
+    /_lod[12](?=\.vrm(?:[?#].*)?$)/i,
+    "",
+  );
+}
+
 /** LOD level enum for avatar selection */
 export enum AvatarLOD {
   /** Full detail - 30K triangles (close range) */
@@ -66,40 +131,28 @@ export const AVATAR_OPTIONS: AvatarOption[] = [
   {
     id: "male-01",
     name: "Male Avatar 01",
-    // TEMP: Use non-optimized VRM to test humanoid.update issue
     url: "asset://avatars/avatar-male-01.vrm",
-    lod1Url: "asset://avatars/avatar-male-01_lod1.vrm",
-    lod2Url: "asset://avatars/avatar-male-01_lod2.vrm",
     previewPath: "/avatars/avatar-male-01.vrm",
     description: "Standard male humanoid avatar",
   },
   {
     id: "male-02",
     name: "Male Avatar 02",
-    // TEMP: Use non-optimized VRM to test humanoid.update issue
     url: "asset://avatars/avatar-male-02.vrm",
-    lod1Url: "asset://avatars/avatar-male-02_lod1.vrm",
-    lod2Url: "asset://avatars/avatar-male-02_lod2.vrm",
     previewPath: "/avatars/avatar-male-02.vrm",
     description: "Standard male humanoid avatar",
   },
   {
     id: "female-01",
     name: "Female Avatar 01",
-    // TEMP: Use non-optimized VRM to test humanoid.update issue
     url: "asset://avatars/avatar-female-01.vrm",
-    lod1Url: "asset://avatars/avatar-female-01_lod1.vrm",
-    lod2Url: "asset://avatars/avatar-female-01_lod2.vrm",
     previewPath: "/avatars/avatar-female-01.vrm",
     description: "Standard female humanoid avatar",
   },
   {
     id: "female-02",
     name: "Female Avatar 02",
-    // TEMP: Use non-optimized VRM to test humanoid.update issue
     url: "asset://avatars/avatar-female-02.vrm",
-    lod1Url: "asset://avatars/avatar-female-02_lod1.vrm",
-    lod2Url: "asset://avatars/avatar-female-02_lod2.vrm",
     previewPath: "/avatars/avatar-female-02.vrm",
     description: "Standard female humanoid avatar",
   },
@@ -116,12 +169,13 @@ export function getAvatarById(id: string): AvatarOption | undefined {
  * Get avatar by URL (checks url, lod1Url, lod2Url, and previewPath)
  */
 export function getAvatarByUrl(url: string): AvatarOption | undefined {
+  const lookupKey = getAvatarLookupKey(url);
   return AVATAR_OPTIONS.find(
     (avatar) =>
-      avatar.url === url ||
-      avatar.lod1Url === url ||
-      avatar.lod2Url === url ||
-      url.endsWith(avatar.previewPath),
+      getAvatarLookupKey(avatar.url) === lookupKey ||
+      getAvatarLookupKey(avatar.lod1Url) === lookupKey ||
+      getAvatarLookupKey(avatar.lod2Url) === lookupKey ||
+      getAvatarLookupKey(avatar.previewPath) === lookupKey,
   );
 }
 
@@ -154,12 +208,14 @@ export function getAvatarUrlForLOD(
 ): string {
   switch (lod) {
     case AvatarLOD.LOD2:
-      return avatar.lod2Url ?? avatar.lod1Url ?? avatar.url;
+      return normalizeAvatarAssetUrl(
+        avatar.lod2Url ?? avatar.lod1Url ?? avatar.url,
+      );
     case AvatarLOD.LOD1:
-      return avatar.lod1Url ?? avatar.url;
+      return normalizeAvatarAssetUrl(avatar.lod1Url ?? avatar.url);
     case AvatarLOD.LOD0:
     default:
-      return avatar.url;
+      return normalizeAvatarAssetUrl(avatar.url);
   }
 }
 
@@ -169,8 +225,11 @@ export function getAvatarUrlForLOD(
  * @returns Array of all available LOD URLs
  */
 export function getAllAvatarLODUrls(avatar: AvatarOption): string[] {
-  const urls = [avatar.url];
-  if (avatar.lod1Url) urls.push(avatar.lod1Url);
-  if (avatar.lod2Url) urls.push(avatar.lod2Url);
-  return urls;
+  return Array.from(
+    new Set(
+      [avatar.url, avatar.lod1Url, avatar.lod2Url]
+        .filter((url): url is string => Boolean(url))
+        .map((url) => normalizeAvatarAssetUrl(url)),
+    ),
+  );
 }
diff --git a/packages/shared/src/entities/player/PlayerEntity.ts b/packages/shared/src/entities/player/PlayerEntity.ts
index aa85bae85..64dde5241 100644
--- a/packages/shared/src/entities/player/PlayerEntity.ts
+++ b/packages/shared/src/entities/player/PlayerEntity.ts
@@ -567,6 +567,10 @@ export class PlayerEntity extends CombatantEntity {
 
       // Player-specific data from playerData
       stamina: this.playerData.stamina!,
+      specialEnergy: this.playerData.specialEnergy ?? {
+        current: 1000,
+        max: 1000,
+      },
       skills: this.playerData.skills!,
       equipment: this.playerData.equipment!,
       coins: this.playerData.coins!,
diff --git a/packages/shared/src/entities/player/PlayerLocal.ts b/packages/shared/src/entities/player/PlayerLocal.ts
index 5fefba88e..bb1757cf9 100644
--- a/packages/shared/src/entities/player/PlayerLocal.ts
+++ b/packages/shared/src/entities/player/PlayerLocal.ts
@@ -455,6 +455,7 @@ export class PlayerLocal extends Entity implements HotReloadable {
       health: this._playerHealth,
       alive: this.alive,
       stamina: { current: this.stamina, max: 100 },
+      specialEnergy: { current: 1000, max: 1000 },
       position: { x: this.position.x, y: this.position.y, z: this.position.z },
       skills: this.skills,
       equipment: this.equipment,
diff --git a/packages/shared/src/entities/player/PlayerRemote.ts b/packages/shared/src/entities/player/PlayerRemote.ts
index b0c6b9aeb..364374ab2 100644
--- a/packages/shared/src/entities/player/PlayerRemote.ts
+++ b/packages/shared/src/entities/player/PlayerRemote.ts
@@ -531,145 +531,104 @@ export class PlayerRemote extends Entity implements HotReloadable {
       ) {
         avatarWithInstance.instance.disableRateCheck();
       }
+      loadSuccess = true;
+      this.avatarUrl = avatarUrl;
+      this._nextAvatarRetryAt = 0;
 
-      // Set up positioning
-      const headHeight = this.avatar.getHeadToHeight()!;
-      // Bubble goes at head height for chat
-      this.bubble.position.y = headHeight + 0.2;
-
-      nodeObj.position.set(0, 0, 0);
-
-      // PERFORMANCE: Disable raycasting on VRM meshes - use raycastProxy instead
-      // SkinnedMesh raycast is extremely slow (~700ms) because THREE.js must
-      // transform every vertex by bone weights. The capsule proxy mesh is instant.
       const instanceWithRaw = avatarWithInstance.instance as unknown as {
         raw?: { scene?: THREE.Object3D };
       };
-      if (instanceWithRaw?.raw?.scene) {
-        instanceWithRaw.raw.scene.traverse((child: THREE.Object3D) => {
-          child.raycast = () => {}; // No-op raycast
+      const rawScene = instanceWithRaw?.raw?.scene;
+      if (rawScene) {
+        rawScene.visible = false;
+        rawScene.traverse((child: THREE.Object3D) => {
+          child.raycast = () => {};
         });
+        this.mesh = rawScene as THREE.Object3D;
       }
 
-      // CRITICAL: Load and apply idle emote BEFORE making avatar visible
-      // This prevents T-pose flash on spawn
-      const avatarWithEmote = this.avatar as AvatarWithInstance;
-      if (avatarWithEmote.instance?.setEmoteAndWait) {
-        // Use setEmoteAndWait to ensure animation is loaded and first frame is applied
-        await avatarWithEmote.instance.setEmoteAndWait(Emotes.IDLE, 3000);
-      } else if (avatarWithEmote.setEmote) {
-        // Fallback to regular setEmote (may show brief T-pose)
-        avatarWithEmote.setEmote(Emotes.IDLE);
-      }
-      this.lastEmote = Emotes.IDLE;
-
-      // NOW make avatar visible - idle animation is guaranteed to be playing
-      if (instanceWithRaw?.raw?.scene) {
-        instanceWithRaw.raw.scene.visible = true;
-      }
-
-      // Pre-warm essential emotes in background to prevent T-pose on first use
-      // This is fire-and-forget - doesn't block avatar display
-      if (avatarWithEmote.instance?.preloadEmote) {
-        for (const emote of essentialEmotes) {
-          if (emote !== Emotes.IDLE) {
-            // IDLE already loaded
-            avatarWithEmote.instance.preloadEmote(emote);
-          }
+      let camHeight = 1.35;
+      try {
+        const headHeight = this.avatar.getHeadToHeight() ?? 1.6;
+        this.bubble.position.y = headHeight + 0.2;
+        nodeObj.position.set(0, 0, 0);
+
+        const avatarWithEmote = this.avatar as AvatarWithInstance;
+        if (avatarWithEmote.instance?.setEmoteAndWait) {
+          await avatarWithEmote.instance.setEmoteAndWait(Emotes.IDLE, 3000);
+        } else if (avatarWithEmote.setEmote) {
+          avatarWithEmote.setEmote(Emotes.IDLE);
         }
-      }
+        this.lastEmote = Emotes.IDLE;
 
-      // Calculate camera height for spectator mode (same as PlayerLocal)
-      interface AvatarWithHeight {
-        height?: number;
-      }
-      const avatarHeight = (this.avatar as AvatarWithHeight).height ?? 1.5;
-      const camHeight = Math.max(1.2, avatarHeight * 0.9);
-
-      // HLOD: Set mesh reference (VRM scene is the mesh)
-      if (instanceWithRaw?.raw?.scene) {
-        this.mesh = instanceWithRaw.raw.scene as THREE.Object3D;
-
-        // Initialize HLOD impostor support for VRM players
-        // VRM models use a different rendering path (avatarInstance.move()) but we can still use impostors.
-        // The key is that this.node.position is kept in sync with the VRM's world position.
-        await this.initHLOD(`vrm_player_${this.id}_${avatarUrl}`, {
-          category: "player",
-          atlasSize: 512, // Smaller for players
-          hemisphere: true,
-          freezeAnimationAtLOD1: true, // Freeze animation at medium distance
-          prepareForBake: async () => {
-            // Prepare VRM mesh for impostor baking at local origin
-            if (this.mesh && this.avatar) {
-              const savedPosition = this.mesh.position.clone();
-              const savedQuaternion = this.mesh.quaternion.clone();
-
-              // Move mesh to local origin for baking
-              this.mesh.position.set(0, 0, 0);
-              this.mesh.quaternion.identity();
-
-              // Update to ensure current pose
-              const avatarWithInstance = this.avatar as AvatarWithInstance;
-              avatarWithInstance.instance?.update(0);
-              this.mesh.updateMatrixWorld(true);
-
-              // Restore position after baking (microtask)
-              Promise.resolve().then(() => {
-                if (this.mesh) {
-                  this.mesh.position.copy(savedPosition);
-                  this.mesh.quaternion.copy(savedQuaternion);
-                  this.mesh.updateMatrixWorld(true);
-                }
-              });
+        if (avatarWithEmote.instance?.preloadEmote) {
+          for (const emote of essentialEmotes) {
+            if (emote !== Emotes.IDLE) {
+              avatarWithEmote.instance.preloadEmote(emote);
             }
-          },
-        });
-
-        // Animated impostor support for remote players (walk cycle)
-        // DISABLED: Animated impostor system not ready for agents/player characters
-        // this.cleanupAnimatedHLOD();
-        // void this.initAnimatedHLODFromEmote(
-        //   `player_${avatarUrl}`,
-        //   Emotes.WALK,
-        //   avatarWithInstance.instance?.raw,
-        //   PLAYER_IMPOSTOR_DISTANCES,
-        // );
-      }
-
-      // Avatar loaded successfully
-      loadSuccess = true;
-      this.avatarUrl = avatarUrl;
-      this._nextAvatarRetryAt = 0;
+          }
+        }
 
-      // CRITICAL: Sync base transform and position the avatar BEFORE making it visible.
-      // Without this, the avatar appears at (0,0,0) in T-pose for one frame because
-      // instance.move() normally only runs in update() on the next frame.
-      this.base.position.copy(this.node.position);
-      this.base.quaternion.copy(this.node.quaternion);
-      this.base.updateTransform();
-      if (avatarWithInstance.instance?.move) {
-        avatarWithInstance.instance.move(this.base.matrixWorld);
-      }
-      if (avatarWithInstance.instance?.update) {
-        avatarWithInstance.instance.update(0);
-      }
+        interface AvatarWithHeight {
+          height?: number;
+        }
+        const avatarHeight = (this.avatar as AvatarWithHeight).height ?? 1.5;
+        camHeight = Math.max(1.2, avatarHeight * 0.9);
+
+        if (rawScene) {
+          await this.initHLOD(`vrm_player_${this.id}_${avatarUrl}`, {
+            category: "player",
+            atlasSize: 512,
+            hemisphere: true,
+            freezeAnimationAtLOD1: true,
+            prepareForBake: async () => {
+              if (this.mesh && this.avatar) {
+                const savedPosition = this.mesh.position.clone();
+                const savedQuaternion = this.mesh.quaternion.clone();
+
+                this.mesh.position.set(0, 0, 0);
+                this.mesh.quaternion.identity();
+
+                const avatarWithInstance = this.avatar as AvatarWithInstance;
+                avatarWithInstance.instance?.update(0);
+                this.mesh.updateMatrixWorld(true);
+
+                Promise.resolve().then(() => {
+                  if (this.mesh) {
+                    this.mesh.position.copy(savedPosition);
+                    this.mesh.quaternion.copy(savedQuaternion);
+                    this.mesh.updateMatrixWorld(true);
+                  }
+                });
+              }
+            },
+          });
+        }
 
-      // NOW make avatar visible — it's already positioned and in idle pose
-      if (this.avatar?.instance) {
-        const avatarWithRaw = this.avatar.instance as unknown as {
-          raw?: { scene?: { visible?: boolean } };
-        };
-        if (avatarWithRaw.raw?.scene) {
-          avatarWithRaw.raw.scene.visible = true;
+        this.base.position.copy(this.node.position);
+        this.base.quaternion.copy(this.node.quaternion);
+        this.base.updateTransform();
+        if (avatarWithInstance.instance?.move) {
+          avatarWithInstance.instance.move(this.base.matrixWorld);
+        }
+        if (avatarWithInstance.instance?.update) {
+          avatarWithInstance.instance.update(0);
+        }
+      } catch (postLoadError) {
+        console.warn(
+          "[PlayerRemote] Avatar post-load setup degraded:",
+          postLoadError,
+        );
+      } finally {
+        if (rawScene) {
+          rawScene.visible = true;
         }
       }
 
-      // SPECTATOR FIX: Emit PLAYER_AVATAR_READY so camera system can set proper offset
-      // This is critical for spectator mode to work correctly
       this.world.emit(EventType.PLAYER_AVATAR_READY, {
         playerId: this.id,
         avatar: this.avatar,
-        camHeight: camHeight,
+        camHeight,
       });
     } catch (error) {
       console.error("[PlayerRemote] Avatar load failed:", error);
diff --git a/packages/shared/src/extras/ui/imageCache.ts b/packages/shared/src/extras/ui/imageCache.ts
new file mode 100644
index 000000000..3a040340e
--- /dev/null
+++ b/packages/shared/src/extras/ui/imageCache.ts
@@ -0,0 +1,146 @@
+/**
+ * imageCache.ts - Async Image Loading Cache for UI Nodes
+ *
+ * Module-level singleton that loads and caches HTMLImageElement instances
+ * for use with Canvas 2D drawImage(). Coalesces multiple load requests
+ * per URL and triggers callbacks when images are ready.
+ *
+ * Used by UIImage nodes to render item icons, skill icons, and other
+ * game assets loaded from the CDN.
+ */
+
+const isBrowser = typeof window !== "undefined";
+
+/** Maximum cached images before evicting oldest entries */
+const MAX_CACHE_SIZE = 256;
+
+interface LoadingEntry {
+  status: "loading";
+  img: HTMLImageElement;
+  callbacks: Array<() => void>;
+}
+
+interface LoadedEntry {
+  status: "loaded";
+  img: HTMLImageElement;
+}
+
+/** Error TTL — retry after 30 seconds so transient CDN failures don't permanently block images */
+const ERROR_TTL_MS = 30_000;
+
+interface ErrorEntry {
+  status: "error";
+  errorTime: number;
+}
+
+type CacheEntry = LoadingEntry | LoadedEntry | ErrorEntry;
+
+const cache = new Map<string, CacheEntry>();
+const insertionOrder: string[] = [];
+
+/**
+ * Evict oldest entries when cache exceeds MAX_CACHE_SIZE.
+ * Skips entries that are still loading.
+ */
+function evictIfNeeded(): void {
+  while (insertionOrder.length > MAX_CACHE_SIZE) {
+    const oldestUrl = insertionOrder[0];
+    const entry = cache.get(oldestUrl);
+    if (entry && entry.status !== "loading") {
+      cache.delete(oldestUrl);
+      insertionOrder.shift();
+    } else {
+      // Don't evict loading entries; rotate to back
+      insertionOrder.shift();
+      if (oldestUrl) insertionOrder.push(oldestUrl);
+      break;
+    }
+  }
+}
+
+/**
+ * Load an image from the given URL, returning the HTMLImageElement
+ * immediately if already cached, or null if still loading.
+ *
+ * The `onLoad` callback is called once the image finishes loading.
+ * Multiple onLoad callbacks per URL are coalesced — only one
+ * HTMLImageElement is created per unique URL.
+ *
+ * @param url - Pre-resolved HTTP URL (not asset:// — resolve before calling)
+ * @param onLoad - Called when image is ready (used to trigger UI redraw)
+ * @returns The loaded HTMLImageElement, or null if still loading/error
+ */
+export function loadCachedImage(
+  url: string,
+  onLoad: () => void,
+): HTMLImageElement | null {
+  if (!isBrowser || !url) return null;
+
+  const existing = cache.get(url);
+
+  if (existing) {
+    if (existing.status === "loaded") {
+      return existing.img;
+    }
+    if (existing.status === "loading") {
+      // Coalesce callback
+      existing.callbacks.push(onLoad);
+      return null;
+    }
+    // Error — retry after TTL expires
+    if (Date.now() - existing.errorTime < ERROR_TTL_MS) {
+      return null;
+    }
+    cache.delete(url); // TTL expired, fall through to reload
+  }
+
+  // Start new load
+  evictIfNeeded();
+
+  const img = new Image();
+  img.crossOrigin = "anonymous";
+
+  const entry: LoadingEntry = {
+    status: "loading",
+    img,
+    callbacks: [onLoad],
+  };
+  cache.set(url, entry);
+  insertionOrder.push(url);
+
+  img.addEventListener("load", () => {
+    const loadedEntry: LoadedEntry = { status: "loaded", img };
+    cache.set(url, loadedEntry);
+    // Fire all coalesced callbacks
+    for (const cb of entry.callbacks) {
+      cb();
+    }
+    entry.callbacks.length = 0;
+  });
+
+  img.addEventListener("error", () => {
+    const errorEntry: ErrorEntry = { status: "error", errorTime: Date.now() };
+    cache.set(url, errorEntry);
+    entry.callbacks.length = 0;
+  });
+
+  img.src = url;
+
+  return null;
+}
+
+/**
+ * Check if an image URL is already cached and loaded.
+ */
+export function isImageCached(url: string): boolean {
+  const entry = cache.get(url);
+  return entry !== undefined && entry.status === "loaded";
+}
+
+/**
+ * Clear all cached images. Useful for memory cleanup on scene transitions.
+ */
+export function clearImageCache(): void {
+  cache.clear();
+  insertionOrder.length = 0;
+}
diff --git a/packages/shared/src/extras/ui/index.ts b/packages/shared/src/extras/ui/index.ts
index 32bab6d5b..8b55c47d1 100644
--- a/packages/shared/src/extras/ui/index.ts
+++ b/packages/shared/src/extras/ui/index.ts
@@ -7,3 +7,5 @@ export * from "./buttons";
 export * from "./borderRoundRect";
 export * from "./roundRect";
 export * from "./yoga";
+export * from "./imageCache";
+export * from "./scrollHandler";
diff --git a/packages/shared/src/extras/ui/scrollHandler.ts b/packages/shared/src/extras/ui/scrollHandler.ts
new file mode 100644
index 000000000..45dfc6528
--- /dev/null
+++ b/packages/shared/src/extras/ui/scrollHandler.ts
@@ -0,0 +1,120 @@
+/**
+ * scrollHandler.ts - Scroll Behavior for UIView Nodes
+ *
+ * Utility that wires wheel events on a root UI node to scroll
+ * a child UIView with overflow: "scroll". Handles clamping,
+ * speed scaling, and horizontal scroll via shift+wheel.
+ */
+
+import type { UI } from "../../nodes/UI";
+import type { UIView } from "../../nodes/UIView";
+import type { UIWheelEvent } from "../../types/rendering/nodes";
+
+interface ScrollHandlerOptions {
+  /** Pixels scrolled per wheel delta unit (default: 1) */
+  scrollSpeed?: number;
+  /** Allow horizontal scrolling via shift+wheel (default: false) */
+  horizontal?: boolean;
+}
+
+/**
+ * Attach scroll behavior to a UIView with overflow: "scroll".
+ *
+ * Listens to the root UI node's onWheel event and updates the
+ * scrollable view's scrollY (or scrollX if shift is held and
+ * horizontal is enabled).
+ *
+ * @param rootUI - The root UI panel node that receives wheel events
+ * @param scrollView - The UIView child with overflow: "scroll"
+ * @param options - Optional scroll speed and horizontal toggle
+ *
+ * @example
+ * ```ts
+ * const root = createNode("ui", { width: 200, height: 300 });
+ * const list = createNode("uiview", { overflow: "scroll", height: 200 });
+ * // ... add children to list
+ * root.add(list);
+ * attachScrollHandler(root, list, { scrollSpeed: 1.5 });
+ * ```
+ */
+export function attachScrollHandler(
+  rootUI: UI,
+  scrollView: UIView,
+  options?: ScrollHandlerOptions,
+): () => void {
+  const speed = options?.scrollSpeed ?? 1;
+  const allowHorizontal = options?.horizontal ?? false;
+
+  const handler = (event: UIWheelEvent) => {
+    if (!scrollView.box || !scrollView.yogaNode) return;
+
+    // Check if pointer is within the scrollable view's bounds
+    const { left, top, width, height } = scrollView.box;
+    const pointerX = event.coords?.x ?? 0;
+    const pointerY = event.coords?.y ?? 0;
+
+    if (
+      pointerX < left ||
+      pointerX > left + width ||
+      pointerY < top ||
+      pointerY > top + height
+    ) {
+      return; // Pointer not over this scroll view
+    }
+
+    // Calculate content height from Yoga layout
+    // The yoga node's computed height is the viewport; children may exceed it
+    const viewportHeight = scrollView.yogaNode.getComputedHeight();
+    const viewportWidth = scrollView.yogaNode.getComputedWidth();
+
+    // Sum children's computed heights for total content size
+    let contentHeight = 0;
+    let contentWidth = 0;
+    const childCount = scrollView.yogaNode.getChildCount();
+    for (let i = 0; i < childCount; i++) {
+      const child = scrollView.yogaNode.getChild(i);
+      contentHeight +=
+        child.getComputedHeight() +
+        child.getComputedMargin(1) + // EDGE_TOP
+        child.getComputedMargin(3); // EDGE_BOTTOM
+      contentWidth +=
+        child.getComputedWidth() +
+        child.getComputedMargin(0) + // EDGE_LEFT
+        child.getComputedMargin(2); // EDGE_RIGHT
+    }
+
+    const res = (rootUI as unknown as { _res: number })._res ?? 2;
+
+    if (allowHorizontal && event.shiftKey) {
+      const maxScrollX = Math.max(0, (contentWidth - viewportWidth) / res);
+      scrollView.scrollX = Math.max(
+        0,
+        Math.min(maxScrollX, scrollView.scrollX + event.deltaX * speed),
+      );
+    } else {
+      const maxScrollY = Math.max(0, (contentHeight - viewportHeight) / res);
+      scrollView.scrollY = Math.max(
+        0,
+        Math.min(maxScrollY, scrollView.scrollY + event.deltaY * speed),
+      );
+    }
+  };
+
+  // Attach to root UI's onWheel
+  const prevHandler = (
+    rootUI as unknown as { _onWheel?: (e: UIWheelEvent) => void }
+  )._onWheel;
+  (rootUI as unknown as { onWheel: (e: UIWheelEvent) => void }).onWheel = (
+    event: UIWheelEvent,
+  ) => {
+    prevHandler?.(event);
+    handler(event);
+  };
+
+  // Return cleanup function
+  return () => {
+    (
+      rootUI as unknown as { onWheel: ((e: UIWheelEvent) => void) | undefined }
+    ).onWheel = prevHandler;
+  };
+}
diff --git a/packages/shared/src/index.client.ts b/packages/shared/src/index.client.ts
index 20db6653b..306156f3b 100644
--- a/packages/shared/src/index.client.ts
+++ b/packages/shared/src/index.client.ts
@@ -181,8 +181,12 @@ export { TERRAIN_CONSTANTS } from "./constants/GameConstants";
 // Client input constants (click-to-move distance, drag threshold, raycast range)
 export { INPUT } from "./systems/client/interaction/constants";
 
-// Export avatar options for character creation
-export { AVATAR_OPTIONS } from "./data/avatars";
+// Export avatar helpers for character creation and runtime normalization
+export {
+  AVATAR_OPTIONS,
+  DEFAULT_AVATAR_URL,
+  normalizeAvatarAssetUrl,
+} from "./data/avatars";
 
 // Export skill data for UI displays
 export {
@@ -238,19 +242,7 @@ export { ClientRuntime } from "./systems/client/ClientRuntime"; // Client lifecy
 export { ClientAudio } from "./systems/client/ClientAudio";
 export { ClientLiveKit } from "./systems/client/ClientLiveKit";
 export { ClientInput } from "./systems/client/ClientInput";
-export {
-  attachEquipmentVisualToVRM,
-  extractEquipmentAttachmentData,
-  removeEquipmentVisual,
-  resolveEquipmentVisualData,
-  resolveEquipmentVisualUrls,
-} from "./systems/client/EquipmentVisualHelpers";
-export type {
-  EquipmentAttachmentData,
-  EquipmentVisualModelData,
-  EquipmentVisualStore,
-  EquipmentVisualUrlResolution,
-} from "./systems/client/EquipmentVisualHelpers";
+export * from "./systems/client/EquipmentVisualHelpers";
 export { ClientActions } from "./systems/client/ClientActions";
 export { DevStats } from "./systems/client/DevStats"; // FPS counter and dev performance telemetry
 export { EventBus } from "./systems/shared";
@@ -264,9 +256,12 @@ export { NodeClient } from "./systems/client/NodeClient";
 // Environment system works in both browser and Node contexts
 export { Node } from "./nodes/Node";
 // Re-export commonly used node classes to satisfy API extractor
+// @internal — These are engine-internal 3D UI nodes using Yoga layout.
+// Client UI uses React/CSS, not these canvas-based nodes.
 export { UI } from "./nodes/UI";
 export { UIView } from "./nodes/UIView";
 export { UIText } from "./nodes/UIText";
+export { UIImage } from "./nodes/UIImage";
 export { Group } from "./nodes/Group";
 export { Mesh } from "./nodes/Mesh";
 export { Avatar } from "./nodes/Avatar";
@@ -438,7 +433,8 @@ export type {
   EquipmentSlot,
 } from "./types/core/core";
 export type { Physics as PhysicsInterface } from "./types/index";
-// Re-export UI-related types used by UIView/UIText/UI
+// @internal — UI node types for engine-internal 3D UI system (Yoga layout).
+// Client UI uses React/CSS, not these types.
 export type {
   UIData,
   UIViewData,
@@ -732,3 +728,82 @@ export type {
   StairTile,
   FloorCollisionData,
 } from "./types/world/building-collision-types";
+
+// Accessibility types and constants (OSRS-accurate colorblind palettes)
+export {
+  COLORBLIND_PALETTES,
+  FONT_SIZE_SCALE,
+  DEFAULT_ACCESSIBILITY_SETTINGS,
+  type ColorblindMode,
+  type ColorOverrides,
+  type AccessibilitySettings,
+  type FontSizeOption,
+} from "./types/interface/accessibility";
+
+// UI complexity mode types and constants
+export {
+  COMPLEXITY_MODE_CONFIGS,
+  DEFAULT_PROGRESSION_THRESHOLDS,
+  type ComplexityMode,
+  type ComplexityFeatures,
+  type ComplexityModeConfig,
+  type ProgressionThresholds,
+} from "./types/interface/complexity";
+
+// Combat level color utilities (OSRS-accurate threat coloring)
+export {
+  getCombatLevelColor,
+  getCombatLevelDescription,
+} from "./systems/client/interaction/utils/combatLevelColor";
+
+// Combat level calculation (OSRS-accurate formula)
+export {
+  calculateCombatLevel,
+  normalizeCombatSkills,
+  type CombatSkills,
+  type CombatType,
+  MIN_COMBAT_LEVEL,
+  MAX_COMBAT_LEVEL,
+} from "./utils/game/CombatLevelCalculator";
+
+// XP ↔ Level calculations (OSRS-accurate, standalone utilities for UI)
+export {
+  getXPForLevel,
+  getLevelForXP,
+  getXPToNextLevel,
+  getXPProgress,
+} from "./utils/game/XPCalculator";
+
+// HP bar utilities (OSRS-style)
+export { getHpPercent, getHpColor } from "./utils/game/CombatUtils";
+
+// Currency constants (single source of truth for coin caps)
+export {
+  MAX_COINS,
+  DEFAULT_STARTING_COINS,
+} from "./systems/shared/character/CoinPouchSystem";
+
+// Prayer event type guards (runtime validation for UI components)
+export {
+  isPrayerStateSyncPayload,
+  isPrayerToggledPayload,
+} from "./types/game/prayer-types";
+export type {
+  PrayerStateSyncPayload,
+  PrayerToggledEvent,
+  PrayerState,
+} from "./types/game/prayer-types";
+
+// Minimap Worker - 2D Canvas minimap rendering in web worker
+export {
+  MinimapWorkerManager,
+  isMinimapWorkerSupported,
+  type MinimapTile,
+  type MinimapEntity,
+  type MinimapRoad,
+  type MinimapBuilding,
+  type MinimapCamera,
+  type MinimapConfig,
+  type MinimapWorkerInput,
+  type MinimapWorkerOutput,
+} from "./utils/workers/MinimapWorker";
diff --git a/packages/shared/src/index.ts b/packages/shared/src/index.ts
index 37f12e2dd..b06234d9e 100644
--- a/packages/shared/src/index.ts
+++ b/packages/shared/src/index.ts
@@ -264,6 +264,8 @@ export {
   PRAYER_TOGGLE_COOLDOWN_MS,
   PRAYER_TOGGLE_RATE_LIMIT,
   PRAYER_ID_PATTERN,
+  isPrayerStateSyncPayload,
+  isPrayerToggledPayload,
 } from "./types/game/prayer-types";
 export type {
   PrayerCategory,
@@ -364,8 +366,12 @@ export {
 // Export store helpers used by server store handler
 export { getStoreById } from "./data/banks-stores";
 
-// Export avatar options for character creation
-export { AVATAR_OPTIONS } from "./data/avatars";
+// Export avatar helpers for character creation and runtime normalization
+export {
+  AVATAR_OPTIONS,
+  DEFAULT_AVATAR_URL,
+  normalizeAvatarAssetUrl,
+} from "./data/avatars";
 
 // Export skill data for UI displays
 export {
@@ -492,6 +498,7 @@ export { Node } from "./nodes/Node";
 export { UI } from "./nodes/UI";
 export { UIView } from "./nodes/UIView";
 export { UIText } from "./nodes/UIText";
+export { UIImage } from "./nodes/UIImage";
 export { Group } from "./nodes/Group";
 export { Mesh } from "./nodes/Mesh";
 export { Avatar } from "./nodes/Avatar";
@@ -1208,7 +1215,10 @@ export type {
 } from "./types/interaction";
 
 // Context menu styled label type (for combat level colors)
-export type { LabelSegment } from "./systems/client/interaction/types";
+export type {
+  LabelSegment,
+  ContextMenuAction,
+} from "./systems/client/interaction/types";
 
 // Bank equipment type guards, types, and constants
 export {
@@ -1282,6 +1292,8 @@ export {
   createMinimapWorker,
   type MinimapTile,
   type MinimapEntity,
+  type MinimapRoad,
+  type MinimapBuilding,
   type MinimapCamera,
   type MinimapConfig,
   type MinimapWorkerInput,
@@ -1349,3 +1361,57 @@ export type {
   CullingGroup,
   FrustumData,
 } from "./utils/compute";
+
+// Accessibility types and constants (OSRS-accurate colorblind palettes)
+export {
+  COLORBLIND_PALETTES,
+  FONT_SIZE_SCALE,
+  DEFAULT_ACCESSIBILITY_SETTINGS,
+  type ColorblindMode,
+  type ColorOverrides,
+  type AccessibilitySettings,
+  type FontSizeOption,
+} from "./types/interface/accessibility";
+
+// UI complexity mode types and constants
+export {
+  COMPLEXITY_MODE_CONFIGS,
+  DEFAULT_PROGRESSION_THRESHOLDS,
+  type ComplexityMode,
+  type ComplexityFeatures,
+  type ComplexityModeConfig,
+  type ProgressionThresholds,
+} from "./types/interface/complexity";
+
+// Combat level color utilities (OSRS-accurate threat coloring)
+export {
+  getCombatLevelColor,
+  getCombatLevelDescription,
+} from "./systems/client/interaction/utils/combatLevelColor";
+
+// Combat level calculation (OSRS-accurate formula)
+export {
+  calculateCombatLevel,
+  normalizeCombatSkills,
+  type CombatSkills,
+  type CombatType,
+  MIN_COMBAT_LEVEL,
+  MAX_COMBAT_LEVEL,
+} from "./utils/game/CombatLevelCalculator";
+
+// XP ↔ Level calculations (OSRS-accurate, standalone utilities for UI)
+export {
+  getXPForLevel,
+  getLevelForXP,
+  getXPToNextLevel,
+  getXPProgress,
+} from "./utils/game/XPCalculator";
+
+// HP bar utilities (OSRS-style)
+export { getHpPercent, getHpColor } from "./utils/game/CombatUtils";
+
+// Currency constants (single source of truth for coin caps)
+export {
+  MAX_COINS,
+  DEFAULT_STARTING_COINS,
+} from "./systems/shared/character/CoinPouchSystem";
diff --git a/packages/shared/src/nodes/UIImage.ts b/packages/shared/src/nodes/UIImage.ts
new file mode 100644
index 000000000..131fdaf54
--- /dev/null
+++ b/packages/shared/src/nodes/UIImage.ts
@@ -0,0 +1,703 @@
+/**
+ * UIImage.ts - UI Image Node
+ *
+ * Renders images in canvas-based 3D UI panels with object-fit support.
+ * Loads images asynchronously via the shared image cache and redraws
+ * when ready. Supports contain, cover, fill, none, and scale-down modes.
+ */
+
+import Yoga from "yoga-layout";
+import type * as YogaTypes from "yoga-layout";
+import { every, isArray, isBoolean, isNumber, isString } from "lodash-es";
+
+import { Node } from "./Node";
+import { Display, isDisplay } from "../extras/ui/yoga";
+import { fillRoundRect, imageRoundRect } from "../extras/ui/roundRect";
+import { loadCachedImage } from "../extras/ui/imageCache";
+import type {
+  UIImageData,
+  DisplayType,
+  EdgeValue,
+  UIContext,
+} from "../types/rendering/nodes";
+
+type ObjectFitMode = "fill" | "contain" | "cover" | "none" | "scale-down";
+
+const objectFitModes: ReadonlySet<string> = new Set([
+  "fill",
+  "contain",
+  "cover",
+  "none",
+  "scale-down",
+]);
+
+function isObjectFit(value: string): value is ObjectFitMode {
+  return objectFitModes.has(value);
+}
+
+const defaults = {
+  display: "flex",
+  src: null,
+  width: null,
+  height: null,
+  absolute: false,
+  top: null,
+  right: null,
+  bottom: null,
+  left: null,
+  objectFit: "fill",
+  backgroundColor: null,
+  borderRadius: 0,
+  margin: 0,
+};
+
+const isBrowser = typeof window !== "undefined";
+
+export class UIImage extends Node {
+  // Private properties
+  _display!: DisplayType;
+  _src!: string | null;
+  _width!: number | null;
+  _height!: number | null;
+  _absolute!: boolean;
+  _top!: number | null;
+  _right!: number | null;
+  _bottom!: number | null;
+  _left!: number | null;
+  _objectFit!: ObjectFitMode;
+  _backgroundColor!: string | null;
+  _borderRadius!: number;
+  _margin!: EdgeValue;
+
+  // UI properties
+  ui?: UIContext;
+  yogaNode?: YogaTypes.Node;
+  box?: { left: number; top: number; width: number; height: number };
+
+  constructor(data: UIImageData = {}) {
+    super(data);
+    this.name = "uiimage";
+
+    this.display =
+      (data.display as DisplayType | undefined) ??
+      (defaults.display as DisplayType);
+    this.src = data.src ?? defaults.src;
+    this.width = (data.width as number | null | undefined) ?? defaults.width;
+    this.height = (data.height as number | null | undefined) ?? defaults.height;
+    this.absolute = data.absolute ?? defaults.absolute;
+    this.top = data.top ?? defaults.top;
+    this.right = data.right ?? defaults.right;
+    this.bottom = data.bottom ?? defaults.bottom;
+    this.left = data.left ?? defaults.left;
+    this.objectFit =
+      (data.objectFit as ObjectFitMode | undefined) ??
+      (defaults.objectFit as ObjectFitMode);
+    this.backgroundColor = data.backgroundColor ?? defaults.backgroundColor;
+    this.borderRadius = data.borderRadius ?? defaults.borderRadius;
+    this.margin = (data.margin as EdgeValue | undefined) ?? defaults.margin;
+  }
+
+  draw(ctx: CanvasRenderingContext2D, offsetLeft: number, offsetTop: number) {
+    if (this._display === "none" || !this.yogaNode || !this.ui) return;
+
+    const left = offsetLeft + this.yogaNode.getComputedLeft();
+    const top = offsetTop + this.yogaNode.getComputedTop();
+    const width = this.yogaNode.getComputedWidth();
+    const height = this.yogaNode.getComputedHeight();
+
+    // Draw background
+    if (this._backgroundColor) {
+      fillRoundRect(
+        ctx,
+        left,
+        top,
+        width,
+        height,
+        this._borderRadius * this.ui!._res,
+        this._backgroundColor,
+      );
+    }
+
+    // Load and draw image
+    if (this._src) {
+      const img = loadCachedImage(this._src, () => this.ui?.redraw());
+      if (img) {
+        const imgNaturalW = img.naturalWidth;
+        const imgNaturalH = img.naturalHeight;
+
+        if (imgNaturalW > 0 && imgNaturalH > 0) {
+          const { drawX, drawY, drawW, drawH } = computeObjectFit(
+            this._objectFit,
+            left,
+            top,
+            width,
+            height,
+            imgNaturalW,
+            imgNaturalH,
+          );
+
+          const radius = this._borderRadius * this.ui!._res;
+          imageRoundRect(
+            ctx,
+            left,
+            top,
+            width,
+            height,
+            radius,
+            img,
+            drawX,
+            drawY,
+            drawW,
+            drawH,
+          );
+        }
+      }
+    }
+
+    this.box = { left, top, width, height };
+  }
+
+  mount() {
+    if (!isBrowser) return;
+    this.ui = (this.parent as Node & { ui?: UIContext })?.ui;
+    if (!this.ui) return console.error("uiimage: must be child of ui node");
+
+    this.yogaNode = Yoga.Node.create();
+    this.yogaNode.setMeasureFunc(this.measureImageFunc());
+    this.yogaNode.setDisplay(Display[this._display]);
+    this.yogaNode.setWidth(
+      this._width === null ? undefined : this._width * this.ui!._res,
+    );
+    this.yogaNode.setHeight(
+      this._height === null ? undefined : this._height * this.ui!._res,
+    );
+    this.yogaNode.setPositionType(
+      this._absolute
+        ? Yoga.POSITION_TYPE_ABSOLUTE
+        : Yoga.POSITION_TYPE_RELATIVE,
+    );
+    this.yogaNode.setPosition(
+      Yoga.EDGE_TOP,
+      isNumber(this._top) ? this._top * this.ui!._res : undefined,
+    );
+    this.yogaNode.setPosition(
+      Yoga.EDGE_RIGHT,
+      isNumber(this._right) ? this._right * this.ui!._res : undefined,
+    );
+    this.yogaNode.setPosition(
+      Yoga.EDGE_BOTTOM,
+      isNumber(this._bottom) ? this._bottom * this.ui!._res : undefined,
+    );
+    this.yogaNode.setPosition(
+      Yoga.EDGE_LEFT,
+      isNumber(this._left) ? this._left * this.ui!._res : undefined,
+    );
+    if (isArray(this._margin)) {
+      const [marginTop, marginRight, marginBottom, marginLeft] = this._margin;
+      this.yogaNode.setMargin(Yoga.EDGE_TOP, marginTop * this.ui!._res);
+      this.yogaNode.setMargin(Yoga.EDGE_RIGHT, marginRight * this.ui!._res);
+      this.yogaNode.setMargin(Yoga.EDGE_BOTTOM, marginBottom * this.ui!._res);
+      this.yogaNode.setMargin(Yoga.EDGE_LEFT, marginLeft * this.ui!._res);
+    } else {
+      this.yogaNode.setMargin(Yoga.EDGE_ALL, this._margin * this.ui!._res);
+    }
+
+    const parentNode = (this.parent as Node & { yogaNode?: YogaTypes.Node })
+      ?.yogaNode;
+    if (parentNode) {
+      parentNode.insertChild(this.yogaNode, parentNode.getChildCount());
+    }
+    this.ui?.redraw();
+  }
+
+  commit(_didMove: boolean) {
+    // ...
+  }
+
+  unmount() {
+    if (!isBrowser) return;
+    if (this.yogaNode) {
+      const parentNode = (this.parent as Node & { yogaNode?: YogaTypes.Node })
+        ?.yogaNode;
+      if (parentNode) {
+        parentNode.removeChild(this.yogaNode);
+      }
+      this.yogaNode.free();
+      this.yogaNode = undefined;
+      this.box = undefined;
+    }
+  }
+
+  copy(source: UIImage, recursive: boolean) {
+    super.copy(source, recursive);
+    this._display = source._display;
+    this._src = source._src;
+    this._width = source._width;
+    this._height = source._height;
+    this._absolute = source._absolute;
+    this._top = source._top;
+    this._right = source._right;
+    this._bottom = source._bottom;
+    this._left = source._left;
+    this._objectFit = source._objectFit;
+    this._backgroundColor = source._backgroundColor;
+    this._borderRadius = source._borderRadius;
+    this._margin = source._margin;
+    return this;
+  }
+
+  /**
+   * Measure function for Yoga layout. When no explicit width/height is set,
+   * uses the natural image dimensions (scaled by _res) to size the node.
+   * If the image is not yet loaded, returns 0x0 and will re-layout on load.
+   */
+  measureImageFunc() {
+    return (
+      width: number,
+      widthMode: number,
+      height: number,
+      heightMode: number,
+    ) => {
+      // If explicit dimensions are set, Yoga uses those directly
+      // This measure func only fires when width/height are undefined
+      if (!this._src || !this.ui) {
+        return { width: 0, height: 0 };
+      }
+
+      const img = loadCachedImage(this._src, () => {
+        this.yogaNode?.markDirty();
+        this.ui?.redraw();
+      });
+
+      if (!img || img.naturalWidth === 0 || img.naturalHeight === 0) {
+        return { width: 0, height: 0 };
+      }
+
+      const naturalW = img.naturalWidth * this.ui!._res;
+      const naturalH = img.naturalHeight * this.ui!._res;
+      const aspectRatio = naturalW / naturalH;
+
+      let finalWidth = naturalW;
+      let finalHeight = naturalH;
+
+      if (widthMode === Yoga.MEASURE_MODE_EXACTLY) {
+        finalWidth = width;
+        finalHeight = width / aspectRatio;
+      } else if (widthMode === Yoga.MEASURE_MODE_AT_MOST) {
+        finalWidth = Math.min(naturalW, width);
+        finalHeight = finalWidth / aspectRatio;
+      }
+
+      if (heightMode === Yoga.MEASURE_MODE_EXACTLY) {
+        finalHeight = height;
+        if (widthMode === Yoga.MEASURE_MODE_UNDEFINED) {
+          finalWidth = height * aspectRatio;
+        }
+      } else if (heightMode === Yoga.MEASURE_MODE_AT_MOST) {
+        if (finalHeight > height) {
+          finalHeight = height;
+          finalWidth = height * aspectRatio;
+          if (widthMode === Yoga.MEASURE_MODE_AT_MOST) {
+            finalWidth = Math.min(finalWidth, width);
+          }
+        }
+      }
+
+      return { width: finalWidth, height: finalHeight };
+    };
+  }
+
+  // -- Property getters and setters --
+
+  get display() {
+    return this._display;
+  }
+
+  set display(value: DisplayType | undefined) {
+    if (value === undefined) value = defaults.display as DisplayType;
+    if (!isDisplay(value)) {
+      throw new Error(`[uiimage] display invalid: ${value}`);
+    }
+    if (this._display === value) return;
+    this._display = value;
+    this.yogaNode?.setDisplay(
+      (Display as Record<string, YogaTypes.Display>)[this._display],
+    );
+    this.yogaNode?.markDirty();
+    this.ui?.redraw();
+  }
+
+  get src() {
+    return this._src;
+  }
+
+  set src(value: string | null | undefined) {
+    if (value === undefined) value = defaults.src;
+    if (value !== null && !isString(value)) {
+      throw new Error("[uiimage] src not a string");
+    }
+    if (this._src === value) return;
+    this._src = value;
+    this.yogaNode?.markDirty();
+    this.ui?.redraw();
+  }
+
+  get width() {
+    return this._width;
+  }
+
+  set width(value: number | null | undefined) {
+    if (value === undefined) value = defaults.width;
+    if (value !== null && !isNumber(value)) {
+      throw new Error("[uiimage] width not a number");
+    }
+    if (this._width === value) return;
+    this._width = value;
+    this.yogaNode?.setWidth(
+      this._width === null ? undefined : this._width * this.ui!._res,
+    );
+    this.yogaNode?.markDirty();
+    this.ui?.redraw();
+  }
+
+  get height() {
+    return this._height;
+  }
+
+  set height(value: number | null | undefined) {
+    if (value === undefined) value = defaults.height;
+    if (value !== null && !isNumber(value)) {
+      throw new Error("[uiimage] height not a number");
+    }
+    if (this._height === value) return;
+    this._height = value;
+    this.yogaNode?.setHeight(
+      this._height === null ? undefined : this._height * this.ui!._res,
+    );
+    this.yogaNode?.markDirty();
+    this.ui?.redraw();
+  }
+
+  get absolute() {
+    return this._absolute;
+  }
+
+  set absolute(value: boolean | undefined) {
+    if (value === undefined) value = defaults.absolute;
+    if (!isBoolean(value)) {
+      throw new Error("[uiimage] absolute not a boolean");
+    }
+    if (this._absolute === value) return;
+    this._absolute = value;
+    this.yogaNode?.setPositionType(
+      this._absolute
+        ? Yoga.POSITION_TYPE_ABSOLUTE
+        : Yoga.POSITION_TYPE_RELATIVE,
+    );
+    this.ui?.redraw();
+  }
+
+  get top() {
+    return this._top;
+  }
+
+  set top(value: number | null | undefined) {
+    if (value === undefined) value = defaults.top;
+    const isNum = isNumber(value);
+    if (value !== null && !isNum) {
+      throw new Error("[uiimage] top must be a number or null");
+    }
+    if (this._top === value) return;
+    this._top = value;
+    this.yogaNode?.setPosition(
+      Yoga.EDGE_TOP,
+      isNum && this._top !== null ? this._top * this.ui!._res : undefined,
+    );
+    this.ui?.redraw();
+  }
+
+  get right() {
+    return this._right;
+  }
+
+  set right(value: number | null | undefined) {
+    if (value === undefined) value = defaults.right;
+    const isNum = isNumber(value);
+    if (value !== null && !isNum) {
+      throw new Error("[uiimage] right must be a number or null");
+    }
+    if (this._right === value) return;
+    this._right = value;
+    this.yogaNode?.setPosition(
+      Yoga.EDGE_RIGHT,
+      isNum && this._right !== null ? this._right * this.ui!._res : undefined,
+    );
+    this.ui?.redraw();
+  }
+
+  get bottom() {
+    return this._bottom;
+  }
+
+  set bottom(value: number | null | undefined) {
+    if (value === undefined) value = defaults.bottom;
+    const isNum = isNumber(value);
+    if (value !== null && !isNum) {
+      throw new Error("[uiimage] bottom must be a number or null");
+    }
+    if (this._bottom === value) return;
+    this._bottom = value;
+    this.yogaNode?.setPosition(
+      Yoga.EDGE_BOTTOM,
+      isNum && this._bottom !== null ? this._bottom * this.ui!._res : undefined,
+    );
+    this.ui?.redraw();
+  }
+
+  get left() {
+    return this._left;
+  }
+
+  set left(value: number | null | undefined) {
+    if (value === undefined) value = defaults.left;
+    const isNum = isNumber(value);
+    if (value !== null && !isNum) {
+      throw new Error("[uiimage] left must be a number or null");
+    }
+    if (this._left === value) return;
+    this._left = value;
+    this.yogaNode?.setPosition(
+      Yoga.EDGE_LEFT,
+      isNum && this._left !== null ? this._left * this.ui!._res : undefined,
+    );
+    this.ui?.redraw();
+  }
+
+  get objectFit() {
+    return this._objectFit;
+  }
+
+  set objectFit(value: ObjectFitMode | string | undefined) {
+    if (value === undefined) value = defaults.objectFit as ObjectFitMode;
+    if (!isObjectFit(value)) {
+      throw new Error(`[uiimage] objectFit invalid: ${value}`);
+    }
+    if (this._objectFit === value) return;
+    this._objectFit = value;
+    this.ui?.redraw();
+  }
+
+  get backgroundColor() {
+    return this._backgroundColor;
+  }
+
+  set backgroundColor(value: string | null | undefined) {
+    if (value === undefined) value = defaults.backgroundColor;
+    if (value !== null && !isString(value)) {
+      throw new Error("[uiimage] backgroundColor not a string");
+    }
+    if (this._backgroundColor === value) return;
+    this._backgroundColor = value;
+    this.ui?.redraw();
+  }
+
+  get borderRadius() {
+    return this._borderRadius;
+  }
+
+  set borderRadius(value: number | null | undefined) {
+    if (value === undefined || value === null) value = defaults.borderRadius;
+    if (!isNumber(value)) {
+      throw new Error("[uiimage] borderRadius not a number");
+    }
+    if (this._borderRadius === value) return;
+    this._borderRadius = value;
+    this.ui?.redraw();
+  }
+
+  get margin() {
+    return this._margin;
+  }
+
+  set margin(value: number | number[] | EdgeValue | null | undefined) {
+    if (value === undefined || value === null) value = defaults.margin;
+    if (!isEdge(value)) {
+      throw new Error("[uiimage] margin not a number or array of numbers");
+    }
+    if (this._margin === value) return;
+    this._margin = value;
+    if (isArray(this._margin)) {
+      const [marginTop, marginRight, marginBottom, marginLeft] = this._margin;
+      this.yogaNode?.setMargin(Yoga.EDGE_TOP, marginTop * this.ui!._res);
+      this.yogaNode?.setMargin(Yoga.EDGE_RIGHT, marginRight * this.ui!._res);
+      this.yogaNode?.setMargin(Yoga.EDGE_BOTTOM, marginBottom * this.ui!._res);
+      this.yogaNode?.setMargin(Yoga.EDGE_LEFT, marginLeft * this.ui!._res);
+    } else {
+      this.yogaNode?.setMargin(Yoga.EDGE_ALL, this._margin * this.ui!._res);
+    }
+    this.ui?.redraw();
+  }
+
+  getProxy() {
+    const self = this;
+    if (!this.proxy) {
+      let proxy = {
+        get display() {
+          return self.display;
+        },
+        set display(value) {
+          self.display = value;
+        },
+        get src() {
+          return self.src;
+        },
+        set src(value) {
+          self.src = value;
+        },
+        get width() {
+          return self.width;
+        },
+        set width(value) {
+          self.width = value;
+        },
+        get height() {
+          return self.height;
+        },
+        set height(value) {
+          self.height = value;
+        },
+        get absolute() {
+          return self.absolute;
+        },
+        set absolute(value) {
+          self.absolute = value;
+        },
+        get top() {
+          return self.top;
+        },
+        set top(value) {
+          self.top = value;
+        },
+        get right() {
+          return self.right;
+        },
+        set right(value) {
+          self.right = value;
+        },
+        get bottom() {
+          return self.bottom;
+        },
+        set bottom(value) {
+          self.bottom = value;
+        },
+        get left() {
+          return self.left;
+        },
+        set left(value) {
+          self.left = value;
+        },
+        get objectFit() {
+          return self.objectFit;
+        },
+        set objectFit(value) {
+          self.objectFit = value;
+        },
+        get backgroundColor() {
+          return self.backgroundColor;
+        },
+        set backgroundColor(value) {
+          self.backgroundColor = value;
+        },
+        get borderRadius() {
+          return self.borderRadius;
+        },
+        set borderRadius(value) {
+          self.borderRadius = value;
+        },
+        get margin() {
+          return self.margin;
+        },
+        set margin(value) {
+          self.margin = value;
+        },
+      };
+      proxy = Object.defineProperties(
+        proxy,
+        Object.getOwnPropertyDescriptors(super.getProxy()),
+      ); // inherit Node properties
+      this.proxy = proxy;
+    }
+    return this.proxy;
+  }
+}
+
+/**
+ * Compute draw coordinates for an image within a container box
+ * based on the CSS object-fit model.
+ *
+ * Returns absolute pixel positions for drawImage().
+ */
+function computeObjectFit(
+  mode: ObjectFitMode,
+  boxX: number,
+  boxY: number,
+  boxW: number,
+  boxH: number,
+  imgW: number,
+  imgH: number,
+): { drawX: number; drawY: number; drawW: number; drawH: number } {
+  switch (mode) {
+    case "fill": {
+      // Stretch to fill entire box, ignoring aspect ratio
+      return { drawX: boxX, drawY: boxY, drawW: boxW, drawH: boxH };
+    }
+
+    case "contain": {
+      // Fit inside box, maintain aspect ratio, letterbox
+      const scale = Math.min(boxW / imgW, boxH / imgH);
+      const drawW = imgW * scale;
+      const drawH = imgH * scale;
+      const drawX = boxX + (boxW - drawW) / 2;
+      const drawY = boxY + (boxH - drawH) / 2;
+      return { drawX, drawY, drawW, drawH };
+    }
+
+    case "cover": {
+      // Fill box, maintain aspect ratio, clip overflow
+      const scale = Math.max(boxW / imgW, boxH / imgH);
+      const drawW = imgW * scale;
+      const drawH = imgH * scale;
+      const drawX = boxX + (boxW - drawW) / 2;
+      const drawY = boxY + (boxH - drawH) / 2;
+      return { drawX, drawY, drawW, drawH };
+    }
+
+    case "none": {
+      // Natural size, centered in box
+      const drawX = boxX + (boxW - imgW) / 2;
+      const drawY = boxY + (boxH - imgH) / 2;
+      return { drawX, drawY, drawW: imgW, drawH: imgH };
+    }
+
+    case "scale-down": {
+      // Use the smaller of "none" and "contain"
+      const containScale = Math.min(boxW / imgW, boxH / imgH);
+      const scale = Math.min(1, containScale);
+      const drawW = imgW * scale;
+      const drawH = imgH * scale;
+      const drawX = boxX + (boxW - drawW) / 2;
+      const drawY = boxY + (boxH - drawH) / 2;
+      return { drawX, drawY, drawW, drawH };
+    }
+  }
+}
+
+function isEdge(value: unknown): value is number | EdgeValue {
+  if (isNumber(value)) {
+    return true;
+  }
+  if (isArray(value)) {
+    return value.length === 4 && every(value, (n) => isNumber(n));
+  }
+  return false;
+}
diff --git a/packages/shared/src/nodes/UIView.ts b/packages/shared/src/nodes/UIView.ts
index 4f8cb3406..29ce898f9 100644
--- a/packages/shared/src/nodes/UIView.ts
+++ b/packages/shared/src/nodes/UIView.ts
@@ -24,12 +24,14 @@ import {
   JustifyContent,
 } from "../extras/ui/yoga";
 import { Node } from "./Node";
+import { roundRect } from "../extras/ui/roundRect";
 import type {
   UIViewData,
   DisplayType,
   FlexBasis,
   EdgeValue,
   UIContext,
+  OverflowMode,
 } from "../types/rendering/nodes";
 
 const defaults = {
@@ -56,6 +58,9 @@ const defaults = {
   flexBasis: "auto",
   flexGrow: 0,
   flexShrink: 1,
+  overflow: "visible",
+  scrollX: 0,
+  scrollY: 0,
 };
 
 export class UIView extends Node {
@@ -83,6 +88,9 @@ export class UIView extends Node {
   _flexBasis!: FlexBasis;
   _flexGrow!: number;
   _flexShrink!: number;
+  _overflow!: OverflowMode;
+  _scrollX!: number;
+  _scrollY!: number;
 
   // UI properties
   ui?: UIContext;
@@ -125,6 +133,10 @@ export class UIView extends Node {
     this.flexBasis = data.flexBasis ?? (defaults.flexBasis as FlexBasis);
     this.flexGrow = data.flexGrow ?? defaults.flexGrow;
     this.flexShrink = data.flexShrink ?? defaults.flexShrink;
+    this._overflow =
+      (data.overflow as OverflowMode) ?? (defaults.overflow as OverflowMode);
+    this._scrollX = data.scrollX ?? defaults.scrollX;
+    this._scrollY = data.scrollY ?? defaults.scrollY;
   }
 
   draw(ctx: CanvasRenderingContext2D, offsetLeft: number, offsetTop: number) {
@@ -170,6 +182,31 @@ export class UIView extends Node {
       }
     }
     this.box = { left, top, width, height };
+
+    const needsClip = this._overflow !== "visible";
+    if (needsClip) {
+      ctx.save();
+      ctx.beginPath();
+      if (this._borderRadius) {
+        roundRect(
+          ctx,
+          left,
+          top,
+          width,
+          height,
+          this._borderRadius * this.ui!._res,
+        );
+      } else {
+        ctx.rect(left, top, width, height);
+      }
+      ctx.clip();
+    }
+
+    const childOffsetX = needsClip
+      ? left - this._scrollX * this.ui!._res
+      : left;
+    const childOffsetY = needsClip ? top - this._scrollY * this.ui!._res : top;
+
     this.children.forEach((child) => {
       const drawable = child as {
         draw?: (
@@ -178,8 +215,12 @@ export class UIView extends Node {
           top: number,
         ) => void;
       };
-      if (drawable.draw) drawable.draw(ctx, left, top);
+      if (drawable.draw) drawable.draw(ctx, childOffsetX, childOffsetY);
     });
+
+    if (needsClip) {
+      ctx.restore();
+    }
   }
 
   mount() {
@@ -255,6 +296,9 @@ export class UIView extends Node {
     this.yogaNode.setFlexBasis(this._flexBasis);
     this.yogaNode.setFlexGrow(this._flexGrow);
     this.yogaNode.setFlexShrink(this._flexShrink);
+    if (this._overflow === "hidden" || this._overflow === "scroll") {
+      this.yogaNode.setOverflow(Yoga.OVERFLOW_HIDDEN);
+    }
     const parentNode = (this.parent as Node & { yogaNode?: YogaTypes.Node })
       ?.yogaNode;
     if (parentNode) {
@@ -706,6 +750,45 @@ export class UIView extends Node {
     this.ui?.redraw();
   }
 
+  get overflow() {
+    return this._overflow;
+  }
+
+  set overflow(value: OverflowMode) {
+    if (this._overflow === value) return;
+    this._overflow = value;
+    if (this.yogaNode) {
+      if (value === "hidden" || value === "scroll") {
+        this.yogaNode.setOverflow(Yoga.OVERFLOW_HIDDEN);
+      } else {
+        this.yogaNode.setOverflow(Yoga.OVERFLOW_VISIBLE);
+      }
+    }
+    this.ui?.redraw();
+  }
+
+  get scrollX() {
+    return this._scrollX;
+  }
+
+  set scrollX(value: number) {
+    if (!isNumber(value)) throw new Error("[uiview] scrollX not a number");
+    if (this._scrollX === value) return;
+    this._scrollX = value;
+    this.ui?.redraw();
+  }
+
+  get scrollY() {
+    return this._scrollY;
+  }
+
+  set scrollY(value: number) {
+    if (!isNumber(value)) throw new Error("[uiview] scrollY not a number");
+    if (this._scrollY === value) return;
+    this._scrollY = value;
+    this.ui?.redraw();
+  }
+
   getProxy() {
     const self = this;
     if (!this.proxy) {
@@ -848,6 +931,24 @@ export class UIView extends Node {
         set flexShrink(value) {
           self.flexShrink = value;
         },
+        get overflow() {
+          return self.overflow;
+        },
+        set overflow(value) {
+          self.overflow = value;
+        },
+        get scrollX() {
+          return self.scrollX;
+        },
+        set scrollX(value) {
+          self.scrollX = value;
+        },
+        get scrollY() {
+          return self.scrollY;
+        },
+        set scrollY(value) {
+          self.scrollY = value;
+        },
       };
       proxy = Object.defineProperties(
         proxy,
diff --git a/packages/shared/src/nodes/index.ts b/packages/shared/src/nodes/index.ts
index 3894b942d..c9661f9c4 100644
--- a/packages/shared/src/nodes/index.ts
+++ b/packages/shared/src/nodes/index.ts
@@ -42,6 +42,7 @@ export { Particles } from "./Particles";
 export { UI } from "./UI";
 export { UIView } from "./UIView";
 export { UIText } from "./UIText";
+export { UIImage } from "./UIImage";
 export { RigidBody } from "./RigidBody";
 export { Collider } from "./Collider";
 
@@ -58,5 +59,6 @@ export { Particles as particles } from "./Particles";
 export { UI as ui } from "./UI";
 export { UIView as uiview } from "./UIView";
 export { UIText as uitext } from "./UIText";
+export { UIImage as uiimage } from "./UIImage";
 export { RigidBody as rigidbody } from "./RigidBody";
 export { Collider as collider } from "./Collider";
diff --git a/packages/shared/src/runtime/clientViewportMode.ts b/packages/shared/src/runtime/clientViewportMode.ts
index 7ff4d97df..d07831936 100644
--- a/packages/shared/src/runtime/clientViewportMode.ts
+++ b/packages/shared/src/runtime/clientViewportMode.ts
@@ -1,9 +1,11 @@
-interface HyperscapeViewportWindow extends Window {
+type HyperscapeViewportWindow = Window & {
   __HYPERSCAPE_EMBEDDED__?: boolean;
   __HYPERSCAPE_CONFIG__?: {
     mode?: string;
   };
-}
+};
+
+export type HyperscapeViewportMode = "spectator" | "stream" | "free";
 
 function parseTruthy(value: string | null | undefined): boolean {
   if (!value) return false;
@@ -17,8 +19,11 @@ function parseTruthy(value: string | null | undefined): boolean {
 }
 
 function getWindowRef(win?: Window): HyperscapeViewportWindow | undefined {
+  if (win) {
+    return win as HyperscapeViewportWindow;
+  }
   if (typeof window === "undefined") return undefined;
-  return (win ?? window) as HyperscapeViewportWindow;
+  return window as HyperscapeViewportWindow;
 }
 
 function getSearchParams(
@@ -31,12 +36,39 @@ function getSearchParams(
   }
 }
 
+function normalizeViewportMode(value: unknown): HyperscapeViewportMode | null {
+  if (typeof value !== "string") return null;
+  const normalized = value.trim().toLowerCase();
+  return normalized === "spectator" ||
+    normalized === "stream" ||
+    normalized === "free"
+    ? normalized
+    : null;
+}
+
+function isStreamPath(pathname: string): boolean {
+  return /\/stream(?:\.html)?\/?$/.test(pathname);
+}
+
+export function getViewportMode(win?: Window): HyperscapeViewportMode | null {
+  const windowRef = getWindowRef(win);
+  if (!windowRef) return null;
+
+  const params = getSearchParams(windowRef);
+  const queryMode = normalizeViewportMode(params?.get("mode"));
+  if (queryMode) {
+    return queryMode;
+  }
+
+  return normalizeViewportMode(windowRef.__HYPERSCAPE_CONFIG__?.mode);
+}
+
 export function isStreamPageRoute(win?: Window): boolean {
   const windowRef = getWindowRef(win);
   if (!windowRef) return false;
 
   const pathname = windowRef.location.pathname.trim().toLowerCase();
-  if (pathname.endsWith("/stream.html") || pathname === "/stream.html") {
+  if (isStreamPath(pathname)) {
     return true;
   }
 
@@ -44,13 +76,17 @@ export function isStreamPageRoute(win?: Window): boolean {
   return (params?.get("page") || "").trim().toLowerCase() === "stream";
 }
 
+export function isDedicatedStreamViewport(win?: Window): boolean {
+  return isStreamPageRoute(win) || getViewportMode(win) === "stream";
+}
+
 export function isEmbeddedSpectatorViewport(win?: Window): boolean {
   const windowRef = getWindowRef(win);
   if (!windowRef) return false;
 
   const params = getSearchParams(windowRef);
   const embeddedFromQuery = parseTruthy(params?.get("embedded"));
-  const modeFromQuery = (params?.get("mode") || "").trim().toLowerCase();
+  const modeFromQuery = normalizeViewportMode(params?.get("mode"));
 
   const embeddedFromConfig =
     windowRef.__HYPERSCAPE_EMBEDDED__ === true &&
@@ -62,5 +98,15 @@ export function isEmbeddedSpectatorViewport(win?: Window): boolean {
 }
 
 export function isStreamingLikeViewport(win?: Window): boolean {
-  return isStreamPageRoute(win) || isEmbeddedSpectatorViewport(win);
+  return isDedicatedStreamViewport(win) || isEmbeddedSpectatorViewport(win);
+}
+
+export function isStreamDebugEnabled(win?: Window): boolean {
+  const windowRef = getWindowRef(win);
+  if (!windowRef) return false;
+  const params = getSearchParams(windowRef);
+  return (
+    parseTruthy(params?.get("streamDebug")) ||
+    parseTruthy(params?.get("traceInit"))
+  );
 }
diff --git a/packages/shared/src/runtime/createClientWorld.ts b/packages/shared/src/runtime/createClientWorld.ts
index 2e8fdbe0a..48a2475c5 100644
--- a/packages/shared/src/runtime/createClientWorld.ts
+++ b/packages/shared/src/runtime/createClientWorld.ts
@@ -52,6 +52,7 @@ import { ClientActions } from "../systems/client/ClientActions";
 import { ClientAudio } from "../systems/client/ClientAudio";
 import { ClientCameraSystem } from "../systems/client/ClientCameraSystem";
 import { DevStats } from "../systems/client/DevStats";
+import { DuelArenaVisualsSystem } from "../systems/client/DuelArenaVisualsSystem";
 import { PathfindingDebugSystem } from "../systems/client/PathfindingDebugSystem";
 import { BFSPathDebugSystem } from "../systems/client/BFSPathDebugSystem";
 import { WalkableTileDebugSystem } from "../systems/client/WalkableTileDebugSystem";
@@ -129,7 +130,10 @@ import { Particles } from "../systems/shared";
 import { Wind } from "../systems/shared";
 import { ClientTeleportEffectsSystem } from "../systems/client/ClientTeleportEffectsSystem";
 import type { SystemConstructor } from "../systems/shared/infrastructure/System";
-import { isStreamingLikeViewport } from "./clientViewportMode";
+import {
+  isDedicatedStreamViewport,
+  isStreamingLikeViewport,
+} from "./clientViewportMode";
 
 /**
  * Window extension for browser testing and debugging.
@@ -189,6 +193,8 @@ function replaceSystem(
  */
 export function createClientWorld() {
   const world = new World();
+  const isStreamingViewport = isStreamingLikeViewport();
+  const isDedicatedStreamCaptureViewport = isDedicatedStreamViewport();
   // ============================================================================
   // FRAME BUDGET MANAGER
   // ============================================================================
@@ -239,7 +245,9 @@ export function createClientWorld() {
   // Lifecycle and networking
   world.register("client-runtime", ClientRuntime); // Client lifecycle, diagnostics
   replaceSystem(world, "stage", Stage); // Three.js scene graph root
-  world.register("livekit", ClientLiveKit); // Voice chat client
+  if (!isDedicatedStreamCaptureViewport) {
+    world.register("livekit", ClientLiveKit); // Voice chat client
+  }
   world.register("network", ClientNetwork); // WebSocket connection to server
   world.register("loader", ClientLoader); // Asset loading and caching
 
@@ -248,18 +256,24 @@ export function createClientWorld() {
   world.register("environment", Environment); // Lighting, shadows, CSM
 
   // Dev tools (only active in dev mode)
-  world.register("devStats", DevStats); // FPS counter and performance telemetry
-  world.register("pathfindingDebug", PathfindingDebugSystem); // Press 'P' to toggle
-  world.register("bfsPathDebug", BFSPathDebugSystem); // Press 'B' (with F5 open) to toggle
-  world.register("walkableDebug", WalkableTileDebugSystem); // Press 'W' (with F5 open) to toggle
+  if (!isDedicatedStreamCaptureViewport) {
+    world.register("devStats", DevStats); // FPS counter and performance telemetry
+    world.register("pathfindingDebug", PathfindingDebugSystem); // Press 'P' to toggle
+    world.register("bfsPathDebug", BFSPathDebugSystem); // Press 'B' (with F5 open) to toggle
+    world.register("walkableDebug", WalkableTileDebugSystem); // Press 'W' (with F5 open) to toggle
+  }
 
   // Audio systems
-  world.register("audio", ClientAudio); // 3D spatial audio
-  world.register("music", MusicSystem); // Background music player
+  world.register("audio", ClientAudio); // 3D spatial audio / combat SFX
+  if (!isDedicatedStreamCaptureViewport) {
+    world.register("music", MusicSystem); // Background music player
+  }
 
   // Input and interaction
-  world.register("controls", ClientInput); // Keyboard, mouse, touch input
-  world.register("actions", ClientActions); // Executable player actions
+  if (!isDedicatedStreamCaptureViewport) {
+    world.register("controls", ClientInput); // Keyboard, mouse, touch input
+    world.register("actions", ClientActions); // Executable player actions
+  }
 
   // UI and preferences
   world.register("prefs", ClientInterface); // User preferences and UI state
@@ -268,7 +282,7 @@ export function createClientWorld() {
   // Streaming/spectator viewports skip physics entirely — they don't need
   // collision detection and PhysX WASM can crash in the Playwright capture
   // browser. RigidBody/Collider nodes already guard against missing PHYSX.
-  if (!isStreamingLikeViewport()) {
+  if (!isStreamingViewport) {
     replaceSystem(world, "physics", Physics);
   } else {
     // The World constructor registers a default PhysicsSystem whose init()
@@ -293,6 +307,12 @@ export function createClientWorld() {
   world.register("terrain", TerrainSystem);
   world.register("bridges", BridgeSystem);
 
+  // Dedicated broadcast capture is duel-first: arena geometry must mount before
+  // decorative world systems such as vegetation/towns can delay startup.
+  if (isDedicatedStreamCaptureViewport) {
+    world.register("duel-arena-visuals", DuelArenaVisualsSystem);
+  }
+
   // ============================================================================
   // VEGETATION SYSTEM
   // ============================================================================
@@ -313,8 +333,10 @@ export function createClientWorld() {
   // that VegetationSystem receives to regenerate grass at correct heights
 
   world.register("towns", TownSystem);
-  world.register("pois", POISystem);
-  // world.register("roads", RoadNetworkSystem);
+  if (!isDedicatedStreamCaptureViewport) {
+    world.register("pois", POISystem);
+  }
+  world.register("roads", RoadNetworkSystem);
 
   // ============================================================================
   // BUILDING RENDERING SYSTEM
@@ -369,7 +391,10 @@ export function createClientWorld() {
   // ============================================================================
   // DOCK SYSTEM
   // ============================================================================
-  world.register("docks", ProceduralDocks);
+  // Procedural docks for ponds and lakes — collision + mesh on client
+  if (!isDedicatedStreamCaptureViewport) {
+    world.register("docks", ProceduralDocks);
+  }
 
   // ============================================================================
   // THREE.JS SETUP
@@ -450,15 +475,16 @@ export function createClientWorld() {
         console.log(
           "[createClientWorld] Skipping tree cache pre-warm and PhysX for stream/spectator viewport",
         );
-        // CRITICAL: We still need to load PhysX even if we skip tree pre-warming!
-        // In stream mode, there is no local player, so PlayerLocal won't trigger the load either.
-        // We trigger it here in the background so colliders and static actors can initialize.
-        waitForPhysX("StreamInitialization", 120000).catch((err) => {
-          console.warn(
-            "[createClientWorld] Background PhysX load failed:",
-            err,
-          );
-        });
+        if (!isDedicatedStreamCaptureViewport) {
+          // Embedded spectator views still benefit from a background PhysX load
+          // for collision-backed terrain probes without blocking first paint.
+          waitForPhysX("StreamInitialization", 120000).catch((err) => {
+            console.warn(
+              "[createClientWorld] Background PhysX load failed:",
+              err,
+            );
+          });
+        }
       }
 
       // Mob impostor pre-warming disabled — VRM mobs use on-demand baking.
diff --git a/packages/shared/src/systems/client/ClientAudio.ts b/packages/shared/src/systems/client/ClientAudio.ts
index 21cf8ef52..b47f3eb51 100644
--- a/packages/shared/src/systems/client/ClientAudio.ts
+++ b/packages/shared/src/systems/client/ClientAudio.ts
@@ -176,17 +176,9 @@ export class ClientAudio extends System {
         await this.ctx.resume();
         if (this.ctx.state !== "running")
           throw new Error("Audio still suspended");
-        const video = document.createElement("video");
-        video.playsInline = true;
-        video.muted = true;
-        video.src = "/tiny.mp4";
-        await video.play();
-        video.pause();
-        video.remove();
         complete();
       } catch (error) {
         console.error("Failed to unlock audio context:", error);
-        this.removeUnlockListeners();
       }
     };
 
diff --git a/packages/shared/src/systems/client/ClientCameraSystem.ts b/packages/shared/src/systems/client/ClientCameraSystem.ts
index d3f5a11c5..04b455109 100644
--- a/packages/shared/src/systems/client/ClientCameraSystem.ts
+++ b/packages/shared/src/systems/client/ClientCameraSystem.ts
@@ -1597,6 +1597,7 @@ export class ClientCameraSystem extends SystemBase {
     targetFov: number;
     orbitAmplitude: number;
     focusBias: number;
+    reverseAngleCooldownMs: number;
   } {
     switch (this.cinematicPhase) {
       case "ANNOUNCEMENT":
@@ -1608,6 +1609,7 @@ export class ClientCameraSystem extends SystemBase {
           targetFov: 48,
           orbitAmplitude: 0.08,
           focusBias: 0.35,
+          reverseAngleCooldownMs: 20_000,
         };
       case "COUNTDOWN":
         return {
@@ -1618,26 +1620,38 @@ export class ClientCameraSystem extends SystemBase {
           targetFov: 42,
           orbitAmplitude: 0.02,
           focusBias: 0.85,
+          reverseAngleCooldownMs: 20_000,
         };
       case "FIGHTING":
         return {
           radiusMin: 4.0,
           radiusMax: 7.5,
           basePhi: Math.PI * 0.27,
-          driftSpeed: 0.018,
+          driftSpeed: 0.035,
           targetFov: 46,
-          orbitAmplitude: 0.07,
+          // Orbit amplitude raised from 0.07 to 0.25 so the per-frame pixel
+          // delta exceeds CDP screencast JPEG quality-80 deduplication. At
+          // 0.07 rad (~4°) the camera drift was too subtle for the capture
+          // pipeline to distinguish consecutive frames — CDP marked 98% as
+          // "repeated", collapsing effective capture to 2 unique FPS. At
+          // 0.25 rad (~14°) combined with the multi-frequency orbit sines,
+          // the per-frame shift is ~40-80 px at 720p/46° FOV, well above
+          // JPEG detection threshold. Drift speed also bumped (0.018→0.035)
+          // for more dynamic camera motion during fights.
+          orbitAmplitude: 0.25,
           focusBias: 0.5,
+          reverseAngleCooldownMs: 14_000,
         };
       case "RESOLUTION":
         return {
           radiusMin: 5.5,
           radiusMax: 8,
           basePhi: Math.PI * 0.44,
-          driftSpeed: 0.025,
+          driftSpeed: 0.03,
           targetFov: 45,
-          orbitAmplitude: 0.06,
+          orbitAmplitude: 0.2,
           focusBias: 0.5,
+          reverseAngleCooldownMs: 20_000,
         };
       default:
         return {
@@ -1648,6 +1662,7 @@ export class ClientCameraSystem extends SystemBase {
           targetFov: 52,
           orbitAmplitude: 0.1,
           focusBias: 0.5,
+          reverseAngleCooldownMs: 20_000,
         };
     }
   }
@@ -2160,7 +2175,7 @@ export class ClientCameraSystem extends SystemBase {
   }
 
   /**
-   * When streaming duel HP drops, add punch-in + shake so hits read on broadcast.
+   * React to HP changes from streaming state so hits read on broadcast.
    */
   private tickStreamingCombatFeedback(deltaSeconds: number): void {
     if (!this.cinematicEnabled || deltaSeconds <= 0) return;
@@ -2185,18 +2200,29 @@ export class ClientCameraSystem extends SystemBase {
       const lost = prev - next;
       const severity = lost / maxHp;
       this.cinematicShakeIntensity = Math.min(
-        0.32,
-        this.cinematicShakeIntensity + 0.055 + severity * 0.22,
+        0.4,
+        this.cinematicShakeIntensity + 0.06 + severity * 0.35,
       );
       this.cinematicPunchIn = Math.min(
         1,
-        this.cinematicPunchIn + 0.32 + severity * 0.25,
+        this.cinematicPunchIn + 0.35 + severity * 0.3,
       );
     };
 
     applyHit(this.streamingPrevAgent1Hp, h1, m1);
     applyHit(this.streamingPrevAgent2Hp, h2, m2);
 
+    const lowestHpPct = Math.min(h1 / m1, h2 / m2);
+    if (lowestHpPct < 0.15 && lowestHpPct > 0) {
+      const urgency = 1 - lowestHpPct / 0.15;
+      this.cinematicDramaticLow = Math.max(
+        this.cinematicDramaticLow,
+        urgency * 0.6,
+      );
+    } else {
+      this.cinematicDramaticLow *= Math.exp(-1.5 * deltaSeconds);
+    }
+
     this.streamingPrevAgent1Hp = h1;
     this.streamingPrevAgent2Hp = h2;
   }
@@ -2421,7 +2447,9 @@ export class ClientCameraSystem extends SystemBase {
         if (timeSinceReverse > this.cinematicNextReverseCooldown) {
           reverseAngleBoost = Math.PI * 0.3;
           this.cinematicLastReverseAt = now;
-          this.cinematicNextReverseCooldown = 18000 + Math.random() * 8000;
+          const baseCooldown = pp.reverseAngleCooldownMs;
+          this.cinematicNextReverseCooldown =
+            baseCooldown - 2000 + Math.random() * 6000;
           // Reset theta cache so LOS scorer accepts the new angle
           this.cinematicThetaCacheValid = false;
           this.cinematicLastLosRefreshAt = 0;
@@ -2478,8 +2506,9 @@ export class ClientCameraSystem extends SystemBase {
           pp.basePhi + closeCombatBlend * (Math.PI * 0.38 - pp.basePhi);
         const phiVariation =
           Math.sin(t * 0.13) * 0.015 + Math.sin(t * 0.07) * 0.01;
+        const dramaticLowOffset = this.cinematicDramaticLow * -0.12;
         phi = clamp(
-          closeCombatPhi + phiVariation,
+          closeCombatPhi + phiVariation + dramaticLowOffset,
           this.settings.minPolarAngle + 0.03,
           this.settings.maxPolarAngle - 0.03,
         );
diff --git a/packages/shared/src/systems/client/ClientLoader.ts b/packages/shared/src/systems/client/ClientLoader.ts
index 0ac5e227a..320347601 100644
--- a/packages/shared/src/systems/client/ClientLoader.ts
+++ b/packages/shared/src/systems/client/ClientLoader.ts
@@ -372,6 +372,7 @@ export class ClientLoader extends SystemBase {
   private maxConcurrentFetches = 16; // Higher during preload, lowered after
   private readonly PRELOAD_CONCURRENCY = 16;
   private readonly RUNTIME_CONCURRENCY = 6;
+  private readonly FETCH_TIMEOUT_MS = 15000;
   private activeFetches = 0;
   private fetchQueue: Array<() => void> = [];
   private isPreloading = false;
@@ -594,14 +595,41 @@ export class ClientLoader extends SystemBase {
         try {
           this.stats.networkRequests++;
           const fetchStart = performance.now();
+          const abortController =
+            typeof AbortController !== "undefined"
+              ? new AbortController()
+              : null;
+          let timedOut = false;
+          const timeoutId =
+            abortController !== null
+              ? setTimeout(() => {
+                  timedOut = true;
+                  abortController.abort();
+                }, this.FETCH_TIMEOUT_MS)
+              : null;
 
           console.log(`[ClientLoader] Fetching: ${url}`);
           // Use 'default' cache mode to leverage browser HTTP cache
           // This will use cached response if available and not stale
-          const resp = await fetch(url, {
-            cache: "default",
-            mode: "cors",
-          });
+          let resp: Response;
+          try {
+            resp = await fetch(url, {
+              cache: "default",
+              mode: "cors",
+              signal: abortController?.signal,
+            });
+          } catch (error) {
+            if (timedOut) {
+              throw new Error(
+                `Request timed out after ${this.FETCH_TIMEOUT_MS}ms`,
+              );
+            }
+            throw error;
+          } finally {
+            if (timeoutId) {
+              clearTimeout(timeoutId);
+            }
+          }
 
           if (!resp.ok) {
             console.error(
diff --git a/packages/shared/src/systems/client/ClientNetwork.ts b/packages/shared/src/systems/client/ClientNetwork.ts
index fa37a7840..8277f62ad 100644
--- a/packages/shared/src/systems/client/ClientNetwork.ts
+++ b/packages/shared/src/systems/client/ClientNetwork.ts
@@ -123,12 +123,16 @@ import { isStreamingLikeViewport } from "../../runtime/clientViewportMode";
 import { PlayerLocal } from "../../entities/player/PlayerLocal";
 import { TileInterpolator } from "./TileInterpolator";
 import { type TileCoord } from "../shared/movement/TileSystem"; // Internal import within shared package
+import { resolveClientAssetBase } from "../../utils/clientAssetBase";
 
 type ClientNetworkEnv = {
   PUBLIC_DISABLE_NETWORK?: string;
   DISABLE_NETWORK?: string;
   PUBLIC_INTERPOLATION_MAX_PER_FRAME?: string;
   INTERPOLATION_MAX_PER_FRAME?: string;
+  PUBLIC_API_URL?: string;
+  PUBLIC_CDN_URL?: string;
+  PUBLIC_ASSETS_URL?: string;
 };
 
 const isTruthy = (value?: string): boolean =>
@@ -397,14 +401,10 @@ export class ClientNetwork extends SystemBase {
     this.world.emit(EventType.INVENTORY_UPDATED, { ...cached });
   }
 
-  /**
-   * Schedule a single delayed prune check. Re-schedules itself only while
-   * there are still pending optimistic actions, so the timer stops when idle
-   * instead of ticking every 1s unconditionally.
-   */
+  /** Start the periodic rollback pruner (once, lazily on first optimistic call). */
   private ensureInventoryPruner(): void {
     if (this.inventoryPrunerInterval) return;
-    const runPrune = () => {
+    this.inventoryPrunerInterval = setInterval(() => {
       const rollbacks = this.inventoryTracker.pruneStale();
       for (const snapshot of rollbacks) {
         this.lastInventoryByPlayerId[snapshot.playerId] = snapshot;
@@ -413,20 +413,11 @@ export class ClientNetwork extends SystemBase {
           "[ClientNetwork] Optimistic inventory action timed out, rolling back",
         );
       }
-      // Re-schedule only if more actions are still pending
-      if (this.inventoryTracker.hasPending()) {
-        this.inventoryPrunerInterval = setTimeout(
-          runPrune,
-          1000,
-        ) as unknown as ReturnType<typeof setInterval>;
-      } else {
+      if (!this.inventoryTracker.hasPending()) {
+        clearInterval(this.inventoryPrunerInterval!);
         this.inventoryPrunerInterval = null;
       }
-    };
-    this.inventoryPrunerInterval = setTimeout(
-      runPrune,
-      1000,
-    ) as unknown as ReturnType<typeof setInterval>;
+    }, 1000);
   }
 
   public getSpectatorFollowEntity(): string | undefined {
@@ -582,32 +573,7 @@ export class ClientNetwork extends SystemBase {
       }
     }
 
-    // For embedded spectator viewfinders (dashboard agent live view), the spectator
-    // JWT is passed as a URL param on the iframe and stored in __HYPERSCAPE_CONFIG__.authToken.
-    // It is intentionally NOT put in the WebSocket URL by EmbeddedGameClient (security
-    // concern about token leaking in logs), but the server requires it to pass the
-    // STREAMING_PUBLIC_DELAY_MS access gate for agent spectating.  Use it here if no
-    // other authToken was found, so the connection is authenticated.
-    if (
-      !authToken &&
-      !urlHasAuthToken &&
-      typeof window !== "undefined" &&
-      !isPlaywrightRuntime
-    ) {
-      const embeddedAuth = (
-        window as {
-          __HYPERSCAPE_CONFIG__?: { authToken?: string };
-        }
-      ).__HYPERSCAPE_CONFIG__?.authToken;
-      if (embeddedAuth) {
-        authToken = embeddedAuth;
-      }
-    }
-
-    // Build WebSocket URL with authToken included.
-    // Note: For `mode=streaming`, the server may require `authToken` + `privyUserId` in the
-    // query string at connect time (`verifyStreamingViewerCredentials`) when public delay is
-    // enabled — streaming does not use the deferred first-message auth path on the server.
+    // Build WebSocket URL with authToken included
     let url: string;
     if (urlHasAuthToken) {
       // URL already has authToken (legacy embedded mode) - use as-is
@@ -651,43 +617,23 @@ export class ClientNetwork extends SystemBase {
       ).__HYPERSCAPE_CONFIG__;
 
       if (isEmbedded && embeddedConfig) {
-        this.isEmbeddedSpectator = embeddedConfig.mode === "spectator";
-        // Use followEntity as fallback so the onStreamingState guard fires even
-        // when the dashboard specifies an agent via followEntity (not characterId).
-        const originalFollowTarget =
-          embeddedConfig.characterId || embeddedConfig.followEntity || null;
-        this.embeddedCharacterId = originalFollowTarget;
-        // Freeze the original follow target on window so it survives HMR re-instantiation
-        // and can't be overwritten by streaming state broadcasts.
-        if (
-          originalFollowTarget &&
-          !(window as { __HYPERSCAPE_ORIGINAL_FOLLOW__?: string })
-            .__HYPERSCAPE_ORIGINAL_FOLLOW__
-        ) {
-          (
-            window as { __HYPERSCAPE_ORIGINAL_FOLLOW__?: string }
-          ).__HYPERSCAPE_ORIGINAL_FOLLOW__ = originalFollowTarget;
+        this.isEmbeddedSpectator =
+          embeddedConfig.mode === "spectator" ||
+          embeddedConfig.mode === "stream";
+        this.embeddedCharacterId = embeddedConfig.characterId || null;
+        const explicitFollow =
+          embeddedConfig.followEntity || embeddedConfig.characterId || null;
+        if (this.isEmbeddedSpectator && explicitFollow) {
+          const w = window as Window & {
+            __HYPERSCAPE_ORIGINAL_FOLLOW__?: string;
+          };
+          w.__HYPERSCAPE_ORIGINAL_FOLLOW__ ??= explicitFollow;
         }
 
         this.logger.debug("[ClientNetwork] Embedded config loaded", {
           isSpectator: this.isEmbeddedSpectator,
           hasCharacterId: !!this.embeddedCharacterId,
         });
-
-        // CRITICAL: Add mode, characterId, and followEntity to the WebSocket URL
-        // so the server's ConnectionHandler can use them to target the correct agent.
-        // Without these params, params.characterId and params.followEntity are undefined
-        // on the server, so requestedCharacterId is null and the server falls back to
-        // whatever streaming duel is active — causing the "random guy near a tree" bug.
-        if (embeddedConfig.mode && !url.includes("mode=")) {
-          url += `${url.includes("?") ? "&" : "?"}mode=${encodeURIComponent(embeddedConfig.mode)}`;
-        }
-        if (embeddedConfig.characterId && !url.includes("characterId=")) {
-          url += `&characterId=${encodeURIComponent(embeddedConfig.characterId)}`;
-        }
-        if (embeddedConfig.followEntity && !url.includes("followEntity=")) {
-          url += `&followEntity=${encodeURIComponent(embeddedConfig.followEntity)}`;
-        }
       }
     }
 
@@ -1187,22 +1133,41 @@ export class ClientNetwork extends SystemBase {
     }
     this.maxUploadSize = data.maxUploadSize || 10 * 1024 * 1024; // Default 10MB
 
-    // Use assetsUrl from server (always absolute URL to CDN)
-    this.world.assetsUrl = data.assetsUrl || "/";
+    const isStreamingLikeClient =
+      isSpectatorMode || this.isEmbeddedSpectator || isStreamingLikeViewport();
+
+    const resolvedAssetsUrl =
+      typeof window !== "undefined"
+        ? resolveClientAssetBase(
+            data.assetsUrl,
+            data.apiUrl,
+            window.location.href,
+            {
+              preferRuntimeAssetBase: isStreamingLikeClient,
+            },
+          )
+        : data.assetsUrl;
+    const normalizedAssetsUrl = resolvedAssetsUrl
+      ? resolvedAssetsUrl.endsWith("/")
+        ? resolvedAssetsUrl
+        : `${resolvedAssetsUrl}/`
+      : "/";
+
+    // Use assetsUrl from server/runtime, but sanitize problematic staging hosts first.
+    this.world.assetsUrl = normalizedAssetsUrl;
     if (typeof window !== "undefined") {
       const windowWithAssets = window as Window & {
         __CDN_URL?: string;
         __ASSETS_URL?: string;
       };
-      if (data.assetsUrl) {
-        windowWithAssets.__ASSETS_URL = data.assetsUrl;
-        windowWithAssets.__CDN_URL = data.assetsUrl;
+      if (resolvedAssetsUrl) {
+        windowWithAssets.__ASSETS_URL = resolvedAssetsUrl;
+        windowWithAssets.__CDN_URL = resolvedAssetsUrl;
       }
     }
 
     const loader = this.world.loader!;
-    // Assume preload and execPreload methods exist on loader
-    // preload environment model and avatar
+
     if (loader) {
       if (
         data.settings &&
@@ -1226,11 +1191,9 @@ export class ClientNetwork extends SystemBase {
           loader.preload("avatar", settings.avatar.url);
         }
       }
-      // preload emotes
       for (const url of emoteUrls) {
         loader.preload("emote", url as string);
       }
-      // We'll preload local player avatar after entities are deserialized
     }
 
     // Deserialize settings if method exists
@@ -2019,13 +1982,12 @@ export class ClientNetwork extends SystemBase {
     const now = performance.now();
     const renderTime = now - this.interpolationDelay;
 
-    // OPTIMIZATION: Use cached array, only rebuild when states change.
-    // forEach avoids the iterator object allocation that .entries() creates.
+    // OPTIMIZATION: Use cached array, only rebuild when states change
     if (this._interpolationStatesDirty) {
       this._interpolationStatesArray.length = 0;
-      this.interpolationStates.forEach((state, entityId) => {
-        this._interpolationStatesArray.push([entityId, state]);
-      });
+      for (const entry of this.interpolationStates.entries()) {
+        this._interpolationStatesArray.push(entry);
+      }
       this._interpolationStatesDirty = false;
       this._interpolationRotationIndex = 0; // Reset rotation on change
     }
@@ -4526,6 +4488,8 @@ export class ClientNetwork extends SystemBase {
     health: number;
     maxHealth: number;
     alive: boolean;
+    specialEnergy?: number;
+    specialAttackActive?: boolean;
   }) => {
     const localPlayer = this.world.getPlayer();
     if (!localPlayer) {
@@ -4555,6 +4519,15 @@ export class ClientNetwork extends SystemBase {
       health: data.health,
       maxHealth: data.maxHealth,
     });
+
+    // Emit special attack energy update for combat panel
+    if (typeof data.specialEnergy === "number") {
+      this.world.emit(EventType.UI_SPECIAL_ATTACK_CHANGED, {
+        playerId: localPlayer.id,
+        energy: data.specialEnergy,
+        active: data.specialAttackActive ?? false,
+      });
+    }
   };
 
   onCorpseLoot = (data: {
@@ -5167,7 +5140,7 @@ export class ClientNetwork extends SystemBase {
 
     // Clean up optimistic inventory tracker on disconnect
     if (this.inventoryPrunerInterval) {
-      clearTimeout(this.inventoryPrunerInterval);
+      clearInterval(this.inventoryPrunerInterval);
       this.inventoryPrunerInterval = null;
     }
     this.inventoryTracker.clear();
@@ -5450,26 +5423,17 @@ export class ClientNetwork extends SystemBase {
         ? data.cameraTarget
         : null;
 
-    // Embedded spectators should follow scheduler camera target changes
-    // (prevents stale followEntity from pinning the camera to inactive agents).
-    if (!this.isEmbeddedSpectator || !nextTargetId) {
-      return;
-    }
-
-    // Dashboard viewfinders have an explicit embeddedCharacterId — they are
-    // deliberately watching a specific agent and must NOT be hijacked by the
-    // streaming scheduler's cameraTarget (which points at whoever is currently
-    // dueling, not the agent the dashboard selected).  Only anonymous/streaming
-    // viewers with no pinned character should follow the scheduler's camera.
-    // Check instance field AND the frozen window value so HMR re-instantiation
-    // (which resets class fields to null) doesn't bypass this guard.
-    const frozenFollow =
-      this.embeddedCharacterId ||
-      (typeof window !== "undefined" &&
+    const hasDashboardFollowLock =
+      typeof window !== "undefined" &&
+      Boolean(
         (window as { __HYPERSCAPE_ORIGINAL_FOLLOW__?: string })
-          .__HYPERSCAPE_ORIGINAL_FOLLOW__) ||
-      null;
-    if (frozenFollow) {
+          .__HYPERSCAPE_ORIGINAL_FOLLOW__,
+      );
+
+    // Stream capture spectators should follow scheduler camera target changes.
+    // Dashboard viewfinders with an explicit follow target must stay pinned to
+    // that agent; the frozen value survives HMR/config churn.
+    if (!this.isEmbeddedSpectator || hasDashboardFollowLock || !nextTargetId) {
       return;
     }
 
diff --git a/packages/shared/src/systems/client/ClientRuntime.ts b/packages/shared/src/systems/client/ClientRuntime.ts
index 6900c21bc..87c563105 100644
--- a/packages/shared/src/systems/client/ClientRuntime.ts
+++ b/packages/shared/src/systems/client/ClientRuntime.ts
@@ -301,7 +301,12 @@ export class ClientRuntime extends System {
       const searchParams = new URLSearchParams(window.location.search);
       const page = (searchParams.get("page") || "").trim().toLowerCase();
       const mode = (searchParams.get("mode") || "").trim().toLowerCase();
-      if (page === "stream" || mode === "spectator" || isStreamPageRoute()) {
+      if (
+        page === "stream" ||
+        mode === "spectator" ||
+        mode === "stream" ||
+        isStreamPageRoute()
+      ) {
         return true;
       }
       if (parseTruthy(searchParams.get("disableVisibilityThrottle"))) {
diff --git a/packages/shared/src/systems/client/DuelArenaVisualsSystem.ts b/packages/shared/src/systems/client/DuelArenaVisualsSystem.ts
index ce4e9e641..6bbce50a3 100644
--- a/packages/shared/src/systems/client/DuelArenaVisualsSystem.ts
+++ b/packages/shared/src/systems/client/DuelArenaVisualsSystem.ts
@@ -56,14 +56,14 @@ import {
   type DuelArenaConfig,
 } from "../../data/duel-manifest";
 import {
-  LOBBY_CENTER_X,
-  LOBBY_CENTER_Z,
-  LOBBY_WIDTH,
-  LOBBY_LENGTH,
   HOSPITAL_CENTER_X,
   HOSPITAL_CENTER_Z,
-  HOSPITAL_WIDTH,
   HOSPITAL_LENGTH,
+  HOSPITAL_WIDTH,
+  LOBBY_CENTER_X,
+  LOBBY_CENTER_Z,
+  LOBBY_LENGTH,
+  LOBBY_WIDTH,
 } from "../../data/arena-layout";
 
 // Arena grid size/position: getDuelArenaConfig() at runtime (see duel-manifest / ArenaPoolManager).
@@ -673,11 +673,17 @@ export class DuelArenaVisualsSystem extends System {
       const quantized = vec2(tslFloor(wp.x.add(0.5)), tslFloor(wp.z.add(0.5)));
       const phase = tslHash(quantized).mul(6.28);
 
+      // Per-brazier speed variation (±15%) so they don't cycle in lockstep
+      const speedJitter = tslHash(quantized.add(vec2(31.5, 97.2)));
+      const speedScale = float(0.85).add(speedJitter.mul(0.3)); // 0.85–1.15
+
       // Multi-frequency sine flicker + high-freq noise (matches old PointLight behavior)
-      const flicker = sin(t.mul(10.0).add(phase))
+      const flicker = sin(t.mul(10.0).mul(speedScale).add(phase))
         .mul(0.15)
-        .add(sin(t.mul(7.3).add(phase.mul(1.7))).mul(0.08));
-      const noise = fract(sin(t.mul(43.7).add(phase)).mul(9827.3)).mul(0.05);
+        .add(sin(t.mul(7.3).mul(speedScale).add(phase.mul(1.7))).mul(0.08));
+      const noise = fract(
+        sin(t.mul(43.7).mul(speedScale).add(phase)).mul(9827.3),
+      ).mul(0.05);
       const intensity = float(0.6).add(flicker).add(noise);
 
       // Only the top face (fire opening) glows; outer shell stays dark.
diff --git a/packages/shared/src/systems/client/EquipmentVisualHelpers.ts b/packages/shared/src/systems/client/EquipmentVisualHelpers.ts
index 7915cd024..a35fe9630 100644
--- a/packages/shared/src/systems/client/EquipmentVisualHelpers.ts
+++ b/packages/shared/src/systems/client/EquipmentVisualHelpers.ts
@@ -28,6 +28,15 @@ export interface EquipmentVisualStore {
   [slot: string]: THREE.Object3D | undefined;
 }
 
+const EQUIPMENT_MODEL_FALLBACKS: Readonly<Record<string, string>> =
+  Object.freeze({
+    iron_arrow: "asset://models/arrows/arrows-bronze/arrows-bronze.glb",
+    steel_arrow: "asset://models/arrows/arrows-bronze/arrows-bronze.glb",
+    mithril_arrow: "asset://models/arrows/arrows-bronze/arrows-bronze.glb",
+    adamant_arrow: "asset://models/arrows/arrows-bronze/arrows-bronze.glb",
+    rune_arrow: "asset://models/arrows/arrows-bronze/arrows-bronze.glb",
+  });
+
 export function removeEquipmentVisual(
   store: EquipmentVisualStore,
   slot: string,
@@ -69,6 +78,11 @@ export function resolveEquipmentVisualUrls(options: {
 
   let equippedModelPath = itemData?.equippedModelPath;
   let modelPath = itemData?.modelPath;
+  const explicitlyModelLess =
+    itemData?.equippedModelPath === null ||
+    itemData?.modelPath === null ||
+    fallbackItemData?.equippedModelPath === null ||
+    fallbackItemData?.modelPath === null;
 
   if (equippedModelPath === null) {
     return null;
@@ -97,6 +111,17 @@ export function resolveEquipmentVisualUrls(options: {
     };
   }
 
+  if (explicitlyModelLess) {
+    const fallbackAssetPath = EQUIPMENT_MODEL_FALLBACKS[itemId];
+    if (!fallbackAssetPath) {
+      return null;
+    }
+    return {
+      primaryUrl: fallbackAssetPath.replace("asset://", `${assetsUrl}/`),
+      fallbackUrl: null,
+    };
+  }
+
   const parts = itemId.split("_");
   let assetId = itemId.replace(/_/g, "-");
   let category = "";
diff --git a/packages/shared/src/systems/client/EquipmentVisualSystem.ts b/packages/shared/src/systems/client/EquipmentVisualSystem.ts
index a351351f6..6ff51b5dc 100644
--- a/packages/shared/src/systems/client/EquipmentVisualSystem.ts
+++ b/packages/shared/src/systems/client/EquipmentVisualSystem.ts
@@ -27,8 +27,8 @@ import type { World } from "../../types";
 import type { VRM } from "@pixiv/three-vrm";
 import { EQUIPMENT_SLOT_NAMES } from "../../constants/EquipmentConstants";
 import type { Entity } from "../../entities/Entity";
-import { AttackType } from "../../types/game/item-types";
 import { getItem } from "../../data/items";
+import { AttackType } from "../../types/game/item-types";
 import {
   attachEquipmentVisualToVRM,
   removeEquipmentVisual,
diff --git a/packages/shared/src/systems/client/__tests__/ClientLoaderBoot.test.ts b/packages/shared/src/systems/client/__tests__/ClientLoaderBoot.test.ts
new file mode 100644
index 000000000..b7dbc83ff
--- /dev/null
+++ b/packages/shared/src/systems/client/__tests__/ClientLoaderBoot.test.ts
@@ -0,0 +1,93 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { ClientLoader } from "../ClientLoader";
+import { EventType } from "../../../types/events";
+
+function createMockWorld() {
+  return {
+    resolveURL: (url: string) => url,
+    emit: vi.fn(),
+    network: {
+      send: vi.fn(),
+    },
+    camera: {},
+    stage: {
+      scene: {},
+      octree: {},
+    },
+    setupMaterial: vi.fn(),
+  } as const;
+}
+
+describe("ClientLoader boot safeguards", () => {
+  beforeEach(() => {
+    vi.useFakeTimers();
+    vi.stubGlobal("indexedDB", undefined);
+    vi.spyOn(console, "log").mockImplementation(() => {});
+    vi.spyOn(console, "warn").mockImplementation(() => {});
+    vi.spyOn(console, "error").mockImplementation(() => {});
+  });
+
+  afterEach(() => {
+    vi.useRealTimers();
+    vi.unstubAllGlobals();
+    vi.restoreAllMocks();
+  });
+
+  it("times out hanging fetches instead of waiting forever", async () => {
+    const world = createMockWorld();
+    const loader = new ClientLoader(world as never);
+
+    vi.stubGlobal(
+      "fetch",
+      vi.fn((_url: string, init?: RequestInit) => {
+        return new Promise((_resolve, reject) => {
+          const signal = init?.signal;
+          signal?.addEventListener("abort", () => {
+            reject(new DOMException("Aborted", "AbortError"));
+          });
+        });
+      }),
+    );
+
+    const filePromise = loader.loadFile("https://cdn.example.com/hanging.glb");
+    const rejection = expect(filePromise).rejects.toThrow(
+      "Request timed out after 15000ms",
+    );
+
+    await vi.advanceTimersByTimeAsync(15000);
+    await rejection;
+  });
+
+  it("does not emit READY early while preload work is still unresolved", async () => {
+    const world = createMockWorld();
+    const loader = new ClientLoader(world as never);
+    let resolveCritical: ((value: unknown) => void) | null = null;
+
+    vi.spyOn(loader, "load").mockImplementation(
+      (_type: string, url: string) => {
+        if (url === "critical.glb") {
+          return new Promise((resolve) => {
+            resolveCritical = resolve;
+          }) as Promise<never>;
+        }
+        return Promise.resolve({} as never);
+      },
+    );
+
+    loader.preload("model", "critical.glb");
+    loader.preload("emote", "background.glb");
+
+    loader.execPreload();
+    await vi.advanceTimersByTimeAsync(20000);
+
+    expect(world.emit).not.toHaveBeenCalledWith(EventType.READY);
+    expect(world.network.send).not.toHaveBeenCalledWith("clientReady", {});
+
+    resolveCritical?.({} as never);
+    await Promise.resolve();
+    await vi.advanceTimersByTimeAsync(0);
+
+    expect(world.emit).toHaveBeenCalledWith(EventType.READY);
+    expect(world.network.send).toHaveBeenCalledWith("clientReady", {});
+  });
+});
diff --git a/packages/shared/src/systems/client/__tests__/ClientNetworkInventoryPruner.test.ts b/packages/shared/src/systems/client/__tests__/ClientNetworkInventoryPruner.test.ts
new file mode 100644
index 000000000..680c8fb32
--- /dev/null
+++ b/packages/shared/src/systems/client/__tests__/ClientNetworkInventoryPruner.test.ts
@@ -0,0 +1,57 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { ClientNetwork } from "../ClientNetwork";
+import type { World } from "../../../types";
+
+type ClientNetworkHarness = ClientNetwork & {
+  inventoryPrunerInterval: ReturnType<typeof setInterval> | null;
+  lastInventoryByPlayerId: Record<
+    string,
+    {
+      playerId: string;
+      items: Array<{ slot: number; itemId: string; quantity: number }>;
+      coins: number;
+      maxSlots: number;
+    }
+  >;
+};
+
+const createWorld = () =>
+  ({
+    emit: vi.fn(),
+  }) as unknown as World;
+
+describe("ClientNetwork inventory pruner", () => {
+  let nowMs = 0;
+
+  beforeEach(() => {
+    nowMs = 0;
+    vi.useFakeTimers();
+    vi.spyOn(performance, "now").mockImplementation(() => nowMs);
+  });
+
+  afterEach(() => {
+    vi.useRealTimers();
+    vi.restoreAllMocks();
+  });
+
+  it("stops polling once no optimistic inventory actions remain pending", () => {
+    const world = createWorld();
+    const network = new ClientNetwork(world) as ClientNetworkHarness;
+
+    network.lastInventoryByPlayerId.player = {
+      playerId: "player",
+      items: [{ slot: 1, itemId: "logs", quantity: 2 }],
+      coins: 0,
+      maxSlots: 28,
+    };
+
+    network.applyOptimisticRemoval("player", 1, 1);
+
+    expect(network.inventoryPrunerInterval).not.toBeNull();
+
+    nowMs = 6_000;
+    vi.advanceTimersByTime(1_000);
+
+    expect(network.inventoryPrunerInterval).toBeNull();
+  });
+});
diff --git a/packages/shared/src/systems/client/__tests__/EquipmentVisualHelpers.test.ts b/packages/shared/src/systems/client/__tests__/EquipmentVisualHelpers.test.ts
new file mode 100644
index 000000000..1757ce466
--- /dev/null
+++ b/packages/shared/src/systems/client/__tests__/EquipmentVisualHelpers.test.ts
@@ -0,0 +1,41 @@
+import { describe, expect, it } from "vitest";
+import { resolveEquipmentVisualUrls } from "../EquipmentVisualHelpers";
+
+describe("EquipmentVisualHelpers", () => {
+  it("uses the packaged arrow visual when an ammo item is explicitly model-less", () => {
+    const urls = resolveEquipmentVisualUrls({
+      assetsUrl: "https://example.com/game-assets",
+      itemId: "iron_arrow",
+      slot: "arrows",
+      itemData: {
+        modelPath: null,
+        equippedModelPath: undefined,
+      },
+    });
+
+    expect(urls).toEqual({
+      primaryUrl:
+        "https://example.com/game-assets/models/arrows/arrows-bronze/arrows-bronze.glb",
+      fallbackUrl: null,
+    });
+  });
+
+  it("keeps heuristic model resolution for regular equipment items", () => {
+    const urls = resolveEquipmentVisualUrls({
+      assetsUrl: "https://example.com/game-assets",
+      itemId: "iron_sword",
+      slot: "mainHand",
+      itemData: {
+        modelPath: undefined,
+        equippedModelPath: undefined,
+      },
+    });
+
+    expect(urls).toEqual({
+      primaryUrl:
+        "https://example.com/game-assets/models/swords-old/sword-iron-aligned.glb",
+      fallbackUrl:
+        "https://example.com/game-assets/models/swords-old/sword-iron/sword-iron-aligned.glb",
+    });
+  });
+});
diff --git a/packages/shared/src/systems/client/network/ConnectionManager.ts b/packages/shared/src/systems/client/network/ConnectionManager.ts
index 85ce21241..57326354b 100644
--- a/packages/shared/src/systems/client/network/ConnectionManager.ts
+++ b/packages/shared/src/systems/client/network/ConnectionManager.ts
@@ -233,7 +233,9 @@ export class ConnectionManager {
       ).__HYPERSCAPE_CONFIG__;
 
       if (isEmbedded && embeddedConfig) {
-        this.isEmbeddedSpectator = embeddedConfig.mode === "spectator";
+        this.isEmbeddedSpectator =
+          embeddedConfig.mode === "spectator" ||
+          embeddedConfig.mode === "stream";
         const characterId = embeddedConfig.characterId || null;
         onEmbeddedConfig(characterId);
 
@@ -244,11 +246,17 @@ export class ConnectionManager {
       }
     }
 
-    // Capture whether we're using first-message auth for the open handler.
-    // Use first-message auth whenever URL auth is unavailable.
-    const useFirstMessageAuth = !urlHasAuthToken;
     const isStreamingConnection = /[?&]mode=streaming(?:[&#]|$)/.test(url);
-    const connectionTimeoutMs = isStreamingConnection ? 120_000 : 30_000;
+    const isSpectatorConnection = /[?&]mode=spectator(?:[&#]|$)/.test(url);
+    const allowsAnonymousMode =
+      isStreamingConnection ||
+      isSpectatorConnection ||
+      this.isEmbeddedSpectator;
+    // Streaming/spectator connections are read-only public viewers. They must
+    // not send an empty authenticate packet when URL auth is absent.
+    const useFirstMessageAuth = !urlHasAuthToken && !allowsAnonymousMode;
+    const connectionTimeoutMs =
+      isStreamingConnection || isSpectatorConnection ? 120_000 : 30_000;
 
     return new Promise((resolve, reject) => {
       this.ws = new WebSocket(url);
diff --git a/packages/shared/src/systems/shared/character/CoinPouchSystem.ts b/packages/shared/src/systems/shared/character/CoinPouchSystem.ts
index 62267da92..f2dde99ed 100644
--- a/packages/shared/src/systems/shared/character/CoinPouchSystem.ts
+++ b/packages/shared/src/systems/shared/character/CoinPouchSystem.ts
@@ -30,10 +30,10 @@ import type { PlayerID } from "../../../types/core/identifiers";
 import type { DatabaseSystem } from "../../../types/systems/system-interfaces";
 
 /** Default starting coins for new players */
-const DEFAULT_STARTING_COINS = 100;
+export const DEFAULT_STARTING_COINS = 100;
 
-/** Maximum coins a player can hold (prevent overflow) */
-const MAX_COINS = 2147483647; // Max 32-bit signed integer (OSRS cap)
+/** Maximum coins a player can hold (prevent overflow) — OSRS INT32 cap */
+export const MAX_COINS = 2147483647;
 
 /**
  * CoinPouchSystem - Manages player coin balances
diff --git a/packages/shared/src/systems/shared/character/InventorySystem.ts b/packages/shared/src/systems/shared/character/InventorySystem.ts
index be28092c3..83a96ea18 100644
--- a/packages/shared/src/systems/shared/character/InventorySystem.ts
+++ b/packages/shared/src/systems/shared/character/InventorySystem.ts
@@ -27,6 +27,7 @@ import { EntityManager } from "..";
 import { SystemBase } from "../infrastructure/SystemBase";
 import { Logger } from "../../../utils/Logger";
 import type { DatabaseSystem } from "../../../types/systems/system-interfaces";
+import { MAX_COINS } from "./CoinPouchSystem";
 import type { GroundItemSystem } from "../economy/GroundItemSystem";
 import type { CoinPouchSystem } from "./CoinPouchSystem";
 import { DeathState } from "../../../types/entities";
@@ -34,8 +35,8 @@ import { DeathState } from "../../../types/entities";
 export class InventorySystem extends SystemBase {
   protected playerInventories = new Map<PlayerID, PlayerInventory>();
   private readonly MAX_INVENTORY_SLOTS = 28;
-  /** Max stackable quantity — matches PostgreSQL integer max to prevent DB truncation */
-  private readonly MAX_QUANTITY = 2_147_483_647;
+  /** Max stackable quantity — uses shared MAX_COINS (PostgreSQL integer max) */
+  private readonly MAX_QUANTITY = MAX_COINS;
   // Pickup locks to prevent race conditions when multiple players try to pickup same item
   private pickupLocks = new Set<string>();
 
diff --git a/packages/shared/src/systems/shared/character/PlayerSystem.ts b/packages/shared/src/systems/shared/character/PlayerSystem.ts
index 80e2be81b..10cc22351 100644
--- a/packages/shared/src/systems/shared/character/PlayerSystem.ts
+++ b/packages/shared/src/systems/shared/character/PlayerSystem.ts
@@ -62,6 +62,11 @@ import type {
   PlayerLeaveEvent,
   PlayerLevelUpEvent,
 } from "../../../types/events";
+import type { StatsComponent } from "../../../components/StatsComponent";
+import {
+  calculateCombatLevel,
+  normalizeCombatSkills,
+} from "../../../utils/game/CombatLevelCalculator";
 import { EventType } from "../../../types/events";
 import type { World } from "../../../types/index";
 import { Logger } from "../../../utils/Logger";
@@ -121,6 +126,8 @@ export class PlayerSystem extends SystemBase {
     maxStamina: 100,
     coins: 0,
     combatStyle: "attack" as string,
+    specialEnergy: 1000,
+    specialAttackActive: false,
   };
   private _playerUpdatedEvent = {
     playerId: "",
@@ -151,6 +158,11 @@ export class PlayerSystem extends SystemBase {
   private autoRetaliateLastToggle = new Map<string, number>();
   private readonly AUTO_RETALIATE_COOLDOWN_MS = 500; // Max 2 toggles/second
 
+  // Special attack energy tracking (OSRS: 0-1000 internal, displayed as 0-100%)
+  private specialAttackToggle = new Map<string, boolean>();
+  private specialAttackLastToggle = new Map<string, number>();
+  private specialRechargeLastTick = new Map<string, number>();
+
   // Attack styles - OSRS-accurate stat bonuses applied via CombatCalculations.getStyleBonus()
   // @see https://oldschool.runescape.wiki/w/Combat_Options
   private readonly ATTACK_STYLES: Record<string, AttackStyle> = {
@@ -385,6 +397,19 @@ export class PlayerSystem extends SystemBase {
       ),
     );
 
+    // Special attack energy events
+    this.subscribe(EventType.UI_SPECIAL_ATTACK_TOGGLE, (data) =>
+      this.handleSpecialAttackToggle(data as { playerId: string }),
+    );
+    this.subscribe(EventType.UI_SPECIAL_ATTACK_GET, (data) =>
+      this.handleSpecialAttackGet(
+        data as {
+          playerId: string;
+          callback?: (info: { energy: number; active: boolean }) => void;
+        },
+      ),
+    );
+
     // Autocast spell selection (F2P magic combat)
     this.subscribe(EventType.PLAYER_SET_AUTOCAST, (data) =>
       this.handleSetAutocast(
@@ -768,6 +793,11 @@ export class PlayerSystem extends SystemBase {
     this.playerAutoRetaliate.delete(data.playerId);
     this.autoRetaliateLastToggle.delete(data.playerId);
 
+    // Clean up special attack
+    this.specialAttackToggle.delete(data.playerId);
+    this.specialAttackLastToggle.delete(data.playerId);
+    this.specialRechargeLastTick.delete(data.playerId);
+
     // Clean up eat cooldown (memory hygiene)
     this.eatDelayManager.clearPlayer(data.playerId);
 
@@ -972,10 +1002,15 @@ export class PlayerSystem extends SystemBase {
     // Reset player state to alive
     player.alive = true;
     player.health.current = player.health.max;
+    player.specialEnergy.current = player.specialEnergy.max;
     player.position = data.spawnPosition;
     player.death.respawnTime = 0;
     player.death.deathLocation = null;
 
+    // Clear special attack state
+    this.specialAttackToggle.delete(data.playerId);
+    this.specialRechargeLastTick.delete(data.playerId);
+
     // Update PlayerEntity health if it exists
     const playerEntity = this.world.getPlayer?.(
       data.playerId,
@@ -1028,6 +1063,10 @@ export class PlayerSystem extends SystemBase {
     playerData.maxStamina = player.stamina?.max || 100;
     playerData.coins = player.coins || 0;
     playerData.combatStyle = player.combat.combatStyle || "attack";
+    playerData.specialEnergy =
+      player.specialEnergy?.current ?? COMBAT_CONSTANTS.SPECIAL_ENERGY_MAX;
+    playerData.specialAttackActive =
+      this.specialAttackToggle.get(playerId) ?? false;
 
     // OPTIMIZATION: Reuse pre-allocated event objects
     // Emit PLAYER_UPDATED for systems
@@ -1478,14 +1517,22 @@ export class PlayerSystem extends SystemBase {
           player.health.current <= 0;
       }
 
-      // Update stats component health
-      const statsComponent = playerEntity.getComponent("stats");
-      if (statsComponent && statsComponent.data && statsComponent.data.health) {
-        const healthData = statsComponent.data.health as {
-          current: number;
-          max: number;
-        };
-        healthData.current = player.health.current;
+      // Update stats component health (both public property AND data dict)
+      // StatsComponent has TWO health objects: this.health (public) and this.data.health
+      // Both must stay in sync — handleLevelUp reads this.health, serialization reads this.data.health
+      const statsComponent = playerEntity.getComponent(
+        "stats",
+      ) as StatsComponent | null;
+      if (statsComponent) {
+        statsComponent.health.current = player.health.current;
+        statsComponent.health.max = player.health.max;
+        if (statsComponent.data?.health) {
+          (
+            statsComponent.data.health as { current: number; max: number }
+          ).current = player.health.current;
+          (statsComponent.data.health as { current: number; max: number }).max =
+            player.health.max;
+        }
       }
 
       // COMBAT_DAMAGE_DEALT is emitted by CombatSystem - no need to emit here
@@ -1718,6 +1765,9 @@ export class PlayerSystem extends SystemBase {
         player.position.z = entity.position.z;
       }
     }
+
+    // Recharge special attack energy (10% per 30 seconds)
+    this.rechargeSpecialEnergy();
   }
 
   private async performAutoSave(): Promise<void> {
@@ -1788,22 +1838,17 @@ export class PlayerSystem extends SystemBase {
   }
 
   private calculateCombatLevel(skills: Skills): number {
-    // OSRS Combat Level Formula:
-    // base = 0.25 × (Defence + Hitpoints + floor(Prayer / 2))
-    // melee = 0.325 × (Attack + Strength)
-    // ranged = 0.325 × floor(Ranged × 1.5)
-    // magic = 0.325 × floor(Magic × 1.5)
-    // combat = base + max(melee, ranged, magic)
-
-    // Since we don't have Prayer or Magic yet, simplified formula:
-    const base = 0.25 * (skills.defense.level + skills.constitution.level);
-
-    const melee = 0.325 * (skills.attack.level + skills.strength.level);
-    const ranged = 0.325 * Math.floor(skills.ranged.level * 1.5);
-
-    const combatLevel = base + Math.max(melee, ranged);
-
-    return Math.floor(combatLevel);
+    return calculateCombatLevel(
+      normalizeCombatSkills({
+        attack: skills.attack.level,
+        strength: skills.strength.level,
+        defense: skills.defense.level,
+        hitpoints: skills.constitution.level,
+        ranged: skills.ranged.level,
+        magic: skills.magic?.level,
+        prayer: skills.prayer?.level,
+      }),
+    );
   }
 
   /**
@@ -2322,6 +2367,135 @@ export class PlayerSystem extends SystemBase {
     return this.playerAutoRetaliate.get(playerId) ?? true;
   }
 
+  // ============================================================================
+  // SPECIAL ATTACK ENERGY METHODS
+  // ============================================================================
+
+  private handleSpecialAttackToggle(data: { playerId: string }): void {
+    if (!this.world.isServer) return;
+
+    const player = this.players.get(data.playerId);
+    if (!player || !player.alive) return;
+
+    // Rate limit (OWASP: prevent toggle spam)
+    const now = Date.now();
+    const lastToggle = this.specialAttackLastToggle.get(data.playerId) ?? 0;
+    if (now - lastToggle < COMBAT_CONSTANTS.SPECIAL_ATTACK_TOGGLE_COOLDOWN_MS) {
+      return;
+    }
+    this.specialAttackLastToggle.set(data.playerId, now);
+
+    const currentlyActive =
+      this.specialAttackToggle.get(data.playerId) ?? false;
+
+    if (currentlyActive) {
+      // Toggle OFF
+      this.specialAttackToggle.set(data.playerId, false);
+    } else {
+      // Toggle ON — check energy
+      const energy = player.specialEnergy.current;
+      if (energy < COMBAT_CONSTANTS.SPECIAL_ATTACK_MVP_COST) {
+        return; // Not enough energy
+      }
+      this.specialAttackToggle.set(data.playerId, true);
+    }
+
+    this.emitTypedEvent(EventType.UI_SPECIAL_ATTACK_CHANGED, {
+      playerId: data.playerId,
+      energy: player.specialEnergy.current,
+      maxEnergy: player.specialEnergy.max,
+      active: this.specialAttackToggle.get(data.playerId) ?? false,
+    });
+  }
+
+  private handleSpecialAttackGet(data: {
+    playerId: string;
+    callback?: (info: { energy: number; active: boolean }) => void;
+  }): void {
+    const player = this.players.get(data.playerId);
+    const energy =
+      player?.specialEnergy.current ?? COMBAT_CONSTANTS.SPECIAL_ENERGY_MAX;
+    const active = this.specialAttackToggle.get(data.playerId) ?? false;
+
+    if (data.callback) {
+      data.callback({ energy, active });
+    } else {
+      this.emitTypedEvent(EventType.UI_SPECIAL_ATTACK_CHANGED, {
+        playerId: data.playerId,
+        energy,
+        maxEnergy:
+          player?.specialEnergy.max ?? COMBAT_CONSTANTS.SPECIAL_ENERGY_MAX,
+        active,
+      });
+    }
+  }
+
+  /** Public: Check if player's special attack toggle is ON (used by CombatSystem) */
+  isSpecialAttackActive(playerId: string): boolean {
+    return this.specialAttackToggle.get(playerId) ?? false;
+  }
+
+  /** Public: Get current special energy (used by CombatSystem) */
+  getSpecialEnergy(playerId: string): number {
+    return this.players.get(playerId)?.specialEnergy.current ?? 0;
+  }
+
+  /**
+   * Public: Drain special energy and clear toggle (called by CombatSystem after special attack)
+   * Returns false if insufficient energy.
+   */
+  drainSpecialEnergy(playerId: string, amount: number): boolean {
+    const player = this.players.get(playerId);
+    if (!player) return false;
+
+    if (player.specialEnergy.current < amount) {
+      this.specialAttackToggle.set(playerId, false);
+      return false;
+    }
+
+    player.specialEnergy.current -= amount;
+    this.specialAttackToggle.set(playerId, false);
+
+    this.emitTypedEvent(EventType.UI_SPECIAL_ATTACK_CHANGED, {
+      playerId,
+      energy: player.specialEnergy.current,
+      maxEnergy: player.specialEnergy.max,
+      active: false,
+    });
+
+    this.emitPlayerUpdate(playerId);
+    return true;
+  }
+
+  /** Recharge special energy for all players (called from update tick) */
+  private rechargeSpecialEnergy(): void {
+    if (!this.world.isServer) return;
+    const currentTick = this.world.currentTick ?? 0;
+
+    for (const [playerId, player] of this.players) {
+      if (!player.alive) continue;
+      if (player.specialEnergy.current >= player.specialEnergy.max) continue;
+
+      const lastTick = this.specialRechargeLastTick.get(playerId) ?? 0;
+      if (
+        currentTick - lastTick <
+        COMBAT_CONSTANTS.SPECIAL_ENERGY_RECHARGE_TICKS
+      ) {
+        continue;
+      }
+
+      this.specialRechargeLastTick.set(playerId, currentTick);
+      player.specialEnergy.current = Math.min(
+        player.specialEnergy.max,
+        player.specialEnergy.current +
+          COMBAT_CONSTANTS.SPECIAL_ENERGY_RECHARGE_AMOUNT,
+      );
+
+      // Only broadcast when energy changes (avoid unnecessary packets)
+      this.emitPlayerUpdate(playerId);
+    }
+  }
+
   private handleSkillsUpdate(data: { playerId: string; skills: Skills }): void {
     const player = this.players.get(data.playerId);
     if (!player) {
@@ -2332,6 +2506,21 @@ export class PlayerSystem extends SystemBase {
     // Update player skills
     player.skills = data.skills;
 
+    // Sync health.max from constitution (same formula as initial registration at line 693)
+    // Without this, emitPlayerUpdate() broadcasts stale health.max after constitution XP gain
+    const constitutionLevel =
+      Number.isFinite(data.skills.constitution?.level) &&
+      data.skills.constitution.level > 0
+        ? data.skills.constitution.level
+        : 10;
+    const healthMaxChanged = constitutionLevel !== player.health.max;
+    if (healthMaxChanged) {
+      player.health.max = constitutionLevel;
+      if (player.health.current > player.health.max) {
+        player.health.current = player.health.max;
+      }
+    }
+
     // Recalculate combat level
     player.combat.combatLevel = this.calculateCombatLevel(data.skills);
 
@@ -2341,7 +2530,9 @@ export class PlayerSystem extends SystemBase {
     // Update stats component with new skill data for SkillsSystem and combat calculations
     const playerEntity = this.world.entities.get(data.playerId);
     if (playerEntity) {
-      const statsComponent = playerEntity.getComponent("stats");
+      const statsComponent = playerEntity.getComponent(
+        "stats",
+      ) as StatsComponent | null;
       if (statsComponent) {
         // Update skill data (full SkillData objects with level + xp) in stats component
         statsComponent.data.attack = data.skills.attack;
@@ -2353,6 +2544,18 @@ export class PlayerSystem extends SystemBase {
         statsComponent.data.fishing = data.skills.fishing;
         statsComponent.data.firemaking = data.skills.firemaking;
         statsComponent.data.cooking = data.skills.cooking;
+
+        // Sync health to statsComponent so handleLevelUp reads correct values
+        // (defense-in-depth: handleLevelUp reads stats.health, not player.health)
+        statsComponent.health.current = player.health.current;
+        statsComponent.health.max = player.health.max;
+      }
+
+      // Push updated health.max to entity data for network serialization
+      if (healthMaxChanged) {
+        playerEntity.data.health = player.health.current;
+        (playerEntity.data as { maxHealth?: number }).maxHealth =
+          player.health.max;
       }
     }
 
diff --git a/packages/shared/src/systems/shared/infrastructure/SystemLoader.ts b/packages/shared/src/systems/shared/infrastructure/SystemLoader.ts
index b905a35c6..f01b1cc1e 100644
--- a/packages/shared/src/systems/shared/infrastructure/SystemLoader.ts
+++ b/packages/shared/src/systems/shared/infrastructure/SystemLoader.ts
@@ -398,7 +398,9 @@ export async function registerSystems(world: World): Promise<void> {
     process.env.DUEL_ARENA_VISUALS_ENABLED !== "false";
   if (duelArenaVisualsEnabled) {
     try {
-      world.register("duel-arena-visuals", DuelArenaVisualsSystem);
+      if (!world.getSystem("duel-arena-visuals")) {
+        world.register("duel-arena-visuals", DuelArenaVisualsSystem);
+      }
     } catch (err) {
       console.error(
         "[SystemLoader] Failed to register DuelArenaVisualsSystem:",
diff --git a/packages/shared/src/systems/shared/world/Environment.ts b/packages/shared/src/systems/shared/world/Environment.ts
index 105f151ff..e9ffc228f 100644
--- a/packages/shared/src/systems/shared/world/Environment.ts
+++ b/packages/shared/src/systems/shared/world/Environment.ts
@@ -2,6 +2,7 @@ import THREE, { CSMShadowNode } from "../../../extras/three/three";
 import { MeshBasicNodeMaterial } from "three/webgpu";
 
 import { Node as NodeClass } from "../../../nodes/Node";
+import { isDedicatedStreamViewport } from "../../../runtime/clientViewportMode";
 import { System } from "../infrastructure/System";
 
 // NOTE: Import directly to avoid circular dependency through barrel file
@@ -48,11 +49,13 @@ const _sunDirection = new THREE.Vector3(0, -1, 0);
 // Default: false — uses a single 2048 shadow map centered on the player.
 export function isCsmEnabled(): boolean {
   try {
-    if (
-      typeof import.meta !== "undefined" &&
-      (import.meta as any).env?.ENABLE_CSM
-    )
-      return (import.meta as any).env.ENABLE_CSM === "true";
+    const metaEnv = (
+      import.meta as unknown as {
+        env?: { ENABLE_CSM?: string };
+      }
+    ).env;
+    if (typeof import.meta !== "undefined" && metaEnv?.ENABLE_CSM)
+      return metaEnv.ENABLE_CSM === "true";
     if (typeof process !== "undefined" && process.env?.ENABLE_CSM)
       return process.env.ENABLE_CSM === "true";
   } catch {
@@ -179,6 +182,10 @@ export class Environment extends System {
   private ambientLight: THREE.AmbientLight | null = null;
 
   private isClientWithGraphics: boolean = false;
+  private deferredEnvironmentAssetTimer: ReturnType<typeof setTimeout> | null =
+    null;
+  private optionalEnvironmentAssetsStarted = false;
+  private destroyed = false;
 
   constructor(world: World) {
     super(world);
@@ -187,6 +194,9 @@ export class Environment extends System {
   override init(
     options: WorldOptions & { baseEnvironment?: BaseEnvironment },
   ): Promise<void> {
+    this.destroyed = false;
+    this.optionalEnvironmentAssetsStarted = false;
+    this.deferredEnvironmentAssetTimer = null;
     this.base = options.baseEnvironment || {};
 
     // Determine if this is a client with graphics capabilities
@@ -216,7 +226,36 @@ export class Environment extends System {
     // Create ambient lighting for day/night visibility
     this.createAmbientLighting();
 
-    this.updateSky();
+    const dedicatedStreamViewport = isDedicatedStreamViewport();
+
+    this.applyBaselineFog();
+    if (!dedicatedStreamViewport) {
+      void this.updateSky().catch((err) => {
+        console.warn("[Environment] Failed to apply initial sky state:", err);
+      });
+    }
+
+    // No environment map - using planar reflections for water, toon/rough style for everything else
+    this.clearSceneEnvironmentMap();
+
+    this.world.settings?.on("change", this.onSettingsChange);
+    this.world.prefs?.on("change", this.onPrefsChange);
+
+    if (this.world.graphics) {
+      this.world.graphics.on("resize", this.onViewportResize);
+    }
+
+    if (dedicatedStreamViewport) {
+      this.deferStreamOptionalEnvironmentAssetsUntilArenaReady();
+      return;
+    }
+
+    await this.startOptionalEnvironmentAssets();
+  }
+
+  private async startOptionalEnvironmentAssets(): Promise<void> {
+    if (this.optionalEnvironmentAssetsStarted || this.destroyed) return;
+    this.optionalEnvironmentAssetsStarted = true;
 
     // Load initial model (non-blocking - don't let model errors break sky)
     try {
@@ -228,34 +267,101 @@ export class Environment extends System {
       );
     }
 
-    // Enhanced dynamic sky (client-only) - must run even if model fails
-    this.skySystem = new SkySystem(this.world);
-    await this.skySystem.init({} as unknown as WorldOptions);
-    this.skySystem.start();
+    if (this.destroyed) return;
 
-    // Initialize exposure based on current time of day to avoid jarring transitions
-    // when joining at night (otherwise exposure would lerp from 0.85 day → 1.7 night)
-    this.initializeExposure();
+    try {
+      // Enhanced dynamic sky (client-only) - must run even if model fails.
+      const skySystem = new SkySystem(this.world);
+      await skySystem.init({} as unknown as WorldOptions);
 
-    // Ensure legacy sky sphere never occludes dynamic sky
-    if (this.sky) {
-      const mat = this.sky.material as THREE.MeshBasicMaterial;
-      mat.depthWrite = false;
-      this.sky.visible = false;
-    }
-    // Re-evaluate sky state now that SkySystem exists
-    await this.updateSky();
+      if (this.destroyed) {
+        skySystem.destroy();
+        return;
+      }
 
-    // No environment map - using planar reflections for water, toon/rough style for everything else
-    if (this.world.stage?.scene) {
-      this.world.stage.scene.environment = null;
+      this.skySystem = skySystem;
+      this.skySystem.start();
+
+      // Initialize exposure based on current time of day to avoid jarring transitions
+      // when joining at night (otherwise exposure would lerp from 0.85 day to 1.7 night).
+      this.initializeExposure();
+
+      // Ensure legacy sky sphere never occludes dynamic sky
+      if (this.sky) {
+        const mat = this.sky.material as THREE.MeshBasicMaterial;
+        mat.depthWrite = false;
+        this.sky.visible = false;
+      }
+      // Re-evaluate sky state now that SkySystem exists
+      await this.updateSky();
+    } catch (err) {
+      console.warn(
+        "[Environment] Failed to initialize dynamic sky (continuing without):",
+        err,
+      );
     }
 
-    this.world.settings?.on("change", this.onSettingsChange);
-    this.world.prefs?.on("change", this.onPrefsChange);
+    this.clearSceneEnvironmentMap();
+  }
 
-    if (this.world.graphics) {
-      this.world.graphics.on("resize", this.onViewportResize);
+  private deferStreamOptionalEnvironmentAssetsUntilArenaReady(): void {
+    if (this.deferredEnvironmentAssetTimer) return;
+
+    const waitForArenaVisuals = () => {
+      this.deferredEnvironmentAssetTimer = null;
+      if (this.destroyed || this.optionalEnvironmentAssetsStarted) return;
+
+      const arenaVisuals = this.world.getSystem("duel-arena-visuals") as
+        | { isReady?: () => boolean }
+        | undefined;
+      const arenaReady =
+        typeof arenaVisuals?.isReady === "function" && arenaVisuals.isReady();
+
+      if (!arenaReady) {
+        this.deferredEnvironmentAssetTimer = setTimeout(
+          waitForArenaVisuals,
+          250,
+        );
+        return;
+      }
+
+      void this.startOptionalEnvironmentAssets().catch((err) => {
+        console.warn(
+          "[Environment] Deferred stream environment asset load failed:",
+          err,
+        );
+      });
+    };
+
+    this.deferredEnvironmentAssetTimer = setTimeout(waitForArenaVisuals, 0);
+  }
+
+  private applyBaselineFog(): void {
+    if (!this.isClientWithGraphics || !this.world.stage?.scene) return;
+
+    const fogNear = this.base.fogNear ?? FOG_NEAR;
+    const fogFar = this.base.fogFar ?? FOG_FAR;
+    const fogColor = this.base.fogColor ?? "#d4c8b8";
+    this.world.stage.scene.fog = new THREE.Fog(
+      new THREE.Color(fogColor),
+      fogNear as number,
+      fogFar as number,
+    );
+    this.skyInfo = {
+      bgUrl: this.base.bg,
+      hdrUrl: this.base.hdr,
+      sunDirection: this.base.sunDirection || _sunDirection,
+      sunIntensity: this.base.sunIntensity || 1,
+      sunColor: this.base.sunColor || "#ffffff",
+      fogNear,
+      fogFar,
+      fogColor,
+    };
+  }
+
+  private clearSceneEnvironmentMap(): void {
+    if (this.world.stage?.scene) {
+      this.world.stage.scene.environment = null;
     }
   }
 
@@ -439,6 +545,12 @@ export class Environment extends System {
   }
 
   override destroy(): void {
+    this.destroyed = true;
+    if (this.deferredEnvironmentAssetTimer) {
+      clearTimeout(this.deferredEnvironmentAssetTimer);
+      this.deferredEnvironmentAssetTimer = null;
+    }
+
     if (this.skySystem) {
       this.skySystem.destroy();
       this.skySystem = undefined;
@@ -1124,14 +1236,30 @@ export class Environment extends System {
 
   onSettingsChange = (changes: { model?: string | { url?: string } }) => {
     if (changes.model) {
-      this.updateModel();
+      if (
+        isDedicatedStreamViewport() &&
+        !this.optionalEnvironmentAssetsStarted
+      ) {
+        return;
+      }
+      void this.updateModel().catch((err) => {
+        console.warn("[Environment] Failed to update environment model:", err);
+      });
     }
   };
 
   onPrefsChange = (changes: { shadows?: string }) => {
     if (changes.shadows) {
       this.buildSunLight();
-      this.updateSky();
+      if (
+        isDedicatedStreamViewport() &&
+        !this.optionalEnvironmentAssetsStarted
+      ) {
+        return;
+      }
+      void this.updateSky().catch((err) => {
+        console.warn("[Environment] Failed to update sky preferences:", err);
+      });
     }
   };
 
diff --git a/packages/shared/src/systems/shared/world/GLBResourceInstancer.ts b/packages/shared/src/systems/shared/world/GLBResourceInstancer.ts
index 65b36507f..2cd9e659d 100644
--- a/packages/shared/src/systems/shared/world/GLBResourceInstancer.ts
+++ b/packages/shared/src/systems/shared/world/GLBResourceInstancer.ts
@@ -22,13 +22,7 @@ import {
   GPU_VEG_CONFIG,
   type DissolveMaterial,
 } from "./GPUMaterials";
-import {
-  getLODDistances,
-  inferLOD1Path,
-  inferLOD2Path,
-  resolveLOD1ModelPath,
-  resolveLOD2ModelPath,
-} from "./LODConfig";
+import { getLODDistances, inferLOD1Path, inferLOD2Path } from "./LODConfig";
 
 const MAX_INSTANCES = 512;
 
@@ -71,14 +65,11 @@ interface ModelPool {
 
 const resourceLOD = getLODDistances("resource");
 
-function hasExplicitLODPath(path?: string | null): path is string {
-  return typeof path === "string" && path.trim().length > 0;
-}
-
 let scene: THREE.Scene | null = null;
 let world: World | null = null;
 const pools = new Map<string, ModelPool>();
 const entityToModel = new Map<string, string>();
+const missingLodModelPaths = new Set<string>();
 
 function extractGeometryAndMaterial(
   root: THREE.Object3D,
@@ -163,10 +154,19 @@ async function loadLODModel(path: string): Promise<{
   geometry: THREE.BufferGeometry;
   material: THREE.Material;
 } | null> {
+  if (missingLodModelPaths.has(path)) {
+    return null;
+  }
+
   try {
     const { scene: lodScene } = await modelCache.loadModel(path, world!);
     return extractGeometryAndMaterial(lodScene);
-  } catch {
+  } catch (error) {
+    const message =
+      error instanceof Error ? error.message.toLowerCase() : String(error);
+    if (message.includes("404") || message.includes("not found")) {
+      missingLodModelPaths.add(path);
+    }
     return null;
   }
 }
@@ -217,11 +217,19 @@ async function ensureModelPool(
     world!.setupMaterial(lod0Material);
     const lod0Pool = createLODPool(lod0Data.geometry, lod0Material);
 
+    const shouldInferLodPaths = !modelPath.includes("/models/mining-rocks/");
+    const inferredLod1ModelPath = shouldInferLodPaths
+      ? inferLOD1Path(modelPath)
+      : null;
+    const inferredLod2ModelPath = shouldInferLodPaths
+      ? inferLOD2Path(modelPath)
+      : null;
+
     // LOD1 — explicit path first, fall back to inferred naming convention
     let lod1Pool: LODPool | null = null;
-    const resolvedLod1Path = resolveLOD1ModelPath(modelPath, lod1ModelPath);
-    const lod1Data = resolvedLod1Path
-      ? await loadLODModel(resolvedLod1Path)
+    const lod1CandidatePath = lod1ModelPath ?? inferredLod1ModelPath;
+    const lod1Data = lod1CandidatePath
+      ? await loadLODModel(lod1CandidatePath)
       : null;
     if (lod1Data) {
       const lod1Material = createDissolveMaterial(
@@ -230,8 +238,10 @@ async function ensureModelPool(
       );
       world!.setupMaterial(lod1Material);
       lod1Pool = createLODPool(lod1Data.geometry, lod1Material);
-    } else if (hasExplicitLODPath(lod1ModelPath)) {
-      const lod1Inferred = await loadLODModel(inferLOD1Path(modelPath));
+    } else if (lod1ModelPath) {
+      const lod1Inferred = inferredLod1ModelPath
+        ? await loadLODModel(inferredLod1ModelPath)
+        : null;
       if (lod1Inferred) {
         const lod1Material = createDissolveMaterial(
           lod1Inferred.material,
@@ -244,9 +254,9 @@ async function ensureModelPool(
 
     // LOD2 — explicit path first, fall back to inferred naming convention
     let lod2Pool: LODPool | null = null;
-    const resolvedLod2Path = resolveLOD2ModelPath(modelPath, lod2ModelPath);
-    const lod2Data = resolvedLod2Path
-      ? await loadLODModel(resolvedLod2Path)
+    const lod2CandidatePath = lod2ModelPath ?? inferredLod2ModelPath;
+    const lod2Data = lod2CandidatePath
+      ? await loadLODModel(lod2CandidatePath)
       : null;
     if (lod2Data) {
       const lod2Material = createDissolveMaterial(
@@ -255,8 +265,10 @@ async function ensureModelPool(
       );
       world!.setupMaterial(lod2Material);
       lod2Pool = createLODPool(lod2Data.geometry, lod2Material);
-    } else if (hasExplicitLODPath(lod2ModelPath)) {
-      const lod2Inferred = await loadLODModel(inferLOD2Path(modelPath));
+    } else if (lod2ModelPath) {
+      const lod2Inferred = inferredLod2ModelPath
+        ? await loadLODModel(inferredLod2ModelPath)
+        : null;
       if (lod2Inferred) {
         const lod2Material = createDissolveMaterial(
           lod2Inferred.material,
diff --git a/packages/shared/src/systems/shared/world/TerrainSystem.ts b/packages/shared/src/systems/shared/world/TerrainSystem.ts
index 33d35ba03..751b3ab56 100644
--- a/packages/shared/src/systems/shared/world/TerrainSystem.ts
+++ b/packages/shared/src/systems/shared/world/TerrainSystem.ts
@@ -32,6 +32,7 @@ import type { ShorelineConfig, BiomeNoiseSet } from "./TerrainHeightParams";
 import { BiomeType, DEFAULT_BIOME, BIOME_LIST } from "./TerrainBiomeTypes";
 import { WaterBodyRegistry } from "./WaterBodyRegistry";
 import type { BridgeSystem } from "./BridgeSystem";
+
 // Import terrain generator from procgen package
 import {
   TerrainGenerator,
@@ -75,10 +76,7 @@ import {
   // generatePlants, // DISABLED - plants not working/looking good yet
   type ResourceGenerationContext,
 } from "./BiomeResourceGenerator";
-import {
-  getTreeConfigForBiome,
-  getGrassConfigForBiome,
-} from "./TerrainBiomeTypes";
+import { getTreeConfigForBiome } from "./TerrainBiomeTypes";
 import {
   setProcgenRockWorld,
   addRockInstance,
@@ -102,7 +100,6 @@ import {
   updateTerrainVertexLights,
   createTerrainMaterial,
   TerrainUniforms,
-  computeTerrainColorCPU,
 } from "./TerrainShader";
 import { isLamppostLightTextureReady } from "./LamppostLightMask";
 import { isCsmEnabled } from "./Environment";
@@ -114,17 +111,15 @@ import {
   isTerrainComputeAvailable,
   type GPURoadSegment,
 } from "../../../utils/compute";
+import {
+  isDedicatedStreamViewport,
+  isEmbeddedSpectatorViewport,
+  isStreamDebugEnabled,
+} from "../../../runtime/clientViewportMode";
 import {
   TerrainVisualManager,
   type VisualManagerTerrainProvider,
 } from "./TerrainVisualManager";
-import { WaterVisualManager } from "./WaterVisualManager";
-import {
-  GrassVisualManager,
-  type GrassWorkerSetup,
-} from "./GrassVisualManager";
-import { terminateGrassWorkerPool } from "../../../utils/workers/GrassWorker";
-import { CompositeQuadTreeListener } from "./TerrainQuadTree";
 import type { QuadChunkWorkerConfig } from "../../../utils/workers/QuadChunkWorker";
 import { terminateQuadChunkWorkerPool } from "../../../utils/workers/QuadChunkWorker";
 
@@ -133,6 +128,11 @@ const ROAD_BLEND_WIDTH = 0.5; // Extra blend distance beyond road width (meters)
 const TERRAIN_ROAD_INFLUENCE_DEBUG =
   process.env.TERRAIN_ROAD_INFLUENCE_DEBUG === "true";
 const TERRAIN_TIMING_DEBUG = process.env.TERRAIN_TIMING_DEBUG === "true";
+
+function shouldEmitVerboseTerrainBootLogs(): boolean {
+  if (typeof window === "undefined") return true;
+  return !isDedicatedStreamViewport() || isStreamDebugEnabled();
+}
 /** Maximum entries retained in pendingSerializationData to prevent unbounded growth */
 const MAX_PENDING_SERIALIZATION_ENTRIES = 100;
 
@@ -223,6 +223,13 @@ export class TerrainSystem extends System {
   private pendingTileSet = new Set<string>();
   private pendingCollisionKeys: string[] = [];
   private pendingCollisionSet = new Set<string>();
+  // Buffer for heightData computed during createTileGeometry() before the
+  // corresponding tile object has been inserted into this.terrainTiles. Without
+  // this, storeHeightData() silently no-ops during initial tile creation and
+  // bakeWalkabilityFlags() then falls through to expensive noise-based
+  // getHeightAtComputed() for every sample (observed 2026-04-15: ~900ms per
+  // tile bake instead of the intended ~1-2ms).
+  private _pendingTileHeightData = new Map<string, number[]>();
   // Deferred walkability baking queue — spreads 10,000 iterations across ticks
   private pendingWalkabilityTiles: Array<{ tileX: number; tileZ: number }> = [];
   private walkabilityProgress: {
@@ -246,6 +253,7 @@ export class TerrainSystem extends System {
   private _tempVec2_2 = new THREE.Vector2();
   private _tempVec2_3 = new THREE.Vector2(); // For road distance calculations
   private _tempBox3 = new THREE.Box3();
+  private _tempColor = new THREE.Color(); // For biome color parsing
   private _spectatorFocusPos = new THREE.Vector3();
   private lamppostLightUpdateTimer = 0;
   private lamppostActiveLights: VertexLight[] = [];
@@ -266,8 +274,6 @@ export class TerrainSystem extends System {
 
   // Quad-tree LOD visual manager (client-only, when CONFIG.USE_QUADTREE_LOD is true)
   private quadTreeVisualManager: TerrainVisualManager | null = null;
-  private waterVisualManager: WaterVisualManager | null = null;
-  private grassVisualManager: GrassVisualManager | null = null;
 
   // Unified terrain generator from @hyperscape/procgen
   // Provides deterministic height/biome calculation independent of rendering
@@ -585,6 +591,14 @@ export class TerrainSystem extends System {
         }
       }
       generated++;
+      // Post-check: if the tile we just generated blew the budget, exit now
+      // rather than starting another tile that will block the event loop for
+      // another 60-135ms. The pre-check at the top of the loop catches the
+      // easy case (already over budget from a previous iteration), but a
+      // single expensive bakeWalkabilityFlags() call can take 60ms+ — without
+      // this post-check, the loop would start a second tile before realizing
+      // the budget was blown.
+      if (nowFn() - start > this.generationBudgetMsPerFrame) break;
     }
   }
 
@@ -952,7 +966,8 @@ export class TerrainSystem extends System {
       }
     }
 
-    // Set attributes (color attribute removed — shader computes colors procedurally)
+    // Set attributes
+    geometry.setAttribute("color", new THREE.BufferAttribute(colorData, 3));
     geometry.setAttribute(
       "biomeId",
       new THREE.BufferAttribute(new Float32Array(biomeData), 1),
@@ -977,7 +992,7 @@ export class TerrainSystem extends System {
     );
 
     // DEBUG: log biome weights for first 5 tiles
-    if (this._loggedWorkerTileBiome < 5) {
+    if (shouldEmitVerboseTerrainBootLogs() && this._loggedWorkerTileBiome < 5) {
       // Also log river proximity stats
       let rpNonZero = 0,
         rpMax = 0;
@@ -1034,9 +1049,8 @@ export class TerrainSystem extends System {
 
     this.applyFlatZoneCarve(geometry, tileX, tileZ);
 
-    // Attach heightData to geometry so the caller can store it AFTER the tile
-    // is added to terrainTiles (storeHeightData requires the tile to exist).
-    geometry.userData.heightData = Array.from(heightData);
+    // Store height data for persistence
+    this.storeHeightData(tileX, tileZ, Array.from(heightData));
 
     return geometry;
   }
@@ -1196,9 +1210,7 @@ export class TerrainSystem extends System {
         this.generateTileResources(tile);
       }
       this.generateVisualFeatures(tile);
-      if (!this.CONFIG.USE_QUADTREE_LOD) {
-        this.generateWaterMeshes(tile);
-      }
+      this.generateWaterMeshes(tile);
 
       // Queue resource instances for deferred creation (spreads work across frames)
       if (tile.resources.length > 0 && tile.mesh) {
@@ -1276,14 +1288,6 @@ export class TerrainSystem extends System {
     this.terrainTiles.set(key, tile);
     this.activeChunks.add(key);
 
-    // Store height data NOW that the tile is in the map.
-    // createTileGeometryFromWorkerData attaches heightData to geometry.userData
-    // because storeHeightData requires the tile to exist in terrainTiles.
-    if (geometry.userData.heightData) {
-      tile.heightData = geometry.userData.heightData;
-      tile.needsSave = true;
-    }
-
     // Synchronously bake WATER and STEEP_SLOPE collision flags (server-only).
     // Must match generateTile() — worker-generated tiles need the same
     // walkability baking (WATER flags, bridge collision overrides, etc.).
@@ -1414,11 +1418,11 @@ export class TerrainSystem extends System {
     WATER_THRESHOLD: TERRAIN_CONSTANTS.WATER_THRESHOLD,
 
     // LOD (Level of Detail) - Resolution tiers based on distance
-    LOD_DISTANCES: [200, 400, 700], // Distance thresholds
+    LOD_DISTANCES: [100, 200, 350], // Distance thresholds
     LOD_RESOLUTIONS: [64, 32, 16, 8], // Resolution at each LOD level
 
-    // Chunking
-    VIEW_DISTANCE: 5, // Load 5 tiles in each direction (11x11 = 121 tiles, ~1100m)
+    // Chunking - Only adjacent tiles
+    VIEW_DISTANCE: 1, // Load only 1 tile in each direction (3x3 = 9 tiles)
     UPDATE_INTERVAL: 0.5, // Check player movement every 0.5 seconds
 
     // Movement Constraints
@@ -1507,6 +1511,7 @@ export class TerrainSystem extends System {
     this.ensureNoiseInitialized();
 
     // Initialize the unified terrain generator from @hyperscape/procgen
+    // This provides a standalone, testable height generation system
     this.initializeTerrainGenerator();
 
     // Water body registry — ocean level only (no manual rivers/ponds)
@@ -1707,11 +1712,6 @@ export class TerrainSystem extends System {
         );
         this.refreshRoadInfluence();
       }
-
-      // Rebuild grass chunks so road influence is reflected
-      if (this.grassVisualManager) {
-        this.grassVisualManager.rebuildAllChunks();
-      }
     });
 
     // Start player-based terrain update loop
@@ -1927,49 +1927,6 @@ export class TerrainSystem extends System {
       this.CONFIG.QUADTREE_MAX_ASSEMBLIES_PER_FRAME,
     );
 
-    // Water quad-tree visual manager — flat water meshes aligned with terrain chunks
-    if (this.waterSystem) {
-      const waterContainer = new THREE.Group();
-      waterContainer.name = "QuadTreeWaterContainer";
-      if (this.terrainContainer) {
-        this.terrainContainer.parent?.add(waterContainer);
-      }
-
-      this.waterSystem.setWaterLevel(this.CONFIG.WATER_THRESHOLD);
-
-      this.waterVisualManager = new WaterVisualManager(
-        waterContainer,
-        this.waterSystem,
-        (x: number, z: number) => this.getHeightAt(x, z),
-        (x: number, z: number) => this.getIslandMask(x, z),
-        this.CONFIG.WATER_THRESHOLD,
-      );
-
-      const grassContainer = new THREE.Group();
-      grassContainer.name = "QuadTreeGrassContainer";
-      if (this.terrainContainer) {
-        this.terrainContainer.parent?.add(grassContainer);
-      }
-      const grassWorkerSetup = this.buildGrassWorkerSetup();
-      this.grassVisualManager = new GrassVisualManager(
-        grassContainer,
-        (x: number, z: number) => this.getHeightAt(x, z),
-        this.CONFIG.WATER_THRESHOLD,
-        (wx: number, wz: number) =>
-          this.calculateRoadInfluenceAtVertex(wx, wz, 0, 0),
-        (wx: number, wz: number) => this.isInFlatZone(wx, wz),
-        (wx: number, wz: number) => this.getTerrainColorAt(wx, wz),
-        grassWorkerSetup,
-      );
-
-      // Wire terrain, water, grass managers to the same quad-tree via composite
-      const composite = new CompositeQuadTreeListener();
-      composite.add(this.quadTreeVisualManager);
-      composite.add(this.waterVisualManager);
-      composite.add(this.grassVisualManager);
-      this.quadTreeVisualManager.getQuadTree().setListener(composite);
-    }
-
     console.log(
       "[TerrainSystem] Quad-tree LOD visual manager initialized " +
         `(minSize=${this.CONFIG.QUADTREE_MIN_SIZE}, maxDepth=${this.CONFIG.QUADTREE_MAX_DEPTH}, ` +
@@ -1977,218 +1934,6 @@ export class TerrainSystem extends System {
     );
   }
 
-  private buildGrassWorkerSetup(): GrassWorkerSetup {
-    const workerConfig: TerrainWorkerConfig = {
-      TILE_SIZE: this.CONFIG.TILE_SIZE,
-      TILE_RESOLUTION: this.CONFIG.TILE_RESOLUTION,
-      MAX_HEIGHT: MAX_HEIGHT,
-      BIOME_GAUSSIAN_COEFF: BIOME_CONFIG.gaussianCoeff,
-      BIOME_BOUNDARY_NOISE_SCALE: BIOME_CONFIG.boundaryNoiseScale,
-      BIOME_BOUNDARY_NOISE_AMOUNT: BIOME_CONFIG.boundaryNoiseAmount,
-      WATER_THRESHOLD: this.CONFIG.WATER_THRESHOLD,
-      WATER_LEVEL_NORMALIZED: WATER_LEVEL_NORMALIZED,
-      SHORELINE_THRESHOLD: SHORELINE_CONFIG.THRESHOLD,
-      SHORELINE_STRENGTH: SHORELINE_CONFIG.STRENGTH,
-      SHORELINE_MIN_SLOPE: SHORELINE_CONFIG.MIN_SLOPE,
-      SHORELINE_SLOPE_SAMPLE_DISTANCE: SHORELINE_CONFIG.SLOPE_SAMPLE_DISTANCE,
-      SHORELINE_LAND_BAND: SHORELINE_CONFIG.LAND_BAND,
-      SHORELINE_LAND_MAX_MULTIPLIER: SHORELINE_CONFIG.LAND_MAX_MULTIPLIER,
-      SHORELINE_UNDERWATER_BAND: SHORELINE_CONFIG.UNDERWATER_BAND,
-      UNDERWATER_DEPTH_MULTIPLIER: SHORELINE_CONFIG.UNDERWATER_DEPTH_MULTIPLIER,
-    };
-
-    const biomeData: Record<
-      string,
-      { heightModifier: number; color: { r: number; g: number; b: number } }
-    > = {};
-    for (const [name, biome] of Object.entries(BIOMES)) {
-      const color = new THREE.Color(biome.color);
-      biomeData[name] = {
-        heightModifier: biome.terrainMultiplier || 1,
-        color: { r: color.r, g: color.g, b: color.b },
-      };
-    }
-
-    const biomeCenters = this.terrainGenerator
-      .getBiomeSystem()
-      .getBiomeCenters() as BiomeCenter[];
-
-    const tCfg = getGrassConfigForBiome(BiomeType.Tundra);
-    const fCfg = getGrassConfigForBiome(BiomeType.Forest);
-    const cCfg = getGrassConfigForBiome(BiomeType.Canyon);
-
-    const resolveTint = (cfg: ReturnType<typeof getGrassConfigForBiome>) => ({
-      density: cfg.density,
-      maxSlope: cfg.maxSlope,
-      minGrassWeight: cfg.minGrassWeight,
-      heightScale: cfg.heightScale,
-      patchiness: cfg.patchiness,
-      patchScale: cfg.patchScale,
-      tintR: cfg.tintColor?.[0] ?? 0,
-      tintG: cfg.tintColor?.[1] ?? 0,
-      tintB: cfg.tintColor?.[2] ?? 0,
-      tintStrength: cfg.tintStrength ?? 0,
-    });
-
-    const grassConfigs: Record<
-      string,
-      {
-        density: number;
-        maxSlope: number;
-        minGrassWeight: number;
-        heightScale: number;
-        patchiness: number;
-        patchScale: number;
-        tintR: number;
-        tintG: number;
-        tintB: number;
-        tintStrength: number;
-      }
-    > = {
-      [BiomeType.Tundra]: resolveTint(tCfg),
-      [BiomeType.Forest]: resolveTint(fCfg),
-      [BiomeType.Canyon]: resolveTint(cCfg),
-    };
-
-    const tileSize = this.CONFIG.TILE_SIZE;
-
-    return {
-      terrainConfig: workerConfig,
-      seed: this.computeSeedFromWorldId(),
-      biomeCenters: biomeCenters.map((c) => ({
-        x: c.x,
-        z: c.z,
-        type: c.type,
-        influence: c.influence,
-      })),
-      biomes: biomeData,
-      grassConfigs,
-      tileSize,
-      getRoadSegmentsForRegion: (
-        minX: number,
-        minZ: number,
-        maxX: number,
-        maxZ: number,
-      ) => this.getWorldSpaceRoadSegmentsForRegion(minX, minZ, maxX, maxZ),
-      getFlatZonesForRegion: (
-        minX: number,
-        minZ: number,
-        maxX: number,
-        maxZ: number,
-      ) => this.getFlatZonesForRegion(minX, minZ, maxX, maxZ),
-    };
-  }
-
-  /**
-   * Collect road segments overlapping a world-space AABB, returned in
-   * world coordinates for the grass worker.
-   */
-  private getWorldSpaceRoadSegmentsForRegion(
-    minX: number,
-    minZ: number,
-    maxX: number,
-    maxZ: number,
-  ): Array<{
-    startX: number;
-    startZ: number;
-    endX: number;
-    endZ: number;
-    width: number;
-  }> {
-    this.roadNetworkSystem ??= this.world.getSystem("roads") as
-      | RoadNetworkSystem
-      | undefined;
-    if (!this.roadNetworkSystem) return [];
-
-    const ts = this.CONFIG.TILE_SIZE;
-    const minTX = Math.floor(minX / ts);
-    const minTZ = Math.floor(minZ / ts);
-    const maxTX = Math.floor(maxX / ts);
-    const maxTZ = Math.floor(maxZ / ts);
-
-    const result: Array<{
-      startX: number;
-      startZ: number;
-      endX: number;
-      endZ: number;
-      width: number;
-    }> = [];
-
-    for (let tx = minTX; tx <= maxTX; tx++) {
-      for (let tz = minTZ; tz <= maxTZ; tz++) {
-        const segs = this.roadNetworkSystem.getRoadSegmentsForTile(tx, tz);
-        const originX = tx * ts;
-        const originZ = tz * ts;
-        for (const seg of segs) {
-          result.push({
-            startX: originX + seg.start.x,
-            startZ: originZ + seg.start.z,
-            endX: originX + seg.end.x,
-            endZ: originZ + seg.end.z,
-            width: seg.width,
-          });
-        }
-      }
-    }
-
-    return result;
-  }
-
-  /**
-   * Collect flat zones overlapping a world-space AABB, returned as simplified
-   * rectangles for the grass worker to exclude grass from buildings/arenas.
-   */
-  private getFlatZonesForRegion(
-    minX: number,
-    minZ: number,
-    maxX: number,
-    maxZ: number,
-  ): Array<{
-    centerX: number;
-    centerZ: number;
-    halfWidth: number;
-    halfDepth: number;
-    blendRadius: number;
-  }> {
-    if (this.flatZones.size === 0) return [];
-
-    const tileSize = this.CONFIG.TILE_SIZE;
-    const halfTile = tileSize / 2;
-    const minTX = Math.floor((minX + halfTile) / tileSize);
-    const minTZ = Math.floor((minZ + halfTile) / tileSize);
-    const maxTX = Math.floor((maxX + halfTile) / tileSize);
-    const maxTZ = Math.floor((maxZ + halfTile) / tileSize);
-
-    const seen = new Set<string>();
-    const result: Array<{
-      centerX: number;
-      centerZ: number;
-      halfWidth: number;
-      halfDepth: number;
-      blendRadius: number;
-    }> = [];
-
-    for (let tx = minTX; tx <= maxTX; tx++) {
-      for (let tz = minTZ; tz <= maxTZ; tz++) {
-        const zones = this.flatZonesByTile.get(`${tx}_${tz}`);
-        if (!zones) continue;
-        for (const zone of zones) {
-          if (seen.has(zone.id)) continue;
-          seen.add(zone.id);
-          result.push({
-            centerX: zone.centerX,
-            centerZ: zone.centerZ,
-            halfWidth: zone.width / 2,
-            halfDepth: zone.depth / 2,
-            blendRadius: zone.blendRadius,
-          });
-        }
-      }
-    }
-
-    return result;
-  }
-
   private registerInstancedMeshes(): void {
     // Register tree mesh - now with automatic pooling (1000 visible max)
     const treeSize = { x: 1.2, y: 3.0, z: 1.2 };
@@ -2680,9 +2425,7 @@ export class TerrainSystem extends System {
 
         // Generate visual features and water meshes
         this.generateVisualFeatures(tile);
-        if (!this.CONFIG.USE_QUADTREE_LOD) {
-          this.generateWaterMeshes(tile);
-        }
+        this.generateWaterMeshes(tile);
         // NOTE: Grass rendering is handled by ProceduralGrassSystem
 
         // Queue resource instances for deferred creation (spreads work across frames)
@@ -2766,18 +2509,23 @@ export class TerrainSystem extends System {
     this.terrainTiles.set(key, tile);
     this.activeChunks.add(key);
 
-    // Store height data NOW that the tile is in the map.
-    // createTileGeometry attaches heightData to geometry.userData because
-    // storeHeightData requires the tile to exist in terrainTiles.
-    if (geometry.userData.heightData) {
-      tile.heightData = geometry.userData.heightData;
+    // Drain any heightData that createTileGeometry() buffered earlier in this
+    // same call. storeHeightData() fell back to the pending buffer because
+    // tile wasn't yet in this.terrainTiles at that point; now that it is, we
+    // copy the data onto the tile so getHeightAtCached() can bilinear-sample
+    // it during bakeWalkabilityFlags below (P7.a fix 2026-04-15).
+    const _pendingHeights = this._pendingTileHeightData.get(key);
+    if (_pendingHeights) {
+      tile.heightData = _pendingHeights;
       tile.needsSave = true;
+      this._pendingTileHeightData.delete(key);
     }
 
     // Synchronously bake WATER and STEEP_SLOPE collision flags (server-only).
     // Must complete before any movement query can reach this tile, otherwise
     // players can walk into water during the gap between tile generation and
-    // flag baking. ~1-2ms per tile (10K height lookups with cached data).
+    // flag baking. ~1-2ms per tile now that the fast in-tile bilinear path
+    // is used — see P7.a fix 2026-04-15.
     if (isServer) {
       this.bakeWalkabilityFlags(tileX, tileZ);
     }
@@ -2840,9 +2588,8 @@ export class TerrainSystem extends System {
     // Carve terrain triangles inside building flat zones to avoid overdraw
     this.applyFlatZoneCarve(geometry, tileX, tileZ);
 
-    // Attach heightData to geometry so the caller can store it AFTER the tile
-    // is added to terrainTiles (storeHeightData requires the tile to exist).
-    geometry.userData.heightData = heightData;
+    // Store height data for persistence
+    this.storeHeightData(tileX, tileZ, heightData);
 
     // SERVER: Skip all visual-only attributes (colors, biomeIds, roadInfluences,
     // forestWeights, canyonWeights) and the expensive per-vertex biome/color
@@ -2853,45 +2600,121 @@ export class TerrainSystem extends System {
       return geometry;
     }
 
-    // CLIENT: Visual attribute generation (shader computes colors procedurally)
+    // CLIENT: Full visual attribute generation
+    const colors = new Float32Array(positions.count * 3);
     const biomeIds = new Float32Array(positions.count);
     const roadInfluences = new Float32Array(positions.count);
     const forestWeights = new Float32Array(positions.count);
     const canyonWeights = new Float32Array(positions.count);
 
+    // Verify biome data is loaded - error if not
+    if (Object.keys(BIOMES).length === 0) {
+      throw new Error(
+        "[TerrainSystem] BIOMES data not loaded! DataManager must initialize before terrain generation.",
+      );
+    }
+    const defaultBiomeData = BIOMES[DEFAULT_BIOME];
+    if (!defaultBiomeData) {
+      throw new Error(
+        "[TerrainSystem] Default biome not found in BIOMES data!",
+      );
+    }
+
     for (let i = 0; i < positions.count; i++) {
       const i3 = i * 3;
       const x = positionsArray[i3] + tileX * this.CONFIG.TILE_SIZE;
       const z = positionsArray[i3 + 2] + tileZ * this.CONFIG.TILE_SIZE;
+      const height = positionsArray[i3 + 1]; // Already computed above
 
+      // Get biome influences for smooth color blending
       const { biomeWeightMap, totalWeight } =
         this.computeBiomeWeightsAtPosition(x, z);
+      const normalizedHeight = height / MAX_HEIGHT;
 
+      // Store dominant biome ID for shader
       let dominantBiome = DEFAULT_BIOME as string;
       let dominantWeight = -Infinity;
 
+      // PERFORMANCE: Reuse _tempColor to avoid GC pressure (no new THREE.Color per vertex)
+      // Blend up to 3 biome colors based on influence weights
+      let colorR = 0,
+        colorG = 0,
+        colorB = 0;
+
       if (totalWeight > 0) {
-        const invW = 1 / totalWeight;
+        const invTotal = 1 / totalWeight;
         for (const [type, rawWeight] of biomeWeightMap) {
-          const weight = rawWeight * invW;
+          const weight = rawWeight * invTotal;
           if (weight > dominantWeight) {
             dominantWeight = weight;
             dominantBiome = type;
           }
+
+          const biomeData = BIOMES[type];
+          if (!biomeData) {
+            throw new Error(
+              `[TerrainSystem] Biome "${type}" not found in BIOMES data!`,
+            );
+          }
+          this._tempColor.set(biomeData.color);
+
+          colorR += this._tempColor.r * weight;
+          colorG += this._tempColor.g * weight;
+          colorB += this._tempColor.b * weight;
+        }
+      } else {
+        const biomeData = BIOMES[DEFAULT_BIOME];
+        if (!biomeData) {
+          throw new Error(
+            `[TerrainSystem] Default biome not found in BIOMES data!`,
+          );
         }
+        this._tempColor.set(biomeData.color);
+        colorR = this._tempColor.r;
+        colorG = this._tempColor.g;
+        colorB = this._tempColor.b;
+      }
+      biomeIds[i] = this.getBiomeId(dominantBiome);
+
+      if (totalWeight > 0) {
+        const invW = 1 / totalWeight;
         forestWeights[i] = (biomeWeightMap.get(BiomeType.Forest) || 0) * invW;
         canyonWeights[i] = (biomeWeightMap.get(BiomeType.Canyon) || 0) * invW;
       }
-      biomeIds[i] = this.getBiomeId(dominantBiome);
 
+      // Apply brownish shoreline tint near water level
+      const waterLevel = WATER_LEVEL_NORMALIZED;
+      const shorelineThreshold = SHORELINE_CONFIG.THRESHOLD;
+      if (
+        normalizedHeight > waterLevel &&
+        normalizedHeight < shorelineThreshold
+      ) {
+        const shoreFactor =
+          (1.0 -
+            (normalizedHeight - waterLevel) /
+              (shorelineThreshold - waterLevel)) *
+          SHORELINE_CONFIG.STRENGTH;
+        colorR = colorR + (0.545 - colorR) * shoreFactor;
+        colorG = colorG + (0.451 - colorG) * shoreFactor;
+        colorB = colorB + (0.333 - colorB) * shoreFactor;
+      }
+
+      // Calculate road influence - shader uses this attribute for road coloring
+      // (vertex colors are NOT modified for roads, shader handles this procedurally)
       roadInfluences[i] = this.calculateRoadInfluenceAtVertex(
         x,
         z,
         tileX,
         tileZ,
       );
+
+      // Store biome color (kept for potential fallback/debug rendering)
+      colors[i * 3] = colorR;
+      colors[i * 3 + 1] = colorG;
+      colors[i * 3 + 2] = colorB;
     }
 
+    geometry.setAttribute("color", new THREE.BufferAttribute(colors, 3));
     geometry.setAttribute("biomeId", new THREE.BufferAttribute(biomeIds, 1));
     geometry.setAttribute(
       "roadInfluence",
@@ -2907,7 +2730,7 @@ export class TerrainSystem extends System {
     );
 
     // DEBUG: log biome weights for first 5 sync tiles
-    if (this._loggedSyncTileBiome < 5) {
+    if (shouldEmitVerboseTerrainBootLogs() && this._loggedSyncTileBiome < 5) {
       this._loggedSyncTileBiome++;
       let sumF = 0,
         sumD = 0;
@@ -3518,6 +3341,12 @@ export class TerrainSystem extends System {
 
   private getHeightAtWithoutShore(worldX: number, worldZ: number): number {
     this.ensureNoiseInitialized();
+
+    const flatHeight = this.getFlatZoneHeight(worldX, worldZ);
+    if (flatHeight !== null) {
+      return flatHeight;
+    }
+
     return this.getBaseHeightAt(worldX, worldZ);
   }
 
@@ -3701,7 +3530,9 @@ export class TerrainSystem extends System {
   }
 
   /**
-   * Compute height using noise (expensive). Skips flat zone check — caller must check first.
+   * Compute height using noise (expensive). The caller skips the outer
+   * getFlatZoneHeight() check, but the underlying base-height path still
+   * respects flat zones before shoreline shaping is applied.
    * PERF: Avoids redundant getFlatZoneHeight() when called from getHeightAt().
    */
   private getHeightAtComputedSkipFlatZone(
@@ -4017,6 +3848,62 @@ export class TerrainSystem extends System {
     return this.getFlatZoneHeight(worldX, worldZ) !== null;
   }
 
+  /**
+   * Get terrain color at a world position by sampling the nearest terrain tile vertex.
+   * Used by ProceduralGrassSystem to match grass color to terrain.
+   *
+   * @param worldX - World X coordinate
+   * @param worldZ - World Z coordinate
+   * @returns RGB color (0-1 range) or null if no terrain data available
+   */
+  getTerrainColorAt(
+    worldX: number,
+    worldZ: number,
+  ): { r: number; g: number; b: number } | null {
+    const tileX = this.worldToTerrainTileIndex(worldX);
+    const tileZ = this.worldToTerrainTileIndex(worldZ);
+    const key = `${tileX}_${tileZ}`;
+
+    const tile = this.terrainTiles.get(key);
+    if (!tile?.mesh) {
+      return null;
+    }
+
+    // Get vertex colors from geometry
+    const geometry = tile.mesh.geometry as THREE.BufferGeometry;
+    const colorAttr = geometry.getAttribute("color") as
+      | THREE.BufferAttribute
+      | undefined;
+    if (!colorAttr) {
+      return null;
+    }
+
+    const localX = worldX - tileX * this.CONFIG.TILE_SIZE;
+    const localZ = worldZ - tileZ * this.CONFIG.TILE_SIZE;
+
+    const resolution = this.CONFIG.TILE_RESOLUTION;
+    const vertexX = Math.round(
+      Math.max(0, Math.min(resolution - 1, this.localToGridIndex(localX))),
+    );
+    const vertexZ = Math.round(
+      Math.max(0, Math.min(resolution - 1, this.localToGridIndex(localZ))),
+    );
+    const vertexIndex = vertexZ * resolution + vertexX;
+
+    if (
+      vertexIndex < 0 ||
+      vertexIndex * 3 + 2 >= colorAttr.count * colorAttr.itemSize
+    ) {
+      return null;
+    }
+
+    return {
+      r: colorAttr.getX(vertexIndex),
+      g: colorAttr.getY(vertexIndex),
+      b: colorAttr.getZ(vertexIndex),
+    };
+  }
+
   /**
    * Register a flat zone and update spatial index.
    * Spatial index uses terrain tiles (100m each) for efficient lookup.
@@ -4131,26 +4018,6 @@ export class TerrainSystem extends System {
         }
       }
     }
-
-    // Invalidate quad-tree visual chunks so they regenerate with flat zone heights.
-    // Without this, chunks generated before the flat zone was registered would
-    // show the procedural height instead of the flat zone height.
-    if (this.quadTreeVisualManager) {
-      this.quadTreeVisualManager.invalidateRegion(
-        zoneMinX,
-        zoneMinZ,
-        zoneMaxX,
-        zoneMaxZ,
-      );
-    }
-    if (this.grassVisualManager) {
-      this.grassVisualManager.invalidateRegion(
-        zoneMinX,
-        zoneMinZ,
-        zoneMaxX,
-        zoneMaxZ,
-      );
-    }
   }
 
   /**
@@ -4288,18 +4155,6 @@ export class TerrainSystem extends System {
         }
       }
     }
-
-    // Invalidate quad-tree visual chunks so they regenerate without the flat zone.
-    const minX = zone.centerX - totalRadius;
-    const maxX = zone.centerX + totalRadius;
-    const minZ = zone.centerZ - totalRadius;
-    const maxZ = zone.centerZ + totalRadius;
-    if (this.quadTreeVisualManager) {
-      this.quadTreeVisualManager.invalidateRegion(minX, minZ, maxX, maxZ);
-    }
-    if (this.grassVisualManager) {
-      this.grassVisualManager.invalidateRegion(minX, minZ, maxX, maxZ);
-    }
   }
 
   /**
@@ -4756,146 +4611,6 @@ export class TerrainSystem extends System {
     return { biomeWeightMap, totalWeight };
   }
 
-  /**
-   * Single entry point for getting the terrain base color and grass weight
-   * at a world position.  Encapsulates height, slope, biome-weight lookups
-   * and the CPU terrain-color computation so callers (e.g. GrassVisualManager)
-   * don't need any biome knowledge.
-   */
-  getTerrainColorAt(
-    wx: number,
-    wz: number,
-  ): {
-    r: number;
-    g: number;
-    b: number;
-    grassWeight: number;
-    grassPlacement: number;
-    grassHeightScale: number;
-    tintR: number;
-    tintG: number;
-    tintB: number;
-    tintStrength: number;
-    nx: number;
-    ny: number;
-    nz: number;
-  } {
-    const height = this.getHeightAt(wx, wz);
-
-    const sd = 0.5;
-    const hL = this.getHeightAt(wx - sd, wz);
-    const hR = this.getHeightAt(wx + sd, wz);
-    const hD = this.getHeightAt(wx, wz - sd);
-    const hU = this.getHeightAt(wx, wz + sd);
-    const dhdx = (hR - hL) / (2 * sd);
-    const dhdz = (hU - hD) / (2 * sd);
-    const gradMag = Math.sqrt(dhdx * dhdx + dhdz * dhdz);
-    const normalY = 1 / Math.sqrt(1 + gradMag * gradMag);
-    const slope = 1 - normalY;
-
-    const rnx = -dhdx;
-    const rnz = -dhdz;
-    const rny = 1.0;
-    const nLen = Math.sqrt(rnx * rnx + rny * rny + rnz * rnz);
-    const invLen = 1 / nLen;
-
-    const { biomeWeightMap, totalWeight } = this.computeBiomeWeightsAtPosition(
-      wx,
-      wz,
-    );
-    const invW = totalWeight > 0 ? 1 / totalWeight : 1;
-    const forestW = (biomeWeightMap.get("forest") || 0) * invW;
-    const canyonW = (biomeWeightMap.get("canyon") || 0) * invW;
-    const tundraW = 1 - forestW - canyonW;
-
-    const color = computeTerrainColorCPU(
-      wx,
-      wz,
-      height,
-      slope,
-      forestW,
-      canyonW,
-    );
-
-    const tCfg = getGrassConfigForBiome(BiomeType.Tundra);
-    const fCfg = getGrassConfigForBiome(BiomeType.Forest);
-    const cCfg = getGrassConfigForBiome(BiomeType.Canyon);
-
-    const maxSlope =
-      tCfg.maxSlope * tundraW +
-      fCfg.maxSlope * forestW +
-      cCfg.maxSlope * canyonW;
-    const minGW =
-      tCfg.minGrassWeight * tundraW +
-      fCfg.minGrassWeight * forestW +
-      cCfg.minGrassWeight * canyonW;
-    const density =
-      tCfg.density * tundraW + fCfg.density * forestW + cCfg.density * canyonW;
-    const grassHeightScale =
-      tCfg.heightScale * tundraW +
-      fCfg.heightScale * forestW +
-      cCfg.heightScale * canyonW;
-    const patchiness =
-      tCfg.patchiness * tundraW +
-      fCfg.patchiness * forestW +
-      cCfg.patchiness * canyonW;
-    const patchScale =
-      tCfg.patchScale * tundraW +
-      fCfg.patchScale * forestW +
-      cCfg.patchScale * canyonW;
-
-    const slopeOk = slope <= maxSlope ? 1.0 : 0.0;
-    const weightOk = color.grassWeight >= minGW ? 1.0 : 0.0;
-
-    // Noise-based patch mask: patchiness 0 = uniform, 1 = tight clusters
-    const patchThreshold = patchiness * 2 - 1; // maps [0,1] -> [-1,1]
-    const noiseVal = this.noise.simplex2D(wx * patchScale, wz * patchScale);
-    const patchMask = noiseVal > patchThreshold ? 1.0 : 0.0;
-
-    const grassPlacement =
-      color.grassWeight * density * slopeOk * weightOk * patchMask;
-
-    // Biome-blended grass tint (returned separately for tip-only application)
-    const tintStrength =
-      (tCfg.tintStrength ?? 0) * tundraW +
-      (fCfg.tintStrength ?? 0) * forestW +
-      (cCfg.tintStrength ?? 0) * canyonW;
-    let tintR = 0,
-      tintG = 0,
-      tintB = 0;
-    if (tintStrength > 0) {
-      const wR =
-        (tCfg.tintColor?.[0] ?? 0) * (tCfg.tintStrength ?? 0) * tundraW +
-        (fCfg.tintColor?.[0] ?? 0) * (fCfg.tintStrength ?? 0) * forestW +
-        (cCfg.tintColor?.[0] ?? 0) * (cCfg.tintStrength ?? 0) * canyonW;
-      const wG =
-        (tCfg.tintColor?.[1] ?? 0) * (tCfg.tintStrength ?? 0) * tundraW +
-        (fCfg.tintColor?.[1] ?? 0) * (fCfg.tintStrength ?? 0) * forestW +
-        (cCfg.tintColor?.[1] ?? 0) * (cCfg.tintStrength ?? 0) * canyonW;
-      const wB =
-        (tCfg.tintColor?.[2] ?? 0) * (tCfg.tintStrength ?? 0) * tundraW +
-        (fCfg.tintColor?.[2] ?? 0) * (fCfg.tintStrength ?? 0) * forestW +
-        (cCfg.tintColor?.[2] ?? 0) * (cCfg.tintStrength ?? 0) * canyonW;
-      const inv = 1 / tintStrength;
-      tintR = wR * inv;
-      tintG = wG * inv;
-      tintB = wB * inv;
-    }
-
-    return {
-      ...color,
-      grassPlacement,
-      grassHeightScale,
-      tintR,
-      tintG,
-      tintB,
-      tintStrength,
-      nx: rnx * invLen,
-      ny: rny * invLen,
-      nz: rnz * invLen,
-    };
-  }
-
   computeBiomeWeightsByPosition(
     worldX: number,
     worldZ: number,
@@ -5332,7 +5047,16 @@ export class TerrainSystem extends System {
     if (tile) {
       tile.heightData = heightData;
       tile.needsSave = true;
+      return;
     }
+
+    // Tile not yet inserted into this.terrainTiles (initial createTileGeometry
+    // path). Stash the data in the pending buffer so generateTile() can drain
+    // it onto the tile immediately after adding the tile to the map. Without
+    // this the tile ends up with heightData=[], which forces bakeWalkability-
+    // Flags through the expensive noise-based height path — see P7.a fix
+    // 2026-04-15.
+    this._pendingTileHeightData.set(key, heightData);
   }
 
   private saveModifiedChunks(): void {
@@ -5366,6 +5090,8 @@ export class TerrainSystem extends System {
     }
   }
 
+  private _clientUpdateTickCounter = 0;
+
   update(_deltaTime: number): void {
     // Skip processing until terrain is fully initialized (DataManager loaded BIOMES)
     // This prevents race conditions where update() is called before start() completes
@@ -5373,6 +5099,18 @@ export class TerrainSystem extends System {
       return;
     }
 
+    // Track client-side tick count for throttling expensive per-frame work.
+    // Quad-tree LOD updates and instance visibility checks only need to run
+    // at ~4 Hz (every 4th frame at 15 fps), not every tick. Throttling frees
+    // ~75% of terrain CPU for the WebGPU render loop, which is the primary
+    // bottleneck for the streaming capture pipeline (1 unique fps at full
+    // tick rate vs ~8-12 fps when throttled).
+    if (this.runtimeIsClient) {
+      this._clientUpdateTickCounter++;
+    }
+    const isClientHeavyTick =
+      this.runtimeIsClient && this._clientUpdateTickCounter % 4 === 0;
+
     // Dispatch pending tiles to workers for pre-computation (client only)
     if (this.runtimeIsClient && this.CONFIG.USE_WORKERS) {
       this.dispatchWorkerBatch();
@@ -5388,33 +5126,22 @@ export class TerrainSystem extends System {
       this.processWalkabilityQueue();
     }
 
-    // Process pending resource instance creation (client only, spreads work across frames)
-    if (this.runtimeIsClient) {
+    // Process pending resource instance creation (client only, throttled)
+    if (isClientHeavyTick) {
       this.processResourceInstanceQueue();
     }
 
-    // Update quad-tree LOD visual manager (client only)
-    if (this.runtimeIsClient && this.quadTreeVisualManager) {
+    // Update quad-tree LOD visual manager (client only, throttled)
+    if (isClientHeavyTick && this.quadTreeVisualManager) {
       const centers = this.getTerrainCenters();
       if (centers.length > 0) {
         const pos = centers[0].position;
-
-        // Set grass player position BEFORE quad-tree update so
-        // onNodeNeedsGeometry dispatches with correct LOD & distance
-        if (this.grassVisualManager) {
-          this.grassVisualManager.setPlayerPosition(pos.x, pos.z);
-        }
-
         this.quadTreeVisualManager.update(pos.x, pos.z);
-
-        if (this.grassVisualManager) {
-          this.grassVisualManager.update(pos.x, pos.z, this.world.camera);
-        }
       }
     }
 
-    // Update instance visibility on client based on player position
-    if (this.runtimeIsClient && this.instancedMeshManager) {
+    // Update instance visibility on client based on player position (throttled)
+    if (isClientHeavyTick && this.instancedMeshManager) {
       this.instancedMeshManager.updateAllInstanceVisibility();
 
       // TEMPORARILY DISABLED - rock instancer update
@@ -5448,29 +5175,16 @@ export class TerrainSystem extends System {
       if (materialWithUniforms) {
         materialWithUniforms.terrainUniforms.time.value = this.terrainTime;
 
-        // Sync sun direction + day intensity from Environment system
+        // Sync sun direction and shade color from Environment system
         const env = this.world.getSystem("environment") as {
           lightDirection?: THREE.Vector3;
-          getDayIntensity?: () => number;
+          hemisphereLight?: { color: THREE.Color };
         } | null;
         if (env?.lightDirection) {
           materialWithUniforms.terrainUniforms.sunDirection.value
             .copy(env.lightDirection)
             .negate();
-          if (this.grassVisualManager) {
-            this.grassVisualManager.updateLighting(
-              materialWithUniforms.terrainUniforms.sunDirection.value,
-            );
-          }
-        }
-        if (env?.getDayIntensity) {
-          const dayVal = env.getDayIntensity();
-          materialWithUniforms.terrainUniforms.dayIntensity.value = dayVal;
-          if (this.grassVisualManager) {
-            this.grassVisualManager.updateDayIntensity(dayVal);
-          }
         }
-
         // Fog texture is the shared fogRenderTarget from FogConfig — no sync needed
 
         // Update lamppost vertex lights (night-only)
@@ -5975,6 +5689,58 @@ export class TerrainSystem extends System {
     const originXInt = Math.floor(originX);
     const originZInt = Math.floor(originZ);
 
+    // FAST HEIGHT PATH: bakeWalkabilityFlags only cares about raw terrain
+    // height, not bridge/dock/flat-zone overrides (those are applied later
+    // in Pass 3/4 as walkability flag overrides, not height overrides). Using
+    // `getHeightAt` here means 94,356 lookups × (3 system-lookups + flat-zone
+    // scan + bilinear interpolation) per bake. That's what made bake take
+    // 800ms+ per tile even after the heightData caching fix.
+    //
+    // Instead, cache the current tile's heightData locally and bilinear-
+    // interpolate directly for in-tile samples. For samples outside this
+    // tile's bounds (tile edges, slope check overflow), fall back to
+    // `getHeightAtCached` which handles adjacent-tile lookups, and finally
+    // to the noise path if nothing is cached.
+    const tileKey = `${terrainTileX}_${terrainTileZ}`;
+    const currentTile = this.terrainTiles.get(tileKey);
+    const tileHeightData = currentTile?.heightData;
+    const hasLocalHeights =
+      Array.isArray(tileHeightData) && tileHeightData.length > 0;
+    const resolution = this.CONFIG.TILE_RESOLUTION;
+    const fastHeight = (wx: number, wz: number): number => {
+      if (hasLocalHeights) {
+        // In-tile bilinear from the local heightData. Only applies when the
+        // sample is actually inside this tile; otherwise fall through.
+        const lxf = wx - originX;
+        const lzf = wz - originZ;
+        if (lxf >= 0 && lxf <= tileSize && lzf >= 0 && lzf <= tileSize) {
+          const gx = (lxf / tileSize) * (resolution - 1);
+          const gz = (lzf / tileSize) * (resolution - 1);
+          const gxClamped = Math.max(0, Math.min(resolution - 1.001, gx));
+          const gzClamped = Math.max(0, Math.min(resolution - 1.001, gz));
+          const ix0 = Math.floor(gxClamped);
+          const iz0 = Math.floor(gzClamped);
+          const ix1 = Math.min(ix0 + 1, resolution - 1);
+          const iz1 = Math.min(iz0 + 1, resolution - 1);
+          const fx = gxClamped - ix0;
+          const fz = gzClamped - iz0;
+          const h00 = tileHeightData![iz0 * resolution + ix0];
+          const h10 = tileHeightData![iz0 * resolution + ix1];
+          const h01 = tileHeightData![iz1 * resolution + ix0];
+          const h11 = tileHeightData![iz1 * resolution + ix1];
+          const h0 = h00 + (h10 - h00) * fx;
+          const h1 = h01 + (h11 - h01) * fx;
+          return h0 + (h1 - h0) * fz;
+        }
+      }
+      // Out-of-tile or missing local data → walk the full adjacent-tile cache
+      // then fall back to the computed noise path (skip flat-zone since we
+      // already know we're not inside a flat zone for terrain sampling).
+      const adjacentCached = this.getHeightAtCached(wx, wz);
+      if (adjacentCached !== null) return adjacentCached;
+      return this.getHeightAtComputedSkipFlatZone(wx, wz);
+    };
+
     // Clear stale terrain flags first (handles re-baking after flat zone regeneration)
     const terrainFlagsMask = CollisionFlag.WATER | CollisionFlag.STEEP_SLOPE;
     for (let lx = 0; lx < tilesPerSide; lx++) {
@@ -6008,7 +5774,7 @@ export class TerrainSystem extends System {
       const iStride = i * gridPoints;
       for (let j = 0; j < gridPoints; j++) {
         const wz = gridStartZ + j * cellSize;
-        heights[iStride + j] = this.getHeightAt(wx, wz);
+        heights[iStride + j] = fastHeight(wx, wz);
       }
     }
 
@@ -6130,6 +5896,15 @@ export class TerrainSystem extends System {
     }
 
     // ---- PASS 2: Biome + slope flags (non-water tiles only) ----
+    // Inline the slope computation using fastHeight() so the inner 10K×9
+    // getHeightAt calls become 10K×9 fastHeight calls (direct bilinear from
+    // the current tile's heightData array, no bridge/dock/flat-zone lookup,
+    // no per-call Map indirection). Matches the behaviour of calculateSlope()
+    // but skips the system lookups that are irrelevant for the raw terrain
+    // slope used here.
+    const slopeD = this.CONFIG.SLOPE_CHECK_DISTANCE;
+    const slopeInvD = 1 / slopeD;
+    const slopeInvDiag = 1 / (slopeD * Math.SQRT2);
     for (let lx = 0; lx < tilesPerSide; lx++) {
       const worldX = originX + lx + 0.5;
       const moveTileX = originXInt + lx;
@@ -6151,8 +5926,33 @@ export class TerrainSystem extends System {
           // Slope check — slope exceeds biome's maxSlope
           const biomeData = BIOMES[biome];
           if (biomeData) {
-            const slope = this.calculateSlope(worldX, worldZ);
-            if (slope > biomeData.maxSlope) {
+            const c = fastHeight(worldX, worldZ);
+            let maxSlope =
+              Math.abs(fastHeight(worldX, worldZ + slopeD) - c) * slopeInvD;
+            let s =
+              Math.abs(fastHeight(worldX, worldZ - slopeD) - c) * slopeInvD;
+            if (s > maxSlope) maxSlope = s;
+            s = Math.abs(fastHeight(worldX + slopeD, worldZ) - c) * slopeInvD;
+            if (s > maxSlope) maxSlope = s;
+            s = Math.abs(fastHeight(worldX - slopeD, worldZ) - c) * slopeInvD;
+            if (s > maxSlope) maxSlope = s;
+            s =
+              Math.abs(fastHeight(worldX + slopeD, worldZ + slopeD) - c) *
+              slopeInvDiag;
+            if (s > maxSlope) maxSlope = s;
+            s =
+              Math.abs(fastHeight(worldX - slopeD, worldZ + slopeD) - c) *
+              slopeInvDiag;
+            if (s > maxSlope) maxSlope = s;
+            s =
+              Math.abs(fastHeight(worldX + slopeD, worldZ - slopeD) - c) *
+              slopeInvDiag;
+            if (s > maxSlope) maxSlope = s;
+            s =
+              Math.abs(fastHeight(worldX - slopeD, worldZ - slopeD) - c) *
+              slopeInvDiag;
+            if (s > maxSlope) maxSlope = s;
+            if (maxSlope > biomeData.maxSlope) {
               collision.addFlags(
                 moveTileX,
                 originZInt + lz,
@@ -6670,7 +6470,9 @@ export class TerrainSystem extends System {
     worldZ: number,
     overrideDifficultyLevel?: number,
   ): DifficultySample {
-    this.ensureNoiseInitialized();
+    if (!this.noise) {
+      this.noise = new NoiseGenerator(this.computeSeedFromWorldId());
+    }
 
     const biome = this.getBiomeAtWorldPosition(worldX, worldZ);
     const biomeData = BIOMES[biome];
@@ -6832,7 +6634,9 @@ export class TerrainSystem extends System {
   private generateBossHotspots(): void {
     if (this.bossHotspots.length > 0) return;
 
-    this.ensureNoiseInitialized();
+    if (!this.noise) {
+      this.noise = new NoiseGenerator(this.computeSeedFromWorldId());
+    }
 
     const worldSizeMeters = this.getActiveWorldSizeMeters();
     const halfWorld = worldSizeMeters / 2;
@@ -7006,20 +6810,9 @@ export class TerrainSystem extends System {
       this.quadTreeVisualManager = null;
     }
 
-    if (this.waterVisualManager) {
-      this.waterVisualManager.destroy();
-      this.waterVisualManager = null;
-    }
-
-    if (this.grassVisualManager) {
-      this.grassVisualManager.destroy();
-      this.grassVisualManager = null;
-    }
-
     // Terminate worker pools to free resources
     terminateTerrainWorkerPool();
     terminateQuadChunkWorkerPool();
-    terminateGrassWorkerPool();
 
     // Clear pending worker results
     this.pendingWorkerResults.clear();
@@ -7203,29 +6996,30 @@ export class TerrainSystem extends System {
    * Initialize chunk loading system with 9 core + ring strategy
    */
   private initializeChunkLoadingSystem(): void {
-    const isEmbeddedSpectator = (() => {
-      if (typeof window === "undefined") return false;
-      const win = window as Window & {
-        __HYPERSCAPE_EMBEDDED__?: boolean;
-        __HYPERSCAPE_CONFIG__?: { mode?: string };
-      };
-      return (
-        win.__HYPERSCAPE_EMBEDDED__ === true &&
-        win.__HYPERSCAPE_CONFIG__?.mode === "spectator"
-      );
-    })();
     // world.isServer can be false during early bootstrap (before network mode
     // is finalized). Resolve runtime role explicitly so server startup always
     // uses tight headless chunk ranges.
     const { isServer: isServerRuntime } = this.resolveRuntimeRole();
+    const isDedicatedStream = !isServerRuntime && isDedicatedStreamViewport();
+    const isEmbeddedSpectator =
+      !isDedicatedStream && isEmbeddedSpectatorViewport();
 
     // Embedded spectator prioritizes first-frame time over long-range preload.
     if (isServerRuntime) {
-      this.coreChunkRange = 3; // 7x7 core grid (full simulation)
-      this.ringChunkRange = 5; // 11x11 ring — resource content generated here
-      this.terrainOnlyChunkRange = 0; // No render-only tiles on server
-      this.maxTilesPerFrame = 4;
-      this.generationBudgetMsPerFrame = 6;
+      // Server does not render horizon terrain, so keep chunk windows tight to
+      // avoid runaway memory when many autonomous agents are active.
+      // Reduced tile budget to minimize GC pressure from Float32Array allocations.
+      this.coreChunkRange = 1; // 3x3 core grid
+      this.ringChunkRange = 1; // No extra preload ring
+      this.terrainOnlyChunkRange = 0; // Never load render-only distant tiles
+      this.maxTilesPerFrame = 1;
+      this.generationBudgetMsPerFrame = 2;
+    } else if (isDedicatedStream) {
+      this.coreChunkRange = 1; // 3x3 core grid
+      this.ringChunkRange = 1; // No broad preload beyond the duel arena envelope
+      this.terrainOnlyChunkRange = 0; // Disable distant terrain-only horizon churn
+      this.maxTilesPerFrame = 1; // Favor continuity over catch-up bursts
+      this.generationBudgetMsPerFrame = 4;
     } else if (isEmbeddedSpectator) {
       this.coreChunkRange = 1; // 3x3 core grid
       this.ringChunkRange = 2; // Preload ring up to 5x5
@@ -7233,12 +7027,12 @@ export class TerrainSystem extends System {
       this.maxTilesPerFrame = 4; // Catch up faster after camera retargets
       this.generationBudgetMsPerFrame = 10;
     } else {
-      // Client: load tiles out to match LOD fade distances (~1000m)
-      this.coreChunkRange = 3; // 7x7 core grid
-      this.ringChunkRange = 5; // 11x11 ring — content generated here (~1100m)
-      this.terrainOnlyChunkRange = 7; // Terrain mesh horizon (~1500m)
-      this.maxTilesPerFrame = 3;
-      this.generationBudgetMsPerFrame = 8;
+      // Balanced load radius to reduce generation spikes when moving
+      this.coreChunkRange = 2; // 5x5 core grid
+      this.ringChunkRange = 3; // Preload ring up to ~7x7
+      this.terrainOnlyChunkRange = 5;
+      this.maxTilesPerFrame = 2;
+      this.generationBudgetMsPerFrame = 6;
     }
 
     // Initialize tracking maps
diff --git a/packages/shared/src/systems/shared/world/TownSystem.ts b/packages/shared/src/systems/shared/world/TownSystem.ts
index e68452906..0b73b1a9c 100644
--- a/packages/shared/src/systems/shared/world/TownSystem.ts
+++ b/packages/shared/src/systems/shared/world/TownSystem.ts
@@ -1662,9 +1662,13 @@ export class TownSystem extends System {
     }
     const nodeEnv =
       typeof process !== "undefined" ? process.env.NODE_ENV : undefined;
-    // Keep exhaustive validation enabled for test runs while avoiding
-    // multi-gigabyte startup churn in normal server runtimes.
-    return nodeEnv === "test";
+    const isCi =
+      typeof process !== "undefined" &&
+      isTruthyEnv(process.env.CI ?? undefined);
+    // Keep exhaustive validation available for explicit opt-in and local test
+    // debugging, but do not make CI startup depend on fully deterministic world
+    // generation + pathfinding layout.
+    return nodeEnv === "test" && !isCi;
   }
 
   /**
diff --git a/packages/shared/src/systems/shared/world/VegetationSystem.ts b/packages/shared/src/systems/shared/world/VegetationSystem.ts
index 0a14239f1..77bfafcd5 100644
--- a/packages/shared/src/systems/shared/world/VegetationSystem.ts
+++ b/packages/shared/src/systems/shared/world/VegetationSystem.ts
@@ -64,6 +64,10 @@ import {
   getGlobalCullingManager,
 } from "../../../utils/compute";
 import { isPositionInsideDuelArenaZone } from "../../../data/duel-manifest";
+import {
+  isDedicatedStreamViewport,
+  isStreamDebugEnabled,
+} from "../../../runtime/clientViewportMode";
 // Octahedral impostor for high-quality multi-angle billboard rendering
 import {
   OctahedralImpostor,
@@ -117,9 +121,10 @@ const SKIP_LOD1_CATEGORIES = new Set([
 const VEGETATION_CHUNK_SIZE = 64; // meters per chunk
 const MAX_INSTANCES_PER_CHUNK = 256;
 
-let FADE_START = 1000; // Shader fade begins (fully opaque inside)
-let FADE_END = 1200; // Shader fully culls (invisible beyond)
-let CHUNK_RENDER_DISTANCE = 1400; // CPU hides chunks (buffer zone for loading)
+// Default fade distances - overridden by shadow quality settings in start()
+let FADE_START = 180; // Shader fade begins (fully opaque inside)
+let FADE_END = 200; // Shader fully culls (invisible beyond)
+let CHUNK_RENDER_DISTANCE = 300; // CPU hides chunks (buffer zone for loading)
 
 // NOTE: Per-category LOD distances are defined in LODConfig.ts LOD_DISTANCES
 // Access via getLODDistances(category) for actual LOD decisions.
@@ -263,7 +268,36 @@ function getAssetLODConfig(category: string, boundingSize?: number) {
 }
 
 /** Max tile distance from player to generate vegetation (in tiles, not world units) */
-const MAX_VEGETATION_TILE_RADIUS = 5;
+// PERFORMANCE: Reduced from 3 to 2 tiles - vegetation fades before this distance anyway
+const MAX_VEGETATION_TILE_RADIUS = 2;
+const STREAM_MAX_VEGETATION_TILE_RADIUS = 1;
+const DEFAULT_STARTUP_TILE_BATCH_SIZE = 8;
+const STREAM_STARTUP_TILE_BATCH_SIZE = 2;
+const STREAM_MAX_CHUNK_RENDER_DISTANCE = 140;
+
+function isDedicatedStreamVegetationMode(): boolean {
+  return typeof window !== "undefined" && isDedicatedStreamViewport();
+}
+
+function getVegetationTileRadius(): number {
+  return isDedicatedStreamVegetationMode()
+    ? STREAM_MAX_VEGETATION_TILE_RADIUS
+    : MAX_VEGETATION_TILE_RADIUS;
+}
+
+function getVegetationStartupBatchSize(): number {
+  return isDedicatedStreamVegetationMode()
+    ? STREAM_STARTUP_TILE_BATCH_SIZE
+    : DEFAULT_STARTUP_TILE_BATCH_SIZE;
+}
+
+function shouldQueueDistantVegetationTiles(): boolean {
+  return !isDedicatedStreamVegetationMode();
+}
+
+function shouldEmitVerboseVegetationBootLogs(): boolean {
+  return !isDedicatedStreamVegetationMode() || isStreamDebugEnabled();
+}
 
 /** Water threshold from centralized constants */
 import { TERRAIN_CONSTANTS } from "../../../constants/GameConstants";
@@ -773,6 +807,7 @@ export class VegetationSystem extends System {
     if (!this.world.stage?.scene) return;
 
     this.scene = this.world.stage.scene as THREE.Scene;
+    const isDedicatedStreamMode = isDedicatedStreamVegetationMode();
 
     // Sync vegetation fade distances with shadow quality
     // Vegetation must dissolve BEFORE shadow cutoff to avoid unshadowed trees
@@ -787,19 +822,30 @@ export class VegetationSystem extends System {
       csmLevels[shadowsLevel as keyof typeof csmLevels] || csmLevels.med;
     const shadowMaxFar = csmConfig.maxFar;
 
-    // Fade distances are independent of shadow range — distant trees render
-    // without shadows rather than disappearing at the shadow cutoff.
-    FADE_START = 1000;
-    FADE_END = 1200;
-    CHUNK_RENDER_DISTANCE = 1400;
+    // Sync fade distances with shadow range
+    // Vegetation fully dissolves AT shadow maxFar so we never see unshadowed trees
+    FADE_END = shadowMaxFar; // Fully dissolved at shadow cutoff
+    FADE_START = shadowMaxFar * 0.9; // Start dissolving at 90% of shadow range
+    CHUNK_RENDER_DISTANCE = shadowMaxFar * 1.2; // Chunks visible 20% beyond shadow range
+    if (isDedicatedStreamMode) {
+      CHUNK_RENDER_DISTANCE = Math.min(
+        CHUNK_RENDER_DISTANCE,
+        STREAM_MAX_CHUNK_RENDER_DISTANCE,
+      );
+      this.setConfig({
+        cullDistance: CHUNK_RENDER_DISTANCE,
+      });
+    }
 
     // Imposter distances - switch to billboard before dissolve zone
     // LOD transition: 3D mesh -> Billboard imposter -> Dissolve -> Cull
     // Per-category LOD distances are defined in LODConfig.ts LOD_DISTANCES
     // The shared material uses FADE_START/FADE_END for dissolve shader
-    console.log(
-      `[VegetationSystem] Synced with shadows "${shadowsLevel}": fade ${FADE_START.toFixed(0)}-${FADE_END.toFixed(0)}m, chunks ${CHUNK_RENDER_DISTANCE.toFixed(0)}m (per-category LOD via getLODDistances)`,
-    );
+    if (shouldEmitVerboseVegetationBootLogs()) {
+      console.log(
+        `[VegetationSystem] Synced with shadows "${shadowsLevel}": fade ${FADE_START.toFixed(0)}-${FADE_END.toFixed(0)}m, chunks ${CHUNK_RENDER_DISTANCE.toFixed(0)}m (per-category LOD via getLODDistances)`,
+      );
+    }
 
     // Load LOD settings first (affects all subsequent distance calculations)
     await this.loadLODSettings();
@@ -823,9 +869,11 @@ export class VegetationSystem extends System {
       fadeStart: FADE_START,
       fadeEnd: FADE_END,
     });
-    console.log(
-      `[VegetationSystem] Created shared material (fade: ${FADE_START.toFixed(0)}-${FADE_END.toFixed(0)}m, chunks: ${CHUNK_RENDER_DISTANCE.toFixed(0)}m)`,
-    );
+    if (shouldEmitVerboseVegetationBootLogs()) {
+      console.log(
+        `[VegetationSystem] Created shared material (fade: ${FADE_START.toFixed(0)}-${FADE_END.toFixed(0)}m, chunks: ${CHUNK_RENDER_DISTANCE.toFixed(0)}m)`,
+      );
+    }
 
     // PERFORMANCE: Enable layer 1 for main camera so it can see vegetation
     // Minimap camera only sees layer 0, so vegetation won't render in minimap
@@ -848,14 +896,23 @@ export class VegetationSystem extends System {
     );
 
     console.log(
-      `[VegetationSystem] ✅ Started with ${this.assetDefinitions.size} assets, radius=${MAX_VEGETATION_TILE_RADIUS} tiles`,
+      `[VegetationSystem] ✅ Started with ${this.assetDefinitions.size} assets, radius=${getVegetationTileRadius()} tiles`,
     );
 
     // Initialize GPU compute culling (optional enhancement)
     this.initializeGPUCulling();
 
     // Process existing terrain tiles that were generated before we subscribed
-    await this.processExistingTiles();
+    if (isDedicatedStreamMode) {
+      this.processExistingTiles().catch((error) => {
+        console.warn(
+          "[VegetationSystem] Deferred stream vegetation startup failed:",
+          error,
+        );
+      });
+    } else {
+      await this.processExistingTiles();
+    }
   }
 
   /**
@@ -919,7 +976,7 @@ export class VegetationSystem extends System {
     for (const tile of allTiles) {
       const dx = Math.abs(tile.tileX - playerTileX);
       const dz = Math.abs(tile.tileZ - playerTileZ);
-      if (Math.max(dx, dz) <= MAX_VEGETATION_TILE_RADIUS) {
+      if (Math.max(dx, dz) <= getVegetationTileRadius()) {
         nearbyTiles.push(tile);
       } else {
         distantTiles.push(tile);
@@ -945,7 +1002,7 @@ export class VegetationSystem extends System {
     if (totalTiles > 0) {
       // PARALLEL BATCH PROCESSING: Process tiles in batches of 8 for optimal parallelism
       // This balances worker pool utilization with progress reporting
-      const BATCH_SIZE = 8;
+      const BATCH_SIZE = getVegetationStartupBatchSize();
       let processedTiles = 0;
 
       for (let i = 0; i < nearbyTiles.length; i += BATCH_SIZE) {
@@ -967,14 +1024,17 @@ export class VegetationSystem extends System {
     }
 
     // Queue distant tiles for lazy loading
-    for (const tile of distantTiles) {
-      this.pendingTiles.set(`${tile.tileX}_${tile.tileZ}`, tile);
+    if (shouldQueueDistantVegetationTiles()) {
+      for (const tile of distantTiles) {
+        this.pendingTiles.set(`${tile.tileX}_${tile.tileZ}`, tile);
+      }
     }
 
-    // Keep startup logs concise; per-tile detail is noisy in embedded spectator mode.
-    console.log(
-      `[VegetationSystem] Processed ${nearbyTiles.length} nearby tiles, queued ${distantTiles.length} for lazy loading`,
-    );
+    if (shouldEmitVerboseVegetationBootLogs()) {
+      console.log(
+        `[VegetationSystem] Processed ${nearbyTiles.length} nearby tiles, queued ${shouldQueueDistantVegetationTiles() ? distantTiles.length : 0} for lazy loading`,
+      );
+    }
   }
 
   /**
@@ -1004,7 +1064,7 @@ export class VegetationSystem extends System {
 
     const dx = Math.abs(tileX - playerTile.x);
     const dz = Math.abs(tileZ - playerTile.z);
-    return Math.max(dx, dz) <= MAX_VEGETATION_TILE_RADIUS;
+    return Math.max(dx, dz) <= getVegetationTileRadius();
   }
 
   /**
@@ -1024,7 +1084,9 @@ export class VegetationSystem extends System {
 
     if (!this.isTileInRange(data.tileX, data.tileZ)) {
       // Store as pending for later generation when player gets closer
-      this.pendingTiles.set(key, data);
+      if (shouldQueueDistantVegetationTiles()) {
+        this.pendingTiles.set(key, data);
+      }
       return;
     }
 
@@ -4151,7 +4213,8 @@ export class VegetationSystem extends System {
    * Process pending tiles that are now within range of the player
    */
   private async processPendingTiles(): Promise<void> {
-    if (this.pendingTiles.size === 0) return;
+    if (!shouldQueueDistantVegetationTiles() || this.pendingTiles.size === 0)
+      return;
 
     const playerTile = this.getPlayerTile();
     if (!playerTile) return;
diff --git a/packages/shared/src/systems/shared/world/WaterSystem.ts b/packages/shared/src/systems/shared/world/WaterSystem.ts
index ebb449fbe..f178ef0c3 100644
--- a/packages/shared/src/systems/shared/world/WaterSystem.ts
+++ b/packages/shared/src/systems/shared/world/WaterSystem.ts
@@ -123,6 +123,8 @@ const WATER_LOD = {
   MEDIUM_DISTANCE: 200, // Distance threshold for medium->low LOD
 };
 
+const WATER_TEXTURE_LOAD_TIMEOUT_MS = 5000;
+
 type WaveParams = {
   w: number;
   phi: number;
@@ -336,19 +338,21 @@ export class WaterSystem {
         );
       });
 
-    const [normalResult, flowResult] = await Promise.allSettled([
-      loadTex("/textures/waterNormal.png"),
-      loadTex("/textures/noise28.png"),
+    const [normalTex, flowTex] = await Promise.all([
+      this.withTextureLoadFallback(
+        "water normal",
+        loadTex("/textures/waterNormal.png"),
+        () => this.createNormalMap(512, 1.0, 42),
+      ),
+      this.withTextureLoadFallback(
+        "water flow",
+        loadTex("/textures/noise28.png"),
+        () => this.createFlowFallback(256),
+      ),
     ]);
 
-    this.normalTex =
-      normalResult.status === "fulfilled"
-        ? normalResult.value
-        : await this.createNormalMap(512, 1.0, 42);
-    this.flowTex =
-      flowResult.status === "fulfilled"
-        ? flowResult.value
-        : this.createFlowFallback(256);
+    this.normalTex = normalTex;
+    this.flowTex = flowTex;
     this.foamTex = await this.createFoamTexture(128);
 
     // TSL reflector: handles render target, camera mirroring, oblique clipping
@@ -360,6 +364,52 @@ export class WaterSystem {
     this.oceanMaterial = this.createOceanMaterial();
   }
 
+  private async withTextureLoadFallback(
+    label: string,
+    texturePromise: Promise<THREE.Texture>,
+    fallback: () => THREE.Texture | Promise<THREE.Texture>,
+  ): Promise<THREE.Texture> {
+    type TextureLoadResult =
+      | { ok: true; texture: THREE.Texture }
+      | { ok: false; error: unknown };
+
+    let timeoutId: ReturnType<typeof setTimeout> | null = null;
+    const timeout = new Promise<TextureLoadResult>((resolve) => {
+      timeoutId = setTimeout(() => {
+        resolve({
+          ok: false,
+          error: new Error(
+            `${label} texture load timed out after ${WATER_TEXTURE_LOAD_TIMEOUT_MS}ms`,
+          ),
+        });
+      }, WATER_TEXTURE_LOAD_TIMEOUT_MS);
+    });
+
+    try {
+      const result = await Promise.race([
+        texturePromise.then(
+          (texture): TextureLoadResult => ({ ok: true, texture }),
+          (error): TextureLoadResult => ({ ok: false, error }),
+        ),
+        timeout,
+      ]);
+
+      if (result.ok) {
+        return result.texture;
+      }
+
+      console.warn(
+        `[WaterSystem] ${label} texture unavailable; using generated fallback`,
+        result.error,
+      );
+      return await fallback();
+    } finally {
+      if (timeoutId) {
+        clearTimeout(timeoutId);
+      }
+    }
+  }
+
   /**
    * Add water system to scene — adds the reflector target so the mirror plane is active.
    */
diff --git a/packages/shared/src/types/bank-operations.ts b/packages/shared/src/types/bank-operations.ts
index c22770a6a..272acadca 100644
--- a/packages/shared/src/types/bank-operations.ts
+++ b/packages/shared/src/types/bank-operations.ts
@@ -5,12 +5,14 @@
  * Used by both client (pre-validation) and server (security validation).
  */
 
+import { MAX_COINS } from "../systems/shared/character/CoinPouchSystem";
+
 // ============================================================================
 // VALIDATION CONSTANTS
 // ============================================================================
 
 const MAX_ITEM_ID_LENGTH = 64;
-const MAX_QUANTITY = 2147483647; // Max signed 32-bit int
+const MAX_QUANTITY = MAX_COINS;
 const MAX_TAB_INDEX = 20;
 const MAX_SLOT = 500;
 
diff --git a/packages/shared/src/types/entities/player-types.ts b/packages/shared/src/types/entities/player-types.ts
index 167a6aa10..0fecbba52 100644
--- a/packages/shared/src/types/entities/player-types.ts
+++ b/packages/shared/src/types/entities/player-types.ts
@@ -57,6 +57,12 @@ export interface PlayerStamina {
   max: number;
 }
 
+// Special attack energy (OSRS: 0-100%, recharges 10% every 30 seconds)
+export interface PlayerSpecialEnergy {
+  current: number;
+  max: number;
+}
+
 // Death and respawn
 export interface PlayerDeathData {
   deathLocation: PlayerPosition | null;
@@ -77,6 +83,7 @@ export interface Player {
   health: PlayerHealth;
   alive: boolean;
   stamina: PlayerStamina;
+  specialEnergy: PlayerSpecialEnergy;
 
   // Position and movement
   position: PlayerPosition;
@@ -169,7 +176,8 @@ export class PlayerMigration {
       name: old.name,
       health: { current: currentHealth, max: maxHealth },
       alive: currentHealth > 0,
-      stamina: { current: 100, max: 100 }, // Assuming default stamina
+      stamina: { current: 100, max: 100 },
+      specialEnergy: { current: 100, max: 100 },
       position: { x: old.positionX, y: old.positionY, z: old.positionZ },
       skills: {
         attack: { level: old.attackLevel, xp: old.attackXp },
@@ -346,6 +354,7 @@ export class PlayerMigration {
       health: { current: constitutionLevel, max: constitutionLevel },
       alive: true,
       stamina: { current: 100, max: 100 },
+      specialEnergy: { current: 100, max: 100 },
       position: { x: 0, y: 0, z: 0 },
       skills,
       equipment: {
@@ -418,6 +427,10 @@ export interface PlayerStats {
   inCombat: boolean;
   /** Prayer points (current/max) for prayer system UI */
   prayerPoints?: { current: number; max: number };
+  /** Special attack energy (0-100) for special attack bar UI */
+  specialEnergy?: number;
+  /** Whether special attack toggle is active (next attack will be special) */
+  specialAttackActive?: boolean;
 }
 
 // Attack style state
diff --git a/packages/shared/src/types/events/event-types.ts b/packages/shared/src/types/events/event-types.ts
index ce950426f..f0f9674e2 100644
--- a/packages/shared/src/types/events/event-types.ts
+++ b/packages/shared/src/types/events/event-types.ts
@@ -624,6 +624,12 @@ export enum EventType {
   UI_AUTO_RETALIATE_GET = "ui:auto_retaliate:get",
   UI_AUTO_RETALIATE_UPDATE = "ui:auto_retaliate:update",
   UI_AUTO_RETALIATE_CHANGED = "ui:auto_retaliate:changed",
+
+  // Special Attack Energy
+  UI_SPECIAL_ATTACK_GET = "ui:special_attack:get",
+  UI_SPECIAL_ATTACK_TOGGLE = "ui:special_attack:toggle",
+  UI_SPECIAL_ATTACK_CHANGED = "ui:special_attack:changed",
+
   UI_MESSAGE = "ui:message",
   UI_REQUEST = "ui:request",
   UI_CONTEXT_ACTION = "ui:context_action",
diff --git a/packages/shared/src/types/game/prayer-types.ts b/packages/shared/src/types/game/prayer-types.ts
index 87519bff7..33e783b71 100644
--- a/packages/shared/src/types/game/prayer-types.ts
+++ b/packages/shared/src/types/game/prayer-types.ts
@@ -87,6 +87,39 @@ export interface PrayerStateSyncPayload {
 
 // === Type Guards (Runtime Validation) ===
 
+/**
+ * Validates PrayerStateSyncPayload shape.
+ * Used by client UI components to safely narrow event data.
+ */
+export function isPrayerStateSyncPayload(
+  data: unknown,
+): data is PrayerStateSyncPayload {
+  if (!data || typeof data !== "object") return false;
+  const obj = data as Record<string, unknown>;
+  return (
+    typeof obj.playerId === "string" &&
+    typeof obj.points === "number" &&
+    typeof obj.maxPoints === "number" &&
+    Array.isArray(obj.active)
+  );
+}
+
+/**
+ * Validates PrayerToggledEvent shape.
+ * Used by client UI components to safely narrow event data.
+ */
+export function isPrayerToggledPayload(
+  data: unknown,
+): data is PrayerToggledEvent {
+  if (!data || typeof data !== "object") return false;
+  const obj = data as Record<string, unknown>;
+  return (
+    typeof obj.playerId === "string" &&
+    typeof obj.prayerId === "string" &&
+    typeof obj.active === "boolean"
+  );
+}
+
 /**
  * Validates prayer ID format (security + anti-exploit)
  * - Max 64 characters
diff --git a/packages/shared/src/types/rendering/nodes.ts b/packages/shared/src/types/rendering/nodes.ts
index ac3534c91..2ee0be3ff 100644
--- a/packages/shared/src/types/rendering/nodes.ts
+++ b/packages/shared/src/types/rendering/nodes.ts
@@ -704,8 +704,13 @@ export interface UIViewData extends NodeData {
   flexBasis?: FlexBasis;
   flexGrow?: number;
   flexShrink?: number;
+  overflow?: "visible" | "hidden" | "scroll";
+  scrollX?: number;
+  scrollY?: number;
 }
 
+export type OverflowMode = "visible" | "hidden" | "scroll";
+
 // Enhanced UI Image interfaces
 export interface UIImageData extends NodeData {
   display?: string;
diff --git a/packages/shared/src/types/rendering/ui.ts b/packages/shared/src/types/rendering/ui.ts
deleted file mode 100644
index c71d691fa..000000000
--- a/packages/shared/src/types/rendering/ui.ts
+++ /dev/null
@@ -1,389 +0,0 @@
-/**
- * UI-related type definitions
- *
- * Shared types for UI elements and interfaces
- */
-
-import * as THREE from "../../extras/three/three";
-import type { ReactNode, CSSProperties } from "react";
-import type { World } from "../../index";
-import type { Curve } from "../../extras/animation/Curve";
-
-// Equipment UI interfaces
-export interface PlayerWithEquipmentSupport {
-  position: THREE.Vector3;
-  getBoneTransform: (boneName: string) => THREE.Matrix4;
-}
-
-// Action test interfaces (for item interaction testing)
-export interface ActionTestData {
-  testId: string;
-  itemId: string;
-  itemType: string;
-  playerId: string;
-  startTime: number;
-  phase:
-    | "setup"
-    | "right_click"
-    | "verify_menu"
-    | "test_actions"
-    | "verify_results"
-    | "completed"
-    | "failed";
-  rightClicked: boolean;
-  menuShown: boolean;
-  actionsAvailable: string[];
-  actionsExpected: string[];
-  actionsTested: string[];
-  actionsSuccessful: string[];
-  menuDisappeared: boolean;
-  visualFeedbackReceived: boolean;
-  errors: string[];
-}
-
-// Context menu interfaces
-export interface ContextMenuAction {
-  id: string;
-  label: string;
-  icon?: string;
-  enabled: boolean;
-  onClick: () => void;
-}
-
-export interface ContextMenuProps {
-  visible: boolean;
-  position: { x: number; y: number };
-  actions: ContextMenuAction[];
-  onClose: () => void;
-  title?: string;
-}
-
-// Draggable window interfaces
-export interface DraggableWindowProps {
-  children: ReactNode;
-  initialPosition?: { x: number; y: number };
-  dragHandle?: ReactNode;
-  onPositionChange?: (position: { x: number; y: number }) => void;
-  className?: string;
-  style?: CSSProperties;
-  enabled?: boolean;
-}
-
-// Curve component interfaces
-export interface CurvePaneProps {
-  curve: Curve;
-  xLabel: string;
-  xRange?: [number, number];
-  yLabel: string;
-  yMin: number;
-  yMax: number;
-  onCommit: () => void;
-  onCancel: () => void;
-}
-
-export interface CurvePreviewProps {
-  curve: Curve;
-  width?: number;
-  height?: number;
-  xRange?: [number, number];
-  yMin?: number;
-  yMax?: number;
-}
-
-// Hint system interfaces
-export interface HintContextType {
-  hint: string | null;
-  setHint: (hint: string | null) => void;
-}
-
-export interface HintProviderProps {
-  children: ReactNode;
-}
-
-// Field component interfaces
-export interface FieldTextProps {
-  label: string;
-  hint?: string;
-  placeholder?: string;
-  value: string;
-  onChange: (value: string) => void;
-}
-
-export interface FieldTextareaProps {
-  label: string;
-  hint?: string;
-  placeholder?: string;
-  value: string;
-  onChange: (value: string) => void;
-}
-
-export interface SwitchOption {
-  label: string;
-  value: unknown;
-}
-
-export interface FieldSwitchProps {
-  label: string;
-  hint?: string;
-  options: SwitchOption[];
-  value: unknown;
-  onChange: (value: unknown) => void;
-}
-
-export interface FieldToggleProps {
-  label: string;
-  hint?: string;
-  trueLabel?: string;
-  falseLabel?: string;
-  value: boolean;
-  onChange: (value: boolean) => void;
-}
-
-export interface FieldRangeProps {
-  label: string;
-  hint?: string;
-  min?: number;
-  max?: number;
-  step?: number;
-  instant?: boolean;
-  value: number;
-  onChange: (value: number) => void;
-}
-
-export interface FieldFileProps {
-  world: World;
-  label: string;
-  hint?: string;
-  kind: keyof typeof _fileKinds;
-  value: unknown;
-  onChange: (value: unknown) => void;
-}
-
-export interface FieldNumberProps {
-  label: string;
-  hint?: string;
-  dp?: number;
-  min?: number;
-  max?: number;
-  step?: number;
-  bigStep?: number;
-  value: number;
-  onChange: (value: number) => void;
-}
-
-export interface FieldVec3Props {
-  label: string;
-  hint?: string;
-  dp?: number;
-  min?: number;
-  max?: number;
-  step?: number;
-  bigStep?: number;
-  value: number[];
-  onChange: (value: number[]) => void;
-}
-
-export interface FieldCurveProps {
-  label: string;
-  hint?: string;
-  x: string;
-  xRange?: number;
-  y: string;
-  yMin: number;
-  yMax: number;
-  value: string;
-  onChange: (value: string) => void;
-}
-
-export interface FieldBtnProps {
-  label: string;
-  note?: string;
-  hint?: string;
-  nav?: boolean;
-  onClick: () => void;
-}
-
-// FileKinds placeholder - this should be imported from the actual definition
-declare const _fileKinds: Record<string, unknown>;
-
-/**
- * Base window component props
- */
-export interface WindowProps {
-  world: World;
-  visible: boolean;
-  onClose: () => void;
-}
-
-/**
- * Window with entity ID prop
- */
-export interface EntityWindowProps extends WindowProps {
-  entityId?: string;
-}
-
-/**
- * Bank window specific props
- */
-export interface BankWindowProps extends EntityWindowProps {
-  bankId?: string;
-}
-
-/**
- * Store window specific props
- */
-export interface StoreWindowProps extends EntityWindowProps {
-  storeId?: string;
-}
-
-/**
- * Input component base props
- */
-export interface InputBaseProps {
-  label?: string;
-  disabled?: boolean;
-}
-
-/**
- * Text input props
- */
-export interface InputTextProps extends InputBaseProps {
-  value: string;
-  onChange: (value: string) => void;
-  placeholder?: string;
-}
-
-/**
- * Textarea input props
- */
-export interface InputTextareaProps extends InputTextProps {
-  rows?: number;
-}
-
-/**
- * Number input props
- */
-export interface InputNumberProps extends InputBaseProps {
-  value: number;
-  onChange: (value: number) => void;
-  min?: number;
-  max?: number;
-  step?: number;
-}
-
-/**
- * Range input props
- */
-export interface InputRangeProps extends InputNumberProps {
-  // Same as InputNumberProps
-}
-
-/**
- * Switch/toggle input props
- */
-export interface InputSwitchProps extends InputBaseProps {
-  value: boolean;
-  onChange: (value: boolean) => void;
-}
-
-/**
- * Dropdown input props
- */
-export interface InputDropdownProps extends InputBaseProps {
-  value: string;
-  onChange: (value: string) => void;
-  options: { value: string; label: string }[];
-}
-
-/**
- * File input props
- */
-export interface InputFileProps extends InputBaseProps {
-  value: File | null;
-  onChange: (file: File | null) => void;
-  accept?: string;
-  placeholder?: string;
-}
-
-/**
- * Menu context interface
- */
-export interface MenuContextType {
-  setHint: (hint: string | null) => void;
-}
-
-/**
- * Context menu state
- */
-export interface ContextMenuState {
-  visible: boolean;
-  position: { x: number; y: number };
-  target: unknown;
-}
-
-// ItemContextMenu moved to core.ts (more complete definition with actions, itemId, slot, etc.)
-
-/**
- * Entity pip for minimap/radar display
- */
-export interface EntityPip {
-  id: string;
-  type: "player" | "enemy" | "building" | "item" | "resource";
-  position: THREE.Vector3;
-  color: string;
-}
-
-/**
- * Minimap component props
- */
-export interface MinimapProps {
-  world: World;
-  width?: number;
-  height?: number;
-  zoom?: number;
-  className?: string;
-  style?: React.CSSProperties;
-  onCompassClick?: () => void;
-}
-
-/**
- * Hierarchy node for tree display
- */
-export interface HierarchyNode {
-  id?: string;
-  name?: string;
-  constructor?: { name: string };
-  children?: HierarchyNode[];
-  position?:
-    | { x: number; y: number; z: number }
-    | { getHexString?: () => string };
-  rotation?: { x: number; y: number; z: number };
-  scale?: { x: number; y: number; z: number };
-  material?: {
-    type?: string;
-    color?: {
-      getHexString?: () => string;
-    };
-  };
-  geometry?: {
-    type?: string;
-  };
-}
-
-/**
- * Parse result for safe math parsing
- */
-export interface ParseResult {
-  success: boolean;
-  value: number;
-  error?: string;
-}
-
-/**
- * Pane information for UI panels
- */
-export interface PaneInfo {
-  v: number;
-  count: number;
-  configs: Record<string, unknown>;
-}
diff --git a/packages/shared/src/utils/ExternalAssetUtils.ts b/packages/shared/src/utils/ExternalAssetUtils.ts
index d5d5eaea7..fd02c4f48 100644
--- a/packages/shared/src/utils/ExternalAssetUtils.ts
+++ b/packages/shared/src/utils/ExternalAssetUtils.ts
@@ -10,6 +10,332 @@ import type {
   GatheringToolData,
 } from "../data/DataManager";
 
+const OAK_TREE_VARIANTS = [
+  "asset://models/trees/oak/oak_01.glb",
+  "asset://models/trees/oak/oak_02.glb",
+] as const;
+
+const DEAD_TREE_VARIANTS = [
+  "asset://models/trees/dead/dead_01.glb",
+  "asset://models/trees/dead/dead_02.glb",
+  "asset://models/trees/dead/dead_03.glb",
+  "asset://models/trees/dead/dead_04.glb",
+] as const;
+
+const PINE_TREE_VARIANTS = [
+  "asset://models/trees/pine/pine_01.glb",
+  "asset://models/trees/pine/pine_02.glb",
+  "asset://models/trees/pine/pine_03.glb",
+  "asset://models/trees/pine/pine_04.glb",
+  "asset://models/trees/pine/pine_05.glb",
+] as const;
+
+const MAPLE_TREE_VARIANTS = [
+  "asset://models/trees/maple/maple_01.glb",
+  "asset://models/trees/maple/maple_02.glb",
+  "asset://models/trees/maple/maple_03.glb",
+  "asset://models/trees/maple/maple_04.glb",
+] as const;
+
+const RESOURCE_ID_ALIASES: Record<string, string> = {
+  // Legacy/default terrain subtype ids that are still present in staging
+  // world data or emitted by older terrain generators. Map them onto
+  // stable fallback-backed resource ids so both the stream client and the
+  // staging server can survive partial manifest loads.
+  tree_normal: "tree_general",
+  tree_cactus: "tree_general",
+  tree_coconut: "tree_general",
+  tree_birch: "tree_maple",
+  tree_windPine: "tree_pine",
+  tree_chinaPine: "tree_pine",
+  tree_fir: "tree_pine",
+  tree_knotwood: "tree_dead",
+};
+
+const RESOURCE_FALLBACKS: Record<string, ExternalResourceData> = {
+  tree_dead: {
+    id: "tree_dead",
+    name: "Dead Tree",
+    type: "tree",
+    examine: "A dead tree with brittle, weathered branches.",
+    modelPath: null,
+    modelVariants: [...DEAD_TREE_VARIANTS],
+    depletedModelPath:
+      "asset://models/trees/wood-tree-stump/wood-tree-stump.glb",
+    scale: 1,
+    depletedScale: 0.1,
+    harvestSkill: "woodcutting",
+    toolRequired: "bronze_hatchet",
+    levelRequired: 1,
+    baseCycleTicks: 4,
+    depleteChance: 0.125,
+    respawnTicks: 80,
+    harvestYield: [
+      {
+        itemId: "logs",
+        itemName: "Logs",
+        quantity: 1,
+        chance: 1,
+        xpAmount: 25,
+        stackable: true,
+      },
+    ],
+  },
+  tree_pine: {
+    id: "tree_pine",
+    name: "Pine Tree",
+    type: "tree",
+    examine: "A tall pine tree with dense evergreen needles.",
+    modelPath: null,
+    modelVariants: [...PINE_TREE_VARIANTS],
+    depletedModelPath:
+      "asset://models/trees/wood-tree-stump/wood-tree-stump.glb",
+    scale: 1,
+    depletedScale: 0.1,
+    harvestSkill: "woodcutting",
+    toolRequired: "bronze_hatchet",
+    levelRequired: 1,
+    baseCycleTicks: 4,
+    depleteChance: 0.125,
+    respawnTicks: 80,
+    harvestYield: [
+      {
+        itemId: "logs",
+        itemName: "Logs",
+        quantity: 1,
+        chance: 1,
+        xpAmount: 25,
+        stackable: true,
+      },
+    ],
+  },
+  tree_maple: {
+    id: "tree_maple",
+    name: "Maple Tree",
+    type: "tree",
+    examine: "A broad maple tree with a thick trunk.",
+    modelPath: null,
+    modelVariants: [...MAPLE_TREE_VARIANTS],
+    depletedModelPath:
+      "asset://models/trees/wood-tree-stump/wood-tree-stump.glb",
+    scale: 1,
+    depletedScale: 0.1,
+    harvestSkill: "woodcutting",
+    toolRequired: "bronze_hatchet",
+    levelRequired: 1,
+    baseCycleTicks: 4,
+    depleteChance: 0.125,
+    respawnTicks: 80,
+    harvestYield: [
+      {
+        itemId: "logs",
+        itemName: "Logs",
+        quantity: 1,
+        chance: 1,
+        xpAmount: 25,
+        stackable: true,
+      },
+    ],
+  },
+  tree_banana: {
+    id: "tree_banana",
+    name: "Banana Tree",
+    type: "tree",
+    examine: "A tropical banana tree with large, broad leaves.",
+    modelPath: null,
+    modelVariants: [
+      "asset://models/trees/banana/banana_01.glb",
+      "asset://models/trees/banana/banana_02.glb",
+      "asset://models/trees/banana/banana_03.glb",
+      "asset://models/trees/banana/banana_04.glb",
+      "asset://models/trees/banana/banana_05.glb",
+    ],
+    depletedModelPath:
+      "asset://models/trees/wood-tree-stump/wood-tree-stump.glb",
+    scale: 1,
+    depletedScale: 0.1,
+    harvestSkill: "woodcutting",
+    toolRequired: "bronze_hatchet",
+    levelRequired: 1,
+    baseCycleTicks: 4,
+    depleteChance: 0.125,
+    respawnTicks: 80,
+    harvestYield: [
+      {
+        itemId: "logs",
+        itemName: "Logs",
+        quantity: 1,
+        chance: 1,
+        xpAmount: 25,
+        stackable: true,
+      },
+    ],
+  },
+  tree_pineDead: {
+    id: "tree_pineDead",
+    name: "Dead Pine",
+    type: "tree",
+    examine: "A weathered pine, stripped bare by harsh tundra winds.",
+    modelPath: null,
+    modelVariants: [
+      "asset://models/trees/pine_dead/pine_dead_01.glb",
+      "asset://models/trees/pine_dead/pine_dead_02.glb",
+      "asset://models/trees/pine_dead/pine_dead_03.glb",
+    ],
+    depletedModelPath:
+      "asset://models/trees/wood-tree-stump/wood-tree-stump.glb",
+    scale: 1,
+    depletedScale: 0.1,
+    harvestSkill: "woodcutting",
+    toolRequired: "bronze_hatchet",
+    levelRequired: 1,
+    baseCycleTicks: 4,
+    depleteChance: 0.125,
+    respawnTicks: 80,
+    harvestYield: [
+      {
+        itemId: "logs",
+        itemName: "Logs",
+        quantity: 1,
+        chance: 1,
+        xpAmount: 25,
+        stackable: true,
+      },
+    ],
+  },
+  tree_eucalyptus: {
+    id: "tree_eucalyptus",
+    name: "Eucalyptus Tree",
+    type: "tree",
+    examine: "A tall eucalyptus with peeling bark and long leaves.",
+    modelPath: null,
+    modelVariants: [
+      "asset://models/trees/eucalyptus/eucalyptus_01.glb",
+      "asset://models/trees/eucalyptus/eucalyptus_02.glb",
+      "asset://models/trees/eucalyptus/eucalyptus_03.glb",
+      "asset://models/trees/eucalyptus/eucalyptus_04.glb",
+      "asset://models/trees/eucalyptus/eucalyptus_05.glb",
+    ],
+    depletedModelPath:
+      "asset://models/trees/wood-tree-stump/wood-tree-stump.glb",
+    scale: 1,
+    depletedScale: 0.1,
+    harvestSkill: "woodcutting",
+    toolRequired: "bronze_hatchet",
+    levelRequired: 30,
+    baseCycleTicks: 4,
+    depleteChance: 0.125,
+    respawnTicks: 80,
+    harvestYield: [
+      {
+        itemId: "logs",
+        itemName: "Logs",
+        quantity: 1,
+        chance: 1,
+        xpAmount: 67.5,
+        stackable: true,
+      },
+    ],
+  },
+  tree_general: {
+    id: "tree_general",
+    name: "Tree",
+    type: "tree",
+    examine: "A common tree. I can chop it down with a hatchet.",
+    modelPath: null,
+    modelVariants: [
+      "asset://models/trees/general/general_01.glb",
+      "asset://models/trees/general/general_02.glb",
+      "asset://models/trees/general/general_03.glb",
+      "asset://models/trees/general/general_04.glb",
+      "asset://models/trees/general/general_05.glb",
+      "asset://models/trees/general/general_06.glb",
+    ],
+    depletedModelPath:
+      "asset://models/trees/wood-tree-stump/wood-tree-stump.glb",
+    scale: 1,
+    depletedScale: 0.1,
+    harvestSkill: "woodcutting",
+    toolRequired: "bronze_hatchet",
+    levelRequired: 1,
+    baseCycleTicks: 4,
+    depleteChance: 0.125,
+    respawnTicks: 80,
+    harvestYield: [
+      {
+        itemId: "logs",
+        itemName: "Logs",
+        quantity: 1,
+        chance: 1,
+        xpAmount: 25,
+        stackable: true,
+      },
+    ],
+  },
+  tree_magic: {
+    id: "tree_magic",
+    name: "Magic Tree",
+    type: "tree",
+    examine: "A tree infused with magical energy.",
+    modelPath: null,
+    modelVariants: [
+      "asset://models/trees/magic/magic_01.glb",
+      "asset://models/trees/magic/magic_02.glb",
+    ],
+    depletedModelPath:
+      "asset://models/trees/wood-tree-stump/wood-tree-stump.glb",
+    scale: 1,
+    depletedScale: 0.1,
+    harvestSkill: "woodcutting",
+    toolRequired: "bronze_hatchet",
+    levelRequired: 60,
+    baseCycleTicks: 4,
+    depleteChance: 0.125,
+    respawnTicks: 80,
+    harvestYield: [
+      {
+        itemId: "magic_logs",
+        itemName: "Magic Logs",
+        quantity: 1,
+        chance: 1,
+        xpAmount: 250,
+        stackable: true,
+      },
+    ],
+  },
+  tree_mahogany: {
+    id: "tree_mahogany",
+    name: "Mahogany Tree",
+    type: "tree",
+    examine: "A mahogany tree with rich, reddish-brown timber.",
+    modelPath: null,
+    modelVariants: [
+      "asset://models/trees/mahogany/mahogany_01.glb",
+      "asset://models/trees/mahogany/mahogany_02.glb",
+    ],
+    depletedModelPath:
+      "asset://models/trees/wood-tree-stump/wood-tree-stump.glb",
+    scale: 1,
+    depletedScale: 0.1,
+    harvestSkill: "woodcutting",
+    toolRequired: "bronze_hatchet",
+    levelRequired: 50,
+    baseCycleTicks: 4,
+    depleteChance: 0.125,
+    respawnTicks: 80,
+    harvestYield: [
+      {
+        itemId: "mahogany_logs",
+        itemName: "Mahogany Logs",
+        quantity: 1,
+        chance: 1,
+        xpAmount: 125,
+        stackable: true,
+      },
+    ],
+  },
+};
+
 interface ExternalBuilding {
   id: string;
   name: string;
@@ -48,10 +374,13 @@ export function getExternalNPC(id: string): NPCData | null {
  * Get all external resources loaded from manifests
  */
 export function getExternalResources(): Map<string, ExternalResourceData> {
-  const resources = (
-    globalThis as { EXTERNAL_RESOURCES?: Map<string, ExternalResourceData> }
-  ).EXTERNAL_RESOURCES;
-  return resources || new Map();
+  const resourceRoot = globalThis as {
+    EXTERNAL_RESOURCES?: Map<string, ExternalResourceData>;
+  };
+  if (!resourceRoot.EXTERNAL_RESOURCES) {
+    resourceRoot.EXTERNAL_RESOURCES = new Map();
+  }
+  return resourceRoot.EXTERNAL_RESOURCES;
 }
 
 /**
@@ -59,7 +388,26 @@ export function getExternalResources(): Map<string, ExternalResourceData> {
  */
 export function getExternalResource(id: string): ExternalResourceData | null {
   const resources = getExternalResources();
-  return resources.get(id) || null;
+  const existing = resources.get(id);
+  if (existing) {
+    return existing;
+  }
+
+  const canonicalId = RESOURCE_ID_ALIASES[id] ?? id;
+  if (canonicalId !== id) {
+    const aliased = resources.get(canonicalId) ?? RESOURCE_FALLBACKS[canonicalId];
+    if (aliased) {
+      resources.set(id, aliased);
+      return aliased;
+    }
+  }
+
+  const fallback = RESOURCE_FALLBACKS[canonicalId];
+  if (!fallback) {
+    return null;
+  }
+  resources.set(id, fallback);
+  return fallback;
 }
 
 /**
diff --git a/packages/shared/src/utils/__tests__/ExternalAssetUtils.test.ts b/packages/shared/src/utils/__tests__/ExternalAssetUtils.test.ts
new file mode 100644
index 000000000..a78e0630e
--- /dev/null
+++ b/packages/shared/src/utils/__tests__/ExternalAssetUtils.test.ts
@@ -0,0 +1,227 @@
+import { beforeEach, describe, expect, it } from "vitest";
+import type { ExternalResourceData } from "../../data/DataManager";
+import {
+  getExternalResource,
+  getExternalResources,
+} from "../ExternalAssetUtils";
+
+describe("ExternalAssetUtils", () => {
+  beforeEach(() => {
+    delete (
+      globalThis as {
+        EXTERNAL_RESOURCES?: Map<string, ExternalResourceData>;
+      }
+    ).EXTERNAL_RESOURCES;
+  });
+
+  it("hydrates missing staging tree resources from fallback data", () => {
+    const resource = getExternalResource("tree_general");
+    expect(resource).not.toBeNull();
+    expect(resource?.id).toBe("tree_general");
+    expect(resource?.modelVariants?.length).toBeGreaterThan(0);
+    expect(getExternalResources().has("tree_general")).toBe(true);
+  });
+
+  it("points fallback staging tree resources at nested tree asset URIs", () => {
+    const resourceIds = [
+      "tree_banana",
+      "tree_pineDead",
+      "tree_eucalyptus",
+      "tree_general",
+      "tree_magic",
+      "tree_mahogany",
+    ];
+
+    for (const resourceId of resourceIds) {
+      const resource = getExternalResource(resourceId);
+      expect(resource).not.toBeNull();
+      for (const modelVariant of resource?.modelVariants ?? []) {
+        expect(modelVariant).toMatch(
+          /^asset:\/\/models\/trees\/[^/]+\/[^/]+\.glb$/,
+        );
+      }
+      expect(resource?.depletedModelPath).toBe(
+        "asset://models/trees/wood-tree-stump/wood-tree-stump.glb",
+      );
+    }
+  });
+
+  it("prefers already-loaded manifest resources over fallback data", () => {
+    const resources = getExternalResources();
+    resources.set("tree_general", {
+      id: "tree_general",
+      name: "Loaded Tree",
+      type: "tree",
+      modelPath: null,
+      depletedModelPath: null,
+      scale: 2,
+      depletedScale: 1,
+      harvestSkill: "woodcutting",
+      toolRequired: "bronze_hatchet",
+      levelRequired: 1,
+      baseCycleTicks: 4,
+      depleteChance: 0.5,
+      respawnTicks: 10,
+      harvestYield: [
+        {
+          itemId: "logs",
+          itemName: "Logs",
+          quantity: 1,
+          chance: 1,
+          xpAmount: 1,
+          stackable: true,
+        },
+      ],
+    });
+
+    const resource = getExternalResource("tree_general");
+    expect(resource?.name).toBe("Loaded Tree");
+    expect(resource?.scale).toBe(2);
+  });
+
+  it("aliases legacy terrain tree ids onto supported manifest resources", () => {
+    const resources = getExternalResources();
+    resources.set("tree_general", {
+      id: "tree_general",
+      name: "Loaded General",
+      type: "tree",
+      modelPath: null,
+      depletedModelPath: null,
+      scale: 2,
+      depletedScale: 1,
+      harvestSkill: "woodcutting",
+      toolRequired: "bronze_hatchet",
+      levelRequired: 1,
+      baseCycleTicks: 4,
+      depleteChance: 0.5,
+      respawnTicks: 10,
+      harvestYield: [
+        {
+          itemId: "logs",
+          itemName: "Logs",
+          quantity: 1,
+          chance: 1,
+          xpAmount: 1,
+          stackable: true,
+        },
+      ],
+    });
+    resources.set("tree_pine", {
+      id: "tree_pine",
+      name: "Loaded Pine",
+      type: "tree",
+      modelPath: null,
+      depletedModelPath: null,
+      scale: 3,
+      depletedScale: 1,
+      harvestSkill: "woodcutting",
+      toolRequired: "bronze_hatchet",
+      levelRequired: 1,
+      baseCycleTicks: 4,
+      depleteChance: 0.5,
+      respawnTicks: 10,
+      harvestYield: [
+        {
+          itemId: "logs",
+          itemName: "Logs",
+          quantity: 1,
+          chance: 1,
+          xpAmount: 1,
+          stackable: true,
+        },
+      ],
+    });
+    resources.set("tree_maple", {
+      id: "tree_maple",
+      name: "Loaded Maple",
+      type: "tree",
+      modelPath: null,
+      depletedModelPath: null,
+      scale: 4,
+      depletedScale: 1,
+      harvestSkill: "woodcutting",
+      toolRequired: "bronze_hatchet",
+      levelRequired: 1,
+      baseCycleTicks: 4,
+      depleteChance: 0.5,
+      respawnTicks: 10,
+      harvestYield: [
+        {
+          itemId: "logs",
+          itemName: "Logs",
+          quantity: 1,
+          chance: 1,
+          xpAmount: 1,
+          stackable: true,
+        },
+      ],
+    });
+    resources.set("tree_dead", {
+      id: "tree_dead",
+      name: "Loaded Dead",
+      type: "tree",
+      modelPath: null,
+      depletedModelPath: null,
+      scale: 5,
+      depletedScale: 1,
+      harvestSkill: "woodcutting",
+      toolRequired: "bronze_hatchet",
+      levelRequired: 1,
+      baseCycleTicks: 4,
+      depleteChance: 0.5,
+      respawnTicks: 10,
+      harvestYield: [
+        {
+          itemId: "logs",
+          itemName: "Logs",
+          quantity: 1,
+          chance: 1,
+          xpAmount: 1,
+          stackable: true,
+        },
+      ],
+    });
+
+    const cactus = getExternalResource("tree_cactus");
+    const coconut = getExternalResource("tree_coconut");
+    const birch = getExternalResource("tree_birch");
+    const windPine = getExternalResource("tree_windPine");
+    const chinaPine = getExternalResource("tree_chinaPine");
+    const fir = getExternalResource("tree_fir");
+    const knotwood = getExternalResource("tree_knotwood");
+    const normal = getExternalResource("tree_normal");
+
+    expect(cactus).not.toBeNull();
+    expect(cactus?.id).toBe("tree_general");
+    expect(coconut).not.toBeNull();
+    expect(coconut?.id).toBe("tree_general");
+    expect(birch).not.toBeNull();
+    expect(birch?.id).toBe("tree_maple");
+    expect(windPine).not.toBeNull();
+    expect(windPine?.id).toBe("tree_pine");
+    expect(chinaPine).not.toBeNull();
+    expect(chinaPine?.id).toBe("tree_pine");
+    expect(fir).not.toBeNull();
+    expect(fir?.id).toBe("tree_pine");
+    expect(knotwood).not.toBeNull();
+    expect(knotwood?.id).toBe("tree_dead");
+    expect(normal).not.toBeNull();
+    expect(normal?.id).toBe("tree_general");
+    expect(getExternalResources().get("tree_cactus")?.id).toBe(
+      "tree_general",
+    );
+    expect(getExternalResources().get("tree_coconut")?.id).toBe(
+      "tree_general",
+    );
+    expect(getExternalResources().get("tree_birch")?.id).toBe("tree_maple");
+    expect(getExternalResources().get("tree_windPine")?.id).toBe("tree_pine");
+    expect(getExternalResources().get("tree_chinaPine")?.id).toBe(
+      "tree_pine",
+    );
+    expect(getExternalResources().get("tree_fir")?.id).toBe("tree_pine");
+    expect(getExternalResources().get("tree_knotwood")?.id).toBe("tree_dead");
+    expect(getExternalResources().get("tree_normal")?.id).toBe(
+      "tree_general",
+    );
+  });
+});
diff --git a/packages/shared/src/utils/__tests__/clientAssetBase.test.ts b/packages/shared/src/utils/__tests__/clientAssetBase.test.ts
new file mode 100644
index 000000000..e4a4bc574
--- /dev/null
+++ b/packages/shared/src/utils/__tests__/clientAssetBase.test.ts
@@ -0,0 +1,68 @@
+// @vitest-environment jsdom
+
+import { afterEach, describe, expect, it } from "vitest";
+import {
+  getRuntimeClientAssetBase,
+  resolveClientAssetBase,
+} from "../clientAssetBase";
+
+type TestWindow = Window & {
+  env?: Record<string, string>;
+  __CDN_URL?: string;
+  __ASSETS_URL?: string;
+};
+
+describe("clientAssetBase", () => {
+  afterEach(() => {
+    if (typeof window !== "undefined") {
+      delete (window as TestWindow).env;
+      delete (window as TestWindow).__CDN_URL;
+      delete (window as TestWindow).__ASSETS_URL;
+    }
+  });
+
+  it("maps problematic sslip snapshot asset hosts to the runtime CDN", () => {
+    (window as TestWindow).env = {
+      PUBLIC_CDN_URL:
+        "https://hyperscapes-staging-production.up.railway.app/game-assets",
+      PUBLIC_API_URL: "https://hyperscapes-staging-production.up.railway.app",
+    };
+
+    expect(
+      resolveClientAssetBase(
+        "https://46.4.80.150.sslip.io/game-assets",
+        "https://46.4.80.150.sslip.io",
+        "https://enoomian-staging.hyperscape-enoomian-staging.pages.dev/stream",
+        { preferRuntimeAssetBase: true },
+      ),
+    ).toBe("https://hyperscapes-staging-production.up.railway.app/game-assets");
+  });
+
+  it("prefers runtime env asset bases over stale window overrides", () => {
+    (window as TestWindow).env = {
+      PUBLIC_CDN_URL:
+        "https://hyperscapes-staging-production.up.railway.app/game-assets",
+    };
+    (window as TestWindow).__ASSETS_URL =
+      "https://46.4.80.150.sslip.io/game-assets";
+
+    expect(
+      getRuntimeClientAssetBase("https://46.4.80.150.sslip.io/game-assets"),
+    ).toBe("https://hyperscapes-staging-production.up.railway.app/game-assets");
+  });
+
+  it("preserves the server asset base for generic clients when runtime override is not requested", () => {
+    (window as TestWindow).env = {
+      PUBLIC_CDN_URL:
+        "https://hyperscapes-staging-production.up.railway.app/game-assets",
+    };
+
+    expect(
+      resolveClientAssetBase(
+        "https://cdn.example.com/game-assets",
+        "https://api.example.com",
+        "https://example.com/play",
+      ),
+    ).toBe("https://cdn.example.com/game-assets");
+  });
+});
diff --git a/packages/shared/src/utils/clientAssetBase.ts b/packages/shared/src/utils/clientAssetBase.ts
new file mode 100644
index 000000000..64814e641
--- /dev/null
+++ b/packages/shared/src/utils/clientAssetBase.ts
@@ -0,0 +1,155 @@
+type RuntimeAssetEnv = {
+  PUBLIC_API_URL?: string;
+  PUBLIC_CDN_URL?: string;
+  PUBLIC_ASSETS_URL?: string;
+};
+
+type BrowserAssetWindow = Window & {
+  __CDN_URL?: string;
+  __ASSETS_URL?: string;
+};
+
+type ResolveClientAssetBaseOptions = {
+  preferRuntimeAssetBase?: boolean;
+};
+
+function normalizeBaseUrl(value: string): string {
+  return value.endsWith("/") ? value.slice(0, -1) : value;
+}
+
+function isProblematicAssetHost(hostname: string): boolean {
+  return (
+    hostname === "localhost" ||
+    hostname === "127.0.0.1" ||
+    hostname === "0.0.0.0" ||
+    hostname === "::1" ||
+    hostname.endsWith(".sslip.io")
+  );
+}
+
+function getRuntimeAssetEnv(): RuntimeAssetEnv | undefined {
+  return (globalThis as { env?: RuntimeAssetEnv }).env;
+}
+
+function getRuntimeAssetBase(): string | undefined {
+  const runtimeEnv = getRuntimeAssetEnv();
+  const candidate = runtimeEnv?.PUBLIC_ASSETS_URL ?? runtimeEnv?.PUBLIC_CDN_URL;
+  if (!candidate || candidate === "undefined") return undefined;
+  return candidate;
+}
+
+function resolveRuntimeAssetBase(pageUrl: string): string | null {
+  const runtimeAssetBase = getRuntimeAssetBase();
+  if (!runtimeAssetBase) return null;
+
+  try {
+    const page = new URL(pageUrl);
+    return normalizeBaseUrl(new URL(runtimeAssetBase, page).toString());
+  } catch {
+    return normalizeBaseUrl(runtimeAssetBase);
+  }
+}
+
+function getRuntimeApiBase(): string | undefined {
+  const runtimeEnv = getRuntimeAssetEnv();
+  const candidate = runtimeEnv?.PUBLIC_API_URL;
+  if (!candidate || candidate === "undefined") return undefined;
+  return candidate;
+}
+
+export function resolveClientAssetBase(
+  assetBaseUrl: string | undefined,
+  apiBaseUrl: string | undefined,
+  pageUrl: string,
+  options: ResolveClientAssetBaseOptions = {},
+): string | null {
+  const runtimeAssetBase = resolveRuntimeAssetBase(pageUrl);
+  if (options.preferRuntimeAssetBase && runtimeAssetBase) {
+    return runtimeAssetBase;
+  }
+  if (!assetBaseUrl) return runtimeAssetBase;
+
+  try {
+    const page = new URL(pageUrl);
+    const asset = new URL(assetBaseUrl, page);
+
+    if (
+      asset.origin !== page.origin &&
+      isProblematicAssetHost(asset.hostname) &&
+      runtimeAssetBase
+    ) {
+      return normalizeBaseUrl(new URL(runtimeAssetBase, page).toString());
+    }
+
+    if (
+      asset.origin !== page.origin &&
+      isProblematicAssetHost(asset.hostname) &&
+      (getRuntimeApiBase() || apiBaseUrl)
+    ) {
+      const api = new URL(getRuntimeApiBase() || apiBaseUrl!, page);
+      return normalizeBaseUrl(new URL("/game-assets", api.origin).toString());
+    }
+
+    if (
+      options.preferRuntimeAssetBase &&
+      runtimeAssetBase &&
+      asset.origin !== page.origin &&
+      normalizeBaseUrl(asset.toString()) !== runtimeAssetBase
+    ) {
+      return runtimeAssetBase;
+    }
+
+    return normalizeBaseUrl(asset.toString());
+  } catch {
+    return runtimeAssetBase ?? normalizeBaseUrl(assetBaseUrl);
+  }
+}
+
+export function getRuntimeClientAssetBase(buildPublicCdnUrl?: string): string {
+  if (typeof window !== "undefined") {
+    const runtimeAssetBase = resolveRuntimeAssetBase(window.location.href);
+    if (runtimeAssetBase) {
+      return runtimeAssetBase;
+    }
+
+    let assetBase =
+      buildPublicCdnUrl ||
+      (typeof process !== "undefined" ? process.env.PUBLIC_CDN_URL : undefined) ||
+      "http://localhost:5555/game-assets";
+    const windowWithCdn = window as BrowserAssetWindow;
+    if (windowWithCdn.__ASSETS_URL) {
+      assetBase = windowWithCdn.__ASSETS_URL;
+    } else if (windowWithCdn.__CDN_URL) {
+      assetBase = windowWithCdn.__CDN_URL;
+    } else if (
+      typeof import.meta !== "undefined" &&
+      import.meta.env?.PUBLIC_CDN_URL
+    ) {
+      assetBase =
+        import.meta.env.PUBLIC_CDN_URL || "http://localhost:5555/game-assets";
+    }
+
+    const resolved =
+      resolveClientAssetBase(
+        assetBase,
+        getRuntimeApiBase(),
+        window.location.href,
+        { preferRuntimeAssetBase: false },
+      ) || assetBase;
+    return resolved;
+  }
+
+  let assetBase =
+    buildPublicCdnUrl ||
+    (typeof process !== "undefined" ? process.env.PUBLIC_CDN_URL : undefined) ||
+    "http://localhost:5555/game-assets";
+  if (
+    typeof process !== "undefined" &&
+    process.env.PUBLIC_CDN_URL &&
+    !assetBase.includes("localhost")
+  ) {
+    assetBase = process.env.PUBLIC_CDN_URL;
+  }
+
+  return assetBase;
+}
diff --git a/packages/shared/src/utils/compute/NetworkingComputeContext.ts b/packages/shared/src/utils/compute/NetworkingComputeContext.ts
index 1e2f84cf0..1cebf0a6e 100644
--- a/packages/shared/src/utils/compute/NetworkingComputeContext.ts
+++ b/packages/shared/src/utils/compute/NetworkingComputeContext.ts
@@ -15,11 +15,14 @@ import {
   BATCH_AGGRO_CHECK_SHADER,
   NEAREST_ENTITY_SHADER,
   PHYSICS_BROADPHASE_SHADER,
+  BROADPHASE_WORKGROUP_SIZE_X,
   SOUND_OCCLUSION_SHADER,
   SPAWN_VALIDATION_SHADER,
   LOOT_DISTRIBUTION_SHADER,
 } from "./shaders/networking.wgsl";
 
+export const MAX_INTEREST_MANAGEMENT_ENTITIES = 65_535;
+
 // ============================================================================
 // TYPES
 // ============================================================================
@@ -339,6 +342,11 @@ export class NetworkingComputeContext {
     const entityCount = entities.length;
     const playerCount = players.length;
     const u32PerEntity = Math.ceil(playerCount / 32);
+    if (entityCount > MAX_INTEREST_MANAGEMENT_ENTITIES) {
+      throw new Error(
+        `Interest management supports at most ${MAX_INTEREST_MANAGEMENT_ENTITIES} entities per dispatch; received ${entityCount}`,
+      );
+    }
 
     // Pack entity data (4 floats per entity)
     const entityData = new Float32Array(entityCount * 4);
@@ -737,9 +745,32 @@ export class NetworkingComputeContext {
       "bp_count",
       new Uint32Array([0]),
     );
+    // Dispatch shape: one GPU thread per pair, workgroup size 64.
+    // The pair count is O(N²), so for aabbCount ≳ 5793 the 1D dispatch
+    // exceeds WebGPU's per-dimension ceiling of 65535 workgroups. We
+    // reshape to a 2D dispatch (x × y × 1) in that case and pass
+    // numWorkgroupsX in the uniform buffer so the shader can
+    // reconstruct the linear thread index via
+    //   threadIdx = global_id.y * (numWorkgroupsX * WORKGROUP_SIZE_1D)
+    //             + global_id.x
+    // For the 1D case we still pass numWorkgroupsX = totalWorkgroups,
+    // y=1, and the shader arithmetic degenerates correctly. Workgroup
+    // size is imported from the shader module so the host-side divisor
+    // can't drift from @workgroup_size.
+    const totalPairs = (aabbCount * (aabbCount - 1)) / 2;
+    const totalWorkgroups = Math.ceil(totalPairs / BROADPHASE_WORKGROUP_SIZE_X);
+    const WEBGPU_MAX_WORKGROUPS_PER_DIM = 65535;
+    const dispatchX = Math.min(totalWorkgroups, WEBGPU_MAX_WORKGROUPS_PER_DIM);
+    const dispatchY = Math.ceil(totalWorkgroups / dispatchX);
+    if (dispatchY > WEBGPU_MAX_WORKGROUPS_PER_DIM) {
+      throw new Error(
+        `Broadphase dispatch exceeds WebGPU 2D workgroup limits: totalWorkgroups=${totalWorkgroups}, dispatch=${dispatchX}x${dispatchY}`,
+      );
+    }
+
     const uniformBuffer = this.ctx.createUniformBuffer(
       "bp_uniforms",
-      new Uint32Array([aabbCount, layerMask, maxOverlaps, 0]),
+      new Uint32Array([aabbCount, layerMask, maxOverlaps, dispatchX]),
     );
 
     if (!aabbBuffer || !overlapBuffer || !countBuffer || !uniformBuffer) {
@@ -758,12 +789,10 @@ export class NetworkingComputeContext {
       throw new Error("Failed to create broadphase bind group");
     }
 
-    // Dispatch - one thread per pair
-    const totalPairs = (aabbCount * (aabbCount - 1)) / 2;
     await this.ctx.dispatchAndWait({
       pipeline: this.broadphasePipeline,
       bindGroup,
-      workgroupCount: this.ctx.calculateWorkgroupCount(totalPairs, 64),
+      workgroupCount: [dispatchX, dispatchY, 1],
     });
 
     // Read back results
diff --git a/packages/shared/src/utils/compute/RuntimeComputeContext.ts b/packages/shared/src/utils/compute/RuntimeComputeContext.ts
index e6bc2f71f..e6c4f3674 100644
--- a/packages/shared/src/utils/compute/RuntimeComputeContext.ts
+++ b/packages/shared/src/utils/compute/RuntimeComputeContext.ts
@@ -677,7 +677,28 @@ export class RuntimeComputeContext {
     elementCount: number,
     workgroupSize: number = 64,
   ): number {
-    return Math.ceil(elementCount / workgroupSize);
+    const count = Math.ceil(elementCount / workgroupSize);
+    // TEMPORARY CANARY INSTRUMENTATION: the 2D-reshape migration is in
+    // progress (only broadphase and road-influence done). Any call still
+    // producing > 65535 would previously return the invalid count and let
+    // WebGPU reject the dispatch with "Dispatch workgroup count X exceeds
+    // max compute workgroups per dimension", crashing the client. Log a
+    // stack-trace-tagged warning to reveal the offender, then clamp so the
+    // dispatch proceeds with degraded output instead of a hard renderer
+    // crash while the migration completes. Safe to strip and replace with
+    // a throw once all sites are reshaped to 2D dispatch.
+    if (count > 65535) {
+      const stack =
+        new Error("[compute-dispatch-over-limit]").stack ??
+        "(no stack available)";
+      // Log at error level — truncated output is incorrect, not just slow —
+      // so this shows up in any aggregator configured to alert on errors.
+      console.error(
+        `[compute] calculateWorkgroupCount=${count} (elementCount=${elementCount}, workgroupSize=${workgroupSize}) exceeds WebGPU 65535 per-dimension ceiling. Clamping to 65535; results past element ${65535 * workgroupSize} will be truncated.\n${stack}`,
+      );
+      return 65535;
+    }
+    return count;
   }
 
   /**
diff --git a/packages/shared/src/utils/compute/TerrainComputeContext.ts b/packages/shared/src/utils/compute/TerrainComputeContext.ts
index 468d2e6ad..f6c19be0d 100644
--- a/packages/shared/src/utils/compute/TerrainComputeContext.ts
+++ b/packages/shared/src/utils/compute/TerrainComputeContext.ts
@@ -13,6 +13,7 @@ import {
 import {
   ROAD_INFLUENCE_SHADER,
   ROAD_INFLUENCE_TEXTURE_SHADER,
+  ROAD_INFLUENCE_TEXTURE_WORKGROUP_SIZE_X,
   TERRAIN_VERTEX_COLOR_SHADER,
   INSTANCE_MATRIX_SHADER,
   BATCH_DISTANCE_SHADER,
@@ -289,6 +290,10 @@ export class TerrainComputeContext {
       throw new Error("TerrainComputeContext not initialized");
     }
 
+    if (!Number.isFinite(textureSize) || textureSize <= 0) {
+      return new Float32Array(0);
+    }
+
     const pixelCount = textureSize * textureSize;
     const roadCount = roads.length;
 
@@ -317,18 +322,44 @@ export class TerrainComputeContext {
       "rtex_output",
       pixelCount * 4,
     );
+    // Dispatch shape: one GPU thread per pixel at workgroup size 64.
+    // At textureSize ≥ 2048 (pixelCount ≥ 4,194,304) the 1D workgroup
+    // count exceeds WebGPU's 65535 per-dimension ceiling. Reshape to
+    // 2D (dispatchX, dispatchY, 1) in that case and pass numWorkgroupsX
+    // so the shader can reconstruct the linear pixel index via
+    //   idx = global_id.y * (numWorkgroupsX * WORKGROUP_SIZE_1D)
+    //       + global_id.x
+    // Under the 1D case (pixelCount < 4.19M) dispatchY degenerates
+    // to 1 and the math yields idx = global_id.x — identical to the
+    // previous behavior. Workgroup size is imported from the shader
+    // module so the host-side divisor can't drift from @workgroup_size.
+    const totalWorkgroups = Math.ceil(
+      pixelCount / ROAD_INFLUENCE_TEXTURE_WORKGROUP_SIZE_X,
+    );
+    const WEBGPU_MAX_WORKGROUPS_PER_DIM = 65535;
+    const dispatchX = Math.min(totalWorkgroups, WEBGPU_MAX_WORKGROUPS_PER_DIM);
+    const dispatchY = Math.ceil(totalWorkgroups / dispatchX);
+    if (dispatchY > WEBGPU_MAX_WORKGROUPS_PER_DIM) {
+      throw new Error(
+        `Road influence texture dispatch exceeds WebGPU 2D workgroup limits: totalWorkgroups=${totalWorkgroups}, dispatch=${dispatchX}x${dispatchY}`,
+      );
+    }
+
+    const roadInfluenceUniformData = new ArrayBuffer(8 * 4);
+    const roadInfluenceUniformF32 = new Float32Array(roadInfluenceUniformData);
+    const roadInfluenceUniformU32 = new Uint32Array(roadInfluenceUniformData);
+    roadInfluenceUniformU32[0] = pixelCount;
+    roadInfluenceUniformF32[1] = roadCount;
+    roadInfluenceUniformF32[2] = textureSize;
+    roadInfluenceUniformF32[3] = worldSize;
+    roadInfluenceUniformF32[4] = centerX;
+    roadInfluenceUniformF32[5] = centerZ;
+    roadInfluenceUniformF32[6] = blendWidth;
+    roadInfluenceUniformU32[7] = dispatchX;
+
     const uniformBuffer = this.ctx.createUniformBuffer(
       "rtex_uniforms",
-      new Float32Array([
-        pixelCount,
-        roadCount,
-        textureSize,
-        worldSize,
-        centerX,
-        centerZ,
-        blendWidth,
-        0, // padding
-      ]),
+      new Uint8Array(roadInfluenceUniformData),
     );
 
     if (!roadBuffer || !outputBuffer || !uniformBuffer) {
@@ -349,11 +380,10 @@ export class TerrainComputeContext {
       throw new Error("Failed to create bind group");
     }
 
-    // Dispatch
     await this.ctx.dispatchAndWait({
       pipeline: this.roadInfluenceTexturePipeline,
       bindGroup,
-      workgroupCount: this.ctx.calculateWorkgroupCount(pixelCount, 64),
+      workgroupCount: [dispatchX, dispatchY, 1],
     });
 
     // Read back results
diff --git a/packages/shared/src/utils/compute/__tests__/NetworkingComputeContext.test.ts b/packages/shared/src/utils/compute/__tests__/NetworkingComputeContext.test.ts
index 30b54e6ae..05d7b49ac 100644
--- a/packages/shared/src/utils/compute/__tests__/NetworkingComputeContext.test.ts
+++ b/packages/shared/src/utils/compute/__tests__/NetworkingComputeContext.test.ts
@@ -9,6 +9,7 @@
 import { describe, it, expect, beforeEach, afterEach } from "vitest";
 import {
   NetworkingComputeContext,
+  MAX_INTEREST_MANAGEMENT_ENTITIES,
   isNetworkingComputeAvailable,
   type GPUEntityInterest,
   type GPUPlayerPosition,
@@ -52,6 +53,10 @@ describe("NetworkingComputeContext", () => {
       );
     });
 
+    it("documents the one-workgroup-per-entity interest limit", () => {
+      expect(MAX_INTEREST_MANAGEMENT_ENTITIES).toBe(65_535);
+    });
+
     it("should export spatial range query shader", () => {
       expect(SPATIAL_RANGE_QUERY_SHADER).toBeDefined();
       expect(SPATIAL_RANGE_QUERY_SHADER).toContain("@compute");
@@ -87,6 +92,87 @@ describe("NetworkingComputeContext", () => {
       expect(PHYSICS_BROADPHASE_SHADER).toContain("aabbOverlap");
     });
 
+    it("broadphase shader carries the 2D-dispatch linear-index reconstruction and uniform field", () => {
+      // Regression guard for the 2D dispatch reshape: at aabbCount ≳ 5793
+      // the O(N²) pair dispatch exceeds WebGPU's 65535 per-dimension
+      // workgroup ceiling, so the host issues a 2D dispatch and the
+      // shader must reconstruct the linear thread index from
+      // (global_id.x, global_id.y) using `numWorkgroupsX` passed via
+      // uniforms. If this assertion fails the shader is back to the
+      // 1D form and the canary will stall at 1080p.
+      expect(PHYSICS_BROADPHASE_SHADER).toContain("numWorkgroupsX: u32");
+      // Shader multiplies by a named WGSL const bound to the host-side
+      // workgroup constant (not a raw "64u"), so host and shader cannot
+      // drift. The const value itself is still 64u, emitted from the TS
+      // template literal, so the assertion accepts either form for
+      // safety against future template tweaks.
+      expect(PHYSICS_BROADPHASE_SHADER).toMatch(
+        /uniforms\.numWorkgroupsX \* (WORKGROUP_SIZE_1D|64u)/,
+      );
+      expect(PHYSICS_BROADPHASE_SHADER).toContain(
+        "const WORKGROUP_SIZE_1D: u32 = 64u",
+      );
+      expect(PHYSICS_BROADPHASE_SHADER).toContain(
+        "global_id.y * threadsPerRow + global_id.x",
+      );
+      // `padding` was repurposed to numWorkgroupsX; make sure the old
+      // name isn't accidentally reintroduced.
+      expect(PHYSICS_BROADPHASE_SHADER).not.toContain("padding: u32");
+    });
+
+    it("broadphase 2D dispatch shape covers the pair space", () => {
+      // Host-side reshape math: totalPairs = n*(n-1)/2, workgroups =
+      // ceil(totalPairs / 64), dispatchX = min(workgroups, 65535),
+      // dispatchY = ceil(workgroups / dispatchX). Verify the resulting
+      // (x, y, 64 threads-per-workgroup) 3-tuple ALWAYS covers every
+      // pair for a range of aabbCounts spanning under, at, and well
+      // above the dispatch-dimension ceiling.
+      const WEBGPU_MAX = 65535;
+      const reshape = (aabbCount: number) => {
+        const totalPairs = (aabbCount * (aabbCount - 1)) / 2;
+        const workgroups = Math.ceil(totalPairs / 64);
+        const dispatchX = Math.min(workgroups, WEBGPU_MAX);
+        const dispatchY = Math.ceil(workgroups / dispatchX);
+        if (dispatchY > WEBGPU_MAX) {
+          throw new Error("dispatchY exceeds WebGPU limit");
+        }
+        return { totalPairs, workgroups, dispatchX, dispatchY };
+      };
+
+      for (const aabbCount of [2, 1000, 5793, 5800, 8000, 12000, 20000]) {
+        const r = reshape(aabbCount);
+        // Dimensions within WebGPU limits.
+        expect(r.dispatchX).toBeLessThanOrEqual(WEBGPU_MAX);
+        expect(r.dispatchY).toBeLessThanOrEqual(WEBGPU_MAX);
+        // Total threads cover every pair.
+        expect(r.dispatchX * r.dispatchY * 64).toBeGreaterThanOrEqual(
+          r.totalPairs,
+        );
+      }
+    });
+
+    it("rejects impossible broadphase dispatch shapes instead of overflowing Y", () => {
+      // totalPairs = WEBGPU_MAX² * 64 + 1 forces dispatchY one over the
+      // per-dimension ceiling after the 2D reshape.
+      const WEBGPU_MAX = 65535;
+      const reshape = (aabbCount: number) => {
+        const totalPairs = (aabbCount * (aabbCount - 1)) / 2;
+        const workgroups = Math.ceil(totalPairs / 64);
+        const dispatchX = Math.min(workgroups, WEBGPU_MAX);
+        const dispatchY = Math.ceil(workgroups / dispatchX);
+        if (dispatchY > WEBGPU_MAX) {
+          throw new Error("dispatchY exceeds WebGPU limit");
+        }
+        return { dispatchX, dispatchY };
+      };
+      const impossiblePairs = WEBGPU_MAX * WEBGPU_MAX * 64 + 1;
+      const aabbCount = Math.ceil((1 + Math.sqrt(1 + 8 * impossiblePairs)) / 2);
+
+      expect(() => reshape(aabbCount)).toThrow(
+        "dispatchY exceeds WebGPU limit",
+      );
+    });
+
     it("should export sound occlusion shader", () => {
       expect(SOUND_OCCLUSION_SHADER).toBeDefined();
       expect(SOUND_OCCLUSION_SHADER).toContain("@compute");
diff --git a/packages/shared/src/utils/compute/__tests__/TerrainComputeContext.test.ts b/packages/shared/src/utils/compute/__tests__/TerrainComputeContext.test.ts
index 0a55be897..12f0bc2cf 100644
--- a/packages/shared/src/utils/compute/__tests__/TerrainComputeContext.test.ts
+++ b/packages/shared/src/utils/compute/__tests__/TerrainComputeContext.test.ts
@@ -16,6 +16,8 @@ import {
 } from "../TerrainComputeContext";
 import {
   ROAD_INFLUENCE_SHADER,
+  ROAD_INFLUENCE_TEXTURE_SHADER,
+  ROAD_INFLUENCE_TEXTURE_WORKGROUP_SIZE_X,
   TERRAIN_VERTEX_COLOR_SHADER,
   INSTANCE_MATRIX_SHADER,
   BATCH_DISTANCE_SHADER,
@@ -28,6 +30,17 @@ describe("TerrainComputeContext", () => {
       expect(ROAD_INFLUENCE_SHADER).toBeDefined();
       expect(ROAD_INFLUENCE_SHADER).toContain("@compute");
       expect(ROAD_INFLUENCE_SHADER).toContain("distanceToLineSegment");
+      expect(ROAD_INFLUENCE_TEXTURE_SHADER).toContain("pixelCount: u32");
+      expect(ROAD_INFLUENCE_TEXTURE_SHADER).toContain("numWorkgroupsX: u32");
+      // Shader multiplies by a named WGSL const bound to the host-side
+      // workgroup constant. Accept either the named form or the literal
+      // 64u in case the template substitution path changes.
+      expect(ROAD_INFLUENCE_TEXTURE_SHADER).toMatch(
+        /uniforms\.numWorkgroupsX \* (WORKGROUP_SIZE_1D|64u)/,
+      );
+      expect(ROAD_INFLUENCE_TEXTURE_SHADER).toContain(
+        "const WORKGROUP_SIZE_1D: u32 = 64u",
+      );
     });
 
     it("should export terrain vertex color shader", () => {
@@ -57,6 +70,80 @@ describe("TerrainComputeContext", () => {
     });
   });
 
+  describe("road-influence 2D dispatch reshape", () => {
+    // The host-side reshape math in TerrainComputeContext.computeRoadInfluence
+    // Texture divides pixelCount by ROAD_INFLUENCE_TEXTURE_WORKGROUP_SIZE_X
+    // and reshapes to 2D when it exceeds the WebGPU 65535 per-dimension
+    // ceiling. This is what keeps fresh 1080p+ clients from crashing with
+    // "Dispatch workgroup count exceeds max compute workgroups per
+    // dimension". Test the math here directly without requiring a GPU —
+    // the production code uses these exact formulas at line ~333 of
+    // TerrainComputeContext.ts.
+    const WORKGROUP = ROAD_INFLUENCE_TEXTURE_WORKGROUP_SIZE_X;
+    const WEBGPU_MAX = 65535;
+    const dispatch = (pixelCount: number) => {
+      const totalWorkgroups = Math.ceil(pixelCount / WORKGROUP);
+      const dispatchX = Math.min(totalWorkgroups, WEBGPU_MAX);
+      const dispatchY = Math.ceil(totalWorkgroups / dispatchX);
+      if (dispatchY > WEBGPU_MAX) {
+        throw new Error("dispatchY exceeds WebGPU limit");
+      }
+      return { totalWorkgroups, dispatchX, dispatchY };
+    };
+
+    it("stays 1D for texture sizes that fit under the ceiling", () => {
+      // 1024×1024 = 1,048,576 pixels → 16384 workgroups → well under 65535.
+      const { totalWorkgroups, dispatchX, dispatchY } = dispatch(1024 * 1024);
+      expect(totalWorkgroups).toBe(16384);
+      expect(dispatchX).toBe(16384);
+      expect(dispatchY).toBe(1);
+    });
+
+    it("reshapes to 2D exactly at the 2048×2048 boundary", () => {
+      // 2048×2048 = 4,194,304 pixels → 65536 workgroups → one over 65535.
+      // Must reshape: dispatchX=65535, dispatchY=ceil(65536/65535)=2.
+      const pixelCount = 2048 * 2048;
+      const { totalWorkgroups, dispatchX, dispatchY } = dispatch(pixelCount);
+      expect(totalWorkgroups).toBe(65536);
+      expect(dispatchX).toBe(WEBGPU_MAX);
+      expect(dispatchY).toBe(2);
+      // Verify the 2D dispatch covers every pixel: dispatchX * dispatchY *
+      // WORKGROUP threads must span all pixelCount indices.
+      expect(dispatchX * dispatchY * WORKGROUP).toBeGreaterThanOrEqual(
+        pixelCount,
+      );
+    });
+
+    it("reshapes cleanly for 4096×4096 and 8192×8192 textures", () => {
+      // 4096² = 16,777,216 → 262144 workgroups → dispatchY=5 (65535*5=327,675 ≥ 262144).
+      const pc4096 = 4096 * 4096;
+      const d4096 = dispatch(pc4096);
+      expect(d4096.totalWorkgroups).toBe(262144);
+      expect(d4096.dispatchX).toBe(WEBGPU_MAX);
+      expect(d4096.dispatchY).toBe(Math.ceil(262144 / WEBGPU_MAX));
+      expect(
+        d4096.dispatchX * d4096.dispatchY * WORKGROUP,
+      ).toBeGreaterThanOrEqual(pc4096);
+
+      // 8192² = 67,108,864 → 1,048,576 workgroups → dispatchY=16.
+      const pc8192 = 8192 * 8192;
+      const d8192 = dispatch(pc8192);
+      expect(d8192.totalWorkgroups).toBe(1_048_576);
+      expect(d8192.dispatchX).toBe(WEBGPU_MAX);
+      expect(d8192.dispatchY).toBe(Math.ceil(1_048_576 / WEBGPU_MAX));
+      expect(
+        d8192.dispatchX * d8192.dispatchY * WORKGROUP,
+      ).toBeGreaterThanOrEqual(pc8192);
+    });
+
+    it("rejects impossible 2D dispatch shapes instead of overflowing Y", () => {
+      const maxCoveredPixels = WEBGPU_MAX * WEBGPU_MAX * WORKGROUP;
+      expect(() => dispatch(maxCoveredPixels + 1)).toThrow(
+        "dispatchY exceeds WebGPU limit",
+      );
+    });
+  });
+
   describe("isTerrainComputeAvailable", () => {
     it("should return a boolean", () => {
       const result = isTerrainComputeAvailable();
diff --git a/packages/shared/src/utils/compute/shaders/networking.wgsl.ts b/packages/shared/src/utils/compute/shaders/networking.wgsl.ts
index c734b73f5..33b04fd1c 100644
--- a/packages/shared/src/utils/compute/shaders/networking.wgsl.ts
+++ b/packages/shared/src/utils/compute/shaders/networking.wgsl.ts
@@ -424,7 +424,16 @@ fn main(@builtin(global_invocation_id) global_id: vec3<u32>) {
  * - overlaps: pairs of overlapping AABB indices
  * - overlapCount: number of overlapping pairs
  */
+// Workgroup size used by the broadphase compute shader (1D along X).
+// Exported so host-side dispatch math stays in sync with the shader — any
+// drift here would silently miscompute thread indices in the 2D dispatch
+// path (threadsPerRow = numWorkgroupsX * BROADPHASE_WORKGROUP_SIZE_X).
+export const BROADPHASE_WORKGROUP_SIZE_X = 64;
+
 export const PHYSICS_BROADPHASE_SHADER = /* wgsl */ `
+// WORKGROUP_SIZE_1D must match BROADPHASE_WORKGROUP_SIZE_X above.
+const WORKGROUP_SIZE_1D: u32 = ${BROADPHASE_WORKGROUP_SIZE_X}u;
+
 struct AABB {
   minX: f32,
   minY: f32,
@@ -445,7 +454,14 @@ struct Uniforms {
   aabbCount: u32,
   layerMask: u32,  // Bitmask for layer filtering
   maxOverlaps: u32,
-  padding: u32,
+  // X-dimension workgroup count passed from the host. Needed because this
+  // shader can be dispatched 2D (dispatchWorkgroups(x, y, 1)) whenever
+  // ceil(totalPairs/64) exceeds WebGPU's per-dimension ceiling of 65535.
+  // In that case the linear thread index must be reconstructed from
+  // (global_invocation_id.x, global_invocation_id.y) instead of
+  // global_invocation_id.x alone. The 1D dispatch case just passes y=1
+  // and this field is still correct (numWorkgroupsX equals the total).
+  numWorkgroupsX: u32,
 }
 
 @group(0) @binding(0) var<storage, read> aabbs: array<AABB>;
@@ -459,15 +475,22 @@ fn aabbOverlap(a: AABB, b: AABB) -> bool {
          a.minZ <= b.maxZ && a.maxZ >= b.minZ;
 }
 
-@compute @workgroup_size(64)
+@compute @workgroup_size(${BROADPHASE_WORKGROUP_SIZE_X})
 fn main(@builtin(global_invocation_id) global_id: vec3<u32>) {
-  let threadIdx = global_id.x;
-  
+  // Reconstruct the linear thread index across 2D dispatch.
+  // threadsPerRow = numWorkgroupsX * workgroup_size_x.
+  // Under a 1D dispatch dispatchWorkgroups(N, 1, 1), global_id.y is 0 and
+  // this reduces to threadIdx = global_id.x. Under a 2D dispatch
+  // dispatchWorkgroups(65535, K, 1), global_id.y ranges 0..K-1 and we
+  // offset by a full row of threads per y.
+  let threadsPerRow = uniforms.numWorkgroupsX * WORKGROUP_SIZE_1D;
+  let threadIdx = global_id.y * threadsPerRow + global_id.x;
+
   // Each thread checks one pair (upper triangle of N×N matrix)
   // Thread i maps to pair (a, b) where a < b
   let n = uniforms.aabbCount;
   let totalPairs = n * (n - 1u) / 2u;
-  
+
   if (threadIdx >= totalPairs) {
     return;
   }
diff --git a/packages/shared/src/utils/compute/shaders/terrain.wgsl.ts b/packages/shared/src/utils/compute/shaders/terrain.wgsl.ts
index 8d6314df3..c1ab1d8e4 100644
--- a/packages/shared/src/utils/compute/shaders/terrain.wgsl.ts
+++ b/packages/shared/src/utils/compute/shaders/terrain.wgsl.ts
@@ -150,8 +150,16 @@ fn main(@builtin(global_invocation_id) global_id: vec3<u32>) {
  * Output:
  * - influences: float per pixel (0-1)
  */
+// Workgroup size used by the road-influence-texture compute shader (1D
+// along X). Exported so host-side TerrainComputeContext dispatch math stays
+// in sync with the shader — any drift here would silently miscompute pixel
+// indices in the 2D dispatch reshape path.
+export const ROAD_INFLUENCE_TEXTURE_WORKGROUP_SIZE_X = 64;
+
 export const ROAD_INFLUENCE_TEXTURE_SHADER = /* wgsl */ `
 const EPS: f32 = 0.001;
+// WORKGROUP_SIZE_1D must match ROAD_INFLUENCE_TEXTURE_WORKGROUP_SIZE_X above.
+const WORKGROUP_SIZE_1D: u32 = ${ROAD_INFLUENCE_TEXTURE_WORKGROUP_SIZE_X}u;
 
 struct Road {
   startX: f32,
@@ -165,14 +173,23 @@ struct Road {
 }
 
 struct Uniforms {
-  pixelCount: f32,
+  pixelCount: u32,
   roadCount: f32,
   textureSize: f32,
   worldSize: f32,
   centerX: f32,
   centerZ: f32,
   blendWidth: f32,
-  padding: f32,
+  // X-dimension workgroup count passed from the host. At textureSize ≥
+  // 2048 (pixelCount ≥ 4,194,304) the 1D dispatch count exceeds
+  // WebGPU's 65535 per-dimension ceiling, so the host issues a 2D
+  // dispatch (dispatchWorkgroups(x, y, 1)) and the shader must
+  // reconstruct the linear pixel index from
+  // (global_invocation_id.x, global_invocation_id.y) using
+  // numWorkgroupsX. Under the 1D case the host passes y=1 and
+  // numWorkgroupsX = totalWorkgroups, and the arithmetic degenerates
+  // back to idx = global_id.x.
+  numWorkgroupsX: u32,
 }
 
 @group(0) @binding(0) var<storage, read> roads: array<Road>;
@@ -206,14 +223,20 @@ fn smoothstep(edge0: f32, edge1: f32, x: f32) -> f32 {
   return t * t * (3.0 - 2.0 * t);
 }
 
-@compute @workgroup_size(64)
+@compute @workgroup_size(${ROAD_INFLUENCE_TEXTURE_WORKGROUP_SIZE_X})
 fn main(@builtin(global_invocation_id) global_id: vec3<u32>) {
-  let idx = global_id.x;
-  let pixelCount = u32(uniforms.pixelCount);
-  if (idx >= pixelCount) {
+  // Reconstruct the linear pixel index across 2D dispatch.
+  // threadsPerRow = numWorkgroupsX * workgroup_size_x.
+  // Under a 1D dispatch dispatchWorkgroups(N, 1, 1), global_id.y is 0
+  // and this reduces to idx = global_id.x. Under a 2D dispatch
+  // dispatchWorkgroups(65535, K, 1) we offset by a full row of threads
+  // per y index.
+  let threadsPerRow = uniforms.numWorkgroupsX * WORKGROUP_SIZE_1D;
+  let idx = global_id.y * threadsPerRow + global_id.x;
+  if (idx >= uniforms.pixelCount) {
     return;
   }
-  
+
   let roadCount = u32(uniforms.roadCount);
   let texSize = u32(uniforms.textureSize);
   let halfWorld = uniforms.worldSize * 0.5;
diff --git a/packages/shared/src/utils/game/CombatUtils.ts b/packages/shared/src/utils/game/CombatUtils.ts
index 359a6a881..fe268066a 100644
--- a/packages/shared/src/utils/game/CombatUtils.ts
+++ b/packages/shared/src/utils/game/CombatUtils.ts
@@ -355,3 +355,30 @@ export function isAlive(player: Player): boolean {
 export function isDead(player: Player): boolean {
   return !player.alive || player.health.current <= 0;
 }
+
+// HP bar utilities (OSRS-style)
+
+/**
+ * Calculate clamped, rounded health percentage from raw values.
+ *
+ * @param current - Current health points
+ * @param max - Maximum health points
+ * @returns Percentage 0-100 (rounded integer)
+ */
+export function getHpPercent(current: number, max: number): number {
+  if (max <= 0) return 0;
+  return Math.max(0, Math.min(100, Math.round((current / max) * 100)));
+}
+
+/**
+ * Get the OSRS-style hex color for a health percentage.
+ * Thresholds: >50% green, 25-50% yellow, ≤25% red.
+ *
+ * @param percent - Health percentage (0-100)
+ * @returns Hex color string
+ */
+export function getHpColor(percent: number): string {
+  if (percent > 50) return "#22c55e";
+  if (percent > 25) return "#eab308";
+  return "#ef4444";
+}
diff --git a/packages/shared/src/utils/game/XPCalculator.ts b/packages/shared/src/utils/game/XPCalculator.ts
new file mode 100644
index 000000000..096f26b60
--- /dev/null
+++ b/packages/shared/src/utils/game/XPCalculator.ts
@@ -0,0 +1,103 @@
+/**
+ * XP Calculator - OSRS-Accurate Experience Point Calculations
+ *
+ * Standalone utility functions for XP ↔ Level conversions.
+ * Implements the exact XP formula from Old School RuneScape.
+ *
+ * Formula source: https://oldschool.runescape.wiki/w/Experience
+ *
+ * Note: SkillsSystem uses a pre-computed XP table (instance method) for server
+ * performance in hot paths. These standalone functions are intended for client-side
+ * UI rendering where occasional on-the-fly computation is acceptable.
+ */
+
+/** Maximum skill level */
+const MAX_LEVEL = 99;
+
+/**
+ * Get the total XP required to reach a given level.
+ *
+ * Uses the same accumulative formula as SkillsSystem.generateXPTable() and
+ * the on-chain XPTable.sol contract to ensure parity across server, client,
+ * and blockchain. Produces 13,034,394 at level 99.
+ *
+ * @param level - Target level (1-99)
+ * @returns Total XP required (0 for level 1)
+ *
+ * @example
+ * getXPForLevel(1)  // => 0
+ * getXPForLevel(2)  // => 83
+ * getXPForLevel(99) // => 13,034,394
+ */
+export function getXPForLevel(level: number): number {
+  if (level <= 1) return 0;
+  const clampedLevel = Math.min(level, MAX_LEVEL);
+
+  // Accumulative formula matching SkillsSystem.generateXPTable() exactly:
+  // xpDelta(L) = floor((L-1 + 300 * 2^((L-1)/7)) / 4)
+  // xpForLevel(N) = sum(xpDelta(2)..xpDelta(N))
+  let cumulative = 0;
+  for (let l = 2; l <= clampedLevel; l++) {
+    const xp = Math.floor(l - 1 + 300 * Math.pow(2, (l - 1) / 7)) / 4;
+    cumulative = Math.floor(cumulative + xp);
+  }
+  return cumulative;
+}
+
+/**
+ * Get the level for a given amount of XP.
+ *
+ * Scans from MAX_LEVEL down to find the highest level whose XP threshold
+ * the given XP meets or exceeds.
+ *
+ * @param xp - Current XP amount
+ * @returns Level (1-99)
+ *
+ * @example
+ * getLevelForXP(0)    // => 1
+ * getLevelForXP(83)   // => 2
+ * getLevelForXP(100)  // => 2
+ */
+export function getLevelForXP(xp: number): number {
+  if (xp <= 0) return 1;
+  for (let level = MAX_LEVEL; level >= 1; level--) {
+    if (xp >= getXPForLevel(level)) {
+      return level;
+    }
+  }
+  return 1;
+}
+
+/**
+ * Get XP remaining until the next level.
+ *
+ * @param currentXP - Current total XP
+ * @param currentLevel - Current level
+ * @returns XP remaining (0 if at max level)
+ */
+export function getXPToNextLevel(
+  currentXP: number,
+  currentLevel: number,
+): number {
+  if (currentLevel >= MAX_LEVEL) return 0;
+  return getXPForLevel(currentLevel + 1) - currentXP;
+}
+
+/**
+ * Get XP progress percentage toward the next level.
+ *
+ * @param currentXP - Current total XP
+ * @param currentLevel - Current level
+ * @returns Progress percentage (0-100)
+ */
+export function getXPProgress(currentXP: number, currentLevel: number): number {
+  if (currentLevel >= MAX_LEVEL) return 100;
+
+  const currentLevelXP = getXPForLevel(currentLevel);
+  const nextLevelXP = getXPForLevel(currentLevel + 1);
+  const progressXP = currentXP - currentLevelXP;
+  const requiredXP = nextLevelXP - currentLevelXP;
+
+  if (requiredXP <= 0) return 100;
+  return Math.min(100, Math.max(0, (progressXP / requiredXP) * 100));
+}
diff --git a/packages/shared/src/utils/game/index.ts b/packages/shared/src/utils/game/index.ts
index d1f5abbaa..5a5ba5806 100644
--- a/packages/shared/src/utils/game/index.ts
+++ b/packages/shared/src/utils/game/index.ts
@@ -37,3 +37,6 @@ export * from "./ComponentUtils";
 
 // Combat level calculation (OSRS-accurate)
 export * from "./CombatLevelCalculator";
+
+// XP ↔ Level calculations (OSRS-accurate, standalone utilities)
+export * from "./XPCalculator";
diff --git a/packages/shared/src/utils/workers/MinimapWorker.ts b/packages/shared/src/utils/workers/MinimapWorker.ts
index e4c3b22f3..fa51ec099 100644
--- a/packages/shared/src/utils/workers/MinimapWorker.ts
+++ b/packages/shared/src/utils/workers/MinimapWorker.ts
@@ -41,9 +41,38 @@ export interface MinimapEntity {
   id: string;
   x: number;
   z: number;
-  type: "player" | "enemy" | "item" | "building" | "resource" | "npc";
+  type: "player" | "enemy" | "item" | "building" | "resource" | "npc" | "quest";
   color: string;
   size?: number;
+  /** Render as white square (local player) */
+  isLocalPlayer?: boolean;
+  /** Party member slot (0-7) for group color */
+  groupIndex?: number;
+  /** POI icon subtype: "bank", "shop", "quest", "mining", etc. */
+  subType?: string;
+  /** Pulse animation active */
+  isActive?: boolean;
+  /** Shape override: star, diamond, or default circle */
+  icon?: "star" | "circle" | "diamond";
+}
+
+/** Road polyline with AABB for culling */
+export interface MinimapRoad {
+  path: Array<{ x: number; z: number }>;
+  width: number;
+  minX: number;
+  maxX: number;
+  minZ: number;
+  maxZ: number;
+}
+
+/** Rotated building rectangle */
+export interface MinimapBuilding {
+  x: number;
+  z: number;
+  width: number;
+  depth: number;
+  rotation: number;
 }
 
 /** Camera state for minimap rendering */
@@ -90,6 +119,10 @@ export type MinimapWorkerInput =
   | { type: "removeTiles"; tileKeys: string[] }
   | { type: "updateCamera"; camera: MinimapCamera }
   | { type: "updateEntities"; entities: MinimapEntity[] }
+  | { type: "updateRoads"; roads: MinimapRoad[] }
+  | { type: "updateBuildings"; buildings: MinimapBuilding[] }
+  | { type: "updateDestination"; x: number; z: number }
+  | { type: "clearDestination" }
   | { type: "render" }
   | { type: "dispose" };
 
@@ -122,9 +155,40 @@ const tiles = new Map();
 // Entity data
 let entities = [];
 
+// Road data
+let roads = [];
+
+// Building data
+let buildings = [];
+
+// Destination marker (null = hidden)
+let destination = null;
+
+// Frame counter for animations
+let frameCount = 0;
+
 // Camera state
 let camera = { x: 0, z: 0, extent: 50, rotation: 0 };
 
+// Party colors (OSRS-style, 8 members)
+const GROUP_COLORS = [
+  '#4CAF50', '#2196F3', '#9C27B0', '#FF9800',
+  '#00BCD4', '#E91E63', '#CDDC39', '#607D8B'
+];
+
+// Road rendering constants
+const ROAD_LINE_WIDTH_PX = 5;
+const ROAD_OUTLINE_WIDTH_PX = 7;
+const ROAD_OUTLINE_COLOR = 'rgb(56, 60, 68)';
+const ROAD_FILL_COLOR = 'rgb(164, 151, 128)';
+
+// Building rendering constants
+const BUILDING_FILL_COLOR = 'rgba(84, 92, 104, 0.92)';
+const BUILDING_STROKE_COLOR = 'rgb(34, 39, 46)';
+
+// POI icon cache (OffscreenCanvas per subType)
+const iconCache = new Map();
+
 // Config
 let config = {
   waterColor: 0x3498db,
@@ -293,9 +357,8 @@ function render() {
   
   const startTime = performance.now();
   
-  // Clear with background
-  ctx.fillStyle = hexToRgb(config.backgroundColor);
-  ctx.fillRect(0, 0, width, height);
+  // Clear to transparent — this canvas is an overlay composited on top of terrain
+  ctx.clearRect(0, 0, width, height);
   
   // Save context for rotation
   ctx.save();
@@ -339,10 +402,10 @@ function render() {
   if (config.showGrid) {
     ctx.strokeStyle = hexToRgb(config.gridColor);
     ctx.lineWidth = 1;
-    
+
     const gridWorldMin = Math.floor(worldMinX / config.gridSize) * config.gridSize;
     const gridWorldMax = Math.ceil(worldMaxX / config.gridSize) * config.gridSize;
-    
+
     for (let gx = gridWorldMin; gx <= gridWorldMax; gx += config.gridSize) {
       const start = worldToScreen(gx, worldMinZ);
       const end = worldToScreen(gx, worldMaxZ);
@@ -351,7 +414,7 @@ function render() {
       ctx.lineTo(end.x, end.y);
       ctx.stroke();
     }
-    
+
     for (let gz = gridWorldMin; gz <= gridWorldMax; gz += config.gridSize) {
       const start = worldToScreen(worldMinX, gz);
       const end = worldToScreen(worldMaxX, gz);
@@ -361,45 +424,251 @@ function render() {
       ctx.stroke();
     }
   }
-  
+
   ctx.restore();
-  
-  // Render entities (after rotation restore so they're always upright)
+
+  // Roads, buildings, entities drawn AFTER ctx.restore() because worldToScreen()
+  // already applies camera rotation — no double-rotation from ctx.rotate().
+
+  // Draw roads (two-pass: outlines first, then fills to avoid dark bands at intersections)
+  if (roads.length > 0) {
+    const viewRadius = camera.extent * 2;
+    const worldToPixel = width / (2 * camera.extent);
+    ctx.lineCap = 'round';
+    ctx.lineJoin = 'round';
+
+    // Pass 1: outlines
+    ctx.strokeStyle = ROAD_OUTLINE_COLOR;
+    for (const road of roads) {
+      if (Math.abs((road.minX + road.maxX) / 2 - camera.x) > viewRadius) continue;
+      if (Math.abs((road.minZ + road.maxZ) / 2 - camera.z) > viewRadius) continue;
+      const outlineW = Math.max(ROAD_OUTLINE_WIDTH_PX, Math.min(40, road.width * worldToPixel) + 2);
+      ctx.lineWidth = outlineW;
+      ctx.beginPath();
+      for (let i = 0; i < road.path.length; i++) {
+        const p = worldToScreen(road.path[i].x, road.path[i].z);
+        if (i === 0) ctx.moveTo(p.x, p.y);
+        else ctx.lineTo(p.x, p.y);
+      }
+      ctx.stroke();
+    }
+
+    // Pass 2: fills
+    ctx.strokeStyle = ROAD_FILL_COLOR;
+    for (const road of roads) {
+      if (Math.abs((road.minX + road.maxX) / 2 - camera.x) > viewRadius) continue;
+      if (Math.abs((road.minZ + road.maxZ) / 2 - camera.z) > viewRadius) continue;
+      const fillW = Math.max(ROAD_LINE_WIDTH_PX, Math.min(40, road.width * worldToPixel));
+      ctx.lineWidth = fillW;
+      ctx.beginPath();
+      for (let i = 0; i < road.path.length; i++) {
+        const p = worldToScreen(road.path[i].x, road.path[i].z);
+        if (i === 0) ctx.moveTo(p.x, p.y);
+        else ctx.lineTo(p.x, p.y);
+      }
+      ctx.stroke();
+    }
+  }
+
+  // Draw buildings (rotated rectangles)
+  if (buildings.length > 0) {
+    const viewRadius = camera.extent * 2;
+    ctx.fillStyle = BUILDING_FILL_COLOR;
+    ctx.strokeStyle = BUILDING_STROKE_COLOR;
+    ctx.lineWidth = 0.5;
+
+    for (const b of buildings) {
+      if (Math.abs(b.x - camera.x) > viewRadius || Math.abs(b.z - camera.z) > viewRadius) continue;
+      const hw = b.width / 2;
+      const hd = b.depth / 2;
+      const cos = Math.cos(b.rotation);
+      const sin = Math.sin(b.rotation);
+      const corners = [
+        worldToScreen(b.x + cos * hw - sin * hd, b.z + sin * hw + cos * hd),
+        worldToScreen(b.x - cos * hw - sin * hd, b.z - sin * hw + cos * hd),
+        worldToScreen(b.x - cos * hw + sin * hd, b.z - sin * hw - cos * hd),
+        worldToScreen(b.x + cos * hw + sin * hd, b.z + sin * hw - cos * hd),
+      ];
+      ctx.beginPath();
+      ctx.moveTo(corners[0].x, corners[0].y);
+      for (let i = 1; i < 4; i++) ctx.lineTo(corners[i].x, corners[i].y);
+      ctx.closePath();
+      ctx.fill();
+      ctx.stroke();
+    }
+  }
+
+  frameCount++;
+
+  // Render entities
   for (const entity of entities) {
     const pos = worldToScreen(entity.x, entity.z);
-    
+
     // Skip if off-screen
     if (pos.x < -10 || pos.x > width + 10 || pos.y < -10 || pos.y > height + 10) {
       continue;
     }
-    
-    const size = entity.size || 4;
-    
-    ctx.fillStyle = entity.color;
-    ctx.beginPath();
-    
-    if (entity.type === 'building') {
-      // Square for buildings
-      ctx.fillRect(pos.x - size, pos.y - size, size * 2, size * 2);
+
+    const baseSize = entity.size || 4;
+    const pulseScale = entity.isActive ? (Math.sin(frameCount * 0.1) * 0.15 + 1) : 1;
+    const size = baseSize * pulseScale;
+
+    // Determine color (party group override for players)
+    let pipColor = entity.color;
+    if (entity.type === 'player' && entity.groupIndex !== undefined && entity.groupIndex >= 0) {
+      pipColor = GROUP_COLORS[entity.groupIndex % GROUP_COLORS.length];
+    }
+
+    // Try POI icon first
+    if (entity.subType && drawIcon(ctx, pos.x, pos.y, entity.subType)) {
+      continue;
+    }
+
+    ctx.fillStyle = pipColor;
+    ctx.strokeStyle = '#000000';
+    ctx.lineWidth = 1;
+
+    if (entity.isLocalPlayer) {
+      // White square for local player
+      ctx.fillStyle = '#ffffff';
+      ctx.fillRect(pos.x - 2.5, pos.y - 2.5, 5, 5);
+    } else if (entity.icon === 'star' || entity.type === 'quest') {
+      // Star shape
+      ctx.beginPath();
+      for (let i = 0; i < 5; i++) {
+        const angle = (i * 4 * Math.PI) / 5 - Math.PI / 2;
+        const r = i % 2 === 0 ? size : size * 0.5;
+        const sx = pos.x + Math.cos(angle) * r;
+        const sy = pos.y + Math.sin(angle) * r;
+        if (i === 0) ctx.moveTo(sx, sy);
+        else ctx.lineTo(sx, sy);
+      }
+      ctx.closePath();
+      ctx.fill();
+      ctx.stroke();
+    } else if (entity.icon === 'diamond') {
+      // Diamond shape
+      ctx.beginPath();
+      ctx.moveTo(pos.x, pos.y - size);
+      ctx.lineTo(pos.x + size * 0.7, pos.y);
+      ctx.lineTo(pos.x, pos.y + size);
+      ctx.lineTo(pos.x - size * 0.7, pos.y);
+      ctx.closePath();
+      ctx.fill();
+      ctx.stroke();
     } else if (entity.type === 'player') {
-      // Larger circle for players
+      // Circle with white border for players
+      ctx.beginPath();
       ctx.arc(pos.x, pos.y, size + 1, 0, Math.PI * 2);
       ctx.fill();
-      // White border
       ctx.strokeStyle = '#ffffff';
-      ctx.lineWidth = 1;
       ctx.stroke();
     } else {
       // Circle for everything else
+      ctx.beginPath();
       ctx.arc(pos.x, pos.y, size, 0, Math.PI * 2);
       ctx.fill();
+      ctx.stroke();
     }
   }
-  
+
+  // Draw destination marker (red flag)
+  if (destination) {
+    const dp = worldToScreen(destination.x, destination.z);
+    if (dp.x > -20 && dp.x < width + 20 && dp.y > -20 && dp.y < height + 20) {
+      // Pole
+      ctx.strokeStyle = '#880000';
+      ctx.lineWidth = 1;
+      ctx.beginPath();
+      ctx.moveTo(dp.x, dp.y + 3);
+      ctx.lineTo(dp.x, dp.y - 5);
+      ctx.stroke();
+      // Flag triangle
+      ctx.fillStyle = '#ff0000';
+      ctx.beginPath();
+      ctx.moveTo(dp.x, dp.y - 5);
+      ctx.lineTo(dp.x + 5, dp.y - 3);
+      ctx.lineTo(dp.x, dp.y - 1);
+      ctx.closePath();
+      ctx.fill();
+    }
+  }
+
   const frameTime = performance.now() - startTime;
   return { frameTime };
 }
 
+/**
+ * Draw a POI icon from flyweight cache.
+ * Returns true if icon was drawn, false if subType unknown.
+ */
+function drawIcon(ctx, cx, cy, subType) {
+  if (!iconCache.has(subType)) {
+    // Create icon on first use
+    try {
+      const ic = new OffscreenCanvas(16, 16);
+      const ictx = ic.getContext('2d');
+      if (ictx) {
+        renderIconGlyph(ictx, subType);
+        iconCache.set(subType, ic);
+      } else {
+        iconCache.set(subType, null);
+      }
+    } catch (e) {
+      iconCache.set(subType, null);
+    }
+  }
+  const cached = iconCache.get(subType);
+  if (!cached) return false;
+  ctx.drawImage(cached, cx - 8, cy - 8, 16, 16);
+  return true;
+}
+
+/**
+ * Render a glyph onto a 16x16 icon canvas.
+ */
+function renderIconGlyph(ctx, subType) {
+  const w = 16, h = 16, cx = 8, cy = 8, r = 6;
+  ctx.clearRect(0, 0, w, h);
+
+  const glyphs = {
+    bank:                { bg: '#ffd700', fg: '#000000', label: '$' },
+    shop:                { bg: '#d4a574', fg: '#000000', label: 'S' },
+    altar:               { bg: '#ffffff', fg: '#000000', label: '+' },
+    runecrafting_altar:  { bg: '#9b59b6', fg: '#ffffff', label: 'R' },
+    anvil:               { bg: '#555555', fg: '#ffffff', label: 'A' },
+    furnace:             { bg: '#ff6600', fg: '#ffffff', label: 'F' },
+    range:               { bg: '#8b4513', fg: '#ffffff', label: '~' },
+    fishing:             { bg: '#00bcd4', fg: '#ffffff', label: 'f' },
+    mining:              { bg: '#8b6914', fg: '#ffffff', label: 'P' },
+    tree:                { bg: '#22c55e', fg: '#000000', label: 'T' },
+    quest_available:     { bg: '#2196f3', fg: '#ffffff', label: '!' },
+    quest:               { bg: '#2196f3', fg: '#ffffff', label: '!' },
+    quest_in_progress:   { bg: '#2196f3', fg: '#ffffff', label: '?' },
+  };
+
+  const glyph = glyphs[subType];
+  if (!glyph) return;
+
+  // Circle background
+  ctx.fillStyle = glyph.bg;
+  ctx.beginPath();
+  ctx.arc(cx, cy, r, 0, Math.PI * 2);
+  ctx.fill();
+
+  // Border
+  ctx.strokeStyle = '#000000';
+  ctx.lineWidth = 1;
+  ctx.stroke();
+
+  // Label
+  ctx.fillStyle = glyph.fg;
+  ctx.font = 'bold 9px sans-serif';
+  ctx.textAlign = 'center';
+  ctx.textBaseline = 'middle';
+  ctx.fillText(glyph.label, cx, cy + 1);
+}
+
 // Message handler
 self.onmessage = function(e) {
   const msg = e.data;
@@ -440,7 +709,27 @@ self.onmessage = function(e) {
       updateEntities(msg.entities);
       break;
     }
-    
+
+    case 'updateRoads': {
+      roads = msg.roads || [];
+      break;
+    }
+
+    case 'updateBuildings': {
+      buildings = msg.buildings || [];
+      break;
+    }
+
+    case 'updateDestination': {
+      destination = { x: msg.x, z: msg.z };
+      break;
+    }
+
+    case 'clearDestination': {
+      destination = null;
+      break;
+    }
+
     case 'render': {
       const result = render();
       
@@ -458,6 +747,10 @@ self.onmessage = function(e) {
     case 'dispose': {
       tiles.clear();
       entities = [];
+      roads = [];
+      buildings = [];
+      destination = null;
+      iconCache.clear();
       canvas = null;
       ctx = null;
       break;
@@ -640,6 +933,30 @@ export class MinimapWorkerManager {
     this.worker.postMessage({ type: "updateEntities", entities });
   }
 
+  /** Update road polylines */
+  updateRoads(roads: MinimapRoad[]): void {
+    if (!this.worker || !this.ready) return;
+    this.worker.postMessage({ type: "updateRoads", roads });
+  }
+
+  /** Update building rectangles */
+  updateBuildings(buildings: MinimapBuilding[]): void {
+    if (!this.worker || !this.ready) return;
+    this.worker.postMessage({ type: "updateBuildings", buildings });
+  }
+
+  /** Set destination marker position */
+  updateDestination(x: number, z: number): void {
+    if (!this.worker || !this.ready) return;
+    this.worker.postMessage({ type: "updateDestination", x, z });
+  }
+
+  /** Clear destination marker */
+  clearDestination(): void {
+    if (!this.worker || !this.ready) return;
+    this.worker.postMessage({ type: "clearDestination" });
+  }
+
   /** Request a render */
   render(): void {
     if (!this.worker || !this.ready) return;
diff --git a/scripts/configure-r2-cors.sh b/scripts/configure-r2-cors.sh
index 25090536a..799d8d801 100755
--- a/scripts/configure-r2-cors.sh
+++ b/scripts/configure-r2-cors.sh
@@ -40,8 +40,6 @@ CORS_CONFIG=$(cat <<'EOF'
           "https://*.hyperscape.pages.dev",
           "https://*.hyperscape-betting.pages.dev",
           "https://*.hyperbet.pages.dev",
-          "https://*.hyperbet-solana.pages.dev",
-          "https://*.hyperbet-bsc.pages.dev",
           "http://localhost:3333",
           "http://localhost:5555",
           "http://127.0.0.1:3333",
@@ -82,6 +80,4 @@ echo "  - https://hyperscape-production.up.railway.app"
 echo "  - https://*.hyperscape.pages.dev"
 echo "  - https://*.hyperscape-betting.pages.dev"
 echo "  - https://*.hyperbet.pages.dev"
-echo "  - https://*.hyperbet-solana.pages.dev"
-echo "  - https://*.hyperbet-bsc.pages.dev"
 echo "  - http://localhost:*"
diff --git a/scripts/deploy-vast.sh b/scripts/deploy-vast.sh
index 7592b4389..64f61665d 100755
--- a/scripts/deploy-vast.sh
+++ b/scripts/deploy-vast.sh
@@ -1,22 +1,44 @@
 #!/bin/bash
 # Hyperscape CI/CD Deploy for Vast.ai
-# Pulls latest, builds, and starts the full duel stack under pm2
+# Pulls latest, builds, and starts the split duel/control plane plus source worker under pm2
 set -euo pipefail
 
 export PATH="/root/.bun/bin:$PATH"
 cd /root/hyperscape
 
-SECRETS_FILE="/tmp/hyperscape-secrets.env"
-if [ -f "$SECRETS_FILE" ]; then
-    echo "[deploy] Loading runtime secrets from $SECRETS_FILE"
+# Prefer the persistent path first. /tmp is wiped on reboot by systemd-tmpfiles,
+# so a pm2 resurrect or manual restart after a host reboot would otherwise lose
+# the deploy-time env. The /tmp path remains as a transitional fallback.
+SECRETS_CANDIDATES=(
+    "/root/hyperscape-secrets.env"
+    "/tmp/hyperscape-secrets.env"
+)
+SECRETS_FILE=""
+for candidate in "${SECRETS_CANDIDATES[@]}"; do
+    if [ -f "$candidate" ]; then
+        SECRETS_FILE="$candidate"
+        break
+    fi
+done
+
+if [ -n "$SECRETS_FILE" ]; then
+    echo "[deploy] Loading local runtime secrets from $SECRETS_FILE"
     set -a
     # shellcheck disable=SC1090
     . "$SECRETS_FILE"
     set +a
+    # Mirror to the persistent path so subsequent reboots retain these secrets.
+    if [ "$SECRETS_FILE" != "/root/hyperscape-secrets.env" ]; then
+        cp "$SECRETS_FILE" /root/hyperscape-secrets.env
+        chmod 600 /root/hyperscape-secrets.env
+        echo "[deploy] Mirrored secrets to /root/hyperscape-secrets.env"
+    fi
 else
-    echo "[deploy] Warning: $SECRETS_FILE not found; relying on existing environment"
+    echo "[deploy] Warning: no secrets file found at ${SECRETS_CANDIDATES[*]}; relying on the existing local shell environment only"
 fi
 
+echo "[deploy] Shared project secrets are intentionally not read in this enoomian staging path"
+
 # Auto-detect database mode: if DATABASE_URL is set to a remote host, use remote mode
 if [ -z "${DUEL_DATABASE_MODE:-}" ] && [ -n "${DATABASE_URL:-}" ]; then
     case "$DATABASE_URL" in
@@ -115,6 +137,29 @@ SQL
     echo "[deploy] Local PostgreSQL ready at ${LOCAL_POSTGRES_HOST}:${LOCAL_POSTGRES_PORT}/${LOCAL_POSTGRES_DB}"
 }
 
+ensure_tree_asset_aliases() {
+    local trees_root="/root/hyperscape/packages/server/world/assets/models/trees"
+    if [ ! -d "$trees_root" ]; then
+        echo "[deploy] Skipping tree asset alias generation; missing $trees_root"
+        return
+    fi
+
+    echo "[deploy] Ensuring tree asset compatibility aliases..."
+    find "$trees_root" -maxdepth 1 -type f -name '*.glb' | while read -r asset_path; do
+        local asset_name family_dir alias_path
+        asset_name="$(basename "$asset_path")"
+        family_dir="${asset_name%%_*}"
+        if [ -z "$family_dir" ] || [ "$family_dir" = "$asset_name" ]; then
+            continue
+        fi
+        mkdir -p "$trees_root/$family_dir"
+        alias_path="$trees_root/$family_dir/$asset_name"
+        if [ ! -e "$alias_path" ]; then
+            ln -s "../$asset_name" "$alias_path"
+        fi
+    done
+}
+
 echo "[deploy] Starting Hyperscape CI/CD update on Vast.ai..."
 
 # ── Pull latest code ──────────────────────────────────────────
@@ -174,25 +219,20 @@ sleep 2
 bunx pm2 kill 2>/dev/null || true
 sleep 2
 
-# Kill specific server processes (avoid killing deploy script's bun processes)
-# Target the hyperscape server process specifically, not all bun processes
-pkill -f "hyperscape-duel" || true
-pkill -f "watchdog.sh" || true
-pkill -f "stream-to-rtmp" || true
-pkill -f "xvfb-run.*packages/server.*stream:rtmp" || true
-pkill -f "turbo.*dev" || true
-pkill -f "chromium" || true
-pkill -f "chrome" || true
-# Kill node processes that might hold DB connections
-pkill -f "node.*packages/server" || true
-pkill -f "drizzle" || true
-# Kill ORPHANED bun child processes that pm2 kill failed to terminate
-# (Specifically avoids killing the bash deployment script's own bun instances)
+# Kill specific server processes using explicit ownership names and lock files.
+pkill -f "hyperscape-duel-api" || true
+pkill -f "hyperscape-stream-source" || true
+pkill -f "scripts/duel-stack.mjs" || true
+pkill -f "packages/server/scripts/stream-to-rtmp.ts" || true
+pkill -f "bun.*packages/server.*stream:rtmp" || true
 pkill -f "bun.*packages/server.*dist/index.js" || true
 pkill -f "bun.*packages/server.*start" || true
 pkill -f "bun.*dev-duel.mjs" || true
 pkill -f "bun.*preview.*3333" || true
-rm -f /root/hyperscape/.runtime-locks/rtmp-status.json || true
+rm -f \
+    /root/hyperscape/.runtime-locks/duel-stack.json \
+    /root/hyperscape/.runtime-locks/stream-source.json \
+    /root/hyperscape/.runtime-locks/rtmp-status.json || true
 
 DB_DRAIN_WAIT_SECONDS=5
 if [ "$DUEL_DATABASE_MODE" = "remote" ]; then
@@ -211,6 +251,7 @@ cd packages/asset-forge && bun run build:services && cd ../..
 cd packages/shared && bun run build && cd ../..
 echo "[deploy] Building fresh client dist for stream/runtime pages..."
 cd packages/client && bun run build:cf && cd ../..
+ensure_tree_asset_aliases
 
 # ── Database migration (after connections cleared) ────────────
 echo "[deploy] Applying database migrations..."
@@ -246,7 +287,7 @@ export DISPLAY=:99
 echo "[deploy] Xvfb started on DISPLAY=$DISPLAY"
 
 # ── Start duel stack via pm2 ─────────────────────────────────
-echo "[deploy] Starting Hyperscape duel stack via pm2..."
+echo "[deploy] Starting split Hyperscape duel stack via pm2..."
 bunx pm2 start ecosystem.config.cjs --update-env
 
 REQUIRE_LOCAL_CDN=false
@@ -261,6 +302,7 @@ echo "[deploy] Waiting for local services to become healthy..."
 for attempt in $(seq 1 30); do
     SERVER_OK=false
     STREAMING_OK=false
+    CAPTURE_OK=false
     CDN_OK=true
 
     if curl -fsS --max-time 10 http://127.0.0.1:5555/health > /dev/null 2>&1; then
@@ -269,6 +311,9 @@ for attempt in $(seq 1 30); do
     if curl -fsS --max-time 10 http://127.0.0.1:5555/api/streaming/state > /dev/null 2>&1; then
         STREAMING_OK=true
     fi
+    if curl -fsS --max-time 10 http://127.0.0.1:5555/api/streaming/capture/status > /dev/null 2>&1; then
+        CAPTURE_OK=true
+    fi
     if [ "$REQUIRE_LOCAL_CDN" = true ]; then
         CDN_OK=false
         if curl -fsS --max-time 10 http://127.0.0.1:8080/health > /dev/null 2>&1; then
@@ -276,7 +321,7 @@ for attempt in $(seq 1 30); do
         fi
     fi
 
-    if [ "$SERVER_OK" = true ] && [ "$STREAMING_OK" = true ] && [ "$CDN_OK" = true ]; then
+    if [ "$SERVER_OK" = true ] && [ "$STREAMING_OK" = true ] && [ "$CAPTURE_OK" = true ] && [ "$CDN_OK" = true ]; then
         echo "[deploy] Local services are healthy"
         break
     fi
@@ -286,12 +331,14 @@ for attempt in $(seq 1 30); do
         echo "[deploy] pm2 status:"
         bunx pm2 status || true
         echo "[deploy] tailing duel logs directly from OS:"
-        tail -n 10000 /root/.pm2/logs/hyperscape-duel-error.log 2>/dev/null || true
-        tail -n 10000 /root/.pm2/logs/hyperscape-duel-out.log 2>/dev/null || true
+        tail -n 10000 /root/.pm2/logs/hyperscape-duel-api-error.log 2>/dev/null || true
+        tail -n 10000 /root/.pm2/logs/hyperscape-duel-api-out.log 2>/dev/null || true
+        tail -n 10000 /root/.pm2/logs/hyperscape-stream-source-error.log 2>/dev/null || true
+        tail -n 10000 /root/.pm2/logs/hyperscape-stream-source-out.log 2>/dev/null || true
         exit 1
     fi
 
-    echo "[deploy] health check ${attempt}/30 pending (server=$SERVER_OK streaming=$STREAMING_OK cdn=$CDN_OK)"
+    echo "[deploy] health check ${attempt}/30 pending (server=$SERVER_OK streaming=$STREAMING_OK capture=$CAPTURE_OK cdn=$CDN_OK)"
     sleep 10
 done
 
@@ -302,7 +349,7 @@ bunx pm2 save
 echo ""
 echo "════════════════════════════════════════════════════════════"
 echo "  ✓ Hyperscape deployed successfully!"
-echo "  ✓ Duel stack managed by pm2 (auto-restart on crash)"
+echo "  ✓ Duel API/control plane and stream source are split under pm2"
 echo ""
 echo "  Useful commands:"
 echo "    bun run duel:prod:logs     # tail live logs"
diff --git a/scripts/duel-stack.mjs b/scripts/duel-stack.mjs
index 14bbbcd8c..cb6d2beb8 100644
--- a/scripts/duel-stack.mjs
+++ b/scripts/duel-stack.mjs
@@ -81,6 +81,7 @@ Options:
   --skip-chain-setup      Start server without setup-chain/anvil bootstrap
   --skip-keeper           Skip keeper bot
   --skip-stream           Skip RTMP/HLS bridge process
+                           (split topology is default; DUEL_OWNS_STREAM_CAPTURE=true opts into local ownership)
   --skip-betting          Skip the sibling Hyperbet app
   --skip-bots             Skip duel matchmaker bots
   --with-mm               Start sibling Hyperbet market-maker bot(s) after duel stack is ready
@@ -387,6 +388,10 @@ const useExternalAgentPool = options["skip-bots"] !== true;
 const defaultDuelServerAgentMode = useExternalAgentPool
   ? "external"
   : "embedded";
+const ownsStreamCapture = /^(1|true|yes|on)$/i.test(
+  process.env.DUEL_OWNS_STREAM_CAPTURE || "",
+);
+const shouldOwnStreamCapture = ownsStreamCapture && !options["skip-stream"];
 const DUEL_LOG_LEVEL_PRIORITY = {
   debug: 0,
   info: 1,
@@ -1671,7 +1676,7 @@ async function main() {
     // stream-to-rtmp capture.
     STREAMING_CAPTURE_ENABLED:
       process.env.STREAMING_CAPTURE_ENABLED ||
-      (options["skip-stream"] ? "true" : "false"),
+      (shouldOwnStreamCapture ? "true" : "false"),
     RTMP_STATUS_FILE: rtmpStatusFile,
     // Keep the server DB pool conservative in local duel workflows to avoid
     // exceeding low local Postgres max_connections limits.
@@ -1924,8 +1929,12 @@ async function main() {
     );
   }
 
-  if (!options["skip-stream"]) {
+  if (shouldOwnStreamCapture) {
     await startStreamBridge();
+  } else {
+    log(
+      "stream capture is split out by default; set DUEL_OWNS_STREAM_CAPTURE=true only for explicit local ownership mode",
+    );
   }
 
   if (!skipBettingApp && hyperbetEnabled && hyperbetAvailable) {
@@ -1980,7 +1989,7 @@ async function main() {
   }
 
   async function startStreamBridge() {
-    log("starting RTMP bridge + local HLS fanout...");
+    log("starting RTMP bridge + local HLS fanout (explicit ownership mode)...");
     await terminateProcessesByCommandPatterns(
       [
         "bun run --cwd packages/server stream:rtmp",
@@ -2137,7 +2146,7 @@ async function main() {
       rtmpArgs,
       {
         env: streamEnv,
-        critical: false,
+        critical: true,
         restart: true,
         restartDelayMs: 3000,
       },
@@ -2146,11 +2155,11 @@ async function main() {
     const hlsReadyTimeoutMs =
       Number.parseInt(process.env.DUEL_STREAM_READY_TIMEOUT_MS || "", 10) ||
       180_000;
-    // Non-fatal: if HLS stream never comes up (e.g. no RTMP source) just warn
-    // and keep the rest of the stack (Hyperbet app, bots, keeper) running.
     waitForLiveHls(hlsUrl, hlsReadyTimeoutMs).catch((err) => {
       warnLog(`HLS stream not ready - ${err.message}`);
-      warnLog("stream may not be available, but the rest of the stack continues");
+      warnLog(
+        "stream capture ownership is explicit; the rest of the stack continues only when stream capture is split out",
+      );
     });
   }
 
diff --git a/scripts/fix-esm-specifiers.py b/scripts/fix-esm-specifiers.py
new file mode 100644
index 000000000..50d25b546
--- /dev/null
+++ b/scripts/fix-esm-specifiers.py
@@ -0,0 +1,81 @@
+from pathlib import Path
+import re
+
+
+ROOT = Path(__file__).resolve().parent.parent / "packages"
+JS_EXTENSIONS = (".js", ".mjs", ".cjs", ".json", ".node", ".wasm")
+FROM_PATTERN = re.compile(
+    r"(?P<prefix>\b(?:import|export)\b[^\n]*?\bfrom\s+[\"'])(?P<spec>\.{1,2}/[^\"']+)(?P<suffix>[\"'])"
+)
+DYNAMIC_IMPORT_PATTERN = re.compile(
+    r"(?P<prefix>\bimport\s*\(\s*)(?P<quote>[\"'])(?P<spec>\.{1,2}/[^\"']+)(?P=quote)(?P<suffix>\s*\))"
+)
+ASSIGNMENT_PATTERN = re.compile(
+    r"(?P<prefix>(?:=|:)\s*)(?P<quote>[\"'])(?P<spec>\.{1,2}/[^\"']+)(?P=quote)"
+)
+
+
+def resolve_specifier(path: Path, spec: str) -> str:
+    if spec.endswith(JS_EXTENSIONS):
+        target = (path.parent / spec).resolve()
+        if target.exists():
+            return spec
+        for ext in JS_EXTENSIONS:
+            if spec.endswith(ext):
+                base_spec = spec[: -len(ext)]
+                index_candidate = (path.parent / base_spec).resolve() / f"index{ext}"
+                if index_candidate.exists():
+                    return f"{base_spec}/index{ext}"
+        return spec
+
+    target = (path.parent / spec).resolve()
+    for ext in JS_EXTENSIONS:
+        appended_candidate = (path.parent / f"{spec}{ext}").resolve()
+        if appended_candidate.exists():
+            return f"{spec}{ext}"
+        candidate = target.with_suffix(ext)
+        if candidate.exists():
+            return f"{spec}{ext}"
+
+    for ext in JS_EXTENSIONS:
+        index_candidate = target / f"index{ext}"
+        if index_candidate.exists():
+            return f"{spec}/index{ext}"
+
+    return spec
+
+
+for path in ROOT.rglob("*.js"):
+    if "dist" not in path.parts and "build" not in path.parts:
+        continue
+
+    text = path.read_text()
+    updated = FROM_PATTERN.sub(
+        lambda match: (
+            f"{match.group('prefix')}"
+            f"{resolve_specifier(path, match.group('spec'))}"
+            f"{match.group('suffix')}"
+        ),
+        text,
+    )
+    updated = DYNAMIC_IMPORT_PATTERN.sub(
+        lambda match: (
+            f"{match.group('prefix')}"
+            f"{match.group('quote')}"
+            f"{resolve_specifier(path, match.group('spec'))}"
+            f"{match.group('quote')}"
+            f"{match.group('suffix')}"
+        ),
+        updated,
+    )
+    updated = ASSIGNMENT_PATTERN.sub(
+        lambda match: (
+            f"{match.group('prefix')}"
+            f"{match.group('quote')}"
+            f"{resolve_specifier(path, match.group('spec'))}"
+            f"{match.group('quote')}"
+        ),
+        updated,
+    )
+    if updated != text:
+        path.write_text(updated)
diff --git a/scripts/personal-runtime-secret-manifest.sh b/scripts/personal-runtime-secret-manifest.sh
new file mode 100644
index 000000000..0c6f5d19a
--- /dev/null
+++ b/scripts/personal-runtime-secret-manifest.sh
@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+
+# Variable names only. Real values belong in local untracked runtime secret
+# files such as /tmp/hyperscape-secrets.env or .env.production.
+
+HYPERSCAPES_PERSONAL_RUNTIME_SECRET_REQUIRED_KEYS=(
+  DATABASE_URL
+  JWT_SECRET
+  STREAMING_AUTOMATION_TOKEN
+)
+
+HYPERSCAPES_PERSONAL_RUNTIME_SECRET_OPTIONAL_KEYS=(
+  BETTING_FEED_ACCESS_TOKEN
+  STREAMING_VIEWER_ACCESS_TOKEN
+  STREAM_INGEST_STREAM_KEY
+  STREAM_INGEST_SRT_PASSPHRASE
+)
+
+HYPERSCAPES_PERSONAL_RUNTIME_RESERVED_CLOUDFLARE_KEYS=(
+  STREAM_CLOUDFLARE_LIVE_INPUT_ID
+  STREAM_CLOUDFLARE_WEBHOOK_SECRET
+  STREAM_CLOUDFLARE_ACCOUNT_ID
+)