release: v0.6.4

Co-authored-by: Adam Spiers <opencode@adamspiers.org>
Co-authored-by: rekram1-node <aidenpcline@gmail.com>

.github/workflows/deploy.yml

@@ -24,4 +24,6 @@ jobs:
       - run: bun sst deploy --stage=${{ github.ref_name }}
         env:
           CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+          PLANETSCALE_SERVICE_TOKEN_NAME: ${{ secrets.PLANETSCALE_SERVICE_TOKEN_NAME }}
+          PLANETSCALE_SERVICE_TOKEN: ${{ secrets.PLANETSCALE_SERVICE_TOKEN }}
           STRIPE_SECRET_KEY: ${{ github.ref_name == 'production' && secrets.STRIPE_SECRET_KEY_PROD || secrets.STRIPE_SECRET_KEY_DEV }}

AGENTS.md

@@ -10,3 +10,7 @@
 - AVOID `let` statements
 - PREFER single word variable names where possible
 - Use as many bun apis as possible like Bun.file()
+
+## Debugging
+
+- To test opencode in the `packages/opencode` directory you can run `bun dev`

STATS.md

@@ -64,3 +64,7 @@
 | 2025-08-28 | 252,796 (+4,387) | 205,242 (+0)     | 458,038 (+4,387)  |
 | 2025-08-29 | 256,045 (+3,249) | 211,075 (+5,833) | 467,120 (+9,082)  |
 | 2025-08-30 | 258,863 (+2,818) | 212,397 (+1,322) | 471,260 (+4,140)  |
+| 2025-08-31 | 262,004 (+3,141) | 213,944 (+1,547) | 475,948 (+4,688)  |
+| 2025-09-01 | 265,359 (+3,355) | 215,115 (+1,171) | 480,474 (+4,526)  |
+| 2025-09-02 | 270,483 (+5,124) | 217,075 (+1,960) | 487,558 (+7,084)  |
+| 2025-09-03 | 274,793 (+4,310) | 219,755 (+2,680) | 494,548 (+6,990)  |

bun.lock

@@ -26,10 +26,11 @@
     },
     "cloud/core": {
       "name": "@opencode/cloud-core",
-      "version": "0.5.28",
+      "version": "0.6.3",
       "dependencies": {
         "@aws-sdk/client-sts": "3.782.0",
         "@opencode/cloud-resource": "workspace:*",
+        "@planetscale/database": "1.19.0",
         "drizzle-orm": "0.41.0",
         "postgres": "3.4.7",
         "stripe": "18.0.0",
@@ -37,11 +38,12 @@
       },
       "devDependencies": {
         "drizzle-kit": "0.30.5",
+        "mysql2": "3.14.4",
       },
     },
     "cloud/function": {
       "name": "@opencode/cloud-function",
-      "version": "0.5.28",
+      "version": "0.6.3",
       "dependencies": {
         "@ai-sdk/anthropic": "2.0.0",
         "@ai-sdk/openai": "2.0.2",
@@ -67,7 +69,7 @@
     },
     "packages/function": {
       "name": "@opencode/function",
-      "version": "0.5.28",
+      "version": "0.6.3",
       "dependencies": {
         "@octokit/auth-app": "8.0.1",
         "@octokit/rest": "22.0.0",
@@ -82,7 +84,7 @@
     },
     "packages/opencode": {
       "name": "opencode",
-      "version": "0.5.28",
+      "version": "0.6.3",
       "bin": {
         "opencode": "./bin/opencode",
       },
@@ -132,7 +134,7 @@
     },
     "packages/plugin": {
       "name": "@opencode-ai/plugin",
-      "version": "0.5.28",
+      "version": "0.6.3",
       "dependencies": {
         "@opencode-ai/sdk": "workspace:*",
       },
@@ -143,7 +145,7 @@
     },
     "packages/sdk/js": {
       "name": "@opencode-ai/sdk",
-      "version": "0.5.28",
+      "version": "0.6.3",
       "dependencies": {
         "@hey-api/openapi-ts": "0.81.0",
       },
@@ -155,7 +157,7 @@
     },
     "packages/web": {
       "name": "@opencode/web",
-      "version": "0.5.28",
+      "version": "0.6.3",
       "dependencies": {
         "@astrojs/cloudflare": "12.6.3",
         "@astrojs/markdown-remark": "6.3.1",
@@ -194,6 +196,9 @@
     "web-tree-sitter",
     "tree-sitter-bash",
   ],
+  "patchedDependencies": {
+    "@solidjs/start@1.1.7": "patches/@solidjs%2Fstart@1.1.7.patch",
+  },
   "overrides": {
     "zod": "3.25.76",
   },
@@ -747,6 +752,8 @@
 
     "@pkgjs/parseargs": ["@pkgjs/parseargs@0.11.0", "", {}, "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg=="],
 
+    "@planetscale/database": ["@planetscale/database@1.19.0", "", {}, "sha512-Tv4jcFUFAFjOWrGSio49H6R2ijALv0ZzVBfJKIdm+kl9X046Fh4LLawrF9OMsglVbK6ukqMJsUCeucGAFTBcMA=="],
+
     "@poppinss/colors": ["@poppinss/colors@4.1.5", "", { "dependencies": { "kleur": "^4.1.5" } }, "sha512-FvdDqtcRCtz6hThExcFOgW0cWX+xwSMWcRuQe5ZEb2m7cVQOAVZOIMt+/v9RxGiD9/OY16qJBXK4CVKWAPalBw=="],
 
     "@poppinss/dumper": ["@poppinss/dumper@0.6.4", "", { "dependencies": { "@poppinss/colors": "^4.1.5", "@sindresorhus/is": "^7.0.2", "supports-color": "^10.0.0" } }, "sha512-iG0TIdqv8xJ3Lt9O8DrPRxw1MRLjNpoqiSGU03P/wNLP/s0ra0udPJ1J2Tx5M0J3H/cVyEgpbn8xUKRY9j59kQ=="],
@@ -1161,6 +1168,8 @@
 
     "aws-sdk": ["aws-sdk@2.1692.0", "", { "dependencies": { "buffer": "4.9.2", "events": "1.1.1", "ieee754": "1.1.13", "jmespath": "0.16.0", "querystring": "0.2.0", "sax": "1.2.1", "url": "0.10.3", "util": "^0.12.4", "uuid": "8.0.0", "xml2js": "0.6.2" } }, "sha512-x511uiJ/57FIsbgUe5csJ13k3uzu25uWQE+XqfBis/sB0SFoiElJWXRkgEAUh0U6n40eT3ay5Ue4oPkRMu1LYw=="],
 
+    "aws-ssl-profiles": ["aws-ssl-profiles@1.1.2", "", {}, "sha512-NZKeq9AfyQvEeNlN0zSYAaWrmBffJh3IELMZfRpJVWgrpEbtEpnjvzqBPf+mxoI287JohRDoa+/nsfqqiZmF6g=="],
+
     "aws4fetch": ["aws4fetch@1.0.18", "", {}, "sha512-3Cf+YaUl07p24MoQ46rFwulAmiyCwH2+1zw1ZyPAX5OtJ34Hh185DwB8y/qRLb6cYYYtSFJ9pthyLc0MD4e8sQ=="],
 
     "axobject-query": ["axobject-query@4.1.0", "", {}, "sha512-qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ=="],
@@ -1631,6 +1640,8 @@
 
     "gel": ["gel@2.1.1", "", { "dependencies": { "@petamoriken/float16": "^3.8.7", "debug": "^4.3.4", "env-paths": "^3.0.0", "semver": "^7.6.2", "shell-quote": "^1.8.1", "which": "^4.0.0" }, "bin": { "gel": "dist/cli.mjs" } }, "sha512-Newg9X7mRYskoBjSw70l1YnJ/ZGbq64VPyR821H5WVkTGpHG2O0mQILxCeUhxdYERLFY9B4tUyKLyf3uMTjtKw=="],
 
+    "generate-function": ["generate-function@2.3.1", "", { "dependencies": { "is-property": "^1.0.2" } }, "sha512-eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ=="],
+
     "gensync": ["gensync@1.0.0-beta.2", "", {}, "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="],
 
     "get-amd-module-type": ["get-amd-module-type@6.0.1", "", { "dependencies": { "ast-module-types": "^6.0.1", "node-source-walk": "^7.0.1" } }, "sha512-MtjsmYiCXcYDDrGqtNbeIYdAl85n+5mSv2r3FbzER/YV3ZILw4HNNIw34HuV5pyl0jzs6GFYU1VHVEefhgcNHQ=="],
@@ -1769,7 +1780,7 @@
 
     "i18next": ["i18next@23.16.8", "", { "dependencies": { "@babel/runtime": "^7.23.2" } }, "sha512-06r/TitrM88Mg5FdUXAKL96dJMzgqLE5dv3ryBAra4KCwD9mJ4ndOTS95ZuymIGoE+2hzfdaMak2X11/es7ZWg=="],
 
-    "iconv-lite": ["iconv-lite@0.6.3", "", { "dependencies": { "safer-buffer": ">= 2.1.2 < 3.0.0" } }, "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw=="],
+    "iconv-lite": ["iconv-lite@0.7.0", "", { "dependencies": { "safer-buffer": ">= 2.1.2 < 3.0.0" } }, "sha512-cf6L2Ds3h57VVmkZe+Pn+5APsT7FpqJtEhhieDCvrE2MK5Qk9MyffgQyuxQTm6BChfeZNtcOLHp9IcWRVcIcBQ=="],
 
     "ieee754": ["ieee754@1.1.13", "", {}, "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="],
 
@@ -1845,6 +1856,8 @@
 
     "is-promise": ["is-promise@4.0.0", "", {}, "sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ=="],
 
+    "is-property": ["is-property@1.0.2", "", {}, "sha512-Ks/IoX00TtClbGQr4TWXemAnktAQvYB7HzcCxDGqEZU6oCmb2INHuOoKxbtR+HFkmYWBKv/dOZtGRiAjDhj92g=="],
+
     "is-reference": ["is-reference@1.2.1", "", { "dependencies": { "@types/estree": "*" } }, "sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ=="],
 
     "is-regex": ["is-regex@1.2.1", "", { "dependencies": { "call-bound": "^1.0.2", "gopd": "^1.2.0", "has-tostringtag": "^1.0.2", "hasown": "^2.0.2" } }, "sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g=="],
@@ -1957,6 +1970,8 @@
 
     "lru-cache": ["lru-cache@6.0.0", "", { "dependencies": { "yallist": "^4.0.0" } }, "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="],
 
+    "lru.min": ["lru.min@1.1.2", "", {}, "sha512-Nv9KddBcQSlQopmBHXSsZVY5xsdlZkdH/Iey0BlcBYggMd4two7cZnKOK9vmy3nY0O5RGH99z1PCeTpPqszUYg=="],
+
     "luxon": ["luxon@3.6.1", "", {}, "sha512-tJLxrKJhO2ukZ5z0gyjY1zPh3Rh88Ej9P7jNrZiHMUXHae1yvI2imgOZtL1TO8TW6biMMKfTtAOoEJANgtWBMQ=="],
 
     "magic-string": ["magic-string@0.30.18", "", { "dependencies": { "@jridgewell/sourcemap-codec": "^1.5.5" } }, "sha512-yi8swmWbO17qHhwIBNeeZxTceJMeBvWJaId6dyvTSOwTipqeHhMhOrz6513r1sOKnpvQ7zkhlG8tPrpilwTxHQ=="],
@@ -2145,6 +2160,10 @@
 
     "ms": ["ms@2.1.3", "", {}, "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="],
 
+    "mysql2": ["mysql2@3.14.4", "", { "dependencies": { "aws-ssl-profiles": "^1.1.1", "denque": "^2.1.0", "generate-function": "^2.3.1", "iconv-lite": "^0.7.0", "long": "^5.2.1", "lru.min": "^1.0.0", "named-placeholders": "^1.1.3", "seq-queue": "^0.0.5", "sqlstring": "^2.3.2" } }, "sha512-Cs/jx3WZPNrYHVz+Iunp9ziahaG5uFMvD2R8Zlmc194AqXNxt9HBNu7ZsPYrUtmJsF0egETCWIdMIYAwOGjL1w=="],
+
+    "named-placeholders": ["named-placeholders@1.1.3", "", { "dependencies": { "lru-cache": "^7.14.1" } }, "sha512-eLoBxg6wE/rZkJPhU/xRX1WTpkFEwDJEN96oxFrTsqBdbT5ec295Q+CoHrL9IT0DipqKhmGcaZmwOt8OON5x1w=="],
+
     "nanoid": ["nanoid@3.3.11", "", { "bin": { "nanoid": "bin/nanoid.cjs" } }, "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w=="],
 
     "napi-build-utils": ["napi-build-utils@2.0.0", "", {}, "sha512-GEbrYkbfF7MoNaoh2iGG84Mnf/WZfB0GdGEsM8wz7Expx/LlWf5U8t9nvJKXSp3qr5IsEbK04cBGhol/KwOsWA=="],
@@ -2523,6 +2542,8 @@
 
     "send": ["send@0.19.0", "", { "dependencies": { "debug": "2.6.9", "depd": "2.0.0", "destroy": "1.2.0", "encodeurl": "~1.0.2", "escape-html": "~1.0.3", "etag": "~1.8.1", "fresh": "0.5.2", "http-errors": "2.0.0", "mime": "1.6.0", "ms": "2.1.3", "on-finished": "2.4.1", "range-parser": "~1.2.1", "statuses": "2.0.1" } }, "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw=="],
 
+    "seq-queue": ["seq-queue@0.0.5", "", {}, "sha512-hr3Wtp/GZIc/6DAGPDcV4/9WoZhjrkXsi5B/07QgX8tsdc6ilr7BFM6PM6rbdAX1kFSDYeZGLipIZZKyQP0O5Q=="],
+
     "serialize-javascript": ["serialize-javascript@6.0.2", "", { "dependencies": { "randombytes": "^2.1.0" } }, "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g=="],
 
     "seroval": ["seroval@1.3.2", "", {}, "sha512-RbcPH1n5cfwKrru7v7+zrZvjLurgHhGyso3HTyGtRivGWgYjbOmGuivCQaORNELjNONoK35nj28EoWul9sb1zQ=="],
@@ -2607,6 +2628,8 @@
 
     "sprintf-js": ["sprintf-js@1.0.3", "", {}, "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="],
 
+    "sqlstring": ["sqlstring@2.3.3", "", {}, "sha512-qC9iz2FlN7DQl3+wjwn3802RTyjCx7sDvfQEXchwa6CWOx07/WVfh91gBmQ9fahw8snwGEWU3xGzOt4tFyHLxg=="],
+
     "ssri": ["ssri@10.0.6", "", { "dependencies": { "minipass": "^7.0.3" } }, "sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ=="],
 
     "sst": ["sst@3.17.12", "", { "dependencies": { "aws-sdk": "2.1692.0", "aws4fetch": "1.0.18", "jose": "5.2.3", "opencontrol": "0.0.6", "openid-client": "5.6.4" }, "optionalDependencies": { "sst-darwin-arm64": "3.17.12", "sst-darwin-x64": "3.17.12", "sst-linux-arm64": "3.17.12", "sst-linux-x64": "3.17.12", "sst-linux-x86": "3.17.12", "sst-win32-arm64": "3.17.12", "sst-win32-x64": "3.17.12", "sst-win32-x86": "3.17.12" }, "bin": { "sst": "bin/sst.mjs" } }, "sha512-UwUbucNZRLp9GHgPAwkat1sBsNGaJfHsLXZHCMKsolCW7CEuugJfvBl2vOyJrhKP4N+Xnv1QFh0BGsOmN0kQeA=="],
@@ -3113,6 +3136,8 @@
 
     "bl/readable-stream": ["readable-stream@3.6.2", "", { "dependencies": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", "util-deprecate": "^1.0.1" } }, "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA=="],
 
+    "body-parser/iconv-lite": ["iconv-lite@0.6.3", "", { "dependencies": { "safer-buffer": ">= 2.1.2 < 3.0.0" } }, "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw=="],
+
     "cacache/lru-cache": ["lru-cache@10.4.3", "", {}, "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ=="],
 
     "cacheable-request/get-stream": ["get-stream@5.2.0", "", { "dependencies": { "pump": "^3.0.0" } }, "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA=="],
@@ -3129,6 +3154,8 @@
 
     "drizzle-kit/esbuild": ["esbuild@0.19.12", "", { "optionalDependencies": { "@esbuild/aix-ppc64": "0.19.12", "@esbuild/android-arm": "0.19.12", "@esbuild/android-arm64": "0.19.12", "@esbuild/android-x64": "0.19.12", "@esbuild/darwin-arm64": "0.19.12", "@esbuild/darwin-x64": "0.19.12", "@esbuild/freebsd-arm64": "0.19.12", "@esbuild/freebsd-x64": "0.19.12", "@esbuild/linux-arm": "0.19.12", "@esbuild/linux-arm64": "0.19.12", "@esbuild/linux-ia32": "0.19.12", "@esbuild/linux-loong64": "0.19.12", "@esbuild/linux-mips64el": "0.19.12", "@esbuild/linux-ppc64": "0.19.12", "@esbuild/linux-riscv64": "0.19.12", "@esbuild/linux-s390x": "0.19.12", "@esbuild/linux-x64": "0.19.12", "@esbuild/netbsd-x64": "0.19.12", "@esbuild/openbsd-x64": "0.19.12", "@esbuild/sunos-x64": "0.19.12", "@esbuild/win32-arm64": "0.19.12", "@esbuild/win32-ia32": "0.19.12", "@esbuild/win32-x64": "0.19.12" }, "bin": { "esbuild": "bin/esbuild" } }, "sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg=="],
 
+    "encoding/iconv-lite": ["iconv-lite@0.6.3", "", { "dependencies": { "safer-buffer": ">= 2.1.2 < 3.0.0" } }, "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw=="],
+
     "estree-util-to-js/source-map": ["source-map@0.7.6", "", {}, "sha512-i5uvt8C3ikiWeNZSVZNWcfZPItFQOsYTUAOkcUPGd8DqDy1uOUikjt5dG+uRlwyvR108Fb9DOd4GvXfT0N2/uQ=="],
 
     "express/cookie": ["cookie@0.7.2", "", {}, "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w=="],
@@ -3187,6 +3214,8 @@
 
     "mlly/pathe": ["pathe@2.0.3", "", {}, "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w=="],
 
+    "named-placeholders/lru-cache": ["lru-cache@7.18.3", "", {}, "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA=="],
+
     "netlify/node-fetch": ["node-fetch@3.3.2", "", { "dependencies": { "data-uri-to-buffer": "^4.0.0", "fetch-blob": "^3.1.4", "formdata-polyfill": "^4.0.10" } }, "sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA=="],
 
     "nitropack/c12": ["c12@3.2.0", "", { "dependencies": { "chokidar": "^4.0.3", "confbox": "^0.2.2", "defu": "^6.1.4", "dotenv": "^17.2.1", "exsolve": "^1.0.7", "giget": "^2.0.0", "jiti": "^2.5.1", "ohash": "^2.0.11", "pathe": "^2.0.3", "perfect-debounce": "^1.0.0", "pkg-types": "^2.2.0", "rc9": "^2.1.2" }, "peerDependencies": { "magicast": "^0.3.5" }, "optionalPeers": ["magicast"] }, "sha512-ixkEtbYafL56E6HiFuonMm1ZjoKtIo7TH68/uiEq4DAwv9NcUX2nJ95F8TrbMeNjqIkZpruo3ojXQJ+MGG5gcQ=="],
@@ -3243,6 +3272,8 @@
 
     "prompts/kleur": ["kleur@3.0.3", "", {}, "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w=="],
 
+    "raw-body/iconv-lite": ["iconv-lite@0.6.3", "", { "dependencies": { "safer-buffer": ">= 2.1.2 < 3.0.0" } }, "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw=="],
+
     "rc/ini": ["ini@1.3.8", "", {}, "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="],
 
     "read-pkg/unicorn-magic": ["unicorn-magic@0.1.0", "", {}, "sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ=="],

cloud/app/app.config.ts

@@ -1,6 +1,7 @@
 import { defineConfig } from "@solidjs/start/config"
 
 export default defineConfig({
+  middleware: "./src/middleware.ts",
   vite: {
     server: {
       allowedHosts: true,

cloud/app/package.json

@@ -2,11 +2,12 @@
   "name": "@opencode/cloud-app",
   "type": "module",
   "scripts": {
+    "typecheck": "tsc --noEmit",
     "dev": "vinxi dev --host 0.0.0.0",
     "dev:remote": "VITE_AUTH_URL=https://auth.dev.opencode.ai bun sst shell --stage=dev bun dev",
     "build": "vinxi build",
     "start": "vinxi start",
-    "version": "0.5.29"
+    "version": "0.6.4"
   },
   "dependencies": {
     "@ibm/plex": "6.4.1",

cloud/app/public/robots.txt

@@ -0,0 +1,5 @@
+User-agent: *
+Allow: /
+
+# Disallow shared content pages
+Disallow: /s/

cloud/app/public/theme.json

@@ -0,0 +1,182 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "type": "object",
+  "properties": {
+    "$schema": {
+      "type": "string",
+      "description": "JSON schema reference for configuration validation"
+    },
+    "defs": {
+      "type": "object",
+      "description": "Color definitions that can be referenced in the theme",
+      "patternProperties": {
+        "^[a-zA-Z][a-zA-Z0-9_]*$": {
+          "oneOf": [
+            {
+              "type": "string",
+              "pattern": "^#[0-9a-fA-F]{6}$",
+              "description": "Hex color value"
+            },
+            {
+              "type": "integer",
+              "minimum": 0,
+              "maximum": 255,
+              "description": "ANSI color code (0-255)"
+            },
+            {
+              "type": "string",
+              "enum": ["none"],
+              "description": "No color (uses terminal default)"
+            }
+          ]
+        }
+      },
+      "additionalProperties": false
+    },
+    "theme": {
+      "type": "object",
+      "description": "Theme color definitions",
+      "properties": {
+        "primary": { "$ref": "#/definitions/colorValue" },
+        "secondary": { "$ref": "#/definitions/colorValue" },
+        "accent": { "$ref": "#/definitions/colorValue" },
+        "error": { "$ref": "#/definitions/colorValue" },
+        "warning": { "$ref": "#/definitions/colorValue" },
+        "success": { "$ref": "#/definitions/colorValue" },
+        "info": { "$ref": "#/definitions/colorValue" },
+        "text": { "$ref": "#/definitions/colorValue" },
+        "textMuted": { "$ref": "#/definitions/colorValue" },
+        "background": { "$ref": "#/definitions/colorValue" },
+        "backgroundPanel": { "$ref": "#/definitions/colorValue" },
+        "backgroundElement": { "$ref": "#/definitions/colorValue" },
+        "border": { "$ref": "#/definitions/colorValue" },
+        "borderActive": { "$ref": "#/definitions/colorValue" },
+        "borderSubtle": { "$ref": "#/definitions/colorValue" },
+        "diffAdded": { "$ref": "#/definitions/colorValue" },
+        "diffRemoved": { "$ref": "#/definitions/colorValue" },
+        "diffContext": { "$ref": "#/definitions/colorValue" },
+        "diffHunkHeader": { "$ref": "#/definitions/colorValue" },
+        "diffHighlightAdded": { "$ref": "#/definitions/colorValue" },
+        "diffHighlightRemoved": { "$ref": "#/definitions/colorValue" },
+        "diffAddedBg": { "$ref": "#/definitions/colorValue" },
+        "diffRemovedBg": { "$ref": "#/definitions/colorValue" },
+        "diffContextBg": { "$ref": "#/definitions/colorValue" },
+        "diffLineNumber": { "$ref": "#/definitions/colorValue" },
+        "diffAddedLineNumberBg": { "$ref": "#/definitions/colorValue" },
+        "diffRemovedLineNumberBg": { "$ref": "#/definitions/colorValue" },
+        "markdownText": { "$ref": "#/definitions/colorValue" },
+        "markdownHeading": { "$ref": "#/definitions/colorValue" },
+        "markdownLink": { "$ref": "#/definitions/colorValue" },
+        "markdownLinkText": { "$ref": "#/definitions/colorValue" },
+        "markdownCode": { "$ref": "#/definitions/colorValue" },
+        "markdownBlockQuote": { "$ref": "#/definitions/colorValue" },
+        "markdownEmph": { "$ref": "#/definitions/colorValue" },
+        "markdownStrong": { "$ref": "#/definitions/colorValue" },
+        "markdownHorizontalRule": { "$ref": "#/definitions/colorValue" },
+        "markdownListItem": { "$ref": "#/definitions/colorValue" },
+        "markdownListEnumeration": { "$ref": "#/definitions/colorValue" },
+        "markdownImage": { "$ref": "#/definitions/colorValue" },
+        "markdownImageText": { "$ref": "#/definitions/colorValue" },
+        "markdownCodeBlock": { "$ref": "#/definitions/colorValue" },
+        "syntaxComment": { "$ref": "#/definitions/colorValue" },
+        "syntaxKeyword": { "$ref": "#/definitions/colorValue" },
+        "syntaxFunction": { "$ref": "#/definitions/colorValue" },
+        "syntaxVariable": { "$ref": "#/definitions/colorValue" },
+        "syntaxString": { "$ref": "#/definitions/colorValue" },
+        "syntaxNumber": { "$ref": "#/definitions/colorValue" },
+        "syntaxType": { "$ref": "#/definitions/colorValue" },
+        "syntaxOperator": { "$ref": "#/definitions/colorValue" },
+        "syntaxPunctuation": { "$ref": "#/definitions/colorValue" }
+      },
+      "required": ["primary", "secondary", "accent", "text", "textMuted", "background"],
+      "additionalProperties": false
+    }
+  },
+  "required": ["theme"],
+  "additionalProperties": false,
+  "definitions": {
+    "colorValue": {
+      "oneOf": [
+        {
+          "type": "string",
+          "pattern": "^#[0-9a-fA-F]{6}$",
+          "description": "Hex color value (same for dark and light)"
+        },
+        {
+          "type": "integer",
+          "minimum": 0,
+          "maximum": 255,
+          "description": "ANSI color code (0-255, same for dark and light)"
+        },
+        {
+          "type": "string",
+          "enum": ["none"],
+          "description": "No color (uses terminal default)"
+        },
+        {
+          "type": "string",
+          "pattern": "^[a-zA-Z][a-zA-Z0-9_]*$",
+          "description": "Reference to another color in the theme or defs"
+        },
+        {
+          "type": "object",
+          "properties": {
+            "dark": {
+              "oneOf": [
+                {
+                  "type": "string",
+                  "pattern": "^#[0-9a-fA-F]{6}$",
+                  "description": "Hex color value for dark mode"
+                },
+                {
+                  "type": "integer",
+                  "minimum": 0,
+                  "maximum": 255,
+                  "description": "ANSI color code for dark mode"
+                },
+                {
+                  "type": "string",
+                  "enum": ["none"],
+                  "description": "No color (uses terminal default)"
+                },
+                {
+                  "type": "string",
+                  "pattern": "^[a-zA-Z][a-zA-Z0-9_]*$",
+                  "description": "Reference to another color for dark mode"
+                }
+              ]
+            },
+            "light": {
+              "oneOf": [
+                {
+                  "type": "string",
+                  "pattern": "^#[0-9a-fA-F]{6}$",
+                  "description": "Hex color value for light mode"
+                },
+                {
+                  "type": "integer",
+                  "minimum": 0,
+                  "maximum": 255,
+                  "description": "ANSI color code for light mode"
+                },
+                {
+                  "type": "string",
+                  "enum": ["none"],
+                  "description": "No color (uses terminal default)"
+                },
+                {
+                  "type": "string",
+                  "pattern": "^[a-zA-Z][a-zA-Z0-9_]*$",
+                  "description": "Reference to another color for light mode"
+                }
+              ]
+            }
+          },
+          "required": ["dark", "light"],
+          "additionalProperties": false,
+          "description": "Separate colors for dark and light modes"
+        }
+      ]
+    }
+  }
+}

cloud/app/src/context/auth.session.ts

@@ -1,7 +1,7 @@
 import { useSession } from "vinxi/http"
 
 export interface AuthSession {
-  account: Record<
+  account?: Record<
     string,
     {
       id: string

cloud/app/src/context/auth.ts

@@ -2,7 +2,7 @@ import { getRequestEvent } from "solid-js/web"
 import { and, Database, eq, inArray } from "@opencode/cloud-core/drizzle/index.js"
 import { WorkspaceTable } from "@opencode/cloud-core/schema/workspace.sql.js"
 import { UserTable } from "@opencode/cloud-core/schema/user.sql.js"
-import { query, redirect } from "@solidjs/router"
+import { redirect } from "@solidjs/router"
 import { AccountTable } from "@opencode/cloud-core/schema/account.sql.js"
 import { Actor } from "@opencode/cloud-core/actor.js"
 
@@ -14,16 +14,17 @@ export const AuthClient = createClient({
   issuer: import.meta.env.VITE_AUTH_URL,
 })
 
-export const getActor = query(async (): Promise<Actor.Info> => {
+export const getActor = async (): Promise<Actor.Info> => {
   "use server"
   const evt = getRequestEvent()
   if (!evt) throw new Error("No request event")
   const url = new URL(evt.request.headers.has("x-server-id") ? evt.request.headers.get("referer")! : evt.request.url)
   const auth = await useAuthSession()
+  auth.data.account = auth.data.account ?? {}
   const splits = url.pathname.split("/").filter(Boolean)
   if (splits[0] !== "workspace") {
-    if (auth.data.current) {
-      const current = auth.data.account[auth.data.current]
+    const current = auth.data.account[auth.data.current ?? ""]
+    if (current) {
       return {
         type: "account",
         properties: {
@@ -52,28 +53,30 @@ export const getActor = query(async (): Promise<Actor.Info> => {
     }
   }
   const workspaceHint = splits[1]
-  const accounts = Object.keys(auth.data.account)
-  const result = await Database.transaction(async (tx) => {
-    return await tx
-      .select({
-        user: UserTable,
-      })
-      .from(AccountTable)
-      .innerJoin(UserTable, and(eq(UserTable.email, AccountTable.email)))
-      .innerJoin(WorkspaceTable, eq(WorkspaceTable.id, UserTable.workspaceID))
-      .where(and(inArray(AccountTable.id, accounts), eq(WorkspaceTable.id, workspaceHint)))
-      .limit(1)
-      .execute()
-      .then((x) => x[0])
-  })
-  if (result) {
-    return {
-      type: "user",
-      properties: {
-        userID: result.user.id,
-        workspaceID: result.user.workspaceID,
-      },
+  const accounts = Object.keys(auth.data.account ?? {})
+  if (accounts.length) {
+    const result = await Database.transaction(async (tx) => {
+      return await tx
+        .select({
+          user: UserTable,
+        })
+        .from(AccountTable)
+        .innerJoin(UserTable, and(eq(UserTable.email, AccountTable.email)))
+        .innerJoin(WorkspaceTable, eq(WorkspaceTable.id, UserTable.workspaceID))
+        .where(and(inArray(AccountTable.id, accounts), eq(WorkspaceTable.id, workspaceHint)))
+        .limit(1)
+        .execute()
+        .then((x) => x[0])
+    })
+    if (result) {
+      return {
+        type: "user",
+        properties: {
+          userID: result.user.id,
+          workspaceID: result.user.workspaceID,
+        },
+      }
     }
   }
   throw redirect("/auth/authorize")
-}, "actor")
+}

cloud/app/src/context/auth.withActor.ts

@@ -1,16 +1,7 @@
 import { Actor } from "@opencode/cloud-core/actor.js"
 import { getActor } from "./auth"
-import { query } from "@solidjs/router"
 
 export async function withActor<T>(fn: () => T) {
   const actor = await getActor()
   return Actor.provide(actor.type, actor.properties, fn)
 }
-
-export function actorQuery<T>(cb: () => T, name: string) {
-  "use server"
-  return query(async () => {
-    const actor = await getActor()
-    return withActor(cb)
-  }, name)
-}

cloud/app/src/entry-server.tsx

@@ -20,4 +20,6 @@ export default createHandler(() => (
       </html>
     )}
   />
-))
+), {
+  mode: "async",
+})

cloud/app/src/middleware.ts

@@ -0,0 +1,5 @@
+import { defineMiddleware } from "vinxi/http"
+
+export default defineMiddleware({
+  onBeforeResponse() {},
+})

cloud/app/src/routes/auth/callback.ts

@@ -27,5 +27,5 @@ export async function GET(input: APIEvent) {
       current: id,
     }
   })
-  return redirect("/")
+  return redirect("/auth")
 }

cloud/app/src/routes/auth/index.ts

@@ -0,0 +1,13 @@
+import { Account } from "@opencode/cloud-core/account.js"
+import { redirect } from "@solidjs/router"
+import type { APIEvent } from "@solidjs/start/server"
+import { withActor } from "~/context/auth.withActor"
+
+export async function GET(input: APIEvent) {
+  try {
+    const workspaces = await withActor(async () => Account.workspaces())
+    return redirect(`/workspace/${workspaces[0].id}`)
+  } catch {
+    return redirect("/auth/authorize")
+  }
+}

cloud/app/src/routes/auth/logout.ts

@@ -1,7 +0,0 @@
-import type { APIEvent } from "@solidjs/start/server"
-import { AuthClient } from "~/context/auth"
-
-export async function GET(input: APIEvent) {
-  const result = await AuthClient.authorize(new URL("./callback", input.request.url).toString(), "code")
-  return Response.redirect(result.url, 302)
-}

cloud/app/src/routes/debug/index.ts

@@ -1,9 +1,13 @@
 import type { APIEvent } from "@solidjs/start/server"
-import { Resource } from "@opencode/cloud-resource"
 import { json } from "@solidjs/router"
+import { Database } from "@opencode/cloud-core/drizzle/index.js"
+import { UserTable } from "@opencode/cloud-core/schema/user.sql.js"
 
 export async function GET(evt: APIEvent) {
   return json({
-    data: Resource.Database.host,
+    data: await Database.use(async (tx) => {
+      const result = await tx.$count(UserTable)
+      return result
+    }),
   })
 }

cloud/app/src/routes/docs/[...path].ts

@@ -0,0 +1,20 @@
+import type { APIEvent } from "@solidjs/start/server"
+
+async function handler(evt: APIEvent) {
+  const req = evt.request.clone()
+  const url = new URL(req.url)
+  const targetUrl = `https://docs.opencode.ai${url.pathname}${url.search}`
+  const response = await fetch(targetUrl, {
+    method: req.method,
+    headers: req.headers,
+    body: req.body,
+  })
+  return response
+}
+
+export const GET = handler
+export const POST = handler
+export const PUT = handler
+export const DELETE = handler
+export const OPTIONS = handler
+export const PATCH = handler

cloud/app/src/routes/docs/index.ts

@@ -0,0 +1,20 @@
+import type { APIEvent } from "@solidjs/start/server"
+
+async function handler(evt: APIEvent) {
+  const req = evt.request.clone()
+  const url = new URL(req.url)
+  const targetUrl = `https://docs.opencode.ai${url.pathname}${url.search}`
+  const response = await fetch(targetUrl, {
+    method: req.method,
+    headers: req.headers,
+    body: req.body,
+  })
+  return response
+}
+
+export const GET = handler
+export const POST = handler
+export const PUT = handler
+export const DELETE = handler
+export const OPTIONS = handler
+export const PATCH = handler

cloud/app/src/routes/gateway/v1/chat/completions.ts

@@ -1,576 +1,305 @@
 import { Resource } from "@opencode/cloud-resource"
-import { Billing } from "@opencode/cloud-core/billing.js"
 import type { APIEvent } from "@solidjs/start/server"
 import { Database, eq, sql } from "@opencode/cloud-core/drizzle/index.js"
-import { BillingTable, PaymentTable } from "@opencode/cloud-core/schema/billing.sql.js"
-import { Identifier } from "@opencode/cloud-core/identifier.js"
-import { centsToMicroCents } from "@opencode/cloud-core/util/price.js"
-import { Actor } from "@opencode/cloud-core/actor.js"
 import { KeyTable } from "@opencode/cloud-core/schema/key.sql.js"
+import { BillingTable, UsageTable } from "@opencode/cloud-core/schema/billing.sql.js"
+import { centsToMicroCents } from "@opencode/cloud-core/util/price.js"
+import { Identifier } from "@opencode/cloud-core/identifier.js"
 
-const SUPPORTED_MODELS = {
+const MODELS = {
   //  "anthropic/claude-sonnet-4": {
-  //    input: 0.0000015,
-  //    output: 0.000006,
-  //    reasoning: 0.0000015,
-  //    cacheRead: 0.0000001,
-  //    cacheWrite: 0.0000001,
-  //    model: () =>
-  //      createAnthropic({
-  //        apiKey: Resource.ANTHROPIC_API_KEY.value,
-  //      })("claude-sonnet-4-20250514"),
-  //  },
-  //  "openai/gpt-4.1": {
-  //    input: 0.0000015,
-  //    output: 0.000006,
-  //    reasoning: 0.0000015,
-  //    cacheRead: 0.0000001,
-  //    cacheWrite: 0.0000001,
-  //    model: () =>
-  //      createOpenAI({
-  //        apiKey: Resource.OPENAI_API_KEY.value,
-  //      })("gpt-4.1"),
-  //  },
-  //  "zhipuai/glm-4.5-flash": {
-  //    input: 0,
-  //    output: 0,
-  //    reasoning: 0,
-  //    cacheRead: 0,
-  //    cacheWrite: 0,
-  //    model: () =>
-  //      createOpenAICompatible({
-  //        name: "Zhipu AI",
-  //        baseURL: "https://api.z.ai/api/paas/v4",
-  //        apiKey: Resource.ZHIPU_API_KEY.value,
-  //      })("glm-4.5-flash"),
+  //    auth: true,
+  //    api: "https://api.anthropic.com",
+  //    apiKey: Resource.ANTHROPIC_API_KEY.value,
+  //    model: "claude-sonnet-4-20250514",
+  //    cost: {
+  //      input: 0.0000015,
+  //      output: 0.000006,
+  //      reasoning: 0.0000015,
+  //      cacheRead: 0.0000001,
+  //      cacheWrite: 0.0000001,
+  //    },
+  //    headerMappings: {},
   //  },
+  "qwen/qwen3-coder": {
+    id: "qwen/qwen3-coder",
+    auth: true,
+    api: "https://inference.baseten.co",
+    apiKey: Resource.BASETEN_API_KEY.value,
+    model: "Qwen/Qwen3-Coder-480B-A35B-Instruct",
+    cost: {
+      input: 0.00000038,
+      output: 0.00000153,
+      reasoning: 0,
+      cacheRead: 0,
+      cacheWrite: 0,
+    },
+    headerMappings: {},
+  },
+  "x-ai/grok-code-fast-1": {
+    id: "x-ai/grok-code-fast-1",
+    auth: false,
+    api: "https://api.x.ai",
+    apiKey: Resource.XAI_API_KEY.value,
+    model: "grok-code",
+    cost: {
+      input: 0,
+      output: 0,
+      reasoning: 0,
+      cacheRead: 0,
+      cacheWrite: 0,
+    },
+    headerMappings: {
+      "x-grok-conv-id": "x-opencode-session",
+      "x-grok-req-id": "x-opencode-request",
+    },
+  },
 }
 
+class AuthError extends Error {}
+class CreditsError extends Error {}
+class ModelError extends Error {}
+
 export async function POST(input: APIEvent) {
-  // Check auth header
-  const authHeader = input.request.headers.get("authorization")
-  if (!authHeader || !authHeader.startsWith("Bearer "))
-    return Response.json(
-      {
-        error: {
-          message: "Missing API key.",
-          type: "invalid_request_error",
-          param: null,
-          code: "unauthorized",
-        },
-      },
-      { status: 401 },
-    )
-  const apiKey = authHeader.split(" ")[1]
+  try {
+    const url = new URL(input.request.url)
+    const body = await input.request.json()
+    const MODEL = validateModel()
+    const apiKey = await authenticate()
+    await checkCredits()
 
-  // Check against KeyTable
-  const keyRecord = await Database.use((tx) =>
-    tx
-      .select({
-        id: KeyTable.id,
-        workspaceID: KeyTable.workspaceID,
+    // Request to model provider
+    const res = await fetch(new URL(url.pathname.replace(/^\/gateway/, "") + url.search, MODEL.api), {
+      method: "POST",
+      headers: (() => {
+        const headers = input.request.headers
+        headers.delete("host")
+        headers.delete("content-length")
+        headers.set("authorization", `Bearer ${MODEL.apiKey}`)
+        Object.entries(MODEL.headerMappings ?? {}).forEach(([k, v]) => {
+          headers.set(k, headers.get(v)!)
+        })
+        return headers
+      })(),
+      body: JSON.stringify({
+        ...body,
+        model: MODEL.model,
+        stream_options: {
+          include_usage: true,
+        },
+      }),
+    })
+
+    // Scrub response headers
+    const resHeaders = new Headers()
+    const keepHeaders = ["content-type", "cache-control"]
+    for (const [k, v] of res.headers.entries()) {
+      if (keepHeaders.includes(k.toLowerCase())) {
+        resHeaders.set(k, v)
+      }
+    }
+
+    // Handle non-streaming response
+    if (!body.stream) {
+      const body = await res.json()
+      await trackUsage(body)
+      return new Response(JSON.stringify(body), {
+        status: res.status,
+        statusText: res.statusText,
+        headers: resHeaders,
       })
-      .from(KeyTable)
-      .where(eq(KeyTable.key, apiKey))
-      .then((rows) => rows[0]),
-  )
+    }
 
-  if (!keyRecord)
-    return Response.json(
-      {
-        error: {
-          message: "Invalid API key.",
-          type: "invalid_request_error",
-          param: null,
-          code: "unauthorized",
-        },
+    // Handle streaming response
+    const stream = new ReadableStream({
+      start(c) {
+        const reader = res.body?.getReader()
+        const decoder = new TextDecoder()
+        let buffer = ""
+
+        function pump(): Promise<void> {
+          return (
+            reader?.read().then(async ({ done, value }) => {
+              if (done) {
+                c.close()
+                return
+              }
+
+              buffer += decoder.decode(value, { stream: true })
+
+              const parts = buffer.split("\n\n")
+              buffer = parts.pop() ?? ""
+
+              const usage = parts
+                .map((part) => part.trim())
+                .filter((part) => part.startsWith("data: "))
+                .map((part) => {
+                  try {
+                    return JSON.parse(part.slice(6))
+                  } catch (e) {
+                    return {}
+                  }
+                })
+                .find((part) => part.usage)
+              if (usage) await trackUsage(usage)
+
+              c.enqueue(value)
+
+              return pump()
+            }) || Promise.resolve()
+          )
+        }
+
+        return pump()
       },
-      { status: 401 },
-    )
+    })
 
-  /*
-  return await Actor.provide("system", { workspaceID: keyRecord.workspaceID }, async () => {
-    try {
-      // Check balance
-      const customer = await Billing.get()
-      if (customer.balance <= 0) {
-        return Response.json(
-          {
-            error: {
-              message: "Insufficient balance",
-              type: "insufficient_quota",
-              param: null,
-              code: "insufficient_quota",
-            },
-          },
-          { status: 401 },
+    return new Response(stream, {
+      status: res.status,
+      statusText: res.statusText,
+      headers: resHeaders,
+    })
+
+    function validateModel() {
+      if (!(body.model in MODELS)) {
+        throw new ModelError(`Model ${body.model} not supported`)
+      }
+      return MODELS[body.model as keyof typeof MODELS]
+    }
+
+    async function authenticate() {
+      try {
+        const authHeader = input.request.headers.get("authorization")
+        if (!authHeader || !authHeader.startsWith("Bearer ")) throw new AuthError("Missing API key.")
+
+        const apiKey = authHeader.split(" ")[1]
+        const key = await Database.use((tx) =>
+          tx
+            .select({
+              id: KeyTable.id,
+              workspaceID: KeyTable.workspaceID,
+            })
+            .from(KeyTable)
+            .where(eq(KeyTable.key, apiKey))
+            .then((rows) => rows[0]),
         )
+
+        if (!key) throw new AuthError("Invalid API key.")
+        return key
+      } catch (e) {
+        console.log(e)
+        // ignore error if model does not require authentication
+        if (!MODEL.auth) return
+        throw e
       }
+    }
 
-      const body = await input.request.json<ChatCompletionCreateParamsBase>()
-      const model = SUPPORTED_MODELS[body.model as keyof typeof SUPPORTED_MODELS]?.model()
-      if (!model) throw new Error(`Unsupported model: ${body.model}`)
+    async function checkCredits() {
+      if (!apiKey || !MODEL.auth) return
 
-      const requestBody = transformOpenAIRequestToAiSDK()
-
-      return body.stream ? await handleStream() : await handleGenerate()
-
-      async function handleStream() {
-        const result = await model.doStream({
-          ...requestBody,
-        })
-
-        const encoder = new TextEncoder()
-        const stream = new ReadableStream({
-          async start(controller) {
-            const id = `chatcmpl-${Date.now()}`
-            const created = Math.floor(Date.now() / 1000)
-
-            try {
-              for await (const chunk of result.stream) {
-                console.log("!!! CHUNK !!! : " + chunk.type)
-                switch (chunk.type) {
-                  case "text-delta": {
-                    const data = {
-                      id,
-                      object: "chat.completion.chunk",
-                      created,
-                      model: body.model,
-                      choices: [
-                        {
-                          index: 0,
-                          delta: {
-                            content: chunk.delta,
-                          },
-                          finish_reason: null,
-                        },
-                      ],
-                    }
-                    controller.enqueue(encoder.encode(`data: ${JSON.stringify(data)}\n\n`))
-                    break
-                  }
-
-                  case "reasoning-delta": {
-                    const data = {
-                      id,
-                      object: "chat.completion.chunk",
-                      created,
-                      model: body.model,
-                      choices: [
-                        {
-                          index: 0,
-                          delta: {
-                            reasoning_content: chunk.delta,
-                          },
-                          finish_reason: null,
-                        },
-                      ],
-                    }
-                    controller.enqueue(encoder.encode(`data: ${JSON.stringify(data)}\n\n`))
-                    break
-                  }
-
-                  case "tool-call": {
-                    const data = {
-                      id,
-                      object: "chat.completion.chunk",
-                      created,
-                      model: body.model,
-                      choices: [
-                        {
-                          index: 0,
-                          delta: {
-                            tool_calls: [
-                              {
-                                index: 0,
-                                id: chunk.toolCallId,
-                                type: "function",
-                                function: {
-                                  name: chunk.toolName,
-                                  arguments: chunk.input,
-                                },
-                              },
-                            ],
-                          },
-                          finish_reason: null,
-                        },
-                      ],
-                    }
-                    controller.enqueue(encoder.encode(`data: ${JSON.stringify(data)}\n\n`))
-                    break
-                  }
-
-                  case "error": {
-                    const data = {
-                      id,
-                      object: "chat.completion.chunk",
-                      created,
-                      model: body.model,
-                      choices: [
-                        {
-                          index: 0,
-                          delta: {},
-                          finish_reason: "stop",
-                        },
-                      ],
-                      error: {
-                        message: typeof chunk.error === "string" ? chunk.error : chunk.error,
-                        type: "server_error",
-                      },
-                    }
-                    controller.enqueue(encoder.encode(`data: ${JSON.stringify(data)}\n\n`))
-                    controller.enqueue(encoder.encode("data: [DONE]\n\n"))
-                    controller.close()
-                    break
-                  }
-
-                  case "finish": {
-                    const data = {
-                      id,
-                      object: "chat.completion.chunk",
-                      created,
-                      model: body.model,
-                      choices: [
-                        {
-                          index: 0,
-                          delta: {},
-                          finish_reason:
-                            {
-                              stop: "stop",
-                              length: "length",
-                              "content-filter": "content_filter",
-                              "tool-calls": "tool_calls",
-                              error: "stop",
-                              other: "stop",
-                              unknown: "stop",
-                            }[chunk.finishReason] || "stop",
-                        },
-                      ],
-                      usage: {
-                        prompt_tokens: chunk.usage.inputTokens,
-                        completion_tokens: chunk.usage.outputTokens,
-                        total_tokens: chunk.usage.totalTokens,
-                        completion_tokens_details: {
-                          reasoning_tokens: chunk.usage.reasoningTokens,
-                        },
-                        prompt_tokens_details: {
-                          cached_tokens: chunk.usage.cachedInputTokens,
-                        },
-                      },
-                    }
-                    await trackUsage(body.model, chunk.usage, chunk.providerMetadata)
-                    controller.enqueue(encoder.encode(`data: ${JSON.stringify(data)}\n\n`))
-                    controller.enqueue(encoder.encode("data: [DONE]\n\n"))
-                    controller.close()
-                    break
-                  }
-
-                  //case "stream-start":
-                  //case "response-metadata":
-                  case "text-start":
-                  case "text-end":
-                  case "reasoning-start":
-                  case "reasoning-end":
-                  case "tool-input-start":
-                  case "tool-input-delta":
-                  case "tool-input-end":
-                  case "raw":
-                  default:
-                    // Log unknown chunk types for debugging
-                    console.warn(`Unknown chunk type: ${(chunk as any).type}`)
-                    break
-                }
-              }
-            } catch (error) {
-              controller.error(error)
-            }
-          },
-        })
-
-        return new Response(stream, {
-          headers: {
-            "Content-Type": "text/plain; charset=utf-8",
-            "Cache-Control": "no-cache",
-            Connection: "keep-alive",
-          },
-        })
-      }
-
-      async function handleGenerate() {
-        const response = await model.doGenerate({
-          ...requestBody,
-        })
-        await trackUsage(body.model, response.usage, response.providerMetadata)
-        return c.json({
-          id: `chatcmpl-${Date.now()}`,
-          object: "chat.completion" as const,
-          created: Math.floor(Date.now() / 1000),
-          model: body.model,
-          choices: [
-            {
-              index: 0,
-              message: {
-                role: "assistant" as const,
-                content: response.content?.find((c) => c.type === "text")?.text ?? "",
-                reasoning_content: response.content?.find((c) => c.type === "reasoning")?.text,
-                tool_calls: response.content
-                  ?.filter((c) => c.type === "tool-call")
-                  .map((toolCall) => ({
-                    id: toolCall.toolCallId,
-                    type: "function" as const,
-                    function: {
-                      name: toolCall.toolName,
-                      arguments: toolCall.input,
-                    },
-                  })),
-              },
-              finish_reason:
-                (
-                  {
-                    stop: "stop",
-                    length: "length",
-                    "content-filter": "content_filter",
-                    "tool-calls": "tool_calls",
-                    error: "stop",
-                    other: "stop",
-                    unknown: "stop",
-                  } as const
-                )[response.finishReason] || "stop",
-            },
-          ],
-          usage: {
-            prompt_tokens: response.usage?.inputTokens,
-            completion_tokens: response.usage?.outputTokens,
-            total_tokens: response.usage?.totalTokens,
-            completion_tokens_details: {
-              reasoning_tokens: response.usage?.reasoningTokens,
-            },
-            prompt_tokens_details: {
-              cached_tokens: response.usage?.cachedInputTokens,
-            },
-          },
-        })
-      }
-
-      function transformOpenAIRequestToAiSDK() {
-        const prompt = transformMessages()
-        const tools = transformTools()
-
-        return {
-          prompt,
-          maxOutputTokens: body.max_tokens ?? body.max_completion_tokens ?? undefined,
-          temperature: body.temperature ?? undefined,
-          topP: body.top_p ?? undefined,
-          frequencyPenalty: body.frequency_penalty ?? undefined,
-          presencePenalty: body.presence_penalty ?? undefined,
-          providerOptions: body.reasoning_effort
-            ? {
-                anthropic: {
-                  reasoningEffort: body.reasoning_effort,
-                },
-              }
-            : undefined,
-          stopSequences: (typeof body.stop === "string" ? [body.stop] : body.stop) ?? undefined,
-          responseFormat: (() => {
-            if (!body.response_format) return { type: "text" as const }
-            if (body.response_format.type === "json_schema")
-              return {
-                type: "json" as const,
-                schema: body.response_format.json_schema.schema,
-                name: body.response_format.json_schema.name,
-                description: body.response_format.json_schema.description,
-              }
-            if (body.response_format.type === "json_object") return { type: "json" as const }
-            throw new Error("Unsupported response format")
-          })(),
-          seed: body.seed ?? undefined,
-          tools: tools.tools,
-          toolChoice: tools.toolChoice,
-        }
-
-        function transformTools() {
-          const { tools, tool_choice } = body
-
-          if (!tools || tools.length === 0) {
-            return { tools: undefined, toolChoice: undefined }
-          }
-
-          const aiSdkTools = tools.map((tool) => {
-            return {
-              type: tool.type,
-              name: tool.function.name,
-              description: tool.function.description,
-              inputSchema: tool.function.parameters!,
-            }
+      const billing = await Database.use((tx) =>
+        tx
+          .select({
+            balance: BillingTable.balance,
           })
+          .from(BillingTable)
+          .where(eq(BillingTable.workspaceID, apiKey.workspaceID))
+          .then((rows) => rows[0]),
+      )
 
-          let aiSdkToolChoice
-          if (tool_choice == null) {
-            aiSdkToolChoice = undefined
-          } else if (tool_choice === "auto") {
-            aiSdkToolChoice = { type: "auto" as const }
-          } else if (tool_choice === "none") {
-            aiSdkToolChoice = { type: "none" as const }
-          } else if (tool_choice === "required") {
-            aiSdkToolChoice = { type: "required" as const }
-          } else if (tool_choice.type === "function") {
-            aiSdkToolChoice = {
-              type: "tool" as const,
-              toolName: tool_choice.function.name,
-            }
-          }
+      if (billing.balance <= 0) throw new CreditsError("Insufficient balance")
+    }
 
-          return { tools: aiSdkTools, toolChoice: aiSdkToolChoice }
-        }
+    async function trackUsage(chunk: any) {
+      console.log(`trackUsage ${apiKey}`)
 
-        function transformMessages() {
-          const { messages } = body
-          const prompt: LanguageModelV2Prompt = []
+      if (!apiKey) return
 
-          for (const message of messages) {
-            switch (message.role) {
-              case "system": {
-                prompt.push({
-                  role: "system",
-                  content: message.content as string,
-                })
-                break
-              }
+      const usage = chunk.usage
+      const inputTokens = usage.prompt_tokens ?? 0
+      const outputTokens = usage.completion_tokens ?? 0
+      const reasoningTokens = usage.completion_tokens_details?.reasoning_tokens ?? 0
+      const cacheReadTokens = usage.prompt_tokens_details?.cached_tokens ?? 0
+      //const cacheWriteTokens = providerMetadata?.["anthropic"]?.["cacheCreationInputTokens"] ?? 0
+      const cacheWriteTokens = 0
 
-              case "user": {
-                if (typeof message.content === "string") {
-                  prompt.push({
-                    role: "user",
-                    content: [{ type: "text", text: message.content }],
-                  })
-                } else {
-                  const content = message.content.map((part) => {
-                    switch (part.type) {
-                      case "text":
-                        return { type: "text" as const, text: part.text }
-                      case "image_url":
-                        return {
-                          type: "file" as const,
-                          mediaType: "image/jpeg" as const,
-                          data: part.image_url.url,
-                        }
-                      default:
-                        throw new Error(`Unsupported content part type: ${(part as any).type}`)
-                    }
-                  })
-                  prompt.push({
-                    role: "user",
-                    content,
-                  })
-                }
-                break
-              }
+      const inputCost = MODEL.cost.input * inputTokens
+      const outputCost = MODEL.cost.output * outputTokens
+      const reasoningCost = MODEL.cost.reasoning * reasoningTokens
+      const cacheReadCost = MODEL.cost.cacheRead * cacheReadTokens
+      const cacheWriteCost = MODEL.cost.cacheWrite * cacheWriteTokens
+      const costInCents = (inputCost + outputCost + reasoningCost + cacheReadCost + cacheWriteCost) * 100
+      const cost = centsToMicroCents(costInCents)
 
-              case "assistant": {
-                const content: Array<
-                  | { type: "text"; text: string }
-                  | {
-                      type: "tool-call"
-                      toolCallId: string
-                      toolName: string
-                      input: any
-                    }
-                > = []
-
-                if (message.content) {
-                  content.push({
-                    type: "text",
-                    text: message.content as string,
-                  })
-                }
-
-                if (message.tool_calls) {
-                  for (const toolCall of message.tool_calls) {
-                    content.push({
-                      type: "tool-call",
-                      toolCallId: toolCall.id,
-                      toolName: toolCall.function.name,
-                      input: JSON.parse(toolCall.function.arguments),
-                    })
-                  }
-                }
-
-                prompt.push({
-                  role: "assistant",
-                  content,
-                })
-                break
-              }
-
-              case "tool": {
-                prompt.push({
-                  role: "tool",
-                  content: [
-                    {
-                      type: "tool-result",
-                      toolName: "placeholder",
-                      toolCallId: message.tool_call_id,
-                      output: {
-                        type: "text",
-                        value: message.content as string,
-                      },
-                    },
-                  ],
-                })
-                break
-              }
-
-              default: {
-                throw new Error(`Unsupported message role: ${message.role}`)
-              }
-            }
-          }
-
-          return prompt
-        }
-      }
-
-      async function trackUsage(model: string, usage: LanguageModelUsage, providerMetadata?: ProviderMetadata) {
-        const modelData = SUPPORTED_MODELS[model as keyof typeof SUPPORTED_MODELS]
-        if (!modelData) throw new Error(`Unsupported model: ${model}`)
-
-        const inputTokens = usage.inputTokens ?? 0
-        const outputTokens = usage.outputTokens ?? 0
-        const reasoningTokens = usage.reasoningTokens ?? 0
-        const cacheReadTokens = usage.cachedInputTokens ?? 0
-        const cacheWriteTokens =
-          providerMetadata?.["anthropic"]?.["cacheCreationInputTokens"] ??
-          // @ts-expect-error
-          providerMetadata?.["bedrock"]?.["usage"]?.["cacheWriteInputTokens"] ??
-          0
-
-        const inputCost = modelData.input * inputTokens
-        const outputCost = modelData.output * outputTokens
-        const reasoningCost = modelData.reasoning * reasoningTokens
-        const cacheReadCost = modelData.cacheRead * cacheReadTokens
-        const cacheWriteCost = modelData.cacheWrite * cacheWriteTokens
-        const costInCents = (inputCost + outputCost + reasoningCost + cacheReadCost + cacheWriteCost) * 100
-
-        await Billing.consume({
-          model,
+      await Database.transaction(async (tx) => {
+        await tx.insert(UsageTable).values({
+          workspaceID: apiKey.workspaceID,
+          id: Identifier.create("usage"),
+          model: MODEL.id,
           inputTokens,
           outputTokens,
           reasoningTokens,
           cacheReadTokens,
           cacheWriteTokens,
-          costInCents,
+          cost,
         })
+        await tx
+          .update(BillingTable)
+          .set({
+            balance: sql`${BillingTable.balance} - ${cost}`,
+          })
+          .where(eq(BillingTable.workspaceID, apiKey.workspaceID))
+      })
 
-        await Database.use((tx) =>
-          tx
-            .update(KeyTable)
-            .set({ timeUsed: sql`now()` })
-            .where(eq(KeyTable.id, keyRecord.id)),
-        )
-      }
-    } catch (error: any) {
-      return Response.json({ error: { message: error.message } }, { status: 500 })
+      await Database.use((tx) =>
+        tx
+          .update(KeyTable)
+          .set({ timeUsed: sql`now()` })
+          .where(eq(KeyTable.id, apiKey.id)),
+      )
     }
-  })
-    */
+  } catch (error: any) {
+    if (error instanceof AuthError) {
+      return new Response(
+        JSON.stringify({
+          error: {
+            message: error.message,
+            type: "invalid_request_error",
+            param: null,
+            code: "unauthorized",
+          },
+        }),
+        {
+          status: 401,
+        },
+      )
+    }
+
+    if (error instanceof CreditsError) {
+      return new Response(
+        JSON.stringify({
+          error: {
+            message: error.message,
+            type: "insufficient_quota",
+            param: null,
+            code: "insufficient_quota",
+          },
+        }),
+        {
+          status: 401,
+        },
+      )
+    }
+
+    if (error instanceof ModelError) {
+      return new Response(JSON.stringify({ error: { message: error.message } }), {
+        status: 401,
+      })
+    }
+
+    console.log(error)
+    return new Response(JSON.stringify({ error: { message: error.message } }), {
+      status: 500,
+    })
+  }
 }

cloud/app/src/routes/index.css

@@ -78,22 +78,22 @@
 
   [data-component="cta"] {
     border-top: 2px solid var(--color-border);
-    display: grid;
-    grid-template-columns: auto 1fr auto;
-    align-items: stretch;
+    display: flex;
 
     & > div + div {
       border-left: 2px solid var(--color-border);
     }
 
-    [data-slot="left"],
-    [data-slot="right"] {
+    [data-slot="left"] {
+      flex: 0 0 auto;
       text-align: center;
       line-height: 1.4;
       padding: var(--vertical-padding) 2rem;
       text-transform: uppercase;
+      font-size: 1.125rem;
 
       @media (max-width: 30rem) {
+        font-size: 1rem;
         padding-bottom: calc(var(--vertical-padding) + 4px);
       }
 
@@ -103,53 +103,18 @@
       }
     }
 
-    [data-slot="center"] {
+    [data-slot="right"] {
+      flex: 1;
       padding: var(--vertical-padding) 1rem;
     }
 
-    @media (max-width: 55rem) {
-      display: grid;
-      grid-template-columns: 1fr 1fr;
-      grid-template-rows: auto auto;
-
-      [data-slot="left"] {
-        grid-column: 1;
-        grid-row: 1;
-      }
+    @media (max-width: 50rem) {
+      flex-direction: column;
 
       [data-slot="right"] {
-        grid-column: 2;
-        grid-row: 1;
-      }
-
-      [data-slot="center"] {
-        grid-column: 1 / -1;
-        grid-row: 2;
         border-left: none;
         border-top: 2px solid var(--color-border);
       }
-
-      @media (max-width: 22rem) {
-        grid-template-columns: 1fr;
-        grid-template-rows: auto auto auto;
-
-        [data-slot="left"] {
-          grid-column: 1;
-          grid-row: 1;
-        }
-
-        [data-slot="right"] {
-          grid-column: 1;
-          grid-row: 2;
-          border-top: 2px solid var(--color-border);
-          border-left: none;
-        }
-
-        [data-slot="center"] {
-          grid-column: 1;
-          grid-row: 3;
-        }
-      }
     }
 
     [data-slot="command"] {
@@ -168,7 +133,7 @@
         @media (max-width: 24rem) {
           font-size: 0.875rem;
         }
-        @media (max-width: 64rem) {
+        @media (max-width: 56rem) {
           [data-slot="protocol"] {
             display: none;
           }
@@ -188,6 +153,32 @@
     }
   }
 
+  [data-component="zen"] {
+    border-top: 2px solid var(--color-border);
+    text-align: center;
+    font-size: 1.125rem;
+    padding: var(--vertical-padding) 2rem;
+
+    @media (max-width: 30rem) {
+      font-size: 1rem;
+      padding-left: 1rem;
+      padding-right: 1rem;
+    }
+
+    a[target="_self"] {
+      text-transform: uppercase;
+    }
+
+    [data-slot="description"] {
+      color: var(--color-text-secondary);
+    }
+
+    [data-slot="divider"] {
+      font-weight: bold;
+      color: var(--color-border);
+    }
+  }
+
   [data-component="features"] {
     border-top: 2px solid var(--color-border);
     padding: var(--padding);
@@ -309,27 +300,27 @@
     grid-template-rows: var(--images-height);
     border-top: 2px solid var(--color-border);
 
-    & > div.left {
+    & > [data-slot="left"] {
       display: flex;
       grid-row: 1;
       grid-column: 1;
     }
 
-    & > div.right {
+    & > [data-slot="right"] {
       display: grid;
       grid-template-rows: 1fr 1fr;
       grid-row: 1;
       grid-column: 2;
       border-left: 2px solid var(--color-border);
 
-      & > div.row1 {
+      & > [data-slot="row1"] {
         display: flex;
         grid-row: 1;
         border-bottom: 2px solid var(--color-border);
         height: calc(var(--images-height) / 2);
       }
 
-      & > div.row2 {
+      & > [data-slot="row2"] {
         display: flex;
         grid-row: 2;
         height: calc(var(--images-height) / 2);
@@ -384,24 +375,24 @@
       }
     }
 
-    & > div.left figure {
+    & > [data-slot="left"] figure {
       height: var(--images-height);
       box-sizing: border-box;
     }
 
-    & > div.right figure {
+    & > [data-slot="right"] figure {
       height: calc(var(--images-height) / 2);
       box-sizing: border-box;
     }
 
-    & > div.left img {
+    & > [data-slot="left"] img {
       width: 100%;
       height: 100%;
       min-width: 0;
       object-fit: contain;
     }
 
-    & > div.right img {
+    & > [data-slot="right"] img {
       width: 100%;
       height: calc(100% - 2rem);
       object-fit: contain;
@@ -415,30 +406,30 @@
         grid-template-rows: auto auto;
       }
 
-      & > div.left {
+      & > [data-slot="left"] {
         grid-row: 1;
         grid-column: 1;
       }
 
-      & > div.right {
+      & > [data-slot="right"] {
         grid-row: 2;
         grid-column: 1;
         border-left: none;
         border-top: 2px solid var(--color-border);
 
-        & > div.row1,
-        & > div.row2 {
+        & > [data-slot="row1"],
+        & > [data-slot="row2"] {
           height: auto;
         }
       }
 
-      & > div.left figure,
-      & > div.right figure {
+      & > [data-slot="left"] figure,
+      & > [data-slot="right"] figure {
         height: auto;
       }
 
-      & > div.left img,
-      & > div.right img {
+      & > [data-slot="left"] img,
+      & > [data-slot="right"] img {
         width: 100%;
         height: auto;
         max-height: none;

cloud/app/src/routes/index.tsx

@@ -26,13 +26,13 @@ const isLoggedIn = query(async () => {
   const actor = await getActor()
   if (actor.type === "account") {
     const workspaces = await withActor(() => Account.workspaces())
-    throw redirect(`/workspace/${workspaces[0].id}`)
+    return workspaces[0].id
+    // throw redirect(`/workspace/${workspaces[0].id}`)
   }
-  return false
 }, "isLoggedIn")
 
 export default function Home() {
-  createAsync(() => isLoggedIn(), {
+  const auth = createAsync(() => isLoggedIn(), {
     deferStream: true,
   })
   onMount(() => {
@@ -67,9 +67,11 @@ export default function Home() {
 
         <section data-component="cta">
           <div data-slot="left">
-            <a href="/docs">Get Started</a>
+            <a target="_self" href="/docs">
+              Get Started
+            </a>
           </div>
-          <div data-slot="center">
+          <div data-slot="right">
             <button data-copy data-slot="command">
               <span>
                 <span>curl -fsSL&nbsp;</span>
@@ -80,11 +82,17 @@ export default function Home() {
               <CopyStatus />
             </button>
           </div>
-          <div data-slot="right">
-            <a href="/auth/authorize" target="_self">
-              Login
-            </a>
-          </div>
+        </section>
+
+        <section data-component="zen">
+          <a target="_self" href="/docs/zen">
+            opencode zen
+          </a>
+          <span data-slot="description">, a curated list of models provided by opencode</span>
+          <span data-slot="divider">&nbsp;/&nbsp;</span>
+          <a href="/auth" target="_self">
+            {auth() ? "Dashboard" : "Sign in"}
+          </a>
         </section>
 
         <section data-component="features">
@@ -151,7 +159,7 @@ export default function Home() {
         </section>
 
         <section data-component="screenshots">
-          <div class="left">
+          <div data-slot="left">
             <figure>
               <figcaption>opencode TUI with the tokyonight theme</figcaption>
               <a href="/docs/cli">
@@ -159,8 +167,8 @@ export default function Home() {
               </a>
             </figure>
           </div>
-          <div class="right">
-            <div class="row1">
+          <div data-slot="right">
+            <div data-slot="row1">
               <figure>
                 <figcaption>opencode in VS Code</figcaption>
                 <a href="/docs/ide">
@@ -168,7 +176,7 @@ export default function Home() {
                 </a>
               </figure>
             </div>
-            <div class="row2">
+            <div data-slot="row2">
               <figure>
                 <figcaption>opencode in GitHub</figcaption>
                 <a href="/docs/github">

cloud/app/src/routes/s/[id].ts

@@ -0,0 +1,20 @@
+import type { APIEvent } from "@solidjs/start/server"
+
+async function handler(evt: APIEvent) {
+  const req = evt.request.clone()
+  const url = new URL(req.url)
+  const targetUrl = `https://docs.opencode.ai/docs${url.pathname}${url.search}`
+  const response = await fetch(targetUrl, {
+    method: req.method,
+    headers: req.headers,
+    body: req.body,
+  })
+  return response
+}
+
+export const GET = handler
+export const POST = handler
+export const PUT = handler
+export const DELETE = handler
+export const OPTIONS = handler
+export const PATCH = handler

cloud/app/src/routes/stripe/webhook.ts

@@ -26,6 +26,8 @@ export async function POST(input: APIEvent) {
     if (!amount) throw new Error("Amount not found")
     if (!paymentID) throw new Error("Payment ID not found")
 
+    const chargedAmount = 2000
+
     await Actor.provide("system", { workspaceID }, async () => {
       const customer = await Billing.get()
       if (customer?.customerID && customer.customerID !== customerID) throw new Error("Customer ID mismatch")
@@ -50,7 +52,7 @@ export async function POST(input: APIEvent) {
         await tx
           .update(BillingTable)
           .set({
-            balance: sql`${BillingTable.balance} + ${centsToMicroCents(amount)}`,
+            balance: sql`${BillingTable.balance} + ${centsToMicroCents(chargedAmount)}`,
             customerID,
             paymentMethodID: paymentMethod.id,
             paymentMethodLast4: paymentMethod.card!.last4,
@@ -59,7 +61,7 @@ export async function POST(input: APIEvent) {
         await tx.insert(PaymentTable).values({
           workspaceID,
           id: Identifier.create("payment"),
-          amount: centsToMicroCents(amount),
+          amount: centsToMicroCents(chargedAmount),
           paymentID,
           customerID,
         })

cloud/app/src/routes/workspace.css

@@ -54,7 +54,10 @@
 
     a,
     button {
+      appearance: none;
+      background: none;
       border: none;
+      cursor: pointer;
       padding: 0;
       color: var(--color-text);
       text-decoration: underline;

cloud/app/src/routes/workspace.tsx

@@ -1,7 +1,20 @@
 import "./workspace.css"
 import { useAuthSession } from "~/context/auth.session"
 import { IconLogo } from "../component/icon"
-import { action, redirect, RouteSectionProps } from "@solidjs/router"
+import { withActor } from "~/context/auth.withActor"
+import "./workspace.css"
+import { query, action, redirect, createAsync, RouteSectionProps } from "@solidjs/router"
+import { User } from "@opencode/cloud-core/user.js"
+import { Actor } from "@opencode/cloud-core/actor.js"
+
+const getUserInfo = query(async () => {
+  "use server"
+  return withActor(async () => {
+    const actor = Actor.assert("user")
+    const user = await User.fromID(actor.properties.userID)
+    return { user }
+  })
+}, "userInfo")
 
 const logout = action(async () => {
   "use server"
@@ -9,14 +22,17 @@ const logout = action(async () => {
   const current = auth.data.current
   if (current)
     await auth.update((val) => {
-      delete val.account[current]
+      delete val.account?.[current]
+      const first = Object.keys(val.account ?? {})[0]
+      val.current = first
       return val
     })
-
-  return redirect("/")
 })
 
 export default function WorkspaceLayout(props: RouteSectionProps) {
+  const userInfo = createAsync(() => getUserInfo(), {
+    deferStream: true,
+  })
   return (
     <main data-page="workspace">
       <header data-component="workspace-header">
@@ -26,9 +42,11 @@ export default function WorkspaceLayout(props: RouteSectionProps) {
           </a>
         </div>
         <div data-slot="header-actions">
-          <span>name@example.com</span>
-          <form action={logout} method="post">
-            <button type="submit" formaction={logout}>Logout</button>
+          <span>{userInfo()?.user.email}</span>
+          <form onSubmit={() => (location.href = "/")} action={logout} method="post">
+            <button type="submit" formaction={logout}>
+              Logout
+            </button>
           </form>
         </div>
       </header>

cloud/app/src/routes/workspace/[id].css

@@ -23,453 +23,450 @@
       padding-bottom: var(--space-16);
     }
   }
-}
 
-/* Common elements */
-button {
-  padding: var(--space-3) var(--space-4);
-  border: 1px solid var(--color-border);
-  border-radius: var(--border-radius-sm);
-  background-color: var(--color-bg);
-  color: var(--color-text);
-  font-size: var(--font-size-sm);
-  font-family: var(--font-sans);
-  font-weight: 500;
-  text-transform: uppercase;
-  cursor: pointer;
-  transition: all 0.15s ease;
-
-  &:hover {
-    background-color: var(--color-surface-hover);
-    border-color: var(--color-accent);
-  }
-
-  &:active {
-    transform: translateY(1px);
-  }
-
-  &:disabled {
-    opacity: 0.5;
-    cursor: not-allowed;
-
-    &:hover {
-      background-color: var(--color-bg);
-      border-color: var(--color-border);
-      transform: none;
-    }
-  }
-
-  &[color="primary"] {
-    background-color: var(--color-primary);
-    border-color: var(--color-primary);
-    color: var(--color-primary-text);
-
-    &:hover {
-      background-color: var(--color-primary-hover);
-      border-color: var(--color-primary-hover);
-    }
-  }
-
-  &[color="ghost"] {
-    background-color: transparent;
-    border-color: transparent;
-    color: var(--color-text-muted);
+  /* Common elements */
+  button {
+    padding: var(--space-3) var(--space-4);
+    border: 1px solid var(--color-border);
+    border-radius: var(--border-radius-sm);
+    background-color: var(--color-bg);
+    color: var(--color-text);
+    font-size: var(--font-size-sm);
+    font-family: var(--font-sans);
+    font-weight: 500;
+    text-transform: uppercase;
+    cursor: pointer;
+    transition: all 0.15s ease;
 
     &:hover {
       background-color: var(--color-surface-hover);
-      border-color: var(--color-border);
-      color: var(--color-text);
+      border-color: var(--color-accent);
     }
-  }
-}
 
-a {
-  color: var(--color-text);
-  text-decoration: underline;
-  text-underline-offset: var(--space-0-75);
-  text-decoration-thickness: 1px;
-}
+    &:active {
+      transform: translateY(1px);
+    }
 
-[data-slot="empty-state"] {
-  padding: var(--space-20) var(--space-6);
-  text-align: center;
-  border: 1px dashed var(--color-border);
-  border-radius: var(--border-radius-sm);
-  display: flex;
-  flex-direction: column;
-  gap: var(--space-2);
+    &:disabled {
+      opacity: 0.5;
+      cursor: not-allowed;
 
-  p {
-    font-size: var(--font-size-sm);
-    color: var(--color-text-muted);
-    margin: 0;
-  }
-}
+      &:hover {
+        background-color: var(--color-bg);
+        border-color: var(--color-border);
+        transform: none;
+      }
+    }
 
-/* Title section */
-[data-slot="title-section"] {
-  display: flex;
-  flex-direction: column;
-  gap: var(--space-2);
-  padding-bottom: var(--space-8);
-  border-bottom: 1px solid var(--color-border);
+    &[data-color="primary"] {
+      background-color: var(--color-primary);
+      border-color: var(--color-primary);
+      color: var(--color-primary-text);
 
-  h1 {
-    font-size: var(--font-size-2xl);
-    font-weight: 500;
-    line-height: 1.2;
-    letter-spacing: -0.03125rem;
-    margin: 0;
-    text-transform: uppercase;
+      &:hover {
+        background-color: var(--color-primary-hover);
+        border-color: var(--color-primary-hover);
+      }
+    }
 
-    @media (max-width: 30rem) {
-      font-size: var(--font-size-xl);
-      line-height: 1.25;
+    &[data-color="ghost"] {
+      background-color: transparent;
+      border-color: transparent;
+      color: var(--color-text-muted);
+
+      &:hover {
+        background-color: var(--color-surface-hover);
+        border-color: var(--color-border);
+        color: var(--color-text);
+      }
     }
   }
 
-  p {
-    font-size: var(--font-size-md);
-    color: var(--color-text-muted);
+  a {
+    color: var(--color-text);
+    text-decoration: underline;
+    text-underline-offset: var(--space-0-75);
+    text-decoration-thickness: 1px;
+  }
 
-    a {
+  [data-slot="empty-state"] {
+    padding: var(--space-20) var(--space-6);
+    text-align: center;
+    border: 1px dashed var(--color-border);
+    border-radius: var(--border-radius-sm);
+    display: flex;
+    flex-direction: column;
+    gap: var(--space-2);
+
+    p {
+      font-size: var(--font-size-sm);
+      color: var(--color-text-muted);
+      margin: 0;
+    }
+  }
+
+  /* Title section */
+  [data-slot="title-section"] {
+    display: flex;
+    flex-direction: column;
+    gap: var(--space-2);
+    padding-bottom: var(--space-8);
+    border-bottom: 1px solid var(--color-border);
+
+    h1 {
+      font-size: var(--font-size-2xl);
+      font-weight: 500;
+      line-height: 1.2;
+      letter-spacing: -0.03125rem;
+      margin: 0;
+      text-transform: uppercase;
+
+      @media (max-width: 30rem) {
+        font-size: var(--font-size-xl);
+        line-height: 1.25;
+      }
+    }
+
+    p {
+      font-size: var(--font-size-md);
+      color: var(--color-text-muted);
+
+      a {
+        color: var(--color-text-muted);
+      }
+    }
+  }
+
+  /* Section titles */
+  [data-slot="section-title"] {
+    display: flex;
+    flex-direction: column;
+    gap: var(--space-1);
+
+    h2 {
+      font-size: var(--font-size-md);
+      font-weight: 600;
+      line-height: 1.2;
+      letter-spacing: -0.03125rem;
+      margin: 0;
+      color: var(--color-text-secondary);
+      text-transform: uppercase;
+
+      @media (max-width: 30rem) {
+        font-size: var(--font-size-lg);
+        line-height: 1.25;
+      }
+    }
+
+    p {
+      font-size: var(--font-size-sm);
       color: var(--color-text-muted);
     }
   }
-}
 
-/* Section titles */
-[data-slot="section-title"] {
-  display: flex;
-  flex-direction: column;
-  gap: var(--space-1);
-
-  h2 {
-    font-size: var(--font-size-md);
-    font-weight: 600;
-    line-height: 1.2;
-    letter-spacing: -0.03125rem;
-    margin: 0;
-    color: var(--color-text-secondary);
-    text-transform: uppercase;
-
-    @media (max-width: 30rem) {
-      font-size: var(--font-size-lg);
-      line-height: 1.25;
-    }
-  }
-
-  p {
-    font-size: var(--font-size-sm);
-    color: var(--color-text-muted);
-  }
-}
-
-/* API Keys Section */
-[data-slot="api-keys-section"] {
-  [data-slot="create-form"] {
-    display: flex;
-    flex-direction: column;
-    gap: var(--space-3);
-    padding: var(--space-4);
-    background-color: var(--color-bg-surface);
-    border: 1px solid var(--color-border);
-    border-radius: var(--border-radius-sm);
-    max-width: 32rem;
-
-    input {
-      padding: var(--space-2) var(--space-3);
+  /* API Keys Section */
+  [data-slot="api-keys-section"] {
+    [data-slot="create-form"] {
+      display: flex;
+      gap: var(--space-3);
+      padding: var(--space-4);
       border: 1px solid var(--color-border);
       border-radius: var(--border-radius-sm);
-      background-color: var(--color-bg);
-      color: var(--color-text);
+
+      input {
+        flex: 1;
+        padding: var(--space-2) var(--space-3);
+        border: 1px solid var(--color-border);
+        border-radius: var(--border-radius-sm);
+        background-color: var(--color-bg);
+        color: var(--color-text);
+        font-size: var(--font-size-sm);
+        font-family: var(--font-mono);
+
+        &:focus {
+          outline: none;
+          border-color: var(--color-accent);
+        }
+
+        &::placeholder {
+          color: var(--color-text-disabled);
+        }
+      }
+
+      [data-slot="form-actions"] {
+        display: flex;
+        gap: var(--space-2);
+      }
+    }
+
+    [data-slot="api-keys-table"] {
+      overflow-x: auto;
+    }
+
+    [data-slot="api-keys-table-element"] {
+      width: 100%;
+      border-collapse: collapse;
       font-size: var(--font-size-sm);
-      font-family: var(--font-mono);
 
-      &:focus {
-        outline: none;
-        border-color: var(--color-accent);
-      }
-
-      &::placeholder {
-        color: var(--color-text-disabled);
-      }
-    }
-
-    [data-slot="form-actions"] {
-      display: flex;
-      gap: var(--space-2);
-      justify-content: flex-end;
-    }
-  }
-
-  [data-slot="api-keys-table"] {
-    overflow-x: auto;
-  }
-
-  [data-slot="api-keys-table-element"] {
-    width: 100%;
-    border-collapse: collapse;
-    font-size: var(--font-size-sm);
-
-    thead {
-      border-bottom: 1px solid var(--color-border);
-    }
-
-    th {
-      padding: var(--space-3) var(--space-4);
-      text-align: left;
-      font-weight: normal;
-      color: var(--color-text-muted);
-      text-transform: uppercase;
-    }
-
-    td {
-      padding: var(--space-3) var(--space-4);
-      border-bottom: 1px solid var(--color-border-muted);
-      color: var(--color-text-muted);
-      font-family: var(--font-mono);
-
-      &[data-slot="key-name"] {
-        color: var(--color-text);
-        font-family: var(--font-sans);
-        font-weight: 500;
-      }
-
-      &[data-slot="key-value"] {
-        font-family: var(--font-mono);
-
-        div {
-          cursor: pointer;
-          display: flex;
-          align-items: center;
-          gap: var(--space-2);
-        }
-      }
-
-      &[data-slot="key-date"] {
-        color: var(--color-text);
-      }
-
-      &[data-slot="key-actions"] {
-        font-family: var(--font-sans);
-      }
-    }
-
-    tbody tr {
-      &:last-child td {
-        border-bottom: none;
-      }
-    }
-
-    @media (max-width: 40rem) {
-      th,
-      td {
-        padding: var(--space-2) var(--space-3);
-        font-size: var(--font-size-xs);
+      thead {
+        border-bottom: 1px solid var(--color-border);
       }
 
       th {
-        &:nth-child(3) /* Date */ {
-          display: none;
-        }
+        padding: var(--space-3) var(--space-4);
+        text-align: left;
+        font-weight: normal;
+        color: var(--color-text-muted);
+        text-transform: uppercase;
       }
 
       td {
-        &:nth-child(3) /* Date */ {
-          display: none;
+        padding: var(--space-3) var(--space-4);
+        border-bottom: 1px solid var(--color-border-muted);
+        color: var(--color-text-muted);
+        font-family: var(--font-mono);
+
+        &[data-slot="key-name"] {
+          color: var(--color-text);
+          font-family: var(--font-sans);
+          font-weight: 500;
+        }
+
+        &[data-slot="key-value"] {
+          font-family: var(--font-mono);
+
+          div {
+            cursor: pointer;
+            display: flex;
+            align-items: center;
+            gap: var(--space-2);
+          }
+        }
+
+        &[data-slot="key-date"] {
+          color: var(--color-text);
+        }
+
+        &[data-slot="key-actions"] {
+          font-family: var(--font-sans);
+        }
+      }
+
+      tbody tr {
+        &:last-child td {
+          border-bottom: none;
+        }
+      }
+
+      @media (max-width: 40rem) {
+        th,
+        td {
+          padding: var(--space-2) var(--space-3);
+          font-size: var(--font-size-xs);
+        }
+
+        th {
+          &:nth-child(3) /* Date */ {
+            display: none;
+          }
+        }
+
+        td {
+          &:nth-child(3) /* Date */ {
+            display: none;
+          }
         }
       }
     }
   }
-}
 
-/* Balance Section */
-[data-slot="balance-section"] {
-  [data-slot="balance"] {
-    display: flex;
-    flex-direction: column;
-    gap: var(--space-3);
-    padding: var(--space-4);
-    border: 1px solid var(--color-border);
-    border-radius: var(--border-radius-sm);
-    min-width: 14.5rem;
-    width: fit-content;
-
-    [data-slot="amount"] {
-      padding: var(--space-3-5) var(--space-4);
-      background-color: var(--color-bg-surface);
+  /* Balance Section */
+  [data-slot="balance-section"] {
+    [data-slot="balance"] {
+      display: flex;
+      flex-direction: column;
+      gap: var(--space-3);
+      padding: var(--space-4);
+      border: 1px solid var(--color-border);
       border-radius: var(--border-radius-sm);
-      display: flex;
-      align-items: baseline;
-      gap: var(--space-1);
-      justify-content: flex-end;
+      min-width: 14.5rem;
+      width: fit-content;
+
+      [data-slot="amount"] {
+        padding: var(--space-3-5) var(--space-4);
+        background-color: var(--color-bg-surface);
+        border-radius: var(--border-radius-sm);
+        display: flex;
+        align-items: baseline;
+        gap: var(--space-1);
+        justify-content: flex-end;
+
+        &.danger {
+          [data-slot="value"] {
+            color: var(--color-danger);
+          }
+        }
+
+        [data-slot="currency"] {
+          position: relative;
+          bottom: 2px;
+          font-size: var(--font-size-lg);
+          color: var(--color-text-muted);
+          font-weight: 400;
+        }
 
-      &.danger {
         [data-slot="value"] {
-          color: var(--color-danger);
+          font-size: var(--font-size-3xl);
+          font-weight: 500;
+          color: var(--color-text);
         }
       }
+    }
+  }
 
-      [data-slot="currency"] {
-        position: relative;
-        bottom: 2px;
-        font-size: var(--font-size-lg);
+  /* Payments Section */
+  [data-slot="payments-section"] {
+    [data-slot="payments-table"] {
+      overflow-x: auto;
+    }
+
+    [data-slot="payments-table-element"] {
+      width: 100%;
+      border-collapse: collapse;
+      font-size: var(--font-size-sm);
+
+      thead {
+        border-bottom: 1px solid var(--color-border);
+      }
+
+      th {
+        padding: var(--space-3) var(--space-4);
+        text-align: left;
+        font-weight: normal;
         color: var(--color-text-muted);
-        font-weight: 400;
+        text-transform: uppercase;
       }
 
-      [data-slot="value"] {
-        font-size: var(--font-size-3xl);
-        font-weight: 500;
-        color: var(--color-text);
-      }
-    }
-  }
-}
-
-/* Payments Section */
-[data-slot="payments-section"] {
-  [data-slot="payments-table"] {
-    overflow-x: auto;
-  }
-
-  [data-slot="payments-table-element"] {
-    width: 100%;
-    border-collapse: collapse;
-    font-size: var(--font-size-sm);
-
-    thead {
-      border-bottom: 1px solid var(--color-border);
-    }
-
-    th {
-      padding: var(--space-3) var(--space-4);
-      text-align: left;
-      font-weight: normal;
-      color: var(--color-text-muted);
-      text-transform: uppercase;
-    }
-
-    td {
-      padding: var(--space-3) var(--space-4);
-      border-bottom: 1px solid var(--color-border-muted);
-      color: var(--color-text-muted);
-      font-family: var(--font-mono);
-
-      &[data-slot="payment-date"] {
-        color: var(--color-text);
-      }
-
-      &[data-slot="payment-id"] {
+      td {
+        padding: var(--space-3) var(--space-4);
+        border-bottom: 1px solid var(--color-border-muted);
+        color: var(--color-text-muted);
         font-family: var(--font-mono);
-        font-weight: 400;
+
+        &[data-slot="payment-date"] {
+          color: var(--color-text);
+        }
+
+        &[data-slot="payment-id"] {
+          font-family: var(--font-mono);
+          font-weight: 400;
+          color: var(--color-text-muted);
+          max-width: 200px;
+          word-break: break-word;
+        }
+
+        &[data-slot="payment-amount"] {
+          color: var(--color-text);
+        }
+      }
+
+      tbody tr {
+        &:last-child td {
+          border-bottom: none;
+        }
+      }
+
+      @media (max-width: 40rem) {
+        th,
+        td {
+          padding: var(--space-2) var(--space-3);
+          font-size: var(--font-size-xs);
+        }
+
+        th {
+          &:nth-child(2) /* Payment ID */ {
+            display: none;
+          }
+        }
+
+        td {
+          &:nth-child(2) /* Payment ID */ {
+            display: none;
+          }
+        }
+      }
+    }
+  }
+
+  /* Usage Section */
+  [data-slot="usage-section"] {
+    [data-slot="usage-table"] {
+      overflow-x: auto;
+    }
+
+    [data-slot="usage-table-element"] {
+      width: 100%;
+      border-collapse: collapse;
+      font-size: var(--font-size-sm);
+
+      thead {
+        border-bottom: 1px solid var(--color-border);
+      }
+
+      th {
+        padding: var(--space-3) var(--space-4);
+        text-align: left;
+        font-weight: normal;
         color: var(--color-text-muted);
-        max-width: 200px;
-        word-break: break-word;
+        text-transform: uppercase;
       }
 
-      &[data-slot="payment-amount"] {
-        color: var(--color-text);
-      }
-    }
-
-    tbody tr {
-      &:last-child td {
-        border-bottom: none;
-      }
-    }
-
-    @media (max-width: 40rem) {
-      th,
       td {
-        padding: var(--space-2) var(--space-3);
-        font-size: var(--font-size-xs);
-      }
+        padding: var(--space-3) var(--space-4);
+        border-bottom: 1px solid var(--color-border-muted);
+        color: var(--color-text-muted);
+        font-family: var(--font-mono);
 
-      th {
-        &:nth-child(2) /* Payment ID */ {
-          display: none;
+        &[data-slot="usage-date"] {
+          color: var(--color-text);
+        }
+
+        &[data-slot="usage-model"] {
+          font-family: var(--font-sans);
+          font-weight: 400;
+          color: var(--color-text-secondary);
+          max-width: 200px;
+          word-break: break-word;
+        }
+
+        &[data-slot="usage-cost"] {
+          color: var(--color-text);
         }
       }
 
-      td {
-        &:nth-child(2) /* Payment ID */ {
-          display: none;
+      tbody tr {
+        &:last-child td {
+          border-bottom: none;
         }
       }
-    }
-  }
-}
 
-/* Usage Section */
-[data-slot="usage-section"] {
-  [data-slot="usage-table"] {
-    overflow-x: auto;
-  }
-
-  [data-slot="usage-table-element"] {
-    width: 100%;
-    border-collapse: collapse;
-    font-size: var(--font-size-sm);
-
-    thead {
-      border-bottom: 1px solid var(--color-border);
-    }
-
-    th {
-      padding: var(--space-3) var(--space-4);
-      text-align: left;
-      font-weight: normal;
-      color: var(--color-text-muted);
-      text-transform: uppercase;
-    }
-
-    td {
-      padding: var(--space-3) var(--space-4);
-      border-bottom: 1px solid var(--color-border-muted);
-      color: var(--color-text-muted);
-      font-family: var(--font-mono);
-
-      &[data-slot="usage-date"] {
-        color: var(--color-text);
-      }
-
-      &[data-slot="usage-model"] {
-        font-family: var(--font-sans);
-        font-weight: 400;
-        color: var(--color-text-secondary);
-        max-width: 200px;
-        word-break: break-word;
-      }
-
-      &[data-slot="usage-cost"] {
-        color: var(--color-text);
-      }
-    }
-
-    tbody tr {
-      &:last-child td {
-        border-bottom: none;
-      }
-    }
-
-    @media (max-width: 40rem) {
-      th,
-      td {
-        padding: var(--space-2) var(--space-3);
-        font-size: var(--font-size-xs);
-      }
+      @media (max-width: 40rem) {
+        th,
+        td {
+          padding: var(--space-2) var(--space-3);
+          font-size: var(--font-size-xs);
+        }
 
-      th {
-        &:nth-child(2) /* Model */ {
-          display: none;
+        th {
+          &:nth-child(2) /* Model */ {
+            display: none;
+          }
         }
-      }
 
-      td {
-        &:nth-child(2) /* Model */ {
-          display: none;
+        td {
+          &:nth-child(2) /* Model */ {
+            display: none;
+          }
         }
       }
     }

cloud/app/src/routes/workspace/[id].tsx

@@ -1,11 +1,10 @@
+import "./[id].css"
 import { Billing } from "@opencode/cloud-core/billing.js"
 import { Key } from "@opencode/cloud-core/key.js"
 import { action, createAsync, query, useAction, useSubmission, json } from "@solidjs/router"
-import { createSignal, For, onMount, Show } from "solid-js"
-import { getActor } from "~/context/auth"
+import { createSignal, For, Show } from "solid-js"
 import { withActor } from "~/context/auth.withActor"
 import { IconCopy, IconCheck } from "~/component/icon"
-import "./[id].css"
 import { User } from "@opencode/cloud-core/user.js"
 import { Actor } from "@opencode/cloud-core/actor.js"
 
@@ -14,7 +13,7 @@ import { Actor } from "@opencode/cloud-core/actor.js"
 /////////////////////////////////////
 
 
-const listKeys = query(() => {
+const listKeys = query(async () => {
   "use server"
   return withActor(() => Key.list())
 }, "key.list")
@@ -63,121 +62,14 @@ const createPortalUrl = action(async (returnUrl: string) => {
   return withActor(() => Billing.generatePortalUrl({ returnUrl }))
 }, "portalUrl")
 
-const dummyUsageData = [
-  {
-    model: "claude-3-5-sonnet-20241022",
-    inputTokens: 1250,
-    outputTokens: 890,
-    reasoningTokens: 150,
-    cacheReadTokens: 0,
-    cacheWriteTokens: 45,
-    cost: 12340000,
-    timeCreated: new Date("2025-01-28T10:30:00Z"),
-  },
-  {
-    model: "claude-3-haiku-20240307",
-    inputTokens: 2100,
-    outputTokens: 450,
-    reasoningTokens: null,
-    cacheReadTokens: 120,
-    cacheWriteTokens: 0,
-    cost: 5670000,
-    timeCreated: new Date("2025-01-27T15:22:00Z"),
-  },
-  {
-    model: "claude-3-5-sonnet-20241022",
-    inputTokens: 850,
-    outputTokens: 1200,
-    reasoningTokens: 220,
-    cacheReadTokens: 30,
-    cacheWriteTokens: 15,
-    cost: 18990000,
-    timeCreated: new Date("2025-01-27T09:15:00Z"),
-  },
-  {
-    model: "claude-3-opus-20240229",
-    inputTokens: 3200,
-    outputTokens: 1800,
-    reasoningTokens: 400,
-    cacheReadTokens: 0,
-    cacheWriteTokens: 100,
-    cost: 45670000,
-    timeCreated: new Date("2025-01-26T14:45:00Z"),
-  },
-  {
-    model: "claude-3-haiku-20240307",
-    inputTokens: 650,
-    outputTokens: 280,
-    reasoningTokens: null,
-    cacheReadTokens: 200,
-    cacheWriteTokens: 0,
-    cost: 2340000,
-    timeCreated: new Date("2025-01-25T16:18:00Z"),
-  },
-]
-
-const dummyPaymentData = [
-  {
-    id: "pay_1Ab2Cd3Ef4Gh5678",
-    amount: 2000000000,
-    timeCreated: new Date("2025-01-28T14:32:00Z"),
-  },
-  {
-    id: "pay_9Ij8Kl7Mn6Op5432",
-    amount: 1000000000,
-    timeCreated: new Date("2025-01-25T09:18:00Z"),
-  },
-  {
-    id: "pay_5Qr4St3Uv2Wx1098",
-    amount: 5000000000,
-    timeCreated: new Date("2025-01-20T16:45:00Z"),
-  },
-  {
-    id: "pay_7Yz6Ab5Cd4Ef3210",
-    amount: 1500000000,
-    timeCreated: new Date("2025-01-15T11:22:00Z"),
-  },
-  {
-    id: "pay_3Gh2Ij1Kl0Mn9876",
-    amount: 3000000000,
-    timeCreated: new Date("2025-01-10T13:55:00Z"),
-  },
-]
-
-const dummyApiKeyData = [
-  {
-    id: "key_1Ab2Cd3Ef4Gh5678",
-    name: "Production API",
-    key: "oc_live_sk_1Ab2Cd3Ef4Gh567890123456789012345678901234567890",
-    timeCreated: new Date("2025-01-28T14:32:00Z"),
-    timeUsed: new Date("2025-01-29T09:15:00Z"),
-  },
-  {
-    id: "key_9Ij8Kl7Mn6Op5432",
-    name: "Development Key",
-    key: "oc_test_sk_9Ij8Kl7Mn6Op543210987654321098765432109876543210",
-    timeCreated: new Date("2025-01-25T09:18:00Z"),
-    timeUsed: null,
-  },
-  {
-    id: "key_5Qr4St3Uv2Wx1098",
-    name: "CI/CD Pipeline",
-    key: "oc_live_sk_5Qr4St3Uv2Wx109876543210987654321098765432109876",
-    timeCreated: new Date("2025-01-20T16:45:00Z"),
-    timeUsed: new Date("2025-01-28T12:30:00Z"),
-  },
-]
-
 export default function () {
-  const actor = createAsync(() => getActor())
-  onMount(() => {
-    console.log("MOUNTED", actor())
-  })
 
   /////////////////
   // Keys section
   /////////////////
-  const keys = createAsync(() => listKeys())
+  const keys = createAsync(() => listKeys(), {
+    deferStream: true,
+  })
   const createKeyAction = useAction(createKey)
   const removeKeyAction = useAction(removeKey)
   const createKeySubmission = useSubmission(createKey)
@@ -265,7 +157,9 @@ export default function () {
   /////////////////
   // Billing section
   /////////////////
-  const billingInfo = createAsync(() => getBillingInfo())
+  const billingInfo = createAsync(() => getBillingInfo(), {
+    deferStream: true,
+  })
   const createCheckoutUrlAction = useAction(createCheckoutUrl)
   const createCheckoutUrlSubmission = useSubmission(createCheckoutUrl)
 
@@ -285,22 +179,13 @@ export default function () {
     <div data-slot="root">
       {/* Title */}
       <section data-slot="title-section">
-        <h1>Gateway</h1>
+        <h1>opencode zen</h1>
         <p>
-          Coding models optimized for use with opencode. <a href="/docs">Learn more</a>.
+          Curated list of models provided by opencode. <a href="/docs/zen">Learn more</a>.
         </p>
       </section>
 
       <div data-slot="sections">
-        {/* Actor Section */}
-        <section data-slot="actor-section">
-          <div data-slot="section-title">
-            <h2>Actor</h2>
-            <p>Current authenticated user information and session details.</p>
-          </div>
-          <div>{JSON.stringify(actor())}</div>
-        </section>
-
         {/* API Keys Section */}
         <section data-slot="api-keys-section">
           <div data-slot="section-title">
@@ -321,14 +206,7 @@ export default function () {
                 />
                 <div data-slot="form-actions">
                   <button
-                    color="primary"
-                    disabled={createKeySubmission.pending || !keyName().trim()}
-                    onClick={handleCreateKey}
-                  >
-                    {createKeySubmission.pending ? "Creating..." : "Create"}
-                  </button>
-                  <button
-                    color="ghost"
+                    data-color="ghost"
                     onClick={() => {
                       setShowCreateForm(false)
                       setKeyName("")
@@ -336,12 +214,19 @@ export default function () {
                   >
                     Cancel
                   </button>
+                  <button
+                    data-color="primary"
+                    disabled={createKeySubmission.pending || !keyName().trim()}
+                    onClick={handleCreateKey}
+                  >
+                    {createKeySubmission.pending ? "Creating..." : "Create"}
+                  </button>
                 </div>
               </div>
             }
           >
             <button
-              color="primary"
+              data-color="primary"
               onClick={() => {
                 console.log("clicked")
                 setShowCreateForm(true)
@@ -370,7 +255,6 @@ export default function () {
                 </thead>
                 <tbody>
                   <For each={keys()!}>
-                    {/* Real data: keys() */}
                     {(key) => (
                       <tr>
                         <td data-slot="key-name">{key.name}</td>
@@ -389,7 +273,7 @@ export default function () {
                           {formatDateForTable(key.timeCreated)}
                         </td>
                         <td data-slot="key-actions">
-                          <button color="ghost" onClick={() => handleDeleteKey(key.id)} title="Delete API key">
+                          <button data-color="ghost" onClick={() => handleDeleteKey(key.id)} title="Delete API key">
                             Delete
                           </button>
                         </td>
@@ -426,51 +310,12 @@ export default function () {
                 })()}
               </span>
             </div>
-            <button color="primary" disabled={createCheckoutUrlSubmission.pending} onClick={handleBuyCredits}>
+            <button data-color="primary" disabled={createCheckoutUrlSubmission.pending} onClick={handleBuyCredits}>
               {createCheckoutUrlSubmission.pending ? "Loading..." : "Buy Credits"}
             </button>
           </div>
         </section>
 
-        {/* Payments Section */}
-        <Show when={dummyPaymentData.length > 0}>
-          {/* Real data condition: billingInfo() && billingInfo()!.payments.length > 0 */}
-          <section data-slot="payments-section">
-            <div data-slot="section-title">
-              <h2>Payments History</h2>
-              <p>Recent payment transactions.</p>
-            </div>
-            <div data-slot="payments-table">
-              <table data-slot="payments-table-element">
-                <thead>
-                  <tr>
-                    <th>Date</th>
-                    <th>Payment ID</th>
-                    <th>Amount</th>
-                  </tr>
-                </thead>
-                <tbody>
-                  <For each={dummyPaymentData}>
-                    {/* Real data: billingInfo()?.payments */}
-                    {(payment) => {
-                      const date = new Date(payment.timeCreated)
-                      return (
-                        <tr>
-                          <td data-slot="payment-date" title={formatDateUTC(date)}>
-                            {formatDateForTable(date)}
-                          </td>
-                          <td data-slot="payment-id">{payment.id}</td>
-                          <td data-slot="payment-amount">${((payment.amount ?? 0) / 100000000).toFixed(2)}</td>
-                        </tr>
-                      )
-                    }}
-                  </For>
-                </tbody>
-              </table>
-            </div>
-          </section>
-        </Show>
-
         {/* Usage Section */}
         <section data-slot="usage-section">
           <div data-slot="section-title">
@@ -479,7 +324,7 @@ export default function () {
           </div>
           <div data-slot="usage-table">
             <Show
-              when={dummyUsageData.length > 0}
+              when={billingInfo() && billingInfo()!.usage.length > 0}
               fallback={
                 <div data-slot="empty-state">
                   <p>Make your first API call to get started.</p>
@@ -496,7 +341,7 @@ export default function () {
                   </tr>
                 </thead>
                 <tbody>
-                  <For each={dummyUsageData}>
+                  <For each={billingInfo()!.usage}>
                     {(usage) => {
                       const totalTokens = usage.inputTokens + usage.outputTokens + (usage.reasoningTokens || 0)
                       const date = new Date(usage.timeCreated)
@@ -517,6 +362,44 @@ export default function () {
             </Show>
           </div>
         </section>
+
+        {/* Payments Section */}
+        <Show when={billingInfo() && billingInfo()!.payments.length > 0}>
+          <section data-slot="payments-section">
+            <div data-slot="section-title">
+              <h2>Payments History</h2>
+              <p>Recent payment transactions.</p>
+            </div>
+            <div data-slot="payments-table">
+              <table data-slot="payments-table-element">
+                <thead>
+                  <tr>
+                    <th>Date</th>
+                    <th>Payment ID</th>
+                    <th>Amount</th>
+                  </tr>
+                </thead>
+                <tbody>
+                  <For each={billingInfo()!.payments}>
+                    {(payment) => {
+                      const date = new Date(payment.timeCreated)
+                      return (
+                        <tr>
+                          <td data-slot="payment-date" title={formatDateUTC(date)}>
+                            {formatDateForTable(date)}
+                          </td>
+                          <td data-slot="payment-id">{payment.id}</td>
+                          <td data-slot="payment-amount">${((payment.amount ?? 0) / 100000000).toFixed(2)}</td>
+                        </tr>
+                      )
+                    }}
+                  </For>
+                </tbody>
+              </table>
+            </div>
+          </section>
+        </Show>
+
       </div>
     </div>
   )

cloud/app/tsconfig.json

@@ -3,6 +3,7 @@
   "compilerOptions": {
     "target": "ESNext",
     "module": "ESNext",
+    "skipLibCheck": true,
     "moduleResolution": "bundler",
     "allowSyntheticDefaultImports": true,
     "esModuleInterop": true,

cloud/core/drizzle.config.ts

@@ -1,4 +1,4 @@
-import { Resource } from "@opencode/cloud-resource"
+import { Resource } from "sst"
 import { defineConfig } from "drizzle-kit"
 
 export default defineConfig({
@@ -6,7 +6,7 @@ export default defineConfig({
   strict: true,
   schema: ["./src/**/*.sql.ts"],
   verbose: true,
-  dialect: "postgresql",
+  dialect: "mysql",
   dbCredentials: {
     database: Resource.Database.database,
     host: Resource.Database.host,

cloud/core/migrations/0000_amused_mojo.sql

@@ -1,66 +0,0 @@
-CREATE TABLE "billing" (
-	"id" varchar(30) NOT NULL,
-	"workspace_id" varchar(30) NOT NULL,
-	"time_created" timestamp with time zone DEFAULT now() NOT NULL,
-	"time_deleted" timestamp with time zone,
-	"customer_id" varchar(255),
-	"payment_method_id" varchar(255),
-	"payment_method_last4" varchar(4),
-	"balance" bigint NOT NULL,
-	"reload" boolean,
-	CONSTRAINT "billing_workspace_id_id_pk" PRIMARY KEY("workspace_id","id")
-);
---> statement-breakpoint
-CREATE TABLE "payment" (
-	"id" varchar(30) NOT NULL,
-	"workspace_id" varchar(30) NOT NULL,
-	"time_created" timestamp with time zone DEFAULT now() NOT NULL,
-	"time_deleted" timestamp with time zone,
-	"customer_id" varchar(255),
-	"payment_id" varchar(255),
-	"amount" bigint NOT NULL,
-	CONSTRAINT "payment_workspace_id_id_pk" PRIMARY KEY("workspace_id","id")
-);
---> statement-breakpoint
-CREATE TABLE "usage" (
-	"id" varchar(30) NOT NULL,
-	"workspace_id" varchar(30) NOT NULL,
-	"time_created" timestamp with time zone DEFAULT now() NOT NULL,
-	"time_deleted" timestamp with time zone,
-	"request_id" varchar(255),
-	"model" varchar(255) NOT NULL,
-	"input_tokens" integer NOT NULL,
-	"output_tokens" integer NOT NULL,
-	"reasoning_tokens" integer,
-	"cache_read_tokens" integer,
-	"cache_write_tokens" integer,
-	"cost" bigint NOT NULL,
-	CONSTRAINT "usage_workspace_id_id_pk" PRIMARY KEY("workspace_id","id")
-);
---> statement-breakpoint
-CREATE TABLE "user" (
-	"id" varchar(30) NOT NULL,
-	"workspace_id" varchar(30) NOT NULL,
-	"time_created" timestamp with time zone DEFAULT now() NOT NULL,
-	"time_deleted" timestamp with time zone,
-	"email" text NOT NULL,
-	"name" varchar(255) NOT NULL,
-	"time_seen" timestamp with time zone,
-	"color" integer,
-	CONSTRAINT "user_workspace_id_id_pk" PRIMARY KEY("workspace_id","id")
-);
---> statement-breakpoint
-CREATE TABLE "workspace" (
-	"id" varchar(30) PRIMARY KEY NOT NULL,
-	"slug" varchar(255),
-	"name" varchar(255),
-	"time_created" timestamp with time zone DEFAULT now() NOT NULL,
-	"time_deleted" timestamp with time zone
-);
---> statement-breakpoint
-ALTER TABLE "billing" ADD CONSTRAINT "billing_workspace_id_workspace_id_fk" FOREIGN KEY ("workspace_id") REFERENCES "public"."workspace"("id") ON DELETE no action ON UPDATE no action;--> statement-breakpoint
-ALTER TABLE "payment" ADD CONSTRAINT "payment_workspace_id_workspace_id_fk" FOREIGN KEY ("workspace_id") REFERENCES "public"."workspace"("id") ON DELETE no action ON UPDATE no action;--> statement-breakpoint
-ALTER TABLE "usage" ADD CONSTRAINT "usage_workspace_id_workspace_id_fk" FOREIGN KEY ("workspace_id") REFERENCES "public"."workspace"("id") ON DELETE no action ON UPDATE no action;--> statement-breakpoint
-ALTER TABLE "user" ADD CONSTRAINT "user_workspace_id_workspace_id_fk" FOREIGN KEY ("workspace_id") REFERENCES "public"."workspace"("id") ON DELETE no action ON UPDATE no action;--> statement-breakpoint
-CREATE UNIQUE INDEX "user_email" ON "user" USING btree ("workspace_id","email");--> statement-breakpoint
-CREATE UNIQUE INDEX "slug" ON "workspace" USING btree ("slug");

cloud/core/migrations/0000_fluffy_raza.sql

@@ -0,0 +1,89 @@
+CREATE TABLE `account` (
+	`id` varchar(30) NOT NULL,
+	`time_created` timestamp(3) NOT NULL DEFAULT (now()),
+	`time_updated` timestamp(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3),
+	`time_deleted` timestamp(3),
+	`email` varchar(255) NOT NULL,
+	CONSTRAINT `email` UNIQUE(`email`)
+);
+--> statement-breakpoint
+CREATE TABLE `billing` (
+	`id` varchar(30) NOT NULL,
+	`workspace_id` varchar(30) NOT NULL,
+	`time_created` timestamp(3) NOT NULL DEFAULT (now()),
+	`time_updated` timestamp(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3),
+	`time_deleted` timestamp(3),
+	`customer_id` varchar(255),
+	`payment_method_id` varchar(255),
+	`payment_method_last4` varchar(4),
+	`balance` bigint NOT NULL,
+	`reload` boolean,
+	CONSTRAINT `billing_workspace_id_id_pk` PRIMARY KEY(`workspace_id`,`id`)
+);
+--> statement-breakpoint
+CREATE TABLE `payment` (
+	`id` varchar(30) NOT NULL,
+	`workspace_id` varchar(30) NOT NULL,
+	`time_created` timestamp(3) NOT NULL DEFAULT (now()),
+	`time_updated` timestamp(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3),
+	`time_deleted` timestamp(3),
+	`customer_id` varchar(255),
+	`payment_id` varchar(255),
+	`amount` bigint NOT NULL,
+	CONSTRAINT `payment_workspace_id_id_pk` PRIMARY KEY(`workspace_id`,`id`)
+);
+--> statement-breakpoint
+CREATE TABLE `usage` (
+	`id` varchar(30) NOT NULL,
+	`workspace_id` varchar(30) NOT NULL,
+	`time_created` timestamp(3) NOT NULL DEFAULT (now()),
+	`time_updated` timestamp(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3),
+	`time_deleted` timestamp(3),
+	`model` varchar(255) NOT NULL,
+	`input_tokens` int NOT NULL,
+	`output_tokens` int NOT NULL,
+	`reasoning_tokens` int,
+	`cache_read_tokens` int,
+	`cache_write_tokens` int,
+	`cost` bigint NOT NULL,
+	CONSTRAINT `usage_workspace_id_id_pk` PRIMARY KEY(`workspace_id`,`id`)
+);
+--> statement-breakpoint
+CREATE TABLE `key` (
+	`id` varchar(30) NOT NULL,
+	`workspace_id` varchar(30) NOT NULL,
+	`time_created` timestamp(3) NOT NULL DEFAULT (now()),
+	`time_updated` timestamp(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3),
+	`time_deleted` timestamp(3),
+	`user_id` text NOT NULL,
+	`name` varchar(255) NOT NULL,
+	`key` varchar(255) NOT NULL,
+	`time_used` timestamp(3),
+	CONSTRAINT `key_workspace_id_id_pk` PRIMARY KEY(`workspace_id`,`id`),
+	CONSTRAINT `global_key` UNIQUE(`key`)
+);
+--> statement-breakpoint
+CREATE TABLE `user` (
+	`id` varchar(30) NOT NULL,
+	`workspace_id` varchar(30) NOT NULL,
+	`time_created` timestamp(3) NOT NULL DEFAULT (now()),
+	`time_updated` timestamp(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3),
+	`time_deleted` timestamp(3),
+	`email` varchar(255) NOT NULL,
+	`name` varchar(255) NOT NULL,
+	`time_seen` timestamp(3),
+	`color` int,
+	CONSTRAINT `user_workspace_id_id_pk` PRIMARY KEY(`workspace_id`,`id`),
+	CONSTRAINT `user_email` UNIQUE(`workspace_id`,`email`)
+);
+--> statement-breakpoint
+CREATE TABLE `workspace` (
+	`id` varchar(30) NOT NULL,
+	`slug` varchar(255),
+	`name` varchar(255),
+	`time_created` timestamp(3) NOT NULL DEFAULT (now()),
+	`time_updated` timestamp(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3),
+	`time_deleted` timestamp(3),
+	CONSTRAINT `workspace_id` PRIMARY KEY(`id`),
+	CONSTRAINT `slug` UNIQUE(`slug`)
+);

cloud/core/migrations/0001_serious_whistler.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `key` ADD `actor` json;--> statement-breakpoint
+ALTER TABLE `key` DROP COLUMN `user_id`;

cloud/core/migrations/0001_thankful_chat.sql

@@ -1,8 +0,0 @@
-CREATE TABLE "account" (
-	"id" varchar(30) NOT NULL,
-	"time_created" timestamp with time zone DEFAULT now() NOT NULL,
-	"time_deleted" timestamp with time zone,
-	"email" varchar(255) NOT NULL
-);
---> statement-breakpoint
-CREATE UNIQUE INDEX "email" ON "account" USING btree ("email");

cloud/core/migrations/0002_stale_jackal.sql

@@ -1,14 +0,0 @@
-CREATE TABLE "key" (
-	"id" varchar(30) NOT NULL,
-	"workspace_id" varchar(30) NOT NULL,
-	"time_created" timestamp with time zone DEFAULT now() NOT NULL,
-	"time_deleted" timestamp with time zone,
-	"user_id" text NOT NULL,
-	"name" varchar(255) NOT NULL,
-	"key" varchar(255) NOT NULL,
-	"time_used" timestamp with time zone,
-	CONSTRAINT "key_workspace_id_id_pk" PRIMARY KEY("workspace_id","id")
-);
---> statement-breakpoint
-ALTER TABLE "key" ADD CONSTRAINT "key_workspace_id_workspace_id_fk" FOREIGN KEY ("workspace_id") REFERENCES "public"."workspace"("id") ON DELETE no action ON UPDATE no action;--> statement-breakpoint
-CREATE UNIQUE INDEX "global_key" ON "key" USING btree ("key");

cloud/core/migrations/0003_tranquil_spencer_smythe.sql

@@ -1 +0,0 @@
-ALTER TABLE "usage" DROP COLUMN "request_id";

cloud/core/migrations/meta/0000_snapshot.json

@@ -1,85 +1,142 @@
 {
-  "id": "9b5cec8c-8b59-4d7a-bb5c-76ade1c83d6f",
+  "version": "5",
+  "dialect": "mysql",
+  "id": "aee779c5-db1d-4655-95ec-6451c18455be",
   "prevId": "00000000-0000-0000-0000-000000000000",
-  "version": "7",
-  "dialect": "postgresql",
   "tables": {
-    "public.billing": {
-      "name": "billing",
-      "schema": "",
+    "account": {
+      "name": "account",
       "columns": {
         "id": {
           "name": "id",
           "type": "varchar(30)",
           "primaryKey": false,
-          "notNull": true
+          "notNull": true,
+          "autoincrement": false
+        },
+        "time_created": {
+          "name": "time_created",
+          "type": "timestamp(3)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "(now())"
+        },
+        "time_updated": {
+          "name": "time_updated",
+          "type": "timestamp(3)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3)"
+        },
+        "time_deleted": {
+          "name": "time_deleted",
+          "type": "timestamp(3)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "email": {
+          "name": "email",
+          "type": "varchar(255)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "email": {
+          "name": "email",
+          "columns": [
+            "email"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraint": {}
+    },
+    "billing": {
+      "name": "billing",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "varchar(30)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
         },
         "workspace_id": {
           "name": "workspace_id",
           "type": "varchar(30)",
           "primaryKey": false,
-          "notNull": true
+          "notNull": true,
+          "autoincrement": false
         },
         "time_created": {
           "name": "time_created",
-          "type": "timestamp with time zone",
+          "type": "timestamp(3)",
           "primaryKey": false,
           "notNull": true,
-          "default": "now()"
+          "autoincrement": false,
+          "default": "(now())"
+        },
+        "time_updated": {
+          "name": "time_updated",
+          "type": "timestamp(3)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3)"
         },
         "time_deleted": {
           "name": "time_deleted",
-          "type": "timestamp with time zone",
+          "type": "timestamp(3)",
           "primaryKey": false,
-          "notNull": false
+          "notNull": false,
+          "autoincrement": false
         },
         "customer_id": {
           "name": "customer_id",
           "type": "varchar(255)",
           "primaryKey": false,
-          "notNull": false
+          "notNull": false,
+          "autoincrement": false
         },
         "payment_method_id": {
           "name": "payment_method_id",
           "type": "varchar(255)",
           "primaryKey": false,
-          "notNull": false
+          "notNull": false,
+          "autoincrement": false
         },
         "payment_method_last4": {
           "name": "payment_method_last4",
           "type": "varchar(4)",
           "primaryKey": false,
-          "notNull": false
+          "notNull": false,
+          "autoincrement": false
         },
         "balance": {
           "name": "balance",
           "type": "bigint",
           "primaryKey": false,
-          "notNull": true
+          "notNull": true,
+          "autoincrement": false
         },
         "reload": {
           "name": "reload",
           "type": "boolean",
           "primaryKey": false,
-          "notNull": false
+          "notNull": false,
+          "autoincrement": false
         }
       },
       "indexes": {},
-      "foreignKeys": {
-        "billing_workspace_id_workspace_id_fk": {
-          "name": "billing_workspace_id_workspace_id_fk",
-          "tableFrom": "billing",
-          "tableTo": "workspace",
-          "columnsFrom": [
-            "workspace_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
+      "foreignKeys": {},
       "compositePrimaryKeys": {
         "billing_workspace_id_id_pk": {
           "name": "billing_workspace_id_id_pk",
@@ -90,74 +147,72 @@
         }
       },
       "uniqueConstraints": {},
-      "policies": {},
-      "checkConstraints": {},
-      "isRLSEnabled": false
+      "checkConstraint": {}
     },
-    "public.payment": {
+    "payment": {
       "name": "payment",
-      "schema": "",
       "columns": {
         "id": {
           "name": "id",
           "type": "varchar(30)",
           "primaryKey": false,
-          "notNull": true
+          "notNull": true,
+          "autoincrement": false
         },
         "workspace_id": {
           "name": "workspace_id",
           "type": "varchar(30)",
           "primaryKey": false,
-          "notNull": true
+          "notNull": true,
+          "autoincrement": false
         },
         "time_created": {
           "name": "time_created",
-          "type": "timestamp with time zone",
+          "type": "timestamp(3)",
           "primaryKey": false,
           "notNull": true,
-          "default": "now()"
+          "autoincrement": false,
+          "default": "(now())"
+        },
+        "time_updated": {
+          "name": "time_updated",
+          "type": "timestamp(3)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3)"
         },
         "time_deleted": {
           "name": "time_deleted",
-          "type": "timestamp with time zone",
+          "type": "timestamp(3)",
           "primaryKey": false,
-          "notNull": false
+          "notNull": false,
+          "autoincrement": false
         },
         "customer_id": {
           "name": "customer_id",
           "type": "varchar(255)",
           "primaryKey": false,
-          "notNull": false
+          "notNull": false,
+          "autoincrement": false
         },
         "payment_id": {
           "name": "payment_id",
           "type": "varchar(255)",
           "primaryKey": false,
-          "notNull": false
+          "notNull": false,
+          "autoincrement": false
         },
         "amount": {
           "name": "amount",
           "type": "bigint",
           "primaryKey": false,
-          "notNull": true
+          "notNull": true,
+          "autoincrement": false
         }
       },
       "indexes": {},
-      "foreignKeys": {
-        "payment_workspace_id_workspace_id_fk": {
-          "name": "payment_workspace_id_workspace_id_fk",
-          "tableFrom": "payment",
-          "tableTo": "workspace",
-          "columnsFrom": [
-            "workspace_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
+      "foreignKeys": {},
       "compositePrimaryKeys": {
         "payment_workspace_id_id_pk": {
           "name": "payment_workspace_id_id_pk",
@@ -168,104 +223,100 @@
         }
       },
       "uniqueConstraints": {},
-      "policies": {},
-      "checkConstraints": {},
-      "isRLSEnabled": false
+      "checkConstraint": {}
     },
-    "public.usage": {
+    "usage": {
       "name": "usage",
-      "schema": "",
       "columns": {
         "id": {
           "name": "id",
           "type": "varchar(30)",
           "primaryKey": false,
-          "notNull": true
+          "notNull": true,
+          "autoincrement": false
         },
         "workspace_id": {
           "name": "workspace_id",
           "type": "varchar(30)",
           "primaryKey": false,
-          "notNull": true
+          "notNull": true,
+          "autoincrement": false
         },
         "time_created": {
           "name": "time_created",
-          "type": "timestamp with time zone",
+          "type": "timestamp(3)",
           "primaryKey": false,
           "notNull": true,
-          "default": "now()"
+          "autoincrement": false,
+          "default": "(now())"
+        },
+        "time_updated": {
+          "name": "time_updated",
+          "type": "timestamp(3)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3)"
         },
         "time_deleted": {
           "name": "time_deleted",
-          "type": "timestamp with time zone",
+          "type": "timestamp(3)",
           "primaryKey": false,
-          "notNull": false
-        },
-        "request_id": {
-          "name": "request_id",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": false
+          "notNull": false,
+          "autoincrement": false
         },
         "model": {
           "name": "model",
           "type": "varchar(255)",
           "primaryKey": false,
-          "notNull": true
+          "notNull": true,
+          "autoincrement": false
         },
         "input_tokens": {
           "name": "input_tokens",
-          "type": "integer",
+          "type": "int",
           "primaryKey": false,
-          "notNull": true
+          "notNull": true,
+          "autoincrement": false
         },
         "output_tokens": {
           "name": "output_tokens",
-          "type": "integer",
+          "type": "int",
           "primaryKey": false,
-          "notNull": true
+          "notNull": true,
+          "autoincrement": false
         },
         "reasoning_tokens": {
           "name": "reasoning_tokens",
-          "type": "integer",
+          "type": "int",
           "primaryKey": false,
-          "notNull": false
+          "notNull": false,
+          "autoincrement": false
         },
         "cache_read_tokens": {
           "name": "cache_read_tokens",
-          "type": "integer",
+          "type": "int",
           "primaryKey": false,
-          "notNull": false
+          "notNull": false,
+          "autoincrement": false
         },
         "cache_write_tokens": {
           "name": "cache_write_tokens",
-          "type": "integer",
+          "type": "int",
           "primaryKey": false,
-          "notNull": false
+          "notNull": false,
+          "autoincrement": false
         },
         "cost": {
           "name": "cost",
           "type": "bigint",
           "primaryKey": false,
-          "notNull": true
+          "notNull": true,
+          "autoincrement": false
         }
       },
       "indexes": {},
-      "foreignKeys": {
-        "usage_workspace_id_workspace_id_fk": {
-          "name": "usage_workspace_id_workspace_id_fk",
-          "tableFrom": "usage",
-          "tableTo": "workspace",
-          "columnsFrom": [
-            "workspace_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
+      "foreignKeys": {},
       "compositePrimaryKeys": {
         "usage_workspace_id_id_pk": {
           "name": "usage_workspace_id_id_pk",
@@ -276,102 +327,179 @@
         }
       },
       "uniqueConstraints": {},
-      "policies": {},
-      "checkConstraints": {},
-      "isRLSEnabled": false
+      "checkConstraint": {}
     },
-    "public.user": {
-      "name": "user",
-      "schema": "",
+    "key": {
+      "name": "key",
       "columns": {
         "id": {
           "name": "id",
           "type": "varchar(30)",
           "primaryKey": false,
-          "notNull": true
+          "notNull": true,
+          "autoincrement": false
         },
         "workspace_id": {
           "name": "workspace_id",
           "type": "varchar(30)",
           "primaryKey": false,
-          "notNull": true
+          "notNull": true,
+          "autoincrement": false
         },
         "time_created": {
           "name": "time_created",
-          "type": "timestamp with time zone",
+          "type": "timestamp(3)",
           "primaryKey": false,
           "notNull": true,
-          "default": "now()"
+          "autoincrement": false,
+          "default": "(now())"
+        },
+        "time_updated": {
+          "name": "time_updated",
+          "type": "timestamp(3)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3)"
         },
         "time_deleted": {
           "name": "time_deleted",
-          "type": "timestamp with time zone",
+          "type": "timestamp(3)",
           "primaryKey": false,
-          "notNull": false
+          "notNull": false,
+          "autoincrement": false
         },
-        "email": {
-          "name": "email",
+        "user_id": {
+          "name": "user_id",
           "type": "text",
           "primaryKey": false,
-          "notNull": true
+          "notNull": true,
+          "autoincrement": false
         },
         "name": {
           "name": "name",
           "type": "varchar(255)",
           "primaryKey": false,
-          "notNull": true
+          "notNull": true,
+          "autoincrement": false
+        },
+        "key": {
+          "name": "key",
+          "type": "varchar(255)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "time_used": {
+          "name": "time_used",
+          "type": "timestamp(3)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "global_key": {
+          "name": "global_key",
+          "columns": [
+            "key"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {
+        "key_workspace_id_id_pk": {
+          "name": "key_workspace_id_id_pk",
+          "columns": [
+            "workspace_id",
+            "id"
+          ]
+        }
+      },
+      "uniqueConstraints": {},
+      "checkConstraint": {}
+    },
+    "user": {
+      "name": "user",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "varchar(30)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "varchar(30)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "time_created": {
+          "name": "time_created",
+          "type": "timestamp(3)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "(now())"
+        },
+        "time_updated": {
+          "name": "time_updated",
+          "type": "timestamp(3)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3)"
+        },
+        "time_deleted": {
+          "name": "time_deleted",
+          "type": "timestamp(3)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "email": {
+          "name": "email",
+          "type": "varchar(255)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "varchar(255)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
         },
         "time_seen": {
           "name": "time_seen",
-          "type": "timestamp with time zone",
+          "type": "timestamp(3)",
           "primaryKey": false,
-          "notNull": false
+          "notNull": false,
+          "autoincrement": false
         },
         "color": {
           "name": "color",
-          "type": "integer",
+          "type": "int",
           "primaryKey": false,
-          "notNull": false
+          "notNull": false,
+          "autoincrement": false
         }
       },
       "indexes": {
         "user_email": {
           "name": "user_email",
           "columns": [
-            {
-              "expression": "workspace_id",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            },
-            {
-              "expression": "email",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            }
+            "workspace_id",
+            "email"
           ],
-          "isUnique": true,
-          "concurrently": false,
-          "method": "btree",
-          "with": {}
-        }
-      },
-      "foreignKeys": {
-        "user_workspace_id_workspace_id_fk": {
-          "name": "user_workspace_id_workspace_id_fk",
-          "tableFrom": "user",
-          "tableTo": "workspace",
-          "columnsFrom": [
-            "workspace_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
+          "isUnique": true
         }
       },
+      "foreignKeys": {},
       "compositePrimaryKeys": {
         "user_workspace_id_id_pk": {
           "name": "user_workspace_id_id_pk",
@@ -382,80 +510,86 @@
         }
       },
       "uniqueConstraints": {},
-      "policies": {},
-      "checkConstraints": {},
-      "isRLSEnabled": false
+      "checkConstraint": {}
     },
-    "public.workspace": {
+    "workspace": {
       "name": "workspace",
-      "schema": "",
       "columns": {
         "id": {
           "name": "id",
           "type": "varchar(30)",
-          "primaryKey": true,
-          "notNull": true
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
         },
         "slug": {
           "name": "slug",
           "type": "varchar(255)",
           "primaryKey": false,
-          "notNull": false
+          "notNull": false,
+          "autoincrement": false
         },
         "name": {
           "name": "name",
           "type": "varchar(255)",
           "primaryKey": false,
-          "notNull": false
+          "notNull": false,
+          "autoincrement": false
         },
         "time_created": {
           "name": "time_created",
-          "type": "timestamp with time zone",
+          "type": "timestamp(3)",
           "primaryKey": false,
           "notNull": true,
-          "default": "now()"
+          "autoincrement": false,
+          "default": "(now())"
+        },
+        "time_updated": {
+          "name": "time_updated",
+          "type": "timestamp(3)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3)"
         },
         "time_deleted": {
           "name": "time_deleted",
-          "type": "timestamp with time zone",
+          "type": "timestamp(3)",
           "primaryKey": false,
-          "notNull": false
+          "notNull": false,
+          "autoincrement": false
         }
       },
       "indexes": {
         "slug": {
           "name": "slug",
           "columns": [
-            {
-              "expression": "slug",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            }
+            "slug"
           ],
-          "isUnique": true,
-          "concurrently": false,
-          "method": "btree",
-          "with": {}
+          "isUnique": true
         }
       },
       "foreignKeys": {},
-      "compositePrimaryKeys": {},
+      "compositePrimaryKeys": {
+        "workspace_id": {
+          "name": "workspace_id",
+          "columns": [
+            "id"
+          ]
+        }
+      },
       "uniqueConstraints": {},
-      "policies": {},
-      "checkConstraints": {},
-      "isRLSEnabled": false
+      "checkConstraint": {}
     }
   },
-  "enums": {},
-  "schemas": {},
-  "sequences": {},
-  "roles": {},
-  "policies": {},
   "views": {},
   "_meta": {
-    "columns": {},
     "schemas": {},
-    "tables": {}
+    "tables": {},
+    "columns": {}
+  },
+  "internal": {
+    "tables": {},
+    "indexes": {}
   }
 }

cloud/core/migrations/meta/0001_snapshot.json

@@ -1,139 +1,142 @@
 {
-  "id": "bf9e9084-4073-4ecb-8e56-5610816c9589",
-  "prevId": "9b5cec8c-8b59-4d7a-bb5c-76ade1c83d6f",
-  "version": "7",
-  "dialect": "postgresql",
+  "version": "5",
+  "dialect": "mysql",
+  "id": "79b7ee25-1c1c-41ff-9bbf-754af257102b",
+  "prevId": "aee779c5-db1d-4655-95ec-6451c18455be",
   "tables": {
-    "public.account": {
+    "account": {
       "name": "account",
-      "schema": "",
       "columns": {
         "id": {
           "name": "id",
           "type": "varchar(30)",
           "primaryKey": false,
-          "notNull": true
+          "notNull": true,
+          "autoincrement": false
         },
         "time_created": {
           "name": "time_created",
-          "type": "timestamp with time zone",
+          "type": "timestamp(3)",
           "primaryKey": false,
           "notNull": true,
-          "default": "now()"
+          "autoincrement": false,
+          "default": "(now())"
+        },
+        "time_updated": {
+          "name": "time_updated",
+          "type": "timestamp(3)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3)"
         },
         "time_deleted": {
           "name": "time_deleted",
-          "type": "timestamp with time zone",
+          "type": "timestamp(3)",
           "primaryKey": false,
-          "notNull": false
+          "notNull": false,
+          "autoincrement": false
         },
         "email": {
           "name": "email",
           "type": "varchar(255)",
           "primaryKey": false,
-          "notNull": true
+          "notNull": true,
+          "autoincrement": false
         }
       },
       "indexes": {
         "email": {
           "name": "email",
           "columns": [
-            {
-              "expression": "email",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            }
+            "email"
           ],
-          "isUnique": true,
-          "concurrently": false,
-          "method": "btree",
-          "with": {}
+          "isUnique": true
         }
       },
       "foreignKeys": {},
       "compositePrimaryKeys": {},
       "uniqueConstraints": {},
-      "policies": {},
-      "checkConstraints": {},
-      "isRLSEnabled": false
+      "checkConstraint": {}
     },
-    "public.billing": {
+    "billing": {
       "name": "billing",
-      "schema": "",
       "columns": {
         "id": {
           "name": "id",
           "type": "varchar(30)",
           "primaryKey": false,
-          "notNull": true
+          "notNull": true,
+          "autoincrement": false
         },
         "workspace_id": {
           "name": "workspace_id",
           "type": "varchar(30)",
           "primaryKey": false,
-          "notNull": true
+          "notNull": true,
+          "autoincrement": false
         },
         "time_created": {
           "name": "time_created",
-          "type": "timestamp with time zone",
+          "type": "timestamp(3)",
           "primaryKey": false,
           "notNull": true,
-          "default": "now()"
+          "autoincrement": false,
+          "default": "(now())"
+        },
+        "time_updated": {
+          "name": "time_updated",
+          "type": "timestamp(3)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3)"
         },
         "time_deleted": {
           "name": "time_deleted",
-          "type": "timestamp with time zone",
+          "type": "timestamp(3)",
           "primaryKey": false,
-          "notNull": false
+          "notNull": false,
+          "autoincrement": false
         },
         "customer_id": {
           "name": "customer_id",
           "type": "varchar(255)",
           "primaryKey": false,
-          "notNull": false
+          "notNull": false,
+          "autoincrement": false
         },
         "payment_method_id": {
           "name": "payment_method_id",
           "type": "varchar(255)",
           "primaryKey": false,
-          "notNull": false
+          "notNull": false,
+          "autoincrement": false
         },
         "payment_method_last4": {
           "name": "payment_method_last4",
           "type": "varchar(4)",
           "primaryKey": false,
-          "notNull": false
+          "notNull": false,
+          "autoincrement": false
         },
         "balance": {
           "name": "balance",
           "type": "bigint",
           "primaryKey": false,
-          "notNull": true
+          "notNull": true,
+          "autoincrement": false
         },
         "reload": {
           "name": "reload",
           "type": "boolean",
           "primaryKey": false,
-          "notNull": false
+          "notNull": false,
+          "autoincrement": false
         }
       },
       "indexes": {},
-      "foreignKeys": {
-        "billing_workspace_id_workspace_id_fk": {
-          "name": "billing_workspace_id_workspace_id_fk",
-          "tableFrom": "billing",
-          "tableTo": "workspace",
-          "columnsFrom": [
-            "workspace_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
+      "foreignKeys": {},
       "compositePrimaryKeys": {
         "billing_workspace_id_id_pk": {
           "name": "billing_workspace_id_id_pk",
@@ -144,74 +147,72 @@
         }
       },
       "uniqueConstraints": {},
-      "policies": {},
-      "checkConstraints": {},
-      "isRLSEnabled": false
+      "checkConstraint": {}
     },
-    "public.payment": {
+    "payment": {
       "name": "payment",
-      "schema": "",
       "columns": {
         "id": {
           "name": "id",
           "type": "varchar(30)",
           "primaryKey": false,
-          "notNull": true
+          "notNull": true,
+          "autoincrement": false
         },
         "workspace_id": {
           "name": "workspace_id",
           "type": "varchar(30)",
           "primaryKey": false,
-          "notNull": true
+          "notNull": true,
+          "autoincrement": false
         },
         "time_created": {
           "name": "time_created",
-          "type": "timestamp with time zone",
+          "type": "timestamp(3)",
           "primaryKey": false,
           "notNull": true,
-          "default": "now()"
+          "autoincrement": false,
+          "default": "(now())"
+        },
+        "time_updated": {
+          "name": "time_updated",
+          "type": "timestamp(3)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3)"
         },
         "time_deleted": {
           "name": "time_deleted",
-          "type": "timestamp with time zone",
+          "type": "timestamp(3)",
           "primaryKey": false,
-          "notNull": false
+          "notNull": false,
+          "autoincrement": false
         },
         "customer_id": {
           "name": "customer_id",
           "type": "varchar(255)",
           "primaryKey": false,
-          "notNull": false
+          "notNull": false,
+          "autoincrement": false
         },
         "payment_id": {
           "name": "payment_id",
           "type": "varchar(255)",
           "primaryKey": false,
-          "notNull": false
+          "notNull": false,
+          "autoincrement": false
         },
         "amount": {
           "name": "amount",
           "type": "bigint",
           "primaryKey": false,
-          "notNull": true
+          "notNull": true,
+          "autoincrement": false
         }
       },
       "indexes": {},
-      "foreignKeys": {
-        "payment_workspace_id_workspace_id_fk": {
-          "name": "payment_workspace_id_workspace_id_fk",
-          "tableFrom": "payment",
-          "tableTo": "workspace",
-          "columnsFrom": [
-            "workspace_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
+      "foreignKeys": {},
       "compositePrimaryKeys": {
         "payment_workspace_id_id_pk": {
           "name": "payment_workspace_id_id_pk",
@@ -222,104 +223,100 @@
         }
       },
       "uniqueConstraints": {},
-      "policies": {},
-      "checkConstraints": {},
-      "isRLSEnabled": false
+      "checkConstraint": {}
     },
-    "public.usage": {
+    "usage": {
       "name": "usage",
-      "schema": "",
       "columns": {
         "id": {
           "name": "id",
           "type": "varchar(30)",
           "primaryKey": false,
-          "notNull": true
+          "notNull": true,
+          "autoincrement": false
         },
         "workspace_id": {
           "name": "workspace_id",
           "type": "varchar(30)",
           "primaryKey": false,
-          "notNull": true
+          "notNull": true,
+          "autoincrement": false
         },
         "time_created": {
           "name": "time_created",
-          "type": "timestamp with time zone",
+          "type": "timestamp(3)",
           "primaryKey": false,
           "notNull": true,
-          "default": "now()"
+          "autoincrement": false,
+          "default": "(now())"
+        },
+        "time_updated": {
+          "name": "time_updated",
+          "type": "timestamp(3)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3)"
         },
         "time_deleted": {
           "name": "time_deleted",
-          "type": "timestamp with time zone",
+          "type": "timestamp(3)",
           "primaryKey": false,
-          "notNull": false
-        },
-        "request_id": {
-          "name": "request_id",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": false
+          "notNull": false,
+          "autoincrement": false
         },
         "model": {
           "name": "model",
           "type": "varchar(255)",
           "primaryKey": false,
-          "notNull": true
+          "notNull": true,
+          "autoincrement": false
         },
         "input_tokens": {
           "name": "input_tokens",
-          "type": "integer",
+          "type": "int",
           "primaryKey": false,
-          "notNull": true
+          "notNull": true,
+          "autoincrement": false
         },
         "output_tokens": {
           "name": "output_tokens",
-          "type": "integer",
+          "type": "int",
           "primaryKey": false,
-          "notNull": true
+          "notNull": true,
+          "autoincrement": false
         },
         "reasoning_tokens": {
           "name": "reasoning_tokens",
-          "type": "integer",
+          "type": "int",
           "primaryKey": false,
-          "notNull": false
+          "notNull": false,
+          "autoincrement": false
         },
         "cache_read_tokens": {
           "name": "cache_read_tokens",
-          "type": "integer",
+          "type": "int",
           "primaryKey": false,
-          "notNull": false
+          "notNull": false,
+          "autoincrement": false
         },
         "cache_write_tokens": {
           "name": "cache_write_tokens",
-          "type": "integer",
+          "type": "int",
           "primaryKey": false,
-          "notNull": false
+          "notNull": false,
+          "autoincrement": false
         },
         "cost": {
           "name": "cost",
           "type": "bigint",
           "primaryKey": false,
-          "notNull": true
+          "notNull": true,
+          "autoincrement": false
         }
       },
       "indexes": {},
-      "foreignKeys": {
-        "usage_workspace_id_workspace_id_fk": {
-          "name": "usage_workspace_id_workspace_id_fk",
-          "tableFrom": "usage",
-          "tableTo": "workspace",
-          "columnsFrom": [
-            "workspace_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
+      "foreignKeys": {},
       "compositePrimaryKeys": {
         "usage_workspace_id_id_pk": {
           "name": "usage_workspace_id_id_pk",
@@ -330,102 +327,179 @@
         }
       },
       "uniqueConstraints": {},
-      "policies": {},
-      "checkConstraints": {},
-      "isRLSEnabled": false
+      "checkConstraint": {}
     },
-    "public.user": {
-      "name": "user",
-      "schema": "",
+    "key": {
+      "name": "key",
       "columns": {
         "id": {
           "name": "id",
           "type": "varchar(30)",
           "primaryKey": false,
-          "notNull": true
+          "notNull": true,
+          "autoincrement": false
         },
         "workspace_id": {
           "name": "workspace_id",
           "type": "varchar(30)",
           "primaryKey": false,
-          "notNull": true
+          "notNull": true,
+          "autoincrement": false
         },
         "time_created": {
           "name": "time_created",
-          "type": "timestamp with time zone",
+          "type": "timestamp(3)",
           "primaryKey": false,
           "notNull": true,
-          "default": "now()"
+          "autoincrement": false,
+          "default": "(now())"
+        },
+        "time_updated": {
+          "name": "time_updated",
+          "type": "timestamp(3)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3)"
         },
         "time_deleted": {
           "name": "time_deleted",
-          "type": "timestamp with time zone",
+          "type": "timestamp(3)",
           "primaryKey": false,
-          "notNull": false
+          "notNull": false,
+          "autoincrement": false
         },
-        "email": {
-          "name": "email",
-          "type": "text",
+        "actor": {
+          "name": "actor",
+          "type": "json",
           "primaryKey": false,
-          "notNull": true
+          "notNull": false,
+          "autoincrement": false
         },
         "name": {
           "name": "name",
           "type": "varchar(255)",
           "primaryKey": false,
-          "notNull": true
+          "notNull": true,
+          "autoincrement": false
+        },
+        "key": {
+          "name": "key",
+          "type": "varchar(255)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "time_used": {
+          "name": "time_used",
+          "type": "timestamp(3)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "global_key": {
+          "name": "global_key",
+          "columns": [
+            "key"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {
+        "key_workspace_id_id_pk": {
+          "name": "key_workspace_id_id_pk",
+          "columns": [
+            "workspace_id",
+            "id"
+          ]
+        }
+      },
+      "uniqueConstraints": {},
+      "checkConstraint": {}
+    },
+    "user": {
+      "name": "user",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "varchar(30)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "varchar(30)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "time_created": {
+          "name": "time_created",
+          "type": "timestamp(3)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "(now())"
+        },
+        "time_updated": {
+          "name": "time_updated",
+          "type": "timestamp(3)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3)"
+        },
+        "time_deleted": {
+          "name": "time_deleted",
+          "type": "timestamp(3)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "email": {
+          "name": "email",
+          "type": "varchar(255)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "varchar(255)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
         },
         "time_seen": {
           "name": "time_seen",
-          "type": "timestamp with time zone",
+          "type": "timestamp(3)",
           "primaryKey": false,
-          "notNull": false
+          "notNull": false,
+          "autoincrement": false
         },
         "color": {
           "name": "color",
-          "type": "integer",
+          "type": "int",
           "primaryKey": false,
-          "notNull": false
+          "notNull": false,
+          "autoincrement": false
         }
       },
       "indexes": {
         "user_email": {
           "name": "user_email",
           "columns": [
-            {
-              "expression": "workspace_id",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            },
-            {
-              "expression": "email",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            }
+            "workspace_id",
+            "email"
           ],
-          "isUnique": true,
-          "concurrently": false,
-          "method": "btree",
-          "with": {}
-        }
-      },
-      "foreignKeys": {
-        "user_workspace_id_workspace_id_fk": {
-          "name": "user_workspace_id_workspace_id_fk",
-          "tableFrom": "user",
-          "tableTo": "workspace",
-          "columnsFrom": [
-            "workspace_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
+          "isUnique": true
         }
       },
+      "foreignKeys": {},
       "compositePrimaryKeys": {
         "user_workspace_id_id_pk": {
           "name": "user_workspace_id_id_pk",
@@ -436,80 +510,86 @@
         }
       },
       "uniqueConstraints": {},
-      "policies": {},
-      "checkConstraints": {},
-      "isRLSEnabled": false
+      "checkConstraint": {}
     },
-    "public.workspace": {
+    "workspace": {
       "name": "workspace",
-      "schema": "",
       "columns": {
         "id": {
           "name": "id",
           "type": "varchar(30)",
-          "primaryKey": true,
-          "notNull": true
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
         },
         "slug": {
           "name": "slug",
           "type": "varchar(255)",
           "primaryKey": false,
-          "notNull": false
+          "notNull": false,
+          "autoincrement": false
         },
         "name": {
           "name": "name",
           "type": "varchar(255)",
           "primaryKey": false,
-          "notNull": false
+          "notNull": false,
+          "autoincrement": false
         },
         "time_created": {
           "name": "time_created",
-          "type": "timestamp with time zone",
+          "type": "timestamp(3)",
           "primaryKey": false,
           "notNull": true,
-          "default": "now()"
+          "autoincrement": false,
+          "default": "(now())"
+        },
+        "time_updated": {
+          "name": "time_updated",
+          "type": "timestamp(3)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3)"
         },
         "time_deleted": {
           "name": "time_deleted",
-          "type": "timestamp with time zone",
+          "type": "timestamp(3)",
           "primaryKey": false,
-          "notNull": false
+          "notNull": false,
+          "autoincrement": false
         }
       },
       "indexes": {
         "slug": {
           "name": "slug",
           "columns": [
-            {
-              "expression": "slug",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            }
+            "slug"
           ],
-          "isUnique": true,
-          "concurrently": false,
-          "method": "btree",
-          "with": {}
+          "isUnique": true
         }
       },
       "foreignKeys": {},
-      "compositePrimaryKeys": {},
+      "compositePrimaryKeys": {
+        "workspace_id": {
+          "name": "workspace_id",
+          "columns": [
+            "id"
+          ]
+        }
+      },
       "uniqueConstraints": {},
-      "policies": {},
-      "checkConstraints": {},
-      "isRLSEnabled": false
+      "checkConstraint": {}
     }
   },
-  "enums": {},
-  "schemas": {},
-  "sequences": {},
-  "roles": {},
-  "policies": {},
   "views": {},
   "_meta": {
-    "columns": {},
     "schemas": {},
-    "tables": {}
+    "tables": {},
+    "columns": {}
+  },
+  "internal": {
+    "tables": {},
+    "indexes": {}
   }
 }

cloud/core/migrations/meta/0002_snapshot.json

@@ -1,615 +0,0 @@
-{
-  "id": "351e4956-74e0-4282-a23b-02f1a73fa38c",
-  "prevId": "bf9e9084-4073-4ecb-8e56-5610816c9589",
-  "version": "7",
-  "dialect": "postgresql",
-  "tables": {
-    "public.account": {
-      "name": "account",
-      "schema": "",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "varchar(30)",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "time_created": {
-          "name": "time_created",
-          "type": "timestamp with time zone",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "now()"
-        },
-        "time_deleted": {
-          "name": "time_deleted",
-          "type": "timestamp with time zone",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "email": {
-          "name": "email",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": true
-        }
-      },
-      "indexes": {
-        "email": {
-          "name": "email",
-          "columns": [
-            {
-              "expression": "email",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            }
-          ],
-          "isUnique": true,
-          "concurrently": false,
-          "method": "btree",
-          "with": {}
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "policies": {},
-      "checkConstraints": {},
-      "isRLSEnabled": false
-    },
-    "public.billing": {
-      "name": "billing",
-      "schema": "",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "varchar(30)",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "workspace_id": {
-          "name": "workspace_id",
-          "type": "varchar(30)",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "time_created": {
-          "name": "time_created",
-          "type": "timestamp with time zone",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "now()"
-        },
-        "time_deleted": {
-          "name": "time_deleted",
-          "type": "timestamp with time zone",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "customer_id": {
-          "name": "customer_id",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "payment_method_id": {
-          "name": "payment_method_id",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "payment_method_last4": {
-          "name": "payment_method_last4",
-          "type": "varchar(4)",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "balance": {
-          "name": "balance",
-          "type": "bigint",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "reload": {
-          "name": "reload",
-          "type": "boolean",
-          "primaryKey": false,
-          "notNull": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "billing_workspace_id_workspace_id_fk": {
-          "name": "billing_workspace_id_workspace_id_fk",
-          "tableFrom": "billing",
-          "tableTo": "workspace",
-          "columnsFrom": [
-            "workspace_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {
-        "billing_workspace_id_id_pk": {
-          "name": "billing_workspace_id_id_pk",
-          "columns": [
-            "workspace_id",
-            "id"
-          ]
-        }
-      },
-      "uniqueConstraints": {},
-      "policies": {},
-      "checkConstraints": {},
-      "isRLSEnabled": false
-    },
-    "public.payment": {
-      "name": "payment",
-      "schema": "",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "varchar(30)",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "workspace_id": {
-          "name": "workspace_id",
-          "type": "varchar(30)",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "time_created": {
-          "name": "time_created",
-          "type": "timestamp with time zone",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "now()"
-        },
-        "time_deleted": {
-          "name": "time_deleted",
-          "type": "timestamp with time zone",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "customer_id": {
-          "name": "customer_id",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "payment_id": {
-          "name": "payment_id",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "amount": {
-          "name": "amount",
-          "type": "bigint",
-          "primaryKey": false,
-          "notNull": true
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "payment_workspace_id_workspace_id_fk": {
-          "name": "payment_workspace_id_workspace_id_fk",
-          "tableFrom": "payment",
-          "tableTo": "workspace",
-          "columnsFrom": [
-            "workspace_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {
-        "payment_workspace_id_id_pk": {
-          "name": "payment_workspace_id_id_pk",
-          "columns": [
-            "workspace_id",
-            "id"
-          ]
-        }
-      },
-      "uniqueConstraints": {},
-      "policies": {},
-      "checkConstraints": {},
-      "isRLSEnabled": false
-    },
-    "public.usage": {
-      "name": "usage",
-      "schema": "",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "varchar(30)",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "workspace_id": {
-          "name": "workspace_id",
-          "type": "varchar(30)",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "time_created": {
-          "name": "time_created",
-          "type": "timestamp with time zone",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "now()"
-        },
-        "time_deleted": {
-          "name": "time_deleted",
-          "type": "timestamp with time zone",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "request_id": {
-          "name": "request_id",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "model": {
-          "name": "model",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "input_tokens": {
-          "name": "input_tokens",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "output_tokens": {
-          "name": "output_tokens",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "reasoning_tokens": {
-          "name": "reasoning_tokens",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "cache_read_tokens": {
-          "name": "cache_read_tokens",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "cache_write_tokens": {
-          "name": "cache_write_tokens",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "cost": {
-          "name": "cost",
-          "type": "bigint",
-          "primaryKey": false,
-          "notNull": true
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "usage_workspace_id_workspace_id_fk": {
-          "name": "usage_workspace_id_workspace_id_fk",
-          "tableFrom": "usage",
-          "tableTo": "workspace",
-          "columnsFrom": [
-            "workspace_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {
-        "usage_workspace_id_id_pk": {
-          "name": "usage_workspace_id_id_pk",
-          "columns": [
-            "workspace_id",
-            "id"
-          ]
-        }
-      },
-      "uniqueConstraints": {},
-      "policies": {},
-      "checkConstraints": {},
-      "isRLSEnabled": false
-    },
-    "public.key": {
-      "name": "key",
-      "schema": "",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "varchar(30)",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "workspace_id": {
-          "name": "workspace_id",
-          "type": "varchar(30)",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "time_created": {
-          "name": "time_created",
-          "type": "timestamp with time zone",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "now()"
-        },
-        "time_deleted": {
-          "name": "time_deleted",
-          "type": "timestamp with time zone",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "name": {
-          "name": "name",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "key": {
-          "name": "key",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "time_used": {
-          "name": "time_used",
-          "type": "timestamp with time zone",
-          "primaryKey": false,
-          "notNull": false
-        }
-      },
-      "indexes": {
-        "global_key": {
-          "name": "global_key",
-          "columns": [
-            {
-              "expression": "key",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            }
-          ],
-          "isUnique": true,
-          "concurrently": false,
-          "method": "btree",
-          "with": {}
-        }
-      },
-      "foreignKeys": {
-        "key_workspace_id_workspace_id_fk": {
-          "name": "key_workspace_id_workspace_id_fk",
-          "tableFrom": "key",
-          "tableTo": "workspace",
-          "columnsFrom": [
-            "workspace_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {
-        "key_workspace_id_id_pk": {
-          "name": "key_workspace_id_id_pk",
-          "columns": [
-            "workspace_id",
-            "id"
-          ]
-        }
-      },
-      "uniqueConstraints": {},
-      "policies": {},
-      "checkConstraints": {},
-      "isRLSEnabled": false
-    },
-    "public.user": {
-      "name": "user",
-      "schema": "",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "varchar(30)",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "workspace_id": {
-          "name": "workspace_id",
-          "type": "varchar(30)",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "time_created": {
-          "name": "time_created",
-          "type": "timestamp with time zone",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "now()"
-        },
-        "time_deleted": {
-          "name": "time_deleted",
-          "type": "timestamp with time zone",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "email": {
-          "name": "email",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "name": {
-          "name": "name",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "time_seen": {
-          "name": "time_seen",
-          "type": "timestamp with time zone",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "color": {
-          "name": "color",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false
-        }
-      },
-      "indexes": {
-        "user_email": {
-          "name": "user_email",
-          "columns": [
-            {
-              "expression": "workspace_id",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            },
-            {
-              "expression": "email",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            }
-          ],
-          "isUnique": true,
-          "concurrently": false,
-          "method": "btree",
-          "with": {}
-        }
-      },
-      "foreignKeys": {
-        "user_workspace_id_workspace_id_fk": {
-          "name": "user_workspace_id_workspace_id_fk",
-          "tableFrom": "user",
-          "tableTo": "workspace",
-          "columnsFrom": [
-            "workspace_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {
-        "user_workspace_id_id_pk": {
-          "name": "user_workspace_id_id_pk",
-          "columns": [
-            "workspace_id",
-            "id"
-          ]
-        }
-      },
-      "uniqueConstraints": {},
-      "policies": {},
-      "checkConstraints": {},
-      "isRLSEnabled": false
-    },
-    "public.workspace": {
-      "name": "workspace",
-      "schema": "",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "varchar(30)",
-          "primaryKey": true,
-          "notNull": true
-        },
-        "slug": {
-          "name": "slug",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "name": {
-          "name": "name",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "time_created": {
-          "name": "time_created",
-          "type": "timestamp with time zone",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "now()"
-        },
-        "time_deleted": {
-          "name": "time_deleted",
-          "type": "timestamp with time zone",
-          "primaryKey": false,
-          "notNull": false
-        }
-      },
-      "indexes": {
-        "slug": {
-          "name": "slug",
-          "columns": [
-            {
-              "expression": "slug",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            }
-          ],
-          "isUnique": true,
-          "concurrently": false,
-          "method": "btree",
-          "with": {}
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "policies": {},
-      "checkConstraints": {},
-      "isRLSEnabled": false
-    }
-  },
-  "enums": {},
-  "schemas": {},
-  "sequences": {},
-  "roles": {},
-  "policies": {},
-  "views": {},
-  "_meta": {
-    "columns": {},
-    "schemas": {},
-    "tables": {}
-  }
-}

cloud/core/migrations/meta/0003_snapshot.json

@@ -1,609 +0,0 @@
-{
-  "id": "fa935883-9e51-4811-90c7-8967eefe458c",
-  "prevId": "351e4956-74e0-4282-a23b-02f1a73fa38c",
-  "version": "7",
-  "dialect": "postgresql",
-  "tables": {
-    "public.account": {
-      "name": "account",
-      "schema": "",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "varchar(30)",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "time_created": {
-          "name": "time_created",
-          "type": "timestamp with time zone",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "now()"
-        },
-        "time_deleted": {
-          "name": "time_deleted",
-          "type": "timestamp with time zone",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "email": {
-          "name": "email",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": true
-        }
-      },
-      "indexes": {
-        "email": {
-          "name": "email",
-          "columns": [
-            {
-              "expression": "email",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            }
-          ],
-          "isUnique": true,
-          "concurrently": false,
-          "method": "btree",
-          "with": {}
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "policies": {},
-      "checkConstraints": {},
-      "isRLSEnabled": false
-    },
-    "public.billing": {
-      "name": "billing",
-      "schema": "",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "varchar(30)",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "workspace_id": {
-          "name": "workspace_id",
-          "type": "varchar(30)",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "time_created": {
-          "name": "time_created",
-          "type": "timestamp with time zone",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "now()"
-        },
-        "time_deleted": {
-          "name": "time_deleted",
-          "type": "timestamp with time zone",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "customer_id": {
-          "name": "customer_id",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "payment_method_id": {
-          "name": "payment_method_id",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "payment_method_last4": {
-          "name": "payment_method_last4",
-          "type": "varchar(4)",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "balance": {
-          "name": "balance",
-          "type": "bigint",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "reload": {
-          "name": "reload",
-          "type": "boolean",
-          "primaryKey": false,
-          "notNull": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "billing_workspace_id_workspace_id_fk": {
-          "name": "billing_workspace_id_workspace_id_fk",
-          "tableFrom": "billing",
-          "tableTo": "workspace",
-          "columnsFrom": [
-            "workspace_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {
-        "billing_workspace_id_id_pk": {
-          "name": "billing_workspace_id_id_pk",
-          "columns": [
-            "workspace_id",
-            "id"
-          ]
-        }
-      },
-      "uniqueConstraints": {},
-      "policies": {},
-      "checkConstraints": {},
-      "isRLSEnabled": false
-    },
-    "public.payment": {
-      "name": "payment",
-      "schema": "",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "varchar(30)",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "workspace_id": {
-          "name": "workspace_id",
-          "type": "varchar(30)",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "time_created": {
-          "name": "time_created",
-          "type": "timestamp with time zone",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "now()"
-        },
-        "time_deleted": {
-          "name": "time_deleted",
-          "type": "timestamp with time zone",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "customer_id": {
-          "name": "customer_id",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "payment_id": {
-          "name": "payment_id",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "amount": {
-          "name": "amount",
-          "type": "bigint",
-          "primaryKey": false,
-          "notNull": true
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "payment_workspace_id_workspace_id_fk": {
-          "name": "payment_workspace_id_workspace_id_fk",
-          "tableFrom": "payment",
-          "tableTo": "workspace",
-          "columnsFrom": [
-            "workspace_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {
-        "payment_workspace_id_id_pk": {
-          "name": "payment_workspace_id_id_pk",
-          "columns": [
-            "workspace_id",
-            "id"
-          ]
-        }
-      },
-      "uniqueConstraints": {},
-      "policies": {},
-      "checkConstraints": {},
-      "isRLSEnabled": false
-    },
-    "public.usage": {
-      "name": "usage",
-      "schema": "",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "varchar(30)",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "workspace_id": {
-          "name": "workspace_id",
-          "type": "varchar(30)",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "time_created": {
-          "name": "time_created",
-          "type": "timestamp with time zone",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "now()"
-        },
-        "time_deleted": {
-          "name": "time_deleted",
-          "type": "timestamp with time zone",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "model": {
-          "name": "model",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "input_tokens": {
-          "name": "input_tokens",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "output_tokens": {
-          "name": "output_tokens",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "reasoning_tokens": {
-          "name": "reasoning_tokens",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "cache_read_tokens": {
-          "name": "cache_read_tokens",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "cache_write_tokens": {
-          "name": "cache_write_tokens",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "cost": {
-          "name": "cost",
-          "type": "bigint",
-          "primaryKey": false,
-          "notNull": true
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "usage_workspace_id_workspace_id_fk": {
-          "name": "usage_workspace_id_workspace_id_fk",
-          "tableFrom": "usage",
-          "tableTo": "workspace",
-          "columnsFrom": [
-            "workspace_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {
-        "usage_workspace_id_id_pk": {
-          "name": "usage_workspace_id_id_pk",
-          "columns": [
-            "workspace_id",
-            "id"
-          ]
-        }
-      },
-      "uniqueConstraints": {},
-      "policies": {},
-      "checkConstraints": {},
-      "isRLSEnabled": false
-    },
-    "public.key": {
-      "name": "key",
-      "schema": "",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "varchar(30)",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "workspace_id": {
-          "name": "workspace_id",
-          "type": "varchar(30)",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "time_created": {
-          "name": "time_created",
-          "type": "timestamp with time zone",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "now()"
-        },
-        "time_deleted": {
-          "name": "time_deleted",
-          "type": "timestamp with time zone",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "name": {
-          "name": "name",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "key": {
-          "name": "key",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "time_used": {
-          "name": "time_used",
-          "type": "timestamp with time zone",
-          "primaryKey": false,
-          "notNull": false
-        }
-      },
-      "indexes": {
-        "global_key": {
-          "name": "global_key",
-          "columns": [
-            {
-              "expression": "key",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            }
-          ],
-          "isUnique": true,
-          "concurrently": false,
-          "method": "btree",
-          "with": {}
-        }
-      },
-      "foreignKeys": {
-        "key_workspace_id_workspace_id_fk": {
-          "name": "key_workspace_id_workspace_id_fk",
-          "tableFrom": "key",
-          "tableTo": "workspace",
-          "columnsFrom": [
-            "workspace_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {
-        "key_workspace_id_id_pk": {
-          "name": "key_workspace_id_id_pk",
-          "columns": [
-            "workspace_id",
-            "id"
-          ]
-        }
-      },
-      "uniqueConstraints": {},
-      "policies": {},
-      "checkConstraints": {},
-      "isRLSEnabled": false
-    },
-    "public.user": {
-      "name": "user",
-      "schema": "",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "varchar(30)",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "workspace_id": {
-          "name": "workspace_id",
-          "type": "varchar(30)",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "time_created": {
-          "name": "time_created",
-          "type": "timestamp with time zone",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "now()"
-        },
-        "time_deleted": {
-          "name": "time_deleted",
-          "type": "timestamp with time zone",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "email": {
-          "name": "email",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "name": {
-          "name": "name",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "time_seen": {
-          "name": "time_seen",
-          "type": "timestamp with time zone",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "color": {
-          "name": "color",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false
-        }
-      },
-      "indexes": {
-        "user_email": {
-          "name": "user_email",
-          "columns": [
-            {
-              "expression": "workspace_id",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            },
-            {
-              "expression": "email",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            }
-          ],
-          "isUnique": true,
-          "concurrently": false,
-          "method": "btree",
-          "with": {}
-        }
-      },
-      "foreignKeys": {
-        "user_workspace_id_workspace_id_fk": {
-          "name": "user_workspace_id_workspace_id_fk",
-          "tableFrom": "user",
-          "tableTo": "workspace",
-          "columnsFrom": [
-            "workspace_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {
-        "user_workspace_id_id_pk": {
-          "name": "user_workspace_id_id_pk",
-          "columns": [
-            "workspace_id",
-            "id"
-          ]
-        }
-      },
-      "uniqueConstraints": {},
-      "policies": {},
-      "checkConstraints": {},
-      "isRLSEnabled": false
-    },
-    "public.workspace": {
-      "name": "workspace",
-      "schema": "",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "varchar(30)",
-          "primaryKey": true,
-          "notNull": true
-        },
-        "slug": {
-          "name": "slug",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "name": {
-          "name": "name",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "time_created": {
-          "name": "time_created",
-          "type": "timestamp with time zone",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "now()"
-        },
-        "time_deleted": {
-          "name": "time_deleted",
-          "type": "timestamp with time zone",
-          "primaryKey": false,
-          "notNull": false
-        }
-      },
-      "indexes": {
-        "slug": {
-          "name": "slug",
-          "columns": [
-            {
-              "expression": "slug",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            }
-          ],
-          "isUnique": true,
-          "concurrently": false,
-          "method": "btree",
-          "with": {}
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "policies": {},
-      "checkConstraints": {},
-      "isRLSEnabled": false
-    }
-  },
-  "enums": {},
-  "schemas": {},
-  "sequences": {},
-  "roles": {},
-  "policies": {},
-  "views": {},
-  "_meta": {
-    "columns": {},
-    "schemas": {},
-    "tables": {}
-  }
-}

cloud/core/migrations/meta/_journal.json

@@ -1,33 +1,19 @@
 {
   "version": "7",
-  "dialect": "postgresql",
+  "dialect": "mysql",
   "entries": [
     {
       "idx": 0,
-      "version": "7",
-      "when": 1754518198186,
-      "tag": "0000_amused_mojo",
+      "version": "5",
+      "when": 1756796050935,
+      "tag": "0000_fluffy_raza",
       "breakpoints": true
     },
     {
       "idx": 1,
-      "version": "7",
-      "when": 1754609655262,
-      "tag": "0001_thankful_chat",
-      "breakpoints": true
-    },
-    {
-      "idx": 2,
-      "version": "7",
-      "when": 1754627626945,
-      "tag": "0002_stale_jackal",
-      "breakpoints": true
-    },
-    {
-      "idx": 3,
-      "version": "7",
-      "when": 1754672464106,
-      "tag": "0003_tranquil_spencer_smythe",
+      "version": "5",
+      "when": 1756871639102,
+      "tag": "0001_serious_whistler",
       "breakpoints": true
     }
   ]

cloud/core/package.json

@@ -1,12 +1,13 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode/cloud-core",
-  "version": "0.5.29",
+  "version": "0.6.4",
   "private": true,
   "type": "module",
   "dependencies": {
     "@aws-sdk/client-sts": "3.782.0",
     "@opencode/cloud-resource": "workspace:*",
+    "@planetscale/database": "1.19.0",
     "drizzle-orm": "0.41.0",
     "postgres": "3.4.7",
     "stripe": "18.0.0",
@@ -16,9 +17,11 @@
     "./*": "./src/*"
   },
   "scripts": {
-    "db": "sst shell drizzle-kit"
+    "db": "sst shell drizzle-kit",
+    "typecheck": "tsc --noEmit"
   },
   "devDependencies": {
-    "drizzle-kit": "0.30.5"
+    "drizzle-kit": "0.30.5",
+    "mysql2": "3.14.4"
   }
 }

cloud/core/src/billing.ts

@@ -4,8 +4,6 @@ import { BillingTable, PaymentTable, UsageTable } from "./schema/billing.sql"
 import { Actor } from "./actor"
 import { fn } from "./util/fn"
 import { z } from "zod"
-import { Identifier } from "./identifier"
-import { centsToMicroCents } from "./util/price"
 import { User } from "./user"
 import { Resource } from "@opencode/cloud-resource"
 
@@ -52,46 +50,6 @@ export namespace Billing {
     )
   }
 
-  export const consume = fn(
-    z.object({
-      requestID: z.string().optional(),
-      model: z.string(),
-      inputTokens: z.number(),
-      outputTokens: z.number(),
-      reasoningTokens: z.number().optional(),
-      cacheReadTokens: z.number().optional(),
-      cacheWriteTokens: z.number().optional(),
-      costInCents: z.number(),
-    }),
-    async (input) => {
-      const workspaceID = Actor.workspace()
-      const cost = centsToMicroCents(input.costInCents)
-
-      return await Database.transaction(async (tx) => {
-        await tx.insert(UsageTable).values({
-          workspaceID,
-          id: Identifier.create("usage"),
-          requestID: input.requestID,
-          model: input.model,
-          inputTokens: input.inputTokens,
-          outputTokens: input.outputTokens,
-          reasoningTokens: input.reasoningTokens,
-          cacheReadTokens: input.cacheReadTokens,
-          cacheWriteTokens: input.cacheWriteTokens,
-          cost,
-        })
-        const [updated] = await tx
-          .update(BillingTable)
-          .set({
-            balance: sql`${BillingTable.balance} - ${cost}`,
-          })
-          .where(eq(BillingTable.workspaceID, workspaceID))
-          .returning()
-        return updated.balance
-      })
-    },
-  )
-
   export const generateCheckoutUrl = fn(
     z.object({
       successUrl: z.string(),
@@ -112,7 +70,7 @@ export namespace Billing {
               product_data: {
                 name: "opencode credits",
               },
-              unit_amount: 2000, // $20 minimum
+              unit_amount: 2123, // $20 minimum + Stripe fee 4.4% + $0.30
             },
             quantity: 1,
           },

cloud/core/src/drizzle/index.ts

@@ -1,41 +1,33 @@
-import { drizzle } from "drizzle-orm/postgres-js"
+import { drizzle } from "drizzle-orm/planetscale-serverless"
 import { Resource } from "@opencode/cloud-resource"
 export * from "drizzle-orm"
-import postgres from "postgres"
+import { Client } from "@planetscale/database"
 
-const init = () => {
-  const client = postgres({
-    idle_timeout: 30000,
-    connect_timeout: 30000,
-    host: Resource.Database.host,
-    database: Resource.Database.database,
-    user: Resource.Database.username,
-    password: Resource.Database.password,
-    port: Resource.Database.port,
-    ssl: {
-      rejectUnauthorized: false,
-    },
-    max: 1,
-  })
-  return drizzle(client, {})
-}
-
-const createClient = "NODE_ENV" in process.env ? memo(init) : init
-
-import { PgTransaction, type PgTransactionConfig } from "drizzle-orm/pg-core"
+import { MySqlTransaction, type MySqlTransactionConfig } from "drizzle-orm/mysql-core"
 import type { ExtractTablesWithRelations } from "drizzle-orm"
-import type { PostgresJsQueryResultHKT } from "drizzle-orm/postgres-js"
+import type { PlanetScalePreparedQueryHKT, PlanetscaleQueryResultHKT } from "drizzle-orm/planetscale-serverless"
 import { Context } from "../context"
 import { memo } from "../util/memo"
 
 export namespace Database {
-  export type Transaction = PgTransaction<
-    PostgresJsQueryResultHKT,
-    Record<string, unknown>,
-    ExtractTablesWithRelations<Record<string, unknown>>
+  export type Transaction = MySqlTransaction<
+    PlanetscaleQueryResultHKT,
+    PlanetScalePreparedQueryHKT,
+    Record<string, never>,
+    ExtractTablesWithRelations<Record<string, never>>
   >
 
-  export type TxOrDb = Transaction | ReturnType<typeof createClient>
+  const client = memo(() => {
+    const result = new Client({
+      host: Resource.Database.host,
+      username: Resource.Database.username,
+      password: Resource.Database.password,
+    })
+    const db = drizzle(result, {})
+    return db
+  })
+
+  export type TxOrDb = Transaction | ReturnType<typeof client>
 
   const TransactionContext = Context.create<{
     tx: TxOrDb
@@ -48,14 +40,13 @@ export namespace Database {
       return tx.transaction(callback)
     } catch (err) {
       if (err instanceof Context.NotFound) {
-        const client = createClient()
         const effects: (() => void | Promise<void>)[] = []
         const result = await TransactionContext.provide(
           {
             effects,
-            tx: client,
+            tx: client(),
           },
-          () => callback(client),
+          () => callback(client()),
         )
         await Promise.all(effects.map((x) => x()))
         return result
@@ -76,15 +67,14 @@ export namespace Database {
     }
   }
 
-  export async function transaction<T>(callback: (tx: TxOrDb) => Promise<T>, config?: PgTransactionConfig) {
+  export async function transaction<T>(callback: (tx: TxOrDb) => Promise<T>, config?: MySqlTransactionConfig) {
     try {
       const { tx } = TransactionContext.use()
       return callback(tx)
     } catch (err) {
       if (err instanceof Context.NotFound) {
-        const client = createClient()
         const effects: (() => void | Promise<void>)[] = []
-        const result = await client.transaction(async (tx) => {
+        const result = await client().transaction(async (tx) => {
           return TransactionContext.provide({ tx, effects }, () => callback(tx))
         }, config)
         await Promise.all(effects.map((x) => x()))

cloud/core/src/drizzle/types.ts

@@ -1,4 +1,5 @@
-import { bigint, timestamp, varchar } from "drizzle-orm/pg-core"
+import { sql } from "drizzle-orm"
+import { bigint, timestamp, varchar } from "drizzle-orm/mysql-core"
 
 export const ulid = (name: string) => varchar(name, { length: 30 })
 
@@ -15,7 +16,7 @@ export const id = () => ulid("id").notNull()
 
 export const utc = (name: string) =>
   timestamp(name, {
-    withTimezone: true,
+    fsp: 3,
   })
 
 export const currency = (name: string) =>
@@ -25,5 +26,8 @@ export const currency = (name: string) =>
 
 export const timestamps = {
   timeCreated: utc("time_created").notNull().defaultNow(),
+  timeUpdated: utc("time_updated")
+    .notNull()
+    .default(sql`CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3)`),
   timeDeleted: utc("time_deleted"),
 }

cloud/core/src/key.ts

@@ -7,73 +7,49 @@ import { KeyTable } from "./schema/key.sql"
 
 export namespace Key {
   export const list = async () => {
-    const user = Actor.assert("user")
+    const workspace = Actor.workspace()
     const keys = await Database.use((tx) =>
       tx
-        .select({
-          id: KeyTable.id,
-          name: KeyTable.name,
-          key: KeyTable.key,
-          userID: KeyTable.userID,
-          timeCreated: KeyTable.timeCreated,
-          timeUsed: KeyTable.timeUsed,
-        })
+        .select()
         .from(KeyTable)
-        .where(eq(KeyTable.workspaceID, user.properties.workspaceID))
+        .where(eq(KeyTable.workspaceID, workspace))
         .orderBy(sql`${KeyTable.timeCreated} DESC`),
     )
     return keys
   }
 
   export const create = fn(z.object({ name: z.string().min(1).max(255) }), async (input) => {
-    const user = Actor.assert("user")
+    const workspaceID = Actor.workspace()
     const { name } = input
 
     // Generate secret key: sk- + 64 random characters (upper, lower, numbers)
     const chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"
-    let randomPart = ""
-    for (let i = 0; i < 64; i++) {
-      randomPart += chars.charAt(Math.floor(Math.random() * chars.length))
+    let secretKey = "sk-"
+    const array = new Uint32Array(64)
+    crypto.getRandomValues(array)
+    for (let i = 0, l = array.length; i < l; i++) {
+      secretKey += chars[array[i] % chars.length]
     }
-    const secretKey = `sk-${randomPart}`
+    const keyID = Identifier.create("key")
 
-    const keyRecord = await Database.use((tx) =>
-      tx
-        .insert(KeyTable)
-        .values({
-          id: Identifier.create("key"),
-          workspaceID: user.properties.workspaceID,
-          userID: user.properties.userID,
-          name,
-          key: secretKey,
-          timeUsed: null,
-        })
-        .returning(),
+    await Database.use((tx) =>
+      tx.insert(KeyTable).values({
+        id: keyID,
+        workspaceID,
+        actor: Actor.use(),
+        name,
+        key: secretKey,
+        timeUsed: null,
+      }),
     )
 
-    return {
-      key: secretKey,
-      id: keyRecord[0].id,
-      name: keyRecord[0].name,
-      created: keyRecord[0].timeCreated,
-    }
+    return keyID
   })
 
   export const remove = fn(z.object({ id: z.string() }), async (input) => {
-    const user = Actor.assert("user")
-    const { id } = input
-
-    const result = await Database.use((tx) =>
-      tx
-        .delete(KeyTable)
-        .where(and(eq(KeyTable.id, id), eq(KeyTable.workspaceID, user.properties.workspaceID)))
-        .returning({ id: KeyTable.id }),
+    const workspace = Actor.workspace()
+    await Database.use((tx) =>
+      tx.delete(KeyTable).where(and(eq(KeyTable.id, input.id), eq(KeyTable.workspaceID, workspace))),
     )
-
-    if (result.length === 0) {
-      throw new Error("Key not found")
-    }
-
-    return { id: result[0].id }
   })
 }

cloud/core/src/schema/account.sql.ts

@@ -1,7 +1,7 @@
-import { pgTable, uniqueIndex, varchar } from "drizzle-orm/pg-core"
+import { mysqlTable, uniqueIndex, varchar } from "drizzle-orm/mysql-core"
 import { id, timestamps } from "../drizzle/types"
 
-export const AccountTable = pgTable(
+export const AccountTable = mysqlTable(
   "account",
   {
     id: id(),

cloud/core/src/schema/billing.sql.ts

@@ -1,8 +1,8 @@
-import { bigint, boolean, integer, pgTable, varchar } from "drizzle-orm/pg-core"
+import { bigint, boolean, int, mysqlTable, varchar } from "drizzle-orm/mysql-core"
 import { timestamps, workspaceColumns } from "../drizzle/types"
 import { workspaceIndexes } from "./workspace.sql"
 
-export const BillingTable = pgTable(
+export const BillingTable = mysqlTable(
   "billing",
   {
     ...workspaceColumns,
@@ -16,7 +16,7 @@ export const BillingTable = pgTable(
   (table) => [...workspaceIndexes(table)],
 )
 
-export const PaymentTable = pgTable(
+export const PaymentTable = mysqlTable(
   "payment",
   {
     ...workspaceColumns,
@@ -28,17 +28,17 @@ export const PaymentTable = pgTable(
   (table) => [...workspaceIndexes(table)],
 )
 
-export const UsageTable = pgTable(
+export const UsageTable = mysqlTable(
   "usage",
   {
     ...workspaceColumns,
     ...timestamps,
     model: varchar("model", { length: 255 }).notNull(),
-    inputTokens: integer("input_tokens").notNull(),
-    outputTokens: integer("output_tokens").notNull(),
-    reasoningTokens: integer("reasoning_tokens"),
-    cacheReadTokens: integer("cache_read_tokens"),
-    cacheWriteTokens: integer("cache_write_tokens"),
+    inputTokens: int("input_tokens").notNull(),
+    outputTokens: int("output_tokens").notNull(),
+    reasoningTokens: int("reasoning_tokens"),
+    cacheReadTokens: int("cache_read_tokens"),
+    cacheWriteTokens: int("cache_write_tokens"),
     cost: bigint("cost", { mode: "number" }).notNull(),
   },
   (table) => [...workspaceIndexes(table)],

cloud/core/src/schema/key.sql.ts

@@ -1,13 +1,14 @@
-import { text, pgTable, varchar, uniqueIndex } from "drizzle-orm/pg-core"
+import { mysqlTable, varchar, uniqueIndex, json } from "drizzle-orm/mysql-core"
 import { timestamps, utc, workspaceColumns } from "../drizzle/types"
 import { workspaceIndexes } from "./workspace.sql"
+import { Actor } from "../actor"
 
-export const KeyTable = pgTable(
+export const KeyTable = mysqlTable(
   "key",
   {
     ...workspaceColumns,
     ...timestamps,
-    userID: text("user_id").notNull(),
+    actor: json("actor").$type<Actor.Info>(),
     name: varchar("name", { length: 255 }).notNull(),
     key: varchar("key", { length: 255 }).notNull(),
     timeUsed: utc("time_used"),

cloud/core/src/schema/user.sql.ts

@@ -1,16 +1,16 @@
-import { text, pgTable, uniqueIndex, varchar, integer } from "drizzle-orm/pg-core"
+import { text, mysqlTable, uniqueIndex, varchar, int } from "drizzle-orm/mysql-core"
 import { timestamps, utc, workspaceColumns } from "../drizzle/types"
 import { workspaceIndexes } from "./workspace.sql"
 
-export const UserTable = pgTable(
+export const UserTable = mysqlTable(
   "user",
   {
     ...workspaceColumns,
     ...timestamps,
-    email: text("email").notNull(),
+    email: varchar("email", { length: 255 }).notNull(),
     name: varchar("name", { length: 255 }).notNull(),
     timeSeen: utc("time_seen"),
-    color: integer("color"),
+    color: int("color"),
   },
   (table) => [...workspaceIndexes(table), uniqueIndex("user_email").on(table.workspaceID, table.email)],
 )

cloud/core/src/schema/workspace.sql.ts

@@ -1,7 +1,7 @@
-import { primaryKey, foreignKey, pgTable, uniqueIndex, varchar } from "drizzle-orm/pg-core"
+import { primaryKey, mysqlTable, uniqueIndex, varchar } from "drizzle-orm/mysql-core"
 import { timestamps, ulid } from "../drizzle/types"
 
-export const WorkspaceTable = pgTable(
+export const WorkspaceTable = mysqlTable(
   "workspace",
   {
     id: ulid("id").notNull().primaryKey(),
@@ -17,9 +17,5 @@ export function workspaceIndexes(table: any) {
     primaryKey({
       columns: [table.workspaceID, table.id],
     }),
-    foreignKey({
-      foreignColumns: [WorkspaceTable.id],
-      columns: [table.workspaceID],
-    }),
   ]
 }

cloud/core/src/util/memo.ts

@@ -1,11 +1,18 @@
-export function memo<T>(fn: () => T) {
+export function memo<T>(fn: () => T, cleanup?: (input: T) => Promise<void>) {
   let value: T | undefined
   let loaded = false
 
-  return (): T => {
+  const result = (): T => {
     if (loaded) return value as T
     loaded = true
     value = fn()
     return value as T
   }
+  result.reset = async () => {
+    if (cleanup && value) await cleanup(value)
+    loaded = false
+    value = undefined
+  }
+
+  return result
 }

cloud/core/src/workspace.ts

@@ -26,7 +26,7 @@ export namespace Workspace {
       await tx.insert(BillingTable).values({
         workspaceID,
         id: Identifier.create("billing"),
-        balance: centsToMicroCents(100),
+        balance: 0,
       })
     })
     await Actor.provide(

cloud/function/package.json

@@ -1,9 +1,12 @@
 {
   "name": "@opencode/cloud-function",
-  "version": "0.5.29",
+  "version": "0.6.4",
   "$schema": "https://json.schemastore.org/package.json",
   "private": true,
   "type": "module",
+  "scripts": {
+    "typecheck": "tsc --noEmit"
+  },
   "devDependencies": {
     "@cloudflare/workers-types": "4.20250522.0",
     "@types/node": "catalog:",

cloud/function/src/auth.ts

@@ -10,6 +10,7 @@ import { Account } from "@opencode/cloud-core/account.js"
 import { Workspace } from "@opencode/cloud-core/workspace.js"
 import { Actor } from "@opencode/cloud-core/actor.js"
 import { Resource } from "@opencode/cloud-resource"
+import { Database } from "@opencode/cloud-core/drizzle/index.js"
 
 type Env = {
   AuthStorage: KVNamespace
@@ -33,7 +34,7 @@ const MY_THEME: Theme = {
 
 export default {
   async fetch(request: Request, env: Env, ctx: ExecutionContext) {
-    return issuer({
+    const result = await issuer({
       theme: MY_THEME,
       providers: {
         github: GithubProvider({
@@ -135,5 +136,6 @@ export default {
         return ctx.subject("account", accountID, { accountID, email })
       },
     }).fetch(request, env, ctx)
+    return result
   },
 }

cloud/function/src/gateway.ts

@@ -1,596 +0,0 @@
-import { Hono, MiddlewareHandler } from "hono"
-import { type ProviderMetadata, type LanguageModelUsage } from "ai"
-import { createAnthropic } from "@ai-sdk/anthropic"
-import { createOpenAI } from "@ai-sdk/openai"
-import { createOpenAICompatible } from "@ai-sdk/openai-compatible"
-import type { LanguageModelV2Prompt } from "@ai-sdk/provider"
-import { type ChatCompletionCreateParamsBase } from "openai/resources/chat/completions"
-import { Actor } from "@opencode/cloud-core/actor.js"
-import { Database, eq, sql } from "@opencode/cloud-core/drizzle/index.js"
-import { KeyTable } from "@opencode/cloud-core/schema/key.sql.js"
-import { Billing } from "@opencode/cloud-core/billing.js"
-import { Resource } from "@opencode/cloud-resource"
-
-type Env = {}
-
-const SUPPORTED_MODELS = {
-  "anthropic/claude-sonnet-4": {
-    input: 0.0000015,
-    output: 0.000006,
-    reasoning: 0.0000015,
-    cacheRead: 0.0000001,
-    cacheWrite: 0.0000001,
-    model: () =>
-      createAnthropic({
-        apiKey: Resource.ANTHROPIC_API_KEY.value,
-      })("claude-sonnet-4-20250514"),
-  },
-  "openai/gpt-4.1": {
-    input: 0.0000015,
-    output: 0.000006,
-    reasoning: 0.0000015,
-    cacheRead: 0.0000001,
-    cacheWrite: 0.0000001,
-    model: () =>
-      createOpenAI({
-        apiKey: Resource.OPENAI_API_KEY.value,
-      })("gpt-4.1"),
-  },
-  "zhipuai/glm-4.5-flash": {
-    input: 0,
-    output: 0,
-    reasoning: 0,
-    cacheRead: 0,
-    cacheWrite: 0,
-    model: () =>
-      createOpenAICompatible({
-        name: "Zhipu AI",
-        baseURL: "https://api.z.ai/api/paas/v4",
-        apiKey: Resource.ZHIPU_API_KEY.value,
-      })("glm-4.5-flash"),
-  },
-}
-
-const GatewayAuth: MiddlewareHandler = async (c, next) => {
-  const authHeader = c.req.header("authorization")
-
-  if (!authHeader || !authHeader.startsWith("Bearer ")) {
-    return c.json(
-      {
-        error: {
-          message: "Missing API key.",
-          type: "invalid_request_error",
-          param: null,
-          code: "unauthorized",
-        },
-      },
-      401,
-    )
-  }
-
-  const apiKey = authHeader.split(" ")[1]
-
-  // Check against KeyTable
-  const keyRecord = await Database.use((tx) =>
-    tx
-      .select({
-        id: KeyTable.id,
-        workspaceID: KeyTable.workspaceID,
-      })
-      .from(KeyTable)
-      .where(eq(KeyTable.key, apiKey))
-      .then((rows) => rows[0]),
-  )
-
-  if (!keyRecord) {
-    return c.json(
-      {
-        error: {
-          message: "Invalid API key.",
-          type: "invalid_request_error",
-          param: null,
-          code: "unauthorized",
-        },
-      },
-      401,
-    )
-  }
-
-  c.set("keyRecord", keyRecord)
-  await next()
-}
-
-const app = new Hono<{ Bindings: Env; Variables: { keyRecord?: { id: string; workspaceID: string } } }>()
-  .get("/", (c) => c.text("Hello, world!"))
-  .post("/v1/chat/completions", GatewayAuth, async (c) => {
-    const keyRecord = c.get("keyRecord")!
-
-    return await Actor.provide("system", { workspaceID: keyRecord.workspaceID }, async () => {
-      try {
-        // Check balance
-        const customer = await Billing.get()
-        if (customer.balance <= 0) {
-          return c.json(
-            {
-              error: {
-                message: "Insufficient balance",
-                type: "insufficient_quota",
-                param: null,
-                code: "insufficient_quota",
-              },
-            },
-            401,
-          )
-        }
-
-        const body = await c.req.json<ChatCompletionCreateParamsBase>()
-        const model = SUPPORTED_MODELS[body.model as keyof typeof SUPPORTED_MODELS]?.model()
-        if (!model) throw new Error(`Unsupported model: ${body.model}`)
-
-        const requestBody = transformOpenAIRequestToAiSDK()
-
-        return body.stream ? await handleStream() : await handleGenerate()
-
-        async function handleStream() {
-          const result = await model.doStream({
-            ...requestBody,
-          })
-
-          const encoder = new TextEncoder()
-          const stream = new ReadableStream({
-            async start(controller) {
-              const id = `chatcmpl-${Date.now()}`
-              const created = Math.floor(Date.now() / 1000)
-
-              try {
-                for await (const chunk of result.stream) {
-                  console.log("!!! CHUNK !!! : " + chunk.type)
-                  switch (chunk.type) {
-                    case "text-delta": {
-                      const data = {
-                        id,
-                        object: "chat.completion.chunk",
-                        created,
-                        model: body.model,
-                        choices: [
-                          {
-                            index: 0,
-                            delta: {
-                              content: chunk.delta,
-                            },
-                            finish_reason: null,
-                          },
-                        ],
-                      }
-                      controller.enqueue(encoder.encode(`data: ${JSON.stringify(data)}\n\n`))
-                      break
-                    }
-
-                    case "reasoning-delta": {
-                      const data = {
-                        id,
-                        object: "chat.completion.chunk",
-                        created,
-                        model: body.model,
-                        choices: [
-                          {
-                            index: 0,
-                            delta: {
-                              reasoning_content: chunk.delta,
-                            },
-                            finish_reason: null,
-                          },
-                        ],
-                      }
-                      controller.enqueue(encoder.encode(`data: ${JSON.stringify(data)}\n\n`))
-                      break
-                    }
-
-                    case "tool-call": {
-                      const data = {
-                        id,
-                        object: "chat.completion.chunk",
-                        created,
-                        model: body.model,
-                        choices: [
-                          {
-                            index: 0,
-                            delta: {
-                              tool_calls: [
-                                {
-                                  index: 0,
-                                  id: chunk.toolCallId,
-                                  type: "function",
-                                  function: {
-                                    name: chunk.toolName,
-                                    arguments: chunk.input,
-                                  },
-                                },
-                              ],
-                            },
-                            finish_reason: null,
-                          },
-                        ],
-                      }
-                      controller.enqueue(encoder.encode(`data: ${JSON.stringify(data)}\n\n`))
-                      break
-                    }
-
-                    case "error": {
-                      const data = {
-                        id,
-                        object: "chat.completion.chunk",
-                        created,
-                        model: body.model,
-                        choices: [
-                          {
-                            index: 0,
-                            delta: {},
-                            finish_reason: "stop",
-                          },
-                        ],
-                        error: {
-                          message: typeof chunk.error === "string" ? chunk.error : chunk.error,
-                          type: "server_error",
-                        },
-                      }
-                      controller.enqueue(encoder.encode(`data: ${JSON.stringify(data)}\n\n`))
-                      controller.enqueue(encoder.encode("data: [DONE]\n\n"))
-                      controller.close()
-                      break
-                    }
-
-                    case "finish": {
-                      const data = {
-                        id,
-                        object: "chat.completion.chunk",
-                        created,
-                        model: body.model,
-                        choices: [
-                          {
-                            index: 0,
-                            delta: {},
-                            finish_reason:
-                              {
-                                stop: "stop",
-                                length: "length",
-                                "content-filter": "content_filter",
-                                "tool-calls": "tool_calls",
-                                error: "stop",
-                                other: "stop",
-                                unknown: "stop",
-                              }[chunk.finishReason] || "stop",
-                          },
-                        ],
-                        usage: {
-                          prompt_tokens: chunk.usage.inputTokens,
-                          completion_tokens: chunk.usage.outputTokens,
-                          total_tokens: chunk.usage.totalTokens,
-                          completion_tokens_details: {
-                            reasoning_tokens: chunk.usage.reasoningTokens,
-                          },
-                          prompt_tokens_details: {
-                            cached_tokens: chunk.usage.cachedInputTokens,
-                          },
-                        },
-                      }
-                      await trackUsage(body.model, chunk.usage, chunk.providerMetadata)
-                      controller.enqueue(encoder.encode(`data: ${JSON.stringify(data)}\n\n`))
-                      controller.enqueue(encoder.encode("data: [DONE]\n\n"))
-                      controller.close()
-                      break
-                    }
-
-                    //case "stream-start":
-                    //case "response-metadata":
-                    case "text-start":
-                    case "text-end":
-                    case "reasoning-start":
-                    case "reasoning-end":
-                    case "tool-input-start":
-                    case "tool-input-delta":
-                    case "tool-input-end":
-                    case "raw":
-                    default:
-                      // Log unknown chunk types for debugging
-                      console.warn(`Unknown chunk type: ${(chunk as any).type}`)
-                      break
-                  }
-                }
-              } catch (error) {
-                controller.error(error)
-              }
-            },
-          })
-
-          return new Response(stream, {
-            headers: {
-              "Content-Type": "text/plain; charset=utf-8",
-              "Cache-Control": "no-cache",
-              Connection: "keep-alive",
-            },
-          })
-        }
-
-        async function handleGenerate() {
-          const response = await model.doGenerate({
-            ...requestBody,
-          })
-          await trackUsage(body.model, response.usage, response.providerMetadata)
-          return c.json({
-            id: `chatcmpl-${Date.now()}`,
-            object: "chat.completion" as const,
-            created: Math.floor(Date.now() / 1000),
-            model: body.model,
-            choices: [
-              {
-                index: 0,
-                message: {
-                  role: "assistant" as const,
-                  content: response.content?.find((c) => c.type === "text")?.text ?? "",
-                  reasoning_content: response.content?.find((c) => c.type === "reasoning")?.text,
-                  tool_calls: response.content
-                    ?.filter((c) => c.type === "tool-call")
-                    .map((toolCall) => ({
-                      id: toolCall.toolCallId,
-                      type: "function" as const,
-                      function: {
-                        name: toolCall.toolName,
-                        arguments: toolCall.input,
-                      },
-                    })),
-                },
-                finish_reason:
-                  (
-                    {
-                      stop: "stop",
-                      length: "length",
-                      "content-filter": "content_filter",
-                      "tool-calls": "tool_calls",
-                      error: "stop",
-                      other: "stop",
-                      unknown: "stop",
-                    } as const
-                  )[response.finishReason] || "stop",
-              },
-            ],
-            usage: {
-              prompt_tokens: response.usage?.inputTokens,
-              completion_tokens: response.usage?.outputTokens,
-              total_tokens: response.usage?.totalTokens,
-              completion_tokens_details: {
-                reasoning_tokens: response.usage?.reasoningTokens,
-              },
-              prompt_tokens_details: {
-                cached_tokens: response.usage?.cachedInputTokens,
-              },
-            },
-          })
-        }
-
-        function transformOpenAIRequestToAiSDK() {
-          const prompt = transformMessages()
-          const tools = transformTools()
-
-          return {
-            prompt,
-            maxOutputTokens: body.max_tokens ?? body.max_completion_tokens ?? undefined,
-            temperature: body.temperature ?? undefined,
-            topP: body.top_p ?? undefined,
-            frequencyPenalty: body.frequency_penalty ?? undefined,
-            presencePenalty: body.presence_penalty ?? undefined,
-            providerOptions: body.reasoning_effort
-              ? {
-                  anthropic: {
-                    reasoningEffort: body.reasoning_effort,
-                  },
-                }
-              : undefined,
-            stopSequences: (typeof body.stop === "string" ? [body.stop] : body.stop) ?? undefined,
-            responseFormat: (() => {
-              if (!body.response_format) return { type: "text" as const }
-              if (body.response_format.type === "json_schema")
-                return {
-                  type: "json" as const,
-                  schema: body.response_format.json_schema.schema,
-                  name: body.response_format.json_schema.name,
-                  description: body.response_format.json_schema.description,
-                }
-              if (body.response_format.type === "json_object") return { type: "json" as const }
-              throw new Error("Unsupported response format")
-            })(),
-            seed: body.seed ?? undefined,
-            tools: tools.tools,
-            toolChoice: tools.toolChoice,
-          }
-
-          function transformTools() {
-            const { tools, tool_choice } = body
-
-            if (!tools || tools.length === 0) {
-              return { tools: undefined, toolChoice: undefined }
-            }
-
-            const aiSdkTools = tools.map((tool) => {
-              return {
-                type: tool.type,
-                name: tool.function.name,
-                description: tool.function.description,
-                inputSchema: tool.function.parameters!,
-              }
-            })
-
-            let aiSdkToolChoice
-            if (tool_choice == null) {
-              aiSdkToolChoice = undefined
-            } else if (tool_choice === "auto") {
-              aiSdkToolChoice = { type: "auto" as const }
-            } else if (tool_choice === "none") {
-              aiSdkToolChoice = { type: "none" as const }
-            } else if (tool_choice === "required") {
-              aiSdkToolChoice = { type: "required" as const }
-            } else if (tool_choice.type === "function") {
-              aiSdkToolChoice = {
-                type: "tool" as const,
-                toolName: tool_choice.function.name,
-              }
-            }
-
-            return { tools: aiSdkTools, toolChoice: aiSdkToolChoice }
-          }
-
-          function transformMessages() {
-            const { messages } = body
-            const prompt: LanguageModelV2Prompt = []
-
-            for (const message of messages) {
-              switch (message.role) {
-                case "system": {
-                  prompt.push({
-                    role: "system",
-                    content: message.content as string,
-                  })
-                  break
-                }
-
-                case "user": {
-                  if (typeof message.content === "string") {
-                    prompt.push({
-                      role: "user",
-                      content: [{ type: "text", text: message.content }],
-                    })
-                  } else {
-                    const content = message.content.map((part) => {
-                      switch (part.type) {
-                        case "text":
-                          return { type: "text" as const, text: part.text }
-                        case "image_url":
-                          return {
-                            type: "file" as const,
-                            mediaType: "image/jpeg" as const,
-                            data: part.image_url.url,
-                          }
-                        default:
-                          throw new Error(`Unsupported content part type: ${(part as any).type}`)
-                      }
-                    })
-                    prompt.push({
-                      role: "user",
-                      content,
-                    })
-                  }
-                  break
-                }
-
-                case "assistant": {
-                  const content: Array<
-                    | { type: "text"; text: string }
-                    | {
-                        type: "tool-call"
-                        toolCallId: string
-                        toolName: string
-                        input: any
-                      }
-                  > = []
-
-                  if (message.content) {
-                    content.push({
-                      type: "text",
-                      text: message.content as string,
-                    })
-                  }
-
-                  if (message.tool_calls) {
-                    for (const toolCall of message.tool_calls) {
-                      content.push({
-                        type: "tool-call",
-                        toolCallId: toolCall.id,
-                        toolName: toolCall.function.name,
-                        input: JSON.parse(toolCall.function.arguments),
-                      })
-                    }
-                  }
-
-                  prompt.push({
-                    role: "assistant",
-                    content,
-                  })
-                  break
-                }
-
-                case "tool": {
-                  prompt.push({
-                    role: "tool",
-                    content: [
-                      {
-                        type: "tool-result",
-                        toolName: "placeholder",
-                        toolCallId: message.tool_call_id,
-                        output: {
-                          type: "text",
-                          value: message.content as string,
-                        },
-                      },
-                    ],
-                  })
-                  break
-                }
-
-                default: {
-                  throw new Error(`Unsupported message role: ${message.role}`)
-                }
-              }
-            }
-
-            return prompt
-          }
-        }
-
-        async function trackUsage(model: string, usage: LanguageModelUsage, providerMetadata?: ProviderMetadata) {
-          const modelData = SUPPORTED_MODELS[model as keyof typeof SUPPORTED_MODELS]
-          if (!modelData) throw new Error(`Unsupported model: ${model}`)
-
-          const inputTokens = usage.inputTokens ?? 0
-          const outputTokens = usage.outputTokens ?? 0
-          const reasoningTokens = usage.reasoningTokens ?? 0
-          const cacheReadTokens = usage.cachedInputTokens ?? 0
-          const cacheWriteTokens =
-            providerMetadata?.["anthropic"]?.["cacheCreationInputTokens"] ??
-            // @ts-expect-error
-            providerMetadata?.["bedrock"]?.["usage"]?.["cacheWriteInputTokens"] ??
-            0
-
-          const inputCost = modelData.input * inputTokens
-          const outputCost = modelData.output * outputTokens
-          const reasoningCost = modelData.reasoning * reasoningTokens
-          const cacheReadCost = modelData.cacheRead * cacheReadTokens
-          const cacheWriteCost = modelData.cacheWrite * cacheWriteTokens
-          const costInCents = (inputCost + outputCost + reasoningCost + cacheReadCost + cacheWriteCost) * 100
-
-          await Billing.consume({
-            model,
-            inputTokens,
-            outputTokens,
-            reasoningTokens,
-            cacheReadTokens,
-            cacheWriteTokens,
-            costInCents,
-          })
-
-          await Database.use((tx) =>
-            tx
-              .update(KeyTable)
-              .set({ timeUsed: sql`now()` })
-              .where(eq(KeyTable.id, keyRecord.id)),
-          )
-        }
-      } catch (error: any) {
-        return c.json({ error: { message: error.message } }, 500)
-      }
-    })
-  })
-  .all("*", (c) => c.text("Not Found"))
-
-export type ApiType = typeof app
-
-export default app

cloud/function/sst-env.d.ts

@@ -14,18 +14,14 @@ declare module "sst" {
       "type": "sst.sst.Linkable"
       "value": string
     }
+    "BASETEN_API_KEY": {
+      "type": "sst.sst.Secret"
+      "value": string
+    }
     "Console": {
       "type": "sst.cloudflare.SolidStart"
       "url": string
     }
-    "DATABASE_PASSWORD": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "DATABASE_USERNAME": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
     "Database": {
       "database": string
       "host": string
@@ -54,10 +50,6 @@ declare module "sst" {
       "type": "sst.sst.Secret"
       "value": string
     }
-    "OPENAI_API_KEY": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
     "STRIPE_SECRET_KEY": {
       "type": "sst.sst.Secret"
       "value": string
@@ -70,7 +62,7 @@ declare module "sst" {
       "type": "sst.cloudflare.Astro"
       "url": string
     }
-    "ZHIPU_API_KEY": {
+    "XAI_API_KEY": {
       "type": "sst.sst.Secret"
       "value": string
     }
@@ -84,7 +76,6 @@ declare module "sst" {
     "AuthApi": cloudflare.Service
     "AuthStorage": cloudflare.KVNamespace
     "Bucket": cloudflare.R2Bucket
-    "GatewayApi": cloudflare.Service
   }
 }
 

cloud/resource/sst-env.d.ts

@@ -14,18 +14,14 @@ declare module "sst" {
       "type": "sst.sst.Linkable"
       "value": string
     }
+    "BASETEN_API_KEY": {
+      "type": "sst.sst.Secret"
+      "value": string
+    }
     "Console": {
       "type": "sst.cloudflare.SolidStart"
       "url": string
     }
-    "DATABASE_PASSWORD": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "DATABASE_USERNAME": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
     "Database": {
       "database": string
       "host": string
@@ -54,10 +50,6 @@ declare module "sst" {
       "type": "sst.sst.Secret"
       "value": string
     }
-    "OPENAI_API_KEY": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
     "STRIPE_SECRET_KEY": {
       "type": "sst.sst.Secret"
       "value": string
@@ -70,7 +62,7 @@ declare module "sst" {
       "type": "sst.cloudflare.Astro"
       "url": string
     }
-    "ZHIPU_API_KEY": {
+    "XAI_API_KEY": {
       "type": "sst.sst.Secret"
       "value": string
     }
@@ -84,7 +76,6 @@ declare module "sst" {
     "AuthApi": cloudflare.Service
     "AuthStorage": cloudflare.KVNamespace
     "Bucket": cloudflare.R2Bucket
-    "GatewayApi": cloudflare.Service
   }
 }
 

infra/app.ts

@@ -33,8 +33,8 @@ export const api = new sst.cloudflare.Worker("Api", {
   },
 })
 
-export const web = new sst.cloudflare.x.Astro("Web", {
-  domain,
+new sst.cloudflare.x.Astro("Web", {
+  domain: "docs." + domain,
   path: "packages/web",
   environment: {
     // For astro config

infra/cloud.ts

@@ -5,15 +5,38 @@ import { domain } from "./stage"
 // DATABASE
 ////////////////
 
-const DATABASE_USERNAME = new sst.Secret("DATABASE_USERNAME")
-const DATABASE_PASSWORD = new sst.Secret("DATABASE_PASSWORD")
+const cluster = planetscale.getDatabaseOutput({
+  name: "opencode",
+  organization: "sst",
+})
+
+const branch =
+  $app.stage === "production"
+    ? planetscale.getBranchOutput({
+        name: "production",
+        organization: cluster.organization,
+        database: cluster.name,
+      })
+    : new planetscale.Branch("DatabaseBranch", {
+        database: cluster.name,
+        organization: cluster.organization,
+        name: $app.stage,
+        parentBranch: "production",
+      })
+const password = new planetscale.Password("DatabasePassword", {
+  name: $app.stage,
+  database: cluster.name,
+  organization: cluster.organization,
+  branch: branch.name,
+})
+
 export const database = new sst.Linkable("Database", {
   properties: {
-    host: `aws-us-east-2-${$app.stage === "thdxr" ? "2" : "1"}.pg.psdb.cloud`,
-    database: "postgres",
-    username: DATABASE_USERNAME.value,
-    password: DATABASE_PASSWORD.value,
-    port: 5432,
+    host: password.accessHostUrl,
+    database: cluster.name,
+    username: password.username,
+    password: password.plaintext,
+    port: 3306,
   },
 })
 
@@ -77,8 +100,8 @@ export const stripeWebhook = new WebhookEndpoint("StripeWebhook", {
 })
 
 const ANTHROPIC_API_KEY = new sst.Secret("ANTHROPIC_API_KEY")
-const OPENAI_API_KEY = new sst.Secret("OPENAI_API_KEY")
-const ZHIPU_API_KEY = new sst.Secret("ZHIPU_API_KEY")
+const XAI_API_KEY = new sst.Secret("XAI_API_KEY")
+const BASETEN_API_KEY = new sst.Secret("BASETEN_API_KEY")
 const STRIPE_SECRET_KEY = new sst.Secret("STRIPE_SECRET_KEY")
 const AUTH_API_URL = new sst.Linkable("AUTH_API_URL", {
   properties: { value: auth.url.apply((url) => url!) },
@@ -86,27 +109,13 @@ const AUTH_API_URL = new sst.Linkable("AUTH_API_URL", {
 const STRIPE_WEBHOOK_SECRET = new sst.Linkable("STRIPE_WEBHOOK_SECRET", {
   properties: { value: stripeWebhook.secret },
 })
-export const gateway = new sst.cloudflare.Worker("GatewayApi", {
-  domain: `api.gateway.${domain}`,
-  handler: "cloud/function/src/gateway.ts",
-  url: true,
-  link: [
-    database,
-    AUTH_API_URL,
-    STRIPE_WEBHOOK_SECRET,
-    STRIPE_SECRET_KEY,
-    ANTHROPIC_API_KEY,
-    OPENAI_API_KEY,
-    ZHIPU_API_KEY,
-  ],
-})
 
 ////////////////
 // CONSOLE
 ////////////////
 
-export const console = new sst.cloudflare.x.SolidStart("Console", {
-  domain: `console.${domain}`,
+new sst.cloudflare.x.SolidStart("Console", {
+  domain,
   path: "cloud/app",
   link: [
     database,
@@ -114,8 +123,8 @@ export const console = new sst.cloudflare.x.SolidStart("Console", {
     STRIPE_WEBHOOK_SECRET,
     STRIPE_SECRET_KEY,
     ANTHROPIC_API_KEY,
-    OPENAI_API_KEY,
-    ZHIPU_API_KEY,
+    XAI_API_KEY,
+    BASETEN_API_KEY,
   ],
   environment: {
     //VITE_DOCS_URL: web.url.apply((url) => url!),

opencode.json

@@ -1,6 +1,5 @@
 {
   "$schema": "https://opencode.ai/config.json",
-
   "mcp": {
     "weather": {
       "type": "local",

package.json

@@ -55,5 +55,7 @@
   "overrides": {
     "zod": "3.25.76"
   },
-  "patchedDependencies": {}
+  "patchedDependencies": {
+  "@solidjs/start@1.1.7": "patches/@solidjs%2Fstart@1.1.7.patch"
+}
 }

packages/function/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opencode/function",
-  "version": "0.5.29",
+  "version": "0.6.4",
   "$schema": "https://json.schemastore.org/package.json",
   "private": true,
   "type": "module",

packages/function/sst-env.d.ts

@@ -14,18 +14,14 @@ declare module "sst" {
       "type": "sst.sst.Linkable"
       "value": string
     }
+    "BASETEN_API_KEY": {
+      "type": "sst.sst.Secret"
+      "value": string
+    }
     "Console": {
       "type": "sst.cloudflare.SolidStart"
       "url": string
     }
-    "DATABASE_PASSWORD": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
-    "DATABASE_USERNAME": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
     "Database": {
       "database": string
       "host": string
@@ -54,10 +50,6 @@ declare module "sst" {
       "type": "sst.sst.Secret"
       "value": string
     }
-    "OPENAI_API_KEY": {
-      "type": "sst.sst.Secret"
-      "value": string
-    }
     "STRIPE_SECRET_KEY": {
       "type": "sst.sst.Secret"
       "value": string
@@ -70,7 +62,7 @@ declare module "sst" {
       "type": "sst.cloudflare.Astro"
       "url": string
     }
-    "ZHIPU_API_KEY": {
+    "XAI_API_KEY": {
       "type": "sst.sst.Secret"
       "value": string
     }
@@ -84,7 +76,6 @@ declare module "sst" {
     "AuthApi": cloudflare.Service
     "AuthStorage": cloudflare.KVNamespace
     "Bucket": cloudflare.R2Bucket
-    "GatewayApi": cloudflare.Service
   }
 }
 

packages/opencode/package.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "0.5.29",
+  "version": "0.6.4",
   "name": "opencode",
   "type": "module",
   "private": true,

packages/opencode/src/agent/agent.ts

@@ -1,10 +1,10 @@
-import { App } from "../app/app"
 import { Config } from "../config/config"
 import z from "zod"
 import { Provider } from "../provider/provider"
 import { generateObject, type ModelMessage } from "ai"
 import PROMPT_GENERATE from "./generate.txt"
 import { SystemPrompt } from "../session/system"
+import { Instance } from "../project/instance"
 import { mergeDeep } from "remeda"
 
 export namespace Agent {
@@ -36,7 +36,7 @@ export namespace Agent {
     })
   export type Info = z.infer<typeof Info>
 
-  const state = App.state("agent", async () => {
+  const state = Instance.state(async () => {
     const cfg = await Config.get()
     const defaultTools = cfg.tools ?? {}
     const defaultPermission: Info["permission"] = {

packages/opencode/src/app/app.ts

@@ -1,147 +0,0 @@
-import "zod-openapi/extend"
-import { Log } from "../util/log"
-import { Context } from "../util/context"
-import { Filesystem } from "../util/filesystem"
-import { Global } from "../global"
-import path from "path"
-import os from "os"
-import { z } from "zod"
-
-export namespace App {
-  const log = Log.create({ service: "app" })
-
-  export const Info = z
-    .object({
-      hostname: z.string(),
-      git: z.boolean(),
-      path: z.object({
-        home: z.string(),
-        config: z.string(),
-        data: z.string(),
-        root: z.string(),
-        cwd: z.string(),
-        state: z.string(),
-      }),
-      time: z.object({
-        initialized: z.number().optional(),
-      }),
-    })
-    .openapi({
-      ref: "App",
-    })
-  export type Info = z.infer<typeof Info>
-
-  const ctx = Context.create<{
-    info: Info
-    services: Map<any, { state: any; shutdown?: (input: any) => Promise<void> }>
-  }>("app")
-
-  export const use = ctx.use
-
-  const APP_JSON = "app.json"
-
-  export type Input = {
-    cwd: string
-  }
-
-  export const provideExisting = ctx.provide
-  export async function provide<T>(input: Input, cb: (app: App.Info) => Promise<T>) {
-    log.info("creating", {
-      cwd: input.cwd,
-    })
-    const git = await Filesystem.findUp(".git", input.cwd).then(([x]) => (x ? path.dirname(x) : undefined))
-    log.info("git", { git })
-
-    const data = path.join(Global.Path.data, "project", git ? directory(git) : "global")
-    const stateFile = Bun.file(path.join(data, APP_JSON))
-    const state = (await stateFile.json().catch(() => ({}))) as {
-      initialized: number
-    }
-    await stateFile.write(JSON.stringify(state))
-
-    const services = new Map<
-      any,
-      {
-        state: any
-        shutdown?: (input: any) => Promise<void>
-      }
-    >()
-
-    const root = git ?? input.cwd
-
-    const info: Info = {
-      hostname: os.hostname(),
-      time: {
-        initialized: state.initialized,
-      },
-      git: git !== undefined,
-      path: {
-        home: os.homedir(),
-        config: Global.Path.config,
-        state: Global.Path.state,
-        data,
-        root,
-        cwd: input.cwd,
-      },
-    }
-    const app = {
-      services,
-      info,
-    }
-
-    return ctx.provide(app, async () => {
-      try {
-        const result = await cb(app.info)
-        return result
-      } finally {
-        for (const [key, entry] of app.services.entries()) {
-          if (!entry.shutdown) continue
-          log.info("shutdown", { name: key })
-          await entry.shutdown?.(await entry.state)
-        }
-      }
-    })
-  }
-
-  export function state<State>(
-    key: any,
-    init: (app: Info) => State,
-    shutdown?: (state: Awaited<State>) => Promise<void>,
-  ) {
-    return () => {
-      const app = ctx.use()
-      const services = app.services
-      if (!services.has(key)) {
-        log.info("registering service", { name: key })
-        services.set(key, {
-          state: init(app.info),
-          shutdown,
-        })
-      }
-      return services.get(key)?.state as State
-    }
-  }
-
-  export function info() {
-    return ctx.use().info
-  }
-
-  export async function initialize() {
-    const { info } = ctx.use()
-    info.time.initialized = Date.now()
-    await Bun.write(
-      path.join(info.path.data, APP_JSON),
-      JSON.stringify({
-        initialized: Date.now(),
-      }),
-    )
-  }
-
-  function directory(input: string): string {
-    return input
-      .split(path.sep)
-      .filter(Boolean)
-      .join("-")
-      .replace(/[^A-Za-z0-9_]/g, "-")
-  }
-}

packages/opencode/src/bus/index.ts

@@ -1,12 +1,12 @@
 import { z, type ZodType } from "zod"
-import { App } from "../app/app"
 import { Log } from "../util/log"
+import { Instance } from "../project/instance"
 
 export namespace Bus {
   const log = Log.create({ service: "bus" })
   type Subscription = (event: any) => void
 
-  const state = App.state("bus", () => {
+  const state = Instance.state(() => {
     const subscriptions = new Map<any, Subscription[]>()
 
     return {

packages/opencode/src/cli/bootstrap.ts

@@ -1,20 +1,19 @@
-import { App } from "../app/app"
-import { ConfigHooks } from "../config/hooks"
 import { Format } from "../format"
 import { LSP } from "../lsp"
 import { Plugin } from "../plugin"
+import { Instance } from "../project/instance"
 import { Share } from "../share/share"
 import { Snapshot } from "../snapshot"
 
-export async function bootstrap<T>(input: App.Input, cb: (app: App.Info) => Promise<T>) {
-  return App.provide(input, async (app) => {
+export async function bootstrap<T>(directory: string, cb: () => Promise<T>) {
+  return Instance.provide(directory, async () => {
     await Plugin.init()
     Share.init()
     Format.init()
-    ConfigHooks.init()
     LSP.init()
     Snapshot.init()
-
-    return cb(app)
+    const result = await cb()
+    await Instance.dispose()
+    return result
   })
 }

packages/opencode/src/cli/cmd/agent.ts

@@ -5,25 +5,26 @@ import { Global } from "../../global"
 import { Agent } from "../../agent/agent"
 import path from "path"
 import matter from "gray-matter"
-import { App } from "../../app/app"
+import { Instance } from "../../project/instance"
 
 const AgentCreateCommand = cmd({
   command: "create",
   describe: "create a new agent",
   async handler() {
-    await App.provide({ cwd: process.cwd() }, async (app) => {
+    await Instance.provide(process.cwd(), async () => {
       UI.empty()
       prompts.intro("Create agent")
+      const project = Instance.project
 
       let scope: "global" | "project" = "global"
-      if (app.git) {
+      if (project.vcs === "git") {
         const scopeResult = await prompts.select({
           message: "Location",
           options: [
             {
               label: "Current project",
               value: "project" as const,
-              hint: app.path.root,
+              hint: Instance.worktree,
             },
             {
               label: "Global",
@@ -116,7 +117,7 @@ const AgentCreateCommand = cmd({
 
       const content = matter.stringify(generated.systemPrompt, frontmatter)
       const filePath = path.join(
-        scope === "global" ? Global.Path.config : path.join(app.path.root, ".opencode"),
+        scope === "global" ? Global.Path.config : path.join(Instance.worktree, ".opencode"),
         `agent`,
         `${generated.identifier}.md`,
       )

packages/opencode/src/cli/cmd/auth.ts

@@ -8,7 +8,7 @@ import path from "path"
 import os from "os"
 import { Global } from "../../global"
 import { Plugin } from "../../plugin"
-import { App } from "../../app/app"
+import { Instance } from "../../project/instance"
 
 export const AuthCommand = cmd({
   command: "auth",
@@ -74,7 +74,7 @@ export const AuthLoginCommand = cmd({
       type: "string",
     }),
   async handler(args) {
-    await App.provide({ cwd: process.cwd() }, async () => {
+    await Instance.provide(process.cwd(), async () => {
       UI.empty()
       prompts.intro("Add credential")
       if (args.url) {
@@ -103,12 +103,13 @@ export const AuthLoginCommand = cmd({
       await ModelsDev.refresh().catch(() => {})
       const providers = await ModelsDev.get()
       const priority: Record<string, number> = {
-        anthropic: 0,
-        "github-copilot": 1,
-        openai: 2,
-        google: 3,
-        openrouter: 4,
-        vercel: 5,
+        opencode: 0,
+        anthropic: 1,
+        "github-copilot": 2,
+        openai: 3,
+        google: 4,
+        openrouter: 5,
+        vercel: 6,
       }
       let provider = await prompts.autocomplete({
         message: "Select provider",
@@ -124,7 +125,7 @@ export const AuthLoginCommand = cmd({
             map((x) => ({
               label: x.name,
               value: x.id,
-              hint: priority[x.id] === 0 ? "recommended" : undefined,
+              hint: priority[x.id] <= 1 ? "recommended" : undefined,
             })),
           ),
           {

packages/opencode/src/cli/cmd/debug/app.ts

@@ -1,20 +0,0 @@
-import { App } from "../../../app/app"
-import { bootstrap } from "../../bootstrap"
-import { cmd } from "../cmd"
-
-const AppInfoCommand = cmd({
-  command: "info",
-  builder: (yargs) => yargs,
-  async handler() {
-    await bootstrap({ cwd: process.cwd() }, async () => {
-      const app = App.info()
-      console.log(JSON.stringify(app, null, 2))
-    })
-  },
-})
-
-export const AppCommand = cmd({
-  command: "app",
-  builder: (yargs) => yargs.command(AppInfoCommand).demandCommand(),
-  async handler() {},
-})

packages/opencode/src/cli/cmd/debug/file.ts

@@ -11,7 +11,7 @@ const FileReadCommand = cmd({
       description: "File path to read",
     }),
   async handler(args) {
-    await bootstrap({ cwd: process.cwd() }, async () => {
+    await bootstrap(process.cwd(), async () => {
       const content = await File.read(args.path)
       console.log(content)
     })
@@ -22,7 +22,7 @@ const FileStatusCommand = cmd({
   command: "status",
   builder: (yargs) => yargs,
   async handler() {
-    await bootstrap({ cwd: process.cwd() }, async () => {
+    await bootstrap(process.cwd(), async () => {
       const status = await File.status()
       console.log(JSON.stringify(status, null, 2))
     })
@@ -38,7 +38,7 @@ const FileListCommand = cmd({
       description: "File path to list",
     }),
   async handler(args) {
-    await bootstrap({ cwd: process.cwd() }, async () => {
+    await bootstrap(process.cwd(), async () => {
       const files = await File.list(args.path)
       console.log(JSON.stringify(files, null, 2))
     })

packages/opencode/src/cli/cmd/debug/index.ts

@@ -1,7 +1,6 @@
 import { Global } from "../../../global"
 import { bootstrap } from "../../bootstrap"
 import { cmd } from "../cmd"
-import { AppCommand } from "./app"
 import { FileCommand } from "./file"
 import { LSPCommand } from "./lsp"
 import { RipgrepCommand } from "./ripgrep"
@@ -12,7 +11,6 @@ export const DebugCommand = cmd({
   command: "debug",
   builder: (yargs) =>
     yargs
-      .command(AppCommand)
       .command(LSPCommand)
       .command(RipgrepCommand)
       .command(FileCommand)
@@ -22,7 +20,7 @@ export const DebugCommand = cmd({
       .command({
         command: "wait",
         async handler() {
-          await bootstrap({ cwd: process.cwd() }, async () => {
+          await bootstrap(process.cwd(), async () => {
             await new Promise((resolve) => setTimeout(resolve, 1_000 * 60 * 60 * 24))
           })
         },

packages/opencode/src/cli/cmd/debug/lsp.ts

@@ -14,7 +14,7 @@ const DiagnosticsCommand = cmd({
   command: "diagnostics <file>",
   builder: (yargs) => yargs.positional("file", { type: "string", demandOption: true }),
   async handler(args) {
-    await bootstrap({ cwd: process.cwd() }, async () => {
+    await bootstrap(process.cwd(), async () => {
       await LSP.touchFile(args.file, true)
       console.log(JSON.stringify(await LSP.diagnostics(), null, 2))
     })
@@ -25,7 +25,7 @@ export const SymbolsCommand = cmd({
   command: "symbols <query>",
   builder: (yargs) => yargs.positional("query", { type: "string", demandOption: true }),
   async handler(args) {
-    await bootstrap({ cwd: process.cwd() }, async () => {
+    await bootstrap(process.cwd(), async () => {
       using _ = Log.Default.time("symbols")
       const results = await LSP.workspaceSymbol(args.query)
       console.log(JSON.stringify(results, null, 2))
@@ -37,7 +37,7 @@ export const DocumentSymbolsCommand = cmd({
   command: "document-symbols <uri>",
   builder: (yargs) => yargs.positional("uri", { type: "string", demandOption: true }),
   async handler(args) {
-    await bootstrap({ cwd: process.cwd() }, async () => {
+    await bootstrap(process.cwd(), async () => {
       using _ = Log.Default.time("document-symbols")
       const results = await LSP.documentSymbol(args.uri)
       console.log(JSON.stringify(results, null, 2))

packages/opencode/src/cli/cmd/debug/ripgrep.ts

@@ -1,5 +1,5 @@
-import { App } from "../../../app/app"
 import { Ripgrep } from "../../../file/ripgrep"
+import { Instance } from "../../../project/instance"
 import { bootstrap } from "../../bootstrap"
 import { cmd } from "../cmd"
 
@@ -16,9 +16,8 @@ const TreeCommand = cmd({
       type: "number",
     }),
   async handler(args) {
-    await bootstrap({ cwd: process.cwd() }, async () => {
-      const app = App.info()
-      console.log(await Ripgrep.tree({ cwd: app.path.cwd, limit: args.limit }))
+    await bootstrap(process.cwd(), async () => {
+      console.log(await Ripgrep.tree({ cwd: Instance.directory, limit: args.limit }))
     })
   },
 })
@@ -40,10 +39,9 @@ const FilesCommand = cmd({
         description: "Limit number of results",
       }),
   async handler(args) {
-    await bootstrap({ cwd: process.cwd() }, async () => {
-      const app = App.info()
+    await bootstrap(process.cwd(), async () => {
       const files = await Ripgrep.files({
-        cwd: app.path.cwd,
+        cwd: Instance.directory,
         query: args.query,
         glob: args.glob ? [args.glob] : undefined,
         limit: args.limit,

packages/opencode/src/cli/cmd/debug/scrap.ts

@@ -1,7 +1,14 @@
+import { Project } from "../../../project/project"
+import { Log } from "../../../util/log"
 import { cmd } from "../cmd"
 
 export const ScrapCommand = cmd({
   command: "scrap",
   builder: (yargs) => yargs,
-  async handler() {},
+  async handler() {
+    const timer = Log.Default.time("scrap")
+    const list = await Project.list()
+    console.log(list)
+    timer.stop()
+  },
 })

packages/opencode/src/cli/cmd/debug/snapshot.ts

@@ -11,7 +11,7 @@ export const SnapshotCommand = cmd({
 const TrackCommand = cmd({
   command: "track",
   async handler() {
-    await bootstrap({ cwd: process.cwd() }, async () => {
+    await bootstrap(process.cwd(), async () => {
       console.log(await Snapshot.track())
     })
   },
@@ -26,7 +26,7 @@ const PatchCommand = cmd({
       demandOption: true,
     }),
   async handler(args) {
-    await bootstrap({ cwd: process.cwd() }, async () => {
+    await bootstrap(process.cwd(), async () => {
       console.log(await Snapshot.patch(args.hash))
     })
   },
@@ -41,7 +41,7 @@ const DiffCommand = cmd({
       demandOption: true,
     }),
   async handler(args) {
-    await bootstrap({ cwd: process.cwd() }, async () => {
+    await bootstrap(process.cwd(), async () => {
       console.log(await Snapshot.diff(args.hash))
     })
   },

packages/opencode/src/cli/cmd/export.ts

@@ -0,0 +1,76 @@
+import type { Argv } from "yargs"
+import { Session } from "../../session"
+import { cmd } from "./cmd"
+import { bootstrap } from "../bootstrap"
+import { UI } from "../ui"
+import * as prompts from "@clack/prompts"
+
+export const ExportCommand = cmd({
+  command: "export [sessionID]",
+  describe: "export session data as JSON",
+  builder: (yargs: Argv) => {
+    return yargs.positional("sessionID", {
+      describe: "session id to export",
+      type: "string",
+    })
+  },
+  handler: async (args) => {
+    await bootstrap(process.cwd(), async () => {
+      let sessionID = args.sessionID
+
+      if (!sessionID) {
+        UI.empty()
+        prompts.intro("Export session")
+
+        const sessions = []
+        for await (const session of Session.list()) {
+          sessions.push(session)
+        }
+
+        if (sessions.length === 0) {
+          prompts.log.error("No sessions found")
+          prompts.outro("Done")
+          return
+        }
+
+        sessions.sort((a, b) => b.time.updated - a.time.updated)
+
+        const selectedSession = await prompts.autocomplete({
+          message: "Select session to export",
+          maxItems: 10,
+          options: sessions.map((session) => ({
+            label: session.title,
+            value: session.id,
+            hint: `${new Date(session.time.updated).toLocaleString()} • ${session.id.slice(-8)}`,
+          })),
+        })
+
+        if (prompts.isCancel(selectedSession)) {
+          throw new UI.CancelledError()
+        }
+
+        sessionID = selectedSession as string
+
+        prompts.outro("Exporting session...")
+      }
+
+      try {
+        const sessionInfo = await Session.get(sessionID!)
+        const messages = await Session.messages(sessionID!)
+
+        const exportData = {
+          info: sessionInfo,
+          messages: messages.map((msg) => ({
+            info: msg.info,
+            parts: msg.parts,
+          })),
+        }
+
+        console.log(JSON.stringify(exportData, null, 2))
+      } catch (error) {
+        UI.error(`Session not found: ${sessionID!}`)
+        process.exit(1)
+      }
+    })
+  },
+})

packages/opencode/src/cli/cmd/github.ts

@@ -6,7 +6,7 @@ import { map, pipe, sortBy, values } from "remeda"
 import { UI } from "../ui"
 import { cmd } from "./cmd"
 import { ModelsDev } from "../../provider/models"
-import { App } from "../../app/app"
+import { Instance } from "../../project/instance"
 
 const WORKFLOW_FILE = ".github/workflows/opencode.yml"
 
@@ -21,7 +21,7 @@ export const GithubInstallCommand = cmd({
   command: "install",
   describe: "install the GitHub agent",
   async handler() {
-    await App.provide({ cwd: process.cwd() }, async () => {
+    await Instance.provide(process.cwd(), async () => {
       UI.empty()
       prompts.intro("Install GitHub agent")
       const app = await getAppInfo()
@@ -63,8 +63,8 @@ export const GithubInstallCommand = cmd({
       }
 
       async function getAppInfo() {
-        const app = App.info()
-        if (!app.git) {
+        const project = Instance.project
+        if (project.vcs !== "git") {
           prompts.log.error(`Could not find git repository. Please run this command from a git repository.`)
           throw new UI.CancelledError()
         }
@@ -88,15 +88,18 @@ export const GithubInstallCommand = cmd({
           throw new UI.CancelledError()
         }
         const [, owner, repo] = parsed
-        return { owner, repo, root: app.path.root }
+        return { owner, repo, root: Instance.worktree }
       }
 
       async function promptProvider() {
         const priority: Record<string, number> = {
-          anthropic: 0,
-          "github-copilot": 1,
-          openai: 2,
-          google: 3,
+          opencode: 0,
+          anthropic: 1,
+          "github-copilot": 2,
+          openai: 3,
+          google: 4,
+          openrouter: 5,
+          vercel: 6,
         }
         let provider = await prompts.select({
           message: "Select provider",
@@ -111,7 +114,7 @@ export const GithubInstallCommand = cmd({
             map((x) => ({
               label: x.name,
               value: x.id,
-              hint: priority[x.id] === 0 ? "recommended" : undefined,
+              hint: priority[x.id] <= 1 ? "recommended" : undefined,
             })),
           ),
         })

packages/opencode/src/cli/cmd/models.ts

@@ -1,4 +1,4 @@
-import { App } from "../../app/app"
+import { Instance } from "../../project/instance"
 import { Provider } from "../../provider/provider"
 import { cmd } from "./cmd"
 
@@ -6,7 +6,7 @@ export const ModelsCommand = cmd({
   command: "models",
   describe: "list all available models",
   handler: async () => {
-    await App.provide({ cwd: process.cwd() }, async () => {
+    await Instance.provide(process.cwd(), async () => {
       const providers = await Provider.list()
 
       for (const [providerID, provider] of Object.entries(providers)) {

packages/opencode/src/cli/cmd/run.ts

@@ -10,6 +10,7 @@ import { bootstrap } from "../bootstrap"
 import { MessageV2 } from "../../session/message-v2"
 import { Identifier } from "../../id/id"
 import { Agent } from "../../agent/agent"
+import { Command } from "../../command"
 
 const TOOL: Record<string, [string, string]> = {
   todowrite: ["Todo", UI.Style.TEXT_WARNING_BOLD],
@@ -35,6 +36,10 @@ export const RunCommand = cmd({
         array: true,
         default: [],
       })
+      .option("command", {
+        describe: "the command to run, use message for args",
+        type: "string",
+      })
       .option("continue", {
         alias: ["c"],
         describe: "continue the last session",
@@ -64,12 +69,19 @@ export const RunCommand = cmd({
 
     if (!process.stdin.isTTY) message += "\n" + (await Bun.stdin.text())
 
-    if (message.trim().length === 0) {
-      UI.error("Message cannot be empty")
+    if (message.trim().length === 0 && !args.command) {
+      UI.error("You must provide a message or a command")
       return
     }
 
-    await bootstrap({ cwd: process.cwd() }, async () => {
+    await bootstrap(process.cwd(), async () => {
+      if (args.command) {
+        const exists = await Command.get(args.command)
+        if (!exists) {
+          UI.error(`Command "${args.command}" not found`)
+          return
+        }
+      }
       const session = await (async () => {
         if (args.continue) {
           const it = Session.list()
@@ -172,12 +184,26 @@ export const RunCommand = cmd({
         UI.error(err)
       })
 
+      if (args.command) {
+        await Session.command({
+          messageID: Identifier.ascending("message"),
+          sessionID: session.id,
+          agent: agent.name,
+          model: providerID + "/" + modelID,
+          command: args.command,
+          arguments: message,
+        })
+        return
+      }
+
       const messageID = Identifier.ascending("message")
-      const result = await Session.chat({
+      const result = await Session.prompt({
         sessionID: session.id,
         messageID,
-        providerID,
-        modelID,
+        model: {
+          providerID,
+          modelID,
+        },
         agent: agent.name,
         parts: [
           {
@@ -190,7 +216,7 @@ export const RunCommand = cmd({
 
       const isPiped = !process.stdout.isTTY
       if (isPiped) {
-        const match = result.parts.findLast((x) => x.type === "text")
+        const match = result.parts.findLast((x: any) => x.type === "text") as any
         if (match) process.stdout.write(UI.markdown(match.text))
         if (errorMsg) process.stdout.write(errorMsg)
       }

packages/opencode/src/cli/cmd/serve.ts

@@ -1,6 +1,4 @@
-import { Provider } from "../../provider/provider"
 import { Server } from "../../server/server"
-import { bootstrap } from "../bootstrap"
 import { cmd } from "./cmd"
 
 export const ServeCommand = cmd({
@@ -21,26 +19,14 @@ export const ServeCommand = cmd({
       }),
   describe: "starts a headless opencode server",
   handler: async (args) => {
-    const cwd = process.cwd()
-    await bootstrap({ cwd }, async () => {
-      const providers = await Provider.list()
-      if (Object.keys(providers).length === 0) {
-        return "needs_provider"
-      }
-
-      const hostname = args.hostname
-      const port = args.port
-
-      const server = Server.listen({
-        port,
-        hostname,
-      })
-
-      console.log(`opencode server listening on http://${server.hostname}:${server.port}`)
-
-      await new Promise(() => {})
-
-      server.stop()
+    const hostname = args.hostname
+    const port = args.port
+    const server = Server.listen({
+      port,
+      hostname,
     })
+    console.log(`opencode server listening on http://${server.hostname}:${server.port}`)
+    await new Promise(() => {})
+    server.stop()
   },
 })

packages/opencode/src/cli/cmd/tui.ts

@@ -15,6 +15,7 @@ import { Ide } from "../../ide"
 
 import { Flag } from "../../flag/flag"
 import { Session } from "../../session"
+import { Instance } from "../../project/instance"
 
 declare global {
   const OPENCODE_TUI_PATH: string
@@ -79,7 +80,7 @@ export const TuiCommand = cmd({
         UI.error("Failed to change directory to " + cwd)
         return
       }
-      const result = await bootstrap({ cwd }, async (app) => {
+      const result = await bootstrap(cwd, async () => {
         const sessionID = await (async () => {
           if (args.continue) {
             const it = Session.list()
@@ -146,7 +147,7 @@ export const TuiCommand = cmd({
             ...process.env,
             CGO_ENABLED: "0",
             OPENCODE_SERVER: server.url.toString(),
-            OPENCODE_APP_INFO: JSON.stringify(app),
+            OPENCODE_PROJECT: JSON.stringify(Instance.project),
           },
           onExit: () => {
             server.stop()

packages/opencode/src/command/index.ts

@@ -1,6 +1,6 @@
 import z from "zod"
-import { App } from "../app/app"
 import { Config } from "../config/config"
+import { Instance } from "../project/instance"
 
 export namespace Command {
   export const Info = z
@@ -16,7 +16,7 @@ export namespace Command {
     })
   export type Info = z.infer<typeof Info>
 
-  const state = App.state("command", async () => {
+  const state = Instance.state(async () => {
     const cfg = await Config.get()
 
     const result: Record<string, Info> = {}

packages/opencode/src/config/config.ts

@@ -2,7 +2,6 @@ import { Log } from "../util/log"
 import path from "path"
 import os from "os"
 import { z } from "zod"
-import { App } from "../app/app"
 import { Filesystem } from "../util/filesystem"
 import { ModelsDev } from "../provider/models"
 import { mergeDeep, pipe } from "remeda"
@@ -14,15 +13,16 @@ import matter from "gray-matter"
 import { Flag } from "../flag/flag"
 import { Auth } from "../auth"
 import { type ParseError as JsoncParseError, parse as parseJsonc, printParseErrorCode } from "jsonc-parser"
+import { Instance } from "../project/instance"
 
 export namespace Config {
   const log = Log.create({ service: "config" })
 
-  export const state = App.state("config", async (app) => {
+  export const state = Instance.state(async () => {
     const auth = await Auth.all()
     let result = await global()
     for (const file of ["opencode.jsonc", "opencode.json"]) {
-      const found = await Filesystem.findUp(file, app.path.cwd, app.path.root)
+      const found = await Filesystem.findUp(file, Instance.directory, Instance.worktree)
       for (const resolved of found.toReversed()) {
         result = mergeDeep(result, await loadFile(resolved))
       }
@@ -34,6 +34,11 @@ export namespace Config {
       log.debug("loaded custom config", { path: Flag.OPENCODE_CONFIG })
     }
 
+    if (Flag.OPENCODE_CONFIG_CONTENT) {
+      result = mergeDeep(result, JSON.parse(Flag.OPENCODE_CONFIG_CONTENT))
+      log.debug("loaded custom config from OPENCODE_CONFIG_CONTENT")
+    }
+
     for (const [key, value] of Object.entries(auth)) {
       if (value.type === "wellknown") {
         process.env[value.key] = value.token
@@ -45,7 +50,7 @@ export namespace Config {
     result.agent = result.agent || {}
     const markdownAgents = [
       ...(await Filesystem.globUp("agent/**/*.md", Global.Path.config, Global.Path.config)),
-      ...(await Filesystem.globUp(".opencode/agent/**/*.md", app.path.cwd, app.path.root)),
+      ...(await Filesystem.globUp(".opencode/agent/**/*.md", Instance.directory, Instance.worktree)),
     ]
     for (const item of markdownAgents) {
       const content = await Bun.file(item).text()
@@ -86,7 +91,7 @@ export namespace Config {
     result.mode = result.mode || {}
     const markdownModes = [
       ...(await Filesystem.globUp("mode/*.md", Global.Path.config, Global.Path.config)),
-      ...(await Filesystem.globUp(".opencode/mode/*.md", app.path.cwd, app.path.root)),
+      ...(await Filesystem.globUp(".opencode/mode/*.md", Instance.directory, Instance.worktree)),
     ]
     for (const item of markdownModes) {
       const content = await Bun.file(item).text()
@@ -100,19 +105,21 @@ export namespace Config {
       }
       const parsed = Agent.safeParse(config)
       if (parsed.success) {
-        result.mode = mergeDeep(result.mode, {
-          [config.name]: parsed.data,
+        result.agent = mergeDeep(result.mode, {
+          [config.name]: {
+            ...parsed.data,
+            mode: "primary" as const,
+          },
         })
         continue
       }
-      throw new InvalidError({ path: item }, { cause: parsed.error })
     }
 
     // Load command markdown files
     result.command = result.command || {}
     const markdownCommands = [
       ...(await Filesystem.globUp("command/*.md", Global.Path.config, Global.Path.config)),
-      ...(await Filesystem.globUp(".opencode/command/*.md", app.path.cwd, app.path.root)),
+      ...(await Filesystem.globUp(".opencode/command/*.md", Instance.directory, Instance.worktree)),
     ]
     for (const item of markdownCommands) {
       const content = await Bun.file(item).text()
@@ -147,7 +154,7 @@ export namespace Config {
     result.plugin.push(
       ...[
         ...(await Filesystem.globUp("plugin/*.{ts,js}", Global.Path.config, Global.Path.config)),
-        ...(await Filesystem.globUp(".opencode/plugin/*.{ts,js}", app.path.cwd, app.path.root)),
+        ...(await Filesystem.globUp(".opencode/plugin/*.{ts,js}", Instance.directory, Instance.worktree)),
       ].map((x) => "file://" + x),
     )
 
@@ -155,6 +162,16 @@ export namespace Config {
       result.permission = mergeDeep(result.permission ?? {}, JSON.parse(Flag.OPENCODE_PERMISSION))
     }
 
+    if (!result.username) result.username = os.userInfo().username
+
+    // Handle migration from autoshare to share field
+    if (result.autoshare === true && !result.share) {
+      result.share = "auto"
+    }
+    if (result.keybinds?.messages_revert && !result.keybinds.messages_undo) {
+      result.keybinds.messages_undo = result.keybinds.messages_revert
+    }
+
     // Handle migration from autoshare to share field
     if (result.autoshare === true && !result.share) {
       result.share = "auto"
@@ -175,13 +192,6 @@ export namespace Config {
       result.keybinds.agent_cycle_reverse = result.keybinds.switch_agent_reverse
     }
 
-    if (!result.username) {
-      const os = await import("os")
-      result.username = os.userInfo().username
-    }
-
-    log.info("loaded", result)
-
     return result
   })
 
@@ -392,6 +402,21 @@ export namespace Config {
                 .object({
                   apiKey: z.string().optional(),
                   baseURL: z.string().optional(),
+                  timeout: z
+                    .union([
+                      z
+                        .number()
+                        .int()
+                        .positive()
+                        .describe(
+                          "Timeout in milliseconds for requests to this provider. Default is 300000 (5 minutes). Set to false to disable timeout.",
+                        ),
+                      z.literal(false).describe("Disable timeout for this provider entirely."),
+                    ])
+                    .optional()
+                    .describe(
+                      "Timeout in milliseconds for requests to this provider. Default is 300000 (5 minutes). Set to false to disable timeout.",
+                    ),
                 })
                 .catchall(z.any())
                 .optional(),

packages/opencode/src/config/hooks.ts

@@ -1,56 +0,0 @@
-import { App } from "../app/app"
-import { Bus } from "../bus"
-import { File } from "../file"
-import { Session } from "../session"
-import { Log } from "../util/log"
-import { Config } from "./config"
-import path from "path"
-
-export namespace ConfigHooks {
-  const log = Log.create({ service: "config.hooks" })
-
-  export function init() {
-    log.info("init")
-    const app = App.info()
-
-    Bus.subscribe(File.Event.Edited, async (payload) => {
-      const cfg = await Config.get()
-      const ext = path.extname(payload.properties.file)
-      for (const item of cfg.experimental?.hook?.file_edited?.[ext] ?? []) {
-        log.info("file_edited", {
-          file: payload.properties.file,
-          command: item.command,
-        })
-        Bun.spawn({
-          cmd: item.command.map((x) => x.replace("$FILE", payload.properties.file)),
-          env: item.environment,
-          cwd: app.path.cwd,
-          stdout: "ignore",
-          stderr: "ignore",
-        })
-      }
-    })
-
-    Bus.subscribe(Session.Event.Idle, async (payload) => {
-      const cfg = await Config.get()
-      if (cfg.experimental?.hook?.session_completed) {
-        const session = await Session.get(payload.properties.sessionID)
-        // Only fire hook for top-level sessions (not subagent sessions)
-        if (session.parentID) return
-
-        for (const item of cfg.experimental.hook.session_completed) {
-          log.info("session_completed", {
-            command: item.command,
-          })
-          Bun.spawn({
-            cmd: item.command,
-            cwd: App.info().path.cwd,
-            env: item.environment,
-            stdout: "ignore",
-            stderr: "ignore",
-          })
-        }
-      }
-    })
-  }
-}

packages/opencode/src/file/index.ts

@@ -3,10 +3,10 @@ import { Bus } from "../bus"
 import { $ } from "bun"
 import { createPatch } from "diff"
 import path from "path"
-import { App } from "../app/app"
 import fs from "fs"
 import ignore from "ignore"
 import { Log } from "../util/log"
+import { Instance } from "../project/instance"
 
 export namespace File {
   const log = Log.create({ service: "file" })
@@ -46,10 +46,10 @@ export namespace File {
   }
 
   export async function status() {
-    const app = App.info()
-    if (!app.git) return []
+    const project = Instance.project
+    if (project.vcs !== "git") return []
 
-    const diffOutput = await $`git diff --numstat HEAD`.cwd(app.path.cwd).quiet().nothrow().text()
+    const diffOutput = await $`git diff --numstat HEAD`.cwd(Instance.directory).quiet().nothrow().text()
 
     const changedFiles: Info[] = []
 
@@ -66,13 +66,17 @@ export namespace File {
       }
     }
 
-    const untrackedOutput = await $`git ls-files --others --exclude-standard`.cwd(app.path.cwd).quiet().nothrow().text()
+    const untrackedOutput = await $`git ls-files --others --exclude-standard`
+      .cwd(Instance.directory)
+      .quiet()
+      .nothrow()
+      .text()
 
     if (untrackedOutput.trim()) {
       const untrackedFiles = untrackedOutput.trim().split("\n")
       for (const filepath of untrackedFiles) {
         try {
-          const content = await Bun.file(path.join(app.path.root, filepath)).text()
+          const content = await Bun.file(path.join(Instance.worktree, filepath)).text()
           const lines = content.split("\n").length
           changedFiles.push({
             path: filepath,
@@ -87,7 +91,11 @@ export namespace File {
     }
 
     // Get deleted files
-    const deletedOutput = await $`git diff --name-only --diff-filter=D HEAD`.cwd(app.path.cwd).quiet().nothrow().text()
+    const deletedOutput = await $`git diff --name-only --diff-filter=D HEAD`
+      .cwd(Instance.directory)
+      .quiet()
+      .nothrow()
+      .text()
 
     if (deletedOutput.trim()) {
       const deletedFiles = deletedOutput.trim().split("\n")
@@ -103,23 +111,23 @@ export namespace File {
 
     return changedFiles.map((x) => ({
       ...x,
-      path: path.relative(app.path.cwd, path.join(app.path.root, x.path)),
+      path: path.relative(Instance.directory, path.join(Instance.worktree, x.path)),
     }))
   }
 
   export async function read(file: string) {
     using _ = log.time("read", { file })
-    const app = App.info()
-    const full = path.join(app.path.cwd, file)
+    const project = Instance.project
+    const full = path.join(Instance.directory, file)
     const content = await Bun.file(full)
       .text()
       .catch(() => "")
       .then((x) => x.trim())
-    if (app.git) {
-      const rel = path.relative(app.path.root, full)
-      const diff = await $`git diff ${rel}`.cwd(app.path.root).quiet().nothrow().text()
+    if (project.vcs === "git") {
+      const rel = path.relative(Instance.worktree, full)
+      const diff = await $`git diff ${rel}`.cwd(Instance.worktree).quiet().nothrow().text()
       if (diff.trim()) {
-        const original = await $`git show HEAD:${rel}`.cwd(app.path.root).quiet().nothrow().text()
+        const original = await $`git show HEAD:${rel}`.cwd(Instance.worktree).quiet().nothrow().text()
         const patch = createPatch(file, original, content, "old", "new", {
           context: Infinity,
         })
@@ -131,28 +139,27 @@ export namespace File {
 
   export async function list(dir?: string) {
     const exclude = [".git", ".DS_Store"]
-    const app = App.info()
+    const project = Instance.project
     let ignored = (_: string) => false
-    if (app.git) {
-      const gitignore = Bun.file(path.join(app.path.root, ".gitignore"))
+    if (project.vcs === "git") {
+      const gitignore = Bun.file(path.join(Instance.worktree, ".gitignore"))
       if (await gitignore.exists()) {
         const ig = ignore().add(await gitignore.text())
         ignored = ig.ignores.bind(ig)
       }
     }
-    const resolved = dir ? path.join(app.path.cwd, dir) : app.path.cwd
+    const resolved = dir ? path.join(Instance.directory, dir) : Instance.directory
     const nodes: Node[] = []
     for (const entry of await fs.promises.readdir(resolved, { withFileTypes: true })) {
       if (exclude.includes(entry.name)) continue
       const fullPath = path.join(resolved, entry.name)
-      const relativePath = path.relative(app.path.cwd, fullPath)
-      const relativeToRoot = path.relative(app.path.root, fullPath)
+      const relativePath = path.relative(Instance.directory, fullPath)
       const type = entry.isDirectory() ? "directory" : "file"
       nodes.push({
         name: entry.name,
         path: relativePath,
         type,
-        ignored: ignored(type === "directory" ? relativeToRoot + "/" : relativeToRoot),
+        ignored: ignored(type === "directory" ? relativePath + "/" : relativePath),
       })
     }
     return nodes.sort((a, b) => {

packages/opencode/src/file/time.ts

@@ -1,18 +1,20 @@
-import { App } from "../app/app"
+import { Instance } from "../project/instance"
 import { Log } from "../util/log"
 
 export namespace FileTime {
   const log = Log.create({ service: "file.time" })
-  export const state = App.state("tool.filetimes", () => {
-    const read: {
-      [sessionID: string]: {
-        [path: string]: Date | undefined
+  export const state = Instance.state(
+    () => {
+      const read: {
+        [sessionID: string]: {
+          [path: string]: Date | undefined
+        }
+      } = {}
+      return {
+        read,
       }
-    } = {}
-    return {
-      read,
-    }
-  })
+    },
+  )
 
   export function read(sessionID: string, file: string) {
     log.info("read", { sessionID, file })

packages/opencode/src/file/watch.ts

@@ -1,9 +1,9 @@
 import { z } from "zod"
 import { Bus } from "../bus"
 import fs from "fs"
-import { App } from "../app/app"
 import { Log } from "../util/log"
 import { Flag } from "../flag/flag"
+import { Instance } from "../project/instance"
 
 export namespace FileWatcher {
   const log = Log.create({ service: "file.watcher" })
@@ -17,22 +17,16 @@ export namespace FileWatcher {
       }),
     ),
   }
-  const state = App.state(
-    "file.watcher",
+  const state = Instance.state(
     () => {
-      const app = App.use()
-      if (!app.info.git) return {}
+      if (Instance.project.vcs !== "git") return {}
       try {
-        const watcher = fs.watch(app.info.path.cwd, { recursive: true }, (event, file) => {
+        const watcher = fs.watch(Instance.directory, { recursive: true }, (event, file) => {
           log.info("change", { file, event })
           if (!file) return
-          // for some reason async local storage is lost here
-          // https://github.com/oven-sh/bun/issues/20754
-          App.provideExisting(app, async () => {
-            Bus.publish(Event.Updated, {
-              file,
-              event,
-            })
+          Bus.publish(Event.Updated, {
+            file,
+            event,
           })
         })
         return { watcher }

packages/opencode/src/flag/flag.ts

@@ -2,6 +2,7 @@ export namespace Flag {
   export const OPENCODE_AUTO_SHARE = truthy("OPENCODE_AUTO_SHARE")
   export const OPENCODE_DISABLE_WATCHER = truthy("OPENCODE_DISABLE_WATCHER")
   export const OPENCODE_CONFIG = process.env["OPENCODE_CONFIG"]
+  export const OPENCODE_CONFIG_CONTENT = process.env["OPENCODE_CONFIG_CONTENT"]
   export const OPENCODE_DISABLE_AUTOUPDATE = truthy("OPENCODE_DISABLE_AUTOUPDATE")
   export const OPENCODE_PERMISSION = process.env["OPENCODE_PERMISSION"]
   export const OPENCODE_DISABLE_DEFAULT_PLUGINS = truthy("OPENCODE_DISABLE_DEFAULT_PLUGINS")

packages/opencode/src/format/formatter.ts

@@ -1,5 +1,5 @@
-import { App } from "../app/app"
 import { BunProc } from "../bun"
+import { Instance } from "../project/instance"
 import { Filesystem } from "../util/filesystem"
 
 export interface Info {
@@ -63,8 +63,7 @@ export const prettier: Info = {
     ".gql",
   ],
   async enabled() {
-    const app = App.info()
-    const items = await Filesystem.findUp("package.json", app.path.cwd, app.path.root)
+    const items = await Filesystem.findUp("package.json", Instance.directory, Instance.worktree)
     for (const item of items) {
       const json = await Bun.file(item).json()
       if (json.dependencies?.prettier) return true
@@ -109,10 +108,9 @@ export const biome: Info = {
     ".gql",
   ],
   async enabled() {
-    const app = App.info()
     const configs = ["biome.json", "biome.jsonc"]
     for (const config of configs) {
-      const found = await Filesystem.findUp(config, app.path.cwd, app.path.root)
+      const found = await Filesystem.findUp(config, Instance.directory, Instance.worktree)
       if (found.length > 0) {
         return true
       }
@@ -135,8 +133,7 @@ export const clang: Info = {
   command: ["clang-format", "-i", "$FILE"],
   extensions: [".c", ".cc", ".cpp", ".cxx", ".c++", ".h", ".hh", ".hpp", ".hxx", ".h++", ".ino", ".C", ".H"],
   async enabled() {
-    const app = App.info()
-    const items = await Filesystem.findUp(".clang-format", app.path.cwd, app.path.root)
+    const items = await Filesystem.findUp(".clang-format", Instance.directory, Instance.worktree)
     return items.length > 0
   },
 }
@@ -156,10 +153,9 @@ export const ruff: Info = {
   extensions: [".py", ".pyi"],
   async enabled() {
     if (!Bun.which("ruff")) return false
-    const app = App.info()
     const configs = ["pyproject.toml", "ruff.toml", ".ruff.toml"]
     for (const config of configs) {
-      const found = await Filesystem.findUp(config, app.path.cwd, app.path.root)
+      const found = await Filesystem.findUp(config, Instance.directory, Instance.worktree)
       if (found.length > 0) {
         if (config === "pyproject.toml") {
           const content = await Bun.file(found[0]).text()
@@ -171,7 +167,7 @@ export const ruff: Info = {
     }
     const deps = ["requirements.txt", "pyproject.toml", "Pipfile"]
     for (const dep of deps) {
-      const found = await Filesystem.findUp(dep, app.path.cwd, app.path.root)
+      const found = await Filesystem.findUp(dep, Instance.directory, Instance.worktree)
       if (found.length > 0) {
         const content = await Bun.file(found[0]).text()
         if (content.includes("ruff")) return true

packages/opencode/src/format/index.ts

@@ -1,4 +1,3 @@
-import { App } from "../app/app"
 import { Bus } from "../bus"
 import { File } from "../file"
 import { Log } from "../util/log"
@@ -7,11 +6,12 @@ import path from "path"
 import * as Formatter from "./formatter"
 import { Config } from "../config/config"
 import { mergeDeep } from "remeda"
+import { Instance } from "../project/instance"
 
 export namespace Format {
   const log = Log.create({ service: "format" })
 
-  const state = App.state("format", async () => {
+  const state = Instance.state(async () => {
     const enabled: Record<string, boolean> = {}
     const cfg = await Config.get()
 
@@ -71,7 +71,7 @@ export namespace Format {
         try {
           const proc = Bun.spawn({
             cmd: item.command.map((x) => x.replace("$FILE", file)),
-            cwd: App.info().path.cwd,
+            cwd: Instance.directory,
             env: { ...process.env, ...item.environment },
             stdout: "ignore",
             stderr: "ignore",

packages/opencode/src/index.ts

@@ -18,6 +18,7 @@ import { DebugCommand } from "./cli/cmd/debug"
 import { StatsCommand } from "./cli/cmd/stats"
 import { McpCommand } from "./cli/cmd/mcp"
 import { GithubCommand } from "./cli/cmd/github"
+import { ExportCommand } from "./cli/cmd/export"
 
 const cancel = new AbortController()
 
@@ -80,6 +81,7 @@ const cli = yargs(hideBin(process.argv))
   .command(ServeCommand)
   .command(ModelsCommand)
   .command(StatsCommand)
+  .command(ExportCommand)
   .command(GithubCommand)
   .fail((msg) => {
     if (msg.startsWith("Unknown argument") || msg.startsWith("Not enough non-option arguments")) {
@@ -105,6 +107,7 @@ try {
       name: e.name,
       message: e.message,
       cause: e.cause?.toString(),
+      stack: e.stack,
     })
   }
 

packages/opencode/src/lsp/client.ts

@@ -1,7 +1,6 @@
 import path from "path"
 import { createMessageConnection, StreamMessageReader, StreamMessageWriter } from "vscode-jsonrpc/node"
 import type { Diagnostic as VSCodeDiagnostic } from "vscode-languageserver-types"
-import { App } from "../app/app"
 import { Log } from "../util/log"
 import { LANGUAGE_EXTENSIONS } from "./language"
 import { Bus } from "../bus"
@@ -9,6 +8,7 @@ import z from "zod"
 import type { LSPServer } from "./server"
 import { NamedError } from "../util/error"
 import { withTimeout } from "../util/timeout"
+import { Instance } from "../project/instance"
 
 export namespace LSPClient {
   const log = Log.create({ service: "lsp.client" })
@@ -35,7 +35,6 @@ export namespace LSPClient {
   }
 
   export async function create(input: { serverID: string; server: LSPServer.Handle; root: string }) {
-    const app = App.info()
     const l = log.clone().tag("serverID", input.serverID)
     l.info("starting client")
 
@@ -60,7 +59,8 @@ export namespace LSPClient {
       return null
     })
     connection.onRequest("workspace/configuration", async () => {
-      return [{}]
+      // Return server initialization options
+      return [input.server.initialization ?? {}]
     })
     connection.listen()
 
@@ -109,6 +109,12 @@ export namespace LSPClient {
 
     await connection.sendNotification("initialized", {})
 
+    if (input.server.initialization) {
+      await connection.sendNotification("workspace/didChangeConfiguration", {
+        settings: input.server.initialization,
+      })
+    }
+
     const files: {
       [path: string]: number
     } = {}
@@ -123,7 +129,7 @@ export namespace LSPClient {
       },
       notify: {
         async open(input: { path: string }) {
-          input.path = path.isAbsolute(input.path) ? input.path : path.resolve(app.path.cwd, input.path)
+          input.path = path.isAbsolute(input.path) ? input.path : path.resolve(Instance.directory, input.path)
           const file = Bun.file(input.path)
           const text = await file.text()
           const extension = path.extname(input.path)
@@ -162,7 +168,7 @@ export namespace LSPClient {
         return diagnostics
       },
       async waitForDiagnostics(input: { path: string }) {
-        input.path = path.isAbsolute(input.path) ? input.path : path.resolve(app.path.cwd, input.path)
+        input.path = path.isAbsolute(input.path) ? input.path : path.resolve(Instance.directory, input.path)
         log.info("waiting for diagnostics", input)
         let unsub: () => void
         return await withTimeout(

packages/opencode/src/lsp/index.ts

@@ -1,4 +1,3 @@
-import { App } from "../app/app"
 import { Log } from "../util/log"
 import { LSPClient } from "./client"
 import path from "path"
@@ -6,6 +5,7 @@ import { LSPServer } from "./server"
 import { z } from "zod"
 import { Config } from "../config/config"
 import { spawn } from "child_process"
+import { Instance } from "../project/instance"
 
 export namespace LSP {
   const log = Log.create({ service: "lsp" })
@@ -53,8 +53,7 @@ export namespace LSP {
     })
   export type DocumentSymbol = z.infer<typeof DocumentSymbol>
 
-  const state = App.state(
-    "lsp",
+  const state = Instance.state(
     async () => {
       const clients: LSPClient.Info[] = []
       const servers: Record<string, LSPServer.Info> = {}
@@ -71,9 +70,10 @@ export namespace LSP {
         }
         servers[name] = {
           ...existing,
-          root: existing?.root ?? (async (_file, app) => app.path.root),
+          id: name,
+          root: existing?.root ?? (async () => Instance.directory),
           extensions: item.extensions ?? existing.extensions,
-          spawn: async (_app, root) => {
+          spawn: async (root) => {
             return {
               process: spawn(item.command[0], item.command.slice(1), {
                 cwd: root,
@@ -117,7 +117,7 @@ export namespace LSP {
     const result: LSPClient.Info[] = []
     for (const server of Object.values(s.servers)) {
       if (server.extensions.length && !server.extensions.includes(extension)) continue
-      const root = await server.root(file, App.info())
+      const root = await server.root(file)
       if (!root) continue
       if (s.broken.has(root + server.id)) continue
 
@@ -126,7 +126,7 @@ export namespace LSP {
         result.push(match)
         continue
       }
-      const handle = await server.spawn(App.info(), root).catch((err) => {
+      const handle = await server.spawn(root).catch((err) => {
         s.broken.add(root + server.id)
         log.error(`Failed to spawn LSP server ${server.id}`, { error: err })
         return undefined

packages/opencode/src/lsp/server.ts

@@ -1,5 +1,4 @@
 import { spawn, type ChildProcessWithoutNullStreams } from "child_process"
-import type { App } from "../app/app"
 import path from "path"
 import { Global } from "../global"
 import { Log } from "../util/log"
@@ -7,6 +6,7 @@ import { BunProc } from "../bun"
 import { $ } from "bun"
 import fs from "fs/promises"
 import { Filesystem } from "../util/filesystem"
+import { Instance } from "../project/instance"
 import { Flag } from "../flag/flag"
 
 export namespace LSPServer {
@@ -17,18 +17,18 @@ export namespace LSPServer {
     initialization?: Record<string, any>
   }
 
-  type RootFunction = (file: string, app: App.Info) => Promise<string | undefined>
+  type RootFunction = (file: string) => Promise<string | undefined>
 
   const NearestRoot = (patterns: string[]): RootFunction => {
-    return async (file, app) => {
+    return async (file) => {
       const files = Filesystem.up({
         targets: patterns,
         start: path.dirname(file),
-        stop: app.path.root,
+        stop: Instance.worktree,
       })
       const first = await files.next()
       await files.return()
-      if (!first.value) return app.path.root
+      if (!first.value) return Instance.worktree
       return path.dirname(first.value)
     }
   }
@@ -38,15 +38,15 @@ export namespace LSPServer {
     extensions: string[]
     global?: boolean
     root: RootFunction
-    spawn(app: App.Info, root: string): Promise<Handle | undefined>
+    spawn(root: string): Promise<Handle | undefined>
   }
 
   export const Typescript: Info = {
     id: "typescript",
     root: NearestRoot(["tsconfig.json", "package.json", "jsconfig.json"]),
     extensions: [".ts", ".tsx", ".js", ".jsx", ".mjs", ".cjs", ".mts", ".cts"],
-    async spawn(app, root) {
-      const tsserver = await Bun.resolve("typescript/lib/tsserver.js", app.path.cwd).catch(() => {})
+    async spawn(root) {
+      const tsserver = await Bun.resolve("typescript/lib/tsserver.js", Instance.directory).catch(() => {})
       if (!tsserver) return
       const proc = spawn(BunProc.which(), ["x", "typescript-language-server", "--stdio"], {
         cwd: root,
@@ -83,7 +83,7 @@ export namespace LSPServer {
       "nuxt.config.js",
       "vue.config.js",
     ]),
-    async spawn(_, root) {
+    async spawn(root) {
       let binary = Bun.which("vue-language-server")
       const args: string[] = []
       if (!binary) {
@@ -145,8 +145,8 @@ export namespace LSPServer {
       "package.json",
     ]),
     extensions: [".ts", ".tsx", ".js", ".jsx", ".mjs", ".cjs", ".mts", ".cts", ".vue"],
-    async spawn(app, root) {
-      const eslint = await Bun.resolve("eslint", app.path.cwd).catch(() => {})
+    async spawn(root) {
+      const eslint = await Bun.resolve("eslint", Instance.directory).catch(() => {})
       if (!eslint) return
       log.info("spawning eslint server")
       const serverPath = path.join(Global.Path.bin, "vscode-eslint", "server", "out", "eslintServer.js")
@@ -193,14 +193,14 @@ export namespace LSPServer {
   }
 
   export const Gopls: Info = {
-    id: "golang",
-    root: async (file, app) => {
-      const work = await NearestRoot(["go.work"])(file, app)
+    id: "gopls",
+    root: async (file) => {
+      const work = await NearestRoot(["go.work"])(file)
       if (work) return work
-      return NearestRoot(["go.mod", "go.sum"])(file, app)
+      return NearestRoot(["go.mod", "go.sum"])(file)
     },
     extensions: [".go"],
-    async spawn(_, root) {
+    async spawn(root) {
       let bin = Bun.which("gopls", {
         PATH: process.env["PATH"] + ":" + Global.Path.bin,
       })
@@ -238,7 +238,7 @@ export namespace LSPServer {
     id: "ruby-lsp",
     root: NearestRoot(["Gemfile"]),
     extensions: [".rb", ".rake", ".gemspec", ".ru"],
-    async spawn(_, root) {
+    async spawn(root) {
       let bin = Bun.which("ruby-lsp", {
         PATH: process.env["PATH"] + ":" + Global.Path.bin,
       })
@@ -279,7 +279,7 @@ export namespace LSPServer {
     id: "pyright",
     extensions: [".py", ".pyi"],
     root: NearestRoot(["pyproject.toml", "setup.py", "setup.cfg", "requirements.txt", "Pipfile", "pyrightconfig.json"]),
-    async spawn(_, root) {
+    async spawn(root) {
       let binary = Bun.which("pyright-langserver")
       const args = []
       if (!binary) {
@@ -298,6 +298,23 @@ export namespace LSPServer {
         args.push(...["run", js])
       }
       args.push("--stdio")
+
+      const initialization: Record<string, string> = {}
+
+      const potentialVenvPaths = [process.env["VIRTUAL_ENV"], path.join(root, ".venv"), path.join(root, "venv")].filter(
+        (p): p is string => p !== undefined,
+      )
+      for (const venvPath of potentialVenvPaths) {
+        const isWindows = process.platform === "win32"
+        const potentialPythonPath = isWindows
+          ? path.join(venvPath, "Scripts", "python.exe")
+          : path.join(venvPath, "bin", "python")
+        if (await Bun.file(potentialPythonPath).exists()) {
+          initialization["pythonPath"] = potentialPythonPath
+          break
+        }
+      }
+
       const proc = spawn(binary, args, {
         cwd: root,
         env: {
@@ -307,6 +324,7 @@ export namespace LSPServer {
       })
       return {
         process: proc,
+        initialization,
       }
     },
   }
@@ -315,7 +333,7 @@ export namespace LSPServer {
     id: "elixir-ls",
     extensions: [".ex", ".exs"],
     root: NearestRoot(["mix.exs", "mix.lock"]),
-    async spawn(_, root) {
+    async spawn(root) {
       let binary = Bun.which("elixir-ls")
       if (!binary) {
         const elixirLsPath = path.join(Global.Path.bin, "elixir-ls")
@@ -371,7 +389,7 @@ export namespace LSPServer {
     id: "zls",
     extensions: [".zig", ".zon"],
     root: NearestRoot(["build.zig"]),
-    async spawn(_, root) {
+    async spawn(root) {
       let bin = Bun.which("zls", {
         PATH: process.env["PATH"] + ":" + Global.Path.bin,
       })
@@ -477,7 +495,7 @@ export namespace LSPServer {
     id: "csharp",
     root: NearestRoot([".sln", ".csproj", "global.json"]),
     extensions: [".cs"],
-    async spawn(_, root) {
+    async spawn(root) {
       let bin = Bun.which("csharp-ls", {
         PATH: process.env["PATH"] + ":" + Global.Path.bin,
       })
@@ -515,8 +533,8 @@ export namespace LSPServer {
 
   export const RustAnalyzer: Info = {
     id: "rust",
-    root: async (file, app) => {
-      const crateRoot = await NearestRoot(["Cargo.toml", "Cargo.lock"])(file, app)
+    root: async (root) => {
+      const crateRoot = await NearestRoot(["Cargo.toml", "Cargo.lock"])(root)
       if (crateRoot === undefined) {
         return undefined
       }
@@ -539,13 +557,13 @@ export namespace LSPServer {
         currentDir = parentDir
 
         // Stop if we've gone above the app root
-        if (!currentDir.startsWith(app.path.root)) break
+        if (!currentDir.startsWith(Instance.worktree)) break
       }
 
       return crateRoot
     },
     extensions: [".rs"],
-    async spawn(_, root) {
+    async spawn(root) {
       const bin = Bun.which("rust-analyzer")
       if (!bin) {
         log.info("rust-analyzer not found in path, please install it")
@@ -563,7 +581,7 @@ export namespace LSPServer {
     id: "clangd",
     root: NearestRoot(["compile_commands.json", "compile_flags.txt", ".clangd", "CMakeLists.txt", "Makefile"]),
     extensions: [".c", ".cpp", ".cc", ".cxx", ".c++", ".h", ".hpp", ".hh", ".hxx", ".h++"],
-    async spawn(_, root) {
+    async spawn(root) {
       let bin = Bun.which("clangd", {
         PATH: process.env["PATH"] + ":" + Global.Path.bin,
       })

packages/opencode/src/mcp/index.ts

@@ -2,13 +2,13 @@ import { experimental_createMCPClient, type Tool } from "ai"
 import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js"
 import { SSEClientTransport } from "@modelcontextprotocol/sdk/client/sse.js"
 import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js"
-import { App } from "../app/app"
 import { Config } from "../config/config"
 import { Log } from "../util/log"
 import { NamedError } from "../util/error"
 import { z } from "zod"
 import { Session } from "../session"
 import { Bus } from "../bus"
+import { Instance } from "../project/instance"
 
 export namespace MCP {
   const log = Log.create({ service: "mcp" })
@@ -20,8 +20,7 @@ export namespace MCP {
     }),
   )
 
-  const state = App.state(
-    "mcp",
+  const state = Instance.state(
     async () => {
       const cfg = await Config.get()
       const clients: {

packages/opencode/src/permission/index.ts

@@ -1,9 +1,9 @@
-import { App } from "../app/app"
 import { z } from "zod"
 import { Bus } from "../bus"
 import { Log } from "../util/log"
 import { Identifier } from "../id/id"
 import { Plugin } from "../plugin"
+import { Instance } from "../project/instance"
 
 export namespace Permission {
   const log = Log.create({ service: "permission" })
@@ -35,8 +35,7 @@ export namespace Permission {
     ),
   }
 
-  const state = App.state(
-    "permission",
+  const state = Instance.state(
     () => {
       const pending: {
         [sessionID: string]: {

packages/opencode/src/plugin/index.ts

@@ -1,26 +1,28 @@
 import type { Hooks, Plugin as PluginInstance } from "@opencode-ai/plugin"
-import { App } from "../app/app"
 import { Config } from "../config/config"
 import { Bus } from "../bus"
 import { Log } from "../util/log"
 import { createOpencodeClient } from "@opencode-ai/sdk"
 import { Server } from "../server/server"
 import { BunProc } from "../bun"
+import { Instance } from "../project/instance"
 import { Flag } from "../flag/flag"
 
 export namespace Plugin {
   const log = Log.create({ service: "plugin" })
 
-  const state = App.state("plugin", async (app) => {
+  const state = Instance.state(async () => {
     const client = createOpencodeClient({
       baseUrl: "http://localhost:4096",
-      fetch: async (...args) => Server.app().fetch(...args),
+      fetch: async (...args) => Server.App.fetch(...args),
     })
     const config = await Config.get()
     const hooks = []
     const input = {
       client,
-      app,
+      project: Instance.project,
+      worktree: Instance.worktree,
+      directory: Instance.directory,
       $: Bun.$,
     }
     const plugins = [...(config.plugin ?? [])]