diff --git a/.github/workflows/build-desktop.yml b/.github/workflows/build-desktop.yml
new file mode 100644
index 00000000..f1b221f7
--- /dev/null
+++ b/.github/workflows/build-desktop.yml
@@ -0,0 +1,93 @@
+name: Build Desktop (Linux)
+
+on:
+  pull_request:
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  build-linux:
+    name: Tauri Build (Linux)
+    runs-on: ubuntu-22.04
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: 10.27.0
+
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+
+      - name: Install Linux build dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y \
+            libgtk-3-dev \
+            libglib2.0-dev \
+            libayatana-appindicator3-dev \
+            libsoup-3.0-dev \
+            libwebkit2gtk-4.1-dev \
+            libssl-dev \
+            libdbus-1-dev \
+            librsvg2-dev
+
+      - name: Setup Rust
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          targets: x86_64-unknown-linux-gnu
+
+      - name: Download OpenCode sidecar
+        shell: bash
+        env:
+          OPENCODE_VERSION: 1.1.25
+          GITHUB_TOKEN: ${{ github.token }}
+        run: |
+          set -euo pipefail
+
+          version="${OPENCODE_VERSION}"
+          if [ -n "${GITHUB_TOKEN:-}" ]; then
+            latest=$(curl -fsSL \
+              -H "Authorization: Bearer ${GITHUB_TOKEN}" \
+              -H "X-GitHub-Api-Version: 2022-11-28" \
+              https://api.github.com/repos/anomalyco/opencode/releases/latest \
+              | sed -n 's/.*"tag_name": *"v\([^"]*\)".*/\1/p')
+            if [ -n "$latest" ]; then
+              version="$latest"
+            fi
+          fi
+
+          opencode_asset="opencode-linux-x64-baseline.tar.gz"
+          url="https://github.com/anomalyco/opencode/releases/download/v${version}/${opencode_asset}"
+          tmp_dir="$RUNNER_TEMP/opencode"
+          extract_dir="$tmp_dir/extracted"
+          rm -rf "$tmp_dir"
+          mkdir -p "$extract_dir"
+          curl -fsSL -o "$tmp_dir/$opencode_asset" "$url"
+          tar -xzf "$tmp_dir/$opencode_asset" -C "$extract_dir"
+
+          if [ -f "$extract_dir/opencode" ]; then
+            bin_path="$extract_dir/opencode"
+          else
+            echo "OpenCode binary not found in archive"
+            ls -la "$extract_dir"
+            exit 1
+          fi
+
+          target_name="opencode-x86_64-unknown-linux-gnu"
+          mkdir -p packages/desktop/src-tauri/sidecars
+          cp "$bin_path" "packages/desktop/src-tauri/sidecars/${target_name}"
+          chmod 755 "packages/desktop/src-tauri/sidecars/${target_name}"
+
+      - name: Build desktop app
+        run: pnpm --filter @different-ai/openwork exec tauri build --target x86_64-unknown-linux-gnu --bundles deb
diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
index 75f55d1d..bbc571a7 100644
--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@ -62,4 +62,4 @@ jobs:
         run: pnpm install --frozen-lockfile
 
       - name: Run e2e tests
-        run: pnpm test:e2e
+        run: pnpm --filter @different-ai/openwork test:e2e
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cb956d42..03ae9288 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -31,4 +31,4 @@ jobs:
         run: pnpm install --frozen-lockfile
 
       - name: Build web
-        run: pnpm build:web
+        run: pnpm --filter @different-ai/openwork build:web
diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
index e2a5856d..c3eefe0c 100644
--- a/.github/workflows/prerelease.yml
+++ b/.github/workflows/prerelease.yml
@@ -216,9 +216,9 @@ jobs:
             target_name="${target_name}.exe"
           fi
 
-          mkdir -p src-tauri/sidecars
-          cp "$bin_path" "src-tauri/sidecars/${target_name}"
-          chmod 755 "src-tauri/sidecars/${target_name}"
+          mkdir -p packages/desktop/src-tauri/sidecars
+          cp "$bin_path" "packages/desktop/src-tauri/sidecars/${target_name}"
+          chmod 755 "packages/desktop/src-tauri/sidecars/${target_name}"
 
       - name: Write notary API key
         if: matrix.os_type == 'macos'
@@ -258,7 +258,7 @@ jobs:
           releaseBody: ${{ env.RELEASE_BODY }}
           prerelease: true
           releaseDraft: false
-          projectPath: .
+          projectPath: packages/desktop
           tauriScript: pnpm exec tauri -vvv
           args: ${{ matrix.args }}
           retryAttempts: 3
diff --git a/.github/workflows/release-macos-aarch64.yml b/.github/workflows/release-macos-aarch64.yml
index a044c6f1..bc1e6664 100644
--- a/.github/workflows/release-macos-aarch64.yml
+++ b/.github/workflows/release-macos-aarch64.yml
@@ -313,9 +313,9 @@ jobs:
             target_name="${target_name}.exe"
           fi
 
-          mkdir -p src-tauri/sidecars
-          cp "$bin_path" "src-tauri/sidecars/${target_name}"
-          chmod 755 "src-tauri/sidecars/${target_name}"
+          mkdir -p packages/desktop/src-tauri/sidecars
+          cp "$bin_path" "packages/desktop/src-tauri/sidecars/${target_name}"
+          chmod 755 "packages/desktop/src-tauri/sidecars/${target_name}"
 
       - name: Write notary API key
         if: matrix.os_type == 'macos'
@@ -355,7 +355,7 @@ jobs:
           releaseBody: ${{ env.RELEASE_BODY }}
           releaseDraft: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.draft == 'true' }}
           prerelease: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.prerelease == 'true' }}
-          projectPath: .
+          projectPath: packages/desktop
           tauriScript: pnpm exec tauri -vvv
           args: ${{ matrix.args }}
           retryAttempts: 3
diff --git a/.gitignore b/.gitignore
index 8eef5574..e76c0c6b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,13 @@
 node_modules/
+packages/*/node_modules/
 .next/
 out/
 dist/
+packages/*/dist/
 
 # Tauri/Rust
-src-tauri/target/
-src-tauri/sidecars/
+packages/desktop/src-tauri/target/
+packages/desktop/src-tauri/sidecars/
 
 # Env
 .env
diff --git a/.opencode/skill/openwork-core/SKILL.md b/.opencode/skill/openwork-core/SKILL.md
index 3cdd50e7..eb26d2bf 100644
--- a/.opencode/skill/openwork-core/SKILL.md
+++ b/.opencode/skill/openwork-core/SKILL.md
@@ -20,6 +20,9 @@ git -C vendor/opencode pull --ff-only
 pnpm tauri dev          # Desktop development
 pnpm tauri ios dev      # iOS development
 pnpm tauri android dev  # Android development
+
+# Or run directly in the desktop package:
+pnpm -C packages/desktop tauri dev
 ```
 
 ## OpenCode Integration
diff --git a/.opencode/skill/prd-conventions/SKILL.md b/.opencode/skill/prd-conventions/SKILL.md
index cce2e5f5..9cc5eda9 100644
--- a/.opencode/skill/prd-conventions/SKILL.md
+++ b/.opencode/skill/prd-conventions/SKILL.md
@@ -7,12 +7,12 @@ description: PRD authoring conventions for OpenWork
 
 All new PRDs for OpenWork must live at:
 
-- `vendor/openwork/pr/<prd-name>.md`
+- `packages/desktop/pr/<prd-name>.md`
 
 Examples:
 
-- `vendor/openwork/pr/onboarding-1.0.md`
-- `vendor/openwork/pr/folder-workspaces-jit.md`
+- `packages/desktop/pr/onboarding-1.0.md`
+- `packages/desktop/pr/ui-dark-radix.md`
 
 ## Why
 
diff --git a/.opencode/skill/publish/SKILL.md b/.opencode/skill/publish/SKILL.md
index 2fddddae..bb48d738 100644
--- a/.opencode/skill/publish/SKILL.md
+++ b/.opencode/skill/publish/SKILL.md
@@ -23,16 +23,16 @@ git status
 
 ### 2) Bump version everywhere
 
-- `package.json` (`version`)
-- `src-tauri/tauri.conf.json` (`version`)
-- `src-tauri/Cargo.toml` (`version`)
+- `packages/desktop/package.json` (`version`)
+- `packages/desktop/src-tauri/tauri.conf.json` (`version`)
+- `packages/desktop/src-tauri/Cargo.toml` (`version`)
 
 ### 3) Validate builds
 
 ```bash
 pnpm typecheck
 pnpm build:web
-cargo check --manifest-path src-tauri/Cargo.toml
+cargo check --manifest-path packages/desktop/src-tauri/Cargo.toml
 ```
 
 ### 4) Build DMG
@@ -43,7 +43,7 @@ pnpm tauri build --bundles dmg
 
 Expected output (Apple Silicon example):
 
-- `src-tauri/target/release/bundle/dmg/OpenWork_<version>_aarch64.dmg`
+- `packages/desktop/src-tauri/target/release/bundle/dmg/OpenWork_<version>_aarch64.dmg`
 
 ### 5) Commit + tag
 
@@ -61,7 +61,7 @@ gh release create vX.Y.Z \
   --title "OpenWork vX.Y.Z" \
   --notes "<summary>"
 
-gh release upload vX.Y.Z "src-tauri/target/release/bundle/dmg/<DMG_NAME>.dmg" --clobber
+gh release upload vX.Y.Z "packages/desktop/src-tauri/target/release/bundle/dmg/<DMG_NAME>.dmg" --clobber
 ```
 
 ## Helper
diff --git a/.opencode/skill/publish/first-call.ts b/.opencode/skill/publish/first-call.ts
index 1a1e15b5..75054a66 100644
--- a/.opencode/skill/publish/first-call.ts
+++ b/.opencode/skill/publish/first-call.ts
@@ -1,4 +1,5 @@
 import { readFile } from "fs/promises";
+import path from "node:path";
 import { loadEnv } from "./load-env";
 import { run } from "./client";
 
@@ -6,7 +7,9 @@ async function main() {
   await loadEnv();
   await run("gh", ["auth", "status"], { allowFailure: false });
 
-  const pkgRaw = await readFile("package.json", "utf8");
+  const desktopPackage = path.join(process.cwd(), "packages", "desktop", "package.json");
+  const rootPackage = path.join(process.cwd(), "package.json");
+  const pkgRaw = await readFile(desktopPackage, "utf8").catch(() => readFile(rootPackage, "utf8"));
   const pkg = JSON.parse(pkgRaw) as { name?: string; version?: string };
 
   console.log(
@@ -18,7 +21,7 @@ async function main() {
         next: [
           "pnpm typecheck",
           "pnpm build:web",
-          "cargo check --manifest-path src-tauri/Cargo.toml",
+          "cargo check --manifest-path packages/desktop/src-tauri/Cargo.toml",
           "pnpm tauri build --bundles dmg",
           "gh release upload vX.Y.Z <dmg> --clobber",
         ],
diff --git a/.opencode/skill/release/SKILL.md b/.opencode/skill/release/SKILL.md
index ba630cd3..de4cb6c8 100644
--- a/.opencode/skill/release/SKILL.md
+++ b/.opencode/skill/release/SKILL.md
@@ -27,16 +27,16 @@ git status
 
 ### 2) Bump version everywhere
 
-- `package.json` (`version`)
-- `src-tauri/tauri.conf.json` (`version`)
-- `src-tauri/Cargo.toml` (`version`)
+- `packages/desktop/package.json` (`version`)
+- `packages/desktop/src-tauri/tauri.conf.json` (`version`)
+- `packages/desktop/src-tauri/Cargo.toml` (`version`)
 
 ### 3) Validate builds
 
 ```bash
 pnpm typecheck
 pnpm build:web
-cargo check --manifest-path src-tauri/Cargo.toml
+cargo check --manifest-path packages/desktop/src-tauri/Cargo.toml
 ```
 
 ### 4) Build DMG
@@ -47,7 +47,7 @@ pnpm tauri build --bundles dmg
 
 This should produce something like:
 
-- `src-tauri/target/release/bundle/dmg/OpenWork_<version>_aarch64.dmg`
+- `packages/desktop/src-tauri/target/release/bundle/dmg/OpenWork_<version>_aarch64.dmg`
 
 ### 5) Verify “unsigned” state
 
@@ -57,7 +57,7 @@ Quick checks:
 
 ```bash
 # mount the dmg read-only
-hdiutil attach -nobrowse -readonly "src-tauri/target/release/bundle/dmg/<DMG_NAME>.dmg"
+hdiutil attach -nobrowse -readonly "packages/desktop/src-tauri/target/release/bundle/dmg/<DMG_NAME>.dmg"
 
 # verify signature details (expect ad-hoc or not notarized)
 codesign -dv --verbose=4 "/Volumes/<VOLUME>/<APP>.app"
@@ -85,7 +85,7 @@ gh release create vX.Y.Z \
   --title "OpenWork vX.Y.Z" \
   --notes "<human summary>"
 
-gh release upload vX.Y.Z "src-tauri/target/release/bundle/dmg/<DMG_NAME>.dmg" --clobber
+gh release upload vX.Y.Z "packages/desktop/src-tauri/target/release/bundle/dmg/<DMG_NAME>.dmg" --clobber
 ```
 
 ## Local helper scripts
diff --git a/.opencode/skill/tauri-solidjs/SKILL.md b/.opencode/skill/tauri-solidjs/SKILL.md
index e55edddb..c6a5c469 100644
--- a/.opencode/skill/tauri-solidjs/SKILL.md
+++ b/.opencode/skill/tauri-solidjs/SKILL.md
@@ -34,23 +34,25 @@ pnpm tauri android build
 ## Project Structure
 
 ```
-vendor/openwork/
-  src-tauri/
-    src/
-      main.rs           # Rust entry point
-      lib.rs            # Tauri commands and state
-    Cargo.toml          # Rust dependencies
-    tauri.conf.json     # Tauri configuration
-    capabilities/       # Permission capabilities
-  src/
-    App.tsx             # SolidJS root component
-    index.tsx           # Entry point
-  components/         # UI components
-  stores/             # Solid stores for state
-  lib/                # Utilities and OpenCode bridge
-  index.html            # HTML template
-  package.json          # Frontend dependencies
-  vite.config.ts        # Vite configuration
+openwork/
+  packages/
+    desktop/
+      src-tauri/
+        src/
+          main.rs           # Rust entry point
+          lib.rs            # Tauri commands and state
+        Cargo.toml          # Rust dependencies
+        tauri.conf.json     # Tauri configuration
+        capabilities/       # Permission capabilities
+      src/
+        App.tsx             # SolidJS root component
+        index.tsx           # Entry point
+      components/           # UI components
+      stores/               # Solid stores for state
+      lib/                  # Utilities and OpenCode bridge
+      index.html            # HTML template
+      package.json          # Frontend dependencies
+      vite.config.ts        # Vite configuration
 ```
 
 
@@ -89,7 +91,7 @@ serde_json = "1"
 ## Tauri Commands (Rust -> JS)
 
 ```rust
-// src-tauri/src/lib.rs
+// packages/desktop/src-tauri/src/lib.rs
 use tauri::Manager;
 
 #[tauri::command]
diff --git a/AGENTS.md b/AGENTS.md
index 57f7a84e..767e6c54 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -31,18 +31,26 @@ OpenWork is an open-source alternative to Claude Cowork.
 
 ## Repository Guidance
 
-- Write new PRDs under `prd/<prd-name>.md` (see `.opencode/skill/prd-conventions/SKILL.md`).
+- Write new PRDs under `packages/desktop/pr/<prd-name>.md` (see `.opencode/skill/prd-conventions/SKILL.md`).
 - Use MOTIVATIONS-PHILOSOPHY.md to understand the "why" of OpenWork so you can guide your decisions.
 
 
 ## Local Structure
 
 ```
-vendor/openwork/
-  AGENTS.md           # This file
-  MOTIVATIONS-PHILOSOPHY.md       # Exhaustive PRD and user flow map
-  .gitignore          # Ignores vendor/opencode, node_modules, etc.
+openwork/
+  AGENTS.md                    # This file
+  MOTIVATIONS-PHILOSOPHY.md     # Exhaustive PRD and user flow map
+  .gitignore                    # Ignores vendor/opencode, node_modules, etc.
   .opencode/
+  packages/
+    desktop/
+      src/
+      src-tauri/
+      public/
+      pr/
+      prd/
+      package.json
 ```
 
 ## OpenCode SDK Usage
@@ -78,7 +86,7 @@ Key primitives to expose:
 
 ## Skill: SolidJS Patterns
 
-When editing SolidJS UI (`src/**/*.tsx`), consult:
+When editing SolidJS UI (`packages/desktop/src/**/*.tsx`), consult:
 
 - `.opencode/skill/solidjs-patterns/SKILL.md`
 
@@ -92,9 +100,9 @@ OpenWork releases are built by GitHub Actions (`Release App`). A release is trig
 
 1. Ensure `main` is green and up to date.
 2. Bump versions (keep these in sync):
-- `vendor/openwork/package.json` (`version`)
-- `vendor/openwork/src-tauri/tauri.conf.json` (`version`)
-- `vendor/openwork/src-tauri/Cargo.toml` (`version`)
+- `packages/desktop/package.json` (`version`)
+- `packages/desktop/src-tauri/tauri.conf.json` (`version`)
+- `packages/desktop/src-tauri/Cargo.toml` (`version`)
 
 You can bump all three non-interactively with:
 - `pnpm bump:patch`
@@ -120,4 +128,4 @@ If the workflow needs to be re-run for an existing tag (e.g. notarization retry)
 - Runs: `gh run list --repo different-ai/openwork --workflow "Release App" --limit 5`
 - Release: `gh release view vX.Y.Z --repo different-ai/openwork`
 
-Confirm the DMG assets are attached and versioned correctly.
\ No newline at end of file
+Confirm the DMG assets are attached and versioned correctly.
diff --git a/README.md b/README.md
index 318c5a71..e50baa07 100644
--- a/README.md
+++ b/README.md
@@ -67,6 +67,8 @@ OpenWork is designed to be:
 pnpm install
 ```
 
+OpenWork now lives in `packages/desktop`. Root scripts forward to that package.
+
 ### Run (Desktop)
 
 ```bash
@@ -95,7 +97,7 @@ pnpm dev:web
 
 The folder picker uses the Tauri dialog plugin.
 Capability permissions are defined in:
-- `src-tauri/capabilities/default.json`
+- `packages/desktop/src-tauri/capabilities/default.json`
 
 ## OpenPackage Notes
 
@@ -140,7 +142,7 @@ pnpm test:e2e
 - Review `AGENTS.md` and `MOTIVATIONS-PHILOSOPHY.md` to understand the product goals before making changes.
 - Ensure Node.js, `pnpm`, the Rust toolchain, and `opencode` are installed before working inside the repo.
 - Run `pnpm install` once per checkout, then verify your change with `pnpm typecheck` plus `pnpm test:e2e` (or the targeted subset of scripts) before opening a PR.
-- Add new PRDs to `prd/<name>.md` following the `.opencode/skill/prd-conventions/SKILL.md` conventions described in `AGENTS.md`.
+- Add new PRDs to `packages/desktop/pr/<name>.md` following the `.opencode/skill/prd-conventions/SKILL.md` conventions described in `AGENTS.md`.
 
 ## License
 
diff --git a/package.json b/package.json
index 708958e0..6faad034 100644
--- a/package.json
+++ b/package.json
@@ -1,50 +1,28 @@
 {
-  "name": "@different-ai/openwork",
+  "name": "@different-ai/openwork-workspace",
   "private": true,
-  "version": "0.2.5",
-  "type": "module",
+  "version": "0.0.0",
   "scripts": {
-    "dev": "tauri dev",
-    "build": "tauri build",
-    "dev:web": "vite",
-    "build:web": "vite build",
-    "preview": "vite preview",
-    "typecheck": "tsc -p tsconfig.json --noEmit",
-    "test:health": "node scripts/health.mjs",
-    "test:sessions": "node scripts/sessions.mjs",
-    "test:refactor": "pnpm typecheck && pnpm test:health && pnpm test:sessions",
-    "test:events": "node scripts/events.mjs",
-    "test:todos": "node scripts/todos.mjs",
-    "test:permissions": "node scripts/permissions.mjs",
-    "test:session-switch": "node scripts/session-switch.mjs",
-    "test:fs-engine": "node scripts/fs-engine.mjs",
-    "test:e2e": "node scripts/e2e.mjs && node scripts/session-switch.mjs && node scripts/fs-engine.mjs",
-    "bump:patch": "node scripts/bump-version.mjs patch",
-    "bump:minor": "node scripts/bump-version.mjs minor",
-    "bump:major": "node scripts/bump-version.mjs major",
-    "bump:set": "node scripts/bump-version.mjs --set"
-  },
-  "dependencies": {
-    "@opencode-ai/sdk": "^1.1.19",
-    "@radix-ui/colors": "^3.0.0",
-    "@solid-primitives/event-bus": "^1.1.2",
-    "@solid-primitives/storage": "^4.3.3",
-    "@tauri-apps/api": "^2.0.0",
-    "@tauri-apps/plugin-dialog": "~2.6.0",
-    "@tauri-apps/plugin-opener": "^2.5.3",
-    "@tauri-apps/plugin-process": "~2.3.1",
-    "@tauri-apps/plugin-updater": "~2.9.0",
-    "jsonc-parser": "^3.2.1",
-    "lucide-solid": "^0.562.0",
-    "solid-js": "^1.9.0"
-  },
-  "devDependencies": {
-    "@tailwindcss/vite": "^4.1.18",
-    "@tauri-apps/cli": "^2.0.0",
-    "tailwindcss": "^4.1.18",
-    "typescript": "^5.6.3",
-    "vite": "^6.0.1",
-    "vite-plugin-solid": "^2.11.0"
+    "dev": "pnpm --filter @different-ai/openwork dev",
+    "build": "pnpm --filter @different-ai/openwork build",
+    "dev:web": "pnpm --filter @different-ai/openwork dev:web",
+    "build:web": "pnpm --filter @different-ai/openwork build:web",
+    "preview": "pnpm --filter @different-ai/openwork preview",
+    "typecheck": "pnpm --filter @different-ai/openwork typecheck",
+    "test:health": "pnpm --filter @different-ai/openwork test:health",
+    "test:sessions": "pnpm --filter @different-ai/openwork test:sessions",
+    "test:refactor": "pnpm --filter @different-ai/openwork test:refactor",
+    "test:events": "pnpm --filter @different-ai/openwork test:events",
+    "test:todos": "pnpm --filter @different-ai/openwork test:todos",
+    "test:permissions": "pnpm --filter @different-ai/openwork test:permissions",
+    "test:session-switch": "pnpm --filter @different-ai/openwork test:session-switch",
+    "test:fs-engine": "pnpm --filter @different-ai/openwork test:fs-engine",
+    "test:e2e": "pnpm --filter @different-ai/openwork test:e2e",
+    "bump:patch": "pnpm --filter @different-ai/openwork bump:patch",
+    "bump:minor": "pnpm --filter @different-ai/openwork bump:minor",
+    "bump:major": "pnpm --filter @different-ai/openwork bump:major",
+    "bump:set": "pnpm --filter @different-ai/openwork bump:set",
+    "tauri": "pnpm --filter @different-ai/openwork exec tauri"
   },
   "pnpm": {
     "onlyBuiltDependencies": [
diff --git a/index.html b/packages/desktop/index.html
similarity index 100%
rename from index.html
rename to packages/desktop/index.html
diff --git a/packages/desktop/package.json b/packages/desktop/package.json
new file mode 100644
index 00000000..afa159cc
--- /dev/null
+++ b/packages/desktop/package.json
@@ -0,0 +1,50 @@
+{
+  "name": "@different-ai/openwork",
+  "private": true,
+  "version": "0.2.5",
+  "type": "module",
+  "scripts": {
+    "dev": "tauri dev",
+    "build": "tauri build",
+    "dev:web": "vite",
+    "build:web": "vite build",
+    "preview": "vite preview",
+    "typecheck": "tsc -p tsconfig.json --noEmit",
+    "test:health": "node scripts/health.mjs",
+    "test:sessions": "node scripts/sessions.mjs",
+    "test:refactor": "pnpm typecheck && pnpm test:health && pnpm test:sessions",
+    "test:events": "node scripts/events.mjs",
+    "test:todos": "node scripts/todos.mjs",
+    "test:permissions": "node scripts/permissions.mjs",
+    "test:session-switch": "node scripts/session-switch.mjs",
+    "test:fs-engine": "node scripts/fs-engine.mjs",
+    "test:e2e": "node scripts/e2e.mjs && node scripts/session-switch.mjs && node scripts/fs-engine.mjs",
+    "bump:patch": "node scripts/bump-version.mjs patch",
+    "bump:minor": "node scripts/bump-version.mjs minor",
+    "bump:major": "node scripts/bump-version.mjs major",
+    "bump:set": "node scripts/bump-version.mjs --set"
+  },
+  "dependencies": {
+    "@opencode-ai/sdk": "^1.1.19",
+    "@radix-ui/colors": "^3.0.0",
+    "@solid-primitives/event-bus": "^1.1.2",
+    "@solid-primitives/storage": "^4.3.3",
+    "@tauri-apps/api": "^2.0.0",
+    "@tauri-apps/plugin-dialog": "~2.6.0",
+    "@tauri-apps/plugin-opener": "^2.5.3",
+    "@tauri-apps/plugin-process": "~2.3.1",
+    "@tauri-apps/plugin-updater": "~2.9.0",
+    "jsonc-parser": "^3.2.1",
+    "lucide-solid": "^0.562.0",
+    "solid-js": "^1.9.0"
+  },
+  "devDependencies": {
+    "@tailwindcss/vite": "^4.1.18",
+    "@tauri-apps/cli": "^2.0.0",
+    "tailwindcss": "^4.1.18",
+    "typescript": "^5.6.3",
+    "vite": "^6.0.1",
+    "vite-plugin-solid": "^2.11.0"
+  },
+  "packageManager": "pnpm@10.27.0"
+}
diff --git a/pr/demo-cold-open-1.0.md b/packages/desktop/pr/demo-cold-open-1.0.md
similarity index 100%
rename from pr/demo-cold-open-1.0.md
rename to packages/desktop/pr/demo-cold-open-1.0.md
diff --git a/pr/onboarding-1.0.md b/packages/desktop/pr/onboarding-1.0.md
similarity index 100%
rename from pr/onboarding-1.0.md
rename to packages/desktop/pr/onboarding-1.0.md
diff --git a/pr/refactor-simplify-state.md b/packages/desktop/pr/refactor-simplify-state.md
similarity index 99%
rename from pr/refactor-simplify-state.md
rename to packages/desktop/pr/refactor-simplify-state.md
index e5390e9c..7ff7d44d 100644
--- a/pr/refactor-simplify-state.md
+++ b/packages/desktop/pr/refactor-simplify-state.md
@@ -75,7 +75,7 @@ Refactor the UI architecture to establish a clean, layered structure:
 ### Target Directory Structure
 
 ```
-vendor/openwork/src/
+packages/desktop/src/
   app/
     connection.ts
     updates.ts
diff --git a/pr/refactor.md b/packages/desktop/pr/refactor.md
similarity index 91%
rename from pr/refactor.md
rename to packages/desktop/pr/refactor.md
index b0134bd4..cd8119ff 100644
--- a/pr/refactor.md
+++ b/packages/desktop/pr/refactor.md
@@ -54,7 +54,7 @@ Add a single script so every step runs the same command.
 
 Each step ends with the same two actions:
 
-1) Run `pnpm -C vendor/openwork test:refactor`
+1) Run `pnpm test:refactor`
 2) If it fails, stop and fix or revert the last step.
 
 ### Step 0 - Baseline and guardrails
@@ -65,7 +65,7 @@ Each step ends with the same two actions:
 - Pay attention:
   - Do not change any runtime logic while adding the script.
 - Check:
-  - Run `pnpm -C vendor/openwork test:refactor`.
+  - Run `pnpm test:refactor`.
 
 ### Step 1 - Demo mode state
 
@@ -82,7 +82,7 @@ Each step ends with the same two actions:
   - Ensure demo state is reset when sequence changes.
   - All `active*` memos must still switch between demo and real state.
 - Check:
-  - Run `pnpm -C vendor/openwork test:refactor`.
+  - Run `pnpm test:refactor`.
 
 ### Step 2 - Template management
 
@@ -100,7 +100,7 @@ Each step ends with the same two actions:
   - Preserve busy label values and error messages.
   - `loadWorkspaceTemplates` is used by `createWorkspaceStore` and must keep its signature.
 - Check:
-  - Run `pnpm -C vendor/openwork test:refactor`.
+  - Run `pnpm test:refactor`.
 
 ### Step 3 - Update, reload, reset, cache repair
 
@@ -118,7 +118,7 @@ Each step ends with the same two actions:
   - Reload gating must still block during active runs and non-host mode.
   - Reset must still clear local storage before relaunch/reload.
 - Check:
-  - Run `pnpm -C vendor/openwork test:refactor`.
+  - Run `pnpm test:refactor`.
 
 ### Step 4 - Provider and model selection
 
@@ -133,7 +133,7 @@ Each step ends with the same two actions:
   - Keep sorting logic identical (connected and free first).
   - Preserve default model fallback behavior when no providers are loaded.
 - Check:
-  - Run `pnpm -C vendor/openwork test:refactor`.
+  - Run `pnpm test:refactor`.
 
 ### Step 5 - Preferences and local storage
 
@@ -148,7 +148,7 @@ Each step ends with the same two actions:
   - Keep legacy keys for compatibility (e.g. `openwork_mode_pref`, `openwork.projectDir`).
   - Do not change any localStorage key names or value formats.
 - Check:
-  - Run `pnpm -C vendor/openwork test:refactor`.
+  - Run `pnpm test:refactor`.
 
 ### Step 6 - View prop builders
 
@@ -162,15 +162,15 @@ Each step ends with the same two actions:
   - Every prop name must match the current view usage.
   - Do not remove any callbacks or rename handlers.
 - Check:
-  - Run `pnpm -C vendor/openwork test:refactor`.
+  - Run `pnpm test:refactor`.
 
 ### Step 7 - App.tsx cleanup
 
 - Remove unused imports and reorder remaining imports.
 - App.tsx should only create signals, wire factories, and render views/modals.
 - Check:
-  - Run `pnpm -C vendor/openwork test:refactor`.
-  - Run `pnpm -C vendor/openwork test:e2e`.
+  - Run `pnpm test:refactor`.
+  - Run `pnpm test:e2e`.
 
 ## Attention Checklist (every step)
 
@@ -182,14 +182,14 @@ Each step ends with the same two actions:
 
 ## Regression Checks (every step)
 
-- `pnpm -C vendor/openwork test:refactor`
-- Manual smoke (optional): `pnpm -C vendor/openwork dev:web` and verify onboarding and dashboard render.
+- `pnpm test:refactor`
+- Manual smoke (optional): `pnpm dev:web` and verify onboarding and dashboard render.
 
 ## Acceptance Criteria
 
 - `src/App.tsx` <= 1100 lines.
 - All test gates pass after each step.
-- Final `pnpm -C vendor/openwork test:e2e` passes.
+- Final `pnpm test:e2e` passes.
 - No UI or behavior changes.
 
 ## Open Questions
diff --git a/pr/reload-engine.md b/packages/desktop/pr/reload-engine.md
similarity index 100%
rename from pr/reload-engine.md
rename to packages/desktop/pr/reload-engine.md
diff --git a/pr/ui-dark-radix.md b/packages/desktop/pr/ui-dark-radix.md
similarity index 100%
rename from pr/ui-dark-radix.md
rename to packages/desktop/pr/ui-dark-radix.md
diff --git a/prd-authenticated-providers.md b/packages/desktop/prd-authenticated-providers.md
similarity index 100%
rename from prd-authenticated-providers.md
rename to packages/desktop/prd-authenticated-providers.md
diff --git a/prd-opencode-install.md b/packages/desktop/prd-opencode-install.md
similarity index 100%
rename from prd-opencode-install.md
rename to packages/desktop/prd-opencode-install.md
diff --git a/prd-workspaces-jit.md b/packages/desktop/prd-workspaces-jit.md
similarity index 100%
rename from prd-workspaces-jit.md
rename to packages/desktop/prd-workspaces-jit.md
diff --git a/prd/mcp-skill-onboarding.md b/packages/desktop/prd/mcp-skill-onboarding.md
similarity index 100%
rename from prd/mcp-skill-onboarding.md
rename to packages/desktop/prd/mcp-skill-onboarding.md
diff --git a/progress.json b/packages/desktop/progress.json
similarity index 98%
rename from progress.json
rename to packages/desktop/progress.json
index 9379a41b..6adb8ef4 100644
--- a/progress.json
+++ b/packages/desktop/progress.json
@@ -40,7 +40,7 @@
   "notes": [
     "Frontend uses @opencode-ai/sdk/v2/client to avoid bundling Node-only server code.",
     "Engine spawns `opencode serve` from Rust with a per-run working directory.",
-    "`cargo check` runs successfully; a placeholder icon exists at `src-tauri/icons/icon.png`.",
+    "`cargo check` runs successfully; a placeholder icon exists at `packages/desktop/src-tauri/icons/icon.png`.",
     "OpenCode mirror cloned at `vendor/opencode` (gitignored).",
     "UI follows `design.ts` (ported to Solid + Tailwind) and is wired to real OpenCode v2 sessions/messages/todos/permissions.",
     "Folder picking uses Tauri dialog plugin (no manual path required in Host mode).",
diff --git a/public/apple-touch-icon.png b/packages/desktop/public/apple-touch-icon.png
similarity index 100%
rename from public/apple-touch-icon.png
rename to packages/desktop/public/apple-touch-icon.png
diff --git a/public/favicon-16x16.png b/packages/desktop/public/favicon-16x16.png
similarity index 100%
rename from public/favicon-16x16.png
rename to packages/desktop/public/favicon-16x16.png
diff --git a/public/favicon-32x32.png b/packages/desktop/public/favicon-32x32.png
similarity index 100%
rename from public/favicon-32x32.png
rename to packages/desktop/public/favicon-32x32.png
diff --git a/public/icon-512.png b/packages/desktop/public/icon-512.png
similarity index 100%
rename from public/icon-512.png
rename to packages/desktop/public/icon-512.png
diff --git a/public/logo.png b/packages/desktop/public/logo.png
similarity index 100%
rename from public/logo.png
rename to packages/desktop/public/logo.png
diff --git a/public/openwork-logo-square.svg b/packages/desktop/public/openwork-logo-square.svg
similarity index 100%
rename from public/openwork-logo-square.svg
rename to packages/desktop/public/openwork-logo-square.svg
diff --git a/public/openwork-logo.svg b/packages/desktop/public/openwork-logo.svg
similarity index 100%
rename from public/openwork-logo.svg
rename to packages/desktop/public/openwork-logo.svg
diff --git a/scripts/_util.mjs b/packages/desktop/scripts/_util.mjs
similarity index 100%
rename from scripts/_util.mjs
rename to packages/desktop/scripts/_util.mjs
diff --git a/scripts/bump-version.mjs b/packages/desktop/scripts/bump-version.mjs
similarity index 100%
rename from scripts/bump-version.mjs
rename to packages/desktop/scripts/bump-version.mjs
diff --git a/scripts/e2e.mjs b/packages/desktop/scripts/e2e.mjs
similarity index 100%
rename from scripts/e2e.mjs
rename to packages/desktop/scripts/e2e.mjs
diff --git a/scripts/events.mjs b/packages/desktop/scripts/events.mjs
similarity index 100%
rename from scripts/events.mjs
rename to packages/desktop/scripts/events.mjs
diff --git a/scripts/fs-engine.mjs b/packages/desktop/scripts/fs-engine.mjs
similarity index 100%
rename from scripts/fs-engine.mjs
rename to packages/desktop/scripts/fs-engine.mjs
diff --git a/scripts/health.mjs b/packages/desktop/scripts/health.mjs
similarity index 100%
rename from scripts/health.mjs
rename to packages/desktop/scripts/health.mjs
diff --git a/scripts/permissions.mjs b/packages/desktop/scripts/permissions.mjs
similarity index 100%
rename from scripts/permissions.mjs
rename to packages/desktop/scripts/permissions.mjs
diff --git a/scripts/select-session-debug.mjs b/packages/desktop/scripts/select-session-debug.mjs
similarity index 100%
rename from scripts/select-session-debug.mjs
rename to packages/desktop/scripts/select-session-debug.mjs
diff --git a/scripts/session-switch.mjs b/packages/desktop/scripts/session-switch.mjs
similarity index 100%
rename from scripts/session-switch.mjs
rename to packages/desktop/scripts/session-switch.mjs
diff --git a/scripts/sessions-parallel.mjs b/packages/desktop/scripts/sessions-parallel.mjs
similarity index 100%
rename from scripts/sessions-parallel.mjs
rename to packages/desktop/scripts/sessions-parallel.mjs
diff --git a/scripts/sessions.mjs b/packages/desktop/scripts/sessions.mjs
similarity index 100%
rename from scripts/sessions.mjs
rename to packages/desktop/scripts/sessions.mjs
diff --git a/scripts/todos.mjs b/packages/desktop/scripts/todos.mjs
similarity index 100%
rename from scripts/todos.mjs
rename to packages/desktop/scripts/todos.mjs
diff --git a/src-tauri/Cargo.lock b/packages/desktop/src-tauri/Cargo.lock
similarity index 100%
rename from src-tauri/Cargo.lock
rename to packages/desktop/src-tauri/Cargo.lock
diff --git a/src-tauri/Cargo.toml b/packages/desktop/src-tauri/Cargo.toml
similarity index 100%
rename from src-tauri/Cargo.toml
rename to packages/desktop/src-tauri/Cargo.toml
diff --git a/src-tauri/build.rs b/packages/desktop/src-tauri/build.rs
similarity index 100%
rename from src-tauri/build.rs
rename to packages/desktop/src-tauri/build.rs
diff --git a/src-tauri/capabilities/default.json b/packages/desktop/src-tauri/capabilities/default.json
similarity index 100%
rename from src-tauri/capabilities/default.json
rename to packages/desktop/src-tauri/capabilities/default.json
diff --git a/src-tauri/gen/schemas/acl-manifests.json b/packages/desktop/src-tauri/gen/schemas/acl-manifests.json
similarity index 100%
rename from src-tauri/gen/schemas/acl-manifests.json
rename to packages/desktop/src-tauri/gen/schemas/acl-manifests.json
diff --git a/src-tauri/gen/schemas/capabilities.json b/packages/desktop/src-tauri/gen/schemas/capabilities.json
similarity index 100%
rename from src-tauri/gen/schemas/capabilities.json
rename to packages/desktop/src-tauri/gen/schemas/capabilities.json
diff --git a/src-tauri/gen/schemas/desktop-schema.json b/packages/desktop/src-tauri/gen/schemas/desktop-schema.json
similarity index 100%
rename from src-tauri/gen/schemas/desktop-schema.json
rename to packages/desktop/src-tauri/gen/schemas/desktop-schema.json
diff --git a/src-tauri/gen/schemas/macOS-schema.json b/packages/desktop/src-tauri/gen/schemas/macOS-schema.json
similarity index 100%
rename from src-tauri/gen/schemas/macOS-schema.json
rename to packages/desktop/src-tauri/gen/schemas/macOS-schema.json
diff --git a/src-tauri/icons/128x128.png b/packages/desktop/src-tauri/icons/128x128.png
similarity index 100%
rename from src-tauri/icons/128x128.png
rename to packages/desktop/src-tauri/icons/128x128.png
diff --git a/src-tauri/icons/128x128@2x.png b/packages/desktop/src-tauri/icons/128x128@2x.png
similarity index 100%
rename from src-tauri/icons/128x128@2x.png
rename to packages/desktop/src-tauri/icons/128x128@2x.png
diff --git a/src-tauri/icons/32x32.png b/packages/desktop/src-tauri/icons/32x32.png
similarity index 100%
rename from src-tauri/icons/32x32.png
rename to packages/desktop/src-tauri/icons/32x32.png
diff --git a/src-tauri/icons/64x64.png b/packages/desktop/src-tauri/icons/64x64.png
similarity index 100%
rename from src-tauri/icons/64x64.png
rename to packages/desktop/src-tauri/icons/64x64.png
diff --git a/src-tauri/icons/Square107x107Logo.png b/packages/desktop/src-tauri/icons/Square107x107Logo.png
similarity index 100%
rename from src-tauri/icons/Square107x107Logo.png
rename to packages/desktop/src-tauri/icons/Square107x107Logo.png
diff --git a/src-tauri/icons/Square142x142Logo.png b/packages/desktop/src-tauri/icons/Square142x142Logo.png
similarity index 100%
rename from src-tauri/icons/Square142x142Logo.png
rename to packages/desktop/src-tauri/icons/Square142x142Logo.png
diff --git a/src-tauri/icons/Square150x150Logo.png b/packages/desktop/src-tauri/icons/Square150x150Logo.png
similarity index 100%
rename from src-tauri/icons/Square150x150Logo.png
rename to packages/desktop/src-tauri/icons/Square150x150Logo.png
diff --git a/src-tauri/icons/Square284x284Logo.png b/packages/desktop/src-tauri/icons/Square284x284Logo.png
similarity index 100%
rename from src-tauri/icons/Square284x284Logo.png
rename to packages/desktop/src-tauri/icons/Square284x284Logo.png
diff --git a/src-tauri/icons/Square30x30Logo.png b/packages/desktop/src-tauri/icons/Square30x30Logo.png
similarity index 100%
rename from src-tauri/icons/Square30x30Logo.png
rename to packages/desktop/src-tauri/icons/Square30x30Logo.png
diff --git a/src-tauri/icons/Square310x310Logo.png b/packages/desktop/src-tauri/icons/Square310x310Logo.png
similarity index 100%
rename from src-tauri/icons/Square310x310Logo.png
rename to packages/desktop/src-tauri/icons/Square310x310Logo.png
diff --git a/src-tauri/icons/Square44x44Logo.png b/packages/desktop/src-tauri/icons/Square44x44Logo.png
similarity index 100%
rename from src-tauri/icons/Square44x44Logo.png
rename to packages/desktop/src-tauri/icons/Square44x44Logo.png
diff --git a/src-tauri/icons/Square71x71Logo.png b/packages/desktop/src-tauri/icons/Square71x71Logo.png
similarity index 100%
rename from src-tauri/icons/Square71x71Logo.png
rename to packages/desktop/src-tauri/icons/Square71x71Logo.png
diff --git a/src-tauri/icons/Square89x89Logo.png b/packages/desktop/src-tauri/icons/Square89x89Logo.png
similarity index 100%
rename from src-tauri/icons/Square89x89Logo.png
rename to packages/desktop/src-tauri/icons/Square89x89Logo.png
diff --git a/src-tauri/icons/StoreLogo.png b/packages/desktop/src-tauri/icons/StoreLogo.png
similarity index 100%
rename from src-tauri/icons/StoreLogo.png
rename to packages/desktop/src-tauri/icons/StoreLogo.png
diff --git a/src-tauri/icons/android/mipmap-anydpi-v26/ic_launcher.xml b/packages/desktop/src-tauri/icons/android/mipmap-anydpi-v26/ic_launcher.xml
similarity index 100%
rename from src-tauri/icons/android/mipmap-anydpi-v26/ic_launcher.xml
rename to packages/desktop/src-tauri/icons/android/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/src-tauri/icons/android/mipmap-hdpi/ic_launcher.png b/packages/desktop/src-tauri/icons/android/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from src-tauri/icons/android/mipmap-hdpi/ic_launcher.png
rename to packages/desktop/src-tauri/icons/android/mipmap-hdpi/ic_launcher.png
diff --git a/src-tauri/icons/android/mipmap-hdpi/ic_launcher_foreground.png b/packages/desktop/src-tauri/icons/android/mipmap-hdpi/ic_launcher_foreground.png
similarity index 100%
rename from src-tauri/icons/android/mipmap-hdpi/ic_launcher_foreground.png
rename to packages/desktop/src-tauri/icons/android/mipmap-hdpi/ic_launcher_foreground.png
diff --git a/src-tauri/icons/android/mipmap-hdpi/ic_launcher_round.png b/packages/desktop/src-tauri/icons/android/mipmap-hdpi/ic_launcher_round.png
similarity index 100%
rename from src-tauri/icons/android/mipmap-hdpi/ic_launcher_round.png
rename to packages/desktop/src-tauri/icons/android/mipmap-hdpi/ic_launcher_round.png
diff --git a/src-tauri/icons/android/mipmap-mdpi/ic_launcher.png b/packages/desktop/src-tauri/icons/android/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from src-tauri/icons/android/mipmap-mdpi/ic_launcher.png
rename to packages/desktop/src-tauri/icons/android/mipmap-mdpi/ic_launcher.png
diff --git a/src-tauri/icons/android/mipmap-mdpi/ic_launcher_foreground.png b/packages/desktop/src-tauri/icons/android/mipmap-mdpi/ic_launcher_foreground.png
similarity index 100%
rename from src-tauri/icons/android/mipmap-mdpi/ic_launcher_foreground.png
rename to packages/desktop/src-tauri/icons/android/mipmap-mdpi/ic_launcher_foreground.png
diff --git a/src-tauri/icons/android/mipmap-mdpi/ic_launcher_round.png b/packages/desktop/src-tauri/icons/android/mipmap-mdpi/ic_launcher_round.png
similarity index 100%
rename from src-tauri/icons/android/mipmap-mdpi/ic_launcher_round.png
rename to packages/desktop/src-tauri/icons/android/mipmap-mdpi/ic_launcher_round.png
diff --git a/src-tauri/icons/android/mipmap-xhdpi/ic_launcher.png b/packages/desktop/src-tauri/icons/android/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from src-tauri/icons/android/mipmap-xhdpi/ic_launcher.png
rename to packages/desktop/src-tauri/icons/android/mipmap-xhdpi/ic_launcher.png
diff --git a/src-tauri/icons/android/mipmap-xhdpi/ic_launcher_foreground.png b/packages/desktop/src-tauri/icons/android/mipmap-xhdpi/ic_launcher_foreground.png
similarity index 100%
rename from src-tauri/icons/android/mipmap-xhdpi/ic_launcher_foreground.png
rename to packages/desktop/src-tauri/icons/android/mipmap-xhdpi/ic_launcher_foreground.png
diff --git a/src-tauri/icons/android/mipmap-xhdpi/ic_launcher_round.png b/packages/desktop/src-tauri/icons/android/mipmap-xhdpi/ic_launcher_round.png
similarity index 100%
rename from src-tauri/icons/android/mipmap-xhdpi/ic_launcher_round.png
rename to packages/desktop/src-tauri/icons/android/mipmap-xhdpi/ic_launcher_round.png
diff --git a/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher.png b/packages/desktop/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from src-tauri/icons/android/mipmap-xxhdpi/ic_launcher.png
rename to packages/desktop/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher.png
diff --git a/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_foreground.png b/packages/desktop/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_foreground.png
similarity index 100%
rename from src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_foreground.png
rename to packages/desktop/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_foreground.png
diff --git a/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_round.png b/packages/desktop/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_round.png
similarity index 100%
rename from src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_round.png
rename to packages/desktop/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher.png b/packages/desktop/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher.png
rename to packages/desktop/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_foreground.png b/packages/desktop/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_foreground.png
similarity index 100%
rename from src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_foreground.png
rename to packages/desktop/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_foreground.png
diff --git a/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_round.png b/packages/desktop/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_round.png
similarity index 100%
rename from src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_round.png
rename to packages/desktop/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/src-tauri/icons/android/values/ic_launcher_background.xml b/packages/desktop/src-tauri/icons/android/values/ic_launcher_background.xml
similarity index 100%
rename from src-tauri/icons/android/values/ic_launcher_background.xml
rename to packages/desktop/src-tauri/icons/android/values/ic_launcher_background.xml
diff --git a/src-tauri/icons/icon.icns b/packages/desktop/src-tauri/icons/icon.icns
similarity index 100%
rename from src-tauri/icons/icon.icns
rename to packages/desktop/src-tauri/icons/icon.icns
diff --git a/src-tauri/icons/icon.ico b/packages/desktop/src-tauri/icons/icon.ico
similarity index 100%
rename from src-tauri/icons/icon.ico
rename to packages/desktop/src-tauri/icons/icon.ico
diff --git a/src-tauri/icons/icon.png b/packages/desktop/src-tauri/icons/icon.png
similarity index 100%
rename from src-tauri/icons/icon.png
rename to packages/desktop/src-tauri/icons/icon.png
diff --git a/src-tauri/icons/ios/AppIcon-20x20@1x.png b/packages/desktop/src-tauri/icons/ios/AppIcon-20x20@1x.png
similarity index 100%
rename from src-tauri/icons/ios/AppIcon-20x20@1x.png
rename to packages/desktop/src-tauri/icons/ios/AppIcon-20x20@1x.png
diff --git a/src-tauri/icons/ios/AppIcon-20x20@2x-1.png b/packages/desktop/src-tauri/icons/ios/AppIcon-20x20@2x-1.png
similarity index 100%
rename from src-tauri/icons/ios/AppIcon-20x20@2x-1.png
rename to packages/desktop/src-tauri/icons/ios/AppIcon-20x20@2x-1.png
diff --git a/src-tauri/icons/ios/AppIcon-20x20@2x.png b/packages/desktop/src-tauri/icons/ios/AppIcon-20x20@2x.png
similarity index 100%
rename from src-tauri/icons/ios/AppIcon-20x20@2x.png
rename to packages/desktop/src-tauri/icons/ios/AppIcon-20x20@2x.png
diff --git a/src-tauri/icons/ios/AppIcon-20x20@3x.png b/packages/desktop/src-tauri/icons/ios/AppIcon-20x20@3x.png
similarity index 100%
rename from src-tauri/icons/ios/AppIcon-20x20@3x.png
rename to packages/desktop/src-tauri/icons/ios/AppIcon-20x20@3x.png
diff --git a/src-tauri/icons/ios/AppIcon-29x29@1x.png b/packages/desktop/src-tauri/icons/ios/AppIcon-29x29@1x.png
similarity index 100%
rename from src-tauri/icons/ios/AppIcon-29x29@1x.png
rename to packages/desktop/src-tauri/icons/ios/AppIcon-29x29@1x.png
diff --git a/src-tauri/icons/ios/AppIcon-29x29@2x-1.png b/packages/desktop/src-tauri/icons/ios/AppIcon-29x29@2x-1.png
similarity index 100%
rename from src-tauri/icons/ios/AppIcon-29x29@2x-1.png
rename to packages/desktop/src-tauri/icons/ios/AppIcon-29x29@2x-1.png
diff --git a/src-tauri/icons/ios/AppIcon-29x29@2x.png b/packages/desktop/src-tauri/icons/ios/AppIcon-29x29@2x.png
similarity index 100%
rename from src-tauri/icons/ios/AppIcon-29x29@2x.png
rename to packages/desktop/src-tauri/icons/ios/AppIcon-29x29@2x.png
diff --git a/src-tauri/icons/ios/AppIcon-29x29@3x.png b/packages/desktop/src-tauri/icons/ios/AppIcon-29x29@3x.png
similarity index 100%
rename from src-tauri/icons/ios/AppIcon-29x29@3x.png
rename to packages/desktop/src-tauri/icons/ios/AppIcon-29x29@3x.png
diff --git a/src-tauri/icons/ios/AppIcon-40x40@1x.png b/packages/desktop/src-tauri/icons/ios/AppIcon-40x40@1x.png
similarity index 100%
rename from src-tauri/icons/ios/AppIcon-40x40@1x.png
rename to packages/desktop/src-tauri/icons/ios/AppIcon-40x40@1x.png
diff --git a/src-tauri/icons/ios/AppIcon-40x40@2x-1.png b/packages/desktop/src-tauri/icons/ios/AppIcon-40x40@2x-1.png
similarity index 100%
rename from src-tauri/icons/ios/AppIcon-40x40@2x-1.png
rename to packages/desktop/src-tauri/icons/ios/AppIcon-40x40@2x-1.png
diff --git a/src-tauri/icons/ios/AppIcon-40x40@2x.png b/packages/desktop/src-tauri/icons/ios/AppIcon-40x40@2x.png
similarity index 100%
rename from src-tauri/icons/ios/AppIcon-40x40@2x.png
rename to packages/desktop/src-tauri/icons/ios/AppIcon-40x40@2x.png
diff --git a/src-tauri/icons/ios/AppIcon-40x40@3x.png b/packages/desktop/src-tauri/icons/ios/AppIcon-40x40@3x.png
similarity index 100%
rename from src-tauri/icons/ios/AppIcon-40x40@3x.png
rename to packages/desktop/src-tauri/icons/ios/AppIcon-40x40@3x.png
diff --git a/src-tauri/icons/ios/AppIcon-512@2x.png b/packages/desktop/src-tauri/icons/ios/AppIcon-512@2x.png
similarity index 100%
rename from src-tauri/icons/ios/AppIcon-512@2x.png
rename to packages/desktop/src-tauri/icons/ios/AppIcon-512@2x.png
diff --git a/src-tauri/icons/ios/AppIcon-60x60@2x.png b/packages/desktop/src-tauri/icons/ios/AppIcon-60x60@2x.png
similarity index 100%
rename from src-tauri/icons/ios/AppIcon-60x60@2x.png
rename to packages/desktop/src-tauri/icons/ios/AppIcon-60x60@2x.png
diff --git a/src-tauri/icons/ios/AppIcon-60x60@3x.png b/packages/desktop/src-tauri/icons/ios/AppIcon-60x60@3x.png
similarity index 100%
rename from src-tauri/icons/ios/AppIcon-60x60@3x.png
rename to packages/desktop/src-tauri/icons/ios/AppIcon-60x60@3x.png
diff --git a/src-tauri/icons/ios/AppIcon-76x76@1x.png b/packages/desktop/src-tauri/icons/ios/AppIcon-76x76@1x.png
similarity index 100%
rename from src-tauri/icons/ios/AppIcon-76x76@1x.png
rename to packages/desktop/src-tauri/icons/ios/AppIcon-76x76@1x.png
diff --git a/src-tauri/icons/ios/AppIcon-76x76@2x.png b/packages/desktop/src-tauri/icons/ios/AppIcon-76x76@2x.png
similarity index 100%
rename from src-tauri/icons/ios/AppIcon-76x76@2x.png
rename to packages/desktop/src-tauri/icons/ios/AppIcon-76x76@2x.png
diff --git a/src-tauri/icons/ios/AppIcon-83.5x83.5@2x.png b/packages/desktop/src-tauri/icons/ios/AppIcon-83.5x83.5@2x.png
similarity index 100%
rename from src-tauri/icons/ios/AppIcon-83.5x83.5@2x.png
rename to packages/desktop/src-tauri/icons/ios/AppIcon-83.5x83.5@2x.png
diff --git a/src-tauri/src/commands/config.rs b/packages/desktop/src-tauri/src/commands/config.rs
similarity index 100%
rename from src-tauri/src/commands/config.rs
rename to packages/desktop/src-tauri/src/commands/config.rs
diff --git a/src-tauri/src/commands/engine.rs b/packages/desktop/src-tauri/src/commands/engine.rs
similarity index 100%
rename from src-tauri/src/commands/engine.rs
rename to packages/desktop/src-tauri/src/commands/engine.rs
diff --git a/src-tauri/src/commands/misc.rs b/packages/desktop/src-tauri/src/commands/misc.rs
similarity index 100%
rename from src-tauri/src/commands/misc.rs
rename to packages/desktop/src-tauri/src/commands/misc.rs
diff --git a/src-tauri/src/commands/mod.rs b/packages/desktop/src-tauri/src/commands/mod.rs
similarity index 100%
rename from src-tauri/src/commands/mod.rs
rename to packages/desktop/src-tauri/src/commands/mod.rs
diff --git a/src-tauri/src/commands/opkg.rs b/packages/desktop/src-tauri/src/commands/opkg.rs
similarity index 100%
rename from src-tauri/src/commands/opkg.rs
rename to packages/desktop/src-tauri/src/commands/opkg.rs
diff --git a/src-tauri/src/commands/updater.rs b/packages/desktop/src-tauri/src/commands/updater.rs
similarity index 100%
rename from src-tauri/src/commands/updater.rs
rename to packages/desktop/src-tauri/src/commands/updater.rs
diff --git a/src-tauri/src/commands/workspace.rs b/packages/desktop/src-tauri/src/commands/workspace.rs
similarity index 100%
rename from src-tauri/src/commands/workspace.rs
rename to packages/desktop/src-tauri/src/commands/workspace.rs
diff --git a/src-tauri/src/config.rs b/packages/desktop/src-tauri/src/config.rs
similarity index 100%
rename from src-tauri/src/config.rs
rename to packages/desktop/src-tauri/src/config.rs
diff --git a/src-tauri/src/engine/doctor.rs b/packages/desktop/src-tauri/src/engine/doctor.rs
similarity index 100%
rename from src-tauri/src/engine/doctor.rs
rename to packages/desktop/src-tauri/src/engine/doctor.rs
diff --git a/src-tauri/src/engine/manager.rs b/packages/desktop/src-tauri/src/engine/manager.rs
similarity index 100%
rename from src-tauri/src/engine/manager.rs
rename to packages/desktop/src-tauri/src/engine/manager.rs
diff --git a/src-tauri/src/engine/mod.rs b/packages/desktop/src-tauri/src/engine/mod.rs
similarity index 100%
rename from src-tauri/src/engine/mod.rs
rename to packages/desktop/src-tauri/src/engine/mod.rs
diff --git a/src-tauri/src/engine/paths.rs b/packages/desktop/src-tauri/src/engine/paths.rs
similarity index 100%
rename from src-tauri/src/engine/paths.rs
rename to packages/desktop/src-tauri/src/engine/paths.rs
diff --git a/src-tauri/src/engine/spawn.rs b/packages/desktop/src-tauri/src/engine/spawn.rs
similarity index 100%
rename from src-tauri/src/engine/spawn.rs
rename to packages/desktop/src-tauri/src/engine/spawn.rs
diff --git a/src-tauri/src/fs.rs b/packages/desktop/src-tauri/src/fs.rs
similarity index 100%
rename from src-tauri/src/fs.rs
rename to packages/desktop/src-tauri/src/fs.rs
diff --git a/src-tauri/src/lib.rs b/packages/desktop/src-tauri/src/lib.rs
similarity index 100%
rename from src-tauri/src/lib.rs
rename to packages/desktop/src-tauri/src/lib.rs
diff --git a/src-tauri/src/main.rs b/packages/desktop/src-tauri/src/main.rs
similarity index 100%
rename from src-tauri/src/main.rs
rename to packages/desktop/src-tauri/src/main.rs
diff --git a/src-tauri/src/opkg.rs b/packages/desktop/src-tauri/src/opkg.rs
similarity index 100%
rename from src-tauri/src/opkg.rs
rename to packages/desktop/src-tauri/src/opkg.rs
diff --git a/src-tauri/src/paths.rs b/packages/desktop/src-tauri/src/paths.rs
similarity index 100%
rename from src-tauri/src/paths.rs
rename to packages/desktop/src-tauri/src/paths.rs
diff --git a/src-tauri/src/platform/mod.rs b/packages/desktop/src-tauri/src/platform/mod.rs
similarity index 100%
rename from src-tauri/src/platform/mod.rs
rename to packages/desktop/src-tauri/src/platform/mod.rs
diff --git a/src-tauri/src/platform/unix.rs b/packages/desktop/src-tauri/src/platform/unix.rs
similarity index 100%
rename from src-tauri/src/platform/unix.rs
rename to packages/desktop/src-tauri/src/platform/unix.rs
diff --git a/src-tauri/src/platform/windows.rs b/packages/desktop/src-tauri/src/platform/windows.rs
similarity index 100%
rename from src-tauri/src/platform/windows.rs
rename to packages/desktop/src-tauri/src/platform/windows.rs
diff --git a/src-tauri/src/types.rs b/packages/desktop/src-tauri/src/types.rs
similarity index 100%
rename from src-tauri/src/types.rs
rename to packages/desktop/src-tauri/src/types.rs
diff --git a/src-tauri/src/updater.rs b/packages/desktop/src-tauri/src/updater.rs
similarity index 100%
rename from src-tauri/src/updater.rs
rename to packages/desktop/src-tauri/src/updater.rs
diff --git a/src-tauri/src/utils.rs b/packages/desktop/src-tauri/src/utils.rs
similarity index 100%
rename from src-tauri/src/utils.rs
rename to packages/desktop/src-tauri/src/utils.rs
diff --git a/src-tauri/src/workspace/files.rs b/packages/desktop/src-tauri/src/workspace/files.rs
similarity index 100%
rename from src-tauri/src/workspace/files.rs
rename to packages/desktop/src-tauri/src/workspace/files.rs
diff --git a/src-tauri/src/workspace/mod.rs b/packages/desktop/src-tauri/src/workspace/mod.rs
similarity index 100%
rename from src-tauri/src/workspace/mod.rs
rename to packages/desktop/src-tauri/src/workspace/mod.rs
diff --git a/src-tauri/src/workspace/state.rs b/packages/desktop/src-tauri/src/workspace/state.rs
similarity index 100%
rename from src-tauri/src/workspace/state.rs
rename to packages/desktop/src-tauri/src/workspace/state.rs
diff --git a/src-tauri/src/workspace/templates.rs b/packages/desktop/src-tauri/src/workspace/templates.rs
similarity index 100%
rename from src-tauri/src/workspace/templates.rs
rename to packages/desktop/src-tauri/src/workspace/templates.rs
diff --git a/src-tauri/tauri.conf.json b/packages/desktop/src-tauri/tauri.conf.json
similarity index 100%
rename from src-tauri/tauri.conf.json
rename to packages/desktop/src-tauri/tauri.conf.json
diff --git a/src/app/app.tsx b/packages/desktop/src/app/app.tsx
similarity index 100%
rename from src/app/app.tsx
rename to packages/desktop/src/app/app.tsx
diff --git a/src/app/components/button.tsx b/packages/desktop/src/app/components/button.tsx
similarity index 100%
rename from src/app/components/button.tsx
rename to packages/desktop/src/app/components/button.tsx
diff --git a/src/app/components/card.tsx b/packages/desktop/src/app/components/card.tsx
similarity index 100%
rename from src/app/components/card.tsx
rename to packages/desktop/src/app/components/card.tsx
diff --git a/src/app/components/create-workspace-modal.tsx b/packages/desktop/src/app/components/create-workspace-modal.tsx
similarity index 100%
rename from src/app/components/create-workspace-modal.tsx
rename to packages/desktop/src/app/components/create-workspace-modal.tsx
diff --git a/src/app/components/language-picker-modal.tsx b/packages/desktop/src/app/components/language-picker-modal.tsx
similarity index 100%
rename from src/app/components/language-picker-modal.tsx
rename to packages/desktop/src/app/components/language-picker-modal.tsx
diff --git a/src/app/components/mcp-auth-modal.tsx b/packages/desktop/src/app/components/mcp-auth-modal.tsx
similarity index 100%
rename from src/app/components/mcp-auth-modal.tsx
rename to packages/desktop/src/app/components/mcp-auth-modal.tsx
diff --git a/src/app/components/model-picker-modal.tsx b/packages/desktop/src/app/components/model-picker-modal.tsx
similarity index 100%
rename from src/app/components/model-picker-modal.tsx
rename to packages/desktop/src/app/components/model-picker-modal.tsx
diff --git a/src/app/components/onboarding-workspace-selector.tsx b/packages/desktop/src/app/components/onboarding-workspace-selector.tsx
similarity index 100%
rename from src/app/components/onboarding-workspace-selector.tsx
rename to packages/desktop/src/app/components/onboarding-workspace-selector.tsx
diff --git a/src/app/components/openwork-logo.tsx b/packages/desktop/src/app/components/openwork-logo.tsx
similarity index 100%
rename from src/app/components/openwork-logo.tsx
rename to packages/desktop/src/app/components/openwork-logo.tsx
diff --git a/src/app/components/part-view.tsx b/packages/desktop/src/app/components/part-view.tsx
similarity index 100%
rename from src/app/components/part-view.tsx
rename to packages/desktop/src/app/components/part-view.tsx
diff --git a/src/app/components/reset-modal.tsx b/packages/desktop/src/app/components/reset-modal.tsx
similarity index 100%
rename from src/app/components/reset-modal.tsx
rename to packages/desktop/src/app/components/reset-modal.tsx
diff --git a/src/app/components/template-modal.tsx b/packages/desktop/src/app/components/template-modal.tsx
similarity index 100%
rename from src/app/components/template-modal.tsx
rename to packages/desktop/src/app/components/template-modal.tsx
diff --git a/src/app/components/text-input.tsx b/packages/desktop/src/app/components/text-input.tsx
similarity index 100%
rename from src/app/components/text-input.tsx
rename to packages/desktop/src/app/components/text-input.tsx
diff --git a/src/app/components/thinking-block.tsx b/packages/desktop/src/app/components/thinking-block.tsx
similarity index 100%
rename from src/app/components/thinking-block.tsx
rename to packages/desktop/src/app/components/thinking-block.tsx
diff --git a/src/app/components/workspace-chip.tsx b/packages/desktop/src/app/components/workspace-chip.tsx
similarity index 100%
rename from src/app/components/workspace-chip.tsx
rename to packages/desktop/src/app/components/workspace-chip.tsx
diff --git a/src/app/components/workspace-picker.tsx b/packages/desktop/src/app/components/workspace-picker.tsx
similarity index 100%
rename from src/app/components/workspace-picker.tsx
rename to packages/desktop/src/app/components/workspace-picker.tsx
diff --git a/src/app/constants.ts b/packages/desktop/src/app/constants.ts
similarity index 100%
rename from src/app/constants.ts
rename to packages/desktop/src/app/constants.ts
diff --git a/src/app/context/extensions.ts b/packages/desktop/src/app/context/extensions.ts
similarity index 100%
rename from src/app/context/extensions.ts
rename to packages/desktop/src/app/context/extensions.ts
diff --git a/src/app/context/global-sdk.tsx b/packages/desktop/src/app/context/global-sdk.tsx
similarity index 100%
rename from src/app/context/global-sdk.tsx
rename to packages/desktop/src/app/context/global-sdk.tsx
diff --git a/src/app/context/global-sync.tsx b/packages/desktop/src/app/context/global-sync.tsx
similarity index 100%
rename from src/app/context/global-sync.tsx
rename to packages/desktop/src/app/context/global-sync.tsx
diff --git a/src/app/context/local.tsx b/packages/desktop/src/app/context/local.tsx
similarity index 100%
rename from src/app/context/local.tsx
rename to packages/desktop/src/app/context/local.tsx
diff --git a/src/app/context/platform.tsx b/packages/desktop/src/app/context/platform.tsx
similarity index 100%
rename from src/app/context/platform.tsx
rename to packages/desktop/src/app/context/platform.tsx
diff --git a/src/app/context/server.tsx b/packages/desktop/src/app/context/server.tsx
similarity index 100%
rename from src/app/context/server.tsx
rename to packages/desktop/src/app/context/server.tsx
diff --git a/src/app/context/session.ts b/packages/desktop/src/app/context/session.ts
similarity index 100%
rename from src/app/context/session.ts
rename to packages/desktop/src/app/context/session.ts
diff --git a/src/app/context/sync.tsx b/packages/desktop/src/app/context/sync.tsx
similarity index 100%
rename from src/app/context/sync.tsx
rename to packages/desktop/src/app/context/sync.tsx
diff --git a/src/app/context/updater.ts b/packages/desktop/src/app/context/updater.ts
similarity index 100%
rename from src/app/context/updater.ts
rename to packages/desktop/src/app/context/updater.ts
diff --git a/src/app/context/workspace.ts b/packages/desktop/src/app/context/workspace.ts
similarity index 100%
rename from src/app/context/workspace.ts
rename to packages/desktop/src/app/context/workspace.ts
diff --git a/src/app/demo-state.ts b/packages/desktop/src/app/demo-state.ts
similarity index 100%
rename from src/app/demo-state.ts
rename to packages/desktop/src/app/demo-state.ts
diff --git a/src/app/entry.tsx b/packages/desktop/src/app/entry.tsx
similarity index 100%
rename from src/app/entry.tsx
rename to packages/desktop/src/app/entry.tsx
diff --git a/src/app/index.css b/packages/desktop/src/app/index.css
similarity index 100%
rename from src/app/index.css
rename to packages/desktop/src/app/index.css
diff --git a/src/app/lib/opencode.ts b/packages/desktop/src/app/lib/opencode.ts
similarity index 100%
rename from src/app/lib/opencode.ts
rename to packages/desktop/src/app/lib/opencode.ts
diff --git a/src/app/lib/tauri.ts b/packages/desktop/src/app/lib/tauri.ts
similarity index 100%
rename from src/app/lib/tauri.ts
rename to packages/desktop/src/app/lib/tauri.ts
diff --git a/src/app/mcp.ts b/packages/desktop/src/app/mcp.ts
similarity index 100%
rename from src/app/mcp.ts
rename to packages/desktop/src/app/mcp.ts
diff --git a/src/app/pages/dashboard.tsx b/packages/desktop/src/app/pages/dashboard.tsx
similarity index 100%
rename from src/app/pages/dashboard.tsx
rename to packages/desktop/src/app/pages/dashboard.tsx
diff --git a/src/app/pages/mcp.tsx b/packages/desktop/src/app/pages/mcp.tsx
similarity index 100%
rename from src/app/pages/mcp.tsx
rename to packages/desktop/src/app/pages/mcp.tsx
diff --git a/src/app/pages/onboarding.tsx b/packages/desktop/src/app/pages/onboarding.tsx
similarity index 100%
rename from src/app/pages/onboarding.tsx
rename to packages/desktop/src/app/pages/onboarding.tsx
diff --git a/src/app/pages/plugins.tsx b/packages/desktop/src/app/pages/plugins.tsx
similarity index 100%
rename from src/app/pages/plugins.tsx
rename to packages/desktop/src/app/pages/plugins.tsx
diff --git a/src/app/pages/session.tsx b/packages/desktop/src/app/pages/session.tsx
similarity index 100%
rename from src/app/pages/session.tsx
rename to packages/desktop/src/app/pages/session.tsx
diff --git a/src/app/pages/settings.tsx b/packages/desktop/src/app/pages/settings.tsx
similarity index 100%
rename from src/app/pages/settings.tsx
rename to packages/desktop/src/app/pages/settings.tsx
diff --git a/src/app/pages/skills.tsx b/packages/desktop/src/app/pages/skills.tsx
similarity index 100%
rename from src/app/pages/skills.tsx
rename to packages/desktop/src/app/pages/skills.tsx
diff --git a/src/app/pages/templates.tsx b/packages/desktop/src/app/pages/templates.tsx
similarity index 100%
rename from src/app/pages/templates.tsx
rename to packages/desktop/src/app/pages/templates.tsx
diff --git a/src/app/state/demo.ts b/packages/desktop/src/app/state/demo.ts
similarity index 100%
rename from src/app/state/demo.ts
rename to packages/desktop/src/app/state/demo.ts
diff --git a/src/app/state/extensions.ts b/packages/desktop/src/app/state/extensions.ts
similarity index 100%
rename from src/app/state/extensions.ts
rename to packages/desktop/src/app/state/extensions.ts
diff --git a/src/app/state/sessions.ts b/packages/desktop/src/app/state/sessions.ts
similarity index 100%
rename from src/app/state/sessions.ts
rename to packages/desktop/src/app/state/sessions.ts
diff --git a/src/app/state/system.ts b/packages/desktop/src/app/state/system.ts
similarity index 100%
rename from src/app/state/system.ts
rename to packages/desktop/src/app/state/system.ts
diff --git a/src/app/state/templates.ts b/packages/desktop/src/app/state/templates.ts
similarity index 100%
rename from src/app/state/templates.ts
rename to packages/desktop/src/app/state/templates.ts
diff --git a/src/app/system-state.ts b/packages/desktop/src/app/system-state.ts
similarity index 100%
rename from src/app/system-state.ts
rename to packages/desktop/src/app/system-state.ts
diff --git a/src/app/template-state.ts b/packages/desktop/src/app/template-state.ts
similarity index 100%
rename from src/app/template-state.ts
rename to packages/desktop/src/app/template-state.ts
diff --git a/src/app/theme.ts b/packages/desktop/src/app/theme.ts
similarity index 100%
rename from src/app/theme.ts
rename to packages/desktop/src/app/theme.ts
diff --git a/src/app/types.ts b/packages/desktop/src/app/types.ts
similarity index 100%
rename from src/app/types.ts
rename to packages/desktop/src/app/types.ts
diff --git a/src/app/utils/index.ts b/packages/desktop/src/app/utils/index.ts
similarity index 100%
rename from src/app/utils/index.ts
rename to packages/desktop/src/app/utils/index.ts
diff --git a/src/app/utils/persist.ts b/packages/desktop/src/app/utils/persist.ts
similarity index 100%
rename from src/app/utils/persist.ts
rename to packages/desktop/src/app/utils/persist.ts
diff --git a/src/app/utils/plugins.ts b/packages/desktop/src/app/utils/plugins.ts
similarity index 100%
rename from src/app/utils/plugins.ts
rename to packages/desktop/src/app/utils/plugins.ts
diff --git a/src/app/utils/templates.ts b/packages/desktop/src/app/utils/templates.ts
similarity index 100%
rename from src/app/utils/templates.ts
rename to packages/desktop/src/app/utils/templates.ts
diff --git a/src/i18n/index.ts b/packages/desktop/src/i18n/index.ts
similarity index 100%
rename from src/i18n/index.ts
rename to packages/desktop/src/i18n/index.ts
diff --git a/src/i18n/locales/en.ts b/packages/desktop/src/i18n/locales/en.ts
similarity index 100%
rename from src/i18n/locales/en.ts
rename to packages/desktop/src/i18n/locales/en.ts
diff --git a/src/i18n/locales/index.ts b/packages/desktop/src/i18n/locales/index.ts
similarity index 100%
rename from src/i18n/locales/index.ts
rename to packages/desktop/src/i18n/locales/index.ts
diff --git a/src/i18n/locales/zh.ts b/packages/desktop/src/i18n/locales/zh.ts
similarity index 100%
rename from src/i18n/locales/zh.ts
rename to packages/desktop/src/i18n/locales/zh.ts
diff --git a/src/index.tsx b/packages/desktop/src/index.tsx
similarity index 100%
rename from src/index.tsx
rename to packages/desktop/src/index.tsx
diff --git a/src/styles/colors.css b/packages/desktop/src/styles/colors.css
similarity index 100%
rename from src/styles/colors.css
rename to packages/desktop/src/styles/colors.css
diff --git a/src/styles/tailwind-colors.ts b/packages/desktop/src/styles/tailwind-colors.ts
similarity index 100%
rename from src/styles/tailwind-colors.ts
rename to packages/desktop/src/styles/tailwind-colors.ts
diff --git a/tailwind.config.ts b/packages/desktop/tailwind.config.ts
similarity index 100%
rename from tailwind.config.ts
rename to packages/desktop/tailwind.config.ts
diff --git a/tsconfig.json b/packages/desktop/tsconfig.json
similarity index 100%
rename from tsconfig.json
rename to packages/desktop/tsconfig.json
diff --git a/vite.config.ts b/packages/desktop/vite.config.ts
similarity index 100%
rename from vite.config.ts
rename to packages/desktop/vite.config.ts
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4ce0181d..9b399686 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -6,7 +6,9 @@ settings:
 
 importers:
 
-  .:
+  .: {}
+
+  packages/desktop:
     dependencies:
       '@opencode-ai/sdk':
         specifier: ^1.1.19
@@ -454,6 +456,7 @@ packages:
     resolution: {integrity: sha512-l+n10/51neGcMaP3ypYt21bXfoeWh8IaC8k7fYuY3ww2a8S1Zv2N2a7FF5Qn+waTu86l0V8/nRHjkyqVIZBYwA==}
     peerDependencies:
       solid-js: ^1.6.12
+
   '@solid-primitives/storage@4.3.3':
     resolution: {integrity: sha512-ACbNwMZ1s8VAvld6EUXkDkX/US3IhtlPLxg6+B2s9MwNUugwdd51I98LPEaHrdLpqPmyzqgoJe0TxEFlf3Dqrw==}
     peerDependencies:
@@ -1292,6 +1295,7 @@ snapshots:
     dependencies:
       '@solid-primitives/utils': 6.3.2(solid-js@1.9.10)
       solid-js: 1.9.10
+
   '@solid-primitives/storage@4.3.3(solid-js@1.9.10)':
     dependencies:
       '@solid-primitives/utils': 6.3.2(solid-js@1.9.10)
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 4de91a38..dee51e92 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -1,2 +1,2 @@
 packages:
-  - '.'
+  - "packages/*"