refactor(tui): migrate worktree workflows

refactor(server): expose global worktree api
refactor(core): consolidate worktree domain
2026-08-12 20:50:01 -04:00 · 2026-08-12 21:57:30 +00:00 · 2026-08-12 21:57:21 +00:00 · 2026-08-12 21:57:11 +00:00 · 2026-08-12 23:09:41 +02:00 · 2026-08-12 20:49:54 +00:00
107 changed files with 6934 additions and 3263 deletions
@@ -596,9 +596,9 @@
      },
      "peerDependencies": {
        "@opencode-ai/theme": "workspace:*",
-        "@opentui/core": "0.0.0-20260808-9ecf7c0a",
-        "@opentui/keymap": "0.0.0-20260808-9ecf7c0a",
-        "@opentui/solid": "0.0.0-20260808-9ecf7c0a",
+        "@opentui/core": ">=0.5.2",
+        "@opentui/keymap": ">=0.5.2",
+        "@opentui/solid": ">=0.5.2",
        "solid-js": ">=1.9.0",
      },
      "optionalPeers": [
@@ -678,7 +678,6 @@
        "@opencode-ai/util": "workspace:*",
        "drizzle-orm": "catalog:",
        "effect": "catalog:",
-        "modal": "0.9.0",
      },
      "devDependencies": {
        "@tsconfig/bun": "catalog:",
@@ -1099,9 +1098,9 @@
    "@ai-sdk/openai-compatible@2.0.41": "patches/@ai-sdk%2Fopenai-compatible@2.0.41.patch",
  },
  "overrides": {
-    "@opentui/core": "0.0.0-20260808-9ecf7c0a",
-    "@opentui/keymap": "0.0.0-20260808-9ecf7c0a",
-    "@opentui/solid": "0.0.0-20260808-9ecf7c0a",
+    "@opentui/core": "catalog:",
+    "@opentui/keymap": "catalog:",
+    "@opentui/solid": "catalog:",
    "@types/bun": "catalog:",
    "@types/node": "catalog:",
    "effect": "catalog:",
@@ -1119,9 +1118,9 @@
    "@npmcli/arborist": "9.4.0",
    "@octokit/rest": "22.0.0",
    "@openauthjs/openauth": "0.0.0-20250322224806",
-    "@opentui/core": "0.0.0-20260808-9ecf7c0a",
-    "@opentui/keymap": "0.0.0-20260808-9ecf7c0a",
-    "@opentui/solid": "0.0.0-20260808-9ecf7c0a",
+    "@opentui/core": "0.5.2",
+    "@opentui/keymap": "0.5.2",
+    "@opentui/solid": "0.5.2",
    "@pierre/diffs": "1.2.10",
    "@playwright/test": "1.59.1",
    "@sentry/solid": "10.36.0",
@@ -1537,18 +1536,6 @@

    "@capsizecss/unpack": ["@capsizecss/unpack@2.4.0", "", { "dependencies": { "blob-to-buffer": "^1.2.8", "cross-fetch": "^3.0.4", "fontkit": "^2.0.2" } }, "sha512-GrSU71meACqcmIUxPYOJvGKF0yryjN/L1aCuE9DViCTJI7bfkjgYDPD1zbNDcINJwSSP6UaBZY9GAbYDO7re0Q=="],

-    "@cbor-extract/cbor-extract-darwin-arm64": ["@cbor-extract/cbor-extract-darwin-arm64@2.2.2", "", { "os": "darwin", "cpu": "arm64" }, "sha512-ZKZ/F8US7JR92J4DMct6cLW/Y66o2K576+zjlEN/MevH70bFIsB10wkZEQPLzl2oNh2SMGy55xpJ9JoBRl5DOA=="],
-
-    "@cbor-extract/cbor-extract-darwin-x64": ["@cbor-extract/cbor-extract-darwin-x64@2.2.2", "", { "os": "darwin", "cpu": "x64" }, "sha512-32b1mgc+P61Js+KW9VZv/c+xRw5EfmOcPx990JbCBSkYJFY0l25VinvyyWfl+3KjibQmAcYwmyzKF9J4DyKP/Q=="],
-
-    "@cbor-extract/cbor-extract-linux-arm": ["@cbor-extract/cbor-extract-linux-arm@2.2.2", "", { "os": "linux", "cpu": "arm" }, "sha512-tNg0za41TpQfkhWjptD+0gSD2fggMiDCSacuIeELyb2xZhr7PrhPe5h66Jc67B/5dmpIhI2QOUtv4SBsricyYQ=="],
-
-    "@cbor-extract/cbor-extract-linux-arm64": ["@cbor-extract/cbor-extract-linux-arm64@2.2.2", "", { "os": "linux", "cpu": "arm64" }, "sha512-wfqgzqCAy/Vn8i6WVIh7qZd0DdBFaWBjPdB6ma+Wihcjv0gHqD/mw3ouVv7kbbUNrab6dKEx/w3xQZEdeXIlzg=="],
-
-    "@cbor-extract/cbor-extract-linux-x64": ["@cbor-extract/cbor-extract-linux-x64@2.2.2", "", { "os": "linux", "cpu": "x64" }, "sha512-rpiLnVEsqtPJ+mXTdx1rfz4RtUGYIUg2rUAZgd1KjiC1SehYUSkJN7Yh+aVfSjvCGtVP0/bfkQkXpPXKbmSUaA=="],
-
-    "@cbor-extract/cbor-extract-win32-x64": ["@cbor-extract/cbor-extract-win32-x64@2.2.2", "", { "os": "win32", "cpu": "x64" }, "sha512-dI+9P7cfWxkTQ+oE+7Aa6onEn92PHgfWXZivjNheCRmTBDBf2fx6RyTi0cmgpYLnD1KLZK9ZYrMxaPZ4oiXhGA=="],
-
    "@chevrotain/types": ["@chevrotain/types@11.1.2", "", {}, "sha512-U+HFai5+zmJCkK86QsaJtoITlboZHBqrVketcO2ROv865xfCMSFpELQoz1GkX5GzME8pTa+3kbKrZHQtI0gdbw=="],

    "@clack/core": ["@clack/core@1.0.0-alpha.1", "", { "dependencies": { "picocolors": "^1.0.0", "sisteransi": "^1.0.5" } }, "sha512-rFbCU83JnN7l3W1nfgCqqme4ZZvTTgsiKQ6FM0l+r0P+o2eJpExcocBUWUIwnDzL76Aca9VhUdWmB2MbUv+Qyg=="],
@@ -1759,10 +1746,6 @@

    "@graphql-typed-document-node/core": ["@graphql-typed-document-node/core@3.2.0", "", { "peerDependencies": { "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" } }, "sha512-mB9oAsNCm9aM3/SOv4YtBMqZbYj10R7dkq8byBqxGY/ncFwhf2oQzMV+LCRlWoDSEBJ3COiR1yeDvMtsoOsuFQ=="],

-    "@grpc/grpc-js": ["@grpc/grpc-js@1.14.4", "", { "dependencies": { "@grpc/proto-loader": "^0.8.0", "@js-sdsl/ordered-map": "^4.4.2" } }, "sha512-k9Dj3DV/itK9D06Y8f190Qgop7/Ui+D0njFV3LHMPwPT75DpXLQohE9Wmz0QElrJnzsjB7KPWiKJbOl7IPDArQ=="],
-
-    "@grpc/proto-loader": ["@grpc/proto-loader@0.8.1", "", { "dependencies": { "lodash.camelcase": "^4.3.0", "long": "^5.0.0", "protobufjs": "^7.5.5", "yargs": "^17.7.2" }, "bin": { "proto-loader-gen-types": "build/bin/proto-loader-gen-types.js" } }, "sha512-wtF6h+DY6M3YaDBPAmvuuA6jV8Sif9MjtOI5euKFWRgCDl5PeDpPsHR9u2l6St5ceY8AZgoNDww5+HvEsXFsGg=="],
-
    "@happy-dom/global-registrator": ["@happy-dom/global-registrator@20.0.11", "", { "dependencies": { "@types/node": "^20.0.0", "happy-dom": "^20.0.11" } }, "sha512-GqNqiShBT/lzkHTMC/slKBrvN0DsD4Di8ssBk4aDaVgEn+2WMzE6DXxq701ndSXj7/0cJ8mNT71pM7Bnrr6JRw=="],

    "@hono/node-server": ["@hono/node-server@1.19.15", "", { "peerDependencies": { "hono": "^4" } }, "sha512-Za2ai6TLdKjUvnur+eenO6nuYYipVAEhyCAdaV8IRvmU9kK8crOZUSYvIXn72E4f8fJqyAbpcJuTsYYmZp9Deg=="],
@@ -1857,8 +1840,6 @@

    "@jridgewell/trace-mapping": ["@jridgewell/trace-mapping@0.3.31", "", { "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", "@jridgewell/sourcemap-codec": "^1.4.14" } }, "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw=="],

-    "@js-sdsl/ordered-map": ["@js-sdsl/ordered-map@4.4.2", "", {}, "sha512-iUKgm52T8HOE/makSxjqoWhe95ZJA1/G1sYsGev2JDKUSS14KAgg1LHb+Ba+IPow0xflbnSkOsZcO08C7w1gYw=="],
-
    "@js-temporal/polyfill": ["@js-temporal/polyfill@0.5.1", "", { "dependencies": { "jsbi": "^4.3.0" } }, "sha512-hloP58zRVCRSpgDxmqCWJNlizAlUgJFqG2ypq79DCvyv9tHjRYMDOcPFjzfl/A1/YxDvRCZz8wvZvmapQnKwFQ=="],

    "@jsx-email/all": ["@jsx-email/all@2.2.3", "", { "dependencies": { "@jsx-email/body": "1.0.2", "@jsx-email/button": "1.0.4", "@jsx-email/column": "1.0.3", "@jsx-email/container": "1.0.2", "@jsx-email/font": "1.0.3", "@jsx-email/head": "1.0.2", "@jsx-email/heading": "1.0.2", "@jsx-email/hr": "1.0.2", "@jsx-email/html": "1.0.2", "@jsx-email/img": "1.0.2", "@jsx-email/link": "1.0.2", "@jsx-email/markdown": "2.0.4", "@jsx-email/preview": "1.0.2", "@jsx-email/render": "1.1.1", "@jsx-email/row": "1.0.2", "@jsx-email/section": "1.0.2", "@jsx-email/tailwind": "2.4.4", "@jsx-email/text": "1.0.2" }, "peerDependencies": { "react": "^18.2.0" } }, "sha512-OBvLe/hVSQc0LlMSTJnkjFoqs3bmxcC4zpy/5pT5agPCSKMvAKQjzmsc2xJ2wO73jSpRV1K/g38GmvdCfrhSoQ=="],
@@ -2181,27 +2162,27 @@

    "@opentelemetry/semantic-conventions": ["@opentelemetry/semantic-conventions@1.43.0", "", {}, "sha512-eSYWTm620tTk45EKSedaUL8MFYI8hW164hIXsgIHyxu3VobUB3fFCu5t0hQby6OoWRPsG1KkKUG2M5UadiLiVg=="],

-    "@opentui/core": ["@opentui/core@0.0.0-20260808-9ecf7c0a", "", { "dependencies": { "bun-ffi-structs": "0.3.1", "diff": "9.0.0", "marked": "17.0.1", "string-width": "7.2.0", "strip-ansi": "7.1.2" }, "optionalDependencies": { "@opentui/core-darwin-arm64": "0.0.0-20260808-9ecf7c0a", "@opentui/core-darwin-x64": "0.0.0-20260808-9ecf7c0a", "@opentui/core-linux-arm64": "0.0.0-20260808-9ecf7c0a", "@opentui/core-linux-arm64-musl": "0.0.0-20260808-9ecf7c0a", "@opentui/core-linux-x64": "0.0.0-20260808-9ecf7c0a", "@opentui/core-linux-x64-musl": "0.0.0-20260808-9ecf7c0a", "@opentui/core-win32-arm64": "0.0.0-20260808-9ecf7c0a", "@opentui/core-win32-x64": "0.0.0-20260808-9ecf7c0a" }, "peerDependencies": { "web-tree-sitter": "0.25.10" } }, "sha512-y9MKL8LMup4ebW3uZ57RSsPyOv37sIZxuWiHq4XJK9wrzpzTMnVomzxpWOI0S/QtLH2QzZ7znnbF+IuvIQ1hLQ=="],
+    "@opentui/core": ["@opentui/core@0.5.2", "", { "dependencies": { "bun-ffi-structs": "0.3.1", "diff": "9.0.0", "marked": "17.0.1", "string-width": "7.2.0", "strip-ansi": "7.1.2" }, "optionalDependencies": { "@opentui/core-darwin-arm64": "0.5.2", "@opentui/core-darwin-x64": "0.5.2", "@opentui/core-linux-arm64": "0.5.2", "@opentui/core-linux-arm64-musl": "0.5.2", "@opentui/core-linux-x64": "0.5.2", "@opentui/core-linux-x64-musl": "0.5.2", "@opentui/core-win32-arm64": "0.5.2", "@opentui/core-win32-x64": "0.5.2" }, "peerDependencies": { "web-tree-sitter": "0.25.10" } }, "sha512-GOuD0Mq1ylybq9eEX6L0TdYlfJ2zJVLGecuh6yEM8RpT9oMtR0f+gEWqGJsBN/ay+Y5TOCH9b3vePEcwOW01fg=="],

-    "@opentui/core-darwin-arm64": ["@opentui/core-darwin-arm64@0.0.0-20260808-9ecf7c0a", "", { "os": "darwin", "cpu": "arm64" }, "sha512-Bn6fUZrwbUojkJG4YHowg/h/u3SPANmEivrl8YVbxBPCYOhZzQWxAVf7Fwg6PD0BpWk5gt9inQrir2DzWh5UpA=="],
+    "@opentui/core-darwin-arm64": ["@opentui/core-darwin-arm64@0.5.2", "", { "os": "darwin", "cpu": "arm64" }, "sha512-fGi/RubZIhxcU8+M3GXNaBmEHqf127ZOnKmUTSp4ty2QdQ0kT4RTd+t91a/oyxrLZjjCmry0jXyquT0CZR1Byw=="],

-    "@opentui/core-darwin-x64": ["@opentui/core-darwin-x64@0.0.0-20260808-9ecf7c0a", "", { "os": "darwin", "cpu": "x64" }, "sha512-lrVskzbjcT9yJCUgjOpvPpEq2ipmuDyHTMJ+OebsJFdATdryJLzRAr5BZiFGXEo4CJ2CS/+6vT+ki7dmhpM+0g=="],
+    "@opentui/core-darwin-x64": ["@opentui/core-darwin-x64@0.5.2", "", { "os": "darwin", "cpu": "x64" }, "sha512-ezFpB+5mQTd9BS4VvHOYEgQK6YxiYwVUmFb2sfTbJBnTqbOFP3Z/cdE5qNUHoeLQ01/nOs2dmUPcGyWxtMZIzw=="],

-    "@opentui/core-linux-arm64": ["@opentui/core-linux-arm64@0.0.0-20260808-9ecf7c0a", "", { "os": "linux", "cpu": "arm64" }, "sha512-czqIqdnBvyFRSJ0BEdNn7moRN0KQo5gvhSsOSfrzueHxsktgWcmk1cMeCvTkzC3JCBvCwlB1KnSdt4jlwNO1EQ=="],
+    "@opentui/core-linux-arm64": ["@opentui/core-linux-arm64@0.5.2", "", { "os": "linux", "cpu": "arm64" }, "sha512-9S53zkIkbwRb0iIv2thibK+IofpTCEz/c48rJNaBx3qDylaDcTA11k5oqt1gkFcOLernlqIcow8aMCNDnRYMAA=="],

-    "@opentui/core-linux-arm64-musl": ["@opentui/core-linux-arm64-musl@0.0.0-20260808-9ecf7c0a", "", { "os": "linux", "cpu": "arm64" }, "sha512-6nixv6wlgjelUVJVHkJsCpuARb1rE/oxhIIthyLd062u5veoBt83cRGH9KmcZiwowKvso58hXn2KC21qAfylhQ=="],
+    "@opentui/core-linux-arm64-musl": ["@opentui/core-linux-arm64-musl@0.5.2", "", { "os": "linux", "cpu": "arm64" }, "sha512-s2DB6he7jgbBqWOHBAIV/p4X12mj+Hlk1pAEcwK36j2wg+L4nVVdWecUJm1xeJn6LJSRcaJYE29sA45w5b7B2g=="],

-    "@opentui/core-linux-x64": ["@opentui/core-linux-x64@0.0.0-20260808-9ecf7c0a", "", { "os": "linux", "cpu": "x64" }, "sha512-cxJMfrSsMsrZdU1Ke6awrxz0rdIJuI34l8Le3QlUbM5yLpp09ygJ7CElILMT50g3F+EnRf6BKvVmkbRrDzFQ6g=="],
+    "@opentui/core-linux-x64": ["@opentui/core-linux-x64@0.5.2", "", { "os": "linux", "cpu": "x64" }, "sha512-HO0TWovqxo95hxFoTBx47MTP6pzzTW/QMoOIiD8jw0hkrn1DF8rSVPva0vLQMRer/drO9RpjyroFRNra7710og=="],

-    "@opentui/core-linux-x64-musl": ["@opentui/core-linux-x64-musl@0.0.0-20260808-9ecf7c0a", "", { "os": "linux", "cpu": "x64" }, "sha512-7zVbZ0XgCDi3yImmd9Cj+e0WhSuQzWo1ziSQiFgPCR8cs/dfrpYLgBlX9PP0gFOcJKeRccJJv7rnBetl3CB7tg=="],
+    "@opentui/core-linux-x64-musl": ["@opentui/core-linux-x64-musl@0.5.2", "", { "os": "linux", "cpu": "x64" }, "sha512-zyuJaRGBRbUOABgf3nJ2Jk/NmD+gS2dQpJzC2ikr2OMqclPVk7gFbPTHW2s/A3SJH7D8d0PJ6wL2wzXWMUdrWQ=="],

-    "@opentui/core-win32-arm64": ["@opentui/core-win32-arm64@0.0.0-20260808-9ecf7c0a", "", { "os": "win32", "cpu": "arm64" }, "sha512-K3SNYJDvB7XD5nxi8jt4jWtgmqPG0Qbob0Px9afqMH3g/R5hIoi2P3GDbqn8JNv82c4dPIGJjXXuNhHa0tZQbw=="],
+    "@opentui/core-win32-arm64": ["@opentui/core-win32-arm64@0.5.2", "", { "os": "win32", "cpu": "arm64" }, "sha512-J1QxYJqxyAO49RyocqZSoGWs5uszlYot8sInLasi6nUbjCFg4h7Kvh+64+gxE2i4LASeyvMRpAIYwblI6eMbtg=="],

-    "@opentui/core-win32-x64": ["@opentui/core-win32-x64@0.0.0-20260808-9ecf7c0a", "", { "os": "win32", "cpu": "x64" }, "sha512-3JCpPS8+Gz3PWlQHiFwqYuJ0AM0vKlfbe4+O+0m2EYej/QjN5KjL1nBfVLq5XDj4dVPEIktQKN6e//YzSzdaqA=="],
+    "@opentui/core-win32-x64": ["@opentui/core-win32-x64@0.5.2", "", { "os": "win32", "cpu": "x64" }, "sha512-9/F1Q19GdtkZ1jypa0dRP6v9SJHHc91XHs4ZSroamDeqSDyTaGu1bbWnKiC503gpNpQMY0mjOVg4g+WVJLdDig=="],

-    "@opentui/keymap": ["@opentui/keymap@0.0.0-20260808-9ecf7c0a", "", { "dependencies": { "@opentui/core": "0.0.0-20260808-9ecf7c0a" }, "peerDependencies": { "@opentui/react": "0.0.0-20260808-9ecf7c0a", "@opentui/solid": "0.0.0-20260808-9ecf7c0a", "react": ">=19.2.0", "solid-js": "1.9.12" }, "optionalPeers": ["@opentui/react", "@opentui/solid", "react", "solid-js"] }, "sha512-aGxw6P0RJSuUU3y3QtAnKa1B6tQShxR0mjmnN3Cadr4LoduSuWn/l1kE+27KwH0ap9WTAeGVsN7u2oawB9eWKw=="],
+    "@opentui/keymap": ["@opentui/keymap@0.5.2", "", { "dependencies": { "@opentui/core": "0.5.2" }, "peerDependencies": { "@opentui/react": "0.5.2", "@opentui/solid": "0.5.2", "react": ">=19.2.0", "solid-js": "1.9.12" }, "optionalPeers": ["@opentui/react", "@opentui/solid", "react", "solid-js"] }, "sha512-MKESKHGeGit/i416E4zOujJIn17ladl6w9oOACmrjgff3a1naLFF3salrkUjD0C+uTUvh+nNTah795RORTTMyQ=="],

-    "@opentui/solid": ["@opentui/solid@0.0.0-20260808-9ecf7c0a", "", { "dependencies": { "@babel/core": "7.28.0", "@babel/preset-typescript": "7.27.1", "@opentui/core": "0.0.0-20260808-9ecf7c0a", "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-Q7ouv2KxZKO0/Sh0RbhNd7kEw6E7tlrU+yw36xxlnyXOqlK3TkQ+u1RMSZulYAn8mP20pnYLM9OxY4pOC/wK8Q=="],
+    "@opentui/solid": ["@opentui/solid@0.5.2", "", { "dependencies": { "@babel/core": "7.28.0", "@babel/preset-typescript": "7.27.1", "@opentui/core": "0.5.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-mPB6xhG0bufjhUpWj5e8g/1M3LYZUKPM0mPPz6O6KIXFtakHVCJZuff2l1vvDpKuuLOAjivL8jLU7OJ3ZSCRuw=="],

    "@orama/orama": ["@orama/orama@3.1.18", "", {}, "sha512-a61ljmRVVyG5MC/698C8/FfFDw5a8LOIvyOLW5fztgUXqUpc1jOfQzOitSCbge657OgXXThmY3Tk8fpiDb4UcA=="],

@@ -3345,8 +3326,6 @@

    "abort-controller": ["abort-controller@3.0.0", "", { "dependencies": { "event-target-shim": "^5.0.0" } }, "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg=="],

-    "abort-controller-x": ["abort-controller-x@0.5.0", "", {}, "sha512-yTt9CI0x+nRfX6BFMenEGP8ooPvErGH6AbFz20C2IeOLIlDsrw/VHpgne3GsCEuTA410IiFiaLVFKmgM4bKEPQ=="],
-
    "accepts": ["accepts@2.0.0", "", { "dependencies": { "mime-types": "^3.0.0", "negotiator": "^1.0.0" } }, "sha512-5cvg6CtKwfgdmVqY1WIiXKc3Q1bkRqGLi+2W/6ao+6Y7gu/RCwRuAhGEzh5B4KlszSuTLgZYuqFqo5bImjNKng=="],

    "acorn": ["acorn@8.15.0", "", { "bin": { "acorn": "bin/acorn" } }, "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg=="],
@@ -3587,10 +3566,6 @@

    "caniuse-lite": ["caniuse-lite@1.0.30001806", "", {}, "sha512-72Cuvd95zbSYPKq6Fhg8eDJRlzgWDf7/mtoZv6Qe/DYNCEBdNxoA3+rZAU2ZhGCpZlns3EssFavaZomckT5Uuw=="],

-    "cbor-extract": ["cbor-extract@2.2.2", "", { "dependencies": { "node-gyp-build-optional-packages": "5.1.1" }, "optionalDependencies": { "@cbor-extract/cbor-extract-darwin-arm64": "2.2.2", "@cbor-extract/cbor-extract-darwin-x64": "2.2.2", "@cbor-extract/cbor-extract-linux-arm": "2.2.2", "@cbor-extract/cbor-extract-linux-arm64": "2.2.2", "@cbor-extract/cbor-extract-linux-x64": "2.2.2", "@cbor-extract/cbor-extract-win32-x64": "2.2.2" }, "bin": { "download-cbor-prebuilds": "bin/download-prebuilds.js" } }, "sha512-hlSxxI9XO2yQfe9g6msd3g4xCfDqK5T5P0fRMLuaLHhxn4ViPrm+a+MUfhrvH2W962RGxcBwEGzLQyjbDG1gng=="],
-
-    "cbor-x": ["cbor-x@1.6.5", "", { "optionalDependencies": { "cbor-extract": "^2.2.2" } }, "sha512-yO64CxnSh6kp+pHNRK9IfwnMvCB+c8HvmUjQY/9l9YRF0/cAPka/tUHLwS64QqUpFCq3/OtbKziVJYXH2EaRig=="],
-
    "ccount": ["ccount@2.0.1", "", {}, "sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg=="],

    "chai": ["chai@5.3.3", "", { "dependencies": { "assertion-error": "^2.0.1", "check-error": "^2.1.1", "deep-eql": "^5.0.1", "loupe": "^3.1.0", "pathval": "^2.0.0" } }, "sha512-4zNhdJD/iOjSH0A05ea+Ke6MU5mmpQcbQsSOkgdaUMJ9zTlDTD/GYlwohmIE2u0gaxHYiVHEn1Fw9mZ/ktJWgw=="],
@@ -4623,8 +4598,6 @@

    "lodash-es": ["lodash-es@4.18.1", "", {}, "sha512-J8xewKD/Gk22OZbhpOVSwcs60zhd95ESDwezOFuA3/099925PdHJ7OFHNTGtajL3AlZkykD32HykiMo+BIBI8A=="],

-    "lodash.camelcase": ["lodash.camelcase@4.3.0", "", {}, "sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA=="],
-
    "lodash.escaperegexp": ["lodash.escaperegexp@4.1.2", "", {}, "sha512-TM9YBvyC84ZxE3rgfefxUWiQKLilstD6k7PTGt6wfbtXF8ixIJLOL3VYyV/z+ZiPLsVxAsKAFVwWlWeb2Y8Yyw=="],

    "lodash.includes": ["lodash.includes@4.3.0", "", {}, "sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w=="],
@@ -4849,8 +4822,6 @@

    "mkdirp": ["mkdirp@0.5.6", "", { "dependencies": { "minimist": "^1.2.6" }, "bin": { "mkdirp": "bin/cmd.js" } }, "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw=="],

-    "modal": ["modal@0.9.0", "", { "dependencies": { "cbor-x": "^1.6.0", "long": "^5.3.1", "nice-grpc": "^2.1.12", "protobufjs": "^7.5.0", "smol-toml": "^1.3.3", "uuid": "^11.1.0" } }, "sha512-kCXcdJkhbJorf/q/6T9Wdlg6in9JmRnCNQnV6rVBMyeqNV/iXI6BYk4IzY4cvZ6dbauNeDMjk/Q08cbxvoIaXg=="],
-
    "morphdom": ["morphdom@2.7.8", "", {}, "sha512-D/fR4xgGUyVRbdMGU6Nejea1RFzYxYtyurG4Fbv2Fi/daKlWKuXGLOdXtl+3eIwL110cI2hz1ZojGICjjFLgTg=="],

    "motion": ["motion@12.34.5", "", { "dependencies": { "framer-motion": "^12.34.5", "tslib": "^2.4.0" }, "peerDependencies": { "@emotion/is-prop-valid": "*", "react": "^18.0.0 || ^19.0.0", "react-dom": "^18.0.0 || ^19.0.0" }, "optionalPeers": ["@emotion/is-prop-valid", "react", "react-dom"] }, "sha512-N06NLJ9IeBHeielRqIvYvjPfXuRdyTxa+9++BgpGa+hY2D7TcMkI6QzV3jaRuv0aZRXgMa7cPy9YcBUBisPzAQ=="],
@@ -4889,10 +4860,6 @@

    "nf3": ["nf3@0.1.12", "", {}, "sha512-qbMXT7RTGh74MYWPeqTIED8nDW70NXOULVHpdWcdZ7IVHVnAsMV9fNugSNnvooipDc1FMOzpis7T9nXJEbJhvQ=="],

-    "nice-grpc": ["nice-grpc@2.1.16", "", { "dependencies": { "@grpc/grpc-js": "^1.14.0", "abort-controller-x": "^0.5.0", "nice-grpc-common": "^2.0.3" } }, "sha512-Cl3Pn00212Hl8/U6bpgMxmhZj5lyv3nWoJov4cd3FjWarktrMHP4DNvSjCnDwkMWYx4W1tyscEia4JX6Y4GVCQ=="],
-
-    "nice-grpc-common": ["nice-grpc-common@2.0.3", "", { "dependencies": { "ts-error": "^1.0.6" } }, "sha512-MEhnD3JMah0mgyivpb9hpRDbOBuXBxI/TVO+OK1h6rC97WM42HsPMR+zzRNQ0C5BqYJTw1nyWiQRD0DucO+pjQ=="],
-
    "nitro": ["nitro@3.0.1-alpha.1", "", { "dependencies": { "consola": "^3.4.2", "crossws": "^0.4.1", "db0": "^0.3.4", "h3": "2.0.1-rc.5", "jiti": "^2.6.1", "nf3": "^0.1.10", "ofetch": "^2.0.0-alpha.3", "ohash": "^2.0.11", "oxc-minify": "^0.96.0", "oxc-transform": "^0.96.0", "srvx": "^0.9.5", "undici": "^7.16.0", "unenv": "^2.0.0-rc.24", "unstorage": "^2.0.0-alpha.4" }, "peerDependencies": { "rolldown": "*", "rollup": "^4", "vite": "^7", "xml2js": "^0.6.2" }, "optionalPeers": ["rolldown", "rollup", "vite", "xml2js"], "bin": { "nitro": "dist/cli/index.mjs" } }, "sha512-U4AxIsXxdkxzkFrK0XAw0e5Qbojk8jQ50MjjRBtBakC4HurTtQoiZvF+lSe382jhuQZCfAyywGWOFa9QzXLFaw=="],

    "nlcst-to-string": ["nlcst-to-string@4.0.0", "", { "dependencies": { "@types/nlcst": "^2.0.0" } }, "sha512-YKLBCcUYKAg0FNlOBT6aI91qFmSiFKiluk655WzPF+DDMA02qIyy8uiRqI8QXtcFpEvll12LpL5MXqEmAZ+dcA=="],
@@ -5695,8 +5662,6 @@

    "ts-dedent": ["ts-dedent@2.3.0", "", {}, "sha512-JfJeIHke7y2egdGGgRAvpCwYFUsHlM2gPcrVOxFkznt/4uzQ7HFmvE63iFHVLBJNDuyDOQgijDK/tXH/f6Msjg=="],

-    "ts-error": ["ts-error@1.0.6", "", {}, "sha512-tLJxacIQUM82IR7JO1UUkKlYuUTmoY9HBJAmNWFzheSlDS5SPMcNIepejHJa4BpPQLAcbRhRf3GDJzyj6rbKvA=="],
-
    "ts-interface-checker": ["ts-interface-checker@0.1.13", "", {}, "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA=="],

    "tsconfck": ["tsconfck@3.1.6", "", { "peerDependencies": { "typescript": "^5.0.0" }, "optionalPeers": ["typescript"], "bin": { "tsconfck": "bin/tsconfck.js" } }, "sha512-ks6Vjr/jEw0P1gmOVwutM3B7fWxoWBL2KRDb1JfqGVawBmO5UsvmWOQFGHBPl5yxYz4eERr19E6L7NMv+Fej4w=="],
@@ -6657,8 +6622,6 @@

    "builder-util/js-yaml": ["js-yaml@4.3.0", "", { "dependencies": { "argparse": "^2.0.1" }, "bin": { "js-yaml": "bin/js-yaml.js" } }, "sha512-1td788aAnnZ5qs7V2QIRl1owjtYpbKt749Y3xauqQgwIIGF/xXWz1wMTEBx5O3LK3lXLVuqXPdPxj2BoFHaW9Q=="],

-    "cbor-extract/node-gyp-build-optional-packages": ["node-gyp-build-optional-packages@5.1.1", "", { "dependencies": { "detect-libc": "^2.0.1" }, "bin": { "node-gyp-build-optional-packages": "bin.js", "node-gyp-build-optional-packages-test": "build-test.js", "node-gyp-build-optional-packages-optional": "optional.js" } }, "sha512-+P72GAjVAbTxjjwUmwjVrqrdZROD4nf8KgpBoDxqXXTiYZZt/ud60dE5yvCSr9lRO8e8yv6kgJIC0K0PfZFVQw=="],
-
    "cliui/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=="],

    "cliui/strip-ansi": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="],
@@ -6807,8 +6770,6 @@

    "minipass-pipeline/minipass": ["minipass@3.3.6", "", { "dependencies": { "yallist": "^4.0.0" } }, "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw=="],

-    "modal/uuid": ["uuid@11.1.1", "", { "bin": { "uuid": "dist/esm/bin/uuid" } }, "sha512-vIYxrBCC/N/K+Js3qSN88go7kIfNPssr/hHCesKCQNAjmgvYS2oqr69kIufEG+O4+PfezOH4EbIeHCfFov8ZgQ=="],
-
    "motion/framer-motion": ["framer-motion@12.42.2", "", { "dependencies": { "motion-dom": "^12.42.2", "motion-utils": "^12.39.0", "tslib": "^2.4.0" }, "peerDependencies": { "@emotion/is-prop-valid": "*", "react": "^18.0.0 || ^19.0.0", "react-dom": "^18.0.0 || ^19.0.0" }, "optionalPeers": ["@emotion/is-prop-valid", "react", "react-dom"] }, "sha512-5XY9luDiu0oHfHBjpDthFMh0ES+122w6p/papSJBweMkO8Sn+PW2QaEgRblQBpWFnuvZS5qvarpt/hO2pjGmnw=="],

    "nitro/h3": ["h3@2.0.1-rc.5", "", { "dependencies": { "rou3": "^0.7.9", "srvx": "^0.9.1" }, "peerDependencies": { "crossws": "^0.4.1" }, "optionalPeers": ["crossws"] }, "sha512-qkohAzCab0nLzXNm78tBjZDvtKMTmtygS8BJLT3VPczAQofdqlFXDPkXdLMJN4r05+xqneG8snZJ0HgkERCZTg=="],
@@ -46,9 +46,9 @@
      "@octokit/rest": "22.0.0",
      "@hono/standard-validator": "0.2.0",
      "@hono/zod-validator": "0.4.2",
-      "@opentui/core": "0.0.0-20260808-9ecf7c0a",
-      "@opentui/keymap": "0.0.0-20260808-9ecf7c0a",
-      "@opentui/solid": "0.0.0-20260808-9ecf7c0a",
+      "@opentui/core": "0.5.2",
+      "@opentui/keymap": "0.5.2",
+      "@opentui/solid": "0.5.2",
      "@tanstack/solid-virtual": "3.13.32",
      "@shikijs/stream": "4.2.0",
      "@standard-schema/spec": "1.1.0",
@@ -150,9 +150,9 @@
    "electron"
  ],
  "overrides": {
-    "@opentui/core": "0.0.0-20260808-9ecf7c0a",
-    "@opentui/keymap": "0.0.0-20260808-9ecf7c0a",
-    "@opentui/solid": "0.0.0-20260808-9ecf7c0a",
+    "@opentui/core": "catalog:",
+    "@opentui/keymap": "catalog:",
+    "@opentui/solid": "catalog:",
    "@types/bun": "catalog:",
    "@types/node": "catalog:",
    "effect": "catalog:"
@@ -1,4 +1,5 @@
 import { Binary } from "@opencode-ai/core/util/binary"
+import { ProjectDirectories } from "@opencode-ai/schema/project-directories"
 import { produce, reconcile, type SetStoreFunction, type Store } from "solid-js/store"
 import type { Message, Part, Project, Todo } from "@/types"
 import type {
@@ -187,6 +188,18 @@ export function applyDirectoryEvent(input: {
      input.setStore("sessionTotal", (value) => Math.max(0, value - 1))
      break
    }
+    case "project.directory.resolved": {
+      const properties = event.properties as { projectID: string; directory: string; previous: string }
+      input.store.session.forEach((session, index) => {
+        const adopted = ProjectDirectories.adopt(
+          { projectID: session.projectID, directory: session.location.directory },
+          properties,
+        )
+        if (!adopted) return
+        input.setStore("session", index, (current) => ({ ...current, ...adopted }))
+      })
+      break
+    }
    case "session.renamed": {
      const properties = event.properties as { sessionID: string; title: string }
      const result = Binary.search(input.store.session, properties.sessionID, (session) => session.id)
@@ -1,4 +1,5 @@
 import { Binary } from "@opencode-ai/core/util/binary"
+import { ProjectDirectories } from "@opencode-ai/schema/project-directories"
 import { retry } from "@opencode-ai/core/util/retry"
 import type { OpenCodeEvent, SessionApi, SessionInfo, SessionMessageInfo } from "@opencode-ai/client/promise"
 import type { Message, Part, Todo } from "@/types"
@@ -894,6 +895,17 @@ export function createServerSession(
  }

  const applyV2 = (event: OpenCodeEvent) => {
+    if (event.type === "project.directory.resolved") {
+      Object.values(data.info).forEach((info) => {
+        if (!info) return
+        const adopted = ProjectDirectories.adopt(
+          { projectID: info.projectID, directory: info.location.directory },
+          event.data,
+        )
+        if (adopted) remember({ ...info, ...adopted })
+      })
+      return
+    }
    if (!("data" in event) || !("sessionID" in event.data) || typeof event.data.sessionID !== "string") return
    const sessionID = event.data.sessionID
    const reduction = v2.reduce(data.session_message[sessionID] ?? [], event)
@@ -19,7 +19,7 @@ import { Permission } from "@opencode-ai/schema/permission"
 import { PermissionSaved } from "@opencode-ai/schema/permission-saved"
 import { Plugin } from "@opencode-ai/schema/plugin"
 import { Project } from "@opencode-ai/schema/project"
-import { ProjectCopy } from "@opencode-ai/schema/project-copy"
+import { Worktree } from "@opencode-ai/schema/worktree"
 import { AgentAttachment, FileAttachment, Prompt, PromptMention } from "@opencode-ai/schema/prompt"
 import { PromptInput } from "@opencode-ai/schema/prompt-input"
 import { Provider } from "@opencode-ai/schema/provider"
@@ -60,7 +60,7 @@ const effectTypeReferences = [
  ...namespaceTypes("PermissionSaved", "@opencode-ai/schema/permission-saved", PermissionSaved),
  ...namespaceTypes("Plugin", "@opencode-ai/schema/plugin", Plugin),
  ...namespaceTypes("Project", "@opencode-ai/schema/project", Project),
-  ...namespaceTypes("ProjectCopy", "@opencode-ai/schema/project-copy", ProjectCopy),
+  ...namespaceTypes("Worktree", "@opencode-ai/schema/worktree", Worktree),
  ...namespaceTypes("PromptInput", "@opencode-ai/schema/prompt-input", PromptInput),
  ...namespaceTypes("Provider", "@opencode-ai/schema/provider", Provider),
  ...namespaceTypes("Pty", "@opencode-ai/schema/pty", Pty),
@@ -34,7 +34,7 @@ import type { OpenCodeEvent } from "@opencode-ai/protocol/groups/event"
 import type { Pty } from "@opencode-ai/schema/pty"
 import type { Question } from "@opencode-ai/schema/question"
 import type { Reference } from "@opencode-ai/schema/reference"
-import type { ProjectCopy } from "@opencode-ai/schema/project-copy"
+import type { Worktree } from "@opencode-ai/schema/worktree"
 import type { Vcs } from "@opencode-ai/schema/vcs"
 import type { FileDiff } from "@opencode-ai/schema/file-diff"
 import type { WebSearch } from "@opencode-ai/schema/websearch"
@@ -1230,17 +1230,9 @@ export type Endpoint13_1Input = {
 export type Endpoint13_1Output = Project.Current
 export type ProjectCurrentOperation<E = never> = (input?: Endpoint13_1Input) => Effect.Effect<Endpoint13_1Output, E>

-export type Endpoint13_2Input = {
-  readonly projectID: Project.ID
-  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
-}
-export type Endpoint13_2Output = Project.Directories
-export type ProjectDirectoriesOperation<E = never> = (input: Endpoint13_2Input) => Effect.Effect<Endpoint13_2Output, E>
-
 export interface ProjectApi<E = never> {
  readonly list: ProjectListOperation<E>
  readonly current: ProjectCurrentOperation<E>
-  readonly directories: ProjectDirectoriesOperation<E>
 }

 export type Endpoint14_0Input = {
@@ -1549,36 +1541,36 @@ export interface ReferenceApi<E = never> {
  readonly list: ReferenceListOperation<E>
 }

-export type Endpoint24_0Input = {
-  readonly projectID: Project.ID
-  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
-  readonly strategy: ProjectCopy.StrategyID
-  readonly directory: AbsolutePath
-  readonly name?: string | undefined
-}
-export type Endpoint24_0Output = ProjectCopy.Copy
-export type ProjectCopyCreateOperation<E = never> = (input: Endpoint24_0Input) => Effect.Effect<Endpoint24_0Output, E>
+export type Endpoint24_0Input = { readonly projectID: Project.ID }
+export type Endpoint24_0Output = Worktree.List
+export type WorktreeListOperation<E = never> = (input: Endpoint24_0Input) => Effect.Effect<Endpoint24_0Output, E>

 export type Endpoint24_1Input = {
  readonly projectID: Project.ID
-  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
+  readonly strategy: Worktree.StrategyID
  readonly directory: AbsolutePath
-  readonly force: boolean
+  readonly name?: string | undefined
 }
-export type Endpoint24_1Output = void
-export type ProjectCopyRemoveOperation<E = never> = (input: Endpoint24_1Input) => Effect.Effect<Endpoint24_1Output, E>
+export type Endpoint24_1Output = Worktree.Info
+export type WorktreeCreateOperation<E = never> = (input: Endpoint24_1Input) => Effect.Effect<Endpoint24_1Output, E>

 export type Endpoint24_2Input = {
  readonly projectID: Project.ID
-  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
+  readonly directory: AbsolutePath
+  readonly force: boolean
 }
 export type Endpoint24_2Output = void
-export type ProjectCopyRefreshOperation<E = never> = (input: Endpoint24_2Input) => Effect.Effect<Endpoint24_2Output, E>
+export type WorktreeRemoveOperation<E = never> = (input: Endpoint24_2Input) => Effect.Effect<Endpoint24_2Output, E>

-export interface ProjectCopyApi<E = never> {
-  readonly create: ProjectCopyCreateOperation<E>
-  readonly remove: ProjectCopyRemoveOperation<E>
-  readonly refresh: ProjectCopyRefreshOperation<E>
+export type Endpoint24_3Input = { readonly projectID: Project.ID }
+export type Endpoint24_3Output = void
+export type WorktreeRefreshOperation<E = never> = (input: Endpoint24_3Input) => Effect.Effect<Endpoint24_3Output, E>
+
+export interface WorktreeApi<E = never> {
+  readonly list: WorktreeListOperation<E>
+  readonly create: WorktreeCreateOperation<E>
+  readonly remove: WorktreeRemoveOperation<E>
+  readonly refresh: WorktreeRefreshOperation<E>
 }

 export type Endpoint25_0Input = {
@@ -1691,7 +1683,7 @@ export interface AppApi<E = never> {
  readonly shell: ShellApi<E>
  readonly question: QuestionApi<E>
  readonly reference: ReferenceApi<E>
-  readonly projectCopy: ProjectCopyApi<E>
+  readonly worktree: WorktreeApi<E>
  readonly vcs: VcsApi<E>
  readonly debug: DebugApi<E>
  readonly migration: MigrationApi<E>
@@ -139,8 +139,6 @@ import type {
  Endpoint13_0Output,
  Endpoint13_1Input,
  Endpoint13_1Output,
-  Endpoint13_2Input,
-  Endpoint13_2Output,
  Endpoint14_0Input,
  Endpoint14_0Output,
  Endpoint14_1Input,
@@ -216,6 +214,8 @@ import type {
  Endpoint24_1Output,
  Endpoint24_2Input,
  Endpoint24_2Output,
+  Endpoint24_3Input,
+  Endpoint24_3Output,
  Endpoint25_0Input,
  Endpoint25_0Output,
  Endpoint25_1Input,
@@ -876,19 +876,7 @@ const Endpoint13_1 = (raw: RawClient["server.project"]) => (input?: Endpoint13_1
    raw["project.current"]({ query: { location: input?.["location"] } }).pipe(Effect.mapError(mapClientError)),
  )

-const Endpoint13_2 = (raw: RawClient["server.project"]) => (input: Endpoint13_2Input) =>
-  preserveEffect<Endpoint13_2Output>()(
-    raw["project.directories"]({
-      params: { projectID: input["projectID"] },
-      query: { location: input["location"] },
-    }).pipe(Effect.mapError(mapClientError)),
-  )
-
-const adaptGroup13 = (raw: RawClient["server.project"]) => ({
-  list: Endpoint13_0(raw),
-  current: Endpoint13_1(raw),
-  directories: Endpoint13_2(raw),
-})
+const adaptGroup13 = (raw: RawClient["server.project"]) => ({ list: Endpoint13_0(raw), current: Endpoint13_1(raw) })

 const Endpoint14_0 = (raw: RawClient["server.form"]) => (input?: Endpoint14_0Input) =>
  preserveEffect<Endpoint14_0Output>()(
@@ -1212,36 +1200,37 @@ const Endpoint23_0 = (raw: RawClient["server.reference"]) => (input?: Endpoint23

 const adaptGroup23 = (raw: RawClient["server.reference"]) => ({ list: Endpoint23_0(raw) })

-const Endpoint24_0 = (raw: RawClient["server.projectCopy"]) => (input: Endpoint24_0Input) =>
+const Endpoint24_0 = (raw: RawClient["server.worktree"]) => (input: Endpoint24_0Input) =>
  preserveEffect<Endpoint24_0Output>()(
-    raw["projectCopy.create"]({
+    raw["worktree.list"]({ params: { projectID: input["projectID"] } }).pipe(Effect.mapError(mapClientError)),
+  )
+
+const Endpoint24_1 = (raw: RawClient["server.worktree"]) => (input: Endpoint24_1Input) =>
+  preserveEffect<Endpoint24_1Output>()(
+    raw["worktree.create"]({
      params: { projectID: input["projectID"] },
-      query: { location: input["location"] },
      payload: { strategy: input["strategy"], directory: input["directory"], name: input["name"] },
    }).pipe(Effect.mapError(mapClientError)),
  )

-const Endpoint24_1 = (raw: RawClient["server.projectCopy"]) => (input: Endpoint24_1Input) =>
-  preserveEffect<Endpoint24_1Output>()(
-    raw["projectCopy.remove"]({
+const Endpoint24_2 = (raw: RawClient["server.worktree"]) => (input: Endpoint24_2Input) =>
+  preserveEffect<Endpoint24_2Output>()(
+    raw["worktree.remove"]({
      params: { projectID: input["projectID"] },
-      query: { location: input["location"] },
      payload: { directory: input["directory"], force: input["force"] },
    }).pipe(Effect.mapError(mapClientError)),
  )

-const Endpoint24_2 = (raw: RawClient["server.projectCopy"]) => (input: Endpoint24_2Input) =>
-  preserveEffect<Endpoint24_2Output>()(
-    raw["projectCopy.refresh"]({
-      params: { projectID: input["projectID"] },
-      query: { location: input["location"] },
-    }).pipe(Effect.mapError(mapClientError)),
+const Endpoint24_3 = (raw: RawClient["server.worktree"]) => (input: Endpoint24_3Input) =>
+  preserveEffect<Endpoint24_3Output>()(
+    raw["worktree.refresh"]({ params: { projectID: input["projectID"] } }).pipe(Effect.mapError(mapClientError)),
  )

-const adaptGroup24 = (raw: RawClient["server.projectCopy"]) => ({
-  create: Endpoint24_0(raw),
-  remove: Endpoint24_1(raw),
-  refresh: Endpoint24_2(raw),
+const adaptGroup24 = (raw: RawClient["server.worktree"]) => ({
+  list: Endpoint24_0(raw),
+  create: Endpoint24_1(raw),
+  remove: Endpoint24_2(raw),
+  refresh: Endpoint24_3(raw),
 })

 const Endpoint25_0 = (raw: RawClient["server.vcs"]) => (input?: Endpoint25_0Input) =>
@@ -1334,7 +1323,7 @@ const adaptClient = (raw: RawClient) => ({
  shell: adaptGroup21(raw["server.shell"]),
  question: adaptGroup22(raw["server.question"]),
  reference: adaptGroup23(raw["server.reference"]),
-  projectCopy: adaptGroup24(raw["server.projectCopy"]),
+  worktree: adaptGroup24(raw["server.worktree"]),
  vcs: adaptGroup25(raw["server.vcs"]),
  debug: adaptGroup26(raw["server.debug"]),
  migration: adaptGroup27(raw["server.migration"]),
@@ -33,7 +33,7 @@ export { Model } from "@opencode-ai/schema/model"
 export { Permission } from "@opencode-ai/schema/permission"
 export { PermissionSaved } from "@opencode-ai/schema/permission-saved"
 export { Project } from "@opencode-ai/schema/project"
-export { ProjectCopy } from "@opencode-ai/schema/project-copy"
+export { Worktree } from "@opencode-ai/schema/worktree"
 export { Provider } from "@opencode-ai/schema/provider"
 export { Pty } from "@opencode-ai/schema/pty"
 export { Question } from "@opencode-ai/schema/question"
@@ -133,8 +133,6 @@ import type {
  ProjectListOutput,
  ProjectCurrentInput,
  ProjectCurrentOutput,
-  ProjectDirectoriesInput,
-  ProjectDirectoriesOutput,
  FormRequestListInput,
  FormRequestListOutput,
  FormListInput,
@@ -206,12 +204,14 @@ import type {
  QuestionRejectOutput,
  ReferenceListInput,
  ReferenceListOutput,
-  ProjectCopyCreateInput,
-  ProjectCopyCreateOutput,
-  ProjectCopyRemoveInput,
-  ProjectCopyRemoveOutput,
-  ProjectCopyRefreshInput,
-  ProjectCopyRefreshOutput,
+  WorktreeListInput,
+  WorktreeListOutput,
+  WorktreeCreateInput,
+  WorktreeCreateOutput,
+  WorktreeRemoveInput,
+  WorktreeRemoveOutput,
+  WorktreeRefreshInput,
+  WorktreeRefreshOutput,
  VcsGetInput,
  VcsGetOutput,
  VcsStatusInput,
@@ -1255,18 +1255,6 @@ export function make(options: ClientOptions) {
          },
          requestOptions,
        ),
-      directories: (input: ProjectDirectoriesInput, requestOptions?: RequestOptions) =>
-        request<ProjectDirectoriesOutput>(
-          {
-            method: "GET",
-            path: `/api/project/${encodeURIComponent(input.projectID)}/directories`,
-            query: { location: input["location"] },
-            successStatus: 200,
-            declaredStatuses: [401, 400],
-            empty: false,
-          },
-          requestOptions,
-        ),
    },
    form: {
      request: {
@@ -1736,13 +1724,23 @@ export function make(options: ClientOptions) {
          requestOptions,
        ),
    },
-    projectCopy: {
-      create: (input: ProjectCopyCreateInput, requestOptions?: RequestOptions) =>
-        request<ProjectCopyCreateOutput>(
+    worktree: {
+      list: (input: WorktreeListInput, requestOptions?: RequestOptions) =>
+        request<WorktreeListOutput>(
+          {
+            method: "GET",
+            path: `/api/experimental/project/${encodeURIComponent(input.projectID)}/worktree`,
+            successStatus: 200,
+            declaredStatuses: [401, 400],
+            empty: false,
+          },
+          requestOptions,
+        ),
+      create: (input: WorktreeCreateInput, requestOptions?: RequestOptions) =>
+        request<WorktreeCreateOutput>(
          {
            method: "POST",
-            path: `/api/experimental/project/${encodeURIComponent(input.projectID)}/copy`,
-            query: { location: input["location"] },
+            path: `/api/experimental/project/${encodeURIComponent(input.projectID)}/worktree`,
            body: { strategy: input["strategy"], directory: input["directory"], name: input["name"] },
            successStatus: 200,
            declaredStatuses: [400, 401],
@@ -1750,12 +1748,11 @@ export function make(options: ClientOptions) {
          },
          requestOptions,
        ),
-      remove: (input: ProjectCopyRemoveInput, requestOptions?: RequestOptions) =>
-        request<ProjectCopyRemoveOutput>(
+      remove: (input: WorktreeRemoveInput, requestOptions?: RequestOptions) =>
+        request<WorktreeRemoveOutput>(
          {
            method: "DELETE",
-            path: `/api/experimental/project/${encodeURIComponent(input.projectID)}/copy`,
-            query: { location: input["location"] },
+            path: `/api/experimental/project/${encodeURIComponent(input.projectID)}/worktree`,
            body: { directory: input["directory"], force: input["force"] },
            successStatus: 204,
            declaredStatuses: [400, 401],
@@ -1763,12 +1760,11 @@ export function make(options: ClientOptions) {
          },
          requestOptions,
        ),
-      refresh: (input: ProjectCopyRefreshInput, requestOptions?: RequestOptions) =>
-        request<ProjectCopyRefreshOutput>(
+      refresh: (input: WorktreeRefreshInput, requestOptions?: RequestOptions) =>
+        request<WorktreeRefreshOutput>(
          {
            method: "POST",
-            path: `/api/experimental/project/${encodeURIComponent(input.projectID)}/copy/refresh`,
-            query: { location: input["location"] },
+            path: `/api/experimental/project/${encodeURIComponent(input.projectID)}/worktree/refresh`,
            successStatus: 204,
            declaredStatuses: [400, 401],
            empty: true,
@@ -291,8 +291,6 @@ export type ProjectTime = { created: number; updated: number; initialized?: numb

 export type ProjectCurrent = { id: string; directory: string; canonical: string }

-export type ProjectDirectory = { directory: string; strategy?: string }
-
 export type FormMetadata = { [x: string]: JsonValue }

 export type FormValue = string | number | boolean | Array<string>
@@ -370,7 +368,9 @@ export type ReferenceGitSource = {
  hidden?: boolean
 }

-export type ProjectCopyCopy = { directory: string }
+export type WorktreeDirectory = { directory: string; strategy?: string }
+
+export type WorktreeInfo = { directory: string }

 export type VcsBranch = { current?: string; default?: string }

@@ -828,15 +828,25 @@ export type PluginUpdated = {
  data: {}
 }

-export type ProjectDirectoriesUpdated = {
+export type WorktreeUpdated = {
  id: string
  created: number
  metadata?: { [x: string]: any }
-  type: "project.directories.updated"
+  type: "worktree.updated"
  location?: LocationRef
  data: { projectID: string }
 }

+export type WorktreeResolved = {
+  id: string
+  created: number
+  metadata?: { [x: string]: any }
+  type: "worktree.resolved"
+  durable: { aggregateID: string; seq: number; version: 1 }
+  location?: LocationRef
+  data: { projectID: string; directory: string; previous: string }
+}
+
 export type CommandUpdated = {
  id: string
  created: number
@@ -1359,8 +1369,6 @@ export type Project = {
  sandboxes: Array<string>
 }

-export type ProjectDirectories = Array<ProjectDirectory>
-
 export type FormAnswer = { [x: string]: FormValue }

 export type PermissionRequest = {
@@ -1510,6 +1518,8 @@ export type SessionStatus2 = {

 export type ReferenceSource = ReferenceLocalSource | ReferenceGitSource

+export type WorktreeList = Array<WorktreeDirectory>
+
 export type VcsInfo = { branch: VcsBranch }

 export type PermissionRuleset = Array<PermissionRule>
@@ -2092,7 +2102,8 @@ export type V2Event =
  | PermissionReplied
  | PluginAdded
  | PluginUpdated
-  | ProjectDirectoriesUpdated
+  | WorktreeUpdated
+  | WorktreeResolved
  | CommandUpdated
  | ConfigUpdated
  | SkillUpdated
@@ -2293,12 +2304,12 @@ export type QuestionNotFoundError = {
 export const isQuestionNotFoundError = (value: unknown): value is QuestionNotFoundError =>
  typeof value === "object" && value !== null && "_tag" in value && value["_tag"] === "QuestionNotFoundError"

-export type ProjectCopyError = {
-  readonly name: "ProjectCopyError"
+export type WorktreeError = {
+  readonly name: "WorktreeError"
  readonly data: { readonly message: string; readonly forceRequired?: boolean | undefined }
 }
-export const isProjectCopyError = (value: unknown): value is ProjectCopyError =>
-  typeof value === "object" && value !== null && "name" in value && value["name"] === "ProjectCopyError"
+export const isWorktreeError = (value: unknown): value is WorktreeError =>
+  typeof value === "object" && value !== null && "name" in value && value["name"] === "WorktreeError"

 export type HealthGetOutput = ServiceHealth

@@ -4337,15 +4348,6 @@ export type ProjectCurrentInput = {

 export type ProjectCurrentOutput = ProjectCurrent

-export type ProjectDirectoriesInput = {
-  readonly projectID: { readonly projectID: string }["projectID"]
-  readonly location?: {
-    readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
-  }["location"]
-}
-
-export type ProjectDirectoriesOutput = ProjectDirectories
-
 export type FormRequestListInput = {
  readonly location?: {
    readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
@@ -5631,37 +5633,30 @@ export type ReferenceListOutput = {
  data: Array<ReferenceInfo>
 }

-export type ProjectCopyCreateInput = {
+export type WorktreeListInput = { readonly projectID: { readonly projectID: string }["projectID"] }
+
+export type WorktreeListOutput = WorktreeList
+
+export type WorktreeCreateInput = {
  readonly projectID: { readonly projectID: string }["projectID"]
-  readonly location?: {
-    readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
-  }["location"]
  readonly strategy: { readonly strategy: string; readonly directory: string; readonly name?: string }["strategy"]
  readonly directory: { readonly strategy: string; readonly directory: string; readonly name?: string }["directory"]
  readonly name?: { readonly strategy: string; readonly directory: string; readonly name?: string }["name"]
 }

-export type ProjectCopyCreateOutput = ProjectCopyCopy
+export type WorktreeCreateOutput = WorktreeInfo

-export type ProjectCopyRemoveInput = {
+export type WorktreeRemoveInput = {
  readonly projectID: { readonly projectID: string }["projectID"]
-  readonly location?: {
-    readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
-  }["location"]
  readonly directory: { readonly directory: string; readonly force: boolean }["directory"]
  readonly force: { readonly directory: string; readonly force: boolean }["force"]
 }

-export type ProjectCopyRemoveOutput = void
+export type WorktreeRemoveOutput = void

-export type ProjectCopyRefreshInput = {
-  readonly projectID: { readonly projectID: string }["projectID"]
-  readonly location?: {
-    readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
-  }["location"]
-}
+export type WorktreeRefreshInput = { readonly projectID: { readonly projectID: string }["projectID"] }

-export type ProjectCopyRefreshOutput = void
+export type WorktreeRefreshOutput = void

 export type VcsGetInput = {
  readonly location?: {
@@ -29,7 +29,7 @@ test("exposes every standard HTTP API group", () => {
    "shell",
    "question",
    "reference",
-    "projectCopy",
+    "worktree",
    "vcs",
    "debug",
    "migration",
@@ -49,7 +49,8 @@ test("exposes every standard HTTP API group", () => {
  expect(Object.keys(client.vcs)).toEqual(["get", "status", "diff"])
  expect(Object.keys(client.pty)).toEqual(["list", "create", "get", "update", "remove"])
  expect(Object.keys(client.shell)).toEqual(["list", "create", "get", "timeout", "output", "remove"])
-  expect(Object.keys(client.project)).toEqual(["list", "current", "directories"])
+  expect(Object.keys(client.project)).toEqual(["list", "current"])
+  expect(Object.keys(client.worktree)).toEqual(["list", "create", "remove", "refresh"])
 })

 test("config.get returns ordered config entries for a location", async () => {
@@ -251,30 +252,44 @@ test("file.read returns binary content from the public HTTP contract", async ()
  )
 })

-test("project methods use the public HTTP contract", async () => {
-  const requests: string[] = []
+test("worktree methods use the global project contract", async () => {
+  const requests: Request[] = []
  const client = OpenCode.make({
    baseUrl: "http://localhost:3000",
-    fetch: async (input) => {
-      const url = typeof input === "string" ? input : input instanceof URL ? input.href : input.url
-      requests.push(url)
-      if (url.includes("/directories")) return Response.json([])
-      return Response.json({ id: "proj_test", directory: "/tmp/project" })
+    fetch: async (input, init) => {
+      const request = input instanceof Request ? input : new Request(input, init)
+      requests.push(request)
+      if (request.method === "GET") return Response.json([{ directory: "/tmp/project" }])
+      if (request.method === "POST" && !request.url.endsWith("/refresh"))
+        return Response.json({ directory: "/tmp/worktrees/api" })
+      return new Response(null, { status: 204 })
    },
  })

-  const current = await client.project.current({ location: { workspace: "wrk_test" } })
-  const directories = await client.project.directories({
-    projectID: current.id,
-    location: { directory: current.directory },
+  expect(await client.worktree.list({ projectID: "proj_test" })).toEqual([{ directory: "/tmp/project" }])
+  expect(
+    await client.worktree.create({
+      projectID: "proj_test",
+      strategy: "git",
+      directory: "/tmp/worktrees",
+      name: "api",
+    }),
+  ).toEqual({ directory: "/tmp/worktrees/api" })
+  await client.worktree.remove({
+    projectID: "proj_test",
+    directory: "/tmp/worktrees/api",
+    force: false,
  })
+  await client.worktree.refresh({ projectID: "proj_test" })

-  expect(current).toEqual({ id: "proj_test", directory: "/tmp/project" })
-  expect(directories).toEqual([])
-  expect(requests).toEqual([
-    "http://localhost:3000/api/project/current?location%5Bworkspace%5D=wrk_test",
-    "http://localhost:3000/api/project/proj_test/directories?location%5Bdirectory%5D=%2Ftmp%2Fproject",
+  expect(requests.map((request) => [request.method, request.url])).toEqual([
+    ["GET", "http://localhost:3000/api/experimental/project/proj_test/worktree"],
+    ["POST", "http://localhost:3000/api/experimental/project/proj_test/worktree"],
+    ["DELETE", "http://localhost:3000/api/experimental/project/proj_test/worktree"],
+    ["POST", "http://localhost:3000/api/experimental/project/proj_test/worktree/refresh"],
  ])
+  expect(await requests[1]?.json()).toEqual({ strategy: "git", directory: "/tmp/worktrees", name: "api" })
+  expect(await requests[2]?.json()).toEqual({ directory: "/tmp/worktrees/api", force: false })
 })

 test("shell list and remove use the public HTTP contract", async () => {
@@ -19,6 +19,12 @@
  "exports": {
    ".": "./src/index.ts"
  },
+  "imports": {
+    "#transpile": {
+      "workerd": "./src/interpreter/transpile.workerd.ts",
+      "default": "./src/interpreter/transpile.node.ts"
+    }
+  },
  "scripts": {
    "build": "bun run script/build.ts",
    "typecheck": "tsgo --noEmit",
@@ -1,6 +1,8 @@
 import { parse } from "acorn"
 import { Cause, Effect, Scope } from "effect"
-import { DiagnosticCategory, ModuleKind, ScriptTarget, flattenDiagnosticMessageText, transpileModule } from "typescript"
+// #transpile: conditional import — full typescript on node/bun, an identity
+// pass-through on workerd (the compiler is ~11 MiB and can't init there).
+import { transpile } from "#transpile"
 import type { DataValue, Diagnostic, ExecuteOptions, ResolvedExecutionLimits, Result } from "../codemode.js"
 import { copyIn, copyOut, ToolRuntime, type Services } from "../tool-runtime.js"
 import type { Tools } from "../tools.js"
@@ -119,21 +121,10 @@ export const executeWithLimits = <const Provided extends Record<string, unknown>
 }

 const parseProgram = (code: string): ProgramNode => {
-  const transpiled = transpileModule(`async function __codemode__() {\n${code}\n}`, {
-    reportDiagnostics: true,
-    compilerOptions: {
-      target: ScriptTarget.ESNext,
-      module: ModuleKind.ESNext,
-    },
-  })
-  const diagnostic = transpiled.diagnostics?.find((item) => item.category === DiagnosticCategory.Error)
+  const transpiled = transpile(`async function __codemode__() {\n${code}\n}`)

-  if (diagnostic) {
-    throw new InterpreterRuntimeError(
-      `Failed to parse TypeScript: ${flattenDiagnosticMessageText(diagnostic.messageText, "\n")}`,
-      undefined,
-      "ParseError",
-    )
+  if (transpiled.error !== undefined) {
+    throw new InterpreterRuntimeError(`Failed to parse TypeScript: ${transpiled.error}`, undefined, "ParseError")
  }

  const bodyStart = transpiled.outputText.indexOf("{") + 1
@@ -0,0 +1,25 @@
+import { DiagnosticCategory, ModuleKind, ScriptTarget, flattenDiagnosticMessageText, transpileModule } from "typescript"
+
+export interface TranspileResult {
+  readonly outputText: string
+  readonly error?: string
+}
+
+// Full TypeScript transpilation on node/bun runtimes.
+export const transpile = (source: string): TranspileResult => {
+  const transpiled = transpileModule(source, {
+    reportDiagnostics: true,
+    compilerOptions: {
+      target: ScriptTarget.ESNext,
+      module: ModuleKind.ESNext,
+    },
+  })
+  const diagnostic = transpiled.diagnostics?.find((item) => item.category === DiagnosticCategory.Error)
+  if (diagnostic) {
+    return {
+      outputText: transpiled.outputText,
+      error: flattenDiagnosticMessageText(diagnostic.messageText, "\n"),
+    }
+  }
+  return { outputText: transpiled.outputText }
+}
@@ -0,0 +1,11 @@
+export interface TranspileResult {
+  readonly outputText: string
+  readonly error?: string
+}
+
+// workerd profile: the typescript compiler is ~11 MiB and probes node
+// internals at module init, so codemode programs are passed through
+// untranspiled. Plain-JS programs (the overwhelmingly common case) parse
+// fine downstream via acorn; TypeScript-only syntax surfaces as a parse
+// error from the interpreter instead of a transpile diagnostic.
+export const transpile = (source: string): TranspileResult => ({ outputText: source })
@@ -1,8 +1,10 @@
 {
  "version": "7",
  "dialect": "sqlite",
-  "id": "5c1aa56b-c3ee-4283-9a84-c0bf626dc604",
-  "prevIds": ["00924d88-1842-4d71-ac74-5682ddc47e1c"],
+  "id": "dcde8e6b-4bf4-4f6b-b2be-4030c2c3e936",
+  "prevIds": [
+    "5c1aa56b-c3ee-4283-9a84-c0bf626dc604"
+  ],
  "ddl": [
    {
      "name": "account_state",
@@ -76,6 +78,10 @@
      "name": "workspace",
      "entityType": "tables"
    },
+    {
+      "name": "worktree",
+      "entityType": "tables"
+    },
    {
      "type": "integer",
      "notNull": false,
@@ -1437,9 +1443,53 @@
      "table": "workspace"
    },
    {
-      "columns": ["active_account_id"],
+      "type": "text",
+      "notNull": true,
+      "autoincrement": false,
+      "default": null,
+      "generated": null,
+      "name": "project_id",
+      "entityType": "columns",
+      "table": "worktree"
+    },
+    {
+      "type": "text",
+      "notNull": true,
+      "autoincrement": false,
+      "default": null,
+      "generated": null,
+      "name": "directory",
+      "entityType": "columns",
+      "table": "worktree"
+    },
+    {
+      "type": "text",
+      "notNull": false,
+      "autoincrement": false,
+      "default": null,
+      "generated": null,
+      "name": "strategy",
+      "entityType": "columns",
+      "table": "worktree"
+    },
+    {
+      "type": "integer",
+      "notNull": true,
+      "autoincrement": false,
+      "default": null,
+      "generated": null,
+      "name": "time_created",
+      "entityType": "columns",
+      "table": "worktree"
+    },
+    {
+      "columns": [
+        "active_account_id"
+      ],
      "tableTo": "account",
-      "columnsTo": ["id"],
+      "columnsTo": [
+        "id"
+      ],
      "onUpdate": "NO ACTION",
      "onDelete": "SET NULL",
      "nameExplicit": false,
@@ -1448,9 +1498,13 @@
      "table": "account_state"
    },
    {
-      "columns": ["aggregate_id"],
+      "columns": [
+        "aggregate_id"
+      ],
      "tableTo": "event_sequence",
-      "columnsTo": ["aggregate_id"],
+      "columnsTo": [
+        "aggregate_id"
+      ],
      "onUpdate": "NO ACTION",
      "onDelete": "CASCADE",
      "nameExplicit": false,
@@ -1459,9 +1513,13 @@
      "table": "event"
    },
    {
-      "columns": ["project_id"],
+      "columns": [
+        "project_id"
+      ],
      "tableTo": "project",
-      "columnsTo": ["id"],
+      "columnsTo": [
+        "id"
+      ],
      "onUpdate": "NO ACTION",
      "onDelete": "CASCADE",
      "nameExplicit": false,
@@ -1470,9 +1528,13 @@
      "table": "permission"
    },
    {
-      "columns": ["project_id"],
+      "columns": [
+        "project_id"
+      ],
      "tableTo": "project",
-      "columnsTo": ["id"],
+      "columnsTo": [
+        "id"
+      ],
      "onUpdate": "NO ACTION",
      "onDelete": "CASCADE",
      "nameExplicit": false,
@@ -1481,9 +1543,13 @@
      "table": "project_directory"
    },
    {
-      "columns": ["session_id"],
+      "columns": [
+        "session_id"
+      ],
      "tableTo": "session_v2",
-      "columnsTo": ["id"],
+      "columnsTo": [
+        "id"
+      ],
      "onUpdate": "NO ACTION",
      "onDelete": "CASCADE",
      "nameExplicit": false,
@@ -1492,9 +1558,13 @@
      "table": "instruction_entry"
    },
    {
-      "columns": ["session_id"],
+      "columns": [
+        "session_id"
+      ],
      "tableTo": "session_v2",
-      "columnsTo": ["id"],
+      "columnsTo": [
+        "id"
+      ],
      "onUpdate": "NO ACTION",
      "onDelete": "CASCADE",
      "nameExplicit": false,
@@ -1503,9 +1573,13 @@
      "table": "instruction_state"
    },
    {
-      "columns": ["session_id"],
+      "columns": [
+        "session_id"
+      ],
      "tableTo": "session_v2",
-      "columnsTo": ["id"],
+      "columnsTo": [
+        "id"
+      ],
      "onUpdate": "NO ACTION",
      "onDelete": "CASCADE",
      "nameExplicit": false,
@@ -1514,9 +1588,13 @@
      "table": "session_inbox"
    },
    {
-      "columns": ["session_id"],
+      "columns": [
+        "session_id"
+      ],
      "tableTo": "session_v2",
-      "columnsTo": ["id"],
+      "columnsTo": [
+        "id"
+      ],
      "onUpdate": "NO ACTION",
      "onDelete": "CASCADE",
      "nameExplicit": false,
@@ -1525,9 +1603,13 @@
      "table": "session_message"
    },
    {
-      "columns": ["session_id"],
+      "columns": [
+        "session_id"
+      ],
      "tableTo": "session_v2",
-      "columnsTo": ["id"],
+      "columnsTo": [
+        "id"
+      ],
      "onUpdate": "NO ACTION",
      "onDelete": "CASCADE",
      "nameExplicit": false,
@@ -1536,9 +1618,13 @@
      "table": "session_pending"
    },
    {
-      "columns": ["project_id"],
+      "columns": [
+        "project_id"
+      ],
      "tableTo": "project",
-      "columnsTo": ["id"],
+      "columnsTo": [
+        "id"
+      ],
      "onUpdate": "NO ACTION",
      "onDelete": "CASCADE",
      "nameExplicit": false,
@@ -1547,126 +1633,190 @@
      "table": "session_v2"
    },
    {
-      "columns": ["email", "url"],
+      "columns": [
+        "project_id"
+      ],
+      "tableTo": "project",
+      "columnsTo": [
+        "id"
+      ],
+      "onUpdate": "NO ACTION",
+      "onDelete": "CASCADE",
+      "nameExplicit": false,
+      "name": "fk_worktree_project_id_project_id_fk",
+      "entityType": "fks",
+      "table": "worktree"
+    },
+    {
+      "columns": [
+        "email",
+        "url"
+      ],
      "nameExplicit": false,
      "name": "control_account_pk",
      "entityType": "pks",
      "table": "control_account"
    },
    {
-      "columns": ["project_id", "directory"],
+      "columns": [
+        "project_id",
+        "directory"
+      ],
      "nameExplicit": false,
      "name": "project_directory_pk",
      "entityType": "pks",
      "table": "project_directory"
    },
    {
-      "columns": ["session_id", "key"],
+      "columns": [
+        "session_id",
+        "key"
+      ],
      "nameExplicit": false,
      "name": "instruction_entry_pk",
      "entityType": "pks",
      "table": "instruction_entry"
    },
    {
-      "columns": ["id"],
+      "columns": [
+        "project_id",
+        "directory"
+      ],
+      "nameExplicit": false,
+      "name": "worktree_pk",
+      "entityType": "pks",
+      "table": "worktree"
+    },
+    {
+      "columns": [
+        "id"
+      ],
      "nameExplicit": false,
      "name": "account_state_pk",
      "table": "account_state",
      "entityType": "pks"
    },
    {
-      "columns": ["id"],
+      "columns": [
+        "id"
+      ],
      "nameExplicit": false,
      "name": "account_pk",
      "table": "account",
      "entityType": "pks"
    },
    {
-      "columns": ["id"],
+      "columns": [
+        "id"
+      ],
      "nameExplicit": false,
      "name": "credential_pk",
      "table": "credential",
      "entityType": "pks"
    },
    {
-      "columns": ["aggregate_id"],
+      "columns": [
+        "aggregate_id"
+      ],
      "nameExplicit": false,
      "name": "event_sequence_pk",
      "table": "event_sequence",
      "entityType": "pks"
    },
    {
-      "columns": ["id"],
+      "columns": [
+        "id"
+      ],
      "nameExplicit": false,
      "name": "event_pk",
      "table": "event",
      "entityType": "pks"
    },
    {
-      "columns": ["key"],
+      "columns": [
+        "key"
+      ],
      "nameExplicit": false,
      "name": "kv_pk",
      "table": "kv",
      "entityType": "pks"
    },
    {
-      "columns": ["id"],
+      "columns": [
+        "id"
+      ],
      "nameExplicit": false,
      "name": "permission_pk",
      "table": "permission",
      "entityType": "pks"
    },
    {
-      "columns": ["id"],
+      "columns": [
+        "id"
+      ],
      "nameExplicit": false,
      "name": "project_pk",
      "table": "project",
      "entityType": "pks"
    },
    {
-      "columns": ["hash"],
+      "columns": [
+        "hash"
+      ],
      "nameExplicit": false,
      "name": "instruction_blob_pk",
      "table": "instruction_blob",
      "entityType": "pks"
    },
    {
-      "columns": ["session_id"],
+      "columns": [
+        "session_id"
+      ],
      "nameExplicit": false,
      "name": "instruction_state_pk",
      "table": "instruction_state",
      "entityType": "pks"
    },
    {
-      "columns": ["id"],
+      "columns": [
+        "id"
+      ],
      "nameExplicit": false,
      "name": "session_inbox_pk",
      "table": "session_inbox",
      "entityType": "pks"
    },
    {
-      "columns": ["id"],
+      "columns": [
+        "id"
+      ],
      "nameExplicit": false,
      "name": "session_message_pk",
      "table": "session_message",
      "entityType": "pks"
    },
    {
-      "columns": ["id"],
+      "columns": [
+        "id"
+      ],
      "nameExplicit": false,
      "name": "session_pending_pk",
      "table": "session_pending",
      "entityType": "pks"
    },
    {
-      "columns": ["id"],
+      "columns": [
+        "id"
+      ],
      "nameExplicit": false,
      "name": "session_v2_pk",
      "table": "session_v2",
      "entityType": "pks"
    },
    {
-      "columns": ["id"],
+      "columns": [
+        "id"
+      ],
      "nameExplicit": false,
      "name": "workspace_pk",
      "table": "workspace",
@@ -1962,4 +2112,4 @@
    }
  ],
  "renames": []
-}
+}
@@ -6,7 +6,7 @@ import type { EventLog } from "@opencode-ai/schema/event-log"
 import { and, asc, eq, gt, lte, sql } from "drizzle-orm"
 import { Database } from "./database/database.js"
 import { EventSequenceTable, EventTable } from "./event/sql.js"
-import { Location } from "./location.js"
+import type { Location } from "@opencode-ai/schema/location"
 import { KeyedMutex } from "./effect/keyed-mutex.js"
 import { makeGlobalNode } from "@opencode-ai/util/effect/app-node"
 import { isDeepStrictEqual } from "node:util"
@@ -183,6 +183,9 @@ export function configured(options?: Options) {
    layer: Layer.effect(
      Service,
      Effect.gen(function* () {
+        // Deferred import: a static one would close the module cycle
+        // bus → location → project → bus and hit the node bindings in TDZ.
+        const { Location } = yield* Effect.promise(() => import("./location.js"))
        const pubsub = {
          live: yield* PubSub.unbounded<Event.Payload>(),
          durable: new Map<string, Set<PubSub.PubSub<void>>>(),
@@ -42,6 +42,7 @@ import m39 from "./migration/20260805200742_import_legacy_credentials.js"
 import m40 from "./migration/20260808023530_workspace_domain.js"
 import m41 from "./migration/20260811161259_execution_claim_attempts.js"
 import m42 from "./migration/20260812181746_session_inbox.js"
+import m43 from "./migration/20260812213948_worktree.js"

 export const migrations = [
  m00,
@@ -87,4 +88,5 @@ export const migrations = [
  m40,
  m41,
  m42,
+  m43,
 ] satisfies DatabaseMigration.Migration[]
@@ -0,0 +1,35 @@
+import { Effect } from "effect"
+import type { DatabaseMigration } from "../migration.js"
+
+const migration: DatabaseMigration.Migration = {
+  id: "20260812213948_worktree",
+  up(tx) {
+    return Effect.gen(function* () {
+      yield* tx.run(`
+        CREATE TABLE \`worktree\` (
+          \`project_id\` text NOT NULL,
+          \`directory\` text NOT NULL,
+          \`strategy\` text,
+          \`time_created\` integer NOT NULL,
+          CONSTRAINT \`worktree_pk\` PRIMARY KEY(\`project_id\`, \`directory\`),
+          CONSTRAINT \`fk_worktree_project_id_project_id_fk\` FOREIGN KEY (\`project_id\`) REFERENCES \`project\`(\`id\`) ON DELETE CASCADE
+        );
+      `)
+      yield* tx.run(`
+        INSERT INTO \`worktree\` (\`project_id\`, \`directory\`, \`strategy\`, \`time_created\`)
+        SELECT
+          \`project_id\`,
+          \`directory\`,
+          CASE
+            WHEN \`strategy\` = 'git_worktree' THEN 'git'
+            WHEN \`strategy\` IS NOT NULL THEN \`strategy\`
+            WHEN \`type\` = 'git_worktree' THEN 'git'
+          END,
+          \`time_created\`
+        FROM \`project_directory\`;
+      `)
+    })
+  },
+}
+
+export default migration
@@ -225,6 +225,16 @@ const schema: Omit<DatabaseMigration.Migration, "id"> = {
          \`last_used_at\` integer NOT NULL
        );
      `)
+      yield* tx.run(`
+        CREATE TABLE \`worktree\` (
+          \`project_id\` text NOT NULL,
+          \`directory\` text NOT NULL,
+          \`strategy\` text,
+          \`time_created\` integer NOT NULL,
+          CONSTRAINT \`worktree_pk\` PRIMARY KEY(\`project_id\`, \`directory\`),
+          CONSTRAINT \`fk_worktree_project_id_project_id_fk\` FOREIGN KEY (\`project_id\`) REFERENCES \`project\`(\`id\`) ON DELETE CASCADE
+        );
+      `)
      yield* tx.run(`CREATE UNIQUE INDEX \`event_aggregate_seq_idx\` ON \`event\` (\`aggregate_id\`,\`seq\`);`)
      yield* tx.run(`CREATE INDEX \`event_aggregate_type_seq_idx\` ON \`event\` (\`aggregate_id\`,\`type\`,\`seq\`);`)
      yield* tx.run(
@@ -2,9 +2,10 @@ import { createRequire } from "node:module"

 declare const OPENCODE_LIBC: string | undefined

-const require = createRequire(import.meta.url)
-
+// Lazy: on workerd import.meta.url is undefined and the watcher is never
+// loaded, so createRequire must not run at module scope.
 export default function load() {
+  const require = createRequire(import.meta.url)
  const libc = typeof OPENCODE_LIBC === "undefined" ? undefined : OPENCODE_LIBC
  return require(
    process.env.OPENCODE_PARCEL_WATCHER_PATH ??
@@ -25,7 +25,7 @@ import { MCP } from "./mcp/index.js"
 import { Permission } from "./permission.js"
 import { Plugin } from "./plugin.js"
 import { PluginSupervisor } from "./plugin/supervisor.js"
-import { ProjectCopy } from "./project/copy.js"
+import { Worktree } from "./worktree.js"
 import { Pty } from "./pty.js"
 import { Question } from "./question.js"
 import { Shell } from "./shell.js"
@@ -66,8 +66,7 @@ const locationServiceNodes = [
  AISDK.node,
  Plugin.node,
  PluginSupervisor.node,
-  ProjectCopy.node,
-  ProjectCopy.refreshNode,
+  Worktree.refreshNode,
  FileSystemSearch.node,
  FileSystem.node,
  Pty.node,
@@ -2,18 +2,20 @@ export * as Project from "./project.js"

 import { Context, Effect, Layer, Schema } from "effect"
 import { ChildProcess } from "effect/unstable/process"
-import { asc, desc } from "drizzle-orm"
+import { and, asc, desc, eq } from "drizzle-orm"
 import path from "path"
 import { AbsolutePath } from "./schema.js"
+import { Bus } from "./bus.js"
 import { Database } from "./database/database.js"
+import { Worktree } from "@opencode-ai/schema/worktree"
 import { FSUtil } from "@opencode-ai/util/fs-util"
 import { Git } from "./git.js"
 import { AppProcess } from "@opencode-ai/util/process"
 import { makeGlobalNode } from "@opencode-ai/util/effect/app-node"
 import { Hash } from "@opencode-ai/util/hash"
-import { ProjectDirectories } from "./project/directories.js"
 import { ProjectSchema } from "./project/schema.js"
 import { ProjectTable, upsertProject } from "./project/sql.js"
+import { WorktreeTable } from "./worktree/sql.js"

 export const ID = ProjectSchema.ID
 export type ID = ProjectSchema.ID
@@ -24,18 +26,9 @@ export type Vcs = ProjectSchema.Vcs
 export const Current = ProjectSchema.Current
 export type Current = ProjectSchema.Current

-export const Directory = ProjectSchema.Directory
-export type Directory = ProjectSchema.Directory
-
 export const Info = ProjectSchema.Info
 export interface Info extends Schema.Schema.Type<typeof Info> {}

-export const DirectoriesInput = ProjectSchema.DirectoriesInput
-export type DirectoriesInput = typeof DirectoriesInput.Type
-
-export const Directories = ProjectSchema.Directories
-export type Directories = typeof Directories.Type
-
 export interface Resolved {
  readonly previous?: ID
  readonly id: ID
@@ -54,7 +47,6 @@ export const root = Effect.fn("Project.root")(function* (fs: FSUtil.Interface, i

 export interface Interface {
  readonly list: () => Effect.Effect<ReadonlyArray<Info>>
-  readonly directories: (input: DirectoriesInput) => Effect.Effect<Directories>
  readonly resolve: (input: AbsolutePath) => Effect.Effect<Resolved>
 }

@@ -91,28 +83,55 @@ const layer = Layer.effect(
    const fs = yield* FSUtil.Service
    const git = yield* Git.Service
    const proc = yield* AppProcess.Service
+    const bus = yield* Bus.Service
    const db = (yield* Database.Service).db
-    const projectDirectories = yield* ProjectDirectories.Service

+    const announcing = new Set<string>()
    const persist = Effect.fnUntraced(function* (project: Resolved) {
-      yield* db
-        .transaction((tx) =>
-          Effect.gen(function* () {
-            yield* upsertProject(tx, project)
-            if (!project.vcs) return
-            yield* projectDirectories.create({ projectID: project.id, directory: project.canonical }, tx)
-            if (project.directory === project.canonical) return
-            yield* projectDirectories.create(
-              {
-                projectID: project.id,
-                directory: project.directory,
-                strategy: project.vcs.type === "git" ? "git_worktree" : undefined,
-              },
-              tx,
-            )
-          }),
-        )
-        .pipe(Effect.orDie)
+      yield* upsertProject(db, project).pipe(Effect.orDie)
+      if (!project.vcs) return project
+      const directories: Array<{ projectID: ID; directory: AbsolutePath; strategy?: string }> = [
+        { projectID: project.id, directory: project.canonical },
+      ]
+      if (project.directory !== project.canonical)
+        directories.push({
+          projectID: project.id,
+          directory: project.directory,
+          strategy: project.vcs.type === "git" ? "git" : undefined,
+        })
+      // A missing directory row means this directory's resolution is a new durable
+      // fact (copy.ts registers copy directories directly; those never strand
+      // sessions and never announce). The row insert commits atomically with the
+      // event, so a crash between checks retries on the next resolve instead of
+      // stranding the announcement. The in-flight set keeps concurrent resolves
+      // from publishing the same fact twice.
+      for (const item of directories) {
+        const key = item.projectID + "\u0000" + item.directory
+        if (announcing.has(key)) continue
+        announcing.add(key)
+        yield* Effect.gen(function* () {
+          const stored = yield* db
+            .select({ directory: WorktreeTable.directory })
+            .from(WorktreeTable)
+            .where(and(eq(WorktreeTable.project_id, item.projectID), eq(WorktreeTable.directory, item.directory)))
+            .get()
+            .pipe(Effect.orDie)
+          if (stored) return
+          yield* bus.publish(
+            Worktree.Event.Resolved,
+            { projectID: item.projectID, directory: item.directory, previous: project.previous ?? ID.global },
+            {
+              commit: () =>
+                db
+                  .insert(WorktreeTable)
+                  .values({ project_id: item.projectID, directory: item.directory, strategy: item.strategy })
+                  .onConflictDoNothing()
+                  .run()
+                  .pipe(Effect.orDie, Effect.asVoid),
+            },
+          )
+        }).pipe(Effect.ensuring(Effect.sync(() => announcing.delete(key))))
+      }
      return project
    })

@@ -126,10 +145,6 @@ const layer = Layer.effect(
      return rows.map(fromRow)
    })

-    const directories = Effect.fn("Project.directories")(function* (input: DirectoriesInput) {
-      return yield* projectDirectories.list(input.projectID)
-    })
-
    const cached = Effect.fnUntraced(function* (dir: string) {
      return yield* fs.readFileString(path.join(dir, "opencode")).pipe(
        Effect.map((value) => value.trim()),
@@ -243,12 +258,12 @@ const layer = Layer.effect(
      return yield* persist({ id: ID.global, directory, canonical: directory, vcs: undefined })
    })

-    return Service.of({ list, directories, resolve })
+    return Service.of({ list, resolve })
  }),
 )

 export const node = makeGlobalNode({
  service: Service,
  layer: layer,
-  deps: [Database.node, FSUtil.node, Git.node, AppProcess.node, ProjectDirectories.node],
+  deps: [Bus.node, Database.node, FSUtil.node, Git.node, AppProcess.node],
 })
@@ -1,35 +0,0 @@
-import { Effect } from "effect"
-import { AbsolutePath } from "../schema.js"
-import { Git } from "../git.js"
-import { DirectoryUnavailableError, StrategyID, type ListEntry, type Strategy } from "./copy.js"
-
-export function makeGitWorktreeStrategy(input: {
-  git: Git.Interface
-  canonical: (directory: AbsolutePath) => Effect.Effect<AbsolutePath, DirectoryUnavailableError>
-}) {
-  return {
-    id: StrategyID.make("git_worktree"),
-    create: Effect.fn("ProjectCopy.GitWorktree.create")(function* (options) {
-      const repository = yield* input.git.repo.discover(options.sourceDirectory)
-      if (!repository) return yield* new DirectoryUnavailableError({ directory: options.sourceDirectory })
-      yield* input.git.worktree.create({ repository, directory: options.directory })
-      return { directory: yield* input.canonical(options.directory) }
-    }),
-    remove: Effect.fn("ProjectCopy.GitWorktree.remove")(function* (options) {
-      const found = yield* input.git.repo.discover(options.directory)
-      if (!found) return yield* new DirectoryUnavailableError({ directory: options.directory })
-      yield* input.git.worktree.remove({ repository: found, directory: options.directory, force: options.force })
-    }),
-    list: Effect.fn("ProjectCopy.GitWorktree.list")(function* (directory) {
-      const found = yield* input.git.repo.discover(directory)
-      if (!found) return yield* new DirectoryUnavailableError({ directory })
-      const entries = yield* input.git.worktree.list(found)
-      return yield* Effect.forEach(entries, (entry) =>
-        input.canonical(entry.directory).pipe(
-          Effect.map((directory) => ({ directory, type: entry.kind === "main" ? "root" : "copy" }) as const),
-          Effect.catchTag("ProjectCopy.DirectoryUnavailableError", () => Effect.succeed(undefined)),
-        ),
-      ).pipe(Effect.map((items) => items.filter((item): item is ListEntry => item !== undefined)))
-    }),
-  } satisfies Strategy
-}
@@ -1,272 +0,0 @@
-export * as ProjectCopy from "./copy.js"
-
-import { Context, Effect, Layer, Schema } from "effect"
-import path from "path"
-import { AbsolutePath } from "../schema.js"
-import { FSUtil } from "@opencode-ai/util/fs-util"
-import { Git } from "../git.js"
-import { makeLocationNode } from "@opencode-ai/util/effect/app-node"
-import { Project } from "../project.js"
-import { ProjectDirectories } from "./directories.js"
-import { makeGitWorktreeStrategy } from "./copy-strategies.js"
-import { Slug } from "../util/slug.js"
-import { Bus } from "../bus.js"
-import { Database } from "../database/database.js"
-import { Location } from "../location.js"
-import { Event } from "@opencode-ai/schema/project-directories"
-import { ProjectCopy } from "@opencode-ai/schema/project-copy"
-
-export const StrategyID = ProjectCopy.StrategyID
-export type StrategyID = typeof StrategyID.Type
-
-export const CreateInput = ProjectCopy.CreateInput
-export type CreateInput = typeof CreateInput.Type
-
-export const RemoveInput = ProjectCopy.RemoveInput
-export type RemoveInput = typeof RemoveInput.Type
-
-export const RefreshInput = Schema.Struct({
-  projectID: Project.ID,
-}).annotate({ identifier: "ProjectCopy.RefreshInput" })
-export type RefreshInput = typeof RefreshInput.Type
-
-export const RefreshResult = Schema.Struct({
-  updated: Schema.Array(AbsolutePath),
-  removed: Schema.Array(AbsolutePath),
-}).annotate({ identifier: "ProjectCopy.RefreshResult" })
-export type RefreshResult = typeof RefreshResult.Type
-
-export const Copy = ProjectCopy.Copy
-export type Copy = typeof Copy.Type
-
-export const ListEntry = Schema.Struct({
-  directory: AbsolutePath,
-  type: Schema.Literals(["root", "copy"]),
-}).annotate({ identifier: "ProjectCopy.ListEntry" })
-export type ListEntry = typeof ListEntry.Type
-
-export class SourceDirectoryNotFoundError extends Schema.TaggedErrorClass<SourceDirectoryNotFoundError>()(
-  "ProjectCopy.SourceDirectoryNotFoundError",
-  { directory: AbsolutePath },
-) {}
-
-export class DestinationExistsError extends Schema.TaggedErrorClass<DestinationExistsError>()(
-  "ProjectCopy.DestinationExistsError",
-  { directory: AbsolutePath },
-) {}
-
-export class DirectoryUnavailableError extends Schema.TaggedErrorClass<DirectoryUnavailableError>()(
-  "ProjectCopy.DirectoryUnavailableError",
-  { directory: AbsolutePath },
-) {}
-
-export class InvalidDirectoryError extends Schema.TaggedErrorClass<InvalidDirectoryError>()(
-  "ProjectCopy.InvalidDirectoryError",
-  { directory: AbsolutePath },
-) {}
-
-export class StrategyUnavailableError extends Schema.TaggedErrorClass<StrategyUnavailableError>()(
-  "ProjectCopy.StrategyUnavailableError",
-  { strategy: StrategyID },
-) {}
-
-export type Error =
-  | SourceDirectoryNotFoundError
-  | DestinationExistsError
-  | DirectoryUnavailableError
-  | InvalidDirectoryError
-  | StrategyUnavailableError
-  | Git.WorktreeError
-
-export interface Strategy {
-  readonly id: StrategyID
-  readonly create: (input: {
-    sourceDirectory: AbsolutePath
-    directory: AbsolutePath
-  }) => Effect.Effect<Copy, Git.WorktreeError | DirectoryUnavailableError>
-  readonly remove: (input: {
-    directory: AbsolutePath
-    force: boolean
-  }) => Effect.Effect<void, Git.WorktreeError | DirectoryUnavailableError>
-  readonly list: (directory: AbsolutePath) => Effect.Effect<ListEntry[], Git.WorktreeError | DirectoryUnavailableError>
-}
-
-export { Event }
-
-export interface Interface {
-  readonly create: (input: CreateInput) => Effect.Effect<Copy, Error>
-  readonly remove: (input: RemoveInput) => Effect.Effect<void, Error>
-  readonly refresh: (input: RefreshInput) => Effect.Effect<RefreshResult, Error>
-}
-
-export class Service extends Context.Service<Service, Interface>()("@opencode/ProjectCopy") {}
-
-export const refreshAfterBoot = Effect.gen(function* () {
-  const location = yield* Location.Service
-  const copies = yield* Service
-  yield* Effect.gen(function* () {
-    yield* Effect.logInfo("project copy refresh started", { projectID: location.project.id })
-    const result = yield* copies.refresh({ projectID: location.project.id })
-    yield* Effect.logInfo("project copy refresh done", {
-      projectID: location.project.id,
-      updated: result.updated,
-      removed: result.removed,
-    })
-  }).pipe(
-    Effect.catchCause((cause) => Effect.logWarning("project copy refresh failed", { cause })),
-    Effect.forkScoped,
-    Effect.asVoid,
-  )
-})
-
-const layer = Layer.effect(
-  Service,
-  Effect.gen(function* () {
-    const fs = yield* FSUtil.Service
-    const git = yield* Git.Service
-    const directories = yield* ProjectDirectories.Service
-    const db = (yield* Database.Service).db
-    const bus = yield* Bus.Service
-
-    const changed = Effect.fnUntraced(function* (projectID: Project.ID, update: boolean) {
-      if (update) yield* bus.publish(Event.Updated, { projectID })
-    })
-
-    const canonical = Effect.fnUntraced(function* (input: AbsolutePath) {
-      const resolved = AbsolutePath.make(yield* fs.resolve(input))
-      if (!(yield* fs.isDir(resolved))) return yield* new DirectoryUnavailableError({ directory: input })
-      return resolved
-    })
-
-    const strategy = makeGitWorktreeStrategy({ git, canonical })
-
-    const source = Effect.fnUntraced(function* (input: AbsolutePath, projectID: Project.ID) {
-      const sourceDirectory = yield* canonical(input)
-      if ((yield* directories.get({ projectID, directory: sourceDirectory })) === undefined)
-        return yield* new SourceDirectoryNotFoundError({ directory: sourceDirectory })
-      return sourceDirectory
-    })
-
-    const getStrategy = Effect.fnUntraced(function* (id: StrategyID) {
-      if (id !== strategy.id) return yield* new StrategyUnavailableError({ strategy: id })
-      return strategy
-    })
-
-    const create = Effect.fn("ProjectCopy.create")(function* (input: CreateInput) {
-      const selected = yield* getStrategy(input.strategy)
-      const sourceDirectory = yield* source(input.sourceDirectory, input.projectID)
-      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}`))
-      }
-
-      const result = yield* selected.create({
-        directory: copyDirectory,
-        sourceDirectory,
-      })
-      yield* changed(
-        input.projectID,
-        yield* directories.create({
-          projectID: input.projectID,
-          directory: result.directory,
-          strategy: input.strategy,
-          behavior: "replace",
-        }),
-      )
-      return result
-    })
-
-    const remove = Effect.fn("ProjectCopy.remove")(function* (input: RemoveInput) {
-      const copyDirectory = yield* canonical(input.directory)
-      const stored = yield* directories.get({ projectID: input.projectID, directory: copyDirectory })
-      if (!stored?.strategy) return yield* new InvalidDirectoryError({ directory: copyDirectory })
-      const strategy = yield* getStrategy(StrategyID.make(stored.strategy))
-      yield* strategy.remove({
-        directory: copyDirectory,
-        force: input.force,
-      })
-      yield* changed(
-        input.projectID,
-        yield* directories.remove({ projectID: input.projectID, directory: copyDirectory }),
-      )
-    })
-
-    const refresh = Effect.fn("ProjectCopy.refresh")(function* (input: RefreshInput) {
-      const stored = yield* directories.list(input.projectID)
-      const checked = yield* Effect.forEach(
-        stored,
-        (item) => fs.isDir(item.directory).pipe(Effect.map((exists) => ({ ...item, exists }))),
-        { concurrency: "unbounded" },
-      )
-      const sourceDirectories = checked
-        .filter((item) => item.strategy === undefined && item.exists)
-        .map((item) => item.directory)
-      const discovered = yield* Effect.forEach(
-        sourceDirectories,
-        (sourceDirectory) =>
-          strategy.list(sourceDirectory).pipe(
-            Effect.catchTag("ProjectCopy.DirectoryUnavailableError", () => Effect.succeed([])),
-            Effect.map((items) =>
-              items.map((item) => ({
-                directory: item.directory,
-                strategy: item.type === "copy" ? strategy.id : undefined,
-              })),
-            ),
-          ),
-        { concurrency: "unbounded" },
-      ).pipe(
-        Effect.map((sets) => new Map(sets.flat().map((item) => [item.directory, item] as const)).values().toArray()),
-      )
-      const removed = checked.filter((item) => !item.exists).map((item) => item.directory)
-      const result = yield* db
-        .transaction((tx) =>
-          Effect.all({
-            updated: Effect.forEach(discovered, (item) =>
-              directories.create(
-                {
-                  projectID: input.projectID,
-                  directory: item.directory,
-                  strategy: item.strategy,
-                  behavior: "replace",
-                },
-                tx,
-              ),
-            ),
-            removed: Effect.forEach(removed, (directory) =>
-              directories.remove({ projectID: input.projectID, directory }, tx),
-            ),
-          }),
-        )
-        .pipe(Effect.orDie)
-      const changes = {
-        updated: discovered.filter((_, index) => result.updated[index]).map((item) => item.directory),
-        removed: removed.filter((_, index) => result.removed[index]),
-      }
-      yield* changed(input.projectID, changes.updated.length > 0 || changes.removed.length > 0)
-      return changes
-    })
-
-    return Service.of({
-      create,
-      remove,
-      refresh,
-    })
-  }),
-)
-
-export const node = makeLocationNode({
-  service: Service,
-  layer: layer,
-  deps: [FSUtil.node, Git.node, ProjectDirectories.node, Bus.node, Database.node],
-})
-
-export const refreshNode = makeLocationNode({
-  name: "project-copy-refresh",
-  layer: Layer.effectDiscard(refreshAfterBoot),
-  deps: [node, Location.node],
-})
@@ -1,128 +0,0 @@
-export * as ProjectDirectories from "./directories.js"
-
-import { and, asc, desc, eq, isNotNull, isNull, ne, or } from "drizzle-orm"
-import { Context, Effect, Layer, Schema } from "effect"
-import { Database } from "../database/database.js"
-import { makeGlobalNode } from "@opencode-ai/util/effect/app-node"
-import { AbsolutePath } from "../schema.js"
-import { ProjectSchema } from "./schema.js"
-import { ProjectDirectoryTable } from "./sql.js"
-import type { EffectDrizzleSqlite } from "../database/drizzle.js"
-import type { Project } from "../project.js"
-
-export type Directory = Project.Directory
-
-export const CreateInput = Schema.Struct({
-  projectID: ProjectSchema.ID,
-  directory: AbsolutePath,
-  strategy: Schema.optional(Schema.String),
-  behavior: Schema.Literals(["ignore", "replace"]).pipe(Schema.optional),
-})
-export type CreateInput = typeof CreateInput.Type
-
-export const RemoveInput = Schema.Struct({
-  projectID: ProjectSchema.ID,
-  directory: AbsolutePath,
-})
-export type RemoveInput = typeof RemoveInput.Type
-
-type DatabaseClient = EffectDrizzleSqlite.EffectSQLiteDatabase
-export type Transaction = Parameters<Parameters<DatabaseClient["transaction"]>[0]>[0]
-
-export const ListInput = ProjectSchema.DirectoriesInput
-export type ListInput = typeof ListInput.Type
-
-export const ListOutput = ProjectSchema.Directories
-export type ListOutput = typeof ListOutput.Type
-
-export interface Interface {
-  readonly list: (projectID: ProjectSchema.ID) => Effect.Effect<ReadonlyArray<Directory>>
-  readonly get: (input: {
-    projectID: ProjectSchema.ID
-    directory: AbsolutePath
-  }) => Effect.Effect<Directory | undefined>
-  readonly create: (input: CreateInput, tx?: Transaction) => Effect.Effect<boolean>
-  readonly remove: (input: RemoveInput, tx?: Transaction) => Effect.Effect<boolean>
-}
-
-export class Service extends Context.Service<Service, Interface>()("@opencode/ProjectDirectories") {}
-
-const layer = Layer.effect(
-  Service,
-  Effect.gen(function* () {
-    const db = (yield* Database.Service).db
-
-    const create = Effect.fn("ProjectDirectories.create")(function* (input: CreateInput, tx?: Transaction) {
-      const insert = (tx ?? db)
-        .insert(ProjectDirectoryTable)
-        .values({ project_id: input.projectID, directory: input.directory, strategy: input.strategy })
-      const query =
-        input.behavior === "replace"
-          ? insert.onConflictDoUpdate({
-              target: [ProjectDirectoryTable.project_id, ProjectDirectoryTable.directory],
-              set: { strategy: input.strategy ?? null },
-              setWhere: input.strategy
-                ? or(isNull(ProjectDirectoryTable.strategy), ne(ProjectDirectoryTable.strategy, input.strategy))
-                : isNotNull(ProjectDirectoryTable.strategy),
-            })
-          : insert.onConflictDoNothing()
-      return (
-        (yield* query.returning({ directory: ProjectDirectoryTable.directory }).get().pipe(Effect.orDie)) !== undefined
-      )
-    })
-
-    const remove = Effect.fn("ProjectDirectories.remove")(function* (input: RemoveInput, tx?: Transaction) {
-      return (
-        (yield* (tx ?? db)
-          .delete(ProjectDirectoryTable)
-          .where(
-            and(
-              eq(ProjectDirectoryTable.project_id, input.projectID),
-              eq(ProjectDirectoryTable.directory, input.directory),
-            ),
-          )
-          .returning({ directory: ProjectDirectoryTable.directory })
-          .get()
-          .pipe(Effect.orDie)) !== undefined
-      )
-    })
-
-    const list = Effect.fn("ProjectDirectories.list")(function* (projectID: ProjectSchema.ID) {
-      const rows = yield* db
-        .select({ directory: ProjectDirectoryTable.directory, strategy: ProjectDirectoryTable.strategy })
-        .from(ProjectDirectoryTable)
-        .where(eq(ProjectDirectoryTable.project_id, projectID))
-        .orderBy(desc(ProjectDirectoryTable.time_created), asc(ProjectDirectoryTable.directory))
-        .all()
-        .pipe(Effect.orDie)
-      return rows.map((row) => ({ directory: row.directory, strategy: row.strategy ?? undefined }))
-    })
-
-    const get = Effect.fn("ProjectDirectories.get")(function* (input: {
-      projectID: ProjectSchema.ID
-      directory: AbsolutePath
-    }) {
-      const row = yield* db
-        .select({ directory: ProjectDirectoryTable.directory, strategy: ProjectDirectoryTable.strategy })
-        .from(ProjectDirectoryTable)
-        .where(
-          and(
-            eq(ProjectDirectoryTable.project_id, input.projectID),
-            eq(ProjectDirectoryTable.directory, input.directory),
-          ),
-        )
-        .get()
-        .pipe(Effect.orDie)
-      return row ? { directory: row.directory, strategy: row.strategy ?? undefined } : undefined
-    })
-
-    return Service.of({
-      list,
-      get,
-      create,
-      remove,
-    })
-  }),
-)
-
-export const node = makeGlobalNode({ service: Service, layer: layer, deps: [Database.node] })
@@ -10,18 +10,9 @@ export type ID = typeof ID.Type
 export const Current = Project.Current
 export type Current = typeof Current.Type

-export const Directory = Project.Directory
-export type Directory = typeof Directory.Type
-
 export const Info = Project.Info
 export interface Info extends Schema.Schema.Type<typeof Info> {}

-export const DirectoriesInput = Project.DirectoriesInput
-export type DirectoriesInput = typeof DirectoriesInput.Type
-
-export const Directories = Project.Directories
-export type Directories = typeof Directories.Type
-
 export const Vcs = Schema.Union([
  Schema.Struct({
    type: Schema.Literal("git"),
@@ -23,6 +23,7 @@ export const ProjectTable = sqliteTable("project", {
  commands: text({ mode: "json" }).$type<{ start?: string }>(),
 })

+/** @deprecated Use WorktreeTable from worktree/sql instead. */
 export const ProjectDirectoryTable = sqliteTable(
  "project_directory",
  {
@@ -748,7 +748,7 @@ const layer = Layer.effect(
            projectID: project.id,
            subpath: RelativePath.make(path.relative(project.directory, directory).replaceAll("\\", "/")),
          },
-          delivery: input.delivery ?? "queue",
+          delivery: input.delivery ?? "steer",
        })
        const inboxID = SessionMessage.ID.create()
        yield* SessionInbox.admit(db, bus, {
@@ -67,16 +67,17 @@ export const layer = Layer.effect(
    const releaseOnCommit = (sessionID: SessionSchema.ID) => ({
      commit: () => store.release(sessionID),
    })
-    const coordinator = yield* SessionRunCoordinator.make<SessionSchema.ID, SessionRunner.RunError, InterruptReason>({
-      started: (sessionID) =>
-        reportLifecycle(
-          sessionID,
-          bus.publish(SessionEvent.Execution.Started, { sessionID }, claimOnCommit(sessionID)),
-        ),
-      drain: Effect.fnUntraced(function* (sessionID: SessionSchema.ID, force) {
+    function drain(
+      sessionID: SessionSchema.ID,
+      force: boolean,
+      continuation?: SessionRunner.Continuation,
+    ): Effect.Effect<void, SessionRunner.RunError> {
+      return Effect.gen(function* () {
        const session = yield* store.get(sessionID)
        if (!session) return yield* Effect.die(new Error(`Session not found: ${sessionID}`))
-        return yield* SessionRunner.Service.use((runner) => runner.drain({ sessionID, force })).pipe(
+        const result = yield* SessionRunner.Service.use((runner) =>
+          runner.drain({ sessionID, force, continuation }),
+        ).pipe(
          Effect.provide(locations.get(session.location)),
          Effect.tapCause((cause) =>
            Cause.hasInterruptsOnly(cause)
@@ -84,7 +85,17 @@ export const layer = Layer.effect(
              : Effect.logError("Failed to drain Session", cause).pipe(Effect.annotateLogs({ sessionID })),
          ),
        )
-      }),
+        if (result.type === "complete") return
+        return yield* drain(sessionID, false, result.continuation)
+      })
+    }
+    const coordinator = yield* SessionRunCoordinator.make<SessionSchema.ID, SessionRunner.RunError, InterruptReason>({
+      started: (sessionID) =>
+        reportLifecycle(
+          sessionID,
+          bus.publish(SessionEvent.Execution.Started, { sessionID }, claimOnCommit(sessionID)),
+        ),
+      drain: (sessionID, force) => drain(sessionID, force),
      // One terminal observation per busy period, covering every coalesced drain.
      settled: (sessionID, exit, reason) =>
        reportLifecycle(
@@ -1,7 +1,8 @@
 export * as SessionProjector from "./projector.js"

-import { and, asc, desc, eq, gt, gte, lt, lte, sql } from "drizzle-orm"
+import { and, asc, desc, eq, gt, gte, inArray, lt, lte, sql } from "drizzle-orm"
 import { DateTime, Effect, Layer, Schema, Stream } from "effect"
+import path from "path"
 import { Database } from "../database/database.js"
 import { Bus } from "../bus.js"
 import { makeGlobalNode } from "@opencode-ai/util/effect/app-node"
@@ -15,7 +16,10 @@ import { Workspace } from "../workspace.js"
 import { InstructionState } from "./instruction-state.js"
 import { SessionInboxTable, SessionMessageTable, SessionTable } from "./sql.js"
 import { Slug } from "../util/slug.js"
+import { FSUtil } from "@opencode-ai/util/fs-util"
 import { Money } from "@opencode-ai/schema/money"
+import { Worktree } from "@opencode-ai/schema/worktree"
+import { Project } from "@opencode-ai/schema/project"
 import { AbsolutePath, RelativePath } from "../schema.js"
 import type { SessionSchema } from "./schema.js"

@@ -435,6 +439,47 @@ const layer = Layer.effectDiscard(
        yield* InstructionState.reset(db, event.data.sessionID)
      }),
    )
+    // Sessions whose ownership came from the directory's previous resolution
+    // follow its new identity. Location, transcript, instructions, and recency
+    // are untouched: the session did not move, its directory got identified.
+    yield* bus.project(Worktree.Event.Resolved, (event) =>
+      Effect.gen(function* () {
+        const stale = [event.data.previous, Project.ID.global].filter((id) => id !== event.data.projectID)
+        if (stale.length === 0) return
+        const rows = yield* db
+          .select({ id: SessionTable.id, directory: SessionTable.directory })
+          .from(SessionTable)
+          .where(
+            and(
+              inArray(SessionTable.project_id, stale),
+              // Lexicographic range narrows the scan to prefix neighbors without
+              // LIKE escaping; FSUtil.contains below decides containment exactly.
+              gte(SessionTable.directory, event.data.directory),
+              lte(SessionTable.directory, AbsolutePath.make(event.data.directory + "\uffff")),
+            ),
+          )
+          .all()
+          .pipe(Effect.orDie)
+        yield* Effect.forEach(
+          rows,
+          (row) => {
+            if (!FSUtil.contains(event.data.directory, row.directory)) return Effect.void
+            return db
+              .update(SessionTable)
+              .set({
+                project_id: event.data.projectID,
+                path: RelativePath.make(path.relative(event.data.directory, row.directory).replaceAll("\\", "/")),
+                // Self-assignment suppresses the column's $onUpdate: adoption is not activity.
+                time_updated: sql`${SessionTable.time_updated}`,
+              })
+              .where(eq(SessionTable.id, row.id))
+              .run()
+              .pipe(Effect.orDie)
+          },
+          { discard: true },
+        )
+      }),
+    )
    yield* bus.project(SessionEvent.Deleted, (event) =>
      db.delete(SessionTable).where(eq(SessionTable.id, event.data.sessionID)).run().pipe(Effect.orDie),
    )
@@ -16,13 +16,20 @@ export type RunError =
  | UserInterruptedError
  | Instructions.InitializationBlocked

+export type Continuation = { readonly step: number }
+
+export type DrainResult =
+  | { readonly type: "complete" }
+  | { readonly type: "moved"; readonly continuation?: Continuation }
+
 /** Runs one local continuation from already-recorded Session history. */
 export interface Interface {
-  /** Drains eligible durable work. Explicit runs make one model call even when no work is eligible. */
+  /** Drains eligible durable work, returning transient state when execution must continue at a new Location. */
  readonly drain: (input: {
    readonly sessionID: SessionSchema.ID
    readonly force: boolean
-  }) => Effect.Effect<void, RunError>
+    readonly continuation?: Continuation
+  }) => Effect.Effect<DrainResult, RunError>
 }

 export class Service extends Context.Service<Service, Interface>()("@opencode/SessionRunner") {}
@@ -23,7 +23,7 @@ import { SessionMessage } from "../message.js"
 import { SessionSchema } from "../schema.js"
 import { SessionStore } from "../store.js"
 import { SessionTitle } from "../title.js"
-import { Service } from "./index.js"
+import { Service, type Continuation } from "./index.js"
 import { createLLMEventPublisher, type StepRecord } from "./publish-llm-event.js"
 import { Snapshot } from "../../snapshot.js"
 import { makeLocationNode } from "@opencode-ai/util/effect/app-node"
@@ -124,19 +124,25 @@ const layer = Layer.effect(
    const drain = Effect.fn("SessionRunner.drain")(function* (input: {
      readonly sessionID: SessionSchema.ID
      readonly force: boolean
+      readonly continuation?: Continuation
    }) {
      let force = input.force
-      if (!force && !(yield* SessionInbox.has(db, input.sessionID, "any"))) return
+      let continuation = input.continuation
+      if (!force && !continuation && !(yield* SessionInbox.has(db, input.sessionID, "any")))
+        return { type: "complete" as const }
      yield* settleStaleToolCalls(input.sessionID)
      while (true) {
        if (yield* runPendingCompaction(input.sessionID)) {
          force = false
          continue
        }
-        if (yield* runPendingMove(input.sessionID)) return
-        if (!force && !(yield* SessionInbox.has(db, input.sessionID, "input"))) return
-        if (yield* runSteps(input.sessionID)) return
+        if (yield* runPendingMove(input.sessionID, "input")) return { type: "moved" as const }
+        if (!force && !continuation && !(yield* SessionInbox.has(db, input.sessionID, "input")))
+          return { type: "complete" as const }
+        const result = yield* runSteps(input.sessionID, continuation)
+        if (result.type === "moved") return result
        force = false
+        continuation = undefined
      }
    })

@@ -144,15 +150,21 @@ const layer = Layer.effect(
     * Runs logical steps until no tool result or newly admitted steer requires another
     * model call. Queued inputs remain pending until the current model work reaches idle.
     */
-    const runSteps = Effect.fn("SessionRunner.runSteps")(function* (sessionID: SessionSchema.ID) {
+    const runSteps = Effect.fn("SessionRunner.runSteps")(function* (
+      sessionID: SessionSchema.ID,
+      continuation?: Continuation,
+    ) {
      // Fresh work may promote queued input; later steps absorb steers only.
-      let promotable: SessionInbox.Promotable = "input"
-      let step = 1
+      let promotable: SessionInbox.Promotable = continuation ? "steer" : "input"
+      let step = continuation?.step ?? 1
+      let next = continuation
      while (true) {
        if (yield* runPendingCompaction(sessionID)) continue
-        if (yield* runPendingMove(sessionID)) return true
+        if (yield* runPendingMove(sessionID, "steer")) return { type: "moved" as const, continuation: next }
        const result = yield* runStep(sessionID, promotable, step)
-        if (!result.needsContinuation && !(yield* SessionInbox.has(db, sessionID, "steer"))) return false
+        next = result.needsContinuation ? { step: result.step + 1 } : undefined
+        if (!result.needsContinuation && !(yield* SessionInbox.has(db, sessionID, "steer")))
+          return { type: "complete" as const }
        promotable = "steer"
        step = result.step + 1
      }
@@ -530,12 +542,16 @@ const layer = Layer.effect(
      )
    })

-    const runPendingMove = Effect.fn("SessionRunner.runPendingMove")(function* (sessionID: SessionSchema.ID) {
+    const runPendingMove = Effect.fn("SessionRunner.runPendingMove")(function* (
+      sessionID: SessionSchema.ID,
+      promotable: SessionInbox.Promotable,
+    ) {
      return yield* SessionInbox.serialized(
        sessionID,
        Effect.gen(function* () {
          const pending =
-            (yield* SessionInbox.nextSteer(db, sessionID)) ?? (yield* SessionInbox.nextQueued(db, sessionID))
+            (yield* SessionInbox.nextSteer(db, sessionID)) ??
+            (promotable === "input" ? yield* SessionInbox.nextQueued(db, sessionID) : undefined)
          if (pending?.type !== "move") return false
          yield* bus.publishAll([
            [SessionEvent.InboxDelivered, { sessionID, inboxID: pending.id }],
@@ -0,0 +1,349 @@
+export * as Worktree from "./worktree.js"
+
+import { Context, Effect, Layer, Schema } from "effect"
+import { and, asc, desc, eq, isNotNull, isNull, ne, or } from "drizzle-orm"
+import path from "path"
+import { AbsolutePath } from "./schema.js"
+import { FSUtil } from "@opencode-ai/util/fs-util"
+import { Git } from "./git.js"
+import { makeGlobalNode, makeLocationNode } from "@opencode-ai/util/effect/app-node"
+import { ProjectSchema } from "./project/schema.js"
+import { Slug } from "./util/slug.js"
+import { Bus } from "./bus.js"
+import { Database } from "./database/database.js"
+import { Location } from "./location.js"
+import { Worktree } from "@opencode-ai/schema/worktree"
+import { WorktreeTable } from "./worktree/sql.js"
+import { canonical, DirectoryUnavailableError } from "./worktree/directory.js"
+import { WorktreeGit } from "./worktree/git.js"
+import type { EffectDrizzleSqlite } from "./database/drizzle.js"
+
+export { DirectoryUnavailableError } from "./worktree/directory.js"
+
+export const StrategyID = Worktree.StrategyID
+export type StrategyID = typeof StrategyID.Type
+
+export const CreateInput = Worktree.CreateInput
+export type CreateInput = typeof CreateInput.Type
+
+export const RemoveInput = Worktree.RemoveInput
+export type RemoveInput = typeof RemoveInput.Type
+
+export const RefreshInput = Schema.Struct({
+  projectID: ProjectSchema.ID,
+}).annotate({ identifier: "Worktree.RefreshInput" })
+export type RefreshInput = typeof RefreshInput.Type
+
+export const RefreshResult = Schema.Struct({
+  updated: Schema.Array(AbsolutePath),
+  removed: Schema.Array(AbsolutePath),
+}).annotate({ identifier: "Worktree.RefreshResult" })
+export type RefreshResult = typeof RefreshResult.Type
+
+export const Info = Worktree.Info
+export type Info = typeof Info.Type
+
+export const ListInput = Worktree.ListInput
+export type ListInput = typeof ListInput.Type
+
+export const List = Worktree.List
+export type List = typeof List.Type
+
+export const ListEntry = Schema.Struct({
+  directory: AbsolutePath,
+  type: Schema.Literals(["root", "worktree"]),
+}).annotate({ identifier: "Worktree.ListEntry" })
+export type ListEntry = typeof ListEntry.Type
+
+export class SourceDirectoryNotFoundError extends Schema.TaggedErrorClass<SourceDirectoryNotFoundError>()(
+  "Worktree.SourceDirectoryNotFoundError",
+  { projectID: ProjectSchema.ID },
+) {}
+
+export class DestinationExistsError extends Schema.TaggedErrorClass<DestinationExistsError>()(
+  "Worktree.DestinationExistsError",
+  { directory: AbsolutePath },
+) {}
+
+export class InvalidDirectoryError extends Schema.TaggedErrorClass<InvalidDirectoryError>()(
+  "Worktree.InvalidDirectoryError",
+  { directory: AbsolutePath },
+) {}
+
+export class StrategyUnavailableError extends Schema.TaggedErrorClass<StrategyUnavailableError>()(
+  "Worktree.StrategyUnavailableError",
+  { strategy: StrategyID },
+) {}
+
+export class DuplicateStrategyError extends Schema.TaggedErrorClass<DuplicateStrategyError>()(
+  "Worktree.DuplicateStrategyError",
+  { strategy: StrategyID },
+) {}
+
+export type Error =
+  | SourceDirectoryNotFoundError
+  | DestinationExistsError
+  | DirectoryUnavailableError
+  | InvalidDirectoryError
+  | StrategyUnavailableError
+  | Git.WorktreeError
+
+export interface Strategy {
+  readonly id: StrategyID
+  readonly create: (input: {
+    sourceDirectory: AbsolutePath
+    directory: AbsolutePath
+  }) => Effect.Effect<Info, Git.WorktreeError | DirectoryUnavailableError>
+  readonly remove: (input: {
+    directory: AbsolutePath
+    force: boolean
+  }) => Effect.Effect<void, Git.WorktreeError | DirectoryUnavailableError>
+  readonly list: (directory: AbsolutePath) => Effect.Effect<ListEntry[], Git.WorktreeError | DirectoryUnavailableError>
+}
+
+export const Event = Worktree.Event
+
+interface StoredInput {
+  readonly projectID: ProjectSchema.ID
+  readonly directory: AbsolutePath
+  readonly strategy?: string
+}
+
+type DatabaseClient = EffectDrizzleSqlite.EffectSQLiteDatabase
+type Transaction = Parameters<Parameters<DatabaseClient["transaction"]>[0]>[0]
+
+export interface Interface {
+  readonly register: (strategy: Strategy) => Effect.Effect<void, DuplicateStrategyError>
+  readonly list: (projectID: ProjectSchema.ID) => Effect.Effect<List>
+  readonly create: (input: CreateInput) => Effect.Effect<Info, Error>
+  readonly remove: (input: RemoveInput) => Effect.Effect<void, Error>
+  readonly refresh: (input: RefreshInput) => Effect.Effect<RefreshResult, Error>
+}
+
+export class Service extends Context.Service<Service, Interface>()("@opencode/v2/Worktree") {}
+
+export const refreshAfterBoot = Effect.gen(function* () {
+  const location = yield* Location.Service
+  const worktrees = yield* Service
+  yield* Effect.gen(function* () {
+    yield* Effect.logInfo("worktree refresh started", { projectID: location.project.id })
+    const result = yield* worktrees.refresh({ projectID: location.project.id })
+    yield* Effect.logInfo("worktree refresh done", {
+      projectID: location.project.id,
+      updated: result.updated,
+      removed: result.removed,
+    })
+  }).pipe(
+    Effect.catchCause((cause) => Effect.logWarning("worktree refresh failed", { cause })),
+    Effect.forkScoped,
+    Effect.asVoid,
+  )
+})
+
+const layer = Layer.effect(
+  Service,
+  Effect.gen(function* () {
+    const fs = yield* FSUtil.Service
+    const db = (yield* Database.Service).db
+    const bus = yield* Bus.Service
+
+    const changed = Effect.fnUntraced(function* (projectID: ProjectSchema.ID, update: boolean) {
+      if (update) yield* bus.publish(Event.Updated, { projectID })
+    })
+
+    const ops = {
+      list: Effect.fn("Worktree.list")(function* (projectID: ProjectSchema.ID) {
+        const rows = yield* db
+          .select({ directory: WorktreeTable.directory, strategy: WorktreeTable.strategy })
+          .from(WorktreeTable)
+          .where(eq(WorktreeTable.project_id, projectID))
+          .orderBy(desc(WorktreeTable.time_created), asc(WorktreeTable.directory))
+          .all()
+          .pipe(Effect.orDie)
+        return rows.map((row) => ({ directory: row.directory, strategy: row.strategy ?? undefined }))
+      }),
+      find: Effect.fnUntraced(function* (projectID: ProjectSchema.ID, directory: AbsolutePath) {
+        const row = yield* db
+          .select({ directory: WorktreeTable.directory, strategy: WorktreeTable.strategy })
+          .from(WorktreeTable)
+          .where(and(eq(WorktreeTable.project_id, projectID), eq(WorktreeTable.directory, directory)))
+          .get()
+          .pipe(Effect.orDie)
+        return row ? { directory: row.directory, strategy: row.strategy ?? undefined } : undefined
+      }),
+      create: Effect.fnUntraced(function* (input: StoredInput, tx?: Transaction) {
+        return (
+          (yield* (tx ?? db)
+            .insert(WorktreeTable)
+            .values({ project_id: input.projectID, directory: input.directory, strategy: input.strategy })
+            .onConflictDoUpdate({
+              target: [WorktreeTable.project_id, WorktreeTable.directory],
+              set: { strategy: input.strategy ?? null },
+              setWhere: input.strategy
+                ? or(isNull(WorktreeTable.strategy), ne(WorktreeTable.strategy, input.strategy))
+                : isNotNull(WorktreeTable.strategy),
+            })
+            .returning({ directory: WorktreeTable.directory })
+            .get()
+            .pipe(Effect.orDie)) !== undefined
+        )
+      }),
+      remove: Effect.fnUntraced(function* (projectID: ProjectSchema.ID, directory: AbsolutePath, tx?: Transaction) {
+        return (
+          (yield* (tx ?? db)
+            .delete(WorktreeTable)
+            .where(and(eq(WorktreeTable.project_id, projectID), eq(WorktreeTable.directory, directory)))
+            .returning({ directory: WorktreeTable.directory })
+            .get()
+            .pipe(Effect.orDie)) !== undefined
+        )
+      }),
+    }
+
+    const registry = new Map<StrategyID, Strategy>()
+
+    const register = Effect.fn("Worktree.register")(function* (strategy: Strategy) {
+      if (registry.has(strategy.id)) return yield* new DuplicateStrategyError({ strategy: strategy.id })
+      registry.set(strategy.id, strategy)
+    })
+
+    // Register default strategies
+    const gitStrategy = yield* WorktreeGit.make
+    yield* register(gitStrategy).pipe(Effect.orDie)
+
+    const strategies = () => Array.from(registry.values())
+
+    const source = Effect.fnUntraced(function* (projectID: ProjectSchema.ID) {
+      const checked = yield* Effect.forEach(
+        yield* ops.list(projectID),
+        (item) =>
+          canonical(fs, item.directory).pipe(
+            Effect.catchTag("Worktree.DirectoryUnavailableError", () => Effect.succeed(undefined)),
+          ),
+        { concurrency: "unbounded" },
+      )
+      const found = checked.find((directory) => directory !== undefined)
+      if (!found) return yield* new SourceDirectoryNotFoundError({ projectID })
+      return found
+    })
+
+    const getStrategy = Effect.fnUntraced(function* (id: StrategyID) {
+      const found = registry.get(id)
+      if (!found) return yield* new StrategyUnavailableError({ strategy: id })
+      return found
+    })
+
+    const create = Effect.fn("Worktree.create")(function* (input: CreateInput) {
+      const selected = yield* getStrategy(input.strategy)
+      const sourceDirectory = yield* source(input.projectID)
+      yield* fs.makeDirectory(input.directory, { recursive: true }).pipe(Effect.orDie)
+      const name = input.name ?? Slug.create()
+      let suffix = 1
+      let worktreeDirectory = AbsolutePath.make(path.join(input.directory, name))
+      while (yield* fs.existsSafe(worktreeDirectory)) {
+        suffix++
+        if (suffix > 10) return yield* new DestinationExistsError({ directory: worktreeDirectory })
+        worktreeDirectory = AbsolutePath.make(path.join(input.directory, `${name}-${suffix}`))
+      }
+
+      const result = yield* selected.create({
+        directory: worktreeDirectory,
+        sourceDirectory,
+      })
+      yield* changed(
+        input.projectID,
+        yield* ops.create({
+          projectID: input.projectID,
+          directory: result.directory,
+          strategy: input.strategy,
+        }),
+      )
+      return result
+    })
+
+    const remove = Effect.fn("Worktree.remove")(function* (input: RemoveInput) {
+      const worktreeDirectory = yield* canonical(fs, input.directory)
+      const stored = yield* ops.find(input.projectID, worktreeDirectory)
+      if (!stored?.strategy) return yield* new InvalidDirectoryError({ directory: worktreeDirectory })
+      yield* (yield* getStrategy(StrategyID.make(stored.strategy))).remove({
+        directory: worktreeDirectory,
+        force: input.force,
+      })
+      yield* changed(input.projectID, yield* ops.remove(input.projectID, worktreeDirectory))
+    })
+
+    const refresh = Effect.fn("Worktree.refresh")(function* (input: RefreshInput) {
+      const stored = yield* ops.list(input.projectID)
+      const checked = yield* Effect.forEach(
+        stored,
+        (item) => fs.isDir(item.directory).pipe(Effect.map((exists) => ({ ...item, exists }))),
+        { concurrency: "unbounded" },
+      )
+      const sourceDirectories = checked
+        .filter((item) => item.strategy === undefined && item.exists)
+        .map((item) => item.directory)
+      const discovered = yield* Effect.forEach(
+        sourceDirectories,
+        (sourceDirectory) =>
+          Effect.forEach(strategies(), (strategy) =>
+            strategy.list(sourceDirectory).pipe(
+              Effect.catchTag("Worktree.DirectoryUnavailableError", () => Effect.succeed([])),
+              Effect.map((items) =>
+                items.map((item) => ({
+                  directory: item.directory,
+                  strategy: item.type === "worktree" ? strategy.id : undefined,
+                })),
+              ),
+            ),
+          ),
+        { concurrency: "unbounded" },
+      ).pipe(
+        Effect.map((sets) => new Map(sets.flat(2).map((item) => [item.directory, item] as const)).values().toArray()),
+      )
+      const removed = checked.filter((item) => !item.exists).map((item) => item.directory)
+      const result = yield* db
+        .transaction((tx) =>
+          Effect.all({
+            updated: Effect.forEach(discovered, (item) =>
+              ops.create(
+                {
+                  projectID: input.projectID,
+                  directory: item.directory,
+                  strategy: item.strategy,
+                },
+                tx,
+              ),
+            ),
+            removed: Effect.forEach(removed, (directory) => ops.remove(input.projectID, directory, tx)),
+          }),
+        )
+        .pipe(Effect.orDie)
+      const changes = {
+        updated: discovered.filter((_, index) => result.updated[index]).map((item) => item.directory),
+        removed: removed.filter((_, index) => result.removed[index]),
+      }
+      yield* changed(input.projectID, changes.updated.length > 0 || changes.removed.length > 0)
+      return changes
+    })
+
+    return Service.of({
+      register,
+      list: ops.list,
+      create,
+      remove,
+      refresh,
+    })
+  }),
+)
+
+export const node = makeGlobalNode({
+  service: Service,
+  layer: layer,
+  deps: [FSUtil.node, Git.node, Bus.node, Database.node],
+})
+
+export const refreshNode = makeLocationNode({
+  name: "worktree-refresh",
+  layer: Layer.effectDiscard(refreshAfterBoot),
+  deps: [node, Location.node],
+})
@@ -0,0 +1,16 @@
+export * as WorktreeDirectory from "./directory.js"
+
+import { Effect, Schema } from "effect"
+import { FSUtil } from "@opencode-ai/util/fs-util"
+import { AbsolutePath } from "../schema.js"
+
+export class DirectoryUnavailableError extends Schema.TaggedErrorClass<DirectoryUnavailableError>()(
+  "Worktree.DirectoryUnavailableError",
+  { directory: AbsolutePath },
+) {}
+
+export const canonical = Effect.fnUntraced(function* (fs: FSUtil.Interface, input: AbsolutePath) {
+  const resolved = AbsolutePath.make(yield* fs.resolve(input))
+  if (!(yield* fs.isDir(resolved))) return yield* new DirectoryUnavailableError({ directory: input })
+  return resolved
+})
@@ -0,0 +1,39 @@
+export * as WorktreeGit from "./git.js"
+
+import { Effect } from "effect"
+import { Worktree } from "@opencode-ai/schema/worktree"
+import { FSUtil } from "@opencode-ai/util/fs-util"
+import { Git } from "../git.js"
+import { canonical, DirectoryUnavailableError } from "./directory.js"
+import type { ListEntry, Strategy } from "../worktree.js"
+
+export const make = Effect.gen(function* () {
+  const fs = yield* FSUtil.Service
+  const git = yield* Git.Service
+
+  return {
+    id: Worktree.StrategyID.make("git"),
+    create: Effect.fn("Worktree.Git.create")(function* (input) {
+      const repository = yield* git.repo.discover(input.sourceDirectory)
+      if (!repository) return yield* new DirectoryUnavailableError({ directory: input.sourceDirectory })
+      yield* git.worktree.create({ repository, directory: input.directory })
+      return { directory: yield* canonical(fs, input.directory) }
+    }),
+    remove: Effect.fn("Worktree.Git.remove")(function* (input) {
+      const repository = yield* git.repo.discover(input.directory)
+      if (!repository) return yield* new DirectoryUnavailableError({ directory: input.directory })
+      yield* git.worktree.remove({ repository, directory: input.directory, force: input.force })
+    }),
+    list: Effect.fn("Worktree.Git.list")(function* (directory) {
+      const repository = yield* git.repo.discover(directory)
+      if (!repository) return yield* new DirectoryUnavailableError({ directory })
+      const entries = yield* git.worktree.list(repository)
+      return yield* Effect.forEach(entries, (entry) =>
+        canonical(fs, entry.directory).pipe(
+          Effect.map((directory) => ({ directory, type: entry.kind === "main" ? "root" : "worktree" }) as const),
+          Effect.catchTag("Worktree.DirectoryUnavailableError", () => Effect.succeed(undefined)),
+        ),
+      ).pipe(Effect.map((items) => items.filter((item): item is ListEntry => item !== undefined)))
+    }),
+  } satisfies Strategy
+})
@@ -0,0 +1,20 @@
+import { integer, primaryKey, sqliteTable, text } from "drizzle-orm/sqlite-core"
+import { absoluteColumn } from "../database/path.js"
+import { ProjectSchema } from "../project/schema.js"
+import { ProjectTable } from "../project/sql.js"
+
+export const WorktreeTable = sqliteTable(
+  "worktree",
+  {
+    project_id: text()
+      .$type<ProjectSchema.ID>()
+      .notNull()
+      .references(() => ProjectTable.id, { onDelete: "cascade" }),
+    directory: absoluteColumn().notNull(),
+    strategy: text(),
+    time_created: integer()
+      .notNull()
+      .$default(() => Date.now()),
+  },
+  (table) => [primaryKey({ columns: [table.project_id, table.directory] })],
+)
@@ -12,6 +12,7 @@ import { Database } from "@opencode-ai/core/database/database"
 import { tmpdir } from "./fixture/tmpdir"
 import type { SqlClient } from "effect/unstable/sql/SqlClient"
 import legacyCredentialsMigration from "@opencode-ai/core/database/migration/20260805200742_import_legacy_credentials"
+import worktreeMigration from "@opencode-ai/core/database/migration/20260812213948_worktree"
 import { Global } from "@opencode-ai/util/global"

 const run = <A, E>(
@@ -127,6 +128,31 @@ describe("DatabaseMigration", () => {
    )
  })

+  test("copies project directories into worktrees without removing the old table", async () => {
+    await run(
+      Effect.gen(function* () {
+        const db = yield* makeDb
+        yield* db.run(sql`CREATE TABLE project (id text PRIMARY KEY)`)
+        yield* db.run(
+          sql`CREATE TABLE project_directory (project_id text NOT NULL, directory text NOT NULL, type text, strategy text, time_created integer NOT NULL, PRIMARY KEY (project_id, directory))`,
+        )
+        yield* db.run(
+          sql`INSERT INTO project_directory (project_id, directory, type, strategy, time_created) VALUES ('project', '/root', 'main', NULL, 1), ('project', '/legacy', 'git_worktree', NULL, 2), ('project', '/strategy', NULL, 'git_worktree', 3), ('project', '/custom', NULL, 'acme/snapshot', 4)`,
+        )
+
+        yield* DatabaseMigration.applyOnly(db, [worktreeMigration])
+
+        expect(yield* db.all(sql`SELECT directory, strategy FROM worktree ORDER BY directory`)).toEqual([
+          { directory: "/custom", strategy: "acme/snapshot" },
+          { directory: "/legacy", strategy: "git" },
+          { directory: "/root", strategy: null },
+          { directory: "/strategy", strategy: "git" },
+        ])
+        expect(yield* db.get(sql`SELECT count(*) AS count FROM project_directory`)).toEqual({ count: 4 })
+      }),
+    )
+  })
+
  test("imports legacy JSON credentials without changing the source file or existing credentials", async () => {
    await using tmp = await tmpdir()
    const source = path.join(tmp.path, "auth.json")
@@ -78,7 +78,6 @@ describe("node build", () => {
        acquisitions++
        return Project.Service.of({
          list: () => Effect.succeed([]),
-          directories: () => Effect.succeed([]),
          resolve: (directory) => Effect.succeed({ id: Project.ID.global, directory, canonical: directory }),
        })
      }),
@@ -13,7 +13,6 @@ const projectLayer = Layer.succeed(
  Project.Service,
  Project.Service.of({
    list: () => Effect.succeed([]),
-    directories: () => Effect.succeed([]),
    resolve: () =>
      Effect.succeed({
        id: Project.ID.make("project"),
@@ -1,69 +0,0 @@
-import { describe, expect } from "bun:test"
-import { Effect, Schema } from "effect"
-import { Database } from "@opencode-ai/core/database/database"
-import { LayerNode } from "@opencode-ai/util/effect/layer-node"
-import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
-import { Project } from "@opencode-ai/core/project"
-import { ProjectDirectories } from "@opencode-ai/core/project/directories"
-import { ProjectTable } from "@opencode-ai/core/project/sql"
-import { AbsolutePath } from "@opencode-ai/core/schema"
-import { testEffect } from "./lib/effect"
-
-const it = testEffect(AppNodeBuilder.build(LayerNode.group([Database.node, ProjectDirectories.node])))
-
-const projectID = Project.ID.make("project-directories")
-const directory = AbsolutePath.make("/tmp/project-directories")
-
-function setup() {
-  return Database.Service.use(({ db }) =>
-    db
-      .insert(ProjectTable)
-      .values({ id: projectID, worktree: directory, sandboxes: [], time_created: 1, time_updated: 1 })
-      .onConflictDoNothing()
-      .run()
-      .pipe(Effect.orDie),
-  )
-}
-
-describe("ProjectDirectories", () => {
-  it.effect("decodes directory schemas", () =>
-    Effect.sync(() => {
-      expect(Schema.decodeUnknownSync(ProjectDirectories.ListInput)({ projectID })).toEqual({ projectID })
-      expect(Schema.decodeUnknownSync(ProjectDirectories.ListOutput)([{ directory }])).toEqual([{ directory }])
-    }),
-  )
-
-  it.effect("creates once and ignores conflicts", () =>
-    Effect.gen(function* () {
-      yield* setup()
-      const service = yield* ProjectDirectories.Service
-
-      expect(yield* service.create({ projectID, directory })).toBe(true)
-      expect(yield* service.create({ projectID, directory, strategy: "git_worktree" })).toBe(false)
-      expect(yield* service.list(projectID)).toEqual([{ directory, strategy: undefined }])
-    }),
-  )
-
-  it.effect("returns an empty list for missing projects", () =>
-    Effect.gen(function* () {
-      const service = yield* ProjectDirectories.Service
-
-      expect(yield* service.list(Project.ID.make("missing-project"))).toEqual([])
-    }),
-  )
-
-  it.effect("replaces the strategy when requested", () =>
-    Effect.gen(function* () {
-      yield* setup()
-      const service = yield* ProjectDirectories.Service
-      yield* service.create({ projectID, directory, strategy: "old/strategy" })
-
-      expect(yield* service.create({ projectID, directory, strategy: "new/strategy", behavior: "replace" })).toBe(true)
-      expect(yield* service.create({ projectID, directory, strategy: "new/strategy", behavior: "replace" })).toBe(false)
-      expect(yield* service.create({ projectID, directory, behavior: "replace" })).toBe(true)
-      expect(yield* service.create({ projectID, directory, behavior: "replace" })).toBe(false)
-      expect(yield* service.create({ projectID, directory, strategy: "new/strategy", behavior: "replace" })).toBe(true)
-      expect(yield* service.list(projectID)).toEqual([{ directory, strategy: "new/strategy" }])
-    }),
-  )
-})
@@ -2,11 +2,13 @@ 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, Schema } from "effect"
 import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
 import { Database } from "@opencode-ai/core/database/database"
 import { Project } from "@opencode-ai/core/project"
 import { ProjectTable } from "@opencode-ai/core/project/sql"
+import { WorktreeTable } from "@opencode-ai/core/worktree/sql"
 import { AbsolutePath } from "@opencode-ai/core/schema"
 import { Hash } from "@opencode-ai/util/hash"
 import { tmpdir } from "./fixture/tmpdir"
@@ -365,8 +367,15 @@ describe("Project.resolve", () => {
        time: { created: 1, initialized: 2 },
      })
      expect(
-        (yield* project.directories({ projectID: id })).toSorted((a, b) => a.directory.localeCompare(b.directory)),
-      ).toEqual([{ directory: yield* real(tmp.path) }, { directory: yield* real(worktree), strategy: "git_worktree" }])
+        (yield* db
+          .select({ directory: WorktreeTable.directory, strategy: WorktreeTable.strategy })
+          .from(WorktreeTable)
+          .where(eq(WorktreeTable.project_id, id))
+          .all()
+          .pipe(Effect.orDie))
+          .map((item) => ({ directory: item.directory, strategy: item.strategy ?? undefined }))
+          .toSorted((a, b) => a.directory.localeCompare(b.directory)),
+      ).toEqual([{ directory: yield* real(tmp.path), strategy: undefined }, { directory: yield* real(worktree), strategy: "git" }])
    }),
  )
 })
@@ -34,7 +34,6 @@ const projects = Layer.succeed(
  Project.Service.of({
    list: () => Effect.succeed([]),
    resolve: (directory) => Effect.succeed({ id: Project.ID.global, directory, canonical: directory }),
-    directories: () => Effect.succeed([]),
  }),
 )
 let requests: LLMRequest[] = []
@@ -1,4 +1,6 @@
 import { describe, expect } from "bun:test"
+import { $ } from "bun"
+import fs from "fs/promises"
 import path from "path"
 import { DateTime, Effect, Layer, Stream } from "effect"
 import { Money } from "@opencode-ai/schema/money"
@@ -7,6 +9,7 @@ import { asc, eq } from "drizzle-orm"
 import { Database } from "@opencode-ai/core/database/database"
 import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
 import { LayerNode } from "@opencode-ai/util/effect/layer-node"
+import { Hash } from "@opencode-ai/util/hash"
 import { Bus } from "@opencode-ai/core/bus"
 import { EventTable } from "@opencode-ai/core/event/sql"
 import { Location } from "@opencode-ai/core/location"
@@ -33,7 +36,6 @@ const projects = Layer.succeed(
  Project.Service.of({
    list: () => Effect.succeed([]),
    resolve: (directory) => Effect.succeed({ id: Project.ID.global, directory, canonical: directory }),
-    directories: () => Effect.succeed([]),
  }),
 )
 const it = testEffect(
@@ -53,6 +55,15 @@ const it = testEffect(
    ],
  ),
 )
+const liveIt = testEffect(
+  AppNodeBuilder.build(
+    LayerNode.group([Database.node, Bus.node, Project.node, SessionProjector.node, SessionStore.node, Session.node]),
+    [
+      [Bus.node, Bus.configured({ persist: true })],
+      [SessionExecution.node, SessionExecution.noopLayer],
+    ],
+  ),
+)
 const location = Location.Ref.make({ directory: AbsolutePath.make("/project") })
 const id = Session.ID.create()

@@ -78,6 +89,65 @@ function withTmp<A, E, R>(f: (directory: string) => Effect.Effect<A, E, R>) {
 }

 describe("Session.create", () => {
+  liveIt.live("follows the directory's project identity established after creation", () =>
+    withTmp((directory) =>
+      Effect.gen(function* () {
+        const session = yield* Session.Service
+        const projects = yield* Project.Service
+        const { db } = yield* Database.Service
+        const ref = Location.Ref.make({ directory: AbsolutePath.make(directory) })
+        const nested = Location.Ref.make({ directory: AbsolutePath.make(path.join(directory, "packages", "app")) })
+        const created = yield* session.create({ location: ref, title: "Before git" })
+        const child = yield* session.create({ location: nested, title: "Nested before git" })
+        const originalUpdated = created.time.updated
+
+        yield* Effect.promise(async () => {
+          await $`git init -q`.cwd(directory)
+          await $`git config user.email test@example.com`.cwd(directory)
+          await $`git config user.name Test`.cwd(directory)
+          await fs.writeFile(path.join(directory, "README.md"), "test\n")
+          await $`git add README.md`.cwd(directory)
+          await $`git commit -qm initial`.cwd(directory)
+          await $`git remote add origin git@github.com:owner/adopted.git`.cwd(directory)
+        })
+
+        const project = yield* projects.resolve(ref.directory)
+        const repeat = yield* projects.resolve(ref.directory)
+        const adopted = yield* session.get(created.id)
+        const nestedAdopted = yield* session.get(child.id)
+        const page = yield* session.list({ project: project.id })
+        const log = Array.from(yield* Stream.runCollect(logEvents(session, created.id)))
+
+        expect(created.projectID).toBe(Project.ID.global)
+        expect(project.id).toBe(Project.ID.make(Hash.fast("git-remote:github.com/owner/adopted")))
+        expect(repeat.id).toBe(project.id)
+        expect(page.data.map((item) => item.id)).toEqual(expect.arrayContaining([created.id, child.id]))
+        expect(adopted).toMatchObject({
+          projectID: project.id,
+          location: ref,
+          subpath: undefined,
+          time: { updated: originalUpdated },
+        })
+        expect(nestedAdopted).toMatchObject({
+          projectID: project.id,
+          location: nested,
+          subpath: RelativePath.make("packages/app"),
+        })
+        // Adoption is a project-domain fact; the session log records nothing new.
+        expect(log.map((event) => event.type)).toEqual(["session.created"])
+        expect(yield* session.messages({ sessionID: created.id })).toEqual([])
+        // Repeated resolution announces the directory's identity exactly once.
+        const announced = yield* db
+          .select({ type: EventTable.type })
+          .from(EventTable)
+          .where(eq(EventTable.aggregate_id, project.id))
+          .all()
+          .pipe(Effect.orDie)
+        expect(announced.map((event) => event.type)).toEqual(["worktree.resolved.1"])
+      }),
+    ),
+  )
+
  it.effect("persists a missing title until one is generated or supplied", () =>
    Effect.gen(function* () {
      const session = yield* Session.Service
@@ -346,14 +346,17 @@ function attempts(database: Database.Service["Service"], sessionID: Session.ID)
 /** Builds the local execution layer plus the restart actions against the test harness services. */
 function buildExecution(
  scope: Scope.Closeable,
-  drain: SessionRunner.Interface["drain"],
+  drain: (input: Parameters<SessionRunner.Interface["drain"]>[0]) => Effect.Effect<void, SessionRunner.RunError>,
  options?: SessionRestart.Options,
 ) {
  return Effect.gen(function* () {
    const database = yield* Database.Service
    const bus = yield* Bus.Service
    const store = yield* SessionStore.Service
-    const runner = Layer.succeed(SessionRunner.Service, SessionRunner.Service.of({ drain }))
+    const runner = Layer.succeed(
+      SessionRunner.Service,
+      SessionRunner.Service.of({ drain: (input) => drain(input).pipe(Effect.as({ type: "complete" as const })) }),
+    )
    const locations = Layer.effect(
      LocationServiceMap.Service,
      LayerMap.make(
@@ -55,7 +55,6 @@ const projects = Layer.succeed(
  Project.Service.of({
    list: () => Effect.succeed([]),
    resolve: (directory) => Effect.succeed({ id: Project.ID.global, directory, canonical: directory }),
-    directories: () => Effect.succeed([]),
  }),
 )
 const permission = Layer.succeed(
@@ -22,7 +22,6 @@ const projects = Layer.succeed(
  Project.Service.of({
    list: () => Effect.succeed([]),
    resolve: (directory) => Effect.succeed({ id: Project.ID.global, directory, canonical: directory }),
-    directories: () => Effect.succeed([]),
  }),
 )
 const it = testEffect(
@@ -1,6 +1,7 @@
 import { describe, expect } from "bun:test"
 import path from "path"
 import { Effect, Layer } from "effect"
+import { Worktree } from "@opencode-ai/schema/worktree"
 import { Bus } from "@opencode-ai/core/bus"
 import { Database } from "@opencode-ai/core/database/database"
 import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
@@ -8,6 +9,7 @@ import { Location } from "@opencode-ai/core/location"
 import { Project } from "@opencode-ai/core/project"
 import { AbsolutePath } from "@opencode-ai/core/schema"
 import { Session } from "@opencode-ai/core/session"
+import { SessionEvent } from "@opencode-ai/core/session/event"
 import { SessionExecution } from "@opencode-ai/core/session/execution"
 import { SessionProjector } from "@opencode-ai/core/session/projector"
 import { SessionStore } from "@opencode-ai/core/session/store"
@@ -20,7 +22,6 @@ const projects = Layer.succeed(
  Project.Service.of({
    list: () => Effect.succeed([]),
    resolve: (directory) => Effect.succeed({ id: Project.ID.global, directory, canonical: directory }),
-    directories: () => Effect.succeed([]),
  }),
 )
 const it = testEffect(
@@ -55,7 +56,7 @@ describe("Session.move", () => {
          expect(yield* session.inbox(created.id)).toMatchObject([
            {
              type: "move",
-              delivery: "queue",
+              delivery: "steer",
              payload: {
                location: { directory: destination },
                projectID: Project.ID.global,
@@ -69,8 +70,45 @@ describe("Session.move", () => {
          const steered = yield* session.create({
            location: Location.Ref.make({ directory: AbsolutePath.make(path.join(tmp.path, "other")) }),
          })
-          yield* session.move({ sessionID: steered.id, directory: destination, delivery: "steer" })
-          expect(yield* session.inbox(steered.id)).toMatchObject([{ type: "move", delivery: "steer" }])
+          yield* session.move({ sessionID: steered.id, directory: destination, delivery: "queue" })
+          expect(yield* session.inbox(steered.id)).toMatchObject([{ type: "move", delivery: "queue" }])
+        }),
+      ),
+    ),
+  )
+
+  it.effect("keeps a moved session out of its former directory's new identity", () =>
+    Effect.acquireRelease(
+      Effect.promise(() => tmpdir()),
+      (tmp) => Effect.promise(() => tmp[Symbol.asyncDispose]()),
+    ).pipe(
+      Effect.flatMap((tmp) =>
+        Effect.gen(function* () {
+          const session = yield* Session.Service
+          const bus = yield* Bus.Service
+          const previous = AbsolutePath.make(path.join(tmp.path, "previous"))
+          const destination = AbsolutePath.make(tmp.path)
+          const created = yield* session.create({ location: Location.Ref.make({ directory: previous }) })
+
+          // Moves are admitted through the inbox and applied by the drain;
+          // publish the applied move directly since execution is a no-op here.
+          yield* bus.publish(SessionEvent.Moved, {
+            sessionID: created.id,
+            location: Location.Ref.make({ directory: destination }),
+            projectID: Project.ID.global,
+          })
+          // The former directory becomes a project after the session left it.
+          yield* bus.publish(Worktree.Event.Resolved, {
+            projectID: Project.ID.make("adopting"),
+            directory: previous,
+            previous: Project.ID.global,
+          })
+
+          expect(yield* session.get(created.id)).toMatchObject({
+            projectID: Project.ID.global,
+            location: { directory: destination },
+            subpath: undefined,
+          })
        }),
      ),
    ),
@@ -18,7 +18,6 @@ const projects = Layer.succeed(
  Project.Service.of({
    list: () => Effect.succeed([]),
    resolve: (directory) => Effect.succeed({ id: Project.ID.global, directory, canonical: directory }),
-    directories: () => Effect.succeed([]),
  }),
 )
 const it = testEffect(
@@ -129,7 +129,7 @@ const execution = (llmClient: Layer.Layer<typeof LLMClient.Service>) =>
    Effect.gen(function* () {
      const sessionRunner = yield* SessionRunner.Service
      const coordinator = yield* SessionRunCoordinator.make<Session.ID, SessionRunner.RunError>({
-        drain: (sessionID, force) => sessionRunner.drain({ sessionID, force }),
+        drain: (sessionID, force) => sessionRunner.drain({ sessionID, force }).pipe(Effect.asVoid),
      })
      return SessionExecution.Service.of({
        active: coordinator.active,
@@ -387,8 +387,21 @@ const execution = Layer.effect(
  SessionExecution.Service,
  Effect.gen(function* () {
    const sessionRunner = yield* SessionRunner.Service
+    function drain(
+      sessionID: Session.ID,
+      force: boolean,
+      continuation?: SessionRunner.Continuation,
+    ): Effect.Effect<void, SessionRunner.RunError> {
+      return sessionRunner
+        .drain({ sessionID, force, continuation })
+        .pipe(
+          Effect.flatMap((result) =>
+            result.type === "complete" ? Effect.void : drain(sessionID, false, result.continuation),
+          ),
+        )
+    }
    const coordinator = yield* SessionRunCoordinator.make<Session.ID, SessionRunner.RunError>({
-      drain: (sessionID, force) => sessionRunner.drain({ sessionID, force }),
+      drain: (sessionID, force) => drain(sessionID, force),
    })
    return SessionExecution.Service.of({
      active: coordinator.active,
@@ -1261,6 +1274,41 @@ describe("SessionRunnerLLM", () => {
    }),
  )

+  it.effect("preserves a tool continuation across a steered move", () =>
+    Effect.gen(function* () {
+      const session = yield* setup
+      const bus = yield* Bus.Service
+      const { db } = yield* Database.Service
+      yield* admit(session, "Echo before moving")
+      yield* TestLLM.push(
+        TestLLM.tool("call-move", "echo", { text: "moving" }),
+        TestLLM.text("Done", "text-after-move"),
+      )
+      const tools = yield* blockTools()
+      const run = yield* session.resume(sessionID).pipe(Effect.forkChild)
+      yield* tools.started
+      yield* SessionInbox.admit(db, bus, {
+        id: SessionMessage.ID.create(),
+        sessionID,
+        item: {
+          type: "move",
+          payload: {
+            location: Location.Ref.make({ directory: AbsolutePath.make("/project") }),
+            projectID: Project.ID.global,
+          },
+          delivery: "steer",
+        },
+      })
+
+      yield* tools.release
+      yield* Fiber.join(run)
+
+      expect(requests).toHaveLength(2)
+      expect(requests.map(messageRoles).at(1)?.slice(0, 3)).toEqual(["user", "assistant", "tool"])
+      expect(yield* session.inbox(sessionID)).toEqual([])
+    }),
+  )
+
  it.effect("seeds a fork with the parent's newest instruction values", () =>
    Effect.gen(function* () {
      const session = yield* setup
@@ -6,7 +6,7 @@ import { Location } from "@opencode-ai/schema/location"
 import { Model } from "@opencode-ai/schema/model"
 import { Provider } from "@opencode-ai/schema/provider"
 import { Project } from "@opencode-ai/schema/project"
-import { ProjectDirectories } from "@opencode-ai/schema/project-directories"
+import { Worktree } from "@opencode-ai/schema/worktree"
 import { PermissionV1 } from "@opencode-ai/schema/permission-v1"
 import { Prompt } from "@opencode-ai/schema/prompt"
 import { SessionInbox } from "@opencode-ai/schema/session-inbox"
@@ -39,7 +39,7 @@ test("Core reuses the canonical shared schemas", async () => {
    coreModel,
    corePermission,
    corePermissionV1,
-    coreProjectCopy,
+    coreWorktree,
    corePty,
    coreProject,
    coreProvider,
@@ -60,7 +60,7 @@ test("Core reuses the canonical shared schemas", async () => {
    import("@opencode-ai/core/model"),
    import("@opencode-ai/core/permission"),
    import("@opencode-ai/core/v1/permission"),
-    import("@opencode-ai/core/project/copy"),
+    import("@opencode-ai/core/worktree"),
    import("@opencode-ai/core/pty"),
    import("@opencode-ai/core/project/schema"),
    import("@opencode-ai/core/provider"),
@@ -112,14 +112,16 @@ test("Core reuses the canonical shared schemas", async () => {
    [corePermission.Rule, Permission.Rule],
    [corePermission.Ruleset, Permission.Ruleset],
    [corePermissionV1.Event, PermissionV1.Event],
-    [coreProjectCopy.Event, ProjectDirectories.Event],
+    [coreWorktree.CreateInput, Worktree.CreateInput],
+    [coreWorktree.RemoveInput, Worktree.RemoveInput],
+    [coreWorktree.Info, Worktree.Info],
+    [coreWorktree.ListInput, Worktree.ListInput],
+    [coreWorktree.List, Worktree.List],
+    [coreWorktree.Event, Worktree.Event],
    [corePty.Info, Pty.Info],
    [corePty.Event, Pty.Event],
    [coreProject.ID, Project.ID],
    [coreProject.Current, Project.Current],
-    [coreProject.Directory, Project.Directory],
-    [coreProject.DirectoriesInput, Project.DirectoriesInput],
-    [coreProject.Directories, Project.Directories],
    [coreReference.LocalSource, Reference.LocalSource],
    [coreReference.GitSource, Reference.GitSource],
    [coreReference.Source, Reference.Source],
@@ -2,7 +2,7 @@ import { describe, expect } from "bun:test"
 import { $ } from "bun"
 import fs from "fs/promises"
 import path from "path"
-import { eq } from "drizzle-orm"
+import { and, eq, isNull } from "drizzle-orm"
 import { Effect, Fiber, Stream } from "effect"
 import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
 import { LayerNode } from "@opencode-ai/util/effect/layer-node"
@@ -11,21 +11,19 @@ import { Git } from "@opencode-ai/core/git"
 import { Database } from "@opencode-ai/core/database/database"
 import { Bus } from "@opencode-ai/core/bus"
 import { Project } from "@opencode-ai/core/project"
-import { ProjectDirectoryTable, ProjectTable } from "@opencode-ai/core/project/sql"
-import { ProjectCopy } from "@opencode-ai/core/project/copy"
-import { ProjectDirectories } from "@opencode-ai/core/project/directories"
+import { ProjectTable } from "@opencode-ai/core/project/sql"
+import { Worktree } from "@opencode-ai/core/worktree"
+import { WorktreeTable } from "@opencode-ai/core/worktree/sql"
 import { tmpdir } from "./fixture/tmpdir"
 import { testEffect } from "./lib/effect"

-const it = testEffect(
-  AppNodeBuilder.build(LayerNode.group([ProjectCopy.node, Database.node, Bus.node, ProjectDirectories.node])),
-)
+const it = testEffect(AppNodeBuilder.build(LayerNode.group([Worktree.node, Database.node, Bus.node])))

 function abs(input: string) {
  return AbsolutePath.make(input)
 }

-const gitWorktree = ProjectCopy.StrategyID.make("git_worktree")
+const gitWorktree = Worktree.StrategyID.make("git")

 async function initRepo(directory: string) {
  await $`git init`.cwd(directory).quiet()
@@ -44,7 +42,7 @@ function setup() {
    )
    yield* Effect.promise(() => initRepo(root.path))
    const sourceDirectory = abs(yield* Effect.promise(() => fs.realpath(root.path)))
-    const projectID = Project.ID.make("copy-project")
+    const projectID = Project.ID.make("worktree-project")
    const { db } = yield* Database.Service
    yield* db
      .insert(ProjectTable)
@@ -52,7 +50,7 @@ function setup() {
      .run()
      .pipe(Effect.orDie)
    yield* db
-      .insert(ProjectDirectoryTable)
+      .insert(WorktreeTable)
      .values({ project_id: projectID, directory: sourceDirectory })
      .run()
      .pipe(Effect.orDie)
@@ -63,9 +61,9 @@ function setup() {
 function stored(projectID: Project.ID) {
  return Database.Service.use(({ db }) =>
    db
-      .select({ directory: ProjectDirectoryTable.directory, strategy: ProjectDirectoryTable.strategy })
-      .from(ProjectDirectoryTable)
-      .where(eq(ProjectDirectoryTable.project_id, projectID))
+      .select({ directory: WorktreeTable.directory, strategy: WorktreeTable.strategy })
+      .from(WorktreeTable)
+      .where(eq(WorktreeTable.project_id, projectID))
      .all()
      .pipe(
        Effect.orDie,
@@ -74,92 +72,151 @@ function stored(projectID: Project.ID) {
  )
 }

-describe("ProjectCopy", () => {
+describe("Worktree", () => {
  it.effect("accepts arbitrary non-empty strategy ids", () =>
    Effect.sync(() => {
-      expect(String(ProjectCopy.StrategyID.make("acme/snapshot"))).toBe("acme/snapshot")
-      expect(() => ProjectCopy.StrategyID.make("  acme/snapshot  ")).toThrow()
-      expect(() => ProjectCopy.StrategyID.make("   ")).toThrow()
+      expect(String(Worktree.StrategyID.make("acme/snapshot"))).toBe("acme/snapshot")
+      expect(() => Worktree.StrategyID.make("  acme/snapshot  ")).toThrow()
+      expect(() => Worktree.StrategyID.make("   ")).toThrow()
    }),
  )

  it.effect("reports unavailable strategy ids", () =>
    Effect.gen(function* () {
      const input = yield* setup()
-      const copy = yield* ProjectCopy.Service
-      const unavailable = ProjectCopy.StrategyID.make("acme/missing")
-      const error = yield* copy
+      const worktree = yield* Worktree.Service
+      const unavailable = Worktree.StrategyID.make("acme/missing")
+      const error = yield* worktree
        .create({
          projectID: input.projectID,
          strategy: unavailable,
-          sourceDirectory: input.sourceDirectory,
          directory: abs(`${input.root.path}-missing-strategy`),
-          name: "copy",
+          name: "worktree",
        })
        .pipe(Effect.flip)
-      expect(error).toBeInstanceOf(ProjectCopy.StrategyUnavailableError)
-      if (error instanceof ProjectCopy.StrategyUnavailableError) expect(error.strategy).toBe(unavailable)
+      expect(error).toBeInstanceOf(Worktree.StrategyUnavailableError)
+      if (error instanceof Worktree.StrategyUnavailableError) expect(error.strategy).toBe(unavailable)
+    }),
+  )
+
+  it.live("requires a tracked project worktree", () =>
+    Effect.gen(function* () {
+      const input = yield* setup()
+      yield* input.db
+        .delete(WorktreeTable)
+        .where(eq(WorktreeTable.project_id, input.projectID))
+        .run()
+        .pipe(Effect.orDie)
+      const worktree = yield* Worktree.Service
+
+      const error = yield* worktree
+        .create({
+          projectID: input.projectID,
+          strategy: gitWorktree,
+          directory: abs(`${input.root.path}-missing-source`),
+          name: "worktree",
+        })
+        .pipe(Effect.flip)
+
+      expect(error).toBeInstanceOf(Worktree.SourceDirectoryNotFoundError)
+      if (error instanceof Worktree.SourceDirectoryNotFoundError) expect(error.projectID).toBe(input.projectID)
    }),
  )

  it.live("creates and removes a git worktree directory", () =>
    Effect.gen(function* () {
      const input = yield* setup()
-      const copy = yield* ProjectCopy.Service
+      const worktree = yield* Worktree.Service
      const bus = yield* Bus.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 parent = abs(path.join(temp, path.basename(input.root.path) + "-worktree-created"))
+      const target = abs(path.join(parent, "worktree"))
      yield* Effect.addFinalizer(() =>
        Effect.promise(() => fs.rm(parent, { recursive: true, force: true })).pipe(Effect.ignore),
      )
      const fiber = yield* bus
-        .subscribe(ProjectCopy.Event.Updated)
+        .subscribe(Worktree.Event.Updated)
        .pipe(Stream.take(1), Stream.runCollect, Effect.forkScoped)
      yield* Effect.yieldNow

-      const created = yield* copy.create({
+      const created = yield* worktree.create({
        projectID: input.projectID,
        strategy: gitWorktree,
-        sourceDirectory: input.sourceDirectory,
        directory: parent,
-        name: "copy",
+        name: "worktree",
      })
      expect(created.directory).toBe(target)
      expect(yield* stored(input.projectID)).toEqual(
        [
          { directory: input.sourceDirectory, strategy: null },
-          { directory: created.directory, strategy: "git_worktree" },
+          { directory: created.directory, strategy: "git" },
        ].toSorted((a, b) => a.directory.localeCompare(b.directory)),
      )
      expect(Array.from(yield* Fiber.join(fiber))[0]?.data).toEqual({ projectID: input.projectID })

-      yield* copy.remove({ projectID: input.projectID, directory: created.directory, force: false })
+      yield* worktree.remove({ projectID: input.projectID, directory: created.directory, force: false })

      expect(yield* stored(input.projectID)).toEqual([{ directory: input.sourceDirectory, strategy: null }])
      expect(yield* Effect.promise(() => Bun.file(target).exists())).toBe(false)
    }),
  )

+  it.live("creates from another managed worktree", () =>
+    Effect.gen(function* () {
+      const input = yield* setup()
+      const worktree = yield* Worktree.Service
+      const temp = yield* Effect.promise(() => fs.realpath(path.dirname(input.root.path)))
+      const sourceParent = abs(path.join(temp, path.basename(input.root.path) + "-managed-source"))
+      const targetParent = abs(path.join(temp, path.basename(input.root.path) + "-managed-target"))
+      yield* Effect.addFinalizer(() =>
+        Effect.all([
+          Effect.promise(() => fs.rm(sourceParent, { recursive: true, force: true })).pipe(Effect.ignore),
+          Effect.promise(() => fs.rm(targetParent, { recursive: true, force: true })).pipe(Effect.ignore),
+        ]).pipe(Effect.asVoid),
+      )
+      const source = yield* worktree.create({
+        projectID: input.projectID,
+        strategy: gitWorktree,
+        directory: sourceParent,
+        name: "source",
+      })
+      yield* input.db
+        .delete(WorktreeTable)
+        .where(and(eq(WorktreeTable.project_id, input.projectID), isNull(WorktreeTable.strategy)))
+        .run()
+        .pipe(Effect.orDie)
+
+      const created = yield* worktree.create({
+        projectID: input.projectID,
+        strategy: gitWorktree,
+        directory: targetParent,
+        name: "target",
+      })
+
+      expect(created.directory).toBe(abs(path.join(targetParent, "target")))
+      yield* worktree.remove({ projectID: input.projectID, directory: created.directory, force: false })
+      yield* worktree.remove({ projectID: input.projectID, directory: source.directory, force: false })
+    }),
+  )
+
  it.live("requires force to remove a dirty git worktree", () =>
    Effect.gen(function* () {
      const input = yield* setup()
-      const copy = yield* ProjectCopy.Service
+      const worktree = yield* Worktree.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-dirty"))
+      const parent = abs(path.join(temp, path.basename(input.root.path) + "-worktree-dirty"))
      yield* Effect.addFinalizer(() =>
        Effect.promise(() => fs.rm(parent, { recursive: true, force: true })).pipe(Effect.ignore),
      )
-      const created = yield* copy.create({
+      const created = yield* worktree.create({
        projectID: input.projectID,
        strategy: gitWorktree,
-        sourceDirectory: input.sourceDirectory,
        directory: parent,
-        name: "copy",
+        name: "worktree",
      })
      yield* Effect.promise(() => Bun.write(path.join(created.directory, "dirty.txt"), "dirty"))

-      const error = yield* copy
+      const error = yield* worktree
        .remove({ projectID: input.projectID, directory: created.directory, force: false })
        .pipe(Effect.flip)

@@ -168,115 +225,113 @@ describe("ProjectCopy", () => {
        expect(error.operation).toBe("remove")
        expect(error.forceRequired).toBe(true)
      }
-      expect(yield* stored(input.projectID)).toContainEqual({ directory: created.directory, strategy: "git_worktree" })
+      expect(yield* stored(input.projectID)).toContainEqual({ directory: created.directory, strategy: "git" })
      expect(yield* Effect.promise(() => Bun.file(path.join(created.directory, "dirty.txt")).exists())).toBe(true)

-      yield* copy.remove({ projectID: input.projectID, directory: created.directory, force: true })
+      yield* worktree.remove({ projectID: input.projectID, directory: created.directory, force: true })
      expect(yield* Effect.promise(() => Bun.file(created.directory).exists())).toBe(false)
    }),
  )

-  it.live("preserves copies whose stored strategy is unavailable", () =>
+  it.live("preserves worktrees whose stored strategy is unavailable", () =>
    Effect.gen(function* () {
      const input = yield* setup()
-      const copy = yield* ProjectCopy.Service
-      const unavailable = abs(`${input.root.path}-copy-unavailable`)
+      const worktree = yield* Worktree.Service
+      const unavailable = abs(`${input.root.path}-worktree-unavailable`)
      yield* Effect.promise(() => fs.mkdir(unavailable))
      yield* Effect.addFinalizer(() => Effect.promise(() => fs.rm(unavailable, { recursive: true, force: true })))
      yield* input.db
-        .insert(ProjectDirectoryTable)
+        .insert(WorktreeTable)
        .values({ project_id: input.projectID, directory: unavailable, strategy: "acme/missing" })
        .run()
        .pipe(Effect.orDie)

-      const error = yield* copy
+      const error = yield* worktree
        .remove({ projectID: input.projectID, directory: unavailable, force: false })
        .pipe(Effect.flip)

-      expect(error).toBeInstanceOf(ProjectCopy.StrategyUnavailableError)
+      expect(error).toBeInstanceOf(Worktree.StrategyUnavailableError)
      expect(yield* stored(input.projectID)).toContainEqual({ directory: unavailable, strategy: "acme/missing" })
    }),
  )

-  it.live("adds a numeric suffix when a copy directory already exists", () =>
+  it.live("adds a numeric suffix when a worktree directory already exists", () =>
    Effect.gen(function* () {
      const input = yield* setup()
-      const copy = yield* ProjectCopy.Service
+      const worktree = yield* Worktree.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"))
+      const parent = abs(path.join(temp, path.basename(input.root.path) + "-worktree-suffix"))
+      const target = abs(path.join(parent, "worktree-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")))
+      yield* Effect.promise(() => fs.mkdir(path.join(parent, "worktree"), { recursive: true }))
+      yield* Effect.promise(() => fs.mkdir(path.join(parent, "worktree-2")))

-      const created = yield* copy.create({
+      const created = yield* worktree.create({
        projectID: input.projectID,
        strategy: gitWorktree,
-        sourceDirectory: input.sourceDirectory,
        directory: parent,
-        name: "copy",
+        name: "worktree",
      })

      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,
-      )
+      expect(
+        yield* Effect.promise(() => fs.stat(path.join(parent, "worktree")).then((item) => item.isDirectory())),
+      ).toBe(true)
+      expect(
+        yield* Effect.promise(() => fs.stat(path.join(parent, "worktree-2")).then((item) => item.isDirectory())),
+      ).toBe(true)

-      yield* copy.remove({ projectID: input.projectID, directory: created.directory, force: false })
+      yield* worktree.remove({ projectID: input.projectID, directory: created.directory, force: false })
    }),
  )

-  it.live("fails after ten copy directory conflicts", () =>
+  it.live("fails after ten worktree directory conflicts", () =>
    Effect.gen(function* () {
      const input = yield* setup()
-      const copy = yield* ProjectCopy.Service
+      const worktree = yield* Worktree.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"))
+      const parent = abs(path.join(temp, path.basename(input.root.path) + "-worktree-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 }),
+            fs.mkdir(path.join(parent, index === 0 ? "worktree" : `worktree-${index + 1}`), { recursive: true }),
          ),
        ),
      )

-      const error = yield* copy
+      const error = yield* worktree
        .create({
          projectID: input.projectID,
          strategy: gitWorktree,
-          sourceDirectory: input.sourceDirectory,
          directory: parent,
-          name: "copy",
+          name: "worktree",
        })
        .pipe(Effect.flip)

-      expect(error).toBeInstanceOf(ProjectCopy.DestinationExistsError)
-      if (error instanceof ProjectCopy.DestinationExistsError)
-        expect(error.directory).toBe(abs(path.join(parent, "copy-10")))
+      expect(error).toBeInstanceOf(Worktree.DestinationExistsError)
+      if (error instanceof Worktree.DestinationExistsError)
+        expect(error.directory).toBe(abs(path.join(parent, "worktree-10")))
    }),
  )

  it.live("does not publish an event when refresh finds no directory changes", () =>
    Effect.gen(function* () {
      const input = yield* setup()
-      const copy = yield* ProjectCopy.Service
+      const worktree = yield* Worktree.Service
      const bus = yield* Bus.Service
-      const event = yield* bus.subscribe(ProjectCopy.Event.Updated).pipe(
+      const event = yield* bus.subscribe(Worktree.Event.Updated).pipe(
        Stream.take(1),
        Stream.runCollect,
        Effect.forkScoped,
        Effect.flatMap((fiber) =>
          Effect.gen(function* () {
            yield* Effect.yieldNow
-            yield* copy.refresh({ projectID: input.projectID })
+            yield* worktree.refresh({ projectID: input.projectID })
            return yield* Fiber.join(fiber).pipe(Effect.timeoutOption("50 millis"))
          }),
        ),
@@ -289,36 +344,36 @@ describe("ProjectCopy", () => {
  it.live("refresh discovers and prunes an externally managed git worktree", () =>
    Effect.gen(function* () {
      const input = yield* setup()
-      const copy = yield* ProjectCopy.Service
+      const worktree = yield* Worktree.Service
      const bus = yield* Bus.Service
-      const target = abs(`${input.root.path}-copy-external`)
+      const target = abs(`${input.root.path}-worktree-external`)
      yield* Effect.addFinalizer(() =>
        Effect.promise(() => fs.rm(target, { recursive: true, force: true })).pipe(Effect.ignore),
      )
      yield* Effect.promise(() => $`git worktree add --detach ${target} HEAD`.cwd(input.root.path).quiet())
      yield* input.db
-        .insert(ProjectDirectoryTable)
+        .insert(WorktreeTable)
        .values({ project_id: input.projectID, directory: target })
        .run()
        .pipe(Effect.orDie)
      const fiber = yield* bus
-        .subscribe(ProjectCopy.Event.Updated)
+        .subscribe(Worktree.Event.Updated)
        .pipe(Stream.take(1), Stream.runCollect, Effect.forkScoped)
      yield* Effect.yieldNow

      const discovered = abs(yield* Effect.promise(() => fs.realpath(target)))
-      expect(yield* copy.refresh({ projectID: input.projectID })).toEqual({ updated: [discovered], removed: [] })
+      expect(yield* worktree.refresh({ projectID: input.projectID })).toEqual({ updated: [discovered], removed: [] })

      expect(yield* stored(input.projectID)).toEqual(
        [
          { directory: input.sourceDirectory, strategy: null },
-          { directory: discovered, strategy: "git_worktree" },
+          { directory: discovered, strategy: "git" },
        ].toSorted((a, b) => a.directory.localeCompare(b.directory)),
      )
      expect(Array.from(yield* Fiber.join(fiber))[0]?.data).toEqual({ projectID: input.projectID })

      yield* Effect.promise(() => $`git worktree remove --force ${target}`.cwd(input.root.path).quiet())
-      expect(yield* copy.refresh({ projectID: input.projectID })).toEqual({ updated: [], removed: [discovered] })
+      expect(yield* worktree.refresh({ projectID: input.projectID })).toEqual({ updated: [], removed: [discovered] })
      expect(yield* stored(input.projectID)).toEqual([{ directory: input.sourceDirectory, strategy: null }])
    }),
  )
@@ -326,9 +381,9 @@ 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`)
+      const worktree = yield* Worktree.Service
+      const stale = abs(`${input.root.path}-worktree-stale`)
+      const target = abs(`${input.root.path}-worktree-after-stale`)
      yield* Effect.addFinalizer(() =>
        Effect.promise(() => fs.rm(target, { recursive: true, force: true })).pipe(Effect.ignore),
      )
@@ -336,13 +391,13 @@ describe("ProjectCopy", () => {
      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 })
+      yield* worktree.refresh({ projectID: input.projectID })

      const discovered = abs(yield* Effect.promise(() => fs.realpath(target)))
      expect(yield* stored(input.projectID)).toEqual(
        [
          { directory: input.sourceDirectory, strategy: null },
-          { directory: discovered, strategy: "git_worktree" },
+          { directory: discovered, strategy: "git" },
        ].toSorted((a, b) => a.directory.localeCompare(b.directory)),
      )
    }),
@@ -352,9 +407,9 @@ describe("ProjectCopy", () => {
    Effect.gen(function* () {
      const input = yield* setup()
      yield* Effect.promise(() => fs.rm(path.join(input.sourceDirectory, ".git"), { recursive: true }))
-      const copy = yield* ProjectCopy.Service
+      const worktree = yield* Worktree.Service

-      yield* copy.refresh({ projectID: input.projectID })
+      yield* worktree.refresh({ projectID: input.projectID })

      expect(yield* stored(input.projectID)).toEqual([{ directory: input.sourceDirectory, strategy: null }])
    }),
@@ -362,9 +417,9 @@ describe("ProjectCopy", () => {

  it.live("refresh with no roots is a no-op", () =>
    Effect.gen(function* () {
-      const copy = yield* ProjectCopy.Service
+      const worktree = yield* Worktree.Service

-      expect(yield* copy.refresh({ projectID: Project.ID.make("missing-project") })).toEqual({
+      expect(yield* worktree.refresh({ projectID: Project.ID.make("missing-project") })).toEqual({
        updated: [],
        removed: [],
      })
@@ -376,13 +431,13 @@ describe("ProjectCopy", () => {
      const input = yield* setup()
      const missing = abs(`${input.root.path}-missing-checkout`)
      yield* input.db
-        .insert(ProjectDirectoryTable)
+        .insert(WorktreeTable)
        .values({ project_id: input.projectID, directory: missing })
        .run()
        .pipe(Effect.orDie)
-      const copy = yield* ProjectCopy.Service
+      const worktree = yield* Worktree.Service

-      expect(yield* copy.refresh({ projectID: input.projectID })).toEqual({ updated: [], removed: [missing] })
+      expect(yield* worktree.refresh({ projectID: input.projectID })).toEqual({ updated: [], removed: [missing] })

      expect(yield* stored(input.projectID)).not.toContainEqual({ directory: missing, strategy: null })
    }),
@@ -31,9 +31,9 @@
  },
  "peerDependencies": {
    "@opencode-ai/theme": "workspace:*",
-    "@opentui/core": "0.0.0-20260808-9ecf7c0a",
-    "@opentui/keymap": "0.0.0-20260808-9ecf7c0a",
-    "@opentui/solid": "0.0.0-20260808-9ecf7c0a",
+    "@opentui/core": ">=0.5.2",
+    "@opentui/keymap": ">=0.5.2",
+    "@opentui/solid": ">=0.5.2",
    "solid-js": ">=1.9.0"
  },
  "peerDependenciesMeta": {
@@ -29,7 +29,7 @@ import { WebSearchGroup } from "./groups/websearch.js"
 import { McpGroup } from "./groups/mcp.js"
 import { CredentialGroup } from "./groups/credential.js"
 import { ProjectGroup } from "./groups/project.js"
-import { ProjectCopyGroup } from "./groups/project-copy.js"
+import { WorktreeGroup } from "./groups/worktree.js"
 import { VcsGroup } from "./groups/vcs.js"
 import { MigrationGroup } from "./groups/migration.js"
 import { ConfigGroup } from "./groups/config.js"
@@ -52,7 +52,6 @@ type LocationGroups<LocationId extends HttpApiMiddleware.AnyId> =
  | HttpApiGroup.AddMiddleware<typeof PtyGroup, LocationId>
  | HttpApiGroup.AddMiddleware<typeof ShellGroup, LocationId>
  | HttpApiGroup.AddMiddleware<typeof ReferenceGroup, LocationId>
-  | HttpApiGroup.AddMiddleware<typeof ProjectCopyGroup, LocationId>
  | HttpApiGroup.AddMiddleware<typeof VcsGroup, LocationId>
  | HttpApiGroup.AddMiddleware<typeof ConfigGroup, LocationId>

@@ -89,6 +88,7 @@ type ApiGroups<
  | typeof ServerGroup
  | typeof DebugGroup
  | typeof MigrationGroup
+  | typeof WorktreeGroup
  | LocationGroups<LocationId>
  | FormGroups<LocationId, LocationService, FormLocationId, FormLocationService>
  | SessionGroups<SessionLocationId, SessionLocationService>
@@ -172,7 +172,7 @@ const makeApiFromGroup = <
    .add(ShellGroup.middleware(locationMiddleware))
    .add(makeQuestionGroup(locationMiddleware, sessionLocationMiddleware))
    .add(ReferenceGroup.middleware(locationMiddleware))
-    .add(ProjectCopyGroup.middleware(locationMiddleware))
+    .add(WorktreeGroup)
    .add(VcsGroup.middleware(locationMiddleware))
    .add(DebugGroup)
    .add(MigrationGroup)
@@ -60,7 +60,7 @@ export const groupNames = {
  "server.question": "question",
  "server.reference": "reference",
  "server.project": "project",
-  "server.projectCopy": "projectCopy",
+  "server.worktree": "worktree",
  "server.vcs": "vcs",
  "server.config": "config",
 } as const
@@ -1,56 +0,0 @@
-import { ProjectCopy } from "@opencode-ai/schema/project-copy"
-import { Project } from "@opencode-ai/schema/project"
-import { Schema, Struct } from "effect"
-import { HttpApiEndpoint, HttpApiGroup, HttpApiSchema, OpenApi } from "effect/unstable/httpapi"
-import { LocationQuery, locationQueryOpenApi } from "./location.js"
-
-const root = "/api/experimental/project/:projectID/copy"
-
-export class ProjectCopyError extends Schema.ErrorClass<ProjectCopyError>("ProjectCopyError")(
-  {
-    name: Schema.Literal("ProjectCopyError"),
-    data: Schema.Struct({
-      message: Schema.String,
-      forceRequired: Schema.optional(Schema.Boolean),
-    }),
-  },
-  { httpApiStatus: 400 },
-) {}
-
-const CreatePayload = Schema.Struct(Struct.omit(ProjectCopy.CreateInput.fields, ["projectID", "sourceDirectory"]))
-const RemovePayload = Schema.Struct(Struct.omit(ProjectCopy.RemoveInput.fields, ["projectID"]))
-
-export const ProjectCopyGroup = HttpApiGroup.make("server.projectCopy")
-  .add(
-    HttpApiEndpoint.post("projectCopy.create", root, {
-      params: { projectID: Project.ID },
-      query: LocationQuery,
-      payload: CreatePayload,
-      success: ProjectCopy.Copy,
-      error: ProjectCopyError,
-    })
-      .annotateMerge(locationQueryOpenApi)
-      .annotateMerge(OpenApi.annotations({ identifier: "v2.projectCopy.create" })),
-  )
-  .add(
-    HttpApiEndpoint.delete("projectCopy.remove", root, {
-      params: { projectID: Project.ID },
-      query: LocationQuery,
-      payload: RemovePayload,
-      success: HttpApiSchema.NoContent,
-      error: ProjectCopyError,
-    })
-      .annotateMerge(locationQueryOpenApi)
-      .annotateMerge(OpenApi.annotations({ identifier: "v2.projectCopy.remove" })),
-  )
-  .add(
-    HttpApiEndpoint.post("projectCopy.refresh", `${root}/refresh`, {
-      params: { projectID: Project.ID },
-      query: LocationQuery,
-      success: HttpApiSchema.NoContent,
-      error: ProjectCopyError,
-    })
-      .annotateMerge(locationQueryOpenApi)
-      .annotateMerge(OpenApi.annotations({ identifier: "v2.projectCopy.refresh" })),
-  )
-  .annotateMerge(OpenApi.annotations({ title: "projectCopy", description: "Project copy management routes." }))
@@ -31,24 +31,9 @@ export const ProjectGroup = HttpApiGroup.make("server.project")
        }),
      ),
  )
-  .add(
-    HttpApiEndpoint.get("project.directories", `${root}/:projectID/directories`, {
-      params: { projectID: Project.ID },
-      query: LocationQuery,
-      success: Project.Directories,
-    })
-      .annotateMerge(locationQueryOpenApi)
-      .annotateMerge(
-        OpenApi.annotations({
-          identifier: "v2.project.directories",
-          summary: "List project directories",
-          description: "List known local absolute directories for a project.",
-        }),
-      ),
-  )
  .annotateMerge(
    OpenApi.annotations({
      title: "project",
-      description: "Location-scoped project routes.",
+      description: "Project routes.",
    }),
  )
@@ -0,0 +1,76 @@
+import { Project } from "@opencode-ai/schema/project"
+import { Worktree } from "@opencode-ai/schema/worktree"
+import { Schema, Struct } from "effect"
+import { HttpApiEndpoint, HttpApiGroup, HttpApiSchema, OpenApi } from "effect/unstable/httpapi"
+
+const root = "/api/experimental/project/:projectID/worktree"
+
+export class WorktreeError extends Schema.ErrorClass<WorktreeError>("WorktreeError")(
+  {
+    name: Schema.Literal("WorktreeError"),
+    data: Schema.Struct({
+      message: Schema.String,
+      forceRequired: Schema.optional(Schema.Boolean),
+    }),
+  },
+  { httpApiStatus: 400 },
+) {}
+
+const CreatePayload = Schema.Struct(Struct.omit(Worktree.CreateInput.fields, ["projectID"]))
+const RemovePayload = Schema.Struct(Struct.omit(Worktree.RemoveInput.fields, ["projectID"]))
+
+export const WorktreeGroup = HttpApiGroup.make("server.worktree")
+  .add(
+    HttpApiEndpoint.get("worktree.list", root, {
+      params: { projectID: Project.ID },
+      success: Worktree.List,
+    }).annotateMerge(
+      OpenApi.annotations({
+        identifier: "v2.worktree.list",
+        summary: "List worktrees",
+        description: "List known local worktrees for a project.",
+      }),
+    ),
+  )
+  .add(
+    HttpApiEndpoint.post("worktree.create", root, {
+      params: { projectID: Project.ID },
+      payload: CreatePayload,
+      success: Worktree.Info,
+      error: WorktreeError,
+    }).annotateMerge(
+      OpenApi.annotations({
+        identifier: "v2.worktree.create",
+        summary: "Create worktree",
+        description: "Create a worktree for a project.",
+      }),
+    ),
+  )
+  .add(
+    HttpApiEndpoint.delete("worktree.remove", root, {
+      params: { projectID: Project.ID },
+      payload: RemovePayload,
+      success: HttpApiSchema.NoContent,
+      error: WorktreeError,
+    }).annotateMerge(
+      OpenApi.annotations({
+        identifier: "v2.worktree.remove",
+        summary: "Remove worktree",
+        description: "Remove a managed worktree from a project.",
+      }),
+    ),
+  )
+  .add(
+    HttpApiEndpoint.post("worktree.refresh", `${root}/refresh`, {
+      params: { projectID: Project.ID },
+      success: HttpApiSchema.NoContent,
+      error: WorktreeError,
+    }).annotateMerge(
+      OpenApi.annotations({
+        identifier: "v2.worktree.refresh",
+        summary: "Refresh worktrees",
+        description: "Reconcile stored worktrees with the project repositories.",
+      }),
+    ),
+  )
+  .annotateMerge(OpenApi.annotations({ title: "worktree", description: "Project worktree management routes." }))
@@ -1,6 +1,7 @@
 export * as DurableEventManifest from "./durable-event-manifest.js"

 import { Event } from "./event.js"
+import { Worktree } from "./worktree.js"
 import { SessionEvent } from "./session-event.js"

 export const SessionDurable = {
@@ -8,4 +9,4 @@ export const SessionDurable = {
  schema: SessionEvent.Durable,
 } as const

-export const Durable = Event.durableMap(SessionEvent.DurableDefinitions)
+export const Durable = Event.durableMap([...SessionEvent.DurableDefinitions, Worktree.Event.Resolved])
@@ -19,7 +19,7 @@ import { ModelsDev } from "./models-dev.js"
 import { Permission } from "./permission.js"
 import { Plugin } from "./plugin.js"
 import { Project } from "./project.js"
-import { ProjectDirectories } from "./project-directories.js"
+import { Worktree } from "./worktree.js"
 import { Pty } from "./pty.js"
 import { Question } from "./question.js"
 import { Reference } from "./reference.js"
@@ -50,7 +50,7 @@ const featureDefinitions = Event.inventory(
  ...Reference.Event.Definitions,
  ...Permission.Event.Definitions,
  ...Plugin.Event.Definitions,
-  ...ProjectDirectories.Event.Definitions,
+  ...Worktree.Event.Definitions,
  ...Command.Event.Definitions,
  ...Config.Event.Definitions,
  ...Skill.Event.Definitions,
@@ -16,7 +16,7 @@ export { Money } from "./money.js"
 export { Permission } from "./permission.js"
 export { PermissionSaved } from "./permission-saved.js"
 export { Project } from "./project.js"
-export { ProjectCopy } from "./project-copy.js"
+export { Worktree } from "./worktree.js"
 export { Provider } from "./provider.js"
 export { Reference } from "./reference.js"
 export { WebSearch } from "./websearch.js"
@@ -1,30 +0,0 @@
-export * as ProjectCopy from "./project-copy.js"
-
-import { Schema } from "effect"
-import { optional } from "./schema.js"
-import { ProjectID } from "./project-id.js"
-import { AbsolutePath } from "./schema.js"
-
-export const StrategyID = Schema.Trim.pipe(Schema.check(Schema.isNonEmpty()), Schema.brand("ProjectCopy.StrategyID"))
-export type StrategyID = typeof StrategyID.Type
-
-export const CreateInput = Schema.Struct({
-  projectID: ProjectID,
-  strategy: StrategyID,
-  sourceDirectory: AbsolutePath,
-  directory: AbsolutePath,
-  name: optional(Schema.String),
-}).annotate({ identifier: "ProjectCopy.CreateInput" })
-export interface CreateInput extends Schema.Schema.Type<typeof CreateInput> {}
-
-export const RemoveInput = Schema.Struct({
-  projectID: ProjectID,
-  directory: AbsolutePath,
-  force: Schema.Boolean,
-}).annotate({ identifier: "ProjectCopy.RemoveInput" })
-export interface RemoveInput extends Schema.Schema.Type<typeof RemoveInput> {}
-
-export const Copy = Schema.Struct({
-  directory: AbsolutePath,
-}).annotate({ identifier: "ProjectCopy.Copy" })
-export interface Copy extends Schema.Schema.Type<typeof Copy> {}
@@ -1,10 +0,0 @@
-export * as ProjectDirectories from "./project-directories.js"
-
-import { ephemeral, inventory } from "./event.js"
-import { Project } from "./project.js"
-
-const Updated = ephemeral({
-  type: "project.directories.updated",
-  schema: { projectID: Project.ID },
-})
-export const Event = { Updated, Definitions: inventory(Updated) }
@@ -15,17 +15,6 @@ export const Current = Schema.Struct({
  canonical: AbsolutePath,
 }).annotate({ identifier: "Project.Current" })
 export interface Current extends Schema.Schema.Type<typeof Current> {}
-export const Directory = Schema.Struct({
-  directory: AbsolutePath,
-  strategy: optional(Schema.String),
-}).annotate({ identifier: "Project.Directory" })
-export interface Directory extends Schema.Schema.Type<typeof Directory> {}
-export const DirectoriesInput = Schema.Struct({
-  projectID: ID,
-}).annotate({ identifier: "Project.DirectoriesInput" })
-export interface DirectoriesInput extends Schema.Schema.Type<typeof DirectoriesInput> {}
-export const Directories = Schema.Array(Directory).annotate({ identifier: "Project.Directories" })
-export type Directories = typeof Directories.Type
 export const Icon = Schema.Struct({
  url: optional(Schema.String),
  override: optional(Schema.String),
@@ -0,0 +1,81 @@
+export * as Worktree from "./worktree.js"
+
+import { Schema } from "effect"
+import { durable, ephemeral, inventory } from "./event.js"
+import { ProjectID } from "./project-id.js"
+import { AbsolutePath, optional } from "./schema.js"
+import { Project } from "./project.js"
+
+export const StrategyID = Schema.Trim.pipe(Schema.check(Schema.isNonEmpty()), Schema.brand("Worktree.StrategyID"))
+export type StrategyID = typeof StrategyID.Type
+
+export const CreateInput = Schema.Struct({
+  projectID: ProjectID,
+  strategy: StrategyID,
+  directory: AbsolutePath,
+  name: optional(Schema.String),
+}).annotate({ identifier: "Worktree.CreateInput" })
+export interface CreateInput extends Schema.Schema.Type<typeof CreateInput> {}
+
+export const RemoveInput = Schema.Struct({
+  projectID: ProjectID,
+  directory: AbsolutePath,
+  force: Schema.Boolean,
+}).annotate({ identifier: "Worktree.RemoveInput" })
+export interface RemoveInput extends Schema.Schema.Type<typeof RemoveInput> {}
+
+export const Info = Schema.Struct({
+  directory: AbsolutePath,
+}).annotate({ identifier: "Worktree.Info" })
+export interface Info extends Schema.Schema.Type<typeof Info> {}
+
+export const Directory = Schema.Struct({
+  directory: AbsolutePath,
+  strategy: optional(Schema.String),
+}).annotate({ identifier: "Worktree.Directory" })
+export interface Directory extends Schema.Schema.Type<typeof Directory> {}
+
+export const ListInput = Schema.Struct({
+  projectID: ProjectID,
+}).annotate({ identifier: "Worktree.ListInput" })
+export interface ListInput extends Schema.Schema.Type<typeof ListInput> {}
+
+export const List = Schema.Array(Directory).annotate({ identifier: "Worktree.List" })
+export type List = typeof List.Type
+
+const Updated = ephemeral({
+  type: "worktree.updated",
+  schema: { projectID: Project.ID },
+})
+
+const Resolved = durable({
+  type: "worktree.resolved",
+  durable: { aggregate: "projectID", version: 1 },
+  schema: {
+    projectID: Project.ID,
+    directory: AbsolutePath,
+    previous: Project.ID,
+  },
+})
+
+export const Event = { Updated, Resolved, Definitions: inventory(Updated, Resolved) }
+
+export function adopt(
+  session: { readonly projectID: string; readonly directory: string },
+  event: { readonly projectID: string; readonly directory: string; readonly previous: string },
+) {
+  if (session.projectID !== event.previous && session.projectID !== Project.ID.global) return
+  if (session.projectID === event.projectID) return
+  const inside =
+    session.directory === event.directory ||
+    session.directory.startsWith(event.directory + "/") ||
+    session.directory.startsWith(event.directory + "\\")
+  if (!inside) return
+  return {
+    projectID: event.projectID,
+    subpath:
+      session.directory === event.directory
+        ? undefined
+        : session.directory.slice(event.directory.length + 1).replaceAll("\\", "/"),
+  }
+}
@@ -17,6 +17,7 @@ import { Money } from "../src/money.js"
 import { Skill } from "../src/skill.js"
 import { Shell } from "../src/shell.js"
 import { Vcs } from "../src/vcs.js"
+import { Worktree } from "../src/worktree.js"
 import { PersistedRevert } from "../src/session-revert.js"
 import { AbsolutePath, optional } from "../src/schema.js"

@@ -157,9 +158,9 @@ describe("contract hygiene", () => {
      Model.Cost,
      Model.Variant,
      Project.Current,
-      Project.Directory,
-      Project.DirectoriesInput,
-      Project.Directories,
+      Worktree.Directory,
+      Worktree.ListInput,
+      Worktree.List,
      Project.Icon,
      Project.Commands,
      Project.Time,
@@ -114,6 +114,7 @@ describe("public event manifest", () => {
        "session.revert.staged.1",
        "session.revert.cleared.1",
        "session.revert.committed.1",
+        "worktree.resolved.1",
      ].toSorted(),
    )
    expect(SessionEvent.DurableDefinitions).toEqual([
@@ -36,7 +36,15 @@ const program = Effect.gen(function* () {
  return yield* opencode.sessions.get({ sessionID })
 })

-yield * program.pipe(Effect.provide(OpenCode.layer))
+yield * program.pipe(Effect.provide(OpenCode.layer()))
 ```

-`OpenCode.layer` adapts the silent default `OpenCode.create()` for dependency injection; use `OpenCode.layerWith(options)` to configure the host.
+`OpenCode.layer(options)` adapts the scoped `OpenCode.create(options)` convenience constructor for dependency injection.
+
+Workspace providers are host infrastructure configured when the SDK is constructed. Workspace lifecycle operations remain on the typed facade:
+
+```ts
+const opencode = yield * OpenCode.create({ workspaceProviders: { modal: modalWorkspaceProvider } })
+const workspace = yield * opencode.workspace.create({ provider: "modal" })
+yield * opencode.workspace.destroy({ workspaceID: workspace.id })
+```
@@ -14,7 +14,7 @@ export { Model } from "@opencode-ai/schema/model"
 export { Permission } from "@opencode-ai/schema/permission"
 export { PermissionSaved } from "@opencode-ai/schema/permission-saved"
 export { Project } from "@opencode-ai/schema/project"
-export { ProjectCopy } from "@opencode-ai/schema/project-copy"
+export { Worktree } from "@opencode-ai/schema/worktree"
 export { Prompt } from "@opencode-ai/schema/prompt"
 export { PromptInput } from "@opencode-ai/schema/prompt-input"
 export { Provider } from "@opencode-ai/schema/provider"
@@ -27,3 +27,4 @@ export { Session } from "@opencode-ai/schema/session"
 export { SessionInbox } from "@opencode-ai/schema/session-inbox"
 export { SessionMessage } from "@opencode-ai/schema/session-message"
 export { Skill } from "@opencode-ai/schema/skill"
+export { Workspace } from "@opencode-ai/schema/workspace"
@@ -1,6 +1,8 @@
 import { OpenCode } from "@opencode-ai/client/effect"
 import { SdkPlugins } from "@opencode-ai/core/plugin/sdk"
 import { SessionRestart } from "@opencode-ai/core/session/execution/restart"
+import { Workspace } from "@opencode-ai/core/workspace"
+import { WorkspaceDriver } from "@opencode-ai/core/workspace/driver"
 import type { ServerFetch } from "@opencode-ai/server/fetch"
 import { createEmbeddedRoutes } from "@opencode-ai/server/routes"
 import type { ServerOptions } from "@opencode-ai/server/options"
@@ -13,13 +15,14 @@ import type { LogOptions } from "./logging"

 export type CreateOptions = ServerOptions & {
  readonly log?: LogOptions
+  readonly workspaceProviders?: Readonly<Record<string, WorkspaceDriver.Interface>>
 }

 /** Host hooks for embedding opencode on a non-default runtime profile (e.g. workerd). */
 export type EmbedOptions = ServerFetch.BootOptions

 export const create = Effect.fn("OpenCode.create")(function* (options: CreateOptions = {}, embed: EmbedOptions = {}) {
-  const { log, ...server } = options
+  const { log, workspaceProviders, ...server } = options
  const runtime = yield* Effect.acquireRelease(
    Effect.sync(() =>
      ManagedRuntime.make(
@@ -29,7 +32,9 @@ export const create = Effect.fn("OpenCode.create")(function* (options: CreateOpt
            app: { ...server.app, name: server.app?.name ?? "sdk" },
            database: { path: ":memory:", ...server.database },
          },
-          embed.overrides ?? [],
+          workspaceProviders
+            ? [...(embed.overrides ?? []), [WorkspaceDriver.node, WorkspaceDriver.registryNode(workspaceProviders)]]
+            : embed.overrides,
        ).pipe(Layer.provide(HttpServer.layerServices), Layer.provideMerge(Logging.layer(log))),
      ),
    ),
@@ -42,6 +47,7 @@ export const create = Effect.fn("OpenCode.create")(function* (options: CreateOpt
  // durably recorded by the execution layer.
  yield* Effect.forkDetach(Context.get(context, SessionRestart.Service).resumeSuspendedSessions)
  const plugins = Context.get(context, SdkPlugins.Service)
+  const workspace = Context.get(context, Workspace.Service)
  const router = Context.get(context, HttpRouter.HttpRouter)
  const handler = HttpEffect.toWebHandlerWith<never, HttpServerRequest.HttpServerRequest | Scope.Scope>(
    Logging.context(context),
@@ -56,6 +62,10 @@ export const create = Effect.fn("OpenCode.create")(function* (options: CreateOpt
    ...client,
    sessions: client.session,
    events: client.event,
+    workspace: {
+      create: ({ provider }: { readonly provider: string }) => workspace.create(provider),
+      destroy: ({ workspaceID }: { readonly workspaceID: Workspace.ID }) => workspace.destroy(workspaceID),
+    },
    // The embedded host contributes plugins through the ordinary discovery flow:
    // each plugin's `effect` runs inside every Location with the real
    // `PluginContext`, so `ctx.agent.transform` and every other hook behave exactly
@@ -69,4 +79,4 @@ export type Interface = Effect.Success<ReturnType<typeof create>>

 export class Service extends Context.Service<Service, Interface>()("@opencode-ai/sdk-next/OpenCode") {}

-export const layer = Layer.effect(Service, create())
+export const layer = (options: CreateOptions = {}) => Layer.effect(Service, create(options))
@@ -3,11 +3,8 @@ export * as OpenCodeWorkerd from "./workerd"
 import { ServerWorkerd } from "@opencode-ai/server/workerd"
 import { Layer } from "effect"
 import * as OpenCode from "./opencode"
-import type { LogOptions } from "./logging"

-export type CreateOptions = ServerWorkerd.Options & {
-  readonly log?: LogOptions
-}
+export type CreateOptions = ServerWorkerd.Options & Pick<OpenCode.CreateOptions, "log" | "workspaceProviders">

 /**
 * Boots the embedded opencode SDK on the workerd runtime profile: the full
@@ -23,7 +20,10 @@ export type CreateOptions = ServerWorkerd.Options & {
 * session operations plus the live `events.subscribe()` stream — served over
 * an in-process fetch transport, so no request leaves the isolate.
 */
-export const create = ({ log, ...options }: CreateOptions) =>
-  OpenCode.create({ ...ServerWorkerd.serverOptions(options), log }, { overrides: ServerWorkerd.replacements(options) })
+export const create = ({ log, workspaceProviders, ...options }: CreateOptions) =>
+  OpenCode.create(
+    { ...ServerWorkerd.serverOptions(options), log, workspaceProviders },
+    { overrides: ServerWorkerd.replacements(options) },
+  )

 export const layer = (options: CreateOptions) => Layer.effect(OpenCode.Service, create(options))
@@ -13,6 +13,7 @@ import { Session } from "@opencode-ai/schema/session"
 import { SessionInbox } from "@opencode-ai/schema/session-inbox"
 import { SessionMessage } from "@opencode-ai/schema/session-message"
 import { Workspace } from "@opencode-ai/schema/workspace"
+import { Worktree } from "@opencode-ai/schema/worktree"
 import { Api } from "@opencode-ai/server/api"
 import { ClientApi, groupNames, promiseOmitEndpoints } from "@opencode-ai/protocol/client"
 import { compile, emitPromise } from "@opencode-ai/httpapi-codegen"
@@ -22,6 +23,7 @@ const CoreAgent = await import("@opencode-ai/core/agent")
 const CoreModel = await import("@opencode-ai/core/model")
 const CoreProject = await import("@opencode-ai/core/project")
 const CoreSession = await import("@opencode-ai/core/session")
+const CoreWorktree = await import("@opencode-ai/core/worktree")

 test("re-exports canonical contracts directly from Schema", () => {
  expect(SDK.Agent).toBe(Agent)
@@ -29,6 +31,8 @@ test("re-exports canonical contracts directly from Schema", () => {
  expect(SDK.Model).toBe(Model)
  expect(SDK.WebSearch).toBe(WebSearch)
  expect(SDK.Session).toBe(Session)
+  expect(SDK.Worktree).toBe(Worktree)
+  expect(SDK.Workspace).toBe(Workspace)
  expect(Object.keys(SDK).sort()).toEqual([
    "AbsolutePath",
    "Agent",
@@ -44,7 +48,6 @@ test("re-exports canonical contracts directly from Schema", () => {
    "Permission",
    "PermissionSaved",
    "Project",
-    "ProjectCopy",
    "Prompt",
    "PromptInput",
    "Provider",
@@ -58,6 +61,8 @@ test("re-exports canonical contracts directly from Schema", () => {
    "Skill",
    "Tool",
    "WebSearch",
+    "Workspace",
+    "Worktree",
  ])
 })

@@ -67,8 +72,9 @@ test("Core and Server reuse the authoritative Schema and Protocol values", () =>
  expect(CoreModel.Ref).toBe(Model.Ref)
  expect(CoreSession.Info).toBe(Session.Info)
  expect(CoreProject.Current).toBe(Project.Current)
-  expect(CoreProject.Directory).toBe(Project.Directory)
-  expect(CoreProject.Directories).toBe(Project.Directories)
+  expect(CoreWorktree.DirectoryUnavailableError).toBeDefined()
+  expect(CoreWorktree.List).toBe(Worktree.List)
+  expect(CoreWorktree.Info).toBe(Worktree.Info)
  expect(CoreSessionInbox.Item).toBe(SessionInbox.Item)
  expect(CoreSessionInbox.User).toBe(SessionInbox.User)
  expect(CoreSessionInbox.Synthetic).toBe(SessionInbox.Synthetic)
@@ -1,6 +1,8 @@
 import fs from "fs/promises"
 import path from "path"
 import { expect } from "bun:test"
+import { makeMemoryDriver } from "@opencode-ai/core/environment/index"
+import { WorkspaceDriver } from "@opencode-ai/core/workspace/driver"
 import { Deferred, Effect, Latch, Layer, Option, Ref, Schema, Stream } from "effect"
 import { testEffect } from "../../core/test/lib/effect"
 import { tmpdir } from "../../core/test/fixture/tmpdir"
@@ -429,6 +431,58 @@ it.live("embedded client is available as a Layer service", () =>
      const opencode = yield* fixture.sdk.OpenCode.Service
      const created = yield* opencode.sessions.create({ id, location: location(fixture) })
      expect(created.id).toBe(id)
-    }).pipe(Effect.provide(fixture.sdk.OpenCode.layer))
+    }).pipe(Effect.provide(fixture.sdk.OpenCode.layer()))
  }),
 )
+
+it.live("configures workspace providers through the SDK facade", () =>
+  withEmbedded("opencode-embedded-workspace-", (fixture) =>
+    Effect.gen(function* () {
+      const calls: Array<{ readonly operation: string; readonly workspaceID: string }> = []
+      const driver = WorkspaceDriver.make({
+        create: ({ workspaceID }) => {
+          calls.push({ operation: "create", workspaceID })
+          return Effect.succeed({ binding: { externalID: workspaceID } })
+        },
+        connect: ({ workspaceID }) => {
+          calls.push({ operation: "connect", workspaceID })
+          return Effect.succeed(makeMemoryDriver())
+        },
+        suspendForIdle: () => Effect.void,
+        destroy: ({ workspaceID }) => {
+          calls.push({ operation: "destroy", workspaceID })
+          return Effect.void
+        },
+      })
+      const opencode = yield* fixture.sdk.OpenCode.create({ workspaceProviders: { fake: driver } })
+      const workspace = yield* opencode.workspace.create({ provider: "fake" })
+
+      expect(workspace.provider).toBe("fake")
+      expect(workspace.binding).toEqual({ externalID: workspace.id })
+      expect(calls).toEqual([{ operation: "create", workspaceID: workspace.id }])
+
+      const workspaceLocation = fixture.sdk.Location.Ref.make({
+        directory: fixture.sdk.AbsolutePath.make("/"),
+        workspaceID: workspace.id,
+      })
+      const session = yield* opencode.sessions.create({ location: workspaceLocation })
+      expect(session.location.workspaceID).toBe(workspace.id)
+
+      yield* opencode.workspace.destroy({ workspaceID: workspace.id })
+      expect(calls.map((call) => call.operation)).toEqual(["create", "destroy"])
+      expect((yield* opencode.workspace.destroy({ workspaceID: workspace.id }).pipe(Effect.flip))._tag).toBe(
+        "Workspace.NotFound",
+      )
+    }),
+  ),
+)
+
+it.live("preserves unknown workspace provider errors", () =>
+  withEmbedded("opencode-embedded-workspace-provider-", (fixture) =>
+    Effect.gen(function* () {
+      const opencode = yield* fixture.sdk.OpenCode.create()
+      const error = yield* opencode.workspace.create({ provider: "missing" }).pipe(Effect.flip)
+      expect(error).toEqual(new WorkspaceDriver.ProviderNotFound({ provider: "missing" }))
+    }),
+  ),
+)
@@ -21,8 +21,7 @@
    "@opencode-ai/simulation": "workspace:*",
    "@opencode-ai/util": "workspace:*",
    "drizzle-orm": "catalog:",
-    "effect": "catalog:",
-    "modal": "0.9.0"
+    "effect": "catalog:"
  },
  "devDependencies": {
    "@tsconfig/bun": "catalog:",
@@ -25,7 +25,7 @@ import { WebSearchHandler } from "./handlers/websearch"
 import { McpHandler } from "./handlers/mcp"
 import { CredentialHandler } from "./handlers/credential"
 import { ProjectHandler } from "./handlers/project"
-import { ProjectCopyHandler } from "./handlers/project-copy"
+import { WorktreeHandler } from "./handlers/worktree"
 import { VcsHandler } from "./handlers/vcs"
 import { EventFeed } from "./event-feed"
 import { MigrationHandler } from "./handlers/migration"
@@ -59,7 +59,7 @@ export const handlers = Layer.mergeAll(
  ShellHandler,
  QuestionHandler,
  ReferenceHandler,
-  ProjectCopyHandler,
+  WorktreeHandler,
  VcsHandler,
  ConfigHandler,
 )
@@ -1,68 +0,0 @@
-import { Location } from "@opencode-ai/core/location"
-import { ProjectCopy } from "@opencode-ai/core/project/copy"
-import { Git } from "@opencode-ai/core/git"
-import { Effect } from "effect"
-import { HttpApiBuilder, HttpApiSchema } from "effect/unstable/httpapi"
-import { Api } from "../api"
-import { ProjectCopyError } from "@opencode-ai/protocol/groups/project-copy"
-
-export const ProjectCopyHandler = HttpApiBuilder.group(Api, "server.projectCopy", (handlers) =>
-  Effect.succeed(
-    handlers
-      .handle("projectCopy.create", (ctx) =>
-        Effect.gen(function* () {
-          const copies = yield* ProjectCopy.Service
-          const location = yield* Location.Service
-          return yield* badRequest(
-            copies.create({
-              ...ctx.payload,
-              projectID: ctx.params.projectID,
-              sourceDirectory: location.project.directory,
-            }),
-          )
-        }),
-      )
-      .handle("projectCopy.remove", (ctx) =>
-        ProjectCopy.Service.use((copies) =>
-          badRequest(copies.remove({ ...ctx.payload, projectID: ctx.params.projectID })).pipe(
-            Effect.as(HttpApiSchema.NoContent.make()),
-          ),
-        ),
-      )
-      .handle("projectCopy.refresh", (ctx) =>
-        ProjectCopy.Service.use((copies) =>
-          badRequest(copies.refresh({ projectID: ctx.params.projectID })).pipe(
-            Effect.as(HttpApiSchema.NoContent.make()),
-          ),
-        ),
-      ),
-  ),
-)
-
-function badRequest<A, R>(effect: Effect.Effect<A, ProjectCopy.Error, R>) {
-  return effect.pipe(
-    Effect.mapError(
-      (error) =>
-        new ProjectCopyError({
-          name: "ProjectCopyError",
-          data: {
-            message: message(error),
-            forceRequired: error instanceof Git.WorktreeError ? error.forceRequired : undefined,
-          },
-        }),
-    ),
-  )
-}
-
-function message(error: ProjectCopy.Error) {
-  if (error instanceof ProjectCopy.SourceDirectoryNotFoundError)
-    return `Project copy source not found: ${error.directory}`
-  if (error instanceof ProjectCopy.DestinationExistsError)
-    return `Project copy destination already exists: ${error.directory}`
-  if (error instanceof ProjectCopy.DirectoryUnavailableError)
-    return `Project copy directory unavailable: ${error.directory}`
-  if (error instanceof ProjectCopy.InvalidDirectoryError) return `Invalid project copy directory: ${error.directory}`
-  if (error instanceof ProjectCopy.StrategyUnavailableError)
-    return `Project copy strategy unavailable: ${error.strategy}`
-  return error.message
-}
@@ -15,8 +15,5 @@ export const ProjectHandler = HttpApiBuilder.group(Api, "server.project", (handl
          canonical: location.project.canonical,
        }),
      ),
-    )
-    .handle("project.directories", (ctx) =>
-      Project.Service.use((project) => project.directories({ projectID: ctx.params.projectID })),
    ),
 )
@@ -0,0 +1,53 @@
+import { Git } from "@opencode-ai/core/git"
+import { Worktree } from "@opencode-ai/core/worktree"
+import { WorktreeError } from "@opencode-ai/protocol/groups/worktree"
+import { Effect } from "effect"
+import { HttpApiBuilder, HttpApiSchema } from "effect/unstable/httpapi"
+import { Api } from "../api"
+
+export const WorktreeHandler = HttpApiBuilder.group(Api, "server.worktree", (handlers) =>
+  Effect.gen(function* () {
+    const worktrees = yield* Worktree.Service
+
+    return handlers
+      .handle("worktree.list", (ctx) => worktrees.list(ctx.params.projectID))
+      .handle("worktree.create", (ctx) =>
+        badRequest(worktrees.create({ ...ctx.payload, projectID: ctx.params.projectID })),
+      )
+      .handle("worktree.remove", (ctx) =>
+        badRequest(worktrees.remove({ ...ctx.payload, projectID: ctx.params.projectID })).pipe(
+          Effect.as(HttpApiSchema.NoContent.make()),
+        ),
+      )
+      .handle("worktree.refresh", (ctx) =>
+        badRequest(worktrees.refresh({ projectID: ctx.params.projectID })).pipe(
+          Effect.as(HttpApiSchema.NoContent.make()),
+        ),
+      )
+  }),
+)
+
+function badRequest<A, R>(effect: Effect.Effect<A, Worktree.Error, R>) {
+  return effect.pipe(
+    Effect.mapError(
+      (error) =>
+        new WorktreeError({
+          name: "WorktreeError",
+          data: {
+            message: message(error),
+            forceRequired: error instanceof Git.WorktreeError ? error.forceRequired : undefined,
+          },
+        }),
+    ),
+  )
+}
+
+function message(error: Worktree.Error) {
+  if (error instanceof Worktree.SourceDirectoryNotFoundError)
+    return `Worktree source not found for project: ${error.projectID}`
+  if (error instanceof Worktree.DestinationExistsError) return `Worktree destination already exists: ${error.directory}`
+  if (error instanceof Worktree.DirectoryUnavailableError) return `Worktree directory unavailable: ${error.directory}`
+  if (error instanceof Worktree.InvalidDirectoryError) return `Invalid worktree directory: ${error.directory}`
+  if (error instanceof Worktree.StrategyUnavailableError) return `Worktree strategy unavailable: ${error.strategy}`
+  return error.message
+}
@@ -27,7 +27,8 @@ import { SessionRestart } from "@opencode-ai/core/session/execution/restart"
 import { PluginRuntime } from "@opencode-ai/core/plugin/runtime"
 import { SdkPlugins } from "@opencode-ai/core/plugin/sdk"
 import { WellKnown } from "@opencode-ai/core/wellknown"
-import { WorkspaceDriver } from "@opencode-ai/core/workspace/driver"
+import { Workspace } from "@opencode-ai/core/workspace"
+import { Worktree } from "@opencode-ai/core/worktree"
 import { Watcher } from "@opencode-ai/core/filesystem/watcher"
 import { HttpRouter } from "effect/unstable/http"
 import { HttpApiBuilder } from "effect/unstable/httpapi"
@@ -43,9 +44,8 @@ import { formLocationLayer } from "./middleware/form-location"
 import { sessionLocationLayer } from "./middleware/session-location"
 import { ServerInfo } from "./server-info"
 import type { ServerOptions } from "./options"
-import { modalWorkspaceDriver, provider as modalProvider } from "./workspace/modal-workspace"

-const applicationServices = LayerNode.group([
+const applicationServiceNodes = [
  Global.node,
  Database.node,
  Bus.node,
@@ -53,6 +53,7 @@ const applicationServices = LayerNode.group([
  httpClient,
  Job.node,
  Project.node,
+  Worktree.node,
  Session.node,
  SessionTransfer.node,
  PluginRuntime.providerNode,
@@ -64,7 +65,9 @@ const applicationServices = LayerNode.group([
  PtyEnvironment.node,
  LocationServiceMap.node,
  SessionRestart.node,
-])
+] as const
+const applicationServices = LayerNode.group(applicationServiceNodes)
+const embeddedApplicationServices = LayerNode.group([...applicationServiceNodes, Workspace.node])

 export function createRoutes(
  options: ServerOptions = {},
@@ -78,11 +81,12 @@ export function createRoutes(
    options,
    serviceURLs,
    overrides,
+    false,
  )
 }

 export function createEmbeddedRoutes(options: ServerOptions = {}, overrides: LayerNode.Replacements = []) {
-  return makeRoutes(ServerAuth.Config.configLayer({ password: Option.none() }), options, () => [], overrides)
+  return makeRoutes(ServerAuth.Config.configLayer({ password: Option.none() }), options, () => [], overrides, true)
 }

 function makeRoutes<AuthError, AuthServices>(
@@ -91,6 +95,7 @@ function makeRoutes<AuthError, AuthServices>(
  serviceURLs: () => ReadonlyArray<string>,
  // Runtime-profile replacements (e.g. workerd) applied after the standard set, so later entries win.
  overrides: LayerNode.Replacements,
+  embedded: boolean,
 ) {
  const pluginRuntimeCell = PluginRuntime.makeCell()
  const standard: LayerNode.Replacements = [
@@ -124,10 +129,6 @@ function makeRoutes<AuthError, AuthServices>(
    ],
    [PluginRuntime.node, PluginRuntime.layerWithCell(pluginRuntimeCell)],
    [PluginRuntime.providerNode, PluginRuntime.providerNodeWithCell(pluginRuntimeCell)],
-    [
-      WorkspaceDriver.node,
-      WorkspaceDriver.registryNode({ [modalProvider]: modalWorkspaceDriver({ app: "opencode-workspaces" }) }),
-    ],
  ]
  const replacements: LayerNode.Replacements = [...standard, ...overrides]
  const serviceLayer = options.simulation
@@ -135,10 +136,13 @@ function makeRoutes<AuthError, AuthServices>(
        Effect.gen(function* () {
          const { simulationReplacements } = yield* Effect.promise(() => import("@opencode-ai/simulation/backend"))
          const simulation = yield* simulationReplacements({ version: App.make(options.app).version })
-          return AppNodeBuilder.build(applicationServices, [...replacements, ...simulation])
+          return AppNodeBuilder.build(embedded ? embeddedApplicationServices : applicationServices, [
+            ...replacements,
+            ...simulation,
+          ])
        }),
      )
-    : AppNodeBuilder.build(applicationServices, replacements)
+    : AppNodeBuilder.build(embedded ? embeddedApplicationServices : applicationServices, replacements)
  return serviceLayer.pipe(
    Layer.flatMap((context) => {
      const services = Layer.succeedContext(context)
@@ -1,128 +0,0 @@
-import { WorkspaceDriver } from "@opencode-ai/core/workspace/driver"
-import { Effect, Option, Schema } from "effect"
-import type { App, Image, ModalClient, ModalClientParams, Sandbox } from "modal"
-import { createModalSandboxWithClient, makeModalDriver, type ModalImageSpec, openModalClient } from "./modal"
-
-export const provider = "modal"
-
-export const ModalBinding = Schema.Struct({
-  sandboxId: Schema.optional(Schema.String),
-  snapshotImageId: Schema.optional(Schema.String),
-})
-export type ModalBinding = typeof ModalBinding.Type
-
-export interface ModalWorkspaceOptions {
-  readonly app: string
-  readonly client?: ModalClientParams
-  readonly image?: ModalImageSpec
-}
-
-export const modalWorkspaceDriver = (options: ModalWorkspaceOptions): WorkspaceDriver.Interface => {
-  const decodeBinding = Schema.decodeUnknownOption(ModalBinding)
-  let clientPromise: Promise<ModalClient> | undefined
-  let appPromise: Promise<App> | undefined
-  // The SDK client and app handle are shared for the process lifetime of this driver.
-  const client = () => (clientPromise ??= openModalClient(options.client))
-  const app = () =>
-    (appPromise ??= client().then((value) => value.apps.fromName(options.app, { createIfMissing: true })))
-
-  const attempt = <A>(run: () => Promise<A>) =>
-    Effect.tryPromise({ try: run, catch: (cause) => new WorkspaceDriver.Error({ cause }) })
-
-  const binding = (value: WorkspaceDriver.Binding): ModalBinding => Option.getOrElse(decodeBinding(value), () => ({}))
-
-  const live = async (lookup: () => Promise<Sandbox>) => {
-    const { NotFoundError } = await import("modal")
-    const sandbox = await lookup().catch((error) => {
-      if (error instanceof NotFoundError) return undefined
-      throw error
-    })
-    if (sandbox && (await sandbox.poll()) === null) return sandbox
-  }
-
-  const findLive = async (modalClient: ModalClient, value: ModalBinding, workspaceID: string) => {
-    if (value.sandboxId) {
-      const sandboxID = value.sandboxId
-      const sandbox = await live(() => modalClient.sandboxes.fromId(sandboxID))
-      if (sandbox) return sandbox
-    }
-    // Name fallback is valid only before the first snapshot; afterward a live named sandbox is stale by design.
-    if (value.snapshotImageId) return
-    return live(() => modalClient.sandboxes.fromName(options.app, workspaceID))
-  }
-
-  const createSandbox = async (workspaceID: string, image?: Image) => {
-    const { AlreadyExistsError } = await import("modal")
-    const modalClient = await client()
-    return createModalSandboxWithClient(
-      modalClient,
-      await app(),
-      {
-        image: options.image,
-        sandbox: {
-          name: workspaceID,
-          tags: { workspace: workspaceID },
-          timeoutMs: 24 * 60 * 60 * 1000,
-        },
-      },
-      image,
-    ).catch((error) => {
-      if (error instanceof AlreadyExistsError) return modalClient.sandboxes.fromName(options.app, workspaceID)
-      throw error
-    })
-  }
-
-  const deleteImage = (modalClient: ModalClient, imageID?: string) =>
-    imageID ? attempt(() => modalClient.images.delete(imageID)).pipe(Effect.ignore) : Effect.void
-
-  const terminate = (sandbox?: Sandbox) =>
-    sandbox ? attempt(() => sandbox.terminate({ wait: true })).pipe(Effect.ignore) : Effect.void
-
-  return WorkspaceDriver.make({
-    create: ({ workspaceID }) =>
-      attempt(async () => {
-        const sandbox = await createSandbox(workspaceID)
-        return { binding: { sandboxId: sandbox.sandboxId } }
-      }),
-    connect: ({ workspaceID, binding: value, saveBinding }) =>
-      Effect.gen(function* () {
-        const modalBinding = binding(value)
-        const modalClient = yield* attempt(client)
-        const sandbox = yield* attempt(async () => {
-          const existing = await findLive(modalClient, modalBinding, workspaceID)
-          const image =
-            existing || !modalBinding.snapshotImageId
-              ? undefined
-              : await modalClient.images.fromId(modalBinding.snapshotImageId)
-          return existing ?? createSandbox(workspaceID, image)
-        })
-        if (modalBinding.sandboxId !== sandbox.sandboxId) {
-          yield* saveBinding({ ...modalBinding, sandboxId: sandbox.sandboxId })
-        }
-        return makeModalDriver(sandbox)
-      }),
-    suspendForIdle: ({ workspaceID, binding: value, saveBinding }) =>
-      Effect.gen(function* () {
-        const modalBinding = binding(value)
-        const modalClient = yield* attempt(client)
-        const sandbox = yield* attempt(() => findLive(modalClient, modalBinding, workspaceID))
-        if (!sandbox) return
-        const snapshot = yield* attempt(() => sandbox.snapshotFilesystem({ ttlMs: null }))
-        yield* saveBinding({ snapshotImageId: snapshot.imageId })
-        yield* Effect.all([deleteImage(modalClient, modalBinding.snapshotImageId), terminate(sandbox)], {
-          concurrency: "unbounded",
-          discard: true,
-        })
-      }),
-    destroy: ({ workspaceID, binding: value }) =>
-      Effect.gen(function* () {
-        const modalBinding = binding(value)
-        const modalClient = yield* attempt(client)
-        const sandbox = yield* attempt(() => findLive(modalClient, modalBinding, workspaceID))
-        yield* Effect.all([terminate(sandbox), deleteImage(modalClient, modalBinding.snapshotImageId)], {
-          concurrency: "unbounded",
-          discard: true,
-        })
-      }),
-  })
-}
@@ -1,225 +0,0 @@
-import { Effect, Sink, Stream } from "effect"
-import { systemError } from "effect/PlatformError"
-import type { Command, KillOptions } from "effect/unstable/process/ChildProcess"
-import { ExitCode, make, makeHandle, ProcessId } from "effect/unstable/process/ChildProcessSpawner"
-import type { Driver } from "@opencode-ai/core/environment/index"
-import type { App, Image, ModalClient, ModalClientParams, Sandbox, SandboxCreateParams } from "modal"
-
-const INNER_WRAPPER = `
-pidfile=$1
-shift
-printf "%s" "$$" > "$pidfile"
-trap 'rm -f -- "$pidfile"' EXIT
-"$@"
-`
-
-// Modal's VM runtime accepts process-group signals without delivering them
-// (kill(-pgid) returns 0 and nothing dies; direct-pid signals work), so the
-// group is enumerated from /proc and each member is signalled directly. The
-// second pass catches children forked between scan and signal.
-const KILL = `
-pidfile=$1
-sig=$2
-i=0
-while [ ! -s "$pidfile" ] && [ "$i" -lt 250 ]; do sleep 0.02; i=$((i + 1)); done
-[ -s "$pidfile" ] || exit 47
-target=$(cat "$pidfile")
-pass=0
-while [ "$pass" -lt 2 ]; do
-  for stat in /proc/[0-9]*/stat; do
-    [ -e "$stat" ] || continue
-    pid=\${stat#/proc/}
-    pid=\${pid%/stat}
-    set -- $(sed "s/.*) //" "$stat" 2>/dev/null)
-    if [ "\${3:-}" = "$target" ]; then
-      /bin/kill "-$sig" "$pid" 2>/dev/null || true
-    fi
-  done
-  pass=$((pass + 1))
-done
-`
-
-export interface ModalImageSpec {
-  readonly registry: string
-  readonly dockerfileCommands: ReadonlyArray<string>
-}
-
-export interface ModalSandboxCreateOptions {
-  readonly image?: ModalImageSpec
-  readonly sandbox?: SandboxCreateParams
-}
-
-export interface ModalSandboxOptions extends ModalSandboxCreateOptions {
-  readonly app: string
-  readonly client?: ModalClientParams
-}
-
-/**
- * Ubuntu supplies the GNU coreutils and findutils required by the derived Files
- * scripts. Busybox images do not satisfy the Environment contract.
- */
-export const ubuntuImage: ModalImageSpec = {
-  registry: "ubuntu:24.04",
-  dockerfileCommands: [
-    "RUN apt-get update && apt-get install -y --no-install-recommends git bash ripgrep ca-certificates coreutils findutils util-linux",
-  ],
-}
-
-/** Creates a Modal sandbox lazily, keeping the SDK off the server startup path when Modal is unused. */
-export const createModalSandbox = async (options: ModalSandboxOptions) => {
-  const client = await openModalClient(options.client)
-  const app = await client.apps.fromName(options.app, { createIfMissing: true })
-  const sandbox = await createModalSandboxWithClient(client, app, {
-    image: options.image,
-    sandbox: options.sandbox,
-  })
-  return {
-    driver: makeModalDriver(sandbox),
-    sandbox,
-    terminate: () => sandbox.terminate(),
-  }
-}
-
-export const openModalClient = async (params?: ModalClientParams) => {
-  const { ModalClient } = await import("modal")
-  return new ModalClient(params)
-}
-
-export const createModalSandboxWithClient = async (
-  client: ModalClient,
-  app: App,
-  options: ModalSandboxCreateOptions,
-  existingImage?: Image,
-) => {
-  const imageSpec = options.image ?? ubuntuImage
-  const image =
-    existingImage ??
-    client.images.fromRegistry(imageSpec.registry).dockerfileCommands([...imageSpec.dockerfileCommands])
-  // Always Modal's Full-VM runtime (beta, enabled per account): a real kernel
-  // with real device nodes, so workspaces can run Docker and other
-  // kernel-dependent workloads. Costs versus gVisor, measured Aug 2026:
-  // per-exec floor ~285-535ms versus ~90-165ms, and filesystem snapshots only
-  // (no memory snapshots — acceptable; fs-snapshot is the persistence design).
-  return client.sandboxes.create(app, image, {
-    ...options.sandbox,
-    experimentalOptions: { ...options.sandbox?.experimentalOptions, vm_runtime: true },
-  })
-}
-
-/**
- * Adapts Modal exec to the Environment driver. Files intentionally has no native
- * overrides: exec latency dominates payload work (VM runtime floor measured
- * ~285-535ms per exec, Aug 2026), so the derived exec defaults are the simplest
- * implementation with no measured loss.
- *
- * Modal cannot signal a ContainerProcess. Each command therefore starts a new
- * process group and records its leader in a unique pid file; kill runs a second
- * sandbox command that enumerates that group from /proc and signals each member
- * directly (see KILL). Pid files are removed best-effort.
- */
-export const makeModalDriver = (sandbox: Sandbox): Driver => {
-  const spawn = Effect.fnUntraced(function* (command: Command) {
-    if (command._tag === "PipedCommand") {
-      return yield* Effect.fail(spawnError("spawn", "piped commands unsupported"))
-    }
-    if (command.options.additionalFds) {
-      return yield* Effect.fail(spawnError("spawn", "additional file descriptors unsupported"))
-    }
-
-    const pidFile = `/tmp/opencode-process-${crypto.randomUUID()}.pid`
-    const env = compact(command.options.env)
-    const isolatedEnv =
-      command.options.extendEnv === false || (!command.options.extendEnv && command.options.env !== undefined)
-    const argv = isolatedEnv ? ["env", "-i", ...Object.entries(env ?? {}).map(([key, value]) => `${key}=${value}`)] : []
-    const process = yield* Effect.tryPromise({
-      try: () =>
-        sandbox.exec(
-          ["setsid", "--wait", "sh", "-c", INNER_WRAPPER, "sh", pidFile, ...argv, command.command, ...command.args],
-          {
-            mode: "binary",
-            stdout: "pipe",
-            stderr: "pipe",
-            workdir: command.options.cwd,
-            env: isolatedEnv ? undefined : env,
-          },
-        ),
-      catch: (cause) => spawnError("spawn", undefined, cause),
-    })
-
-    const onError = (cause: unknown) => spawnError("process", undefined, cause)
-    let exited = false
-    const writer = process.stdin.getWriter()
-    let closingStdin: Promise<void> | undefined
-    const waited = process.wait().then((code) => {
-      exited = true
-      if (!closingStdin) writer.releaseLock()
-      return code
-    })
-    const exitCode = Effect.tryPromise({ try: () => waited, catch: onError }).pipe(Effect.map(ExitCode))
-    const kill = (options?: KillOptions) => {
-      if (exited) return Effect.void
-      return Effect.tryPromise({
-        try: async () => {
-          const killer = await sandbox.exec(["sh", "-c", KILL, "sh", pidFile, options?.killSignal ?? "SIGTERM"], {
-            stdout: "pipe",
-            stderr: "pipe",
-          })
-          const code = await killer.wait()
-          if (code !== 0) throw new Error(`modal kill exited ${code}`)
-        },
-        catch: onError,
-      }).pipe(Effect.andThen(exitCode), Effect.asVoid)
-    }
-
-    yield* Effect.addFinalizer(() => kill(command.options).pipe(Effect.ignore))
-
-    const closeStdin = Effect.tryPromise({
-      try: () => (closingStdin ??= writer.close().finally(() => writer.releaseLock())),
-      catch: onError,
-    })
-    const writeStdin = Sink.forEach((chunk: Uint8Array) =>
-      Effect.tryPromise({ try: () => writer.write(chunk), catch: onError }),
-    )
-    const inputConfig = command.options.stdin
-    const inputOptions =
-      inputConfig !== undefined && typeof inputConfig === "object" && !Stream.isStream(inputConfig)
-        ? inputConfig
-        : undefined
-    const input = inputOptions?.stream ?? inputConfig
-    const stdin = inputOptions?.endOnDone === false ? writeStdin : writeStdin.pipe(Sink.ensuring(closeStdin))
-    if (input === "ignore") {
-      yield* closeStdin
-    }
-    if (Stream.isStream(input)) {
-      yield* Effect.forkScoped(Stream.run(input, stdin))
-    }
-
-    const stdout = Stream.fromReadableStream({ evaluate: () => process.stdout, onError })
-    const stderr = Stream.fromReadableStream({ evaluate: () => process.stderr, onError })
-    return makeHandle({
-      pid: ProcessId(crypto.getRandomValues(new Uint32Array(1))[0]),
-      exitCode,
-      isRunning: Effect.sync(() => !exited),
-      kill,
-      stdin,
-      stdout,
-      stderr,
-      all: Stream.merge(stdout, stderr),
-      getInputFd: () => Sink.fail(spawnError("getInputFd", "unsupported")),
-      getOutputFd: () => Stream.fail(spawnError("getOutputFd", "unsupported")),
-      unref: Effect.succeed(Effect.void),
-    })
-  })
-
-  return { spawner: make(spawn) }
-}
-
-const compact = (env: Record<string, string | undefined> | undefined) => {
-  if (!env) return undefined
-  return Object.fromEntries(Object.entries(env).flatMap(([key, value]) => (value === undefined ? [] : [[key, value]])))
-}
-
-const spawnError = (method: string, description?: string, cause?: unknown) =>
-  systemError({ _tag: "Unknown", module: "ModalDriver", method, description, cause })
-
-export * as ModalDriver from "./modal"
@@ -1,67 +0,0 @@
-import fs from "node:fs"
-import os from "node:os"
-import path from "node:path"
-import { afterAll, expect, test } from "bun:test"
-import { Effect } from "effect"
-import { ChildProcess } from "effect/unstable/process"
-import { Failed, makeFiles } from "@opencode-ai/core/environment/index"
-import { environmentConformance } from "../../core/test/lib/environment-conformance.js"
-import { createModalSandbox } from "../src/workspace/modal"
-
-const enabled =
-  !!process.env.OPENCODE_TEST_MODAL &&
-  ((!!process.env.MODAL_TOKEN_ID && !!process.env.MODAL_TOKEN_SECRET) ||
-    fs.existsSync(path.join(os.homedir(), ".modal.toml")))
-const modalTest = enabled ? test : test.skip
-const root = `/tmp/opencode-environment-${crypto.randomUUID()}`
-const sandbox = enabled
-  ? createModalSandbox({
-      app: "opencode-environment-tests",
-      sandbox: { timeoutMs: 10 * 60 * 1000 },
-    })
-  : undefined
-
-modalTest(
-  "kills a running modal process",
-  async () => {
-    const value = await sandbox!
-    const started = performance.now()
-    const exitCode = await Effect.runPromise(
-      Effect.scoped(
-        Effect.gen(function* () {
-          const handle = yield* value.driver.spawner.spawn(ChildProcess.make("sleep", ["300"]))
-          yield* handle.kill()
-          return yield* handle.exitCode
-        }),
-      ).pipe(Effect.timeout("10 seconds")),
-    )
-    expect(exitCode).not.toBe(0)
-    expect(performance.now() - started).toBeLessThan(10_000)
-  },
-  15_000,
-)
-
-environmentConformance(
-  "modal environment",
-  () =>
-    Effect.promise(async () => {
-      const value = await sandbox!
-      return {
-        files: makeFiles(value.driver),
-        root,
-        symlink: (target, link) =>
-          Effect.scoped(value.driver.spawner.exitCode(ChildProcess.make("ln", ["-s", "--", target, link]))).pipe(
-            Effect.flatMap((code) =>
-              code === 0 ? Effect.void : Effect.fail(new Failed({ path: link, cause: new Error(`ln exited ${code}`) })),
-            ),
-            Effect.mapError((cause) => (cause instanceof Failed ? cause : new Failed({ path: link, cause }))),
-          ),
-      }
-    }),
-  !enabled,
-)
-
-afterAll(async () => {
-  if (!sandbox) return
-  await (await sandbox).terminate()
-})
@@ -1,54 +0,0 @@
-import fs from "node:fs"
-import os from "node:os"
-import path from "node:path"
-import { expect, test } from "bun:test"
-import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
-import { makeFiles } from "@opencode-ai/core/environment/index"
-import { Workspace } from "@opencode-ai/core/workspace"
-import { WorkspaceDriver } from "@opencode-ai/core/workspace/driver"
-import { Effect, Layer } from "effect"
-import { TestClock } from "effect/testing"
-import { modalWorkspaceDriver, provider } from "../src/workspace/modal-workspace"
-
-const enabled =
-  !!process.env.OPENCODE_TEST_MODAL &&
-  ((!!process.env.MODAL_TOKEN_ID && !!process.env.MODAL_TOKEN_SECRET) ||
-    fs.existsSync(path.join(os.homedir(), ".modal.toml")))
-
-const testLayer = Layer.provideMerge(
-  AppNodeBuilder.build(Workspace.configured({ idleThreshold: "1 minute", pollInterval: "1 minute" }), [
-    [
-      WorkspaceDriver.node,
-      WorkspaceDriver.registryNode({ [provider]: modalWorkspaceDriver({ app: "opencode-workspace-tests" }) }),
-    ],
-  ]),
-  TestClock.layer(),
-)
-const modalTest = enabled ? test : test.skip
-
-modalTest(
-  "wakes a workspace from its filesystem snapshot",
-  () =>
-    Effect.runPromise(
-      Effect.gen(function* () {
-        const workspace = yield* Workspace.Service
-        yield* Effect.acquireUseRelease(
-          workspace.create(provider),
-          (created) =>
-            Effect.gen(function* () {
-              const environment = yield* workspace.connect(created.id)
-              const files = makeFiles(environment)
-              const file = `/tmp/opencode-workspace-${crypto.randomUUID()}.txt`
-              yield* files.write(file, new TextEncoder().encode("survived snapshot"))
-
-              yield* TestClock.adjust("2 minutes")
-
-              const restored = yield* files.read(file)
-              expect(new TextDecoder().decode(restored.bytes)).toBe("survived snapshot")
-            }),
-          (created) => workspace.destroy(created.id).pipe(Effect.ignore),
-        )
-      }).pipe(Effect.scoped, Effect.provide(testLayer)),
-    ),
-  180_000,
-)
@@ -0,0 +1,71 @@
+import fs from "node:fs/promises"
+import path from "node:path"
+import { $ } from "bun"
+import { expect } from "bun:test"
+import { Effect } from "effect"
+import { HttpServer } from "effect/unstable/http"
+import { tmpdir } from "../../core/test/fixture/tmpdir"
+import { it } from "../../core/test/lib/effect"
+import { ServerProcess } from "../src/process"
+
+it.live("lists, creates, and removes worktrees by project ID", () =>
+  Effect.acquireUseRelease(
+    Effect.promise(() => tmpdir("opencode-worktree-endpoint-")),
+    (tmp) =>
+      Effect.gen(function* () {
+        const project = path.join(tmp.path, "project")
+        const destination = path.join(tmp.path, "worktrees")
+        yield* Effect.promise(() => fs.mkdir(project, { recursive: true }))
+        yield* Effect.promise(() => $`git init`.cwd(project).quiet())
+        yield* Effect.promise(() => $`git config user.email test@opencode.test`.cwd(project).quiet())
+        yield* Effect.promise(() => $`git config user.name Test`.cwd(project).quiet())
+        yield* Effect.promise(() => $`git commit --allow-empty -m root`.cwd(project).quiet())
+        const server = yield* ServerProcess.start<never, never>({
+          hostname: "127.0.0.1",
+          port: 0,
+          password: "secret",
+          app: { version: "test-version" },
+          database: { path: ":memory:" },
+          config: { directory: path.join(tmp.path, "config") },
+          fs: { filewatcher: false },
+        })
+        const base = HttpServer.formatAddress(server.address)
+        const headers = { authorization: `Basic ${btoa("opencode:secret")}` }
+        const location = new URL("/api/location", base)
+        location.searchParams.set("location[directory]", project)
+        const resolved = yield* Effect.promise(() => fetch(location, { headers }).then((response) => response.json()))
+        if (!isRecord(resolved) || !isRecord(resolved.project) || typeof resolved.project.id !== "string")
+          throw new Error("Expected resolved project")
+        const url = new URL(`/api/experimental/project/${resolved.project.id}/worktree`, base)
+
+        const initial = yield* Effect.promise(() => fetch(url, { headers }).then((response) => response.json()))
+        expect(initial).toEqual([{ directory: project }])
+
+        const created = yield* Effect.promise(() =>
+          fetch(url, {
+            method: "POST",
+            headers: { ...headers, "content-type": "application/json" },
+            body: JSON.stringify({ strategy: "git", directory: destination, name: "api" }),
+          }).then((response) => response.json()),
+        )
+        expect(created).toEqual({ directory: path.join(destination, "api") })
+
+        const listed = yield* Effect.promise(() => fetch(url, { headers }).then((response) => response.json()))
+        expect(listed).toContainEqual({ directory: path.join(destination, "api"), strategy: "git" })
+
+        const removed = yield* Effect.promise(() =>
+          fetch(url, {
+            method: "DELETE",
+            headers: { ...headers, "content-type": "application/json" },
+            body: JSON.stringify({ directory: path.join(destination, "api"), force: false }),
+          }),
+        )
+        expect(removed.status).toBe(204)
+      }),
+    (tmp) => Effect.promise(() => tmp[Symbol.asyncDispose]()),
+  ),
+)
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === "object" && value !== null && !Array.isArray(value)
+}
@@ -117,7 +117,6 @@ export function DialogMcp() {
          <DialogSelect
            title="MCP servers"
            options={options()}
-            current={focused()}
            preserveSelection
            onMove={(option) => setFocused(option.value as string)}
            onSelect={(option) => open(option.value as string)}
@@ -16,14 +16,14 @@ import { isRecord } from "../util/record"
 import { useToast } from "../ui/toast"
 import { Spinner } from "./spinner"
 import { DialogWorkspaceFileChanges } from "./dialog-workspace-file-changes"
-import type { ProjectDirectoriesOutput } from "@opencode-ai/client"
+import type { WorktreeListOutput } from "@opencode-ai/client"
 import { useRoute } from "../context/route"
-import { DialogProjectCopyName } from "./dialog-project-copy-name"
+import { DialogWorktreeName } from "./dialog-worktree-name"

 export type MoveSessionSelection =
  | { type: "directory"; directory: string; subdirectory: boolean }
  | { type: "new"; name: string }
-type ProjectDirectory = ProjectDirectoriesOutput[number]
+type ProjectDirectory = WorktreeListOutput[number]

 type DialogMoveSessionProps = {
  projectID: string
@@ -78,15 +78,8 @@ export function DialogMoveSession(props: DialogMoveSessionProps) {
    () => (props.initialRemoving ? undefined : props.projectID),
    async (projectID, info): Promise<ReadonlyArray<ProjectDirectory> | undefined> => {
      try {
-        const requestLocation = { directory: location()?.directory || paths.cwd }
-        await client.api.projectCopy.refresh({
-          projectID,
-          location: requestLocation,
-        })
-        const directories = await client.api.project.directories({
-          projectID,
-          location: requestLocation,
-        })
+        await client.api.worktree.refresh({ projectID })
+        const directories = await client.api.worktree.list({ projectID })
        setLoadError(undefined)
        return directories
      } catch (error) {
@@ -234,10 +227,9 @@ export function DialogMoveSession(props: DialogMoveSessionProps) {
    setToDelete(undefined)
    setRemoving(selected.directory)
    setWorking(true)
-    const error = await client.api.projectCopy
+    const error = await client.api.worktree
      .remove({
        projectID: props.projectID,
-        location: { directory: location()?.directory || paths.cwd },
        directory: selected.directory,
        force: false,
      })
@@ -253,18 +245,17 @@ export function DialogMoveSession(props: DialogMoveSessionProps) {
          .status({ location: { directory: selected.directory } })
          .catch(() => undefined)
        const choice = await DialogWorkspaceFileChanges.show(dialog, status?.data ?? [], {
-          title: "Delete working copy?",
-          message: "This working copy has file changes. Do you want to delete it anyway?",
+          title: "Delete worktree?",
+          message: "This worktree has file changes. Do you want to delete it anyway?",
        })
        if (choice !== "yes") {
          reopen()
          return
        }
        reopen(selected.directory)
-        const forcedError = await client.api.projectCopy
+        const forcedError = await client.api.worktree
          .remove({
            projectID: props.projectID,
-            location: { directory: location()?.directory || paths.cwd },
            directory: selected.directory,
            force: true,
          })
@@ -275,7 +266,7 @@ export function DialogMoveSession(props: DialogMoveSessionProps) {
        if (forcedError) {
          toast.show({
            variant: "error",
-            title: "Failed to delete project copy",
+            title: "Failed to delete worktree",
            message: errorMessage(forcedError),
          })
          reopen()
@@ -289,7 +280,7 @@ export function DialogMoveSession(props: DialogMoveSessionProps) {
      }
      toast.show({
        variant: "error",
-        title: "Failed to delete project copy",
+        title: "Failed to delete worktree",
        message: errorMessage(error),
      })
      return
@@ -301,7 +292,7 @@ export function DialogMoveSession(props: DialogMoveSessionProps) {
  }

  async function create() {
-    const name = await DialogProjectCopyName.show(dialog)
+    const name = await DialogWorktreeName.show(dialog)
    if (name === null) return
    props.onSelect({ type: "new", name })
  }
@@ -1,6 +1,7 @@
 import { createMemo, createResource, createSignal } from "solid-js"
 import type { SessionInfo } from "@opencode-ai/client"
 import { useTerminalDimensions } from "@opentui/solid"
+import type { RGBA } from "@opentui/core"
 import { dialogWidth, useDialog } from "../ui/dialog"
 import { DialogSelect, dialogSelectContentWidth } from "../ui/dialog-select"
 import { useRoute } from "../context/route"
@@ -105,7 +106,7 @@ export function DialogOpen(props: { sessions: SessionInfo[] }) {
        footer: `${name ? `${Locale.truncate(name, 20)} · ` : ""}${timeAgo(session.time.updated)}`,
        onSelect: () => location.set(session.location),
        gutter: running
-          ? () => <Spinner />
+          ? (color: RGBA) => <Spinner color={color} />
          : tabs.has(session.id)
            ? () => <text fg={theme.hue.accent[mode() === "light" ? 800 : 200]}>▪</text>
            : undefined,
@@ -2,6 +2,7 @@ import { createMemo, createResource, createSignal, onMount, Show } from "solid-j
 import path from "path"
 import type { SessionInfo } from "@opencode-ai/client"
 import { TextAttributes } from "@opentui/core"
+import type { RGBA } from "@opentui/core"
 import { useDialog } from "../ui/dialog"
 import { DialogSelect } from "../ui/dialog-select"
 import { useRoute } from "../context/route"
@@ -161,7 +162,7 @@ export function DialogSessionList() {
        gutter:
          data.session.status(session.id) === "running" ||
          data.session.family(session.id).some((id) => data.session.status(id) === "running")
-            ? () => <Spinner />
+            ? (color: RGBA) => <Spinner color={color} />
            : slot === undefined
              ? undefined
              : () => <text fg={theme.hue.accent[mode() === "light" ? 800 : 200]}>{slot}</text>,
@@ -6,7 +6,7 @@ import { useTheme } from "../context/theme"
 import { useDialog, type DialogContext } from "../ui/dialog"
 import { useConfig } from "../config"

-export function DialogProjectCopyName(props: { onConfirm: (name: string) => void }) {
+export function DialogWorktreeName(props: { onConfirm: (name: string) => void }) {
  const dialog = useDialog()
  const theme = useTheme("elevated")
  const shortcuts = Keymap.useShortcuts()
@@ -30,8 +30,8 @@ export function DialogProjectCopyName(props: { onConfirm: (name: string) => void
    priority: 1,
    commands: [
      {
-        id: "dialog.project_copy.generate",
-        title: "Generate project copy name",
+        id: "dialog.worktree.generate",
+        title: "Generate worktree name",
        group: "Dialog",
        run: generate,
      },
@@ -50,7 +50,7 @@ export function DialogProjectCopyName(props: { onConfirm: (name: string) => void
    <box paddingLeft={2} paddingRight={2} gap={1}>
      <box flexDirection="row" justifyContent="space-between">
        <text attributes={TextAttributes.BOLD} fg={theme.text.default}>
-          Name project copy
+          Name worktree
        </text>
        <text fg={theme.text.subdued} onMouseUp={() => dialog.clear()}>
          esc
@@ -63,7 +63,7 @@ export function DialogProjectCopyName(props: { onConfirm: (name: string) => void
          setInputTarget(value)
        }}
        onSubmit={confirm}
-        placeholder="Project copy name"
+        placeholder="Worktree name"
        placeholderColor={theme.text.subdued}
        textColor={theme.text.formfield.default}
        focusedTextColor={theme.text.formfield.default}
@@ -74,17 +74,17 @@ export function DialogProjectCopyName(props: { onConfirm: (name: string) => void
          enter <span style={{ fg: theme.text.subdued }}>submit</span>
        </text>
        <text fg={theme.text.default}>
-          {shortcuts.get("dialog.project_copy.generate")} <span style={{ fg: theme.text.subdued }}>generate one</span>
+          {shortcuts.get("dialog.worktree.generate")} <span style={{ fg: theme.text.subdued }}>generate one</span>
        </text>
      </box>
    </box>
  )
 }

-DialogProjectCopyName.show = (dialog: DialogContext) =>
+DialogWorktreeName.show = (dialog: DialogContext) =>
  new Promise<string | null>((resolve) => {
    dialog.replace(
-      () => <DialogProjectCopyName onConfirm={resolve} />,
+      () => <DialogWorktreeName onConfirm={resolve} />,
      () => resolve(null),
    )
  })
@@ -503,6 +503,7 @@ export function Prompt(props: PromptProps) {
          if (store.interrupt >= 2) {
            void client.api.session.interrupt({
              sessionID: props.sessionID,
+              continue: true,
            })
            setStore("interrupt", 0)
          }
@@ -1842,7 +1843,7 @@ export function Prompt(props: PromptProps) {
                  <Match when={move.pendingNew()}>
                    <box paddingLeft={3} height={1} minHeight={0} flexShrink={1}>
                      <text fg={theme.hue.accent[500]} wrapMode="none" truncate>
-                        (new working copy)
+                        (new worktree)
                      </text>
                    </box>
                  </Match>
@@ -23,17 +23,16 @@ export function usePromptMove(input: { projectID: () => string | undefined; sess
    const projectID = await resolveProjectID()
    if (!projectID) return
    setCreating(true)
-    setProgress("Creating copy")
+    setProgress("Creating worktree")
    try {
-      const result = await client.api.projectCopy.create({
+      const result = await client.api.worktree.create({
        projectID,
-        location: { directory: data.location.info()?.directory || paths.cwd },
-        strategy: "git_worktree",
+        strategy: "git",
        directory: path.join(paths.worktree, projectID.slice(0, 6)),
        name,
      })
      const directory = result.directory
-      if (!directory) throw new Error("No project copy directory returned")
+      if (!directory) throw new Error("No worktree directory returned")

      // Call a location-based route to initialize it before moving on.
      await client.api.location.get({ location: { directory } })
@@ -1,5 +1,16 @@
 import { RGBA, ScrollBoxRenderable, TextAttributes, type MouseEvent } from "@opentui/core"
-import { For, Show, createComputed, createEffect, createMemo, createSignal, onCleanup, untrack } from "solid-js"
+import {
+  For,
+  Match,
+  Show,
+  Switch,
+  createComputed,
+  createEffect,
+  createMemo,
+  createSignal,
+  onCleanup,
+  untrack,
+} from "solid-js"
 import { useTerminalDimensions } from "@opentui/solid"
 import { useConfig } from "../config"
 import { useSessionTabs } from "../context/session-tabs"
@@ -57,13 +68,30 @@ export const EMPTY_SESSION_TAB_STATUS: SessionTabsStatus = {
 export type SessionTabsController = Pick<ContextController, "tabs" | "current" | "select" | "close" | "move"> & {
  newTab?: () => boolean
  add?: () => void
+  detail?: (sessionID: string) => string | undefined
  status(sessionID: string): SessionTabsStatus
 }
-
 const NEW_SESSION_TAB: SessionTab = { sessionID: "new", title: NEW_SESSION_TAB_TITLE }
 const glowTextColor = (base: RGBA, glow: RGBA, index: number, width: number) =>
  tint(base, glow, 0.12 * unreadGlowIntensity(index, width))

+function createNumberIgnition(runs: () => boolean, prompt: () => number, animations: () => boolean) {
+  const ignition = createAnimatable({ level: 0 }, { enabled: animations, transition: tween({ duration: 0.7 }) })
+  let wasRunning = runs()
+  let promptPulse = prompt()
+  createEffect(() => {
+    const running = runs()
+    const nextPromptPulse = prompt()
+    if (running !== wasRunning || nextPromptPulse !== promptPulse) {
+      ignition.jump({ level: 0.85 })
+      ignition.animate({ level: 0 })
+    }
+    wasRunning = running
+    promptPulse = nextPromptPulse
+  })
+  return ignition
+}
+
 function fadeTitleColor(color: RGBA, background: RGBA, index: number, length: number, leading: number) {
  const fade = (position: number) => (position <= 0 ? 0 : 0.2 + 0.72 * ((position - 1) / Math.max(1, FADE_WIDTH - 1)))
  const start = index < FADE_WIDTH ? FADE_WIDTH - index : 0
@@ -247,15 +275,27 @@ function TabContextMenu(props: { state: TabContextMenuState; tabs: SessionTabsCo
 }

 export function SessionTabs(
-  props: { controller?: SessionTabsController; animations?: boolean; orientation?: "horizontal" | "vertical" } = {},
+  props: {
+    controller?: SessionTabsController
+    animations?: boolean
+    orientation?: "horizontal" | "vertical"
+  } = {},
 ) {
-  if (props.orientation === "vertical")
-    return <VerticalSessionTabs controller={props.controller} animations={props.animations} />
-  return <HorizontalSessionTabs controller={props.controller} animations={props.animations} />
+  return (
+    <Switch>
+      <Match when={props.orientation === "vertical"}>
+        <VerticalSessionTabs controller={props.controller} animations={props.animations} />
+      </Match>
+      <Match when={true}>
+        <HorizontalSessionTabs controller={props.controller} animations={props.animations} />
+      </Match>
+    </Switch>
+  )
 }

 function VerticalSessionTabs(props: { controller?: SessionTabsController; animations?: boolean }) {
-  const tabs = props.controller ?? useSessionTabs()
+  const contextTabs = useSessionTabs()
+  const tabs: SessionTabsController = props.controller ?? contextTabs
  const data = useData()
  const theme = useTheme("elevated")
  const { mode } = useThemes()
@@ -367,6 +407,8 @@ function VerticalSessionTabs(props: { controller?: SessionTabsController; animat
              const visibleTitleParts = createMemo(() => Locale.graphemes(visibleTitle()))
              const titleFades = createMemo(() => marqueeOverflows(title(), titleWidth()) && titleWidth() > FADE_WIDTH)
              const detail = createMemo(() => {
+                const fixture = tabs.detail?.(tab.sessionID)
+                if (fixture !== undefined) return Locale.takeWidth(fixture, titleWidth())
                const value = session()
                return Locale.takeWidth(projectName(project(), value?.location.directory) ?? "", titleWidth())
              })
@@ -377,15 +419,22 @@ function VerticalSessionTabs(props: { controller?: SessionTabsController; animat
                return theme.background.default
              })
              const pulseBackground = createMemo(() => tint(theme.background.default, background(), background().a))
+              const runs = () => status().runs
+              const numberIgnition = createNumberIgnition(runs, () => status().promptPulse, animations)
              const numberColor = () => {
-                if (status().attention) return theme.text.feedback.warning.default
-                if (status().unread === "error") return theme.text.feedback.error.default
                const base =
                  hovered() === tab.sessionID && !selected()
                    ? foreground()
-                    : tint(idleNumber(), activeNumber(), Number(selected()))
-                const color = tint(base, accent(), Number(complete()))
-                return sweepLevel() === 0 ? color : tint(color, theme.text.default, 0.15 * sweepLevel())
+                    : tint(idleNumber(), tint(theme.text.default, pulseBackground(), 0.25), Number(selected()))
+                const color = status().attention
+                  ? theme.text.feedback.warning.default
+                  : status().unread === "error"
+                    ? theme.text.feedback.error.default
+                    : tint(base, accent(), Number(complete()))
+                const runningColor = runs() ? activeNumber() : color
+                return sweepLevel() === 0
+                  ? tint(runningColor, theme.text.default, numberIgnition.value().level)
+                  : tint(runningColor, theme.text.default, Math.max(numberIgnition.value().level, 0.35 * sweepLevel()))
              }
              const foreground = () => {
                if (hovered() === tab.sessionID) return theme.text.default
@@ -398,8 +447,10 @@ function VerticalSessionTabs(props: { controller?: SessionTabsController; animat
                return accent()
              }
              const pulseColor = createMemo(() => tint(pulseBackground(), theme.text.default, 0.25))
+              const flashColor = createMemo(() => tint(pulseBackground(), theme.text.default, 0.7))
              const glowColor = createMemo(() => tint(pulseBackground(), glowHue(), 0.45))
              const detailPulseColor = createMemo(() => tint(pulseBackground(), theme.text.default, 0.13))
+              const detailFlashColor = createMemo(() => tint(pulseBackground(), theme.text.default, 0.42))
              const detailGlowColor = createMemo(() => tint(pulseBackground(), glowHue(), 0.25))
              const detailColor = createMemo(() => tint(theme.text.subdued, pulseBackground(), 0.35))
              const glows = () => status().glows
@@ -411,8 +462,8 @@ function VerticalSessionTabs(props: { controller?: SessionTabsController; animat
                  : { ...EMPTY_SESSION_TAB_STATUS, complete: false, runs: false, glows: false }
              })
              const previousGlows = () => previousStatus().glows
-              const runs = () => status().runs
              const previousRuns = () => previousStatus().runs
+              const indicatorWidth = 10
              const previousGlowHue = () => {
                if (previousStatus().attention) return theme.text.feedback.warning.default
                if (previousStatus().unread === "error") return theme.text.feedback.error.default
@@ -499,7 +550,11 @@ function VerticalSessionTabs(props: { controller?: SessionTabsController; animat
                    breathe={status().attention}
                    outerBreathe={previousStatus().attention}
                    color={separatorLowerPulseColor()}
+                    width={indicatorWidth}
                    outerColor={separatorUpperPulseColor()}
+                    flashColor={tint(theme.background.default, theme.text.default, 0.22)}
+                    outerFlashColor={tint(theme.background.default, theme.text.default, 0.18)}
+                    flashTail={8}
                    glowColor={separatorLowerColor()}
                    outerGlowColor={separatorUpperColor()}
                    glowTail={8}
@@ -524,7 +579,10 @@ function VerticalSessionTabs(props: { controller?: SessionTabsController; animat
                      breathe={status().attention}
                      outerBreathe={false}
                      color={tint(theme.background.default, theme.text.default, 0.04)}
+                      width={indicatorWidth}
                      outerColor={tint(theme.background.default, theme.text.default, 0.006)}
+                      flashColor={tint(theme.background.default, theme.text.default, 0.18)}
+                      flashTail={8}
                      glowColor={tint(theme.background.default, glowHue(), 0.1)}
                      outerGlowColor={theme.background.default}
                      glowTail={8}
@@ -543,7 +601,10 @@ function VerticalSessionTabs(props: { controller?: SessionTabsController; animat
                      glow={glows()}
                      breathe={status().attention}
                      color={pulseColor()}
+                      width={indicatorWidth}
                      glowColor={glowColor()}
+                      flashColor={flashColor()}
+                      flashTail={8}
                      completionColor={glowColor()}
                      backgroundColor={pulseBackground()}
                      onLevel={setSweepLevel}
@@ -599,8 +660,11 @@ function VerticalSessionTabs(props: { controller?: SessionTabsController; animat
                      glow={glows()}
                      breathe={status().attention}
                      color={detailPulseColor()}
+                      width={indicatorWidth}
                      glowColor={detailGlowColor()}
                      glowTail={10}
+                      flashColor={detailFlashColor()}
+                      flashTail={8}
                      completionColor={detailGlowColor()}
                      backgroundColor={pulseBackground()}
                    />
@@ -646,7 +710,7 @@ function VerticalSessionTabs(props: { controller?: SessionTabsController; animat
            >
              <text
                width={2}
-                fg={newTab() ? activeNumber() : addHovered() ? theme.text.default : idleNumber()}
+                fg={newTab() || addHovered() ? theme.text.default : idleNumber()}
                selectable={false}
                attributes={newTab() ? TextAttributes.BOLD : undefined}
              >
@@ -903,6 +967,8 @@ function HorizontalSessionTabs(props: { controller?: SessionTabsController; anim
          const titleFades = createMemo(
            () => marqueeOverflows(title(), availableTitleWidth()) && availableTitleWidth() > FADE_WIDTH,
          )
+          const runs = () => status().busy && !status().attention
+          const numberIgnition = createNumberIgnition(runs, () => status().promptPulse, animations)
          const foreground = () => {
            if (hovered() === tab.sessionID) return theme.text.default
            return tint(theme.text.subdued, theme.text.default, selection())
@@ -927,14 +993,13 @@ function HorizontalSessionTabs(props: { controller?: SessionTabsController; anim
          const [closeHovered, setCloseHovered] = createSignal(false)
          const numberColor = () => {
            const feedback = feedbackColor()
-            if (feedback) return feedback
            const base =
              hovered() === tab.sessionID && !selected()
                ? foreground()
-                : tint(idleNumber(), activeNumber(), selection())
-            const color = tint(base, accent(), activity())
+                : tint(idleNumber(), tint(theme.text.default, background(), 0.25), selection())
+            const color = feedback ?? (runs() ? activeNumber() : tint(base, accent(), activity()))
            // The number brightens faintly as the running sweep passes beneath it.
-            return sweepLevel() === 0 ? color : tint(color, theme.text.default, 0.15 * sweepLevel())
+            return tint(color, theme.text.default, Math.max(numberIgnition.value().level, 0.15 * sweepLevel()))
          }
          const bold = () => (selected() || dragged() ? TextAttributes.BOLD : undefined)
          const closeColor = () => tint(theme.text.subdued, theme.text.default, 0.6)
@@ -22,6 +22,8 @@ type TabPulseOptions = RenderableOptions<TabPulseRenderable> & {
  outerGlowTail?: number
  flashColor?: RGBA
  outerFlashColor?: RGBA
+  flashTail?: number
+  outerFlashTail?: number
  completionColor?: RGBA
  outerCompletionColor?: RGBA
  backgroundColor?: RGBA
@@ -72,6 +74,7 @@ export const completionPulseOpacity = (progress: number) => attackDecay(progress
 export const glowIgnitionLevel = (progress: number) =>
  attackDecay(progress, GLOW_IGNITION_ATTACK, GLOW_IGNITION_PEAK, 1)
 const glowIntensityAt = (index: number, tail: number) => smootherstep(clamp(1 - Math.max(0, index - 1) / tail))
+export const tabFlashIntensity = (index: number, tail: number) => glowIntensityAt(index, tail)
 export const unreadGlowIntensity = (index: number, width: number, maximumTail = GLOW_TAIL) => {
  const tail = Math.min(maximumTail, Math.max(1, width - 2))
  return glowIntensityAt(index, tail)
@@ -323,6 +326,8 @@ class TabPulseRenderable extends Renderable {
  private _edge: "above" | "below" | undefined
  private _flashColor: RGBA
  private _outerFlashColor: RGBA
+  private _flashTail: number | undefined
+  private _outerFlashTail: number | undefined
  private _completionColor: RGBA
  private _outerCompletionColor: RGBA
  private _backgroundColor: RGBA
@@ -373,6 +378,8 @@ class TabPulseRenderable extends Renderable {
    this._edge = edge
    this._flashColor = options.flashColor ?? this._color
    this._outerFlashColor = options.outerFlashColor ?? options.flashColor ?? this._outerColor
+    this._flashTail = options.flashTail
+    this._outerFlashTail = options.outerFlashTail ?? options.flashTail
    this._completionColor = options.completionColor ?? this._color
    this._outerCompletionColor = options.outerCompletionColor ?? options.completionColor ?? this._outerColor
    this._backgroundColor = options.backgroundColor ?? RGBA.defaultBackground()
@@ -501,6 +508,18 @@ class TabPulseRenderable extends Renderable {
    this.requestRender()
  }

+  set flashTail(value: number | undefined) {
+    if (value === this._flashTail) return
+    this._flashTail = value
+    this.requestRender()
+  }
+
+  set outerFlashTail(value: number | undefined) {
+    if (value === this._outerFlashTail) return
+    this._outerFlashTail = value
+    this.requestRender()
+  }
+
  set completionColor(value: RGBA) {
    if (value.equals(this._completionColor)) return
    this._completionColor = value
@@ -560,6 +579,9 @@ class TabPulseRenderable extends Renderable {
      )
    const glowTail = Math.min(this._glowTail, Math.max(1, this.width - 2))
    const outerGlowTail = Math.min(this._outerGlowTail, Math.max(1, this.width - 2))
+    const flashTail = this._flashTail === undefined ? undefined : Math.min(this._flashTail, Math.max(1, this.width - 2))
+    const outerFlashTail =
+      this._outerFlashTail === undefined ? undefined : Math.min(this._outerFlashTail, Math.max(1, this.width - 2))
    for (let index = 0; index < this.width; index++) {
      // Skip per-cell sweep and glow math when that stage is idle, e.g. a steady breathing glow.
      const sweep =
@@ -589,7 +611,7 @@ class TabPulseRenderable extends Renderable {
        this._completionColor,
        glowLevel === 0 ? 0 : glowIntensityAt(index, glowTail) * GLOW_OPACITY * glowLevel,
        sweep,
-        flash,
+        flashTail === undefined ? flash : flash * tabFlashIntensity(index, flashTail),
        completion,
      )
      if (!this._edge) {
@@ -605,7 +627,7 @@ class TabPulseRenderable extends Renderable {
        this._outerCompletionColor,
        outerGlowLevel === 0 ? 0 : glowIntensityAt(index, outerGlowTail) * GLOW_OPACITY * outerGlowLevel,
        outerSweep,
-        outerFlash,
+        outerFlashTail === undefined ? outerFlash : outerFlash * tabFlashIntensity(index, outerFlashTail),
        outerCompletion,
      )
      buffer.setCell(
@@ -650,6 +672,8 @@ export function TabPulse(props: {
  outerGlowTail?: number
  flashColor?: RGBA
  outerFlashColor?: RGBA
+  flashTail?: number
+  outerFlashTail?: number
  completionColor?: RGBA
  outerCompletionColor?: RGBA
  backgroundColor: RGBA
@@ -681,6 +705,8 @@ export function TabPulse(props: {
      outerGlowTail={props.outerGlowTail ?? props.glowTail ?? GLOW_TAIL}
      flashColor={props.flashColor ?? props.color}
      outerFlashColor={props.outerFlashColor ?? props.flashColor ?? props.outerColor ?? props.color}
+      flashTail={props.flashTail}
+      outerFlashTail={props.outerFlashTail ?? props.flashTail}
      completionColor={props.completionColor ?? props.color}
      outerCompletionColor={props.outerCompletionColor ?? props.completionColor ?? props.outerColor ?? props.color}
      backgroundColor={props.backgroundColor}
@@ -243,10 +243,10 @@ export const Definitions = {
  "dialog.select.end": keybind("end", "Move to last dialog item"),
  "dialog.select.submit": keybind("return", "Submit selected dialog item"),
  "dialog.prompt.submit": keybind("return", "Submit dialog prompt"),
-  "dialog.project_copy.generate": keybind("tab", "Generate project copy name"),
-  "dialog.move_session.new": keybind("ctrl+m", "New project copy"),
-  "dialog.move_session.delete": keybind("ctrl+d", "Delete project copy"),
-  "dialog.move_session.refresh": keybind("ctrl+r", "Refresh project copies"),
+  "dialog.worktree.generate": keybind("tab", "Generate worktree name"),
+  "dialog.move_session.new": keybind("ctrl+m", "New worktree"),
+  "dialog.move_session.delete": keybind("ctrl+d", "Delete worktree"),
+  "dialog.move_session.refresh": keybind("ctrl+r", "Refresh worktrees"),
  "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"),
@@ -39,6 +39,7 @@ import { createSimpleContext } from "./helper"
 import { useClient } from "./client"
 import { nonEmptyToolContent } from "../util/tool-display"
 import type { SessionInbox } from "@opencode-ai/schema/session-inbox"
+import { Worktree } from "@opencode-ai/schema/worktree"
 import { createEffect, createSignal, onCleanup } from "solid-js"

 export type DataSessionStatus = "idle" | "running"
@@ -457,6 +458,18 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
          }
          break
        }
+        case "worktree.resolved": {
+          for (const [sessionID, info] of Object.entries(store.session.info)) {
+            const adopted = Worktree.adopt(
+              { projectID: info.projectID, directory: info.location.directory },
+              event.data,
+            )
+            if (!adopted) continue
+            setStore("session", "info", sessionID, "projectID", adopted.projectID)
+            setStore("session", "info", sessionID, "subpath", adopted.subpath)
+          }
+          break
+        }
        case "session.inbox.delivered": {
          const admitted = store.session.input[event.data.sessionID]?.includes(event.data.inboxID) ?? false
          removePending(event.data.sessionID, event.data.inboxID)
@@ -21,17 +21,10 @@ function View(props: { context: Plugin.Context; plugins: ReturnType<typeof usePl
          title: plugin.id,
          value: plugin.id,
          category: "Built-in",
-          footer: (
-            <span
-              style={{
-                fg: plugin.active
-                  ? props.context.theme.text.feedback.success.default
-                  : props.context.theme.text.subdued,
-              }}
-            >
-              {plugin.active ? "active" : "inactive"}
-            </span>
-          ),
+          footer: plugin.active ? "active" : "inactive",
+          footerColor: plugin.active
+            ? props.context.theme.text.feedback.success.default
+            : props.context.theme.text.subdued,
        }),
      )
    const external = props.plugins
@@ -43,20 +36,13 @@ function View(props: { context: Plugin.Context; plugins: ReturnType<typeof usePl
          value: plugin.id ?? plugin.target,
          category: "External",
          searchText: plugin.target,
-          footer: (
-            <span
-              style={{
-                fg:
-                  plugin.status === "active"
-                    ? props.context.theme.text.feedback.success.default
-                    : plugin.status === "failed"
-                      ? props.context.theme.text.feedback.error.default
-                      : props.context.theme.text.subdued,
-              }}
-            >
-              {plugin.status}
-            </span>
-          ),
+          footer: plugin.status,
+          footerColor:
+            plugin.status === "active"
+              ? props.context.theme.text.feedback.success.default
+              : plugin.status === "failed"
+                ? props.context.theme.text.feedback.error.default
+                : props.context.theme.text.subdued,
        }),
      )
    return [...builtins, ...external].sort((a, b) => a.title.localeCompare(b.title))
@@ -107,7 +93,6 @@ function View(props: { context: Plugin.Context; plugins: ReturnType<typeof usePl
          <DialogSelect
            title="Plugins"
            options={options()}
-            current={focused()}
            locked={locked()}
            preserveSelection={true}
            onMove={(option) => setFocused(option.value)}
@@ -0,0 +1,54 @@
+import type { Plugin } from "@opencode-ai/plugin/tui"
+import { For, Show } from "solid-js"
+
+export type StoryFooterControl = {
+  shortcut: string
+  label: string
+}
+
+export function StoryFooter(props: {
+  context: Plugin.Context
+  title: string
+  details?: readonly string[]
+  status?: string
+  message?: string
+  controls: readonly StoryFooterControl[]
+}) {
+  const theme = props.context.theme.contextual.elevated
+
+  return (
+    <box flexShrink={0} flexDirection="column" backgroundColor={theme.background.default}>
+      <box height={1} paddingLeft={1} paddingRight={1} flexDirection="row">
+        <text fg={theme.text.default}>{props.title}</text>
+        <Show when={props.details?.length}>
+          <text fg={theme.text.subdued}> · {props.details?.join(" · ")}</text>
+        </Show>
+      </box>
+      <Show when={props.status || props.message}>
+        <box height={1} paddingLeft={1} paddingRight={1} flexDirection="row">
+          <text fg={theme.text.default}>{props.status ?? ""}</text>
+          <Show when={props.status && props.message}>
+            <text fg={theme.text.subdued}> · </text>
+          </Show>
+          <text fg={theme.text.subdued}>{props.message ?? ""}</text>
+        </box>
+      </Show>
+      <box height={1} paddingLeft={1} paddingRight={1} flexDirection="row">
+        <text fg={theme.text.default} wrapMode="none">
+          <For each={props.controls}>
+            {(control, index) => (
+              <>
+                <Show when={index() > 0}>
+                  <span> </span>
+                </Show>
+                {control.shortcut} <span style={{ fg: theme.text.subdued }}>{control.label}</span>
+              </>
+            )}
+          </For>
+        </text>
+      </box>
+      {/* The app-wide feature footer overlays the terminal's final row. */}
+      <box height={1} />
+    </box>
+  )
+}
@@ -1,6 +1,7 @@
 import { Plugin } from "@opencode-ai/plugin/tui"
 import { useTerminalDimensions } from "@opentui/solid"
 import { createSignal, For, type JSX } from "solid-js"
+import { StoryFooter } from "./footer"
 import { sessionTabsStory } from "./session-tabs"

 /**
@@ -47,7 +48,6 @@ function Commands(props: { context: Plugin.Context }) {
 function StorybookIndex(props: { context: Plugin.Context }) {
  const dimensions = useTerminalDimensions()
  const theme = props.context.theme
-  const elevatedTheme = theme.contextual.elevated
  const [selected, setSelected] = createSignal(0)
  const open = (story: Story) =>
    props.context.ui.router.navigate({ type: "plugin", name: "storybook", data: { story: story.id } })
@@ -110,18 +110,15 @@ function StorybookIndex(props: { context: Plugin.Context }) {
        </For>
      </box>
      <box flexGrow={1} />
-      <box
-        height={1}
-        flexShrink={0}
-        backgroundColor={elevatedTheme.background.default}
-        paddingLeft={1}
-        paddingRight={1}
-        flexDirection="row"
-      >
-        <text fg={elevatedTheme.text.subdued}>storybook</text>
-        <box flexGrow={1} />
-        <text fg={elevatedTheme.text.subdued}>↑/↓ select | enter open | esc home</text>
-      </box>
+      <StoryFooter
+        context={props.context}
+        title="storybook"
+        controls={[
+          { shortcut: "↑/↓", label: "select" },
+          { shortcut: "enter", label: "open" },
+          { shortcut: "esc", label: "home" },
+        ]}
+      />
    </box>
  )
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
James Long	b79e75e01a	refactor(tui): migrate worktree workflows	2026-08-12 21:57:30 +00:00
James Long	eb75637742	refactor(server): expose global worktree api	2026-08-12 21:57:21 +00:00
James Long	2bba2915db	refactor(core): consolidate worktree domain	2026-08-12 21:57:11 +00:00
Simon Klee	66c2967520	deps: update OpenTUI to 0.5.2 (#42148 )	2026-08-12 23:09:41 +02:00
opencode-agent[bot]	883c9e3cb4	chore: generate	2026-08-12 20:49:54 +00:00
Kit Langton	0d703d39e7	fix(core): adopt pre-project sessions on directory resolution (#42100 )	2026-08-12 20:47:55 +00:00
Kit Langton	bc2251d6d8	feat(sdk): configure external workspace providers (#42142 )	2026-08-12 16:47:12 -04:00
opencode-agent[bot]	b034154e09	chore: generate	2026-08-12 20:45:10 +00:00
Kit Langton	c894f87771	feat(tui): refine session tab activity indicators (#42144 )	2026-08-12 16:43:58 -04:00
opencode-agent[bot]	fc5c781085	chore: generate	2026-08-12 20:29:39 +00:00
Kit Langton	f6aa1a67f0	fix(tui): improve selected spinner contrast (#42141 )	2026-08-12 16:27:52 -04:00
Dax	0859f77153	fix(core): continue sessions after location move (#42138 )	2026-08-12 16:25:50 -04:00
Kit Langton	7a22ac865d	fix(tui): navigate filtered plugins (#42127 )	2026-08-12 16:20:52 -04:00
Dax	b75dd58f7c	fix(tui): continue pending work after interrupt (#42131 )	2026-08-12 15:55:53 -04:00
Kit Langton	56197e621a	refactor(codemode): route transpilation through a #transpile conditional import (#42121 )	2026-08-12 15:43:30 -04:00
Kit Langton	d8f62cfdcb	fix(core): resolve watcher binding require lazily (#42122 )	2026-08-12 15:40:41 -04:00