refactor(tui): simplify rpc failure propagation

fix(tui): reject worker rpc failures
2026-08-10 03:19:59 -04:00 · 2026-06-04 11:45:42 -05:00 · 2026-06-04 11:42:13 -05:00
166 changed files with 2214 additions and 12073 deletions
@@ -112,7 +112,7 @@ jobs:
      - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
        with:
          name: opencode-preview-cli
-          path: packages/cli/dist/cli-*
+          path: packages/cli/dist/lildax-*

    outputs:
      version: ${{ needs.version.outputs.version }}
@@ -29,7 +29,7 @@
    },
    "packages/app": {
      "name": "@opencode-ai/app",
-      "version": "1.16.0",
+      "version": "1.15.13",
      "dependencies": {
        "@kobalte/core": "catalog:",
        "@opencode-ai/core": "workspace:*",
@@ -85,7 +85,7 @@
    },
    "packages/cli": {
      "name": "@opencode-ai/cli",
-      "version": "1.16.0",
+      "version": "1.15.13",
      "bin": {
        "lildax": "./bin/lildax.cjs",
      },
@@ -106,7 +106,7 @@
    },
    "packages/console/app": {
      "name": "@opencode-ai/console-app",
-      "version": "1.16.0",
+      "version": "1.15.13",
      "dependencies": {
        "@cloudflare/vite-plugin": "1.15.2",
        "@ibm/plex": "6.4.1",
@@ -142,7 +142,7 @@
    },
    "packages/console/core": {
      "name": "@opencode-ai/console-core",
-      "version": "1.16.0",
+      "version": "1.15.13",
      "dependencies": {
        "@aws-sdk/client-sts": "3.782.0",
        "@jsx-email/render": "1.1.1",
@@ -169,7 +169,7 @@
    },
    "packages/console/function": {
      "name": "@opencode-ai/console-function",
-      "version": "1.16.0",
+      "version": "1.15.13",
      "dependencies": {
        "@ai-sdk/anthropic": "3.0.64",
        "@ai-sdk/openai": "3.0.48",
@@ -191,7 +191,7 @@
    },
    "packages/console/mail": {
      "name": "@opencode-ai/console-mail",
-      "version": "1.16.0",
+      "version": "1.15.13",
      "dependencies": {
        "@jsx-email/all": "2.2.3",
        "@jsx-email/cli": "1.4.3",
@@ -215,7 +215,7 @@
    },
    "packages/console/support": {
      "name": "@opencode-ai/console-support",
-      "version": "1.16.0",
+      "version": "1.15.13",
      "dependencies": {
        "@cloudflare/vite-plugin": "1.15.2",
        "@opencode-ai/console-core": "workspace:*",
@@ -235,7 +235,7 @@
    },
    "packages/core": {
      "name": "@opencode-ai/core",
-      "version": "1.16.0",
+      "version": "1.15.13",
      "bin": {
        "opencode": "./bin/opencode",
      },
@@ -270,7 +270,7 @@
        "@opencode-ai/effect-drizzle-sqlite": "workspace:*",
        "@opencode-ai/effect-sqlite-node": "workspace:*",
        "@opencode-ai/llm": "workspace:*",
-        "@openrouter/ai-sdk-provider": "2.9.0",
+        "@openrouter/ai-sdk-provider": "2.8.1",
        "@opentelemetry/api": "1.9.0",
        "@opentelemetry/context-async-hooks": "2.6.1",
        "@opentelemetry/exporter-trace-otlp-http": "0.214.0",
@@ -324,7 +324,7 @@
    },
    "packages/desktop": {
      "name": "@opencode-ai/desktop",
-      "version": "1.16.0",
+      "version": "1.15.13",
      "dependencies": {
        "@zip.js/zip.js": "2.7.62",
        "effect": "catalog:",
@@ -378,7 +378,7 @@
    },
    "packages/effect-drizzle-sqlite": {
      "name": "@opencode-ai/effect-drizzle-sqlite",
-      "version": "1.16.0",
+      "version": "1.15.13",
      "dependencies": {
        "drizzle-orm": "catalog:",
        "effect": "catalog:",
@@ -392,7 +392,7 @@
    },
    "packages/effect-sqlite-node": {
      "name": "@opencode-ai/effect-sqlite-node",
-      "version": "1.16.0",
+      "version": "1.15.10",
      "dependencies": {
        "effect": "catalog:",
      },
@@ -404,7 +404,7 @@
    },
    "packages/enterprise": {
      "name": "@opencode-ai/enterprise",
-      "version": "1.16.0",
+      "version": "1.15.13",
      "dependencies": {
        "@hono/standard-validator": "catalog:",
        "@opencode-ai/core": "workspace:*",
@@ -435,7 +435,7 @@
    },
    "packages/function": {
      "name": "@opencode-ai/function",
-      "version": "1.16.0",
+      "version": "1.15.13",
      "dependencies": {
        "@octokit/auth-app": "8.0.1",
        "@octokit/rest": "catalog:",
@@ -451,7 +451,7 @@
    },
    "packages/http-recorder": {
      "name": "@opencode-ai/http-recorder",
-      "version": "1.16.0",
+      "version": "1.15.13",
      "dependencies": {
        "@effect/platform-node": "catalog:",
        "effect": "catalog:",
@@ -464,7 +464,7 @@
    },
    "packages/llm": {
      "name": "@opencode-ai/llm",
-      "version": "1.16.0",
+      "version": "1.15.13",
      "dependencies": {
        "@smithy/eventstream-codec": "4.2.14",
        "@smithy/util-utf8": "4.2.2",
@@ -482,7 +482,7 @@
    },
    "packages/opencode": {
      "name": "opencode",
-      "version": "1.16.0",
+      "version": "1.15.13",
      "bin": {
        "opencode": "./bin/opencode",
      },
@@ -524,7 +524,7 @@
        "@opencode-ai/sdk": "workspace:*",
        "@opencode-ai/server": "workspace:*",
        "@opencode-ai/ui": "workspace:*",
-        "@openrouter/ai-sdk-provider": "2.9.0",
+        "@openrouter/ai-sdk-provider": "2.8.1",
        "@opentelemetry/api": "1.9.0",
        "@opentelemetry/context-async-hooks": "2.6.1",
        "@opentelemetry/exporter-trace-otlp-http": "0.214.0",
@@ -609,7 +609,7 @@
    },
    "packages/plugin": {
      "name": "@opencode-ai/plugin",
-      "version": "1.16.0",
+      "version": "1.15.13",
      "dependencies": {
        "@opencode-ai/sdk": "workspace:*",
        "effect": "catalog:",
@@ -625,9 +625,9 @@
        "typescript": "catalog:",
      },
      "peerDependencies": {
-        "@opentui/core": ">=0.3.2",
-        "@opentui/keymap": ">=0.3.2",
-        "@opentui/solid": ">=0.3.2",
+        "@opentui/core": ">=0.3.1",
+        "@opentui/keymap": ">=0.3.1",
+        "@opentui/solid": ">=0.3.1",
      },
      "optionalPeers": [
        "@opentui/core",
@@ -647,7 +647,7 @@
    },
    "packages/sdk/js": {
      "name": "@opencode-ai/sdk",
-      "version": "1.16.0",
+      "version": "1.15.13",
      "dependencies": {
        "cross-spawn": "catalog:",
      },
@@ -662,7 +662,7 @@
    },
    "packages/server": {
      "name": "@opencode-ai/server",
-      "version": "1.16.0",
+      "version": "1.15.13",
      "dependencies": {
        "@opencode-ai/core": "workspace:*",
        "drizzle-orm": "catalog:",
@@ -676,7 +676,7 @@
    },
    "packages/slack": {
      "name": "@opencode-ai/slack",
-      "version": "1.16.0",
+      "version": "1.15.13",
      "dependencies": {
        "@opencode-ai/sdk": "workspace:*",
        "@slack/bolt": "^3.17.1",
@@ -689,7 +689,7 @@
    },
    "packages/stats/app": {
      "name": "@opencode-ai/stats-app",
-      "version": "1.16.0",
+      "version": "1.15.13",
      "dependencies": {
        "@ibm/plex": "6.4.1",
        "@opencode-ai/stats-core": "workspace:*",
@@ -722,7 +722,7 @@
    },
    "packages/stats/core": {
      "name": "@opencode-ai/stats-core",
-      "version": "1.16.0",
+      "version": "1.15.13",
      "dependencies": {
        "@aws-sdk/client-athena": "3.933.0",
        "@planetscale/database": "1.19.0",
@@ -741,7 +741,7 @@
    },
    "packages/stats/server": {
      "name": "@opencode-ai/stats-server",
-      "version": "1.16.0",
+      "version": "1.15.13",
      "dependencies": {
        "@aws-sdk/client-firehose": "3.933.0",
        "@effect/platform-node": "catalog:",
@@ -781,7 +781,7 @@
    },
    "packages/ui": {
      "name": "@opencode-ai/ui",
-      "version": "1.16.0",
+      "version": "1.15.13",
      "dependencies": {
        "@kobalte/core": "catalog:",
        "@opencode-ai/core": "workspace:*",
@@ -830,7 +830,7 @@
    },
    "packages/web": {
      "name": "@opencode-ai/web",
-      "version": "1.16.0",
+      "version": "1.15.13",
      "dependencies": {
        "@astrojs/cloudflare": "12.6.3",
        "@astrojs/markdown-remark": "6.3.1",
@@ -900,9 +900,9 @@
    "@npmcli/arborist": "9.4.0",
    "@octokit/rest": "22.0.0",
    "@openauthjs/openauth": "0.0.0-20250322224806",
-    "@opentui/core": "0.3.2",
-    "@opentui/keymap": "0.3.2",
-    "@opentui/solid": "0.3.2",
+    "@opentui/core": "0.3.1",
+    "@opentui/keymap": "0.3.1",
+    "@opentui/solid": "0.3.1",
    "@pierre/diffs": "1.1.0-beta.18",
    "@playwright/test": "1.59.1",
    "@sentry/solid": "10.36.0",
@@ -1754,7 +1754,7 @@

    "@opencode-ai/web": ["@opencode-ai/web@workspace:packages/web"],

-    "@openrouter/ai-sdk-provider": ["@openrouter/ai-sdk-provider@2.9.0", "", { "peerDependencies": { "ai": "^6.0.0", "zod": "^3.25.0 || ^4.0.0" } }, "sha512-Seva+NCa0WUQnJIUE5GzHsUv1WTIeyqwz0ELl2VtS6NP+eF+77yCXGFVOMbvoCM7QMjlnhv7931e89R+8pJdcQ=="],
+    "@openrouter/ai-sdk-provider": ["@openrouter/ai-sdk-provider@2.8.1", "", { "peerDependencies": { "ai": "^6.0.0", "zod": "^3.25.0 || ^4.0.0" } }, "sha512-Y6j3yivgoEUf/kutD/k5GX/mzZfioRFoSx0gbQ+mIOzMaH/vJv1rCkztiuvlLw5xRYQil7oxHUZvmSfXqOx1NQ=="],

    "@opentelemetry/api": ["@opentelemetry/api@1.9.0", "", {}, "sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg=="],

@@ -1782,27 +1782,23 @@

    "@opentelemetry/semantic-conventions": ["@opentelemetry/semantic-conventions@1.41.1", "", {}, "sha512-/UhIkaZgPutTFmQ7RnIJGgDXZmtEJ7Dvi86xNTFWcnRxVRNk/aotsqDJYeEvDP+FSMB2SdW+pQzNMcWP0rwuNA=="],

-    "@opentui/core": ["@opentui/core@0.3.2", "", { "dependencies": { "bun-ffi-structs": "0.2.2", "diff": "9.0.0", "marked": "17.0.1", "string-width": "7.2.0", "strip-ansi": "7.1.2", "yoga-layout": "3.2.1" }, "optionalDependencies": { "@opentui/core-darwin-arm64": "0.3.2", "@opentui/core-darwin-x64": "0.3.2", "@opentui/core-linux-arm64": "0.3.2", "@opentui/core-linux-arm64-musl": "0.3.2", "@opentui/core-linux-x64": "0.3.2", "@opentui/core-linux-x64-musl": "0.3.2", "@opentui/core-win32-arm64": "0.3.2", "@opentui/core-win32-x64": "0.3.2" }, "peerDependencies": { "web-tree-sitter": "0.25.10" } }, "sha512-5rCVS/3Obb3iLqg/egLCRArt7hAu3lX/9PWVHqUlnJylCT6b5NYDFljt0r3x8v3VG98LB71UzpnDv7DgmGKATw=="],
+    "@opentui/core": ["@opentui/core@0.3.1", "", { "dependencies": { "bun-ffi-structs": "0.2.2", "diff": "9.0.0", "marked": "17.0.1", "string-width": "7.2.0", "strip-ansi": "7.1.2", "yoga-layout": "3.2.1" }, "optionalDependencies": { "@opentui/core-darwin-arm64": "0.3.1", "@opentui/core-darwin-x64": "0.3.1", "@opentui/core-linux-arm64": "0.3.1", "@opentui/core-linux-x64": "0.3.1", "@opentui/core-win32-arm64": "0.3.1", "@opentui/core-win32-x64": "0.3.1" }, "peerDependencies": { "web-tree-sitter": "0.25.10" } }, "sha512-kQFSsSCgtlasSqTigCgKmM67xaquGvTg+vwimDnFSZtcBEt4E3dz7qLrbeh5FVvTA+RMbwe+Bozq03PW+SgjXw=="],

-    "@opentui/core-darwin-arm64": ["@opentui/core-darwin-arm64@0.3.2", "", { "os": "darwin", "cpu": "arm64" }, "sha512-rFnGfqqEOGiUTbxglpiDA500KeRqcI1ukemhNfDrEzx3imAArS8mFZSuUG7ib31P5EpX+PXuvg0G9/3YXfgWeQ=="],
+    "@opentui/core-darwin-arm64": ["@opentui/core-darwin-arm64@0.3.1", "", { "os": "darwin", "cpu": "arm64" }, "sha512-krvVfiBpeBY+727R8yogdqIcxkK3RUVcI97bqjl8jTeDMcWOkFFfHezssRMPmbR5x++1tX669Fz3fuxoe7XUIg=="],

-    "@opentui/core-darwin-x64": ["@opentui/core-darwin-x64@0.3.2", "", { "os": "darwin", "cpu": "x64" }, "sha512-Z+/GxKvB3NzMDSwuyWR7HDStbaNRf5a09lt5W9b4BGmCAFW/mbX0Tuh3kloubcMgiq5vLnVaNzY19hrIgJrjGQ=="],
+    "@opentui/core-darwin-x64": ["@opentui/core-darwin-x64@0.3.1", "", { "os": "darwin", "cpu": "x64" }, "sha512-D/6ec5H8SPpSBMr01/sqgSddIl1Qc1QMKsDl/wV5MpbxYc7Qvie9qlNvvoSsWNfAXAbafLRb1jQBzouk41cp1w=="],

-    "@opentui/core-linux-arm64": ["@opentui/core-linux-arm64@0.3.2", "", { "os": "linux", "cpu": "arm64" }, "sha512-0TRuGNR+2GGk0rQuDaIxkIa/3Ty/XySfeOQLAUX4Jqaifky04As69fYT17yOhHqg5viCJUAGG/SdW8IH6C2osg=="],
+    "@opentui/core-linux-arm64": ["@opentui/core-linux-arm64@0.3.1", "", { "os": "linux", "cpu": "arm64" }, "sha512-E/FFBoAsWJyS/EO/cF7h7DuEENYa9nAdSv1W/TIyKXpBisN6K3U1Xgbk528TkfWjrwJjhGs+9OMYdXuAHd5LTw=="],

-    "@opentui/core-linux-arm64-musl": ["@opentui/core-linux-arm64-musl@0.3.2", "", { "os": "linux", "cpu": "arm64" }, "sha512-noDKfwYUjutQUx5rtoyKrBIYaeSCmAmtxOSJdnKecyWEhMygtdHp4ssPtxzsZMuQAliHogCmD7vUG/pGMgcXMQ=="],
+    "@opentui/core-linux-x64": ["@opentui/core-linux-x64@0.3.1", "", { "os": "linux", "cpu": "x64" }, "sha512-Btb7Q4BOC55Aj2qCs0VoxGuj87DNfUEaSx0z89oeU4npTN+6SpJApyGZTCNNeSe2sdmOGeh/8eAR4X96ORjcKg=="],

-    "@opentui/core-linux-x64": ["@opentui/core-linux-x64@0.3.2", "", { "os": "linux", "cpu": "x64" }, "sha512-EZp+Lg9eZwzwNny4l2ACHdC95JbEKYbor1WImnm6IEo1e2Fgl9mltYv2J+i+Ea+dXQbrkK/MRIw7CRusxfqFFA=="],
+    "@opentui/core-win32-arm64": ["@opentui/core-win32-arm64@0.3.1", "", { "os": "win32", "cpu": "arm64" }, "sha512-+lt24u3KwEPG69oXDOLz9N484wPcAHvrPbDNU77OT6DvWew+StAjh40eY+Zeu0TkTNDWfj7qnQKV0GKWtFA3cw=="],

-    "@opentui/core-linux-x64-musl": ["@opentui/core-linux-x64-musl@0.3.2", "", { "os": "linux", "cpu": "x64" }, "sha512-/FNGeJYhCHcIE3qBIo+nl8014NZ8u/XXUwQY2RjuWhMnzK9kQUfZ3cW4FP6FkOA/k4jGvByya47193II6djFtw=="],
+    "@opentui/core-win32-x64": ["@opentui/core-win32-x64@0.3.1", "", { "os": "win32", "cpu": "x64" }, "sha512-eVkKMYirYgpn92lI0YT/GKru4J+UiXjzwyzNRFX+P59OHXvL3GFdqJMcJmX4/zvyjg4c8HDnU79YLnyG+TlXLw=="],

-    "@opentui/core-win32-arm64": ["@opentui/core-win32-arm64@0.3.2", "", { "os": "win32", "cpu": "arm64" }, "sha512-/zb5nCZKDgBS1UEQXrzTYUbbTPFMygbiZ/BfNWjEDIbm63gVzQ7pVouYbGP+88CRXIJtwT6LeoVPgp9nmOrDWQ=="],
+    "@opentui/keymap": ["@opentui/keymap@0.3.1", "", { "dependencies": { "@opentui/core": "0.3.1" }, "peerDependencies": { "@opentui/react": "0.3.1", "@opentui/solid": "0.3.1", "react": ">=19.2.0", "solid-js": "1.9.12" }, "optionalPeers": ["@opentui/react", "@opentui/solid", "react", "solid-js"] }, "sha512-BTj+ggsarO2uyvd6CWzvgfsekA8c4aEclbAPKPZGVjBI3Fo5+KAHUrXvteFO5qpGMANfEJTtVHoRu5cic1Nlaw=="],

-    "@opentui/core-win32-x64": ["@opentui/core-win32-x64@0.3.2", "", { "os": "win32", "cpu": "x64" }, "sha512-q8xqMhW1jlJVzos+A5+FXRquH01j1ZHmrNi/9++W1Ebz3LQYn+8Z8j7rcV/meIiDuo9nyRHigQQT+cy9xV4N2g=="],
-
-    "@opentui/keymap": ["@opentui/keymap@0.3.2", "", { "dependencies": { "@opentui/core": "0.3.2" }, "peerDependencies": { "@opentui/react": "0.3.2", "@opentui/solid": "0.3.2", "react": ">=19.2.0", "solid-js": "1.9.12" }, "optionalPeers": ["@opentui/react", "@opentui/solid", "react", "solid-js"] }, "sha512-y+IPBagxPvVrKIISmlfvO7ScvVIXGMmV92x0O+WzQ2vPf6fi5xgJc4YNmgEACfGdnM3ub14MkgEXqMOeUN7ZQA=="],
-
-    "@opentui/solid": ["@opentui/solid@0.3.2", "", { "dependencies": { "@babel/core": "7.28.0", "@babel/preset-typescript": "7.27.1", "@opentui/core": "0.3.2", "babel-plugin-module-resolver": "5.0.2", "babel-preset-solid": "1.9.12", "entities": "7.0.1", "s-js": "^0.4.9" }, "peerDependencies": { "solid-js": "1.9.12" } }, "sha512-Yff0gSwIY/o0XeMciYeAUkQtea8bWzR0UjjVglmcBe13hWuJZt/GfjbDMdNNQ8zCrLubLEh04an5fYXCd7NMYQ=="],
+    "@opentui/solid": ["@opentui/solid@0.3.1", "", { "dependencies": { "@babel/core": "7.28.0", "@babel/preset-typescript": "7.27.1", "@opentui/core": "0.3.1", "babel-plugin-module-resolver": "5.0.2", "babel-preset-solid": "1.9.12", "entities": "7.0.1", "s-js": "^0.4.9" }, "peerDependencies": { "solid-js": "1.9.12" } }, "sha512-2R6wEijfMub9COTBCm8IKVj2y7+Sc4fZZjJawxk8sE6+++mzeUaokKNJTlYhZXpMju4LKMv6j9CjWkG8JYfbcg=="],

    "@oslojs/asn1": ["@oslojs/asn1@1.0.0", "", { "dependencies": { "@oslojs/binary": "1.0.0" } }, "sha512-zw/wn0sj0j0QKbIXfIlnEcTviaCzYOY3V5rAyjR6YtOByFtJiT574+8p9Wlach0lZH9fddD4yb9laEAIl4vXQA=="],

@@ -5812,8 +5808,6 @@

    "ai-gateway-provider/@ai-sdk/openai": ["@ai-sdk/openai@3.0.53", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.23" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-Wld+Rbc05KaUn08uBt06eEuwcgalcIFtIl32Yp+GxuZXUQwOb6YeAuq+C6da4ch6BurFoqEaLemJVwjBb7x+PQ=="],

-    "ai-gateway-provider/@openrouter/ai-sdk-provider": ["@openrouter/ai-sdk-provider@2.8.1", "", { "peerDependencies": { "ai": "^6.0.0", "zod": "^3.25.0 || ^4.0.0" } }, "sha512-Y6j3yivgoEUf/kutD/k5GX/mzZfioRFoSx0gbQ+mIOzMaH/vJv1rCkztiuvlLw5xRYQil7oxHUZvmSfXqOx1NQ=="],
-
    "ajv-keywords/ajv": ["ajv@6.15.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-fgFx7Hfoq60ytK2c7DhnF8jIvzYgOMxfugjLOSMHjLIPgenqa7S7oaagATUq99mV6IYvN2tRmC0wnTYX6iPbMw=="],

    "ansi-align/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=="],
@@ -2,7 +2,7 @@
 exact = true
 # Only install newly resolved package versions published at least 3 days ago.
 minimumReleaseAge = 259200
-minimumReleaseAgeExcludes = ["@ai-sdk/amazon-bedrock", "@opentui/core", "@opentui/core-darwin-arm64", "@opentui/core-darwin-x64", "@opentui/core-linux-arm64", "@opentui/core-linux-arm64-musl", "@opentui/core-linux-x64", "@opentui/core-linux-x64-musl", "@opentui/core-win32-arm64", "@opentui/core-win32-x64", "@opentui/keymap", "@opentui/solid", "gitlab-ai-provider"]
+minimumReleaseAgeExcludes = ["@ai-sdk/amazon-bedrock", "@opentui/core", "@opentui/core-darwin-arm64", "@opentui/core-darwin-x64", "@opentui/core-linux-arm64", "@opentui/core-linux-x64", "@opentui/core-win32-arm64", "@opentui/core-win32-x64", "@opentui/keymap", "@opentui/solid", "gitlab-ai-provider"]

 [test]
 root = "./do-not-run-tests-from-root"
@@ -1,8 +1,8 @@
 {
  "nodeModules": {
-    "x86_64-linux": "sha256-mXTzANDuuy+BY4vzhuuL5Q6JVVTJCKdHuD/Fo8pSfgI=",
-    "aarch64-linux": "sha256-t1Uf+PIDvj9bogsSo2Dg1e+zJM2CHQ8lpA/I3vFQA1Q=",
-    "aarch64-darwin": "sha256-HKpMwzpYhCQOu0xHugi4ZIC/Va2BSiQpM2TbA6BEZDU=",
-    "x86_64-darwin": "sha256-m5h7h9KxkcIrdTO2QzQftq68d0Ru0IsCfu3WzMp4P68="
+    "x86_64-linux": "sha256-dvFu5Cbs8MFoSBQXwv4HN2vyh5p20dh6QC5zZiFr0qs=",
+    "aarch64-linux": "sha256-l0xO7Nocl6enQxLQlLB71mG+NuT6I1eQQ1FgLtYGQOg=",
+    "aarch64-darwin": "sha256-WY6Lstxt4n4n63kYZUX09birHx7sNvl0Pegc6L13mGE=",
+    "x86_64-darwin": "sha256-sZdG40TSE9KhrmLQyQMPRugGo6R7AS3wgHiEGYtcXtc="
  }
 }
@@ -39,9 +39,9 @@
      "@octokit/rest": "22.0.0",
      "@hono/standard-validator": "0.2.0",
      "@hono/zod-validator": "0.4.2",
-      "@opentui/core": "0.3.2",
-      "@opentui/keymap": "0.3.2",
-      "@opentui/solid": "0.3.2",
+      "@opentui/core": "0.3.1",
+      "@opentui/keymap": "0.3.1",
+      "@opentui/solid": "0.3.1",
      "ulid": "3.0.1",
      "@kobalte/core": "0.13.11",
      "@types/luxon": "3.7.1",
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/app",
-  "version": "1.16.0",
+  "version": "1.15.13",
  "description": "",
  "type": "module",
  "exports": {
@@ -16,8 +16,14 @@ export const DialogSettings: Component = () => {
  const platform = usePlatform()

  return (
-    <Dialog size="x-large" variant="settings" class="settings-v2-dialog">
-      <TabsV2 orientation="vertical" variant="settings" defaultValue="general" class="settings-v2">
+    <Dialog size="x-large" class="settings-v2-dialog" data-component="settings-v2-dialog">
+      <TabsV2
+        orientation="vertical"
+        variant="settings"
+        defaultValue="general"
+        class="settings-v2"
+        data-component="settings-v2"
+      >
        <TabsV2.List>
          <div class="flex flex-col justify-between h-full w-full">
            <div class="flex flex-col gap-3 w-full">
@@ -1,15 +1,11 @@
@import "@opencode-ai/ui/v2/text-input-v2.css";
@import "@opencode-ai/ui/v2/button-v2.css";

-[data-component="tabs-v2"][data-variant="settings"] {
+[data-component="settings-v2"] {
  height: 100%;
 }

-[data-component="dialog-v2"][data-variant="settings"] [data-slot="dialog-container"] {
-  background: var(--v2-background-bg-base);
-}
-
-[data-component="dialog-v2"][data-variant="settings"] [data-slot="dialog-body"] {
+[data-component="settings-v2-dialog"] [data-slot="dialog-body"] {
  padding: 0;
  overflow: hidden;
 }
@@ -85,6 +81,10 @@
  box-shadow: inset 0 0 0 0.5px var(--v2-border-border-muted);
 }

+[data-slot="dialog-container"]:has(.settings-v2-dialog) {
+  box-shadow: var(--v2-elevation-overlay);
+}
+
 [data-component="settings-v2-row"] {
  display: flex;
  flex-wrap: wrap;
@@ -153,12 +153,12 @@
  width: 100%;
 }

-[data-component="dialog-v2"][data-variant="settings"] [data-component="select-v2-root"] {
+[data-component="settings-v2-dialog"] [data-component="select-v2-root"] {
  width: fit-content;
  max-width: 100%;
 }

-[data-component="dialog-v2"][data-variant="settings"] [data-component="button-v2"] {
+[data-component="settings-v2-dialog"] [data-component="button-v2"] {
  width: fit-content;
  max-width: 100%;
 }
@@ -467,7 +467,6 @@ export const dict = {

  "error.page.title": "Something went wrong",
  "error.page.description": "An error occurred while loading the application.",
-  "error.page.description.localServerStartup": "An error occurred while starting the local server.",
  "error.page.details.label": "Error Details",
  "error.page.action.restart": "Restart",
  "error.page.action.report": "Report Error",
@@ -1,17 +0,0 @@
-import { describe, expect, test } from "bun:test"
-import { errorDescriptionKey } from "./error-description"
-
-describe("error description", () => {
-  test("describes local server startup errors", () => {
-    expect(errorDescriptionKey(Object.assign(new Error("migration failed"), { localServerStartup: true }))).toBe(
-      "error.page.description.localServerStartup",
-    )
-  })
-
-  test("uses the generic description for other errors", () => {
-    expect(errorDescriptionKey(new Error("unknown"))).toBe("error.page.description")
-    expect(errorDescriptionKey(Object.assign(new Error("unknown"), { localServerStartup: false }))).toBe(
-      "error.page.description",
-    )
-  })
-})
@@ -1,11 +0,0 @@
-export function errorDescriptionKey(error: unknown) {
-  if (
-    typeof error === "object" &&
-    error !== null &&
-    "localServerStartup" in error &&
-    error.localServerStartup === true
-  ) {
-    return "error.page.description.localServerStartup" as const
-  }
-  return "error.page.description" as const
-}
@@ -7,7 +7,6 @@ import { createStore } from "solid-js/store"
 import { usePlatform } from "@/context/platform"
 import { useLanguage } from "@/context/language"
 import { Icon } from "@opencode-ai/ui/icon"
-import { errorDescriptionKey } from "./error-description"

 export type InitError = {
  name: string
@@ -290,7 +289,7 @@ export const ErrorPage: Component<ErrorPageProps> = (props) => {
        <Logo class="w-58.5 opacity-12 shrink-0" />
        <div class="flex flex-col items-center gap-2 text-center">
          <h1 class="text-lg font-medium text-text-strong">{language.t("error.page.title")}</h1>
-          <p class="text-sm text-text-weak">{language.t(errorDescriptionKey(props.error))}</p>
+          <p class="text-sm text-text-weak">{language.t("error.page.description")}</p>
        </div>
        <TextField
          value={formattedError()}
@@ -270,7 +270,7 @@ function HomeDesign() {
  }

  return (
-    <div class="rounded-[10px] shadow-[var(--v2-elevation-raised)] m-2 bg-v2-background-bg-base self-stretch flex-1">
+    <div class="rounded-[10px] shadow-[var(--v2-elevation-raised)] m-2 bg-background-base self-stretch flex-1">
      <div class="mx-auto grid w-full h-full max-w-[1080px] gap-8 px-6 pb-16 lg:grid-cols-[280px_minmax(0,720px)]">
        <HomeProjectColumn
          projects={projects()}
@@ -34,7 +34,7 @@ const scriptDir = path.dirname(fs.realpathSync(__filename))
 const cached = path.join(scriptDir, ".lildax")
 const platform = { darwin: "darwin", linux: "linux", win32: "windows" }[os.platform()] || os.platform()
 const arch = { x64: "x64", arm64: "arm64", arm: "arm" }[os.arch()] || os.arch()
-const base = "@opencode-ai/cli-" + platform + "-" + arch
+const base = "@opencode-ai/lildax-" + platform + "-" + arch
 const binary = platform === "windows" ? "lildax.exe" : "lildax"

 function supportsAvx2() {
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode-ai/cli",
-  "version": "1.16.0",
+  "version": "1.15.13",
  "type": "module",
  "license": "MIT",
  "bin": {
@@ -44,7 +44,7 @@ const targets = singleFlag
  : allTargets

 for (const item of targets) {
-  const target = [
+  const name = [
    binary,
    item.os === "win32" ? "windows" : item.os,
    item.arch,
@@ -53,7 +53,6 @@ for (const item of targets) {
  ]
    .filter(Boolean)
    .join("-")
-  const name = target.replace(binary, "cli")
  console.log(`building ${name}`)
  const result = await Bun.build({
    entrypoints: ["./src/index.ts"],
@@ -68,7 +67,7 @@ for (const item of targets) {
      autoloadDotenv: false,
      autoloadTsconfig: true,
      autoloadPackageJson: true,
-      target: target.replace(binary, "bun") as Bun.Build.CompileTarget,
+      target: name.replace(binary, "bun") as Bun.Build.CompileTarget,
      outfile: `./dist/${name}/bin/${binary}`,
      execArgv: [`--user-agent=${binary}/${Script.version}`, "--use-system-ca", "--"],
      windows: {},
@@ -94,7 +93,6 @@ for (const item of targets) {
        name: `@opencode-ai/${name}`,
        version: Script.version,
        license: "MIT",
-        repository: { type: "git", url: "git+https://github.com/anomalyco/opencode.git" },
        os: [item.os],
        cpu: [item.arch],
      },
@@ -35,7 +35,6 @@ await Bun.file(`./dist/${pkg.name}/package.json`).write(
      bin: { lildax: "./bin/lildax" },
      version,
      license: pkg.license,
-      repository: { type: "git", url: "git+https://github.com/anomalyco/opencode.git" },
      os: ["darwin", "linux", "win32"],
      cpu: ["arm64", "x64"],
      optionalDependencies: binaries,
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/console-app",
-  "version": "1.16.0",
+  "version": "1.15.13",
  "type": "module",
  "license": "MIT",
  "scripts": {
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode-ai/console-core",
-  "version": "1.16.0",
+  "version": "1.15.13",
  "private": true,
  "type": "module",
  "license": "MIT",
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/console-function",
-  "version": "1.16.0",
+  "version": "1.15.13",
  "$schema": "https://json.schemastore.org/package.json",
  "private": true,
  "type": "module",
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/console-mail",
-  "version": "1.16.0",
+  "version": "1.15.13",
  "dependencies": {
    "@jsx-email/all": "2.2.3",
    "@jsx-email/cli": "1.4.3",
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/console-support",
-  "version": "1.16.0",
+  "version": "1.15.13",
  "type": "module",
  "license": "MIT",
  "scripts": {
@@ -1,28 +0,0 @@
-DELETE FROM `session_input`;--> statement-breakpoint
-DELETE FROM `session_message`;--> statement-breakpoint
-DELETE FROM `event`;--> statement-breakpoint
-DELETE FROM `event_sequence`;--> statement-breakpoint
-UPDATE `session` SET `workspace_id` = NULL;--> statement-breakpoint
-DELETE FROM `workspace`;--> statement-breakpoint
-DROP INDEX IF EXISTS `event_aggregate_seq_idx`;--> statement-breakpoint
-CREATE UNIQUE INDEX `event_aggregate_seq_idx` ON `event` (`aggregate_id`,`seq`);--> statement-breakpoint
-DROP INDEX IF EXISTS `session_message_session_seq_idx`;--> statement-breakpoint
-CREATE UNIQUE INDEX `session_message_session_seq_idx` ON `session_message` (`session_id`,`seq`);--> statement-breakpoint
-PRAGMA foreign_keys=OFF;--> statement-breakpoint
-CREATE TABLE `__new_session_input` (
-	`id` text PRIMARY KEY,
-	`session_id` text NOT NULL,
-	`prompt` text NOT NULL,
-	`delivery` text NOT NULL,
-	`admitted_seq` integer NOT NULL,
-	`promoted_seq` integer,
-	`time_created` integer NOT NULL,
-	CONSTRAINT `fk_session_input_session_id_session_id_fk` FOREIGN KEY (`session_id`) REFERENCES `session`(`id`) ON DELETE CASCADE
-);
--> statement-breakpoint
-DROP TABLE `session_input`;--> statement-breakpoint
-ALTER TABLE `__new_session_input` RENAME TO `session_input`;--> statement-breakpoint
-PRAGMA foreign_keys=ON;--> statement-breakpoint
-CREATE INDEX `session_input_session_pending_delivery_seq_idx` ON `session_input` (`session_id`,`promoted_seq`,`delivery`,`admitted_seq`);--> statement-breakpoint
-CREATE UNIQUE INDEX `session_input_session_admitted_seq_idx` ON `session_input` (`session_id`,`admitted_seq`);--> statement-breakpoint
-CREATE UNIQUE INDEX `session_input_session_promoted_seq_idx` ON `session_input` (`session_id`,`promoted_seq`);
@@ -1,6 +1,6 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
-  "version": "1.16.0",
+  "version": "1.15.13",
  "name": "@opencode-ai/core",
  "type": "module",
  "license": "MIT",
@@ -17,7 +17,6 @@
    "opencode": "./bin/opencode"
  },
  "exports": {
-    "./public": "./src/public/index.ts",
    "./session/runner": "./src/session/runner/index.ts",
    "./*": "./src/*.ts"
  },
@@ -90,7 +89,7 @@
    "@opentelemetry/exporter-trace-otlp-http": "0.214.0",
    "@opentelemetry/sdk-trace-base": "2.6.1",
    "@parcel/watcher": "2.5.1",
-    "@openrouter/ai-sdk-provider": "2.9.0",
+    "@openrouter/ai-sdk-provider": "2.8.1",
    "ai-gateway-provider": "3.1.2",
    "bun-pty": "0.4.8",
    "cross-spawn": "catalog:",
@@ -1,128 +0,0 @@
-export * as MoveSession from "./move-session"
-
-import { Context, DateTime, Effect, Layer, Schema } from "effect"
-import { EventV2 } from "../event"
-import { Git } from "../git"
-import { Location } from "../location"
-import { ProjectV2 } from "../project"
-import { SessionV2 } from "../session"
-import { SessionEvent } from "../session/event"
-import { SessionSchema } from "../session/schema"
-import { AbsolutePath, RelativePath } from "../schema"
-import path from "path"
-
-export const Destination = Schema.Struct({
-  directory: AbsolutePath,
-}).annotate({ identifier: "MoveSession.Destination" })
-export type Destination = typeof Destination.Type
-
-export const Input = Schema.Struct({
-  sessionID: SessionSchema.ID,
-  destination: Destination,
-  moveChanges: Schema.optional(Schema.Boolean),
-}).annotate({ identifier: "MoveSession.Input" })
-export type Input = typeof Input.Type
-
-export class DestinationProjectMismatchError extends Schema.TaggedErrorClass<DestinationProjectMismatchError>()(
-  "MoveSession.DestinationProjectMismatchError",
-  {
-    expected: ProjectV2.ID,
-    actual: ProjectV2.ID,
-  },
-) {}
-
-export class ApplyChangesError extends Schema.TaggedErrorClass<ApplyChangesError>()("MoveSession.ApplyChangesError", {
-  message: Schema.String,
-}) {}
-
-export class CaptureChangesError extends Schema.TaggedErrorClass<CaptureChangesError>()(
-  "MoveSession.CaptureChangesError",
-  {
-    message: Schema.String,
-  },
-) {}
-
-export class ResetSourceChangesError extends Schema.TaggedErrorClass<ResetSourceChangesError>()(
-  "MoveSession.ResetSourceChangesError",
-  {
-    directory: AbsolutePath,
-    message: Schema.String,
-    cause: Schema.optional(Schema.Defect),
-  },
-) {}
-
-export type Error =
-  | SessionV2.NotFoundError
-  | DestinationProjectMismatchError
-  | CaptureChangesError
-  | ApplyChangesError
-  | ResetSourceChangesError
-
-export interface Interface {
-  readonly moveSession: (input: Input) => Effect.Effect<void, Error>
-}
-
-export class Service extends Context.Service<Service, Interface>()("@opencode/ControlPlaneMoveSession") {}
-
-export const layer = Layer.effect(
-  Service,
-  Effect.gen(function* () {
-    const git = yield* Git.Service
-    const events = yield* EventV2.Service
-    const project = yield* ProjectV2.Service
-    const session = yield* SessionV2.Service
-
-    const moveSession = Effect.fn("MoveSession.moveSession")(function* (input: Input) {
-      const current = yield* session.get(input.sessionID)
-      const directory = AbsolutePath.make(input.destination.directory)
-      if (current.location.directory === directory) return
-
-      const source = yield* project.resolve(current.location.directory)
-      const destination = yield* project.resolve(directory)
-      if (current.projectID !== destination.id) {
-        return yield* new DestinationProjectMismatchError({ expected: current.projectID, actual: destination.id })
-      }
-
-      const patch =
-        input.moveChanges && source.directory !== destination.directory
-          ? yield* git
-              .patch(current.location.directory)
-              .pipe(Effect.mapError((error) => new CaptureChangesError({ message: error.message })))
-          : ""
-      if (patch) {
-        yield* git
-          .applyPatch({ directory, patch })
-          .pipe(Effect.mapError((error) => new ApplyChangesError({ message: error.message })))
-      }
-
-      yield* events.publish(SessionEvent.Moved, {
-        sessionID: input.sessionID,
-        location: Location.Ref.make({ directory }),
-        subdirectory: RelativePath.make(path.relative(destination.directory, directory).replaceAll("\\", "/")),
-        timestamp: yield* DateTime.now,
-      })
-
-      if (patch) {
-        yield* git.softResetChanges(current.location.directory).pipe(
-          Effect.mapError(
-            (error) =>
-              new ResetSourceChangesError({
-                directory: current.location.directory,
-                message: error.message,
-                cause: error.cause,
-              }),
-          ),
-        )
-      }
-    })
-
-    return Service.of({ moveSession })
-  }),
-)
-
-export const defaultLayer = layer.pipe(
-  Layer.provide(Git.defaultLayer),
-  Layer.provide(EventV2.defaultLayer),
-  Layer.provide(ProjectV2.defaultLayer),
-  Layer.provide(SessionV2.defaultLayer),
-)
@@ -31,6 +31,5 @@ export const migrations = (
    import("./migration/20260603040000_session_message_projection_order"),
    import("./migration/20260603141458_session_input_inbox"),
    import("./migration/20260603160727_jittery_ezekiel_stane"),
-    import("./migration/20260604172448_event_sourced_session_input"),
  ])
 ).map((module) => module.default) satisfies DatabaseMigration.Migration[]
@@ -1,47 +0,0 @@
-import { Effect } from "effect"
-import type { DatabaseMigration } from "../migration"
-
-export default {
-  id: "20260604172448_event_sourced_session_input",
-  up(tx) {
-    return Effect.gen(function* () {
-      yield* tx.run(`DELETE FROM \`session_input\`;`)
-      yield* tx.run(`DELETE FROM \`session_message\`;`)
-      yield* tx.run(`DELETE FROM \`event\`;`)
-      yield* tx.run(`DELETE FROM \`event_sequence\`;`)
-      yield* tx.run(`UPDATE \`session\` SET \`workspace_id\` = NULL;`)
-      yield* tx.run(`DELETE FROM \`workspace\`;`)
-      yield* tx.run(`DROP INDEX IF EXISTS \`event_aggregate_seq_idx\`;`)
-      yield* tx.run(`CREATE UNIQUE INDEX \`event_aggregate_seq_idx\` ON \`event\` (\`aggregate_id\`,\`seq\`);`)
-      yield* tx.run(`DROP INDEX IF EXISTS \`session_message_session_seq_idx\`;`)
-      yield* tx.run(
-        `CREATE UNIQUE INDEX \`session_message_session_seq_idx\` ON \`session_message\` (\`session_id\`,\`seq\`);`,
-      )
-      yield* tx.run(`PRAGMA foreign_keys=OFF;`)
-      yield* tx.run(`
-        CREATE TABLE \`__new_session_input\` (
-          \`id\` text PRIMARY KEY,
-          \`session_id\` text NOT NULL,
-          \`prompt\` text NOT NULL,
-          \`delivery\` text NOT NULL,
-          \`admitted_seq\` integer NOT NULL,
-          \`promoted_seq\` integer,
-          \`time_created\` integer NOT NULL,
-          CONSTRAINT \`fk_session_input_session_id_session_id_fk\` FOREIGN KEY (\`session_id\`) REFERENCES \`session\`(\`id\`) ON DELETE CASCADE
-        );
-      `)
-      yield* tx.run(`DROP TABLE \`session_input\`;`)
-      yield* tx.run(`ALTER TABLE \`__new_session_input\` RENAME TO \`session_input\`;`)
-      yield* tx.run(`PRAGMA foreign_keys=ON;`)
-      yield* tx.run(
-        `CREATE INDEX \`session_input_session_pending_delivery_seq_idx\` ON \`session_input\` (\`session_id\`,\`promoted_seq\`,\`delivery\`,\`admitted_seq\`);`,
-      )
-      yield* tx.run(
-        `CREATE UNIQUE INDEX \`session_input_session_admitted_seq_idx\` ON \`session_input\` (\`session_id\`,\`admitted_seq\`);`,
-      )
-      yield* tx.run(
-        `CREATE UNIQUE INDEX \`session_input_session_promoted_seq_idx\` ON \`session_input\` (\`session_id\`,\`promoted_seq\`);`,
-      )
-    })
-  },
-} satisfies DatabaseMigration.Migration
@@ -1,15 +1,14 @@
 export * as EventV2 from "./event"

-import { Cause, Context, Effect, Layer, Option, PubSub, Schema, Stream } from "effect"
+import { Context, Effect, Layer, Option, PubSub, Schema, Stream } from "effect"
 import { and, asc, eq, gt } from "drizzle-orm"
 import { Database } from "./database/database"
 import { EventSequenceTable, EventTable } from "./event/sql"
 import { Location } from "./location"
 import { externalID, type ExternalID, NonNegativeInt, withStatics } from "./schema"
 import { Identifier } from "./util/identifier"
-import { isDeepStrictEqual } from "node:util"

-export const ID = Schema.String.check(Schema.isStartsWith("evt_")).pipe(
+export const ID = Schema.String.pipe(
  Schema.brand("Event.ID"),
  withStatics((schema) => ({
    create: () => schema.make("evt_" + Identifier.ascending()),
@@ -259,47 +258,16 @@ export const layerWith = (options?: LayerOptions) =>
                            .get()
                            .pipe(Effect.orDie)
                          const latest = row?.seq ?? -1
-                          const encoded = syncRegistry
-                            .get(versionedType(definition.type, sync.version))!
-                            .encode(event.data) as Record<string, unknown>
-                          if (input?.strictOwner && row?.ownerID && row.ownerID !== input.ownerID) {
-                            yield* Effect.die(
-                              new InvalidSyncEventError({
-                                type: event.type,
-                                message: `Replay owner mismatch for aggregate ${aggregateID}: expected ${row.ownerID}, got ${input.ownerID ?? "none"}`,
-                              }),
-                            )
-                          }
-                          if (input && input.seq <= latest) {
-                            const stored = yield* db
-                              .select()
-                              .from(EventTable)
-                              .where(and(eq(EventTable.aggregate_id, aggregateID), eq(EventTable.seq, input.seq)))
-                              .get()
-                              .pipe(Effect.orDie)
-                            if (
-                              stored?.id === event.id &&
-                              stored.type === versionedType(definition.type, sync.version) &&
-                              isDeepStrictEqual(stored.data, encoded)
-                            ) {
-                              if (input.ownerID && row?.ownerID == null) {
-                                yield* db
-                                  .update(EventSequenceTable)
-                                  .set({ owner_id: input.ownerID })
-                                  .where(eq(EventSequenceTable.aggregate_id, aggregateID))
-                                  .run()
-                                  .pipe(Effect.orDie)
-                              }
-                              return
-                            }
-                            yield* Effect.die(
-                              new InvalidSyncEventError({
-                                type: event.type,
-                                message: `Replay diverged at aggregate ${aggregateID} sequence ${input.seq}`,
-                              }),
-                            )
-                          }
+                          if (input && input.seq <= latest) return
                          if (input && row?.ownerID && row.ownerID !== input.ownerID) {
+                            if (input.strictOwner) {
+                              yield* Effect.die(
+                                new InvalidSyncEventError({
+                                  type: event.type,
+                                  message: `Replay owner mismatch for aggregate ${aggregateID}: expected ${row.ownerID}, got ${input.ownerID ?? "none"}`,
+                                }),
+                              )
+                            }
                            return
                          }
                          const seq = input?.seq ?? latest + 1
@@ -311,25 +279,15 @@ export const layerWith = (options?: LayerOptions) =>
                              }),
                            )
                          }
-                          const stored = yield* db
-                            .select({ aggregateID: EventTable.aggregate_id, seq: EventTable.seq })
-                            .from(EventTable)
-                            .where(eq(EventTable.id, event.id))
-                            .get()
-                            .pipe(Effect.orDie)
-                          if (stored)
-                            yield* Effect.die(
-                              new InvalidSyncEventError({
-                                type: event.type,
-                                message: `Event ${event.id} already exists at aggregate ${stored.aggregateID} sequence ${stored.seq}`,
-                              }),
-                            )
                          for (const guard of commitGuards) {
                            yield* guard(event)
                          }
                          for (const projector of list) {
                            yield* projector({ ...event, seq } as Payload)
                          }
+                          const encoded = syncRegistry
+                            .get(versionedType(definition.type, sync.version))!
+                            .encode(event.data)
                          yield* db
                            .insert(EventSequenceTable)
                            .values([{ aggregate_id: aggregateID, seq, owner_id: input?.ownerID }])
@@ -350,7 +308,7 @@ export const layerWith = (options?: LayerOptions) =>
                                aggregate_id: aggregateID,
                                seq,
                                type: versionedType(definition.type, sync.version),
-                                data: encoded,
+                                data: encoded as Record<string, unknown>,
                              },
                            ])
                            .run()
@@ -379,40 +337,19 @@ export const layerWith = (options?: LayerOptions) =>
        return Effect.gen(function* () {
          const durable = registry.get(event.type)?.sync !== undefined
          if (durable) {
-            const committed = yield* commitSyncEvent(event as Payload)
-            if (committed) {
-              event = { ...event, seq: committed.seq }
-              yield* Effect.forEach(syncHandlers, (sync) => observe(event as Payload, "sync", sync), { discard: true })
-              yield* notify(event as Payload, true)
-              return event
+            for (const sync of syncHandlers) {
+              yield* sync(event as Payload)
            }
+            const committed = yield* commitSyncEvent(event as Payload)
+            if (committed) event = { ...event, seq: committed.seq }
+          }
+          for (const listener of listeners) {
+            yield* listener(event as Payload)
          }
-          yield* notify(event as Payload, false)
-          return event
-        })
-      }
-
-      const observe = (event: Payload, kind: "sync" | "listener", observer: (event: Payload) => Effect.Effect<void>) =>
-        Effect.suspend(() => observer(event)).pipe(
-          Effect.catchCauseIf(
-            (cause) => !Cause.hasInterrupts(cause),
-            (cause) =>
-              Effect.logError("Event observer failed").pipe(
-                Effect.annotateLogs({ eventID: event.id, eventType: event.type, kind, cause }),
-              ),
-          ),
-        )
-
-      function notify(event: Payload, isolateListeners: boolean) {
-        return Effect.gen(function* () {
-          yield* Effect.forEach(
-            listeners,
-            (listener) => (isolateListeners ? observe(event, "listener", listener) : listener(event)),
-            { discard: true },
-          )
          const pubsub = typed.get(event.type)
-          if (pubsub) yield* PubSub.publish(pubsub, event)
-          yield* PubSub.publish(all, event)
+          if (pubsub) yield* PubSub.publish(pubsub, event as Payload)
+          yield* PubSub.publish(all, event as Payload)
+          return event
        })
      }

@@ -459,7 +396,13 @@ export const layerWith = (options?: LayerOptions) =>
              strictOwner: options?.strictOwner,
            })
            if (committed && options?.publish) {
-              yield* notify({ ...payload, seq: committed.seq }, true)
+              const published = { ...payload, seq: committed.seq }
+              for (const listener of listeners) {
+                yield* listener(published)
+              }
+              const pubsub = typed.get(payload.type)
+              if (pubsub) yield* PubSub.publish(pubsub, published)
+              yield* PubSub.publish(all, published)
            }
          }
        })
@@ -1,4 +1,4 @@
-import { sqliteTable, text, integer, index, uniqueIndex } from "drizzle-orm/sqlite-core"
+import { sqliteTable, text, integer, index } from "drizzle-orm/sqlite-core"
 import type { EventV2 } from "../event"

 export const EventSequenceTable = sqliteTable("event_sequence", {
@@ -19,7 +19,7 @@ export const EventTable = sqliteTable(
    data: text({ mode: "json" }).$type<Record<string, unknown>>().notNull(),
  },
  (table) => [
-    uniqueIndex("event_aggregate_seq_idx").on(table.aggregate_id, table.seq),
+    index("event_aggregate_seq_idx").on(table.aggregate_id, table.seq),
    index("event_aggregate_type_seq_idx").on(table.aggregate_id, table.type, table.seq),
  ],
 )
@@ -1,7 +1,7 @@
 export * as Git from "./git"

 import path from "path"
-import { Context, Effect, Layer, Schema, Stream } from "effect"
+import { Context, Effect, Layer, Schema } from "effect"
 import { ChildProcess } from "effect/unstable/process"
 import { AbsolutePath } from "./schema"
 import { FSUtil } from "./fs-util"
@@ -33,13 +33,6 @@ export class WorktreeError extends Schema.TaggedErrorClass<WorktreeError>()("Git
  cause: Schema.optional(Schema.Defect),
 }) {}

-export class PatchError extends Schema.TaggedErrorClass<PatchError>()("Git.PatchError", {
-  operation: Schema.Literals(["capture", "apply", "reset"]),
-  directory: AbsolutePath,
-  message: Schema.String,
-  cause: Schema.optional(Schema.Defect),
-}) {}
-
 export interface Interface {
  readonly find: (input: AbsolutePath) => Effect.Effect<Repo | undefined>
  readonly remote: (repo: Repo, name?: string) => Effect.Effect<string | undefined>
@@ -59,10 +52,6 @@ export interface Interface {
  readonly fetchBranch: (directory: string, branch: string) => Effect.Effect<Result, AppProcess.AppProcessError>
  readonly checkout: (directory: string, branch: string) => Effect.Effect<Result, AppProcess.AppProcessError>
  readonly reset: (directory: string, target: string) => Effect.Effect<Result, AppProcess.AppProcessError>
-  readonly patch: (directory: AbsolutePath) => Effect.Effect<string, PatchError>
-  readonly applyPatch: (input: { directory: AbsolutePath; patch: string }) => Effect.Effect<void, PatchError>
-  readonly resetChanges: (directory: AbsolutePath) => Effect.Effect<void, PatchError>
-  readonly softResetChanges: (directory: AbsolutePath) => Effect.Effect<void, PatchError>
  readonly worktreeCreate: (input: { repo: Repo; directory: AbsolutePath }) => Effect.Effect<void, WorktreeError>
  readonly worktreeRemove: (input: { repo: Repo; directory: AbsolutePath }) => Effect.Effect<void, WorktreeError>
  readonly worktreeList: (repo: Repo) => Effect.Effect<AbsolutePath[], WorktreeError>
@@ -170,156 +159,6 @@ export const layer = Layer.effect(
      execute(directory, proc)(["reset", "--hard", target]),
    )

-    const patch = Effect.fn("Git.patch")(function* (directory: AbsolutePath) {
-      const root = yield* execute(
-        directory,
-        proc,
-      )(["rev-parse", "--show-toplevel"]).pipe(
-        Effect.mapError((cause) => new PatchError({ operation: "capture", directory, message: cause.message, cause })),
-      )
-      if (root.exitCode !== 0) {
-        return yield* new PatchError({
-          operation: "capture",
-          directory,
-          message: root.stderr.trim() || root.text.trim() || "Failed to locate repository root",
-        })
-      }
-      const repo = AbsolutePath.make(resolvePath(directory, root.text))
-      const scope = path.relative(repo, directory).replaceAll("\\", "/") || "."
-      const tracked = yield* execute(
-        repo,
-        proc,
-      )(["diff", "--binary", "HEAD", "--", scope]).pipe(
-        Effect.mapError((cause) => new PatchError({ operation: "capture", directory, message: cause.message, cause })),
-      )
-      if (tracked.exitCode !== 0) {
-        return yield* new PatchError({
-          operation: "capture",
-          directory,
-          message: tracked.stderr.trim() || tracked.text.trim() || "Failed to capture tracked changes",
-        })
-      }
-
-      const untracked = yield* execute(
-        repo,
-        proc,
-      )(["ls-files", "--others", "--exclude-standard", "-z", "--", scope]).pipe(
-        Effect.mapError((cause) => new PatchError({ operation: "capture", directory, message: cause.message, cause })),
-      )
-      if (untracked.exitCode !== 0) {
-        return yield* new PatchError({
-          operation: "capture",
-          directory,
-          message: untracked.stderr.trim() || untracked.text.trim() || "Failed to list untracked changes",
-        })
-      }
-
-      const created = yield* Effect.forEach(untracked.text.split("\0").filter(Boolean), (file) =>
-        execute(
-          repo,
-          proc,
-        )(["diff", "--binary", "--no-index", "--", "/dev/null", file]).pipe(
-          Effect.mapError(
-            (cause) => new PatchError({ operation: "capture", directory, message: cause.message, cause }),
-          ),
-          Effect.flatMap((result) =>
-            // git diff --no-index returns 1 when differences were found.
-            result.exitCode === 0 || result.exitCode === 1
-              ? Effect.succeed(result.text)
-              : Effect.fail(
-                  new PatchError({
-                    operation: "capture",
-                    directory,
-                    message:
-                      result.stderr.trim() || result.text.trim() || `Failed to capture untracked change: ${file}`,
-                  }),
-                ),
-          ),
-        ),
-      )
-      return [tracked.text, ...created].filter(Boolean).join("\n")
-    })
-
-    const applyPatch = Effect.fn("Git.applyPatch")(function* (input: { directory: AbsolutePath; patch: string }) {
-      const result = yield* proc
-        .run(
-          ChildProcess.make("git", ["apply", "-"], {
-            cwd: input.directory,
-            extendEnv: true,
-            stdin: Stream.make(new TextEncoder().encode(input.patch)),
-          }),
-        )
-        .pipe(
-          Effect.mapError(
-            (cause) =>
-              new PatchError({ operation: "apply", directory: input.directory, message: cause.message, cause }),
-          ),
-        )
-      if (result.exitCode === 0) return
-      return yield* new PatchError({
-        operation: "apply",
-        directory: input.directory,
-        message:
-          result.stderr.toString("utf8").trim() || result.stdout.toString("utf8").trim() || "Failed to apply changes",
-      })
-    })
-
-    const resetChanges = Effect.fn("Git.resetChanges")(function* (directory: AbsolutePath) {
-      const reset = yield* execute(
-        directory,
-        proc,
-      )(["reset", "--hard", "HEAD"]).pipe(
-        Effect.mapError((cause) => new PatchError({ operation: "reset", directory, message: cause.message, cause })),
-      )
-      if (reset.exitCode !== 0) {
-        return yield* new PatchError({
-          operation: "reset",
-          directory,
-          message: reset.stderr.trim() || reset.text.trim() || "Failed to reset tracked changes",
-        })
-      }
-      const clean = yield* execute(
-        directory,
-        proc,
-      )(["clean", "-fd"]).pipe(
-        Effect.mapError((cause) => new PatchError({ operation: "reset", directory, message: cause.message, cause })),
-      )
-      if (clean.exitCode === 0) return
-      return yield* new PatchError({
-        operation: "reset",
-        directory,
-        message: clean.stderr.trim() || clean.text.trim() || "Failed to clean untracked changes",
-      })
-    })
-
-    const softResetChanges = Effect.fn("Git.softResetChanges")(function* (directory: AbsolutePath) {
-      const checkout = yield* execute(
-        directory,
-        proc,
-      )(["checkout", "--", "."]).pipe(
-        Effect.mapError((cause) => new PatchError({ operation: "reset", directory, message: cause.message, cause })),
-      )
-      if (checkout.exitCode !== 0) {
-        return yield* new PatchError({
-          operation: "reset",
-          directory,
-          message: checkout.stderr.trim() || checkout.text.trim() || "Failed to restore tracked changes",
-        })
-      }
-      const clean = yield* execute(
-        directory,
-        proc,
-      )(["clean", "-fd", "--", "."]).pipe(
-        Effect.mapError((cause) => new PatchError({ operation: "reset", directory, message: cause.message, cause })),
-      )
-      if (clean.exitCode === 0) return
-      return yield* new PatchError({
-        operation: "reset",
-        directory,
-        message: clean.stderr.trim() || clean.text.trim() || "Failed to clean untracked changes",
-      })
-    })
-
    const worktree = Effect.fnUntraced(function* (
      operation: "create" | "remove" | "list",
      repo: Repo,
@@ -377,10 +216,6 @@ export const layer = Layer.effect(
      fetchBranch,
      checkout,
      reset,
-      patch,
-      applyPatch,
-      resetChanges,
-      softResetChanges,
      worktreeCreate,
      worktreeRemove,
      worktreeList,
@@ -0,0 +1,39 @@
+export * as OpenCode from "./opencode"
+
+import { Context, Effect, Layer } from "effect"
+import { Database } from "./database/database"
+import { EventV2 } from "./event"
+import { LocationServiceMap } from "./location-layer"
+import { ProjectV2 } from "./project"
+import { SessionV2 } from "./session"
+import { SessionProjector } from "./session/projector"
+import * as SessionExecutionLocal from "./session/execution/local"
+import { SessionStore } from "./session/store"
+
+export interface Interface {
+  readonly sessions: SessionV2.Interface
+}
+
+/** Public embedded OpenCode API for Effect-native applications. */
+export class Service extends Context.Service<Service, Interface>()("@opencode/OpenCode") {}
+
+const DefaultSessions = SessionV2.layer.pipe(
+  Layer.provide(SessionProjector.layer),
+  Layer.provide(SessionExecutionLocal.layer),
+  Layer.provide(LocationServiceMap.layer),
+  Layer.provide(SessionStore.layer),
+  Layer.provide(EventV2.layer),
+  Layer.provide(Database.defaultLayer),
+  Layer.provide(ProjectV2.defaultLayer),
+  Layer.orDie,
+)
+
+// TODO: Accept explicit storage so tests and embeddings can select disposable or application-owned persistence.
+export const layer = Layer.effect(
+  Service,
+  Effect.gen(function* () {
+    return Service.of({ sessions: yield* SessionV2.Service })
+  }),
+).pipe(Layer.provide(DefaultSessions))
+
+// TODO: Add OpenCode.create(...) as the Promise facade over the same embedded API semantics.
@@ -25,17 +25,11 @@ export function makeStrategies(input: {
      yield* input.git.worktreeRemove({ repo: found, directory })
    }),
    list: Effect.fn("ProjectCopy.GitWorktree.list")(function* (directory) {
-      const found = yield* input.git.find(directory)
-      if (!found) return yield* new DirectoryUnavailableError({ directory })
-      const core = path.basename(found.store) === ".git" ? path.dirname(found.store) : found.store
-      const entries = yield* input.git.worktreeList(found)
+      const entries = yield* input.git.worktreeList(repo(directory))
      return yield* Effect.forEach(entries, (entry) =>
-        entry === core
+        entry === directory
          ? Effect.succeed(undefined)
-          : input.canonical(entry).pipe(
-              Effect.map((directory) => ({ directory })),
-              Effect.catchTag("ProjectCopy.DirectoryUnavailableError", () => Effect.succeed(undefined)),
-            ),
+          : input.canonical(entry).pipe(Effect.map((directory) => ({ directory }))),
      ).pipe(Effect.map((items) => items.filter((item): item is Copy => item !== undefined)))
    }),
    detect: Effect.fn("ProjectCopy.GitWorktree.detect")(function* (inputDirectory) {
@@ -2,7 +2,6 @@ export * as ProjectCopy from "./copy"

 import { and, eq, inArray } from "drizzle-orm"
 import { Context, Effect, Layer, Schema } from "effect"
-import path from "path"
 import { AbsolutePath } from "../schema"
 import { FSUtil } from "../fs-util"
 import { Git } from "../git"
@@ -11,7 +10,6 @@ import { EventV2 } from "../event"
 import { Project } from "../project"
 import { ProjectDirectoryTable } from "./sql"
 import { makeStrategies } from "./copy-strategies"
-import { Slug } from "../util/slug"

 export const StrategyID = Schema.Literal("git_worktree")
 export type StrategyID = typeof StrategyID.Type
@@ -26,8 +24,6 @@ export const CreateInput = Schema.Struct({
  strategy: StrategyID,
  sourceDirectory: AbsolutePath,
  directory: AbsolutePath,
-  name: Schema.optional(Schema.String),
-  context: Schema.optional(Schema.String),
 }).annotate({ identifier: "ProjectCopy.CreateInput" })
 export type CreateInput = typeof CreateInput.Type

@@ -187,18 +183,10 @@ export const layer = Layer.effect(
    })

    const create = Effect.fn("ProjectCopy.create")(function* (input: CreateInput) {
-      yield* fs.makeDirectory(input.directory, { recursive: true }).pipe(Effect.orDie)
-      const name = input.name ?? Slug.create()
-      let suffix = 1
-      let copyDirectory = AbsolutePath.make(path.join(input.directory, name))
-      while (yield* fs.existsSafe(copyDirectory)) {
-        suffix++
-        if (suffix > 10) return yield* new DestinationExistsError({ directory: copyDirectory })
-        copyDirectory = AbsolutePath.make(path.join(input.directory, `${name}-${suffix}`))
-      }
-
+      if (yield* fs.existsSafe(input.directory))
+        return yield* new DestinationExistsError({ directory: input.directory })
      const result = yield* strategy(input.strategy).create({
-        directory: copyDirectory,
+        directory: input.directory,
        sourceDirectory: yield* source(input.sourceDirectory, input.projectID),
      })
      yield* changed(input.projectID, yield* insert(input.projectID, result.directory, input.strategy))
@@ -1,6 +0,0 @@
-export * as Agent from "./agent"
-
-import { AgentV2 } from "../agent"
-
-export const ID = AgentV2.ID
-export type ID = AgentV2.ID
@@ -1,8 +0,0 @@
-/** Intentional supported native API. Other core subpaths remain internal implementation surfaces. */
-export { Agent } from "./agent"
-export { Model } from "./model"
-export { OpenCode } from "./opencode"
-export { Session } from "./session"
-export { Location } from "./location"
-export { Prompt } from "../session/prompt"
-export { AbsolutePath } from "../schema"
@@ -1,6 +0,0 @@
-export * as Location from "./location"
-
-import { Location } from "../location"
-
-export const Ref = Location.Ref
-export type Ref = Location.Ref
@@ -1,9 +0,0 @@
-export * as Model from "./model"
-
-import { ModelV2 } from "../model"
-
-export const ID = ModelV2.ID
-export type ID = ModelV2.ID
-
-export const Ref = ModelV2.Ref
-export type Ref = ModelV2.Ref
@@ -1,70 +0,0 @@
-export * as OpenCode from "./opencode"
-
-import { Context, Effect, Layer } from "effect"
-import { Database } from "../database/database"
-import { EventV2 } from "../event"
-import { LocationServiceMap } from "../location-layer"
-import { ProjectV2 } from "../project"
-import { SessionV2 } from "../session"
-import * as SessionExecutionLocal from "../session/execution/local"
-import { SessionProjector } from "../session/projector"
-import { SessionStore } from "../session/store"
-import { Session } from "./session"
-
-export interface Interface {
-  readonly sessions: Session.Interface
-}
-
-/** Intentional public native API for Effect applications embedding OpenCode. */
-export class Service extends Context.Service<Service, Interface>()("@opencode/public/OpenCode") {}
-
-const SessionsLayer = SessionV2.layer.pipe(
-  Layer.provide(SessionProjector.layer),
-  Layer.provide(SessionExecutionLocal.layer),
-  Layer.provide(LocationServiceMap.layer),
-  Layer.provide(SessionStore.layer),
-  Layer.provide(EventV2.layer),
-  Layer.provide(Database.defaultLayer),
-  Layer.provide(ProjectV2.defaultLayer),
-  Layer.orDie,
-)
-
-// TODO: Accept explicit storage so tests and embeddings can select disposable or application-owned persistence.
-export const layer = Layer.effect(
-  Service,
-  Effect.gen(function* () {
-    const sessions = yield* SessionV2.Service
-    return Service.of({
-      sessions: {
-        create: (input) =>
-          sessions.create({
-            id: input.id,
-            agent: input.agent,
-            model: input.model,
-            location: input.location,
-          }),
-        get: sessions.get,
-        list: sessions.list,
-        prompt: (input) =>
-          sessions.prompt({
-            id: input.id,
-            sessionID: input.sessionID,
-            prompt: input.prompt,
-            delivery: input.delivery,
-          }),
-        messages: (input) =>
-          sessions.messages({
-            sessionID: input.sessionID,
-            limit: input.limit,
-            order: input.order,
-            cursor: input.cursor,
-          }),
-        message: (input) => sessions.message({ sessionID: input.sessionID, messageID: input.messageID }),
-        context: sessions.context,
-        events: (input) => sessions.events({ sessionID: input.sessionID, after: input.after }),
-      },
-    })
-  }),
-).pipe(Layer.provide(SessionsLayer))
-
-// TODO: Add OpenCode.create(...) as the Promise facade over the same native API semantics.
@@ -1,91 +0,0 @@
-export * as Session from "./session"
-
-import { Effect, Stream } from "effect"
-import { EventV2 } from "../event"
-import { SessionV2 } from "../session"
-import { MessageDecodeError } from "../session/error"
-import { SessionEvent } from "../session/event"
-import { SessionInput } from "../session/input"
-import { SessionMessage } from "../session/message"
-import { Prompt } from "../session/prompt"
-import { Agent } from "./agent"
-import { Location } from "./location"
-import { Model } from "./model"
-
-export const ID = SessionV2.ID
-export type ID = SessionV2.ID
-
-export const Info = SessionV2.Info
-export type Info = SessionV2.Info
-
-export const MessageID = SessionMessage.ID
-export type MessageID = SessionMessage.ID
-
-export const Message = SessionMessage.Message
-export type Message = SessionMessage.Message
-
-export const Admission = SessionInput.Admitted
-export type Admission = SessionInput.Admitted
-
-export const Delivery = SessionInput.Delivery
-export type Delivery = SessionInput.Delivery
-
-export const ListInput = SessionV2.ListInput
-export type ListInput = SessionV2.ListInput
-
-export const EventCursor = EventV2.Cursor
-export type EventCursor = EventV2.Cursor
-export type Event = EventV2.CursorEvent<SessionEvent.DurableEvent>
-
-export const NotFoundError = SessionV2.NotFoundError
-export type NotFoundError = SessionV2.NotFoundError
-
-export const PromptConflictError = SessionV2.PromptConflictError
-export type PromptConflictError = SessionV2.PromptConflictError
-
-export { MessageDecodeError }
-
-export interface CreateInput {
-  readonly id?: ID
-  readonly agent?: Agent.ID
-  readonly model?: Model.Ref
-  readonly location: Location.Ref
-}
-
-export interface PromptInput {
-  readonly id?: MessageID
-  readonly sessionID: ID
-  readonly prompt: Prompt
-  readonly delivery?: Delivery
-}
-
-export interface MessagesInput {
-  readonly sessionID: ID
-  readonly limit?: number
-  readonly order?: "asc" | "desc"
-  readonly cursor?: {
-    readonly id: MessageID
-    readonly direction: "previous" | "next"
-  }
-}
-
-export interface MessageInput {
-  readonly sessionID: ID
-  readonly messageID: MessageID
-}
-
-export interface EventsInput {
-  readonly sessionID: ID
-  readonly after?: EventCursor
-}
-
-export interface Interface {
-  readonly create: (input: CreateInput) => Effect.Effect<Info>
-  readonly get: (sessionID: ID) => Effect.Effect<Info, NotFoundError>
-  readonly list: (input?: ListInput) => Effect.Effect<Info[]>
-  readonly prompt: (input: PromptInput) => Effect.Effect<Admission, NotFoundError | PromptConflictError>
-  readonly messages: (input: MessagesInput) => Effect.Effect<Message[], NotFoundError | MessageDecodeError>
-  readonly message: (input: MessageInput) => Effect.Effect<Message | undefined>
-  readonly context: (sessionID: ID) => Effect.Effect<Message[], NotFoundError | MessageDecodeError>
-  readonly events: (input: EventsInput) => Stream.Stream<Event, NotFoundError>
-}
@@ -1,7 +1,7 @@
 export * as SessionV2 from "./session"
 export * from "./session/schema"

-import { Cause, Effect, Layer, Schema, Context, Stream } from "effect"
+import { Cause, DateTime, Effect, Layer, Schema, Context, Stream } from "effect"
 import { and, asc, desc, eq, gt, like, lt, or, type SQL } from "drizzle-orm"
 import { ProjectV2 } from "./project"
 import { WorkspaceV2 } from "./workspace"
@@ -10,6 +10,7 @@ import { Location } from "./location"
 import { SessionMessage } from "./session/message"
 import { Prompt } from "./session/prompt"
 import { EventV2 } from "./event"
+import { ProviderV2 } from "./provider"
 import { Database } from "./database/database"
 import { SessionProjector } from "./session/projector"
 import { SessionMessageTable, SessionTable } from "./session/sql"
@@ -76,6 +77,11 @@ type CreateInput = {
  location: Location.Ref
 }

+type MoveInput = {
+  sessionID: SessionSchema.ID
+  location: Location.Ref
+}
+
 type CompactInput = {
  sessionID: SessionSchema.ID
  prompt?: Prompt
@@ -104,6 +110,7 @@ export type Error = NotFoundError | MessageDecodeError | OperationUnavailableErr
 export interface Interface {
  readonly list: (input?: ListInput) => Effect.Effect<SessionSchema.Info[]>
  readonly create: (input: CreateInput) => Effect.Effect<SessionSchema.Info>
+  readonly move: (input: MoveInput) => Effect.Effect<void, NotFoundError | OperationUnavailableError>
  readonly get: (sessionID: SessionSchema.ID) => Effect.Effect<SessionSchema.Info, NotFoundError>
  readonly messages: (input: {
    sessionID: SessionSchema.ID
@@ -139,7 +146,7 @@ export interface Interface {
    prompt: Prompt
    delivery?: SessionInput.Delivery
    resume?: boolean
-  }) => Effect.Effect<SessionInput.Admitted, NotFoundError | PromptConflictError>
+  }) => Effect.Effect<SessionMessage.User, NotFoundError | PromptConflictError>
  readonly shell: (input: {
    id?: EventV2.ID
    sessionID: SessionSchema.ID
@@ -197,6 +204,20 @@ export const layer = Layer.effect(
        ),
      )

+    const findExistingPrompt = Effect.fnUntraced(function* (input: {
+      sessionID: SessionSchema.ID
+      messageID: SessionMessage.ID
+      prompt: Prompt
+      delivery: SessionInput.Delivery
+    }) {
+      const stored = yield* SessionInput.find(db, input.messageID)
+      if (!stored) return yield* SessionInput.reconcileProjected(db, { id: input.messageID, ...input })
+      if (!SessionInput.equivalent(stored, input)) {
+        return yield* new PromptConflictError({ sessionID: input.sessionID, messageID: input.messageID })
+      }
+      return stored
+    })
+
    const result = Service.of({
      create: Effect.fn("V2Session.create")(function* (input) {
        const sessionID = input.id ?? SessionSchema.ID.create()
@@ -352,23 +373,20 @@ export const layer = Layer.effect(
            yield* result.get(input.sessionID)
            const returnPrompt = Effect.fnUntraced(function* (admitted: SessionInput.Admitted) {
              if (input.resume !== false) yield* enqueueWake(input.sessionID)
-              return admitted
+              return SessionInput.toMessage(admitted)
            }, Effect.uninterruptible)
            const messageID = input.id ?? SessionMessage.ID.create()
            const delivery = input.delivery ?? "steer"
            const expected = { sessionID: input.sessionID, messageID, prompt: input.prompt, delivery }
-            const admitted = yield* SessionInput.admit(db, events, {
+            const existing = yield* findExistingPrompt(expected)
+            if (existing) return yield* returnPrompt(existing)
+            const admitted = yield* SessionInput.admit(db, {
              id: messageID,
              sessionID: input.sessionID,
              prompt: input.prompt,
              delivery,
-            }).pipe(
-              Effect.catchDefect((defect) =>
-                defect instanceof SessionInput.LifecycleConflict
-                  ? new PromptConflictError({ sessionID: input.sessionID, messageID })
-                  : Effect.die(defect),
-              ),
-            )
+            })
+            if (!admitted) return yield* new PromptConflictError({ sessionID: input.sessionID, messageID })
            if (!SessionInput.equivalent(admitted, expected))
              return yield* new PromptConflictError({ sessionID: input.sessionID, messageID })
            return yield* returnPrompt(admitted)
@@ -399,6 +417,9 @@ export const layer = Layer.effect(
        yield* result.get(sessionID)
        yield* execution.resume(sessionID)
      }),
+      move: Effect.fn("V2Session.move")(function* () {
+        return yield* new OperationUnavailableError({ operation: "move" })
+      }),
    })

    return result
@@ -7,9 +7,6 @@ import { ToolOutput } from "../tool-output"
 import { V2Schema } from "../v2-schema"
 import { FileAttachment, Prompt } from "./prompt"
 import { SessionSchema } from "./schema"
-import { Location } from "../location"
-import { RelativePath } from "../schema"
-import { SessionMessageID } from "./message-id"

 export { FileAttachment }

@@ -53,7 +50,6 @@ export const AgentSwitched = EventV2.define({
  ...options,
  schema: {
    ...Base,
-    messageID: SessionMessageID.ID,
    agent: Schema.String,
  },
 })
@@ -64,67 +60,27 @@ export const ModelSwitched = EventV2.define({
  ...options,
  schema: {
    ...Base,
-    messageID: SessionMessageID.ID,
    model: ModelV2.Ref,
  },
 })
 export type ModelSwitched = typeof ModelSwitched.Type

-export const Moved = EventV2.define({
-  type: "session.next.moved",
-  ...options,
-  schema: {
-    ...Base,
-    location: Location.Ref,
-    subdirectory: RelativePath.pipe(Schema.optional),
-  },
-})
-export type Moved = typeof Moved.Type
-
 export const Prompted = EventV2.define({
  type: "session.next.prompted",
  ...options,
  schema: {
    ...Base,
-    messageID: SessionMessageID.ID,
    prompt: Prompt,
    delivery: Schema.Literals(["steer", "queue"]),
  },
 })
 export type Prompted = typeof Prompted.Type

-export namespace PromptLifecycle {
-  export const Admitted = EventV2.define({
-    type: "session.next.prompt.admitted",
-    ...options,
-    schema: {
-      ...Base,
-      messageID: SessionMessageID.ID,
-      prompt: Prompt,
-      delivery: Schema.Literals(["steer", "queue"]),
-    },
-  })
-  export type Admitted = typeof Admitted.Type
-
-  export const Promoted = EventV2.define({
-    type: "session.next.prompt.promoted",
-    ...options,
-    schema: {
-      ...Base,
-      messageID: SessionMessageID.ID,
-      prompt: Prompt,
-      timeCreated: V2Schema.DateTimeUtcFromMillis,
-    },
-  })
-  export type Promoted = typeof Promoted.Type
-}
-
 export const Synthetic = EventV2.define({
  type: "session.next.synthetic",
  ...options,
  schema: {
    ...Base,
-    messageID: SessionMessageID.ID,
    text: Schema.String,
  },
 })
@@ -136,7 +92,6 @@ export namespace Shell {
    ...options,
    schema: {
      ...Base,
-      messageID: SessionMessageID.ID,
      callID: Schema.String,
      command: Schema.String,
    },
@@ -161,7 +116,6 @@ export namespace Step {
    ...options,
    schema: {
      ...Base,
-      assistantMessageID: SessionMessageID.ID,
      agent: Schema.String,
      model: ModelV2.Ref,
      snapshot: Schema.String.pipe(Schema.optional),
@@ -174,7 +128,7 @@ export namespace Step {
    ...stepSettlementOptions,
    schema: {
      ...Base,
-      assistantMessageID: SessionMessageID.ID,
+      assistantMessageID: EventV2.ID,
      finish: Schema.String,
      cost: Schema.Finite,
      tokens: Schema.Struct({
@@ -196,7 +150,7 @@ export namespace Step {
    ...stepSettlementOptions,
    schema: {
      ...Base,
-      assistantMessageID: SessionMessageID.ID,
+      assistantMessageID: EventV2.ID,
      error: UnknownError,
    },
  })
@@ -209,7 +163,6 @@ export namespace Text {
    ...options,
    schema: {
      ...Base,
-      assistantMessageID: SessionMessageID.ID,
      textID: Schema.String,
    },
  })
@@ -220,7 +173,6 @@ export namespace Text {
    type: "session.next.text.delta",
    schema: {
      ...Base,
-      assistantMessageID: SessionMessageID.ID,
      textID: Schema.String,
      delta: Schema.String,
    },
@@ -232,7 +184,6 @@ export namespace Text {
    ...options,
    schema: {
      ...Base,
-      assistantMessageID: SessionMessageID.ID,
      textID: Schema.String,
      text: Schema.String,
    },
@@ -246,7 +197,6 @@ export namespace Reasoning {
    ...options,
    schema: {
      ...Base,
-      assistantMessageID: SessionMessageID.ID,
      reasoningID: Schema.String,
      providerMetadata: ProviderMetadata.pipe(Schema.optional),
    },
@@ -258,7 +208,6 @@ export namespace Reasoning {
    type: "session.next.reasoning.delta",
    schema: {
      ...Base,
-      assistantMessageID: SessionMessageID.ID,
      reasoningID: Schema.String,
      delta: Schema.String,
    },
@@ -270,7 +219,6 @@ export namespace Reasoning {
    ...options,
    schema: {
      ...Base,
-      assistantMessageID: SessionMessageID.ID,
      reasoningID: Schema.String,
      text: Schema.String,
      providerMetadata: ProviderMetadata.pipe(Schema.optional),
@@ -282,7 +230,7 @@ export namespace Reasoning {
 export namespace Tool {
  const ToolBase = {
    ...Base,
-    assistantMessageID: SessionMessageID.ID,
+    assistantMessageID: EventV2.ID,
    callID: Schema.String,
  }

@@ -409,7 +357,6 @@ export namespace Compaction {
    ...options,
    schema: {
      ...Base,
-      messageID: SessionMessageID.ID,
      reason: Schema.Union([Schema.Literal("auto"), Schema.Literal("manual")]),
    },
  })
@@ -440,10 +387,7 @@ export namespace Compaction {
 const DurableDefinitions = [
  AgentSwitched,
  ModelSwitched,
-  Moved,
  Prompted,
-  PromptLifecycle.Admitted,
-  PromptLifecycle.Promoted,
  Synthetic,
  Shell.Started,
  Shell.Ended,
@@ -1,11 +1,11 @@
 export * as SessionInput from "./input"

-import { and, asc, eq, isNull, lte } from "drizzle-orm"
+import { and, asc, eq, inArray, isNull } from "drizzle-orm"
 import { DateTime, Effect, Schema } from "effect"
 import type { Database } from "../database/database"
 import type { EventV2 } from "../event"
-import { EventSequenceTable } from "../event/sql"
-import { NonNegativeInt } from "../schema"
+import { EventTable } from "../event/sql"
+import { NonNegativeInt, PositiveInt } from "../schema"
 import { V2Schema } from "../v2-schema"
 import { SessionEvent } from "./event"
 import { SessionMessage } from "./message"
@@ -19,7 +19,7 @@ export const Delivery = Schema.Literals(["steer", "queue"])
 export type Delivery = typeof Delivery.Type

 export class Admitted extends Schema.Class<Admitted>("SessionInput.Admitted")({
-  admittedSeq: NonNegativeInt,
+  seq: PositiveInt,
  id: SessionMessage.ID,
  sessionID: SessionSchema.ID,
  prompt: Prompt,
@@ -30,10 +30,11 @@ export class Admitted extends Schema.Class<Admitted>("SessionInput.Admitted")({

 const decodePrompt = Schema.decodeUnknownSync(Prompt)
 const encodePrompt = Schema.encodeSync(Prompt)
+const decodeMessage = Schema.decodeUnknownSync(SessionMessage.Message)

 const fromRow = (row: typeof SessionInputTable.$inferSelect): Admitted =>
  new Admitted({
-    admittedSeq: row.admitted_seq,
+    seq: row.seq,
    id: SessionMessage.ID.make(row.id),
    sessionID: SessionSchema.ID.make(row.session_id),
    prompt: decodePrompt(row.prompt),
@@ -47,13 +48,8 @@ export const find = Effect.fn("SessionInput.find")(function* (db: DatabaseServic
  return row === undefined ? undefined : fromRow(row)
 })

-export class LifecycleConflict extends Schema.TaggedErrorClass<LifecycleConflict>()("SessionInput.LifecycleConflict", {
-  id: SessionMessage.ID,
-}) {}
-
 export const admit = Effect.fn("SessionInput.admit")(function* (
  db: DatabaseService,
-  events: EventV2.Interface,
  input: {
    readonly id: SessionMessage.ID
    readonly sessionID: SessionSchema.ID
@@ -61,124 +57,49 @@ export const admit = Effect.fn("SessionInput.admit")(function* (
    readonly delivery: Delivery
  },
 ) {
-  const existing = yield* find(db, input.id)
-  if (existing !== undefined) return existing
-  const timestamp = yield* DateTime.now
-  return yield* events
-    .publish(SessionEvent.PromptLifecycle.Admitted, {
-      messageID: input.id,
-      sessionID: input.sessionID,
-      timestamp,
-      prompt: input.prompt,
-      delivery: input.delivery,
-    })
-    .pipe(
-      Effect.flatMap((event) =>
-        event.seq === undefined
-          ? Effect.die("Prompt admission event is missing aggregate sequence")
-          : Effect.succeed(
-              new Admitted({
-                admittedSeq: event.seq,
-                id: input.id,
-                sessionID: input.sessionID,
-                prompt: input.prompt,
-                delivery: input.delivery,
-                timeCreated: timestamp,
-              }),
-            ),
-      ),
-      Effect.catchDefect((defect) =>
-        find(db, input.id).pipe(Effect.flatMap((stored) => (stored ? Effect.succeed(stored) : Effect.die(defect)))),
-      ),
+  return yield* db
+    .transaction(
+      () =>
+        Effect.gen(function* () {
+          const existing = yield* find(db, input.id)
+          if (existing !== undefined) return existing
+          const event = yield* db
+            .select({ id: EventTable.id })
+            .from(EventTable)
+            .where(eq(EventTable.id, input.id))
+            .get()
+            .pipe(Effect.orDie)
+          const message = yield* db
+            .select({ id: SessionMessageTable.id })
+            .from(SessionMessageTable)
+            .where(eq(SessionMessageTable.id, input.id))
+            .get()
+            .pipe(Effect.orDie)
+          if (event !== undefined || message !== undefined) return undefined
+          const row = yield* db
+            .insert(SessionInputTable)
+            .values({
+              id: input.id,
+              session_id: input.sessionID,
+              prompt: encodePrompt(input.prompt),
+              delivery: input.delivery,
+            })
+            .returning()
+            .get()
+            .pipe(Effect.orDie)
+          return fromRow(row)
+        }),
+      { behavior: "immediate" },
    )
-})
-
-export const latestSeq = Effect.fn("SessionInput.latestSeq")(function* (
-  db: DatabaseService,
-  sessionID: SessionSchema.ID,
-) {
-  const row = yield* db
-    .select({ seq: EventSequenceTable.seq })
-    .from(EventSequenceTable)
-    .where(eq(EventSequenceTable.aggregate_id, sessionID))
-    .get()
    .pipe(Effect.orDie)
-  return row?.seq ?? -1
-})
-
-export const projectAdmitted = Effect.fn("SessionInput.projectAdmitted")(function* (
-  db: DatabaseService,
-  input: {
-    readonly admittedSeq: number
-    readonly id: SessionMessage.ID
-    readonly sessionID: SessionSchema.ID
-    readonly prompt: Prompt
-    readonly delivery: Delivery
-    readonly timeCreated: DateTime.Utc
-  },
-) {
-  const message = yield* db
-    .select({ id: SessionMessageTable.id })
-    .from(SessionMessageTable)
-    .where(eq(SessionMessageTable.id, input.id))
-    .get()
-    .pipe(Effect.orDie)
-  if (message) return yield* Effect.die(new LifecycleConflict({ id: input.id }))
-  const stored = yield* db
-    .insert(SessionInputTable)
-    .values({
-      id: input.id,
-      session_id: input.sessionID,
-      admitted_seq: input.admittedSeq,
-      prompt: encodePrompt(input.prompt),
-      delivery: input.delivery,
-      time_created: DateTime.toEpochMillis(input.timeCreated),
-    })
-    .onConflictDoNothing()
-    .returning({ id: SessionInputTable.id })
-    .get()
-    .pipe(Effect.orDie)
-  if (!stored) return yield* Effect.die(new LifecycleConflict({ id: input.id }))
-})
-
-export const projectPromoted = Effect.fn("SessionInput.projectPromoted")(function* (
-  db: DatabaseService,
-  input: {
-    readonly id: SessionMessage.ID
-    readonly sessionID: SessionSchema.ID
-    readonly prompt: Prompt
-    readonly timeCreated: DateTime.Utc
-    readonly promotedSeq: number
-  },
-) {
-  const updated = yield* db
-    .update(SessionInputTable)
-    .set({ promoted_seq: input.promotedSeq })
-    .where(
-      and(
-        eq(SessionInputTable.id, input.id),
-        eq(SessionInputTable.session_id, input.sessionID),
-        isNull(SessionInputTable.promoted_seq),
-      ),
-    )
-    .returning()
-    .get()
-    .pipe(Effect.orDie)
-  if (!updated) return yield* Effect.die(new LifecycleConflict({ id: input.id }))
-  const stored = fromRow(updated)
-  if (
-    !matchesPrompt(stored, input) ||
-    DateTime.toEpochMillis(stored.timeCreated) !== DateTime.toEpochMillis(input.timeCreated)
-  )
-    return yield* Effect.die(new LifecycleConflict({ id: input.id }))
-  return toMessage(stored)
 })

 export const hasPending = Effect.fn("SessionInput.hasPending")(function* (
  db: DatabaseService,
  sessionID: SessionSchema.ID,
-  delivery: Delivery,
+  deliveries: ReadonlyArray<Delivery> = ["steer", "queue"],
 ) {
+  if (deliveries.length === 0) return false
  const row = yield* db
    .select({ id: SessionInputTable.id })
    .from(SessionInputTable)
@@ -186,7 +107,7 @@ export const hasPending = Effect.fn("SessionInput.hasPending")(function* (
      and(
        eq(SessionInputTable.session_id, sessionID),
        isNull(SessionInputTable.promoted_seq),
-        eq(SessionInputTable.delivery, delivery),
+        inArray(SessionInputTable.delivery, deliveries),
      ),
    )
    .limit(1)
@@ -212,34 +133,14 @@ export const guardReservedID = Effect.fn("SessionInput.guardReservedID")(functio
  db: DatabaseService,
  event: EventV2.Payload,
 ) {
-  if (
-    Schema.is(SessionEvent.PromptLifecycle.Admitted)(event) ||
-    Schema.is(SessionEvent.PromptLifecycle.Promoted)(event)
-  )
-    return
-  const id = reservedID(event)
-  if (id === undefined) return
-  const admitted = yield* db
-    .select({ id: SessionInputTable.id })
-    .from(SessionInputTable)
-    .where(eq(SessionInputTable.id, id))
-    .get()
-    .pipe(Effect.orDie)
+  const admitted = yield* find(db, event.id)
  if (admitted === undefined) return
-  return yield* Effect.die(new LifecycleConflict({ id }))
+  if (!Schema.is(SessionEvent.Prompted)(event))
+    return yield* Effect.die("Durable event conflicts with admitted prompt input")
+  if (!equivalent(admitted, event.data)) return yield* Effect.die("Prompt projection conflicts with admitted input")
 })

-const reservedID = (event: EventV2.Payload) => {
-  if (Schema.is(SessionEvent.Step.Started)(event)) return event.data.assistantMessageID
-  if (Schema.is(SessionEvent.AgentSwitched)(event)) return event.data.messageID
-  if (Schema.is(SessionEvent.ModelSwitched)(event)) return event.data.messageID
-  if (Schema.is(SessionEvent.Prompted)(event)) return event.data.messageID
-  if (Schema.is(SessionEvent.Synthetic)(event)) return event.data.messageID
-  if (Schema.is(SessionEvent.Shell.Started)(event)) return event.data.messageID
-  if (Schema.is(SessionEvent.Compaction.Started)(event)) return event.data.messageID
-}
-
-export const projectLegacyPrompted = Effect.fn("SessionInput.projectLegacyPrompted")(function* (
+export const project = Effect.fn("SessionInput.project")(function* (
  db: DatabaseService,
  input: {
    readonly id: SessionMessage.ID
@@ -250,49 +151,82 @@ export const projectLegacyPrompted = Effect.fn("SessionInput.projectLegacyPrompt
    readonly promotedSeq: number
  },
 ) {
-  const inserted = yield* db
+  yield* db
    .insert(SessionInputTable)
    .values({
      id: input.id,
      session_id: input.sessionID,
-      admitted_seq: input.promotedSeq,
      prompt: encodePrompt(input.prompt),
      delivery: input.delivery,
      promoted_seq: input.promotedSeq,
      time_created: DateTime.toEpochMillis(input.timeCreated),
    })
    .onConflictDoNothing()
-    .returning()
+    .run()
+    .pipe(Effect.orDie)
+  const admitted = yield* find(db, input.id)
+  if (admitted === undefined || admitted.delivery !== input.delivery || !matchesPrompt(admitted, input))
+    return yield* Effect.die("Prompt projection conflicts with admitted input")
+  yield* db
+    .update(SessionInputTable)
+    .set({ promoted_seq: input.promotedSeq })
+    .where(
+      and(
+        eq(SessionInputTable.id, input.id),
+        eq(SessionInputTable.session_id, input.sessionID),
+        isNull(SessionInputTable.promoted_seq),
+      ),
+    )
+    .run()
+    .pipe(Effect.orDie)
+  return yield* find(db, input.id)
+})
+
+export const reconcileProjected = Effect.fn("SessionInput.reconcileProjected")(function* (
+  db: DatabaseService,
+  expected: {
+    readonly id: SessionMessage.ID
+    readonly sessionID: SessionSchema.ID
+    readonly prompt: Prompt
+    readonly delivery: Delivery
+  },
+) {
+  if (expected.delivery !== "steer") return undefined
+  const row = yield* db
+    .select()
+    .from(SessionMessageTable)
+    .where(eq(SessionMessageTable.id, expected.id))
    .get()
    .pipe(Effect.orDie)
-  if (!inserted) return yield* Effect.die("Prompt projection conflicts with admitted input")
-  return fromRow(inserted)
+  if (row === undefined || row.session_id !== expected.sessionID || row.type !== "user") return undefined
+  const message = decodeMessage({ ...row.data, id: row.id, type: row.type })
+  if (message.type !== "user" || !Prompt.equivalence(Prompt.fromUserMessage(message), expected.prompt)) return undefined
+  return yield* project(db, {
+    id: expected.id,
+    sessionID: expected.sessionID,
+    prompt: expected.prompt,
+    delivery: expected.delivery,
+    timeCreated: message.time.created,
+    promotedSeq: row.seq,
+  })
 })

 const publish = Effect.fn("SessionInput.publish")(function* (
-  db: DatabaseService,
  events: EventV2.Interface,
  sessionID: SessionSchema.ID,
  rows: ReadonlyArray<typeof SessionInputTable.$inferSelect>,
 ) {
  for (const row of rows) {
-    yield* events
-      .publish(SessionEvent.PromptLifecycle.Promoted, {
+    yield* events.publish(
+      SessionEvent.Prompted,
+      {
        sessionID,
-        timestamp: yield* DateTime.now,
-        messageID: SessionMessage.ID.make(row.id),
+        timestamp: DateTime.makeUnsafe(row.time_created),
        prompt: decodePrompt(row.prompt),
-        timeCreated: DateTime.makeUnsafe(row.time_created),
-      })
-      .pipe(
-        Effect.catchDefect((defect) =>
-          defect instanceof LifecycleConflict
-            ? find(db, SessionMessage.ID.make(row.id)).pipe(
-                Effect.flatMap((stored) => (stored?.promotedSeq === undefined ? Effect.die(defect) : Effect.void)),
-              )
-            : Effect.die(defect),
-        ),
-      )
+        delivery: row.delivery,
+      },
+      { id: SessionMessage.ID.make(row.id) },
+    )
  }
  return rows.length
 })
@@ -301,7 +235,6 @@ export const promoteSteers = Effect.fn("SessionInput.promoteSteers")(function* (
  db: DatabaseService,
  events: EventV2.Interface,
  sessionID: SessionSchema.ID,
-  cutoff: number,
 ) {
  const rows = yield* db
    .select()
@@ -311,13 +244,12 @@ export const promoteSteers = Effect.fn("SessionInput.promoteSteers")(function* (
        eq(SessionInputTable.session_id, sessionID),
        isNull(SessionInputTable.promoted_seq),
        eq(SessionInputTable.delivery, "steer"),
-        lte(SessionInputTable.admitted_seq, cutoff),
      ),
    )
-    .orderBy(asc(SessionInputTable.admitted_seq))
+    .orderBy(asc(SessionInputTable.seq))
    .all()
    .pipe(Effect.orDie)
-  return yield* publish(db, events, sessionID, rows)
+  return yield* publish(events, sessionID, rows)
 })

 export const promoteNextQueued = Effect.fn("SessionInput.promoteNextQueued")(function* (
@@ -335,14 +267,14 @@ export const promoteNextQueued = Effect.fn("SessionInput.promoteNextQueued")(fun
        eq(SessionInputTable.delivery, "queue"),
      ),
    )
-    .orderBy(asc(SessionInputTable.admitted_seq))
+    .orderBy(asc(SessionInputTable.seq))
    .limit(1)
    .get()
    .pipe(Effect.orDie)
-  return row === undefined ? false : yield* publish(db, events, sessionID, [row]).pipe(Effect.as(true))
+  return row === undefined ? false : yield* publish(events, sessionID, [row]).pipe(Effect.as(true))
 })

-const toMessage = (input: Admitted) =>
+export const toMessage = (input: Admitted) =>
  new SessionMessage.User({
    id: input.id,
    type: "user",
@@ -1,13 +0,0 @@
-export * as SessionMessageID from "./message-id"
-
-import { Schema } from "effect"
-import { withStatics } from "../schema"
-import { Identifier } from "../util/identifier"
-
-export const ID = Schema.String.check(Schema.isStartsWith("msg_")).pipe(
-  Schema.brand("Session.Message.ID"),
-  withStatics((schema) => ({
-    create: () => schema.make("msg_" + Identifier.ascending()),
-  })),
-)
-export type ID = typeof ID.Type
@@ -123,7 +123,7 @@ export function update(adapter: Adapter, event: SessionEvent.Event) {
      "session.next.agent.switched": (event) => {
        return adapter.appendMessage(
          new SessionMessage.AgentSwitched({
-            id: event.data.messageID,
+            id: event.id,
            type: "agent-switched",
            metadata: event.metadata,
            agent: event.data.agent,
@@ -134,7 +134,7 @@ export function update(adapter: Adapter, event: SessionEvent.Event) {
      "session.next.model.switched": (event) => {
        return adapter.appendMessage(
          new SessionMessage.ModelSwitched({
-            id: event.data.messageID,
+            id: event.id,
            type: "model-switched",
            metadata: event.metadata,
            model: event.data.model,
@@ -142,11 +142,10 @@ export function update(adapter: Adapter, event: SessionEvent.Event) {
          }),
        )
      },
-      "session.next.moved": () => Effect.void,
      "session.next.prompted": (event) => {
        return adapter.appendMessage(
          new SessionMessage.User({
-            id: event.data.messageID,
+            id: event.id,
            type: "user",
            metadata: event.metadata,
            text: event.data.prompt.text,
@@ -157,14 +156,12 @@ export function update(adapter: Adapter, event: SessionEvent.Event) {
          }),
        )
      },
-      "session.next.prompt.admitted": () => Effect.void,
-      "session.next.prompt.promoted": () => Effect.void,
      "session.next.synthetic": (event) => {
        return adapter.appendMessage(
          new SessionMessage.Synthetic({
            sessionID: event.data.sessionID,
            text: event.data.text,
-            id: event.data.messageID,
+            id: event.id,
            type: "synthetic",
            time: { created: event.data.timestamp },
          }),
@@ -173,7 +170,7 @@ export function update(adapter: Adapter, event: SessionEvent.Event) {
      "session.next.shell.started": (event) => {
        return adapter.appendMessage(
          new SessionMessage.Shell({
-            id: event.data.messageID,
+            id: event.id,
            type: "shell",
            metadata: event.metadata,
            callID: event.data.callID,
@@ -208,7 +205,7 @@ export function update(adapter: Adapter, event: SessionEvent.Event) {
          }
          yield* adapter.appendMessage(
            new SessionMessage.Assistant({
-              id: event.data.assistantMessageID,
+              id: event.id,
              type: "assistant",
              agent: event.data.agent,
              model: event.data.model,
@@ -236,22 +233,43 @@ export function update(adapter: Adapter, event: SessionEvent.Event) {
        })
      },
      "session.next.text.started": (event) => {
-        return updateOwnedAssistant(event.data.assistantMessageID, (draft) => {
-          draft.content.push(
-            castDraft(new SessionMessage.AssistantText({ type: "text", id: event.data.textID, text: "" })),
-          )
+        return Effect.gen(function* () {
+          const currentAssistant = yield* adapter.getCurrentAssistant()
+          if (currentAssistant) {
+            yield* adapter.updateAssistant(
+              produce(currentAssistant, (draft) => {
+                draft.content.push(
+                  castDraft(new SessionMessage.AssistantText({ type: "text", id: event.data.textID, text: "" })),
+                )
+              }),
+            )
+          }
        })
      },
      "session.next.text.delta": (event) => {
-        return updateOwnedAssistant(event.data.assistantMessageID, (draft) => {
-          const match = latestText(draft, event.data.textID)
-          if (match) match.text += event.data.delta
+        return Effect.gen(function* () {
+          const currentAssistant = yield* adapter.getCurrentAssistant()
+          if (currentAssistant) {
+            yield* adapter.updateAssistant(
+              produce(currentAssistant, (draft) => {
+                const match = latestText(draft, event.data.textID)
+                if (match) match.text += event.data.delta
+              }),
+            )
+          }
        })
      },
      "session.next.text.ended": (event) => {
-        return updateOwnedAssistant(event.data.assistantMessageID, (draft) => {
-          const match = latestText(draft, event.data.textID)
-          if (match) match.text = event.data.text
+        return Effect.gen(function* () {
+          const currentAssistant = yield* adapter.getCurrentAssistant()
+          if (currentAssistant) {
+            yield* adapter.updateAssistant(
+              produce(currentAssistant, (draft) => {
+                const match = latestText(draft, event.data.textID)
+                if (match) match.text = event.data.text
+              }),
+            )
+          }
        })
      },
      "session.next.tool.input.started": (event) => {
@@ -348,31 +366,52 @@ export function update(adapter: Adapter, event: SessionEvent.Event) {
        })
      },
      "session.next.reasoning.started": (event) => {
-        return updateOwnedAssistant(event.data.assistantMessageID, (draft) => {
-          draft.content.push(
-            castDraft(
-              new SessionMessage.AssistantReasoning({
-                type: "reasoning",
-                id: event.data.reasoningID,
-                text: "",
-                providerMetadata: event.data.providerMetadata,
+        return Effect.gen(function* () {
+          const currentAssistant = yield* adapter.getCurrentAssistant()
+          if (currentAssistant) {
+            yield* adapter.updateAssistant(
+              produce(currentAssistant, (draft) => {
+                draft.content.push(
+                  castDraft(
+                    new SessionMessage.AssistantReasoning({
+                      type: "reasoning",
+                      id: event.data.reasoningID,
+                      text: "",
+                      providerMetadata: event.data.providerMetadata,
+                    }),
+                  ),
+                )
              }),
-            ),
-          )
+            )
+          }
        })
      },
      "session.next.reasoning.delta": (event) => {
-        return updateOwnedAssistant(event.data.assistantMessageID, (draft) => {
-          const match = latestReasoning(draft, event.data.reasoningID)
-          if (match) match.text += event.data.delta
+        return Effect.gen(function* () {
+          const currentAssistant = yield* adapter.getCurrentAssistant()
+          if (currentAssistant) {
+            yield* adapter.updateAssistant(
+              produce(currentAssistant, (draft) => {
+                const match = latestReasoning(draft, event.data.reasoningID)
+                if (match) match.text += event.data.delta
+              }),
+            )
+          }
        })
      },
      "session.next.reasoning.ended": (event) => {
-        return updateOwnedAssistant(event.data.assistantMessageID, (draft) => {
-          const match = latestReasoning(draft, event.data.reasoningID)
-          if (match) {
-            match.text = event.data.text
-            if (event.data.providerMetadata !== undefined) match.providerMetadata = event.data.providerMetadata
+        return Effect.gen(function* () {
+          const currentAssistant = yield* adapter.getCurrentAssistant()
+          if (currentAssistant) {
+            yield* adapter.updateAssistant(
+              produce(currentAssistant, (draft) => {
+                const match = latestReasoning(draft, event.data.reasoningID)
+                if (match) {
+                  match.text = event.data.text
+                  if (event.data.providerMetadata !== undefined) match.providerMetadata = event.data.providerMetadata
+                }
+              }),
+            )
          }
        })
      },
@@ -380,7 +419,7 @@ export function update(adapter: Adapter, event: SessionEvent.Event) {
      "session.next.compaction.started": (event) => {
        return adapter.appendMessage(
          new SessionMessage.Compaction({
-            id: event.data.messageID,
+            id: event.id,
            type: "compaction",
            metadata: event.metadata,
            reason: event.data.reason,
@@ -2,15 +2,15 @@ export * as SessionMessage from "./message"

 import { Schema } from "effect"
 import { ProviderMetadata } from "@opencode-ai/llm"
+import { EventV2 } from "../event"
 import { ModelV2 } from "../model"
 import { ToolOutput } from "../tool-output"
 import { V2Schema } from "../v2-schema"
 import { SessionEvent } from "./event"
 import { Prompt } from "./prompt"
-import { SessionMessageID } from "./message-id"

-export const ID = SessionMessageID.ID
-export type ID = typeof ID.Type
+export const ID = EventV2.ID
+export type ID = Schema.Schema.Type<typeof ID>

 const Base = {
  id: ID,
@@ -10,7 +10,6 @@ import { WorkspaceTable } from "../control-plane/workspace.sql"
 import { SessionMessage } from "./message"
 import { SessionMessageUpdater } from "./message-updater"
 import { SessionInput } from "./input"
-import { WorkspaceV2 } from "../workspace"
 import { MessageTable, PartTable, SessionMessageTable, SessionTable } from "./sql"
 import type { DeepMutable } from "../schema"

@@ -19,7 +18,7 @@ type DatabaseService = Database.Interface["db"]
 const decodeMessage = Schema.decodeUnknownSync(SessionMessage.Message)
 const encodeMessage = Schema.encodeSync(SessionMessage.Message)

-class PromptAlreadyProjected extends Error {}
+export class PromptAlreadyProjected extends Error {}
 export class SessionAlreadyProjected extends Error {}

 type Usage = {
@@ -112,23 +111,29 @@ function run(db: DatabaseService, event: SessionEvent.Event) {
  return Effect.gen(function* () {
    const decodeRow = (row: typeof SessionMessageTable.$inferSelect) =>
      decodeMessage({ ...row.data, id: row.id, type: row.type })
-    const updateMessage = (message: SessionMessage.Message) => {
+    const writeMessage = (message: SessionMessage.Message) => {
      if (event.seq === undefined) return Effect.die("Synchronized Session event is missing aggregate sequence")
      const encoded = encodeMessage(message)
      const { id, type, ...data } = encoded
      return db
-        .update(SessionMessageTable)
-        .set({ type, time_created: DateTime.toEpochMillis(message.time.created), data })
-        .where(
-          and(
-            eq(SessionMessageTable.id, SessionMessage.ID.make(id)),
-            eq(SessionMessageTable.session_id, event.data.sessionID),
-          ),
-        )
+        .insert(SessionMessageTable)
+        .values([
+          {
+            id: SessionMessage.ID.make(id),
+            session_id: event.data.sessionID,
+            type,
+            seq: event.seq,
+            time_created: DateTime.toEpochMillis(message.time.created),
+            data,
+          },
+        ])
+        .onConflictDoUpdate({
+          target: SessionMessageTable.id,
+          set: { type, time_created: DateTime.toEpochMillis(message.time.created), data },
+        })
        .run()
        .pipe(Effect.orDie)
    }
-    const appendMessage = (message: SessionMessage.Message) => insertMessage(db, event, message)
    const adapter: SessionMessageUpdater.Adapter = {
      getCurrentAssistant() {
        return Effect.gen(function* () {
@@ -198,33 +203,15 @@ function run(db: DatabaseService, event: SessionEvent.Event) {
            .find((message): message is SessionMessage.Shell => message.type === "shell" && message.callID === callID)
        })
      },
-      updateAssistant: updateMessage,
-      updateCompaction: updateMessage,
-      updateShell: updateMessage,
-      appendMessage,
+      updateAssistant: writeMessage,
+      updateCompaction: writeMessage,
+      updateShell: writeMessage,
+      appendMessage: writeMessage,
    }
    yield* SessionMessageUpdater.update(adapter, event)
  })
 }

-function insertMessage(db: DatabaseService, event: SessionEvent.Event, message: SessionMessage.Message) {
-  if (event.seq === undefined) return Effect.die("Synchronized Session event is missing aggregate sequence")
-  const encoded = encodeMessage(message)
-  const { id, type, ...data } = encoded
-  return db
-    .insert(SessionMessageTable)
-    .values({
-      id: SessionMessage.ID.make(id),
-      session_id: event.data.sessionID,
-      type,
-      seq: event.seq,
-      time_created: DateTime.toEpochMillis(message.time.created),
-      data,
-    })
-    .run()
-    .pipe(Effect.orDie)
-}
-
 export const layer = Layer.effectDiscard(
  Effect.gen(function* () {
    const events = yield* EventV2.Service
@@ -258,19 +245,6 @@ export const layer = Layer.effectDiscard(
        .run()
        .pipe(Effect.orDie),
    )
-    yield* events.project(SessionEvent.Moved, (event) =>
-      db
-        .update(SessionTable)
-        .set({
-          directory: event.data.location.directory,
-          path: event.data.subdirectory,
-          workspace_id: event.data.location.workspaceID ? WorkspaceV2.ID.make(event.data.location.workspaceID) : null,
-          time_updated: DateTime.toEpochMillis(event.data.timestamp),
-        })
-        .where(eq(SessionTable.id, event.data.sessionID))
-        .run()
-        .pipe(Effect.orDie),
-    )
    yield* events.project(SessionV1.Event.Deleted, (event) =>
      db.delete(SessionTable).where(eq(SessionTable.id, event.data.sessionID)).run().pipe(Effect.orDie),
    )
@@ -361,19 +335,27 @@ export const layer = Layer.effectDiscard(
    )
    yield* events.project(SessionEvent.Prompted, (event) =>
      Effect.gen(function* () {
-        const messageID = event.data.messageID
        const existing = yield* db
          .select({ id: SessionMessageTable.id })
          .from(SessionMessageTable)
-          .where(eq(SessionMessageTable.id, messageID))
+          .where(eq(SessionMessageTable.id, event.id))
          .get()
          .pipe(Effect.orDie)
        if (existing) return yield* Effect.die(new PromptAlreadyProjected())
        yield* run(db, event)
+        const row = yield* db
+          .select()
+          .from(SessionMessageTable)
+          .where(eq(SessionMessageTable.id, event.id))
+          .get()
+          .pipe(Effect.orDie)
+        if (!row) return yield* Effect.die("Prompt projection was not stored")
+        const message = decodeMessage({ ...row.data, id: row.id, type: row.type })
+        if (message.type !== "user") return yield* Effect.die("Prompt projection did not produce a user message")
        if (event.seq === undefined)
          return yield* Effect.die("Synchronized Session event is missing aggregate sequence")
-        yield* SessionInput.projectLegacyPrompted(db, {
-          id: messageID,
+        yield* SessionInput.project(db, {
+          id: SessionMessage.ID.make(event.id),
          sessionID: event.data.sessionID,
          prompt: event.data.prompt,
          delivery: event.data.delivery,
@@ -382,37 +364,6 @@ export const layer = Layer.effectDiscard(
        })
      }),
    )
-    yield* events.project(SessionEvent.PromptLifecycle.Admitted, (event) =>
-      Effect.gen(function* () {
-        if (event.seq === undefined)
-          return yield* Effect.die("Synchronized Session event is missing aggregate sequence")
-        yield* SessionInput.projectAdmitted(db, {
-          admittedSeq: event.seq,
-          id: event.data.messageID,
-          sessionID: event.data.sessionID,
-          prompt: event.data.prompt,
-          delivery: event.data.delivery,
-          timeCreated: event.data.timestamp,
-        })
-      }),
-    )
-    yield* events.project(SessionEvent.PromptLifecycle.Promoted, (event) =>
-      Effect.gen(function* () {
-        if (event.seq === undefined)
-          return yield* Effect.die("Synchronized Session event is missing aggregate sequence")
-        yield* insertMessage(
-          db,
-          event,
-          yield* SessionInput.projectPromoted(db, {
-            id: event.data.messageID,
-            sessionID: event.data.sessionID,
-            prompt: event.data.prompt,
-            timeCreated: event.data.timeCreated,
-            promotedSeq: event.seq,
-          }),
-        )
-      }),
-    )
    yield* events.project(SessionEvent.Synthetic, (event) => run(db, event))
    yield* events.project(SessionEvent.Shell.Started, (event) => run(db, event))
    yield* events.project(SessionEvent.Shell.Ended, (event) => run(db, event))
@@ -132,13 +132,10 @@ export const layer = Layer.effect(
      const model = yield* models.resolve(session)
      const toolFibers = yield* FiberSet.make<void, never>()
      let needsContinuation = false
-      if (promotion) {
-        const cutoff = yield* SessionInput.latestSeq(db, session.id)
-        if (promotion === "steer") yield* SessionInput.promoteSteers(db, events, session.id, cutoff)
-        if (promotion === "queue") {
-          yield* SessionInput.promoteNextQueued(db, events, session.id)
-          yield* SessionInput.promoteSteers(db, events, session.id, cutoff)
-        }
+      if (promotion === "steer") yield* SessionInput.promoteSteers(db, events, session.id)
+      if (promotion === "queue") {
+        yield* SessionInput.promoteNextQueued(db, events, session.id)
+        yield* SessionInput.promoteSteers(db, events, session.id)
      }
      yield* failInterruptedTools(session.id)
      const context = yield* getContext(session.id)
@@ -236,8 +233,8 @@ export const layer = Layer.effect(
      readonly force?: boolean
    }) {
      const session = yield* getSession(input.sessionID)
-      const hasSteer = yield* SessionInput.hasPending(db, input.sessionID, "steer")
-      const hasQueue = hasSteer ? false : yield* SessionInput.hasPending(db, input.sessionID, "queue")
+      const hasSteer = yield* SessionInput.hasPending(db, input.sessionID, ["steer"])
+      const hasQueue = yield* SessionInput.hasPending(db, input.sessionID, ["queue"])
      if (input.force !== true && !hasSteer && !hasQueue) return
      let promotion: "steer" | "queue" | undefined = hasSteer ? "steer" : hasQueue ? "queue" : undefined
      let openActivity = input.force === true || hasSteer || hasQueue
@@ -246,12 +243,12 @@ export const layer = Layer.effect(
        for (let step = 0; step < MAX_STEPS; step++) {
          needsContinuation = yield* runTurn(session, promotion)
          promotion = "steer"
-          if (!needsContinuation) needsContinuation = yield* SessionInput.hasPending(db, input.sessionID, "steer")
+          if (!needsContinuation) needsContinuation = yield* SessionInput.hasPending(db, input.sessionID, ["steer"])
          if (!needsContinuation) break
        }
        if (needsContinuation)
          return yield* new StepLimitExceededError({ sessionID: input.sessionID, limit: MAX_STEPS })
-        openActivity = yield* SessionInput.hasPending(db, input.sessionID, "queue")
+        openActivity = yield* SessionInput.hasPending(db, input.sessionID, ["queue"])
        promotion = openActivity ? "queue" : undefined
      }
    })
@@ -10,7 +10,6 @@ import { DateTime, Effect } from "effect"
 import { EventV2 } from "../../event"
 import { ModelV2 } from "../../model"
 import { SessionEvent } from "../event"
-import { SessionMessage } from "../message"
 import { SessionSchema } from "../schema"

 type Input = {
@@ -61,7 +60,7 @@ export const createLLMEventPublisher = (events: EventV2.Interface, input: Input)
  const tools = new Map<
    string,
    {
-      readonly assistantMessageID: SessionMessage.ID
+      readonly assistantMessageID: EventV2.ID
      readonly name: string
      inputEnded: boolean
      called: boolean
@@ -71,17 +70,13 @@ export const createLLMEventPublisher = (events: EventV2.Interface, input: Input)
    }
  >()
  const timestamp = DateTime.now
-  let assistantMessageID: SessionMessage.ID | undefined
+  let assistantMessageID: EventV2.ID | undefined
  let providerFailed = false

  const startAssistant = Effect.fnUntraced(function* () {
    if (assistantMessageID !== undefined) return assistantMessageID
-    assistantMessageID = SessionMessage.ID.create()
-    yield* events.publish(SessionEvent.Step.Started, {
-      ...input,
-      assistantMessageID,
-      timestamp: yield* timestamp,
-    })
+    assistantMessageID = (yield* events.publish(SessionEvent.Step.Started, { ...input, timestamp: yield* timestamp }))
+      .id
    return assistantMessageID
  })
  const currentAssistantMessageID = () =>
@@ -123,7 +118,6 @@ export const createLLMEventPublisher = (events: EventV2.Interface, input: Input)
    Effect.gen(function* () {
      yield* events.publish(SessionEvent.Text.Ended, {
        sessionID: input.sessionID,
-        assistantMessageID: yield* currentAssistantMessageID(),
        timestamp: yield* timestamp,
        textID,
        text: value,
@@ -134,7 +128,6 @@ export const createLLMEventPublisher = (events: EventV2.Interface, input: Input)
    Effect.gen(function* () {
      yield* events.publish(SessionEvent.Reasoning.Ended, {
        sessionID: input.sessionID,
-        assistantMessageID: yield* currentAssistantMessageID(),
        timestamp: yield* timestamp,
        reasoningID,
        text: value,
@@ -227,7 +220,6 @@ export const createLLMEventPublisher = (events: EventV2.Interface, input: Input)
        yield* text.start(event.id)
        yield* events.publish(SessionEvent.Text.Started, {
          sessionID: input.sessionID,
-          assistantMessageID: yield* startAssistant(),
          timestamp: yield* timestamp,
          textID: event.id,
        })
@@ -236,7 +228,6 @@ export const createLLMEventPublisher = (events: EventV2.Interface, input: Input)
        yield* text.append(event.id, event.text)
        yield* events.publish(SessionEvent.Text.Delta, {
          sessionID: input.sessionID,
-          assistantMessageID: yield* currentAssistantMessageID(),
          timestamp: yield* timestamp,
          textID: event.id,
          delta: event.text,
@@ -249,7 +240,6 @@ export const createLLMEventPublisher = (events: EventV2.Interface, input: Input)
        yield* reasoning.start(event.id)
        yield* events.publish(SessionEvent.Reasoning.Started, {
          sessionID: input.sessionID,
-          assistantMessageID: yield* startAssistant(),
          timestamp: yield* timestamp,
          reasoningID: event.id,
          providerMetadata: event.providerMetadata,
@@ -259,7 +249,6 @@ export const createLLMEventPublisher = (events: EventV2.Interface, input: Input)
        yield* reasoning.append(event.id, event.text)
        yield* events.publish(SessionEvent.Reasoning.Delta, {
          sessionID: input.sessionID,
-          assistantMessageID: yield* currentAssistantMessageID(),
          timestamp: yield* timestamp,
          reasoningID: event.id,
          delta: event.text,
@@ -1,4 +1,4 @@
-import { sqliteTable, text, integer, index, primaryKey, real, uniqueIndex } from "drizzle-orm/sqlite-core"
+import { sqliteTable, text, integer, index, primaryKey, real } from "drizzle-orm/sqlite-core"
 import * as DatabasePath from "../database/path"
 import { ProjectTable } from "../project/sql"
 import type { SessionMessage } from "./message"
@@ -127,7 +127,7 @@ export const SessionMessageTable = sqliteTable(
    data: text({ mode: "json" }).notNull().$type<SessionMessageData>(),
  },
  (table) => [
-    uniqueIndex("session_message_session_seq_idx").on(table.session_id, table.seq),
+    index("session_message_session_seq_idx").on(table.session_id, table.seq),
    index("session_message_session_type_seq_idx").on(table.session_id, table.type, table.seq),
    index("session_message_session_time_created_id_idx").on(table.session_id, table.time_created, table.id),
    index("session_message_time_created_idx").on(table.time_created),
@@ -137,14 +137,14 @@ export const SessionMessageTable = sqliteTable(
 export const SessionInputTable = sqliteTable(
  "session_input",
  {
-    id: text().$type<SessionMessage.ID>().primaryKey(),
+    seq: integer().primaryKey({ autoIncrement: true }),
+    id: text().$type<SessionMessage.ID>().notNull().unique(),
    session_id: text()
      .$type<SessionSchema.ID>()
      .notNull()
      .references(() => SessionTable.id, { onDelete: "cascade" }),
    prompt: text({ mode: "json" }).notNull().$type<Prompt>(),
    delivery: text().$type<SessionInput.Delivery>().notNull(),
-    admitted_seq: integer().notNull(),
    promoted_seq: integer(),
    time_created: integer()
      .notNull()
@@ -155,9 +155,7 @@ export const SessionInputTable = sqliteTable(
      table.session_id,
      table.promoted_seq,
      table.delivery,
-      table.admitted_seq,
+      table.seq,
    ),
-    uniqueIndex("session_input_session_admitted_seq_idx").on(table.session_id, table.admitted_seq),
-    uniqueIndex("session_input_session_promoted_seq_idx").on(table.session_id, table.promoted_seq),
  ],
 )
@@ -10,7 +10,6 @@ import { DatabaseMigration } from "@opencode-ai/core/database/migration"
 import sessionUsageMigration from "@opencode-ai/core/database/migration/20260510033149_session_usage"
 import normalizeStoragePathsMigration from "@opencode-ai/core/database/migration/20260601010001_normalize_storage_paths"
 import sessionMessageProjectionOrderMigration from "@opencode-ai/core/database/migration/20260603040000_session_message_projection_order"
-import eventSourcedSessionInputMigration from "@opencode-ai/core/database/migration/20260604172448_event_sourced_session_input"
 import { ProjectV2 } from "@opencode-ai/core/project"
 import { ProjectTable } from "@opencode-ai/core/project/sql"
 import { AbsolutePath } from "@opencode-ai/core/schema"
@@ -63,17 +62,15 @@ describe("DatabaseMigration", () => {
        expect(
          yield* db.get(sql`SELECT name FROM sqlite_master WHERE type = 'table' AND name = 'session_input'`),
        ).toEqual({ name: "session_input" })
-        expect(yield* db.get(sql`SELECT count(*) as count FROM migration`)).toEqual({ count: 30 })
+        expect(yield* db.get(sql`SELECT count(*) as count FROM migration`)).toEqual({ count: 29 })
        expect(
          yield* db.all(
-            sql`SELECT name FROM sqlite_master WHERE type = 'index' AND name IN ('event_aggregate_seq_idx', 'event_aggregate_type_seq_idx', 'session_input_session_pending_seq_idx', 'session_input_session_pending_delivery_seq_idx', 'session_input_session_admitted_seq_idx', 'session_input_session_promoted_seq_idx', 'session_message_session_idx', 'session_message_session_type_idx', 'session_message_session_seq_idx', 'session_message_session_type_seq_idx', 'session_message_session_time_created_id_idx') ORDER BY name`,
+            sql`SELECT name FROM sqlite_master WHERE type = 'index' AND name IN ('event_aggregate_seq_idx', 'event_aggregate_type_seq_idx', 'session_input_session_pending_seq_idx', 'session_input_session_pending_delivery_seq_idx', 'session_message_session_idx', 'session_message_session_type_idx', 'session_message_session_seq_idx', 'session_message_session_type_seq_idx', 'session_message_session_time_created_id_idx') ORDER BY name`,
          ),
        ).toEqual([
          { name: "event_aggregate_seq_idx" },
          { name: "event_aggregate_type_seq_idx" },
-          { name: "session_input_session_admitted_seq_idx" },
          { name: "session_input_session_pending_delivery_seq_idx" },
-          { name: "session_input_session_promoted_seq_idx" },
          { name: "session_message_session_seq_idx" },
          { name: "session_message_session_time_created_id_idx" },
          { name: "session_message_session_type_seq_idx" },
@@ -82,82 +79,6 @@ describe("DatabaseMigration", () => {
    )
  })

-  test("resets beta history and rebuilds event-sourced Session input storage", async () => {
-    await run(
-      Effect.gen(function* () {
-        const db = yield* makeDb
-        yield* db.run(sql`CREATE TABLE session (id text PRIMARY KEY, workspace_id text)`)
-        yield* db.run(sql`CREATE TABLE workspace (id text PRIMARY KEY)`)
-        yield* db.run(sql`CREATE TABLE message (id text PRIMARY KEY)`)
-        yield* db.run(sql`CREATE TABLE part (id text PRIMARY KEY)`)
-        yield* db.run(sql`CREATE TABLE event_sequence (aggregate_id text PRIMARY KEY, seq integer NOT NULL)`)
-        yield* db.run(
-          sql`CREATE TABLE event (id text PRIMARY KEY, aggregate_id text NOT NULL, seq integer NOT NULL, type text NOT NULL, data text NOT NULL)`,
-        )
-        yield* db.run(sql`CREATE INDEX event_aggregate_seq_idx ON event (aggregate_id, seq)`)
-        yield* db.run(sql`CREATE INDEX event_aggregate_type_seq_idx ON event (aggregate_id, type, seq)`)
-        yield* db.run(
-          sql`CREATE TABLE session_message (id text PRIMARY KEY, session_id text NOT NULL, type text NOT NULL, seq integer NOT NULL, time_created integer NOT NULL, time_updated integer NOT NULL, data text NOT NULL)`,
-        )
-        yield* db.run(sql`CREATE INDEX session_message_session_seq_idx ON session_message (session_id, seq)`)
-        yield* db.run(
-          sql`CREATE TABLE session_input (seq integer PRIMARY KEY AUTOINCREMENT, id text NOT NULL UNIQUE, session_id text NOT NULL, prompt text NOT NULL, delivery text NOT NULL, promoted_seq integer, time_created integer NOT NULL)`,
-        )
-        yield* db.run(
-          sql`CREATE INDEX session_input_session_pending_delivery_seq_idx ON session_input (session_id, promoted_seq, delivery, seq)`,
-        )
-        yield* db.run(sql`INSERT INTO session (id, workspace_id) VALUES ('session', 'wrk_old')`)
-        yield* db.run(sql`INSERT INTO workspace (id) VALUES ('wrk_old')`)
-        yield* db.run(sql`INSERT INTO message (id) VALUES ('message')`)
-        yield* db.run(sql`INSERT INTO part (id) VALUES ('part')`)
-        yield* db.run(sql`INSERT INTO event_sequence (aggregate_id, seq) VALUES ('session', 0)`)
-        yield* db.run(
-          sql`INSERT INTO event (id, aggregate_id, seq, type, data) VALUES ('evt_old', 'session', 0, 'old.1', '{}')`,
-        )
-        yield* db.run(
-          sql`INSERT INTO session_message (id, session_id, type, seq, time_created, time_updated, data) VALUES ('msg_old', 'session', 'user', 0, 1, 1, '{}')`,
-        )
-        yield* db.run(
-          sql`INSERT INTO session_input (id, session_id, prompt, delivery, time_created) VALUES ('msg_pending', 'session', '{}', 'steer', 1)`,
-        )
-
-        yield* DatabaseMigration.applyOnly(db, [eventSourcedSessionInputMigration])
-
-        expect(yield* db.all(sql`SELECT id, workspace_id FROM session`)).toEqual([
-          { id: "session", workspace_id: null },
-        ])
-        expect(yield* db.all(sql`SELECT id FROM workspace`)).toEqual([])
-        expect(yield* db.all(sql`SELECT id FROM message`)).toEqual([{ id: "message" }])
-        expect(yield* db.all(sql`SELECT id FROM part`)).toEqual([{ id: "part" }])
-        expect(yield* db.all(sql`SELECT id FROM event`)).toEqual([])
-        expect(yield* db.all(sql`SELECT aggregate_id FROM event_sequence`)).toEqual([])
-        expect(yield* db.all(sql`SELECT id FROM session_message`)).toEqual([])
-        expect(yield* db.all(sql`SELECT id FROM session_input`)).toEqual([])
-        expect(
-          (yield* db.all<{ name: string }>(sql`PRAGMA table_info(session_input)`)).map((column) => column.name),
-        ).toEqual(["id", "session_id", "prompt", "delivery", "admitted_seq", "promoted_seq", "time_created"])
-        expect(
-          (yield* db.all<{ name: string; unique: number }>(sql`PRAGMA index_list(session_message)`)).find(
-            (index) => index.name === "session_message_session_seq_idx",
-          ),
-        ).toMatchObject({ unique: 1 })
-        expect(
-          (yield* db.all<{ name: string; unique: number }>(sql`PRAGMA index_list(event)`)).find(
-            (index) => index.name === "event_aggregate_seq_idx",
-          ),
-        ).toMatchObject({ unique: 1 })
-        expect(
-          (yield* db.all<{ name: string; unique: number }>(sql`PRAGMA index_list(session_input)`)).filter((index) =>
-            ["session_input_session_admitted_seq_idx", "session_input_session_promoted_seq_idx"].includes(index.name),
-          ),
-        ).toEqual([
-          expect.objectContaining({ name: "session_input_session_promoted_seq_idx", unique: 1 }),
-          expect.objectContaining({ name: "session_input_session_admitted_seq_idx", unique: 1 }),
-        ])
-      }),
-    )
-  })
-
  test("resets incompatible projected Session messages before adding sequence order", async () => {
    await run(
      Effect.gen(function* () {
@@ -1,5 +1,5 @@
 import { describe, expect } from "bun:test"
-import { Cause, DateTime, Deferred, Effect, Exit, Fiber, Layer, Schema, Stream } from "effect"
+import { DateTime, Deferred, Effect, Fiber, Layer, Schema, Stream } from "effect"
 import { EventV2 } from "@opencode-ai/core/event"
 import { Database } from "@opencode-ai/core/database/database"
 import { EventSequenceTable, EventTable } from "@opencode-ai/core/event/sql"
@@ -236,56 +236,6 @@ describe("EventV2", () => {
    }),
  )

-  it.effect("isolates observer defects after durable events commit", () =>
-    Effect.gen(function* () {
-      const events = yield* EventV2.Service
-      const received = new Array<string>()
-      yield* events.sync(() => Effect.die("sync defect"))
-      yield* events.listen(() => {
-        throw new Error("listener defect")
-      })
-      yield* events.listen((event) =>
-        Effect.sync(() => {
-          received.push(event.type)
-        }),
-      )
-
-      const event = yield* events.publish(SyncMessage, { id: "one", text: "hello" })
-
-      expect(received).toEqual([SyncMessage.type])
-      expect(event.seq).toBeNumber()
-    }),
-  )
-
-  it.effect("preserves observer interruption", () =>
-    Effect.gen(function* () {
-      const events = yield* EventV2.Service
-      const { db } = yield* Database.Service
-      yield* events.listen(() => Effect.interrupt)
-
-      const exit = yield* events.publish(SyncMessage, { id: "interrupted", text: "hello" }).pipe(Effect.exit)
-      const committed = yield* db
-        .select({ id: EventTable.id })
-        .from(EventTable)
-        .where(eq(EventTable.aggregate_id, "interrupted"))
-        .get()
-        .pipe(Effect.orDie)
-
-      expect(Exit.isFailure(exit) && Cause.hasInterrupts(exit.cause)).toBeTrue()
-      expect(committed).toBeDefined()
-    }),
-  )
-
-  it.effect("keeps live-only listener defects fail-fast", () =>
-    Effect.gen(function* () {
-      const events = yield* EventV2.Service
-      const defect = new Error("listener defect")
-      yield* events.listen(() => Effect.die(defect))
-
-      expect(yield* events.publish(Message, { text: "hello" }).pipe(Effect.catchDefect(Effect.succeed))).toBe(defect)
-    }),
-  )
-
  it.effect("does not synchronize live-only events", () =>
    Effect.gen(function* () {
      const events = yield* EventV2.Service
@@ -304,30 +254,6 @@ describe("EventV2", () => {
    }),
  )

-  it.effect("synchronizes only after the durable event commits", () =>
-    Effect.gen(function* () {
-      const events = yield* EventV2.Service
-      const { db } = yield* Database.Service
-      const synchronized = new Array<boolean>()
-      yield* events.sync((event) =>
-        db
-          .select({ id: EventTable.id })
-          .from(EventTable)
-          .where(eq(EventTable.id, event.id))
-          .get()
-          .pipe(
-            Effect.orDie,
-            Effect.map((row) => synchronized.push(row !== undefined)),
-            Effect.asVoid,
-          ),
-      )
-
-      yield* events.publish(SyncMessage, { id: EventV2.ID.create(), text: "durable" })
-
-      expect(synchronized).toEqual([true])
-    }),
-  )
-
  it.effect("inserts sync event rows on publish", () =>
    Effect.gen(function* () {
      const events = yield* EventV2.Service
@@ -764,59 +690,6 @@ describe("EventV2", () => {
    }),
  )

-  it.effect("strict owner fences exact replay", () =>
-    Effect.gen(function* () {
-      const events = yield* EventV2.Service
-      const aggregateID = EventV2.ID.create()
-      const id = EventV2.ID.create()
-      const replayed = {
-        id,
-        type: EventV2.versionedType(SyncMessage.type, 1),
-        seq: 0,
-        aggregateID,
-        data: { id: aggregateID, text: "owned" },
-      }
-      yield* events.replay(replayed, { ownerID: "owner-a" })
-
-      const exit = yield* events.replay(replayed, { ownerID: "owner-b", strictOwner: true }).pipe(Effect.exit)
-
-      expect(String(exit)).toContain("Replay owner mismatch")
-    }),
-  )
-
-  it.effect("exact replay claims an unowned aggregate", () =>
-    Effect.gen(function* () {
-      const events = yield* EventV2.Service
-      const { db } = yield* Database.Service
-      const aggregateID = EventV2.ID.create()
-      const published = yield* events.publish(SyncMessage, { id: aggregateID, text: "owned" })
-      const replayed = {
-        id: published.id,
-        type: EventV2.versionedType(SyncMessage.type, 1),
-        seq: published.seq!,
-        aggregateID,
-        data: published.data,
-      }
-
-      yield* events.replay(replayed, { ownerID: "owner-a", strictOwner: true })
-      const row = yield* db
-        .select({ ownerID: EventSequenceTable.owner_id })
-        .from(EventSequenceTable)
-        .where(eq(EventSequenceTable.aggregate_id, aggregateID))
-        .get()
-        .pipe(Effect.orDie)
-
-      expect(row?.ownerID).toBe("owner-a")
-      const exit = yield* events
-        .replay(
-          { ...replayed, id: EventV2.ID.create(), seq: 1, data: { id: aggregateID, text: "conflict" } },
-          { ownerID: "owner-b", strictOwner: true },
-        )
-        .pipe(Effect.exit)
-      expect(String(exit)).toContain("Replay owner mismatch")
-    }),
-  )
-
  it.effect("replay with owner claims an unowned sequence", () =>
    Effect.gen(function* () {
      const events = yield* EventV2.Service
@@ -942,57 +815,6 @@ describe("EventV2", () => {
    }),
  )

-  it.effect("rejects divergent stale replay without publishing it", () =>
-    Effect.gen(function* () {
-      const events = yield* EventV2.Service
-      const received = new Array<EventV2.Payload>()
-      const aggregateID = EventV2.ID.create()
-      const replayed = {
-        id: EventV2.ID.create(),
-        type: EventV2.versionedType(SyncMessage.type, 1),
-        seq: 0,
-        aggregateID,
-        data: { id: aggregateID, text: "original" },
-      }
-      yield* events.listen((event) => Effect.sync(() => received.push(event)))
-      yield* events.replay(replayed, { publish: true })
-
-      const exit = yield* events
-        .replay({ ...replayed, data: { id: aggregateID, text: "divergent" } }, { publish: true })
-        .pipe(Effect.exit)
-
-      expect(String(exit)).toContain("Replay diverged")
-      expect(received).toHaveLength(1)
-    }),
-  )
-
-  it.effect("rejects an event ID reused at another aggregate position", () =>
-    Effect.gen(function* () {
-      const events = yield* EventV2.Service
-      const aggregateID = EventV2.ID.create()
-      const id = EventV2.ID.create()
-      yield* events.replay({
-        id,
-        type: EventV2.versionedType(SyncMessage.type, 1),
-        seq: 0,
-        aggregateID,
-        data: { id: aggregateID, text: "first" },
-      })
-
-      const exit = yield* events
-        .replay({
-          id,
-          type: EventV2.versionedType(SyncMessage.type, 1),
-          seq: 1,
-          aggregateID,
-          data: { id: aggregateID, text: "second" },
-        })
-        .pipe(Effect.exit)
-
-      expect(String(exit)).toContain(`Event ${id} already exists`)
-    }),
-  )
-
  it.effect("replay from a different owner leaves claimed sequence unchanged", () =>
    Effect.gen(function* () {
      const events = yield* EventV2.Service
@@ -1,249 +0,0 @@
-import { describe, expect } from "bun:test"
-import { $ } from "bun"
-import fs from "fs/promises"
-import path from "path"
-import { eq } from "drizzle-orm"
-import { Effect, Layer } from "effect"
-import { MoveSession } from "@opencode-ai/core/control-plane/move-session"
-import { Database } from "@opencode-ai/core/database/database"
-import { FSUtil } from "@opencode-ai/core/fs-util"
-import { Git } from "@opencode-ai/core/git"
-import { EventV2 } from "@opencode-ai/core/event"
-import { Project } from "@opencode-ai/core/project"
-import { ProjectTable } from "@opencode-ai/core/project/sql"
-import { AbsolutePath } from "@opencode-ai/core/schema"
-import { SessionV2 } from "@opencode-ai/core/session"
-import { SessionExecution } from "@opencode-ai/core/session/execution"
-import { SessionProjector } from "@opencode-ai/core/session/projector"
-import { SessionTable } from "@opencode-ai/core/session/sql"
-import { SessionStore } from "@opencode-ai/core/session/store"
-import { tmpdir } from "./fixture/tmpdir"
-import { testEffect } from "./lib/effect"
-
-const database = Database.layerFromPath(":memory:")
-const events = EventV2.layer.pipe(Layer.provide(database))
-const projector = SessionProjector.layer.pipe(Layer.provide(database), Layer.provide(events))
-const project = Project.layer.pipe(
-  Layer.provide(database),
-  Layer.provide(FSUtil.defaultLayer),
-  Layer.provide(Git.defaultLayer),
-)
-const store = SessionStore.layer.pipe(Layer.provide(database))
-const sessions = SessionV2.layer.pipe(
-  Layer.provide(database),
-  Layer.provide(events),
-  Layer.provide(project),
-  Layer.provide(store),
-  Layer.provide(SessionExecution.noopLayer),
-)
-const layer = MoveSession.layer.pipe(
-  Layer.provide(database),
-  Layer.provide(FSUtil.defaultLayer),
-  Layer.provide(Git.defaultLayer),
-  Layer.provide(events),
-  Layer.provide(project),
-  Layer.provide(sessions),
-)
-const it = testEffect(
-  Layer.mergeAll(layer, database, events, project, projector, store, SessionExecution.noopLayer, sessions),
-)
-
-function abs(input: string) {
-  return AbsolutePath.make(input)
-}
-
-async function initRepo(directory: string) {
-  await $`git init`.cwd(directory).quiet()
-  await $`git config core.autocrlf false`.cwd(directory).quiet()
-  await $`git config core.fsmonitor false`.cwd(directory).quiet()
-  await $`git config commit.gpgsign false`.cwd(directory).quiet()
-  await $`git config user.email test@opencode.test`.cwd(directory).quiet()
-  await $`git config user.name Test`.cwd(directory).quiet()
-  await fs.writeFile(path.join(directory, "tracked.txt"), "initial\n")
-  await $`git add tracked.txt`.cwd(directory).quiet()
-  await $`git commit -m root`.cwd(directory).quiet()
-}
-
-describe("MoveSession", () => {
-  it.live("moves session changes to another project directory", () =>
-    Effect.gen(function* () {
-      const root = yield* Effect.acquireRelease(
-        Effect.promise(() => tmpdir()),
-        (dir) => Effect.promise(() => dir[Symbol.asyncDispose]()),
-      )
-      yield* Effect.promise(() => initRepo(root.path))
-      const source = abs(yield* Effect.promise(() => fs.realpath(root.path)))
-      const destination = abs(`${root.path}-move-destination`)
-      yield* Effect.addFinalizer(() =>
-        Effect.promise(() => fs.rm(destination, { recursive: true, force: true })).pipe(Effect.ignore),
-      )
-      yield* Effect.promise(() => $`git worktree add --detach ${destination} HEAD`.cwd(root.path).quiet())
-      const moved = abs(yield* Effect.promise(() => fs.realpath(destination)))
-      yield* Effect.promise(() => fs.writeFile(path.join(source, "tracked.txt"), "changed\n"))
-      yield* Effect.promise(() => fs.writeFile(path.join(source, "untracked.txt"), "new\n"))
-
-      const projectID = (yield* Project.Service.use((service) => service.resolve(source))).id
-      const sessionID = SessionV2.ID.make("ses_move")
-      const { db } = yield* Database.Service
-      yield* db
-        .insert(ProjectTable)
-        .values({ id: projectID, worktree: source, sandboxes: [], time_created: 1, time_updated: 1 })
-        .run()
-        .pipe(Effect.orDie)
-      yield* db
-        .insert(SessionTable)
-        .values({
-          id: sessionID,
-          project_id: projectID,
-          slug: "move",
-          directory: source,
-          title: "move",
-          version: "test",
-          time_created: 1,
-          time_updated: 1,
-        })
-        .run()
-        .pipe(Effect.orDie)
-
-      yield* MoveSession.Service.use((service) =>
-        service.moveSession({ sessionID, destination: { directory: moved }, moveChanges: true }),
-      )
-
-      expect(yield* Effect.promise(() => fs.readFile(path.join(moved, "tracked.txt"), "utf8"))).toBe("changed\n")
-      expect(yield* Effect.promise(() => fs.readFile(path.join(moved, "untracked.txt"), "utf8"))).toBe("new\n")
-      expect(yield* Effect.promise(() => fs.readFile(path.join(source, "tracked.txt"), "utf8"))).toBe("initial\n")
-      expect(yield* Effect.promise(() => Bun.file(path.join(source, "untracked.txt")).exists())).toBe(false)
-      expect(
-        yield* db
-          .select({ directory: SessionTable.directory, path: SessionTable.path })
-          .from(SessionTable)
-          .where(eq(SessionTable.id, sessionID))
-          .get(),
-      ).toEqual({ directory: moved, path: "" })
-    }),
-  )
-
-  it.live("moves within a checkout without transferring existing changes", () =>
-    Effect.gen(function* () {
-      const root = yield* Effect.acquireRelease(
-        Effect.promise(() => tmpdir()),
-        (dir) => Effect.promise(() => dir[Symbol.asyncDispose]()),
-      )
-      yield* Effect.promise(() => initRepo(root.path))
-      const source = abs(yield* Effect.promise(() => fs.realpath(root.path)))
-      const destination = abs(path.join(source, "packages"))
-      yield* Effect.promise(() => fs.mkdir(destination))
-      yield* Effect.promise(() => fs.writeFile(path.join(source, "tracked.txt"), "changed\n"))
-      yield* Effect.promise(() => fs.writeFile(path.join(source, "untracked.txt"), "new\n"))
-
-      const projectID = (yield* Project.Service.use((service) => service.resolve(source))).id
-      const sessionID = SessionV2.ID.make("ses_move_nested")
-      const { db } = yield* Database.Service
-      yield* db
-        .insert(ProjectTable)
-        .values({ id: projectID, worktree: source, sandboxes: [], time_created: 1, time_updated: 1 })
-        .run()
-        .pipe(Effect.orDie)
-      yield* db
-        .insert(SessionTable)
-        .values({
-          id: sessionID,
-          project_id: projectID,
-          slug: "move-nested",
-          directory: source,
-          title: "move nested",
-          version: "test",
-          time_created: 1,
-          time_updated: 1,
-        })
-        .run()
-        .pipe(Effect.orDie)
-
-      yield* MoveSession.Service.use((service) =>
-        service.moveSession({ sessionID, destination: { directory: destination }, moveChanges: true }),
-      )
-
-      expect(yield* Effect.promise(() => fs.readFile(path.join(source, "tracked.txt"), "utf8"))).toBe("changed\n")
-      expect(yield* Effect.promise(() => fs.readFile(path.join(source, "untracked.txt"), "utf8"))).toBe("new\n")
-      expect(
-        yield* db
-          .select({ directory: SessionTable.directory, path: SessionTable.path })
-          .from(SessionTable)
-          .where(eq(SessionTable.id, sessionID))
-          .get(),
-      ).toEqual({ directory: destination, path: "packages" })
-    }),
-  )
-
-  it.live("moves nested session changes without cleaning unrelated files", () =>
-    Effect.gen(function* () {
-      const root = yield* Effect.acquireRelease(
-        Effect.promise(() => tmpdir()),
-        (dir) => Effect.promise(() => dir[Symbol.asyncDispose]()),
-      )
-      yield* Effect.promise(() => initRepo(root.path))
-      const source = abs(yield* Effect.promise(() => fs.realpath(root.path)))
-      const sourceDirectory = abs(path.join(source, "packages"))
-      yield* Effect.promise(() => fs.mkdir(sourceDirectory))
-      yield* Effect.promise(() => fs.writeFile(path.join(sourceDirectory, "tracked.txt"), "initial\n"))
-      yield* Effect.promise(() => fs.writeFile(path.join(sourceDirectory, "staged.txt"), "initial\n"))
-      yield* Effect.promise(() => $`git add packages/tracked.txt packages/staged.txt`.cwd(source).quiet())
-      yield* Effect.promise(() => $`git commit -m packages`.cwd(source).quiet())
-      const destination = abs(`${root.path}-move-nested-destination`)
-      yield* Effect.addFinalizer(() =>
-        Effect.promise(() => fs.rm(destination, { recursive: true, force: true })).pipe(Effect.ignore),
-      )
-      yield* Effect.promise(() => $`git worktree add --detach ${destination} HEAD`.cwd(source).quiet())
-      const moved = abs(path.join(yield* Effect.promise(() => fs.realpath(destination)), "packages"))
-      yield* Effect.promise(() => fs.writeFile(path.join(sourceDirectory, "tracked.txt"), "changed\n"))
-      yield* Effect.promise(() => fs.writeFile(path.join(sourceDirectory, "staged.txt"), "staged\n"))
-      yield* Effect.promise(() => $`git add packages/staged.txt`.cwd(source).quiet())
-      yield* Effect.promise(() => fs.writeFile(path.join(sourceDirectory, "untracked.txt"), "new\n"))
-      yield* Effect.promise(() => fs.writeFile(path.join(source, "tracked.txt"), "unrelated\n"))
-      yield* Effect.promise(() => fs.writeFile(path.join(source, "untracked.txt"), "unrelated\n"))
-
-      const projectID = (yield* Project.Service.use((service) => service.resolve(source))).id
-      const sessionID = SessionV2.ID.make("ses_move_nested_checkout")
-      const { db } = yield* Database.Service
-      yield* db
-        .insert(ProjectTable)
-        .values({ id: projectID, worktree: source, sandboxes: [], time_created: 1, time_updated: 1 })
-        .run()
-        .pipe(Effect.orDie)
-      yield* db
-        .insert(SessionTable)
-        .values({
-          id: sessionID,
-          project_id: projectID,
-          slug: "move-nested-checkout",
-          directory: sourceDirectory,
-          title: "move nested checkout",
-          version: "test",
-          time_created: 1,
-          time_updated: 1,
-        })
-        .run()
-        .pipe(Effect.orDie)
-
-      yield* MoveSession.Service.use((service) =>
-        service.moveSession({ sessionID, destination: { directory: moved }, moveChanges: true }),
-      )
-
-      expect(yield* Effect.promise(() => fs.readFile(path.join(moved, "tracked.txt"), "utf8"))).toBe("changed\n")
-      expect(yield* Effect.promise(() => fs.readFile(path.join(moved, "staged.txt"), "utf8"))).toBe("staged\n")
-      expect(yield* Effect.promise(() => fs.readFile(path.join(moved, "untracked.txt"), "utf8"))).toBe("new\n")
-      expect(yield* Effect.promise(() => fs.readFile(path.join(sourceDirectory, "tracked.txt"), "utf8"))).toBe(
-        "initial\n",
-      )
-      expect(yield* Effect.promise(() => Bun.file(path.join(sourceDirectory, "untracked.txt")).exists())).toBe(false)
-      expect(yield* Effect.promise(() => fs.readFile(path.join(sourceDirectory, "staged.txt"), "utf8"))).toBe(
-        "staged\n",
-      )
-      expect(yield* Effect.promise(() => $`git status --porcelain -- packages/staged.txt`.cwd(source).text())).toBe(
-        "M  packages/staged.txt\n",
-      )
-      expect(yield* Effect.promise(() => fs.readFile(path.join(source, "tracked.txt"), "utf8"))).toBe("unrelated\n")
-      expect(yield* Effect.promise(() => fs.readFile(path.join(source, "untracked.txt"), "utf8"))).toBe("unrelated\n")
-    }),
-  )
-})
@@ -0,0 +1,16 @@
+import { describe, expect } from "bun:test"
+import { Effect } from "effect"
+import { OpenCode } from "@opencode-ai/core/opencode"
+import { testEffect } from "./lib/effect"
+
+const it = testEffect(OpenCode.layer)
+
+describe("OpenCode.layer", () => {
+  it.effect("exposes Sessions through the public embedded API", () =>
+    Effect.gen(function* () {
+      const opencode = yield* OpenCode.Service
+
+      expect(yield* opencode.sessions.list()).toBeArray()
+    }),
+  )
+})
@@ -97,11 +97,9 @@ describe("ProjectCopy", () => {
      const input = yield* setup()
      const copy = yield* ProjectCopy.Service
      const events = yield* EventV2.Service
-      const temp = yield* Effect.promise(() => fs.realpath(path.dirname(input.root.path)))
-      const parent = abs(path.join(temp, path.basename(input.root.path) + "-copy-created"))
-      const target = abs(path.join(parent, "copy"))
+      const target = abs(`${input.root.path}-copy-created`)
      yield* Effect.addFinalizer(() =>
-        Effect.promise(() => fs.rm(parent, { recursive: true, force: true })).pipe(Effect.ignore),
+        Effect.promise(() => fs.rm(target, { recursive: true, force: true })).pipe(Effect.ignore),
      )
      const fiber = yield* events
        .subscribe(ProjectCopy.Event.Updated)
@@ -112,10 +110,8 @@ describe("ProjectCopy", () => {
        projectID: input.projectID,
        strategy: "git_worktree",
        sourceDirectory: input.sourceDirectory,
-        directory: parent,
-        name: "copy",
+        directory: target,
      })
-      expect(created.directory).toBe(target)
      expect(yield* stored(input.projectID)).toEqual(
        [
          { directory: input.sourceDirectory, type: "main" as const },
@@ -131,71 +127,6 @@ describe("ProjectCopy", () => {
    }),
  )

-  it.live("adds a numeric suffix when a copy directory already exists", () =>
-    Effect.gen(function* () {
-      const input = yield* setup()
-      const copy = yield* ProjectCopy.Service
-      const temp = yield* Effect.promise(() => fs.realpath(path.dirname(input.root.path)))
-      const parent = abs(path.join(temp, path.basename(input.root.path) + "-copy-suffix"))
-      const target = abs(path.join(parent, "copy-3"))
-      yield* Effect.addFinalizer(() =>
-        Effect.promise(() => fs.rm(parent, { recursive: true, force: true })).pipe(Effect.ignore),
-      )
-      yield* Effect.promise(() => fs.mkdir(path.join(parent, "copy"), { recursive: true }))
-      yield* Effect.promise(() => fs.mkdir(path.join(parent, "copy-2")))
-
-      const created = yield* copy.create({
-        projectID: input.projectID,
-        strategy: "git_worktree",
-        sourceDirectory: input.sourceDirectory,
-        directory: parent,
-        name: "copy",
-      })
-
-      expect(created.directory).toBe(target)
-      expect(yield* Effect.promise(() => fs.stat(path.join(parent, "copy")).then((item) => item.isDirectory()))).toBe(
-        true,
-      )
-      expect(yield* Effect.promise(() => fs.stat(path.join(parent, "copy-2")).then((item) => item.isDirectory()))).toBe(
-        true,
-      )
-
-      yield* copy.remove({ projectID: input.projectID, directory: created.directory })
-    }),
-  )
-
-  it.live("fails after ten copy directory conflicts", () =>
-    Effect.gen(function* () {
-      const input = yield* setup()
-      const copy = yield* ProjectCopy.Service
-      const temp = yield* Effect.promise(() => fs.realpath(path.dirname(input.root.path)))
-      const parent = abs(path.join(temp, path.basename(input.root.path) + "-copy-conflicts"))
-      yield* Effect.addFinalizer(() =>
-        Effect.promise(() => fs.rm(parent, { recursive: true, force: true })).pipe(Effect.ignore),
-      )
-      yield* Effect.promise(() =>
-        Promise.all(
-          Array.from({ length: 10 }, (_, index) =>
-            fs.mkdir(path.join(parent, index === 0 ? "copy" : `copy-${index + 1}`), { recursive: true }),
-          ),
-        ),
-      )
-
-      const error = yield* copy
-        .create({
-          projectID: input.projectID,
-          strategy: "git_worktree",
-          sourceDirectory: input.sourceDirectory,
-          directory: parent,
-          name: "copy",
-        })
-        .pipe(Effect.flip)
-
-      expect(error).toBeInstanceOf(ProjectCopy.DestinationExistsError)
-      expect(error.directory).toBe(abs(path.join(parent, "copy-10")))
-    }),
-  )
-
  it.live("does not publish an event when refresh finds no directory changes", () =>
    Effect.gen(function* () {
      const input = yield* setup()
@@ -250,31 +181,6 @@ describe("ProjectCopy", () => {
    }),
  )

-  it.live("refresh ignores stale git worktree registrations", () =>
-    Effect.gen(function* () {
-      const input = yield* setup()
-      const copy = yield* ProjectCopy.Service
-      const stale = abs(`${input.root.path}-copy-stale`)
-      const target = abs(`${input.root.path}-copy-after-stale`)
-      yield* Effect.addFinalizer(() =>
-        Effect.promise(() => fs.rm(target, { recursive: true, force: true })).pipe(Effect.ignore),
-      )
-      yield* Effect.promise(() => $`git worktree add --detach ${stale} HEAD`.cwd(input.root.path).quiet())
-      yield* Effect.promise(() => fs.rm(stale, { recursive: true, force: true }))
-      yield* Effect.promise(() => $`git worktree add --detach ${target} HEAD`.cwd(input.root.path).quiet())
-
-      yield* copy.refresh({ projectID: input.projectID })
-
-      const discovered = abs(yield* Effect.promise(() => fs.realpath(target)))
-      expect(yield* stored(input.projectID)).toEqual(
-        [
-          { directory: input.sourceDirectory, type: "main" as const },
-          { directory: discovered, type: "git_worktree" as const },
-        ].toSorted((a, b) => a.directory.localeCompare(b.directory)),
-      )
-    }),
-  )
-
  it.live("refresh with no roots is a no-op", () =>
    Effect.gen(function* () {
      const copy = yield* ProjectCopy.Service
@@ -1,28 +0,0 @@
-import { describe, expect } from "bun:test"
-import { Effect } from "effect"
-import { OpenCode, Session } from "@opencode-ai/core/public"
-import { testEffect } from "./lib/effect"
-
-const it = testEffect(OpenCode.layer)
-
-describe("public native OpenCode API", () => {
-  it.effect("exposes only the intentional Session capabilities", () =>
-    Effect.gen(function* () {
-      const opencode = yield* OpenCode.Service
-
-      expect(Object.keys(opencode.sessions).sort()).toEqual([
-        "context",
-        "create",
-        "events",
-        "get",
-        "list",
-        "message",
-        "messages",
-        "prompt",
-      ])
-      expect(Session.ID.create()).toStartWith("ses_")
-      expect(Session.MessageID.create()).toStartWith("msg_")
-      expect(yield* opencode.sessions.list()).toBeArray()
-    }),
-  )
-})
@@ -1,15 +1,13 @@
 import { describe, expect } from "bun:test"
-import path from "path"
 import { Effect, Layer, Stream } from "effect"
 import { AgentV2 } from "@opencode-ai/core/agent"
-import { asc, eq } from "drizzle-orm"
+import { eq } from "drizzle-orm"
 import { Database } from "@opencode-ai/core/database/database"
 import { EventV2 } from "@opencode-ai/core/event"
 import { EventTable } from "@opencode-ai/core/event/sql"
 import { Location } from "@opencode-ai/core/location"
 import { ModelV2 } from "@opencode-ai/core/model"
 import { ProjectV2 } from "@opencode-ai/core/project"
-import { ProjectTable } from "@opencode-ai/core/project/sql"
 import { ProviderV2 } from "@opencode-ai/core/provider"
 import { AbsolutePath } from "@opencode-ai/core/schema"
 import { SessionV2 } from "@opencode-ai/core/session"
@@ -18,12 +16,10 @@ import { Prompt } from "@opencode-ai/core/session/prompt"
 import { SessionProjector } from "@opencode-ai/core/session/projector"
 import { SessionExecution } from "@opencode-ai/core/session/execution"
 import { SessionInput } from "@opencode-ai/core/session/input"
-import { SessionEvent } from "@opencode-ai/core/session/event"
 import { SessionTable } from "@opencode-ai/core/session/sql"
 import { SessionStore } from "@opencode-ai/core/session/store"
 import { WorkspaceV2 } from "@opencode-ai/core/workspace"
 import { testEffect } from "./lib/effect"
-import { tmpdir } from "./fixture/tmpdir"

 const database = Database.layerFromPath(":memory:")
 const events = EventV2.layer.pipe(Layer.provide(database))
@@ -215,99 +211,11 @@ describe("SessionV2.create", () => {
      const { db } = yield* Database.Service
      const created = yield* session.create({ location })
      yield* session.prompt({ sessionID: created.id, prompt: new Prompt({ text: "Hello" }), resume: false })
-      yield* SessionInput.promoteSteers(db, events, created.id, Number.MAX_SAFE_INTEGER)
+      yield* SessionInput.promoteSteers(db, events, created.id)

      expect(
-        Array.from(yield* session.events({ sessionID: created.id }).pipe(Stream.take(2), Stream.runCollect)),
-      ).toMatchObject([
-        { cursor: 1, event: { type: "session.next.prompt.admitted", data: { prompt: { text: "Hello" } } } },
-        { cursor: 2, event: { type: "session.next.prompt.promoted" } },
-      ])
-    }),
-  )
-
-  it.effect("replays one prompt lifecycle into a fresh target database", () =>
-    Effect.gen(function* () {
-      const session = yield* SessionV2.Service
-      const sourceEvents = yield* EventV2.Service
-      const sourceDb = (yield* Database.Service).db
-      const created = yield* session.create({ id: SessionV2.ID.make("ses_fresh_target_replay"), location })
-      const admitted = yield* session.prompt({
-        sessionID: created.id,
-        prompt: new Prompt({ text: "Replay lifecycle" }),
-        resume: false,
-      })
-      yield* SessionInput.promoteSteers(sourceDb, sourceEvents, created.id, Number.MAX_SAFE_INTEGER)
-      const serialized = (yield* sourceDb
-        .select()
-        .from(EventTable)
-        .where(eq(EventTable.aggregate_id, created.id))
-        .orderBy(asc(EventTable.seq))
-        .all()
-        .pipe(Effect.orDie)).map((event) => ({
-        id: event.id,
-        aggregateID: event.aggregate_id,
-        seq: event.seq,
-        type: event.type,
-        data: event.data,
-      }))
-
-      const tmp = yield* Effect.acquireRelease(
-        Effect.promise(() => tmpdir()),
-        (tmp) => Effect.promise(() => tmp[Symbol.asyncDispose]()),
-      )
-      const targetDatabase = Database.layerFromPath(path.join(tmp.path, "target.sqlite"))
-      const targetEvents = EventV2.layer.pipe(Layer.provide(targetDatabase))
-      const targetProjector = SessionProjector.layer.pipe(Layer.provide(targetEvents), Layer.provide(targetDatabase))
-      const targetStore = SessionStore.layer.pipe(Layer.provide(targetDatabase))
-
-      yield* Effect.gen(function* () {
-        const db = (yield* Database.Service).db
-        const events = yield* EventV2.Service
-        const store = yield* SessionStore.Service
-        yield* db
-          .insert(ProjectTable)
-          .values({ id: ProjectV2.ID.global, worktree: location.directory, sandboxes: [] })
-          .run()
-          .pipe(Effect.orDie)
-
-        expect(yield* store.get(created.id)).toBeUndefined()
-        expect(yield* events.replayAll(serialized.slice(0, 2))).toBe(created.id)
-        expect(yield* SessionInput.find(db, admitted.id)).toMatchObject({
-          id: admitted.id,
-          sessionID: created.id,
-          prompt: { text: "Replay lifecycle" },
-          delivery: "steer",
-          admittedSeq: 1,
-        })
-        expect(yield* store.context(created.id)).toEqual([])
-
-        expect(yield* events.replayAll(serialized.slice(2))).toBe(created.id)
-        expect(yield* SessionInput.find(db, admitted.id)).toMatchObject({
-          id: admitted.id,
-          sessionID: created.id,
-          prompt: { text: "Replay lifecycle" },
-          delivery: "steer",
-          admittedSeq: 1,
-          promotedSeq: 2,
-        })
-        expect(yield* store.context(created.id)).toMatchObject([
-          { id: admitted.id, type: "user", text: "Replay lifecycle" },
-        ])
-        expect(
-          (yield* db
-            .select()
-            .from(EventTable)
-            .where(eq(EventTable.aggregate_id, created.id))
-            .orderBy(asc(EventTable.seq))
-            .all()
-            .pipe(Effect.orDie)).map((event) => [event.seq, event.type]),
-        ).toEqual([
-          [0, EventV2.versionedType(SessionV1.Event.Created.type, 1)],
-          [1, EventV2.versionedType(SessionEvent.PromptLifecycle.Admitted.type, 1)],
-          [2, EventV2.versionedType(SessionEvent.PromptLifecycle.Promoted.type, 1)],
-        ])
-      }).pipe(Effect.provide(Layer.fresh(Layer.mergeAll(targetDatabase, targetEvents, targetProjector, targetStore))))
+        Array.from(yield* session.events({ sessionID: created.id }).pipe(Stream.take(1), Stream.runCollect)),
+      ).toMatchObject([{ cursor: 1, event: { type: "session.next.prompted", data: { prompt: { text: "Hello" } } } }])
    }),
  )

@@ -334,6 +242,7 @@ describe("SessionV2.create", () => {
          Effect.map((error) => (error instanceof SessionV2.OperationUnavailableError ? error.operation : "not-found")),
        )

+      expect(yield* unavailable(session.move({ sessionID: created.id, location }))).toBe("move")
      expect(yield* unavailable(session.shell({ sessionID: created.id, command: "pwd" }))).toBe("shell")
      expect(yield* unavailable(session.skill({ sessionID: created.id, skill: "review" }))).toBe("skill")
      expect(yield* unavailable(session.switchAgent({ sessionID: created.id, agent: "build" }))).toBe("switchAgent")
@@ -67,25 +67,13 @@ describe("SessionProjector", () => {

      yield* events.publish(
        SessionEvent.Prompted,
-        {
-          sessionID,
-          messageID: SessionMessage.ID.make("msg_first"),
-          timestamp: created,
-          prompt: new Prompt({ text: "first" }),
-          delivery: "steer",
-        },
-        { id: EventV2.ID.make("evt_z") },
+        { sessionID, timestamp: created, prompt: new Prompt({ text: "first" }), delivery: "steer" },
+        { id: SessionMessage.ID.make("evt_z") },
      )
      yield* events.publish(
        SessionEvent.Prompted,
-        {
-          sessionID,
-          messageID: SessionMessage.ID.make("msg_second"),
-          timestamp: created,
-          prompt: new Prompt({ text: "second" }),
-          delivery: "steer",
-        },
-        { id: EventV2.ID.make("evt_a") },
+        { sessionID, timestamp: created, prompt: new Prompt({ text: "second" }), delivery: "steer" },
+        { id: SessionMessage.ID.make("evt_a") },
      )

      const sessions = yield* SessionV2.Service
@@ -122,7 +110,7 @@ describe("SessionProjector", () => {
    ),
  )

-  it.effect("marks an admitted lifecycle row promoted with the PromptPromoted event sequence", () =>
+  it.effect("marks an admitted inbox row promoted with the Prompted event sequence", () =>
    Effect.gen(function* () {
      const { db } = yield* Database.Service
      yield* db
@@ -143,21 +131,14 @@ describe("SessionProjector", () => {
        .run()
        .pipe(Effect.orDie)
      const events = yield* EventV2.Service
-      const id = SessionMessage.ID.make("msg_admitted")
-      yield* SessionInput.admit(db, events, {
-        id,
-        sessionID,
-        prompt: new Prompt({ text: "promote me" }),
-        delivery: "steer",
-      })
+      const id = SessionMessage.ID.make("evt_admitted")
+      yield* SessionInput.admit(db, { id, sessionID, prompt: new Prompt({ text: "promote me" }), delivery: "steer" })

-      const event = yield* events.publish(SessionEvent.PromptLifecycle.Promoted, {
-        sessionID,
-        timestamp: created,
-        messageID: id,
-        prompt: new Prompt({ text: "promote me" }),
-        timeCreated: created,
-      })
+      const event = yield* events.publish(
+        SessionEvent.Prompted,
+        { sessionID, timestamp: created, prompt: new Prompt({ text: "promote me" }), delivery: "steer" },
+        { id },
+      )

      expect(
        yield* db.select().from(SessionInputTable).where(eq(SessionInputTable.id, id)).get().pipe(Effect.orDie),
@@ -187,27 +168,11 @@ describe("SessionProjector", () => {
        .pipe(Effect.orDie)
      const events = yield* EventV2.Service

-      yield* events.publish(SessionEvent.AgentSwitched, {
-        sessionID,
-        messageID: SessionMessage.ID.create(),
-        timestamp: created,
-        agent: "build",
-      })
-      yield* events.publish(SessionEvent.ModelSwitched, {
-        sessionID,
-        messageID: SessionMessage.ID.create(),
-        timestamp: created,
-        model,
-      })
-      yield* events.publish(SessionEvent.Synthetic, {
-        sessionID,
-        messageID: SessionMessage.ID.create(),
-        timestamp: created,
-        text: "synthetic context",
-      })
+      yield* events.publish(SessionEvent.AgentSwitched, { sessionID, timestamp: created, agent: "build" })
+      yield* events.publish(SessionEvent.ModelSwitched, { sessionID, timestamp: created, model })
+      yield* events.publish(SessionEvent.Synthetic, { sessionID, timestamp: created, text: "synthetic context" })
      yield* events.publish(SessionEvent.Shell.Started, {
        sessionID,
-        messageID: SessionMessage.ID.create(),
        timestamp: created,
        callID: "shell-1",
        command: "pwd",
@@ -218,12 +183,7 @@ describe("SessionProjector", () => {
        callID: "shell-1",
        output: "/project",
      })
-      yield* events.publish(SessionEvent.Compaction.Started, {
-        sessionID,
-        messageID: SessionMessage.ID.create(),
-        timestamp: created,
-        reason: "manual",
-      })
+      yield* events.publish(SessionEvent.Compaction.Started, { sessionID, timestamp: created, reason: "manual" })
      yield* events.publish(SessionEvent.Compaction.Delta, { sessionID, timestamp: created, text: "partial" })
      yield* events.publish(SessionEvent.Compaction.Ended, {
        sessionID,
@@ -268,47 +228,6 @@ describe("SessionProjector", () => {
    }),
  )

-  it.effect("rejects distinct creator events that reuse one projected message ID", () =>
-    Effect.gen(function* () {
-      const { db } = yield* Database.Service
-      yield* db
-        .insert(ProjectTable)
-        .values({ id: Project.ID.global, worktree: AbsolutePath.make("/project"), sandboxes: [] })
-        .run()
-        .pipe(Effect.orDie)
-      yield* db
-        .insert(SessionTable)
-        .values({
-          id: sessionID,
-          project_id: Project.ID.global,
-          slug: "test",
-          directory: "/project",
-          title: "test",
-          version: "test",
-        })
-        .run()
-        .pipe(Effect.orDie)
-      const events = yield* EventV2.Service
-      const id = SessionMessage.ID.make("msg_creator_collision")
-
-      yield* events.publish(SessionEvent.Synthetic, { sessionID, messageID: id, timestamp: created, text: "keep me" })
-      const exit = yield* events
-        .publish(SessionEvent.Step.Started, {
-          sessionID,
-          assistantMessageID: id,
-          timestamp: created,
-          agent: "build",
-          model,
-        })
-        .pipe(Effect.exit)
-
-      expect(exit._tag).toBe("Failure")
-      expect(
-        yield* db.select().from(SessionMessageTable).where(eq(SessionMessageTable.id, id)).get().pipe(Effect.orDie),
-      ).toMatchObject({ type: "synthetic" })
-    }),
-  )
-
  it.effect("rejects a Prompted event that conflicts with an admitted inbox row", () =>
    Effect.gen(function* () {
      const { db } = yield* Database.Service
@@ -330,77 +249,24 @@ describe("SessionProjector", () => {
        .run()
        .pipe(Effect.orDie)
      const events = yield* EventV2.Service
-      const id = SessionMessage.ID.make("msg_conflict")
-      yield* SessionInput.admit(db, events, {
-        id,
-        sessionID,
-        prompt: new Prompt({ text: "admitted" }),
-        delivery: "steer",
-      })
+      const id = SessionMessage.ID.make("evt_conflict")
+      yield* SessionInput.admit(db, { id, sessionID, prompt: new Prompt({ text: "admitted" }), delivery: "steer" })

      const exit = yield* events
-        .publish(SessionEvent.Prompted, {
-          sessionID,
-          messageID: id,
-          timestamp: created,
-          prompt: new Prompt({ text: "different" }),
-          delivery: "steer",
-        })
+        .publish(
+          SessionEvent.Prompted,
+          { sessionID, timestamp: created, prompt: new Prompt({ text: "different" }), delivery: "steer" },
+          { id },
+        )
        .pipe(Effect.exit)

-      expect(String(exit)).toContain("SessionInput.LifecycleConflict")
+      expect(String(exit)).toContain("Prompt projection conflicts with admitted input")
      expect(
        yield* db.select().from(SessionInputTable).where(eq(SessionInputTable.id, id)).get().pipe(Effect.orDie),
      ).toMatchObject({ promoted_seq: null })
    }),
  )

-  it.effect("rejects an assistant message ID that conflicts with an admitted inbox row", () =>
-    Effect.gen(function* () {
-      const { db } = yield* Database.Service
-      yield* db
-        .insert(ProjectTable)
-        .values({ id: Project.ID.global, worktree: AbsolutePath.make("/project"), sandboxes: [] })
-        .run()
-        .pipe(Effect.orDie)
-      yield* db
-        .insert(SessionTable)
-        .values({
-          id: sessionID,
-          project_id: Project.ID.global,
-          slug: "test",
-          directory: "/project",
-          title: "test",
-          version: "test",
-        })
-        .run()
-        .pipe(Effect.orDie)
-      const events = yield* EventV2.Service
-      const id = SessionMessage.ID.make("msg_conflict")
-      yield* SessionInput.admit(db, events, {
-        id,
-        sessionID,
-        prompt: new Prompt({ text: "admitted" }),
-        delivery: "steer",
-      })
-
-      const exit = yield* events
-        .publish(SessionEvent.Step.Started, {
-          sessionID,
-          timestamp: created,
-          assistantMessageID: id,
-          agent: "build",
-          model,
-        })
-        .pipe(Effect.exit)
-
-      expect(String(exit)).toContain("SessionInput.LifecycleConflict")
-      expect(
-        yield* db.select().from(SessionMessageTable).where(eq(SessionMessageTable.id, id)).get().pipe(Effect.orDie),
-      ).toBeUndefined()
-    }),
-  )
-
  it.effect("rejects a Prompted delivery mode that conflicts with an admitted inbox row", () =>
    Effect.gen(function* () {
      const { db } = yield* Database.Service
@@ -422,15 +288,15 @@ describe("SessionProjector", () => {
        .run()
        .pipe(Effect.orDie)
      const events = yield* EventV2.Service
-      const id = SessionMessage.ID.make("msg_delivery_conflict")
+      const id = SessionMessage.ID.make("evt_delivery_conflict")
      const prompt = new Prompt({ text: "admitted" })
-      yield* SessionInput.admit(db, events, { id, sessionID, prompt, delivery: "queue" })
+      yield* SessionInput.admit(db, { id, sessionID, prompt, delivery: "queue" })

      const exit = yield* events
-        .publish(SessionEvent.Prompted, { sessionID, messageID: id, timestamp: created, prompt, delivery: "steer" })
+        .publish(SessionEvent.Prompted, { sessionID, timestamp: created, prompt, delivery: "steer" }, { id })
        .pipe(Effect.exit)

-      expect(String(exit)).toContain("SessionInput.LifecycleConflict")
+      expect(String(exit)).toContain("Prompt projection conflicts with admitted input")
      expect(
        yield* db.select().from(SessionInputTable).where(eq(SessionInputTable.id, id)).get().pipe(Effect.orDie),
      ).toMatchObject({ delivery: "queue", promoted_seq: null })
@@ -440,7 +306,7 @@ describe("SessionProjector", () => {
  it.effect("does not revive a stale incomplete in-memory assistant projection", () =>
    Effect.gen(function* () {
      const stale = new SessionMessage.Assistant({
-        id: SessionMessage.ID.make("msg_assistant_stale"),
+        id: SessionMessage.ID.make("evt_assistant_stale"),
        type: "assistant",
        agent: "build",
        model,
@@ -448,7 +314,7 @@ describe("SessionProjector", () => {
        time: { created },
      })
      const completed = new SessionMessage.Assistant({
-        id: SessionMessage.ID.make("msg_assistant_completed"),
+        id: SessionMessage.ID.make("evt_assistant_completed"),
        type: "assistant",
        agent: "build",
        model,
@@ -485,8 +351,8 @@ describe("SessionProjector", () => {
      yield* db
        .insert(SessionMessageTable)
        .values([
-          assistantRow(SessionMessage.ID.make("msg_assistant_1"), 0),
-          assistantRow(SessionMessage.ID.make("msg_assistant_2"), 1),
+          assistantRow(SessionMessage.ID.make("evt_assistant_1"), 0),
+          assistantRow(SessionMessage.ID.make("evt_assistant_2"), 1),
        ])
        .run()
        .pipe(Effect.orDie)
@@ -495,7 +361,7 @@ describe("SessionProjector", () => {
      yield* service.publish(SessionEvent.Step.Ended, {
        sessionID,
        timestamp: DateTime.makeUnsafe(1),
-        assistantMessageID: SessionMessage.ID.make("msg_assistant_2"),
+        assistantMessageID: SessionMessage.ID.make("evt_assistant_2"),
        finish: "stop",
        cost: 0,
        tokens: { input: 0, output: 0, reasoning: 0, cache: { read: 0, write: 0 } },
@@ -543,8 +409,8 @@ describe("SessionProjector", () => {
      yield* db
        .insert(SessionMessageTable)
        .values([
-          assistantRow(SessionMessage.ID.make("msg_assistant_stale"), 0),
-          assistantRow(SessionMessage.ID.make("msg_assistant_completed"), 1, {
+          assistantRow(SessionMessage.ID.make("evt_assistant_stale"), 0),
+          assistantRow(SessionMessage.ID.make("evt_assistant_completed"), 1, {
            created: DateTime.makeUnsafe(1),
            completed: DateTime.makeUnsafe(2),
          }),
@@ -555,7 +421,6 @@ describe("SessionProjector", () => {
      const service = yield* EventV2.Service
      yield* service.publish(SessionEvent.Text.Started, {
        sessionID,
-        assistantMessageID: SessionMessage.ID.make("msg_assistant_completed"),
        timestamp: DateTime.makeUnsafe(3),
        textID: "text-stale",
      })
@@ -572,15 +437,15 @@ describe("SessionProjector", () => {
      )
      expect(messages).toEqual([
        new SessionMessage.Assistant({
-          id: SessionMessage.ID.make("msg_assistant_completed"),
+          id: SessionMessage.ID.make("evt_assistant_completed"),
          type: "assistant",
          agent: "build",
          model,
-          content: [new SessionMessage.AssistantText({ type: "text", id: "text-stale", text: "" })],
+          content: [],
          time: { created: DateTime.makeUnsafe(1), completed: DateTime.makeUnsafe(2) },
        }),
        new SessionMessage.Assistant({
-          id: SessionMessage.ID.make("msg_assistant_stale"),
+          id: SessionMessage.ID.make("evt_assistant_stale"),
          type: "assistant",
          agent: "build",
          model,
@@ -1,9 +1,7 @@
 import { describe, expect } from "bun:test"
 import { DateTime, Effect, Fiber, Layer, Stream } from "effect"
-import { eq } from "drizzle-orm"
 import { Database } from "@opencode-ai/core/database/database"
 import { EventV2 } from "@opencode-ai/core/event"
-import { EventTable } from "@opencode-ai/core/event/sql"
 import { SessionEvent } from "@opencode-ai/core/session/event"
 import { Project } from "@opencode-ai/core/project"
 import { ProjectTable } from "@opencode-ai/core/project/sql"
@@ -14,7 +12,7 @@ import { SessionMessage } from "@opencode-ai/core/session/message"
 import { SessionProjector } from "@opencode-ai/core/session/projector"
 import { SessionExecution } from "@opencode-ai/core/session/execution"
 import { SessionInput } from "@opencode-ai/core/session/input"
-import { SessionInputTable, SessionMessageTable, SessionTable } from "@opencode-ai/core/session/sql"
+import { SessionInputTable, SessionTable } from "@opencode-ai/core/session/sql"
 import { SessionStore } from "@opencode-ai/core/session/store"
 import { testEffect } from "./lib/effect"

@@ -82,18 +80,6 @@ const admittedCount = Database.Service.use(({ db }) =>
      Effect.map((rows) => rows.length),
    ),
 )
-const eventCount = (type: string) =>
-  Database.Service.use(({ db }) =>
-    db
-      .select()
-      .from(EventTable)
-      .where(eq(EventTable.type, type))
-      .all()
-      .pipe(
-        Effect.orDie,
-        Effect.map((rows) => rows.length),
-      ),
-  )

 describe("SessionV2.prompt", () => {
  it.effect("delegates execution continuation through SessionExecution", () =>
@@ -119,7 +105,8 @@ describe("SessionV2.prompt", () => {
        resume: false,
      })

-      expect(message.prompt.text).toBe("Fix the failing tests")
+      expect(message.type).toBe("user")
+      expect(message.text).toBe("Fix the failing tests")
      expect(yield* session.messages({ sessionID })).toEqual([])
      expect(yield* admitted(message.id)).toMatchObject({
        id: message.id,
@@ -136,25 +123,25 @@ describe("SessionV2.prompt", () => {
      const session = yield* SessionV2.Service
      const events = yield* EventV2.Service
      const { db } = yield* Database.Service
-      const fiber = yield* session.events({ sessionID }).pipe(Stream.take(4), Stream.runCollect, Effect.forkScoped)
+      const fiber = yield* session.events({ sessionID }).pipe(Stream.take(2), Stream.runCollect, Effect.forkScoped)
      yield* Effect.yieldNow

      yield* session.prompt({ sessionID, prompt: new Prompt({ text: "First" }), resume: false })
      yield* session.prompt({ sessionID, prompt: new Prompt({ text: "Second" }), resume: false })
-      yield* SessionInput.promoteSteers(db, events, sessionID, Number.MAX_SAFE_INTEGER)
+      yield* SessionInput.promoteSteers(db, events, sessionID)
      const streamed = Array.from(yield* Fiber.join(fiber))

-      expect(streamed.map((event) => [event.cursor, event.event.type])).toEqual([
-        [EventV2.Cursor.make(0), "session.next.prompt.admitted"],
-        [EventV2.Cursor.make(1), "session.next.prompt.admitted"],
-        [EventV2.Cursor.make(2), "session.next.prompt.promoted"],
-        [EventV2.Cursor.make(3), "session.next.prompt.promoted"],
+      expect(
+        streamed.map((event) => [event.cursor, event.event.type, (event.event.data as { prompt: Prompt }).prompt.text]),
+      ).toEqual([
+        [EventV2.Cursor.make(0), "session.next.prompted", "First"],
+        [EventV2.Cursor.make(1), "session.next.prompted", "Second"],
      ])
      expect(
        Array.from(
          yield* session.events({ sessionID, after: streamed[0]!.cursor }).pipe(Stream.take(1), Stream.runCollect),
-        ).map((event) => [event.cursor, event.event.type]),
-      ).toEqual([[EventV2.Cursor.make(1), "session.next.prompt.admitted"]])
+        ).map((event) => [event.cursor, (event.event.data as { prompt: Prompt }).prompt.text]),
+      ).toEqual([[EventV2.Cursor.make(1), "Second"]])
    }),
  )

@@ -284,6 +271,17 @@ describe("SessionV2.prompt", () => {
    }),
  )

+  it.effect("does not match pending inputs when no delivery modes are eligible", () =>
+    Effect.gen(function* () {
+      yield* setup
+      const { db } = yield* Database.Service
+      const session = yield* SessionV2.Service
+      yield* session.prompt({ sessionID, prompt: new Prompt({ text: "Wait" }), resume: false })
+
+      expect(yield* SessionInput.hasPending(db, sessionID, [])).toBe(false)
+    }),
+  )
+
  it.effect("returns one recorded message to concurrent exact retries", () =>
    Effect.gen(function* () {
      yield* setup
@@ -300,127 +298,43 @@ describe("SessionV2.prompt", () => {
      expect(messages[1]).toEqual(messages[0])
      expect(yield* session.messages({ sessionID })).toEqual([])
      expect(yield* admittedCount).toBe(1)
-      expect(yield* eventCount(EventV2.versionedType(SessionEvent.PromptLifecycle.Admitted.type, 1))).toBe(1)
    }),
  )

-  it.effect("promotes one message once under concurrent promotion attempts", () =>
-    Effect.gen(function* () {
-      yield* setup
-      const { db } = yield* Database.Service
-      const session = yield* SessionV2.Service
-      const events = yield* EventV2.Service
-      yield* session.prompt({ id: messageID, sessionID, prompt: new Prompt({ text: "Promote once" }), resume: false })
-
-      yield* Effect.all(
-        [
-          SessionInput.promoteSteers(db, events, sessionID, Number.MAX_SAFE_INTEGER),
-          SessionInput.promoteSteers(db, events, sessionID, Number.MAX_SAFE_INTEGER),
-        ],
-        { concurrency: "unbounded" },
-      )
-
-      expect(yield* eventCount(EventV2.versionedType(SessionEvent.PromptLifecycle.Promoted.type, 1))).toBe(1)
-      expect(yield* admitted(messageID)).toMatchObject({ promotedSeq: 1 })
-      expect(yield* session.messages({ sessionID })).toMatchObject([
-        { id: messageID, type: "user", text: "Promote once" },
-      ])
-    }),
-  )
-
-  it.effect("promotes steers only through the captured aggregate cutoff", () =>
-    Effect.gen(function* () {
-      yield* setup
-      const { db } = yield* Database.Service
-      const session = yield* SessionV2.Service
-      const events = yield* EventV2.Service
-      const first = yield* session.prompt({ sessionID, prompt: new Prompt({ text: "Before cutoff" }), resume: false })
-      const cutoff = yield* SessionInput.latestSeq(db, sessionID)
-      const second = yield* session.prompt({ sessionID, prompt: new Prompt({ text: "After cutoff" }), resume: false })
-
-      yield* SessionInput.promoteSteers(db, events, sessionID, cutoff)
-
-      expect(yield* admitted(first.id)).toHaveProperty("promotedSeq")
-      expect(yield* admitted(second.id)).not.toHaveProperty("promotedSeq")
-    }),
-  )
-
-  it.effect("reprojects one pending lifecycle without scheduling execution", () =>
-    Effect.gen(function* () {
-      yield* setup
-      const { db } = yield* Database.Service
-      const session = yield* SessionV2.Service
-      const events = yield* EventV2.Service
-      wakeCalls.length = 0
-      yield* session.prompt({ id: messageID, sessionID, prompt: new Prompt({ text: "Replay pending" }), resume: false })
-      const recorded = yield* db
-        .select()
-        .from(EventTable)
-        .where(eq(EventTable.aggregate_id, sessionID))
-        .all()
-        .pipe(Effect.orDie)
-
-      yield* events.remove(sessionID)
-      yield* db.delete(SessionInputTable).where(eq(SessionInputTable.session_id, sessionID)).run().pipe(Effect.orDie)
-      yield* db
-        .delete(SessionMessageTable)
-        .where(eq(SessionMessageTable.session_id, sessionID))
-        .run()
-        .pipe(Effect.orDie)
-      yield* events.replayAll(
-        recorded.map((event) => ({
-          id: event.id,
-          aggregateID: event.aggregate_id,
-          seq: event.seq,
-          type: event.type,
-          data: event.data,
-        })),
-      )
-
-      expect(yield* admitted(messageID)).toMatchObject({ id: messageID, prompt: { text: "Replay pending" } })
-      expect(yield* session.messages({ sessionID })).toEqual([])
-      expect(wakeCalls).toEqual([])
-    }),
-  )
-
-  it.effect("returns an exact retry of a legacy projected prompt", () =>
+  it.effect("reconciles an existing projected prompt into a promoted inbox record", () =>
    Effect.gen(function* () {
      yield* setup
      const session = yield* SessionV2.Service
      const events = yield* EventV2.Service
      const prompt = new Prompt({ text: "Historical prompt" })
-      yield* events.publish(SessionEvent.Prompted, {
-        sessionID,
-        messageID,
-        timestamp: yield* DateTime.now,
-        prompt,
-        delivery: "steer",
-      })
+      yield* events.publish(
+        SessionEvent.Prompted,
+        { sessionID, timestamp: yield* DateTime.now, prompt, delivery: "steer" },
+        { id: messageID },
+      )

      const retried = yield* session.prompt({ id: messageID, sessionID, prompt, resume: false })

-      expect(retried).toMatchObject({ id: messageID, prompt: { text: "Historical prompt" } })
+      expect(retried).toMatchObject({ id: messageID, text: "Historical prompt" })
      expect(yield* admitted(messageID)).toHaveProperty("promotedSeq")
    }),
  )

-  it.effect("returns an exact retry of a legacy projected queued prompt", () =>
+  it.effect("reconciles an existing projected queued prompt with its delivery mode", () =>
    Effect.gen(function* () {
      yield* setup
      const session = yield* SessionV2.Service
      const events = yield* EventV2.Service
      const prompt = new Prompt({ text: "Historical queued prompt" })
-      yield* events.publish(SessionEvent.Prompted, {
-        sessionID,
-        messageID,
-        timestamp: yield* DateTime.now,
-        prompt,
-        delivery: "queue",
-      })
+      yield* events.publish(
+        SessionEvent.Prompted,
+        { sessionID, timestamp: yield* DateTime.now, prompt, delivery: "queue" },
+        { id: messageID },
+      )

      const retried = yield* session.prompt({ id: messageID, sessionID, prompt, delivery: "queue", resume: false })

-      expect(retried).toMatchObject({ id: messageID, prompt: { text: "Historical queued prompt" } })
+      expect(retried).toMatchObject({ id: messageID, text: "Historical queued prompt" })
      expect(yield* admitted(messageID)).toMatchObject({ delivery: "queue" })
    }),
  )
@@ -430,12 +344,11 @@ describe("SessionV2.prompt", () => {
      yield* setup
      const session = yield* SessionV2.Service
      const events = yield* EventV2.Service
-      yield* events.publish(SessionEvent.Synthetic, {
-        sessionID,
-        messageID,
-        timestamp: yield* DateTime.now,
-        text: "Collision",
-      })
+      yield* events.publish(
+        SessionEvent.Synthetic,
+        { sessionID, timestamp: yield* DateTime.now, text: "Collision" },
+        { id: messageID },
+      )

      const failure = yield* session
        .prompt({ id: messageID, sessionID, prompt: new Prompt({ text: "Collision" }), resume: false })
@@ -456,21 +369,20 @@ describe("SessionV2.prompt", () => {
      yield* session.prompt({ id: messageID, sessionID, prompt, resume: false })

      const failure = yield* events
-        .publish(SessionEvent.Synthetic, {
-          sessionID,
-          messageID,
-          timestamp: yield* DateTime.now,
-          text: "Conflicting synthetic",
-        })
+        .publish(
+          SessionEvent.Synthetic,
+          { sessionID, timestamp: yield* DateTime.now, text: "Conflicting synthetic" },
+          { id: messageID },
+        )
        .pipe(Effect.catchDefect(Effect.succeed))

-      expect(String(failure)).toContain("SessionInput.LifecycleConflict")
+      expect(failure).toBe("Durable event conflicts with admitted prompt input")
      expect(yield* admitted(messageID)).not.toHaveProperty("promotedSeq")
      expect(yield* session.messages({ sessionID })).toEqual([])

-      yield* SessionInput.promoteSteers(db, events, sessionID, Number.MAX_SAFE_INTEGER)
+      yield* SessionInput.promoteSteers(db, events, sessionID)

-      expect(yield* admitted(messageID)).toMatchObject({ promotedSeq: 1 })
+      expect(yield* admitted(messageID)).toMatchObject({ promotedSeq: 0 })
      expect(yield* session.messages({ sessionID })).toMatchObject([
        { id: messageID, type: "user", text: "Reserved prompt" },
      ])
@@ -1,6 +1,7 @@
 import { describe, expect, test } from "bun:test"
 import { Message, Model } from "@opencode-ai/llm"
 import * as OpenAIChat from "@opencode-ai/llm/protocols/openai-chat"
+import { EventV2 } from "@opencode-ai/core/event"
 import { ModelV2 } from "@opencode-ai/core/model"
 import { ProviderV2 } from "@opencode-ai/core/provider"
 import { SessionMessage } from "@opencode-ai/core/session/message"
@@ -11,7 +12,7 @@ import { ToolOutput } from "@opencode-ai/core/tool-output"
 import { DateTime } from "effect"

 const created = DateTime.makeUnsafe(0)
-const id = (value: string) => SessionMessage.ID.make(`msg_${value}`)
+const id = (value: string) => EventV2.ID.make(`evt_${value}`)
 const model = Model.make({ id: "model", provider: "provider", route: OpenAIChat.route })

 describe("toLLMMessages", () => {
@@ -14,6 +14,7 @@ import { Prompt } from "@opencode-ai/core/session/prompt"
 import { SessionProjector } from "@opencode-ai/core/session/projector"
 import { SessionExecution } from "@opencode-ai/core/session/execution"
 import { SessionRunCoordinator } from "@opencode-ai/core/session/run-coordinator"
+import { SessionRunner } from "@opencode-ai/core/session/runner"
 import * as SessionRunnerLLM from "@opencode-ai/core/session/runner/llm"
 import { SessionRunnerModel } from "@opencode-ai/core/session/runner/model"
 import { ToolRegistry } from "@opencode-ai/core/tool-registry"
@@ -130,7 +131,7 @@ describe("SessionRunnerLLM recorded", () => {

      const messages = yield* session.context(sessionID)
      expect(messages).toHaveLength(2)
-      expect(messages[0]).toMatchObject({ id: prompt.id, type: "user", text: "Say hello in one short sentence." })
+      expect(messages[0]).toEqual(prompt)
      expect(messages[1]).toMatchObject({ type: "assistant", agent: "build", finish: "stop" })
      expect(messages[1]?.type === "assistant" ? messages[1].content : []).toMatchObject([
        { type: "text", text: "Hello!" },
@@ -143,8 +144,7 @@ describe("SessionRunnerLLM recorded", () => {
          .orderBy(EventTable.seq)
          .all()).map((event) => event.type),
      ).toEqual([
-        "session.next.prompt.admitted.1",
-        "session.next.prompt.promoted.1",
+        "session.next.prompted.1",
        "session.next.step.started.1",
        "session.next.text.started.1",
        "session.next.text.ended.1",
@@ -21,7 +21,6 @@ import { AbsolutePath } from "@opencode-ai/core/schema"
 import { SessionV2 } from "@opencode-ai/core/session"
 import { SessionEvent } from "@opencode-ai/core/session/event"
 import { SessionInput } from "@opencode-ai/core/session/input"
-import { SessionMessage } from "@opencode-ai/core/session/message"
 import { Prompt } from "@opencode-ai/core/session/prompt"
 import { SessionProjector } from "@opencode-ai/core/session/projector"
 import { SessionExecution } from "@opencode-ai/core/session/execution"
@@ -30,7 +29,7 @@ import { SessionRunner } from "@opencode-ai/core/session/runner"
 import * as SessionRunnerLLM from "@opencode-ai/core/session/runner/llm"
 import { SessionRunnerModel } from "@opencode-ai/core/session/runner/model"
 import { ToolRegistry } from "@opencode-ai/core/tool-registry"
-import { SessionInputTable, SessionMessageTable, SessionTable } from "@opencode-ai/core/session/sql"
+import { SessionMessageTable, SessionTable } from "@opencode-ai/core/session/sql"
 import { SessionStore } from "@opencode-ai/core/session/store"
 import { ModelV2 } from "@opencode-ai/core/model"
 import { ProviderV2 } from "@opencode-ai/core/provider"
@@ -241,7 +240,6 @@ const replaySessionProjection = (id: SessionV2.ID) =>
      .pipe(Effect.orDie)

    yield* events.remove(id)
-    yield* db.delete(SessionInputTable).where(eq(SessionInputTable.session_id, id)).run().pipe(Effect.orDie)
    yield* db.delete(SessionMessageTable).where(eq(SessionMessageTable.session_id, id)).run().pipe(Effect.orDie)
    yield* events.replayAll(
      recorded.map((event) => ({
@@ -427,9 +425,7 @@ describe("SessionRunnerLLM", () => {
      const message = yield* session.prompt({ sessionID, prompt: new Prompt({ text: "Run automatically" }) })

      expect(requests).toHaveLength(1)
-      expect(yield* session.messages({ sessionID })).toMatchObject([
-        { id: message.id, type: "user", text: "Run automatically" },
-      ])
+      expect(yield* session.messages({ sessionID })).toEqual([message])
    }),
  )

@@ -1221,11 +1217,9 @@ describe("SessionRunnerLLM", () => {
      const session = yield* SessionV2.Service
      const events = yield* EventV2.Service
      yield* session.prompt({ sessionID, prompt: new Prompt({ text: "Recover interrupted tool" }), resume: false })
-      yield* SessionInput.promoteSteers((yield* Database.Service).db, events, sessionID, Number.MAX_SAFE_INTEGER)
-      const assistantMessageID = SessionMessage.ID.create()
-      yield* events.publish(SessionEvent.Step.Started, {
+      yield* SessionInput.promoteSteers((yield* Database.Service).db, events, sessionID)
+      const assistant = yield* events.publish(SessionEvent.Step.Started, {
        sessionID,
-        assistantMessageID,
        timestamp: yield* DateTime.now,
        agent: "build",
        model: { id: ModelV2.ID.make("fake-model"), providerID: ProviderV2.ID.make("fake") },
@@ -1233,21 +1227,21 @@ describe("SessionRunnerLLM", () => {
      yield* events.publish(SessionEvent.Tool.Input.Started, {
        sessionID,
        timestamp: yield* DateTime.now,
-        assistantMessageID,
+        assistantMessageID: assistant.id,
        callID: "call-interrupted",
        name: "echo",
      })
      yield* events.publish(SessionEvent.Tool.Input.Ended, {
        sessionID,
        timestamp: yield* DateTime.now,
-        assistantMessageID,
+        assistantMessageID: assistant.id,
        callID: "call-interrupted",
        text: '{"text":"stale"}',
      })
      yield* events.publish(SessionEvent.Tool.Called, {
        sessionID,
        timestamp: yield* DateTime.now,
-        assistantMessageID,
+        assistantMessageID: assistant.id,
        callID: "call-interrupted",
        tool: "echo",
        input: { text: "stale" },
@@ -1285,11 +1279,9 @@ describe("SessionRunnerLLM", () => {
        prompt: new Prompt({ text: "Recover interrupted hosted tool" }),
        resume: false,
      })
-      yield* SessionInput.promoteSteers((yield* Database.Service).db, events, sessionID, Number.MAX_SAFE_INTEGER)
-      const assistantMessageID = SessionMessage.ID.create()
-      yield* events.publish(SessionEvent.Step.Started, {
+      yield* SessionInput.promoteSteers((yield* Database.Service).db, events, sessionID)
+      const assistant = yield* events.publish(SessionEvent.Step.Started, {
        sessionID,
-        assistantMessageID,
        timestamp: yield* DateTime.now,
        agent: "build",
        model: { id: ModelV2.ID.make("fake-model"), providerID: ProviderV2.ID.make("fake") },
@@ -1297,21 +1289,21 @@ describe("SessionRunnerLLM", () => {
      yield* events.publish(SessionEvent.Tool.Input.Started, {
        sessionID,
        timestamp: yield* DateTime.now,
-        assistantMessageID,
+        assistantMessageID: assistant.id,
        callID: "call-hosted-interrupted",
        name: "web_search",
      })
      yield* events.publish(SessionEvent.Tool.Input.Ended, {
        sessionID,
        timestamp: yield* DateTime.now,
-        assistantMessageID,
+        assistantMessageID: assistant.id,
        callID: "call-hosted-interrupted",
        text: '{"query":"stale"}',
      })
      yield* events.publish(SessionEvent.Tool.Called, {
        sessionID,
        timestamp: yield* DateTime.now,
-        assistantMessageID,
+        assistantMessageID: assistant.id,
        callID: "call-hosted-interrupted",
        tool: "web_search",
        input: { query: "stale" },
@@ -1345,11 +1337,9 @@ describe("SessionRunnerLLM", () => {
        prompt: new Prompt({ text: "Recover interrupted tool input" }),
        resume: false,
      })
-      yield* SessionInput.promoteSteers((yield* Database.Service).db, events, sessionID, Number.MAX_SAFE_INTEGER)
-      const assistantMessageID = SessionMessage.ID.create()
-      yield* events.publish(SessionEvent.Step.Started, {
+      yield* SessionInput.promoteSteers((yield* Database.Service).db, events, sessionID)
+      const assistant = yield* events.publish(SessionEvent.Step.Started, {
        sessionID,
-        assistantMessageID,
        timestamp: yield* DateTime.now,
        agent: "build",
        model: { id: ModelV2.ID.make("fake-model"), providerID: ProviderV2.ID.make("fake") },
@@ -1357,7 +1347,7 @@ describe("SessionRunnerLLM", () => {
      yield* events.publish(SessionEvent.Tool.Input.Started, {
        sessionID,
        timestamp: yield* DateTime.now,
-        assistantMessageID,
+        assistantMessageID: assistant.id,
        callID: "call-pending-interrupted",
        name: "echo",
      })
@@ -1424,7 +1414,7 @@ describe("SessionRunnerLLM", () => {
      const events = yield* EventV2.Service
      const defect = new Error("fail after prompt promotion")
      let fail = true
-      yield* events.project(SessionEvent.PromptLifecycle.Promoted, () => (fail ? Effect.die(defect) : Effect.void))
+      yield* events.project(SessionEvent.Prompted, () => (fail ? Effect.die(defect) : Effect.void))
      yield* session.prompt({ sessionID, prompt: new Prompt({ text: "Recover promoted input" }), resume: false })

      expect(yield* session.resume(sessionID).pipe(Effect.catchDefect(Effect.succeed))).toBe(defect)
@@ -1443,30 +1433,6 @@ describe("SessionRunnerLLM", () => {
    }),
  )

-  it.effect("does not strand a committed promotion when a post-commit listener defects", () =>
-    Effect.gen(function* () {
-      yield* setup
-      const session = yield* SessionV2.Service
-      const events = yield* EventV2.Service
-      yield* events.listen((event) =>
-        event.type === SessionEvent.PromptLifecycle.Promoted.type
-          ? Effect.die("fail after prompt promotion commits")
-          : Effect.void,
-      )
-      yield* session.prompt({
-        sessionID,
-        prompt: new Prompt({ text: "Run committed promotion" }),
-        resume: false,
-      })
-
-      requests.length = 0
-      yield* session.resume(sessionID)
-
-      expect(requests).toHaveLength(1)
-      expect(userTexts(requests[0]!)).toEqual(["Run committed promotion"])
-    }),
-  )
-
  it.effect("runs different sessions concurrently", () =>
    Effect.gen(function* () {
      yield* setup
@@ -50,14 +50,12 @@ describe("Tool.Progress", () => {
        })
        .run()
        .pipe(Effect.orDie)
-      const assistantMessageID = SessionMessage.ID.create()
-      yield* service.publish(SessionEvent.Step.Started, {
+      const assistantMessageID = (yield* service.publish(SessionEvent.Step.Started, {
        sessionID,
-        assistantMessageID,
        timestamp,
        agent: "build",
        model,
-      })
+      })).id
      const readAssistant = Effect.gen(function* () {
        const row = yield* db
          .select()
@@ -1,7 +1,7 @@
 {
  "name": "@opencode-ai/desktop",
  "private": true,
-  "version": "1.16.0",
+  "version": "1.15.13",
  "type": "module",
  "license": "MIT",
  "homepage": "https://opencode.ai",
@@ -1,37 +0,0 @@
-import { describe, expect, test } from "bun:test"
-import { Cause, Deferred, Effect, Exit, Fiber } from "effect"
-import { forwardInitializationFailure } from "./initialization"
-
-describe("desktop initialization", () => {
-  const failure = new Error("sidecar startup failed")
-  const expectFailure = (exit: Exit.Exit<unknown, unknown>) => {
-    expect(Exit.isFailure(exit)).toBe(true)
-    if (Exit.isSuccess(exit)) return
-    expect(Cause.squash(exit.cause)).toBe(failure)
-  }
-
-  test("forwards loading task failures before renderer initialization", () => {
-    const exit = Effect.runSync(
-      Effect.gen(function* () {
-        const initialization = yield* Deferred.make<never, unknown>()
-        yield* forwardInitializationFailure(initialization)(Effect.die(failure)).pipe(Effect.exit)
-        return yield* Deferred.await(initialization).pipe(Effect.exit)
-      }),
-    )
-
-    expectFailure(exit)
-  })
-
-  test("forwards loading task failures while renderer initialization waits", () => {
-    const exit = Effect.runSync(
-      Effect.gen(function* () {
-        const initialization = yield* Deferred.make<never, unknown>()
-        const waiting = yield* Deferred.await(initialization).pipe(Effect.exit, Effect.forkChild)
-        yield* forwardInitializationFailure(initialization)(Effect.die(failure)).pipe(Effect.exit)
-        return yield* Fiber.join(waiting)
-      }),
-    )
-
-    expectFailure(exit)
-  })
-})
@@ -14,7 +14,6 @@ import type { ServerReadyData, WslConfig } from "../preload/types"
 import { checkAppExists, resolveAppPath, wslPath } from "./apps"
 import { CHANNEL, UPDATER_ENABLED } from "./constants"
 import { registerIpcHandlers, sendDeepLinks, sendMenuCommand } from "./ipc"
-import { forwardInitializationFailure } from "./initialization"
 import { exportDebugLogs, initCrashReporter, initLogging, startNetLog, write as writeLog } from "./logging"
 import { parseMarkdown } from "./markdown"
 import { createMenu } from "./menu"
@@ -208,7 +207,7 @@ const main = Effect.gen(function* () {
    })
  }

-  const serverReady = Deferred.makeUnsafe<ServerReadyData, unknown>()
+  const serverReady = Deferred.makeUnsafe<ServerReadyData>()

  registerIpcHandlers({
    killSidecar: () => killSidecar(),
@@ -315,7 +314,7 @@ const main = Effect.gen(function* () {
    )

    logger.log("loading task finished")
-  }).pipe(forwardInitializationFailure(serverReady), Effect.forkChild)
+  }).pipe(Effect.forkChild)

  yield* Fiber.await(loadingTask)

@@ -1,6 +0,0 @@
-import { Deferred, Effect } from "effect"
-
-export function forwardInitializationFailure<A>(initialization: Deferred.Deferred<A, unknown>) {
-  return <B, E, R>(effect: Effect.Effect<B, E, R>) =>
-    effect.pipe(Effect.tapCause((cause) => Deferred.failCause(initialization, cause)))
-}
@@ -21,10 +21,9 @@ import { createEffect, createResource, onCleanup, onMount, Show } from "solid-js
 import { render } from "solid-js/web"
 import pkg from "../../package.json"
 import { initI18n, t } from "./i18n"
-import { initializationData, initializationReady } from "./initialization"
 import { resetZoom, setPinchZoomEnabled, webviewZoom, zoomIn, zoomOut } from "./webview-zoom"
 import "./styles.css"
-import { useTheme } from "@opencode-ai/ui/theme/context"
+import { useTheme } from "@opencode-ai/ui/theme"

 const root = document.getElementById("root")
 if (import.meta.env.DEV && !(root instanceof HTMLElement)) {
@@ -330,7 +329,7 @@ render(() => {
  const [locale] = createResource(loadLocale)

  const servers = () => {
-    const data = initializationData(sidecar)
+    const data = sidecar()
    if (!data) return []
    const server: ServerConnection.Sidecar = {
      displayName: "Local Server",
@@ -384,7 +383,7 @@ render(() => {
        <Show
          when={
            !defaultServer.loading &&
-            initializationReady(sidecar) &&
+            !sidecar.loading &&
            !windowConfig.loading &&
            !windowCount.loading &&
            !locale.loading
@@ -1,73 +0,0 @@
-import { describe, expect, test } from "bun:test"
-import { initializationData, initializationReady } from "./initialization"
-
-describe("desktop renderer initialization", () => {
-  test("throws the original initialization error before rendering server providers", () => {
-    const error = new Error("sidecar startup failed")
-
-    try {
-      initializationData(Object.assign(() => undefined, { error }))
-      throw new Error("expected initialization to fail")
-    } catch (failure) {
-      expect(failure).toBe(error)
-      expect((failure as Error & { localServerStartup?: boolean }).localServerStartup).toBe(true)
-    }
-  })
-
-  test("removes Electron's remote invocation wrapper from startup errors", () => {
-    const error = new Error(
-      "Error invoking remote method 'await-initialization': Error: Cannot migrate session_message projections",
-    )
-
-    try {
-      initializationData(Object.assign(() => undefined, { error }))
-      throw new Error("expected initialization to fail")
-    } catch (failure) {
-      expect(failure).toBe(error)
-      expect((failure as Error).message).toBe("Cannot migrate session_message projections")
-    }
-  })
-
-  test("returns initialized sidecar data", () => {
-    const sidecar = { url: "http://127.0.0.1:1234", username: "opencode", password: "secret" }
-
-    expect(initializationData(Object.assign(() => sidecar, { error: undefined }))).toBe(sidecar)
-  })
-
-  test("does not discard falsy initialization errors", () => {
-    let caught: unknown
-    try {
-      initializationData(Object.assign(() => undefined, { error: "" }))
-    } catch (error) {
-      caught = error
-    }
-
-    expect(caught).toBeInstanceOf(Error)
-    if (!(caught instanceof Error)) return
-    expect(caught.message).toBe("")
-    expect((caught as Error & { localServerStartup?: boolean }).localServerStartup).toBe(true)
-  })
-
-  test("checks initialization errors before rendering server providers", () => {
-    const error = new Error("sidecar startup failed")
-
-    expect(() => initializationReady(Object.assign(() => undefined, { error, loading: false }))).toThrow(error)
-  })
-
-  test("waits for pending initialization without reading it", () => {
-    let reads = 0
-
-    expect(
-      initializationReady(
-        Object.assign(
-          () => {
-            reads++
-            return undefined
-          },
-          { error: undefined, loading: true },
-        ),
-      ),
-    ).toBe(false)
-    expect(reads).toBe(0)
-  })
-})
@@ -1,22 +0,0 @@
-export function initializationData<A>(state: (() => A | undefined) & { error: unknown }) {
-  if (state.error !== undefined) throw markLocalServerStartup(state.error)
-  return state()
-}
-
-function markLocalServerStartup(error: unknown) {
-  const failure = error instanceof Error ? error : new Error(String(error))
-  const prefix = "Error invoking remote method 'await-initialization': Error: "
-  if (failure.message.startsWith(prefix)) {
-    const previous = failure.message
-    failure.message = failure.message.slice(prefix.length)
-    if (failure.stack) failure.stack = failure.stack.replace(`Error: ${previous}`, `Error: ${failure.message}`)
-  }
-  Object.defineProperty(failure, "localServerStartup", { value: true })
-  return failure
-}
-
-export function initializationReady<A>(state: (() => A | undefined) & { error: unknown; loading: boolean }) {
-  if (state.loading) return false
-  initializationData(state)
-  return true
-}
@@ -1,6 +1,6 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
-  "version": "1.16.0",
+  "version": "1.15.13",
  "name": "@opencode-ai/effect-drizzle-sqlite",
  "type": "module",
  "license": "MIT",
@@ -1,6 +1,6 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
-  "version": "1.16.0",
+  "version": "1.15.10",
  "name": "@opencode-ai/effect-sqlite-node",
  "type": "module",
  "license": "MIT",
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/enterprise",
-  "version": "1.16.0",
+  "version": "1.15.13",
  "private": true,
  "type": "module",
  "license": "MIT",
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/function",
-  "version": "1.16.0",
+  "version": "1.15.13",
  "$schema": "https://json.schemastore.org/package.json",
  "private": true,
  "type": "module",
@@ -1,6 +1,6 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
-  "version": "1.16.0",
+  "version": "1.15.13",
  "name": "@opencode-ai/http-recorder",
  "type": "module",
  "license": "MIT",
@@ -1,6 +1,6 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
-  "version": "1.16.0",
+  "version": "1.15.13",
  "name": "@opencode-ai/llm",
  "type": "module",
  "license": "MIT",
@@ -165,7 +165,7 @@ const lowerTool = (tool: ToolDefinition): OpenAIChatTool => ({
  function: {
    name: tool.name,
    description: tool.description,
-    parameters: ProviderShared.openAiToolInputSchema(tool.inputSchema),
+    parameters: tool.inputSchema,
  },
 })

@@ -255,7 +255,7 @@ const lowerTool = (tool: ToolDefinition): OpenAIResponsesTool => ({
  type: "function",
  name: tool.name,
  description: tool.description,
-  parameters: ProviderShared.openAiToolInputSchema(tool.inputSchema),
+  parameters: tool.inputSchema,
 })

 const lowerToolChoice = (toolChoice: NonNullable<LLMRequest["toolChoice"]>) =>
@@ -1,5 +1,5 @@
 import { Buffer } from "node:buffer"
-import { Effect, JsonSchema, Schema, Stream } from "effect"
+import { Effect, Schema, Stream } from "effect"
 import * as Sse from "effect/unstable/encoding/Sse"
 import { Headers, HttpClientRequest } from "effect/unstable/http"
 import {
@@ -12,8 +12,7 @@ import {
  type TextPart,
  type ToolResultPart,
 } from "../schema"
-import { isRecord } from "../utils/record"
-export { isRecord }
+export { isRecord } from "../utils/record"

 export const Json = Schema.fromJsonString(Schema.Unknown)
 export const decodeJson = Schema.decodeUnknownSync(Json)
@@ -22,39 +21,6 @@ export const JsonObject = Schema.Record(Schema.String, Schema.Unknown)
 export const optionalArray = <const S extends Schema.Top>(schema: S) => Schema.optional(Schema.Array(schema))
 export const optionalNull = <const S extends Schema.Top>(schema: S) => Schema.optional(Schema.NullOr(schema))

-/** OpenAI function schemas require one flat object at the top level. */
-export const openAiToolInputSchema = (schema: JsonSchema.JsonSchema): JsonSchema.JsonSchema => {
-  const variants = Array.isArray(schema.anyOf) ? schema.anyOf.filter(isRecord) : []
-  const flattened =
-    variants.length === 0
-      ? { ...schema, type: "object" }
-      : {
-          ...Object.fromEntries(Object.entries(schema).filter(([key]) => key !== "anyOf")),
-          type: "object",
-          properties: variants.reduce(
-            (properties, variant) => ({ ...(isRecord(variant.properties) ? variant.properties : {}), ...properties }),
-            {},
-          ),
-          additionalProperties: false,
-        }
-  const normalized = removeNullSchemas(flattened)
-  return isRecord(normalized) ? normalized : { type: "object" }
-}
-
-const removeNullSchemas = (value: unknown): unknown => {
-  if (Array.isArray(value)) return value.map(removeNullSchemas)
-  if (!isRecord(value)) return value
-  const fields = Object.fromEntries(
-    Object.entries(value)
-      .filter(([key]) => key !== "anyOf")
-      .map(([key, field]) => [key, removeNullSchemas(field)]),
-  )
-  if (!Array.isArray(value.anyOf)) return fields
-  const variants = value.anyOf.filter((variant) => !isRecord(variant) || variant.type !== "null").map(removeNullSchemas)
-  if (variants.length === 1 && isRecord(variants[0])) return { ...fields, ...variants[0] }
-  return { ...fields, anyOf: variants }
-}
-
 /**
 * Streaming tool-call accumulator. Adapters that build a tool call across
 * multiple `tool-input-delta` chunks store the partial JSON input string here
@@ -57,58 +57,6 @@ describe("OpenAI Responses route", () => {
    }),
  )

-  it.effect("flattens top-level object unions in function schemas", () =>
-    Effect.gen(function* () {
-      const prepared = yield* LLMClient.prepare<OpenAIResponses.OpenAIResponsesBody>(
-        LLM.updateRequest(request, {
-          tools: [
-            {
-              name: "read",
-              description: "Read a path or resource.",
-              inputSchema: {
-                type: "object",
-                anyOf: [
-                  {
-                    type: "object",
-                    properties: {
-                      path: { type: "string" },
-                      reference: { anyOf: [{ type: "string" }, { type: "null" }] },
-                      limit: { type: "integer", maximum: 2000 },
-                    },
-                    required: ["path"],
-                  },
-                  {
-                    type: "object",
-                    properties: { resource: { type: "string" }, limit: { type: "integer", maximum: 51200 } },
-                    required: ["resource"],
-                  },
-                ],
-              },
-            },
-          ],
-        }),
-      )
-
-      expect(prepared.body.tools).toEqual([
-        {
-          type: "function",
-          name: "read",
-          description: "Read a path or resource.",
-          parameters: {
-            type: "object",
-            properties: {
-              path: { type: "string" },
-              reference: { type: "string" },
-              limit: { type: "integer", maximum: 2000 },
-              resource: { type: "string" },
-            },
-            additionalProperties: false,
-          },
-        },
-      ])
-    }),
-  )
-
  it.effect("lowers chronological system updates to escaped user wrappers in order", () =>
    Effect.gen(function* () {
      const prepared = yield* LLMClient.prepare<OpenAIResponses.OpenAIResponsesBody>(
@@ -1,6 +1,6 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
-  "version": "1.16.0",
+  "version": "1.15.13",
  "name": "opencode",
  "type": "module",
  "license": "MIT",
@@ -90,7 +90,7 @@
    "@opencode-ai/server": "workspace:*",
    "@opencode-ai/sdk": "workspace:*",
    "@opencode-ai/ui": "workspace:*",
-    "@openrouter/ai-sdk-provider": "2.9.0",
+    "@openrouter/ai-sdk-provider": "2.8.1",
    "@opentelemetry/api": "1.9.0",
    "@opentelemetry/context-async-hooks": "2.6.1",
    "@opentelemetry/exporter-trace-otlp-http": "0.214.0",
@@ -166,16 +166,6 @@ export default {
      //   },
      // },
    },
-    {
-      filetype: "vue",
-      wasm: "https://github.com/anomalyco/tree-sitter-vue/releases/download/v0.1.2/tree-sitter-vue.wasm",
-      queries: {
-        highlights: [
-          "https://raw.githubusercontent.com/anomalyco/tree-sitter-vue/v0.1.2/queries/html_tags/highlights.scm",
-          "https://raw.githubusercontent.com/anomalyco/tree-sitter-vue/v0.1.2/queries/vue/highlights.scm",
-        ],
-      },
-    },
    {
      filetype: "hcl",
      wasm: "https://github.com/tree-sitter-grammars/tree-sitter-hcl/releases/download/v1.2.0/tree-sitter-hcl.wasm",
@@ -192,7 +192,6 @@ for (const item of targets) {
      OPENCODE_WORKER_PATH: workerPath,
      OPENCODE_CHANNEL: `'${Script.channel}'`,
      OPENCODE_LIBC: item.os === "linux" ? `'${item.abi ?? "glibc"}'` : "",
-      ...(item.os === "linux" ? { "process.env.OPENTUI_LIBC": JSON.stringify(item.abi ?? "glibc") } : {}),
    },
  })

@@ -218,7 +217,6 @@ for (const item of targets) {
        preferUnplugged: true,
        os: [item.os],
        cpu: [item.arch],
-        ...(item.abi ? { libc: [item.abi] } : {}),
      },
      null,
      2,
@@ -214,7 +214,11 @@ export function make(input: {
      "session",
    )
    const messages = yield* request(
-      () => input.sdk.session.messages({ directory: params.cwd, sessionID: params.sessionId }, { throwOnError: true }),
+      () =>
+        input.sdk.session.messages(
+          { directory: params.cwd, sessionID: params.sessionId, limit: 100 },
+          { throwOnError: true },
+        ),
      "session",
    )
    const restored = restoreFromMessages(messages.map((item) => item.info))
@@ -715,13 +715,6 @@ function App(props: { onSnapshot?: () => Promise<string[]> }) {
        hidden: local.model.variant.list().length === 0,
        slashName: "variants",
        run: () => {
-          if (local.model.variant.list().length === 0) {
-            return toast.show({
-              title: "No variants available",
-              message: "The current model does not support any variants.",
-              variant: "info",
-            })
-          }
          dialog.replace(() => <DialogVariant />)
        },
      },
@@ -1,129 +0,0 @@
-import { useTerminalDimensions } from "@opentui/solid"
-import { createMemo, createResource, createSignal, onMount, Show } from "solid-js"
-import path from "path"
-import { DialogSelect, type DialogSelectOption } from "@tui/ui/dialog-select"
-import { useDialog } from "@tui/ui/dialog"
-import { useSDK } from "@tui/context/sdk"
-import { useTheme } from "@tui/context/theme"
-import { useKV } from "@tui/context/kv"
-import { useSync } from "@tui/context/sync"
-import { Global } from "@opencode-ai/core/global"
-import { Locale } from "@/util/locale"
-import "opentui-spinner/solid"
-
-const REFRESH_FRAMES = ["■", "⬝"]
-
-export type MoveSessionSelection = { type: "directory"; directory: string } | { type: "new" }
-
-export function DialogMoveSession(props: { projectID: string; onSelect: (selection: MoveSessionSelection) => void }) {
-  const dialog = useDialog()
-  const sdk = useSDK()
-  const dimensions = useTerminalDimensions()
-  const { theme } = useTheme()
-  const kv = useKV()
-  const sync = useSync()
-  const [refreshing, setRefreshing] = createSignal(false)
-
-  const [directories] = createResource(
-    () => props.projectID,
-    async (projectID) => {
-      setRefreshing(true)
-      const [, project] = await Promise.all([
-        sdk.client.experimental.projectCopy
-          .refresh({ projectID }, { throwOnError: true })
-          .finally(() => setRefreshing(false)),
-        sdk.client.project.current({}, { throwOnError: true }),
-      ])
-      const directories = await sdk.client.project.directories({ projectID }, { throwOnError: true })
-      return {
-        directories: directories.data ?? [],
-        main: project.data?.id === projectID ? project.data.worktree : undefined,
-      }
-    },
-  )
-
-  const options = createMemo<DialogSelectOption<string | undefined>[]>(() => {
-    if (directories.loading) return [{ title: "Loading project directories...", value: undefined }]
-    if (directories.error) return [{ title: "Failed to load project directories", value: undefined }]
-    const data = directories()
-    const roots = data ? [...new Set(data.main ? [data.main, ...data.directories] : data.directories)] : []
-    if (roots.length === 0) return [{ title: "No project directories found", value: undefined }]
-    const subdirectories = sync.data.session
-      .filter((session) => session.projectID === props.projectID && session.path && ![".", "/"].includes(session.path))
-      .map((session) => session.directory)
-      .filter((directory) => !roots.includes(directory))
-      .filter((directory, index, directories) => directories.indexOf(directory) === index)
-      .map((location) => ({
-        location,
-        root: roots
-          .filter((root) => {
-            const relative = path.relative(root, location)
-            return relative && relative !== ".." && !relative.startsWith(".." + path.sep) && !path.isAbsolute(relative)
-          })
-          .toSorted((a, b) => b.length - a.length)[0],
-      }))
-      .filter((item): item is { location: string; root: string } => item.root !== undefined)
-    const list = [...roots.map((location) => ({ location, root: location })), ...subdirectories].toSorted((a, b) => {
-      const root = roots.indexOf(a.root) - roots.indexOf(b.root)
-      if (root !== 0) return root
-      if (a.location === a.root) return -1
-      if (b.location === b.root) return 1
-      return a.location.localeCompare(b.location)
-    })
-    const titleWidth = Math.max(1, Math.min(116, dimensions().width - 2) - 12)
-    return list.map((item) => {
-      const title =
-        Global.Path.home &&
-        (item.location === Global.Path.home || item.location.startsWith(Global.Path.home + path.sep))
-          ? item.location.replace(Global.Path.home, "~")
-          : item.location
-      const suffix = item.location === item.root ? undefined : path.sep + path.relative(item.root, item.location)
-      const visible = Locale.truncateLeft(title, titleWidth)
-      const split = suffix ? Math.max(0, visible.length - suffix.length) : visible.length
-      return {
-        title,
-        titleView: suffix ? (
-          <>
-            {visible.slice(0, split)}
-            <span style={{ fg: theme.textMuted }}>{visible.slice(split)}</span>
-          </>
-        ) : undefined,
-        value: item.location,
-        category: item.root === data?.main ? "Project" : "Working copies",
-        titleWidth,
-        truncateTitle: "left" as const,
-      }
-    })
-  })
-
-  onMount(() => dialog.setSize("xlarge"))
-
-  return (
-    <box minHeight={Math.max(8, Math.min(16, dimensions().height - Math.floor(dimensions().height / 4) - 2))}>
-      <DialogSelect
-        title="Move session"
-        options={options()}
-        onSelect={(option) => {
-          if (option.value) props.onSelect({ type: "directory", directory: option.value })
-        }}
-        actions={[
-          {
-            command: "dialog.move_session.new",
-            title: "new",
-            onTrigger: () => props.onSelect({ type: "new" }),
-          },
-        ]}
-        footer={
-          <Show when={refreshing()}>
-            <box flexDirection="row" gap={1}>
-              <Show when={kv.get("animations_enabled", true)} fallback={<text fg={theme.textMuted}>⬝</text>}>
-                <spinner color={theme.textMuted} frames={REFRESH_FRAMES} interval={160} />
-              </Show>
-              <text fg={theme.textMuted}>refreshing</text>
-            </box>
-          </Show>
-        }
-      />
-    </box>
-  )
-}
@@ -103,7 +103,7 @@ export function DialogWorkspaceFileChanges(props: {
      </scrollbox>
      <box paddingLeft={2} paddingRight={2}>
        <text fg={theme.textMuted} wrapMode="word">
-          Do you want to move these changes with the session?
+          Do you want to apply these changes after warping?
        </text>
      </box>
      <box flexDirection="row" justifyContent="flex-end" paddingLeft={2} paddingRight={2} paddingBottom={1}>
@@ -51,13 +51,18 @@ import { useToast } from "../../ui/toast"
 import { useKV } from "../../context/kv"
 import { createFadeIn } from "../../util/signal"
 import { DialogSkill } from "../dialog-skill"
+import {
+  confirmWorkspaceFileChanges,
+  openWorkspaceSelect,
+  warpWorkspaceSession,
+  type WorkspaceSelection,
+} from "../dialog-workspace-create"
 import { DialogWorkspaceUnavailable } from "../dialog-workspace-unavailable"
 import { useArgs } from "@tui/context/args"
 import { Flag } from "@opencode-ai/core/flag/flag"
+import { type WorkspaceStatus } from "../workspace-label"
 import { OPENCODE_BASE_MODE, useBindings, useCommandShortcut, useLeaderActive, useOpencodeKeymap } from "../../keymap"
 import { useTuiConfig } from "../../context/tui-config"
-import { usePromptWorkspace } from "./workspace"
-import { usePromptMove } from "./move"

 export type PromptProps = {
  sessionID?: string
@@ -190,12 +195,109 @@ export function Prompt(props: PromptProps) {
  })
  const editorContextLabelState = createMemo(() => editor.labelState())
  const [auto, setAuto] = createSignal<AutocompleteRef>()
-  const workspace = usePromptWorkspace(props.sessionID)
-  const move = usePromptMove({ projectID: project.project, sessionID: () => props.sessionID })
+  const [workspaceSelection, setWorkspaceSelection] = createSignal<WorkspaceSelection>()
+  const [workspaceCreating, setWorkspaceCreating] = createSignal(false)
+  const [workspaceCreatingDots, setWorkspaceCreatingDots] = createSignal(3)
+  const [warpNotice, setWarpNotice] = createSignal<string>()
  const [cursorVersion, setCursorVersion] = createSignal(0)
  const currentProviderLabel = createMemo(() => local.model.parsed().provider)
  const hasRightContent = createMemo(() => Boolean(props.right))

+  function selectWorkspace(selection: WorkspaceSelection | undefined) {
+    setWorkspaceSelection(selection)
+  }
+
+  function setCreatingWorkspace(creating: boolean) {
+    setWorkspaceCreating(creating)
+  }
+
+  function showWarpNotice(name: string) {
+    setWarpNotice(`Warped to ${name}`)
+    setTimeout(() => setWarpNotice(undefined), 4000)
+  }
+
+  async function createWorkspace(selection: Extract<WorkspaceSelection, { type: "new" }>) {
+    setCreatingWorkspace(true)
+    let result
+    try {
+      result = await sdk.client.experimental.workspace.create({ type: selection.workspaceType, branch: null })
+    } catch (err) {
+      selectWorkspace(undefined)
+      setCreatingWorkspace(false)
+      toast.show({
+        title: "Creating workspace failed",
+        message: errorMessage(err),
+        variant: "error",
+      })
+      return
+    }
+    if (result.error || !result.data) {
+      selectWorkspace(undefined)
+      setCreatingWorkspace(false)
+      toast.show({
+        title: "Creating workspace failed",
+        message: errorMessage(result.error ?? "no response"),
+        variant: "error",
+      })
+      return
+    }
+
+    await project.workspace.sync()
+    const workspace = result.data
+    selectWorkspace({
+      type: "existing",
+      workspaceID: workspace.id,
+      workspaceType: workspace.type,
+      workspaceName: workspace.name,
+    })
+    setCreatingWorkspace(false)
+    return workspace
+  }
+
+  async function warpSession(selection: WorkspaceSelection) {
+    if (!props.sessionID) {
+      selectWorkspace(selection)
+      dialog.clear()
+      if (selection.type === "new") void createWorkspace(selection)
+      return
+    }
+    const sourceWorkspaceID = project.workspace.current()
+    const copyChanges = await confirmWorkspaceFileChanges({ dialog, sdk, sourceWorkspaceID })
+    if (copyChanges === undefined) return
+    selectWorkspace(selection)
+    dialog.clear()
+
+    const workspace =
+      selection.type === "none"
+        ? { id: null, name: "local project" }
+        : selection.type === "existing"
+          ? { id: selection.workspaceID, name: selection.workspaceName }
+          : await createWorkspace(selection)
+    if (!workspace) return
+
+    const warped = await warpWorkspaceSession({
+      dialog,
+      sdk,
+      sync,
+      project,
+      toast,
+      sourceWorkspaceID,
+      workspaceID: workspace.id,
+      sessionID: props.sessionID,
+      copyChanges,
+    })
+    if (warped) showWarpNotice(workspace.name)
+  }
+
+  createEffect(() => {
+    if (!workspaceCreating()) {
+      setWorkspaceCreatingDots(3)
+      return
+    }
+    const timer = setInterval(() => setWorkspaceCreatingDots((dots) => (dots % 3) + 1), 1000)
+    onCleanup(() => clearInterval(timer))
+  })
+
  function promptModelWarning() {
    toast.show({
      variant: "warning",
@@ -521,17 +623,16 @@ export function Prompt(props: PromptProps) {
        enabled: Flag.OPENCODE_EXPERIMENTAL_WORKSPACES,
        slashName: "warp",
        run: () => {
-          workspace.open()
-        },
-      },
-      {
-        title: "Move session",
-        desc: "Move the session to another project directory",
-        name: "session.move",
-        category: "Session",
-        slashName: "move",
-        run: () => {
-          move.open()
+          void openWorkspaceSelect({
+            dialog,
+            sdk,
+            sync,
+            project,
+            toast,
+            onSelect: (selection) => {
+              void warpSession(selection)
+            },
+          })
        },
      },
    ].map((entry) => ({
@@ -555,7 +656,6 @@ export function Prompt(props: PromptProps) {
      "prompt.stash.list",
      "session.interrupt",
      "workspace.set",
-      "session.move",
    ]),
  }))

@@ -925,7 +1025,7 @@ export function Prompt(props: PromptProps) {
  }

  async function submitInner() {
-    workspace.clearNotice()
+    setWarpNotice(undefined)

    // IME: double-defer may fire before onContentChange flushes the last
    // composed character (e.g. Korean hangul) to the store, so read
@@ -935,7 +1035,7 @@ export function Prompt(props: PromptProps) {
      syncExtmarksWithPromptParts()
    }
    if (props.disabled) return false
-    if (workspace.creating() || move.creating()) return false
+    if (workspaceCreating()) return false
    if (auto()?.visible) return false
    if (!store.prompt.input) return false
    const agent = local.agent.current()
@@ -958,7 +1058,16 @@ export function Prompt(props: PromptProps) {
      dialog.replace(() => (
        <DialogWorkspaceUnavailable
          onRestore={() => {
-            workspace.open()
+            void openWorkspaceSelect({
+              dialog,
+              sdk,
+              sync,
+              project,
+              toast,
+              onSelect: (selection) => {
+                void warpSession(selection)
+              },
+            })
            return false
          }}
        />
@@ -968,22 +1077,16 @@ export function Prompt(props: PromptProps) {

    const variant = local.model.variant.current()
    let sessionID = props.sessionID
-    let finishMoveProgress = false
    if (sessionID == null) {
-      const selectedWorkspace = workspace.selection()
+      const workspace = workspaceSelection()
      const workspaceID = iife(() => {
-        if (!selectedWorkspace) return undefined
-        if (selectedWorkspace.type === "none") return undefined
-        if (selectedWorkspace.type === "existing") return selectedWorkspace.workspaceID
+        if (!workspace) return undefined
+        if (workspace.type === "none") return undefined
+        if (workspace.type === "existing") return workspace.workspaceID
        return undefined
      })

-      const directory = await move.getDirectory(store.prompt.input)
-      if (move.pending() && !directory) return false
-      finishMoveProgress = Boolean(move.progress())
-
      const res = await sdk.client.session.create({
-        directory,
        workspace: workspaceID,
        agent: agent.name,
        model: {
@@ -994,7 +1097,6 @@ export function Prompt(props: PromptProps) {
      })

      if (res.error) {
-        if (finishMoveProgress) move.finishSubmit()
        console.log("Creating a session failed:", res.error)

        toast.show({
@@ -1044,7 +1146,6 @@ export function Prompt(props: PromptProps) {
        : []

    if (store.mode === "shell") {
-      move.startSubmit()
      void sdk.client.session.shell({
        sessionID,
        agent: agent.name,
@@ -1063,7 +1164,6 @@ export function Prompt(props: PromptProps) {
        return sync.data.command.some((x) => x.name === command)
      })
    ) {
-      move.startSubmit()
      // Parse command from first line, preserve multi-line content in arguments
      const firstLineEnd = inputText.indexOf("\n")
      const firstLine = firstLineEnd === -1 ? inputText : inputText.slice(0, firstLineEnd)
@@ -1087,7 +1187,6 @@ export function Prompt(props: PromptProps) {
          })),
      })
    } else {
-      move.startSubmit()
      sdk.client.session
        .prompt({
          sessionID,
@@ -1132,7 +1231,6 @@ export function Prompt(props: PromptProps) {
      }, 50)
    }
    input.clear()
-    if (finishMoveProgress) move.finishSubmit()
    return true
  }
  const exit = useExit()
@@ -1329,6 +1427,29 @@ export function Prompt(props: PromptProps) {
    return `Ask anything... "${list()[store.placeholder % list().length]}"`
  })

+  const workspaceLabel = createMemo<
+    | { type: "new"; workspaceType: string }
+    | { type: "existing"; workspaceType: string; workspaceName: string; status?: WorkspaceStatus }
+    | undefined
+  >(() => {
+    const selected = workspaceSelection()
+    if (!selected) return
+    if (selected.type === "none") return
+    if (props.sessionID && !workspaceCreating()) return
+    if (selected.type === "new") {
+      return {
+        type: "new",
+        workspaceType: selected.workspaceType,
+      }
+    }
+    return {
+      type: "existing",
+      workspaceType: selected.workspaceType,
+      workspaceName: selected.workspaceName,
+      status: selected.type === "existing" ? "connected" : undefined,
+    }
+  })
+
  const spinnerDef = createMemo(() => {
    const agent =
      status().type !== "idle"
@@ -1353,7 +1474,6 @@ export function Prompt(props: PromptProps) {
    }
  })
  const maxHeight = createMemo(() => tuiConfig.prompt?.max_height ?? Math.max(6, Math.floor(dimensions().height / 3)))
-  const moveLabelWidth = createMemo(() => Math.max(12, Math.min(44, dimensions().width - 48)))

  return (
    <>
@@ -1597,25 +1717,25 @@ export function Prompt(props: PromptProps) {
                </text>
              </box>
            </Match>
-            <Match when={workspace.notice()}>
+            <Match when={warpNotice()}>
              {(notice) => (
                <box paddingLeft={3}>
                  <text fg={theme.accent}>{notice()}</text>
                </box>
              )}
            </Match>
-            <Match when={workspace.label()}>
-              {(label) => (
+            <Match when={workspaceLabel()}>
+              {(workspace) => (
                <box paddingLeft={3} flexDirection="row" gap={1}>
-                  <Show when={workspace.creating()}>
+                  <Show when={workspaceCreating()}>
                    <Spinner color={theme.accent} />
                  </Show>
-                  <text fg={workspace.creating() ? theme.accent : theme.text}>
+                  <text fg={workspaceCreating() ? theme.accent : theme.text}>
                    {(() => {
-                      const item = label()
+                      const item = workspace()
                      if (item.type === "new") {
-                        if (workspace.creating())
-                          return `Creating ${item.workspaceType}${".".repeat(workspace.creatingDots())}`
+                        if (workspaceCreating())
+                          return `Creating ${item.workspaceType}${".".repeat(workspaceCreatingDots())}`
                        return (
                          <>
                            Workspace <span style={{ fg: theme.textMuted }}>(new {item.workspaceType})</span>
@@ -1632,21 +1752,6 @@ export function Prompt(props: PromptProps) {
                </box>
              )}
            </Match>
-            <Match when={move.progress()}>
-              {(progress) => (
-                <box paddingLeft={3}>
-                  <Spinner color={theme.accent}>
-                    {progress()}
-                    <span style={{ fg: theme.textMuted }}>{".".repeat(move.creatingDots())}</span>
-                  </Spinner>
-                </box>
-              )}
-            </Match>
-            <Match when={move.pendingNew()}>
-              <box paddingLeft={3}>
-                <text fg={theme.accent}>(new working copy)</text>
-              </box>
-            </Match>
            <Match when={true}>{props.hint ?? <text />}</Match>
          </Switch>
          <Show when={status().type !== "retry"}>
@@ -1,158 +0,0 @@
-import { createEffect, createMemo, createSignal, onCleanup } from "solid-js"
-import path from "path"
-import { Global } from "@opencode-ai/core/global"
-import { errorMessage } from "@/util/error"
-import { useDialog } from "@tui/ui/dialog"
-import { useSDK } from "@tui/context/sdk"
-import { useSync } from "@tui/context/sync"
-import { useToast } from "@tui/ui/toast"
-import { DialogMoveSession, type MoveSessionSelection } from "../dialog-move-session"
-import { DialogWorkspaceFileChanges } from "../dialog-workspace-file-changes"
-import { useHomeSessionDestination } from "../../routes/home/session-destination"
-
-export function usePromptMove(input: { projectID: () => string | undefined; sessionID: () => string | undefined }) {
-  const dialog = useDialog()
-  const sdk = useSDK()
-  const sync = useSync()
-  const toast = useToast()
-  const homeDestination = useHomeSessionDestination()
-  const [creating, setCreating] = createSignal(false)
-  const [creatingDots, setCreatingDots] = createSignal(3)
-  const [progress, setProgress] = createSignal<string>()
-
-  async function create(context?: string) {
-    const projectID = input.projectID()
-    if (!projectID) return
-    setCreating(true)
-    setProgress("Creating copy")
-    try {
-      const result = await sdk.client.experimental.projectCopy.create(
-        {
-          projectID,
-          strategy: "git_worktree",
-          directory: path.join(Global.Path.data, "worktree", projectID.slice(0, 6)),
-          context,
-        },
-        { throwOnError: true },
-      )
-      const directory = result.data?.directory
-      if (!directory) throw new Error("No project copy directory returned")
-      setProgress("Creating session")
-      return directory
-    } catch (err) {
-      homeDestination?.clear()
-      setProgress(undefined)
-      setCreating(false)
-      toast.show({ title: "Creating workspace failed", message: errorMessage(err), variant: "error" })
-      return
-    }
-  }
-
-  function open() {
-    const projectID = input.projectID()
-    if (!projectID) return
-    dialog.replace(() => (
-      <DialogMoveSession
-        projectID={projectID}
-        onSelect={(selection) => {
-          const sessionID = input.sessionID()
-          if (!sessionID) {
-            homeDestination?.setDestination(selection)
-            dialog.clear()
-            return
-          }
-          void moveExistingSession(sessionID, selection)
-        }}
-      />
-    ))
-  }
-
-  function sessionContext(sessionID: string) {
-    const session = sync.session.get(sessionID)
-    const messages = (sync.data.message[sessionID] ?? [])
-      .slice(-6)
-      .map((message) =>
-        [
-          message.role + ":",
-          ...(sync.data.part[message.id] ?? []).flatMap((part) => (part.type === "text" ? [part.text] : [])),
-        ].join(" "),
-      )
-    return [session?.title, ...messages].filter(Boolean).join("\n") || undefined
-  }
-
-  async function moveExistingSession(sessionID: string, selection: MoveSessionSelection) {
-    const session = sync.session.get(sessionID)
-    const status = await sdk.client.vcs.status({ directory: session?.directory }).catch(() => undefined)
-    const choice = status?.data?.length ? await DialogWorkspaceFileChanges.show(dialog, status.data) : "no"
-    if (!choice) return
-    dialog.clear()
-    const directory = selection.type === "new" ? await create(sessionContext(sessionID)) : selection.directory
-    if (!directory) {
-      setProgress(undefined)
-      dialog.clear()
-      return
-    }
-    setProgress("Moving session")
-    await sdk.client.experimental.controlPlane
-      .moveSession(
-        {
-          sessionID,
-          destination: { directory },
-          moveChanges: choice === "yes",
-        },
-        { throwOnError: true },
-      )
-      .then(() => dialog.clear())
-      .catch((error) => {
-        toast.error(error)
-        dialog.clear()
-      })
-      .finally(() => {
-        setProgress(undefined)
-        setCreating(false)
-      })
-  }
-
-  const pending = createMemo(() => Boolean(homeDestination?.destination()))
-  const pendingNew = createMemo(() => homeDestination?.destination()?.type === "new")
-
-  async function getDirectory(context?: string) {
-    const value = homeDestination?.destination()
-    if (!value) return
-    if (value.type === "directory") {
-      return value.directory
-    }
-    return await create(context)
-  }
-
-  function startSubmit() {
-    if (progress()) setProgress("Submitting prompt")
-  }
-
-  function finishSubmit() {
-    homeDestination?.clear()
-    setProgress(undefined)
-    setCreating(false)
-  }
-
-  createEffect(() => {
-    if (!creating()) {
-      setCreatingDots(3)
-      return
-    }
-    const timer = setInterval(() => setCreatingDots((dots) => (dots % 3) + 1), 1000)
-    onCleanup(() => clearInterval(timer))
-  })
-
-  return {
-    creating,
-    creatingDots,
-    finishSubmit,
-    getDirectory,
-    open,
-    pending,
-    pendingNew,
-    progress,
-    startSubmit,
-  }
-}
@@ -1,137 +0,0 @@
-import { createEffect, createMemo, createSignal, onCleanup } from "solid-js"
-import { useDialog } from "@tui/ui/dialog"
-import { useSDK } from "@tui/context/sdk"
-import { useProject } from "@tui/context/project"
-import { useSync } from "@tui/context/sync"
-import { useToast } from "@tui/ui/toast"
-import { errorMessage } from "@/util/error"
-import {
-  confirmWorkspaceFileChanges,
-  openWorkspaceSelect,
-  warpWorkspaceSession,
-  type WorkspaceSelection,
-} from "../dialog-workspace-create"
-import type { WorkspaceStatus } from "../workspace-label"
-
-export function usePromptWorkspace(sessionID?: string) {
-  const dialog = useDialog()
-  const sdk = useSDK()
-  const project = useProject()
-  const sync = useSync()
-  const toast = useToast()
-  const [selection, setSelection] = createSignal<WorkspaceSelection>()
-  const [creating, setCreating] = createSignal(false)
-  const [creatingDots, setCreatingDots] = createSignal(3)
-  const [notice, setNotice] = createSignal<string>()
-
-  async function create(selection: Extract<WorkspaceSelection, { type: "new" }>) {
-    setCreating(true)
-    let result
-    try {
-      result = await sdk.client.experimental.workspace.create({ type: selection.workspaceType, branch: null })
-    } catch (err) {
-      setSelection(undefined)
-      setCreating(false)
-      toast.show({ title: "Creating workspace failed", message: errorMessage(err), variant: "error" })
-      return
-    }
-    if (result.error || !result.data) {
-      setSelection(undefined)
-      setCreating(false)
-      toast.show({
-        title: "Creating workspace failed",
-        message: errorMessage(result.error ?? "no response"),
-        variant: "error",
-      })
-      return
-    }
-
-    await project.workspace.sync()
-    const workspace = result.data
-    setSelection({
-      type: "existing",
-      workspaceID: workspace.id,
-      workspaceType: workspace.type,
-      workspaceName: workspace.name,
-    })
-    setCreating(false)
-    return workspace
-  }
-
-  async function warp(selection: WorkspaceSelection) {
-    if (!sessionID) {
-      setSelection(selection)
-      dialog.clear()
-      if (selection.type === "new") void create(selection)
-      return
-    }
-    const sourceWorkspaceID = project.workspace.current()
-    const copyChanges = await confirmWorkspaceFileChanges({ dialog, sdk, sourceWorkspaceID })
-    if (copyChanges === undefined) return
-    setSelection(selection)
-    dialog.clear()
-
-    const workspace =
-      selection.type === "none"
-        ? { id: null, name: "local project" }
-        : selection.type === "existing"
-          ? { id: selection.workspaceID, name: selection.workspaceName }
-          : await create(selection)
-    if (!workspace) return
-
-    const warped = await warpWorkspaceSession({
-      dialog,
-      sdk,
-      sync,
-      project,
-      toast,
-      sourceWorkspaceID,
-      workspaceID: workspace.id,
-      sessionID,
-      copyChanges,
-    })
-    if (warped) showNotice(workspace.name)
-  }
-
-  function showNotice(name: string) {
-    setNotice(`Warped to ${name}`)
-    setTimeout(() => setNotice(undefined), 4000)
-  }
-
-  function clearNotice() {
-    setNotice(undefined)
-  }
-
-  function open() {
-    void openWorkspaceSelect({ dialog, sdk, sync, project, toast, onSelect: warp })
-  }
-
-  createEffect(() => {
-    if (!creating()) {
-      setCreatingDots(3)
-      return
-    }
-    const timer = setInterval(() => setCreatingDots((dots) => (dots % 3) + 1), 1000)
-    onCleanup(() => clearInterval(timer))
-  })
-
-  const label = createMemo<
-    | { type: "new"; workspaceType: string }
-    | { type: "existing"; workspaceType: string; workspaceName: string; status?: WorkspaceStatus }
-    | undefined
-  >(() => {
-    const selected = selection()
-    if (!selected) return
-    if (selected.type === "none") return
-    if (sessionID && !creating()) return
-    if (selected.type === "new") return { type: "new", workspaceType: selected.workspaceType }
-    return {
-      type: "existing",
-      workspaceType: selected.workspaceType,
-      workspaceName: selected.workspaceName,
-      status: selected.type === "existing" ? "connected" : undefined,
-    }
-  })
-
-  return { selection, creating, creatingDots, notice, label, open, warp, clearNotice }
-}
@@ -204,7 +204,6 @@ export const Definitions = {
  "dialog.select.submit": keybind("return", "Submit selected dialog item"),
  "dialog.prompt.submit": keybind("return", "Submit dialog prompt"),
  "dialog.mcp.toggle": keybind("space", "Toggle MCP in MCP dialog"),
-  "dialog.move_session.new": keybind("ctrl+w", "New project copy"),
  "prompt.autocomplete.prev": keybind("up,ctrl+p", "Move to previous autocomplete item"),
  "prompt.autocomplete.next": keybind("down,ctrl+n", "Move to next autocomplete item"),
  "prompt.autocomplete.hide": keybind("escape", "Hide autocomplete"),
@@ -1,6 +1,5 @@
 import { useEvent } from "@tui/context/event"
 import type {
-  Event,
  SessionMessage,
  SessionMessageAssistant,
  SessionMessageAssistantReasoning,
@@ -55,11 +54,6 @@ function latestReasoning(assistant: SessionMessageAssistant | undefined, reasoni
  )
 }

-function prepend(messages: SessionMessage[], message: SessionMessage) {
-  if (messages.some((item) => item.id === message.id)) return
-  messages.unshift(message)
-}
-
 export const { use: useSyncV2, provider: SyncProviderV2 } = createSimpleContext({
  name: "SyncV2",
  init: () => {
@@ -73,18 +67,6 @@ export const { use: useSyncV2, provider: SyncProviderV2 } = createSimpleContext(

    const event = useEvent()
    const sdk = useSDK()
-    const applied = new Set<string>()
-    const buffering = new Map<string, Event[]>()
-    const syncing = new Map<string, Promise<void>>()
-
-    function duplicate(id: string) {
-      if (applied.has(id)) return true
-      applied.add(id)
-      if (applied.size <= 1000) return false
-      const oldest = applied.values().next()
-      if (!oldest.done) applied.delete(oldest.value)
-      return false
-    }

    function update(sessionID: string, fn: (messages: SessionMessage[]) => void) {
      setStore(
@@ -95,41 +77,12 @@ export const { use: useSyncV2, provider: SyncProviderV2 } = createSimpleContext(
      )
    }

-    async function hydrate(sessionID: string) {
-      const pending: Event[] = []
-      const before = JSON.parse(JSON.stringify(store.messages[sessionID] ?? [])) as SessionMessage[]
-      buffering.set(sessionID, pending)
-      try {
-        const response = await sdk.client.v2.session.messages({ sessionID })
-        const messages = response.data?.data ?? []
-        const snapshotIDs = new Set(messages.map((message) => message.id))
-        setStore(
-          "messages",
-          sessionID,
-          reconcile([...messages, ...before.filter((message) => !snapshotIDs.has(message.id))]),
-        )
-        buffering.delete(sessionID)
-        for (const event of pending) apply(event)
-      } catch (error) {
-        buffering.delete(sessionID)
-        throw error
-      }
-    }
-
-    function sync(sessionID: string) {
-      const existing = syncing.get(sessionID)
-      if (existing) return existing
-      const result = hydrate(sessionID).finally(() => syncing.delete(sessionID))
-      syncing.set(sessionID, result)
-      return result
-    }
-
-    function apply(event: Event) {
+    event.subscribe((event) => {
      switch (event.type) {
        case "session.next.agent.switched":
          update(event.properties.sessionID, (draft) => {
-            prepend(draft, {
-              id: event.properties.messageID,
+            draft.unshift({
+              id: event.id,
              type: "agent-switched",
              agent: event.properties.agent,
              time: { created: event.properties.timestamp },
@@ -138,8 +91,8 @@ export const { use: useSyncV2, provider: SyncProviderV2 } = createSimpleContext(
          break
        case "session.next.model.switched":
          update(event.properties.sessionID, (draft) => {
-            prepend(draft, {
-              id: event.properties.messageID,
+            draft.unshift({
+              id: event.id,
              type: "model-switched",
              model: event.properties.model,
              time: { created: event.properties.timestamp },
@@ -148,8 +101,8 @@ export const { use: useSyncV2, provider: SyncProviderV2 } = createSimpleContext(
          break
        case "session.next.prompted": {
          update(event.properties.sessionID, (draft) => {
-            prepend(draft, {
-              id: event.properties.messageID,
+            draft.unshift({
+              id: event.id,
              type: "user",
              text: event.properties.prompt.text,
              files: event.properties.prompt.files,
@@ -160,25 +113,10 @@ export const { use: useSyncV2, provider: SyncProviderV2 } = createSimpleContext(
          })
          break
        }
-        case "session.next.prompt.admitted":
-          break
-        case "session.next.prompt.promoted":
-          update(event.properties.sessionID, (draft) => {
-            prepend(draft, {
-              id: event.properties.messageID,
-              type: "user",
-              text: event.properties.prompt.text,
-              files: event.properties.prompt.files,
-              agents: event.properties.prompt.agents,
-              references: event.properties.prompt.references,
-              time: { created: event.properties.timeCreated },
-            })
-          })
-          break
        case "session.next.synthetic":
          update(event.properties.sessionID, (draft) => {
-            prepend(draft, {
-              id: event.properties.messageID,
+            draft.unshift({
+              id: event.id,
              type: "synthetic",
              sessionID: event.properties.sessionID,
              text: event.properties.text,
@@ -188,8 +126,8 @@ export const { use: useSyncV2, provider: SyncProviderV2 } = createSimpleContext(
          break
        case "session.next.shell.started":
          update(event.properties.sessionID, (draft) => {
-            prepend(draft, {
-              id: event.properties.messageID,
+            draft.unshift({
+              id: event.id,
              type: "shell",
              callID: event.properties.callID,
              command: event.properties.command,
@@ -208,11 +146,10 @@ export const { use: useSyncV2, provider: SyncProviderV2 } = createSimpleContext(
          break
        case "session.next.step.started":
          update(event.properties.sessionID, (draft) => {
-            if (draft.some((message) => message.id === event.properties.assistantMessageID)) return
            const currentAssistant = activeAssistant(draft)
            if (currentAssistant) currentAssistant.time.completed = event.properties.timestamp
-            prepend(draft, {
-              id: event.properties.assistantMessageID,
+            draft.unshift({
+              id: event.id,
              type: "assistant",
              agent: event.properties.agent,
              model: event.properties.model,
@@ -245,28 +182,18 @@ export const { use: useSyncV2, provider: SyncProviderV2 } = createSimpleContext(
          break
        case "session.next.text.started":
          update(event.properties.sessionID, (draft) => {
-            ownedAssistant(draft, event.properties.assistantMessageID)?.content.push({
-              type: "text",
-              id: event.properties.textID,
-              text: "",
-            })
+            activeAssistant(draft)?.content.push({ type: "text", id: event.properties.textID, text: "" })
          })
          break
        case "session.next.text.delta":
          update(event.properties.sessionID, (draft) => {
-            const match = latestText(
-              ownedAssistant(draft, event.properties.assistantMessageID),
-              event.properties.textID,
-            )
+            const match = latestText(activeAssistant(draft), event.properties.textID)
            if (match) match.text += event.properties.delta
          })
          break
        case "session.next.text.ended":
          update(event.properties.sessionID, (draft) => {
-            const match = latestText(
-              ownedAssistant(draft, event.properties.assistantMessageID),
-              event.properties.textID,
-            )
+            const match = latestText(activeAssistant(draft), event.properties.textID)
            if (match) match.text = event.properties.text
          })
          break
@@ -336,11 +263,7 @@ export const { use: useSyncV2, provider: SyncProviderV2 } = createSimpleContext(
              content: [...event.properties.content],
              result: event.properties.result,
            }
-            match.provider = {
-              executed: event.properties.provider.executed || match.provider?.executed === true,
-              metadata: match.provider?.metadata,
-              resultMetadata: event.properties.provider.metadata,
-            }
+            match.provider = event.properties.provider
            match.time.completed = event.properties.timestamp
          })
          break
@@ -359,17 +282,13 @@ export const { use: useSyncV2, provider: SyncProviderV2 } = createSimpleContext(
              content: match.state.status === "running" ? match.state.content : [],
              result: event.properties.result,
            }
-            match.provider = {
-              executed: event.properties.provider.executed || match.provider?.executed === true,
-              metadata: match.provider?.metadata,
-              resultMetadata: event.properties.provider.metadata,
-            }
+            match.provider = event.properties.provider
            match.time.completed = event.properties.timestamp
          })
          break
        case "session.next.reasoning.started":
          update(event.properties.sessionID, (draft) => {
-            ownedAssistant(draft, event.properties.assistantMessageID)?.content.push({
+            activeAssistant(draft)?.content.push({
              type: "reasoning",
              id: event.properties.reasoningID,
              text: "",
@@ -379,19 +298,13 @@ export const { use: useSyncV2, provider: SyncProviderV2 } = createSimpleContext(
          break
        case "session.next.reasoning.delta":
          update(event.properties.sessionID, (draft) => {
-            const match = latestReasoning(
-              ownedAssistant(draft, event.properties.assistantMessageID),
-              event.properties.reasoningID,
-            )
+            const match = latestReasoning(activeAssistant(draft), event.properties.reasoningID)
            if (match) match.text += event.properties.delta
          })
          break
        case "session.next.reasoning.ended":
          update(event.properties.sessionID, (draft) => {
-            const match = latestReasoning(
-              ownedAssistant(draft, event.properties.assistantMessageID),
-              event.properties.reasoningID,
-            )
+            const match = latestReasoning(activeAssistant(draft), event.properties.reasoningID)
            if (match) {
              match.text = event.properties.text
              if (event.properties.providerMetadata !== undefined)
@@ -403,8 +316,8 @@ export const { use: useSyncV2, provider: SyncProviderV2 } = createSimpleContext(
          break
        case "session.next.compaction.started":
          update(event.properties.sessionID, (draft) => {
-            prepend(draft, {
-              id: event.properties.messageID,
+            draft.unshift({
+              id: event.id,
              type: "compaction",
              reason: event.properties.reason,
              summary: "",
@@ -427,20 +340,16 @@ export const { use: useSyncV2, provider: SyncProviderV2 } = createSimpleContext(
          })
          break
      }
-    }
-
-    event.subscribe((event) => {
-      if (duplicate(event.id)) return
-      if ("sessionID" in event.properties && typeof event.properties.sessionID === "string")
-        buffering.get(event.properties.sessionID)?.push(event)
-      apply(event)
    })

    const result = {
      data: store,
      session: {
        message: {
-          sync,
+          async sync(sessionID: string) {
+            const response = await sdk.client.v2.session.messages({ sessionID })
+            setStore("messages", sessionID, reconcile(response.data?.data ?? []))
+          },
          fromSession(sessionID: string) {
            const messages = store.messages[sessionID]
            if (!messages) return []
@@ -253,22 +253,6 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({
          break
        }

-        case "session.next.moved": {
-          const result = Binary.search(store.session, event.properties.sessionID, (s) => s.id)
-          if (!result.found) break
-          setStore(
-            "session",
-            result.index,
-            produce((session) => {
-              session.directory = event.properties.location.directory
-              session.path = event.properties.subdirectory
-              session.workspaceID = event.properties.location.workspaceID
-              session.time.updated = event.properties.timestamp
-            }),
-          )
-          break
-        }
-
        case "session.status": {
          setStore("session_status", event.properties.sessionID, event.properties.status)
          break
@@ -2,17 +2,12 @@ import type { TuiPlugin, TuiPluginApi } from "@opencode-ai/plugin/tui"
 import type { InternalTuiPlugin } from "../../plugin/internal"
 import { createMemo, Match, Show, Switch } from "solid-js"
 import { Global } from "@opencode-ai/core/global"
-import { useHomeSessionDestination } from "../../routes/home/session-destination"

 const id = "internal:home-footer"

 function Directory(props: { api: TuiPluginApi }) {
  const theme = () => props.api.theme.current
-  const destination = useHomeSessionDestination()
  const dir = createMemo(() => {
-    const selected = destination?.destination()
-    if (selected?.type === "new") return
-    if (selected?.type === "directory") return selected.directory.replace(Global.Path.home, "~")
    const dir = props.api.state.path.directory || process.cwd()
    const out = dir.replace(Global.Path.home, "~")
    const branch = props.api.state.vcs?.branch
@@ -20,7 +15,7 @@ function Directory(props: { api: TuiPluginApi }) {
    return out
  })

-  return <Show when={dir()}>{(value) => <text fg={theme().textMuted}>{value()}</text>}</Show>
+  return <text fg={theme().textMuted}>{dir()}</text>
 }

 function Mcp(props: { api: TuiPluginApi }) {
@@ -5,7 +5,7 @@ import { Global } from "@opencode-ai/core/global"

 const id = "internal:sidebar-footer"

-function View(props: { api: TuiPluginApi; sessionID: string }) {
+function View(props: { api: TuiPluginApi }) {
  const theme = () => props.api.theme.current
  const has = createMemo(() =>
    props.api.state.provider.some(
@@ -15,11 +15,9 @@ function View(props: { api: TuiPluginApi; sessionID: string }) {
  const done = createMemo(() => props.api.kv.get("dismissed_getting_started", false))
  const show = createMemo(() => !has() && !done())
  const path = createMemo(() => {
-    const session = props.api.state.session.get(props.sessionID)
-    const dir = session?.directory || props.api.state.path.directory || process.cwd()
+    const dir = props.api.state.path.directory || process.cwd()
    const out = dir.replace(Global.Path.home, "~")
-    const branch = session?.directory === props.api.state.path.directory ? props.api.state.vcs?.branch : undefined
-    const text = branch ? out + ":" + branch : out
+    const text = props.api.state.vcs?.branch ? out + ":" + props.api.state.vcs.branch : out
    const list = text.split("/")
    return {
      parent: list.slice(0, -1).join("/"),
@@ -81,8 +79,8 @@ const tui: TuiPlugin = async (api) => {
  api.slots.register({
    order: 100,
    slots: {
-      sidebar_footer(_ctx, props) {
-        return <View api={api} sessionID={props.session_id} />
+      sidebar_footer() {
+        return <View api={api} />
      },
    },
  })
@@ -11,7 +11,6 @@ import { TuiPluginRuntime } from "@/cli/cmd/tui/plugin/runtime"
 import { useEditorContext } from "@tui/context/editor"
 import { useTerminalDimensions } from "@opentui/solid"
 import { useTuiConfig } from "../context/tui-config"
-import { HomeSessionDestinationProvider } from "./home/session-destination"

 let once = false
 const placeholder = {
@@ -67,7 +66,7 @@ export function Home() {
  })

  return (
-    <HomeSessionDestinationProvider>
+    <>
      <box flexGrow={1} alignItems="center" paddingLeft={2} paddingRight={2}>
        <box flexGrow={1} minHeight={0} />
        <box height={4} minHeight={0} flexShrink={1} />
@@ -89,6 +88,6 @@ export function Home() {
      <box width="100%" flexShrink={0}>
        <TuiPluginRuntime.Slot name="home_footer" mode="single_winner" />
      </box>
-    </HomeSessionDestinationProvider>
+    </>
  )
 }
@@ -1,26 +0,0 @@
-import { createContext, createSignal, useContext, type Accessor, type ParentProps, type Setter } from "solid-js"
-
-export type HomeSessionDestination = { type: "directory"; directory: string } | { type: "new" }
-
-type Context = {
-  destination: Accessor<HomeSessionDestination | undefined>
-  setDestination: Setter<HomeSessionDestination | undefined>
-  clear: () => void
-}
-
-const HomeSessionDestinationContext = createContext<Context>()
-
-export function HomeSessionDestinationProvider(props: ParentProps) {
-  const [destination, setDestination] = createSignal<HomeSessionDestination>()
-  return (
-    <HomeSessionDestinationContext.Provider
-      value={{ destination, setDestination, clear: () => setDestination(undefined) }}
-    >
-      {props.children}
-    </HomeSessionDestinationContext.Provider>
-  )
-}
-
-export function useHomeSessionDestination() {
-  return useContext(HomeSessionDestinationContext)
-}
@@ -23,7 +23,6 @@ import { formatKeyBindings, useBindings, useKeymapSelector } from "../keymap"
 export interface DialogSelectProps<T> {
  title: string
  placeholder?: string
-  footer?: JSX.Element
  options: DialogSelectOption<T>[]
  flat?: boolean
  ref?: (ref: DialogSelectRef<T>) => void
@@ -50,13 +49,10 @@ export interface DialogSelectProps<T> {

 export interface DialogSelectOption<T = any> {
  title: string
-  titleView?: JSX.Element
  value: T
  description?: string
  details?: string[]
  footer?: JSX.Element | string
-  titleWidth?: number
-  truncateTitle?: boolean | "left"
  category?: string
  categoryView?: JSX.Element
  disabled?: boolean
@@ -476,10 +472,7 @@ export function DialogSelect<T>(props: DialogSelectProps<T>) {
                            </Show>
                            <Option
                              title={option.title}
-                              titleView={option.titleView}
                              footer={flatten() ? (option.category ?? option.footer) : option.footer}
-                              titleWidth={option.titleWidth}
-                              truncateTitle={option.truncateTitle}
                              description={option.description !== category ? option.description : undefined}
                              active={active()}
                              current={current()}
@@ -505,7 +498,7 @@ export function DialogSelect<T>(props: DialogSelectProps<T>) {
          </scrollbox>
        </Show>
      </box>
-      <Show when={props.footer || visibleActions().length} fallback={<box flexShrink={0} />}>
+      <Show when={visibleActions().length} fallback={<box flexShrink={0} />}>
        <box
          paddingRight={2}
          paddingLeft={4}
@@ -515,7 +508,6 @@ export function DialogSelect<T>(props: DialogSelectProps<T>) {
          paddingTop={1}
        >
          <box flexDirection="row" gap={2}>
-            {props.footer}
            <For each={left()}>
              {(item) => (
                <text>
@@ -547,13 +539,10 @@ export function DialogSelect<T>(props: DialogSelectProps<T>) {

 function Option(props: {
  title: string
-  titleView?: JSX.Element
  description?: string
  active?: boolean
  current?: boolean
  footer?: JSX.Element | string
-  titleWidth?: number
-  truncateTitle?: boolean | "left"
  gutter?: () => JSX.Element
  onMouseOver?: () => void
 }) {
@@ -580,12 +569,7 @@ function Option(props: {
        wrapMode="none"
        paddingLeft={3}
      >
-        {props.titleView ??
-          (props.truncateTitle === false
-            ? props.title
-            : props.truncateTitle === "left"
-              ? Locale.truncateLeft(props.title, props.titleWidth ?? 61)
-              : Locale.truncate(props.title, props.titleWidth ?? 61))}
+        {Locale.truncate(props.title, 61)}
        <Show when={props.description}>
          <span style={{ fg: props.active ? fg : theme.textMuted }}> {props.description}</span>
        </Show>
@@ -5,7 +5,6 @@ import { InstanceDisposed } from "@/server/event"
 import { Question } from "@/question"
 import { ConfigApi } from "./groups/config"
 import { ControlApi } from "./groups/control"
-import { ControlPlaneApi } from "./groups/control-plane"
 import { EventApi } from "./groups/event"
 import { ExperimentalApi } from "./groups/experimental"
 import { FileApi } from "./groups/file"
@@ -32,7 +31,7 @@ const EventSchema = Schema.Union([
    .values()
    .map((definition) =>
      Schema.Struct({
-        id: EventV2.ID,
+        id: Schema.String,
        type: Schema.Literal(definition.type),
        properties: definition.data,
      }).annotate({ identifier: `Event.${definition.type}` }),
@@ -43,7 +42,6 @@ const EventSchema = Schema.Union([

 export const RootHttpApi = HttpApi.make("opencode-root")
  .addHttpApi(ControlApi)
-  .addHttpApi(ControlPlaneApi)
  .addHttpApi(GlobalApi)
  .middleware(SchemaErrorMiddleware)
  .middleware(Authorization)
@@ -1,35 +0,0 @@
-import { MoveSession } from "@opencode-ai/core/control-plane/move-session"
-import { Schema } from "effect"
-import { HttpApi, HttpApiEndpoint, HttpApiGroup, HttpApiSchema, OpenApi } from "effect/unstable/httpapi"
-import { described } from "./metadata"
-
-const root = "/experimental/control-plane"
-export const MoveSessionPayload = Schema.Struct({ ...MoveSession.Input.fields })
-
-export class ApiMoveSessionError extends Schema.ErrorClass<ApiMoveSessionError>("MoveSessionError")(
-  {
-    name: Schema.Literal("MoveSessionError"),
-    data: Schema.Struct({
-      message: Schema.String,
-    }),
-  },
-  { httpApiStatus: 400 },
-) {}
-
-export const ControlPlaneApi = HttpApi.make("controlPlane").add(
-  HttpApiGroup.make("controlPlane")
-    .add(
-      HttpApiEndpoint.post("moveSession", `${root}/move-session`, {
-        payload: MoveSessionPayload,
-        success: described(HttpApiSchema.NoContent, "Session moved"),
-        error: ApiMoveSessionError,
-      }).annotateMerge(
-        OpenApi.annotations({
-          identifier: "experimental.controlPlane.moveSession",
-          summary: "Move session",
-          description: "Move a session to another project directory, optionally transferring local changes.",
-        }),
-      ),
-    )
-    .annotateMerge(OpenApi.annotations({ title: "controlPlane", description: "Control-plane orchestration routes." })),
-)
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Aiden Cline	111f5858d9	refactor(tui): simplify rpc failure propagation	2026-06-04 11:45:42 -05:00
Aiden Cline	45efcc893c	fix(tui): reject worker rpc failures	2026-06-04 11:42:13 -05:00