docs(core): clarify subagent session input

bun.lock

@@ -678,10 +678,8 @@
         "@opencode-ai/util": "workspace:*",
         "drizzle-orm": "catalog:",
         "effect": "catalog:",
-        "modal": "0.9.0",
       },
       "devDependencies": {
-        "@opencode-ai/ai": "workspace:*",
         "@tsconfig/bun": "catalog:",
         "@types/bun": "catalog:",
         "@typescript/native-preview": "catalog:",
@@ -1513,18 +1511,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=="],
@@ -1733,10 +1719,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=="],
@@ -1831,8 +1813,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=="],
@@ -3317,8 +3297,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=="],
@@ -3559,10 +3537,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=="],
@@ -4595,8 +4569,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=="],
@@ -4823,8 +4795,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=="],
@@ -4863,10 +4833,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=="],
@@ -5665,8 +5631,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=="],
@@ -6625,8 +6589,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=="],
@@ -6771,8 +6733,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=="],

packages/ai/src/schema/options.ts

@@ -178,7 +178,6 @@ export class LanguageModelCompatibility extends Schema.Class<LanguageModelCompat
   toolSchema: Schema.optional(LanguageModelToolSchemaCompatibility),
   reasoningField: Schema.optional(Schema.String),
   maxTokensField: Schema.optional(LanguageModelMaxTokensFieldCompatibility),
-  requireFinishReason: Schema.optional(Schema.Boolean),
 }) {}
 
 export namespace LanguageModelCompatibility {

packages/ai/test/llm.test.ts

@@ -102,7 +102,7 @@ describe("llm constructors", () => {
     const updated = LanguageModel.update(base, {
       route: responsesRoute,
       defaults: { generation: { maxTokens: 20 } },
-      compatibility: { toolSchema: "gemini", requireFinishReason: false },
+      compatibility: { toolSchema: "gemini" },
     })
     const updatedInput = LanguageModel.input(updated)
 
@@ -110,7 +110,7 @@ describe("llm constructors", () => {
     expect(String(updated.id)).toBe("fake-model")
     expect(updated.route).toBe(responsesRoute)
     expect(updated.defaults?.generation).toEqual({ maxTokens: 20 })
-    expect(updated.compatibility).toEqual({ toolSchema: "gemini", requireFinishReason: false })
+    expect(updated.compatibility).toEqual({ toolSchema: "gemini" })
     expect(updatedInput.defaults).toBe(updated.defaults)
     expect(updatedInput.compatibility).toBe(updated.compatibility)
     expect(String(updatedInput.provider)).toBe("fake")

packages/cli/src/commands/commands.ts

@@ -140,32 +140,6 @@ export const Commands = Spec.make(typeof OPENCODE_CLI_NAME === "string" ? OPENCO
       description: "List all available models",
       params: ServerParams,
     }),
-    Spec.make("export", {
-      description: "Export session data as JSON",
-      params: {
-        ...ServerParams,
-        session: Flag.string("session").pipe(
-          Flag.withAlias("s"),
-          Flag.withDescription("Session ID to export to stdout"),
-          Flag.optional,
-        ),
-        sanitize: Flag.boolean("sanitize").pipe(
-          Flag.withDescription("Redact sensitive transcript and file data"),
-          Flag.withDefault(false),
-        ),
-      },
-    }),
-    Spec.make("import", {
-      description: "Import session data from a JSON file or URL",
-      params: {
-        ...ServerParams,
-        file: Argument.string("file").pipe(Argument.withDescription("JSON file or URL to import")),
-        directory: Flag.string("directory").pipe(
-          Flag.withDescription("Directory in which to import the session"),
-          Flag.optional,
-        ),
-      },
-    }),
     Spec.make("mini", {
       description: "Start the minimal interactive interface",
       params: {

packages/cli/src/commands/handlers/export.ts

@@ -1,139 +0,0 @@
-import { OpenCode, type SessionInfo } from "@opencode-ai/client"
-import { Service } from "@opencode-ai/client/effect/service"
-import { Effect, Option } from "effect"
-import { EOL, tmpdir } from "node:os"
-import path from "node:path"
-import { emitKeypressEvents, type Key } from "node:readline"
-import { Commands } from "../commands"
-import { Runtime } from "../../framework/runtime"
-import { ServerConnection } from "../../services/server-connection"
-
-export default Runtime.handler(
-  Commands.commands.export,
-  Effect.fn("cli.export")(function* (input) {
-    const server = yield* ServerConnection.resolve({
-      server: Option.getOrUndefined(input.server),
-      standalone: input.standalone,
-    })
-    const client = OpenCode.make({
-      baseUrl: server.endpoint.url,
-      headers: Service.headers(server.endpoint),
-    })
-    const requested = Option.getOrUndefined(input.session)
-    const selected = requested
-      ? undefined
-      : yield* Effect.promise(async () => {
-          const location = await client.location.get({ location: { directory: process.cwd() } })
-          const page = await client.session.list({
-            directory: location.directory,
-            parentID: null,
-            order: "desc",
-            limit: 50,
-          })
-          if (page.data.length === 0) {
-            process.stderr.write(`No sessions found${EOL}`)
-            return undefined
-          }
-          return selectSession(page.data, input.sanitize)
-        })
-    const sessionID = requested ?? selected?.session.id
-    if (!sessionID) return
-    const data = yield* Effect.promise(() =>
-      client.session.export({ sessionID, sanitize: selected?.sanitize ?? input.sanitize }),
-    )
-    process.stdout.write(yield* Effect.promise(() => writeExport(data, sessionID, requested !== undefined)))
-  }),
-)
-
-type Selection = { session: SessionInfo; sanitize: boolean }
-
-function selectSession(sessions: SessionInfo[], initialSanitize: boolean) {
-  if (!process.stdin.isTTY) return Promise.reject(new Error("Session ID is required when stdin is not interactive"))
-  const input = process.stdin
-  const output = process.stderr
-  const wasRaw = input.isRaw
-  const wasPaused = input.isPaused()
-  const date = new Intl.DateTimeFormat(undefined, {
-    month: "short",
-    day: "numeric",
-    hour: "numeric",
-    minute: "2-digit",
-  })
-  const columns = output.columns ?? 100
-  const titleWidth = Math.max(8, Math.min(48, columns - 34))
-  let selected = 0
-  let offset = 0
-  let sanitize = initialSanitize
-  let height = 0
-
-  const render = () => {
-    const visible = sessions.slice(offset, offset + 10)
-    const lines = ["  \x1b[36mExport session\x1b[0m", ""]
-    lines.push(
-      ...visible.map((session) => {
-        const index = sessions.indexOf(session)
-        const title = (session.title ?? "Untitled session").slice(0, titleWidth).padEnd(titleWidth)
-        const updated = date.format(session.time.updated).slice(0, 18).padEnd(18)
-        const row = `${index === selected ? ">" : " "} ${title}  ${updated}  ${session.id.slice(-8)}`
-        return index === selected ? `\x1b[1m${row}\x1b[0m` : row
-      }),
-      "",
-      `  [${sanitize ? "x" : " "}] sanitize sensitive data`,
-      "",
-      "  navigate \x1b[2mup/down\x1b[0m   sanitize \x1b[2mspace\x1b[0m   export \x1b[2menter\x1b[0m   cancel \x1b[2mesc\x1b[0m",
-    )
-    if (height > 0) output.write(`\x1b[${height}F\x1b[J`)
-    output.write(lines.join(EOL) + EOL)
-    height = lines.length
-  }
-  const clear = () => {
-    if (height > 0) output.write(`\x1b[${height}F\x1b[J`)
-    output.write("\x1b[?25h")
-    input.removeListener("keypress", onKeypress)
-    input.setRawMode(wasRaw ?? false)
-    if (wasPaused) input.pause()
-  }
-  const onKeypress = (value: string | undefined, key: Key) => {
-    if (key.name === "up") {
-      selected = (selected - 1 + sessions.length) % sessions.length
-      if (selected === sessions.length - 1) offset = Math.max(0, sessions.length - 10)
-      if (selected < offset) offset = selected
-    }
-    if (key.name === "down") {
-      selected = (selected + 1) % sessions.length
-      if (selected === 0) offset = 0
-      if (selected >= offset + 10) offset = selected - 9
-    }
-    if (key.name === "space" || value === " ") sanitize = !sanitize
-    if (key.name === "return") return finish(sessions[selected])
-    if (key.name === "escape" || (key.ctrl && key.name === "c")) return cancel()
-    render()
-  }
-  const finish = (session: SessionInfo) => {
-    clear()
-    resolveSelection?.({ session, sanitize })
-  }
-  const cancel = () => {
-    clear()
-    resolveSelection?.()
-  }
-  let resolveSelection: ((selection?: Selection) => void) | undefined
-
-  emitKeypressEvents(input)
-  input.setRawMode(true)
-  input.resume()
-  input.on("keypress", onKeypress)
-  output.write("\x1b[?25l")
-  render()
-  return new Promise<Selection | undefined>((resolve) => {
-    resolveSelection = resolve
-  })
-}
-
-export async function writeExport(data: unknown, sessionID: string, stdout: boolean) {
-  const json = JSON.stringify(data, null, 2) + EOL
-  if (stdout) return json
-  const file = path.join(tmpdir(), `opencode-session-${sessionID}-${crypto.randomUUID().slice(0, 8)}.json`)
-  await Bun.write(file, json)
-  return file + EOL
-}

packages/cli/src/commands/handlers/import.ts

@@ -1,60 +0,0 @@
-import { OpenCode } from "@opencode-ai/client"
-import { Service } from "@opencode-ai/client/effect/service"
-import { Session } from "@opencode-ai/schema/session"
-import { SessionTransfer } from "@opencode-ai/schema/session-transfer"
-import { Effect, Option, Schema } from "effect"
-import { EOL } from "node:os"
-import path from "node:path"
-import { Commands } from "../commands"
-import { Runtime } from "../../framework/runtime"
-import { ServerConnection } from "../../services/server-connection"
-
-export default Runtime.handler(
-  Commands.commands.import,
-  Effect.fn("cli.import")(function* (input) {
-    const text = yield* Effect.tryPromise({
-      try: () =>
-        input.file.startsWith("http://") || input.file.startsWith("https://")
-          ? fetch(input.file).then((response) => {
-              if (!response.ok) throw new Error(`Failed to fetch session data: ${response.statusText}`)
-              return response.text()
-            })
-          : Bun.file(input.file).text(),
-      catch: (cause) => new Error(`Failed to read session data: ${cause instanceof Error ? cause.message : String(cause)}`),
-    })
-    const data = yield* Schema.decodeUnknownEffect(Schema.fromJsonString(SessionTransfer.Data))(text)
-    const encoded = Schema.encodeSync(SessionTransfer.Data)(data)
-    const server = yield* ServerConnection.resolve({
-      server: Option.getOrUndefined(input.server),
-      standalone: input.standalone,
-    })
-    const client = OpenCode.make({
-      baseUrl: server.endpoint.url,
-      headers: Service.headers(server.endpoint),
-    })
-    const location = yield* Effect.promise(() =>
-      client.location.get({
-        location: { directory: path.resolve(Option.getOrElse(input.directory, () => process.cwd())) },
-      }),
-    )
-    const response = yield* Effect.promise(() =>
-      fetch(new URL("/api/session/import", server.endpoint.url), {
-        method: "POST",
-        headers: { ...Service.headers(server.endpoint), "content-type": "application/json" },
-        body: JSON.stringify({
-          ...encoded,
-          location: { directory: location.directory, workspaceID: location.workspaceID },
-        }),
-      }),
-    )
-    if (response.status === 409) {
-      process.stderr.write(`Session already exists${EOL}`)
-      return
-    }
-    if (!response.ok) yield* Effect.fail(new Error(`Failed to import session: ${response.statusText}`))
-    const imported = yield* Schema.decodeUnknownEffect(
-      Schema.fromJsonString(Schema.Struct({ data: Session.Info })),
-    )(yield* Effect.promise(() => response.text()))
-    process.stdout.write(`Imported session: ${imported.data.id}${EOL}`)
-  }),
-)

packages/cli/src/index.ts

@@ -37,8 +37,6 @@ const Handlers = Runtime.handlers(Commands, {
     list: () => import("./commands/handlers/plugin/list"),
   },
   models: () => import("./commands/handlers/models"),
-  export: () => import("./commands/handlers/export"),
-  import: () => import("./commands/handlers/import"),
   mini: () => import("./commands/handlers/mini"),
   run: () => import("./commands/handlers/run"),
   pair: () => import("./commands/handlers/pair"),

packages/cli/src/mini.ts

@@ -86,7 +86,7 @@ export async function runMini(input: MiniCommandInput) {
       ) =>
         resolveSessionTarget({
           client,
-          location: { directory: next.location.directory },
+          location: { directory: next.location.directory, workspace: next.location.workspaceID },
           agent: next.agent,
           model: next.model
             ? { providerID: next.model.providerID, id: next.model.modelID, variant: next.variant }

packages/cli/src/run/noninteractive.ts

@@ -703,7 +703,7 @@ export async function runNonInteractivePrompt(input: Input) {
         ? Promise.resolve(undefined)
         : input.client.form.request
             .list({
-              location: { directory: input.location.directory },
+              location: { directory: input.location.directory, workspace: input.location.workspaceID },
             })
             .catch(() => undefined),
     ])
@@ -757,6 +757,7 @@ function formRequestOptions(location: LocationRef | undefined): [] | [{ headers:
     {
       headers: {
         "x-opencode-directory": encodeURIComponent(location.directory),
+        ...(location.workspaceID ? { "x-opencode-workspace": location.workspaceID } : {}),
       },
     },
   ]

packages/cli/src/run/run.ts

@@ -96,7 +96,7 @@ async function execute(input: RunCommandInput, prepared: Prepared, endpoint: End
         next.model ??
         (options.variant
           ? await client.model
-              .default({ location: { directory: next.location.directory } })
+              .default({ location: { directory: next.location.directory, workspace: next.location.workspaceID } })
               .then((result) => result.data)
           : undefined)
       const model = selected

packages/cli/src/session-target.ts

@@ -136,6 +136,7 @@ async function latestSession(
   const page = await client.session.list(
     {
       directory: location.directory,
+      workspace: location.workspaceID,
       parentID: null,
       limit: SESSION_PAGE_LIMIT,
       order: "desc",

packages/cli/test/import-export.test.ts

@@ -1,210 +0,0 @@
-import { expect, test } from "bun:test"
-import fs from "node:fs/promises"
-import os from "node:os"
-import path from "node:path"
-import { OPENCODE_VERSION } from "../src/version"
-import { writeExport } from "../src/commands/handlers/export"
-
-const info = {
-  id: "ses_export_test",
-  projectID: "global",
-  cost: 0,
-  tokens: { input: 0, output: 0, reasoning: 0, cache: { read: 0, write: 0 } },
-  time: { created: 1, updated: 2 },
-  title: "Exported session",
-  location: { directory: "/project" },
-}
-const transfer = {
-  info,
-  messages: [
-    { id: "msg_first", type: "user", text: "First", time: { created: 1 } },
-    { id: "msg_second", type: "user", text: "Second", time: { created: 2 } },
-  ],
-}
-const sanitizedTransfer = {
-  info: {
-    ...info,
-    title: "[redacted:session-title:ses_export_test]",
-    location: { directory: "/[redacted:session-directory:ses_export_test]" },
-  },
-  messages: [
-    {
-      id: "msg_first",
-      type: "user",
-      text: "[redacted:text:msg_first]",
-      time: { created: 1 },
-    },
-    {
-      id: "msg_second",
-      type: "user",
-      text: "[redacted:text:msg_second]",
-      time: { created: 2 },
-    },
-  ],
-}
-
-const health = () => Response.json({ healthy: true, version: OPENCODE_VERSION, pid: process.pid })
-
-function run(args: string[], stdin?: string) {
-  const child = Bun.spawn([process.execPath, "run", "src/index.ts", ...args], {
-    cwd: path.join(import.meta.dir, ".."),
-    stdin: stdin === undefined ? undefined : new Blob([stdin]),
-    stdout: "pipe",
-    stderr: "pipe",
-  })
-  return Promise.all([new Response(child.stdout).text(), new Response(child.stderr).text(), child.exited])
-}
-
-test("export is raw by default and supports explicit sanitization", async () => {
-  const sanitization: string[] = []
-  const server = Bun.serve({
-    port: 0,
-    fetch(request) {
-      const url = new URL(request.url)
-      if (url.pathname === "/api/health") return health()
-      if (url.pathname === `/api/session/${info.id}`) return Response.json({ data: info })
-      if (url.pathname === `/api/session/${info.id}/export`) {
-        sanitization.push(url.searchParams.get("sanitize") ?? "")
-        return Response.json({ data: url.searchParams.get("sanitize") === "true" ? sanitizedTransfer : transfer })
-      }
-      return new Response("Not found", { status: 404 })
-    },
-  })
-
-  try {
-    const [stdout, , exitCode] = await run(["export", "-s", info.id, "--server", server.url.toString()])
-    const exported = JSON.parse(stdout)
-
-    expect(exitCode).toBe(0)
-    expect(exported).toEqual(transfer)
-
-    const [sanitized, , sanitizedExitCode] = await run([
-      "export",
-      "-s",
-      info.id,
-      "--sanitize",
-      "--server",
-      server.url.toString(),
-    ])
-    expect(sanitizedExitCode).toBe(0)
-    expect(JSON.parse(sanitized)).toEqual(sanitizedTransfer)
-    expect(sanitization).toEqual(["false", "true"])
-  } finally {
-    await server.stop(true)
-  }
-}, 15_000)
-
-test("export reports an empty session list without a stack trace", async () => {
-  const server = Bun.serve({
-    port: 0,
-    fetch(request) {
-      const url = new URL(request.url)
-      if (url.pathname === "/api/health") return health()
-      if (url.pathname === "/api/location") {
-        return Response.json({
-          directory: "/project",
-          project: { id: "global", directory: "/project", canonical: "/project" },
-        })
-      }
-      if (url.pathname === "/api/session") return Response.json({ data: [], cursor: {} })
-      return new Response("Not found", { status: 404 })
-    },
-  })
-
-  try {
-    const [stdout, stderr, exitCode] = await run(["export", "--server", server.url.toString()])
-
-    expect(exitCode).toBe(0)
-    expect(stdout).toBe("")
-    expect(stderr).toBe(`No sessions found${os.EOL}`)
-  } finally {
-    await server.stop(true)
-  }
-})
-
-test("interactive export writes a temporary JSON file", async () => {
-  const output = await writeExport(transfer, info.id, false)
-  const file = output.trim()
-
-  try {
-    expect(path.dirname(file)).toBe(os.tmpdir())
-    expect(await Bun.file(file).json()).toEqual(transfer)
-  } finally {
-    await fs.rm(file, { force: true })
-  }
-})
-
-test("import validates a file and sends it to the resolved location", async () => {
-  const root = await fs.mkdtemp(path.join(os.tmpdir(), "opencode-import-"))
-  const file = path.join(root, "session.json")
-  await fs.writeFile(file, JSON.stringify(transfer))
-  let imported: unknown
-  const server = Bun.serve({
-    port: 0,
-    async fetch(request) {
-      const url = new URL(request.url)
-      if (url.pathname === "/api/health") return health()
-      if (url.pathname === "/api/location") {
-        return Response.json({
-          directory: root,
-          project: { id: "global", directory: root, canonical: root },
-        })
-      }
-      if (url.pathname === "/api/session/import") {
-        imported = await request.json()
-        return Response.json({ data: { ...info, location: { directory: root } } })
-      }
-      return new Response("Not found", { status: 404 })
-    },
-  })
-
-  try {
-    const [stdout, , exitCode] = await run([
-      "import",
-      file,
-      "--directory",
-      root,
-      "--server",
-      server.url.toString(),
-    ])
-
-    expect(exitCode).toBe(0)
-    expect(stdout).toBe(`Imported session: ${info.id}${os.EOL}`)
-    expect(imported).toEqual({ ...transfer, location: { directory: root } })
-  } finally {
-    await server.stop(true)
-    await fs.rm(root, { recursive: true, force: true })
-  }
-})
-
-test("import reports an existing session without a stack trace", async () => {
-  const root = await fs.mkdtemp(path.join(os.tmpdir(), "opencode-import-conflict-"))
-  const file = path.join(root, "session.json")
-  await fs.writeFile(file, JSON.stringify(transfer))
-  const server = Bun.serve({
-    port: 0,
-    fetch(request) {
-      const url = new URL(request.url)
-      if (url.pathname === "/api/health") return health()
-      if (url.pathname === "/api/location") {
-        return Response.json({
-          directory: root,
-          project: { id: "global", directory: root, canonical: root },
-        })
-      }
-      if (url.pathname === "/api/session/import") return new Response("Conflict", { status: 409 })
-      return new Response("Not found", { status: 404 })
-    },
-  })
-
-  try {
-    const [stdout, stderr, exitCode] = await run(["import", file, "--server", server.url.toString()])
-
-    expect(exitCode).toBe(0)
-    expect(stdout).toBe("")
-    expect(stderr).toBe(`Session already exists${os.EOL}`)
-  } finally {
-    await server.stop(true)
-    await fs.rm(root, { recursive: true, force: true })
-  }
-})

packages/cli/test/run/noninteractive.test.ts

@@ -426,13 +426,14 @@ describe("runNonInteractivePrompt", () => {
     const globalOptions = {
       headers: {
         "x-opencode-directory": "%2Fwork%20tree",
+        "x-opencode-workspace": "wrk_1",
       },
     }
     expect(sdk.form.cancel).toHaveBeenCalledWith({ sessionID: "global", formID: "frm_live" }, globalOptions)
     expect(sdk.form.cancel).toHaveBeenCalledWith({ sessionID: "ses_1", formID: "frm_pending" })
     expect(sdk.form.cancel).toHaveBeenCalledWith({ sessionID: "global", formID: "frm_pending_global" }, globalOptions)
     expect(sdk.form.request.list).toHaveBeenCalledWith({
-      location: { directory: "/work tree" },
+      location: { directory: "/work tree", workspace: "wrk_1" },
     })
     expect(sdk.question.list).not.toHaveBeenCalled()
     expect(sdk.question.reject).not.toHaveBeenCalled()

packages/client/src/effect/api/api.ts

@@ -3,13 +3,13 @@ import type { Effect, Stream } from "effect"
 import type { Location } from "@opencode-ai/schema/location"
 import type { Agent } from "@opencode-ai/schema/agent"
 import type { Plugin } from "@opencode-ai/schema/plugin"
+import type { Workspace } from "@opencode-ai/schema/workspace"
 import type { Session } from "@opencode-ai/schema/session"
 import type { AbsolutePath } from "@opencode-ai/schema/schema"
 import type { Project } from "@opencode-ai/schema/project"
 import type { RelativePath } from "@opencode-ai/schema/schema"
 import type { Brand } from "effect"
 import type { Model } from "@opencode-ai/schema/model"
-import type { Workspace } from "@opencode-ai/schema/workspace"
 import type { SessionMessage } from "@opencode-ai/schema/session-message"
 import type { PromptInput } from "@opencode-ai/schema/prompt-input"
 import type { AgentAttachment } from "@opencode-ai/schema/prompt"
@@ -59,7 +59,9 @@ export interface ServerApi<E = never> {
   readonly get: ServerGetOperation<E>
 }
 
-export type Endpoint2_0Input = { readonly location?: { readonly directory?: string | undefined } | undefined }
+export type Endpoint2_0Input = {
+  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
+}
 export type Endpoint2_0Output = Location.Info
 export type LocationGetOperation<E = never> = (input?: Endpoint2_0Input) => Effect.Effect<Endpoint2_0Output, E>
 
@@ -67,13 +69,15 @@ export interface LocationApi<E = never> {
   readonly get: LocationGetOperation<E>
 }
 
-export type Endpoint3_0Input = { readonly location?: { readonly directory?: string | undefined } | undefined }
+export type Endpoint3_0Input = {
+  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
+}
 export type Endpoint3_0Output = { readonly location: Location.Info; readonly data: ReadonlyArray<Agent.Info> }
 export type AgentListOperation<E = never> = (input?: Endpoint3_0Input) => Effect.Effect<Endpoint3_0Output, E>
 
 export type Endpoint3_1Input = {
   readonly agentID: Agent.ID
-  readonly location?: { readonly directory?: string | undefined } | undefined
+  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
 }
 export type Endpoint3_1Output = { readonly location: Location.Info; readonly data: Agent.Info }
 export type AgentGetOperation<E = never> = (input: Endpoint3_1Input) => Effect.Effect<Endpoint3_1Output, E>
@@ -83,7 +87,9 @@ export interface AgentApi<E = never> {
   readonly get: AgentGetOperation<E>
 }
 
-export type Endpoint4_0Input = { readonly location?: { readonly directory?: string | undefined } | undefined }
+export type Endpoint4_0Input = {
+  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
+}
 export type Endpoint4_0Output = { readonly location: Location.Info; readonly data: ReadonlyArray<Plugin.Info> }
 export type PluginListOperation<E = never> = (input?: Endpoint4_0Input) => Effect.Effect<Endpoint4_0Output, E>
 
@@ -92,6 +98,7 @@ export interface PluginApi<E = never> {
 }
 
 export type Endpoint5_0Input = {
+  readonly workspace?: Workspace.ID | undefined
   readonly limit?: number | undefined
   readonly order?: "asc" | "desc" | undefined
   readonly search?: string | undefined
@@ -120,54 +127,42 @@ export type Endpoint5_1Input = {
 export type Endpoint5_1Output = Session.Info
 export type SessionCreateOperation<E = never> = (input?: Endpoint5_1Input) => Effect.Effect<Endpoint5_1Output, E>
 
-export type Endpoint5_2Input = {
-  readonly info: Session.Info
-  readonly messages: ReadonlyArray<SessionMessage.Info>
-  readonly location?: Location.Ref | undefined
-}
-export type Endpoint5_2Output = Session.Info
-export type SessionImportOperation<E = never> = (input: Endpoint5_2Input) => Effect.Effect<Endpoint5_2Output, E>
+export type Endpoint5_2Output = { readonly [x: Session.ID]: { readonly type: "running" } }
+export type SessionActiveOperation<E = never> = () => Effect.Effect<Endpoint5_2Output, E>
 
-export type Endpoint5_3Input = { readonly sessionID: Session.ID; readonly sanitize?: boolean | undefined }
-export type Endpoint5_3Output = { readonly info: Session.Info; readonly messages: ReadonlyArray<SessionMessage.Info> }
-export type SessionExportOperation<E = never> = (input: Endpoint5_3Input) => Effect.Effect<Endpoint5_3Output, E>
+export type Endpoint5_3Input = { readonly sessionID: Session.ID }
+export type Endpoint5_3Output = Session.Info
+export type SessionGetOperation<E = never> = (input: Endpoint5_3Input) => Effect.Effect<Endpoint5_3Output, E>
 
-export type Endpoint5_4Output = { readonly [x: Session.ID]: { readonly type: "running" } }
-export type SessionActiveOperation<E = never> = () => Effect.Effect<Endpoint5_4Output, E>
+export type Endpoint5_4Input = { readonly sessionID: Session.ID }
+export type Endpoint5_4Output = void
+export type SessionRemoveOperation<E = never> = (input: Endpoint5_4Input) => Effect.Effect<Endpoint5_4Output, E>
 
-export type Endpoint5_5Input = { readonly sessionID: Session.ID }
+export type Endpoint5_5Input = { readonly sessionID: Session.ID; readonly boundary: Session.ForkRequestBoundary }
 export type Endpoint5_5Output = Session.Info
-export type SessionGetOperation<E = never> = (input: Endpoint5_5Input) => Effect.Effect<Endpoint5_5Output, E>
+export type SessionForkOperation<E = never> = (input: Endpoint5_5Input) => Effect.Effect<Endpoint5_5Output, E>
 
-export type Endpoint5_6Input = { readonly sessionID: Session.ID }
+export type Endpoint5_6Input = { readonly sessionID: Session.ID; readonly agent: Agent.ID }
 export type Endpoint5_6Output = void
-export type SessionRemoveOperation<E = never> = (input: Endpoint5_6Input) => Effect.Effect<Endpoint5_6Output, E>
+export type SessionSwitchAgentOperation<E = never> = (input: Endpoint5_6Input) => Effect.Effect<Endpoint5_6Output, E>
 
-export type Endpoint5_7Input = { readonly sessionID: Session.ID; readonly boundary: Session.ForkRequestBoundary }
-export type Endpoint5_7Output = Session.Info
-export type SessionForkOperation<E = never> = (input: Endpoint5_7Input) => Effect.Effect<Endpoint5_7Output, E>
+export type Endpoint5_7Input = { readonly sessionID: Session.ID; readonly model: Model.Ref }
+export type Endpoint5_7Output = void
+export type SessionSwitchModelOperation<E = never> = (input: Endpoint5_7Input) => Effect.Effect<Endpoint5_7Output, E>
 
-export type Endpoint5_8Input = { readonly sessionID: Session.ID; readonly agent: Agent.ID }
+export type Endpoint5_8Input = { readonly sessionID: Session.ID; readonly title: string }
 export type Endpoint5_8Output = void
-export type SessionSwitchAgentOperation<E = never> = (input: Endpoint5_8Input) => Effect.Effect<Endpoint5_8Output, E>
+export type SessionRenameOperation<E = never> = (input: Endpoint5_8Input) => Effect.Effect<Endpoint5_8Output, E>
 
-export type Endpoint5_9Input = { readonly sessionID: Session.ID; readonly model: Model.Ref }
-export type Endpoint5_9Output = void
-export type SessionSwitchModelOperation<E = never> = (input: Endpoint5_9Input) => Effect.Effect<Endpoint5_9Output, E>
-
-export type Endpoint5_10Input = { readonly sessionID: Session.ID; readonly title: string }
-export type Endpoint5_10Output = void
-export type SessionRenameOperation<E = never> = (input: Endpoint5_10Input) => Effect.Effect<Endpoint5_10Output, E>
-
-export type Endpoint5_11Input = {
+export type Endpoint5_9Input = {
   readonly sessionID: Session.ID
   readonly directory: AbsolutePath
   readonly workspaceID?: Workspace.ID | undefined
 }
-export type Endpoint5_11Output = void
-export type SessionMoveOperation<E = never> = (input: Endpoint5_11Input) => Effect.Effect<Endpoint5_11Output, E>
+export type Endpoint5_9Output = void
+export type SessionMoveOperation<E = never> = (input: Endpoint5_9Input) => Effect.Effect<Endpoint5_9Output, E>
 
-export type Endpoint5_12Input = {
+export type Endpoint5_10Input = {
   readonly sessionID: Session.ID
   readonly id?: SessionMessage.ID | undefined
   readonly text: string
@@ -177,10 +172,10 @@ export type Endpoint5_12Input = {
   readonly delivery?: "steer" | "queue" | undefined
   readonly resume?: boolean | undefined
 }
-export type Endpoint5_12Output = SessionPending.User
-export type SessionPromptOperation<E = never> = (input: Endpoint5_12Input) => Effect.Effect<Endpoint5_12Output, E>
+export type Endpoint5_10Output = SessionPending.User
+export type SessionPromptOperation<E = never> = (input: Endpoint5_10Input) => Effect.Effect<Endpoint5_10Output, E>
 
-export type Endpoint5_13Input = {
+export type Endpoint5_11Input = {
   readonly sessionID: Session.ID
   readonly id?: SessionMessage.ID | undefined
   readonly command: string
@@ -192,19 +187,19 @@ export type Endpoint5_13Input = {
   readonly delivery?: "steer" | "queue" | undefined
   readonly resume?: boolean | undefined
 }
-export type Endpoint5_13Output = SessionPending.User
-export type SessionCommandOperation<E = never> = (input: Endpoint5_13Input) => Effect.Effect<Endpoint5_13Output, E>
+export type Endpoint5_11Output = SessionPending.User
+export type SessionCommandOperation<E = never> = (input: Endpoint5_11Input) => Effect.Effect<Endpoint5_11Output, E>
 
-export type Endpoint5_14Input = {
+export type Endpoint5_12Input = {
   readonly sessionID: Session.ID
   readonly id?: SessionMessage.ID | undefined
   readonly skill: Skill.ID
   readonly resume?: boolean | undefined
 }
-export type Endpoint5_14Output = void
-export type SessionSkillOperation<E = never> = (input: Endpoint5_14Input) => Effect.Effect<Endpoint5_14Output, E>
+export type Endpoint5_12Output = void
+export type SessionSkillOperation<E = never> = (input: Endpoint5_12Input) => Effect.Effect<Endpoint5_12Output, E>
 
-export type Endpoint5_15Input = {
+export type Endpoint5_13Input = {
   readonly sessionID: Session.ID
   readonly id?: SessionMessage.ID | undefined
   readonly text: string
@@ -213,81 +208,81 @@ export type Endpoint5_15Input = {
   readonly delivery?: "steer" | "queue" | undefined
   readonly resume?: boolean | undefined
 }
-export type Endpoint5_15Output = SessionPending.Synthetic
-export type SessionSyntheticOperation<E = never> = (input: Endpoint5_15Input) => Effect.Effect<Endpoint5_15Output, E>
+export type Endpoint5_13Output = SessionPending.Synthetic
+export type SessionSyntheticOperation<E = never> = (input: Endpoint5_13Input) => Effect.Effect<Endpoint5_13Output, E>
 
-export type Endpoint5_16Input = {
+export type Endpoint5_14Input = {
   readonly sessionID: Session.ID
   readonly id?: Event.ID | undefined
   readonly command: string
 }
+export type Endpoint5_14Output = void
+export type SessionShellOperation<E = never> = (input: Endpoint5_14Input) => Effect.Effect<Endpoint5_14Output, E>
+
+export type Endpoint5_15Input = { readonly sessionID: Session.ID; readonly id?: SessionMessage.ID | undefined }
+export type Endpoint5_15Output = SessionPending.Compaction
+export type SessionCompactOperation<E = never> = (input: Endpoint5_15Input) => Effect.Effect<Endpoint5_15Output, E>
+
+export type Endpoint5_16Input = { readonly sessionID: Session.ID }
 export type Endpoint5_16Output = void
-export type SessionShellOperation<E = never> = (input: Endpoint5_16Input) => Effect.Effect<Endpoint5_16Output, E>
+export type SessionWaitOperation<E = never> = (input: Endpoint5_16Input) => Effect.Effect<Endpoint5_16Output, E>
 
-export type Endpoint5_17Input = { readonly sessionID: Session.ID; readonly id?: SessionMessage.ID | undefined }
-export type Endpoint5_17Output = SessionPending.Compaction
-export type SessionCompactOperation<E = never> = (input: Endpoint5_17Input) => Effect.Effect<Endpoint5_17Output, E>
-
-export type Endpoint5_18Input = { readonly sessionID: Session.ID }
-export type Endpoint5_18Output = void
-export type SessionWaitOperation<E = never> = (input: Endpoint5_18Input) => Effect.Effect<Endpoint5_18Output, E>
-
-export type Endpoint5_19Input = {
+export type Endpoint5_17Input = {
   readonly sessionID: Session.ID
   readonly messageID: SessionMessage.ID
   readonly files?: boolean | undefined
 }
-export type Endpoint5_19Output = Session.Revert
-export type SessionRevertStageOperation<E = never> = (input: Endpoint5_19Input) => Effect.Effect<Endpoint5_19Output, E>
+export type Endpoint5_17Output = Session.Revert
+export type SessionRevertStageOperation<E = never> = (input: Endpoint5_17Input) => Effect.Effect<Endpoint5_17Output, E>
+
+export type Endpoint5_18Input = { readonly sessionID: Session.ID }
+export type Endpoint5_18Output = void
+export type SessionRevertClearOperation<E = never> = (input: Endpoint5_18Input) => Effect.Effect<Endpoint5_18Output, E>
+
+export type Endpoint5_19Input = { readonly sessionID: Session.ID }
+export type Endpoint5_19Output = void
+export type SessionRevertCommitOperation<E = never> = (input: Endpoint5_19Input) => Effect.Effect<Endpoint5_19Output, E>
 
 export type Endpoint5_20Input = { readonly sessionID: Session.ID }
-export type Endpoint5_20Output = void
-export type SessionRevertClearOperation<E = never> = (input: Endpoint5_20Input) => Effect.Effect<Endpoint5_20Output, E>
+export type Endpoint5_20Output = ReadonlyArray<SessionMessage.Info>
+export type SessionContextOperation<E = never> = (input: Endpoint5_20Input) => Effect.Effect<Endpoint5_20Output, E>
 
 export type Endpoint5_21Input = { readonly sessionID: Session.ID }
-export type Endpoint5_21Output = void
-export type SessionRevertCommitOperation<E = never> = (input: Endpoint5_21Input) => Effect.Effect<Endpoint5_21Output, E>
+export type Endpoint5_21Output = ReadonlyArray<SessionPending.Info>
+export type SessionPendingListOperation<E = never> = (input: Endpoint5_21Input) => Effect.Effect<Endpoint5_21Output, E>
 
 export type Endpoint5_22Input = { readonly sessionID: Session.ID }
-export type Endpoint5_22Output = ReadonlyArray<SessionMessage.Info>
-export type SessionContextOperation<E = never> = (input: Endpoint5_22Input) => Effect.Effect<Endpoint5_22Output, E>
-
-export type Endpoint5_23Input = { readonly sessionID: Session.ID }
-export type Endpoint5_23Output = ReadonlyArray<SessionPending.Info>
-export type SessionPendingListOperation<E = never> = (input: Endpoint5_23Input) => Effect.Effect<Endpoint5_23Output, E>
-
-export type Endpoint5_24Input = { readonly sessionID: Session.ID }
-export type Endpoint5_24Output = ReadonlyArray<InstructionEntry.Info>
+export type Endpoint5_22Output = ReadonlyArray<InstructionEntry.Info>
 export type SessionInstructionsEntryListOperation<E = never> = (
-  input: Endpoint5_24Input,
-) => Effect.Effect<Endpoint5_24Output, E>
+  input: Endpoint5_22Input,
+) => Effect.Effect<Endpoint5_22Output, E>
 
-export type Endpoint5_25Input = {
+export type Endpoint5_23Input = {
   readonly sessionID: Session.ID
   readonly key: InstructionEntry.Key
   readonly value: Schema.Json
 }
-export type Endpoint5_25Output = void
+export type Endpoint5_23Output = void
 export type SessionInstructionsEntryPutOperation<E = never> = (
-  input: Endpoint5_25Input,
-) => Effect.Effect<Endpoint5_25Output, E>
+  input: Endpoint5_23Input,
+) => Effect.Effect<Endpoint5_23Output, E>
 
-export type Endpoint5_26Input = { readonly sessionID: Session.ID; readonly key: InstructionEntry.Key }
-export type Endpoint5_26Output = void
+export type Endpoint5_24Input = { readonly sessionID: Session.ID; readonly key: InstructionEntry.Key }
+export type Endpoint5_24Output = void
 export type SessionInstructionsEntryRemoveOperation<E = never> = (
-  input: Endpoint5_26Input,
-) => Effect.Effect<Endpoint5_26Output, E>
+  input: Endpoint5_24Input,
+) => Effect.Effect<Endpoint5_24Output, E>
 
-export type Endpoint5_27Input = { readonly sessionID: Session.ID; readonly prompt: string }
-export type Endpoint5_27Output = { readonly text: string }
-export type SessionGenerateOperation<E = never> = (input: Endpoint5_27Input) => Effect.Effect<Endpoint5_27Output, E>
+export type Endpoint5_25Input = { readonly sessionID: Session.ID; readonly prompt: string }
+export type Endpoint5_25Output = { readonly text: string }
+export type SessionGenerateOperation<E = never> = (input: Endpoint5_25Input) => Effect.Effect<Endpoint5_25Output, E>
 
-export type Endpoint5_28Input = {
+export type Endpoint5_26Input = {
   readonly sessionID: Session.ID
   readonly after?: Event.Seq | undefined
   readonly follow?: boolean | undefined
 }
-export type Endpoint5_28Output =
+export type Endpoint5_26Output =
   | (
       | {
           readonly id: Event.ID
@@ -855,25 +850,23 @@ export type Endpoint5_28Output =
         }
     )
   | EventLog.Synced
-export type SessionLogOperation<E = never> = (input: Endpoint5_28Input) => Stream.Stream<Endpoint5_28Output, E>
+export type SessionLogOperation<E = never> = (input: Endpoint5_26Input) => Stream.Stream<Endpoint5_26Output, E>
 
-export type Endpoint5_29Input = { readonly sessionID: Session.ID }
-export type Endpoint5_29Output = void
-export type SessionInterruptOperation<E = never> = (input: Endpoint5_29Input) => Effect.Effect<Endpoint5_29Output, E>
+export type Endpoint5_27Input = { readonly sessionID: Session.ID }
+export type Endpoint5_27Output = void
+export type SessionInterruptOperation<E = never> = (input: Endpoint5_27Input) => Effect.Effect<Endpoint5_27Output, E>
 
-export type Endpoint5_30Input = { readonly sessionID: Session.ID }
-export type Endpoint5_30Output = void
-export type SessionBackgroundOperation<E = never> = (input: Endpoint5_30Input) => Effect.Effect<Endpoint5_30Output, E>
+export type Endpoint5_28Input = { readonly sessionID: Session.ID }
+export type Endpoint5_28Output = void
+export type SessionBackgroundOperation<E = never> = (input: Endpoint5_28Input) => Effect.Effect<Endpoint5_28Output, E>
 
-export type Endpoint5_31Input = { readonly sessionID: Session.ID; readonly messageID: SessionMessage.ID }
-export type Endpoint5_31Output = SessionMessage.Info
-export type SessionMessageOperation<E = never> = (input: Endpoint5_31Input) => Effect.Effect<Endpoint5_31Output, E>
+export type Endpoint5_29Input = { readonly sessionID: Session.ID; readonly messageID: SessionMessage.ID }
+export type Endpoint5_29Output = SessionMessage.Info
+export type SessionMessageOperation<E = never> = (input: Endpoint5_29Input) => Effect.Effect<Endpoint5_29Output, E>
 
 export interface SessionApi<E = never> {
   readonly list: SessionListOperation<E>
   readonly create: SessionCreateOperation<E>
-  readonly import: SessionImportOperation<E>
-  readonly export: SessionExportOperation<E>
   readonly active: SessionActiveOperation<E>
   readonly get: SessionGetOperation<E>
   readonly remove: SessionRemoveOperation<E>
@@ -926,11 +919,15 @@ export interface MessageApi<E = never> {
   readonly list: MessageListOperation<E>
 }
 
-export type Endpoint7_0Input = { readonly location?: { readonly directory?: string | undefined } | undefined }
+export type Endpoint7_0Input = {
+  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
+}
 export type Endpoint7_0Output = { readonly location: Location.Info; readonly data: ReadonlyArray<Model.Info> }
 export type ModelListOperation<E = never> = (input?: Endpoint7_0Input) => Effect.Effect<Endpoint7_0Output, E>
 
-export type Endpoint7_1Input = { readonly location?: { readonly directory?: string | undefined } | undefined }
+export type Endpoint7_1Input = {
+  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
+}
 export type Endpoint7_1Output = { readonly location: Location.Info; readonly data: Model.Info | undefined }
 export type ModelDefaultOperation<E = never> = (input?: Endpoint7_1Input) => Effect.Effect<Endpoint7_1Output, E>
 
@@ -940,7 +937,7 @@ export interface ModelApi<E = never> {
 }
 
 export type Endpoint8_0Input = {
-  readonly location?: { readonly directory?: string | undefined } | undefined
+  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
   readonly prompt: string
   readonly model?: Model.Ref | undefined
 }
@@ -951,13 +948,15 @@ export interface GenerateApi<E = never> {
   readonly text: GenerateTextOperation<E>
 }
 
-export type Endpoint9_0Input = { readonly location?: { readonly directory?: string | undefined } | undefined }
+export type Endpoint9_0Input = {
+  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
+}
 export type Endpoint9_0Output = { readonly location: Location.Info; readonly data: ReadonlyArray<Provider.Info> }
 export type ProviderListOperation<E = never> = (input?: Endpoint9_0Input) => Effect.Effect<Endpoint9_0Output, E>
 
 export type Endpoint9_1Input = {
   readonly providerID: Provider.ID
-  readonly location?: { readonly directory?: string | undefined } | undefined
+  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
 }
 export type Endpoint9_1Output = { readonly location: Location.Info; readonly data: Provider.Info }
 export type ProviderGetOperation<E = never> = (input: Endpoint9_1Input) => Effect.Effect<Endpoint9_1Output, E>
@@ -967,19 +966,21 @@ export interface ProviderApi<E = never> {
   readonly get: ProviderGetOperation<E>
 }
 
-export type Endpoint10_0Input = { readonly location?: { readonly directory?: string | undefined } | undefined }
+export type Endpoint10_0Input = {
+  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
+}
 export type Endpoint10_0Output = { readonly location: Location.Info; readonly data: ReadonlyArray<Integration.Info> }
 export type IntegrationListOperation<E = never> = (input?: Endpoint10_0Input) => Effect.Effect<Endpoint10_0Output, E>
 
 export type Endpoint10_1Input = {
   readonly integrationID: Integration.ID
-  readonly location?: { readonly directory?: string | undefined } | undefined
+  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
 }
 export type Endpoint10_1Output = { readonly location: Location.Info; readonly data: Integration.Info | undefined }
 export type IntegrationGetOperation<E = never> = (input: Endpoint10_1Input) => Effect.Effect<Endpoint10_1Output, E>
 
 export type Endpoint10_2Input = {
-  readonly location?: { readonly directory?: string | undefined } | undefined
+  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
   readonly url: string
 }
 export type Endpoint10_2Output = void
@@ -989,7 +990,7 @@ export type IntegrationWellknownAddOperation<E = never> = (
 
 export type Endpoint10_3Input = {
   readonly integrationID: Integration.ID
-  readonly location?: { readonly directory?: string | undefined } | undefined
+  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
   readonly key: string
   readonly label?: string | undefined
 }
@@ -1000,7 +1001,7 @@ export type IntegrationConnectKeyOperation<E = never> = (
 
 export type Endpoint10_4Input = {
   readonly integrationID: Integration.ID
-  readonly location?: { readonly directory?: string | undefined } | undefined
+  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
   readonly methodID: Integration.MethodID
   readonly inputs: { readonly [x: string]: string }
   readonly label?: string | undefined
@@ -1013,7 +1014,7 @@ export type IntegrationOauthConnectOperation<E = never> = (
 export type Endpoint10_5Input = {
   readonly integrationID: Integration.ID
   readonly attemptID: Integration.AttemptID
-  readonly location?: { readonly directory?: string | undefined } | undefined
+  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
 }
 export type Endpoint10_5Output = { readonly location: Location.Info; readonly data: Integration.AttemptStatus }
 export type IntegrationOauthStatusOperation<E = never> = (
@@ -1023,7 +1024,7 @@ export type IntegrationOauthStatusOperation<E = never> = (
 export type Endpoint10_6Input = {
   readonly integrationID: Integration.ID
   readonly attemptID: Integration.AttemptID
-  readonly location?: { readonly directory?: string | undefined } | undefined
+  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
   readonly code?: string | undefined
 }
 export type Endpoint10_6Output = void
@@ -1034,7 +1035,7 @@ export type IntegrationOauthCompleteOperation<E = never> = (
 export type Endpoint10_7Input = {
   readonly integrationID: Integration.ID
   readonly attemptID: Integration.AttemptID
-  readonly location?: { readonly directory?: string | undefined } | undefined
+  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
 }
 export type Endpoint10_7Output = void
 export type IntegrationOauthCancelOperation<E = never> = (
@@ -1043,7 +1044,7 @@ export type IntegrationOauthCancelOperation<E = never> = (
 
 export type Endpoint10_8Input = {
   readonly integrationID: Integration.ID
-  readonly location?: { readonly directory?: string | undefined } | undefined
+  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
   readonly methodID: Integration.MethodID
   readonly label?: string | undefined
 }
@@ -1055,7 +1056,7 @@ export type IntegrationCommandConnectOperation<E = never> = (
 export type Endpoint10_9Input = {
   readonly integrationID: Integration.ID
   readonly attemptID: Integration.AttemptID
-  readonly location?: { readonly directory?: string | undefined } | undefined
+  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
 }
 export type Endpoint10_9Output = { readonly location: Location.Info; readonly data: Integration.CommandAttemptStatus }
 export type IntegrationCommandStatusOperation<E = never> = (
@@ -1065,7 +1066,7 @@ export type IntegrationCommandStatusOperation<E = never> = (
 export type Endpoint10_10Input = {
   readonly integrationID: Integration.ID
   readonly attemptID: Integration.AttemptID
-  readonly location?: { readonly directory?: string | undefined } | undefined
+  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
 }
 export type Endpoint10_10Output = void
 export type IntegrationCommandCancelOperation<E = never> = (
@@ -1090,13 +1091,15 @@ export interface IntegrationApi<E = never> {
   }
 }
 
-export type Endpoint11_0Input = { readonly location?: { readonly directory?: string | undefined } | undefined }
+export type Endpoint11_0Input = {
+  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
+}
 export type Endpoint11_0Output = { readonly location: Location.Info; readonly data: ReadonlyArray<Mcp.Server> }
 export type McpListOperation<E = never> = (input?: Endpoint11_0Input) => Effect.Effect<Endpoint11_0Output, E>
 
 export type Endpoint11_1Input = {
   readonly server: string
-  readonly location?: { readonly directory?: string | undefined } | undefined
+  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
   readonly config: Mcp.LocalConfig | Mcp.RemoteConfig
 }
 export type Endpoint11_1Output = void
@@ -1104,26 +1107,28 @@ export type McpAddOperation<E = never> = (input: Endpoint11_1Input) => Effect.Ef
 
 export type Endpoint11_2Input = {
   readonly server: string
-  readonly location?: { readonly directory?: string | undefined } | undefined
+  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
 }
 export type Endpoint11_2Output = void
 export type McpRemoveOperation<E = never> = (input: Endpoint11_2Input) => Effect.Effect<Endpoint11_2Output, E>
 
 export type Endpoint11_3Input = {
   readonly server: string
-  readonly location?: { readonly directory?: string | undefined } | undefined
+  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
 }
 export type Endpoint11_3Output = void
 export type McpConnectOperation<E = never> = (input: Endpoint11_3Input) => Effect.Effect<Endpoint11_3Output, E>
 
 export type Endpoint11_4Input = {
   readonly server: string
-  readonly location?: { readonly directory?: string | undefined } | undefined
+  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
 }
 export type Endpoint11_4Output = void
 export type McpDisconnectOperation<E = never> = (input: Endpoint11_4Input) => Effect.Effect<Endpoint11_4Output, E>
 
-export type Endpoint11_5Input = { readonly location?: { readonly directory?: string | undefined } | undefined }
+export type Endpoint11_5Input = {
+  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
+}
 export type Endpoint11_5Output = { readonly location: Location.Info; readonly data: Mcp.ResourceCatalog }
 export type McpResourceCatalogOperation<E = never> = (input?: Endpoint11_5Input) => Effect.Effect<Endpoint11_5Output, E>
 
@@ -1138,7 +1143,7 @@ export interface McpApi<E = never> {
 
 export type Endpoint12_0Input = {
   readonly credentialID: Credential.ID
-  readonly location?: { readonly directory?: string | undefined } | undefined
+  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
   readonly label: string
 }
 export type Endpoint12_0Output = void
@@ -1146,7 +1151,7 @@ export type CredentialUpdateOperation<E = never> = (input: Endpoint12_0Input) =>
 
 export type Endpoint12_1Input = {
   readonly credentialID: Credential.ID
-  readonly location?: { readonly directory?: string | undefined } | undefined
+  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
 }
 export type Endpoint12_1Output = void
 export type CredentialRemoveOperation<E = never> = (input: Endpoint12_1Input) => Effect.Effect<Endpoint12_1Output, E>
@@ -1159,13 +1164,15 @@ export interface CredentialApi<E = never> {
 export type Endpoint13_0Output = ReadonlyArray<Project.Info>
 export type ProjectListOperation<E = never> = () => Effect.Effect<Endpoint13_0Output, E>
 
-export type Endpoint13_1Input = { readonly location?: { readonly directory?: string | undefined } | undefined }
+export type Endpoint13_1Input = {
+  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
+}
 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 } | undefined
+  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>
@@ -1176,7 +1183,9 @@ export interface ProjectApi<E = never> {
   readonly directories: ProjectDirectoriesOperation<E>
 }
 
-export type Endpoint14_0Input = { readonly location?: { readonly directory?: string | undefined } | undefined }
+export type Endpoint14_0Input = {
+  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
+}
 export type Endpoint14_0Output = { readonly location: Location.Info; readonly data: ReadonlyArray<Form.Info> }
 export type FormRequestListOperation<E = never> = (input?: Endpoint14_0Input) => Effect.Effect<Endpoint14_0Output, E>
 
@@ -1220,7 +1229,9 @@ export interface FormApi<E = never> {
   readonly cancel: FormCancelOperation<E>
 }
 
-export type Endpoint15_0Input = { readonly location?: { readonly directory?: string | undefined } | undefined }
+export type Endpoint15_0Input = {
+  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
+}
 export type Endpoint15_0Output = { readonly location: Location.Info; readonly data: ReadonlyArray<Permission.Request> }
 export type PermissionRequestListOperation<E = never> = (
   input?: Endpoint15_0Input,
@@ -1278,14 +1289,14 @@ export interface PermissionApi<E = never> {
 }
 
 export type Endpoint16_0Input = {
-  readonly location?: { readonly directory?: string | undefined } | undefined
+  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
   readonly path?: RelativePath | undefined
 }
 export type Endpoint16_0Output = { readonly location: Location.Info; readonly data: ReadonlyArray<FileSystem.Entry> }
 export type FileListOperation<E = never> = (input?: Endpoint16_0Input) => Effect.Effect<Endpoint16_0Output, E>
 
 export type Endpoint16_1Input = {
-  readonly location?: { readonly directory?: string | undefined } | undefined
+  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
   readonly query: string
   readonly type?: "file" | "directory" | undefined
   readonly limit?: number | undefined
@@ -1298,7 +1309,9 @@ export interface FileApi<E = never> {
   readonly find: FileFindOperation<E>
 }
 
-export type Endpoint17_0Input = { readonly location?: { readonly directory?: string | undefined } | undefined }
+export type Endpoint17_0Input = {
+  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
+}
 export type Endpoint17_0Output = { readonly location: Location.Info; readonly data: ReadonlyArray<Command.Info> }
 export type CommandListOperation<E = never> = (input?: Endpoint17_0Input) => Effect.Effect<Endpoint17_0Output, E>
 
@@ -1306,7 +1319,9 @@ export interface CommandApi<E = never> {
   readonly list: CommandListOperation<E>
 }
 
-export type Endpoint18_0Input = { readonly location?: { readonly directory?: string | undefined } | undefined }
+export type Endpoint18_0Input = {
+  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
+}
 export type Endpoint18_0Output = { readonly location: Location.Info; readonly data: ReadonlyArray<Skill.Info> }
 export type SkillListOperation<E = never> = (input?: Endpoint18_0Input) => Effect.Effect<Endpoint18_0Output, E>
 
@@ -1321,12 +1336,14 @@ export interface EventApi<E = never> {
   readonly subscribe: EventSubscribeOperation<E>
 }
 
-export type Endpoint20_0Input = { readonly location?: { readonly directory?: string | undefined } | undefined }
+export type Endpoint20_0Input = {
+  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
+}
 export type Endpoint20_0Output = { readonly location: Location.Info; readonly data: ReadonlyArray<Pty.Info> }
 export type PtyListOperation<E = never> = (input?: Endpoint20_0Input) => Effect.Effect<Endpoint20_0Output, E>
 
 export type Endpoint20_1Input = {
-  readonly location?: { readonly directory?: string | undefined } | undefined
+  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
   readonly command?: string | undefined
   readonly args?: ReadonlyArray<string> | undefined
   readonly cwd?: string | undefined
@@ -1338,14 +1355,14 @@ export type PtyCreateOperation<E = never> = (input?: Endpoint20_1Input) => Effec
 
 export type Endpoint20_2Input = {
   readonly ptyID: Pty.ID
-  readonly location?: { readonly directory?: string | undefined } | undefined
+  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
 }
 export type Endpoint20_2Output = { readonly location: Location.Info; readonly data: Pty.Info }
 export type PtyGetOperation<E = never> = (input: Endpoint20_2Input) => Effect.Effect<Endpoint20_2Output, E>
 
 export type Endpoint20_3Input = {
   readonly ptyID: Pty.ID
-  readonly location?: { readonly directory?: string | undefined } | undefined
+  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
   readonly title?: string | undefined
   readonly size?: { readonly rows: number; readonly cols: number } | undefined
 }
@@ -1354,7 +1371,7 @@ export type PtyUpdateOperation<E = never> = (input: Endpoint20_3Input) => Effect
 
 export type Endpoint20_4Input = {
   readonly ptyID: Pty.ID
-  readonly location?: { readonly directory?: string | undefined } | undefined
+  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
 }
 export type Endpoint20_4Output = void
 export type PtyRemoveOperation<E = never> = (input: Endpoint20_4Input) => Effect.Effect<Endpoint20_4Output, E>
@@ -1367,12 +1384,14 @@ export interface PtyApi<E = never> {
   readonly remove: PtyRemoveOperation<E>
 }
 
-export type Endpoint21_0Input = { readonly location?: { readonly directory?: string | undefined } | undefined }
+export type Endpoint21_0Input = {
+  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
+}
 export type Endpoint21_0Output = { readonly location: Location.Info; readonly data: ReadonlyArray<Shell.Info> }
 export type ShellListOperation<E = never> = (input?: Endpoint21_0Input) => Effect.Effect<Endpoint21_0Output, E>
 
 export type Endpoint21_1Input = {
-  readonly location?: { readonly directory?: string | undefined } | undefined
+  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
   readonly command: string
   readonly cwd?: string | undefined
   readonly timeout: number
@@ -1383,14 +1402,14 @@ export type ShellCreateOperation<E = never> = (input: Endpoint21_1Input) => Effe
 
 export type Endpoint21_2Input = {
   readonly id: Shell.ID
-  readonly location?: { readonly directory?: string | undefined } | undefined
+  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
 }
 export type Endpoint21_2Output = { readonly location: Location.Info; readonly data: Shell.Info }
 export type ShellGetOperation<E = never> = (input: Endpoint21_2Input) => Effect.Effect<Endpoint21_2Output, E>
 
 export type Endpoint21_3Input = {
   readonly id: Shell.ID
-  readonly location?: { readonly directory?: string | undefined } | undefined
+  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
   readonly timeout: number
 }
 export type Endpoint21_3Output = { readonly location: Location.Info; readonly data: Shell.Info }
@@ -1398,7 +1417,7 @@ export type ShellTimeoutOperation<E = never> = (input: Endpoint21_3Input) => Eff
 
 export type Endpoint21_4Input = {
   readonly id: Shell.ID
-  readonly location?: { readonly directory?: string | undefined } | undefined
+  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
   readonly cursor?: number | undefined
   readonly limit?: number | undefined
 }
@@ -1415,7 +1434,7 @@ export type ShellOutputOperation<E = never> = (input: Endpoint21_4Input) => Effe
 
 export type Endpoint21_5Input = {
   readonly id: Shell.ID
-  readonly location?: { readonly directory?: string | undefined } | undefined
+  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
 }
 export type Endpoint21_5Output = void
 export type ShellRemoveOperation<E = never> = (input: Endpoint21_5Input) => Effect.Effect<Endpoint21_5Output, E>
@@ -1429,7 +1448,9 @@ export interface ShellApi<E = never> {
   readonly remove: ShellRemoveOperation<E>
 }
 
-export type Endpoint22_0Input = { readonly location?: { readonly directory?: string | undefined } | undefined }
+export type Endpoint22_0Input = {
+  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
+}
 export type Endpoint22_0Output = { readonly location: Location.Info; readonly data: ReadonlyArray<Question.Request> }
 export type QuestionRequestListOperation<E = never> = (
   input?: Endpoint22_0Input,
@@ -1458,7 +1479,9 @@ export interface QuestionApi<E = never> {
   readonly reject: QuestionRejectOperation<E>
 }
 
-export type Endpoint23_0Input = { readonly location?: { readonly directory?: string | undefined } | undefined }
+export type Endpoint23_0Input = {
+  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
+}
 export type Endpoint23_0Output = { readonly location: Location.Info; readonly data: ReadonlyArray<Reference.Info> }
 export type ReferenceListOperation<E = never> = (input?: Endpoint23_0Input) => Effect.Effect<Endpoint23_0Output, E>
 
@@ -1468,7 +1491,7 @@ export interface ReferenceApi<E = never> {
 
 export type Endpoint24_0Input = {
   readonly projectID: Project.ID
-  readonly location?: { readonly directory?: string | undefined } | undefined
+  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
   readonly strategy: ProjectCopy.StrategyID
   readonly directory: AbsolutePath
   readonly name?: string | undefined
@@ -1478,7 +1501,7 @@ export type ProjectCopyCreateOperation<E = never> = (input: Endpoint24_0Input) =
 
 export type Endpoint24_1Input = {
   readonly projectID: Project.ID
-  readonly location?: { readonly directory?: string | undefined } | undefined
+  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
   readonly directory: AbsolutePath
   readonly force: boolean
 }
@@ -1487,7 +1510,7 @@ export type ProjectCopyRemoveOperation<E = never> = (input: Endpoint24_1Input) =
 
 export type Endpoint24_2Input = {
   readonly projectID: Project.ID
-  readonly location?: { readonly directory?: string | undefined } | undefined
+  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
 }
 export type Endpoint24_2Output = void
 export type ProjectCopyRefreshOperation<E = never> = (input: Endpoint24_2Input) => Effect.Effect<Endpoint24_2Output, E>
@@ -1498,16 +1521,20 @@ export interface ProjectCopyApi<E = never> {
   readonly refresh: ProjectCopyRefreshOperation<E>
 }
 
-export type Endpoint25_0Input = { readonly location?: { readonly directory?: string | undefined } | undefined }
+export type Endpoint25_0Input = {
+  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
+}
 export type Endpoint25_0Output = { readonly location: Location.Info; readonly data: Vcs.Info }
 export type VcsGetOperation<E = never> = (input?: Endpoint25_0Input) => Effect.Effect<Endpoint25_0Output, E>
 
-export type Endpoint25_1Input = { readonly location?: { readonly directory?: string | undefined } | undefined }
+export type Endpoint25_1Input = {
+  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
+}
 export type Endpoint25_1Output = { readonly location: Location.Info; readonly data: ReadonlyArray<Vcs.FileStatus> }
 export type VcsStatusOperation<E = never> = (input?: Endpoint25_1Input) => Effect.Effect<Endpoint25_1Output, E>
 
 export type Endpoint25_2Input = {
-  readonly location?: { readonly directory?: string | undefined } | undefined
+  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
   readonly mode: Vcs.Mode
   readonly context?: number | undefined
 }
@@ -1523,7 +1550,9 @@ export interface VcsApi<E = never> {
 export type Endpoint26_0Output = ReadonlyArray<Location.Ref>
 export type DebugLocationListOperation<E = never> = () => Effect.Effect<Endpoint26_0Output, E>
 
-export type Endpoint26_1Input = { readonly location?: { readonly directory?: string | undefined } | undefined }
+export type Endpoint26_1Input = {
+  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
+}
 export type Endpoint26_1Output = void
 export type DebugLocationEvictOperation<E = never> = (input?: Endpoint26_1Input) => Effect.Effect<Endpoint26_1Output, E>
 
@@ -1548,12 +1577,14 @@ export interface MigrationApi<E = never> {
   readonly v1: { readonly status: MigrationV1StatusOperation<E> }
 }
 
-export type Endpoint28_0Input = { readonly location?: { readonly directory?: string | undefined } | undefined }
+export type Endpoint28_0Input = {
+  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
+}
 export type Endpoint28_0Output = { readonly location: Location.Info; readonly data: ReadonlyArray<WebSearch.Provider> }
 export type WebsearchProvidersOperation<E = never> = (input?: Endpoint28_0Input) => Effect.Effect<Endpoint28_0Output, E>
 
 export type Endpoint28_1Input = {
-  readonly location?: { readonly directory?: string | undefined } | undefined
+  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
   readonly query: string
   readonly providerID?: WebSearch.ID | undefined
 }
@@ -1565,7 +1596,9 @@ export interface WebsearchApi<E = never> {
   readonly query: WebsearchQueryOperation<E>
 }
 
-export type Endpoint29_0Input = { readonly location?: { readonly directory?: string | undefined } | undefined }
+export type Endpoint29_0Input = {
+  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
+}
 export type Endpoint29_0Output = ReadonlyArray<Config.Entry>
 export type ConfigGetOperation<E = never> = (input?: Endpoint29_0Input) => Effect.Effect<Endpoint29_0Output, E>
 

packages/client/src/effect/generated/client.ts

@@ -21,10 +21,10 @@ import type {
   Endpoint5_0Output,
   Endpoint5_1Input,
   Endpoint5_1Output,
-  Endpoint5_2Input,
   Endpoint5_2Output,
   Endpoint5_3Input,
   Endpoint5_3Output,
+  Endpoint5_4Input,
   Endpoint5_4Output,
   Endpoint5_5Input,
   Endpoint5_5Output,
@@ -76,10 +76,6 @@ import type {
   Endpoint5_28Output,
   Endpoint5_29Input,
   Endpoint5_29Output,
-  Endpoint5_30Input,
-  Endpoint5_30Output,
-  Endpoint5_31Input,
-  Endpoint5_31Output,
   Endpoint6_0Input,
   Endpoint6_0Output,
   Endpoint7_0Input,
@@ -292,6 +288,7 @@ const Endpoint5_0 = (raw: RawClient["server.session"]) => (input?: Endpoint5_0In
   preserveEffect<Endpoint5_0Output>()(
     raw["session.list"]({
       query: {
+        workspace: input?.["workspace"],
         limit: input?.["limit"],
         order: input?.["order"],
         search: input?.["search"],
@@ -320,11 +317,9 @@ const Endpoint5_1 = (raw: RawClient["server.session"]) => (input?: Endpoint5_1In
     ),
   )
 
-const Endpoint5_2 = (raw: RawClient["server.session"]) => (input: Endpoint5_2Input) =>
+const Endpoint5_2 = (raw: RawClient["server.session"]) => () =>
   preserveEffect<Endpoint5_2Output>()(
-    raw["session.import"]({
-      payload: { info: input["info"], messages: input["messages"], location: input["location"] },
-    }).pipe(
+    raw["session.active"]({}).pipe(
       Effect.mapError(mapClientError),
       Effect.map((value) => value.data),
     ),
@@ -332,23 +327,20 @@ const Endpoint5_2 = (raw: RawClient["server.session"]) => (input: Endpoint5_2Inp
 
 const Endpoint5_3 = (raw: RawClient["server.session"]) => (input: Endpoint5_3Input) =>
   preserveEffect<Endpoint5_3Output>()(
-    raw["session.export"]({ params: { sessionID: input["sessionID"] }, query: { sanitize: input["sanitize"] } }).pipe(
+    raw["session.get"]({ params: { sessionID: input["sessionID"] } }).pipe(
       Effect.mapError(mapClientError),
       Effect.map((value) => value.data),
     ),
   )
 
-const Endpoint5_4 = (raw: RawClient["server.session"]) => () =>
+const Endpoint5_4 = (raw: RawClient["server.session"]) => (input: Endpoint5_4Input) =>
   preserveEffect<Endpoint5_4Output>()(
-    raw["session.active"]({}).pipe(
-      Effect.mapError(mapClientError),
-      Effect.map((value) => value.data),
-    ),
+    raw["session.remove"]({ params: { sessionID: input["sessionID"] } }).pipe(Effect.mapError(mapClientError)),
   )
 
 const Endpoint5_5 = (raw: RawClient["server.session"]) => (input: Endpoint5_5Input) =>
   preserveEffect<Endpoint5_5Output>()(
-    raw["session.get"]({ params: { sessionID: input["sessionID"] } }).pipe(
+    raw["session.fork"]({ params: { sessionID: input["sessionID"] }, payload: { boundary: input["boundary"] } }).pipe(
       Effect.mapError(mapClientError),
       Effect.map((value) => value.data),
     ),
@@ -356,48 +348,35 @@ const Endpoint5_5 = (raw: RawClient["server.session"]) => (input: Endpoint5_5Inp
 
 const Endpoint5_6 = (raw: RawClient["server.session"]) => (input: Endpoint5_6Input) =>
   preserveEffect<Endpoint5_6Output>()(
-    raw["session.remove"]({ params: { sessionID: input["sessionID"] } }).pipe(Effect.mapError(mapClientError)),
+    raw["session.switchAgent"]({ params: { sessionID: input["sessionID"] }, payload: { agent: input["agent"] } }).pipe(
+      Effect.mapError(mapClientError),
+    ),
   )
 
 const Endpoint5_7 = (raw: RawClient["server.session"]) => (input: Endpoint5_7Input) =>
   preserveEffect<Endpoint5_7Output>()(
-    raw["session.fork"]({ params: { sessionID: input["sessionID"] }, payload: { boundary: input["boundary"] } }).pipe(
+    raw["session.switchModel"]({ params: { sessionID: input["sessionID"] }, payload: { model: input["model"] } }).pipe(
       Effect.mapError(mapClientError),
-      Effect.map((value) => value.data),
     ),
   )
 
 const Endpoint5_8 = (raw: RawClient["server.session"]) => (input: Endpoint5_8Input) =>
   preserveEffect<Endpoint5_8Output>()(
-    raw["session.switchAgent"]({ params: { sessionID: input["sessionID"] }, payload: { agent: input["agent"] } }).pipe(
+    raw["session.rename"]({ params: { sessionID: input["sessionID"] }, payload: { title: input["title"] } }).pipe(
       Effect.mapError(mapClientError),
     ),
   )
 
 const Endpoint5_9 = (raw: RawClient["server.session"]) => (input: Endpoint5_9Input) =>
   preserveEffect<Endpoint5_9Output>()(
-    raw["session.switchModel"]({ params: { sessionID: input["sessionID"] }, payload: { model: input["model"] } }).pipe(
-      Effect.mapError(mapClientError),
-    ),
-  )
-
-const Endpoint5_10 = (raw: RawClient["server.session"]) => (input: Endpoint5_10Input) =>
-  preserveEffect<Endpoint5_10Output>()(
-    raw["session.rename"]({ params: { sessionID: input["sessionID"] }, payload: { title: input["title"] } }).pipe(
-      Effect.mapError(mapClientError),
-    ),
-  )
-
-const Endpoint5_11 = (raw: RawClient["server.session"]) => (input: Endpoint5_11Input) =>
-  preserveEffect<Endpoint5_11Output>()(
     raw["session.move"]({
       params: { sessionID: input["sessionID"] },
       payload: { directory: input["directory"], workspaceID: input["workspaceID"] },
     }).pipe(Effect.mapError(mapClientError)),
   )
 
-const Endpoint5_12 = (raw: RawClient["server.session"]) => (input: Endpoint5_12Input) =>
-  preserveEffect<Endpoint5_12Output>()(
+const Endpoint5_10 = (raw: RawClient["server.session"]) => (input: Endpoint5_10Input) =>
+  preserveEffect<Endpoint5_10Output>()(
     raw["session.prompt"]({
       params: { sessionID: input["sessionID"] },
       payload: {
@@ -415,8 +394,8 @@ const Endpoint5_12 = (raw: RawClient["server.session"]) => (input: Endpoint5_12I
     ),
   )
 
-const Endpoint5_13 = (raw: RawClient["server.session"]) => (input: Endpoint5_13Input) =>
-  preserveEffect<Endpoint5_13Output>()(
+const Endpoint5_11 = (raw: RawClient["server.session"]) => (input: Endpoint5_11Input) =>
+  preserveEffect<Endpoint5_11Output>()(
     raw["session.command"]({
       params: { sessionID: input["sessionID"] },
       payload: {
@@ -436,16 +415,16 @@ const Endpoint5_13 = (raw: RawClient["server.session"]) => (input: Endpoint5_13I
     ),
   )
 
-const Endpoint5_14 = (raw: RawClient["server.session"]) => (input: Endpoint5_14Input) =>
-  preserveEffect<Endpoint5_14Output>()(
+const Endpoint5_12 = (raw: RawClient["server.session"]) => (input: Endpoint5_12Input) =>
+  preserveEffect<Endpoint5_12Output>()(
     raw["session.skill"]({
       params: { sessionID: input["sessionID"] },
       payload: { id: input["id"], skill: input["skill"], resume: input["resume"] },
     }).pipe(Effect.mapError(mapClientError)),
   )
 
-const Endpoint5_15 = (raw: RawClient["server.session"]) => (input: Endpoint5_15Input) =>
-  preserveEffect<Endpoint5_15Output>()(
+const Endpoint5_13 = (raw: RawClient["server.session"]) => (input: Endpoint5_13Input) =>
+  preserveEffect<Endpoint5_13Output>()(
     raw["session.synthetic"]({
       params: { sessionID: input["sessionID"] },
       payload: {
@@ -462,29 +441,29 @@ const Endpoint5_15 = (raw: RawClient["server.session"]) => (input: Endpoint5_15I
     ),
   )
 
-const Endpoint5_16 = (raw: RawClient["server.session"]) => (input: Endpoint5_16Input) =>
-  preserveEffect<Endpoint5_16Output>()(
+const Endpoint5_14 = (raw: RawClient["server.session"]) => (input: Endpoint5_14Input) =>
+  preserveEffect<Endpoint5_14Output>()(
     raw["session.shell"]({
       params: { sessionID: input["sessionID"] },
       payload: { id: input["id"], command: input["command"] },
     }).pipe(Effect.mapError(mapClientError)),
   )
 
-const Endpoint5_17 = (raw: RawClient["server.session"]) => (input: Endpoint5_17Input) =>
-  preserveEffect<Endpoint5_17Output>()(
+const Endpoint5_15 = (raw: RawClient["server.session"]) => (input: Endpoint5_15Input) =>
+  preserveEffect<Endpoint5_15Output>()(
     raw["session.compact"]({ params: { sessionID: input["sessionID"] }, payload: { id: input["id"] } }).pipe(
       Effect.mapError(mapClientError),
       Effect.map((value) => value.data),
     ),
   )
 
-const Endpoint5_18 = (raw: RawClient["server.session"]) => (input: Endpoint5_18Input) =>
-  preserveEffect<Endpoint5_18Output>()(
+const Endpoint5_16 = (raw: RawClient["server.session"]) => (input: Endpoint5_16Input) =>
+  preserveEffect<Endpoint5_16Output>()(
     raw["session.wait"]({ params: { sessionID: input["sessionID"] } }).pipe(Effect.mapError(mapClientError)),
   )
 
-const Endpoint5_19 = (raw: RawClient["server.session"]) => (input: Endpoint5_19Input) =>
-  preserveEffect<Endpoint5_19Output>()(
+const Endpoint5_17 = (raw: RawClient["server.session"]) => (input: Endpoint5_17Input) =>
+  preserveEffect<Endpoint5_17Output>()(
     raw["session.revert.stage"]({
       params: { sessionID: input["sessionID"] },
       payload: { messageID: input["messageID"], files: input["files"] },
@@ -494,19 +473,35 @@ const Endpoint5_19 = (raw: RawClient["server.session"]) => (input: Endpoint5_19I
     ),
   )
 
+const Endpoint5_18 = (raw: RawClient["server.session"]) => (input: Endpoint5_18Input) =>
+  preserveEffect<Endpoint5_18Output>()(
+    raw["session.revert.clear"]({ params: { sessionID: input["sessionID"] } }).pipe(Effect.mapError(mapClientError)),
+  )
+
+const Endpoint5_19 = (raw: RawClient["server.session"]) => (input: Endpoint5_19Input) =>
+  preserveEffect<Endpoint5_19Output>()(
+    raw["session.revert.commit"]({ params: { sessionID: input["sessionID"] } }).pipe(Effect.mapError(mapClientError)),
+  )
+
 const Endpoint5_20 = (raw: RawClient["server.session"]) => (input: Endpoint5_20Input) =>
   preserveEffect<Endpoint5_20Output>()(
-    raw["session.revert.clear"]({ params: { sessionID: input["sessionID"] } }).pipe(Effect.mapError(mapClientError)),
+    raw["session.context"]({ params: { sessionID: input["sessionID"] } }).pipe(
+      Effect.mapError(mapClientError),
+      Effect.map((value) => value.data),
+    ),
   )
 
 const Endpoint5_21 = (raw: RawClient["server.session"]) => (input: Endpoint5_21Input) =>
   preserveEffect<Endpoint5_21Output>()(
-    raw["session.revert.commit"]({ params: { sessionID: input["sessionID"] } }).pipe(Effect.mapError(mapClientError)),
+    raw["session.pending.list"]({ params: { sessionID: input["sessionID"] } }).pipe(
+      Effect.mapError(mapClientError),
+      Effect.map((value) => value.data),
+    ),
   )
 
 const Endpoint5_22 = (raw: RawClient["server.session"]) => (input: Endpoint5_22Input) =>
   preserveEffect<Endpoint5_22Output>()(
-    raw["session.context"]({ params: { sessionID: input["sessionID"] } }).pipe(
+    raw["session.instructions.entry.list"]({ params: { sessionID: input["sessionID"] } }).pipe(
       Effect.mapError(mapClientError),
       Effect.map((value) => value.data),
     ),
@@ -514,45 +509,29 @@ const Endpoint5_22 = (raw: RawClient["server.session"]) => (input: Endpoint5_22I
 
 const Endpoint5_23 = (raw: RawClient["server.session"]) => (input: Endpoint5_23Input) =>
   preserveEffect<Endpoint5_23Output>()(
-    raw["session.pending.list"]({ params: { sessionID: input["sessionID"] } }).pipe(
-      Effect.mapError(mapClientError),
-      Effect.map((value) => value.data),
-    ),
-  )
-
-const Endpoint5_24 = (raw: RawClient["server.session"]) => (input: Endpoint5_24Input) =>
-  preserveEffect<Endpoint5_24Output>()(
-    raw["session.instructions.entry.list"]({ params: { sessionID: input["sessionID"] } }).pipe(
-      Effect.mapError(mapClientError),
-      Effect.map((value) => value.data),
-    ),
-  )
-
-const Endpoint5_25 = (raw: RawClient["server.session"]) => (input: Endpoint5_25Input) =>
-  preserveEffect<Endpoint5_25Output>()(
     raw["session.instructions.entry.put"]({
       params: { sessionID: input["sessionID"], key: input["key"] },
       payload: { value: input["value"] },
     }).pipe(Effect.mapError(mapClientError)),
   )
 
-const Endpoint5_26 = (raw: RawClient["server.session"]) => (input: Endpoint5_26Input) =>
-  preserveEffect<Endpoint5_26Output>()(
+const Endpoint5_24 = (raw: RawClient["server.session"]) => (input: Endpoint5_24Input) =>
+  preserveEffect<Endpoint5_24Output>()(
     raw["session.instructions.entry.remove"]({ params: { sessionID: input["sessionID"], key: input["key"] } }).pipe(
       Effect.mapError(mapClientError),
     ),
   )
 
-const Endpoint5_27 = (raw: RawClient["server.session"]) => (input: Endpoint5_27Input) =>
-  preserveEffect<Endpoint5_27Output>()(
+const Endpoint5_25 = (raw: RawClient["server.session"]) => (input: Endpoint5_25Input) =>
+  preserveEffect<Endpoint5_25Output>()(
     raw["session.generate"]({ params: { sessionID: input["sessionID"] }, payload: { prompt: input["prompt"] } }).pipe(
       Effect.mapError(mapClientError),
       Effect.map((value) => value.data),
     ),
   )
 
-const Endpoint5_28 = (raw: RawClient["server.session"]) => (input: Endpoint5_28Input) =>
-  preserveStream<Endpoint5_28Output>()(
+const Endpoint5_26 = (raw: RawClient["server.session"]) => (input: Endpoint5_26Input) =>
+  preserveStream<Endpoint5_26Output>()(
     Stream.unwrap(
       raw["session.log"]({
         params: { sessionID: input["sessionID"] },
@@ -564,18 +543,18 @@ const Endpoint5_28 = (raw: RawClient["server.session"]) => (input: Endpoint5_28I
     ),
   )
 
-const Endpoint5_29 = (raw: RawClient["server.session"]) => (input: Endpoint5_29Input) =>
-  preserveEffect<Endpoint5_29Output>()(
+const Endpoint5_27 = (raw: RawClient["server.session"]) => (input: Endpoint5_27Input) =>
+  preserveEffect<Endpoint5_27Output>()(
     raw["session.interrupt"]({ params: { sessionID: input["sessionID"] } }).pipe(Effect.mapError(mapClientError)),
   )
 
-const Endpoint5_30 = (raw: RawClient["server.session"]) => (input: Endpoint5_30Input) =>
-  preserveEffect<Endpoint5_30Output>()(
+const Endpoint5_28 = (raw: RawClient["server.session"]) => (input: Endpoint5_28Input) =>
+  preserveEffect<Endpoint5_28Output>()(
     raw["session.background"]({ params: { sessionID: input["sessionID"] } }).pipe(Effect.mapError(mapClientError)),
   )
 
-const Endpoint5_31 = (raw: RawClient["server.session"]) => (input: Endpoint5_31Input) =>
-  preserveEffect<Endpoint5_31Output>()(
+const Endpoint5_29 = (raw: RawClient["server.session"]) => (input: Endpoint5_29Input) =>
+  preserveEffect<Endpoint5_29Output>()(
     raw["session.message"]({ params: { sessionID: input["sessionID"], messageID: input["messageID"] } }).pipe(
       Effect.mapError(mapClientError),
       Effect.map((value) => value.data),
@@ -585,32 +564,30 @@ const Endpoint5_31 = (raw: RawClient["server.session"]) => (input: Endpoint5_31I
 const adaptGroup5 = (raw: RawClient["server.session"]) => ({
   list: Endpoint5_0(raw),
   create: Endpoint5_1(raw),
-  import: Endpoint5_2(raw),
-  export: Endpoint5_3(raw),
-  active: Endpoint5_4(raw),
-  get: Endpoint5_5(raw),
-  remove: Endpoint5_6(raw),
-  fork: Endpoint5_7(raw),
-  switchAgent: Endpoint5_8(raw),
-  switchModel: Endpoint5_9(raw),
-  rename: Endpoint5_10(raw),
-  move: Endpoint5_11(raw),
-  prompt: Endpoint5_12(raw),
-  command: Endpoint5_13(raw),
-  skill: Endpoint5_14(raw),
-  synthetic: Endpoint5_15(raw),
-  shell: Endpoint5_16(raw),
-  compact: Endpoint5_17(raw),
-  wait: Endpoint5_18(raw),
-  revert: { stage: Endpoint5_19(raw), clear: Endpoint5_20(raw), commit: Endpoint5_21(raw) },
-  context: Endpoint5_22(raw),
-  pending: { list: Endpoint5_23(raw) },
-  instructions: { entry: { list: Endpoint5_24(raw), put: Endpoint5_25(raw), remove: Endpoint5_26(raw) } },
-  generate: Endpoint5_27(raw),
-  log: Endpoint5_28(raw),
-  interrupt: Endpoint5_29(raw),
-  background: Endpoint5_30(raw),
-  message: Endpoint5_31(raw),
+  active: Endpoint5_2(raw),
+  get: Endpoint5_3(raw),
+  remove: Endpoint5_4(raw),
+  fork: Endpoint5_5(raw),
+  switchAgent: Endpoint5_6(raw),
+  switchModel: Endpoint5_7(raw),
+  rename: Endpoint5_8(raw),
+  move: Endpoint5_9(raw),
+  prompt: Endpoint5_10(raw),
+  command: Endpoint5_11(raw),
+  skill: Endpoint5_12(raw),
+  synthetic: Endpoint5_13(raw),
+  shell: Endpoint5_14(raw),
+  compact: Endpoint5_15(raw),
+  wait: Endpoint5_16(raw),
+  revert: { stage: Endpoint5_17(raw), clear: Endpoint5_18(raw), commit: Endpoint5_19(raw) },
+  context: Endpoint5_20(raw),
+  pending: { list: Endpoint5_21(raw) },
+  instructions: { entry: { list: Endpoint5_22(raw), put: Endpoint5_23(raw), remove: Endpoint5_24(raw) } },
+  generate: Endpoint5_25(raw),
+  log: Endpoint5_26(raw),
+  interrupt: Endpoint5_27(raw),
+  background: Endpoint5_28(raw),
+  message: Endpoint5_29(raw),
 })
 
 const Endpoint6_0 = (raw: RawClient["server.message"]) => (input: Endpoint6_0Input) =>

packages/client/src/promise/generated/client.ts

@@ -15,10 +15,6 @@ import type {
   SessionListOutput,
   SessionCreateInput,
   SessionCreateOutput,
-  SessionImportInput,
-  SessionImportOutput,
-  SessionExportInput,
-  SessionExportOutput,
   SessionActiveOutput,
   SessionGetInput,
   SessionGetOutput,
@@ -448,6 +444,7 @@ export function make(options: ClientOptions) {
             method: "GET",
             path: `/api/session`,
             query: {
+              workspace: input?.["workspace"],
               limit: input?.["limit"],
               order: input?.["order"],
               search: input?.["search"],
@@ -476,31 +473,7 @@ export function make(options: ClientOptions) {
               location: input?.["location"],
             },
             successStatus: 200,
-            declaredStatuses: [400, 401],
-            empty: false,
-          },
-          requestOptions,
-        ).then((value) => value.data),
-      import: (input: SessionImportInput, requestOptions?: RequestOptions) =>
-        request<{ readonly data: SessionImportOutput }>(
-          {
-            method: "POST",
-            path: `/api/session/import`,
-            body: { info: input["info"], messages: input["messages"], location: input["location"] },
-            successStatus: 200,
-            declaredStatuses: [409, 401, 400],
-            empty: false,
-          },
-          requestOptions,
-        ).then((value) => value.data),
-      export: (input: SessionExportInput, requestOptions?: RequestOptions) =>
-        request<{ readonly data: SessionExportOutput }>(
-          {
-            method: "GET",
-            path: `/api/session/${encodeURIComponent(input.sessionID)}/export`,
-            query: { sanitize: input["sanitize"] },
-            successStatus: 200,
-            declaredStatuses: [404, 500, 401, 400],
+            declaredStatuses: [401, 400],
             empty: false,
           },
           requestOptions,

packages/codemode/test/openapi.test.ts

@@ -1021,12 +1021,13 @@ describe("OpenAPI.fromSpec", () => {
 
     await Effect.runPromise(
       location
-        .execute({ location: { directory: "/tmp" } })
+        .execute({ location: { directory: "/tmp", workspace: "workspace-1" } })
         .pipe(Effect.provide(client.layer)),
     )
 
     const url = new URL(client.requests[0]!.url)
     expect(url.searchParams.get("location[directory]")).toBe("/tmp")
+    expect(url.searchParams.get("location[workspace]")).toBe("workspace-1")
   })
 
   test("serializes supported simple and form parameter shapes", async () => {

packages/core/schema.json

@@ -1,11 +1,15 @@
 {
   "version": "7",
   "dialect": "sqlite",
-  "id": "2415fa65-3def-4f9f-be85-eb35f4f94ddd",
+  "id": "2d214a71-3b0a-48c1-a667-741952c4e188",
   "prevIds": [
-    "4d283c23-533f-4b87-9aa4-218f7fd36bca"
+    "f14a9b18-8207-487e-a3d3-227e629ba9ad"
   ],
   "ddl": [
+    {
+      "name": "workspace",
+      "entityType": "tables"
+    },
     {
       "name": "account_state",
       "entityType": "tables"
@@ -71,8 +75,84 @@
       "entityType": "tables"
     },
     {
-      "name": "workspace",
-      "entityType": "tables"
+      "type": "text",
+      "notNull": false,
+      "autoincrement": false,
+      "default": null,
+      "generated": null,
+      "name": "id",
+      "entityType": "columns",
+      "table": "workspace"
+    },
+    {
+      "type": "text",
+      "notNull": true,
+      "autoincrement": false,
+      "default": null,
+      "generated": null,
+      "name": "type",
+      "entityType": "columns",
+      "table": "workspace"
+    },
+    {
+      "type": "text",
+      "notNull": true,
+      "autoincrement": false,
+      "default": "''",
+      "generated": null,
+      "name": "name",
+      "entityType": "columns",
+      "table": "workspace"
+    },
+    {
+      "type": "text",
+      "notNull": false,
+      "autoincrement": false,
+      "default": null,
+      "generated": null,
+      "name": "branch",
+      "entityType": "columns",
+      "table": "workspace"
+    },
+    {
+      "type": "text",
+      "notNull": false,
+      "autoincrement": false,
+      "default": null,
+      "generated": null,
+      "name": "directory",
+      "entityType": "columns",
+      "table": "workspace"
+    },
+    {
+      "type": "text",
+      "notNull": false,
+      "autoincrement": false,
+      "default": null,
+      "generated": null,
+      "name": "extra",
+      "entityType": "columns",
+      "table": "workspace"
+    },
+    {
+      "type": "text",
+      "notNull": true,
+      "autoincrement": false,
+      "default": null,
+      "generated": null,
+      "name": "project_id",
+      "entityType": "columns",
+      "table": "workspace"
+    },
+    {
+      "type": "integer",
+      "notNull": true,
+      "autoincrement": false,
+      "default": null,
+      "generated": null,
+      "name": "time_used",
+      "entityType": "columns",
+      "table": "workspace"
     },
     {
       "type": "integer",
@@ -1305,63 +1385,18 @@
       "table": "session_v2"
     },
     {
-      "type": "text",
-      "notNull": false,
-      "autoincrement": false,
-      "default": null,
-      "generated": null,
-      "name": "id",
-      "entityType": "columns",
-      "table": "workspace"
-    },
-    {
-      "type": "text",
-      "notNull": true,
-      "autoincrement": false,
-      "default": null,
-      "generated": null,
-      "name": "provider",
-      "entityType": "columns",
-      "table": "workspace"
-    },
-    {
-      "type": "text",
-      "notNull": true,
-      "autoincrement": false,
-      "default": null,
-      "generated": null,
-      "name": "binding",
-      "entityType": "columns",
-      "table": "workspace"
-    },
-    {
-      "type": "text",
-      "notNull": true,
-      "autoincrement": false,
-      "default": null,
-      "generated": null,
-      "name": "root",
-      "entityType": "columns",
-      "table": "workspace"
-    },
-    {
-      "type": "integer",
-      "notNull": true,
-      "autoincrement": false,
-      "default": null,
-      "generated": null,
-      "name": "time_created",
-      "entityType": "columns",
-      "table": "workspace"
-    },
-    {
-      "type": "integer",
-      "notNull": true,
-      "autoincrement": false,
-      "default": null,
-      "generated": null,
-      "name": "time_updated",
-      "entityType": "columns",
+      "columns": [
+        "project_id"
+      ],
+      "tableTo": "project",
+      "columnsTo": [
+        "id"
+      ],
+      "onUpdate": "NO ACTION",
+      "onDelete": "CASCADE",
+      "nameExplicit": false,
+      "name": "fk_workspace_project_id_project_id_fk",
+      "entityType": "fks",
       "table": "workspace"
     },
     {
@@ -1529,6 +1564,15 @@
       "entityType": "pks",
       "table": "instruction_entry"
     },
+    {
+      "columns": [
+        "id"
+      ],
+      "nameExplicit": false,
+      "name": "workspace_pk",
+      "table": "workspace",
+      "entityType": "pks"
+    },
     {
       "columns": [
         "id"
@@ -1646,15 +1690,6 @@
       "table": "session_v2",
       "entityType": "pks"
     },
-    {
-      "columns": [
-        "id"
-      ],
-      "nameExplicit": false,
-      "name": "workspace_pk",
-      "table": "workspace",
-      "entityType": "pks"
-    },
     {
       "columns": [
         {

packages/core/src/control-plane/workspace.sql.ts

@@ -0,0 +1,20 @@
+import { sqliteTable, text, integer } from "drizzle-orm/sqlite-core"
+import { ProjectTable } from "../project/sql"
+import { Project } from "../project"
+import { Workspace } from "../workspace"
+
+export const WorkspaceTable = sqliteTable("workspace", {
+  id: text().$type<Workspace.ID>().primaryKey(),
+  type: text().notNull(),
+  name: text().notNull().default(""),
+  branch: text(),
+  directory: text(),
+  extra: text({ mode: "json" }),
+  project_id: text()
+    .$type<Project.ID>()
+    .notNull()
+    .references(() => ProjectTable.id, { onDelete: "cascade" }),
+  time_used: integer()
+    .notNull()
+    .$default(() => Date.now()),
+})

packages/core/src/database/migration.gen.ts

@@ -42,7 +42,5 @@ export const migrations = (
     import("./migration/20260622202450_simplify_session_input"),
     import("./migration/20260804233008_loose_psylocke"),
     import("./migration/20260805200742_import_legacy_credentials"),
-    import("./migration/20260806150823_remove_workspace"),
-    import("./migration/20260806150824_add_workspace"),
   ])
 ).map((module) => module.default) satisfies DatabaseMigration.Migration[]

packages/core/src/database/migration/20260806150823_remove_workspace.ts

@@ -1,14 +0,0 @@
-import { Effect } from "effect"
-import type { DatabaseMigration } from "../migration"
-
-export default {
-  id: "20260806150823_remove_workspace",
-  up(tx) {
-    return Effect.gen(function* () {
-      // Legacy control-plane workspace references would otherwise route these
-      // sessions to hosted graphs whose workspace rows no longer exist.
-      yield* tx.run(`UPDATE \`session_v2\` SET \`workspace_id\` = NULL WHERE \`workspace_id\` IS NOT NULL;`)
-      yield* tx.run(`DROP TABLE \`workspace\`;`)
-    })
-  },
-} satisfies DatabaseMigration.Migration

packages/core/src/database/migration/20260806150824_add_workspace.ts

@@ -1,20 +0,0 @@
-import { Effect } from "effect"
-import type { DatabaseMigration } from "../migration"
-
-export default {
-  id: "20260806150824_add_workspace",
-  up(tx) {
-    return Effect.gen(function* () {
-      yield* tx.run(`
-        CREATE TABLE \`workspace\` (
-          \`id\` text PRIMARY KEY,
-          \`provider\` text NOT NULL,
-          \`binding\` text NOT NULL,
-          \`root\` text NOT NULL,
-          \`time_created\` integer NOT NULL,
-          \`time_updated\` integer NOT NULL
-        );
-      `)
-    })
-  },
-} satisfies DatabaseMigration.Migration

packages/core/src/database/schema.gen.ts

@@ -4,6 +4,19 @@ import type { DatabaseMigration } from "./migration"
 export default {
   up(tx) {
     return Effect.gen(function* () {
+      yield* tx.run(`
+        CREATE TABLE \`workspace\` (
+          \`id\` text PRIMARY KEY,
+          \`type\` text NOT NULL,
+          \`name\` text DEFAULT '' NOT NULL,
+          \`branch\` text,
+          \`directory\` text,
+          \`extra\` text,
+          \`project_id\` text NOT NULL,
+          \`time_used\` integer NOT NULL,
+          CONSTRAINT \`fk_workspace_project_id_project_id_fk\` FOREIGN KEY (\`project_id\`) REFERENCES \`project\`(\`id\`) ON DELETE CASCADE
+        );
+      `)
       yield* tx.run(`
         CREATE TABLE \`account_state\` (
           \`id\` integer PRIMARY KEY,
@@ -203,16 +216,6 @@ export default {
           CONSTRAINT \`fk_session_v2_project_id_project_id_fk\` FOREIGN KEY (\`project_id\`) REFERENCES \`project\`(\`id\`) ON DELETE CASCADE
         );
       `)
-      yield* tx.run(`
-        CREATE TABLE \`workspace\` (
-          \`id\` text PRIMARY KEY,
-          \`provider\` text NOT NULL,
-          \`binding\` text NOT NULL,
-          \`root\` text NOT NULL,
-          \`time_created\` integer NOT NULL,
-          \`time_updated\` integer NOT NULL
-        );
-      `)
       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(

packages/core/src/file-mutation.ts

@@ -1,49 +1,23 @@
 export * as FileMutation from "./file-mutation"
 
 import { makeLocationNode } from "@opencode-ai/util/effect/app-node"
-import { Context, Effect, Layer, Schema } from "effect"
+import { Context, Effect, Layer } from "effect"
 import { KeyedMutex } from "./effect/keyed-mutex"
 import { FSUtil } from "@opencode-ai/util/fs-util"
 import { Bom } from "@opencode-ai/util/bom"
-import { Formatter } from "./formatter"
-import { WorkspaceEnvironment } from "./workspace/environment"
 
 export interface Target {
   readonly canonical: string
-  /** Lexical path for entry operations; remove unlinks the name, not the referent. */
-  readonly absolute: string
   readonly resource: string
 }
 
-/** Seam-owned absence so tools never see backend error vocabularies. */
-export class NotFoundError extends Schema.TaggedErrorClass<NotFoundError>()("FileMutation.NotFoundError", {
-  path: Schema.String,
-}) {}
-
-/** The target resolved to a directory where a file operation was required. */
-export class NotAFileError extends Schema.TaggedErrorClass<NotAFileError>()("FileMutation.NotAFileError", {
-  path: Schema.String,
-}) {}
-
-/** A move wrote its destination but failed to remove the source. */
-export class MoveIncompleteError extends Schema.TaggedErrorClass<MoveIncompleteError>()(
-  "FileMutation.MoveIncompleteError",
-  {
-    from: Schema.String,
-    to: Schema.String,
-    cause: Schema.optional(Schema.Defect()),
-  },
-) {}
-
 export interface WriteInput {
   readonly target: Target
-  readonly content: string
+  readonly content: string | Uint8Array
 }
 
-export interface MoveInput {
-  readonly from: Target
-  readonly to: Target
-  /** Text for the destination; may differ from the source content. */
+export interface TextWriteInput {
+  readonly target: Target
   readonly content: string
 }
 
@@ -52,208 +26,74 @@ export interface WriteResult {
   readonly target: string
   readonly resource: string
   readonly existed: boolean
-  /** Final text on disk after BOM handling and formatting. */
-  readonly content: string
 }
 
 export interface Interface {
-  /** Read a text file with the BOM stripped. BOM handling stays inside the seam. */
-  readonly read: (target: Target) => Effect.Effect<string, NotFoundError | NotAFileError | FSUtil.Error>
-  /**
-   * Write logical text while retaining an existing UTF-8 BOM and emitting at
-   * most one BOM. Runs configured formatters where the files live and reports
-   * the final text.
-   */
   readonly write: (input: WriteInput) => Effect.Effect<WriteResult, FSUtil.Error>
-  /**
-   * Write `content` to `to` with write semantics, then remove `from`. The
-   * destination inherits the source's BOM when it has none of its own.
-   */
-  readonly move: (input: MoveInput) => Effect.Effect<WriteResult, MoveIncompleteError | FSUtil.Error>
-  readonly remove: (target: Target) => Effect.Effect<void, NotFoundError | FSUtil.Error>
+  /** Write text while retaining an existing UTF-8 BOM and emitting at most one BOM. */
+  readonly writeTextPreservingBom: (input: TextWriteInput) => Effect.Effect<WriteResult, FSUtil.Error>
 }
 
 export class Service extends Context.Service<Service, Interface>()("@opencode/FileMutation") {}
 
-/** Normalize model-provided text to the BOM-free representation tools consume. */
-export const normalizeText = (content: string) => Bom.split(content).text
-
-/**
- * Backend primitives the shared seam orchestrates. Errors arrive already in
- * the seam vocabulary so tool-level messages stay uniform across backends.
- */
-interface Backend {
-  /** Full file bytes, or undefined when the path does not exist. */
-  readonly readOptional: (path: string) => Effect.Effect<Uint8Array | undefined, FSUtil.Error>
-  /** Classifies read failures; absence and errors report false. */
-  readonly isDirectory: (path: string) => Effect.Effect<boolean>
-  /** Creates parent directories, matching FSUtil.writeWithDirs. */
-  readonly write: (path: string, content: Uint8Array) => Effect.Effect<void, FSUtil.Error>
-  /** Unlink the lexical path; a symlink is removed, never its referent. */
-  readonly remove: (path: string) => Effect.Effect<void, NotFoundError | FSUtil.Error>
-  /** Format after write and report the final text, or undefined when no formatter applies. */
-  readonly format?: (path: string, bom: boolean) => Effect.Effect<string | undefined, FSUtil.Error>
-}
-
-const encoder = new TextEncoder()
-
 /**
  * Serialize file changes by canonical target. Conditional writes compare and
  * write under the same process-local lock so cooperating OpenCode mutations do
  * not overwrite changes made from the same stale content.
  */
-const make = (backend: Backend): Interface => {
-  const locks = KeyedMutex.makeUnsafe<string>()
-  // Locks are acquired in sorted canonical order so multi-target operations
-  // cannot deadlock.
-  const withTargetLocks =
-    (...targets: readonly Target[]) =>
-    <A, E, R>(effect: Effect.Effect<A, E, R>) =>
-      [...new Set(targets.map((target) => target.canonical))]
-        .sort()
-        .reduceRight((locked, key) => locks.withLock(key)(locked), Effect.uninterruptible(effect))
-
-  // Happy-path reads are one operation; only the failure path checks whether
-  // the target is a directory.
-  const read = Effect.fn("FileMutation.read")((target: Target) =>
-    Effect.gen(function* () {
-      const content = yield* backend
-        .readOptional(target.canonical)
-        .pipe(
-          Effect.catch((error) =>
-            backend
-              .isDirectory(target.canonical)
-              .pipe(
-                Effect.flatMap((directory) =>
-                  Effect.fail(directory ? new NotAFileError({ path: target.canonical }) : error),
-                ),
-              ),
-          ),
-        )
-      if (content === undefined) return yield* new NotFoundError({ path: target.canonical })
-      return Bom.fromBytes(content).text
-    }),
-  )
-
-  const writeText = (target: Target, content: string, inheritedBom: boolean) =>
-    Effect.gen(function* () {
-      const next = Bom.split(content)
-      const current = yield* backend.readOptional(target.canonical)
-      const bom = Boolean(current && Bom.has(current)) || inheritedBom || next.bom
-      yield* backend.write(target.canonical, encoder.encode(Bom.join(next.text, bom)))
-      // Formatters may rewrite the file, so the backend re-syncs the BOM and
-      // reports the final text.
-      const formatted = backend.format ? yield* backend.format(target.canonical, bom) : undefined
-      return {
-        operation: "write" as const,
-        target: target.canonical,
-        resource: target.resource,
-        existed: current !== undefined,
-        content: formatted ?? next.text,
-      }
-    })
-
-  const write = Effect.fn("FileMutation.write")((input: WriteInput) =>
-    withTargetLocks(input.target)(writeText(input.target, input.content, false)),
-  )
-
-  const move = Effect.fn("FileMutation.move")((input: MoveInput) =>
-    withTargetLocks(
-      input.from,
-      input.to,
-    )(
-      Effect.gen(function* () {
-        const source = yield* backend.readOptional(input.from.canonical)
-        const result = yield* writeText(input.to, input.content, Boolean(source && Bom.has(source)))
-        yield* backend
-          .remove(input.from.absolute)
-          .pipe(
-            Effect.mapError(
-              (cause) => new MoveIncompleteError({ from: input.from.canonical, to: input.to.canonical, cause }),
-            ),
-          )
-        return result
-      }),
-    ),
-  )
-
-  const remove = Effect.fn("FileMutation.remove")((target: Target) =>
-    withTargetLocks(target)(backend.remove(target.absolute)),
-  )
-
-  return Service.of({ read, write, move, remove })
-}
-
 const layer = Layer.effect(
   Service,
   Effect.gen(function* () {
     const fs = yield* FSUtil.Service
-    const formatter = yield* Formatter.Service
-    return make({
-      readOptional: (path) =>
-        fs.readFile(path).pipe(Effect.catchReason("PlatformError", "NotFound", () => Effect.succeed(undefined))),
-      isDirectory: (path) =>
-        fs.stat(path).pipe(
-          Effect.map((info) => info.type === "Directory"),
-          Effect.catch(() => Effect.succeed(false)),
-        ),
-      write: (path, content) => fs.writeWithDirs(path, content),
-      remove: (path) =>
-        fs.remove(path).pipe(Effect.catchReason("PlatformError", "NotFound", () => new NotFoundError({ path }))),
-      format: (path, bom) =>
-        formatter
-          .file(path)
-          .pipe(Effect.flatMap((formatted) => (formatted ? Bom.syncFile(fs, path, bom) : Effect.succeed(undefined)))),
+    const locks = KeyedMutex.makeUnsafe<string>()
+    const withTargetLock =
+      (target: Target) =>
+      <A, E, R>(effect: Effect.Effect<A, E, R>) =>
+        locks.withLock(target.canonical)(Effect.uninterruptible(effect))
+
+    const writeResult = (target: Target, existed: boolean): WriteResult => ({
+      operation: "write",
+      target: target.canonical,
+      resource: target.resource,
+      existed,
     })
+
+    const write = Effect.fn("FileMutation.write")((input: WriteInput) =>
+      withTargetLock(input.target)(
+        Effect.gen(function* () {
+          const existed = yield* fs.exists(input.target.canonical)
+          yield* fs.writeWithDirs(input.target.canonical, input.content)
+          return writeResult(input.target, existed)
+        }),
+      ),
+    )
+
+    const writeTextPreservingBom = Effect.fn("FileMutation.writeTextPreservingBom")((input: TextWriteInput) =>
+      withTargetLock(input.target)(
+        Effect.gen(function* () {
+          const next = Bom.split(input.content)
+          const current = yield* fs
+            .readFile(input.target.canonical)
+            .pipe(Effect.catchReason("PlatformError", "NotFound", () => Effect.succeed(undefined)))
+          yield* fs.writeWithDirs(
+            input.target.canonical,
+            Bom.join(next.text, Boolean(current && Bom.has(current)) || next.bom),
+          )
+          return writeResult(input.target, current !== undefined)
+        }),
+      ),
+    )
+
+    return Service.of({ write, writeTextPreservingBom })
   }),
 )
 
-export const node = makeLocationNode({ service: Service, layer, deps: [FSUtil.node, Formatter.node] })
-
-// Same seam through WorkspaceEnvironment.Files. Absence stays typed; other
-// environment failures surface as filesystem errors. No formatting: formatters
-// are host binaries and cannot run against provider paths until an environment
-// formatter runtime exists.
-const hostedLayer = Layer.effect(
-  Service,
-  Effect.gen(function* () {
-    const env = yield* WorkspaceEnvironment.Service
-    return make({
-      readOptional: (path) =>
-        env.files.read(path).pipe(
-          Effect.catchTag("WorkspaceEnvironment.NotFoundError", () => Effect.succeed(undefined)),
-          Effect.mapError(WorkspaceEnvironment.toFileSystemError("read")),
-        ),
-      isDirectory: (path) =>
-        env.files.stat(path).pipe(
-          Effect.map((info) => info.type === "Directory"),
-          Effect.catch(() => Effect.succeed(false)),
-        ),
-      write: (path, content) =>
-        env.files.write(path, content).pipe(Effect.mapError(WorkspaceEnvironment.toFileSystemError("write"))),
-      remove: (path) =>
-        env.files
-          .remove(path)
-          .pipe(
-            Effect.mapError((error) =>
-              error._tag === "WorkspaceEnvironment.NotFoundError"
-                ? new NotFoundError({ path })
-                : WorkspaceEnvironment.toFileSystemError("remove")(error),
-            ),
-          ),
-    })
-  }),
-)
-
-export const hostedNode = makeLocationNode({
-  service: Service,
-  layer: hostedLayer,
-  deps: [WorkspaceEnvironment.node],
-})
+export const node = makeLocationNode({ service: Service, layer, deps: [FSUtil.node] })
 
 /**
  * Deferred until the corresponding integrations exist.
  */
+// TODO: Add formatter integration after formatter runtime exists.
 // TODO: Publish watcher/file-edit events after watcher integration exists.
 // TODO: Add snapshots / undo after snapshot design exists.
 // TODO: Notify LSP and collect diagnostics after LSP runtime exists.

packages/core/src/filesystem.ts

@@ -7,9 +7,7 @@ import { FSUtil } from "@opencode-ai/util/fs-util"
 import { Location } from "./location"
 import { PositiveInt, RelativePath } from "./schema"
 import { FileSystemSearch } from "./filesystem/search"
-import { Entry, FileSystem, FindInput, Match } from "@opencode-ai/schema/filesystem"
-import { WorkspaceEnvironment } from "./workspace/environment"
-import { Ripgrep } from "./ripgrep"
+import { Entry, FileSystem, FindInput } from "@opencode-ai/schema/filesystem"
 export { Entry, Match, Submatch } from "@opencode-ai/schema/filesystem"
 
 export const ReadInput = Schema.Struct({
@@ -34,24 +32,7 @@ export type ListInput = typeof ListInput.Type
 export { FindInput }
 
 export const DEFAULT_SEARCH_LIMIT = 100
-/** One second of headroom over the hosted provider-side ripgrep kill. */
-export const DEFAULT_SEARCH_TIMEOUT_MS = (Ripgrep.HOSTED_KILL_TIMEOUT_SECONDS + 1) * 1_000
-
-/** Applies the shared search budget, failing with a search-scoped message. */
-export const searchTimeout =
-  <F>(fail: (message: string) => F) =>
-  <A, E, R>(effect: Effect.Effect<A, E, R>): Effect.Effect<A, E | F, R> =>
-    effect.pipe(
-      Effect.timeoutOrElse({
-        duration: DEFAULT_SEARCH_TIMEOUT_MS,
-        orElse: () =>
-          Effect.fail(
-            fail(
-              `Search timed out after ${DEFAULT_SEARCH_TIMEOUT_MS / 1_000} seconds. Consider using a more specific path or pattern.`,
-            ),
-          ),
-      }),
-    )
+export const DEFAULT_SEARCH_TIMEOUT_MS = 30_000
 
 export class GlobInput extends Schema.Class<GlobInput>("FileSystem.GlobInput")({
   pattern: Schema.String,
@@ -66,251 +47,71 @@ export class GrepInput extends Schema.Class<GrepInput>("FileSystem.GrepInput")({
   limit: Schema.optionalKey(PositiveInt),
 }) {}
 
-export interface SearchTarget {
-  readonly canonical: string
-  readonly absolute: string
-}
-
-export interface GlobSearchInput {
-  readonly target: SearchTarget
-  readonly pattern: string
-  readonly limit: number
-}
-
-export interface GrepSearchInput {
-  readonly target: SearchTarget
-  readonly pattern: string
-  readonly include?: string
-  readonly limit: number
-}
-
-export class SearchPathError extends Schema.TaggedErrorClass<SearchPathError>()("FileSystem.SearchPathError", {
-  path: Schema.String,
-  reason: Schema.Literals(["not_found", "not_directory"]),
-}) {}
-
-export class SearchError extends Schema.TaggedErrorClass<SearchError>()("FileSystem.SearchError", {
-  cause: Schema.Defect(),
-}) {}
-
-export class InvalidPatternError extends Schema.TaggedErrorClass<InvalidPatternError>()(
-  "FileSystem.InvalidPatternError",
-  {
-    pattern: Schema.String,
-    message: Schema.String,
-  },
-) {}
-
-const mapSearchError = (error: unknown) =>
-  error instanceof SearchPathError || error instanceof SearchError ? error : new SearchError({ cause: error })
-
-const mapGrepError = (error: unknown) =>
-  error instanceof Ripgrep.InvalidPatternError
-    ? new InvalidPatternError({ pattern: error.pattern, message: error.message })
-    : mapSearchError(error)
-
 export const Event = FileSystem.Event
 
-/** Directories first, then lexicographic; shared by every entry listing. */
-export const compareEntries = (a: Entry, b: Entry) =>
-  a.type === b.type ? a.path.localeCompare(b.path) : a.type === "directory" ? -1 : 1
-
 export interface Interface {
   readonly read: (input: ReadInput) => Effect.Effect<{ readonly content: Uint8Array; readonly mime: string }>
   readonly list: (input?: ListInput) => Effect.Effect<Entry[]>
   readonly find: (input: FindInput) => Effect.Effect<Entry[]>
-  readonly glob: (input: GlobSearchInput) => Effect.Effect<Entry[], SearchPathError | SearchError>
-  readonly grep: (input: GrepSearchInput) => Effect.Effect<Match[], SearchPathError | SearchError | InvalidPatternError>
 }
 
 export class Service extends Context.Service<Service, Interface>()("@opencode/FileSystem") {}
 
-const makeSearch = (
-  location: Location.Interface,
-  ripgrep: Ripgrep.Interface,
-  paths: Pick<typeof path.posix, "resolve" | "relative" | "dirname" | "basename">,
-  stat: (target: SearchTarget) => Effect.Effect<{ readonly type: string }, SearchPathError | SearchError>,
-) => ({
-  glob: Effect.fn("FileSystem.glob")(function* (input: GlobSearchInput) {
-    if ((yield* stat(input.target)).type !== "Directory")
-      return yield* new SearchPathError({ path: input.target.absolute, reason: "not_directory" })
-    return yield* ripgrep
-      .glob({
-        cwd: input.target.canonical,
-        pattern: input.pattern,
-        limit: input.limit,
-      })
-      .pipe(
-        Effect.map((entries) =>
-          entries.map((entry) =>
-            Entry.make({
-              ...entry,
-              path: RelativePath.make(
-                paths.relative(location.directory, paths.resolve(input.target.absolute, entry.path)),
-              ),
-            }),
-          ),
-        ),
-      )
-  }, Effect.mapError(mapSearchError)),
-  grep: Effect.fn("FileSystem.grep")(function* (input: GrepSearchInput) {
-    const info = yield* stat(input.target)
-    const file = info.type === "File"
-    const cwd = file ? paths.dirname(input.target.absolute) : input.target.canonical
-    const root = file ? paths.dirname(input.target.absolute) : input.target.absolute
-    return yield* ripgrep
-      .grep({
-        cwd,
-        pattern: input.pattern,
-        file: file ? paths.basename(input.target.absolute) : undefined,
-        include: input.include,
-        limit: input.limit,
-      })
-      .pipe(
-        Effect.map((matches) =>
-          matches.map((match) =>
-            Match.make({
-              ...match,
-              entry: Entry.make({
-                ...match.entry,
-                path: RelativePath.make(paths.relative(location.directory, paths.resolve(root, match.entry.path))),
-              }),
-            }),
-          ),
-        ),
-      )
-  }, Effect.mapError(mapGrepError)),
-})
-
-/**
- * Entry primitives the shared read/list implementations consume. Escape
- * failures and type mismatches are defects, matching route behavior.
- */
-interface EntryBackend {
-  readonly paths: Pick<typeof path.posix, "resolve" | "relative" | "join" | "sep">
-  readonly contains: (parent: string, child: string) => boolean
-  readonly realPath: (target: string) => Effect.Effect<string>
-  /** Reads one file; non-file targets die. */
-  readonly readFile: (real: string) => Effect.Effect<Uint8Array>
-  /** Lists one directory; non-directory targets die. */
-  readonly listDir: (real: string) => Effect.Effect<readonly FSUtil.DirEntry[]>
-}
-
-const makeEntries = (location: Location.Interface, root: string, backend: EntryBackend) => {
-  const resolve = Effect.fnUntraced(function* (input?: RelativePath) {
-    const absolute = backend.paths.resolve(location.directory, input ?? ".")
-    if (!backend.contains(location.directory, absolute))
-      return yield* Effect.die(new Error("Path escapes the location"))
-    const real = yield* backend.realPath(absolute)
-    if (!backend.contains(root, real)) return yield* Effect.die(new Error("Path escapes the location"))
-    return { absolute, real }
-  })
-  return {
-    read: Effect.fn("FileSystem.read")(function* (input: ReadInput) {
-      const target = yield* resolve(input.path)
-      return {
-        content: yield* backend.readFile(target.real),
-        mime: FSUtil.mimeType(target.real),
-      }
-    }),
-    list: Effect.fn("FileSystem.list")(function* (input: ListInput = {}) {
-      const target = yield* resolve(input.path)
-      const items = yield* backend.listDir(target.real)
-      return items
-        .flatMap((item) => {
-          if (item.type !== "file" && item.type !== "directory") return []
-          const absolute = backend.paths.join(target.absolute, item.name)
-          const relative = backend.paths.relative(location.directory, absolute)
-          return [
-            Entry.make({
-              path: RelativePath.make(relative + (item.type === "directory" ? backend.paths.sep : "")),
-              type: item.type,
-            }),
-          ]
-        })
-        .sort(compareEntries)
-    }),
-  }
-}
-
 const baseLayer = Layer.effect(
   Service,
   Effect.gen(function* () {
     const fs = yield* FSUtil.Service
     const location = yield* Location.Service
     const search = yield* FileSystemSearch.Service
-    const ripgrep = yield* Ripgrep.Service
-    const searches = makeSearch(location, ripgrep, path, (target) =>
-      fs.stat(target.canonical).pipe(
-        Effect.catchReason("PlatformError", "NotFound", () =>
-          Effect.fail(new SearchPathError({ path: target.absolute, reason: "not_found" })),
-        ),
-        Effect.mapError(mapSearchError),
-      ),
-    )
     const root = yield* fs.realPath(location.directory).pipe(Effect.orDie)
-    const entries = makeEntries(location, root, {
-      paths: path,
-      contains: FSUtil.contains,
-      realPath: (target) => fs.realPath(target).pipe(Effect.orDie),
-      readFile: (real) =>
-        Effect.gen(function* () {
-          const info = yield* fs.stat(real).pipe(Effect.orDie)
-          if (info.type !== "File") return yield* Effect.die(new Error("Path is not a file"))
-          return yield* fs.readFile(real).pipe(Effect.orDie)
-        }),
-      listDir: (real) =>
-        Effect.gen(function* () {
-          const info = yield* fs.stat(real).pipe(Effect.orDie)
-          if (info.type !== "Directory") return yield* Effect.die(new Error("Path is not a directory"))
-          return yield* fs.readDirectoryEntries(real).pipe(Effect.orDie)
-        }),
+    const resolve = Effect.fnUntraced(function* (input?: RelativePath) {
+      const absolute = path.resolve(location.directory, input ?? ".")
+      if (!FSUtil.contains(location.directory, absolute))
+        return yield* Effect.die(new Error("Path escapes the location"))
+      const real = yield* fs.realPath(absolute).pipe(Effect.orDie)
+      if (!FSUtil.contains(root, real)) return yield* Effect.die(new Error("Path escapes the location"))
+      return { absolute, real, directory: location.directory, root }
+    })
+    return Service.of({
+      find: search.find,
+      read: Effect.fn("FileSystem.read")(function* (input) {
+        const target = yield* resolve(input.path)
+        const info = yield* fs.stat(target.real).pipe(Effect.orDie)
+        if (info.type !== "File") return yield* Effect.die(new Error("Path is not a file"))
+        return {
+          content: yield* fs.readFile(target.real).pipe(Effect.orDie),
+          mime: FSUtil.mimeType(target.real),
+        }
+      }),
+      list: Effect.fn("FileSystem.list")(function* (input = {}) {
+        const target = yield* resolve(input.path)
+        const info = yield* fs.stat(target.real).pipe(Effect.orDie)
+        if (info.type !== "Directory") return yield* Effect.die(new Error("Path is not a directory"))
+        return yield* fs.readDirectoryEntries(target.real).pipe(
+          Effect.orDie,
+          Effect.map((items) =>
+            items
+              .flatMap((item) => {
+                if (item.type !== "file" && item.type !== "directory") return []
+                const absolute = path.join(target.absolute, item.name)
+                const relative = path.relative(target.directory, absolute)
+                return [
+                  Entry.make({
+                    path: RelativePath.make(relative + (item.type === "directory" ? path.sep : "")),
+                    type: item.type,
+                  }),
+                ]
+              })
+              .sort((a, b) => (a.type === b.type ? a.path.localeCompare(b.path) : a.type === "directory" ? -1 : 1)),
+          ),
+        )
+      }),
     })
-    return Service.of({ find: search.find, ...searches, ...entries })
   }),
 )
 
 export const node = makeLocationNode({
   service: Service,
   layer: baseLayer,
-  deps: [FSUtil.node, Location.node, FileSystemSearch.node, Ripgrep.node],
-})
-
-// Mirrors baseLayer over WorkspaceEnvironment.Files with posix path rules.
-// Host filesystem services never see provider paths. Type mismatches surface
-// from the environment operation itself; no stat pre-checks.
-const hostedLayer = Layer.effect(
-  Service,
-  Effect.gen(function* () {
-    const env = yield* WorkspaceEnvironment.Service
-    const location = yield* Location.Service
-    const ripgrep = yield* Ripgrep.Service
-    const searches = makeSearch(location, ripgrep, path.posix, (target) =>
-      env.files.stat(target.canonical).pipe(
-        Effect.catchTag("WorkspaceEnvironment.NotFoundError", () =>
-          Effect.fail(new SearchPathError({ path: target.absolute, reason: "not_found" })),
-        ),
-        Effect.mapError(mapSearchError),
-      ),
-    )
-    const root = yield* env.files.realPath(location.directory).pipe(Effect.orDie)
-    const entries = makeEntries(location, root, {
-      paths: path.posix,
-      contains: FSUtil.containsPosix,
-      realPath: (target) => env.files.realPath(target).pipe(Effect.orDie),
-      readFile: (real) => env.files.read(real).pipe(Effect.orDie),
-      listDir: (real) => env.files.list(real).pipe(Effect.orDie),
-    })
-    return Service.of({
-      find: () => Effect.logWarning("find is not supported for hosted locations yet").pipe(Effect.as([])),
-      ...searches,
-      ...entries,
-    })
-  }),
-)
-
-export const hostedNode = makeLocationNode({
-  service: Service,
-  layer: hostedLayer,
-  deps: [WorkspaceEnvironment.node, Location.node, Ripgrep.node],
+  deps: [FSUtil.node, Location.node, FileSystemSearch.node],
 })

packages/core/src/id/id.ts

@@ -10,6 +10,7 @@ const prefixes = {
   part: "prt",
   pty: "pty",
   tool: "tool",
+  workspace: "wrk",
 } as const
 
 export function ascending(prefix: keyof typeof prefixes, given?: string) {

packages/core/src/location-mutation.ts

@@ -7,7 +7,6 @@ import { FSUtil } from "@opencode-ai/util/fs-util"
 import { Location } from "./location"
 import { Project } from "./project"
 import { AbsolutePath } from "./schema"
-import { WorkspaceEnvironment } from "./workspace/environment"
 
 export const Kind = Schema.Literals(["file", "directory"])
 export type Kind = typeof Kind.Type
@@ -26,12 +25,12 @@ export type ResolveInput = typeof ResolveInput.Type
 
 export class PathError extends Schema.TaggedErrorClass<PathError>()("LocationMutation.PathError", {
   path: Schema.String,
-  reason: Schema.Literals(["non_directory_ancestor", "outside_workspace"]),
+  reason: Schema.Literal("non_directory_ancestor"),
 }) {}
 
 export interface ExternalDirectoryAuthorization {
   readonly action: "external_directory"
-  /** Lexical directory used as the external approval boundary. */
+  /** Canonical existing directory used as the external approval boundary. */
   readonly directory: string
   /** `external_directory` permission resource. */
   readonly resource: string
@@ -47,13 +46,7 @@ export const externalDirectoryPermission = (input: ExternalDirectoryAuthorizatio
 export interface Target {
   /** Canonical existing path, or missing path below a canonical directory. */
   readonly canonical: string
-  /**
-   * Lexical resolved path before symlink canonicalization. Reads and writes
-   * address the referent (canonical); entry operations like remove address
-   * the name itself.
-   */
-  readonly absolute: string
-  /** Permission resource: Location-relative for internal paths, lexical absolute for external paths. */
+  /** Permission resource: Location-relative for internal paths, canonical for external paths. */
   readonly resource: string
   readonly externalDirectory?: ExternalDirectoryAuthorization
 }
@@ -81,56 +74,9 @@ interface ResolvedPath {
     | "Socket"
     | "Unknown"
   readonly directory: string
-  readonly lexicalDirectory: string
 }
 
-/**
- * Resolution primitives the shared ancestor walk uses; absence reports
- * undefined so the walk owns the missing-path vocabulary.
- */
-interface WalkBackend<E> {
-  readonly paths: Pick<path.PlatformPath, "dirname" | "resolve" | "relative">
-  readonly realPathOptional: (path: string) => Effect.Effect<string | undefined, E>
-  readonly statOptional: (path: string) => Effect.Effect<{ readonly type: ResolvedPath["type"] } | undefined, E>
-}
-
-/**
- * Canonicalize an existing path, or resolve a missing path below its nearest
- * existing ancestor directory.
- */
-const resolvePathWith = <E>(backend: WalkBackend<E>) =>
-  Effect.fnUntraced(function* (absolute: string) {
-    const existing = yield* backend.realPathOptional(absolute)
-    if (existing !== undefined) {
-      const info = yield* backend.statOptional(existing)
-      if (info === undefined) return yield* new PathError({ path: absolute, reason: "non_directory_ancestor" })
-      return {
-        canonical: existing,
-        type: info.type,
-        directory: info.type === "Directory" ? existing : backend.paths.dirname(existing),
-        lexicalDirectory: info.type === "Directory" ? absolute : backend.paths.dirname(absolute),
-      } satisfies ResolvedPath
-    }
-
-    let anchor = backend.paths.dirname(absolute)
-    while (true) {
-      const canonical = yield* backend.realPathOptional(anchor)
-      if (canonical !== undefined) {
-        const info = yield* backend.statOptional(canonical)
-        if (info === undefined || info.type !== "Directory") {
-          return yield* new PathError({ path: absolute, reason: "non_directory_ancestor" })
-        }
-        return {
-          canonical: backend.paths.resolve(canonical, backend.paths.relative(anchor, absolute)),
-          directory: canonical,
-          lexicalDirectory: anchor,
-        } satisfies ResolvedPath
-      }
-      const parent = backend.paths.dirname(anchor)
-      if (parent === anchor) return yield* new PathError({ path: absolute, reason: "non_directory_ancestor" })
-      anchor = parent
-    }
-  })
+const slash = (value: string) => value.replaceAll("\\", "/")
 
 const layer = Layer.effect(
   Service,
@@ -142,10 +88,34 @@ const layer = Layer.effect(
       return effect.pipe(Effect.catchReason("PlatformError", "NotFound", () => Effect.succeed(undefined)))
     }
 
-    const resolvePath = resolvePathWith({
-      paths: path,
-      realPathOptional: (target) => notFound(fs.realPath(target)),
-      statOptional: (target) => notFound(fs.stat(target)),
+    const resolvePath = Effect.fnUntraced(function* (absolute: string) {
+      const existing = yield* notFound(fs.realPath(absolute))
+      if (existing !== undefined) {
+        const info = yield* fs.stat(existing)
+        return {
+          canonical: existing,
+          type: info.type,
+          directory: info.type === "Directory" ? existing : path.dirname(existing),
+        } satisfies ResolvedPath
+      }
+
+      let anchor = path.dirname(absolute)
+      while (true) {
+        const canonical = yield* notFound(fs.realPath(anchor))
+        if (canonical !== undefined) {
+          const info = yield* fs.stat(canonical)
+          if (info.type !== "Directory") {
+            return yield* new PathError({ path: absolute, reason: "non_directory_ancestor" })
+          }
+          return {
+            canonical: path.resolve(canonical, path.relative(anchor, absolute)),
+            directory: canonical,
+          } satisfies ResolvedPath
+        }
+        const parent = path.dirname(anchor)
+        if (parent === anchor) return yield* new PathError({ path: absolute, reason: "non_directory_ancestor" })
+        anchor = parent
+      }
     })
 
     const resolve = Effect.fn("LocationMutation.resolve")(function* (input: ResolveInput) {
@@ -156,21 +126,19 @@ const layer = Layer.effect(
 
       const resolved = yield* resolvePath(absolute)
       const external = !lexicallyInternal
-      const resource = external
-        ? FSUtil.slash(absolute)
-        : FSUtil.slash(path.relative(location.directory, absolute) || ".")
-      const externalDirectory = resolved.lexicalDirectory
-      const externalResource = FSUtil.slash(path.join(externalDirectory, "*"))
+      const resource = external ? slash(resolved.canonical) : slash(path.relative(location.directory, absolute) || ".")
+      const externalDirectory =
+        input.kind === "directory" && resolved.type === "Directory" ? resolved.canonical : resolved.directory
+      const externalResource = slash(path.join(externalDirectory, "*"))
       return {
         canonical: resolved.canonical,
-        absolute,
         resource,
         externalDirectory: external
           ? {
               action: "external_directory",
               directory: externalDirectory,
               resource: externalResource,
-              save: FSUtil.slash(
+              save: slash(
                 path.join((yield* Project.root(fs, AbsolutePath.make(externalDirectory))) ?? externalDirectory, "*"),
               ),
             }
@@ -187,47 +155,3 @@ export const node = makeLocationNode({
   layer: layer.pipe(Layer.orDie),
   deps: [FSUtil.node, Location.node],
 })
-
-// Mirrors the local resolve walk over WorkspaceEnvironment.Files with posix
-// rules. Hosted paths are never external: everything outside the Location is
-// rejected instead of routed to external_directory approval, because the
-// approval boundary vocabulary is host-relative.
-const hostedLayer = Layer.effect(
-  Service,
-  Effect.gen(function* () {
-    const env = yield* WorkspaceEnvironment.Service
-    const location = yield* Location.Service
-    // Canonicalized even when the Location sits on the workspace root: the
-    // environment does not guarantee a canonical directory (local fakes root
-    // at symlinked temp paths).
-    const root = yield* env.files.realPath(location.directory).pipe(Effect.orDie)
-
-    const resolvePath = resolvePathWith({
-      paths: path.posix,
-      realPathOptional: (target) => WorkspaceEnvironment.optional(env.files.realPath(target)),
-      statOptional: (target) => WorkspaceEnvironment.optional(env.files.stat(target)),
-    })
-
-    const resolve = Effect.fn("LocationMutation.resolve")(function* (input: ResolveInput) {
-      const absolute = path.posix.resolve(location.directory, input.path)
-      if (!FSUtil.containsPosix(location.directory, absolute))
-        return yield* new PathError({ path: absolute, reason: "outside_workspace" })
-      const resolved = yield* resolvePath(absolute)
-      if (!FSUtil.containsPosix(root, resolved.canonical))
-        return yield* new PathError({ path: absolute, reason: "outside_workspace" })
-      return {
-        canonical: resolved.canonical,
-        absolute,
-        resource: path.posix.relative(location.directory, absolute) || ".",
-      } satisfies Target
-    })
-
-    return Service.of({ resolve })
-  }),
-)
-
-export const hostedNode = makeLocationNode({
-  service: Service,
-  layer: hostedLayer.pipe(Layer.orDie),
-  deps: [WorkspaceEnvironment.node, Location.node],
-})

packages/core/src/location-services.ts

@@ -11,7 +11,6 @@ import { FileMutation } from "./file-mutation"
 import { Formatter } from "./formatter"
 import { FileSystem } from "./filesystem"
 import { FileSystemSearch } from "./filesystem/search"
-import { Ripgrep } from "./ripgrep"
 import { Generate } from "./generate"
 import { Form } from "./form"
 import { Image } from "./image"
@@ -48,8 +47,6 @@ import { McpTool } from "./tool/mcp"
 import { ReadToolFileSystem } from "./tool/read-filesystem"
 import { Tool } from "./tool"
 import { Vcs } from "./vcs"
-import { Workspace } from "@opencode-ai/schema/workspace"
-import { WorkspaceEnvironment } from "./workspace/environment"
 
 export { LocationServiceMap } from "./location-service-map"
 
@@ -107,27 +104,6 @@ export const locationServices = LayerNode.group<typeof locationServiceNodes>(loc
 export type LocationServices = LayerNode.Output<typeof locationServices>
 export type LocationError = LayerNode.Error<typeof locationServices>
 
-/**
- * Hosted graphs state their Location (no host discovery), read only global
- * config sources, and bind the workspace environment; local graphs are
- * byte-identical to before. Exported so tests can verify that every
- * Location-path-consuming service is environment-backed in hosted graphs.
- */
-export function hostedReplacements(ref: Location.Ref, workspaceID: Workspace.ID): LayerNode.Replacements {
-  return [
-    [Location.node, Location.hostedBoundNode(ref, workspaceID)],
-    [Config.node, Config.configured({ project: false })],
-    [InstructionDiscovery.node, InstructionDiscovery.configured({ project: false })],
-    [WorkspaceEnvironment.node, WorkspaceEnvironment.hostedNode(workspaceID)],
-    [Ripgrep.node, Ripgrep.hostedNode],
-    [FileSystem.node, FileSystem.hostedNode],
-    [LocationMutation.node, LocationMutation.hostedNode],
-    [FileMutation.node, FileMutation.hostedNode],
-    [ReadToolFileSystem.node, ReadToolFileSystem.hostedNode],
-    [Shell.node, Shell.hostedNode],
-  ]
-}
-
 export function buildLocationServiceMap(
   replacements: LayerNode.Replacements = [],
 ): Layer.Layer<LocationServiceMap.Service> {
@@ -142,10 +118,7 @@ export function buildLocationServiceMap(
       LayerMap.make(
         (ref: Location.Ref) => {
           const startedAt = performance.now()
-          const workspaceID = ref.workspaceID
-          const allReplacements = replacements.concat(
-            workspaceID ? hostedReplacements(ref, workspaceID) : [[Location.node, Location.boundNode(ref)]],
-          )
+          const allReplacements = replacements.concat([[Location.node, Location.boundNode(ref)]])
           // Apply replacements during hoist, not afterward: replacements can
           // introduce new tagged dependencies (Location.boundNode depends on
           // Project), and the hoist walk is the only pass that can still slice

packages/core/src/location.ts

@@ -1,9 +1,6 @@
-import path from "path"
 import { Context, Effect, Layer } from "effect"
 import { Info, Ref, response } from "@opencode-ai/schema/location"
-import { Workspace } from "@opencode-ai/schema/workspace"
 import { Project } from "./project"
-import { WorkspaceEnvironment } from "./workspace/environment"
 import { LayerNode } from "@opencode-ai/util/effect/layer-node"
 import { makeLocationNode, tags } from "@opencode-ai/util/effect/app-node"
 
@@ -17,12 +14,6 @@ export interface Interface extends Info {
 
 export class Service extends Context.Service<Service, Interface>()("@opencode/Location") {}
 
-/**
- * Path rules for a Location's directory. Hosted directories live in the
- * provider filesystem: posix semantics regardless of the host platform.
- */
-export const paths = (location: Pick<Info, "workspaceID">) => (location.workspaceID ? path.posix : path)
-
 export const node = LayerNode.unbound(Service, tags.values.location)
 
 const layer = (ref: Ref) =>
@@ -46,26 +37,3 @@ export const boundNode = (ref: Ref) =>
     layer: layer(ref),
     deps: [Project.node],
   })
-
-/**
- * Hosted Locations state their Project instead of discovering it: host git
- * and filesystem walks must never run against a provider directory. The
- * Workspace root comes from the already-connected environment, avoiding a
- * second workspace row read per graph build.
- */
-export const hostedBoundNode = (ref: Ref, workspaceID: Workspace.ID) =>
-  makeLocationNode({
-    service: Service,
-    layer: Layer.effect(
-      Service,
-      Effect.gen(function* () {
-        const env = yield* WorkspaceEnvironment.Service
-        return Service.of({
-          directory: ref.directory,
-          workspaceID,
-          project: Project.hostedGlobal(env.directory),
-        })
-      }),
-    ),
-    deps: [WorkspaceEnvironment.node],
-  })

packages/core/src/plugin/internal.ts

@@ -32,6 +32,7 @@ import { Npm } from "@opencode-ai/util/npm"
 import { Permission } from "../permission"
 import { Reference } from "../reference"
 import { WebSearch } from "../websearch"
+import { Ripgrep } from "../ripgrep"
 import { SessionInstructions } from "../session/instructions"
 import { Shell } from "../shell"
 import { Skill } from "../skill"
@@ -88,6 +89,7 @@ const services = Effect.fn("PluginInternal.services")(function* () {
   const read = yield* ReadToolFileSystem.Service
   const reference = yield* Reference.Service
   const websearch = yield* WebSearch.Service
+  const ripgrep = yield* Ripgrep.Service
   const instructions = yield* SessionInstructions.Service
   const shell = yield* Shell.Service
   const skill = yield* Skill.Service
@@ -119,6 +121,7 @@ const services = Effect.fn("PluginInternal.services")(function* () {
     Context.make(ReadToolFileSystem.Service, read),
     Context.make(Reference.Service, reference),
     Context.make(WebSearch.Service, websearch),
+    Context.make(Ripgrep.Service, ripgrep),
     Context.make(SessionInstructions.Service, instructions),
     Context.make(Shell.Service, shell),
     Context.make(Skill.Service, skill),

packages/core/src/plugin/runtime.ts

@@ -23,7 +23,7 @@ export interface Interface {
     | "synthetic"
     | "wait"
   >
-  readonly job: Pick<Job.Interface, "start" | "wait" | "block" | "background" | "cancel">
+  readonly job: Pick<Job.Interface, "get" | "start" | "wait" | "block" | "background" | "cancel">
   readonly location: {
     readonly agent: {
       readonly list: (
@@ -69,6 +69,7 @@ export const layerWithCell = (cell: Cell) =>
         wait: (sessionID) => require(cell, (runtime) => runtime.session.wait(sessionID)),
       },
       job: {
+        get: (id) => require(cell, (runtime) => runtime.job.get(id)),
         start: (input) => require(cell, (runtime) => runtime.job.start(input)),
         wait: (input) => require(cell, (runtime) => runtime.job.wait(input)),
         block: (input) => require(cell, (runtime) => runtime.job.block(input)),

packages/core/src/plugin/supervisor.ts

@@ -282,9 +282,7 @@ const layer = Layer.effect(
     })
     const updates = Stream.merge(
       config.changes().pipe(
-        Stream.filterEffect((update) =>
-          Effect.map(config.entries(), (entries) => isPluginSource(entries, update.path)),
-        ),
+        Stream.filterEffect((update) => Effect.map(config.entries(), (entries) => isPluginSource(entries, update.path))),
         Stream.merge(Stream.fromPubSub(configuredChanges)),
       ),
       bus.subscribe([Event.Updated, SdkPlugins.Updated]),
@@ -340,6 +338,7 @@ export const node = makeLocationNode({
     Form.node,
     ReadToolFileSystem.node,
     Reference.node,
+    Ripgrep.node,
     SessionInstructions.node,
     Shell.node,
     Skill.node,

packages/core/src/project.ts

@@ -44,18 +44,6 @@ export interface Resolved {
   readonly vcs?: Vcs
 }
 
-/**
- * The stated Project for hosted Locations: global identity until rediscovery
- * inside the Workspace finds a repository. Canonical "/" matches the local
- * non-VCS fallback on posix hosts, so persisting it never repoints the global
- * row at a provider path.
- */
-export const hostedGlobal = (root: string): Resolved => ({
-  id: ID.global,
-  directory: AbsolutePath.make(root),
-  canonical: AbsolutePath.make("/"),
-})
-
 // Keep this filesystem-only; permission checks use it and should not execute VCS commands.
 export const root = Effect.fn("Project.root")(function* (
   fs: FSUtil.Interface,

packages/core/src/pty/ticket.ts

@@ -1,5 +1,6 @@
 export * as PtyTicket from "./ticket"
 
+import { Workspace } from "../workspace"
 import { PtyTicket } from "@opencode-ai/schema/pty-ticket"
 import { PtyID } from "./schema"
 import { Cache, Context, Duration, Effect, Layer } from "effect"
@@ -13,6 +14,7 @@ export const ConnectToken = PtyTicket.ConnectToken
 export type Scope = {
   readonly ptyID: PtyID
   readonly directory?: string
+  readonly workspaceID?: Workspace.ID
 }
 
 export interface Interface {
@@ -23,7 +25,9 @@ export interface Interface {
 export class Service extends Context.Service<Service, Interface>()("@opencode/PtyTicket") {}
 
 function matches(record: Scope, input: Scope) {
-  return record.ptyID === input.ptyID && record.directory === input.directory
+  return (
+    record.ptyID === input.ptyID && record.directory === input.directory && record.workspaceID === input.workspaceID
+  )
 }
 
 // Tickets are inserted via Cache.set and removed atomically via invalidateWhen. The lookup is

packages/core/src/ripgrep.ts

@@ -2,13 +2,11 @@ export * as Ripgrep from "./ripgrep"
 
 import { Context, Effect, Fiber, Layer, Schema, Stream } from "effect"
 import { ChildProcess } from "effect/unstable/process"
-import type { Command } from "effect/unstable/process/ChildProcess"
 import { Entry, Match } from "@opencode-ai/schema/filesystem"
-import { makeLocationNode } from "@opencode-ai/util/effect/app-node"
+import { makeGlobalNode } from "@opencode-ai/util/effect/app-node"
 import { AppProcess, collectStream, waitForAbort } from "@opencode-ai/util/process"
 import { NonNegativeInt, PositiveInt, RelativePath } from "./schema"
 import { RipgrepBinary } from "./ripgrep/binary"
-import { WorkspaceEnvironment } from "./workspace/environment"
 
 /**
  * Small core-owned ripgrep execution adapter. It deliberately exposes raw
@@ -20,13 +18,6 @@ import { WorkspaceEnvironment } from "./workspace/environment"
 const ERROR_BYTES = 8 * 1024
 const MAX_SUBMATCHES = 100
 
-/**
- * Provider-side kill for hosted searches, since hosted process kill is not
- * implemented. Kept below FileSystem.DEFAULT_SEARCH_TIMEOUT_MS so the sandbox
- * process dies before the caller's timeout fires.
- */
-export const HOSTED_KILL_TIMEOUT_SECONDS = 29
-
 const RawMatch = Schema.Struct({
   type: Schema.Literal("match"),
   data: Schema.Struct({
@@ -99,208 +90,184 @@ const failure = (message: string, cause?: unknown) => new Error({ message, cause
 const isInvalidPattern = (stderr: string) =>
   stderr.includes("regex parse error") || stderr.includes("error parsing regex")
 
-const normalizeRelativePath = (value: string) =>
-  value
-    .replace(/^(?:\.[\\/])+/u, "")
-    .replace(/^[\\/]+/u, "")
-    .replaceAll("\\", "/")
-
-interface Backend {
-  readonly spawn: AppProcess.Interface["spawn"]
-  readonly awaitTruncated: boolean
-  readonly command: (input: {
-    readonly cwd: string
-    readonly args: string[]
-    readonly limit: number
-    readonly output: "lines" | "matches"
-  }) => Effect.Effect<Command, globalThis.Error>
-}
-
-const make = (backend: Backend) => {
-  const run = <A>(input: {
-    readonly cwd: string
-    readonly args: string[]
-    readonly limit: number
-    readonly signal?: AbortSignal
-    readonly parse: (line: string) => Effect.Effect<A | undefined, Error>
-    readonly output: "lines" | "matches"
-    readonly pattern?: string
-    readonly onItem?: (item: A) => Effect.Effect<void>
-  }) => {
-    const program = Effect.scoped(
-      Effect.gen(function* () {
-        const handle = yield* backend.spawn(yield* backend.command(input))
-        const stderrFiber = yield* collectStream(handle.stderr, ERROR_BYTES).pipe(
-          Effect.map((output) => output.buffer.toString("utf8")),
-          Effect.forkScoped,
-        )
-        let observed = 0
-        const rows = yield* Stream.decodeText(handle.stdout).pipe(
-          Stream.splitLines,
-          Stream.filter((line) => line.length > 0),
-          Stream.mapEffect(input.parse),
-          Stream.filter((row): row is A => row !== undefined),
-          Stream.tap((row) => {
-            if (!input.onItem || observed++ >= input.limit) return Effect.void
-            return input.onItem(row)
-          }),
-          Stream.take(input.limit + 1),
-          Stream.runCollect,
-          Effect.map((chunk) => [...chunk]),
-        )
-        const truncated = rows.length > input.limit
-        if (truncated) {
-          if (backend.awaitTruncated)
-            yield* Effect.all([handle.exitCode, Fiber.join(stderrFiber)], { concurrency: "unbounded" })
-          return { items: rows.slice(0, input.limit), truncated, partial: false }
-        }
-
-        const code = yield* handle.exitCode
-        const stderr = yield* Fiber.join(stderrFiber)
-        if (input.pattern && code === 2 && isInvalidPattern(stderr)) {
-          return yield* new InvalidPatternError({ pattern: input.pattern, message: stderr.trim() })
-        }
-        if (code !== 0 && code !== 1 && code !== 2) {
-          return yield* failure(stderr.trim() || `ripgrep failed with code ${code}`)
-        }
-        return { items: code === 1 ? [] : rows, truncated: false, partial: code === 2 }
-      }),
-    )
-    const abortable = input.signal ? program.pipe(Effect.raceFirst(waitForAbort(input.signal))) : program
-    return abortable.pipe(
-      Effect.mapError((cause) =>
-        cause instanceof Error || cause instanceof InvalidPatternError
-          ? cause
-          : failure("ripgrep execution failed", cause),
-      ),
-    )
-  }
-
-  return Service.of({
-    glob: (input) =>
-      run<string>({
-        cwd: input.cwd,
-        limit: input.limit,
-        signal: input.signal,
-        output: "lines",
-        args: [
-          "--no-config",
-          "--files",
-          ...(input.hidden ? ["--hidden"] : []),
-          ...(input.follow ? ["--follow"] : []),
-          `--glob=${input.pattern}`,
-          "--glob=!**/.git/**",
-          ".",
-        ],
-        parse: (line) => Effect.succeed(normalizeRelativePath(line)),
-      }).pipe(
-        Effect.map((result) =>
-          result.items.map((relative) =>
-            Entry.make({
-              path: RelativePath.make(relative),
-              type: "file",
-            }),
-          ),
-        ),
-        Effect.catchTag("Ripgrep.InvalidPatternError", (cause) => Effect.fail(failure(cause.message, cause))),
-      ),
-    find: (input) =>
-      run<Entry>({
-        cwd: input.cwd,
-        limit: input.limit,
-        signal: input.signal,
-        output: "lines",
-        args: [
-          "--no-config",
-          "--files",
-          ...(input.hidden ? ["--hidden"] : []),
-          ...(input.follow ? ["--follow"] : []),
-          ...(input.pattern === "*" ? [] : [`--glob=${input.pattern}`]),
-          ...(input.exclude ?? []).map((pattern) => `--glob=!${pattern}`),
-          "--glob=!**/.git/**",
-          ".",
-        ],
-        parse: (line) => {
-          return Effect.succeed(
-            Entry.make({
-              path: RelativePath.make(normalizeRelativePath(line)),
-              type: "file",
-            }),
-          )
-        },
-        onItem: input.onEntry,
-      }).pipe(
-        Effect.map((result) => result.items),
-        Effect.catchTag("Ripgrep.InvalidPatternError", (cause) => Effect.fail(failure(cause.message, cause))),
-      ),
-    grep: (input) =>
-      run<RawMatchData>({
-        ...input,
-        output: "matches",
-        args: [
-          "--no-config",
-          "--json",
-          "--hidden",
-          "--no-messages",
-          ...(input.include ? [`--glob=${input.include}`] : []),
-          "--glob=!**/.git/**",
-          "--",
-          input.pattern,
-          input.file ?? ".",
-        ],
-        parse: (line) =>
-          decodeJsonRecord(line).pipe(
-            Effect.mapError((cause) => failure("Invalid ripgrep JSON output", cause)),
-            Effect.flatMap((json) => {
-              if (!json || typeof json !== "object" || !("type" in json) || json.type !== "match")
-                return Effect.succeed(undefined)
-              return Schema.decodeUnknownEffect(RawMatch)(json).pipe(
-                Effect.map((match) => ({
-                  ...match.data,
-                  submatches: match.data.submatches.slice(0, MAX_SUBMATCHES),
-                })),
-                Effect.mapError((cause) => failure("Invalid ripgrep match output", cause)),
-              )
-            }),
-          ),
-      }).pipe(
-        Effect.map((result) =>
-          result.items.map((match) => {
-            return Match.make({
-              entry: Entry.make({
-                path: RelativePath.make(normalizeRelativePath(match.path.text)),
-                type: "file",
-              }),
-              line: match.line_number,
-              offset: match.absolute_offset,
-              text: match.lines.text.length > 2_000 ? match.lines.text.slice(0, 2_000) + "..." : match.lines.text,
-              submatches: match.submatches.map((submatch) => ({
-                text: submatch.match.text,
-                start: submatch.start,
-                end: submatch.end,
-              })),
-            })
-          }),
-        ),
-      ),
-  })
-}
-
 const layer = Layer.effect(
   Service,
   Effect.gen(function* () {
     const process = yield* AppProcess.Service
     const binary = yield* RipgrepBinary.Service
-    return make({
-      spawn: (command) => process.spawn(command),
-      awaitTruncated: false,
-      command: (input) =>
-        binary.filepath.pipe(
-          Effect.map((executable) =>
-            ChildProcess.make(executable, input.args, {
-              cwd: input.cwd,
-              extendEnv: true,
-              stdin: "ignore",
+
+    const run = <A>(input: {
+      readonly cwd: string
+      readonly args: string[]
+      readonly limit: number
+      readonly signal?: AbortSignal
+      readonly parse: (line: string) => Effect.Effect<A | undefined, Error>
+      readonly pattern?: string
+      readonly onItem?: (item: A) => Effect.Effect<void>
+    }) => {
+      const program = Effect.scoped(
+        Effect.gen(function* () {
+          const handle = yield* process.spawn(
+            ChildProcess.make(yield* binary.filepath, input.args, { cwd: input.cwd, extendEnv: true, stdin: "ignore" }),
+          )
+          const stderrFiber = yield* collectStream(handle.stderr, ERROR_BYTES).pipe(
+            Effect.map((output) => output.buffer.toString("utf8")),
+            Effect.forkScoped,
+          )
+          let observed = 0
+          const rows = yield* Stream.decodeText(handle.stdout).pipe(
+            Stream.splitLines,
+            Stream.filter((line) => line.length > 0),
+            Stream.mapEffect(input.parse),
+            Stream.filter((row): row is A => row !== undefined),
+            Stream.tap((row) => {
+              if (!input.onItem || observed++ >= input.limit) return Effect.void
+              return input.onItem(row)
+            }),
+            Stream.take(input.limit + 1),
+            Stream.runCollect,
+            Effect.map((chunk) => [...chunk]),
+          )
+          const truncated = rows.length > input.limit
+          if (truncated) return { items: rows.slice(0, input.limit), truncated, partial: false }
+
+          const code = yield* handle.exitCode
+          const stderr = yield* Fiber.join(stderrFiber)
+          if (input.pattern && code === 2 && isInvalidPattern(stderr)) {
+            return yield* new InvalidPatternError({ pattern: input.pattern, message: stderr.trim() })
+          }
+          if (code !== 0 && code !== 1 && code !== 2) {
+            return yield* failure(stderr.trim() || `ripgrep failed with code ${code}`)
+          }
+          return { items: code === 1 ? [] : rows, truncated: false, partial: code === 2 }
+        }),
+      )
+      const abortable = input.signal ? program.pipe(Effect.raceFirst(waitForAbort(input.signal))) : program
+      return abortable.pipe(
+        Effect.mapError((cause) =>
+          cause instanceof Error || cause instanceof InvalidPatternError
+            ? cause
+            : failure("ripgrep execution failed", cause),
+        ),
+      )
+    }
+
+    return Service.of({
+      glob: (input) =>
+        run<string>({
+          cwd: input.cwd,
+          limit: input.limit,
+          signal: input.signal,
+          args: [
+            "--no-config",
+            "--files",
+            ...(input.hidden ? ["--hidden"] : []),
+            ...(input.follow ? ["--follow"] : []),
+            `--glob=${input.pattern}`,
+            "--glob=!**/.git/**",
+            ".",
+          ],
+          parse: (line) =>
+            Effect.succeed(
+              line
+                .replace(/^(?:\.[\\/])+/u, "")
+                .replace(/^[\\/]+/u, "")
+                .replaceAll("\\", "/"),
+            ),
+        }).pipe(
+          Effect.map((result) =>
+            result.items.map((relative) =>
+              Entry.make({
+                path: RelativePath.make(relative),
+                type: "file",
+              }),
+            ),
+          ),
+          Effect.catchTag("Ripgrep.InvalidPatternError", (cause) => Effect.fail(failure(cause.message, cause))),
+        ),
+      find: (input) =>
+        run<Entry>({
+          cwd: input.cwd,
+          limit: input.limit,
+          signal: input.signal,
+          args: [
+            "--no-config",
+            "--files",
+            ...(input.hidden ? ["--hidden"] : []),
+            ...(input.follow ? ["--follow"] : []),
+            ...(input.pattern === "*" ? [] : [`--glob=${input.pattern}`]),
+            ...(input.exclude ?? []).map((pattern) => `--glob=!${pattern}`),
+            "--glob=!**/.git/**",
+            ".",
+          ],
+          parse: (line) => {
+            const relative = line
+              .replace(/^(?:\.[\\/])+/u, "")
+              .replace(/^[\\/]+/u, "")
+              .replaceAll("\\", "/")
+            return Effect.succeed(
+              Entry.make({
+                path: RelativePath.make(relative),
+                type: "file",
+              }),
+            )
+          },
+          onItem: input.onEntry,
+        }).pipe(
+          Effect.map((result) => result.items),
+          Effect.catchTag("Ripgrep.InvalidPatternError", (cause) => Effect.fail(failure(cause.message, cause))),
+        ),
+      grep: (input) =>
+        run<RawMatchData>({
+          ...input,
+          args: [
+            "--no-config",
+            "--json",
+            "--hidden",
+            "--no-messages",
+            ...(input.include ? [`--glob=${input.include}`] : []),
+            "--glob=!**/.git/**",
+            "--",
+            input.pattern,
+            input.file ?? ".",
+          ],
+          parse: (line) =>
+            decodeJsonRecord(line).pipe(
+              Effect.mapError((cause) => failure("Invalid ripgrep JSON output", cause)),
+              Effect.flatMap((json) => {
+                if (!json || typeof json !== "object" || !("type" in json) || json.type !== "match")
+                  return Effect.succeed(undefined)
+                return Schema.decodeUnknownEffect(RawMatch)(json).pipe(
+                  Effect.map((match) => ({
+                    ...match.data,
+                    path: { text: match.data.path.text.replace(/^\.[\\/]/, "") },
+                    submatches: match.data.submatches.slice(0, MAX_SUBMATCHES),
+                  })),
+                  Effect.mapError((cause) => failure("Invalid ripgrep match output", cause)),
+                )
+              }),
+            ),
+        }).pipe(
+          Effect.map((result) =>
+            result.items.map((match) => {
+              const relative = match.path.text
+                .replace(/^(?:\.[\\/])+/u, "")
+                .replace(/^[\\/]+/u, "")
+                .replaceAll("\\", "/")
+              return Match.make({
+                entry: Entry.make({
+                  path: RelativePath.make(relative),
+                  type: "file",
+                }),
+                line: match.line_number,
+                offset: match.absolute_offset,
+                text: match.lines.text.length > 2_000 ? match.lines.text.slice(0, 2_000) + "..." : match.lines.text,
+                submatches: match.submatches.map((submatch) => ({
+                  text: submatch.match.text,
+                  start: submatch.start,
+                  end: submatch.end,
+                })),
+              })
             }),
           ),
         ),
@@ -308,42 +275,4 @@ const layer = Layer.effect(
   }),
 )
 
-export const node = makeLocationNode({ service: Service, layer, deps: [RipgrepBinary.node, AppProcess.node] })
-
-export const hostedNode = makeLocationNode({
-  service: Service,
-  layer: Layer.effect(
-    Service,
-    Effect.gen(function* () {
-      const env = yield* WorkspaceEnvironment.Service
-      return make({
-        spawn: (command) => env.process.spawn(command),
-        awaitTruncated: true,
-        command: (input) =>
-          Effect.succeed(
-            ChildProcess.make(
-              env.shell.executable,
-              [
-                ...env.shell.args(
-                  input.output === "lines"
-                    ? `set -o pipefail; limit=$1; shift; timeout --signal=KILL ${HOSTED_KILL_TIMEOUT_SECONDS}s rg "$@" | head -n "$limit"`
-                    : `set -o pipefail; limit=$1; shift; timeout --signal=KILL ${HOSTED_KILL_TIMEOUT_SECONDS}s rg "$@" | awk -v limit="$limit" '{ print } /"type":"match"/ { if (++matches >= limit) exit }'`,
-                ),
-                "opencode-ripgrep",
-                String(input.limit + 1),
-                ...input.args,
-              ],
-              {
-                cwd: input.cwd,
-                env: env.shell.environmentOverrides,
-                extendEnv: false,
-                detached: env.shell.detached,
-                stdin: "ignore",
-              },
-            ),
-          ),
-      })
-    }),
-  ),
-  deps: [WorkspaceEnvironment.node],
-})
+export const node = makeGlobalNode({ service: Service, layer: layer, deps: [RipgrepBinary.node, AppProcess.node] })

packages/core/src/session.ts

@@ -5,6 +5,7 @@ import { Effect, Layer, Schema, Context, Stream, Scope } from "effect"
 import { ListAnchor } from "@opencode-ai/schema/session"
 import { and, asc, desc, eq, gt, isNotNull, isNull, like, lt, ne, or, type SQL } from "drizzle-orm"
 import { Project } from "./project"
+import { Workspace } from "./workspace"
 import { Model } from "./model"
 import { Location } from "./location"
 import { SessionMessage } from "./session/message"
@@ -26,8 +27,7 @@ import { fromRow } from "./session/info"
 import { SessionRunner } from "./session/runner/index"
 import { SessionStore } from "./session/store"
 import { SessionExecution } from "./session/execution"
-import { ForkEmptyError, MessageDecodeError, NotFoundError, WorkspaceDirectoryError } from "./session/error"
-import { Workspace } from "./workspace"
+import { ForkEmptyError, MessageDecodeError, NotFoundError } from "./session/error"
 import { makeGlobalNode } from "@opencode-ai/util/effect/app-node"
 import { LocationServiceMap } from "./location-service-map"
 import { SessionEvent } from "./session/event"
@@ -58,9 +58,12 @@ import { fileURLToPath } from "url"
 
 // - by project
 //   - by subpath
+// - by workspace (home is special)
+
 export { ListAnchor }
 
 const ListInputBase = {
+  workspaceID: Workspace.ID.pipe(Schema.optional),
   search: Schema.String.pipe(Schema.optional),
   limit: PositiveInt.pipe(Schema.optional),
   order: Schema.Literals(["asc", "desc"]).pipe(Schema.optional),
@@ -150,9 +153,7 @@ export interface Interface {
   readonly list: (input?: ListInput) => Effect.Effect<{
     readonly data: SessionSchema.Info[]
   }>
-  readonly create: (
-    input: CreateInput,
-  ) => Effect.Effect<SessionSchema.Info, NotFoundError | Workspace.NotFoundError | WorkspaceDirectoryError>
+  readonly create: (input: CreateInput) => Effect.Effect<SessionSchema.Info, NotFoundError>
   readonly fork: (
     input: ForkInput,
   ) => Effect.Effect<SessionSchema.Info, NotFoundError | MessageNotFoundError | ForkEmptyError>
@@ -198,6 +199,7 @@ export interface Interface {
   readonly move: (input: {
     sessionID: SessionSchema.ID
     directory: AbsolutePath
+    workspaceID?: Location.Ref["workspaceID"]
   }) => Effect.Effect<void, NotFoundError | DestinationNotFoundError | DestinationNotDirectoryError>
   readonly prompt: (input: {
     id?: SessionMessage.ID
@@ -233,7 +235,7 @@ export interface Interface {
     id?: Event.ID
     sessionID: SessionSchema.ID
     command: string
-  }) => Effect.Effect<void, NotFoundError | Shell.InvalidCwdError>
+  }) => Effect.Effect<void, NotFoundError>
   readonly skill: (input: {
     id?: SessionMessage.ID
     sessionID: SessionSchema.ID
@@ -278,7 +280,6 @@ const layer = Layer.effect(
     const db = database.db
     const bus = yield* Bus.Service
     const projects = yield* Project.Service
-    const workspaces = yield* Workspace.Service
     const global = yield* Global.Service
     const execution = yield* SessionExecution.Service
     const store = yield* SessionStore.Service
@@ -290,17 +291,6 @@ const layer = Layer.effect(
     const shellLocks = KeyedMutex.makeUnsafe<SessionSchema.ID>()
     const decodeMessage = Schema.decodeUnknownEffect(SessionMessage.Info)
     const isDurableSessionEvent = Schema.is(SessionEvent.Durable)
-    // Host Project discovery must not run against provider directories; hosted
-    // Sessions state the global Project until rediscovery inside the Workspace.
-    const hostedProject = Effect.fn("Session.hostedProject")(function* (
-      workspaceID: Workspace.ID,
-      directory: AbsolutePath,
-    ) {
-      const workspace = yield* workspaces.get(workspaceID)
-      if (!FSUtil.containsPosix(workspace.root, directory))
-        return yield* new WorkspaceDirectoryError({ workspaceID, directory, root: workspace.root })
-      return Project.hostedGlobal(workspace.root)
-    })
     const persistProject = (project: Project.Resolved) => {
       const vcs = project.vcs?.type
       return db
@@ -338,9 +328,7 @@ const layer = Layer.effect(
         const location = parent?.location ?? input.location
         if (location === undefined)
           return yield* Effect.die(new Error("Session.create requires either location or an existing parentID"))
-        const project = location.workspaceID
-          ? yield* hostedProject(location.workspaceID, location.directory)
-          : yield* projects.resolve(location.directory)
+        const project = yield* projects.resolve(location.directory)
         yield* persistProject(project)
         const projected = yield* bus
           .publish(
@@ -352,9 +340,7 @@ const layer = Layer.effect(
               projectID: project.id,
               parentID: input.parentID,
               location,
-              subpath: RelativePath.make(
-                FSUtil.slash(Location.paths(location).relative(project.directory, location.directory)),
-              ),
+              subpath: RelativePath.make(path.relative(project.directory, location.directory).replaceAll("\\", "/")),
               title: input.title,
               agent: input.agent,
               model: input.model
@@ -441,6 +427,7 @@ const layer = Layer.effect(
         const sortColumn = SessionTable.time_updated
         const conditions: SQL[] = []
         if ("directory" in input) conditions.push(eq(SessionTable.directory, input.directory))
+        if (input.workspaceID) conditions.push(eq(SessionTable.workspace_id, input.workspaceID))
         if ("project" in input) conditions.push(eq(SessionTable.project_id, input.project))
         if ("project" in input && input.subpath !== undefined) conditions.push(eq(SessionTable.path, input.subpath))
         if (input.search) conditions.push(like(SessionTable.title, `%${input.search}%`))
@@ -714,10 +701,10 @@ const layer = Layer.effect(
         const expanded =
           value === "~" ? global.home : value.startsWith("~/") ? path.join(global.home, value.slice(2)) : value
         const directory = AbsolutePath.make(path.resolve(current.location.directory, expanded))
-        if (current.location.directory === directory) return
         const info = yield* fs.stat(directory).pipe(Effect.catch(() => Effect.succeed(undefined)))
         if (!info) return yield* new DestinationNotFoundError({ directory })
         if (info.type !== "Directory") return yield* new DestinationNotDirectoryError({ directory })
+        if (current.location.directory === directory && current.location.workspaceID === input.workspaceID) return
         const project = yield* projects.resolve(directory)
         yield* persistProject(project)
         if ((yield* execution.active).has(input.sessionID)) {
@@ -728,9 +715,9 @@ const layer = Layer.effect(
           SessionEvent.Moved,
           {
             sessionID: input.sessionID,
-            location: Location.Ref.make({ directory }),
+            location: Location.Ref.make({ directory, workspaceID: input.workspaceID }),
             projectID: project.id,
-            subpath: RelativePath.make(FSUtil.slash(path.relative(project.directory, directory))),
+            subpath: RelativePath.make(path.relative(project.directory, directory).replaceAll("\\", "/")),
           },
           { location: current.location },
         )
@@ -1026,7 +1013,6 @@ export const node = makeGlobalNode({
     Database.node,
     Bus.node,
     Project.node,
-    Workspace.node,
     SessionExecution.node,
     SessionStore.node,
     LocationServiceMap.node,

packages/core/src/session/error.ts

@@ -2,7 +2,6 @@ export * as SessionErrors from "./error"
 
 import { Schema } from "effect"
 import { Agent } from "@opencode-ai/schema/agent"
-import { WorkspaceID } from "@opencode-ai/schema/workspace-id"
 import { SessionMessage } from "./message"
 import { SessionSchema } from "./schema"
 import { SessionError } from "@opencode-ai/schema/session-error"
@@ -19,19 +18,6 @@ export class ForkEmptyError extends Schema.TaggedErrorClass<ForkEmptyError>()("S
   }
 }
 
-export class WorkspaceDirectoryError extends Schema.TaggedErrorClass<WorkspaceDirectoryError>()(
-  "Session.WorkspaceDirectoryError",
-  {
-    workspaceID: WorkspaceID,
-    directory: Schema.String,
-    root: Schema.String,
-  },
-) {
-  override get message() {
-    return `Directory ${this.directory} is outside workspace ${this.workspaceID} root ${this.root}`
-  }
-}
-
 export class MessageDecodeError extends Schema.TaggedErrorClass<MessageDecodeError>()("Session.MessageDecodeError", {
   sessionID: SessionSchema.ID,
   messageID: SessionMessage.ID,

packages/core/src/session/projector.ts

@@ -7,16 +7,16 @@ import { Bus } from "../bus"
 import { makeGlobalNode } from "@opencode-ai/util/effect/app-node"
 import { Model } from "../model"
 import { SessionEvent } from "./event"
-
 import { SessionMessage } from "./message"
 import { SessionMessageUpdater } from "./message-updater"
 import { SessionPending } from "./pending"
+import { Workspace } from "../workspace"
 import { InstructionState } from "./instruction-state"
 import { SessionPendingTable, SessionMessageTable, SessionTable } from "./sql"
 import { Slug } from "../util/slug"
 import { Money } from "@opencode-ai/schema/money"
 import type { SessionSchema } from "./schema"
-import { Workspace } from "../workspace"
+import { WorkspaceTable } from "../control-plane/workspace.sql"
 
 type DatabaseService = Database.Interface["db"]
 type CurrentDurableEvent = Extract<SessionEvent.Event, { readonly durable: object }>
@@ -376,6 +376,13 @@ const layer = Layer.effectDiscard(
           .get()
           .pipe(Effect.orDie)
         if (!stored) return yield* Effect.die(new SessionAlreadyProjected())
+        if (!event.data.location.workspaceID) return
+        yield* db
+          .update(WorkspaceTable)
+          .set({ time_used: Date.now() })
+          .where(eq(WorkspaceTable.id, event.data.location.workspaceID))
+          .run()
+          .pipe(Effect.orDie)
       }),
     )
     yield* bus.project(SessionEvent.Moved, (event) =>
@@ -386,7 +393,7 @@ const layer = Layer.effectDiscard(
             directory: event.data.location.directory,
             path: event.data.subpath,
             ...(event.data.projectID ? { project_id: event.data.projectID } : {}),
-            workspace_id: null,
+            workspace_id: event.data.location.workspaceID ? Workspace.ID.make(event.data.location.workspaceID) : null,
             time_updated: DateTime.toEpochMillis(event.created),
           })
           .where(eq(SessionTable.id, event.data.sessionID))

packages/core/src/session/transfer.ts

@@ -1,323 +0,0 @@
-export * as SessionTransfer from "./transfer"
-
-import { SessionTransfer } from "@opencode-ai/schema/session-transfer"
-import { Tool } from "@opencode-ai/schema/tool"
-import { eq, isNotNull, isNull, ne, or } from "drizzle-orm"
-import { Context, DateTime, Effect, Layer, Schema } from "effect"
-import path from "path"
-import { makeGlobalNode } from "@opencode-ai/util/effect/app-node"
-import { App } from "../app"
-import { Bus } from "../bus"
-import { Database } from "../database/database"
-import { Location } from "../location"
-import { Project } from "../project"
-import { ProjectTable } from "../project/sql"
-import { AbsolutePath, RelativePath } from "../schema"
-import { Session } from "../session"
-import { Slug } from "../util/slug"
-import { SessionEvent } from "./event"
-import { SessionMessage } from "./message"
-import { SessionProjector } from "./projector"
-import { SessionMessageTable, SessionTable } from "./sql"
-
-export const Data = SessionTransfer.Data
-export type Data = SessionTransfer.Data
-
-export class ImportConflictError extends Schema.TaggedErrorClass<ImportConflictError>()(
-  "SessionTransfer.ImportConflictError",
-  { sessionID: Session.ID },
-) {}
-
-export interface Interface {
-  readonly export: (input: {
-    sessionID: Session.ID
-    sanitize?: boolean
-  }) => Effect.Effect<Data, Session.NotFoundError | Session.MessageDecodeError>
-  readonly import: (input: {
-    data: Data
-    location: Location.Ref
-  }) => Effect.Effect<Session.Info, ImportConflictError>
-}
-
-export class Service extends Context.Service<Service, Interface>()("@opencode/SessionTransfer") {}
-
-const layer = Layer.effect(
-  Service,
-  Effect.gen(function* () {
-    const app = yield* App.Metadata
-    const bus = yield* Bus.Service
-    const { db } = yield* Database.Service
-    const projects = yield* Project.Service
-    const sessions = yield* Session.Service
-    const encodeMessage = Schema.encodeSync(SessionMessage.Info)
-
-    const persistProject = (project: Project.Resolved) => {
-      const vcs = project.vcs?.type
-      return db
-        .insert(ProjectTable)
-        .values({ id: project.id, worktree: project.canonical, vcs, sandboxes: [] })
-        .onConflictDoUpdate({
-          target: ProjectTable.id,
-          set: { worktree: project.canonical, vcs: vcs ?? null },
-          setWhere: or(
-            ne(ProjectTable.worktree, project.canonical),
-            vcs ? or(isNull(ProjectTable.vcs), ne(ProjectTable.vcs, vcs)) : isNotNull(ProjectTable.vcs),
-          ),
-        })
-        .run()
-        .pipe(Effect.orDie)
-    }
-
-    return Service.of({
-      export: Effect.fn("SessionTransfer.export")(function* (input) {
-        const data = {
-          info: yield* sessions.get(input.sessionID),
-          messages: yield* sessions.messages({ sessionID: input.sessionID, order: "asc" }),
-        }
-        return input.sanitize ? sanitize(data) : data
-      }),
-      import: Effect.fn("SessionTransfer.import")(function* (input) {
-        const sessionID = input.data.info.id
-        const recorded = yield* db
-          .select({ id: SessionTable.id })
-          .from(SessionTable)
-          .where(eq(SessionTable.id, sessionID))
-          .get()
-          .pipe(Effect.orDie)
-        if (recorded) return yield* new ImportConflictError({ sessionID })
-        const project = yield* projects.resolve(input.location.directory)
-        yield* persistProject(project)
-        const messages = input.data.messages.map((message, index) => {
-          const encoded = encodeMessage(message)
-          const { id: _, type, ...data } = encoded
-          return {
-            id: message.id,
-            session_id: sessionID,
-            type,
-            seq: index + 1,
-            time_created: DateTime.toEpochMillis(message.time.created),
-            data,
-          }
-        })
-        yield* bus
-          .publish(
-            SessionEvent.Created,
-            {
-              sessionID,
-              slug: Slug.create(),
-              version: app.version,
-              projectID: project.id,
-              location: input.location,
-              subpath: RelativePath.make(path.relative(project.directory, input.location.directory).replaceAll("\\", "/")),
-              title: input.data.info.title,
-              agent: input.data.info.agent,
-              model: input.data.info.model,
-            },
-            {
-              location: input.location,
-              commit: (seq) =>
-                Effect.gen(function* () {
-                  if (messages.length > 0) {
-                    yield* db.insert(SessionMessageTable).values(messages).run().pipe(Effect.orDie)
-                    yield* Bus.reserveSequence(db, sessionID, seq + messages.length)
-                  }
-                  yield* db
-                    .update(SessionTable)
-                    .set({
-                      cost: input.data.info.cost,
-                      tokens_input: input.data.info.tokens.input,
-                      tokens_output: input.data.info.tokens.output,
-                      tokens_reasoning: input.data.info.tokens.reasoning,
-                      tokens_cache_read: input.data.info.tokens.cache.read,
-                      tokens_cache_write: input.data.info.tokens.cache.write,
-                      time_created: DateTime.toEpochMillis(input.data.info.time.created),
-                      time_updated: DateTime.toEpochMillis(input.data.info.time.updated),
-                      time_archived: input.data.info.time.archived
-                        ? DateTime.toEpochMillis(input.data.info.time.archived)
-                        : null,
-                    })
-                    .where(eq(SessionTable.id, sessionID))
-                    .run()
-                    .pipe(Effect.orDie)
-                }),
-            },
-          )
-          .pipe(
-            Effect.catchDefect((defect) =>
-              defect instanceof SessionProjector.SessionAlreadyProjected
-                ? Effect.fail(new ImportConflictError({ sessionID }))
-                : Effect.die(defect),
-            ),
-          )
-        return yield* sessions.get(sessionID).pipe(Effect.orDie)
-      }),
-    })
-  }),
-)
-
-export const node = makeGlobalNode({
-  service: Service,
-  layer,
-  deps: [App.node, Bus.node, Database.node, Project.node, Session.node],
-})
-
-function redact(kind: string, id: string, value: string) {
-  return value.trim() ? `[redacted:${kind}:${id}]` : value
-}
-
-function metadata(kind: string, id: string, value: Readonly<Record<string, unknown>> | undefined) {
-  if (!value) return value
-  return Object.keys(value).length > 0 ? { redacted: `${kind}:${id}` } : value
-}
-
-function sanitize(data: Data): Data {
-  return {
-    info: {
-      ...data.info,
-      title: data.info.title === undefined ? undefined : redact("session-title", data.info.id, data.info.title),
-      location: {
-        ...data.info.location,
-        directory: AbsolutePath.make(`/${redact("session-directory", data.info.id, data.info.location.directory)}`),
-      },
-      revert: data.info.revert
-        ? {
-            ...data.info.revert,
-            files: data.info.revert.files?.map((file, index) => ({
-              ...file,
-              file: redact("revert-file", String(index), file.file),
-              patch: redact("revert-patch", String(index), file.patch),
-            })),
-          }
-        : undefined,
-    },
-    messages: data.messages.map(sanitizeMessage),
-  }
-}
-
-function sanitizeMessage(message: SessionMessage.Info): SessionMessage.Info {
-  const meta = metadata("message-metadata", message.id, message.metadata)
-  if (message.type === "user")
-    return {
-      ...message,
-      metadata: meta,
-      text: redact("text", message.id, message.text),
-      files: message.files?.map((file, index) => ({
-        ...file,
-        data: "",
-        source: { type: "inline" },
-        name: file.name === undefined ? undefined : redact("file-name", String(index), file.name),
-        description:
-          file.description === undefined ? undefined : redact("file-description", String(index), file.description),
-        mention: file.mention
-          ? { ...file.mention, text: redact("file-mention", String(index), file.mention.text) }
-          : undefined,
-      })),
-      agents: message.agents?.map((agent, index) => ({
-        ...agent,
-        name: redact("agent-name", String(index), agent.name),
-        mention: agent.mention
-          ? { ...agent.mention, text: redact("agent-mention", String(index), agent.mention.text) }
-          : undefined,
-      })),
-    }
-  if (message.type === "synthetic")
-    return {
-      ...message,
-      metadata: meta,
-      text: redact("synthetic", message.id, message.text),
-      description:
-        message.description === undefined
-          ? undefined
-          : redact("synthetic-description", message.id, message.description),
-    }
-  if (message.type === "system")
-    return { ...message, metadata: meta, text: redact("system", message.id, message.text) }
-  if (message.type === "skill") return { ...message, metadata: meta, text: redact("skill", message.id, message.text) }
-  if (message.type === "shell")
-    return {
-      ...message,
-      metadata: meta,
-      command: redact("shell-command", message.id, message.command),
-      output: message.output
-        ? { ...message.output, output: redact("shell-output", message.id, message.output.output) }
-        : undefined,
-    }
-  if (message.type === "assistant")
-    return {
-      ...message,
-      metadata: meta,
-      content: message.content.map((content) => {
-        if (content.type === "text")
-          return {
-            ...content,
-            text: redact("text", message.id, content.text),
-            state: content.state ? { redacted: `text-state:${message.id}` } : undefined,
-          }
-        if (content.type === "reasoning")
-          return {
-            ...content,
-            text: redact("reasoning", message.id, content.text),
-            state: content.state ? { redacted: `reasoning-state:${message.id}` } : undefined,
-          }
-        return {
-          ...content,
-          providerState: content.providerState ? { redacted: `tool-provider-state:${message.id}` } : undefined,
-          providerResultState: content.providerResultState
-            ? { redacted: `tool-provider-result-state:${message.id}` }
-            : undefined,
-          state: sanitizeToolState(message.id, content.state),
-        }
-      }),
-    }
-  if (message.type === "compaction") {
-    if (message.status === "failed")
-      return {
-        ...message,
-        metadata: meta,
-      }
-    return {
-      ...message,
-      metadata: meta,
-      summary: redact("compaction-summary", message.id, message.summary),
-      recent: redact("compaction-recent", message.id, message.recent),
-    }
-  }
-  return { ...message, metadata: meta }
-}
-
-function sanitizeToolState(id: string, state: SessionMessage.ToolState): SessionMessage.ToolState {
-  if (state.status === "streaming") return { ...state, input: redact("tool-input", id, state.input) }
-  if (state.status === "running")
-    return { ...state, input: { redacted: `tool-input:${id}` }, metadata: { redacted: `tool-metadata:${id}` } }
-  const meta = state.metadata === undefined ? undefined : { redacted: `tool-metadata:${id}` }
-  if (state.status === "completed")
-    return {
-      ...state,
-      input: { redacted: `tool-input:${id}` },
-      content: [
-        sanitizeToolContent(id, state.content[0]),
-        ...state.content.slice(1).map((item) => sanitizeToolContent(id, item)),
-      ],
-      metadata: meta,
-    }
-  return {
-    ...state,
-    input: { redacted: `tool-input:${id}` },
-    content: state.content
-      ? [
-          sanitizeToolContent(id, state.content[0]),
-          ...state.content.slice(1).map((item) => sanitizeToolContent(id, item)),
-        ]
-      : undefined,
-    metadata: meta,
-  }
-}
-
-function sanitizeToolContent(id: string, content: Tool.Content): Tool.Content {
-  if (content.type === "text") return { ...content, text: redact("tool-output", id, content.text) }
-  return {
-    ...content,
-    uri: redact("tool-file-uri", id, content.uri),
-    name: content.name === undefined ? undefined : redact("tool-file-name", id, content.name),
-  }
-}

packages/core/src/shell.ts

@@ -6,14 +6,12 @@ import { ChildProcess } from "effect/unstable/process"
 import { produce } from "immer"
 import { Shell } from "@opencode-ai/schema/shell"
 import { makeLocationNode } from "@opencode-ai/util/effect/app-node"
-import { FSUtil } from "@opencode-ai/util/fs-util"
 import { AppProcess } from "@opencode-ai/util/process"
 import { Config } from "./config"
 import { Bus } from "./bus"
 import { Location } from "./location"
 import { Global } from "@opencode-ai/util/global"
 import { ShellSelect } from "./shell/select"
-import { WorkspaceEnvironment } from "./workspace/environment"
 import type { ShellCreateBefore } from "@opencode-ai/plugin/effect/shell"
 import { PluginHooks } from "./plugin/hooks"
 
@@ -21,18 +19,6 @@ export class NotFoundError extends Schema.TaggedErrorClass<NotFoundError>()("She
   id: Shell.ID,
 }) {}
 
-export class InvalidCwdError extends Schema.TaggedErrorClass<InvalidCwdError>()("Shell.InvalidCwdError", {
-  path: Schema.String,
-  reason: Schema.Literals(["not_found", "not_directory", "unavailable"]),
-  cause: Schema.optional(Schema.Defect()),
-}) {
-  override get message() {
-    if (this.reason === "not_found") return `Working directory does not exist: ${this.path}`
-    if (this.reason === "not_directory") return `Working directory is not a directory: ${this.path}`
-    return `Unable to inspect working directory: ${this.path}`
-  }
-}
-
 // Exited processes stay observable (status, exit code, retained output) until removed explicitly.
 // Cap retention so abandoned commands do not accumulate unbounded state and output files.
 const EXITED_LIMIT = 25
@@ -64,7 +50,7 @@ export interface Interface {
   readonly create: <E = never, R = never>(
     input: Shell.CreateInput,
     before?: (input: ShellCreateBefore) => Effect.Effect<void, E, R>,
-  ) => Effect.Effect<Shell.Info, E | InvalidCwdError, R>
+  ) => Effect.Effect<Shell.Info, E, R>
   // Currently running commands only; exited shells are retained for get/output but excluded here.
   readonly list: () => Effect.Effect<Shell.Info[]>
   readonly get: (id: Shell.ID) => Effect.Effect<Shell.Info, NotFoundError>
@@ -79,354 +65,286 @@ export interface Interface {
 
 export class Service extends Context.Service<Service, Interface>()("@opencode/Shell") {}
 
-/** The provider-facing seams; everything else in this service is host-owned bookkeeping. */
-interface Backend {
-  readonly spawn: (command: ChildProcess.Command) => ReturnType<AppProcess.Interface["spawn"]>
-  /** Shell executable; re-evaluated per command so config changes apply. */
-  readonly shell: Effect.Effect<string>
-  readonly args: (shell: string, command: string) => readonly string[]
-  /** Base environment for spawned commands. Hosted backends must not leak host process.env. */
-  readonly env: Readonly<Record<string, string | undefined>>
-  readonly detached: boolean
-  readonly validateCwd: (cwd: string) => Effect.Effect<void, InvalidCwdError>
-}
+export const layer = (options?: ShellSelect.Options) => Layer.effect(
+  Service,
+  Effect.gen(function* () {
+    const bus = yield* Bus.Service
+    const location = yield* Location.Service
+    const config = yield* Config.Service
+    const global = yield* Global.Service
+    const appProcess = yield* AppProcess.Service
+    const hooks = yield* PluginHooks.Service
+    const context = yield* Effect.context()
+    const runFork = Effect.runForkWith(context)
+    const sessions = new Map<string, Active>()
+    const exitOrder: string[] = []
 
-const layerWith = <E, R>(backend: Effect.Effect<Backend, E, R>) =>
-  Layer.effect(
-    Service,
-    Effect.gen(function* () {
-      const bus = yield* Bus.Service
-      const location = yield* Location.Service
-      const global = yield* Global.Service
-      const spawner = yield* backend
-      const hooks = yield* PluginHooks.Service
-      const context = yield* Effect.context()
-      const runFork = Effect.runForkWith(context)
-      const sessions = new Map<string, Active>()
-      const exitOrder: string[] = []
+    const outputDir = path.join(global.data, "shell", location.project.id)
+    const { mkdir, unlink } = yield* Effect.promise(() => import("fs/promises"))
+    const { createWriteStream, createReadStream } = yield* Effect.promise(() => import("fs"))
+    yield* Effect.promise(() => mkdir(outputDir, { recursive: true }))
 
-      const outputDir = path.join(global.data, "shell", location.project.id)
-      const { mkdir, unlink } = yield* Effect.promise(() => import("fs/promises"))
-      const { createWriteStream, createReadStream } = yield* Effect.promise(() => import("fs"))
-      yield* Effect.promise(() => mkdir(outputDir, { recursive: true }))
-
-      yield* Effect.addFinalizer(() =>
-        Effect.gen(function* () {
-          for (const session of sessions.values()) {
-            if (session.timeoutFiber) yield* Fiber.interrupt(session.timeoutFiber)
-            // Unblock waiters still pending at teardown; succeed is a no-op once already resolved.
-            yield* Deferred.fail(session.done, new NotFoundError({ id: Shell.ID.make(session.info.id) }))
-          }
-          sessions.clear()
-          exitOrder.length = 0
-        }),
-      )
-
-      const require = Effect.fn("Shell.require")(function* (id: Shell.ID) {
-        const session = sessions.get(id)
-        if (!session) return yield* new NotFoundError({ id })
-        return session
-      })
-
-      const removeSession = Effect.fnUntraced(function* (id: Shell.ID) {
-        const session = sessions.get(id)
-        if (!session) return
-        sessions.delete(id)
-        const index = exitOrder.indexOf(id)
-        if (index !== -1) exitOrder.splice(index, 1)
-        if (session.timeoutFiber) yield* Fiber.interrupt(session.timeoutFiber)
-        // Unblock any wait still pending when the command is removed before it terminated.
-        yield* Deferred.fail(session.done, new NotFoundError({ id }))
-        yield* Effect.promise(() => unlink(session.file).catch(() => {}))
-        yield* bus.publish(Shell.Event.Deleted, { id })
-      })
-
-      const remove = Effect.fn("Shell.remove")(function* (id: Shell.ID) {
-        yield* require(id)
-        yield* removeSession(id)
-      })
-
-      const list = Effect.fn("Shell.list")(function* () {
-        return Array.from(sessions.values())
-          .filter((session) => session.info.status === "running")
-          .map((session) => session.info)
-      })
-
-      const get = Effect.fn("Shell.get")(function* (id: Shell.ID) {
-        return (yield* require(id)).info
-      })
-
-      const wait = Effect.fn("Shell.wait")(function* (id: Shell.ID) {
-        return yield* Deferred.await((yield* require(id)).done)
-      })
-
-      const timeout = Effect.fn("Shell.timeout")(function* (id: Shell.ID, duration: number) {
-        const session = yield* require(id)
-        if (session.info.status !== "running" || !session.timeout) return session.info
-        yield* session.timeout(duration)
-        return session.info
-      })
-
-      const name = () => spawner.shell.pipe(Effect.map(ShellSelect.name))
-
-      const output = Effect.fn("Shell.output")(function* (id: Shell.ID, input?: Shell.OutputInput) {
-        const session = yield* require(id)
-        const cursor = input?.cursor ?? 0
-        const limit = input?.limit ?? 65536
-        if (cursor >= session.size) return { output: "", cursor: session.size, size: session.size, truncated: false }
-        const start = Math.max(0, cursor)
-        const length = Math.min(limit, session.size - start)
-        const buffer = Buffer.alloc(length)
-        const bytesRead = yield* Effect.promise(
-          () =>
-            new Promise<number>((resolve) => {
-              const stream = createReadStream(session.file, { start, end: start + length - 1 })
-              let offset = 0
-              stream.on("data", (chunk: string | Buffer) => {
-                const bytes = Buffer.from(chunk)
-                bytes.copy(buffer, offset)
-                offset += bytes.length
-              })
-              stream.on("end", () => resolve(offset))
-              stream.on("error", () => resolve(0))
-            }),
-        )
-        return {
-          output: buffer.subarray(0, bytesRead).toString("utf8"),
-          cursor: start + bytesRead,
-          size: session.size,
-          truncated: false,
+    yield* Effect.addFinalizer(() =>
+      Effect.gen(function* () {
+        for (const session of sessions.values()) {
+          if (session.timeoutFiber) yield* Fiber.interrupt(session.timeoutFiber)
+          // Unblock waiters still pending at teardown; succeed is a no-op once already resolved.
+          yield* Deferred.fail(session.done, new NotFoundError({ id: Shell.ID.make(session.info.id) }))
         }
-      })
-
-      const create = Effect.fn("Shell.create")(function* <E = never, R = never>(
-        input: Shell.CreateInput,
-        before?: (input: ShellCreateBefore) => Effect.Effect<void, E, R>,
-      ) {
-        const invocation: ShellCreateBefore = {
-          command: input.command,
-          cwd: input.cwd ?? location.directory,
-          timeout: input.timeout,
-          shell: yield* spawner.shell,
-          env: {
-            ...spawner.env,
-            TERM: "xterm-256color",
-            OPENCODE_TERMINAL: "1",
-          },
-        }
-        yield* hooks.trigger("shell", "create.before", invocation)
-        if (before) yield* before(invocation)
-        yield* spawner.validateCwd(invocation.cwd)
-
-        const id = Shell.ID.ascending()
-        const args = spawner.args(invocation.shell, invocation.command)
-        const file = path.join(outputDir, `${id}.out`)
-
-        const info: Info = {
-          id,
-          status: "running",
-          command: invocation.command,
-          cwd: invocation.cwd,
-          shell: invocation.shell,
-          file,
-          metadata: input.metadata ?? {},
-          time: { started: Date.now() },
-        }
-
-        // Spawn via AppProcess and stream combined output to the file. The handle is scope-bound, so
-        // the managing fiber keeps its scope open until the command terminates (it awaits `done` at the
-        // end). `create` returns once `ready` resolves with the registered session.
-        const ready = Deferred.makeUnsafe<Active>()
-        runFork(
-          Effect.scoped(
-            Effect.gen(function* () {
-              const handle = yield* spawner.spawn(
-                ChildProcess.make(invocation.shell, args, {
-                  cwd: invocation.cwd,
-                  env: invocation.env,
-                  stdin: "ignore",
-                  detached: spawner.detached,
-                  forceKillAfter: Duration.seconds(3),
-                }),
-              )
-              const session: Active = {
-                info: produce(info, (draft) => {
-                  draft.pid = handle.pid
-                }),
-                file,
-                size: 0,
-                done: Deferred.makeUnsafe<Info, NotFoundError>(),
-              }
-              sessions.set(id, session)
-
-              const stream = createWriteStream(file)
-              const outputDone = Deferred.makeUnsafe<void>()
-              const pump = handle.all.pipe(
-                Stream.runForEach((chunk: Uint8Array) =>
-                  Effect.sync(() => {
-                    stream.write(chunk)
-                    session.size += chunk.length
-                  }),
-                ),
-              )
-              runFork(
-                Effect.gen(function* () {
-                  yield* pump.pipe(Effect.catch(() => Effect.void))
-                  yield* Effect.promise(
-                    () =>
-                      new Promise<void>((resolve) => {
-                        stream.end(() => resolve())
-                      }),
-                  )
-                  yield* Deferred.succeed(outputDone, undefined)
-                }).pipe(Effect.catch(() => Deferred.succeed(outputDone, undefined))),
-              )
-              yield* Effect.promise(
-                () =>
-                  new Promise<void>((resolve) => {
-                    stream.once("open", () => resolve())
-                    stream.once("error", () => resolve())
-                  }),
-              )
-
-              const finish = (status: Info["status"], exit?: number, beforeWait = Effect.void) =>
-                Effect.gen(function* () {
-                  if (session.info.status !== "running") return
-                  session.info = produce(session.info, (draft) => {
-                    draft.status = status
-                    if (exit !== undefined) draft.exit = exit
-                    draft.time.completed = Date.now()
-                  })
-                  yield* beforeWait
-                  yield* Deferred.await(outputDone)
-                  // Resolve waiters with the terminal Info before any retention eviction, so an evicted
-                  // session still reports success rather than the removal NotFoundError. This runs before
-                  // the timeout-fiber interrupt below, which on the timeout path would otherwise cancel
-                  // this very fiber (finish is invoked by the timeout fiber) before waiters are resolved.
-                  yield* Deferred.succeed(session.done, session.info)
-                  yield* bus.publish(Shell.Event.Exited, {
-                    id,
-                    ...(exit !== undefined ? { exit } : {}),
-                    status,
-                  })
-                  exitOrder.push(id)
-                  while (exitOrder.length > EXITED_LIMIT) {
-                    const oldest = exitOrder[0]
-                    if (!oldest) break
-                    yield* removeSession(Shell.ID.make(oldest))
-                  }
-                  // Cancel a pending timeout once the command exits on its own. Interrupting last avoids
-                  // aborting finish when finish itself runs on the timeout fiber.
-                  if (session.timeoutFiber) yield* Fiber.interrupt(session.timeoutFiber)
-                })
-
-              session.timeout = (duration) =>
-                Effect.gen(function* () {
-                  if (session.timeoutFiber) yield* Fiber.interrupt(session.timeoutFiber)
-                  session.timeoutFiber = undefined
-                  if (duration === 0 || session.info.status !== "running") return
-                  session.timeoutFiber = runFork(
-                    Effect.sleep(Duration.millis(duration)).pipe(
-                      Effect.flatMap(() =>
-                        finish("timeout", undefined, handle.kill().pipe(Effect.catch(() => Effect.void))),
-                      ),
-                      Effect.catch(() => Effect.void),
-                    ),
-                  )
-                })
-
-              yield* session.timeout(invocation.timeout)
-
-              runFork(
-                handle.exitCode.pipe(
-                  Effect.flatMap((code) => finish("exited", code)),
-                  Effect.catch(() => Effect.void),
-                ),
-              )
-
-              yield* bus.publish(Shell.Event.Created, { info })
-              yield* Deferred.succeed(ready, session)
-              // Hold the handle's scope open until the command terminates; closing it earlier would
-              // release (kill) the process before its exit is observed.
-              yield* Deferred.await(session.done).pipe(Effect.catch(() => Effect.void))
-            }),
-          ).pipe(Effect.catch(() => Effect.void)),
-        )
-
-        const session = yield* Deferred.await(ready)
-        return session.info
-      })
-
-      return Service.of({ name, create, list, get, wait, timeout, output, remove })
-    }),
-  )
-
-const validateCwdWith =
-  <E>(stat: (cwd: string) => Effect.Effect<{ readonly type: string }, E>, isNotFound: (error: E) => boolean) =>
-  (cwd: string) =>
-    stat(cwd).pipe(
-      Effect.mapError(
-        (error) =>
-          new InvalidCwdError({ path: cwd, reason: isNotFound(error) ? "not_found" : "unavailable", cause: error }),
-      ),
-      Effect.flatMap((info) =>
-        info.type === "Directory"
-          ? Effect.void
-          : Effect.fail(new InvalidCwdError({ path: cwd, reason: "not_directory" })),
-      ),
+        sessions.clear()
+        exitOrder.length = 0
+      }),
     )
 
-export const layer = (options?: ShellSelect.Options) =>
-  layerWith(
-    Effect.gen(function* () {
-      const config = yield* Config.Service
-      const appProcess = yield* AppProcess.Service
-      const fs = yield* FSUtil.Service
+    const require = Effect.fn("Shell.require")(function* (id: Shell.ID) {
+      const session = sessions.get(id)
+      if (!session) return yield* new NotFoundError({ id })
+      return session
+    })
+
+    const removeSession = Effect.fnUntraced(function* (id: Shell.ID) {
+      const session = sessions.get(id)
+      if (!session) return
+      sessions.delete(id)
+      const index = exitOrder.indexOf(id)
+      if (index !== -1) exitOrder.splice(index, 1)
+      if (session.timeoutFiber) yield* Fiber.interrupt(session.timeoutFiber)
+      // Unblock any wait still pending when the command is removed before it terminated.
+      yield* Deferred.fail(session.done, new NotFoundError({ id }))
+      yield* Effect.promise(() => unlink(session.file).catch(() => {}))
+      yield* bus.publish(Shell.Event.Deleted, { id })
+    })
+
+    const remove = Effect.fn("Shell.remove")(function* (id: Shell.ID) {
+      yield* require(id)
+      yield* removeSession(id)
+    })
+
+    const list = Effect.fn("Shell.list")(function* () {
+      return Array.from(sessions.values())
+        .filter((session) => session.info.status === "running")
+        .map((session) => session.info)
+    })
+
+    const get = Effect.fn("Shell.get")(function* (id: Shell.ID) {
+      return (yield* require(id)).info
+    })
+
+    const wait = Effect.fn("Shell.wait")(function* (id: Shell.ID) {
+      return yield* Deferred.await((yield* require(id)).done)
+    })
+
+    const timeout = Effect.fn("Shell.timeout")(function* (id: Shell.ID, duration: number) {
+      const session = yield* require(id)
+      if (session.info.status !== "running" || !session.timeout) return session.info
+      yield* session.timeout(duration)
+      return session.info
+    })
+
+    const resolve = () =>
+      config
+        .entries()
+        .pipe(Effect.map((entries) => ShellSelect.preferred(Config.latest(entries, "shell"), options)))
+
+    const name = () => resolve().pipe(Effect.map(ShellSelect.name))
+
+    const output = Effect.fn("Shell.output")(function* (id: Shell.ID, input?: Shell.OutputInput) {
+      const session = yield* require(id)
+      const cursor = input?.cursor ?? 0
+      const limit = input?.limit ?? 65536
+      if (cursor >= session.size) return { output: "", cursor: session.size, size: session.size, truncated: false }
+      const start = Math.max(0, cursor)
+      const length = Math.min(limit, session.size - start)
+      const buffer = Buffer.alloc(length)
+      const bytesRead = yield* Effect.promise(
+        () =>
+          new Promise<number>((resolve) => {
+            const stream = createReadStream(session.file, { start, end: start + length - 1 })
+            let offset = 0
+            stream.on("data", (chunk: string | Buffer) => {
+              const bytes = Buffer.from(chunk)
+              bytes.copy(buffer, offset)
+              offset += bytes.length
+            })
+            stream.on("end", () => resolve(offset))
+            stream.on("error", () => resolve(0))
+          }),
+      )
       return {
-        spawn: (command) => appProcess.spawn(command),
-        shell: config
-          .entries()
-          .pipe(Effect.map((entries) => ShellSelect.preferred(Config.latest(entries, "shell"), options))),
-        args: ShellSelect.args,
-        env: process.env,
-        detached: process.platform !== "win32",
-        validateCwd: validateCwdWith(
-          (cwd) => fs.stat(cwd),
-          (error) => error.reason._tag === "NotFound",
-        ),
-      } satisfies Backend
-    }),
-  )
+        output: buffer.subarray(0, bytesRead).toString("utf8"),
+        cursor: start + bytesRead,
+        size: session.size,
+        truncated: false,
+      }
+    })
+
+    const create = Effect.fn("Shell.create")(function* <E = never, R = never>(
+      input: Shell.CreateInput,
+      before?: (input: ShellCreateBefore) => Effect.Effect<void, E, R>,
+    ) {
+      const invocation: ShellCreateBefore = {
+        command: input.command,
+        cwd: input.cwd ?? location.directory,
+        timeout: input.timeout,
+        shell: yield* resolve(),
+        env: {
+          ...process.env,
+          TERM: "xterm-256color",
+          OPENCODE_TERMINAL: "1",
+        },
+      }
+      yield* hooks.trigger("shell", "create.before", invocation)
+      if (before) yield* before(invocation)
+
+      const id = Shell.ID.ascending()
+      const args = ShellSelect.args(invocation.shell, invocation.command)
+      const file = path.join(outputDir, `${id}.out`)
+
+      const info: Info = {
+        id,
+        status: "running",
+        command: invocation.command,
+        cwd: invocation.cwd,
+        shell: invocation.shell,
+        file,
+        metadata: input.metadata ?? {},
+        time: { started: Date.now() },
+      }
+
+      // Spawn via AppProcess and stream combined output to the file. The handle is scope-bound, so
+      // the managing fiber keeps its scope open until the command terminates (it awaits `done` at the
+      // end). `create` returns once `ready` resolves with the registered session.
+      const ready = Deferred.makeUnsafe<Active>()
+      runFork(
+        Effect.scoped(
+          Effect.gen(function* () {
+            const handle = yield* appProcess.spawn(
+              ChildProcess.make(invocation.shell, args, {
+                cwd: invocation.cwd,
+                env: invocation.env,
+                stdin: "ignore",
+                detached: process.platform !== "win32",
+                forceKillAfter: Duration.seconds(3),
+              }),
+            )
+            const session: Active = {
+              info: produce(info, (draft) => {
+                draft.pid = handle.pid
+              }),
+              file,
+              size: 0,
+              done: Deferred.makeUnsafe<Info, NotFoundError>(),
+            }
+            sessions.set(id, session)
+
+            const stream = createWriteStream(file)
+            const outputDone = Deferred.makeUnsafe<void>()
+            const pump = handle.all.pipe(
+              Stream.runForEach((chunk: Uint8Array) =>
+                Effect.sync(() => {
+                  stream.write(chunk)
+                  session.size += chunk.length
+                }),
+              ),
+            )
+            runFork(
+              Effect.gen(function* () {
+                yield* pump.pipe(Effect.catch(() => Effect.void))
+                yield* Effect.promise(
+                  () =>
+                    new Promise<void>((resolve) => {
+                      stream.end(() => resolve())
+                    }),
+                )
+                yield* Deferred.succeed(outputDone, undefined)
+              }).pipe(Effect.catch(() => Deferred.succeed(outputDone, undefined))),
+            )
+            yield* Effect.promise(
+              () =>
+                new Promise<void>((resolve) => {
+                  stream.once("open", () => resolve())
+                  stream.once("error", () => resolve())
+                }),
+            )
+
+            const finish = (status: Info["status"], exit?: number, beforeWait = Effect.void) =>
+              Effect.gen(function* () {
+                if (session.info.status !== "running") return
+                session.info = produce(session.info, (draft) => {
+                  draft.status = status
+                  if (exit !== undefined) draft.exit = exit
+                  draft.time.completed = Date.now()
+                })
+                yield* beforeWait
+                yield* Deferred.await(outputDone)
+                // Resolve waiters with the terminal Info before any retention eviction, so an evicted
+                // session still reports success rather than the removal NotFoundError. This runs before
+                // the timeout-fiber interrupt below, which on the timeout path would otherwise cancel
+                // this very fiber (finish is invoked by the timeout fiber) before waiters are resolved.
+                yield* Deferred.succeed(session.done, session.info)
+                yield* bus.publish(Shell.Event.Exited, {
+                  id,
+                  ...(exit !== undefined ? { exit } : {}),
+                  status,
+                })
+                exitOrder.push(id)
+                while (exitOrder.length > EXITED_LIMIT) {
+                  const oldest = exitOrder[0]
+                  if (!oldest) break
+                  yield* removeSession(Shell.ID.make(oldest))
+                }
+                // Cancel a pending timeout once the command exits on its own. Interrupting last avoids
+                // aborting finish when finish itself runs on the timeout fiber.
+                if (session.timeoutFiber) yield* Fiber.interrupt(session.timeoutFiber)
+              })
+
+            session.timeout = (duration) =>
+              Effect.gen(function* () {
+                if (session.timeoutFiber) yield* Fiber.interrupt(session.timeoutFiber)
+                session.timeoutFiber = undefined
+                if (duration === 0 || session.info.status !== "running") return
+                session.timeoutFiber = runFork(
+                  Effect.sleep(Duration.millis(duration)).pipe(
+                    Effect.flatMap(() =>
+                      finish("timeout", undefined, handle.kill().pipe(Effect.catch(() => Effect.void))),
+                    ),
+                    Effect.catch(() => Effect.void),
+                  ),
+                )
+              })
+
+            yield* session.timeout(invocation.timeout)
+
+            runFork(
+              handle.exitCode.pipe(
+                Effect.flatMap((code) => finish("exited", code)),
+                Effect.catch(() => Effect.void),
+              ),
+            )
+
+            yield* bus.publish(Shell.Event.Created, { info })
+            yield* Deferred.succeed(ready, session)
+            // Hold the handle's scope open until the command terminates; closing it earlier would
+            // release (kill) the process before its exit is observed.
+            yield* Deferred.await(session.done).pipe(Effect.catch(() => Effect.void))
+          }),
+        ).pipe(Effect.catch(() => Effect.void)),
+      )
+
+      const session = yield* Deferred.await(ready)
+      return session.info
+    })
+
+    return Service.of({ name, create, list, get, wait, timeout, output, remove })
+  }),
+)
 
 export function configured(options?: ShellSelect.Options) {
   return makeLocationNode({
     service: Service,
     layer: layer(options),
-    deps: [Bus.node, Location.node, Config.node, Global.node, AppProcess.node, FSUtil.node, PluginHooks.node],
+    deps: [Bus.node, Location.node, Config.node, Global.node, AppProcess.node, PluginHooks.node],
   })
 }
 
 export const node = configured()
-
-// Commands run inside the workspace: provider spawner, image shell lowering,
-// and no host process.env leakage. Output capture files remain host-owned.
-export const hostedNode = makeLocationNode({
-  service: Service,
-  layer: layerWith(
-    Effect.gen(function* () {
-      const env = yield* WorkspaceEnvironment.Service
-      return {
-        spawn: (command) => env.process.spawn(command),
-        shell: Effect.succeed(env.shell.executable),
-        args: (_shell, command) => env.shell.args(command),
-        env: env.shell.environmentOverrides,
-        detached: env.shell.detached,
-        validateCwd: validateCwdWith(
-          (cwd) => env.files.stat(cwd),
-          (error) => error._tag === "WorkspaceEnvironment.NotFoundError",
-        ),
-      } satisfies Backend
-    }),
-  ),
-  deps: [Bus.node, Location.node, Global.node, WorkspaceEnvironment.node, PluginHooks.node],
-})

packages/core/src/tool/plugin/edit.ts

@@ -12,6 +12,8 @@ import { FileDiff } from "@opencode-ai/schema/file-diff"
 import { Bom } from "@opencode-ai/util/bom"
 import { Effect, Schema } from "effect"
 import { FileMutation } from "../../file-mutation"
+import { Formatter } from "../../formatter"
+import { FSUtil } from "@opencode-ai/util/fs-util"
 import { LocationMutation } from "../../location-mutation"
 import { Permission } from "../../permission"
 import { fileDiff } from "./file-diff"
@@ -108,113 +110,130 @@ export const Plugin = {
   effect: Effect.fn("EditTool.Plugin")(function* (ctx: PluginContext) {
     const mutation = yield* LocationMutation.Service
     const files = yield* FileMutation.Service
+    const formatter = yield* Formatter.Service
+    const fs = yield* FSUtil.Service
     const permission = yield* Permission.Service
 
     yield* ctx.tool
       .transform((draft) =>
-        draft.add({
-          name,
-          options: { codemode: false, permission: "edit" },
-          description:
-            "Edit the contents of a file by finding and replacing exact text. When editing text from Read output, preserve the exact indentation (tabs or spaces) and omit the line-number prefix, such as `1: `. Never include the prefix in oldString or newString. The edit fails if oldString is not found. By default, oldString must identify a UNIQUE location. Multiple matches FAIL unless replaceAll is true. Add more surrounding context to disambiguate, or set replaceAll to true to replace every occurrence. Use replaceAll when the change should apply to every occurrence, such as renaming a variable.",
-          input: Input,
-          output: Output,
-          execute: (input, context) => {
-            return Effect.gen(function* () {
-              const permissionSource = {
-                type: "tool" as const,
-                messageID: context.messageID,
-                id: context.id,
-              }
-              if (input.oldString === input.newString) {
-                return yield* new ToolFailure({
-                  message: "No changes to apply: oldString and newString are identical.",
-                })
-              }
-              if (input.oldString === "") {
-                return yield* new ToolFailure({
-                  message: "oldString must not be empty. Use write to create or overwrite a file.",
-                })
-              }
+        draft.add(
+          ({
+              name,
+              options: { codemode: false, permission: "edit" },
+              description:
+                "Edit the contents of a file by finding and replacing exact text. When editing text from Read output, preserve the exact indentation (tabs or spaces) and omit the line-number prefix, such as `1: `. Never include the prefix in oldString or newString. The edit fails if oldString is not found. By default, oldString must identify a UNIQUE location. Multiple matches FAIL unless replaceAll is true. Add more surrounding context to disambiguate, or set replaceAll to true to replace every occurrence. Use replaceAll when the change should apply to every occurrence, such as renaming a variable.",
+              input: Input,
+              output: Output,
+              execute: (input, context) => {
+                return Effect.gen(function* () {
+                  const permissionSource = {
+                    type: "tool" as const,
+                    messageID: context.messageID,
+                    id: context.id,
+                  }
+                  if (input.oldString === input.newString) {
+                    return yield* new ToolFailure({
+                      message: "No changes to apply: oldString and newString are identical.",
+                    })
+                  }
+                  if (input.oldString === "") {
+                    return yield* new ToolFailure({
+                      message: "oldString must not be empty. Use write to create or overwrite a file.",
+                    })
+                  }
 
-              const target = yield* mutation.resolve({ path: input.path, kind: "file" })
-              const external = target.externalDirectory
-              if (external) {
-                yield* permission.assert({
-                  ...LocationMutation.externalDirectoryPermission(external),
-                  sessionID: context.sessionID,
-                  agent: context.agent,
-                  source: permissionSource,
-                })
-              }
+                  const target = yield* mutation.resolve({ path: input.path, kind: "file" })
+                  const external = target.externalDirectory
+                  if (external) {
+                    yield* permission.assert({
+                      ...LocationMutation.externalDirectoryPermission(external),
+                      sessionID: context.sessionID,
+                      agent: context.agent,
+                      source: permissionSource,
+                    })
+                  }
 
-              const source = yield* files.read(target).pipe(
-                Effect.catchTag("FileMutation.NotFoundError", () =>
-                  Effect.fail(new ToolFailure({ message: `File not found: ${input.path}` })),
-                ),
-                Effect.catchTag("FileMutation.NotAFileError", () =>
-                  Effect.fail(new ToolFailure({ message: `Path is a directory, not a file: ${input.path}` })),
-                ),
-              )
-              const ending = source.includes(crlf) ? crlf : "\n"
-              const oldString = input.oldString.replaceAll(crlf, "\n").replaceAll("\n", ending)
-              const newString = input.newString.replaceAll(crlf, "\n").replaceAll("\n", ending)
-              const exact = findOccurrences(source, oldString)
-              // These one-to-one mappings preserve offsets into the original source.
-              const unicode =
-                exact.length > 0 ? [] : findOccurrences(normalizeForMatch(source), normalizeForMatch(oldString))
-              const trailing = exact.length > 0 || unicode.length > 0 ? [] : findLineOccurrences(source, oldString)
-              const matches = exact.length > 0 ? exact : unicode.length > 0 ? unicode : trailing
-              const replacements = matches.length
-              const replaced = (input.replaceAll === true ? matches : matches.slice(0, 1))
-                .toReversed()
-                .reduce(
-                  (content, match) => `${content.slice(0, match.start)}${newString}${content.slice(match.end)}`,
-                  source,
+                  const info = yield* fs.stat(target.canonical).pipe(
+                    Effect.catchReason("PlatformError", "NotFound", () =>
+                      Effect.fail(new ToolFailure({ message: `File not found: ${input.path}` })),
+                    ),
+                  )
+                  if (info.type === "Directory") {
+                    return yield* new ToolFailure({ message: `Path is a directory, not a file: ${input.path}` })
+                  }
+                  const original = yield* Bom.readFile(fs, target.canonical)
+                  const source = original.text
+                  const ending = source.includes(crlf) ? crlf : "\n"
+                  const oldString = input.oldString.replaceAll(crlf, "\n").replaceAll("\n", ending)
+                  const newString = input.newString.replaceAll(crlf, "\n").replaceAll("\n", ending)
+                  const exact = findOccurrences(source, oldString)
+                  // These one-to-one mappings preserve offsets into the original source.
+                  const unicode =
+                    exact.length > 0 ? [] : findOccurrences(normalizeForMatch(source), normalizeForMatch(oldString))
+                  const trailing =
+                    exact.length > 0 || unicode.length > 0
+                      ? []
+                      : findLineOccurrences(source, oldString)
+                  const matches = exact.length > 0 ? exact : unicode.length > 0 ? unicode : trailing
+                  const replacements = matches.length
+                  const replaced = (input.replaceAll === true ? matches : matches.slice(0, 1))
+                    .toReversed()
+                    .reduce(
+                      (content, match) =>
+                        `${content.slice(0, match.start)}${newString}${content.slice(match.end)}`,
+                      source,
+                    )
+                  const preview =
+                    replacements > 0 && (replacements === 1 || input.replaceAll === true)
+                      ? fileDiff(target.resource, source, replaced)
+                      : undefined
+                  yield* permission.assert({
+                    action: "edit",
+                    resources: [target.resource],
+                    save: ["*"],
+                    metadata: preview ? { files: [preview] } : undefined,
+                    sessionID: context.sessionID,
+                    agent: context.agent,
+                    source: permissionSource,
+                  })
+                  if (replacements === 0) {
+                    return yield* new ToolFailure({
+                      message: `Could not find oldString in ${input.path}. It must match exactly, including whitespace and indentation.`,
+                    })
+                  }
+                  if (replacements > 1 && input.replaceAll !== true) {
+                    return yield* new ToolFailure({
+                      message: `Found ${replacements} matches for oldString, but expected exactly one. Add more surrounding context to make oldString unique, or set replaceAll to true to replace every occurrence.`,
+                    })
+                  }
+                  const replacementBom = replaced.startsWith("\uFEFF")
+                  const result = yield* files.write({
+                    target,
+                    content: Bom.join(replaced, original.bom || replacementBom),
+                  })
+                  const bom = original.bom || replacementBom
+                  const formatted = (yield* formatter.file(target.canonical))
+                    ? yield* Bom.syncFile(fs, target.canonical, bom)
+                    : (yield* Bom.readFile(fs, target.canonical)).text
+                  return {
+                    files: [fileDiff(result.resource, source, formatted)],
+                    replacements,
+                  } satisfies Output
+                }).pipe(
+                  Effect.map((output) => ({
+                    output,
+                    content: `Edited ${output.files[0]?.file} (${output.replacements} replacement${output.replacements === 1 ? "" : "s"})`,
+                    metadata: { files: output.files },
+                  })),
+                  Effect.mapError((error) =>
+                    error instanceof ToolFailure
+                      ? error
+                      : new ToolFailure({ message: `Unable to edit ${input.path}`, error }),
+                  ),
                 )
-              const content = FileMutation.normalizeText(replaced)
-              const preview =
-                replacements > 0 && (replacements === 1 || input.replaceAll === true)
-                  ? fileDiff(target.resource, source, content)
-                  : undefined
-              yield* permission.assert({
-                action: "edit",
-                resources: [target.resource],
-                save: ["*"],
-                metadata: preview ? { files: [preview] } : undefined,
-                sessionID: context.sessionID,
-                agent: context.agent,
-                source: permissionSource,
-              })
-              if (replacements === 0) {
-                return yield* new ToolFailure({
-                  message: `Could not find oldString in ${input.path}. It must match exactly, including whitespace and indentation.`,
-                })
-              }
-              if (replacements > 1 && input.replaceAll !== true) {
-                return yield* new ToolFailure({
-                  message: `Found ${replacements} matches for oldString, but expected exactly one. Add more surrounding context to make oldString unique, or set replaceAll to true to replace every occurrence.`,
-                })
-              }
-              const result = yield* files.write({ target, content: replaced })
-              return {
-                files: [fileDiff(result.resource, source, result.content)],
-                replacements,
-              } satisfies Output
-            }).pipe(
-              Effect.map((output) => ({
-                output,
-                content: `Edited ${output.files[0]?.file} (${output.replacements} replacement${output.replacements === 1 ? "" : "s"})`,
-                metadata: { files: output.files },
-              })),
-              Effect.mapError((error) =>
-                error instanceof ToolFailure
-                  ? error
-                  : new ToolFailure({ message: `Unable to edit ${input.path}`, error }),
-              ),
-            )
-          },
-        }),
+              },
+            }),
+        ),
       )
       .pipe(Effect.orDie)
   }),

packages/core/src/tool/plugin/glob.ts

@@ -5,8 +5,10 @@ import type { Context as PluginContext } from "@opencode-ai/plugin/effect/plugin
 import { Effect, Schema } from "effect"
 import path from "path"
 import { FileSystem } from "../../filesystem"
+import { FSUtil } from "@opencode-ai/util/fs-util"
 import { Location } from "../../location"
 import { LocationMutation } from "../../location-mutation"
+import { Ripgrep } from "../../ripgrep"
 import { RelativePath } from "../../schema"
 import { Permission } from "../../permission"
 
@@ -40,83 +42,104 @@ export const toModelContent = (entries: EncodedOutput, truncated = false) => {
 export const Plugin = {
   id: "opencode.tool.glob",
   effect: Effect.fn("GlobTool.Plugin")(function* (ctx: PluginContext) {
-    const filesystem = yield* FileSystem.Service
+    const fs = yield* FSUtil.Service
+    const ripgrep = yield* Ripgrep.Service
     const location = yield* Location.Service
-    const resolve = Location.paths(location).resolve
     const mutation = yield* LocationMutation.Service
     const permission = yield* Permission.Service
 
     yield* ctx.tool
       .transform((draft) =>
-        draft.add({
-          name,
-          options: { codemode: false },
-          description: 'Search file paths using a glob pattern (examples: "**/*.ts", "src/**/*.tsx").',
-          input: Input,
-          output: Output,
-          execute: (input, context) =>
-            Effect.gen(function* () {
-              const searchPath = input.path === "undefined" || input.path === "null" ? undefined : input.path
-              const source = { type: "tool" as const, messageID: context.messageID, id: context.id }
-              const target = yield* mutation.resolve({ path: searchPath ?? ".", kind: "directory" })
-              const external = target.externalDirectory
-              if (external)
+        draft.add(
+          ({
+            name,
+            options: { codemode: false },
+            description:
+              'Search file paths using a glob pattern (examples: "**/*.ts", "src/**/*.tsx").',
+            input: Input,
+            output: Output,
+            execute: (input, context) =>
+              Effect.gen(function* () {
+                const searchPath = input.path === "undefined" || input.path === "null" ? undefined : input.path
+                const source = { type: "tool" as const, messageID: context.messageID, id: context.id }
+                const target = yield* mutation.resolve({ path: searchPath ?? ".", kind: "directory" })
+                const external = target.externalDirectory
+                if (external)
+                  yield* permission.assert({
+                    ...LocationMutation.externalDirectoryPermission(external),
+                    sessionID: context.sessionID,
+                    agent: context.agent,
+                    source,
+                  })
                 yield* permission.assert({
-                  ...LocationMutation.externalDirectoryPermission(external),
+                  action: name,
+                  resources: [input.pattern],
+                  save: ["*"],
+                  metadata: {
+                    root: searchPath ?? ".",
+                    path: searchPath,
+                    limit: input.limit,
+                  },
                   sessionID: context.sessionID,
                   agent: context.agent,
                   source,
                 })
-              yield* permission.assert({
-                action: name,
-                resources: [input.pattern],
-                save: ["*"],
-                metadata: {
-                  root: searchPath ?? ".",
-                  path: searchPath,
-                  limit: input.limit,
-                },
-                sessionID: context.sessionID,
-                agent: context.agent,
-                source,
-              })
-              const limit = input.limit ?? FileSystem.DEFAULT_SEARCH_LIMIT
-              const entries = yield* filesystem
-                .glob({
-                  target,
-                  pattern: input.pattern,
-                  limit: limit + 1,
-                })
-                .pipe(
-                  FileSystem.searchTimeout((message) => new ToolFailure({ message })),
-                  Effect.catchTag("FileSystem.SearchPathError", (error) =>
-                    Effect.fail(
-                      new ToolFailure({
-                        message:
-                          error.reason === "not_found"
-                            ? `Search path does not exist: ${searchPath ?? "."}`
-                            : `Search path is not a directory: ${searchPath ?? "."}`,
-                      }),
+                const info = yield* fs
+                  .stat(target.canonical)
+                  .pipe(
+                    Effect.catchReason("PlatformError", "NotFound", () =>
+                      Effect.fail(new ToolFailure({ message: `Search path does not exist: ${searchPath ?? "."}` })),
                     ),
+                  )
+                if (info.type !== "Directory")
+                  return yield* Effect.fail(
+                    new ToolFailure({ message: `Search path is not a directory: ${searchPath ?? "."}` }),
+                  )
+                const root = path.resolve(location.directory, searchPath ?? ".")
+                const limit = input.limit ?? FileSystem.DEFAULT_SEARCH_LIMIT
+                const entries = yield* ripgrep
+                  .glob({
+                    cwd: target.canonical,
+                    pattern: input.pattern,
+                    limit: limit + 1,
+                  })
+                  .pipe(
+                    Effect.timeoutOrElse({
+                      duration: FileSystem.DEFAULT_SEARCH_TIMEOUT_MS,
+                      orElse: () =>
+                        Effect.fail(
+                          new ToolFailure({
+                            message: `Search timed out after ${FileSystem.DEFAULT_SEARCH_TIMEOUT_MS / 1_000} seconds. Consider using a more specific path or pattern.`,
+                          }),
+                        ),
+                    }),
+                    Effect.map((result) =>
+                      result.map((entry) =>
+                        FileSystem.Entry.make({
+                          ...entry,
+                          path: RelativePath.make(path.relative(location.directory, path.resolve(root, entry.path))),
+                        }),
+                      ),
+                    ),
+                  )
+                return { entries: entries.slice(0, limit), truncated: entries.length > limit }
+              }).pipe(
+                Effect.map((result) => ({
+                  output: result.entries,
+                  content: toModelContent(
+                    result.entries.map((entry) => ({ ...entry, path: path.resolve(location.directory, entry.path) })),
+                    result.truncated,
                   ),
-                )
-              return { entries: entries.slice(0, limit), truncated: entries.length > limit }
-            }).pipe(
-              Effect.map((result) => ({
-                output: result.entries,
-                content: toModelContent(
-                  result.entries.map((entry) => ({ ...entry, path: resolve(location.directory, entry.path) })),
-                  result.truncated,
+                  metadata: { count: result.entries.length, truncated: result.truncated },
+                })),
+                Effect.mapError((error) =>
+                  error instanceof ToolFailure
+                    ? error
+                    : new ToolFailure({ message: `Unable to find files matching ${input.pattern}`, error }),
                 ),
-                metadata: { count: result.entries.length, truncated: result.truncated },
-              })),
-              Effect.mapError((error) =>
-                error instanceof ToolFailure
-                  ? error
-                  : new ToolFailure({ message: `Unable to find files matching ${input.pattern}`, error }),
               ),
-            ),
-        }),
+          }),
+        ),
       )
       .pipe(Effect.orDie)
   }),

packages/core/src/tool/plugin/grep.ts

@@ -5,19 +5,21 @@ import { ToolFailure } from "@opencode-ai/ai"
 import { Effect, Schema } from "effect"
 import path from "path"
 import { FileSystem } from "../../filesystem"
+import { FSUtil } from "@opencode-ai/util/fs-util"
 import { Location } from "../../location"
 import { LocationMutation } from "../../location-mutation"
 import { Permission } from "../../permission"
+import { Ripgrep } from "../../ripgrep"
 import { RelativePath } from "../../schema"
 
 export const name = "grep"
 
 export const Input = Schema.Struct({
-  pattern: FileSystem.GrepInput.fields.pattern
-    .check(Schema.isMinLength(1, { message: "Pattern must not be empty" }))
-    .annotate({
-      description: "Regular expression to search for in file contents (ripgrep syntax)",
-    }),
+  pattern: FileSystem.GrepInput.fields.pattern.check(
+    Schema.isMinLength(1, { message: "Pattern must not be empty" }),
+  ).annotate({
+    description: "Regular expression to search for in file contents (ripgrep syntax)",
+  }),
   path: Schema.optionalKey(RelativePath).annotate({
     description: "File or directory to search. Defaults to the current working directory.",
   }),
@@ -56,82 +58,112 @@ export const toModelContent = (matches: EncodedOutput, truncated = false) => {
 export const Plugin = {
   id: "opencode.tool.grep",
   effect: Effect.fn("GrepTool.Plugin")(function* (ctx: PluginContext) {
-    const filesystem = yield* FileSystem.Service
+    const fs = yield* FSUtil.Service
+    const ripgrep = yield* Ripgrep.Service
     const location = yield* Location.Service
-    const resolve = Location.paths(location).resolve
     const mutation = yield* LocationMutation.Service
     const permission = yield* Permission.Service
 
     yield* ctx.tool
       .transform((draft) =>
-        draft.add({
-          name,
-          options: { codemode: false },
-          description:
-            "Search file contents using regular expressions. Use it to locate specific code, symbols, or text patterns, and narrow searches with `path` or `include`. Returns matching file paths, line numbers, and line previews.",
-          input: Input,
-          output: Output,
-          execute: (input, context) =>
-            Effect.gen(function* () {
-              const source = { type: "tool" as const, messageID: context.messageID, id: context.id }
-              const target = yield* mutation.resolve({ path: input.path ?? "." })
-              if (target.externalDirectory)
+        draft.add(
+          ({
+            name,
+            options: { codemode: false },
+            description:
+              "Search file contents using regular expressions. Use it to locate specific code, symbols, or text patterns, and narrow searches with `path` or `include`. Returns matching file paths, line numbers, and line previews.",
+            input: Input,
+            output: Output,
+            execute: (input, context) =>
+              Effect.gen(function* () {
+                const source = { type: "tool" as const, messageID: context.messageID, id: context.id }
+                const target = yield* mutation.resolve({ path: input.path ?? "." })
+                if (target.externalDirectory)
+                  yield* permission.assert({
+                    ...LocationMutation.externalDirectoryPermission(target.externalDirectory),
+                    sessionID: context.sessionID,
+                    agent: context.agent,
+                    source,
+                  })
                 yield* permission.assert({
-                  ...LocationMutation.externalDirectoryPermission(target.externalDirectory),
+                  action: name,
+                  resources: [input.pattern],
+                  save: ["*"],
+                  metadata: {
+                    root: ".",
+                    path: input.path,
+                    include: input.include,
+                    limit: input.limit,
+                  },
                   sessionID: context.sessionID,
                   agent: context.agent,
                   source,
                 })
-              yield* permission.assert({
-                action: name,
-                resources: [input.pattern],
-                save: ["*"],
-                metadata: {
-                  root: ".",
-                  path: input.path,
-                  include: input.include,
-                  limit: input.limit,
-                },
-                sessionID: context.sessionID,
-                agent: context.agent,
-                source,
-              })
-              const limit = input.limit ?? FileSystem.DEFAULT_SEARCH_LIMIT
-              const matches = yield* filesystem
-                .grep({
-                  target,
-                  pattern: input.pattern,
-                  include: input.include,
-                  limit: limit + 1,
-                })
-                .pipe(
-                  FileSystem.searchTimeout((message) => new ToolFailure({ message })),
-                  Effect.catchTag("FileSystem.SearchPathError", () =>
-                    Effect.fail(new ToolFailure({ message: `Search path does not exist: ${input.path ?? "."}` })),
+                const root = path.resolve(location.directory, input.path ?? ".")
+                const info = yield* fs
+                  .stat(root)
+                  .pipe(
+                    Effect.catchReason("PlatformError", "NotFound", () =>
+                      Effect.fail(new ToolFailure({ message: `Search path does not exist: ${input.path ?? "."}` })),
+                    ),
+                  )
+                const cwd = info?.type === "Directory" ? root : path.dirname(root)
+                const limit = input.limit ?? FileSystem.DEFAULT_SEARCH_LIMIT
+                const matches = yield* ripgrep
+                  .grep({
+                    cwd,
+                    pattern: input.pattern,
+                    file: info?.type === "File" ? path.basename(root) : undefined,
+                    include: input.include,
+                    limit: limit + 1,
+                  })
+                  .pipe(
+                    Effect.timeoutOrElse({
+                      duration: FileSystem.DEFAULT_SEARCH_TIMEOUT_MS,
+                      orElse: () =>
+                        Effect.fail(
+                          new ToolFailure({
+                            message: `Search timed out after ${FileSystem.DEFAULT_SEARCH_TIMEOUT_MS / 1_000} seconds. Consider using a more specific path or pattern.`,
+                          }),
+                        ),
+                    }),
+                    Effect.map((result) =>
+                      result.map((match) =>
+                        FileSystem.Match.make({
+                          ...match,
+                          entry: FileSystem.Entry.make({
+                            ...match.entry,
+                            path: RelativePath.make(
+                              path.relative(location.directory, path.resolve(cwd, match.entry.path)),
+                            ),
+                          }),
+                        }),
+                      ),
+                    ),
+                  )
+                return { matches: matches.slice(0, limit), truncated: matches.length > limit }
+              }).pipe(
+                Effect.map((result) => ({
+                  output: result.matches,
+                  content: toModelContent(
+                    result.matches.map((match) => ({
+                      ...match,
+                      entry: { ...match.entry, path: path.resolve(location.directory, match.entry.path) },
+                    })),
+                    result.truncated,
                   ),
-                )
-              return { matches: matches.slice(0, limit), truncated: matches.length > limit }
-            }).pipe(
-              Effect.map((result) => ({
-                output: result.matches,
-                content: toModelContent(
-                  result.matches.map((match) => ({
-                    ...match,
-                    entry: { ...match.entry, path: resolve(location.directory, match.entry.path) },
-                  })),
-                  result.truncated,
-                ),
-                metadata: { matches: result.matches.length, truncated: result.truncated },
-              })),
-              Effect.mapError((error) =>
-                error instanceof ToolFailure
-                  ? error
-                  : error instanceof FileSystem.InvalidPatternError
-                    ? new ToolFailure({ message: `Invalid regex pattern: ${error.message}` })
+                  metadata: { matches: result.matches.length, truncated: result.truncated },
+                })),
+                Effect.mapError((error) =>
+                  error instanceof ToolFailure
+                    ? error
+                    : error instanceof Ripgrep.InvalidPatternError
+                      ? new ToolFailure({ message: `Invalid regex pattern: ${error.message}` })
                     : new ToolFailure({ message: `Unable to grep for ${input.pattern}`, error }),
+                ),
               ),
-            ),
-        }),
+          }),
+        ),
       )
       .pipe(Effect.orDie)
   }),

packages/core/src/tool/plugin/patch.ts

@@ -6,8 +6,11 @@ import { FileDiff } from "@opencode-ai/schema/file-diff"
 import { createTwoFilesPatch, diffLines } from "diff"
 import { Effect, Schema } from "effect"
 import { PlatformError } from "effect/PlatformError"
-import { FileMutation } from "../../file-mutation"
-import { LocationMutation } from "../../location-mutation"
+import path from "path"
+import { Bom } from "@opencode-ai/util/bom"
+import { FSUtil } from "@opencode-ai/util/fs-util"
+import { Formatter } from "../../formatter"
+import { Location } from "../../location"
 import { Patch } from "@opencode-ai/util/patch"
 import { Permission } from "../../permission"
 import DESCRIPTION from "../patch.txt"
@@ -54,232 +57,286 @@ type Prepared =
       readonly moveTarget?: Target
     })
 
-type Target = LocationMutation.Target
+interface Target {
+  readonly canonical: string
+  readonly resource: string
+  readonly externalDirectory?: {
+    readonly directory: string
+    readonly resource: string
+  }
+}
 
 export const Plugin = {
   id: "opencode.tool.patch",
   effect: Effect.fn("PatchTool.Plugin")(function* (ctx: PluginContext) {
-    const mutation = yield* LocationMutation.Service
-    const files = yield* FileMutation.Service
+    const fs = yield* FSUtil.Service
+    const formatter = yield* Formatter.Service
+    const location = yield* Location.Service
     const permission = yield* Permission.Service
 
     yield* ctx.tool
       .transform((draft) =>
-        draft.add({
-          name,
-          options: { codemode: false, permission: "edit" },
-          description: DESCRIPTION,
-          input: Input,
-          output: Output,
-          execute: (input, context) => {
-            const applied: Array<typeof Applied.Type> = []
-            const fail = (operation: string, error: unknown) => {
-              const completed = applied.map((item) => item.resource).join(", ")
-              return new ToolFailure({
-                message: `${operation}: ${errorMessage(error)}${completed ? `. Completed before failure: ${completed}` : ""}`,
-              })
-            }
-            return Effect.gen(function* () {
-              const source = {
-                type: "tool" as const,
-                messageID: context.messageID,
-                id: context.id,
-              }
-              if (!input.patchText) return yield* new ToolFailure({ message: "patchText is required" })
-              const hunks = yield* Effect.fromResult(Patch.parse(input.patchText)).pipe(
-                Effect.mapError((error) => new ToolFailure({ message: `patch verification failed: ${error.message}` })),
-              )
-              if (hunks.length === 0) {
-                return yield* new ToolFailure({ message: "patch rejected: empty patch" })
-              }
-              const prepared: Prepared[] = []
-              const targets: Target[] = []
-              const updates = new Map<string, string>()
-              const resolveHunkTarget = (value: string) =>
-                mutation
-                  .resolve({ path: value, kind: "file" })
-                  .pipe(
+        draft.add(
+          ({
+              name,
+              options: { codemode: false, permission: "edit" },
+              description: DESCRIPTION,
+              input: Input,
+              output: Output,
+              execute: (input, context) => {
+                const applied: Array<typeof Applied.Type> = []
+                const fail = (operation: string, error: unknown) => {
+                  const completed = applied.map((item) => item.resource).join(", ")
+                  return new ToolFailure({
+                    message: `${operation}: ${errorMessage(error)}${completed ? `. Completed before failure: ${completed}` : ""}`,
+                  })
+                }
+                return Effect.gen(function* () {
+                  const source = {
+                    type: "tool" as const,
+                    messageID: context.messageID,
+                    id: context.id,
+                  }
+                  if (!input.patchText) return yield* new ToolFailure({ message: "patchText is required" })
+                  const hunks = yield* Effect.fromResult(Patch.parse(input.patchText)).pipe(
                     Effect.mapError(
-                      (error) => new ToolFailure({ message: `patch verification failed: ${errorMessage(error)}` }),
+                      (error) => new ToolFailure({ message: `patch verification failed: ${error.message}` }),
                     ),
                   )
-              for (const hunk of hunks) {
-                yield* Effect.gen(function* () {
-                  const target = yield* resolveHunkTarget(hunk.path)
-                  targets.push(target)
-                  if (target.externalDirectory) {
-                    yield* permission.assert({
-                      ...LocationMutation.externalDirectoryPermission(target.externalDirectory),
-                      sessionID: context.sessionID,
-                      agent: context.agent,
-                      source,
-                    })
+                  if (hunks.length === 0) {
+                    return yield* new ToolFailure({ message: "patch rejected: empty patch" })
                   }
-                  if (hunk.type === "add") {
-                    const contents =
-                      hunk.contents.endsWith("\n") || hunk.contents === "" ? hunk.contents : `${hunk.contents}\n`
-                    prepared.push({
-                      ...hunk,
-                      contents,
-                      target,
-                      before: "",
-                      after: FileMutation.normalizeText(contents),
-                    })
-                    return
-                  }
-                  if (hunk.type === "delete") {
-                    const content = yield* files.read(target).pipe(
-                      Effect.mapError(
-                        (error) =>
-                          new ToolFailure({
-                            message: `patch verification failed: Failed to delete ${target.resource}: ${errorMessage(error)}`,
-                          }),
+                  const prepared: Prepared[] = []
+                  const targets: Target[] = []
+                  const updates = new Map<string, string>()
+                  for (const hunk of hunks) {
+                    yield* Effect.gen(function* () {
+                      const target = resolveTarget(location, hunk.path)
+                      targets.push(target)
+                      if (target.externalDirectory) {
+                        yield* permission.assert({
+                          action: "external_directory",
+                          resources: [target.externalDirectory.resource],
+                          save: [target.externalDirectory.resource],
+                          metadata: {
+                            filepath: target.canonical,
+                            parentDir: target.externalDirectory.directory,
+                          },
+                          sessionID: context.sessionID,
+                          agent: context.agent,
+                          source,
+                        })
+                      }
+                      if (hunk.type === "add") {
+                        prepared.push({
+                          ...hunk,
+                          target,
+                          before: "",
+                          after: Bom.split(
+                            hunk.contents.endsWith("\n") || hunk.contents === ""
+                              ? hunk.contents
+                              : `${hunk.contents}\n`,
+                          ).text,
+                        })
+                        return
+                      }
+                      if (hunk.type === "delete") {
+                        const content = yield* Bom.readFile(fs, target.canonical).pipe(
+                          Effect.mapError(
+                            (error) =>
+                              new ToolFailure({
+                                message: `patch verification failed: Failed to delete ${target.resource}: ${errorMessage(error)}`,
+                              }),
+                          ),
+                        )
+                        prepared.push({ ...hunk, target, before: content.text, after: "" })
+                        return
+                      }
+                      const previous = updates.get(target.canonical)
+                      const original =
+                        previous ??
+                        (yield* Effect.gen(function* () {
+                          const stats = yield* fs.stat(target.canonical).pipe(
+                            Effect.mapError(
+                              (error) =>
+                                new ToolFailure({
+                                  message: `patch verification failed: Failed to read file to update ${target.canonical}: ${errorMessage(error)}`,
+                                }),
+                            ),
+                          )
+                          if (stats.type === "Directory") {
+                            return yield* new ToolFailure({
+                              message: `patch verification failed: Failed to read file to update ${target.canonical}: path is a directory`,
+                            })
+                          }
+                          const content = yield* Bom.readFile(fs, target.canonical).pipe(
+                            Effect.mapError(
+                              (error) =>
+                                new ToolFailure({
+                                  message: `patch verification failed: Failed to read file to update ${target.canonical}: ${errorMessage(error)}`,
+                                }),
+                            ),
+                          )
+                          return Bom.join(content.text, content.bom)
+                        }))
+                      const before = Bom.split(original).text
+                      const update = yield* Effect.try({
+                        try: () => Patch.derive(hunk.path, hunk.chunks, original),
+                        catch: (error) =>
+                          new ToolFailure({ message: `patch verification failed: ${errorMessage(error)}` }),
+                      })
+                      const moveTarget = hunk.movePath ? resolveTarget(location, hunk.movePath) : undefined
+                      if (moveTarget) targets.push(moveTarget)
+                      if (moveTarget?.externalDirectory) {
+                        yield* permission.assert({
+                          action: "external_directory",
+                          resources: [moveTarget.externalDirectory.resource],
+                          save: [moveTarget.externalDirectory.resource],
+                          metadata: {
+                            filepath: moveTarget.canonical,
+                            parentDir: moveTarget.externalDirectory.directory,
+                          },
+                          sessionID: context.sessionID,
+                          agent: context.agent,
+                          source,
+                        })
+                      }
+                      prepared.push({
+                        ...hunk,
+                        target,
+                        content: Patch.joinBom(update.content, update.bom),
+                        before,
+                        after: update.content,
+                        moveTarget,
+                      })
+                      if (!moveTarget) updates.set(target.canonical, Patch.joinBom(update.content, update.bom))
+                    }).pipe(
+                      Effect.mapError((error) =>
+                        error instanceof ToolFailure
+                          ? error
+                          : new ToolFailure({ message: `Unable to prepare patch at ${hunk.path}`, error }),
                       ),
                     )
-                    prepared.push({ ...hunk, target, before: content, after: "" })
-                    return
                   }
-                  const previous = updates.get(target.canonical)
-                  const original =
-                    previous ??
-                    (yield* files.read(target).pipe(
-                      Effect.mapError(
-                        (error) =>
-                          new ToolFailure({
-                            message: `patch verification failed: Failed to read file to update ${target.canonical}: ${errorMessage(error)}`,
-                          }),
-                      ),
-                    ))
-                  const update = yield* Effect.try({
-                    try: () => Patch.derive(hunk.path, hunk.chunks, original),
-                    catch: (error) => new ToolFailure({ message: `patch verification failed: ${errorMessage(error)}` }),
+
+                  const patchFiles = prepared.map((change) => patchFile(change))
+                  yield* permission.assert({
+                    action: "edit",
+                    resources: [...new Set(targets.map((target) => target.resource))],
+                    save: ["*"],
+                    metadata: {
+                      filepath: targets.map((target) => target.resource).join(", "),
+                      diff: patchFiles.map((file) => `${file.patch}\n`).join(""),
+                      files: patchFiles,
+                    },
+                    sessionID: context.sessionID,
+                    agent: context.agent,
+                    source,
                   })
-                  const content = FileMutation.normalizeText(update.content)
-                  const moveTarget = hunk.movePath ? yield* resolveHunkTarget(hunk.movePath) : undefined
-                  if (moveTarget) targets.push(moveTarget)
-                  if (moveTarget?.externalDirectory) {
-                    yield* permission.assert({
-                      ...LocationMutation.externalDirectoryPermission(moveTarget.externalDirectory),
-                      sessionID: context.sessionID,
-                      agent: context.agent,
-                      source,
-                    })
-                  }
-                  prepared.push({
-                    ...hunk,
-                    target,
-                    content: Patch.joinBom(update.content, update.bom),
-                    before: original,
-                    after: content,
-                    moveTarget,
+
+                  yield* Effect.forEach(
+                    prepared,
+                    (change) =>
+                      Effect.gen(function* () {
+                        if (change.type === "add") {
+                          yield* fs
+                            .writeWithDirs(
+                              change.target.canonical,
+                              change.contents.endsWith("\n") || change.contents === ""
+                                ? change.contents
+                                : `${change.contents}\n`,
+                            )
+                            .pipe(
+                              Effect.mapError((error) => fail(`Failed to write ${change.target.resource}`, error)),
+                            )
+                          applied.push({
+                            type: change.type,
+                            resource: change.target.resource,
+                            target: change.target.canonical,
+                          })
+                          return
+                        }
+                        if (change.type === "delete") {
+                          yield* fs
+                            .remove(change.target.canonical)
+                            .pipe(
+                              Effect.mapError((error) => fail(`Failed to delete ${change.target.resource}`, error)),
+                            )
+                          applied.push({
+                            type: change.type,
+                            resource: change.target.resource,
+                            target: change.target.canonical,
+                          })
+                          return
+                        }
+                        if (change.moveTarget) {
+                          const moveTarget = change.moveTarget
+                          yield* fs
+                            .writeWithDirs(moveTarget.canonical, change.content)
+                            .pipe(Effect.mapError((error) => fail(`Failed to write ${moveTarget.resource}`, error)))
+                          yield* fs.remove(change.target.canonical).pipe(
+                            Effect.mapError((error) =>
+                              fail(`Wrote ${moveTarget.resource} but failed to remove ${change.target.resource}`, error),
+                            ),
+                          )
+                          applied.push({
+                            type: change.type,
+                            resource: change.moveTarget.resource,
+                            target: change.moveTarget.canonical,
+                          })
+                          return
+                        }
+                        yield* fs
+                          .writeWithDirs(change.target.canonical, change.content)
+                          .pipe(Effect.mapError((error) => fail(`Failed to write ${change.target.resource}`, error)))
+                        applied.push({
+                          type: change.type,
+                          resource: change.target.resource,
+                          target: change.target.canonical,
+                        })
+                      }),
+                    { discard: true },
+                  )
+                  const formatted = new Map<string, string>()
+                  yield* Effect.forEach(
+                    [...new Set(applied.filter((item) => item.type !== "delete").map((item) => item.target))],
+                    (target) =>
+                      Effect.gen(function* () {
+                        const current = yield* Bom.readFile(fs, target).pipe(
+                          Effect.mapError((error) => fail(`Failed to read ${target}`, error)),
+                        )
+                        formatted.set(
+                          target,
+                          (yield* formatter.file(target))
+                            ? yield* Bom.syncFile(fs, target, current.bom).pipe(
+                                Effect.mapError((error) => fail(`Failed to sync ${target}`, error)),
+                              )
+                            : current.text,
+                        )
+                      }),
+                    { discard: true },
+                  )
+                  const files = yield* Effect.forEach(prepared, (change) => {
+                    if (change.type === "delete") return Effect.succeed(patchFile(change))
+                    const target = change.type === "update" && change.moveTarget ? change.moveTarget : change.target
+                    return Effect.succeed(patchFile(change, formatted.get(target.canonical)))
                   })
-                  if (!moveTarget) updates.set(target.canonical, content)
+                  return { applied, files }
                 }).pipe(
+                  Effect.map((output) => ({
+                    output,
+                    content: toModelOutput(output),
+                    metadata: { files: output.files },
+                  })),
                   Effect.mapError((error) =>
                     error instanceof ToolFailure
                       ? error
-                      : new ToolFailure({ message: `Unable to prepare patch at ${hunk.path}`, error }),
+                      : new ToolFailure({ message: "Unable to apply patch", error }),
                   ),
                 )
-              }
-
-              const patchFiles = prepared.map((change) => patchFile(change))
-              yield* permission.assert({
-                action: "edit",
-                resources: [...new Set(targets.map((target) => target.resource))],
-                save: ["*"],
-                metadata: {
-                  filepath: targets.map((target) => target.resource).join(", "),
-                  diff: patchFiles.map((file) => `${file.patch}\n`).join(""),
-                  files: patchFiles,
-                },
-                sessionID: context.sessionID,
-                agent: context.agent,
-                source,
-              })
-
-              // FileMutation.write formats where the files live and reports
-              // the final text, so the diff output reflects disk.
-              const formatted = new Map<string, string>()
-              yield* Effect.forEach(
-                prepared,
-                (change) =>
-                  Effect.gen(function* () {
-                    if (change.type === "add") {
-                      const result = yield* files
-                        .write({ target: change.target, content: change.contents })
-                        .pipe(Effect.mapError((error) => fail(`Failed to write ${change.target.resource}`, error)))
-                      formatted.set(change.target.canonical, result.content)
-                      applied.push({
-                        type: change.type,
-                        resource: change.target.resource,
-                        target: change.target.canonical,
-                      })
-                      return
-                    }
-                    if (change.type === "delete") {
-                      yield* files
-                        .remove(change.target)
-                        .pipe(Effect.mapError((error) => fail(`Failed to delete ${change.target.resource}`, error)))
-                      applied.push({
-                        type: change.type,
-                        resource: change.target.resource,
-                        target: change.target.canonical,
-                      })
-                      return
-                    }
-                    if (change.moveTarget) {
-                      const moveTarget = change.moveTarget
-                      const result = yield* files
-                        .move({ from: change.target, to: moveTarget, content: change.content })
-                        .pipe(
-                          Effect.mapError((error) =>
-                            error instanceof FileMutation.MoveIncompleteError
-                              ? fail(
-                                  `Wrote ${moveTarget.resource} but failed to remove ${change.target.resource}`,
-                                  error.cause,
-                                )
-                              : fail(`Failed to write ${moveTarget.resource}`, error),
-                          ),
-                        )
-                      formatted.set(moveTarget.canonical, result.content)
-                      applied.push({
-                        type: change.type,
-                        resource: change.moveTarget.resource,
-                        target: change.moveTarget.canonical,
-                      })
-                      return
-                    }
-                    const result = yield* files
-                      .write({ target: change.target, content: change.content })
-                      .pipe(Effect.mapError((error) => fail(`Failed to write ${change.target.resource}`, error)))
-                    formatted.set(change.target.canonical, result.content)
-                    applied.push({
-                      type: change.type,
-                      resource: change.target.resource,
-                      target: change.target.canonical,
-                    })
-                  }),
-                { discard: true },
-              )
-              const fileDiffs = yield* Effect.forEach(prepared, (change) => {
-                if (change.type === "delete") return Effect.succeed(patchFile(change))
-                const target = change.type === "update" && change.moveTarget ? change.moveTarget : change.target
-                return Effect.succeed(patchFile(change, formatted.get(target.canonical)))
-              })
-              return { applied, files: fileDiffs }
-            }).pipe(
-              Effect.map((output) => ({
-                output,
-                content: toModelOutput(output),
-                metadata: { files: output.files },
-              })),
-              Effect.mapError((error) =>
-                error instanceof ToolFailure ? error : new ToolFailure({ message: "Unable to apply patch", error }),
-              ),
-            )
-          },
-        }),
+              },
+            }),
+        ),
       )
       .pipe(Effect.orDie)
 
@@ -297,13 +354,8 @@ export const Plugin = {
     )
   }),
 }
+
 function errorMessage(error: unknown) {
-  if (error instanceof FileMutation.NotFoundError) return "file does not exist"
-  if (error instanceof FileMutation.NotAFileError) return "path is a directory"
-  if (error instanceof LocationMutation.PathError)
-    return error.reason === "outside_workspace"
-      ? `path is outside the workspace: ${error.path}`
-      : `ancestor is not a directory: ${error.path}`
   if (error instanceof PlatformError) {
     if (error.reason._tag === "NotFound") return "file does not exist"
     return error.reason.description ?? error.reason.message
@@ -313,7 +365,9 @@ function errorMessage(error: unknown) {
 
 function patchFile(change: Prepared, after = change.after): typeof FileDiff.Info.Type {
   const target = (change.type === "update" ? change.moveTarget : undefined)?.resource ?? change.target.resource
-  const patch = trimDiff(createTwoFilesPatch(change.target.canonical, change.target.canonical, change.before, after))
+  const patch = trimDiff(
+    createTwoFilesPatch(change.target.canonical, change.target.canonical, change.before, after),
+  )
   const counts =
     change.type === "delete"
       ? { additions: 0, deletions: change.before.split("\n").length }
@@ -360,3 +414,24 @@ function trimDiff(diff: string) {
     })
     .join("\n")
 }
+
+function resolveTarget(location: Location.Interface, value: string): Target {
+  const canonical =
+    process.platform === "win32"
+      ? FSUtil.normalizePath(path.resolve(location.directory, value))
+      : path.resolve(location.directory, value)
+  const projectRoot = path.parse(location.project.directory).root
+  const external =
+    !FSUtil.contains(location.directory, canonical) &&
+    (location.project.directory === projectRoot || !FSUtil.contains(location.project.directory, canonical))
+  const directory = path.dirname(canonical)
+  const resource =
+    process.platform === "win32"
+      ? FSUtil.normalizePathPattern(path.join(directory, "*"))
+      : path.join(directory, "*").replaceAll("\\", "/")
+  return {
+    canonical,
+    resource: path.relative(location.project.directory, canonical).replaceAll("\\", "/") || ".",
+    externalDirectory: external ? { directory, resource } : undefined,
+  }
+}

packages/core/src/tool/plugin/read.ts

@@ -25,7 +25,11 @@ const LocationInput = Schema.Struct({
   }),
 })
 export const Input = LocationInput
-const Output = Schema.Union([ReadToolFileSystem.FileContent, ReadToolFileSystem.TextPage, ReadToolFileSystem.ListPage])
+const Output = Schema.Union([
+  ReadToolFileSystem.FileContent,
+  ReadToolFileSystem.TextPage,
+  ReadToolFileSystem.ListPage,
+])
 
 export const Plugin = {
   id: "opencode.tool.read",
@@ -39,99 +43,99 @@ export const Plugin = {
 
     yield* ctx.tool
       .transform((draft) =>
-        draft.add({
-          name,
-          options: { codemode: false },
-          description:
-            "Read the contents of a file or directory. Supports text files, images, and PDFs. Images and PDFs are presented directly to the model. Each text line is prefixed by its 1-based line number as <line>: <content>. The prefix is for reference and is not part of the file content. Directory entries are returned one per line. Use offset and limit to read large files or directories in sections. Prefer one larger read over many small slices, and use grep to find specific content in large files.",
-          input: Input,
-          output: Output,
-          execute: (input, context) => {
-            return Effect.gen(function* () {
-              const source = {
-                type: "tool" as const,
-                messageID: context.messageID,
-                id: context.id,
-              }
-              const target = yield* mutation.resolve({ path: input.path, kind: "directory" })
-              const external = target.externalDirectory
-              if (external)
+        draft.add(
+          ({
+            name,
+            options: { codemode: false },
+            description:
+              "Read the contents of a file or directory. Supports text files, images, and PDFs. Images and PDFs are presented directly to the model. Each text line is prefixed by its 1-based line number as <line>: <content>. The prefix is for reference and is not part of the file content. Directory entries are returned one per line. Use offset and limit to read large files or directories in sections. Prefer one larger read over many small slices, and use grep to find specific content in large files.",
+            input: Input,
+            output: Output,
+            execute: (input, context) => {
+              return Effect.gen(function* () {
+                const source = {
+                  type: "tool" as const,
+                  messageID: context.messageID,
+                  id: context.id,
+                }
+                const target = yield* mutation.resolve({ path: input.path, kind: "directory" })
+                const external = target.externalDirectory
+                if (external)
+                  yield* permission.assert({
+                    ...LocationMutation.externalDirectoryPermission(external),
+                    sessionID: context.sessionID,
+                    agent: context.agent,
+                    source,
+                  })
+                const resource = target.resource
+                const absolute = AbsolutePath.make(target.canonical)
                 yield* permission.assert({
-                  ...LocationMutation.externalDirectoryPermission(external),
+                  action: name,
+                  resources: [resource],
+                  save: ["*"],
                   sessionID: context.sessionID,
                   agent: context.agent,
                   source,
                 })
-              const resource = target.resource
-              const absolute = AbsolutePath.make(target.canonical)
-              yield* permission.assert({
-                action: name,
-                resources: [resource],
-                save: ["*"],
-                sessionID: context.sessionID,
-                agent: context.agent,
-                source,
-              })
-              const type = yield* reader
-                .inspect(absolute)
-                .pipe(Effect.catchReason("PlatformError", "NotFound", () => missing(input.path, target.canonical)))
-              const content =
-                type === "directory"
-                  ? yield* reader.list(absolute, { offset: input.offset, limit: input.limit })
-                  : yield* reader.read(absolute, resource, {
-                      offset: input.offset,
-                      limit: input.limit,
-                    })
-              // After a successful read, discover nearby AGENTS.md walking up to the Location
-              // root exclusive and inject them as durable synthetic instructions. For a
-              // directory listing the walk starts at the directory itself (so its own AGENTS.md
-              // is discovered); for a file it starts at the file's dirname. External reads are
-              // skipped, and discovery failures never fail the read.
-              yield* Effect.gen(function* () {
-                // External reads skip discovery, and so do hosted Locations:
-                // the walk reads the host filesystem.
-                if (external !== undefined || location.workspaceID !== undefined) return
-                const resolved = yield* fs.resolve(target.canonical)
-                const root = yield* fs.resolve(location.directory)
-                // up() searches its stop directory, so the Location-root AGENTS.md (already
-                // supplied by core initial instructions) is dropped by the dirname filter.
-                const discovered = yield* fs.up({
-                  targets: [FILENAME],
-                  start: type === "directory" ? resolved : dirname(resolved),
-                  stop: root,
-                })
-                const candidates = (yield* Effect.forEach(discovered, fs.resolve)).filter(
-                  (file) => dirname(file) !== root,
+                const type = yield* reader.inspect(absolute).pipe(
+                  Effect.catchReason("PlatformError", "NotFound", () => missing(input.path, target.canonical)),
                 )
-                if (candidates.length === 0) return
-                yield* sessionInstructions.load({ sessionID: context.sessionID, paths: candidates })
+                const content =
+                  type === "directory"
+                    ? yield* reader.list(absolute, { offset: input.offset, limit: input.limit })
+                    : yield* reader.read(absolute, resource, {
+                        offset: input.offset,
+                        limit: input.limit,
+                      })
+                // After a successful read, discover nearby AGENTS.md walking up to the Location
+                // root exclusive and inject them as durable synthetic instructions. For a
+                // directory listing the walk starts at the directory itself (so its own AGENTS.md
+                // is discovered); for a file it starts at the file's dirname. External reads are
+                // skipped, and discovery failures never fail the read.
+                yield* Effect.gen(function* () {
+                  if (target.externalDirectory !== undefined) return
+                  const resolved = yield* fs.resolve(target.canonical)
+                  const root = yield* fs.resolve(location.directory)
+                  // up() searches its stop directory, so the Location-root AGENTS.md (already
+                  // supplied by core initial instructions) is dropped by the dirname filter.
+                  const discovered = yield* fs.up({
+                    targets: [FILENAME],
+                    start: type === "directory" ? resolved : dirname(resolved),
+                    stop: root,
+                  })
+                  const candidates = (yield* Effect.forEach(discovered, fs.resolve)).filter(
+                    (file) => dirname(file) !== root,
+                  )
+                  if (candidates.length === 0) return
+                  yield* sessionInstructions.load({ sessionID: context.sessionID, paths: candidates })
+                }).pipe(
+                  Effect.catch(() => Effect.void),
+                  Effect.catchDefect(() => Effect.void),
+                )
+                if (content.type === "file" && content.encoding === "base64" && !SUPPORTED_MEDIA_MIMES.has(content.mime))
+                  return yield* Effect.fail(new ReadToolFileSystem.BinaryFileError({ resource }))
+                return content
               }).pipe(
-                Effect.catch(() => Effect.void),
-                Effect.catchDefect(() => Effect.void),
+                Effect.map((output) => ({
+                  output,
+                  content: toModelContent(input.path, input.offset, output),
+                })),
+                Effect.mapError((error) => {
+                  if (error instanceof ToolFailure) return error
+                  const message =
+                    error instanceof ReadToolFileSystem.BinaryFileError ||
+                    error instanceof ReadToolFileSystem.MediaIngestLimitError ||
+                    error instanceof ReadToolFileSystem.MalformedUtf8Error ||
+                    error instanceof ReadToolFileSystem.OffsetOutOfRangeError ||
+                    error instanceof ReadToolFileSystem.PathKindError
+                      ? error.message
+                      : `Unable to read ${input.path}`
+                  return new ToolFailure({ message, error })
+                }),
               )
-              if (content.type === "file" && content.encoding === "base64" && !SUPPORTED_MEDIA_MIMES.has(content.mime))
-                return yield* Effect.fail(new ReadToolFileSystem.BinaryFileError({ resource }))
-              return content
-            }).pipe(
-              Effect.map((output) => ({
-                output,
-                content: toModelContent(input.path, input.offset, output),
-              })),
-              Effect.mapError((error) => {
-                if (error instanceof ToolFailure) return error
-                const message =
-                  error instanceof ReadToolFileSystem.BinaryFileError ||
-                  error instanceof ReadToolFileSystem.MediaIngestLimitError ||
-                  error instanceof ReadToolFileSystem.MalformedUtf8Error ||
-                  error instanceof ReadToolFileSystem.OffsetOutOfRangeError ||
-                  error instanceof ReadToolFileSystem.PathKindError
-                    ? error.message
-                    : `Unable to read ${input.path}`
-                return new ToolFailure({ message, error })
-              }),
-            )
-          },
-        }),
+            },
+          }),
+        ),
       )
       .pipe(Effect.orDie)
 

packages/core/src/tool/plugin/shell.ts

@@ -4,7 +4,8 @@ import path from "path"
 import { ToolFailure } from "@opencode-ai/ai"
 import type { Content } from "@opencode-ai/schema/tool"
 import type { Context as PluginContext } from "@opencode-ai/plugin/effect/plugin"
-import { Array, Deferred, Effect, Schema, Scope } from "effect"
+import { Deferred, Effect, Schema, Scope } from "effect"
+import { FSUtil } from "@opencode-ai/util/fs-util"
 import { LocationMutation } from "../../location-mutation"
 import { Permission } from "../../permission"
 import { PluginRuntime } from "../../plugin/runtime"
@@ -81,6 +82,7 @@ export const Plugin = {
   effect: Effect.fn("ShellTool.Plugin")(function* (ctx: PluginContext) {
     const runtime = yield* PluginRuntime.Service
     const scope = yield* Scope.Scope
+    const fsUtil = yield* FSUtil.Service
     const mutation = yield* LocationMutation.Service
     const shell = yield* Shell.Service
     const permission = yield* Permission.Service
@@ -152,12 +154,10 @@ export const Plugin = {
                       )
                       invocation.cwd = target.canonical
                       finalTimeout = invocation.timeout
-                      const external = Array.dedupeWith(
-                        [target, ...directories]
-                          .map((item) => item.externalDirectory)
-                          .filter((item) => item !== undefined),
-                        (left, right) => left.resource === right.resource,
-                      )
+                      const external = [target, ...directories]
+                        .map((item) => item.externalDirectory)
+                        .filter((item) => item !== undefined)
+                        .filter((item, index, items) => items.findIndex((other) => other.resource === item.resource) === index)
                       if (external.length > 0)
                         yield* permission.assert({
                           action: "external_directory",
@@ -176,6 +176,13 @@ export const Plugin = {
                           agent: context.agent,
                           source,
                         })
+                      const workdir = yield* fsUtil.stat(target.canonical).pipe(
+                        Effect.catchReason("PlatformError", "NotFound", () =>
+                          Effect.fail(new Error(`Working directory does not exist: ${target.canonical}`)),
+                        ),
+                      )
+                      if (workdir.type !== "Directory")
+                        return yield* Effect.fail(new Error(`Working directory is not a directory: ${target.canonical}`))
                     }),
                 )
                 yield* context.progress({ shellID: info.id })

packages/core/src/tool/plugin/subagent.ts

@@ -23,6 +23,10 @@ export const Input = Schema.Struct({
   agent: Schema.String.annotate({ description: "The type of specialized agent to use for this task" }),
   description: Schema.String.annotate({ description: "A short 3-5 word label for the task, displayed to the user" }),
   prompt: Schema.String.annotate({ description: "The task for the subagent to perform" }),
+  sessionID: Schema.optionalKey(SessionSchema.ID).annotate({
+    description:
+      "Continue a specific previous subagent conversation by passing its sessionID. Calls without a sessionID start a new conversation.",
+  }),
   background: Schema.optionalKey(Schema.Boolean).annotate({
     description:
       "Run the subagent in the background and return immediately. You will be notified when it completes. DO NOT sleep, poll, or proactively check on its progress.",
@@ -36,7 +40,8 @@ export const Output = Schema.Struct({
 })
 export const description = [
   "Spawns an agent in a child session to work on the specified task.",
-  "Include all relevant context and instructions in the prompt because the child starts with fresh context.",
+  "The output includes a sessionID you can pass back later to continue that specific conversation with the subagent.",
+  "New child sessions start with fresh context, so include all relevant context and instructions when you don't pass a sessionID.",
   "Foreground (default) runs the subagent to completion and returns its final response.",
   "Background mode (background=true) launches it asynchronously and returns immediately; you are notified when it finishes.",
   "Use background only for independent work that can run while you continue elsewhere.",
@@ -77,7 +82,7 @@ export const Plugin = {
     ) {
       yield* runtime.session.synthetic({
         sessionID: parentID,
-        text: `<subagent id="${childID}" state="${state}" description="${description}">\n${text}\n</subagent>`,
+        text: `<subagent sessionID="${childID}" state="${state}" description="${description}">\n${text}\n</subagent>`,
         description,
         metadata: { source: "subagent", childID, agent, state },
       })
@@ -164,22 +169,51 @@ export const Plugin = {
                   })
                   .pipe(Effect.mapError((error) => new ToolFailure({ message: `Subagent denied: ${agent.id}`, error })))
 
+                if (input.sessionID !== undefined && input.background === true)
+                  return yield* new ToolFailure({
+                    message: "Continuing a subagent in the background is not implemented yet",
+                  })
+
+                const existing =
+                  input.sessionID === undefined
+                    ? undefined
+                    : yield* runtime.session.get(input.sessionID).pipe(
+                        Effect.mapError(
+                          (error) =>
+                            new ToolFailure({ message: `Subagent session not found: ${input.sessionID}`, error }),
+                        ),
+                      )
+                if (existing !== undefined && existing.parentID !== context.sessionID)
+                  return yield* new ToolFailure({
+                    message: `Session ${existing.id} is not a child of the current session`,
+                  })
+                if (existing !== undefined && existing.agent !== agent.id)
+                  return yield* new ToolFailure({
+                    message: `Session ${existing.id} belongs to agent ${existing.agent ?? "unknown"}, not ${agent.id}`,
+                  })
+                if (existing !== undefined && (yield* runtime.job.get(existing.id))?.status === "running")
+                  return yield* new ToolFailure({
+                    message: "Continuing a running subagent is not implemented yet",
+                  })
+
                 // Model selection is policy/config/session state, not an LLM-facing tool argument.
                 const model = agent.model ?? parent.model
-                const child = yield* runtime.session
-                  .create({
-                    parentID: context.sessionID,
-                    title: input.description,
-                    agent: Agent.ID.make(input.agent),
-                    model,
-                    // TODO(opencode kkdvxn): derive restricted subagent permissions from the parent
-                    // session (V1 deriveSubagentSessionPermission). MVP uses the agent's own permissions.
-                  })
-                  .pipe(
-                    Effect.mapError(
-                      (error) => new ToolFailure({ message: `Parent session not found: ${context.sessionID}`, error }),
-                    ),
-                  )
+                const child =
+                  existing ??
+                  (yield* runtime.session
+                    .create({
+                      parentID: context.sessionID,
+                      title: input.description,
+                      agent: Agent.ID.make(input.agent),
+                      model,
+                      // TODO(opencode kkdvxn): derive restricted subagent permissions from the parent
+                      // session (V1 deriveSubagentSessionPermission). MVP uses the agent's own permissions.
+                    })
+                    .pipe(
+                      Effect.mapError(
+                        (error) => new ToolFailure({ message: `Parent session not found: ${context.sessionID}`, error }),
+                      ),
+                    ))
 
                 const background = input.background === true
                 yield* context.progress({
@@ -190,7 +224,10 @@ export const Plugin = {
                   // The child session owns its agent/model (set at create); prompt only admits input.
                   yield* runtime.session.prompt({
                     sessionID: child.id,
-                    text: ["You are a subagent spawned by another session.", input.prompt].join("\n"),
+                    text:
+                      existing === undefined
+                        ? ["You are a subagent spawned by another session.", input.prompt].join("\n")
+                        : input.prompt,
                     resume: false,
                   })
                   yield* runtime.session.resume(child.id)
@@ -238,7 +275,10 @@ export const Plugin = {
               }).pipe(
                 Effect.map((output) => ({
                   output,
-                  content: output.output,
+                  content:
+                    output.status === "completed"
+                      ? `<subagent sessionID="${output.sessionID}" state="completed">\n${output.output}\n</subagent>`
+                      : output.output,
                   metadata: { sessionID: output.sessionID, status: output.status },
                 })),
               ),

packages/core/src/tool/plugin/websearch.ts

@@ -2,7 +2,7 @@ export * as WebSearchTool from "./websearch"
 
 import type { Context as PluginContext } from "@opencode-ai/plugin/effect/plugin"
 import { ToolFailure } from "@opencode-ai/ai"
-import { Effect, Schema, Semaphore } from "effect"
+import { Effect, Schema } from "effect"
 import { Form } from "../../form"
 import { KV } from "../../kv"
 import { Permission } from "../../permission"
@@ -10,7 +10,6 @@ import { WebSearch } from "../../websearch"
 
 export const name = "websearch"
 export const NO_RESULTS = "No search results found. Please try a different query."
-const providerSelectionLock = Semaphore.makeUnsafe(1)
 
 export const description = `Search the web using the user's selected search integration. Use this for current information beyond knowledge cutoff.
 
@@ -30,7 +29,6 @@ export const Plugin = {
     const permission = yield* Permission.Service
     const forms = yield* Form.Service
     const kv = yield* KV.Service
-    const websearch = yield* WebSearch.Service
 
     yield* ctx.tool
       .transform((draft) =>
@@ -51,90 +49,70 @@ export const Plugin = {
                 agent: context.agent,
                 source: { type: "tool", messageID: context.messageID, id: context.id },
               })
-              const search = (): Effect.Effect<Effect.Success<ReturnType<typeof ctx.websearch.query>>, unknown> =>
-                ctx.websearch.query(input).pipe(
-                  Effect.catch((error) => {
-                    if (!Schema.is(WebSearch.ProviderRequiredError)(error)) return Effect.fail(error)
-                    return providerSelectionLock
-                      .withPermit(
-                        Effect.gen(function* () {
-                          if (yield* websearch.default()) return yield* Effect.void
-                          const providers = (yield* ctx.websearch.providers()).data
-                          const defaultProvider = providers[0]
-                          if (!defaultProvider) return yield* new WebSearch.ProviderRequiredError()
-                          const response = yield* forms.ask({
+              const result = yield* ctx.websearch.query(input).pipe(
+                Effect.catch((error) => {
+                  if (!Schema.is(WebSearch.ProviderRequiredError)(error)) return Effect.fail(error)
+                  return Effect.gen(function* () {
+                    const providers = (yield* ctx.websearch.providers()).data
+                    const defaultProvider = providers[0]
+                    if (!defaultProvider) return yield* new WebSearch.ProviderRequiredError()
+                    const response = yield* forms.ask({
+                      sessionID: context.sessionID,
+                      title: "Web Search",
+                      metadata: { kind: "websearch.provider" },
+                      fields: [
+                        {
+                          key: "choice",
+                          description: "Allow OpenCode to search the web for up-to-date information?",
+                          type: "string",
+                          required: true,
+                          custom: false,
+                          options: [
+                            {
+                              value: "allow",
+                              label: `Allow web search via ${defaultProvider.name}`,
+                            },
+                            {
+                              value: "choose",
+                              label: "Choose another provider",
+                            },
+                            { value: "disable", label: "Disable web search" },
+                          ],
+                        },
+                      ],
+                    })
+                    if (response.status === "cancelled") return yield* Effect.fail(new Error("Web search cancelled"))
+                    if (response.answer.choice === "disable") {
+                      yield* kv.set("websearch:provider", false)
+                      return yield* new WebSearch.DisabledError()
+                    }
+                    const selection =
+                      response.answer.choice === "choose"
+                        ? yield* forms.ask({
                             sessionID: context.sessionID,
-                            title: "Web Search",
+                            title: "Choose a web search provider",
                             metadata: { kind: "websearch.provider" },
                             fields: [
                               {
-                                key: "choice",
-                                description: "Allow OpenCode to search the web for up-to-date information?",
+                                key: "provider",
+                                description: "Choose a provider for web search.",
                                 type: "string",
                                 required: true,
                                 custom: false,
-                                options: [
-                                  {
-                                    value: "allow",
-                                    label: `Allow web search via ${defaultProvider.name}`,
-                                  },
-                                  {
-                                    value: "choose",
-                                    label: "Choose another provider",
-                                  },
-                                  { value: "disable", label: "Disable web search" },
-                                ],
+                                options: providers.map((provider) => ({ value: provider.id, label: provider.name })),
                               },
                             ],
                           })
-                          if (response.status === "cancelled")
-                            return yield* Effect.fail(new Error("Web search cancelled"))
-                          if (response.answer.choice === "disable") {
-                            yield* kv.set("websearch:provider", false)
-                            return yield* new WebSearch.DisabledError()
-                          }
-                          const selection =
-                            response.answer.choice === "choose"
-                              ? yield* forms.ask({
-                                  sessionID: context.sessionID,
-                                  title: "Choose a web search provider",
-                                  metadata: { kind: "websearch.provider" },
-                                  fields: [
-                                    {
-                                      key: "provider",
-                                      description: "Choose a provider for web search.",
-                                      type: "string",
-                                      required: true,
-                                      custom: false,
-                                      options: providers.map((provider) => ({
-                                        value: provider.id,
-                                        label: provider.name,
-                                      })),
-                                    },
-                                  ],
-                                })
-                              : undefined
-                          if (selection?.status === "cancelled")
-                            return yield* Effect.fail(new Error("Web search cancelled"))
-                          const providerID = selection?.answer.provider ?? defaultProvider.id
-                          if (
-                            typeof providerID !== "string" ||
-                            !providers.some((provider) => provider.id === providerID)
-                          )
-                            return yield* new WebSearch.ProviderRequiredError()
-                          return yield* kv.set("websearch:provider", providerID)
-                        }),
-                      )
-                      .pipe(
-                        Effect.timeoutOrElse({
-                          duration: "1 minute",
-                          orElse: () => Effect.fail(new Error("Web search cancelled")),
-                        }),
-                        Effect.andThen(Effect.suspend(search)),
-                      )
-                  }),
-                )
-              const result = yield* search()
+                        : undefined
+                    if (selection?.status === "cancelled") return yield* Effect.fail(new Error("Web search cancelled"))
+                    const providerID = selection?.answer.provider ?? defaultProvider.id
+                    if (typeof providerID !== "string" || !providers.some((provider) => provider.id === providerID))
+                      return yield* new WebSearch.ProviderRequiredError()
+                    yield* kv.set("websearch:provider", providerID)
+                    return yield* ctx.websearch.query(input)
+                  })
+                }),
+              )
               const output = {
                 provider: result.data.providerID,
                 results: result.data.results,

packages/core/src/tool/plugin/write.ts

@@ -9,7 +9,10 @@ export * as WriteTool from "./write"
 import type { Context as PluginContext } from "@opencode-ai/plugin/effect/plugin"
 import { ToolFailure } from "@opencode-ai/ai"
 import { Effect, Schema } from "effect"
+import { Bom } from "@opencode-ai/util/bom"
+import { FSUtil } from "@opencode-ai/util/fs-util"
 import { FileMutation } from "../../file-mutation"
+import { Formatter } from "../../formatter"
 import { LocationMutation } from "../../location-mutation"
 import { Permission } from "../../permission"
 import { fileDiff } from "./file-diff"
@@ -45,64 +48,65 @@ export const Plugin = {
   effect: Effect.fn("WriteTool.Plugin")(function* (ctx: PluginContext) {
     const mutation = yield* LocationMutation.Service
     const files = yield* FileMutation.Service
+    const formatter = yield* Formatter.Service
+    const fs = yield* FSUtil.Service
     const permission = yield* Permission.Service
 
     yield* ctx.tool
       .transform((draft) =>
-        draft.add({
-          name,
-          options: { codemode: false, permission: "edit" },
-          description:
-            "Writes a file to the local filesystem, overwriting if one exists.\n\nMissing parent directories are created automatically.\n\nUse this tool to create new files or overwrite existing files. For partial changes, use the edit tool instead.",
-          input: Input,
-          output: Output,
-          execute: (input, context) =>
-            Effect.gen(function* () {
-              const source = {
-                type: "tool" as const,
-                messageID: context.messageID,
-                id: context.id,
-              }
-              const target = yield* mutation.resolve({ path: input.path, kind: "file" })
-              const external = target.externalDirectory
-              if (external)
-                yield* permission.assert({
-                  ...LocationMutation.externalDirectoryPermission(external),
-                  sessionID: context.sessionID,
-                  agent: context.agent,
-                  source,
-                })
-              const current = yield* files
-                .read(target)
-                .pipe(Effect.catchTag("FileMutation.NotFoundError", () => Effect.succeed(undefined)))
-              const content = FileMutation.normalizeText(input.content)
-              const preview = fileDiff(
-                target.resource,
-                current ?? "",
-                content,
-                current === undefined ? "added" : "modified",
-              )
-              yield* permission.assert({
-                action: "edit",
-                resources: [target.resource],
-                save: ["*"],
-                metadata: { files: [preview] },
-                sessionID: context.sessionID,
-                agent: context.agent,
-                source,
-              })
-              const result = yield* files.write({ target, content: input.content })
-              return {
-                operation: result.operation,
-                target: result.target,
-                resource: result.resource,
-                existed: result.existed,
-              }
-            }).pipe(
-              Effect.map((output) => ({ output, content: toModelOutput(output) })),
-              Effect.mapError((error) => new ToolFailure({ message: `Unable to write ${input.path}`, error })),
-            ),
-        }),
+        draft.add(
+          ({
+              name,
+              options: { codemode: false, permission: "edit" },
+              description:
+                "Writes a file to the local filesystem, overwriting if one exists.\n\nMissing parent directories are created automatically.\n\nUse this tool to create new files or overwrite existing files. For partial changes, use the edit tool instead.",
+              input: Input,
+              output: Output,
+              execute: (input, context) =>
+                Effect.gen(function* () {
+                  const source = {
+                    type: "tool" as const,
+                    messageID: context.messageID,
+                    id: context.id,
+                  }
+                  const target = yield* mutation.resolve({ path: input.path, kind: "file" })
+                  const external = target.externalDirectory
+                  if (external)
+                    yield* permission.assert({
+                      ...LocationMutation.externalDirectoryPermission(external),
+                      sessionID: context.sessionID,
+                      agent: context.agent,
+                      source,
+                    })
+                  const current = yield* Bom.readFile(fs, target.canonical).pipe(
+                    Effect.catchReason("PlatformError", "NotFound", () => Effect.succeed(undefined)),
+                  )
+                  const next = Bom.split(input.content)
+                  const preview = fileDiff(
+                    target.resource,
+                    current?.text ?? "",
+                    next.text,
+                    current ? "modified" : "added",
+                  )
+                  yield* permission.assert({
+                    action: "edit",
+                    resources: [target.resource],
+                    save: ["*"],
+                    metadata: { files: [preview] },
+                    sessionID: context.sessionID,
+                    agent: context.agent,
+                    source,
+                  })
+                  const result = yield* files.writeTextPreservingBom({ target, content: input.content })
+                  const bom = (yield* Bom.readFile(fs, target.canonical)).bom
+                  if (yield* formatter.file(target.canonical)) yield* Bom.syncFile(fs, target.canonical, bom)
+                  return result
+                }).pipe(
+                  Effect.map((output) => ({ output, content: toModelOutput(output) })),
+                  Effect.mapError((error) => new ToolFailure({ message: `Unable to write ${input.path}`, error })),
+                ),
+            }),
+        ),
       )
       .pipe(Effect.orDie)
   }),

packages/core/src/tool/read-filesystem.ts

@@ -2,13 +2,11 @@ export * as ReadToolFileSystem from "./read-filesystem"
 
 import path from "path"
 import { pathToFileURL } from "url"
-import { Context, Effect, Layer, Option, Schema, Scope } from "effect"
-import { systemError } from "effect/PlatformError"
+import { Context, Effect, Layer, Option, Schema } from "effect"
 import { FileSystem } from "../filesystem"
 import { FSUtil } from "@opencode-ai/util/fs-util"
 import { makeLocationNode } from "@opencode-ai/util/effect/app-node"
 import { AbsolutePath, NonNegativeInt, PositiveInt, RelativePath } from "../schema"
-import { WorkspaceEnvironment } from "../workspace/environment"
 
 export const MAX_READ_LINES = 2_000
 export const MAX_READ_BYTES = 50 * 1024
@@ -111,24 +109,6 @@ export interface Interface {
 
 export class Service extends Context.Service<Service, Interface>()("@opencode/ReadToolFileSystem") {}
 
-type FileType = WorkspaceEnvironment.FileInfo["type"]
-
-/** The filesystem surface `read` consumes; FSUtil satisfies it structurally. */
-export interface ReadSource {
-  readonly realPath: (path: string) => Effect.Effect<string, FSUtil.Error>
-  readonly open: (
-    path: string,
-    options: { readonly flag: "r" },
-  ) => Effect.Effect<
-    {
-      readonly stat: Effect.Effect<{ readonly type: FileType; readonly size: bigint | number }, FSUtil.Error>
-      readonly readAlloc: (bytes: number) => Effect.Effect<Option.Option<Uint8Array>, FSUtil.Error>
-    },
-    FSUtil.Error,
-    Scope.Scope
-  >
-}
-
 const extensions = new Set([
   ".zip",
   ".tar",
@@ -189,10 +169,7 @@ const decodeUtf8 = (resource: string, decoder: TextDecoder, bytes?: Uint8Array)
 const decodeChunk = (resource: string, decoder: TextDecoder, bytes: Uint8Array) =>
   bytes.includes(0) ? Effect.fail(new BinaryFileError({ resource })) : decodeUtf8(resource, decoder, bytes)
 
-export const inspect = Effect.fn("ReadTool.inspect")(function* (
-  fs: { readonly stat: (path: string) => Effect.Effect<{ readonly type: FileType }, FSUtil.Error> },
-  input: string,
-) {
+export const inspect = Effect.fn("ReadTool.inspect")(function* (fs: FSUtil.Interface, input: string) {
   const info = yield* fs.stat(input)
   const type = info.type === "File" ? "file" : info.type === "Directory" ? "directory" : undefined
   if (!type) return yield* Effect.fail(new PathKindError({ resource: input, expected: "a file or directory" }))
@@ -200,7 +177,7 @@ export const inspect = Effect.fn("ReadTool.inspect")(function* (
 })
 
 export const read = Effect.fn("ReadTool.read")(function* (
-  fs: ReadSource,
+  fs: FSUtil.Interface,
   input: string,
   resource: string,
   page: PageInput = {},
@@ -233,7 +210,10 @@ export const read = Effect.fn("ReadTool.read")(function* (
           type: "file" as const,
           uri: pathToFileURL(real).href,
           name: path.basename(real),
-          content: Buffer.concat(chunks, total).toString("base64"),
+          content: Buffer.concat(
+            chunks.map((chunk) => Buffer.from(chunk)),
+            total,
+          ).toString("base64"),
           encoding: "base64" as const,
           mime,
         }
@@ -354,6 +334,8 @@ export const read = Effect.fn("ReadTool.read")(function* (
 export const list = Effect.fn("ReadTool.list")(function* (fs: FSUtil.Interface, input: string, page: PageInput = {}) {
   const real = yield* fs.realPath(input)
   const items = yield* fs.readDirectoryEntries(real)
+  const offset = page.offset || 1
+  const limit = Math.min(page.limit || MAX_READ_LINES, MAX_READ_LINES)
   const entries = yield* Effect.forEach(
     items,
     (item) =>
@@ -371,16 +353,9 @@ export const list = Effect.fn("ReadTool.list")(function* (fs: FSUtil.Interface,
       }),
     { concurrency: 16 },
   )
-  return sortAndPage(
-    entries.filter((item): item is FileSystem.Entry => item !== undefined),
-    page,
-  )
-})
-
-const sortAndPage = (entries: FileSystem.Entry[], page: PageInput) => {
-  const offset = page.offset || 1
-  const limit = Math.min(page.limit || MAX_READ_LINES, MAX_READ_LINES)
-  const visible = entries.sort(FileSystem.compareEntries)
+  const visible = entries
+    .filter((item): item is FileSystem.Entry => item !== undefined)
+    .sort((a, b) => (a.type === b.type ? a.path.localeCompare(b.path) : a.type === "directory" ? -1 : 1))
   const selected = visible.slice(offset - 1, offset - 1 + limit)
   const truncated = offset - 1 + selected.length < visible.length
   return new ListPage({
@@ -389,7 +364,7 @@ const sortAndPage = (entries: FileSystem.Entry[], page: PageInput) => {
     truncated,
     ...(truncated ? { next: offset + selected.length } : {}),
   })
-}
+})
 
 const layer = Layer.effect(
   Service,
@@ -404,118 +379,3 @@ const layer = Layer.effect(
 )
 
 export const node = makeLocationNode({ service: Service, layer, deps: [FSUtil.node] })
-
-// Reads through WorkspaceEnvironment.Files so hosted sessions never touch the
-// host filesystem. The environment has no ranged read, so file reads transfer
-// the whole file once and page in memory.
-const hostedLayer = Layer.effect(
-  Service,
-  Effect.gen(function* () {
-    const env = yield* WorkspaceEnvironment.Service
-
-    // Absence surfaces as a platform NotFound so the read tool's missing-file
-    // handling stays backend-agnostic; other failures become filesystem errors.
-    const mapError =
-      (method: string) =>
-      (error: WorkspaceEnvironment.Error | WorkspaceEnvironment.NotFoundError): FSUtil.Error =>
-        error._tag === "WorkspaceEnvironment.NotFoundError"
-          ? systemError({ _tag: "NotFound", module: "FileSystem", method, pathOrDescriptor: error.path, cause: error })
-          : WorkspaceEnvironment.toFileSystemError(method)(error)
-
-    const stats = { stat: (target: string) => env.files.stat(target).pipe(Effect.mapError(mapError("stat"))) }
-
-    const source: ReadSource = {
-      // Paths arrive canonical from LocationMutation.resolve, so identity
-      // avoids a provider canonicalization round trip per read.
-      realPath: Effect.succeed,
-      // The environment has no ranged read, so each read call transfers the
-      // whole file once and pages in memory. Happy-path opens are that one
-      // transfer; only the failure path stats to classify a non-file target,
-      // which the shared read reports as PathKindError.
-      // TODO: Bound and page large hosted reads once environments expose file
-      // size and ranged reads.
-      open: (target) =>
-        env.files.read(target).pipe(
-          Effect.map((bytes) => {
-            let cursor = 0
-            return {
-              stat: Effect.succeed({ type: "File" as const, size: bytes.length }),
-              readAlloc: (size: number) =>
-                Effect.sync(() => {
-                  if (cursor >= bytes.length) return Option.none<Uint8Array>()
-                  const chunk = bytes.subarray(cursor, Math.min(cursor + size, bytes.length))
-                  cursor += chunk.length
-                  return Option.some(chunk)
-                }),
-            }
-          }),
-          Effect.catchTag("WorkspaceEnvironment.Error", (error) =>
-            stats.stat(target).pipe(
-              Effect.catch(() => Effect.fail(mapError("read")(error))),
-              Effect.flatMap((info) =>
-                info.type === "File"
-                  ? Effect.fail(mapError("read")(error))
-                  : Effect.succeed({
-                      stat: Effect.succeed({ type: info.type, size: 0 }),
-                      readAlloc: () => Effect.succeed(Option.none<Uint8Array>()),
-                    }),
-              ),
-            ),
-          ),
-          Effect.catchTag("WorkspaceEnvironment.NotFoundError", (error) => Effect.fail(mapError("read")(error))),
-        ),
-    }
-
-    // Matches the local list semantics: symlinks resolve and escape-filter
-    // against the listed directory. Non-symlink types come from the listing
-    // itself, keeping provider round trips proportional to symlink count.
-    const resolveSymlink = Effect.fnUntraced(function* (parent: string, name: string) {
-      const target = yield* env.files
-        .realPath(path.posix.join(parent, name))
-        .pipe(Effect.catch(() => Effect.succeed(undefined)))
-      if (target === undefined || !FSUtil.containsPosix(parent, target)) return undefined
-      const info = yield* env.files.stat(target).pipe(Effect.catch(() => Effect.succeed(undefined)))
-      if (info?.type === "Directory") return "directory" as const
-      if (info?.type === "File") return "file" as const
-      return undefined
-    })
-
-    const list = Effect.fn("ReadTool.list")(function* (input: string, page: PageInput = {}) {
-      const items = yield* env.files.list(input).pipe(Effect.mapError(mapError("list")))
-      const entries = yield* Effect.forEach(
-        items,
-        (item) =>
-          Effect.gen(function* () {
-            const type =
-              item.type === "file" || item.type === "directory"
-                ? item.type
-                : item.type === "symlink"
-                  ? yield* resolveSymlink(input, item.name)
-                  : undefined
-            if (!type) return
-            return FileSystem.Entry.make({
-              path: RelativePath.make(item.name + (type === "directory" ? "/" : "")),
-              type,
-            })
-          }),
-        { concurrency: 4 },
-      )
-      return sortAndPage(
-        entries.filter((item): item is FileSystem.Entry => item !== undefined),
-        page,
-      )
-    })
-
-    return Service.of({
-      inspect: (target) => inspect(stats, target),
-      read: (target, resource, page) => read(source, target, resource, page),
-      list,
-    })
-  }),
-)
-
-export const hostedNode = makeLocationNode({
-  service: Service,
-  layer: hostedLayer,
-  deps: [WorkspaceEnvironment.node],
-})

packages/core/src/workspace.ts

@@ -1,80 +1,6 @@
 export * as Workspace from "./workspace"
 
-import { eq } from "drizzle-orm"
-import { Context, Effect, Exit, Layer, Schema } from "effect"
-import { AbsolutePath } from "@opencode-ai/schema/schema"
 import { Workspace } from "@opencode-ai/schema/workspace"
-import { makeGlobalNode } from "@opencode-ai/util/effect/app-node"
-import { Database } from "./database/database"
-import { WorkspaceDriver } from "./workspace/driver"
-import { WorkspaceTable } from "./workspace/sql"
 
 export const ID = Workspace.ID
 export type ID = typeof ID.Type
-
-export class NotFoundError extends Schema.TaggedErrorClass<NotFoundError>()("Workspace.NotFoundError", {
-  id: ID,
-}) {}
-
-export interface Info extends Schema.Schema.Type<typeof Info> {}
-export const Info = Schema.Struct({
-  id: ID,
-  provider: Schema.String,
-  root: AbsolutePath,
-}).annotate({ identifier: "Workspace.Info" })
-
-export interface Interface {
-  /** Allocate through the named driver and persist. Resolves when the Workspace is usable. */
-  readonly create: (input: {
-    readonly provider: string
-  }) => Effect.Effect<Info, WorkspaceDriver.Error | WorkspaceDriver.ProviderNotFoundError>
-  /** Metadata read; never contacts a driver. */
-  readonly get: (id: ID) => Effect.Effect<Info, NotFoundError>
-  /** Provider key and opaque binding for WorkspaceDriver.connect. Hosted Location construction only. */
-  readonly binding: (
-    id: ID,
-  ) => Effect.Effect<{ readonly provider: string; readonly binding: WorkspaceDriver.Binding }, NotFoundError>
-}
-
-export class Service extends Context.Service<Service, Interface>()("@opencode/Workspace") {}
-
-const layer = Layer.effect(
-  Service,
-  Effect.gen(function* () {
-    const { db } = yield* Database.Service
-    const registry = yield* WorkspaceDriver.RegistryService
-
-    const require = Effect.fn("Workspace.require")(function* (id: ID) {
-      const row = yield* db.select().from(WorkspaceTable).where(eq(WorkspaceTable.id, id)).get().pipe(Effect.orDie)
-      if (!row) return yield* new NotFoundError({ id })
-      return row
-    })
-
-    return Service.of({
-      create: Effect.fn("Workspace.create")(function* (input) {
-        const driver = yield* registry.get(input.provider)
-        const id = ID.create()
-        const created = yield* Effect.acquireUseRelease(
-          driver.create({ workspaceID: id }),
-          (created) =>
-            db
-              .insert(WorkspaceTable)
-              .values({ id, provider: input.provider, binding: created.binding, root: created.root })
-              .pipe(Effect.orDie, Effect.as(created)),
-          (created, exit) => (Exit.isFailure(exit) ? driver.destroy(created.binding).pipe(Effect.ignore) : Effect.void),
-        )
-        return Info.make({ id, provider: input.provider, root: AbsolutePath.make(created.root) })
-      }),
-      get: Effect.fn("Workspace.get")(function* (id) {
-        const row = yield* require(id)
-        return Info.make({ id: row.id, provider: row.provider, root: AbsolutePath.make(row.root) })
-      }),
-      binding: Effect.fn("Workspace.binding")(function* (id) {
-        const row = yield* require(id)
-        return { provider: row.provider, binding: row.binding }
-      }),
-    })
-  }),
-)
-
-export const node = makeGlobalNode({ service: Service, layer, deps: [Database.node, WorkspaceDriver.registryNode] })

packages/core/src/workspace/driver.ts

@@ -1,70 +0,0 @@
-export * as WorkspaceDriver from "./driver"
-
-import { Context, Effect, Layer, Schema, Scope } from "effect"
-import { Workspace } from "@opencode-ai/schema/workspace"
-import { makeGlobalNode } from "@opencode-ai/util/effect/app-node"
-import type { WorkspaceEnvironment } from "./environment"
-
-/**
- * Smallest provider-owned JSON value required to reconnect to the same
- * provider resource. Core stores it opaquely and hands it back; only the
- * owning driver reads inside.
- */
-export const Binding = Schema.Record(Schema.String, Schema.Json)
-export type Binding = typeof Binding.Type
-
-export class Error extends Schema.TaggedErrorClass<Error>()("WorkspaceDriver.Error", {
-  provider: Schema.String,
-  message: Schema.optional(Schema.String),
-  cause: Schema.optional(Schema.Defect()),
-}) {}
-
-export class ProviderNotFoundError extends Schema.TaggedErrorClass<ProviderNotFoundError>()(
-  "WorkspaceDriver.ProviderNotFoundError",
-  { provider: Schema.String },
-) {}
-
-export interface Interface {
-  /** Allocate a new environment. Resolves only when it is ready to use. */
-  readonly create: (input: {
-    readonly workspaceID: Workspace.ID
-  }) => Effect.Effect<{ readonly binding: Binding; readonly root: string }, Error>
-
-  /**
-   * Binding -> live capabilities; the only way to obtain an environment.
-   * Fresh-create and restart-reconnect both flow through here. Closing the
-   * scope drops the connection, never the provider resource.
-   */
-  readonly connect: (binding: Binding) => Effect.Effect<WorkspaceEnvironment.Interface, Error, Scope.Scope>
-
-  /** Permanently release provider resources. */
-  readonly destroy: (binding: Binding) => Effect.Effect<void, Error>
-}
-
-/** Identity constructor so driver definitions get contextual typing. */
-export const make = (driver: Interface) => driver
-
-export interface Registry {
-  readonly get: (provider: string) => Effect.Effect<Interface, ProviderNotFoundError>
-}
-
-export class RegistryService extends Context.Service<RegistryService, Registry>()("@opencode/WorkspaceDriverRegistry") {}
-
-/** Immutable registry fixed at composition time. */
-export const registry = (drivers: Readonly<Record<string, Interface>>): Registry => ({
-  get: (provider) => {
-    const driver = drivers[provider]
-    return driver ? Effect.succeed(driver) : Effect.fail(new ProviderNotFoundError({ provider }))
-  },
-})
-
-/**
- * Defaults to no drivers, so every provider fails with ProviderNotFoundError.
- * Server composition (or a test) replaces this binding with real drivers;
- * core never constructs one.
- */
-export const registryNode = makeGlobalNode({
-  service: RegistryService,
-  layer: Layer.succeed(RegistryService, RegistryService.of(registry({}))),
-  deps: [],
-})

packages/core/src/workspace/environment.ts

@@ -1,133 +0,0 @@
-export * as WorkspaceEnvironment from "./environment"
-
-import { Context, Effect, FileSystem, Layer, Schema } from "effect"
-import { FSUtil } from "@opencode-ai/util/fs-util"
-import type { ChildProcessSpawner } from "effect/unstable/process/ChildProcessSpawner"
-import { makeLocationNode, tags } from "@opencode-ai/util/effect/app-node"
-import { LayerNode } from "@opencode-ai/util/effect/layer-node"
-import { Workspace } from "../workspace"
-import { WorkspaceDriver } from "./driver"
-
-export class Error extends Schema.TaggedErrorClass<Error>()("WorkspaceEnvironment.Error", {
-  operation: Schema.String,
-  path: Schema.optional(Schema.String),
-  cause: Schema.optional(Schema.Defect()),
-}) {}
-
-/** Distinct so callers (e.g. the LocationMutation ancestor walk) can catch absence. */
-export class NotFoundError extends Schema.TaggedErrorClass<NotFoundError>()("WorkspaceEnvironment.NotFoundError", {
-  path: Schema.String,
-}) {}
-
-/** Translate environment failures into the host filesystem error vocabulary. */
-export const toFileSystemError =
-  (method: string) =>
-  (cause: Error | NotFoundError): FSUtil.Error =>
-    new FSUtil.FileSystemError({ method, cause })
-
-/**
- * Wrap one driver promise, translating the driver's not-found signal into the
- * environment error vocabulary so drivers and fakes never construct it ad hoc.
- */
-export const tryOperation = <A>(input: {
-  readonly operation: string
-  readonly path: string
-  readonly run: () => Promise<A>
-  readonly isNotFound: (cause: unknown) => boolean
-}): Effect.Effect<A, Error | NotFoundError> =>
-  Effect.tryPromise({
-    try: input.run,
-    catch: (cause) =>
-      input.isNotFound(cause)
-        ? new NotFoundError({ path: input.path })
-        : new Error({ operation: input.operation, path: input.path, cause }),
-  })
-
-export interface FileInfo {
-  readonly type: FileSystem.File.Type
-}
-
-export interface DirectoryEntry {
-  readonly name: string
-  readonly type: "file" | "directory" | "symlink" | "other"
-}
-
-/**
- * The minimal primitive set the hosted implementations of Filesystem,
- * LocationMutation, and FileMutation consume. Grow it only when a real
- * consumer appears. Every method is one provider round trip: type mismatches
- * (read a directory, list a file) fail with Error instead of requiring a
- * stat pre-check.
- */
-export interface Files {
-  readonly stat: (path: string) => Effect.Effect<FileInfo, Error | NotFoundError>
-  /** Canonical path with symlinks resolved; identity for permissions and locking. */
-  readonly realPath: (path: string) => Effect.Effect<string, Error | NotFoundError>
-  readonly read: (path: string) => Effect.Effect<Uint8Array, Error | NotFoundError>
-  readonly list: (path: string) => Effect.Effect<readonly DirectoryEntry[], Error | NotFoundError>
-  /** Creates parent directories, matching FSUtil.writeWithDirs. */
-  readonly write: (path: string, content: Uint8Array) => Effect.Effect<void, Error>
-  /** Removes one file. Removing a missing path fails with NotFoundError. */
-  readonly remove: (path: string) => Effect.Effect<void, Error | NotFoundError>
-}
-
-export interface Shell {
-  readonly executable: string
-  readonly args: (command: string) => readonly string[]
-  readonly environmentOverrides: Readonly<Record<string, string>>
-  readonly detached: boolean
-}
-
-export interface Interface {
-  /** The Workspace root, absolute in the provider filesystem. */
-  readonly directory: string
-  readonly files: Files
-  readonly process: ChildProcessSpawner["Service"]
-  readonly shell: Shell
-}
-
-export class Service extends Context.Service<Service, Interface>()("@opencode/WorkspaceEnvironment") {}
-
-/** NotFound becomes undefined; other environment failures become defects. */
-export const optional = <A>(effect: Effect.Effect<A, Error | NotFoundError>): Effect.Effect<A | undefined> =>
-  effect.pipe(
-    Effect.catchTag("WorkspaceEnvironment.NotFoundError", () => Effect.succeed(undefined)),
-    Effect.orDie,
-  )
-
-/** Present only in hosted Location graphs; local graphs never bind it. */
-export const node = LayerNode.unbound(Service, tags.values.location)
-
-/**
- * Connects on graph boot and stays connected for the graph's cached lifetime:
- * Layer.effect supplies the build scope, so releasing the LayerMap entry
- * closes the connection. It never stops or deletes the provider resource.
- */
-export const hostedNode = (workspaceID: Workspace.ID) =>
-  makeLocationNode({
-    service: Service,
-    // Connect failures during graph build are defects, matching the local
-    // graph's E = never. Typed availability errors are a later design.
-    layer: Layer.effect(
-      Service,
-      Effect.gen(function* () {
-        const workspaces = yield* Workspace.Service
-        const registry = yield* WorkspaceDriver.RegistryService
-        const found = yield* workspaces.binding(workspaceID)
-        const driver = yield* registry.get(found.provider)
-        return yield* driver.connect(found.binding)
-      }),
-    ).pipe(Layer.orDie),
-    deps: [Workspace.node, WorkspaceDriver.registryNode],
-  })
-
-/** Identity constructor so environment literals get contextual typing. */
-export const make = (environment: Interface) => environment
-
-/** Default lowering for Linux sandbox images. */
-export const linuxShell: Shell = {
-  executable: "/bin/bash",
-  args: (command) => ["-c", command],
-  environmentOverrides: {},
-  detached: false,
-}

packages/core/src/workspace/sql.ts

@@ -1,12 +0,0 @@
-import { sqliteTable, text } from "drizzle-orm/sqlite-core"
-import { Timestamps } from "../database/schema.sql"
-import type { Workspace } from "@opencode-ai/schema/workspace"
-import type { WorkspaceDriver } from "./driver"
-
-export const WorkspaceTable = sqliteTable("workspace", {
-  id: text().$type<Workspace.ID>().primaryKey(),
-  provider: text().notNull(),
-  binding: text({ mode: "json" }).$type<WorkspaceDriver.Binding>().notNull(),
-  root: text().notNull(),
-  ...Timestamps,
-})

packages/core/test/config/agent.test.ts

@@ -12,7 +12,6 @@ import { LayerNode } from "@opencode-ai/util/effect/layer-node"
 import { FSUtil } from "@opencode-ai/util/fs-util"
 import { Global } from "@opencode-ai/util/global"
 import { Permission } from "@opencode-ai/core/permission"
-import { AgentPlugin } from "@opencode-ai/core/plugin/agent"
 import { AbsolutePath } from "@opencode-ai/core/schema"
 import { ConfigMigrateV1 } from "@opencode-ai/core/v1/config/migrate"
 import { advance, drain } from "../lib/clock"
@@ -60,96 +59,6 @@ describe("ConfigAgentPlugin.Plugin", () => {
     }),
   )
 
-  it.effect("applies remote permission defaults before explicit global and build rules", () =>
-    Effect.gen(function* () {
-      const agents = yield* Agent.Service
-      const global = yield* Global.Service
-      yield* AgentPlugin.Plugin.effect(host({ agent: agentHost(agents) }))
-
-      const entries = [
-        new Document({
-          type: "document",
-          info: decode(
-            ConfigMigrateV1.migrate({
-              permission: {
-                bash: "ask",
-                edit: "ask",
-                webfetch: "ask",
-                read: {
-                  "*": "allow",
-                  "*.env": "deny",
-                  "*.env.*": "deny",
-                  "*.env.example": "allow",
-                  "*.dev.vars": "deny",
-                  "~/.local/share/opencode/mcp-auth.json": "deny",
-                  "$HOME/.local/share/opencode/mcp-auth.json": "deny",
-                },
-                external_directory: {
-                  "*": "ask",
-                  "~/.local/share/opencode/*": "deny",
-                },
-              },
-            }),
-          ),
-        }),
-        new Document({
-          type: "document",
-          info: decode({
-            permissions: [{ action: "*", resource: "*", effect: "allow" }],
-            agents: {
-              build: {
-                permissions: [
-                  { action: "external_directory", resource: "*", effect: "allow" },
-                  {
-                    action: "external_directory",
-                    resource: "~/.local/share/opencode/*",
-                    effect: "deny",
-                  },
-                  { action: "read", resource: "*.env", effect: "deny" },
-                ],
-              },
-            },
-          }),
-        }),
-      ]
-
-      yield* ConfigAgentPlugin.Plugin.effect(host({ agent: agentHost(agents) })).pipe(
-        Effect.provide(Config.testLayer(entries)),
-      )
-
-      const build = yield* agents.get(Agent.defaultID)
-      if (!build) throw new Error("expected configured build agent")
-      const opencodeData = path.join(global.home, ".local", "share", "opencode", "*")
-      const mcpAuth = path.join(global.home, ".local", "share", "opencode", "mcp-auth.json")
-      expect(build.permissions).toEqual([
-        ...defaultPermissions(global),
-        { action: "question", resource: "*", effect: "allow" },
-        { action: "shell", resource: "*", effect: "ask" },
-        { action: "edit", resource: "*", effect: "ask" },
-        { action: "webfetch", resource: "*", effect: "ask" },
-        { action: "read", resource: "*", effect: "allow" },
-        { action: "read", resource: "*.env", effect: "deny" },
-        { action: "read", resource: "*.env.*", effect: "deny" },
-        { action: "read", resource: "*.env.example", effect: "allow" },
-        { action: "read", resource: "*.dev.vars", effect: "deny" },
-        { action: "read", resource: mcpAuth, effect: "deny" },
-        { action: "read", resource: mcpAuth, effect: "deny" },
-        { action: "external_directory", resource: "*", effect: "ask" },
-        { action: "external_directory", resource: opencodeData, effect: "deny" },
-        { action: "*", resource: "*", effect: "allow" },
-        { action: "external_directory", resource: "*", effect: "allow" },
-        { action: "external_directory", resource: opencodeData, effect: "deny" },
-        { action: "read", resource: "*.env", effect: "deny" },
-      ])
-      expect(Permission.evaluate("shell", "bun test", build.permissions).effect).toBe("allow")
-      expect(Permission.evaluate("edit", "src/index.ts", build.permissions).effect).toBe("allow")
-      expect(Permission.evaluate("webfetch", "https://example.com", build.permissions).effect).toBe("allow")
-      expect(Permission.evaluate("read", ".env", build.permissions).effect).toBe("deny")
-      expect(Permission.evaluate("external_directory", opencodeData, build.permissions).effect).toBe("deny")
-      expect(Permission.evaluate("external_directory", "/outside/*", build.permissions).effect).toBe("allow")
-    }),
-  )
-
   it.effect("applies all global permissions before agent-specific permissions", () =>
     Effect.gen(function* () {
       const agents = yield* Agent.Service

packages/core/test/config/config.test.ts

@@ -307,7 +307,7 @@ describe("Config", () => {
     }),
   )
 
-  it.live("loads authenticated wellknown config before user configuration", () =>
+  it.live("loads authenticated wellknown config below project config", () =>
     Effect.acquireUseRelease(
       Effect.promise(() => tmpdir()),
       (tmp) =>
@@ -370,13 +370,7 @@ describe("Config", () => {
           return yield* Effect.gen(function* () {
             const config = yield* Config.Service
             const bus = yield* Bus.Service
-            const initial = yield* config.entries()
-            expect(Config.latest(initial, "shell")).toBe("project")
-            expect(
-              initial.flatMap((entry) =>
-                entry.type === "document" && entry.info.shell ? [entry.info.shell] : [],
-              ),
-            ).toEqual(["secret", "global", "project"])
+            expect(Config.latest(yield* config.entries(), "shell")).toBe("project")
             const updated = yield* bus
               .subscribe(Event.Updated)
               .pipe(Stream.take(1), Stream.runCollect, Effect.forkScoped)
@@ -384,13 +378,7 @@ describe("Config", () => {
             key = "next"
             yield* bus.publish(Integration.Event.ConnectionUpdated, { integrationID })
             expect(yield* Fiber.join(updated)).toHaveLength(1)
-            const refreshed = yield* config.entries()
-            expect(Config.latest(refreshed, "shell")).toBe("project")
-            expect(
-              refreshed.flatMap((entry) =>
-                entry.type === "document" && entry.info.shell ? [entry.info.shell] : [],
-              ),
-            ).toEqual(["next", "global", "project"])
+            expect(Config.latest(yield* config.entries(), "shell")).toBe("project")
           }).pipe(
             Effect.provide(testLayer(project, global, project, undefined, undefined, credentialNode, wellknownNode)),
           )

packages/core/test/config/provider.test.ts

@@ -237,11 +237,7 @@ describe("ConfigProviderPlugin.Plugin", () => {
                   models: {
                     chat: {
                       name: "First",
-                      compatibility: {
-                        reasoningField: "vendor_reasoning",
-                        maxTokensField: "max_completion_tokens",
-                        requireFinishReason: false,
-                      },
+                      compatibility: { reasoningField: "vendor_reasoning" },
                       capabilities: { tools: true, input: ["text"], output: ["text"] },
                       disabled: true,
                       limit: { context: 100, output: 50 },
@@ -322,11 +318,7 @@ describe("ConfigProviderPlugin.Plugin", () => {
         expect(model.id).toBe(modelID)
         expect(model.modelID).toBe(Model.ID.make("api-chat"))
         expect(model.name).toBe("Last")
-        expect(model.compatibility).toEqual({
-          reasoningField: "vendor_reasoning",
-          maxTokensField: "max_completion_tokens",
-          requireFinishReason: false,
-        })
+        expect(model.compatibility).toEqual({ reasoningField: "vendor_reasoning" })
         expect(model.capabilities).toEqual({ tools: true, input: ["text"], output: ["text"] })
         expect(model.enabled).toBe(false)
         expect(model.limit).toEqual({ context: 100, output: 75 })

packages/core/test/file-mutation.test.ts

@@ -46,7 +46,6 @@ describe("FileMutation", () => {
           target: target.canonical,
           resource: "hello.txt",
           existed: true,
-          content: "after",
         })
         expect(yield* Effect.promise(() => fs.readFile(targetPath, "utf8"))).toBe("after")
       }).pipe(provide(directory)),
@@ -66,7 +65,6 @@ describe("FileMutation", () => {
           target: target.canonical,
           resource: "src/nested/hello.txt",
           existed: false,
-          content: "hello",
         })
         expect(yield* Effect.promise(() => fs.readFile(result.target, "utf8"))).toBe("hello")
       }).pipe(provide(directory)),
@@ -82,8 +80,8 @@ describe("FileMutation", () => {
         const created = yield* (yield* LocationMutation.Service).resolve({ path: "created.txt" })
         const files = yield* FileMutation.Service
 
-        yield* files.write({ target: preserved, content: "\uFEFFafter" })
-        yield* files.write({ target: created, content: "\uFEFF\uFEFF\uFEFFcreated" })
+        yield* files.writeTextPreservingBom({ target: preserved, content: "\uFEFFafter" })
+        yield* files.writeTextPreservingBom({ target: created, content: "\uFEFF\uFEFF\uFEFFcreated" })
 
         expect(yield* Effect.promise(() => fs.readFile(preservedPath, "utf8"))).toBe("\uFEFFafter")
         expect(yield* Effect.promise(() => fs.readFile(created.canonical, "utf8"))).toBe("\uFEFFcreated")
@@ -91,31 +89,6 @@ describe("FileMutation", () => {
     ),
   )
 
-  it.live("moves a file and transfers its BOM to the destination", () =>
-    withTmp((directory) =>
-      Effect.gen(function* () {
-        const fromPath = path.join(directory, "from.txt")
-        yield* Effect.promise(() => fs.writeFile(fromPath, "\uFEFFbefore"))
-        const mutation = yield* LocationMutation.Service
-        const from = yield* mutation.resolve({ path: "from.txt" })
-        const to = yield* mutation.resolve({ path: "to.txt" })
-
-        const result = yield* (yield* FileMutation.Service).move({ from, to, content: "after" })
-
-        expect(result.content).toBe("after")
-        expect(yield* Effect.promise(() => fs.readFile(to.canonical, "utf8"))).toBe("\uFEFFafter")
-        expect(
-          yield* Effect.promise(() =>
-            fs.access(fromPath).then(
-              () => true,
-              () => false,
-            ),
-          ),
-        ).toBe(false)
-      }).pipe(provide(directory)),
-    ),
-  )
-
   it.live("writes an explicitly resolved external target", () =>
     withTmp((directory) =>
       withTmp((outside) =>
@@ -129,7 +102,6 @@ describe("FileMutation", () => {
             target: target.canonical,
             resource: target.resource,
             existed: false,
-            content: "external",
           })
           expect(yield* Effect.promise(() => fs.readFile(targetPath, "utf8"))).toBe("external")
         }).pipe(provide(directory)),

packages/core/test/lib/workspace.ts

@@ -1,161 +0,0 @@
-import { mkdir, readdir, readFile, realpath, rm, stat, writeFile } from "fs/promises"
-import nodePath from "path"
-import { Effect, Layer } from "effect"
-import { make } from "effect/unstable/process/ChildProcessSpawner"
-import type { ChildProcessSpawner } from "effect/unstable/process/ChildProcessSpawner"
-import { Location } from "@opencode-ai/core/location"
-import { Project } from "@opencode-ai/core/project"
-import { AbsolutePath } from "@opencode-ai/core/schema"
-import { Workspace } from "@opencode-ai/core/workspace"
-import { WorkspaceEnvironment } from "@opencode-ai/core/workspace/environment"
-
-export const ROOT = "/workspace"
-
-export const workspaceID = Workspace.ID.make("wrk_test")
-
-/** A hosted Location at the workspace root, as hostedBoundNode would state it. */
-export const hostedLocationLayer = (root: string = ROOT) =>
-  Layer.succeed(
-    Location.Service,
-    Location.Service.of({
-      directory: AbsolutePath.make(root),
-      workspaceID,
-      project: Project.hostedGlobal(root),
-    }),
-  )
-
-export interface MemoryEnvironment {
-  readonly environment: WorkspaceEnvironment.Interface
-  /** Live view of stored file contents by absolute path. */
-  readonly contents: (path: string) => string | undefined
-}
-/**
- * Environment backed by a real host directory and spawner: the honest fake
- * for end-to-end tests. Files go through fs/promises, commands actually run
- * with the given spawner, so bash output is visible to reads.
- */
-export const directoryEnvironment = (
-  root: string,
-  spawn: ChildProcessSpawner["Service"]["spawn"],
-): WorkspaceEnvironment.Interface => {
-  const wrap = <A>(operation: string, path: string, run: () => Promise<A>) =>
-    WorkspaceEnvironment.tryOperation({
-      operation,
-      path,
-      run,
-      isNotFound: (cause) => (cause as NodeJS.ErrnoException).code === "ENOENT",
-    })
-  return WorkspaceEnvironment.make({
-    directory: root,
-    files: {
-      stat: (path) =>
-        wrap("stat", path, async () => {
-          const info = await stat(path)
-          return {
-            type: info.isFile()
-              ? ("File" as const)
-              : info.isDirectory()
-                ? ("Directory" as const)
-                : ("Unknown" as const),
-          }
-        }),
-      realPath: (path) => wrap("realPath", path, () => realpath(path)),
-      read: (path) => wrap("read", path, async () => Uint8Array.from(await readFile(path))),
-      list: (path) =>
-        wrap("list", path, async () => {
-          const entries = await readdir(path, { withFileTypes: true })
-          return entries.map((entry) => ({
-            name: entry.name,
-            type: entry.isFile()
-              ? ("file" as const)
-              : entry.isDirectory()
-                ? ("directory" as const)
-                : entry.isSymbolicLink()
-                  ? ("symlink" as const)
-                  : ("other" as const),
-          }))
-        }),
-      write: (path, content) =>
-        Effect.tryPromise({
-          try: async () => {
-            await mkdir(nodePath.dirname(path), { recursive: true })
-            await writeFile(path, content)
-          },
-          catch: (cause) => new WorkspaceEnvironment.Error({ operation: "write", path, cause }),
-        }),
-      remove: (path) => wrap("remove", path, () => rm(path)),
-    },
-    process: make(spawn),
-    shell: {
-      executable: "/bin/bash",
-      args: (command) => ["-c", command],
-      // Real commands need PATH; nothing else from the host environment leaks.
-      environmentOverrides: { PATH: process.env.PATH ?? "" },
-      detached: false,
-    },
-  })
-}
-
-/**
- * In-memory workspace environment rooted at /workspace: file paths to
- * contents, directories implied by keys, no symlinks, no processes. Type
- * mismatches (read a directory, list a file) fail with Error per the Files
- * contract.
- */
-export const memoryEnvironment = (files: Record<string, string>): MemoryEnvironment => {
-  const encoder = new TextEncoder()
-  const decoder = new TextDecoder()
-  const store = new Map(Object.entries(files).map(([key, value]) => [key, Uint8Array.from(encoder.encode(value))]))
-  const isDirectory = (path: string) =>
-    path === ROOT || Array.from(store.keys()).some((key) => key.startsWith(path + "/"))
-  const exists = (path: string) => store.has(path) || isDirectory(path)
-  const notFound = (path: string) => Effect.fail(new WorkspaceEnvironment.NotFoundError({ path }))
-  const wrongType = (operation: string, path: string) =>
-    Effect.fail(new WorkspaceEnvironment.Error({ operation, path }))
-  const environment = WorkspaceEnvironment.make({
-    directory: ROOT,
-    files: {
-      stat: (path) =>
-        store.has(path)
-          ? Effect.succeed({ type: "File" as const })
-          : isDirectory(path)
-            ? Effect.succeed({ type: "Directory" as const })
-            : notFound(path),
-      realPath: (path) => (exists(path) ? Effect.succeed(path) : notFound(path)),
-      read: (path) => {
-        const content = store.get(path)
-        if (content) return Effect.succeed(content)
-        return isDirectory(path) ? wrongType("read", path) : notFound(path)
-      },
-      list: (path) => {
-        if (store.has(path)) return wrongType("list", path)
-        if (!isDirectory(path)) return notFound(path)
-        const names = new Map<string, "file" | "directory">()
-        for (const key of store.keys()) {
-          if (!key.startsWith(path + "/")) continue
-          const rest = key.slice(path.length + 1)
-          const [head] = rest.split("/")
-          if (head) names.set(head, rest.includes("/") ? "directory" : "file")
-        }
-        return Effect.succeed(Array.from(names, ([name, type]) => ({ name, type })))
-      },
-      write: (path, content) =>
-        Effect.sync(() => {
-          store.set(path, Uint8Array.from(content))
-        }),
-      remove: (path) => {
-        if (store.delete(path)) return Effect.void
-        return isDirectory(path) ? wrongType("remove", path) : notFound(path)
-      },
-    },
-    process: make(() => Effect.die(new Error("no processes in the memory environment"))),
-    shell: WorkspaceEnvironment.linuxShell,
-  })
-  return {
-    environment,
-    contents: (path) => {
-      const stored = store.get(path)
-      return stored ? decoder.decode(stored) : undefined
-    },
-  }
-}

packages/core/test/location-mutation.test.ts

@@ -163,35 +163,6 @@ describe("LocationMutation", () => {
     ),
   )
 
-  it.live("authorizes an external symlink by the named path", () =>
-    withTmp((directory) =>
-      withTmp((outside) =>
-        withTmp((referent) =>
-          Effect.gen(function* () {
-            if (process.platform === "win32") return
-            const targetPath = path.join(referent, "target.txt")
-            const linkPath = path.join(outside, "link.txt")
-            yield* Effect.promise(async () => {
-              await fs.writeFile(targetPath, "content")
-              await fs.symlink(targetPath, linkPath)
-            })
-
-            const target = yield* (yield* LocationMutation.Service).resolve({ path: linkPath })
-            expect(target).toMatchObject({
-              absolute: linkPath,
-              canonical: yield* Effect.promise(() => fs.realpath(targetPath)),
-              resource: linkPath.replaceAll("\\", "/"),
-              externalDirectory: {
-                directory: outside,
-                resource: path.join(outside, "*").replaceAll("\\", "/"),
-              },
-            })
-          }).pipe(provide(directory)),
-        ),
-      ),
-    ),
-  )
-
   it.live("anchors prospective external descendants at their stable existing directory", () =>
     withTmp((directory) =>
       withTmp((outside) =>

packages/core/test/model-resolver.test.ts

@@ -194,11 +194,7 @@ describe("ModelResolver", () => {
     Effect.gen(function* () {
       const resolved = yield* ModelResolver.fromCatalogModel(
         model(Provider.aisdk("@ai-sdk/openai-compatible"), {
-          compatibility: {
-            reasoningField: "vendor_reasoning",
-            maxTokensField: "max_completion_tokens",
-            requireFinishReason: false,
-          },
+          compatibility: { reasoningField: "vendor_reasoning" },
           settings: {
             apiKey: "settings-secret",
             baseURL: "https://compatible.example/v1",
@@ -208,8 +204,7 @@ describe("ModelResolver", () => {
           body: {},
         }),
       )
-      const request = LLM.request({ model: resolved, prompt: "Hello", generation: { maxTokens: 10 } })
-      const prepared = yield* compileRequest(request)
+      const request = LLM.request({ model: resolved, prompt: "Hello" })
       const headers = yield* resolved.route.auth.apply({
         request,
         method: "POST",
@@ -221,10 +216,6 @@ describe("ModelResolver", () => {
       expect(headers.authorization).toBe("Bearer settings-secret")
       expect(resolved.route.id).toBe("openai-compatible-chat")
       expect(resolved.compatibility?.reasoningField).toBe("vendor_reasoning")
-      expect(resolved.compatibility?.maxTokensField).toBe("max_completion_tokens")
-      expect(resolved.compatibility?.requireFinishReason).toBe(false)
-      expect(prepared.body).toMatchObject({ max_completion_tokens: 10 })
-      expect(prepared.body).not.toHaveProperty("max_tokens")
       expect(resolved.route.endpoint.baseURL).toBe("https://compatible.example/v1")
       expect(resolved.route.defaults.http?.body).toEqual({})
     }),

packages/core/test/pty/ticket.test.ts

@@ -3,6 +3,7 @@ import { Effect, Layer } from "effect"
 import { LayerNode } from "@opencode-ai/util/effect/layer-node"
 import { PtyID } from "@opencode-ai/core/pty/schema"
 import { PtyTicket } from "@opencode-ai/core/pty/ticket"
+import { Workspace } from "@opencode-ai/core/workspace"
 import { testEffect } from "../lib/effect"
 
 const it = testEffect(LayerNode.compile(PtyTicket.node))
@@ -45,14 +46,17 @@ describe("PTY websocket tickets", () => {
     }),
   )
 
-  it.live("rejects tickets scoped to a different pty", () =>
+  it.live("rejects tickets scoped to a different workspace", () =>
     Effect.gen(function* () {
       const tickets = yield* PtyTicket.Service
       const ptyID = PtyID.ascending()
-      const issued = yield* tickets.issue({ ptyID })
+      const workspaceID = Workspace.ID.ascending()
+      const issued = yield* tickets.issue({ ptyID, workspaceID })
 
-      expect(yield* tickets.consume({ ptyID: PtyID.ascending(), ticket: issued.ticket })).toBe(false)
-      expect(yield* tickets.consume({ ptyID, ticket: issued.ticket })).toBe(true)
+      expect(yield* tickets.consume({ ptyID, workspaceID: Workspace.ID.ascending(), ticket: issued.ticket })).toBe(
+        false,
+      )
+      expect(yield* tickets.consume({ ptyID, workspaceID, ticket: issued.ticket })).toBe(true)
     }),
   )
 })

packages/core/test/session-create.test.ts

@@ -23,7 +23,7 @@ import { SessionPending } from "@opencode-ai/core/session/pending"
 import { SessionEvent } from "@opencode-ai/core/session/event"
 import { SessionTable } from "@opencode-ai/core/session/sql"
 import { SessionStore } from "@opencode-ai/core/session/store"
-import { SessionTransfer } from "@opencode-ai/core/session/transfer"
+import { Workspace } from "@opencode-ai/core/workspace"
 import { testEffect } from "./lib/effect"
 import { tmpdir } from "./fixture/tmpdir"
 
@@ -37,14 +37,7 @@ const projects = Layer.succeed(
 )
 const it = testEffect(
   AppNodeBuilder.build(
-    LayerNode.group([
-      Database.node,
-      Bus.node,
-      SessionProjector.node,
-      SessionStore.node,
-      Session.node,
-      SessionTransfer.node,
-    ]),
+    LayerNode.group([Database.node, Bus.node, SessionProjector.node, SessionStore.node, Session.node]),
     [
       [Bus.node, Bus.configured({ persist: true })],
       [Project.node, projects],
@@ -126,6 +119,7 @@ describe("Session.create", () => {
   it.effect("stores supplied immutable create attributes", () =>
     Effect.gen(function* () {
       const session = yield* Session.Service
+      const workspaceID = Workspace.ID.make("wrk_test")
       const model = Model.Ref.make({
         id: Model.ID.make("sonnet"),
         providerID: Provider.ID.anthropic,
@@ -134,11 +128,11 @@ describe("Session.create", () => {
 
       expect(
         yield* session.create({
-          location: Location.Ref.make({ directory: location.directory }),
+          location: Location.Ref.make({ directory: location.directory, workspaceID }),
           agent: Agent.ID.make("build"),
           model,
         }),
-      ).toMatchObject({ location: { directory: location.directory }, agent: "build", model })
+      ).toMatchObject({ location: { directory: location.directory, workspaceID }, agent: "build", model })
     }),
   )
 
@@ -746,77 +740,3 @@ describe("Session.create", () => {
     }),
   )
 })
-
-describe("SessionTransfer", () => {
-  it.effect("imports projected messages and reserves their aggregate sequence", () =>
-    Effect.gen(function* () {
-      const session = yield* Session.Service
-      const transfer = yield* SessionTransfer.Service
-      const bus = yield* Bus.Service
-      const { db } = yield* Database.Service
-      const template = yield* session.create({ location, title: "Exported" })
-      const sessionID = Session.ID.create()
-      const sourceMessageID = SessionMessage.ID.create()
-      const errorMessageID = SessionMessage.ID.create()
-
-      const imported = yield* transfer.import({
-        data: {
-          info: { ...template, id: sessionID },
-          messages: [
-            {
-              id: sourceMessageID,
-              type: "user",
-              text: "Imported message",
-              time: { created: DateTime.makeUnsafe(100) },
-            },
-            {
-              id: errorMessageID,
-              type: "compaction",
-              status: "failed",
-              reason: "manual",
-              error: { type: "test_error", message: "Original error" },
-              time: { created: DateTime.makeUnsafe(101) },
-            },
-          ],
-        },
-        location,
-      })
-      const messages = yield* session.messages({ sessionID, order: "asc" })
-
-      expect(imported).toMatchObject({ id: sessionID, title: "Exported", location })
-      expect(messages).toMatchObject([
-        { id: sourceMessageID, type: "user", text: "Imported message" },
-        { id: errorMessageID, type: "compaction", error: { type: "test_error", message: "Original error" } },
-      ])
-      expect(yield* Bus.latestSequence(db, sessionID)).toBe(2)
-      expect((yield* transfer.export({ sessionID })).messages).toEqual(messages)
-      expect((yield* transfer.export({ sessionID, sanitize: true })).messages).toMatchObject([
-        { id: sourceMessageID, text: `[redacted:text:${sourceMessageID}]` },
-        { id: errorMessageID, error: { type: "test_error", message: "Original error" } },
-      ])
-
-      yield* session.prompt({ sessionID, text: "Continue", resume: false })
-      yield* SessionPending.promote(db, bus, sessionID, "steer")
-
-      expect((yield* session.messages({ sessionID, order: "asc" })).map((message) => message.type)).toEqual([
-        "user",
-        "compaction",
-        "user",
-      ])
-      expect(yield* Bus.latestSequence(db, sessionID)).toBe(4)
-    }),
-  )
-
-  it.effect("rejects an existing session ID without changing its transcript", () =>
-    Effect.gen(function* () {
-      const session = yield* Session.Service
-      const transfer = yield* SessionTransfer.Service
-      const existing = yield* session.create({ location, title: "Existing" })
-      const exit = yield* Effect.exit(transfer.import({ data: { info: existing, messages: [] }, location }))
-
-      expect(exit._tag).toBe("Failure")
-      expect((yield* session.get(existing.id)).title).toBe("Existing")
-      expect(yield* session.messages({ sessionID: existing.id })).toEqual([])
-    }),
-  )
-})

packages/core/test/tool-patch.test.ts

@@ -13,8 +13,6 @@ import { AbsolutePath } from "@opencode-ai/core/schema"
 import { Session } from "@opencode-ai/core/session"
 import { Tool } from "@opencode-ai/core/tool"
 import { PatchTool } from "@opencode-ai/core/tool/plugin/patch"
-import { FileMutation } from "@opencode-ai/core/file-mutation"
-import { LocationMutation } from "@opencode-ai/core/location-mutation"
 import { location } from "./fixture/location"
 import { tmpdir } from "./fixture/tmpdir"
 import { makeLocationNode } from "@opencode-ai/util/effect/app-node"
@@ -24,7 +22,7 @@ import { toolIdentity, executeTool, registerToolPlugin, toolDefinitions } from "
 const patchToolNode = makeLocationNode({
   name: "test/patch-tool-plugin",
   layer: Layer.effectDiscard(registerToolPlugin(PatchTool.Plugin)),
-  deps: [Tool.node, LocationMutation.node, FileMutation.node, Permission.node],
+  deps: [Tool.node, Formatter.node, FSUtil.node, Location.node, Permission.node],
 })
 
 const sessionID = Session.ID.make("ses_patch_tool_test")
@@ -606,24 +604,6 @@ describe("PatchTool", () => {
     ),
   )
 
-  it.live("preserves a BOM when moving a file", () =>
-    withTempTool((directory, registry) =>
-      Effect.gen(function* () {
-        const source = path.join(directory, "source.txt")
-        const moved = path.join(directory, "moved.txt")
-        yield* Effect.promise(() => fs.writeFile(source, "\uFEFFbefore\n"))
-        yield* executeTool(
-          registry,
-          call(
-            "*** Begin Patch\n*** Update File: source.txt\n*** Move to: moved.txt\n@@\n-before\n+after\n*** End Patch",
-          ),
-        )
-        expect(yield* exists(source)).toBe(false)
-        expect(yield* Effect.promise(() => fs.readFile(moved, "utf8"))).toBe("\uFEFFafter\n")
-      }),
-    ),
-  )
-
   it.live("rejects an update with missing context", () =>
     withTempTool((directory, registry) =>
       Effect.gen(function* () {
@@ -848,9 +828,7 @@ describe("PatchTool", () => {
     ),
   )
 
-  // Paths outside the active Location require external approval — the same
-  // boundary the edit and write tools derive from LocationMutation.
-  it.live("requires external approval for sibling paths outside the location", () =>
+  it.live("treats a sibling path inside the project worktree as internal", () =>
     Effect.acquireUseRelease(
       Effect.promise(() => tmpdir()),
       (tmp) => {
@@ -869,7 +847,7 @@ describe("PatchTool", () => {
                       call("*** Begin Patch\n*** Update File: ../sibling.txt\n@@\n-before\n+after\n*** End Patch"),
                     ),
                   ).toMatchObject({ status: "completed" })
-                  expect(assertions.map((input) => input.action)).toEqual(["external_directory", "edit"])
+                  expect(assertions.map((input) => input.action)).toEqual(["edit"])
                   expect(yield* Effect.promise(() => fs.readFile(target, "utf8"))).toBe("after\n")
                 }),
               tmp.path,

packages/core/test/tool-read.test.ts

@@ -155,7 +155,6 @@ const mutation = Layer.succeed(
       const externalResource = path.join(directory, "*").replaceAll("\\", "/")
       return Effect.succeed({
         canonical,
-        absolute: canonical,
         resource,
         externalDirectory: external
           ? {

packages/core/test/tool-search.test.ts

@@ -6,9 +6,11 @@ import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
 import { makeLocationNode } from "@opencode-ai/util/effect/app-node"
 import { LayerNode } from "@opencode-ai/util/effect/layer-node"
 import { FileSystem } from "@opencode-ai/core/filesystem"
+import { FSUtil } from "@opencode-ai/util/fs-util"
 import { Location } from "@opencode-ai/core/location"
 import { LocationMutation } from "@opencode-ai/core/location-mutation"
 import { Permission } from "@opencode-ai/core/permission"
+import { Ripgrep } from "@opencode-ai/core/ripgrep"
 import { AbsolutePath } from "@opencode-ai/core/schema"
 import { Session } from "@opencode-ai/core/session"
 import { GlobTool } from "@opencode-ai/core/tool/plugin/glob"
@@ -22,12 +24,19 @@ import { executeTool, registerToolPlugin, toolIdentity } from "./lib/tool"
 const globToolNode = makeLocationNode({
   name: "test/glob-tool-plugin",
   layer: Layer.effectDiscard(registerToolPlugin(GlobTool.Plugin)),
-  deps: [Tool.node, FileSystem.node, Location.node, LocationMutation.node, Permission.node],
+  deps: [
+    Tool.node,
+    FSUtil.node,
+    Ripgrep.node,
+    Location.node,
+    LocationMutation.node,
+    Permission.node,
+  ],
 })
 const grepToolNode = makeLocationNode({
   name: "test/grep-tool-plugin",
   layer: Layer.effectDiscard(registerToolPlugin(GrepTool.Plugin)),
-  deps: [Tool.node, FileSystem.node, Location.node, LocationMutation.node, Permission.node],
+  deps: [Tool.node, FSUtil.node, Ripgrep.node, Location.node, LocationMutation.node, Permission.node],
 })
 const sessionID = Session.ID.make("ses_search_tool_test")
 
@@ -172,37 +181,14 @@ describe("search tools", () => {
     ),
   )
 
-  it.live("reports the lexical path when grepping a symlinked file", () =>
-    Effect.acquireUseRelease(
-      Effect.promise(() => tmpdir()),
-      (tmp) =>
-        Effect.promise(async () => {
-          await fs.mkdir(path.join(tmp.path, "actual"))
-          await fs.writeFile(path.join(tmp.path, "actual", "target.txt"), "needle\n")
-          await fs.symlink(path.join(tmp.path, "actual", "target.txt"), path.join(tmp.path, "link.txt"))
-        }).pipe(
-          Effect.andThen(
-            withTools(tmp.path, (registry) =>
-              Effect.gen(function* () {
-                const result = yield* executeTool(registry, call("grep", { path: "link.txt", pattern: "needle" }))
-                expect(result).toMatchObject({
-                  status: "completed",
-                  output: [{ entry: { path: "link.txt" }, line: 1, text: "needle\n" }],
-                })
-              }),
-            ),
-          ),
-        ),
-      (tmp) => Effect.promise(() => tmp[Symbol.asyncDispose]()),
-    ),
-  )
-
   it.live("reports no grep matches", () =>
     Effect.acquireUseRelease(
       Effect.promise(() => tmpdir()),
       (tmp) =>
         Effect.promise(() => fs.writeFile(path.join(tmp.path, "file.txt"), "haystack\n")).pipe(
-          Effect.andThen(withTools(tmp.path, (registry) => executeTool(registry, call("grep", { pattern: "needle" })))),
+          Effect.andThen(
+            withTools(tmp.path, (registry) => executeTool(registry, call("grep", { pattern: "needle" }))),
+          ),
           Effect.tap((result) =>
             Effect.sync(() => {
               expect(result).toMatchObject({
@@ -311,7 +297,9 @@ describe("search tools", () => {
       (tmp) =>
         Effect.promise(() => fs.writeFile(path.join(tmp.path, "file.txt"), "content\n")).pipe(
           Effect.andThen(
-            withTools(tmp.path, (registry) => executeTool(registry, call("glob", { path: "file.txt", pattern: "*" }))),
+            withTools(tmp.path, (registry) =>
+              executeTool(registry, call("glob", { path: "file.txt", pattern: "*" })),
+            ),
           ),
           Effect.tap((result) =>
             Effect.sync(() => {
@@ -343,7 +331,9 @@ describe("search tools", () => {
             Effect.sync(() => {
               expect(result.status).toBe("completed")
               expect(assertions.map((input) => input.action)).toEqual(["external_directory", "glob"])
-              expect(assertions[0]?.resources).toEqual([path.join(outside.path, "*").replaceAll("\\", "/")])
+              expect(assertions[0]?.resources).toEqual([
+                path.join(outside.path, "*").replaceAll("\\", "/"),
+              ])
             }),
           ),
         )

packages/core/test/tool-subagent.test.ts

@@ -240,7 +240,7 @@ describe("SubagentTool", () => {
           expect(settled).toMatchObject({
             status: "completed",
             metadata: { status: "completed" },
-            content: [{ type: "text", text: childText }],
+            content: [{ type: "text", text: expect.stringContaining(childText) }],
           })
           expect(settled.metadata).toEqual({
             sessionID: outputSessionID(settled.metadata),
@@ -283,9 +283,15 @@ describe("SubagentTool", () => {
           expect(settled).toMatchObject({
             status: "completed",
             metadata: { status: "completed" },
-            content: [{ type: "text", text: childText }],
+            content: [{ type: "text", text: expect.stringContaining(childText) }],
           })
           const child = yield* sessions.get(outputSessionID(settled.metadata))
+          expect(settled.content).toEqual([
+            {
+              type: "text",
+              text: `<subagent sessionID="${child.id}" state="completed">\n${childText}\n</subagent>`,
+            },
+          ])
           expect(settled.metadata).toEqual({ sessionID: child.id, status: "completed" })
           expect(progress[0]?.metadata).toEqual({ sessionID: child.id, status: "running" })
           expect(child).toMatchObject({
@@ -315,6 +321,144 @@ describe("SubagentTool", () => {
     ),
   )
 
+  it.live("continues an existing child session", () =>
+    Effect.acquireRelease(
+      Effect.promise(() => tmpdir()),
+      (dir) => Effect.promise(() => dir[Symbol.asyncDispose]()),
+    ).pipe(
+      Effect.flatMap((dir) =>
+        Effect.gen(function* () {
+          const location = Location.Ref.make({ directory: AbsolutePath.make(dir.path) })
+          const sessions = yield* Session.Service
+          const parent = yield* sessions.create({ location, model: parentModel })
+          yield* withSubagent(parent.location)
+          const locations = yield* LocationServiceMap.Service
+          const registry = yield* Tool.Service.pipe(Effect.provide(locations.get(parent.location)))
+          yield* waitForTool(registry, SubagentTool.name)
+
+          const first = yield* executeTool(registry, {
+            sessionID: parent.id,
+            ...toolIdentity,
+            call: {
+              type: "tool-call",
+              id: "call-subagent-first",
+              name: SubagentTool.name,
+              input: { agent: "reviewer", description: "review", prompt: "review this" },
+            },
+          })
+          const childID = outputSessionID(first.metadata)
+          const second = yield* executeTool(registry, {
+            sessionID: parent.id,
+            ...toolIdentity,
+            call: {
+              type: "tool-call",
+              id: "call-subagent-second",
+              name: SubagentTool.name,
+              input: {
+                agent: "reviewer",
+                description: "follow up",
+                prompt: "continue this",
+                sessionID: childID,
+              },
+            },
+          })
+
+          expect(outputSessionID(second.metadata)).toBe(childID)
+          expect((yield* sessions.list({ parentID: parent.id })).data).toHaveLength(1)
+          expect((yield* sessions.get(childID)).title).toBe("review")
+          expect(
+            (yield* sessions.pending(childID)).flatMap((message) =>
+              message.type === "user" ? [message.data.text] : [],
+            ),
+          ).toEqual(["You are a subagent spawned by another session.\nreview this", "continue this"])
+          expect(second.content).toEqual([
+            {
+              type: "text",
+              text: `<subagent sessionID="${childID}" state="completed">\n${childText}\n</subagent>`,
+            },
+          ])
+        }),
+      ),
+    ),
+  )
+
+  it.live("rejects background continuation", () =>
+    Effect.acquireRelease(
+      Effect.promise(() => tmpdir()),
+      (dir) => Effect.promise(() => dir[Symbol.asyncDispose]()),
+    ).pipe(
+      Effect.flatMap((dir) =>
+        Effect.gen(function* () {
+          const location = Location.Ref.make({ directory: AbsolutePath.make(dir.path) })
+          const sessions = yield* Session.Service
+          const parent = yield* sessions.create({ location })
+          const child = yield* sessions.create({
+            parentID: parent.id,
+            title: "review",
+            agent: Agent.ID.make("reviewer"),
+          })
+          yield* withSubagent(parent.location)
+          const locations = yield* LocationServiceMap.Service
+          const registry = yield* Tool.Service.pipe(Effect.provide(locations.get(parent.location)))
+          yield* waitForTool(registry, SubagentTool.name)
+
+          expect(
+            yield* executeTool(registry, {
+              sessionID: parent.id,
+              ...toolIdentity,
+              call: {
+                type: "tool-call",
+                id: "call-background-continuation",
+                name: SubagentTool.name,
+                input: {
+                  agent: "reviewer",
+                  description: "follow up",
+                  prompt: "continue this",
+                  sessionID: child.id,
+                  background: true,
+                },
+              },
+            }),
+          ).toEqual({
+            status: "error",
+            error: {
+              type: "tool.execution",
+              message: "Continuing a subagent in the background is not implemented yet",
+            },
+          })
+
+          const jobs = yield* Job.Service
+          yield* jobs.start({ id: child.id, type: "subagent", run: Effect.never })
+          yield* jobs.background(child.id)
+          expect(
+            yield* executeTool(registry, {
+              sessionID: parent.id,
+              ...toolIdentity,
+              call: {
+                type: "tool-call",
+                id: "call-running-continuation",
+                name: SubagentTool.name,
+                input: {
+                  agent: "reviewer",
+                  description: "follow up",
+                  prompt: "continue this",
+                  sessionID: child.id,
+                },
+              },
+            }),
+          ).toEqual({
+            status: "error",
+            error: {
+              type: "tool.execution",
+              message: "Continuing a running subagent is not implemented yet",
+            },
+          })
+          yield* jobs.cancel(child.id)
+        }),
+      ),
+    ),
+  )
+
   it.live("returns child runner failures as tool errors", () =>
     Effect.acquireRelease(
       Effect.promise(() => tmpdir()),
@@ -393,7 +537,7 @@ describe("SubagentTool", () => {
           expect(settled.content).toEqual([{ type: "text", text: expect.stringContaining(`id: ${childID}`) }])
 
           const admission = Array.from(yield* Fiber.join(admitted))[0]
-          expect(admission?.data.input.data.text).toContain(`<subagent id="${childID}" state="completed"`)
+          expect(admission?.data.input.data.text).toContain(`<subagent sessionID="${childID}" state="completed"`)
           expect(admission?.data.input.data).toMatchObject({
             description: "background review",
             metadata: {
@@ -407,7 +551,7 @@ describe("SubagentTool", () => {
           yield* SessionPending.promote(database.db, bus, parent.id, "steer")
           const synthetic = (yield* sessions.context(parent.id)).filter((message) => message.type === "synthetic")
           expect(synthetic).toHaveLength(1)
-          expect(synthetic[0]?.text).toContain(`<subagent id="${childID}" state="completed"`)
+          expect(synthetic[0]?.text).toContain(`<subagent sessionID="${childID}" state="completed"`)
           expect(synthetic[0]?.text).toContain(childText)
         }),
       ),

packages/core/test/tool-websearch.test.ts

@@ -1,5 +1,5 @@
 import { beforeEach, describe, expect } from "bun:test"
-import { Deferred, Effect, Layer } from "effect"
+import { Effect, Layer } from "effect"
 import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
 import { LayerNode } from "@opencode-ai/util/effect/layer-node"
 import { Permission } from "@opencode-ai/core/permission"
@@ -39,8 +39,6 @@ const providers = [
 let providerRequired = false
 let formResponse: Form.TerminalState = { status: "cancelled" }
 const formResponses: Form.TerminalState[] = []
-let queryBarrier: Deferred.Deferred<void> | undefined
-let synchronizedQueries = 0
 let result = new WebSearch.Response({
   providerID: WebSearch.ID.make("exa"),
   results: [{ url: "https://example.com", title: "Search results", content: "search results", time: {} }],
@@ -54,8 +52,6 @@ beforeEach(() => {
   providerRequired = false
   formResponse = { status: "cancelled" }
   formResponses.length = 0
-  queryBarrier = undefined
-  synchronizedQueries = 0
   result = new WebSearch.Response({
     providerID: WebSearch.ID.make("exa"),
     results: [{ url: "https://example.com", title: "Search results", content: "search results", time: {} }],
@@ -79,21 +75,11 @@ const websearch = Layer.succeed(
     transform: () => Effect.die("unused"),
     reload: () => Effect.die("unused"),
     providers: () => Effect.succeed(providers),
-    default: () =>
-      Effect.gen(function* () {
-        const stored = values.get("websearch:provider")
-        if (stored === false) return yield* new WebSearch.DisabledError()
-        return typeof stored === "string" ? providers.find((provider) => provider.id === stored) : undefined
-      }),
+    default: () => Effect.succeed(undefined),
     query: (input) =>
       Effect.gen(function* () {
         queries.push(input)
         const stored = values.get("websearch:provider")
-        if (queryBarrier && synchronizedQueries < 5) {
-          synchronizedQueries++
-          if (synchronizedQueries === 5) yield* Deferred.succeed(queryBarrier, undefined)
-          yield* Deferred.await(queryBarrier)
-        }
         if (providerRequired && typeof stored !== "string") return yield* new WebSearch.ProviderRequiredError()
         if (typeof stored === "string")
           return new WebSearch.Response({ providerID: WebSearch.ID.make(stored), results: result.results })
@@ -330,35 +316,6 @@ describe("WebSearchTool registration", () => {
     }),
   )
 
-  it.effect("shares provider consent across concurrent searches", () =>
-    Effect.gen(function* () {
-      providerRequired = true
-      formResponse = { status: "answered", answer: { choice: "allow" } }
-      queryBarrier = yield* Deferred.make<void>()
-      const registry = yield* Tool.Service
-
-      const results = yield* Effect.all(
-        Array.from({ length: 5 }, (_, index) =>
-          executeTool(registry, {
-            sessionID,
-            ...toolIdentity,
-            call: {
-              type: "tool-call",
-              id: `call-concurrent-${index}`,
-              name: "websearch",
-              input: { query: `effect ${index}` },
-            },
-          }),
-        ),
-        { concurrency: "unbounded" },
-      )
-
-      expect(results.every((item) => item.status === "completed")).toBe(true)
-      expect(formRequests).toHaveLength(1)
-      expect(values.get("websearch:provider")).toBe("exa")
-    }),
-  )
-
   it.effect("persists the choice to disable web search", () =>
     Effect.gen(function* () {
       providerRequired = true

packages/core/test/workspace-e2e.test.ts

@@ -1,150 +0,0 @@
-import { describe, expect } from "bun:test"
-import { mkdtempSync } from "fs"
-import { mkdtemp } from "fs/promises"
-import { tmpdir } from "os"
-import path from "path"
-import { Effect, Layer, Schema } from "effect"
-import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
-import { Bus } from "@opencode-ai/core/bus"
-import { Database } from "@opencode-ai/core/database/database"
-import { FileMutation } from "@opencode-ai/core/file-mutation"
-import { FileSystem } from "@opencode-ai/core/filesystem"
-import { Location } from "@opencode-ai/core/location"
-import { LocationMutation } from "@opencode-ai/core/location-mutation"
-import { LocationServiceMap } from "@opencode-ai/core/location-service-map"
-import { Project } from "@opencode-ai/core/project"
-import { AbsolutePath, RelativePath } from "@opencode-ai/core/schema"
-import { Shell } from "@opencode-ai/core/shell"
-import { Workspace } from "@opencode-ai/core/workspace"
-import { WorkspaceDriver } from "@opencode-ai/core/workspace/driver"
-import { AppProcess } from "@opencode-ai/util/process"
-import { LayerNode } from "@opencode-ai/util/effect/layer-node"
-import { makeGlobalNode } from "@opencode-ai/util/effect/app-node"
-import { testEffect } from "./lib/effect"
-import { directoryEnvironment } from "./lib/workspace"
-
-const FakeBinding = Schema.Struct({ root: Schema.String })
-
-const connects = { count: 0 }
-
-// Replacement nodes may introduce tagged dependencies; declaring AppProcess
-// lets the driver spawn through the real test spawner.
-const registryLayer = Layer.effect(
-  WorkspaceDriver.RegistryService,
-  Effect.gen(function* () {
-    const appProcess = yield* AppProcess.Service
-    const driver = WorkspaceDriver.make({
-      create: () =>
-        Effect.promise(async () => {
-          const root = await mkdtemp(path.join(tmpdir(), "opencode-workspace-e2e-"))
-          return { binding: { root }, root }
-        }),
-      connect: (binding) =>
-        Schema.decodeUnknownEffect(FakeBinding)(binding).pipe(
-          Effect.mapError((cause) => new WorkspaceDriver.Error({ provider: "fake", cause })),
-          Effect.map((decoded) => {
-            connects.count++
-            return directoryEnvironment(decoded.root, (command) => appProcess.spawn(command))
-          }),
-        ),
-      destroy: () => Effect.void,
-    })
-    return WorkspaceDriver.RegistryService.of(WorkspaceDriver.registry({ fake: driver }))
-  }),
-)
-
-const registry = makeGlobalNode({
-  service: WorkspaceDriver.RegistryService,
-  layer: registryLayer,
-  deps: [AppProcess.node],
-})
-
-// Outer and hoisted location graphs must share one durable database, like the
-// production file-backed configuration; :memory: would give each its own.
-const databaseFile = path.join(mkdtempSync(path.join(tmpdir(), "opencode-workspace-db-")), "e2e.db")
-
-const it = testEffect(
-  AppNodeBuilder.build(
-    LayerNode.group([Database.node, Bus.node, Workspace.node, AppProcess.node, LocationServiceMap.node]),
-    [
-      [Database.node, Database.configured({ path: databaseFile })],
-      [WorkspaceDriver.registryNode, registry],
-    ],
-  ),
-)
-
-describe("hosted workspace end to end", () => {
-  it.live("creates, works inside, evicts, and reconnects", () =>
-    Effect.gen(function* () {
-      const workspaces = yield* Workspace.Service
-      const created = yield* workspaces.create({ provider: "fake" })
-      expect(created.provider).toBe("fake")
-
-      // Metadata read round-trips through sqlite without touching the driver.
-      const fetched = yield* workspaces.get(created.id)
-      expect(fetched.root).toBe(created.root)
-
-      const locations = yield* LocationServiceMap.Service
-      const ref = Location.Ref.make({
-        directory: AbsolutePath.make(created.root),
-        workspaceID: created.id,
-      })
-
-      yield* Effect.gen(function* () {
-        const location = yield* Location.Service
-        expect(location.project.id).toBe(Project.ID.global)
-        expect(String(location.directory)).toBe(created.root)
-
-        const mutation = yield* LocationMutation.Service
-        const mutations = yield* FileMutation.Service
-        const target = yield* mutation.resolve({ path: "hello.txt" })
-        yield* mutations.write({ target, content: "hello from the workspace\n" })
-
-        const shell = yield* Shell.Service
-        const command = yield* shell.create({
-          command: "printf 'from-bash' > bash.txt && ln -s /etc escaped && cat hello.txt",
-          timeout: 30_000,
-        })
-        const finished = yield* shell.wait(command.id)
-        expect(finished.status).toBe("exited")
-        const output = yield* shell.output(command.id)
-        expect(output.output).toContain("hello from the workspace")
-
-        const filesystem = yield* FileSystem.Service
-        const fromBash = yield* filesystem.read({ path: RelativePath.make("bash.txt") })
-        expect(new TextDecoder().decode(fromBash.content)).toBe("from-bash")
-        const root = yield* mutation.resolve({ path: "." })
-        const entries = yield* filesystem.glob({ target: root, pattern: "*.txt", limit: 10 })
-        expect(entries.map((entry) => String(entry.path)).sort()).toEqual(["bash.txt", "hello.txt"])
-        const limited = yield* filesystem.glob({ target: root, pattern: "*.txt", limit: 1 })
-        expect(limited).toHaveLength(1)
-        const matches = yield* filesystem.grep({
-          target: yield* mutation.resolve({ path: "hello.txt" }),
-          pattern: "workspace",
-          limit: 10,
-        })
-        expect(matches).toMatchObject([{ entry: { path: "hello.txt" }, line: 1 }])
-        const invalid = yield* filesystem.grep({ target: root, pattern: "[", limit: 10 }).pipe(Effect.flip)
-        expect(invalid).toMatchObject({ _tag: "FileSystem.InvalidPatternError", pattern: "[" })
-        const escaped = yield* mutation.resolve({ path: "escaped/passwd" }).pipe(Effect.flip)
-        expect(escaped).toMatchObject({ _tag: "LocationMutation.PathError", reason: "outside_workspace" })
-      }).pipe(Effect.provide(locations.get(ref)))
-
-      expect(connects.count).toBe(1)
-
-      // Evict the cached graph, then reconnect through the driver: the
-      // workspace contents survive because the binding names durable state.
-      yield* locations.invalidate(ref)
-
-      yield* Effect.gen(function* () {
-        const filesystem = yield* FileSystem.Service
-        const hello = yield* filesystem.read({ path: RelativePath.make("hello.txt") })
-        expect(new TextDecoder().decode(hello.content)).toBe("hello from the workspace\n")
-        const fromBash = yield* filesystem.read({ path: RelativePath.make("bash.txt") })
-        expect(new TextDecoder().decode(fromBash.content)).toBe("from-bash")
-      }).pipe(Effect.provide(locations.get(ref)))
-
-      expect(connects.count).toBe(2)
-    }),
-  )
-})

packages/core/test/workspace-filesystem.test.ts

@@ -1,57 +0,0 @@
-import { describe, expect } from "bun:test"
-import { Effect, Layer } from "effect"
-import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
-import { FileSystem } from "@opencode-ai/core/filesystem"
-import { Location } from "@opencode-ai/core/location"
-import { RelativePath } from "@opencode-ai/core/schema"
-import { WorkspaceEnvironment } from "@opencode-ai/core/workspace/environment"
-import { testEffect } from "./lib/effect"
-import { hostedLocationLayer, memoryEnvironment } from "./lib/workspace"
-
-const memory = memoryEnvironment({
-  "/workspace/README.md": "# hello\n",
-  "/workspace/src/index.ts": "export {}\n",
-  "/workspace/src/util/deep.ts": "export const deep = 1\n",
-})
-
-const it = testEffect(
-  AppNodeBuilder.build(FileSystem.hostedNode, [
-    [WorkspaceEnvironment.node, Layer.succeed(WorkspaceEnvironment.Service, memory.environment)],
-    [Location.node, hostedLocationLayer()],
-  ]),
-)
-
-describe("hosted FileSystem", () => {
-  it.effect("reads a file through the environment", () =>
-    Effect.gen(function* () {
-      const filesystem = yield* FileSystem.Service
-      const result = yield* filesystem.read({ path: RelativePath.make("README.md") })
-      expect(new TextDecoder().decode(result.content)).toBe("# hello\n")
-      expect(result.mime).toBe("text/markdown")
-    }),
-  )
-
-  it.effect("lists directories before files with posix separators", () =>
-    Effect.gen(function* () {
-      const filesystem = yield* FileSystem.Service
-      const entries = yield* filesystem.list({ path: RelativePath.make("src") })
-      expect(entries.map((entry) => String(entry.path))).toEqual(["src/util/", "src/index.ts"])
-    }),
-  )
-
-  it.effect("lists the root when no path is given", () =>
-    Effect.gen(function* () {
-      const filesystem = yield* FileSystem.Service
-      const entries = yield* filesystem.list()
-      expect(entries.map((entry) => String(entry.path))).toEqual(["src/", "README.md"])
-    }),
-  )
-
-  it.effect("refuses paths that escape the workspace", () =>
-    Effect.gen(function* () {
-      const filesystem = yield* FileSystem.Service
-      const exit = yield* filesystem.read({ path: RelativePath.make("../etc/passwd") }).pipe(Effect.exit)
-      expect(exit._tag).toBe("Failure")
-    }),
-  )
-})

packages/core/test/workspace-graph-guard.test.ts

@@ -1,79 +0,0 @@
-import { describe, expect, test } from "bun:test"
-import { AbsolutePath } from "@opencode-ai/core/schema"
-import { Location } from "@opencode-ai/core/location"
-import { hostedReplacements, locationServices } from "@opencode-ai/core/location-services"
-import { Workspace } from "@opencode-ai/core/workspace"
-import { Node } from "@opencode-ai/util/effect/app-node"
-import { LayerNode } from "@opencode-ai/util/effect/layer-node"
-import { AppProcess } from "@opencode-ai/util/process"
-import { FSUtil } from "@opencode-ai/util/fs-util"
-
-// Location-scoped services receive Location-relative and Location-absolute
-// paths from tools. In a hosted graph those are provider paths (for example
-// /workspace/src), so any Location-scoped service that still depends on a
-// host primitive would silently run provider paths against the host machine.
-// This is the guardrail for the class of bug where the read tool's filesystem
-// stayed host-backed after the hosted rollout.
-//
-// Every entry here is a documented decision, not an exemption by default.
-// Adding a new Location-scoped service that touches FSUtil or AppProcess
-// fails this test until the service either gets a hosted replacement in
-// hostedReplacements or is justified below.
-const allowed: Record<string, string> = {
-  // Host-side by design: hosted graphs read only global (host) configuration.
-  "@opencode/Config": "global host config sources only (Config.configured({ project: false }))",
-  "@opencode/InstructionDiscovery": "global host instructions only (configured({ project: false }))",
-  "@opencode/Skill": "skills load from host config directories",
-  "@opencode/PluginSupervisor": "plugins are host processes loaded from host paths",
-  "@opencode/Integration": "integrations run host-side CLIs",
-  "@opencode/ProjectCopy": "project copy refresh operates on host-owned global project data",
-  // Known gaps: these never advertise hosted capability, but their services
-  // still exist in hosted graphs and would touch host paths if invoked with
-  // provider paths. Each needs an environment-backed design or an explicit
-  // hosted no-op before workspaces ship publicly.
-  "@opencode/Command": "TODO: `!command` template substitution would run on the host",
-  "@opencode/LocationWatcher": "TODO: watches the provider directory path on the host filesystem",
-  "@opencode/Snapshot": "TODO: hosted snapshots need environment-backed git",
-  "@opencode/Vcs": "TODO: hosted VCS info is stated by Project.hostedGlobal, service methods remain host git",
-  "@opencode/v2/Formatter": "TODO: formatters are host binaries; hosted FileMutation deliberately omits format",
-  "session-instructions": "TODO: per-session instruction file loads read the host filesystem",
-}
-
-describe("hosted location graph", () => {
-  test("location-scoped services do not use host primitives without justification", () => {
-    const workspaceID = Workspace.ID.make("wrk_graphguard000000000000000")
-    const ref = Location.Ref.make({ directory: AbsolutePath.make("/workspace"), workspaceID })
-    // Replacement targets may be bare layers in general; every hosted
-    // replacement is a node today, and bare-layer targets have no walkable
-    // dependencies anyway.
-    const replaced = new Map<LayerNode.AnyNode, LayerNode.AnyNode>(
-      hostedReplacements(ref, workspaceID).flatMap(([from, to]) => (LayerNode.isNode(to) ? [[from, to] as const] : [])),
-    )
-    const resolve = (node: LayerNode.AnyNode) => replaced.get(node) ?? node
-
-    const hostPrimitives = new Set<LayerNode.AnyNode>([FSUtil.node, AppProcess.node])
-    const offenders = new Map<string, string[]>()
-    LayerNode.walk<void>(
-      locationServices,
-      (node, context) => {
-        for (const dependency of node.dependencies) {
-          if (hostPrimitives.has(resolve(dependency)) && node.tag === Node.tags.values.location) {
-            offenders.set(node.name, [...(offenders.get(node.name) ?? []), resolve(dependency).name])
-          }
-          context.visit(dependency)
-        }
-      },
-      { resolve },
-    )
-
-    const unjustified = [...offenders.entries()]
-      .filter(([name]) => !(name in allowed))
-      .map(([name, primitives]) => `${name} -> ${primitives.join(", ")}`)
-      .sort()
-    expect(unjustified).toEqual([])
-
-    // Stale allowlist entries must be removed so the inventory stays honest.
-    const stale = Object.keys(allowed).filter((name) => !offenders.has(name))
-    expect(stale).toEqual([])
-  })
-})

packages/core/test/workspace-mutation.test.ts

@@ -1,95 +0,0 @@
-import { describe, expect } from "bun:test"
-import { Effect, Layer } from "effect"
-import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
-import { FileMutation } from "@opencode-ai/core/file-mutation"
-import { Location } from "@opencode-ai/core/location"
-import { LocationMutation } from "@opencode-ai/core/location-mutation"
-import { ReadToolFileSystem } from "@opencode-ai/core/tool/read-filesystem"
-import { AbsolutePath } from "@opencode-ai/core/schema"
-import { WorkspaceEnvironment } from "@opencode-ai/core/workspace/environment"
-import { LayerNode } from "@opencode-ai/util/effect/layer-node"
-import { testEffect } from "./lib/effect"
-import { hostedLocationLayer, memoryEnvironment } from "./lib/workspace"
-
-const memory = memoryEnvironment({
-  "/workspace/README.md": "# hello\n",
-  "/workspace/src/index.ts": "export {}\n",
-})
-
-const it = testEffect(
-  AppNodeBuilder.build(
-    LayerNode.group([LocationMutation.hostedNode, FileMutation.hostedNode, ReadToolFileSystem.hostedNode]),
-    [
-      [WorkspaceEnvironment.node, Layer.succeed(WorkspaceEnvironment.Service, memory.environment)],
-      [Location.node, hostedLocationLayer()],
-    ],
-  ),
-)
-
-describe("hosted mutation", () => {
-  it.effect("resolves an existing file to its canonical path and relative resource", () =>
-    Effect.gen(function* () {
-      const mutation = yield* LocationMutation.Service
-      const target = yield* mutation.resolve({ path: "README.md" })
-      expect(target.canonical).toBe("/workspace/README.md")
-      expect(target.resource).toBe("README.md")
-      expect(target.externalDirectory).toBeUndefined()
-    }),
-  )
-
-  it.effect("resolves a missing path below an existing directory", () =>
-    Effect.gen(function* () {
-      const mutation = yield* LocationMutation.Service
-      const target = yield* mutation.resolve({ path: "src/created/new.ts" })
-      expect(target.canonical).toBe("/workspace/src/created/new.ts")
-      expect(target.resource).toBe("src/created/new.ts")
-    }),
-  )
-
-  it.effect("rejects paths outside the workspace instead of granting external access", () =>
-    Effect.gen(function* () {
-      const mutation = yield* LocationMutation.Service
-      const error = yield* mutation.resolve({ path: "/etc/passwd" }).pipe(Effect.flip)
-      expect(error).toMatchObject({ _tag: "LocationMutation.PathError", reason: "outside_workspace" })
-    }),
-  )
-
-  it.effect("writes new and existing files through the environment", () =>
-    Effect.gen(function* () {
-      const mutation = yield* LocationMutation.Service
-      const files = yield* FileMutation.Service
-
-      const created = yield* mutation.resolve({ path: "notes/todo.md" })
-      const first = yield* files.write({ target: created, content: "- ship it\n" })
-      expect(first.existed).toBe(false)
-      expect(memory.contents("/workspace/notes/todo.md")).toBe("- ship it\n")
-
-      const second = yield* files.write({ target: created, content: "- shipped\n" })
-      expect(second.existed).toBe(true)
-      expect(memory.contents("/workspace/notes/todo.md")).toBe("- shipped\n")
-    }),
-  )
-
-  // The reader must consume the environment, never the host filesystem:
-  // these paths exist only in the memory store.
-  it.effect("reads files and directories through the environment", () =>
-    Effect.gen(function* () {
-      const reader = yield* ReadToolFileSystem.Service
-
-      expect(yield* reader.inspect(AbsolutePath.make("/workspace/README.md"))).toBe("file")
-      expect(yield* reader.inspect(AbsolutePath.make("/workspace/src"))).toBe("directory")
-
-      const content = yield* reader.read(AbsolutePath.make("/workspace/README.md"), "README.md")
-      expect(content).toMatchObject({ type: "file", content: "# hello\n", encoding: "utf8" })
-
-      const paged = yield* reader.read(AbsolutePath.make("/workspace/README.md"), "README.md", { limit: 1 })
-      expect(paged).toMatchObject({ type: "text-page", content: "# hello", offset: 1, truncated: false })
-
-      const listed = yield* reader.list(AbsolutePath.make("/workspace/src"))
-      expect(listed.entries.map((entry) => String(entry.path))).toEqual(["index.ts"])
-
-      const missing = yield* reader.inspect(AbsolutePath.make("/workspace/nope.txt")).pipe(Effect.flip)
-      expect(missing).toMatchObject({ _tag: "PlatformError", reason: { _tag: "NotFound" } })
-    }),
-  )
-})

packages/core/test/workspace-patch.test.ts

@@ -1,175 +0,0 @@
-import { describe, expect } from "bun:test"
-import { Effect, Layer } from "effect"
-import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
-import { LayerNode } from "@opencode-ai/util/effect/layer-node"
-import { FileMutation } from "@opencode-ai/core/file-mutation"
-import { Location } from "@opencode-ai/core/location"
-import { LocationMutation } from "@opencode-ai/core/location-mutation"
-import { Permission } from "@opencode-ai/core/permission"
-import { Session } from "@opencode-ai/core/session"
-import { Tool } from "@opencode-ai/core/tool"
-import { PatchTool } from "@opencode-ai/core/tool/plugin/patch"
-import { WorkspaceEnvironment } from "@opencode-ai/core/workspace/environment"
-import { makeLocationNode } from "@opencode-ai/util/effect/app-node"
-import { testEffect } from "./lib/effect"
-import { toolIdentity, executeTool, registerToolPlugin } from "./lib/tool"
-import { hostedLocationLayer, memoryEnvironment, ROOT } from "./lib/workspace"
-import type { MemoryEnvironment } from "./lib/workspace"
-
-const sessionID = Session.ID.make("ses_workspace_patch_test")
-
-const assertions: Permission.AssertInput[] = []
-
-const permission = Layer.succeed(
-  Permission.Service,
-  Permission.Service.of({
-    assert: (input) =>
-      Effect.sync(() => {
-        assertions.push(input)
-      }),
-    ask: () => Effect.die("unused"),
-    reply: () => Effect.die("unused"),
-    get: () => Effect.die("unused"),
-    forSession: () => Effect.die("unused"),
-    list: () => Effect.die("unused"),
-  }),
-)
-
-const withTool = <A, E, R>(memory: MemoryEnvironment, body: (registry: Tool.Interface) => Effect.Effect<A, E, R>) => {
-  const environment = Layer.succeed(WorkspaceEnvironment.Service, memory.environment)
-  const patchToolNode = makeLocationNode({
-    name: "test/workspace-patch-plugin",
-    layer: Layer.effectDiscard(registerToolPlugin(PatchTool.Plugin)),
-    deps: [Tool.node, LocationMutation.node, FileMutation.node, Permission.node],
-  })
-  return Effect.gen(function* () {
-    assertions.length = 0
-    return yield* body(yield* Tool.Service)
-  }).pipe(
-    Effect.provide(
-      AppNodeBuilder.build(LayerNode.group([Tool.node, patchToolNode]), [
-        [Location.node, hostedLocationLayer()],
-        [LocationMutation.node, LocationMutation.hostedNode],
-        [FileMutation.node, FileMutation.hostedNode],
-        [Permission.node, permission],
-        [WorkspaceEnvironment.node, environment],
-      ]),
-    ),
-  )
-}
-
-const call = (patchText: string, id = "call-patch") => ({
-  sessionID,
-  ...toolIdentity,
-  call: { type: "tool-call" as const, id, name: "patch", input: { patchText } },
-})
-
-const it = testEffect(Layer.empty)
-
-describe("PatchTool on a hosted location", () => {
-  it.effect("applies add, update, and delete through the workspace environment", () => {
-    const memory = memoryEnvironment({
-      [`${ROOT}/update.txt`]: "before\n",
-      [`${ROOT}/remove.txt`]: "remove\n",
-    })
-    return withTool(memory, (registry) =>
-      Effect.gen(function* () {
-        const settled = yield* executeTool(
-          registry,
-          call(
-            "*** Begin Patch\n*** Add File: nested/new.txt\n+created\n*** Update File: update.txt\n@@\n-before\n+after\n*** Delete File: remove.txt\n*** End Patch",
-          ),
-        )
-        expect(settled.status).toBe("completed")
-        if (settled.status !== "completed") return
-        expect(settled.output).toMatchObject({
-          applied: [
-            { type: "add", resource: "nested/new.txt", target: `${ROOT}/nested/new.txt` },
-            { type: "update", resource: "update.txt" },
-            { type: "delete", resource: "remove.txt" },
-          ],
-        })
-        expect(memory.contents(`${ROOT}/nested/new.txt`)).toBe("created\n")
-        expect(memory.contents(`${ROOT}/update.txt`)).toBe("after\n")
-        expect(memory.contents(`${ROOT}/remove.txt`)).toBeUndefined()
-        expect(assertions.map((input) => input.action)).toEqual(["edit"])
-        expect(assertions[0]?.resources).toEqual(["nested/new.txt", "update.txt", "remove.txt"])
-      }),
-    )
-  })
-
-  it.effect("moves a file through the workspace environment", () => {
-    const memory = memoryEnvironment({ [`${ROOT}/old.txt`]: "before\n" })
-    return withTool(memory, (registry) =>
-      Effect.gen(function* () {
-        const settled = yield* executeTool(
-          registry,
-          call("*** Begin Patch\n*** Update File: old.txt\n*** Move to: moved.txt\n@@\n-before\n+after\n*** End Patch"),
-        )
-        expect(settled.status).toBe("completed")
-        expect(memory.contents(`${ROOT}/old.txt`)).toBeUndefined()
-        expect(memory.contents(`${ROOT}/moved.txt`)).toBe("after\n")
-      }),
-    )
-  })
-
-  it.effect("reports a missing update target as a verification failure", () => {
-    const memory = memoryEnvironment({})
-    return withTool(memory, (registry) =>
-      Effect.gen(function* () {
-        const settled = yield* executeTool(
-          registry,
-          call("*** Begin Patch\n*** Update File: missing.txt\n@@\n-before\n+after\n*** End Patch"),
-        )
-        expect(settled.status).toBe("error")
-        if (settled.status !== "error") return
-        expect(settled.error?.message).toContain("file does not exist")
-      }),
-    )
-  })
-
-  it.effect("reports hosted write failures through the tool error channel", () => {
-    const base = memoryEnvironment({})
-    const memory: MemoryEnvironment = {
-      ...base,
-      environment: WorkspaceEnvironment.make({
-        ...base.environment,
-        files: {
-          ...base.environment.files,
-          write: (path, content) =>
-            path.endsWith("fail.txt")
-              ? Effect.fail(new WorkspaceEnvironment.Error({ operation: "write", path }))
-              : base.environment.files.write(path, content),
-        },
-      }),
-    }
-    return withTool(memory, (registry) =>
-      Effect.gen(function* () {
-        const settled = yield* executeTool(
-          registry,
-          call("*** Begin Patch\n*** Add File: fail.txt\n+created\n*** End Patch"),
-        )
-        expect(settled.status).toBe("error")
-        if (settled.status !== "error") return
-        expect(settled.error?.message).toContain("Failed to write fail.txt")
-      }),
-    )
-  })
-
-  it.effect("rejects targets outside the workspace", () => {
-    const memory = memoryEnvironment({})
-    return withTool(memory, (registry) =>
-      Effect.gen(function* () {
-        const settled = yield* executeTool(
-          registry,
-          call("*** Begin Patch\n*** Add File: /outside/new.txt\n+created\n*** End Patch"),
-        )
-        expect(settled.status).toBe("error")
-        if (settled.status !== "error") return
-        expect(settled.error?.message).toContain("path is outside the workspace")
-        expect(assertions).toEqual([])
-        expect(memory.contents("/outside/new.txt")).toBeUndefined()
-      }),
-    )
-  })
-})

packages/core/test/workspace-session-e2e.test.ts

@@ -1,187 +0,0 @@
-import { describe, expect } from "bun:test"
-import { mkdtempSync } from "fs"
-import { mkdtemp, readFile } from "fs/promises"
-import { tmpdir } from "os"
-import path from "path"
-import { Effect, Layer, Schema } from "effect"
-import { LanguageModel } from "@opencode-ai/ai"
-import * as OpenAIChat from "@opencode-ai/ai/protocols/openai-chat"
-import { TestLLM } from "@opencode-ai/ai/testing"
-import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
-import { LayerNodePlatform } from "@opencode-ai/core/effect/app-node-platform"
-import { Bus } from "@opencode-ai/core/bus"
-import { Database } from "@opencode-ai/core/database/database"
-import { Location } from "@opencode-ai/core/location"
-import { LocationServiceMap } from "@opencode-ai/core/location-service-map"
-import { Model } from "@opencode-ai/core/model"
-import { Permission } from "@opencode-ai/core/permission"
-import { PluginRuntime } from "@opencode-ai/core/plugin/runtime"
-import { Provider } from "@opencode-ai/core/provider"
-import { AbsolutePath } from "@opencode-ai/core/schema"
-import { Session } from "@opencode-ai/core/session"
-import { SessionExecution } from "@opencode-ai/core/session/execution"
-import { SessionRunnerModel } from "@opencode-ai/core/session/runner/model"
-import { Workspace } from "@opencode-ai/core/workspace"
-import { WorkspaceDriver } from "@opencode-ai/core/workspace/driver"
-import { AppProcess } from "@opencode-ai/util/process"
-import { LayerNode } from "@opencode-ai/util/effect/layer-node"
-import { makeGlobalNode } from "@opencode-ai/util/effect/app-node"
-import { testEffect } from "./lib/effect"
-import { directoryEnvironment } from "./lib/workspace"
-
-const FakeBinding = Schema.Struct({ root: Schema.String })
-
-const connects = { count: 0 }
-
-const registryLayer = Layer.effect(
-  WorkspaceDriver.RegistryService,
-  Effect.gen(function* () {
-    const appProcess = yield* AppProcess.Service
-    const driver = WorkspaceDriver.make({
-      create: () =>
-        Effect.promise(async () => {
-          const root = await mkdtemp(path.join(tmpdir(), "opencode-workspace-session-"))
-          return { binding: { root }, root }
-        }),
-      connect: (binding) =>
-        Schema.decodeUnknownEffect(FakeBinding)(binding).pipe(
-          Effect.mapError((cause) => new WorkspaceDriver.Error({ provider: "fake", cause })),
-          Effect.map((decoded) => {
-            connects.count++
-            return directoryEnvironment(decoded.root, (command) => appProcess.spawn(command))
-          }),
-        ),
-      destroy: () => Effect.void,
-    })
-    return WorkspaceDriver.RegistryService.of(WorkspaceDriver.registry({ fake: driver }))
-  }),
-)
-
-const registry = makeGlobalNode({
-  service: WorkspaceDriver.RegistryService,
-  layer: registryLayer,
-  deps: [AppProcess.node],
-})
-
-// A gpt-style id so the patch plugin's context hook advertises apply_patch as
-// the only editor, matching production GPT-5 sessions.
-const model = LanguageModel.make({ id: "gpt-fake", provider: "fake", route: OpenAIChat.route })
-const models = Layer.mock(SessionRunnerModel.Service)({
-  resolve: () =>
-    Effect.succeed(
-      SessionRunnerModel.resolved(model, {
-        capabilities: { tools: true, input: ["text"], output: ["text"] },
-        cost: [],
-      }),
-    ),
-})
-
-// Real permission flow would ask; the runner path under test is admission
-// through drain, so approve everything.
-const permission = Layer.mock(Permission.Service)({ assert: () => Effect.void })
-
-// Outer and hoisted location graphs must share one durable database, like the
-// production file-backed configuration; :memory: would give each its own.
-const databaseFile = path.join(mkdtempSync(path.join(tmpdir(), "opencode-workspace-session-db-")), "e2e.db")
-
-// The real SessionExecution + Session nodes: drains route through
-// LocationServiceMap.get(session.location), which is the seam under test.
-// Replacements flow into every hoisted per-location graph via AppNodeBuilder.
-const it = testEffect(
-  AppNodeBuilder.build(
-    LayerNode.group([
-      Database.node,
-      Bus.node,
-      Workspace.node,
-      AppProcess.node,
-      PluginRuntime.providerNode,
-      LocationServiceMap.node,
-      SessionExecution.node,
-      Session.node,
-    ]),
-    [
-      [Database.node, Database.configured({ path: databaseFile })],
-      [WorkspaceDriver.registryNode, registry],
-      [LayerNodePlatform.llmClient, TestLLM.clientLayer],
-      [SessionRunnerModel.node, models],
-      [Permission.node, permission],
-    ],
-  ).pipe(Layer.provideMerge(TestLLM.layer({ fallback: [] }))),
-)
-
-const sessionModel = Model.Ref.make({ id: Model.ID.make("gpt-fake"), providerID: Provider.ID.make("fake") })
-
-describe("hosted workspace session", () => {
-  it.live("runs a scripted model through the real runner on a hosted Location", () =>
-    Effect.gen(function* () {
-      const workspaces = yield* Workspace.Service
-      const created = yield* workspaces.create({ provider: "fake" })
-
-      const sessions = yield* Session.Service
-      const session = yield* sessions.create({
-        title: "hosted session",
-        location: Location.Ref.make({
-          directory: AbsolutePath.make(created.root),
-          workspaceID: created.id,
-        }),
-        model: sessionModel,
-      })
-
-      yield* TestLLM.push(
-        TestLLM.tool("call-patch", "patch", {
-          patchText: "*** Begin Patch\n*** Add File: from-patch.txt\n+patched\n*** End Patch",
-        }),
-        TestLLM.tool("call-shell", "shell", { command: "printf 'from-model' > from-model.txt" }),
-        TestLLM.tool("call-glob", "glob", { pattern: "*.txt" }),
-        TestLLM.tool("call-grep", "grep", { pattern: "from-model" }),
-        TestLLM.tool("call-read", "read", { path: "from-patch.txt" }),
-        TestLLM.text("done", "text-1"),
-      )
-      yield* sessions.prompt({ sessionID: session.id, text: "Write a file in the workspace", resume: false })
-      yield* sessions.resume(session.id)
-
-      // Both tools executed inside the workspace, not on a host path.
-      const written = yield* Effect.promise(() => readFile(path.join(created.root, "from-model.txt"), "utf8"))
-      expect(written).toBe("from-model")
-      const patched = yield* Effect.promise(() => readFile(path.join(created.root, "from-patch.txt"), "utf8"))
-      expect(patched).toBe("patched\n")
-
-      // The hosted catalog includes search tools now that they execute through
-      // the Workspace process seam, plus patch as the gpt-style editor.
-      const requests = (yield* TestLLM.Service).requests
-      const advertised = requests[0]?.tools.map((tool) => tool.name) ?? []
-      expect(advertised).toContain("shell")
-      expect(advertised).toContain("patch")
-      expect(advertised).toContain("glob")
-      expect(advertised).toContain("grep")
-      expect(advertised).toContain("read")
-      expect(advertised).not.toContain("edit")
-      expect(advertised).not.toContain("write")
-
-      // Projected history shows the completed tool call and the final text.
-      // Instruction updates (e.g. the Code Mode catalog settling after boot)
-      // may interleave, so assert on the user and assistant messages directly.
-      const context = yield* sessions.context(session.id)
-      expect(context.at(0)).toMatchObject({ type: "user", text: "Write a file in the workspace" })
-      const assistants = context.filter((message) => message.type === "assistant")
-      expect(assistants.at(0)).toMatchObject({
-        content: [{ type: "tool", id: "call-patch", state: { status: "completed" } }],
-      })
-      expect(assistants.at(1)).toMatchObject({
-        content: [{ type: "tool", id: "call-shell", state: { status: "completed" } }],
-      })
-      expect(assistants.at(2)).toMatchObject({
-        content: [{ type: "tool", id: "call-glob", state: { status: "completed" } }],
-      })
-      expect(assistants.at(3)).toMatchObject({
-        content: [{ type: "tool", id: "call-grep", state: { status: "completed" } }],
-      })
-      expect(assistants.at(4)).toMatchObject({
-        content: [{ type: "tool", id: "call-read", state: { status: "completed" } }],
-      })
-      expect(assistants.at(-1)).toMatchObject({ content: [{ type: "text", text: "done" }] })
-
-      expect(connects.count).toBe(1)
-    }),
-  )
-})

packages/plugin/src/v1/index.ts

@@ -23,11 +23,44 @@ export type ProviderContext = {
   options: Record<string, any>
 }
 
+export type WorkspaceInfo = {
+  id: string
+  type: string
+  name: string
+  branch: string | null
+  directory: string | null
+  extra: unknown | null
+  projectID: string
+}
+
+export type WorkspaceTarget =
+  | {
+      type: "local"
+      directory: string
+    }
+  | {
+      type: "remote"
+      url: string | URL
+      headers?: HeadersInit
+    }
+
+export type WorkspaceAdapter = {
+  name: string
+  description: string
+  configure(config: WorkspaceInfo): WorkspaceInfo | Promise<WorkspaceInfo>
+  create(config: WorkspaceInfo, env: Record<string, string | undefined>, from?: WorkspaceInfo): Promise<void>
+  remove(config: WorkspaceInfo): Promise<void>
+  target(config: WorkspaceInfo): WorkspaceTarget | Promise<WorkspaceTarget>
+}
+
 export type PluginInput = {
   client: ReturnType<typeof createOpencodeClient>
   project: Project
   directory: string
   worktree: string
+  experimental_workspace: {
+    register(type: string, adapter: WorkspaceAdapter): void
+  }
   serverUrl: URL
   $: BunShell
 }

packages/protocol/src/groups/location.ts

@@ -6,6 +6,7 @@ export const LocationQuery = Schema.Struct({
   location: Schema.optional(
     Schema.Struct({
       directory: Schema.optional(Schema.String),
+      workspace: Schema.optional(Schema.String),
     }),
   ),
 }).annotate({ identifier: "LocationQuery" })

packages/protocol/src/groups/pty.ts

@@ -130,7 +130,7 @@ export const PtyGroup = HttpApiGroup.make("server.pty")
           "x-websocket": true,
           parameters: [
             ...(operation.parameters ?? []),
-            ...["location[directory]", "cursor", PTY_CONNECT_TICKET_QUERY].map((name) => ({
+            ...["location[directory]", "location[workspace]", "cursor", PTY_CONNECT_TICKET_QUERY].map((name) => ({
               in: "query",
               name,
               schema: { type: "string" },

packages/protocol/src/groups/session.ts

@@ -1,5 +1,4 @@
 import { SessionMessage } from "@opencode-ai/schema/session-message"
-import { SessionTransfer } from "@opencode-ai/schema/session-transfer"
 import { SessionPending } from "@opencode-ai/schema/session-pending"
 import { PromptInput } from "@opencode-ai/schema/prompt-input"
 import { Session } from "@opencode-ai/schema/session"
@@ -7,6 +6,7 @@ import { InstructionEntry } from "@opencode-ai/schema/instruction-entry"
 import { Project } from "@opencode-ai/schema/project"
 import { AbsolutePath, PositiveInt, RelativePath, statics } from "@opencode-ai/schema/schema"
 import { Event } from "@opencode-ai/schema/event"
+import { Workspace } from "@opencode-ai/schema/workspace"
 import { Context, Effect, Encoding, Result, Schema, SchemaGetter, Struct } from "effect"
 import { HttpApiEndpoint, HttpApiGroup, HttpApiMiddleware, HttpApiSchema, OpenApi } from "effect/unstable/httpapi"
 import {
@@ -42,6 +42,7 @@ const ParentIDFilter = Schema.Union([
 })
 
 const SessionsQueryFields = {
+  workspace: Workspace.ID.pipe(Schema.optional),
   limit: Schema.NumberFromString.pipe(Schema.decodeTo(PositiveInt), Schema.optional).annotate({
     description: "Maximum number of sessions to return. Defaults to the newest 50 sessions.",
   }),
@@ -154,7 +155,6 @@ export const makeSessionGroup = <I extends HttpApiMiddleware.AnyId, S>(sessionLo
           location: Location.Ref.pipe(Schema.optional),
         }),
         success: Schema.Struct({ data: Session.Info }),
-        error: InvalidRequestError,
       }).annotateMerge(
         OpenApi.annotations({
           identifier: "v2.session.create",
@@ -163,36 +163,6 @@ export const makeSessionGroup = <I extends HttpApiMiddleware.AnyId, S>(sessionLo
         }),
       ),
     )
-    .add(
-      HttpApiEndpoint.post("session.import", "/api/session/import", {
-        payload: Schema.Struct({
-          ...SessionTransfer.Data.fields,
-          location: Location.Ref.pipe(Schema.optional),
-        }),
-        success: Schema.Struct({ data: Session.Info }),
-        error: ConflictError,
-      }).annotateMerge(
-        OpenApi.annotations({
-          identifier: "v2.session.import",
-          summary: "Import session",
-          description: "Import a projected session transcript at the requested location.",
-        }),
-      ),
-    )
-    .add(
-      HttpApiEndpoint.get("session.export", "/api/session/:sessionID/export", {
-        params: { sessionID: Session.ID },
-        query: Schema.Struct({ sanitize: BooleanFromString.pipe(Schema.optional) }),
-        success: Schema.Struct({ data: SessionTransfer.Data }),
-        error: [SessionNotFoundError, UnknownError],
-      }).annotateMerge(
-        OpenApi.annotations({
-          identifier: "v2.session.export",
-          summary: "Export session",
-          description: "Export a complete projected session transcript.",
-        }),
-      ),
-    )
     .add(
       HttpApiEndpoint.get("session.active", "/api/session/active", {
         success: Schema.Struct({ data: Schema.Record(Session.ID, SessionActive) }),

packages/protocol/test/session-cursor.test.ts

@@ -6,6 +6,7 @@ import { Session } from "@opencode-ai/schema/session"
 describe("SessionsCursor", () => {
   test("round trips without Node globals", async () => {
     const input = {
+      workspace: undefined,
       search: "protocol",
       order: "desc" as const,
       anchor: { id: Session.ID.make("ses_test"), time: 1, direction: "next" as const },

packages/schema/src/event-manifest.ts

@@ -31,6 +31,7 @@ import { SessionEvent } from "./session-event.js"
 import { SessionStatusEvent } from "./session-status-event.js"
 import { TuiEvent } from "./tui-event.js"
 import { VcsEvent } from "./vcs-event.js"
+import { WorkspaceEvent } from "./workspace-event.js"
 import { WorktreeEvent } from "./worktree-event.js"
 import { WebSearch } from "./websearch.js"
 
@@ -88,6 +89,7 @@ export const Definitions = Event.inventory(
   ...SessionStatusEvent.Definitions,
   ...SessionCompactionEvent.Definitions,
   ...VcsEvent.Definitions,
+  ...WorkspaceEvent.Definitions,
   ...WorktreeEvent.Definitions,
   ...ServerEvent.Definitions,
 )

packages/schema/src/index.ts

@@ -25,7 +25,6 @@ export { Vcs } from "./vcs.js"
 export { SessionPending } from "./session-pending.js"
 export { SessionError } from "./session-error.js"
 export { SessionMessage } from "./session-message.js"
-export { SessionTransfer } from "./session-transfer.js"
 export { Snapshot } from "./snapshot.js"
 export { Shell } from "./shell.js"
 export { Skill } from "./skill.js"

packages/schema/src/model.ts

@@ -47,16 +47,9 @@ export const ReasoningField: Schema.Codec<ReasoningField> = Schema.Union([
   Schema.String,
 ]).annotate({ identifier: "Model.ReasoningField" })
 
-export const MaxTokensField = Schema.Literals(["max_completion_tokens", "max_tokens"]).annotate({
-  identifier: "Model.MaxTokensField",
-})
-export type MaxTokensField = typeof MaxTokensField.Type
-
 export interface Compatibility extends Schema.Schema.Type<typeof Compatibility> {}
 export const Compatibility = Schema.Struct({
   reasoningField: ReasoningField.pipe(optional),
-  maxTokensField: MaxTokensField.pipe(optional),
-  requireFinishReason: Schema.Boolean.pipe(optional),
 }).annotate({ identifier: "Model.Compatibility" })
 
 export interface Capabilities extends Schema.Schema.Type<typeof Capabilities> {}

packages/schema/src/session-transfer.ts

@@ -1,11 +0,0 @@
-export * as SessionTransfer from "./session-transfer.js"
-
-import { Schema } from "effect"
-import { Session } from "./session.js"
-import { SessionMessage } from "./session-message.js"
-
-export interface Data extends Schema.Schema.Type<typeof Data> {}
-export const Data = Schema.Struct({
-  info: Session.Info,
-  messages: Schema.Array(SessionMessage.Info),
-}).annotate({ identifier: "SessionTransfer.Data" })

packages/schema/src/workspace-event.ts

@@ -0,0 +1,32 @@
+export * as WorkspaceEvent from "./workspace-event.js"
+
+import { Schema } from "effect"
+import { Event } from "./event.js"
+import { WorkspaceID } from "./workspace-id.js"
+
+export const ConnectionStatus = Schema.Struct({
+  workspaceID: WorkspaceID,
+  status: Schema.Literals(["connected", "connecting", "disconnected", "error"]),
+}).annotate({ identifier: "WorkspaceEvent.ConnectionStatus" })
+export interface ConnectionStatus extends Schema.Schema.Type<typeof ConnectionStatus> {}
+
+export const Ready = Event.ephemeral({
+  type: "workspace.ready",
+  schema: {
+    name: Schema.String,
+  },
+})
+
+export const Failed = Event.ephemeral({
+  type: "workspace.failed",
+  schema: {
+    message: Schema.String,
+  },
+})
+
+export const Status = Event.ephemeral({
+  type: "workspace.status",
+  schema: ConnectionStatus.fields,
+})
+
+export const Definitions = Event.inventory(Ready, Failed, Status)

packages/schema/src/workspace.ts

@@ -1,6 +1,9 @@
 export * as Workspace from "./workspace.js"
 
+import { WorkspaceEvent } from "./workspace-event.js"
 import { WorkspaceID } from "./workspace-id.js"
 
 export const ID = WorkspaceID
 export type ID = WorkspaceID
+
+export const Event = WorkspaceEvent

packages/schema/test/event-manifest.test.ts

@@ -9,6 +9,7 @@ import {
   Project,
   Reference,
   Session,
+  Workspace,
 } from "../src/index.js"
 import { EventManifest } from "../src/event-manifest.js"
 import { FileSystemV1 } from "../src/filesystem-v1.js"
@@ -18,7 +19,7 @@ import { Plugin } from "../src/plugin.js"
 import { SessionEvent } from "../src/session-event.js"
 import { SessionID } from "../src/session-id.js"
 import { SessionMessage } from "../src/session-message.js"
-
+import { WorkspaceEvent } from "../src/workspace-event.js"
 
 describe("public event manifest", () => {
   test("owns the complete public event surface", () => {
@@ -47,6 +48,8 @@ describe("public event manifest", () => {
   test("uses canonical definitions for current public events", () => {
     expect(Session.Event).toBe(SessionEvent)
     expect(Session.Event.Definitions).toBe(SessionEvent.Definitions)
+    expect(Workspace.Event).toBe(WorkspaceEvent)
+    expect(Workspace.Event.Definitions).toBe(WorkspaceEvent.Definitions)
     expect(EventManifest.Latest.get("session.step.ended")).toBe(SessionEvent.Step.Ended)
     expect(EventManifest.Latest.get("agent.updated")).toBe(Agent.Event.Updated)
     expect(EventManifest.Latest.get("project.updated")).toBe(Project.Event.Updated)

packages/schema/test/model.test.ts

@@ -30,22 +30,3 @@ describe("Model.ReasoningField", () => {
       expect(decode(field)).toBe(field)
   })
 })
-
-describe("Model.Compatibility", () => {
-  test("decodes model compatibility overrides", () => {
-    const decode = Schema.decodeUnknownSync(Model.Compatibility)
-
-    expect(decode({})).toEqual({})
-    expect(
-      decode({
-        reasoningField: "vendor_reasoning",
-        maxTokensField: "max_completion_tokens",
-        requireFinishReason: false,
-      }),
-    ).toEqual({
-      reasoningField: "vendor_reasoning",
-      maxTokensField: "max_completion_tokens",
-      requireFinishReason: false,
-    })
-  })
-})

packages/server/package.json

@@ -20,11 +20,9 @@
     "@opencode-ai/simulation": "workspace:*",
     "@opencode-ai/util": "workspace:*",
     "drizzle-orm": "catalog:",
-    "effect": "catalog:",
-    "modal": "0.9.0"
+    "effect": "catalog:"
   },
   "devDependencies": {
-    "@opencode-ai/ai": "workspace:*",
     "@tsconfig/bun": "catalog:",
     "@types/bun": "catalog:",
     "@typescript/native-preview": "catalog:"

packages/server/src/handlers/location.ts

@@ -10,6 +10,7 @@ export const LocationHandler = HttpApiBuilder.group(Api, "server.location", (han
       const location = yield* Location.Service
       return new Location.Info({
         directory: location.directory,
+        workspaceID: location.workspaceID,
         project: location.project,
       })
     }),

packages/server/src/handlers/pty.ts

@@ -19,7 +19,7 @@ import { PtyEnvironment } from "../pty-environment"
 
 const ticketScope = Effect.gen(function* () {
   const location = yield* Location.Service
-  return { directory: location.directory as string }
+  return { directory: location.directory as string, workspaceID: location.workspaceID }
 })
 
 export const PtyHandler = HttpApiBuilder.group(Api, "server.pty", (handlers) =>

packages/server/src/handlers/session.ts

@@ -1,5 +1,4 @@
 import { Session } from "@opencode-ai/core/session"
-import { SessionTransfer } from "@opencode-ai/core/session/transfer"
 import { InstructionEntry } from "@opencode-ai/core/session/instruction-entry"
 import { DateTime, Effect, Stream } from "effect"
 import { HttpApiBuilder, HttpApiSchema } from "effect/unstable/httpapi"
@@ -25,7 +24,6 @@ const DefaultSessionsLimit = 50
 export const SessionHandler = HttpApiBuilder.group(Api, "server.session", (handlers) =>
   Effect.gen(function* () {
     const session = yield* Session.Service
-    const transfer = yield* SessionTransfer.Service
 
     return handlers
       .handle(
@@ -39,6 +37,7 @@ export const SessionHandler = HttpApiBuilder.group(Api, "server.session", (handl
               : ctx.query
           const page = yield* session.list({
             ...query,
+            workspaceID: query.workspace,
             limit: ctx.query.limit ?? DefaultSessionsLimit,
           })
           const sessions = page.data
@@ -83,65 +82,7 @@ export const SessionHandler = HttpApiBuilder.group(Api, "server.session", (handl
                 model: ctx.payload.model,
                 location: ctx.payload.location ?? { directory: AbsolutePath.make(process.cwd()) },
               })
-              .pipe(
-                Effect.catchTags({
-                  "Workspace.NotFoundError": (error) =>
-                    Effect.fail(new InvalidRequestError({ message: `Workspace not found: ${error.id}` })),
-                  "Session.WorkspaceDirectoryError": (error) =>
-                    Effect.fail(new InvalidRequestError({ message: error.message })),
-                }),
-                Effect.orDie,
-              ),
-          }
-        }),
-      )
-      .handle(
-        "session.import",
-        Effect.fn(function* (ctx) {
-          return {
-            data: yield* transfer
-              .import({
-                data: { info: ctx.payload.info, messages: ctx.payload.messages },
-                location: ctx.payload.location ?? { directory: AbsolutePath.make(process.cwd()) },
-              })
-              .pipe(
-                Effect.catchTag(
-                  "SessionTransfer.ImportConflictError",
-                  (error) =>
-                    new ConflictError({
-                      message: `Session already exists: ${error.sessionID}`,
-                      resource: error.sessionID,
-                    }),
-                ),
-              ),
-          }
-        }),
-      )
-      .handle(
-        "session.export",
-        Effect.fn(function* (ctx) {
-          return {
-            data: yield* transfer.export({ sessionID: ctx.params.sessionID, sanitize: ctx.query.sanitize }).pipe(
-              Effect.catchTag(
-                "Session.NotFoundError",
-                (error) =>
-                  new SessionNotFoundError({
-                    sessionID: error.sessionID,
-                    message: `Session not found: ${error.sessionID}`,
-                  }),
-              ),
-              Effect.catchTag("Session.MessageDecodeError", (error) => {
-                const ref = `err_${crypto.randomUUID().slice(0, 8)}`
-                return Effect.logError("failed to decode session message").pipe(
-                  Effect.annotateLogs({ ref, sessionID: error.sessionID, messageID: error.messageID }),
-                  Effect.andThen(
-                    Effect.fail(
-                      new UnknownError({ message: "Unexpected server error. Check server logs for details.", ref }),
-                    ),
-                  ),
-                )
-              }),
-            ),
+              .pipe(Effect.orDie),
           }
         }),
       )
@@ -272,6 +213,7 @@ export const SessionHandler = HttpApiBuilder.group(Api, "server.session", (handl
             .move({
               sessionID: ctx.params.sessionID,
               directory: ctx.payload.directory,
+              workspaceID: ctx.payload.workspaceID,
             })
             .pipe(
               Effect.catchTag("Session.NotFoundError", (error) =>
@@ -462,9 +404,6 @@ export const SessionHandler = HttpApiBuilder.group(Api, "server.session", (handl
                   }),
                 ),
               ),
-              Effect.catchTag("Shell.InvalidCwdError", (error) =>
-                Effect.fail(new InvalidRequestError({ message: error.message })),
-              ),
             )
           return HttpApiSchema.NoContent.make()
         }),

packages/server/src/handlers/shell.ts

@@ -2,7 +2,7 @@ import { Shell } from "@opencode-ai/core/shell"
 import { Location } from "@opencode-ai/core/location"
 import { Effect } from "effect"
 import { HttpApiBuilder, HttpApiSchema } from "effect/unstable/httpapi"
-import { InvalidRequestError, ShellNotFoundError } from "@opencode-ai/protocol/errors"
+import { ShellNotFoundError } from "@opencode-ai/protocol/errors"
 import { Api } from "../api"
 import { response } from "../location"
 
@@ -21,11 +21,7 @@ export const ShellHandler = HttpApiBuilder.group(Api, "server.shell", (handlers)
         Effect.fn(function* (ctx) {
           const shell = yield* Shell.Service
           const location = yield* Location.Service
-          return yield* response(
-            shell
-              .create({ ...ctx.payload, cwd: ctx.payload.cwd || location.directory })
-              .pipe(Effect.mapError((error) => new InvalidRequestError({ message: error.message }))),
-          )
+          return yield* response(shell.create({ ...ctx.payload, cwd: ctx.payload.cwd || location.directory }))
         }),
       )
       .handle(

packages/server/src/location.ts

@@ -1,6 +1,7 @@
 import { Location } from "@opencode-ai/core/location"
 import { LocationServiceMap } from "@opencode-ai/core/location-services"
 import { AbsolutePath } from "@opencode-ai/core/schema"
+import { Workspace } from "@opencode-ai/core/workspace"
 import { Effect, Layer } from "effect"
 import { HttpServerRequest } from "effect/unstable/http"
 import { HttpApiMiddleware } from "effect/unstable/httpapi"
@@ -27,11 +28,13 @@ export function response<A, E, R>(data: Effect.Effect<A, E, R>) {
 
 export function requestRef(request: HttpServerRequest.HttpServerRequest): Location.Ref {
   const query = new URL(request.url, "http://localhost").searchParams
+  const workspaceID = query.get("location[workspace]") || request.headers["x-opencode-workspace"]
   const directory =
     query.get("location[directory]") ||
     (request.headers["x-opencode-directory"] ? decode(request.headers["x-opencode-directory"]) : process.cwd())
   return Location.Ref.make({
     directory: AbsolutePath.make(directory),
+    workspaceID: workspaceID ? Workspace.ID.make(workspaceID) : undefined,
   })
 }
 

packages/server/src/middleware/session-location.ts

@@ -4,6 +4,7 @@ import { Location } from "@opencode-ai/core/location"
 import { AbsolutePath } from "@opencode-ai/core/schema"
 import { Session } from "@opencode-ai/core/session"
 import { SessionTable } from "@opencode-ai/core/session/sql"
+import { Workspace } from "@opencode-ai/core/workspace"
 import { eq } from "drizzle-orm"
 import { Effect, Layer, Schema } from "effect"
 import { HttpRouter } from "effect/unstable/http"
@@ -39,7 +40,7 @@ export const sessionLocationLayer = Layer.effect(
           ),
         )
         const row = yield* db
-          .select({ directory: SessionTable.directory, workspace_id: SessionTable.workspace_id })
+          .select({ directory: SessionTable.directory, workspaceID: SessionTable.workspace_id })
           .from(SessionTable)
           .where(eq(SessionTable.id, sessionID))
           .get()
@@ -53,11 +54,9 @@ export const sessionLocationLayer = Layer.effect(
         return yield* effect.pipe(
           Effect.provide(
             locations.get(
-              // Hosted-ness is a server-side fact from the session row; clients
-              // never assert workspace identity per-request.
               Location.Ref.make({
                 directory: AbsolutePath.make(row.directory),
-                workspaceID: row.workspace_id ?? undefined,
+                workspaceID: row.workspaceID ? Workspace.ID.make(row.workspaceID) : undefined,
               }),
             ),
           ),

packages/server/src/routes.ts

@@ -16,7 +16,6 @@ import { PtyTicket } from "@opencode-ai/core/pty/ticket"
 import { Pty } from "@opencode-ai/core/pty"
 import { Project } from "@opencode-ai/core/project"
 import { Session } from "@opencode-ai/core/session"
-import { SessionTransfer } from "@opencode-ai/core/session/transfer"
 import { Shell } from "@opencode-ai/core/shell"
 import { Job } from "@opencode-ai/core/job"
 import { MCP } from "@opencode-ai/core/mcp/index"
@@ -41,8 +40,6 @@ import { PtyEnvironment } from "./pty-environment"
 import { layer } from "./location"
 import { formLocationLayer } from "./middleware/form-location"
 import { sessionLocationLayer } from "./middleware/session-location"
-import { WorkspaceDriver } from "@opencode-ai/core/workspace/driver"
-import { ServerWorkspaceDrivers } from "./workspace/drivers"
 import { ServerInfo } from "./server-info"
 import type { ServerOptions } from "./options"
 
@@ -54,7 +51,6 @@ const applicationServices = LayerNode.group([
   Job.node,
   Project.node,
   Session.node,
-  SessionTransfer.node,
   PluginRuntime.providerNode,
   SdkPlugins.node,
   PermissionSaved.node,
@@ -88,7 +84,6 @@ function makeRoutes<AuthError, AuthServices>(
   const pluginRuntimeCell = PluginRuntime.makeCell()
   const replacements: LayerNode.Replacements = [
     [Database.node, Database.configured(options.database)],
-    [WorkspaceDriver.registryNode, ServerWorkspaceDrivers.node],
     [Bus.node, Bus.configured({ persist: options.events?.persist })],
     [App.node, App.configured(options.app)],
     [ModelsDev.node, ModelsDev.configured(options.models)],

packages/server/src/workspace/drivers.ts

@@ -1,18 +0,0 @@
-export * as ServerWorkspaceDrivers from "./drivers"
-
-import { Effect, Layer } from "effect"
-import { makeGlobalNode } from "@opencode-ai/util/effect/app-node"
-import { WorkspaceDriver } from "@opencode-ai/core/workspace/driver"
-import { ModalDriver } from "./modal"
-
-/** Replaces core's empty default registry in Server composition. */
-export const node = makeGlobalNode({
-  service: WorkspaceDriver.RegistryService,
-  layer: Layer.effect(
-    WorkspaceDriver.RegistryService,
-    Effect.map(ModalDriver.make, (modal) =>
-      WorkspaceDriver.RegistryService.of(WorkspaceDriver.registry({ modal })),
-    ),
-  ),
-  deps: [],
-})

packages/server/src/workspace/modal.ts

@@ -1,201 +0,0 @@
-export * as ModalDriver from "./modal"
-
-import { Effect, Schema, Sink, Stream } from "effect"
-import { systemError } from "effect/PlatformError"
-import type { Command } from "effect/unstable/process/ChildProcess"
-import { ExitCode, ProcessId, make as makeSpawner, makeHandle } from "effect/unstable/process/ChildProcessSpawner"
-import { ModalClient, type Sandbox, SandboxFilesystemNotFoundError, NotFoundError } from "modal"
-import { WorkspaceDriver } from "@opencode-ai/core/workspace/driver"
-import { WorkspaceEnvironment } from "@opencode-ai/core/workspace/environment"
-
-const PROVIDER = "modal"
-const APP = "opencode-workspaces"
-const ROOT = "/workspace"
-/** Maximum sandbox lifetime; stop/resume/TTL lifecycle is a deferred design. */
-const SANDBOX_TIMEOUT_MS = 60 * 60 * 1000
-/**
- * Backstop for commands: Modal exposes no per-process termination, so kill is
- * best-effort and this deadline is what actually reaps orphaned commands.
- */
-const EXEC_TIMEOUT_MS = 30 * 60 * 1000
-
-const Binding = Schema.Struct({ sandboxId: Schema.String })
-
-const fail = (message: string) => (cause: unknown) => new WorkspaceDriver.Error({ provider: PROVIDER, message, cause })
-
-// git, bash, and rg are provisioned in the image, never discovered.
-const IMAGE_COMMANDS = ["RUN apt-get update && apt-get install -y --no-install-recommends git ripgrep ca-certificates"]
-
-export const make = Effect.sync(() => {
-  // Credentials come from MODAL_TOKEN_ID/MODAL_TOKEN_SECRET or ~/.modal.toml.
-  const client = new ModalClient()
-  const decode = (binding: WorkspaceDriver.Binding) =>
-    Schema.decodeUnknownEffect(Binding)(binding).pipe(Effect.mapError(fail("invalid modal binding")))
-
-  return WorkspaceDriver.make({
-    create: ({ workspaceID }) =>
-      Effect.tryPromise({
-        try: async () => {
-          const app = await client.apps.fromName(APP, { createIfMissing: true })
-          const image = client.images.fromRegistry("ubuntu:24.04").dockerfileCommands(IMAGE_COMMANDS)
-          const sandbox = await client.sandboxes.create(app, image, {
-            name: workspaceID,
-            timeoutMs: SANDBOX_TIMEOUT_MS,
-          })
-          await sandbox.filesystem.makeDirectory(ROOT)
-          return { binding: { sandboxId: sandbox.sandboxId }, root: ROOT }
-        },
-        catch: fail("create"),
-      }),
-
-    connect: (binding) =>
-      Effect.gen(function* () {
-        const decoded = yield* decode(binding)
-        const sandbox = yield* Effect.tryPromise({
-          try: () => client.sandboxes.fromId(decoded.sandboxId),
-          catch: fail("connect"),
-        })
-        const exit = yield* Effect.tryPromise({ try: () => sandbox.poll(), catch: fail("connect") })
-        if (exit !== null)
-          return yield* new WorkspaceDriver.Error({
-            provider: PROVIDER,
-            message: `sandbox ${decoded.sandboxId} has terminated (exit ${exit})`,
-          })
-        return environment(sandbox)
-      }),
-
-    destroy: (binding) =>
-      Effect.gen(function* () {
-        const decoded = yield* decode(binding)
-        yield* Effect.tryPromise({
-          try: async () => {
-            const sandbox = await client.sandboxes.fromId(decoded.sandboxId)
-            await sandbox.terminate({ wait: true })
-          },
-          catch: fail("destroy"),
-        }).pipe(
-          // Already gone is destroyed.
-          Effect.catchIf(
-            (error) => error.cause instanceof NotFoundError,
-            () => Effect.void,
-          ),
-        )
-      }),
-  })
-})
-
-const environment = (sandbox: Sandbox): WorkspaceEnvironment.Interface => ({
-  directory: ROOT,
-  files: files(sandbox),
-  process: makeSpawner(spawn(sandbox)),
-  shell: WorkspaceEnvironment.linuxShell,
-})
-
-const FILE_TYPE = { file: "File", directory: "Directory", symlink: "SymbolicLink" } as const
-
-const files = (sandbox: Sandbox): WorkspaceEnvironment.Files => {
-  const wrap = <A>(operation: string, path: string, run: () => Promise<A>) =>
-    WorkspaceEnvironment.tryOperation({
-      operation,
-      path,
-      run,
-      isNotFound: (cause) => cause instanceof SandboxFilesystemNotFoundError,
-    })
-  return {
-    stat: (path) =>
-      wrap("stat", path, async () => {
-        const info = await sandbox.filesystem.stat(path)
-        return { type: FILE_TYPE[info.type] }
-      }),
-    realPath: (path) =>
-      // No canonicalization API; realpath(1) from coreutils. A non-zero exit
-      // is reported as NotFound, which matches the dominant failure mode.
-      wrap("realPath", path, async () => {
-        // Both streams piped: the SDK's "ignore" path needs ReadableStream.from,
-        // which Bun does not implement.
-        // -e: every component must exist, matching node fs.realpath semantics.
-        const process = await sandbox.exec(["realpath", "-e", "--", path], { stdout: "pipe", stderr: "pipe" })
-        const [output, code] = await Promise.all([process.stdout.readText(), process.wait()])
-        if (code !== 0) throw new SandboxFilesystemNotFoundError(`realpath exited ${code}`)
-        return output.trim()
-      }),
-    read: (path) => wrap("read", path, () => sandbox.filesystem.readBytes(path)),
-    list: (path) =>
-      wrap("list", path, async () => {
-        const entries = await sandbox.filesystem.listFiles(path)
-        return entries.map((entry) => ({
-          name: entry.name,
-          type:
-            entry.type === "file"
-              ? ("file" as const)
-              : entry.type === "directory"
-                ? ("directory" as const)
-                : ("symlink" as const),
-        }))
-      }),
-    // Parent directories are created by the SDK, matching the Files contract.
-    write: (path, content) =>
-      Effect.tryPromise({
-        try: () => sandbox.filesystem.writeBytes(content, path),
-        catch: (cause) => new WorkspaceEnvironment.Error({ operation: "write", path, cause }),
-      }),
-    remove: (path) => wrap("remove", path, () => sandbox.filesystem.remove(path)),
-  }
-}
-
-const spawnError = (method: string, options?: { description?: string; cause?: unknown }) =>
-  systemError({ _tag: "Unknown", module: "ModalDriver", method, ...options })
-
-const spawn = (sandbox: Sandbox) => {
-  let pids = 0
-  return Effect.fnUntraced(function* (command: Command) {
-    if (command._tag === "PipedCommand")
-      return yield* Effect.fail(spawnError("spawn", { description: "piped commands unsupported" }))
-
-    const process = yield* Effect.tryPromise({
-      try: () =>
-        sandbox.exec([command.command, ...command.args], {
-          mode: "binary",
-          stdout: "pipe",
-          stderr: "pipe",
-          workdir: command.options.cwd,
-          env: compact(command.options.env),
-          timeoutMs: EXEC_TIMEOUT_MS,
-        }),
-      catch: (cause) => spawnError("spawn", { cause }),
-    })
-
-    let exited = false
-    let waited: Promise<number> | undefined
-    const wait = () =>
-      (waited ??= process.wait().then((code) => {
-        exited = true
-        return code
-      }))
-    const onError = (cause: unknown) => spawnError("process", { cause })
-    return makeHandle({
-      pid: ProcessId(++pids),
-      exitCode: Effect.tryPromise({ try: wait, catch: onError }).pipe(Effect.map(ExitCode)),
-      isRunning: Effect.sync(() => !exited),
-      // Modal has no per-process termination; EXEC_TIMEOUT_MS reaps orphans.
-      kill: () => Effect.logWarning("modal cannot kill sandbox commands; relying on exec timeout"),
-      stdin: Sink.forEach((chunk: Uint8Array) =>
-        Effect.tryPromise({ try: () => process.stdin.writeBytes(chunk), catch: onError }),
-      ),
-      stdout: Stream.fromReadableStream({ evaluate: () => process.stdout, onError }),
-      stderr: Stream.fromReadableStream({ evaluate: () => process.stderr, onError }),
-      all: Stream.merge(
-        Stream.fromReadableStream({ evaluate: () => process.stdout, onError }),
-        Stream.fromReadableStream({ evaluate: () => process.stderr, onError }),
-      ),
-      getInputFd: () => Sink.fail(spawnError("getInputFd", { description: "unsupported" })),
-      getOutputFd: () => Stream.fail(spawnError("getOutputFd", { description: "unsupported" })),
-      unref: Effect.succeed(Effect.void),
-    })
-  })
-}
-
-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]])))
-}

packages/server/test/workspace-modal-graph.test.ts

@@ -1,100 +0,0 @@
-import { describe, expect, test } from "bun:test"
-import { existsSync, mkdtempSync } from "fs"
-import { homedir, tmpdir } from "os"
-import path from "path"
-import { Effect, Layer } from "effect"
-import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
-import { Bus } from "@opencode-ai/core/bus"
-import { Database } from "@opencode-ai/core/database/database"
-import { FileMutation } from "@opencode-ai/core/file-mutation"
-import { FileSystem } from "@opencode-ai/core/filesystem"
-import { Location } from "@opencode-ai/core/location"
-import { LocationMutation } from "@opencode-ai/core/location-mutation"
-import { LocationServiceMap } from "@opencode-ai/core/location-service-map"
-import { Project } from "@opencode-ai/core/project"
-import { AbsolutePath, RelativePath } from "@opencode-ai/core/schema"
-import { Shell } from "@opencode-ai/core/shell"
-import { Workspace } from "@opencode-ai/core/workspace"
-import { WorkspaceDriver } from "@opencode-ai/core/workspace/driver"
-import { LayerNode } from "@opencode-ai/util/effect/layer-node"
-import { ServerWorkspaceDrivers } from "../src/workspace/drivers"
-import { ModalDriver } from "../src/workspace/modal"
-
-const hasCredentials = process.env.MODAL_TOKEN_ID !== undefined || existsSync(path.join(homedir(), ".modal.toml"))
-
-const databaseFile = path.join(mkdtempSync(path.join(tmpdir(), "opencode-modal-graph-")), "graph.db")
-
-const layer = AppNodeBuilder.build(
-  LayerNode.group([Database.node, Bus.node, Workspace.node, LocationServiceMap.node]),
-  [
-    [Database.node, Database.configured({ path: databaseFile })],
-    [WorkspaceDriver.registryNode, ServerWorkspaceDrivers.node],
-  ],
-)
-
-// The complete hosted stack against real Modal: workspace creation, the full
-// Location graph, file mutation, real bash in the sandbox, eviction, reconnect.
-describe.skipIf(!hasCredentials)("hosted location graph on modal (live)", () => {
-  test(
-    "runs the location graph against a modal sandbox",
-    async () => {
-      await Effect.gen(function* () {
-        const workspaces = yield* Workspace.Service
-        const created = yield* workspaces.create({ provider: "modal" })
-        const driver = yield* ModalDriver.make
-        const found = yield* workspaces.binding(created.id)
-        yield* Effect.addFinalizer(() => Effect.ignore(driver.destroy(found.binding)))
-
-        const locations = yield* LocationServiceMap.Service
-        const ref = Location.Ref.make({
-          directory: AbsolutePath.make(created.root),
-          workspaceID: created.id,
-        })
-
-        yield* Effect.gen(function* () {
-          const location = yield* Location.Service
-          expect(location.project.id).toBe(Project.ID.global)
-
-          const mutation = yield* LocationMutation.Service
-          const mutations = yield* FileMutation.Service
-          const target = yield* mutation.resolve({ path: "hello.txt" })
-          yield* mutations.write({ target, content: "hello from opencode\n" })
-
-          const shell = yield* Shell.Service
-          const command = yield* shell.create({
-            command: "cat hello.txt && printf 'bash-made' > bash.txt && ln -s /etc escaped",
-            timeout: 60_000,
-          })
-          const finished = yield* shell.wait(command.id)
-          expect(finished.status).toBe("exited")
-          const output = yield* shell.output(command.id)
-          expect(output.output).toContain("hello from opencode")
-
-          const filesystem = yield* FileSystem.Service
-          const fromBash = yield* filesystem.read({ path: RelativePath.make("bash.txt") })
-          expect(new TextDecoder().decode(fromBash.content)).toBe("bash-made")
-          const root = yield* mutation.resolve({ path: "." })
-          const entries = yield* filesystem.glob({ target: root, pattern: "*.txt", limit: 10 })
-          expect(entries.map((entry) => String(entry.path)).sort()).toEqual(["bash.txt", "hello.txt"])
-          const matches = yield* filesystem.grep({
-            target: yield* mutation.resolve({ path: "hello.txt" }),
-            pattern: "opencode",
-            limit: 10,
-          })
-          expect(matches).toMatchObject([{ entry: { path: "hello.txt" }, line: 1 }])
-          const escaped = yield* mutation.resolve({ path: "escaped/passwd" }).pipe(Effect.flip)
-          expect(escaped).toMatchObject({ _tag: "LocationMutation.PathError", reason: "outside_workspace" })
-        }).pipe(Effect.provide(locations.get(ref)))
-
-        yield* locations.invalidate(ref)
-
-        yield* Effect.gen(function* () {
-          const filesystem = yield* FileSystem.Service
-          const hello = yield* filesystem.read({ path: RelativePath.make("hello.txt") })
-          expect(new TextDecoder().decode(hello.content)).toBe("hello from opencode\n")
-        }).pipe(Effect.provide(locations.get(ref)))
-      }).pipe(Effect.scoped, Effect.provide(layer), Effect.runPromise)
-    },
-    { timeout: 600_000 },
-  )
-})

packages/server/test/workspace-modal-session.test.ts

@@ -1,153 +0,0 @@
-import { describe, expect, test } from "bun:test"
-import { existsSync, mkdtempSync } from "fs"
-import { homedir, tmpdir } from "os"
-import path from "path"
-import { Effect, Layer } from "effect"
-import { LanguageModel } from "@opencode-ai/ai"
-import * as OpenAIChat from "@opencode-ai/ai/protocols/openai-chat"
-import { TestLLM } from "@opencode-ai/ai/testing"
-import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
-import { LayerNodePlatform } from "@opencode-ai/core/effect/app-node-platform"
-import { Bus } from "@opencode-ai/core/bus"
-import { Database } from "@opencode-ai/core/database/database"
-import { Location } from "@opencode-ai/core/location"
-import { LocationServiceMap } from "@opencode-ai/core/location-service-map"
-import { Model } from "@opencode-ai/core/model"
-import { Permission } from "@opencode-ai/core/permission"
-import { PluginRuntime } from "@opencode-ai/core/plugin/runtime"
-import { Provider } from "@opencode-ai/core/provider"
-import { AbsolutePath, RelativePath } from "@opencode-ai/core/schema"
-import { FileSystem } from "@opencode-ai/core/filesystem"
-import { Session } from "@opencode-ai/core/session"
-import { SessionExecution } from "@opencode-ai/core/session/execution"
-import { SessionRunnerModel } from "@opencode-ai/core/session/runner/model"
-import { Workspace } from "@opencode-ai/core/workspace"
-import { WorkspaceDriver } from "@opencode-ai/core/workspace/driver"
-import { LayerNode } from "@opencode-ai/util/effect/layer-node"
-import { ServerWorkspaceDrivers } from "../src/workspace/drivers"
-import { ModalDriver } from "../src/workspace/modal"
-
-const hasCredentials = process.env.MODAL_TOKEN_ID !== undefined || existsSync(path.join(homedir(), ".modal.toml"))
-
-const databaseFile = path.join(mkdtempSync(path.join(tmpdir(), "opencode-modal-session-")), "session.db")
-
-// A gpt-style id so the patch plugin's context hook advertises apply_patch as
-// the only editor, matching production GPT-5 sessions.
-const model = LanguageModel.make({ id: "gpt-fake", provider: "fake", route: OpenAIChat.route })
-const models = Layer.mock(SessionRunnerModel.Service)({
-  resolve: () =>
-    Effect.succeed(
-      SessionRunnerModel.resolved(model, {
-        capabilities: { tools: true, input: ["text"], output: ["text"] },
-        cost: [],
-      }),
-    ),
-})
-
-const permission = Layer.mock(Permission.Service)({ assert: () => Effect.void })
-
-const layer = AppNodeBuilder.build(
-  LayerNode.group([
-    Database.node,
-    Bus.node,
-    Workspace.node,
-    PluginRuntime.providerNode,
-    LocationServiceMap.node,
-    SessionExecution.node,
-    Session.node,
-  ]),
-  [
-    [Database.node, Database.configured({ path: databaseFile })],
-    [WorkspaceDriver.registryNode, ServerWorkspaceDrivers.node],
-    [LayerNodePlatform.llmClient, TestLLM.clientLayer],
-    [SessionRunnerModel.node, models],
-    [Permission.node, permission],
-  ],
-).pipe(Layer.provideMerge(TestLLM.layer({ fallback: [] })))
-
-const sessionModel = Model.Ref.make({ id: Model.ID.make("gpt-fake"), providerID: Provider.ID.make("fake") })
-
-// A scripted model through the real runner against a real Modal sandbox: the
-// session-level counterpart of workspace-modal-graph.test.ts.
-describe.skipIf(!hasCredentials)("hosted session on modal (live)", () => {
-  test(
-    "runs a scripted model through the real runner on a modal sandbox",
-    async () => {
-      await Effect.gen(function* () {
-        const workspaces = yield* Workspace.Service
-        const created = yield* workspaces.create({ provider: "modal" })
-        const driver = yield* ModalDriver.make
-        const found = yield* workspaces.binding(created.id)
-        yield* Effect.addFinalizer(() => Effect.ignore(driver.destroy(found.binding)))
-
-        const sessions = yield* Session.Service
-        const location = Location.Ref.make({
-          directory: AbsolutePath.make(created.root),
-          workspaceID: created.id,
-        })
-        const session = yield* sessions.create({
-          title: "hosted modal session",
-          location,
-          model: sessionModel,
-        })
-
-        yield* TestLLM.push(
-          TestLLM.tool("call-patch", "patch", {
-            patchText: "*** Begin Patch\n*** Add File: from-patch.txt\n+patched\n*** End Patch",
-          }),
-          TestLLM.tool("call-shell", "shell", { command: "printf 'from-model' > from-model.txt" }),
-          TestLLM.tool("call-glob", "glob", { pattern: "*.txt" }),
-          TestLLM.tool("call-grep", "grep", { pattern: "from-model" }),
-          // Read must go through the sandbox filesystem: the host has no
-          // /workspace/from-patch.txt, so a host-backed reader would fail.
-          TestLLM.tool("call-read", "read", { path: "from-patch.txt" }),
-          TestLLM.text("done", "text-1"),
-        )
-        yield* sessions.prompt({ sessionID: session.id, text: "Write a file in the workspace", resume: false })
-        yield* sessions.resume(session.id)
-
-        const requests = (yield* TestLLM.Service).requests
-        const advertised = requests[0]?.tools.map((tool) => tool.name) ?? []
-        expect(advertised).toContain("shell")
-        expect(advertised).toContain("patch")
-        expect(advertised).toContain("glob")
-        expect(advertised).toContain("grep")
-        expect(advertised).toContain("read")
-        expect(advertised).not.toContain("edit")
-        expect(advertised).not.toContain("write")
-
-        const context = yield* sessions.context(session.id)
-        expect(context.at(0)).toMatchObject({ type: "user", text: "Write a file in the workspace" })
-        const assistants = context.filter((message) => message.type === "assistant")
-        expect(assistants.at(0)).toMatchObject({
-          content: [{ type: "tool", id: "call-patch", state: { status: "completed" } }],
-        })
-        expect(assistants.at(1)).toMatchObject({
-          content: [{ type: "tool", id: "call-shell", state: { status: "completed" } }],
-        })
-        expect(assistants.at(2)).toMatchObject({
-          content: [{ type: "tool", id: "call-glob", state: { status: "completed" } }],
-        })
-        expect(assistants.at(3)).toMatchObject({
-          content: [{ type: "tool", id: "call-grep", state: { status: "completed" } }],
-        })
-        expect(assistants.at(4)).toMatchObject({
-          content: [{ type: "tool", id: "call-read", state: { status: "completed" } }],
-        })
-        expect(assistants.at(-1)).toMatchObject({ content: [{ type: "text", text: "done" }] })
-
-        // Both tools executed inside the sandbox: read the files back through
-        // the hosted filesystem rather than any host path.
-        const locations = yield* LocationServiceMap.Service
-        yield* Effect.gen(function* () {
-          const filesystem = yield* FileSystem.Service
-          const written = yield* filesystem.read({ path: RelativePath.make("from-model.txt") })
-          expect(new TextDecoder().decode(written.content)).toBe("from-model")
-          const patched = yield* filesystem.read({ path: RelativePath.make("from-patch.txt") })
-          expect(new TextDecoder().decode(patched.content)).toBe("patched\n")
-        }).pipe(Effect.provide(locations.get(location)))
-      }).pipe(Effect.scoped, Effect.provide(layer), Effect.runPromise)
-    },
-    { timeout: 600_000 },
-  )
-})