74 files changed, 78 insertions, 67 deletions

diff --git a/bun.lock b/bun.lock
index dee942825..55d5d46ec 100644
--- a/bun.lock
+++ b/bun.lock
@@ -27,6 +27,54 @@
         "turbo": "2.5.6",
       },
     },
+    "packages/app": {
+      "name": "@opencode-ai/app",
+      "version": "1.0.190",
+      "dependencies": {
+        "@kobalte/core": "catalog:",
+        "@opencode-ai/sdk": "workspace:*",
+        "@opencode-ai/ui": "workspace:*",
+        "@opencode-ai/util": "workspace:*",
+        "@shikijs/transformers": "3.9.2",
+        "@solid-primitives/active-element": "2.1.3",
+        "@solid-primitives/audio": "1.4.2",
+        "@solid-primitives/event-bus": "1.1.2",
+        "@solid-primitives/media": "2.3.3",
+        "@solid-primitives/resize-observer": "2.1.3",
+        "@solid-primitives/scroll": "2.1.3",
+        "@solid-primitives/storage": "catalog:",
+        "@solid-primitives/websocket": "1.3.1",
+        "@solidjs/meta": "catalog:",
+        "@solidjs/router": "catalog:",
+        "@thisbeyond/solid-dnd": "0.7.5",
+        "diff": "catalog:",
+        "fuzzysort": "catalog:",
+        "ghostty-web": "0.3.0",
+        "luxon": "catalog:",
+        "marked": "16.2.0",
+        "marked-shiki": "1.2.1",
+        "remeda": "catalog:",
+        "shiki": "3.9.2",
+        "solid-js": "catalog:",
+        "solid-list": "catalog:",
+        "tailwindcss": "catalog:",
+        "virtua": "catalog:",
+        "zod": "catalog:",
+      },
+      "devDependencies": {
+        "@happy-dom/global-registrator": "20.0.11",
+        "@tailwindcss/vite": "catalog:",
+        "@tsconfig/bun": "1.0.9",
+        "@types/bun": "catalog:",
+        "@types/luxon": "catalog:",
+        "@types/node": "catalog:",
+        "@typescript/native-preview": "catalog:",
+        "typescript": "catalog:",
+        "vite": "catalog:",
+        "vite-plugin-icons-spritesheet": "3.0.1",
+        "vite-plugin-solid": "catalog:",
+      },
+    },
     "packages/console/app": {
       "name": "@opencode-ai/console-app",
       "version": "1.0.190",
@@ -130,54 +178,6 @@
         "cloudflare": "5.2.0",
       },
     },
-    "packages/desktop": {
-      "name": "@opencode-ai/desktop",
-      "version": "1.0.190",
-      "dependencies": {
-        "@kobalte/core": "catalog:",
-        "@opencode-ai/sdk": "workspace:*",
-        "@opencode-ai/ui": "workspace:*",
-        "@opencode-ai/util": "workspace:*",
-        "@shikijs/transformers": "3.9.2",
-        "@solid-primitives/active-element": "2.1.3",
-        "@solid-primitives/audio": "1.4.2",
-        "@solid-primitives/event-bus": "1.1.2",
-        "@solid-primitives/media": "2.3.3",
-        "@solid-primitives/resize-observer": "2.1.3",
-        "@solid-primitives/scroll": "2.1.3",
-        "@solid-primitives/storage": "catalog:",
-        "@solid-primitives/websocket": "1.3.1",
-        "@solidjs/meta": "catalog:",
-        "@solidjs/router": "catalog:",
-        "@thisbeyond/solid-dnd": "0.7.5",
-        "diff": "catalog:",
-        "fuzzysort": "catalog:",
-        "ghostty-web": "0.3.0",
-        "luxon": "catalog:",
-        "marked": "16.2.0",
-        "marked-shiki": "1.2.1",
-        "remeda": "catalog:",
-        "shiki": "3.9.2",
-        "solid-js": "catalog:",
-        "solid-list": "catalog:",
-        "tailwindcss": "catalog:",
-        "virtua": "catalog:",
-        "zod": "catalog:",
-      },
-      "devDependencies": {
-        "@happy-dom/global-registrator": "20.0.11",
-        "@tailwindcss/vite": "catalog:",
-        "@tsconfig/bun": "1.0.9",
-        "@types/bun": "catalog:",
-        "@types/luxon": "catalog:",
-        "@types/node": "catalog:",
-        "@typescript/native-preview": "catalog:",
-        "typescript": "catalog:",
-        "vite": "catalog:",
-        "vite-plugin-icons-spritesheet": "3.0.1",
-        "vite-plugin-solid": "catalog:",
-      },
-    },
     "packages/enterprise": {
       "name": "@opencode-ai/enterprise",
       "version": "1.0.190",
@@ -365,7 +365,7 @@
       "name": "@opencode-ai/tauri",
       "version": "1.0.190",
       "dependencies": {
-        "@opencode-ai/desktop": "workspace:*",
+        "@opencode-ai/app": "workspace:*",
         "@solid-primitives/storage": "catalog:",
         "@tauri-apps/api": "^2",
         "@tauri-apps/plugin-dialog": "~2",
@@ -1148,6 +1148,8 @@
 
     "@openauthjs/openauth": ["@openauthjs/[email protected]", "", { "dependencies": { "@standard-schema/spec": "1.0.0-beta.3", "aws4fetch": "1.0.20", "jose": "5.9.6" }, "peerDependencies": { "arctic": "^2.2.2", "hono": "^4.0.0" } }, "sha512-p5IWSRXvABcwocH2dNI0w8c1QJelIOFulwhKk+aLLFfUbs8u1pr7kQbYe8yCSM2+bcLHiwbogpUQc2ovrGwCuw=="],
 
+    "@opencode-ai/app": ["@opencode-ai/app@workspace:packages/app"],
+
     "@opencode-ai/console-app": ["@opencode-ai/console-app@workspace:packages/console/app"],
 
     "@opencode-ai/console-core": ["@opencode-ai/console-core@workspace:packages/console/core"],
@@ -1158,8 +1160,6 @@
 
     "@opencode-ai/console-resource": ["@opencode-ai/console-resource@workspace:packages/console/resource"],
 
-    "@opencode-ai/desktop": ["@opencode-ai/desktop@workspace:packages/desktop"],
-
     "@opencode-ai/enterprise": ["@opencode-ai/enterprise@workspace:packages/enterprise"],
 
     "@opencode-ai/function": ["@opencode-ai/function@workspace:packages/function"],
@@ -2068,7 +2068,7 @@
 
     "chainsaw": ["[email protected]", "", { "dependencies": { "traverse": ">=0.3.0 <0.4" } }, "sha512-75kWfWt6MEKNC8xYXIdRpDehRYY/tNSgwKaJq+dbbDcxORuVrrQ+SEHoWsniVn9XPYfP4gmdWIeDk/4YNp1rNQ=="],
 
-    "chalk": ["[email protected]", "", { "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" } }, "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="],
+    "chalk": ["[email protected]", "", {}, "sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA=="],
 
     "character-entities": ["[email protected]", "", {}, "sha512-shx7oQ0Awen/BRIdkjkvz54PnEEI/EjwXDSIZp86/KKdbafHh1Df/RYGBhn4hbe2+uKC9FnT5UCEdyPz3ai9hQ=="],
 
@@ -3982,6 +3982,8 @@
 
     "@cspotcode/source-map-support/@jridgewell/trace-mapping": ["@jridgewell/[email protected]", "", { "dependencies": { "@jridgewell/resolve-uri": "^3.0.3", "@jridgewell/sourcemap-codec": "^1.4.10" } }, "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ=="],
 
+    "@dot/log/chalk": ["[email protected]", "", { "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" } }, "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="],
+
     "@esbuild-kit/core-utils/esbuild": ["[email protected]", "", { "optionalDependencies": { "@esbuild/android-arm": "0.18.20", "@esbuild/android-arm64": "0.18.20", "@esbuild/android-x64": "0.18.20", "@esbuild/darwin-arm64": "0.18.20", "@esbuild/darwin-x64": "0.18.20", "@esbuild/freebsd-arm64": "0.18.20", "@esbuild/freebsd-x64": "0.18.20", "@esbuild/linux-arm": "0.18.20", "@esbuild/linux-arm64": "0.18.20", "@esbuild/linux-ia32": "0.18.20", "@esbuild/linux-loong64": "0.18.20", "@esbuild/linux-mips64el": "0.18.20", "@esbuild/linux-ppc64": "0.18.20", "@esbuild/linux-riscv64": "0.18.20", "@esbuild/linux-s390x": "0.18.20", "@esbuild/linux-x64": "0.18.20", "@esbuild/netbsd-x64": "0.18.20", "@esbuild/openbsd-x64": "0.18.20", "@esbuild/sunos-x64": "0.18.20", "@esbuild/win32-arm64": "0.18.20", "@esbuild/win32-ia32": "0.18.20", "@esbuild/win32-x64": "0.18.20" }, "bin": { "esbuild": "bin/esbuild" } }, "sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA=="],
 
     "@expressive-code/plugin-shiki/shiki": ["[email protected]", "", { "dependencies": { "@shikijs/core": "3.15.0", "@shikijs/engine-javascript": "3.15.0", "@shikijs/engine-oniguruma": "3.15.0", "@shikijs/langs": "3.15.0", "@shikijs/themes": "3.15.0", "@shikijs/types": "3.15.0", "@shikijs/vscode-textmate": "^10.0.2", "@types/hast": "^3.0.4" } }, "sha512-kLdkY6iV3dYbtPwS9KXU7mjfmDm25f5m0IPNFnaXO7TBPcvbUOY72PYXSuSqDzwp+vlH/d7MXpHlKO/x+QoLXw=="],
@@ -4028,6 +4030,8 @@
 
     "@jimp/types/zod": ["[email protected]", "", {}, "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ=="],
 
+    "@jsx-email/cli/chalk": ["[email protected]", "", { "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" } }, "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="],
+
     "@jsx-email/cli/esbuild": ["[email protected]", "", { "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=="],
 
     "@jsx-email/cli/tailwindcss": ["[email protected]", "", { "dependencies": { "@alloc/quick-lru": "^5.2.0", "arg": "^5.0.2", "chokidar": "^3.5.3", "didyoumean": "^1.2.2", "dlv": "^1.1.3", "fast-glob": "^3.2.12", "glob-parent": "^6.0.2", "is-glob": "^4.0.3", "jiti": "^1.18.2", "lilconfig": "^2.1.0", "micromatch": "^4.0.5", "normalize-path": "^3.0.0", "object-hash": "^3.0.0", "picocolors": "^1.0.0", "postcss": "^8.4.23", "postcss-import": "^15.1.0", "postcss-js": "^4.0.1", "postcss-load-config": "^4.0.1", "postcss-nested": "^6.0.1", "postcss-selector-parser": "^6.0.11", "resolve": "^1.22.2", "sucrase": "^3.32.0" }, "bin": { "tailwind": "lib/cli.js", "tailwindcss": "lib/cli.js" } }, "sha512-A0KgSkef7eE4Mf+nKJ83i75TMyq8HqY3qmFIJSWy8bNt0v1lG7jUcpGpoTFxAwYcWOphcTBLPPJg+bDfhDf52w=="],
@@ -4208,8 +4212,6 @@
 
     "body-parser/qs": ["[email protected]", "", { "dependencies": { "side-channel": "^1.0.6" } }, "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg=="],
 
-    "boxen/chalk": ["[email protected]", "", {}, "sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA=="],
-
     "clean-css/source-map": ["[email protected]", "", {}, "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="],
 
     "compress-commons/is-stream": ["[email protected]", "", {}, "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg=="],
@@ -4228,6 +4230,8 @@
 
     "es-get-iterator/isarray": ["[email protected]", "", {}, "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw=="],
 
+    "esbuild-plugin-copy/chalk": ["[email protected]", "", { "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" } }, "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="],
+
     "esbuild-plugin-copy/chokidar": ["[email protected]", "", { "dependencies": { "anymatch": "~3.1.2", "braces": "~3.0.2", "glob-parent": "~5.1.2", "is-binary-path": "~2.1.0", "is-glob": "~4.0.1", "normalize-path": "~3.0.0", "readdirp": "~3.6.0" }, "optionalDependencies": { "fsevents": "~2.3.2" } }, "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw=="],
 
     "execa/is-stream": ["[email protected]", "", {}, "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA=="],
@@ -4378,8 +4382,6 @@
 
     "utif2/pako": ["[email protected]", "", {}, "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="],
 
-    "vite-plugin-icons-spritesheet/chalk": ["[email protected]", "", {}, "sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA=="],
-
     "vitest/tinyexec": ["[email protected]", "", {}, "sha512-W/KYk+NFhkmsYpuHq5JykngiOCnxeVL8v8dFnqxSD8qEEdRfXk1SDM6JzNqcERbcGYj9tMrDQBYV9cjgnunFIg=="],
 
     "vitest/vite": ["[email protected]", "", { "dependencies": { "esbuild": "^0.25.0", "fdir": "^6.5.0", "picomatch": "^4.0.3", "postcss": "^8.5.6", "rollup": "^4.43.0", "tinyglobby": "^0.2.15" }, "optionalDependencies": { "fsevents": "~2.3.3" }, "peerDependencies": { "@types/node": "^20.19.0 || >=22.12.0", "jiti": ">=1.21.0", "less": "^4.0.0", "lightningcss": "^1.21.0", "sass": "^1.70.0", "sass-embedded": "^1.70.0", "stylus": ">=0.54.8", "sugarss": "^5.0.0", "terser": "^5.16.0", "tsx": "^4.8.1", "yaml": "^2.4.2" }, "optionalPeers": ["@types/node", "jiti", "less", "lightningcss", "sass", "sass-embedded", "stylus", "sugarss", "terser", "tsx", "yaml"], "bin": { "vite": "bin/vite.js" } }, "sha512-CmuvUBzVJ/e3HGxhg6cYk88NGgTnBoOo7ogtfJJ0fefUWAxN/WDSUa50o+oVBxuIhO8FoEZW0j2eW7sfjs5EtA=="],
diff --git a/infra/app.ts b/infra/app.ts
index 7215995ba..da4ac45b8 100644
--- a/infra/app.ts
+++ b/infra/app.ts
@@ -44,3 +44,12 @@ new sst.cloudflare.x.Astro("Web", {
     VITE_API_URL: api.url.apply((url) => url!),
   },
 })
+
+new sst.cloudflare.StaticSite("App", {
+  domain: "app." + domain,
+  path: "packages/app",
+  build: {
+    command: "bun turbo build",
+    output: "./dist",
+  },
+})
diff --git a/infra/desktop.ts b/infra/desktop.ts
index d4e32c65d..5c4155cc9 100644
--- a/infra/desktop.ts
+++ b/infra/desktop.ts
@@ -2,7 +2,7 @@ import { domain } from "./stage"
 
 new sst.cloudflare.StaticSite("Desktop", {
   domain: "desktop." + domain,
-  path: "packages/desktop",
+  path: "packages/app",
   build: {
     command: "bun turbo build",
     output: "./dist",
diff --git a/packages/desktop/.gitignore b/packages/app/.gitignore
index 4a20d55a7..4a20d55a7 100644
--- a/packages/desktop/.gitignore
+++ b/packages/app/.gitignore
diff --git a/packages/desktop/AGENTS.md b/packages/app/AGENTS.md
index 3137bddc2..3137bddc2 100644
--- a/packages/desktop/AGENTS.md
+++ b/packages/app/AGENTS.md
diff --git a/packages/desktop/README.md b/packages/app/README.md
index 6a1764536..6a1764536 100644
--- a/packages/desktop/README.md
+++ b/packages/app/README.md
diff --git a/packages/desktop/bunfig.toml b/packages/app/bunfig.toml
index 363990451..363990451 100644
--- a/packages/desktop/bunfig.toml
+++ b/packages/app/bunfig.toml
diff --git a/packages/desktop/happydom.ts b/packages/app/happydom.ts
index de726718f..de726718f 100644
--- a/packages/desktop/happydom.ts
+++ b/packages/app/happydom.ts
diff --git a/packages/desktop/index.html b/packages/app/index.html
index 9803517a0..9803517a0 100644
--- a/packages/desktop/index.html
+++ b/packages/app/index.html
diff --git a/packages/desktop/package.json b/packages/app/package.json
index 7665f6d0c..f1f5aef50 100644
--- a/packages/desktop/package.json
+++ b/packages/app/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@opencode-ai/desktop",
+  "name": "@opencode-ai/app",
   "version": "1.0.190",
   "description": "",
   "type": "module",
diff --git a/packages/desktop/public/apple-touch-icon.png b/packages/app/public/apple-touch-icon.png
index fb6e8b170..fb6e8b170 120000
--- a/packages/desktop/public/apple-touch-icon.png
+++ b/packages/app/public/apple-touch-icon.png
diff --git a/packages/desktop/public/favicon-96x96.png b/packages/app/public/favicon-96x96.png
index 155c5ed2f..155c5ed2f 120000
--- a/packages/desktop/public/favicon-96x96.png
+++ b/packages/app/public/favicon-96x96.png
diff --git a/packages/desktop/public/favicon.ico b/packages/app/public/favicon.ico
index 1c90f01b1..1c90f01b1 120000
--- a/packages/desktop/public/favicon.ico
+++ b/packages/app/public/favicon.ico
diff --git a/packages/desktop/public/favicon.svg b/packages/app/public/favicon.svg
index 80804d257..80804d257 120000
--- a/packages/desktop/public/favicon.svg
+++ b/packages/app/public/favicon.svg
diff --git a/packages/desktop/public/site.webmanifest b/packages/app/public/site.webmanifest
index a116d7879..a116d7879 120000
--- a/packages/desktop/public/site.webmanifest
+++ b/packages/app/public/site.webmanifest
diff --git a/packages/desktop/public/social-share-zen.png b/packages/app/public/social-share-zen.png
index 02f205fc5..02f205fc5 120000
--- a/packages/desktop/public/social-share-zen.png
+++ b/packages/app/public/social-share-zen.png
diff --git a/packages/desktop/public/social-share.png b/packages/app/public/social-share.png
index 88bf2d4c6..88bf2d4c6 120000
--- a/packages/desktop/public/social-share.png
+++ b/packages/app/public/social-share.png
diff --git a/packages/desktop/public/web-app-manifest-192x192.png b/packages/app/public/web-app-manifest-192x192.png
index 8cfdf8ca5..8cfdf8ca5 120000
--- a/packages/desktop/public/web-app-manifest-192x192.png
+++ b/packages/app/public/web-app-manifest-192x192.png
diff --git a/packages/desktop/public/web-app-manifest-512x512.png b/packages/app/public/web-app-manifest-512x512.png
index 4165998e6..4165998e6 120000
--- a/packages/desktop/public/web-app-manifest-512x512.png
+++ b/packages/app/public/web-app-manifest-512x512.png
diff --git a/packages/desktop/src/addons/serialize.test.ts b/packages/app/src/addons/serialize.test.ts
index ad165f43f..ad165f43f 100644
--- a/packages/desktop/src/addons/serialize.test.ts
+++ b/packages/app/src/addons/serialize.test.ts
diff --git a/packages/desktop/src/addons/serialize.ts b/packages/app/src/addons/serialize.ts
index cb1ff8442..cb1ff8442 100644
--- a/packages/desktop/src/addons/serialize.ts
+++ b/packages/app/src/addons/serialize.ts
diff --git a/packages/desktop/src/app.tsx b/packages/app/src/app.tsx
index 11216643e..11216643e 100644
--- a/packages/desktop/src/app.tsx
+++ b/packages/app/src/app.tsx
diff --git a/packages/desktop/src/components/dialog-connect-provider.tsx b/packages/app/src/components/dialog-connect-provider.tsx
index 789a5d3b7..789a5d3b7 100644
--- a/packages/desktop/src/components/dialog-connect-provider.tsx
+++ b/packages/app/src/components/dialog-connect-provider.tsx
diff --git a/packages/desktop/src/components/dialog-manage-models.tsx b/packages/app/src/components/dialog-manage-models.tsx
index 66d125288..66d125288 100644
--- a/packages/desktop/src/components/dialog-manage-models.tsx
+++ b/packages/app/src/components/dialog-manage-models.tsx
diff --git a/packages/desktop/src/components/dialog-select-file.tsx b/packages/app/src/components/dialog-select-file.tsx
index b27afdc8b..b27afdc8b 100644
--- a/packages/desktop/src/components/dialog-select-file.tsx
+++ b/packages/app/src/components/dialog-select-file.tsx
diff --git a/packages/desktop/src/components/dialog-select-model-unpaid.tsx b/packages/app/src/components/dialog-select-model-unpaid.tsx
index 24ec8092d..24ec8092d 100644
--- a/packages/desktop/src/components/dialog-select-model-unpaid.tsx
+++ b/packages/app/src/components/dialog-select-model-unpaid.tsx
diff --git a/packages/desktop/src/components/dialog-select-model.tsx b/packages/app/src/components/dialog-select-model.tsx
index 54783386a..54783386a 100644
--- a/packages/desktop/src/components/dialog-select-model.tsx
+++ b/packages/app/src/components/dialog-select-model.tsx
diff --git a/packages/desktop/src/components/dialog-select-provider.tsx b/packages/app/src/components/dialog-select-provider.tsx
index 5bbde5d41..5bbde5d41 100644
--- a/packages/desktop/src/components/dialog-select-provider.tsx
+++ b/packages/app/src/components/dialog-select-provider.tsx
diff --git a/packages/desktop/src/components/file-tree.tsx b/packages/app/src/components/file-tree.tsx
index 0841c71d1..0841c71d1 100644
--- a/packages/desktop/src/components/file-tree.tsx
+++ b/packages/app/src/components/file-tree.tsx
diff --git a/packages/desktop/src/components/header.tsx b/packages/app/src/components/header.tsx
index ec7cdfa25..ec7cdfa25 100644
--- a/packages/desktop/src/components/header.tsx
+++ b/packages/app/src/components/header.tsx
diff --git a/packages/desktop/src/components/link.tsx b/packages/app/src/components/link.tsx
index e13c31330..e13c31330 100644
--- a/packages/desktop/src/components/link.tsx
+++ b/packages/app/src/components/link.tsx
diff --git a/packages/desktop/src/components/prompt-input.tsx b/packages/app/src/components/prompt-input.tsx
index 94d4ae97e..94d4ae97e 100644
--- a/packages/desktop/src/components/prompt-input.tsx
+++ b/packages/app/src/components/prompt-input.tsx
diff --git a/packages/desktop/src/components/session-context-usage.tsx b/packages/app/src/components/session-context-usage.tsx
index 5474005c7..5474005c7 100644
--- a/packages/desktop/src/components/session-context-usage.tsx
+++ b/packages/app/src/components/session-context-usage.tsx
diff --git a/packages/desktop/src/components/terminal.tsx b/packages/app/src/components/terminal.tsx
index c05ddfbf6..c05ddfbf6 100644
--- a/packages/desktop/src/components/terminal.tsx
+++ b/packages/app/src/components/terminal.tsx
diff --git a/packages/desktop/src/context/command.tsx b/packages/app/src/context/command.tsx
index f91a1cf05..f91a1cf05 100644
--- a/packages/desktop/src/context/command.tsx
+++ b/packages/app/src/context/command.tsx
diff --git a/packages/desktop/src/context/global-sdk.tsx b/packages/app/src/context/global-sdk.tsx
index 3732ca085..3732ca085 100644
--- a/packages/desktop/src/context/global-sdk.tsx
+++ b/packages/app/src/context/global-sdk.tsx
diff --git a/packages/desktop/src/context/global-sync.tsx b/packages/app/src/context/global-sync.tsx
index ae40555d6..ae40555d6 100644
--- a/packages/desktop/src/context/global-sync.tsx
+++ b/packages/app/src/context/global-sync.tsx
diff --git a/packages/desktop/src/context/layout.tsx b/packages/app/src/context/layout.tsx
index c6ba5fef5..c6ba5fef5 100644
--- a/packages/desktop/src/context/layout.tsx
+++ b/packages/app/src/context/layout.tsx
diff --git a/packages/desktop/src/context/local.tsx b/packages/app/src/context/local.tsx
index 69807a2f4..69807a2f4 100644
--- a/packages/desktop/src/context/local.tsx
+++ b/packages/app/src/context/local.tsx
diff --git a/packages/desktop/src/context/notification.tsx b/packages/app/src/context/notification.tsx
index 2b258ebd6..2b258ebd6 100644
--- a/packages/desktop/src/context/notification.tsx
+++ b/packages/app/src/context/notification.tsx
diff --git a/packages/desktop/src/context/platform.tsx b/packages/app/src/context/platform.tsx
index 73d4c7f3e..73d4c7f3e 100644
--- a/packages/desktop/src/context/platform.tsx
+++ b/packages/app/src/context/platform.tsx
diff --git a/packages/desktop/src/context/prompt.tsx b/packages/app/src/context/prompt.tsx
index 8d3590cd9..8d3590cd9 100644
--- a/packages/desktop/src/context/prompt.tsx
+++ b/packages/app/src/context/prompt.tsx
diff --git a/packages/desktop/src/context/sdk.tsx b/packages/app/src/context/sdk.tsx
index 4d1c797c9..4d1c797c9 100644
--- a/packages/desktop/src/context/sdk.tsx
+++ b/packages/app/src/context/sdk.tsx
diff --git a/packages/desktop/src/context/sync.tsx b/packages/app/src/context/sync.tsx
index 941b8b629..941b8b629 100644
--- a/packages/desktop/src/context/sync.tsx
+++ b/packages/app/src/context/sync.tsx
diff --git a/packages/desktop/src/context/terminal.tsx b/packages/app/src/context/terminal.tsx
index 6f7c11dea..6f7c11dea 100644
--- a/packages/desktop/src/context/terminal.tsx
+++ b/packages/app/src/context/terminal.tsx
diff --git a/packages/desktop/src/custom-elements.d.ts b/packages/app/src/custom-elements.d.ts
index e4ea0d6ce..e4ea0d6ce 120000
--- a/packages/desktop/src/custom-elements.d.ts
+++ b/packages/app/src/custom-elements.d.ts
diff --git a/packages/desktop/src/entry.tsx b/packages/app/src/entry.tsx
index ecbce9815..ecbce9815 100644
--- a/packages/desktop/src/entry.tsx
+++ b/packages/app/src/entry.tsx
diff --git a/packages/desktop/src/env.d.ts b/packages/app/src/env.d.ts
index ad575e93b..ad575e93b 100644
--- a/packages/desktop/src/env.d.ts
+++ b/packages/app/src/env.d.ts
diff --git a/packages/desktop/src/hooks/use-providers.ts b/packages/app/src/hooks/use-providers.ts
index 4a73fa055..4a73fa055 100644
--- a/packages/desktop/src/hooks/use-providers.ts
+++ b/packages/app/src/hooks/use-providers.ts
diff --git a/packages/desktop/src/index.css b/packages/app/src/index.css
index e40f0842b..e40f0842b 100644
--- a/packages/desktop/src/index.css
+++ b/packages/app/src/index.css
diff --git a/packages/desktop/src/index.ts b/packages/app/src/index.ts
index cf5be9f51..cf5be9f51 100644
--- a/packages/desktop/src/index.ts
+++ b/packages/app/src/index.ts
diff --git a/packages/desktop/src/pages/directory-layout.tsx b/packages/app/src/pages/directory-layout.tsx
index c909a373d..c909a373d 100644
--- a/packages/desktop/src/pages/directory-layout.tsx
+++ b/packages/app/src/pages/directory-layout.tsx
diff --git a/packages/desktop/src/pages/error.tsx b/packages/app/src/pages/error.tsx
index 9914279ad..9914279ad 100644
--- a/packages/desktop/src/pages/error.tsx
+++ b/packages/app/src/pages/error.tsx
diff --git a/packages/desktop/src/pages/home.tsx b/packages/app/src/pages/home.tsx
index 7cd2916e8..7cd2916e8 100644
--- a/packages/desktop/src/pages/home.tsx
+++ b/packages/app/src/pages/home.tsx
diff --git a/packages/desktop/src/pages/layout.tsx b/packages/app/src/pages/layout.tsx
index 489899f88..489899f88 100644
--- a/packages/desktop/src/pages/layout.tsx
+++ b/packages/app/src/pages/layout.tsx
diff --git a/packages/desktop/src/pages/session.tsx b/packages/app/src/pages/session.tsx
index 42e43232a..42e43232a 100644
--- a/packages/desktop/src/pages/session.tsx
+++ b/packages/app/src/pages/session.tsx
diff --git a/packages/desktop/src/sst-env.d.ts b/packages/app/src/sst-env.d.ts
index 47a8fbec7..47a8fbec7 100644
--- a/packages/desktop/src/sst-env.d.ts
+++ b/packages/app/src/sst-env.d.ts
diff --git a/packages/desktop/src/utils/dom.ts b/packages/app/src/utils/dom.ts
index 4f3724c7c..4f3724c7c 100644
--- a/packages/desktop/src/utils/dom.ts
+++ b/packages/app/src/utils/dom.ts
diff --git a/packages/desktop/src/utils/id.ts b/packages/app/src/utils/id.ts
index fa27cf4c5..fa27cf4c5 100644
--- a/packages/desktop/src/utils/id.ts
+++ b/packages/app/src/utils/id.ts
diff --git a/packages/desktop/src/utils/index.ts b/packages/app/src/utils/index.ts
index d87053269..d87053269 100644
--- a/packages/desktop/src/utils/index.ts
+++ b/packages/app/src/utils/index.ts
diff --git a/packages/desktop/src/utils/persist.ts b/packages/app/src/utils/persist.ts
index 12b334f9f..12b334f9f 100644
--- a/packages/desktop/src/utils/persist.ts
+++ b/packages/app/src/utils/persist.ts
diff --git a/packages/desktop/src/utils/prompt.ts b/packages/app/src/utils/prompt.ts
index 45c5ce1f3..45c5ce1f3 100644
--- a/packages/desktop/src/utils/prompt.ts
+++ b/packages/app/src/utils/prompt.ts
diff --git a/packages/desktop/src/utils/solid-dnd.tsx b/packages/app/src/utils/solid-dnd.tsx
index a634be4b4..a634be4b4 100644
--- a/packages/desktop/src/utils/solid-dnd.tsx
+++ b/packages/app/src/utils/solid-dnd.tsx
diff --git a/packages/desktop/src/utils/speech.ts b/packages/app/src/utils/speech.ts
index 921e0a159..921e0a159 100644
--- a/packages/desktop/src/utils/speech.ts
+++ b/packages/app/src/utils/speech.ts
diff --git a/packages/desktop/sst-env.d.ts b/packages/app/sst-env.d.ts
index b6a7e9066..b6a7e9066 100644
--- a/packages/desktop/sst-env.d.ts
+++ b/packages/app/sst-env.d.ts
diff --git a/packages/desktop/tsconfig.json b/packages/app/tsconfig.json
index db04f79ca..db04f79ca 100644
--- a/packages/desktop/tsconfig.json
+++ b/packages/app/tsconfig.json
diff --git a/packages/desktop/vite.config.ts b/packages/app/vite.config.ts
index 57071a894..57071a894 100644
--- a/packages/desktop/vite.config.ts
+++ b/packages/app/vite.config.ts
diff --git a/packages/desktop/vite.js b/packages/app/vite.js
index 6b8fd6137..6b8fd6137 100644
--- a/packages/desktop/vite.js
+++ b/packages/app/vite.js
diff --git a/packages/opencode/src/server/server.ts b/packages/opencode/src/server/server.ts
index 1da1d1ec6..c74dbbb41 100644
--- a/packages/opencode/src/server/server.ts
+++ b/packages/opencode/src/server/server.ts
@@ -2600,10 +2600,10 @@ export namespace Server {
         },
       )
       .all("/*", async (c) => {
-        return proxy(`https://desktop.opencode.ai${c.req.path}`, {
+        return proxy(`https://app.opencode.ai${c.req.path}`, {
           ...c.req,
           headers: {
-            host: "desktop.opencode.ai",
+            host: "app.opencode.ai",
           },
         })
       }),
diff --git a/packages/tauri/package.json b/packages/tauri/package.json
index 1db8ec12c..ecb4751a0 100644
--- a/packages/tauri/package.json
+++ b/packages/tauri/package.json
@@ -12,7 +12,7 @@
     "tauri": "tauri"
   },
   "dependencies": {
-    "@opencode-ai/desktop": "workspace:*",
+    "@opencode-ai/app": "workspace:*",
     "@solid-primitives/storage": "catalog:",
     "@tauri-apps/api": "^2",
     "@tauri-apps/plugin-dialog": "~2",
diff --git a/packages/tauri/src/index.tsx b/packages/tauri/src/index.tsx
index dc2c4047d..57c1fbe55 100644
--- a/packages/tauri/src/index.tsx
+++ b/packages/tauri/src/index.tsx
@@ -1,6 +1,6 @@
 // @refresh reload
 import { render } from "solid-js/web"
-import { App, PlatformProvider, Platform } from "@opencode-ai/desktop"
+import { App, PlatformProvider, Platform } from "@opencode-ai/app"
 import { open, save } from "@tauri-apps/plugin-dialog"
 import { open as shellOpen } from "@tauri-apps/plugin-shell"
 import { type as ostype } from "@tauri-apps/plugin-os"
diff --git a/packages/tauri/tsconfig.json b/packages/tauri/tsconfig.json
index e7f5c5c27..64a6bc357 100644
--- a/packages/tauri/tsconfig.json
+++ b/packages/tauri/tsconfig.json
@@ -15,6 +15,6 @@
     "emitDeclarationOnly": false,
     "outDir": "node_modules/.ts-dist"
   },
-  "references": [{ "path": "../desktop" }],
+  "references": [{ "path": "../app" }],
   "include": ["src"]
 }
diff --git a/packages/tauri/vite.config.ts b/packages/tauri/vite.config.ts
index ead3d8a8d..123a2028c 100644
--- a/packages/tauri/vite.config.ts
+++ b/packages/tauri/vite.config.ts
@@ -1,11 +1,11 @@
 import { defineConfig } from "vite"
-import desktopPlugin from "@opencode-ai/desktop/vite"
+import appPlugin from "@opencode-ai/app/vite"
 
 const host = process.env.TAURI_DEV_HOST
 
 // https://vite.dev/config/
 export default defineConfig({
-  plugins: [desktopPlugin],
+  plugins: [appPlugin],
   // Vite options tailored for Tauri development and only applied in `tauri dev` or `tauri build`
   //
   // 1. prevent Vite from obscuring rust errors
diff --git a/script/publish-start.ts b/script/publish-start.ts
index 9213e1352..6dcbbea5d 100755
--- a/script/publish-start.ts
+++ b/script/publish-start.ts
@@ -17,7 +17,7 @@ if (!Script.preview) {
     .then((data: any) => data.version)
 
   const log =
-    await $`git log v${previous}..HEAD --oneline --format="%h %s" -- packages/opencode packages/sdk packages/plugin packages/tauri packages/desktop`.text()
+    await $`git log v${previous}..HEAD --oneline --format="%h %s" -- packages/opencode packages/sdk packages/plugin packages/tauri packages/app`.text()
 
   const commits = log.split("\n").filter((line) => line && !line.match(/^\w+ (ignore:|test:|chore:|ci:)/i))
 
@@ -64,7 +64,7 @@ if (!Script.preview) {
 
             Group the changes into these categories based on the [areas: ...] tags (omit any category with no changes):
             - **TUI**: Changes to "opencode" area (the terminal/CLI interface)
-            - **Desktop**: Changes to "desktop" or "tauri" areas (the desktop application)
+            - **Desktop**: Changes to "app" or "tauri" areas (the desktop application)
             - **SDK**: Changes to "sdk" or "plugin" areas (the SDK and plugin system)
             - **Extensions**: Changes to "extensions/zed", "extensions/vscode", or "github" areas (editor extensions and GitHub Action)
             - **Other**: Any user-facing changes that don't fit the above categories