149 files changed, 331 insertions, 331 deletions
diff --git a/packages/app/sst-env.d.ts b/packages/app/sst-env.d.ts
index 0397645b5..b6a7e9066 100644
--- a/packages/app/sst-env.d.ts
+++ b/packages/app/sst-env.d.ts
@@ -6,4 +6,4 @@
 /// <reference path="../../sst-env.d.ts" />
 
 import "sst"
-export {}
+export {}
+\ No newline at end of file
diff --git a/packages/cloud/function/sst-env.d.ts b/packages/cloud/function/sst-env.d.ts
deleted file mode 100644
index afa8c6fe7..000000000
--- a/packages/cloud/function/sst-env.d.ts
+++ /dev/null
@@ -1,96 +0,0 @@
-/* This file is auto-generated by SST. Do not edit. */
-/* tslint:disable */
-/* eslint-disable */
-/* deno-fmt-ignore-file */
-
-import "sst"
-declare module "sst" {
-  export interface Resource {
-    ANTHROPIC_API_KEY: {
-      type: "sst.sst.Secret"
-      value: string
-    }
-    AUTH_API_URL: {
-      type: "sst.sst.Linkable"
-      value: string
-    }
-    BASETEN_API_KEY: {
-      type: "sst.sst.Secret"
-      value: string
-    }
-    Console: {
-      type: "sst.cloudflare.SolidStart"
-      url: string
-    }
-    Database: {
-      database: string
-      host: string
-      password: string
-      port: number
-      type: "sst.sst.Linkable"
-      username: string
-    }
-    FIREWORKS_API_KEY: {
-      type: "sst.sst.Secret"
-      value: string
-    }
-    GITHUB_APP_ID: {
-      type: "sst.sst.Secret"
-      value: string
-    }
-    GITHUB_APP_PRIVATE_KEY: {
-      type: "sst.sst.Secret"
-      value: string
-    }
-    GITHUB_CLIENT_ID_CONSOLE: {
-      type: "sst.sst.Secret"
-      value: string
-    }
-    GITHUB_CLIENT_SECRET_CONSOLE: {
-      type: "sst.sst.Secret"
-      value: string
-    }
-    GOOGLE_CLIENT_ID: {
-      type: "sst.sst.Secret"
-      value: string
-    }
-    HONEYCOMB_API_KEY: {
-      type: "sst.sst.Secret"
-      value: string
-    }
-    OPENAI_API_KEY: {
-      type: "sst.sst.Secret"
-      value: string
-    }
-    STRIPE_SECRET_KEY: {
-      type: "sst.sst.Secret"
-      value: string
-    }
-    STRIPE_WEBHOOK_SECRET: {
-      type: "sst.sst.Linkable"
-      value: string
-    }
-    Web: {
-      type: "sst.cloudflare.Astro"
-      url: string
-    }
-    XAI_API_KEY: {
-      type: "sst.sst.Secret"
-      value: string
-    }
-  }
-}
-// cloudflare
-import * as cloudflare from "@cloudflare/workers-types"
-declare module "sst" {
-  export interface Resource {
-    Api: cloudflare.Service
-    AuthApi: cloudflare.Service
-    AuthStorage: cloudflare.KVNamespace
-    Bucket: cloudflare.R2Bucket
-    LogProcessor: cloudflare.Service
-  }
-}
-
-import "sst"
-export {}
diff --git a/packages/cloud/resource/sst-env.d.ts b/packages/cloud/resource/sst-env.d.ts
deleted file mode 100644
index afa8c6fe7..000000000
--- a/packages/cloud/resource/sst-env.d.ts
+++ /dev/null
@@ -1,96 +0,0 @@
-/* This file is auto-generated by SST. Do not edit. */
-/* tslint:disable */
-/* eslint-disable */
-/* deno-fmt-ignore-file */
-
-import "sst"
-declare module "sst" {
-  export interface Resource {
-    ANTHROPIC_API_KEY: {
-      type: "sst.sst.Secret"
-      value: string
-    }
-    AUTH_API_URL: {
-      type: "sst.sst.Linkable"
-      value: string
-    }
-    BASETEN_API_KEY: {
-      type: "sst.sst.Secret"
-      value: string
-    }
-    Console: {
-      type: "sst.cloudflare.SolidStart"
-      url: string
-    }
-    Database: {
-      database: string
-      host: string
-      password: string
-      port: number
-      type: "sst.sst.Linkable"
-      username: string
-    }
-    FIREWORKS_API_KEY: {
-      type: "sst.sst.Secret"
-      value: string
-    }
-    GITHUB_APP_ID: {
-      type: "sst.sst.Secret"
-      value: string
-    }
-    GITHUB_APP_PRIVATE_KEY: {
-      type: "sst.sst.Secret"
-      value: string
-    }
-    GITHUB_CLIENT_ID_CONSOLE: {
-      type: "sst.sst.Secret"
-      value: string
-    }
-    GITHUB_CLIENT_SECRET_CONSOLE: {
-      type: "sst.sst.Secret"
-      value: string
-    }
-    GOOGLE_CLIENT_ID: {
-      type: "sst.sst.Secret"
-      value: string
-    }
-    HONEYCOMB_API_KEY: {
-      type: "sst.sst.Secret"
-      value: string
-    }
-    OPENAI_API_KEY: {
-      type: "sst.sst.Secret"
-      value: string
-    }
-    STRIPE_SECRET_KEY: {
-      type: "sst.sst.Secret"
-      value: string
-    }
-    STRIPE_WEBHOOK_SECRET: {
-      type: "sst.sst.Linkable"
-      value: string
-    }
-    Web: {
-      type: "sst.cloudflare.Astro"
-      url: string
-    }
-    XAI_API_KEY: {
-      type: "sst.sst.Secret"
-      value: string
-    }
-  }
-}
-// cloudflare
-import * as cloudflare from "@cloudflare/workers-types"
-declare module "sst" {
-  export interface Resource {
-    Api: cloudflare.Service
-    AuthApi: cloudflare.Service
-    AuthStorage: cloudflare.KVNamespace
-    Bucket: cloudflare.R2Bucket
-    LogProcessor: cloudflare.Service
-  }
-}
-
-import "sst"
-export {}
diff --git a/packages/cloud/app/.gitignore b/packages/console/app/.gitignore
index 751513ce1..751513ce1 100644
--- a/packages/cloud/app/.gitignore
+++ b/packages/console/app/.gitignore
diff --git a/packages/cloud/app/.opencode/agent/css.md b/packages/console/app/.opencode/agent/css.md
index d0ec43a48..d0ec43a48 100644
--- a/packages/cloud/app/.opencode/agent/css.md
+++ b/packages/console/app/.opencode/agent/css.md
diff --git a/packages/cloud/app/README.md b/packages/console/app/README.md
index 9337430cf..9337430cf 100644
--- a/packages/cloud/app/README.md
+++ b/packages/console/app/README.md
diff --git a/packages/cloud/app/app.config.ts b/packages/console/app/app.config.ts
index af013bc81..af013bc81 100644
--- a/packages/cloud/app/app.config.ts
+++ b/packages/console/app/app.config.ts
diff --git a/packages/cloud/app/package.json b/packages/console/app/package.json
index 577f1dd8d..2a9d9a98b 100644
--- a/packages/cloud/app/package.json
+++ b/packages/console/app/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@opencode/cloud-app",
+  "name": "@opencode/console-app",
   "type": "module",
   "scripts": {
     "typecheck": "tsc --noEmit",
@@ -17,7 +17,7 @@
     "@solidjs/start": "^1.1.0",
     "solid-js": "catalog:",
     "vinxi": "^0.5.7",
-    "@opencode/cloud-core": "workspace:*"
+    "@opencode/console-core": "workspace:*"
   },
   "engines": {
     "node": ">=22"
diff --git a/packages/cloud/app/public/favicon.svg b/packages/console/app/public/favicon.svg
index 3c81bbdb4..3c81bbdb4 100644
--- a/packages/cloud/app/public/favicon.svg
+++ b/packages/console/app/public/favicon.svg
diff --git a/packages/cloud/app/public/robots.txt b/packages/console/app/public/robots.txt
index f88eb1790..f88eb1790 100644
--- a/packages/cloud/app/public/robots.txt
+++ b/packages/console/app/public/robots.txt
diff --git a/packages/cloud/app/public/social-share.png b/packages/console/app/public/social-share.png
index 97f67994d..97f67994d 100644
--- a/packages/cloud/app/public/social-share.png
+++ b/packages/console/app/public/social-share.png
diff --git a/packages/cloud/app/public/theme.json b/packages/console/app/public/theme.json
index b3e97f7ca..b3e97f7ca 100644
--- a/packages/cloud/app/public/theme.json
+++ b/packages/console/app/public/theme.json
diff --git a/packages/cloud/app/src/app.css b/packages/console/app/src/app.css
index c0261c422..c0261c422 100644
--- a/packages/cloud/app/src/app.css
+++ b/packages/console/app/src/app.css
diff --git a/packages/cloud/app/src/app.tsx b/packages/console/app/src/app.tsx
index bc3961214..bc3961214 100644
--- a/packages/cloud/app/src/app.tsx
+++ b/packages/console/app/src/app.tsx
diff --git a/packages/cloud/app/src/asset/lander/check.svg b/packages/console/app/src/asset/lander/check.svg
index 22de6f2a8..22de6f2a8 100644
--- a/packages/cloud/app/src/asset/lander/check.svg
+++ b/packages/console/app/src/asset/lander/check.svg
diff --git a/packages/cloud/app/src/asset/lander/copy.svg b/packages/console/app/src/asset/lander/copy.svg
index f1baac30a..f1baac30a 100644
--- a/packages/cloud/app/src/asset/lander/copy.svg
+++ b/packages/console/app/src/asset/lander/copy.svg
diff --git a/packages/cloud/app/src/asset/lander/screenshot-github.png b/packages/console/app/src/asset/lander/screenshot-github.png
index fda74e641..fda74e641 100644
--- a/packages/cloud/app/src/asset/lander/screenshot-github.png
+++ b/packages/console/app/src/asset/lander/screenshot-github.png
diff --git a/packages/cloud/app/src/asset/lander/screenshot-splash.png b/packages/console/app/src/asset/lander/screenshot-splash.png
index e900673ef..e900673ef 100644
--- a/packages/cloud/app/src/asset/lander/screenshot-splash.png
+++ b/packages/console/app/src/asset/lander/screenshot-splash.png
diff --git a/packages/cloud/app/src/asset/lander/screenshot-vscode.png b/packages/console/app/src/asset/lander/screenshot-vscode.png
index b8966a6b8..b8966a6b8 100644
--- a/packages/cloud/app/src/asset/lander/screenshot-vscode.png
+++ b/packages/console/app/src/asset/lander/screenshot-vscode.png
diff --git a/packages/cloud/app/src/asset/lander/screenshot.png b/packages/console/app/src/asset/lander/screenshot.png
index feb617585..feb617585 100644
--- a/packages/cloud/app/src/asset/lander/screenshot.png
+++ b/packages/console/app/src/asset/lander/screenshot.png
diff --git a/packages/cloud/app/src/asset/logo-ornate-dark.svg b/packages/console/app/src/asset/logo-ornate-dark.svg
index 2efda934d..2efda934d 100644
--- a/packages/cloud/app/src/asset/logo-ornate-dark.svg
+++ b/packages/console/app/src/asset/logo-ornate-dark.svg
diff --git a/packages/cloud/app/src/asset/logo-ornate-light.svg b/packages/console/app/src/asset/logo-ornate-light.svg
index 789223bc4..789223bc4 100644
--- a/packages/cloud/app/src/asset/logo-ornate-light.svg
+++ b/packages/console/app/src/asset/logo-ornate-light.svg
diff --git a/packages/cloud/app/src/asset/logo.svg b/packages/console/app/src/asset/logo.svg
index cbfcccf51..cbfcccf51 100644
--- a/packages/cloud/app/src/asset/logo.svg
+++ b/packages/console/app/src/asset/logo.svg
diff --git a/packages/cloud/app/src/component/icon.tsx b/packages/console/app/src/component/icon.tsx
index a82572e62..a82572e62 100644
--- a/packages/cloud/app/src/component/icon.tsx
+++ b/packages/console/app/src/component/icon.tsx
diff --git a/packages/cloud/app/src/component/workspace/billing-section.module.css b/packages/console/app/src/component/workspace/billing-section.module.css
index 0bb5709cb..0bb5709cb 100644
--- a/packages/cloud/app/src/component/workspace/billing-section.module.css
+++ b/packages/console/app/src/component/workspace/billing-section.module.css
diff --git a/packages/cloud/app/src/component/workspace/billing-section.tsx b/packages/console/app/src/component/workspace/billing-section.tsx
index ec314d9ef..57316e208 100644
--- a/packages/cloud/app/src/component/workspace/billing-section.tsx
+++ b/packages/console/app/src/component/workspace/billing-section.tsx
@@ -1,6 +1,6 @@
 import { json, query, action, useParams, useAction, createAsync, useSubmission } from "@solidjs/router"
 import { createMemo, Show } from "solid-js"
-import { Billing } from "@opencode/cloud-core/billing.js"
+import { Billing } from "@opencode/console-core/billing.js"
 import { withActor } from "~/context/auth.withActor"
 import { IconCreditCard } from "~/component/icon"
 import styles from "./billing-section.module.css"
diff --git a/packages/cloud/app/src/component/workspace/common.tsx b/packages/console/app/src/component/workspace/common.tsx
index f85fd8423..f85fd8423 100644
--- a/packages/cloud/app/src/component/workspace/common.tsx
+++ b/packages/console/app/src/component/workspace/common.tsx
diff --git a/packages/cloud/app/src/component/workspace/key-section.module.css b/packages/console/app/src/component/workspace/key-section.module.css
index 6a1d0c85f..6a1d0c85f 100644
--- a/packages/cloud/app/src/component/workspace/key-section.module.css
+++ b/packages/console/app/src/component/workspace/key-section.module.css
diff --git a/packages/cloud/app/src/component/workspace/key-section.tsx b/packages/console/app/src/component/workspace/key-section.tsx
index 4158ce793..a2bd380ea 100644
--- a/packages/cloud/app/src/component/workspace/key-section.tsx
+++ b/packages/console/app/src/component/workspace/key-section.tsx
@@ -1,7 +1,7 @@
 import { json, query, action, useParams, createAsync, useSubmission } from "@solidjs/router"
 import { createEffect, createSignal, For, Show } from "solid-js"
 import { IconCopy, IconCheck } from "~/component/icon"
-import { Key } from "@opencode/cloud-core/key.js"
+import { Key } from "@opencode/console-core/key.js"
 import { withActor } from "~/context/auth.withActor"
 import { createStore } from "solid-js/store"
 import { formatDateUTC, formatDateForTable } from "./common"
diff --git a/packages/cloud/app/src/component/workspace/monthly-limit-section.module.css b/packages/console/app/src/component/workspace/monthly-limit-section.module.css
index 02de058e4..02de058e4 100644
--- a/packages/cloud/app/src/component/workspace/monthly-limit-section.module.css
+++ b/packages/console/app/src/component/workspace/monthly-limit-section.module.css
diff --git a/packages/cloud/app/src/component/workspace/monthly-limit-section.tsx b/packages/console/app/src/component/workspace/monthly-limit-section.tsx
index 5c1077ab1..35da774d0 100644
--- a/packages/cloud/app/src/component/workspace/monthly-limit-section.tsx
+++ b/packages/console/app/src/component/workspace/monthly-limit-section.tsx
@@ -2,7 +2,7 @@ import { json, query, action, useParams, createAsync, useSubmission } from "@sol
 import { createEffect, Show } from "solid-js"
 import { createStore } from "solid-js/store"
 import { withActor } from "~/context/auth.withActor"
-import { Billing } from "@opencode/cloud-core/billing.js"
+import { Billing } from "@opencode/console-core/billing.js"
 import styles from "./monthly-limit-section.module.css"
 
 const getBillingInfo = query(async (workspaceID: string) => {
diff --git a/packages/cloud/app/src/component/workspace/new-user-section.module.css b/packages/console/app/src/component/workspace/new-user-section.module.css
index 2edc7cc14..2edc7cc14 100644
--- a/packages/cloud/app/src/component/workspace/new-user-section.module.css
+++ b/packages/console/app/src/component/workspace/new-user-section.module.css
diff --git a/packages/cloud/app/src/component/workspace/new-user-section.tsx b/packages/console/app/src/component/workspace/new-user-section.tsx
index 6e031e371..5909072dd 100644
--- a/packages/cloud/app/src/component/workspace/new-user-section.tsx
+++ b/packages/console/app/src/component/workspace/new-user-section.tsx
@@ -1,8 +1,8 @@
 import { query, useParams, createAsync } from "@solidjs/router"
 import { createMemo, createSignal, Show } from "solid-js"
 import { IconCopy, IconCheck } from "~/component/icon"
-import { Key } from "@opencode/cloud-core/key.js"
-import { Billing } from "@opencode/cloud-core/billing.js"
+import { Key } from "@opencode/console-core/key.js"
+import { Billing } from "@opencode/console-core/billing.js"
 import { withActor } from "~/context/auth.withActor"
 import styles from "./new-user-section.module.css"
 
diff --git a/packages/cloud/app/src/component/workspace/payment-section.module.css b/packages/console/app/src/component/workspace/payment-section.module.css
index ea8e2ed42..ea8e2ed42 100644
--- a/packages/cloud/app/src/component/workspace/payment-section.module.css
+++ b/packages/console/app/src/component/workspace/payment-section.module.css
diff --git a/packages/cloud/app/src/component/workspace/payment-section.tsx b/packages/console/app/src/component/workspace/payment-section.tsx
index 8cdceebc3..7be51a581 100644
--- a/packages/cloud/app/src/component/workspace/payment-section.tsx
+++ b/packages/console/app/src/component/workspace/payment-section.tsx
@@ -1,4 +1,4 @@
-import { Billing } from "@opencode/cloud-core/billing.js"
+import { Billing } from "@opencode/console-core/billing.js"
 import { query, action, useParams, createAsync, useAction } from "@solidjs/router"
 import { For } from "solid-js"
 import { withActor } from "~/context/auth.withActor"
diff --git a/packages/cloud/app/src/component/workspace/usage-section.module.css b/packages/console/app/src/component/workspace/usage-section.module.css
index 1a772ba87..1a772ba87 100644
--- a/packages/cloud/app/src/component/workspace/usage-section.module.css
+++ b/packages/console/app/src/component/workspace/usage-section.module.css
diff --git a/packages/cloud/app/src/component/workspace/usage-section.tsx b/packages/console/app/src/component/workspace/usage-section.tsx
index 5d3d3b6c3..e68670c6d 100644
--- a/packages/cloud/app/src/component/workspace/usage-section.tsx
+++ b/packages/console/app/src/component/workspace/usage-section.tsx
@@ -1,4 +1,4 @@
-import { Billing } from "@opencode/cloud-core/billing.js"
+import { Billing } from "@opencode/console-core/billing.js"
 import { query, useParams, createAsync } from "@solidjs/router"
 import { createMemo, For, Show } from "solid-js"
 import { formatDateUTC, formatDateForTable } from "./common"
diff --git a/packages/cloud/app/src/context/auth.session.ts b/packages/console/app/src/context/auth.session.ts
index 609bc364b..609bc364b 100644
--- a/packages/cloud/app/src/context/auth.session.ts
+++ b/packages/console/app/src/context/auth.session.ts
diff --git a/packages/cloud/app/src/context/auth.ts b/packages/console/app/src/context/auth.ts
index e08d965b8..027885241 100644
--- a/packages/cloud/app/src/context/auth.ts
+++ b/packages/console/app/src/context/auth.ts
@@ -1,10 +1,10 @@
 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 { and, Database, eq, inArray } from "@opencode/console-core/drizzle/index.js"
+import { WorkspaceTable } from "@opencode/console-core/schema/workspace.sql.js"
+import { UserTable } from "@opencode/console-core/schema/user.sql.js"
 import { redirect } from "@solidjs/router"
-import { AccountTable } from "@opencode/cloud-core/schema/account.sql.js"
-import { Actor } from "@opencode/cloud-core/actor.js"
+import { AccountTable } from "@opencode/console-core/schema/account.sql.js"
+import { Actor } from "@opencode/console-core/actor.js"
 
 import { createClient } from "@openauthjs/openauth/client"
 import { useAuthSession } from "./auth.session"
diff --git a/packages/cloud/app/src/context/auth.withActor.ts b/packages/console/app/src/context/auth.withActor.ts
index 4cfd5c3e0..2cb970269 100644
--- a/packages/cloud/app/src/context/auth.withActor.ts
+++ b/packages/console/app/src/context/auth.withActor.ts
@@ -1,4 +1,4 @@
-import { Actor } from "@opencode/cloud-core/actor.js"
+import { Actor } from "@opencode/console-core/actor.js"
 import { getActor } from "./auth"
 
 export async function withActor<T>(fn: () => T, workspace?: string) {
diff --git a/packages/cloud/app/src/entry-client.tsx b/packages/console/app/src/entry-client.tsx
index 642deacf7..642deacf7 100644
--- a/packages/cloud/app/src/entry-client.tsx
+++ b/packages/console/app/src/entry-client.tsx
diff --git a/packages/cloud/app/src/entry-server.tsx b/packages/console/app/src/entry-server.tsx
index d5fca6aa5..d5fca6aa5 100644
--- a/packages/cloud/app/src/entry-server.tsx
+++ b/packages/console/app/src/entry-server.tsx
diff --git a/packages/cloud/app/src/global.d.ts b/packages/console/app/src/global.d.ts
index dc6f10c22..dc6f10c22 100644
--- a/packages/cloud/app/src/global.d.ts
+++ b/packages/console/app/src/global.d.ts
diff --git a/packages/cloud/app/src/middleware.ts b/packages/console/app/src/middleware.ts
index b49473cbe..b49473cbe 100644
--- a/packages/cloud/app/src/middleware.ts
+++ b/packages/console/app/src/middleware.ts
diff --git a/packages/cloud/app/src/routes/[...404].css b/packages/console/app/src/routes/[...404].css
index 1edbd0a5a..1edbd0a5a 100644
--- a/packages/cloud/app/src/routes/[...404].css
+++ b/packages/console/app/src/routes/[...404].css
diff --git a/packages/cloud/app/src/routes/[...404].tsx b/packages/console/app/src/routes/[...404].tsx
index ba2842b5a..ba2842b5a 100644
--- a/packages/cloud/app/src/routes/[...404].tsx
+++ b/packages/console/app/src/routes/[...404].tsx
diff --git a/packages/cloud/app/src/routes/auth/authorize.ts b/packages/console/app/src/routes/auth/authorize.ts
index 166466ef8..166466ef8 100644
--- a/packages/cloud/app/src/routes/auth/authorize.ts
+++ b/packages/console/app/src/routes/auth/authorize.ts
diff --git a/packages/cloud/app/src/routes/auth/callback.ts b/packages/console/app/src/routes/auth/callback.ts
index 23025b54d..23025b54d 100644
--- a/packages/cloud/app/src/routes/auth/callback.ts
+++ b/packages/console/app/src/routes/auth/callback.ts
diff --git a/packages/cloud/app/src/routes/auth/index.ts b/packages/console/app/src/routes/auth/index.ts
index 308ae2d1d..2c893185f 100644
--- a/packages/cloud/app/src/routes/auth/index.ts
+++ b/packages/console/app/src/routes/auth/index.ts
@@ -1,4 +1,4 @@
-import { Account } from "@opencode/cloud-core/account.js"
+import { Account } from "@opencode/console-core/account.js"
 import { redirect } from "@solidjs/router"
 import type { APIEvent } from "@solidjs/start/server"
 import { withActor } from "~/context/auth.withActor"
diff --git a/packages/cloud/app/src/routes/debug/index.ts b/packages/console/app/src/routes/debug/index.ts
index 8c7eb7bd8..39fa33d90 100644
--- a/packages/cloud/app/src/routes/debug/index.ts
+++ b/packages/console/app/src/routes/debug/index.ts
@@ -1,7 +1,7 @@
 import type { APIEvent } from "@solidjs/start/server"
 import { json } from "@solidjs/router"
-import { Database } from "@opencode/cloud-core/drizzle/index.js"
-import { UserTable } from "@opencode/cloud-core/schema/user.sql.js"
+import { Database } from "@opencode/console-core/drizzle/index.js"
+import { UserTable } from "@opencode/console-core/schema/user.sql.js"
 
 export async function GET(evt: APIEvent) {
   return json({
diff --git a/packages/cloud/app/src/routes/discord.ts b/packages/console/app/src/routes/discord.ts
index 7088295da..7088295da 100644
--- a/packages/cloud/app/src/routes/discord.ts
+++ b/packages/console/app/src/routes/discord.ts
diff --git a/packages/cloud/app/src/routes/docs/[...path].ts b/packages/console/app/src/routes/docs/[...path].ts
index f07781583..f07781583 100644
--- a/packages/cloud/app/src/routes/docs/[...path].ts
+++ b/packages/console/app/src/routes/docs/[...path].ts
diff --git a/packages/cloud/app/src/routes/docs/index.ts b/packages/console/app/src/routes/docs/index.ts
index f07781583..f07781583 100644
--- a/packages/cloud/app/src/routes/docs/index.ts
+++ b/packages/console/app/src/routes/docs/index.ts
diff --git a/packages/cloud/app/src/routes/index.css b/packages/console/app/src/routes/index.css
index fe95bb7ea..fe95bb7ea 100644
--- a/packages/cloud/app/src/routes/index.css
+++ b/packages/console/app/src/routes/index.css
diff --git a/packages/cloud/app/src/routes/index.tsx b/packages/console/app/src/routes/index.tsx
index 9075f4079..e8c1998ae 100644
--- a/packages/cloud/app/src/routes/index.tsx
+++ b/packages/console/app/src/routes/index.tsx
@@ -8,7 +8,7 @@ import { IconCopy, IconCheck } from "../component/icon"
 import { createAsync, query } from "@solidjs/router"
 import { getActor } from "~/context/auth"
 import { withActor } from "~/context/auth.withActor"
-import { Account } from "@opencode/cloud-core/account.js"
+import { Account } from "@opencode/console-core/account.js"
 
 function CopyStatus() {
   return (
diff --git a/packages/cloud/app/src/routes/s/[id].ts b/packages/console/app/src/routes/s/[id].ts
index 3fd1305a0..3fd1305a0 100644
--- a/packages/cloud/app/src/routes/s/[id].ts
+++ b/packages/console/app/src/routes/s/[id].ts
diff --git a/packages/cloud/app/src/routes/stripe/webhook.ts b/packages/console/app/src/routes/stripe/webhook.ts
index 925ede1ac..920966286 100644
--- a/packages/cloud/app/src/routes/stripe/webhook.ts
+++ b/packages/console/app/src/routes/stripe/webhook.ts
@@ -1,11 +1,11 @@
-import { Billing } from "@opencode/cloud-core/billing.js"
+import { Billing } from "@opencode/console-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 { Resource } from "@opencode/cloud-resource"
+import { Database, eq, sql } from "@opencode/console-core/drizzle/index.js"
+import { BillingTable, PaymentTable } from "@opencode/console-core/schema/billing.sql.js"
+import { Identifier } from "@opencode/console-core/identifier.js"
+import { centsToMicroCents } from "@opencode/console-core/util/price.js"
+import { Actor } from "@opencode/console-core/actor.js"
+import { Resource } from "@opencode/console-resource"
 
 export async function POST(input: APIEvent) {
   const body = await Billing.stripe().webhooks.constructEventAsync(
diff --git a/packages/cloud/app/src/routes/workspace.css b/packages/console/app/src/routes/workspace.css
index ed94365f0..ed94365f0 100644
--- a/packages/cloud/app/src/routes/workspace.css
+++ b/packages/console/app/src/routes/workspace.css
diff --git a/packages/cloud/app/src/routes/workspace.tsx b/packages/console/app/src/routes/workspace.tsx
index 3f08a70a0..3aa3f20d3 100644
--- a/packages/cloud/app/src/routes/workspace.tsx
+++ b/packages/console/app/src/routes/workspace.tsx
@@ -13,8 +13,8 @@ import {
   useParams,
   A,
 } from "@solidjs/router"
-import { User } from "@opencode/cloud-core/user.js"
-import { Actor } from "@opencode/cloud-core/actor.js"
+import { User } from "@opencode/console-core/user.js"
+import { Actor } from "@opencode/console-core/actor.js"
 import { getRequestEvent } from "solid-js/web"
 
 const getUserInfo = query(async (workspaceID: string) => {
diff --git a/packages/cloud/app/src/routes/workspace/[id].css b/packages/console/app/src/routes/workspace/[id].css
index 8b318a19f..8b318a19f 100644
--- a/packages/cloud/app/src/routes/workspace/[id].css
+++ b/packages/console/app/src/routes/workspace/[id].css
diff --git a/packages/cloud/app/src/routes/workspace/[id].tsx b/packages/console/app/src/routes/workspace/[id].tsx
index 4a2c3424d..68a706d5d 100644
--- a/packages/cloud/app/src/routes/workspace/[id].tsx
+++ b/packages/console/app/src/routes/workspace/[id].tsx
@@ -1,5 +1,5 @@
 import "./[id].css"
-import { Billing } from "@opencode/cloud-core/billing.js"
+import { Billing } from "@opencode/console-core/billing.js"
 import { query, useParams, createAsync } from "@solidjs/router"
 import { Show } from "solid-js"
 import { withActor } from "~/context/auth.withActor"
diff --git a/packages/cloud/app/src/routes/workspace/index.tsx b/packages/console/app/src/routes/workspace/index.tsx
index e69de29bb..e69de29bb 100644
--- a/packages/cloud/app/src/routes/workspace/index.tsx
+++ b/packages/console/app/src/routes/workspace/index.tsx
diff --git a/packages/cloud/app/src/routes/zen/handler.ts b/packages/console/app/src/routes/zen/handler.ts
index ab1fc6599..6065e2f76 100644
--- a/packages/cloud/app/src/routes/zen/handler.ts
+++ b/packages/console/app/src/routes/zen/handler.ts
@@ -1,13 +1,13 @@
 import type { APIEvent } from "@solidjs/start/server"
 import path from "node:path"
-import { and, Database, eq, isNull, lt, or, sql } from "@opencode/cloud-core/drizzle/index.js"
-import { KeyTable } from "@opencode/cloud-core/schema/key.sql.js"
-import { BillingTable, PaymentTable, 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"
-import { Resource } from "@opencode/cloud-resource"
+import { and, Database, eq, isNull, lt, or, sql } from "@opencode/console-core/drizzle/index.js"
+import { KeyTable } from "@opencode/console-core/schema/key.sql.js"
+import { BillingTable, PaymentTable, UsageTable } from "@opencode/console-core/schema/billing.sql.js"
+import { centsToMicroCents } from "@opencode/console-core/util/price.js"
+import { Identifier } from "@opencode/console-core/identifier.js"
+import { Resource } from "@opencode/console-resource"
 import { Billing } from "../../../../core/src/billing"
-import { Actor } from "@opencode/cloud-core/actor.js"
+import { Actor } from "@opencode/console-core/actor.js"
 
 type ModelCost = {
   input: number
diff --git a/packages/cloud/app/src/routes/zen/v1/chat/completions.ts b/packages/console/app/src/routes/zen/v1/chat/completions.ts
index 801557324..801557324 100644
--- a/packages/cloud/app/src/routes/zen/v1/chat/completions.ts
+++ b/packages/console/app/src/routes/zen/v1/chat/completions.ts
diff --git a/packages/cloud/app/src/routes/zen/v1/messages.ts b/packages/console/app/src/routes/zen/v1/messages.ts
index 1fd85d5c7..1fd85d5c7 100644
--- a/packages/cloud/app/src/routes/zen/v1/messages.ts
+++ b/packages/console/app/src/routes/zen/v1/messages.ts
diff --git a/packages/cloud/app/src/routes/zen/v1/responses.ts b/packages/console/app/src/routes/zen/v1/responses.ts
index 486c129b9..486c129b9 100644
--- a/packages/cloud/app/src/routes/zen/v1/responses.ts
+++ b/packages/console/app/src/routes/zen/v1/responses.ts
diff --git a/packages/cloud/app/src/style/base.css b/packages/console/app/src/style/base.css
index a4847ed43..a4847ed43 100644
--- a/packages/cloud/app/src/style/base.css
+++ b/packages/console/app/src/style/base.css
diff --git a/packages/cloud/app/src/style/component/button.css b/packages/console/app/src/style/component/button.css
index d10f7af53..d10f7af53 100644
--- a/packages/cloud/app/src/style/component/button.css
+++ b/packages/console/app/src/style/component/button.css
diff --git a/packages/cloud/app/src/style/index.css b/packages/console/app/src/style/index.css
index 832a901e8..832a901e8 100644
--- a/packages/cloud/app/src/style/index.css
+++ b/packages/console/app/src/style/index.css
diff --git a/packages/cloud/app/src/style/reset.css b/packages/console/app/src/style/reset.css
index d331ed724..d331ed724 100644
--- a/packages/cloud/app/src/style/reset.css
+++ b/packages/console/app/src/style/reset.css
diff --git a/packages/cloud/app/src/style/token/color.css b/packages/console/app/src/style/token/color.css
index f1a097d2f..f1a097d2f 100644
--- a/packages/cloud/app/src/style/token/color.css
+++ b/packages/console/app/src/style/token/color.css
diff --git a/packages/cloud/app/src/style/token/font.css b/packages/console/app/src/style/token/font.css
index 67143e662..67143e662 100644
--- a/packages/cloud/app/src/style/token/font.css
+++ b/packages/console/app/src/style/token/font.css
diff --git a/packages/cloud/app/src/style/token/space.css b/packages/console/app/src/style/token/space.css
index 7e1a1b397..7e1a1b397 100644
--- a/packages/cloud/app/src/style/token/space.css
+++ b/packages/console/app/src/style/token/space.css
diff --git a/packages/cloud/app/sst-env.d.ts b/packages/console/app/sst-env.d.ts
index bd5588217..9b9de7327 100644
--- a/packages/cloud/app/sst-env.d.ts
+++ b/packages/console/app/sst-env.d.ts
@@ -6,4 +6,4 @@
 /// <reference path="../../../sst-env.d.ts" />
 
 import "sst"
-export {}
+export {}
+\ No newline at end of file
diff --git a/packages/cloud/app/tsconfig.json b/packages/console/app/tsconfig.json
index 07148a458..07148a458 100644
--- a/packages/cloud/app/tsconfig.json
+++ b/packages/console/app/tsconfig.json
diff --git a/packages/cloud/core/drizzle.config.ts b/packages/console/core/drizzle.config.ts
index 0b7c4417e..0b7c4417e 100644
--- a/packages/cloud/core/drizzle.config.ts
+++ b/packages/console/core/drizzle.config.ts
diff --git a/packages/cloud/core/migrations/0000_fluffy_raza.sql b/packages/console/core/migrations/0000_fluffy_raza.sql
index 8e8173346..8e8173346 100644
--- a/packages/cloud/core/migrations/0000_fluffy_raza.sql
+++ b/packages/console/core/migrations/0000_fluffy_raza.sql
diff --git a/packages/cloud/core/migrations/0001_serious_whistler.sql b/packages/console/core/migrations/0001_serious_whistler.sql
index 4a9a03d63..4a9a03d63 100644
--- a/packages/cloud/core/migrations/0001_serious_whistler.sql
+++ b/packages/console/core/migrations/0001_serious_whistler.sql
diff --git a/packages/cloud/core/migrations/0002_violet_loners.sql b/packages/console/core/migrations/0002_violet_loners.sql
index 17273356c..17273356c 100644
--- a/packages/cloud/core/migrations/0002_violet_loners.sql
+++ b/packages/console/core/migrations/0002_violet_loners.sql
diff --git a/packages/cloud/core/migrations/0003_dusty_clint_barton.sql b/packages/console/core/migrations/0003_dusty_clint_barton.sql
index 14efae216..14efae216 100644
--- a/packages/cloud/core/migrations/0003_dusty_clint_barton.sql
+++ b/packages/console/core/migrations/0003_dusty_clint_barton.sql
diff --git a/packages/cloud/core/migrations/0004_first_mockingbird.sql b/packages/console/core/migrations/0004_first_mockingbird.sql
index 2a6b11067..2a6b11067 100644
--- a/packages/cloud/core/migrations/0004_first_mockingbird.sql
+++ b/packages/console/core/migrations/0004_first_mockingbird.sql
diff --git a/packages/cloud/core/migrations/0005_jazzy_skrulls.sql b/packages/console/core/migrations/0005_jazzy_skrulls.sql
index 774c38dd8..774c38dd8 100644
--- a/packages/cloud/core/migrations/0005_jazzy_skrulls.sql
+++ b/packages/console/core/migrations/0005_jazzy_skrulls.sql
diff --git a/packages/cloud/core/migrations/0006_parallel_gauntlet.sql b/packages/console/core/migrations/0006_parallel_gauntlet.sql
index a1ff78e78..a1ff78e78 100644
--- a/packages/cloud/core/migrations/0006_parallel_gauntlet.sql
+++ b/packages/console/core/migrations/0006_parallel_gauntlet.sql
diff --git a/packages/cloud/core/migrations/0007_familiar_nightshade.sql b/packages/console/core/migrations/0007_familiar_nightshade.sql
index 89cf77f92..89cf77f92 100644
--- a/packages/cloud/core/migrations/0007_familiar_nightshade.sql
+++ b/packages/console/core/migrations/0007_familiar_nightshade.sql
diff --git a/packages/cloud/core/migrations/0008_eminent_ultimatum.sql b/packages/console/core/migrations/0008_eminent_ultimatum.sql
index 93e40a7fe..93e40a7fe 100644
--- a/packages/cloud/core/migrations/0008_eminent_ultimatum.sql
+++ b/packages/console/core/migrations/0008_eminent_ultimatum.sql
diff --git a/packages/cloud/core/migrations/0009_redundant_piledriver.sql b/packages/console/core/migrations/0009_redundant_piledriver.sql
index 4ba1b2d4a..4ba1b2d4a 100644
--- a/packages/cloud/core/migrations/0009_redundant_piledriver.sql
+++ b/packages/console/core/migrations/0009_redundant_piledriver.sql
diff --git a/packages/cloud/core/migrations/0010_needy_sue_storm.sql b/packages/console/core/migrations/0010_needy_sue_storm.sql
index ffd46c9fc..ffd46c9fc 100644
--- a/packages/cloud/core/migrations/0010_needy_sue_storm.sql
+++ b/packages/console/core/migrations/0010_needy_sue_storm.sql
diff --git a/packages/cloud/core/migrations/0011_freezing_phil_sheldon.sql b/packages/console/core/migrations/0011_freezing_phil_sheldon.sql
index 095f25993..095f25993 100644
--- a/packages/cloud/core/migrations/0011_freezing_phil_sheldon.sql
+++ b/packages/console/core/migrations/0011_freezing_phil_sheldon.sql
diff --git a/packages/cloud/core/migrations/0012_bright_photon.sql b/packages/console/core/migrations/0012_bright_photon.sql
index 8ad777bcf..8ad777bcf 100644
--- a/packages/cloud/core/migrations/0012_bright_photon.sql
+++ b/packages/console/core/migrations/0012_bright_photon.sql
diff --git a/packages/cloud/core/migrations/0013_absurd_hobgoblin.sql b/packages/console/core/migrations/0013_absurd_hobgoblin.sql
index 8c331b12f..8c331b12f 100644
--- a/packages/cloud/core/migrations/0013_absurd_hobgoblin.sql
+++ b/packages/console/core/migrations/0013_absurd_hobgoblin.sql
diff --git a/packages/cloud/core/migrations/meta/0000_snapshot.json b/packages/console/core/migrations/meta/0000_snapshot.json
index 17d3bd7f9..17d3bd7f9 100644
--- a/packages/cloud/core/migrations/meta/0000_snapshot.json
+++ b/packages/console/core/migrations/meta/0000_snapshot.json
diff --git a/packages/cloud/core/migrations/meta/0001_snapshot.json b/packages/console/core/migrations/meta/0001_snapshot.json
index d23d1601d..d23d1601d 100644
--- a/packages/cloud/core/migrations/meta/0001_snapshot.json
+++ b/packages/console/core/migrations/meta/0001_snapshot.json
diff --git a/packages/cloud/core/migrations/meta/0002_snapshot.json b/packages/console/core/migrations/meta/0002_snapshot.json
index 45d06926c..45d06926c 100644
--- a/packages/cloud/core/migrations/meta/0002_snapshot.json
+++ b/packages/console/core/migrations/meta/0002_snapshot.json
diff --git a/packages/cloud/core/migrations/meta/0003_snapshot.json b/packages/console/core/migrations/meta/0003_snapshot.json
index e832ebb00..e832ebb00 100644
--- a/packages/cloud/core/migrations/meta/0003_snapshot.json
+++ b/packages/console/core/migrations/meta/0003_snapshot.json
diff --git a/packages/cloud/core/migrations/meta/0004_snapshot.json b/packages/console/core/migrations/meta/0004_snapshot.json
index 6d2695c48..6d2695c48 100644
--- a/packages/cloud/core/migrations/meta/0004_snapshot.json
+++ b/packages/console/core/migrations/meta/0004_snapshot.json
diff --git a/packages/cloud/core/migrations/meta/0005_snapshot.json b/packages/console/core/migrations/meta/0005_snapshot.json
index 12246a6d6..12246a6d6 100644
--- a/packages/cloud/core/migrations/meta/0005_snapshot.json
+++ b/packages/console/core/migrations/meta/0005_snapshot.json
diff --git a/packages/cloud/core/migrations/meta/0006_snapshot.json b/packages/console/core/migrations/meta/0006_snapshot.json
index d726b6f67..d726b6f67 100644
--- a/packages/cloud/core/migrations/meta/0006_snapshot.json
+++ b/packages/console/core/migrations/meta/0006_snapshot.json
diff --git a/packages/cloud/core/migrations/meta/0007_snapshot.json b/packages/console/core/migrations/meta/0007_snapshot.json
index 122db42cb..122db42cb 100644
--- a/packages/cloud/core/migrations/meta/0007_snapshot.json
+++ b/packages/console/core/migrations/meta/0007_snapshot.json
diff --git a/packages/cloud/core/migrations/meta/0008_snapshot.json b/packages/console/core/migrations/meta/0008_snapshot.json
index 02c473200..02c473200 100644
--- a/packages/cloud/core/migrations/meta/0008_snapshot.json
+++ b/packages/console/core/migrations/meta/0008_snapshot.json
diff --git a/packages/cloud/core/migrations/meta/0009_snapshot.json b/packages/console/core/migrations/meta/0009_snapshot.json
index a3bd57cae..a3bd57cae 100644
--- a/packages/cloud/core/migrations/meta/0009_snapshot.json
+++ b/packages/console/core/migrations/meta/0009_snapshot.json
diff --git a/packages/cloud/core/migrations/meta/0010_snapshot.json b/packages/console/core/migrations/meta/0010_snapshot.json
index cb55610ae..cb55610ae 100644
--- a/packages/cloud/core/migrations/meta/0010_snapshot.json
+++ b/packages/console/core/migrations/meta/0010_snapshot.json
diff --git a/packages/cloud/core/migrations/meta/0011_snapshot.json b/packages/console/core/migrations/meta/0011_snapshot.json
index 7eb6fa71a..7eb6fa71a 100644
--- a/packages/cloud/core/migrations/meta/0011_snapshot.json
+++ b/packages/console/core/migrations/meta/0011_snapshot.json
diff --git a/packages/cloud/core/migrations/meta/0012_snapshot.json b/packages/console/core/migrations/meta/0012_snapshot.json
index 4220c988b..4220c988b 100644
--- a/packages/cloud/core/migrations/meta/0012_snapshot.json
+++ b/packages/console/core/migrations/meta/0012_snapshot.json
diff --git a/packages/cloud/core/migrations/meta/0013_snapshot.json b/packages/console/core/migrations/meta/0013_snapshot.json
index ef805ee83..ef805ee83 100644
--- a/packages/cloud/core/migrations/meta/0013_snapshot.json
+++ b/packages/console/core/migrations/meta/0013_snapshot.json
diff --git a/packages/cloud/core/migrations/meta/_journal.json b/packages/console/core/migrations/meta/_journal.json
index 1b7d45da3..1b7d45da3 100644
--- a/packages/cloud/core/migrations/meta/_journal.json
+++ b/packages/console/core/migrations/meta/_journal.json
diff --git a/packages/cloud/core/package.json b/packages/console/core/package.json
index e9e7fc701..e54dd4b0a 100644
--- a/packages/cloud/core/package.json
+++ b/packages/console/core/package.json
@@ -1,12 +1,12 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "name": "@opencode/cloud-core",
+  "name": "@opencode/console-core",
   "version": "0.9.11",
   "private": true,
   "type": "module",
   "dependencies": {
     "@aws-sdk/client-sts": "3.782.0",
-    "@opencode/cloud-resource": "workspace:*",
+    "@opencode/console-resource": "workspace:*",
     "@planetscale/database": "1.19.0",
     "drizzle-orm": "0.41.0",
     "postgres": "3.4.7",
diff --git a/packages/cloud/core/src/account.ts b/packages/console/core/src/account.ts
index cb123e048..cb123e048 100644
--- a/packages/cloud/core/src/account.ts
+++ b/packages/console/core/src/account.ts
diff --git a/packages/cloud/core/src/actor.ts b/packages/console/core/src/actor.ts
index 0d13f7216..0d13f7216 100644
--- a/packages/cloud/core/src/actor.ts
+++ b/packages/console/core/src/actor.ts
diff --git a/packages/cloud/core/src/billing.ts b/packages/console/core/src/billing.ts
index 2254adc79..dda0c539f 100644
--- a/packages/cloud/core/src/billing.ts
+++ b/packages/console/core/src/billing.ts
@@ -5,7 +5,7 @@ import { Actor } from "./actor"
 import { fn } from "./util/fn"
 import { z } from "zod"
 import { User } from "./user"
-import { Resource } from "@opencode/cloud-resource"
+import { Resource } from "@opencode/console-resource"
 import { Identifier } from "./identifier"
 import { centsToMicroCents } from "./util/price"
 
diff --git a/packages/cloud/core/src/context.ts b/packages/console/core/src/context.ts
index c2ca6a313..c2ca6a313 100644
--- a/packages/cloud/core/src/context.ts
+++ b/packages/console/core/src/context.ts
diff --git a/packages/cloud/core/src/drizzle/index.ts b/packages/console/core/src/drizzle/index.ts
index 806037996..899f69148 100644
--- a/packages/cloud/core/src/drizzle/index.ts
+++ b/packages/console/core/src/drizzle/index.ts
@@ -1,5 +1,5 @@
 import { drizzle } from "drizzle-orm/planetscale-serverless"
-import { Resource } from "@opencode/cloud-resource"
+import { Resource } from "@opencode/console-resource"
 export * from "drizzle-orm"
 import { Client } from "@planetscale/database"
 
diff --git a/packages/cloud/core/src/drizzle/types.ts b/packages/console/core/src/drizzle/types.ts
index f16ad5a8a..f16ad5a8a 100644
--- a/packages/cloud/core/src/drizzle/types.ts
+++ b/packages/console/core/src/drizzle/types.ts
diff --git a/packages/cloud/core/src/identifier.ts b/packages/console/core/src/identifier.ts
index f8e73852e..f8e73852e 100644
--- a/packages/cloud/core/src/identifier.ts
+++ b/packages/console/core/src/identifier.ts
diff --git a/packages/cloud/core/src/key.ts b/packages/console/core/src/key.ts
index 28643a521..28643a521 100644
--- a/packages/cloud/core/src/key.ts
+++ b/packages/console/core/src/key.ts
diff --git a/packages/cloud/core/src/schema/account.sql.ts b/packages/console/core/src/schema/account.sql.ts
index 4d9937114..4d9937114 100644
--- a/packages/cloud/core/src/schema/account.sql.ts
+++ b/packages/console/core/src/schema/account.sql.ts
diff --git a/packages/cloud/core/src/schema/billing.sql.ts b/packages/console/core/src/schema/billing.sql.ts
index 5bec4e900..5bec4e900 100644
--- a/packages/cloud/core/src/schema/billing.sql.ts
+++ b/packages/console/core/src/schema/billing.sql.ts
diff --git a/packages/cloud/core/src/schema/key.sql.ts b/packages/console/core/src/schema/key.sql.ts
index 98b99c788..98b99c788 100644
--- a/packages/cloud/core/src/schema/key.sql.ts
+++ b/packages/console/core/src/schema/key.sql.ts
diff --git a/packages/cloud/core/src/schema/user.sql.ts b/packages/console/core/src/schema/user.sql.ts
index 00c372d1a..00c372d1a 100644
--- a/packages/cloud/core/src/schema/user.sql.ts
+++ b/packages/console/core/src/schema/user.sql.ts
diff --git a/packages/cloud/core/src/schema/workspace.sql.ts b/packages/console/core/src/schema/workspace.sql.ts
index 979255428..979255428 100644
--- a/packages/cloud/core/src/schema/workspace.sql.ts
+++ b/packages/console/core/src/schema/workspace.sql.ts
diff --git a/packages/cloud/core/src/user.ts b/packages/console/core/src/user.ts
index 7914926ff..7914926ff 100644
--- a/packages/cloud/core/src/user.ts
+++ b/packages/console/core/src/user.ts
diff --git a/packages/cloud/core/src/util/env.cloudflare.ts b/packages/console/core/src/util/env.cloudflare.ts
index e69de29bb..e69de29bb 100644
--- a/packages/cloud/core/src/util/env.cloudflare.ts
+++ b/packages/console/core/src/util/env.cloudflare.ts
diff --git a/packages/cloud/core/src/util/fn.ts b/packages/console/core/src/util/fn.ts
index 9efe4622f..9efe4622f 100644
--- a/packages/cloud/core/src/util/fn.ts
+++ b/packages/console/core/src/util/fn.ts
diff --git a/packages/cloud/core/src/util/log.ts b/packages/console/core/src/util/log.ts
index 4f2d25c13..4f2d25c13 100644
--- a/packages/cloud/core/src/util/log.ts
+++ b/packages/console/core/src/util/log.ts
diff --git a/packages/cloud/core/src/util/memo.ts b/packages/console/core/src/util/memo.ts
index 49043010f..49043010f 100644
--- a/packages/cloud/core/src/util/memo.ts
+++ b/packages/console/core/src/util/memo.ts
diff --git a/packages/cloud/core/src/util/price.ts b/packages/console/core/src/util/price.ts
index abdbca032..abdbca032 100644
--- a/packages/cloud/core/src/util/price.ts
+++ b/packages/console/core/src/util/price.ts
diff --git a/packages/cloud/core/src/workspace.ts b/packages/console/core/src/workspace.ts
index a9fb923d6..a9fb923d6 100644
--- a/packages/cloud/core/src/workspace.ts
+++ b/packages/console/core/src/workspace.ts
diff --git a/packages/cloud/core/sst-env.d.ts b/packages/console/core/sst-env.d.ts
index bd5588217..9b9de7327 100644
--- a/packages/cloud/core/sst-env.d.ts
+++ b/packages/console/core/sst-env.d.ts
@@ -6,4 +6,4 @@
 /// <reference path="../../../sst-env.d.ts" />
 
 import "sst"
-export {}
+export {}
+\ No newline at end of file
diff --git a/packages/cloud/core/tsconfig.json b/packages/console/core/tsconfig.json
index 0faf16aab..0faf16aab 100644
--- a/packages/cloud/core/tsconfig.json
+++ b/packages/console/core/tsconfig.json
diff --git a/packages/cloud/function/package.json b/packages/console/function/package.json
index 856db3696..4ced6510b 100644
--- a/packages/cloud/function/package.json
+++ b/packages/console/function/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@opencode/cloud-function",
+  "name": "@opencode/console-function",
   "version": "0.9.11",
   "$schema": "https://json.schemastore.org/package.json",
   "private": true,
diff --git a/packages/cloud/function/src/auth.ts b/packages/console/function/src/auth.ts
index 776855e46..5dc799683 100644
--- a/packages/cloud/function/src/auth.ts
+++ b/packages/console/function/src/auth.ts
@@ -6,11 +6,11 @@ import { THEME_OPENAUTH } from "@openauthjs/openauth/ui/theme"
 import { GithubProvider } from "@openauthjs/openauth/provider/github"
 import { GoogleOidcProvider } from "@openauthjs/openauth/provider/google"
 import { CloudflareStorage } from "@openauthjs/openauth/storage/cloudflare"
-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"
+import { Account } from "@opencode/console-core/account.js"
+import { Workspace } from "@opencode/console-core/workspace.js"
+import { Actor } from "@opencode/console-core/actor.js"
+import { Resource } from "@opencode/console-resource"
+import { Database } from "@opencode/console-core/drizzle/index.js"
 
 type Env = {
   AuthStorage: KVNamespace
diff --git a/packages/cloud/function/src/log-processor.ts b/packages/console/function/src/log-processor.ts
index 70fcf5a44..21b9b214e 100644
--- a/packages/cloud/function/src/log-processor.ts
+++ b/packages/console/function/src/log-processor.ts
@@ -1,4 +1,4 @@
-import { Resource } from "@opencode/cloud-resource"
+import { Resource } from "@opencode/console-resource"
 import type { TraceItem } from "@cloudflare/workers-types"
 
 export default {
diff --git a/packages/console/function/sst-env.d.ts b/packages/console/function/sst-env.d.ts
new file mode 100644
index 000000000..09c60c7c2
--- /dev/null
+++ b/packages/console/function/sst-env.d.ts
@@ -0,0 +1,96 @@
+/* This file is auto-generated by SST. Do not edit. */
+/* tslint:disable */
+/* eslint-disable */
+/* deno-fmt-ignore-file */
+
+import "sst"
+declare module "sst" {
+  export interface Resource {
+    "ANTHROPIC_API_KEY": {
+      "type": "sst.sst.Secret"
+      "value": string
+    }
+    "AUTH_API_URL": {
+      "type": "sst.sst.Linkable"
+      "value": string
+    }
+    "BASETEN_API_KEY": {
+      "type": "sst.sst.Secret"
+      "value": string
+    }
+    "Console": {
+      "type": "sst.cloudflare.SolidStart"
+      "url": string
+    }
+    "Database": {
+      "database": string
+      "host": string
+      "password": string
+      "port": number
+      "type": "sst.sst.Linkable"
+      "username": string
+    }
+    "FIREWORKS_API_KEY": {
+      "type": "sst.sst.Secret"
+      "value": string
+    }
+    "GITHUB_APP_ID": {
+      "type": "sst.sst.Secret"
+      "value": string
+    }
+    "GITHUB_APP_PRIVATE_KEY": {
+      "type": "sst.sst.Secret"
+      "value": string
+    }
+    "GITHUB_CLIENT_ID_CONSOLE": {
+      "type": "sst.sst.Secret"
+      "value": string
+    }
+    "GITHUB_CLIENT_SECRET_CONSOLE": {
+      "type": "sst.sst.Secret"
+      "value": string
+    }
+    "GOOGLE_CLIENT_ID": {
+      "type": "sst.sst.Secret"
+      "value": string
+    }
+    "HONEYCOMB_API_KEY": {
+      "type": "sst.sst.Secret"
+      "value": string
+    }
+    "OPENAI_API_KEY": {
+      "type": "sst.sst.Secret"
+      "value": string
+    }
+    "STRIPE_SECRET_KEY": {
+      "type": "sst.sst.Secret"
+      "value": string
+    }
+    "STRIPE_WEBHOOK_SECRET": {
+      "type": "sst.sst.Linkable"
+      "value": string
+    }
+    "Web": {
+      "type": "sst.cloudflare.Astro"
+      "url": string
+    }
+    "XAI_API_KEY": {
+      "type": "sst.sst.Secret"
+      "value": string
+    }
+  }
+}
+// cloudflare 
+import * as cloudflare from "@cloudflare/workers-types";
+declare module "sst" {
+  export interface Resource {
+    "Api": cloudflare.Service
+    "AuthApi": cloudflare.Service
+    "AuthStorage": cloudflare.KVNamespace
+    "Bucket": cloudflare.R2Bucket
+    "LogProcessor": cloudflare.Service
+  }
+}
+
+import "sst"
+export {}
+\ No newline at end of file
diff --git a/packages/cloud/function/tsconfig.json b/packages/console/function/tsconfig.json
index 0faf16aab..0faf16aab 100644
--- a/packages/cloud/function/tsconfig.json
+++ b/packages/console/function/tsconfig.json
diff --git a/packages/cloud/resource/bun.lock b/packages/console/resource/bun.lock
index 56bdf44ca..56bdf44ca 100644
--- a/packages/cloud/resource/bun.lock
+++ b/packages/console/resource/bun.lock
diff --git a/packages/cloud/resource/package.json b/packages/console/resource/package.json
index fd9fa6f34..94a654548 100644
--- a/packages/cloud/resource/package.json
+++ b/packages/console/resource/package.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "name": "@opencode/cloud-resource",
+  "name": "@opencode/console-resource",
   "dependencies": {
     "@cloudflare/workers-types": "^4.20250830.0"
   },
diff --git a/packages/cloud/resource/resource.cloudflare.ts b/packages/console/resource/resource.cloudflare.ts
index a56b1e417..a56b1e417 100644
--- a/packages/cloud/resource/resource.cloudflare.ts
+++ b/packages/console/resource/resource.cloudflare.ts
diff --git a/packages/cloud/resource/resource.node.ts b/packages/console/resource/resource.node.ts
index d7dbb6c6d..d7dbb6c6d 100644
--- a/packages/cloud/resource/resource.node.ts
+++ b/packages/console/resource/resource.node.ts
diff --git a/packages/console/resource/sst-env.d.ts b/packages/console/resource/sst-env.d.ts
new file mode 100644
index 000000000..09c60c7c2
--- /dev/null
+++ b/packages/console/resource/sst-env.d.ts
@@ -0,0 +1,96 @@
+/* This file is auto-generated by SST. Do not edit. */
+/* tslint:disable */
+/* eslint-disable */
+/* deno-fmt-ignore-file */
+
+import "sst"
+declare module "sst" {
+  export interface Resource {
+    "ANTHROPIC_API_KEY": {
+      "type": "sst.sst.Secret"
+      "value": string
+    }
+    "AUTH_API_URL": {
+      "type": "sst.sst.Linkable"
+      "value": string
+    }
+    "BASETEN_API_KEY": {
+      "type": "sst.sst.Secret"
+      "value": string
+    }
+    "Console": {
+      "type": "sst.cloudflare.SolidStart"
+      "url": string
+    }
+    "Database": {
+      "database": string
+      "host": string
+      "password": string
+      "port": number
+      "type": "sst.sst.Linkable"
+      "username": string
+    }
+    "FIREWORKS_API_KEY": {
+      "type": "sst.sst.Secret"
+      "value": string
+    }
+    "GITHUB_APP_ID": {
+      "type": "sst.sst.Secret"
+      "value": string
+    }
+    "GITHUB_APP_PRIVATE_KEY": {
+      "type": "sst.sst.Secret"
+      "value": string
+    }
+    "GITHUB_CLIENT_ID_CONSOLE": {
+      "type": "sst.sst.Secret"
+      "value": string
+    }
+    "GITHUB_CLIENT_SECRET_CONSOLE": {
+      "type": "sst.sst.Secret"
+      "value": string
+    }
+    "GOOGLE_CLIENT_ID": {
+      "type": "sst.sst.Secret"
+      "value": string
+    }
+    "HONEYCOMB_API_KEY": {
+      "type": "sst.sst.Secret"
+      "value": string
+    }
+    "OPENAI_API_KEY": {
+      "type": "sst.sst.Secret"
+      "value": string
+    }
+    "STRIPE_SECRET_KEY": {
+      "type": "sst.sst.Secret"
+      "value": string
+    }
+    "STRIPE_WEBHOOK_SECRET": {
+      "type": "sst.sst.Linkable"
+      "value": string
+    }
+    "Web": {
+      "type": "sst.cloudflare.Astro"
+      "url": string
+    }
+    "XAI_API_KEY": {
+      "type": "sst.sst.Secret"
+      "value": string
+    }
+  }
+}
+// cloudflare 
+import * as cloudflare from "@cloudflare/workers-types";
+declare module "sst" {
+  export interface Resource {
+    "Api": cloudflare.Service
+    "AuthApi": cloudflare.Service
+    "AuthStorage": cloudflare.KVNamespace
+    "Bucket": cloudflare.R2Bucket
+    "LogProcessor": cloudflare.Service
+  }
+}
+
+import "sst"
+export {}
+\ No newline at end of file
diff --git a/packages/cloud/resource/tsconfig.json b/packages/console/resource/tsconfig.json
index 0faf16aab..0faf16aab 100644
--- a/packages/cloud/resource/tsconfig.json
+++ b/packages/console/resource/tsconfig.json
diff --git a/packages/cloud/scripts/.gitignore b/packages/console/scripts/.gitignore
index 18c5ea0f8..18c5ea0f8 100644
--- a/packages/cloud/scripts/.gitignore
+++ b/packages/console/scripts/.gitignore
diff --git a/packages/cloud/scripts/package.json b/packages/console/scripts/package.json
index bddc1b967..06795ee15 100644
--- a/packages/cloud/scripts/package.json
+++ b/packages/console/scripts/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@opencode/cloud-scripts",
+  "name": "@opencode/console-scripts",
   "version": "0.9.11",
   "$schema": "https://json.schemastore.org/package.json",
   "private": true,
@@ -10,7 +10,7 @@
     "shell-prod": "sst shell --stage production -- bun tsx"
   },
   "dependencies": {
-    "@opencode/cloud-core": "workspace:*",
+    "@opencode/console-core": "workspace:*",
     "tsx": "4.20.5"
   },
   "devDependencies": {
diff --git a/packages/cloud/scripts/src/backfill-usage-provider.ts b/packages/console/scripts/src/backfill-usage-provider.ts
index 553dcb478..1485735da 100644
--- a/packages/cloud/scripts/src/backfill-usage-provider.ts
+++ b/packages/console/scripts/src/backfill-usage-provider.ts
@@ -1,5 +1,5 @@
-import { Database, eq } from "@opencode/cloud-core/drizzle/index.js"
-import { UsageTable } from "@opencode/cloud-core/schema/billing.sql.js"
+import { Database, eq } from "@opencode/console-core/drizzle/index.js"
+import { UsageTable } from "@opencode/console-core/schema/billing.sql.js"
 
 await Database.use(async (tx) => {
   await tx
diff --git a/packages/cloud/scripts/sst-env.d.ts b/packages/console/scripts/sst-env.d.ts
index bd5588217..9b9de7327 100644
--- a/packages/cloud/scripts/sst-env.d.ts
+++ b/packages/console/scripts/sst-env.d.ts
@@ -6,4 +6,4 @@
 /// <reference path="../../../sst-env.d.ts" />
 
 import "sst"
-export {}
+export {}
+\ No newline at end of file
diff --git a/packages/cloud/scripts/tsconfig.json b/packages/console/scripts/tsconfig.json
index 0faf16aab..0faf16aab 100644
--- a/packages/cloud/scripts/tsconfig.json
+++ b/packages/console/scripts/tsconfig.json
diff --git a/packages/function/sst-env.d.ts b/packages/function/sst-env.d.ts
index afa8c6fe7..09c60c7c2 100644
--- a/packages/function/sst-env.d.ts
+++ b/packages/function/sst-env.d.ts
@@ -6,91 +6,91 @@
 import "sst"
 declare module "sst" {
   export interface Resource {
-    ANTHROPIC_API_KEY: {
-      type: "sst.sst.Secret"
-      value: string
-    }
-    AUTH_API_URL: {
-      type: "sst.sst.Linkable"
-      value: string
-    }
-    BASETEN_API_KEY: {
-      type: "sst.sst.Secret"
-      value: string
-    }
-    Console: {
-      type: "sst.cloudflare.SolidStart"
-      url: string
-    }
-    Database: {
-      database: string
-      host: string
-      password: string
-      port: number
-      type: "sst.sst.Linkable"
-      username: string
-    }
-    FIREWORKS_API_KEY: {
-      type: "sst.sst.Secret"
-      value: string
-    }
-    GITHUB_APP_ID: {
-      type: "sst.sst.Secret"
-      value: string
-    }
-    GITHUB_APP_PRIVATE_KEY: {
-      type: "sst.sst.Secret"
-      value: string
-    }
-    GITHUB_CLIENT_ID_CONSOLE: {
-      type: "sst.sst.Secret"
-      value: string
-    }
-    GITHUB_CLIENT_SECRET_CONSOLE: {
-      type: "sst.sst.Secret"
-      value: string
-    }
-    GOOGLE_CLIENT_ID: {
-      type: "sst.sst.Secret"
-      value: string
-    }
-    HONEYCOMB_API_KEY: {
-      type: "sst.sst.Secret"
-      value: string
-    }
-    OPENAI_API_KEY: {
-      type: "sst.sst.Secret"
-      value: string
-    }
-    STRIPE_SECRET_KEY: {
-      type: "sst.sst.Secret"
-      value: string
-    }
-    STRIPE_WEBHOOK_SECRET: {
-      type: "sst.sst.Linkable"
-      value: string
-    }
-    Web: {
-      type: "sst.cloudflare.Astro"
-      url: string
-    }
-    XAI_API_KEY: {
-      type: "sst.sst.Secret"
-      value: string
+    "ANTHROPIC_API_KEY": {
+      "type": "sst.sst.Secret"
+      "value": string
+    }
+    "AUTH_API_URL": {
+      "type": "sst.sst.Linkable"
+      "value": string
+    }
+    "BASETEN_API_KEY": {
+      "type": "sst.sst.Secret"
+      "value": string
+    }
+    "Console": {
+      "type": "sst.cloudflare.SolidStart"
+      "url": string
+    }
+    "Database": {
+      "database": string
+      "host": string
+      "password": string
+      "port": number
+      "type": "sst.sst.Linkable"
+      "username": string
+    }
+    "FIREWORKS_API_KEY": {
+      "type": "sst.sst.Secret"
+      "value": string
+    }
+    "GITHUB_APP_ID": {
+      "type": "sst.sst.Secret"
+      "value": string
+    }
+    "GITHUB_APP_PRIVATE_KEY": {
+      "type": "sst.sst.Secret"
+      "value": string
+    }
+    "GITHUB_CLIENT_ID_CONSOLE": {
+      "type": "sst.sst.Secret"
+      "value": string
+    }
+    "GITHUB_CLIENT_SECRET_CONSOLE": {
+      "type": "sst.sst.Secret"
+      "value": string
+    }
+    "GOOGLE_CLIENT_ID": {
+      "type": "sst.sst.Secret"
+      "value": string
+    }
+    "HONEYCOMB_API_KEY": {
+      "type": "sst.sst.Secret"
+      "value": string
+    }
+    "OPENAI_API_KEY": {
+      "type": "sst.sst.Secret"
+      "value": string
+    }
+    "STRIPE_SECRET_KEY": {
+      "type": "sst.sst.Secret"
+      "value": string
+    }
+    "STRIPE_WEBHOOK_SECRET": {
+      "type": "sst.sst.Linkable"
+      "value": string
+    }
+    "Web": {
+      "type": "sst.cloudflare.Astro"
+      "url": string
+    }
+    "XAI_API_KEY": {
+      "type": "sst.sst.Secret"
+      "value": string
     }
   }
 }
-// cloudflare
-import * as cloudflare from "@cloudflare/workers-types"
+// cloudflare 
+import * as cloudflare from "@cloudflare/workers-types";
 declare module "sst" {
   export interface Resource {
-    Api: cloudflare.Service
-    AuthApi: cloudflare.Service
-    AuthStorage: cloudflare.KVNamespace
-    Bucket: cloudflare.R2Bucket
-    LogProcessor: cloudflare.Service
+    "Api": cloudflare.Service
+    "AuthApi": cloudflare.Service
+    "AuthStorage": cloudflare.KVNamespace
+    "Bucket": cloudflare.R2Bucket
+    "LogProcessor": cloudflare.Service
   }
 }
 
 import "sst"
-export {}
+export {}
+\ No newline at end of file
diff --git a/packages/opencode/sst-env.d.ts b/packages/opencode/sst-env.d.ts
index 0397645b5..b6a7e9066 100644
--- a/packages/opencode/sst-env.d.ts
+++ b/packages/opencode/sst-env.d.ts
@@ -6,4 +6,4 @@
 /// <reference path="../../sst-env.d.ts" />
 
 import "sst"
-export {}
+export {}
+\ No newline at end of file
diff --git a/packages/plugin/sst-env.d.ts b/packages/plugin/sst-env.d.ts
index 0397645b5..b6a7e9066 100644
--- a/packages/plugin/sst-env.d.ts
+++ b/packages/plugin/sst-env.d.ts
@@ -6,4 +6,4 @@
 /// <reference path="../../sst-env.d.ts" />
 
 import "sst"
-export {}
+export {}
+\ No newline at end of file
diff --git a/packages/sdk/js/sst-env.d.ts b/packages/sdk/js/sst-env.d.ts
index bd5588217..9b9de7327 100644
--- a/packages/sdk/js/sst-env.d.ts
+++ b/packages/sdk/js/sst-env.d.ts
@@ -6,4 +6,4 @@
 /// <reference path="../../../sst-env.d.ts" />
 
 import "sst"
-export {}
+export {}
+\ No newline at end of file
diff --git a/packages/web/sst-env.d.ts b/packages/web/sst-env.d.ts
index 0397645b5..b6a7e9066 100644
--- a/packages/web/sst-env.d.ts
+++ b/packages/web/sst-env.d.ts
@@ -6,4 +6,4 @@
 /// <reference path="../../sst-env.d.ts" />
 
 import "sst"
-export {}
+export {}
+\ No newline at end of file