fix(opencode): resolve npmrc with @npmcli/config

.github/workflows/porter-app-5534-apn-relay.yml

@@ -1,27 +0,0 @@
-"on":
-    push:
-        branches:
-            - opencode-remote-voice
-name: Deploy to apn-relay
-jobs:
-    porter-deploy:
-        runs-on: ubuntu-latest
-        steps:
-            - name: Checkout code
-              uses: actions/checkout@v4
-            - name: Set Github tag
-              id: vars
-              run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
-            - name: Setup porter
-              uses: porter-dev/setup-porter@v0.1.0
-            - name: Deploy stack
-              timeout-minutes: 30
-              run: porter apply
-              env:
-                PORTER_APP_NAME: apn-relay
-                PORTER_CLUSTER: "5534"
-                PORTER_DEPLOYMENT_TARGET_ID: d60e67f5-b0a6-4275-8ed6-3cebaf092147
-                PORTER_HOST: https://dashboard.porter.run
-                PORTER_PROJECT: "18525"
-                PORTER_TAG: ${{ steps.vars.outputs.sha_short }}
-                PORTER_TOKEN: ${{ secrets.PORTER_APP_18525_975734319 }}

AGENTS.md

@@ -1,162 +1,128 @@
-# OpenCode Monorepo Agent Guide
+- To regenerate the JavaScript SDK, run `./packages/sdk/js/script/build.ts`.
+- ALWAYS USE PARALLEL TOOLS WHEN APPLICABLE.
+- The default branch in this repo is `dev`.
+- Local `main` ref may not exist; use `dev` or `origin/dev` for diffs.
+- Prefer automation: execute requested actions without confirmation unless blocked by missing info or safety/irreversibility.
 
-This file is for coding agents working in `/Users/ryanvogel/dev/opencode`.
+## Style Guide
 
-## Scope And Precedence
+### General Principles
 
-- Start with this file for repo-wide defaults.
-- Then check package-local `AGENTS.md` files for stricter rules.
-- Existing local guides include `packages/opencode/AGENTS.md` and `packages/app/AGENTS.md`.
-- Package-specific guides override this file when they conflict.
-
-## Repo Facts
-
-- Package manager: `bun` (`bun@1.3.11`).
-- Monorepo tool: `turbo`.
-- Default branch: `dev`.
-- Root test script intentionally fails; do not run tests from root.
-
-## Cursor / Copilot Rules
-
-- No `.cursor/rules/` directory found.
-- No `.cursorrules` file found.
-- No `.github/copilot-instructions.md` file found.
-- If these files are added later, treat them as mandatory project policy.
-
-## High-Value Commands
-
-Run commands from the correct package directory unless noted.
-
-### Root
-
-- Install deps: `bun install`
-- Run all typechecks via turbo: `bun run typecheck`
-- OpenCode dev CLI entry: `bun run dev`
-- OpenCode serve (common): `bun run dev serve --hostname 0.0.0.0 --port 4096`
-
-### `packages/opencode`
-
-- Dev CLI: `bun run dev`
-- Typecheck: `bun run typecheck`
-- Tests (all): `bun test --timeout 30000`
-- Tests (single file): `bun test test/path/to/file.test.ts --timeout 30000`
-- Tests (single test name): `bun test test/path/to/file.test.ts -t "name fragment" --timeout 30000`
-- Build: `bun run build`
-- Drizzle helper: `bun run db`
-
-### `packages/app`
-
-- Dev server: `bun dev`
-- Build: `bun run build`
-- Typecheck: `bun run typecheck`
-- Unit tests (all): `bun run test:unit`
-- Unit tests (single file): `bun test --preload ./happydom.ts ./src/path/to/file.test.ts`
-- Unit tests (single test name): `bun test --preload ./happydom.ts ./src/path/to/file.test.ts -t "name fragment"`
-- E2E tests: `bun run test:e2e`
-
-### `packages/mobile-voice`
-
-- Start Expo: `bun run start`
-- Start Expo dev client: `bunx expo start --dev-client --clear --host lan`
-- iOS native run: `bun run ios`
-- Android native run: `bun run android`
-- Lint: `bun run lint`
-- Expo doctor: `bunx expo-doctor`
-- Dependency compatibility check: `bunx expo install --check`
-
-### `packages/apn-relay`
-
-- Start relay: `bun run dev`
-- Typecheck: `bun run typecheck`
-- DB connectivity check: `bun run db:check`
-
-## Build / Lint / Test Expectations
-
-- Always run the narrowest checks that prove your change.
-- For backend changes: run package typecheck + relevant tests.
-- For mobile changes: run `expo lint` and at least one `expo` compile-style command if possible.
-- Never claim tests passed unless you ran them in this workspace.
-
-## Single-Test Guidance
-
-- Prefer running one file first, then broaden scope.
-- For Bun tests, pass the file path directly.
-- For name filtering, use `-t "..."`.
-- Keep original timeouts when scripts define them.
-
-## Code Style Guidelines
-
-These conventions are already used heavily in this repo and should be preserved.
-
-### Formatting
-
-- Use Prettier defaults configured in root: `semi: false`, `printWidth: 120`.
-- Keep imports grouped and stable; avoid noisy reorder-only edits.
-- Avoid unrelated formatting churn in touched files.
-
-### Imports
-
-- Prefer explicit imports over dynamic imports unless runtime gating is required.
-- Prefer existing alias patterns (for example `@/...`) where already configured.
-- Do not introduce new dependency layers when a local util already exists.
-
-### Types
-
-- Avoid `any`.
-- Prefer inference for local variables.
-- Add explicit annotations for exported APIs and complex boundaries.
-- Prefer `zod` schemas for request/response validation and parsing.
+- Keep things in one function unless composable or reusable
+- Avoid `try`/`catch` where possible
+- Avoid using the `any` type
+- Prefer single word variable names where possible
+- Use Bun APIs when possible, like `Bun.file()`
+- Rely on type inference when possible; avoid explicit type annotations or interfaces unless necessary for exports or clarity
+- Prefer functional array methods (flatMap, filter, map) over for loops; use type guards on filter to maintain type inference downstream
 
 ### Naming
 
-- Follow existing repo preference for short, clear names.
-- Use single-word names when readable; use multi-word only for clarity.
-- Keep naming consistent with nearby code.
+Prefer single word names for variables and functions. Only use multiple words if necessary.
+
+### Naming Enforcement (Read This)
+
+THIS RULE IS MANDATORY FOR AGENT WRITTEN CODE.
+
+- Use single word names by default for new locals, params, and helper functions.
+- Multi-word names are allowed only when a single word would be unclear or ambiguous.
+- Do not introduce new camelCase compounds when a short single-word alternative is clear.
+- Before finishing edits, review touched lines and shorten newly introduced identifiers where possible.
+- Good short names to prefer: `pid`, `cfg`, `err`, `opts`, `dir`, `root`, `child`, `state`, `timeout`.
+- Examples to avoid unless truly required: `inputPID`, `existingClient`, `connectTimeout`, `workerPath`.
+
+```ts
+// Good
+const foo = 1
+function journal(dir: string) {}
+
+// Bad
+const fooBar = 1
+function prepareJournal(dir: string) {}
+```
+
+Reduce total variable count by inlining when a value is only used once.
+
+```ts
+// Good
+const journal = await Bun.file(path.join(dir, "journal.json")).json()
+
+// Bad
+const journalPath = path.join(dir, "journal.json")
+const journal = await Bun.file(journalPath).json()
+```
+
+### Destructuring
+
+Avoid unnecessary destructuring. Use dot notation to preserve context.
+
+```ts
+// Good
+obj.a
+obj.b
+
+// Bad
+const { a, b } = obj
+```
+
+### Variables
+
+Prefer `const` over `let`. Use ternaries or early returns instead of reassignment.
+
+```ts
+// Good
+const foo = condition ? 1 : 2
+
+// Bad
+let foo
+if (condition) foo = 1
+else foo = 2
+```
 
 ### Control Flow
 
-- Prefer early returns over nested `else` blocks.
-- Keep functions focused; split only when it improves reuse or readability.
+Avoid `else` statements. Prefer early returns.
 
-### Error Handling
+```ts
+// Good
+function foo() {
+  if (condition) return 1
+  return 2
+}
 
-- Fail with actionable messages.
-- Avoid swallowing errors silently.
-- Log enough context to debug production issues (IDs, env, status), but never secrets.
-- In UI code, degrade gracefully for missing capabilities.
+// Bad
+function foo() {
+  if (condition) return 1
+  else return 2
+}
+```
 
-### Data / DB
+### Schema Definitions (Drizzle)
 
-- For Drizzle schema, use snake_case fields and columns.
-- Keep migration and schema changes minimal and explicit.
-- Follow package-specific DB guidance in `packages/opencode/AGENTS.md`.
+Use snake_case for field names so column names don't need to be redefined as strings.
 
-### Testing Philosophy
+```ts
+// Good
+const table = sqliteTable("session", {
+  id: text().primaryKey(),
+  project_id: text().notNull(),
+  created_at: integer().notNull(),
+})
 
-- Prefer testing real behavior over mocks.
-- Add regression tests for bug fixes where practical.
-- Keep fixtures small and focused.
+// Bad
+const table = sqliteTable("session", {
+  id: text("id").primaryKey(),
+  projectID: text("project_id").notNull(),
+  createdAt: integer("created_at").notNull(),
+})
+```
 
-## Agent Workflow Tips
+## Testing
 
-- Read existing code paths before introducing new abstractions.
-- Match local patterns first; do not impose a new style per file.
-- If a package has its own `AGENTS.md`, review it before editing.
-- For OpenCode Effect services, follow `packages/opencode/AGENTS.md` strictly.
+- Avoid mocks as much as possible
+- Test actual implementation, do not duplicate logic into tests
+- Tests cannot run from repo root (guard: `do-not-run-tests-from-root`); run from package dirs like `packages/opencode`.
 
-## Known Operational Notes
+## Type Checking
 
-- `packages/app/AGENTS.md` says: never restart app/server processes during that package's debugging workflow.
-- `packages/app/AGENTS.md` also documents local backend+web split for UI work.
-- `packages/opencode/AGENTS.md` contains mandatory Effect and database conventions.
-
-## Regeneration / Special Scripts
-
-- Regenerate JS SDK with: `./packages/sdk/js/script/build.ts`
-
-## Quick Checklist Before Finishing
-
-- Ran relevant package checks.
-- Updated docs/config when behavior changed.
-- Avoided committing unrelated files.
-- Kept edits minimal and aligned with local conventions.
+- Always run `bun typecheck` from package directories (e.g., `packages/opencode`), never `tsc` directly.

nix/hashes.json

@@ -1,8 +1,8 @@
 {
   "nodeModules": {
-    "x86_64-linux": "sha256-285KZ7rZLRoc6XqCZRHc25NE+mmpGh/BVeMpv8aPQtQ=",
-    "aarch64-linux": "sha256-qIwmY4TP4CI7R7G6A5OMYRrorVNXjkg25tTtVpIHm2o=",
-    "aarch64-darwin": "sha256-RwvnZQhdYZ0u7h7evyfxuPLHHX9eO/jXTAxIFc8B+IE=",
-    "x86_64-darwin": "sha256-vVj40al+TEeMpbe5XG2GmJEpN+eQAvtr9W0T98l5PBE="
+    "x86_64-linux": "sha256-r1+AehuOGIOaaxfXkQGracT/6OdFRn5Ub8s7H+MeKFY=",
+    "aarch64-linux": "sha256-WkMSRF/ZJLyzxNBjpiMR459C9G0NVOEw31tm8roPneA=",
+    "aarch64-darwin": "sha256-Z127cxFpTl8Ml7PB3CG9TcCU08oYCPuk0FECK2MQ2CI=",
+    "x86_64-darwin": "sha256-pkRoFtnVjyl+5fm+rrFyRnEwvptxylnFxPAcEv4ZOCg="
   }
 }

package.json

@@ -71,8 +71,7 @@
       "@solidjs/router": "0.15.4",
       "@solidjs/start": "https://pkg.pr.new/@solidjs/start@dfb2020",
       "solid-js": "1.9.10",
-      "vite-plugin-solid": "2.11.10",
-      "@lydell/node-pty": "1.2.0-beta.10"
+      "vite-plugin-solid": "2.11.10"
     }
   },
   "devDependencies": {

packages/apn-relay/.env.example

@@ -1,11 +0,0 @@
-PORT=8787
-
-DATABASE_HOST=
-DATABASE_USERNAME=
-DATABASE_PASSWORD=
-DATABASE_NAME=main
-
-APNS_TEAM_ID=
-APNS_KEY_ID=
-APNS_PRIVATE_KEY=
-APNS_DEFAULT_BUNDLE_ID=com.anomalyco.mobilevoice

packages/apn-relay/AGENTS.md

@@ -1,106 +0,0 @@
-# apn-relay Agent Guide
-
-This file defines package-specific guidance for agents working in `packages/apn-relay`.
-
-## Scope And Precedence
-
-- Follow root `AGENTS.md` first.
-- This file provides stricter package-level conventions for relay service work.
-- If future local guides are added, closest guide wins.
-
-## Project Overview
-
-- Minimal APNs relay service (Hono + Bun + PlanetScale via Drizzle).
-- Core routes:
-  - `GET /health`
-  - `GET /`
-  - `POST /v1/device/register`
-  - `POST /v1/device/unregister`
-  - `POST /v1/event`
-
-## Commands
-
-Run all commands from `packages/apn-relay`.
-
-- Install deps: `bun install`
-- Start relay locally: `bun run dev`
-- Typecheck: `bun run typecheck`
-- DB connectivity check: `bun run db:check`
-
-## Build / Test Expectations
-
-- There is no dedicated package test script currently.
-- Required validation for behavior changes:
-  - `bun run typecheck`
-  - `bun run db:check` when DB/env changes are involved
-  - manual endpoint verification against `/health`, `/v1/device/register`, `/v1/event`
-
-## Single-Test Guidance
-
-- No single-test command exists for this package today.
-- For focused checks, run endpoint-level manual tests against a local dev server.
-
-## Code Style Guidelines
-
-### Formatting / Structure
-
-- Keep handlers compact and explicit.
-- Prefer small local helpers for repeated route logic.
-- Avoid broad refactors when a targeted fix is enough.
-
-### Types / Validation
-
-- Validate request bodies with `zod` at route boundaries.
-- Keep payload and DB row shapes explicit and close to usage.
-- Avoid `any`; narrow unknown input immediately after parsing.
-
-### Naming
-
-- Follow existing concise naming in this package (`reg`, `unreg`, `evt`, `row`, `key`).
-- For DB columns, keep snake_case alignment with schema.
-
-### Error Handling
-
-- Return clear JSON errors for invalid input.
-- Keep handler failures observable via `app.onError` and structured logs.
-- Do not leak secrets in responses or logs.
-
-### Logging
-
-- Log delivery lifecycle at key checkpoints:
-  - registration/unregistration attempts
-  - event fanout start/end
-  - APNs send failures and retries
-- Mask sensitive values; prefer token suffixes and metadata.
-
-### APNs Environment Rules
-
-- Keep APNs env explicit per registration (`sandbox` / `production`).
-- For `BadEnvironmentKeyInToken`, retry once with flipped env and persist correction.
-- Avoid infinite retry loops; one retry max per delivery attempt.
-
-## Database Conventions
-
-- Schema is in `src/schema.sql.ts`.
-- Keep table/column names snake_case.
-- Maintain index naming consistency with existing schema.
-- For upserts, update only fields required by current behavior.
-
-## API Behavior Expectations
-
-- `register`/`unregister` must be idempotent.
-- `event` should return success envelope even when no devices are registered.
-- Delivery logs should capture per-attempt result and error payload.
-
-## Operational Notes
-
-- Ensure `APNS_PRIVATE_KEY` supports escaped newline format (`\n`) and raw multiline.
-- Validate that `APNS_DEFAULT_BUNDLE_ID` matches mobile app bundle identifier.
-- Avoid coupling route behavior to deployment platform specifics.
-
-## Before Finishing
-
-- Run `bun run typecheck`.
-- If DB/env behavior changed, run `bun run db:check`.
-- Manually exercise affected endpoints.
-- Confirm logs are useful and secret-safe.

packages/apn-relay/Dockerfile

@@ -1,14 +0,0 @@
-FROM oven/bun:1.3.11-alpine
-
-WORKDIR /app
-
-COPY package.json ./
-COPY tsconfig.json ./
-COPY drizzle.config.ts ./
-RUN bun install --production
-
-COPY src ./src
-
-EXPOSE 8787
-
-CMD ["bun", "run", "src/index.ts"]

packages/apn-relay/README.md

@@ -1,46 +0,0 @@
-# APN Relay
-
-Minimal APNs relay for OpenCode mobile background notifications.
-
-## What it does
-
-- Registers iOS device tokens for a shared secret.
-- Receives OpenCode event posts (`complete`, `permission`, `error`).
-- Sends APNs notifications to mapped devices.
-- Stores delivery rows in PlanetScale.
-
-## Routes
-
-- `GET /health`
-- `GET /` (simple dashboard)
-- `POST /v1/device/register`
-- `POST /v1/device/unregister`
-- `POST /v1/event`
-
-## Environment
-
-Use `.env.example` as a starting point.
-
-- `DATABASE_HOST`
-- `DATABASE_USERNAME`
-- `DATABASE_PASSWORD`
-- `APNS_TEAM_ID`
-- `APNS_KEY_ID`
-- `APNS_PRIVATE_KEY`
-- `APNS_DEFAULT_BUNDLE_ID`
-
-## Run locally
-
-```bash
-bun install
-bun run src/index.ts
-```
-
-## Docker
-
-Build from this directory:
-
-```bash
-docker build -t apn-relay .
-docker run --rm -p 8787:8787 --env-file .env apn-relay
-```

packages/apn-relay/drizzle.config.ts

@@ -1,17 +0,0 @@
-import { defineConfig } from "drizzle-kit"
-
-export default defineConfig({
-  out: "./migration",
-  strict: true,
-  schema: ["./src/**/*.sql.ts"],
-  dialect: "mysql",
-  dbCredentials: {
-    host: process.env.DATABASE_HOST ?? "",
-    user: process.env.DATABASE_USERNAME ?? "",
-    password: process.env.DATABASE_PASSWORD ?? "",
-    database: process.env.DATABASE_NAME ?? "main",
-    ssl: {
-      rejectUnauthorized: false,
-    },
-  },
-})

packages/apn-relay/package.json

@@ -1,27 +0,0 @@
-{
-  "$schema": "https://json.schemastore.org/package.json",
-  "name": "@opencode-ai/apn-relay",
-  "version": "0.0.0",
-  "private": true,
-  "type": "module",
-  "license": "MIT",
-  "scripts": {
-    "dev": "bun run src/index.ts",
-    "db:check": "bun run --env-file .env src/check.ts",
-    "typecheck": "tsgo --noEmit"
-  },
-  "dependencies": {
-    "@planetscale/database": "1.19.0",
-    "drizzle-orm": "1.0.0-beta.19-d95b7a4",
-    "hono": "4.10.7",
-    "jose": "6.0.11",
-    "zod": "4.1.8"
-  },
-  "devDependencies": {
-    "@tsconfig/bun": "1.0.9",
-    "@types/bun": "1.3.11",
-    "@typescript/native-preview": "7.0.0-dev.20251207.1",
-    "drizzle-kit": "1.0.0-beta.19-d95b7a4",
-    "typescript": "5.8.2"
-  }
-}

packages/apn-relay/src/apns.ts

@@ -1,185 +0,0 @@
-import { connect } from "node:http2"
-import { SignJWT, importPKCS8 } from "jose"
-import { env } from "./env"
-
-export type PushEnv = "sandbox" | "production"
-
-type PushInput = {
-  token: string
-  bundle: string
-  env: PushEnv
-  title: string
-  body: string
-  data: Record<string, unknown>
-}
-
-type PushResult = {
-  ok: boolean
-  code: number
-  error?: string
-}
-
-function tokenSuffix(input: string) {
-  return input.length > 8 ? input.slice(-8) : input
-}
-
-let jwt = ""
-let exp = 0
-let pk: Awaited<ReturnType<typeof importPKCS8>> | undefined
-
-function host(input: PushEnv) {
-  if (input === "sandbox") return "api.sandbox.push.apple.com"
-  return "api.push.apple.com"
-}
-
-function key() {
-  if (env.APNS_PRIVATE_KEY.includes("\\n")) return env.APNS_PRIVATE_KEY.replace(/\\n/g, "\n")
-  return env.APNS_PRIVATE_KEY
-}
-
-async function sign() {
-  if (!pk) pk = await importPKCS8(key(), "ES256")
-  const now = Math.floor(Date.now() / 1000)
-  if (jwt && now < exp) return jwt
-  jwt = await new SignJWT({})
-    .setProtectedHeader({ alg: "ES256", kid: env.APNS_KEY_ID })
-    .setIssuer(env.APNS_TEAM_ID)
-    .setIssuedAt(now)
-    .sign(pk)
-  exp = now + 50 * 60
-  return jwt
-}
-
-function post(input: {
-  host: string
-  token: string
-  auth: string
-  bundle: string
-  payload: string
-}): Promise<{ code: number; body: string }> {
-  return new Promise((resolve, reject) => {
-    const cli = connect(`https://${input.host}`)
-    let done = false
-    let code = 0
-    let body = ""
-
-    const stop = (fn: () => void) => {
-      if (done) return
-      done = true
-      fn()
-    }
-
-    cli.on("error", (err) => {
-      stop(() => reject(err))
-      cli.close()
-    })
-
-    const req = cli.request({
-      ":method": "POST",
-      ":path": `/3/device/${input.token}`,
-      authorization: `bearer ${input.auth}`,
-      "apns-topic": input.bundle,
-      "apns-push-type": "alert",
-      "apns-priority": "10",
-      "content-type": "application/json",
-    })
-
-    req.setEncoding("utf8")
-    req.on("response", (headers) => {
-      code = Number(headers[":status"] ?? 0)
-    })
-    req.on("data", (chunk) => {
-      body += chunk
-    })
-    req.on("end", () => {
-      stop(() => resolve({ code, body }))
-      cli.close()
-    })
-    req.on("error", (err) => {
-      stop(() => reject(err))
-      cli.close()
-    })
-    req.end(input.payload)
-  })
-}
-
-export async function send(input: PushInput): Promise<PushResult> {
-  const apnsHost = host(input.env)
-  const suffix = tokenSuffix(input.token)
-
-  console.log("[ APN RELAY ] push:start", {
-    env: input.env,
-    host: apnsHost,
-    bundle: input.bundle,
-    tokenSuffix: suffix,
-  })
-
-  const auth = await sign().catch((err) => {
-    return `error:${String(err)}`
-  })
-  if (auth.startsWith("error:")) {
-    console.log("[ APN RELAY ] push:auth-failed", {
-      env: input.env,
-      host: apnsHost,
-      bundle: input.bundle,
-      tokenSuffix: suffix,
-      error: auth,
-    })
-    return {
-      ok: false,
-      code: 0,
-      error: auth,
-    }
-  }
-
-  const payload = JSON.stringify({
-    aps: {
-      alert: {
-        title: input.title,
-        body: input.body,
-      },
-      sound: "alert.wav",
-    },
-    ...input.data,
-  })
-
-  const out = await post({
-    host: apnsHost,
-    token: input.token,
-    auth,
-    bundle: input.bundle,
-    payload,
-  }).catch((err) => ({
-    code: 0,
-    body: String(err),
-  }))
-
-  if (out.code === 200) {
-    console.log("[ APN RELAY ] push:sent", {
-      env: input.env,
-      host: apnsHost,
-      bundle: input.bundle,
-      tokenSuffix: suffix,
-      code: out.code,
-    })
-    return {
-      ok: true,
-      code: 200,
-    }
-  }
-
-  console.log("[ APN RELAY ] push:failed", {
-    env: input.env,
-    host: apnsHost,
-    bundle: input.bundle,
-    tokenSuffix: suffix,
-    code: out.code,
-    error: out.body,
-  })
-
-  return {
-    ok: false,
-    code: out.code,
-    error: out.body,
-  }
-}

packages/apn-relay/src/check.ts

@@ -1,28 +0,0 @@
-import { sql } from "drizzle-orm"
-import { db } from "./db"
-import { env } from "./env"
-import { delivery_log, device_registration } from "./schema.sql"
-import { setup } from "./setup"
-
-async function run() {
-  console.log(`[apn-relay] DB host: ${env.DATABASE_HOST}`)
-
-  await db.execute(sql`SELECT 1`)
-  console.log("[apn-relay] DB connection OK")
-
-  await setup()
-  console.log("[apn-relay] Setup migration OK")
-
-  const [a] = await db.select({ value: sql<number>`count(*)` }).from(device_registration)
-  const [b] = await db.select({ value: sql<number>`count(*)` }).from(delivery_log)
-
-  console.log(`[apn-relay] device_registration rows: ${Number(a?.value ?? 0)}`)
-  console.log(`[apn-relay] delivery_log rows: ${Number(b?.value ?? 0)}`)
-  console.log("[apn-relay] DB check passed")
-}
-
-run().catch((err) => {
-  console.error("[apn-relay] DB check failed")
-  console.error(err)
-  process.exit(1)
-})

packages/apn-relay/src/db.ts

@@ -1,11 +0,0 @@
-import { Client } from "@planetscale/database"
-import { drizzle } from "drizzle-orm/planetscale-serverless"
-import { env } from "./env"
-
-const client = new Client({
-  host: env.DATABASE_HOST,
-  username: env.DATABASE_USERNAME,
-  password: env.DATABASE_PASSWORD,
-})
-
-export const db = drizzle({ client })

packages/apn-relay/src/env.ts

@@ -1,47 +0,0 @@
-import { z } from "zod"
-
-const bad = new Set(["undefined", "null"])
-const txt = z
-  .string()
-  .transform((input) => input.trim())
-  .refine((input) => input.length > 0 && !bad.has(input.toLowerCase()))
-
-const schema = z.object({
-  PORT: z.coerce.number().int().positive().default(8787),
-  DATABASE_HOST: txt,
-  DATABASE_USERNAME: txt,
-  DATABASE_PASSWORD: txt,
-  APNS_TEAM_ID: txt,
-  APNS_KEY_ID: txt,
-  APNS_PRIVATE_KEY: txt,
-  APNS_DEFAULT_BUNDLE_ID: txt,
-})
-
-const req = [
-  "DATABASE_HOST",
-  "DATABASE_USERNAME",
-  "DATABASE_PASSWORD",
-  "APNS_TEAM_ID",
-  "APNS_KEY_ID",
-  "APNS_PRIVATE_KEY",
-  "APNS_DEFAULT_BUNDLE_ID",
-] as const
-
-const out = schema.safeParse(process.env)
-
-if (!out.success) {
-  const miss = req.filter((key) => !process.env[key]?.trim())
-  const bad = out.error.issues
-    .map((item) => item.path[0])
-    .filter((key): key is string => typeof key === "string")
-    .filter((key) => !miss.includes(key as (typeof req)[number]))
-
-  console.error("[apn-relay] Invalid startup configuration")
-  if (miss.length) console.error(`[apn-relay] Missing required env vars: ${miss.join(", ")}`)
-  if (bad.length) console.error(`[apn-relay] Invalid env vars: ${Array.from(new Set(bad)).join(", ")}`)
-  console.error("[apn-relay] Check .env.example and restart")
-
-  throw new Error("Startup configuration invalid")
-}
-
-export const env = out.data

packages/apn-relay/src/hash.ts

@@ -1,5 +0,0 @@
-import { createHash } from "node:crypto"
-
-export function hash(input: string) {
-  return createHash("sha256").update(input).digest("hex")
-}

packages/apn-relay/src/index.ts

@@ -1,448 +0,0 @@
-import { randomUUID } from "node:crypto"
-import { and, desc, eq, sql } from "drizzle-orm"
-import { Hono } from "hono"
-import { z } from "zod"
-import { send } from "./apns"
-import { db } from "./db"
-import { env } from "./env"
-import { hash } from "./hash"
-import { delivery_log, device_registration } from "./schema.sql"
-import { setup } from "./setup"
-
-function bad(input?: string) {
-  if (!input) return false
-  return input.includes("BadEnvironmentKeyInToken")
-}
-
-function flip(input: "sandbox" | "production") {
-  if (input === "sandbox") return "production"
-  return "sandbox"
-}
-
-function tail(input: string) {
-  return input.slice(-8)
-}
-
-function esc(input: unknown) {
-  return String(input ?? "")
-    .replaceAll("&", "&")
-    .replaceAll("<", "&lt;")
-    .replaceAll(">", "&gt;")
-    .replaceAll('"', "&quot;")
-    .replaceAll("'", "&#39;")
-}
-
-function fmt(input: number) {
-  return new Date(input).toISOString()
-}
-
-const reg = z.object({
-  secret: z.string().min(1),
-  deviceToken: z.string().min(1),
-  bundleId: z.string().min(1).optional(),
-  apnsEnv: z.enum(["sandbox", "production"]).default("production"),
-})
-
-const unreg = z.object({
-  secret: z.string().min(1),
-  deviceToken: z.string().min(1),
-})
-
-const evt = z.object({
-  secret: z.string().min(1),
-  serverID: z.string().min(1).optional(),
-  eventType: z.enum(["complete", "permission", "error"]),
-  sessionID: z.string().min(1),
-  title: z.string().min(1).optional(),
-  body: z.string().min(1).optional(),
-})
-
-function title(input: z.infer<typeof evt>["eventType"]) {
-  if (input === "complete") return "Session complete"
-  if (input === "permission") return "Action needed"
-  return "Session error"
-}
-
-function body(input: z.infer<typeof evt>["eventType"]) {
-  if (input === "complete") return "OpenCode finished your session."
-  if (input === "permission") return "OpenCode needs your permission decision."
-  return "OpenCode reported an error for your session."
-}
-
-const app = new Hono()
-
-app.onError((err, c) => {
-  return c.json(
-    {
-      ok: false,
-      error: err.message,
-    },
-    500,
-  )
-})
-
-app.notFound((c) => {
-  return c.json(
-    {
-      ok: false,
-      error: "Not found",
-    },
-    404,
-  )
-})
-
-app.get("/health", async (c) => {
-  const [a] = await db.select({ value: sql<number>`count(*)` }).from(device_registration)
-  const [b] = await db.select({ value: sql<number>`count(*)` }).from(delivery_log)
-  return c.json({
-    ok: true,
-    devices: Number(a?.value ?? 0),
-    deliveries: Number(b?.value ?? 0),
-  })
-})
-
-app.get("/", async (c) => {
-  const [a] = await db.select({ value: sql<number>`count(*)` }).from(device_registration)
-  const [b] = await db.select({ value: sql<number>`count(*)` }).from(delivery_log)
-  const devices = await db.select().from(device_registration).orderBy(desc(device_registration.updated_at)).limit(100)
-  const byBundle = await db
-    .select({
-      bundle: device_registration.bundle_id,
-      env: device_registration.apns_env,
-      value: sql<number>`count(*)`,
-    })
-    .from(device_registration)
-    .groupBy(device_registration.bundle_id, device_registration.apns_env)
-    .orderBy(desc(sql<number>`count(*)`))
-  const rows = await db.select().from(delivery_log).orderBy(desc(delivery_log.created_at)).limit(20)
-
-  const html = `<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <title>APN Relay</title>
-    <style>
-      body { font-family: ui-sans-serif, system-ui, sans-serif; margin: 24px; color: #111827; }
-      h1 { margin: 0 0 12px 0; }
-      h2 { margin: 22px 0 10px 0; font-size: 16px; }
-      .stats { display: flex; gap: 16px; margin: 0 0 18px 0; }
-      .card { border: 1px solid #e5e7eb; border-radius: 8px; padding: 10px 12px; min-width: 160px; }
-      .muted { color: #6b7280; font-size: 12px; }
-      .small { font-size: 11px; color: #6b7280; }
-      table { border-collapse: collapse; width: 100%; }
-      th, td { border: 1px solid #e5e7eb; text-align: left; padding: 8px; font-size: 12px; }
-      th { background: #f9fafb; }
-    </style>
-  </head>
-  <body>
-    <h1>APN Relay</h1>
-    <p class="muted">MVP dashboard</p>
-    <div class="stats">
-      <div class="card">
-        <div class="muted">Registered devices</div>
-        <div>${Number(a?.value ?? 0)}</div>
-      </div>
-      <div class="card">
-        <div class="muted">Delivery log rows</div>
-        <div>${Number(b?.value ?? 0)}</div>
-      </div>
-    </div>
-    <h2>Registered devices</h2>
-    <p class="small">Most recent 100 registrations. Token values are masked to suffix only.</p>
-    <table>
-      <thead>
-        <tr>
-          <th>updated</th>
-          <th>created</th>
-          <th>token suffix</th>
-          <th>env</th>
-          <th>bundle</th>
-          <th>secret hash</th>
-        </tr>
-      </thead>
-      <tbody>
-        ${
-          devices.length
-            ? devices
-                .map(
-                  (row) => `<tr>
-          <td>${esc(fmt(row.updated_at))}</td>
-          <td>${esc(fmt(row.created_at))}</td>
-          <td>${esc(tail(row.device_token))}</td>
-          <td>${esc(row.apns_env)}</td>
-          <td>${esc(row.bundle_id)}</td>
-          <td>${esc(`${row.secret_hash.slice(0, 12)}…`)}</td>
-        </tr>`,
-                )
-                .join("")
-            : `<tr><td colspan="6" class="muted">No devices registered.</td></tr>`
-        }
-      </tbody>
-    </table>
-    <h2>Bundle breakdown</h2>
-    <table>
-      <thead>
-        <tr>
-          <th>bundle</th>
-          <th>env</th>
-          <th>count</th>
-        </tr>
-      </thead>
-      <tbody>
-        ${
-          byBundle.length
-            ? byBundle
-                .map(
-                  (row) => `<tr>
-          <td>${esc(row.bundle)}</td>
-          <td>${esc(row.env)}</td>
-          <td>${esc(Number(row.value ?? 0))}</td>
-        </tr>`,
-                )
-                .join("")
-            : `<tr><td colspan="3" class="muted">No device data.</td></tr>`
-        }
-      </tbody>
-    </table>
-    <h2>Recent deliveries</h2>
-    <table>
-      <thead>
-        <tr>
-          <th>time</th>
-          <th>event</th>
-          <th>session</th>
-          <th>status</th>
-          <th>error</th>
-        </tr>
-      </thead>
-      <tbody>
-        ${rows
-          .map(
-            (row) => `<tr>
-          <td>${esc(fmt(row.created_at))}</td>
-          <td>${esc(row.event_type)}</td>
-          <td>${esc(row.session_id)}</td>
-          <td>${esc(row.status)}</td>
-          <td>${esc(row.error ?? "")}</td>
-        </tr>`,
-          )
-          .join("")}
-      </tbody>
-    </table>
-  </body>
-</html>`
-
-  return c.html(html)
-})
-
-app.post("/v1/device/register", async (c) => {
-  const raw = await c.req.json().catch(() => undefined)
-  const check = reg.safeParse(raw)
-  if (!check.success) {
-    return c.json(
-      {
-        ok: false,
-        error: "Invalid request body",
-      },
-      400,
-    )
-  }
-
-  const now = Date.now()
-  const key = hash(check.data.secret)
-  const row = {
-    id: randomUUID(),
-    secret_hash: key,
-    device_token: check.data.deviceToken,
-    bundle_id: check.data.bundleId ?? env.APNS_DEFAULT_BUNDLE_ID,
-    apns_env: check.data.apnsEnv,
-    created_at: now,
-    updated_at: now,
-  }
-
-  console.log("[relay] register", {
-    token: tail(row.device_token),
-    env: row.apns_env,
-    bundle: row.bundle_id,
-    secretHash: `${key.slice(0, 12)}...`,
-  })
-
-  await db
-    .insert(device_registration)
-    .values(row)
-    .onDuplicateKeyUpdate({
-      set: {
-        bundle_id: row.bundle_id,
-        apns_env: row.apns_env,
-        updated_at: now,
-      },
-    })
-
-  return c.json({ ok: true })
-})
-
-app.post("/v1/device/unregister", async (c) => {
-  const raw = await c.req.json().catch(() => undefined)
-  const check = unreg.safeParse(raw)
-  if (!check.success) {
-    return c.json(
-      {
-        ok: false,
-        error: "Invalid request body",
-      },
-      400,
-    )
-  }
-
-  const key = hash(check.data.secret)
-
-  console.log("[relay] unregister", {
-    token: tail(check.data.deviceToken),
-    secretHash: `${key.slice(0, 12)}...`,
-  })
-
-  await db
-    .delete(device_registration)
-    .where(and(eq(device_registration.secret_hash, key), eq(device_registration.device_token, check.data.deviceToken)))
-
-  return c.json({ ok: true })
-})
-
-app.post("/v1/event", async (c) => {
-  const raw = await c.req.json().catch(() => undefined)
-  const check = evt.safeParse(raw)
-  if (!check.success) {
-    return c.json(
-      {
-        ok: false,
-        error: "Invalid request body",
-      },
-      400,
-    )
-  }
-
-  const key = hash(check.data.secret)
-  const list = await db.select().from(device_registration).where(eq(device_registration.secret_hash, key))
-  console.log("[relay] event", {
-    type: check.data.eventType,
-    serverID: check.data.serverID,
-    session: check.data.sessionID,
-    secretHash: `${key.slice(0, 12)}...`,
-    devices: list.length,
-  })
-  if (!list.length) {
-    const [total] = await db.select({ value: sql<number>`count(*)` }).from(device_registration)
-    console.log("[relay] event:no-matching-devices", {
-      type: check.data.eventType,
-      serverID: check.data.serverID,
-      session: check.data.sessionID,
-      secretHash: `${key.slice(0, 12)}...`,
-      totalDevices: Number(total?.value ?? 0),
-    })
-
-    return c.json({
-      ok: true,
-      sent: 0,
-      failed: 0,
-    })
-  }
-
-  const out = await Promise.all(
-    list.map(async (row) => {
-      const env = row.apns_env === "sandbox" ? "sandbox" : "production"
-      const payload = {
-        token: row.device_token,
-        bundle: row.bundle_id,
-        title: check.data.title ?? title(check.data.eventType),
-        body: check.data.body ?? body(check.data.eventType),
-        data: {
-          serverID: check.data.serverID,
-          eventType: check.data.eventType,
-          sessionID: check.data.sessionID,
-        },
-      }
-      const first = await send({ ...payload, env })
-      if (first.ok || !bad(first.error)) {
-        if (!first.ok) {
-          console.log("[relay] send:error", {
-            token: tail(row.device_token),
-            env,
-            error: first.error,
-          })
-        }
-        return first
-      }
-
-      const alt = flip(env)
-      console.log("[relay] send:retry-env", {
-        token: tail(row.device_token),
-        from: env,
-        to: alt,
-      })
-      const second = await send({ ...payload, env: alt })
-      if (!second.ok) {
-        console.log("[relay] send:error", {
-          token: tail(row.device_token),
-          env: alt,
-          error: second.error,
-        })
-        return second
-      }
-
-      await db
-        .update(device_registration)
-        .set({ apns_env: alt, updated_at: Date.now() })
-        .where(
-          and(
-            eq(device_registration.secret_hash, row.secret_hash),
-            eq(device_registration.device_token, row.device_token),
-          ),
-        )
-
-      console.log("[relay] send:env-updated", {
-        token: tail(row.device_token),
-        env: alt,
-      })
-      return second
-    }),
-  )
-
-  const now = Date.now()
-  await db.insert(delivery_log).values(
-    out.map((item) => ({
-      id: randomUUID(),
-      secret_hash: key,
-      event_type: check.data.eventType,
-      session_id: check.data.sessionID,
-      status: item.ok ? "sent" : "failed",
-      error: item.error,
-      created_at: now,
-    })),
-  )
-
-  const sent = out.filter((item) => item.ok).length
-  console.log("[relay] event:done", {
-    type: check.data.eventType,
-    session: check.data.sessionID,
-    sent,
-    failed: out.length - sent,
-  })
-  return c.json({
-    ok: true,
-    sent,
-    failed: out.length - sent,
-  })
-})
-
-await setup()
-
-if (import.meta.main) {
-  Bun.serve({
-    port: env.PORT,
-    fetch: app.fetch,
-  })
-  console.log(`apn-relay listening on http://0.0.0.0:${env.PORT}`)
-}
-
-export { app }

packages/apn-relay/src/schema.sql.ts

@@ -1,35 +0,0 @@
-import { bigint, index, mysqlTable, uniqueIndex, varchar } from "drizzle-orm/mysql-core"
-
-export const device_registration = mysqlTable(
-  "device_registration",
-  {
-    id: varchar("id", { length: 36 }).primaryKey(),
-    secret_hash: varchar("secret_hash", { length: 64 }).notNull(),
-    device_token: varchar("device_token", { length: 255 }).notNull(),
-    bundle_id: varchar("bundle_id", { length: 255 }).notNull(),
-    apns_env: varchar("apns_env", { length: 16 }).notNull().default("production"),
-    created_at: bigint("created_at", { mode: "number" }).notNull(),
-    updated_at: bigint("updated_at", { mode: "number" }).notNull(),
-  },
-  (table) => [
-    uniqueIndex("device_registration_secret_token_idx").on(table.secret_hash, table.device_token),
-    index("device_registration_secret_hash_idx").on(table.secret_hash),
-  ],
-)
-
-export const delivery_log = mysqlTable(
-  "delivery_log",
-  {
-    id: varchar("id", { length: 36 }).primaryKey(),
-    secret_hash: varchar("secret_hash", { length: 64 }).notNull(),
-    event_type: varchar("event_type", { length: 32 }).notNull(),
-    session_id: varchar("session_id", { length: 255 }).notNull(),
-    status: varchar("status", { length: 16 }).notNull(),
-    error: varchar("error", { length: 1024 }),
-    created_at: bigint("created_at", { mode: "number" }).notNull(),
-  },
-  (table) => [
-    index("delivery_log_secret_hash_idx").on(table.secret_hash),
-    index("delivery_log_created_at_idx").on(table.created_at),
-  ],
-)

packages/apn-relay/src/setup.ts

@@ -1,34 +0,0 @@
-import { sql } from "drizzle-orm"
-import { db } from "./db"
-
-export async function setup() {
-  await db.execute(sql`
-    CREATE TABLE IF NOT EXISTS device_registration (
-      id varchar(36) NOT NULL,
-      secret_hash varchar(64) NOT NULL,
-      device_token varchar(255) NOT NULL,
-      bundle_id varchar(255) NOT NULL,
-      apns_env varchar(16) NOT NULL DEFAULT 'production',
-      created_at bigint NOT NULL,
-      updated_at bigint NOT NULL,
-      PRIMARY KEY (id),
-      UNIQUE KEY device_registration_secret_token_idx (secret_hash, device_token),
-      KEY device_registration_secret_hash_idx (secret_hash)
-    ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-  `)
-
-  await db.execute(sql`
-    CREATE TABLE IF NOT EXISTS delivery_log (
-      id varchar(36) NOT NULL,
-      secret_hash varchar(64) NOT NULL,
-      event_type varchar(32) NOT NULL,
-      session_id varchar(255) NOT NULL,
-      status varchar(16) NOT NULL,
-      error varchar(1024) NULL,
-      created_at bigint NOT NULL,
-      PRIMARY KEY (id),
-      KEY delivery_log_secret_hash_idx (secret_hash),
-      KEY delivery_log_created_at_idx (created_at)
-    ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-  `)
-}

packages/apn-relay/tsconfig.json

@@ -1,8 +0,0 @@
-{
-  "$schema": "https://json.schemastore.org/tsconfig",
-  "extends": "@tsconfig/bun/tsconfig.json",
-  "compilerOptions": {
-    "lib": ["ESNext", "DOM", "DOM.Iterable"],
-    "noUncheckedIndexedAccess": false
-  }
-}

packages/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opencode-ai/app",
-  "version": "1.4.1",
+  "version": "1.3.17",
   "description": "",
   "type": "module",
   "exports": {

packages/app/src/app.tsx

@@ -13,7 +13,6 @@ import { QueryClient, QueryClientProvider } from "@tanstack/solid-query"
 import { type Duration, Effect } from "effect"
 import {
   type Component,
-  createEffect,
   createMemo,
   createResource,
   createSignal,
@@ -162,7 +161,7 @@ const effectMinDuration =
   <A, E, R>(e: Effect.Effect<A, E, R>) =>
     Effect.all([e, Effect.sleep(duration)], { concurrency: "unbounded" }).pipe(Effect.map((v) => v[0]))
 
-function ConnectionGate(props: ParentProps<{ disableHealthCheck?: boolean; onReady?: () => void }>) {
+function ConnectionGate(props: ParentProps<{ disableHealthCheck?: boolean }>) {
   const server = useServer()
   const checkServerHealth = useCheckServerHealth()
 
@@ -183,22 +182,13 @@ function ConnectionGate(props: ParentProps<{ disableHealthCheck?: boolean; onRea
             if (checkMode() === "background" || type === "http") return false
           }
         }).pipe(
+          effectMinDuration(checkMode() === "blocking" ? "1.2 seconds" : 0),
           Effect.timeoutOrElse({ duration: "10 seconds", orElse: () => Effect.succeed(false) }),
           Effect.ensuring(Effect.sync(() => setCheckMode("background"))),
           Effect.runPromise,
         ),
   )
 
-  let sent = false
-
-  createEffect(() => {
-    if (sent) return
-    const ready = checkMode() === "blocking" ? !startupHealthCheck.loading : startupHealthCheck.state !== "pending"
-    if (!ready) return
-    sent = true
-    props.onReady?.()
-  })
-
   return (
     <Show
       when={checkMode() === "blocking" ? !startupHealthCheck.loading : startupHealthCheck.state !== "pending"}
@@ -291,7 +281,6 @@ export function AppInterface(props: {
   servers?: Array<ServerConnection.Any>
   router?: Component<BaseRouterProps>
   disableHealthCheck?: boolean
-  onReady?: () => void
 }) {
   return (
     <ServerProvider
@@ -299,7 +288,7 @@ export function AppInterface(props: {
       disableHealthCheck={props.disableHealthCheck}
       servers={props.servers}
     >
-      <ConnectionGate disableHealthCheck={props.disableHealthCheck} onReady={props.onReady}>
+      <ConnectionGate disableHealthCheck={props.disableHealthCheck}>
         <ServerKey>
           <GlobalSDKProvider>
             <GlobalSyncProvider>

packages/app/src/components/dialog-settings.tsx

@@ -8,20 +8,14 @@ import { SettingsGeneral } from "./settings-general"
 import { SettingsKeybinds } from "./settings-keybinds"
 import { SettingsProviders } from "./settings-providers"
 import { SettingsModels } from "./settings-models"
-import { SettingsPair } from "./settings-pair"
 
-export const DialogSettings: Component<{ defaultTab?: string }> = (props) => {
+export const DialogSettings: Component = () => {
   const language = useLanguage()
   const platform = usePlatform()
 
   return (
     <Dialog size="x-large" transition>
-      <Tabs
-        orientation="vertical"
-        variant="settings"
-        defaultValue={props.defaultTab ?? "general"}
-        class="h-full settings-dialog"
-      >
+      <Tabs orientation="vertical" variant="settings" defaultValue="general" class="h-full settings-dialog">
         <Tabs.List>
           <div class="flex flex-col justify-between h-full w-full">
             <div class="flex flex-col gap-3 w-full pt-3">
@@ -51,10 +45,6 @@ export const DialogSettings: Component<{ defaultTab?: string }> = (props) => {
                       <Icon name="models" />
                       {language.t("settings.models.title")}
                     </Tabs.Trigger>
-                    <Tabs.Trigger value="pair">
-                      <Icon name="link" />
-                      {language.t("settings.pair.title")}
-                    </Tabs.Trigger>
                   </div>
                 </div>
               </div>
@@ -77,9 +67,6 @@ export const DialogSettings: Component<{ defaultTab?: string }> = (props) => {
         <Tabs.Content value="models" class="no-scrollbar">
           <SettingsModels />
         </Tabs.Content>
-        <Tabs.Content value="pair" class="no-scrollbar">
-          <SettingsPair />
-        </Tabs.Content>
       </Tabs>
     </Dialog>
   )

packages/app/src/components/session/find-assistant-messages.test.ts

@@ -1,81 +0,0 @@
-import { describe, expect, test } from "bun:test"
-import type { Message } from "@opencode-ai/sdk/v2/client"
-import { findAssistantMessages } from "@opencode-ai/ui/find-assistant-messages"
-
-function user(id: string): Message {
-  return {
-    id,
-    role: "user",
-    sessionID: "session-1",
-    time: { created: 1 },
-  } as unknown as Message
-}
-
-function assistant(id: string, parentID: string): Message {
-  return {
-    id,
-    role: "assistant",
-    sessionID: "session-1",
-    parentID,
-    time: { created: 1 },
-  } as unknown as Message
-}
-
-describe("findAssistantMessages", () => {
-  test("normal ordering: assistant after user in array → found via forward scan", () => {
-    const messages = [user("u1"), assistant("a1", "u1")]
-    const result = findAssistantMessages(messages, 0, "u1")
-    expect(result).toHaveLength(1)
-    expect(result[0].id).toBe("a1")
-  })
-
-  test("clock skew: assistant before user in array → found via backward scan", () => {
-    // When client clock is ahead, user ID sorts after assistant ID,
-    // so assistant appears earlier in the ID-sorted message array
-    const messages = [assistant("a1", "u1"), user("u1")]
-    const result = findAssistantMessages(messages, 1, "u1")
-    expect(result).toHaveLength(1)
-    expect(result[0].id).toBe("a1")
-  })
-
-  test("no assistant messages → returns empty array", () => {
-    const messages = [user("u1"), user("u2")]
-    const result = findAssistantMessages(messages, 0, "u1")
-    expect(result).toHaveLength(0)
-  })
-
-  test("multiple assistant messages with matching parentID → all found", () => {
-    const messages = [user("u1"), assistant("a1", "u1"), assistant("a2", "u1")]
-    const result = findAssistantMessages(messages, 0, "u1")
-    expect(result).toHaveLength(2)
-    expect(result[0].id).toBe("a1")
-    expect(result[1].id).toBe("a2")
-  })
-
-  test("does not return assistant messages with different parentID", () => {
-    const messages = [user("u1"), assistant("a1", "u1"), assistant("a2", "other")]
-    const result = findAssistantMessages(messages, 0, "u1")
-    expect(result).toHaveLength(1)
-    expect(result[0].id).toBe("a1")
-  })
-
-  test("stops forward scan at next user message", () => {
-    const messages = [user("u1"), assistant("a1", "u1"), user("u2"), assistant("a2", "u1")]
-    const result = findAssistantMessages(messages, 0, "u1")
-    expect(result).toHaveLength(1)
-    expect(result[0].id).toBe("a1")
-  })
-
-  test("stops backward scan at previous user message", () => {
-    const messages = [assistant("a0", "u1"), user("u0"), assistant("a1", "u1"), user("u1")]
-    const result = findAssistantMessages(messages, 3, "u1")
-    expect(result).toHaveLength(1)
-    expect(result[0].id).toBe("a1")
-  })
-
-  test("invalid index returns empty array", () => {
-    const messages = [user("u1")]
-    expect(findAssistantMessages(messages, -1, "u1")).toHaveLength(0)
-    expect(findAssistantMessages(messages, 5, "u1")).toHaveLength(0)
-  })
-})

packages/app/src/components/session/session-header.tsx

@@ -16,7 +16,6 @@ import { useLanguage } from "@/context/language"
 import { useLayout } from "@/context/layout"
 import { usePlatform } from "@/context/platform"
 import { useServer } from "@/context/server"
-import { useSettings } from "@/context/settings"
 import { useSync } from "@/context/sync"
 import { useTerminal } from "@/context/terminal"
 import { focusTerminalById } from "@/pages/session/helpers"
@@ -135,7 +134,6 @@ export function SessionHeader() {
   const server = useServer()
   const platform = usePlatform()
   const language = useLanguage()
-  const settings = useSettings()
   const sync = useSync()
   const terminal = useTerminal()
   const { params, view } = useSessionLayout()
@@ -153,10 +151,6 @@ export function SessionHeader() {
   })
   const hotkey = createMemo(() => command.keybind("file.open"))
   const os = createMemo(() => detectOS(platform))
-  const search = createMemo(() => platform.platform !== "desktop" || settings.general.showSearch())
-  const tree = createMemo(() => platform.platform !== "desktop" || settings.general.showFileTree())
-  const term = createMemo(() => platform.platform !== "desktop" || settings.general.showTerminal())
-  const status = createMemo(() => platform.platform !== "desktop" || settings.general.showStatus())
 
   const [exists, setExists] = createStore<Partial<Record<OpenApp, boolean>>>({
     finder: true,
@@ -273,37 +267,35 @@ export function SessionHeader() {
 
   return (
     <>
-      <Show when={search()}>
-        <Show when={centerMount()}>
-          {(mount) => (
-            <Portal mount={mount()}>
-              <Button
-                type="button"
-                variant="ghost"
-                size="small"
-                class="hidden md:flex w-[240px] max-w-full min-w-0 items-center gap-2 justify-between rounded-md border border-border-weak-base bg-surface-panel shadow-none cursor-default"
-                onClick={() => command.trigger("file.open")}
-                aria-label={language.t("session.header.searchFiles")}
-              >
-                <div class="flex min-w-0 flex-1 items-center overflow-visible">
-                  <span class="flex-1 min-w-0 text-12-regular text-text-weak truncate text-left">
-                    {language.t("session.header.search.placeholder", {
-                      project: name(),
-                    })}
-                  </span>
-                </div>
+      <Show when={centerMount()}>
+        {(mount) => (
+          <Portal mount={mount()}>
+            <Button
+              type="button"
+              variant="ghost"
+              size="small"
+              class="hidden md:flex w-[240px] max-w-full min-w-0 items-center gap-2 justify-between rounded-md border border-border-weak-base bg-surface-panel shadow-none cursor-default"
+              onClick={() => command.trigger("file.open")}
+              aria-label={language.t("session.header.searchFiles")}
+            >
+              <div class="flex min-w-0 flex-1 items-center overflow-visible">
+                <span class="flex-1 min-w-0 text-12-regular text-text-weak truncate text-left">
+                  {language.t("session.header.search.placeholder", {
+                    project: name(),
+                  })}
+                </span>
+              </div>
 
-                <Show when={hotkey()}>
-                  {(keybind) => (
-                    <Keybind class="shrink-0 !border-0 !bg-transparent !shadow-none px-0 text-text-weaker">
-                      {keybind()}
-                    </Keybind>
-                  )}
-                </Show>
-              </Button>
-            </Portal>
-          )}
-        </Show>
+              <Show when={hotkey()}>
+                {(keybind) => (
+                  <Keybind class="shrink-0 !border-0 !bg-transparent !shadow-none px-0 text-text-weaker">
+                    {keybind()}
+                  </Keybind>
+                )}
+              </Show>
+            </Button>
+          </Portal>
+        )}
       </Show>
       <Show when={rightMount()}>
         {(mount) => (
@@ -423,28 +415,24 @@ export function SessionHeader() {
                 </div>
               </Show>
               <div class="flex items-center gap-1">
-                <Show when={status()}>
-                  <Tooltip placement="bottom" value={language.t("status.popover.trigger")}>
-                    <StatusPopover />
-                  </Tooltip>
-                </Show>
-                <Show when={term()}>
-                  <TooltipKeybind
-                    title={language.t("command.terminal.toggle")}
-                    keybind={command.keybind("terminal.toggle")}
+                <Tooltip placement="bottom" value={language.t("status.popover.trigger")}>
+                  <StatusPopover />
+                </Tooltip>
+                <TooltipKeybind
+                  title={language.t("command.terminal.toggle")}
+                  keybind={command.keybind("terminal.toggle")}
+                >
+                  <Button
+                    variant="ghost"
+                    class="group/terminal-toggle titlebar-icon w-8 h-6 p-0 box-border shrink-0"
+                    onClick={toggleTerminal}
+                    aria-label={language.t("command.terminal.toggle")}
+                    aria-expanded={view().terminal.opened()}
+                    aria-controls="terminal-panel"
                   >
-                    <Button
-                      variant="ghost"
-                      class="group/terminal-toggle titlebar-icon w-8 h-6 p-0 box-border shrink-0"
-                      onClick={toggleTerminal}
-                      aria-label={language.t("command.terminal.toggle")}
-                      aria-expanded={view().terminal.opened()}
-                      aria-controls="terminal-panel"
-                    >
-                      <Icon size="small" name={view().terminal.opened() ? "terminal-active" : "terminal"} />
-                    </Button>
-                  </TooltipKeybind>
-                </Show>
+                    <Icon size="small" name={view().terminal.opened() ? "terminal-active" : "terminal"} />
+                  </Button>
+                </TooltipKeybind>
 
                 <div class="hidden md:flex items-center gap-1 shrink-0">
                   <TooltipKeybind
@@ -463,32 +451,30 @@ export function SessionHeader() {
                     </Button>
                   </TooltipKeybind>
 
-                  <Show when={tree()}>
-                    <TooltipKeybind
-                      title={language.t("command.fileTree.toggle")}
-                      keybind={command.keybind("fileTree.toggle")}
+                  <TooltipKeybind
+                    title={language.t("command.fileTree.toggle")}
+                    keybind={command.keybind("fileTree.toggle")}
+                  >
+                    <Button
+                      variant="ghost"
+                      class="titlebar-icon w-8 h-6 p-0 box-border"
+                      onClick={() => layout.fileTree.toggle()}
+                      aria-label={language.t("command.fileTree.toggle")}
+                      aria-expanded={layout.fileTree.opened()}
+                      aria-controls="file-tree-panel"
                     >
-                      <Button
-                        variant="ghost"
-                        class="titlebar-icon w-8 h-6 p-0 box-border"
-                        onClick={() => layout.fileTree.toggle()}
-                        aria-label={language.t("command.fileTree.toggle")}
-                        aria-expanded={layout.fileTree.opened()}
-                        aria-controls="file-tree-panel"
-                      >
-                        <div class="relative flex items-center justify-center size-4">
-                          <Icon
-                            size="small"
-                            name={layout.fileTree.opened() ? "file-tree-active" : "file-tree"}
-                            classList={{
-                              "text-icon-strong": layout.fileTree.opened(),
-                              "text-icon-weak": !layout.fileTree.opened(),
-                            }}
-                          />
-                        </div>
-                      </Button>
-                    </TooltipKeybind>
-                  </Show>
+                      <div class="relative flex items-center justify-center size-4">
+                        <Icon
+                          size="small"
+                          name={layout.fileTree.opened() ? "file-tree-active" : "file-tree"}
+                          classList={{
+                            "text-icon-strong": layout.fileTree.opened(),
+                            "text-icon-weak": !layout.fileTree.opened(),
+                          }}
+                        />
+                      </div>
+                    </Button>
+                  </TooltipKeybind>
                 </div>
               </div>
             </div>

packages/app/src/components/settings-general.tsx

@@ -106,7 +106,6 @@ export const SettingsGeneral: Component = () => {
 
     permission.disableAutoAccept(params.id, value)
   }
-  const desktop = createMemo(() => platform.platform === "desktop")
 
   const check = () => {
     if (!platform.checkUpdate) return
@@ -280,74 +279,6 @@ export const SettingsGeneral: Component = () => {
     </div>
   )
 
-  const AdvancedSection = () => (
-    <div class="flex flex-col gap-1">
-      <h3 class="text-14-medium text-text-strong pb-2">{language.t("settings.general.section.advanced")}</h3>
-
-      <SettingsList>
-        <SettingsRow
-          title={language.t("settings.general.row.showFileTree.title")}
-          description={language.t("settings.general.row.showFileTree.description")}
-        >
-          <div data-action="settings-show-file-tree">
-            <Switch
-              checked={settings.general.showFileTree()}
-              onChange={(checked) => settings.general.setShowFileTree(checked)}
-            />
-          </div>
-        </SettingsRow>
-
-        <SettingsRow
-          title={language.t("settings.general.row.showNavigation.title")}
-          description={language.t("settings.general.row.showNavigation.description")}
-        >
-          <div data-action="settings-show-navigation">
-            <Switch
-              checked={settings.general.showNavigation()}
-              onChange={(checked) => settings.general.setShowNavigation(checked)}
-            />
-          </div>
-        </SettingsRow>
-
-        <SettingsRow
-          title={language.t("settings.general.row.showSearch.title")}
-          description={language.t("settings.general.row.showSearch.description")}
-        >
-          <div data-action="settings-show-search">
-            <Switch
-              checked={settings.general.showSearch()}
-              onChange={(checked) => settings.general.setShowSearch(checked)}
-            />
-          </div>
-        </SettingsRow>
-
-        <SettingsRow
-          title={language.t("settings.general.row.showTerminal.title")}
-          description={language.t("settings.general.row.showTerminal.description")}
-        >
-          <div data-action="settings-show-terminal">
-            <Switch
-              checked={settings.general.showTerminal()}
-              onChange={(checked) => settings.general.setShowTerminal(checked)}
-            />
-          </div>
-        </SettingsRow>
-
-        <SettingsRow
-          title={language.t("settings.general.row.showStatus.title")}
-          description={language.t("settings.general.row.showStatus.description")}
-        >
-          <div data-action="settings-show-status">
-            <Switch
-              checked={settings.general.showStatus()}
-              onChange={(checked) => settings.general.setShowStatus(checked)}
-            />
-          </div>
-        </SettingsRow>
-      </SettingsList>
-    </div>
-  )
-
   const AppearanceSection = () => (
     <div class="flex flex-col gap-1">
       <h3 class="text-14-medium text-text-strong pb-2">{language.t("settings.general.section.appearance")}</h3>
@@ -678,10 +609,6 @@ export const SettingsGeneral: Component = () => {
             )
           }}
         </Show>
-
-        <Show when={desktop()}>
-          <AdvancedSection />
-        </Show>
       </div>
     </div>
   )

packages/app/src/components/settings-pair.tsx

@@ -1,92 +0,0 @@
-import { type Component, createResource, Show } from "solid-js"
-import { Icon } from "@opencode-ai/ui/icon"
-import { useLanguage } from "@/context/language"
-import { useGlobalSDK } from "@/context/global-sdk"
-import { usePlatform } from "@/context/platform"
-import { SettingsList } from "./settings-list"
-
-type PairResult = { enabled: false } | { enabled: true; hosts: string[]; link: string; qr: string }
-
-export const SettingsPair: Component = () => {
-  const language = useLanguage()
-  const globalSDK = useGlobalSDK()
-  const platform = usePlatform()
-
-  const [data] = createResource(async () => {
-    const f = platform.fetch ?? fetch
-    const res = await f(`${globalSDK.url}/experimental/push/pair`)
-    if (!res.ok) return { enabled: false as const }
-    return (await res.json()) as PairResult
-  })
-
-  return (
-    <div class="flex flex-col gap-6 py-4 px-5">
-      <div class="flex flex-col gap-1">
-        <h2 class="text-16-semibold text-text-strong">{language.t("settings.pair.title")}</h2>
-        <p class="text-13-regular text-text-weak">{language.t("settings.pair.description")}</p>
-      </div>
-
-      <Show when={data.loading}>
-        <SettingsList>
-          <div class="flex items-center justify-center py-12">
-            <span class="text-14-regular text-text-weak">{language.t("settings.pair.loading")}</span>
-          </div>
-        </SettingsList>
-      </Show>
-
-      <Show when={data.error}>
-        <SettingsList>
-          <div class="flex flex-col items-center justify-center py-12 gap-3 text-center">
-            <Icon name="warning" size="large" />
-            <div class="flex flex-col gap-1">
-              <span class="text-14-medium text-text-strong">{language.t("settings.pair.error.title")}</span>
-              <span class="text-13-regular text-text-weak max-w-md">
-                {language.t("settings.pair.error.description")}
-              </span>
-            </div>
-          </div>
-        </SettingsList>
-      </Show>
-
-      <Show when={!data.loading && !data.error && data()}>
-        {(result) => (
-          <Show
-            when={result().enabled && result()}
-            fallback={
-              <SettingsList>
-                <div class="flex flex-col items-center justify-center py-12 gap-3 text-center">
-                  <Icon name="link" size="large" />
-                  <div class="flex flex-col gap-1">
-                    <span class="text-14-medium text-text-strong">{language.t("settings.pair.disabled.title")}</span>
-                    <span class="text-13-regular text-text-weak max-w-md">
-                      {language.t("settings.pair.disabled.description")}
-                    </span>
-                  </div>
-                  <code class="text-12-regular text-text-weak bg-surface-inset px-3 py-1.5 rounded mt-1">
-                    opencode serve --relay-url &lt;url&gt; --relay-secret &lt;secret&gt;
-                  </code>
-                </div>
-              </SettingsList>
-            }
-          >
-            {(pair) => (
-              <SettingsList>
-                <div class="flex flex-col items-center py-8 gap-4">
-                  <img src={(pair() as PairResult & { enabled: true }).qr} alt="Pairing QR code" class="w-64 h-64" />
-                  <div class="flex flex-col gap-1 text-center max-w-sm">
-                    <span class="text-14-medium text-text-strong">
-                      {language.t("settings.pair.instructions.title")}
-                    </span>
-                    <span class="text-13-regular text-text-weak">
-                      {language.t("settings.pair.instructions.description")}
-                    </span>
-                  </div>
-                </div>
-              </SettingsList>
-            )}
-          </Show>
-        )}
-      </Show>
-    </div>
-  )
-}

packages/app/src/components/terminal.tsx

@@ -174,7 +174,6 @@ export const Terminal = (props: TerminalProps) => {
   const auth = server.current?.http
   const username = auth?.username ?? "opencode"
   const password = auth?.password ?? ""
-  const sameOrigin = new URL(url, location.href).origin === location.origin
   let container!: HTMLDivElement
   const [local, others] = splitProps(props, ["pty", "class", "classList", "autoFocus", "onConnect", "onConnectError"])
   const id = local.pty.id
@@ -520,12 +519,8 @@ export const Terminal = (props: TerminalProps) => {
         next.searchParams.set("directory", directory)
         next.searchParams.set("cursor", String(seek))
         next.protocol = next.protocol === "https:" ? "wss:" : "ws:"
-        if (!sameOrigin && password) {
-          next.searchParams.set("auth_token", btoa(`${username}:${password}`))
-          // For same-origin requests, let the browser reuse the page's existing auth.
-          next.username = username
-          next.password = password
-        }
+        next.username = username
+        next.password = password
 
         const socket = new WebSocket(next)
         socket.binaryType = "arraybuffer"

packages/app/src/components/titlebar.tsx

@@ -11,7 +11,6 @@ import { useLayout } from "@/context/layout"
 import { usePlatform } from "@/context/platform"
 import { useCommand } from "@/context/command"
 import { useLanguage } from "@/context/language"
-import { useSettings } from "@/context/settings"
 import { applyPath, backPath, forwardPath } from "./titlebar-history"
 
 type TauriDesktopWindow = {
@@ -41,7 +40,6 @@ export function Titlebar() {
   const platform = usePlatform()
   const command = useCommand()
   const language = useLanguage()
-  const settings = useSettings()
   const theme = useTheme()
   const navigate = useNavigate()
   const location = useLocation()
@@ -80,7 +78,6 @@ export function Titlebar() {
   const canBack = createMemo(() => history.index > 0)
   const canForward = createMemo(() => history.index < history.stack.length - 1)
   const hasProjects = createMemo(() => layout.projects.list().length > 0)
-  const nav = createMemo(() => platform.platform !== "desktop" || settings.general.showNavigation())
 
   const back = () => {
     const next = backPath(history)
@@ -255,7 +252,7 @@ export function Titlebar() {
                 </div>
               </div>
             </Show>
-            <Show when={hasProjects() && nav()}>
+            <Show when={hasProjects()}>
               <div
                 class="flex items-center gap-0 transition-transform"
                 classList={{
@@ -290,9 +287,6 @@ export function Titlebar() {
           </div>
         </div>
         <div id="opencode-titlebar-left" class="flex items-center gap-3 min-w-0 px-2" />
-        <div class="bg-icon-interactive-base text-background-base font-medium px-2 rounded-sm uppercase font-mono">
-          BETA
-        </div>
       </div>
 
       <div class="min-w-0 flex items-center justify-center pointer-events-none">

packages/app/src/context/global-sync/event-reducer.ts

@@ -14,7 +14,6 @@ import type {
 import type { State, VcsCache } from "./types"
 import { trimSessions } from "./session-trim"
 import { dropSessionCaches } from "./session-cache"
-import { diffs as list, message as clean } from "@/utils/diffs"
 
 const SKIP_PARTS = new Set(["patch", "step-start", "step-finish"])
 
@@ -163,7 +162,7 @@ export function applyDirectoryEvent(input: {
     }
     case "session.diff": {
       const props = event.properties as { sessionID: string; diff: SnapshotFileDiff[] }
-      input.setStore("session_diff", props.sessionID, reconcile(list(props.diff), { key: "file" }))
+      input.setStore("session_diff", props.sessionID, reconcile(props.diff, { key: "file" }))
       break
     }
     case "todo.updated": {
@@ -178,7 +177,7 @@ export function applyDirectoryEvent(input: {
       break
     }
     case "message.updated": {
-      const info = clean((event.properties as { info: Message }).info)
+      const info = (event.properties as { info: Message }).info
       const messages = input.store.message[info.sessionID]
       if (!messages) {
         input.setStore("message", info.sessionID, [info])

packages/app/src/context/settings.tsx

@@ -23,11 +23,6 @@ export interface Settings {
     autoSave: boolean
     releaseNotes: boolean
     followup: "queue" | "steer"
-    showFileTree: boolean
-    showNavigation: boolean
-    showSearch: boolean
-    showStatus: boolean
-    showTerminal: boolean
     showReasoningSummaries: boolean
     shellToolPartsExpanded: boolean
     editToolPartsExpanded: boolean
@@ -94,11 +89,6 @@ const defaultSettings: Settings = {
     autoSave: true,
     releaseNotes: true,
     followup: "steer",
-    showFileTree: false,
-    showNavigation: false,
-    showSearch: false,
-    showStatus: false,
-    showTerminal: false,
     showReasoningSummaries: false,
     shellToolPartsExpanded: false,
     editToolPartsExpanded: false,
@@ -172,26 +162,6 @@ export const { use: useSettings, provider: SettingsProvider } = createSimpleCont
         setFollowup(value: "queue" | "steer") {
           setStore("general", "followup", value === "queue" ? "steer" : value)
         },
-        showFileTree: withFallback(() => store.general?.showFileTree, defaultSettings.general.showFileTree),
-        setShowFileTree(value: boolean) {
-          setStore("general", "showFileTree", value)
-        },
-        showNavigation: withFallback(() => store.general?.showNavigation, defaultSettings.general.showNavigation),
-        setShowNavigation(value: boolean) {
-          setStore("general", "showNavigation", value)
-        },
-        showSearch: withFallback(() => store.general?.showSearch, defaultSettings.general.showSearch),
-        setShowSearch(value: boolean) {
-          setStore("general", "showSearch", value)
-        },
-        showStatus: withFallback(() => store.general?.showStatus, defaultSettings.general.showStatus),
-        setShowStatus(value: boolean) {
-          setStore("general", "showStatus", value)
-        },
-        showTerminal: withFallback(() => store.general?.showTerminal, defaultSettings.general.showTerminal),
-        setShowTerminal(value: boolean) {
-          setStore("general", "showTerminal", value)
-        },
         showReasoningSummaries: withFallback(
           () => store.general?.showReasoningSummaries,
           defaultSettings.general.showReasoningSummaries,

packages/app/src/context/sync.tsx

@@ -13,7 +13,6 @@ import { useGlobalSync } from "./global-sync"
 import { useSDK } from "./sdk"
 import type { Message, Part } from "@opencode-ai/sdk/v2/client"
 import { SESSION_CACHE_LIMIT, dropSessionCaches, pickSessionCacheEvictions } from "./global-sync/session-cache"
-import { diffs as list, message as clean } from "@/utils/diffs"
 
 const SKIP_PARTS = new Set(["patch", "step-start", "step-finish"])
 
@@ -301,7 +300,7 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({
         input.client.session.messages({ sessionID: input.sessionID, limit: input.limit, before: input.before }),
       )
       const items = (messages.data ?? []).filter((x) => !!x?.info?.id)
-      const session = items.map((x) => clean(x.info)).sort((a, b) => cmp(a.id, b.id))
+      const session = items.map((x) => x.info).sort((a, b) => cmp(a.id, b.id))
       const part = items.map((message) => ({ id: message.info.id, part: sortParts(message.parts) }))
       const cursor = messages.response.headers.get("x-next-cursor") ?? undefined
       return {
@@ -510,7 +509,7 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({
           return runInflight(inflightDiff, key, () =>
             retry(() => client.session.diff({ sessionID })).then((diff) => {
               if (!tracked(directory, sessionID)) return
-              setStore("session_diff", sessionID, reconcile(list(diff.data), { key: "file" }))
+              setStore("session_diff", sessionID, reconcile(diff.data ?? [], { key: "file" }))
             }),
           )
         },

packages/app/src/i18n/en.ts

@@ -28,7 +28,6 @@ export const dict = {
   "command.provider.connect": "Connect provider",
   "command.server.switch": "Switch server",
   "command.settings.open": "Open settings",
-  "command.pair.show": "Pair mobile device",
   "command.session.previous": "Previous session",
   "command.session.next": "Next session",
   "command.session.previous.unseen": "Previous unread session",
@@ -720,7 +719,6 @@ export const dict = {
   "settings.desktop.wsl.description": "Run the OpenCode server inside WSL on Windows.",
 
   "settings.general.section.appearance": "Appearance",
-  "settings.general.section.advanced": "Advanced",
   "settings.general.section.notifications": "System notifications",
   "settings.general.section.updates": "Updates",
   "settings.general.section.sounds": "Sound effects",
@@ -743,16 +741,6 @@ export const dict = {
   "settings.general.row.followup.description": "Choose whether follow-up prompts steer immediately or wait in a queue",
   "settings.general.row.followup.option.queue": "Queue",
   "settings.general.row.followup.option.steer": "Steer",
-  "settings.general.row.showFileTree.title": "File tree",
-  "settings.general.row.showFileTree.description": "Show the file tree toggle and panel in desktop sessions",
-  "settings.general.row.showNavigation.title": "Navigation controls",
-  "settings.general.row.showNavigation.description": "Show the back and forward buttons in the desktop title bar",
-  "settings.general.row.showSearch.title": "Command palette",
-  "settings.general.row.showSearch.description": "Show the search and command palette button in the desktop title bar",
-  "settings.general.row.showTerminal.title": "Terminal",
-  "settings.general.row.showTerminal.description": "Show the terminal button in the desktop title bar",
-  "settings.general.row.showStatus.title": "Server status",
-  "settings.general.row.showStatus.description": "Show the server status button in the desktop title bar",
   "settings.general.row.reasoningSummaries.title": "Show reasoning summaries",
   "settings.general.row.reasoningSummaries.description": "Display model reasoning summaries in the timeline",
   "settings.general.row.shellToolPartsExpanded.title": "Expand shell tool parts",
@@ -869,17 +857,6 @@ export const dict = {
   "settings.providers.tag.config": "Config",
   "settings.providers.tag.custom": "Custom",
   "settings.providers.tag.other": "Other",
-  "settings.pair.title": "Pair",
-  "settings.pair.description": "Pair a mobile device for push notifications.",
-  "settings.pair.loading": "Loading pairing info...",
-  "settings.pair.error.title": "Could not load pairing info",
-  "settings.pair.error.description": "Check that the server is reachable and try again.",
-  "settings.pair.disabled.title": "Push relay is not enabled",
-  "settings.pair.disabled.description": "Start the server with push relay options to enable mobile pairing.",
-  "settings.pair.instructions.title": "Scan with the OpenCode Control app",
-  "settings.pair.instructions.description":
-    "Open the OpenCode Control app and scan this QR code to pair your device for push notifications.",
-
   "settings.models.title": "Models",
   "settings.models.description": "Model settings will be configurable here.",
   "settings.agents.title": "Agents",

packages/app/src/pages/layout.tsx

@@ -1058,13 +1058,6 @@ export default function Layout(props: ParentProps) {
         keybind: "mod+comma",
         onSelect: () => openSettings(),
       },
-      {
-        id: "pair.show",
-        title: language.t("command.pair.show"),
-        category: language.t("command.category.settings"),
-        slash: "pair",
-        onSelect: () => openSettings("pair"),
-      },
       {
         id: "session.previous",
         title: language.t("command.session.previous"),
@@ -1217,11 +1210,11 @@ export default function Layout(props: ParentProps) {
     })
   }
 
-  function openSettings(defaultTab?: string) {
+  function openSettings() {
     const run = ++dialogRun
     void import("@/components/dialog-settings").then((x) => {
       if (dialogDead || dialogRun !== run) return
-      dialog.show(() => <x.DialogSettings defaultTab={defaultTab} />)
+      dialog.show(() => <x.DialogSettings />)
     })
   }
 

packages/app/src/pages/session.tsx

@@ -58,7 +58,6 @@ import { TerminalPanel } from "@/pages/session/terminal-panel"
 import { useSessionCommands } from "@/pages/session/use-session-commands"
 import { useSessionHashScroll } from "@/pages/session/use-session-hash-scroll"
 import { Identifier } from "@/utils/id"
-import { diffs as list } from "@/utils/diffs"
 import { Persist, persisted } from "@/utils/persist"
 import { extractPromptFromParts } from "@/utils/prompt"
 import { same } from "@/utils/same"
@@ -431,7 +430,7 @@ export default function Page() {
 
   const info = createMemo(() => (params.id ? sync.session.get(params.id) : undefined))
   const isChildSession = createMemo(() => !!info()?.parentID)
-  const diffs = createMemo(() => (params.id ? list(sync.data.session_diff[params.id]) : []))
+  const diffs = createMemo(() => (params.id ? (sync.data.session_diff[params.id] ?? []) : []))
   const sessionCount = createMemo(() => Math.max(info()?.summary?.files ?? 0, diffs().length))
   const hasSessionReview = createMemo(() => sessionCount() > 0)
   const canReview = createMemo(() => !!sync.project)
@@ -612,7 +611,7 @@ export default function Page() {
       .diff({ mode })
       .then((result) => {
         if (vcsRun.get(mode) !== run) return
-        setVcs("diff", mode, list(result.data))
+        setVcs("diff", mode, result.data ?? [])
         setVcs("ready", mode, true)
       })
       .catch((error) => {
@@ -650,7 +649,7 @@ export default function Page() {
     return open
   }, desktopReviewOpen())
 
-  const turnDiffs = createMemo(() => list(lastUserMessage()?.summary?.diffs))
+  const turnDiffs = createMemo(() => lastUserMessage()?.summary?.diffs ?? [])
   const nogit = createMemo(() => !!sync.project && sync.project.vcs !== "git")
   const changesOptions = createMemo<ChangeMode[]>(() => {
     const list: ChangeMode[] = []
@@ -670,11 +669,15 @@ export default function Page() {
     if (store.changes === "git" || store.changes === "branch") return store.changes
   })
   const reviewDiffs = createMemo(() => {
-    if (store.changes === "git") return list(vcs.diff.git)
-    if (store.changes === "branch") return list(vcs.diff.branch)
+    if (store.changes === "git") return vcs.diff.git
+    if (store.changes === "branch") return vcs.diff.branch
     return turnDiffs()
   })
-  const reviewCount = createMemo(() => reviewDiffs().length)
+  const reviewCount = createMemo(() => {
+    if (store.changes === "git") return vcs.diff.git.length
+    if (store.changes === "branch") return vcs.diff.branch.length
+    return turnDiffs().length
+  })
   const hasReview = createMemo(() => reviewCount() > 0)
   const reviewReady = createMemo(() => {
     if (store.changes === "git") return vcs.ready.git

packages/app/src/pages/session/composer/session-question-dock.tsx

@@ -4,7 +4,6 @@ import { useMutation } from "@tanstack/solid-query"
 import { Button } from "@opencode-ai/ui/button"
 import { DockPrompt } from "@opencode-ai/ui/dock-prompt"
 import { Icon } from "@opencode-ai/ui/icon"
-import { IconButton } from "@opencode-ai/ui/icon-button"
 import { showToast } from "@opencode-ai/ui/toast"
 import type { QuestionAnswer, QuestionRequest } from "@opencode-ai/sdk/v2"
 import { useLanguage } from "@/context/language"
@@ -74,7 +73,6 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit
     customOn: cached?.customOn ?? ([] as boolean[]),
     editing: false,
     focus: 0,
-    collapsed: false,
   })
 
   let root: HTMLDivElement | undefined
@@ -89,7 +87,6 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit
   const on = createMemo(() => store.customOn[store.tab] === true)
   const multi = createMemo(() => question()?.multiple === true)
   const count = createMemo(() => options().length + 1)
-  const selected = createMemo(() => store.answers[store.tab]?.length ?? 0)
 
   const summary = createMemo(() => {
     const n = Math.min(store.tab + 1, total())
@@ -101,8 +98,6 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit
 
   const last = createMemo(() => store.tab >= total() - 1)
 
-  const fold = () => setStore("collapsed", (value) => !value)
-
   const customUpdate = (value: string, selected: boolean = on()) => {
     const prev = input().trim()
     const next = value.trim()
@@ -431,21 +426,9 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit
       ref={(el) => (root = el)}
       onKeyDown={nav}
       header={
-        <div
-          data-action="session-question-toggle"
-          class="flex flex-1 min-w-0 items-center gap-2 cursor-default select-none"
-          role="button"
-          tabIndex={0}
-          style={{ margin: "0 -10px", padding: "0 0 0 10px" }}
-          onClick={fold}
-          onKeyDown={(event) => {
-            if (event.key !== "Enter" && event.key !== " ") return
-            event.preventDefault()
-            fold()
-          }}
-        >
+        <>
           <div data-slot="question-header-title">{summary()}</div>
-          <div data-slot="question-progress" class="ml-auto mr-1">
+          <div data-slot="question-progress">
             <For each={questions()}>
               {(_, i) => (
                 <button
@@ -454,38 +437,13 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit
                   data-active={i() === store.tab}
                   data-answered={answered(i())}
                   disabled={sending()}
-                  onMouseDown={(event) => {
-                    event.preventDefault()
-                    event.stopPropagation()
-                  }}
-                  onClick={(event) => {
-                    event.stopPropagation()
-                    jump(i())
-                  }}
+                  onClick={() => jump(i())}
                   aria-label={`${language.t("ui.tool.questions")} ${i() + 1}`}
                 />
               )}
             </For>
           </div>
-          <div>
-            <IconButton
-              data-action="session-question-toggle-button"
-              icon="chevron-down"
-              size="normal"
-              variant="ghost"
-              classList={{ "rotate-180": store.collapsed }}
-              onMouseDown={(event) => {
-                event.preventDefault()
-                event.stopPropagation()
-              }}
-              onClick={(event) => {
-                event.stopPropagation()
-                fold()
-              }}
-              aria-label={store.collapsed ? language.t("session.todo.expand") : language.t("session.todo.collapse")}
-            />
-          </div>
-        </div>
+        </>
       }
       footer={
         <>
@@ -511,137 +469,99 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit
         </>
       }
     >
-      <div
-        data-slot="question-text"
-        class="cursor-default"
-        classList={{
-          "mb-6": store.collapsed && selected() === 0,
-        }}
-        role={store.collapsed ? "button" : undefined}
-        tabIndex={store.collapsed ? 0 : undefined}
-        onClick={fold}
-        onKeyDown={(event) => {
-          if (!store.collapsed) return
-          if (event.key !== "Enter" && event.key !== " ") return
-          event.preventDefault()
-          fold()
-        }}
-      >
-        {question()?.question}
-      </div>
-      <Show when={store.collapsed && selected() > 0}>
-        <div data-slot="question-hint" class="cursor-default mb-6">
-          {selected()} answer{selected() === 1 ? "" : "s"} selected
-        </div>
+      <div data-slot="question-text">{question()?.question}</div>
+      <Show when={multi()} fallback={<div data-slot="question-hint">{language.t("ui.question.singleHint")}</div>}>
+        <div data-slot="question-hint">{language.t("ui.question.multiHint")}</div>
       </Show>
-      <div data-slot="question-answers" hidden={store.collapsed} aria-hidden={store.collapsed}>
-        <Show when={multi()} fallback={<div data-slot="question-hint">{language.t("ui.question.singleHint")}</div>}>
-          <div data-slot="question-hint">{language.t("ui.question.multiHint")}</div>
-        </Show>
-        <div data-slot="question-options">
-          <For each={options()}>
-            {(opt, i) => (
-              <Option
-                multi={multi()}
-                picked={picked(opt.label)}
-                label={opt.label}
-                description={opt.description}
-                disabled={sending()}
-                ref={(el) => (optsRef[i()] = el)}
-                onFocus={() => setStore("focus", i())}
-                onClick={() => selectOption(i())}
-              />
-            )}
-          </For>
+      <div data-slot="question-options">
+        <For each={options()}>
+          {(opt, i) => (
+            <Option
+              multi={multi()}
+              picked={picked(opt.label)}
+              label={opt.label}
+              description={opt.description}
+              disabled={sending()}
+              ref={(el) => (optsRef[i()] = el)}
+              onFocus={() => setStore("focus", i())}
+              onClick={() => selectOption(i())}
+            />
+          )}
+        </For>
 
-          <Show
-            when={store.editing}
-            fallback={
-              <button
-                type="button"
-                ref={customRef}
-                data-slot="question-option"
-                data-custom="true"
-                data-picked={on()}
-                role={multi() ? "checkbox" : "radio"}
-                aria-checked={on()}
-                disabled={sending()}
-                onFocus={() => setStore("focus", options().length)}
-                onClick={customOpen}
-              >
-                <span
-                  data-slot="question-option-check"
-                  aria-hidden="true"
-                  onClick={(event) => {
-                    event.preventDefault()
-                    event.stopPropagation()
-                    customToggle()
-                  }}
-                >
-                  <span data-slot="question-option-box" data-type={multi() ? "checkbox" : "radio"} data-picked={on()}>
-                    <Show when={multi()} fallback={<span data-slot="question-option-radio-dot" />}>
-                      <Icon name="check-small" size="small" />
-                    </Show>
-                  </span>
-                </span>
-                <span data-slot="question-option-main">
-                  <span data-slot="option-label">{customLabel()}</span>
-                  <span data-slot="option-description">{input() || customPlaceholder()}</span>
-                </span>
-              </button>
-            }
-          >
-            <form
+        <Show
+          when={store.editing}
+          fallback={
+            <button
+              type="button"
+              ref={customRef}
               data-slot="question-option"
               data-custom="true"
               data-picked={on()}
               role={multi() ? "checkbox" : "radio"}
               aria-checked={on()}
-              onMouseDown={(e) => {
-                if (sending()) {
-                  e.preventDefault()
-                  return
-                }
-                if (e.target instanceof HTMLTextAreaElement) return
-                const input = e.currentTarget.querySelector('[data-slot="question-custom-input"]')
-                if (input instanceof HTMLTextAreaElement) input.focus()
-              }}
-              onSubmit={(e) => {
-                e.preventDefault()
-                commitCustom()
-              }}
+              disabled={sending()}
+              onFocus={() => setStore("focus", options().length)}
+              onClick={customOpen}
             >
               <Mark multi={multi()} picked={on()} onClick={toggleCustomMark} />
               <span data-slot="question-option-main">
                 <span data-slot="option-label">{customLabel()}</span>
-                <textarea
-                  ref={focusCustom}
-                  data-slot="question-custom-input"
-                  placeholder={customPlaceholder()}
-                  value={input()}
-                  rows={1}
-                  disabled={sending()}
-                  onKeyDown={(e) => {
-                    if (e.key === "Escape") {
-                      e.preventDefault()
-                      setStore("editing", false)
-                      focus(options().length)
-                      return
-                    }
-                    if ((e.metaKey || e.ctrlKey) && !e.altKey) return
-                    if (e.key !== "Enter" || e.shiftKey) return
-                    e.preventDefault()
-                    commitCustom()
-                  }}
-                  onInput={(e) => {
-                    customUpdate(e.currentTarget.value)
-                    resizeInput(e.currentTarget)
-                  }}
-                />
+                <span data-slot="option-description">{input() || customPlaceholder()}</span>
               </span>
-            </form>
-          </Show>
-        </div>
+            </button>
+          }
+        >
+          <form
+            data-slot="question-option"
+            data-custom="true"
+            data-picked={on()}
+            role={multi() ? "checkbox" : "radio"}
+            aria-checked={on()}
+            onMouseDown={(e) => {
+              if (sending()) {
+                e.preventDefault()
+                return
+              }
+              if (e.target instanceof HTMLTextAreaElement) return
+              const input = e.currentTarget.querySelector('[data-slot="question-custom-input"]')
+              if (input instanceof HTMLTextAreaElement) input.focus()
+            }}
+            onSubmit={(e) => {
+              e.preventDefault()
+              commitCustom()
+            }}
+          >
+            <Mark multi={multi()} picked={on()} onClick={toggleCustomMark} />
+            <span data-slot="question-option-main">
+              <span data-slot="option-label">{customLabel()}</span>
+              <textarea
+                ref={focusCustom}
+                data-slot="question-custom-input"
+                placeholder={customPlaceholder()}
+                value={input()}
+                rows={1}
+                disabled={sending()}
+                onKeyDown={(e) => {
+                  if (e.key === "Escape") {
+                    e.preventDefault()
+                    setStore("editing", false)
+                    focus(options().length)
+                    return
+                  }
+                  if ((e.metaKey || e.ctrlKey) && !e.altKey) return
+                  if (e.key !== "Enter" || e.shiftKey) return
+                  e.preventDefault()
+                  commitCustom()
+                }}
+                onInput={(e) => {
+                  customUpdate(e.currentTarget.value)
+                  resizeInput(e.currentTarget)
+                }}
+              />
+            </span>
+          </form>
+        </Show>
       </div>
     </DockPrompt>
   )

packages/app/src/pages/session/session-side-panel.tsx

@@ -19,8 +19,6 @@ import { useCommand } from "@/context/command"
 import { useFile, type SelectedLineRange } from "@/context/file"
 import { useLanguage } from "@/context/language"
 import { useLayout } from "@/context/layout"
-import { usePlatform } from "@/context/platform"
-import { useSettings } from "@/context/settings"
 import { createFileTabListSync } from "@/pages/session/file-tab-scroll"
 import { FileTabContent } from "@/pages/session/file-tabs"
 import { createOpenSessionFileTab, createSessionTabs, getTabReorderIndex, type Sizing } from "@/pages/session/helpers"
@@ -41,8 +39,6 @@ export function SessionSidePanel(props: {
   size: Sizing
 }) {
   const layout = useLayout()
-  const platform = usePlatform()
-  const settings = useSettings()
   const file = useFile()
   const language = useLanguage()
   const command = useCommand()
@@ -50,10 +46,9 @@ export function SessionSidePanel(props: {
   const { sessionKey, tabs, view } = useSessionLayout()
 
   const isDesktop = createMediaQuery("(min-width: 768px)")
-  const shown = createMemo(() => platform.platform !== "desktop" || settings.general.showFileTree())
 
   const reviewOpen = createMemo(() => isDesktop() && view().reviewPanel.opened())
-  const fileOpen = createMemo(() => isDesktop() && shown() && layout.fileTree.opened())
+  const fileOpen = createMemo(() => isDesktop() && layout.fileTree.opened())
   const open = createMemo(() => reviewOpen() || fileOpen())
   const reviewTab = createMemo(() => isDesktop())
   const panelWidth = createMemo(() => {
@@ -346,100 +341,98 @@ export function SessionSidePanel(props: {
             </div>
           </div>
 
-          <Show when={shown()}>
+          <div
+            id="file-tree-panel"
+            aria-hidden={!fileOpen()}
+            inert={!fileOpen()}
+            class="relative min-w-0 h-full shrink-0 overflow-hidden"
+            classList={{
+              "pointer-events-none": !fileOpen(),
+              "transition-[width] duration-200 ease-[cubic-bezier(0.22,1,0.36,1)] will-change-[width] motion-reduce:transition-none":
+                !props.size.active(),
+            }}
+            style={{ width: treeWidth() }}
+          >
             <div
-              id="file-tree-panel"
-              aria-hidden={!fileOpen()}
-              inert={!fileOpen()}
-              class="relative min-w-0 h-full shrink-0 overflow-hidden"
-              classList={{
-                "pointer-events-none": !fileOpen(),
-                "transition-[width] duration-200 ease-[cubic-bezier(0.22,1,0.36,1)] will-change-[width] motion-reduce:transition-none":
-                  !props.size.active(),
-              }}
-              style={{ width: treeWidth() }}
+              class="h-full flex flex-col overflow-hidden group/filetree"
+              classList={{ "border-l border-border-weaker-base": reviewOpen() }}
             >
-              <div
-                class="h-full flex flex-col overflow-hidden group/filetree"
-                classList={{ "border-l border-border-weaker-base": reviewOpen() }}
+              <Tabs
+                variant="pill"
+                value={fileTreeTab()}
+                onChange={setFileTreeTabValue}
+                class="h-full"
+                data-scope="filetree"
               >
-                <Tabs
-                  variant="pill"
-                  value={fileTreeTab()}
-                  onChange={setFileTreeTabValue}
-                  class="h-full"
-                  data-scope="filetree"
-                >
-                  <Tabs.List>
-                    <Tabs.Trigger value="changes" class="flex-1" classes={{ button: "w-full" }}>
-                      {props.reviewCount()}{" "}
-                      {language.t(
-                        props.reviewCount() === 1 ? "session.review.change.one" : "session.review.change.other",
-                      )}
-                    </Tabs.Trigger>
-                    <Tabs.Trigger value="all" class="flex-1" classes={{ button: "w-full" }}>
-                      {language.t("session.files.all")}
-                    </Tabs.Trigger>
-                  </Tabs.List>
-                  <Tabs.Content value="changes" class="bg-background-stronger px-3 py-0">
-                    <Switch>
-                      <Match when={props.hasReview() || !props.diffsReady()}>
-                        <Show
-                          when={props.diffsReady()}
-                          fallback={
-                            <div class="px-2 py-2 text-12-regular text-text-weak">
-                              {language.t("common.loading")}
-                              {language.t("common.loading.ellipsis")}
-                            </div>
-                          }
-                        >
-                          <FileTree
-                            path=""
-                            class="pt-3"
-                            allowed={diffFiles()}
-                            kinds={kinds()}
-                            draggable={false}
-                            active={props.activeDiff}
-                            onFileClick={(node) => props.focusReviewDiff(node.path)}
-                          />
-                        </Show>
-                      </Match>
-                      <Match when={true}>{empty(props.empty())}</Match>
-                    </Switch>
-                  </Tabs.Content>
-                  <Tabs.Content value="all" class="bg-background-stronger px-3 py-0">
-                    <Switch>
-                      <Match when={nofiles()}>{empty(language.t("session.files.empty"))}</Match>
-                      <Match when={true}>
+                <Tabs.List>
+                  <Tabs.Trigger value="changes" class="flex-1" classes={{ button: "w-full" }}>
+                    {props.reviewCount()}{" "}
+                    {language.t(
+                      props.reviewCount() === 1 ? "session.review.change.one" : "session.review.change.other",
+                    )}
+                  </Tabs.Trigger>
+                  <Tabs.Trigger value="all" class="flex-1" classes={{ button: "w-full" }}>
+                    {language.t("session.files.all")}
+                  </Tabs.Trigger>
+                </Tabs.List>
+                <Tabs.Content value="changes" class="bg-background-stronger px-3 py-0">
+                  <Switch>
+                    <Match when={props.hasReview() || !props.diffsReady()}>
+                      <Show
+                        when={props.diffsReady()}
+                        fallback={
+                          <div class="px-2 py-2 text-12-regular text-text-weak">
+                            {language.t("common.loading")}
+                            {language.t("common.loading.ellipsis")}
+                          </div>
+                        }
+                      >
                         <FileTree
                           path=""
                           class="pt-3"
-                          modified={diffFiles()}
+                          allowed={diffFiles()}
                           kinds={kinds()}
-                          onFileClick={(node) => openTab(file.tab(node.path))}
+                          draggable={false}
+                          active={props.activeDiff}
+                          onFileClick={(node) => props.focusReviewDiff(node.path)}
                         />
-                      </Match>
-                    </Switch>
-                  </Tabs.Content>
-                </Tabs>
-              </div>
-              <Show when={fileOpen()}>
-                <div onPointerDown={() => props.size.start()}>
-                  <ResizeHandle
-                    direction="horizontal"
-                    edge="start"
-                    size={layout.fileTree.width()}
-                    min={200}
-                    max={480}
-                    onResize={(width) => {
-                      props.size.touch()
-                      layout.fileTree.resize(width)
-                    }}
-                  />
-                </div>
-              </Show>
+                      </Show>
+                    </Match>
+                    <Match when={true}>{empty(props.empty())}</Match>
+                  </Switch>
+                </Tabs.Content>
+                <Tabs.Content value="all" class="bg-background-stronger px-3 py-0">
+                  <Switch>
+                    <Match when={nofiles()}>{empty(language.t("session.files.empty"))}</Match>
+                    <Match when={true}>
+                      <FileTree
+                        path=""
+                        class="pt-3"
+                        modified={diffFiles()}
+                        kinds={kinds()}
+                        onFileClick={(node) => openTab(file.tab(node.path))}
+                      />
+                    </Match>
+                  </Switch>
+                </Tabs.Content>
+              </Tabs>
             </div>
-          </Show>
+            <Show when={fileOpen()}>
+              <div onPointerDown={() => props.size.start()}>
+                <ResizeHandle
+                  direction="horizontal"
+                  edge="start"
+                  size={layout.fileTree.width()}
+                  min={200}
+                  max={480}
+                  onResize={(width) => {
+                    props.size.touch()
+                    layout.fileTree.resize(width)
+                  }}
+                />
+              </div>
+            </Show>
+          </div>
         </div>
       </aside>
     </Show>

packages/app/src/pages/session/use-session-commands.tsx

@@ -7,10 +7,8 @@ import { useLanguage } from "@/context/language"
 import { useLayout } from "@/context/layout"
 import { useLocal } from "@/context/local"
 import { usePermission } from "@/context/permission"
-import { usePlatform } from "@/context/platform"
 import { usePrompt } from "@/context/prompt"
 import { useSDK } from "@/context/sdk"
-import { useSettings } from "@/context/settings"
 import { useSync } from "@/context/sync"
 import { useTerminal } from "@/context/terminal"
 import { showToast } from "@opencode-ai/ui/toast"
@@ -41,10 +39,8 @@ export const useSessionCommands = (actions: SessionCommandContext) => {
   const language = useLanguage()
   const local = useLocal()
   const permission = usePermission()
-  const platform = usePlatform()
   const prompt = usePrompt()
   const sdk = useSDK()
-  const settings = useSettings()
   const sync = useSync()
   const terminal = useTerminal()
   const layout = useLayout()
@@ -70,7 +66,6 @@ export const useSessionCommands = (actions: SessionCommandContext) => {
   })
   const activeFileTab = tabState.activeFileTab
   const closableTab = tabState.closableTab
-  const shown = () => platform.platform !== "desktop" || settings.general.showFileTree()
 
   const idle = { type: "idle" as const }
   const status = () => sync.data.session_status[params.id ?? ""] ?? idle
@@ -462,16 +457,12 @@ export const useSessionCommands = (actions: SessionCommandContext) => {
       keybind: "mod+shift+r",
       onSelect: () => view().reviewPanel.toggle(),
     }),
-    ...(shown()
-      ? [
-          viewCommand({
-            id: "fileTree.toggle",
-            title: language.t("command.fileTree.toggle"),
-            keybind: "mod+\\",
-            onSelect: () => layout.fileTree.toggle(),
-          }),
-        ]
-      : []),
+    viewCommand({
+      id: "fileTree.toggle",
+      title: language.t("command.fileTree.toggle"),
+      keybind: "mod+\\",
+      onSelect: () => layout.fileTree.toggle(),
+    }),
     viewCommand({
       id: "input.focus",
       title: language.t("command.input.focus"),

packages/app/src/utils/diffs.test.ts

@@ -1,74 +0,0 @@
-import { describe, expect, test } from "bun:test"
-import type { SnapshotFileDiff } from "@opencode-ai/sdk/v2"
-import type { Message } from "@opencode-ai/sdk/v2/client"
-import { diffs, message } from "./diffs"
-
-const item = {
-  file: "src/app.ts",
-  patch: "@@ -1 +1 @@\n-old\n+new\n",
-  additions: 1,
-  deletions: 1,
-  status: "modified",
-} satisfies SnapshotFileDiff
-
-describe("diffs", () => {
-  test("keeps valid arrays", () => {
-    expect(diffs([item])).toEqual([item])
-  })
-
-  test("wraps a single diff object", () => {
-    expect(diffs(item)).toEqual([item])
-  })
-
-  test("reads keyed diff objects", () => {
-    expect(diffs({ a: item })).toEqual([item])
-  })
-
-  test("drops invalid entries", () => {
-    expect(
-      diffs([
-        item,
-        { file: "src/bad.ts", additions: 1, deletions: 1 },
-        { patch: item.patch, additions: 1, deletions: 1 },
-      ]),
-    ).toEqual([item])
-  })
-})
-
-describe("message", () => {
-  test("normalizes user summaries with object diffs", () => {
-    const input = {
-      id: "msg_1",
-      sessionID: "ses_1",
-      role: "user",
-      time: { created: 1 },
-      agent: "build",
-      model: { providerID: "openai", modelID: "gpt-5" },
-      summary: {
-        title: "Edit",
-        diffs: { a: item },
-      },
-    } as unknown as Message
-
-    expect(message(input)).toMatchObject({
-      summary: {
-        title: "Edit",
-        diffs: [item],
-      },
-    })
-  })
-
-  test("drops invalid user summaries", () => {
-    const input = {
-      id: "msg_1",
-      sessionID: "ses_1",
-      role: "user",
-      time: { created: 1 },
-      agent: "build",
-      model: { providerID: "openai", modelID: "gpt-5" },
-      summary: true,
-    } as unknown as Message
-
-    expect(message(input)).toMatchObject({ summary: undefined })
-  })
-})

packages/app/src/utils/diffs.ts

@@ -1,49 +0,0 @@
-import type { SnapshotFileDiff, VcsFileDiff } from "@opencode-ai/sdk/v2"
-import type { Message } from "@opencode-ai/sdk/v2/client"
-
-type Diff = SnapshotFileDiff | VcsFileDiff
-
-function diff(value: unknown): value is Diff {
-  if (!value || typeof value !== "object" || Array.isArray(value)) return false
-  if (!("file" in value) || typeof value.file !== "string") return false
-  if (!("patch" in value) || typeof value.patch !== "string") return false
-  if (!("additions" in value) || typeof value.additions !== "number") return false
-  if (!("deletions" in value) || typeof value.deletions !== "number") return false
-  if (!("status" in value) || value.status === undefined) return true
-  return value.status === "added" || value.status === "deleted" || value.status === "modified"
-}
-
-function object(value: unknown): value is Record<string, unknown> {
-  return !!value && typeof value === "object" && !Array.isArray(value)
-}
-
-export function diffs(value: unknown): Diff[] {
-  if (Array.isArray(value) && value.every(diff)) return value
-  if (Array.isArray(value)) return value.filter(diff)
-  if (diff(value)) return [value]
-  if (!object(value)) return []
-  return Object.values(value).filter(diff)
-}
-
-export function message(value: Message): Message {
-  if (value.role !== "user") return value
-
-  const raw = value.summary as unknown
-  if (raw === undefined) return value
-  if (!object(raw)) return { ...value, summary: undefined }
-
-  const title = typeof raw.title === "string" ? raw.title : undefined
-  const body = typeof raw.body === "string" ? raw.body : undefined
-  const next = diffs(raw.diffs)
-
-  if (title === raw.title && body === raw.body && next === raw.diffs) return value
-
-  return {
-    ...value,
-    summary: {
-      ...(title === undefined ? {} : { title }),
-      ...(body === undefined ? {} : { body }),
-      diffs: next,
-    },
-  }
-}

packages/console/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opencode-ai/console-app",
-  "version": "1.4.1",
+  "version": "1.3.17",
   "type": "module",
   "license": "MIT",
   "scripts": {

packages/console/core/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode-ai/console-core",
-  "version": "1.4.1",
+  "version": "1.3.17",
   "private": true,
   "type": "module",
   "license": "MIT",

packages/console/function/package.json

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

packages/console/mail/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opencode-ai/console-mail",
-  "version": "1.4.1",
+  "version": "1.3.17",
   "dependencies": {
     "@jsx-email/all": "2.2.3",
     "@jsx-email/cli": "1.4.3",

packages/desktop-electron/electron-builder.config.ts

@@ -34,6 +34,11 @@ const getBase = (): Configuration => ({
   },
   files: ["out/**/*", "resources/**/*"],
   extraResources: [
+    {
+      from: "resources/",
+      to: "",
+      filter: ["opencode-cli*"],
+    },
     {
       from: "native/",
       to: "native/",

packages/desktop-electron/electron.vite.config.ts

@@ -1,6 +1,5 @@
 import { defineConfig } from "electron-vite"
 import appPlugin from "@opencode-ai/app/vite"
-import * as fs from "node:fs/promises"
 
 const channel = (() => {
   const raw = process.env.OPENCODE_CHANNEL
@@ -8,10 +7,6 @@ const channel = (() => {
   return "dev"
 })()
 
-const OPENCODE_SERVER_DIST = "../opencode/dist/node"
-
-const nodePtyPkg = `@lydell/node-pty-${process.platform}-${process.arch}`
-
 export default defineConfig({
   main: {
     define: {
@@ -21,33 +16,7 @@ export default defineConfig({
       rollupOptions: {
         input: { index: "src/main/index.ts" },
       },
-      externalizeDeps: { include: [nodePtyPkg] },
     },
-    plugins: [
-      {
-        name: "opencode:node-pty-narrower",
-        enforce: "pre",
-        resolveId(s) {
-          if (s === "@lydell/node-pty") return nodePtyPkg
-        },
-      },
-      {
-        name: "opencode:virtual-server-module",
-        enforce: "pre",
-        resolveId(id) {
-          if (id === "virtual:opencode-server") return this.resolve(`${OPENCODE_SERVER_DIST}/node.js`)
-        },
-      },
-      {
-        name: "opencode:copy-server-assets",
-        async writeBundle() {
-          for (const l of await fs.readdir(OPENCODE_SERVER_DIST)) {
-            if (!l.endsWith(".wasm")) continue
-            await fs.writeFile(`./out/main/chunks/${l}`, await fs.readFile(`${OPENCODE_SERVER_DIST}/${l}`))
-          }
-        },
-      },
-    ],
   },
   preload: {
     build: {
@@ -64,6 +33,7 @@ export default defineConfig({
       rollupOptions: {
         input: {
           main: "src/renderer/index.html",
+          loading: "src/renderer/loading.html",
         },
       },
     },

packages/desktop-electron/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@opencode-ai/desktop-electron",
   "private": true,
-  "version": "1.4.1",
+  "version": "1.3.17",
   "type": "module",
   "license": "MIT",
   "homepage": "https://opencode.ai",
@@ -13,7 +13,7 @@
     "typecheck": "tsgo -b",
     "predev": "bun ./scripts/predev.ts",
     "dev": "electron-vite dev",
-    "prebuild": "bun ./scripts/prebuild.ts",
+    "prebuild": "bun ./scripts/copy-icons.ts",
     "build": "electron-vite build",
     "preview": "electron-vite preview",
     "package": "electron-builder --config electron-builder.config.ts",
@@ -24,42 +24,31 @@
   },
   "main": "./out/main/index.js",
   "dependencies": {
-    "effect": "catalog:",
-    "electron-context-menu": "4.1.2",
-    "electron-log": "^5",
-    "electron-store": "^10",
-    "electron-updater": "^6",
-    "electron-window-state": "^5.0.3",
-    "marked": "^15"
-  },
-  "devDependencies": {
-    "@actions/artifact": "4.0.0",
-    "@lydell/node-pty": "catalog:",
     "@opencode-ai/app": "workspace:*",
     "@opencode-ai/ui": "workspace:*",
     "@solid-primitives/i18n": "2.2.1",
     "@solid-primitives/storage": "catalog:",
     "@solidjs/meta": "catalog:",
     "@solidjs/router": "0.15.4",
+    "effect": "catalog:",
+    "electron-context-menu": "4.1.2",
+    "electron-log": "^5",
+    "electron-store": "^10",
+    "electron-updater": "^6",
+    "electron-window-state": "^5.0.3",
+    "marked": "^15",
+    "solid-js": "catalog:",
+    "tree-kill": "^1.2.2"
+  },
+  "devDependencies": {
+    "@actions/artifact": "4.0.0",
     "@types/bun": "catalog:",
     "@types/node": "catalog:",
     "@typescript/native-preview": "catalog:",
-    "@valibot/to-json-schema": "1.6.0",
     "electron": "40.4.1",
     "electron-builder": "^26",
     "electron-vite": "^5",
-    "solid-js": "catalog:",
-    "sury": "11.0.0-alpha.4",
     "typescript": "~5.6.2",
-    "vite": "catalog:",
-    "zod-openapi": "5.4.6"
-  },
-  "optionalDependencies": {
-    "@lydell/node-pty-darwin-arm64": "1.2.0-beta.10",
-    "@lydell/node-pty-darwin-x64": "1.2.0-beta.10",
-    "@lydell/node-pty-linux-arm64": "1.2.0-beta.10",
-    "@lydell/node-pty-linux-x64": "1.2.0-beta.10",
-    "@lydell/node-pty-win32-arm64": "1.2.0-beta.10",
-    "@lydell/node-pty-win32-x64": "1.2.0-beta.10"
+    "vite": "catalog:"
   }
 }

packages/desktop-electron/scripts/prebuild.ts

@@ -1,9 +0,0 @@
-#!/usr/bin/env bun
-import { $ } from "bun"
-
-import { resolveChannel } from "./utils"
-
-const channel = resolveChannel()
-await $`bun ./scripts/copy-icons.ts ${channel}`
-
-await $`cd ../opencode && bun script/build-node.ts`

packages/desktop-electron/scripts/predev.ts

@@ -1,5 +1,17 @@
 import { $ } from "bun"
 
+import { copyBinaryToSidecarFolder, getCurrentSidecar, windowsify } from "./utils"
+
 await $`bun ./scripts/copy-icons.ts ${process.env.OPENCODE_CHANNEL ?? "dev"}`
 
-await $`cd ../opencode && bun script/build-node.ts`
+const RUST_TARGET = Bun.env.RUST_TARGET
+
+const sidecarConfig = getCurrentSidecar(RUST_TARGET)
+
+const binaryPath = windowsify(`../opencode/dist/${sidecarConfig.ocBinary}/bin/opencode`)
+
+await (sidecarConfig.ocBinary.includes("-baseline")
+  ? $`cd ../opencode && bun run build --single --baseline`
+  : $`cd ../opencode && bun run build --single`)
+
+await copyBinaryToSidecarFolder(binaryPath, RUST_TARGET)

packages/desktop-electron/scripts/prepare.ts

@@ -1,9 +1,25 @@
 #!/usr/bin/env bun
-import { Script } from "@opencode-ai/script"
+import { $ } from "bun"
 
-await import("./prebuild")
+import { Script } from "@opencode-ai/script"
+import { copyBinaryToSidecarFolder, getCurrentSidecar, resolveChannel, windowsify } from "./utils"
+
+const channel = resolveChannel()
+await $`bun ./scripts/copy-icons.ts ${channel}`
 
 const pkg = await Bun.file("./package.json").json()
 pkg.version = Script.version
 await Bun.write("./package.json", JSON.stringify(pkg, null, 2) + "\n")
 console.log(`Updated package.json version to ${Script.version}`)
+
+const sidecarConfig = getCurrentSidecar()
+const artifact = process.env.OPENCODE_CLI_ARTIFACT ?? "opencode-cli"
+
+const dir = "resources/opencode-binaries"
+
+await $`mkdir -p ${dir}`
+await $`gh run download ${process.env.GITHUB_RUN_ID} -n ${artifact}`.cwd(dir)
+
+await copyBinaryToSidecarFolder(windowsify(`${dir}/${sidecarConfig.ocBinary}/bin/opencode`))
+
+await $`rm -rf ${dir}`

packages/desktop-electron/src/main/cli.ts

@@ -0,0 +1,283 @@
+import { execFileSync, spawn } from "node:child_process"
+import { EventEmitter } from "node:events"
+import { chmodSync, readFileSync, unlinkSync, writeFileSync } from "node:fs"
+import { tmpdir } from "node:os"
+import { dirname, join } from "node:path"
+import readline from "node:readline"
+import { fileURLToPath } from "node:url"
+import { app } from "electron"
+import treeKill from "tree-kill"
+
+import { WSL_ENABLED_KEY } from "./constants"
+import { getUserShell, loadShellEnv, mergeShellEnv } from "./shell-env"
+import { store } from "./store"
+
+const CLI_INSTALL_DIR = ".opencode/bin"
+const CLI_BINARY_NAME = "opencode"
+
+export type ServerConfig = {
+  hostname?: string
+  port?: number
+}
+
+export type Config = {
+  server?: ServerConfig
+}
+
+export type TerminatedPayload = { code: number | null; signal: number | null }
+
+export type CommandEvent =
+  | { type: "stdout"; value: string }
+  | { type: "stderr"; value: string }
+  | { type: "error"; value: string }
+  | { type: "terminated"; value: TerminatedPayload }
+  | { type: "sqlite"; value: SqliteMigrationProgress }
+
+export type SqliteMigrationProgress = { type: "InProgress"; value: number } | { type: "Done" }
+
+export type CommandChild = {
+  pid: number | undefined
+  kill: () => void
+}
+
+const root = dirname(fileURLToPath(import.meta.url))
+
+export function getSidecarPath() {
+  const suffix = process.platform === "win32" ? ".exe" : ""
+  const path = app.isPackaged
+    ? join(process.resourcesPath, `opencode-cli${suffix}`)
+    : join(root, "../../resources", `opencode-cli${suffix}`)
+  console.log(`[cli] Sidecar path resolved: ${path} (isPackaged: ${app.isPackaged})`)
+  return path
+}
+
+export async function getConfig(): Promise<Config | null> {
+  const { events } = spawnCommand("debug config", {})
+  let output = ""
+
+  await new Promise<void>((resolve) => {
+    events.on("stdout", (line: string) => {
+      output += line
+    })
+    events.on("stderr", (line: string) => {
+      output += line
+    })
+    events.on("terminated", () => resolve())
+    events.on("error", () => resolve())
+  })
+
+  try {
+    return JSON.parse(output) as Config
+  } catch {
+    return null
+  }
+}
+
+export async function installCli(): Promise<string> {
+  if (process.platform === "win32") {
+    throw new Error("CLI installation is only supported on macOS & Linux")
+  }
+
+  const sidecar = getSidecarPath()
+  const scriptPath = join(app.getAppPath(), "install")
+  const script = readFileSync(scriptPath, "utf8")
+  const tempScript = join(tmpdir(), "opencode-install.sh")
+
+  writeFileSync(tempScript, script, "utf8")
+  chmodSync(tempScript, 0o755)
+
+  const cmd = spawn(tempScript, ["--binary", sidecar], { stdio: "pipe" })
+  return await new Promise<string>((resolve, reject) => {
+    cmd.on("exit", (code: number | null) => {
+      try {
+        unlinkSync(tempScript)
+      } catch {}
+      if (code === 0) {
+        const installPath = getCliInstallPath()
+        if (installPath) return resolve(installPath)
+        return reject(new Error("Could not determine install path"))
+      }
+      reject(new Error("Install script failed"))
+    })
+  })
+}
+
+export function syncCli() {
+  if (!app.isPackaged) return
+  const installPath = getCliInstallPath()
+  if (!installPath) return
+
+  let version = ""
+  try {
+    version = execFileSync(installPath, ["--version"], { windowsHide: true }).toString().trim()
+  } catch {
+    return
+  }
+
+  const cli = parseVersion(version)
+  const appVersion = parseVersion(app.getVersion())
+  if (!cli || !appVersion) return
+  if (compareVersions(cli, appVersion) >= 0) return
+  void installCli().catch(() => undefined)
+}
+
+export function serve(hostname: string, port: number, password: string) {
+  const args = `--print-logs --log-level WARN serve --hostname ${hostname} --port ${port}`
+  const env = {
+    OPENCODE_SERVER_USERNAME: "opencode",
+    OPENCODE_SERVER_PASSWORD: password,
+  }
+
+  return spawnCommand(args, env)
+}
+
+export function spawnCommand(args: string, extraEnv: Record<string, string>) {
+  console.log(`[cli] Spawning command with args: ${args}`)
+  const base = Object.fromEntries(
+    Object.entries(process.env).filter((entry): entry is [string, string] => typeof entry[1] === "string"),
+  )
+  const env = {
+    ...base,
+    OPENCODE_EXPERIMENTAL_ICON_DISCOVERY: "true",
+    OPENCODE_EXPERIMENTAL_FILEWATCHER: "true",
+    OPENCODE_CLIENT: "desktop",
+    XDG_STATE_HOME: app.getPath("userData"),
+    ...extraEnv,
+  }
+  const shell = process.platform === "win32" ? null : getUserShell()
+  const envs = shell ? mergeShellEnv(loadShellEnv(shell), env) : env
+
+  const { cmd, cmdArgs } = buildCommand(args, envs, shell)
+  console.log(`[cli] Executing: ${cmd} ${cmdArgs.join(" ")}`)
+  const child = spawn(cmd, cmdArgs, {
+    env: envs,
+    detached: process.platform !== "win32",
+    windowsHide: true,
+    stdio: ["ignore", "pipe", "pipe"],
+  })
+  console.log(`[cli] Spawned process with PID: ${child.pid}`)
+
+  const events = new EventEmitter()
+  const exit = new Promise<TerminatedPayload>((resolve) => {
+    child.on("exit", (code: number | null, signal: NodeJS.Signals | null) => {
+      console.log(`[cli] Process exited with code: ${code}, signal: ${signal}`)
+      resolve({ code: code ?? null, signal: null })
+    })
+    child.on("error", (error: Error) => {
+      console.error(`[cli] Process error: ${error.message}`)
+      events.emit("error", error.message)
+    })
+  })
+
+  const stdout = child.stdout
+  const stderr = child.stderr
+
+  if (stdout) {
+    readline.createInterface({ input: stdout }).on("line", (line: string) => {
+      if (handleSqliteProgress(events, line)) return
+      events.emit("stdout", `${line}\n`)
+    })
+  }
+
+  if (stderr) {
+    readline.createInterface({ input: stderr }).on("line", (line: string) => {
+      if (handleSqliteProgress(events, line)) return
+      events.emit("stderr", `${line}\n`)
+    })
+  }
+
+  exit.then((payload) => {
+    events.emit("terminated", payload)
+  })
+
+  const kill = () => {
+    if (!child.pid) return
+    treeKill(child.pid)
+  }
+
+  return { events, child: { pid: child.pid, kill }, exit }
+}
+
+function handleSqliteProgress(events: EventEmitter, line: string) {
+  const stripped = line.startsWith("sqlite-migration:") ? line.slice("sqlite-migration:".length).trim() : null
+  if (!stripped) return false
+  if (stripped === "done") {
+    events.emit("sqlite", { type: "Done" })
+    return true
+  }
+  const value = Number.parseInt(stripped, 10)
+  if (!Number.isNaN(value)) {
+    events.emit("sqlite", { type: "InProgress", value })
+    return true
+  }
+  return false
+}
+
+function buildCommand(args: string, env: Record<string, string>, shell: string | null) {
+  if (process.platform === "win32" && isWslEnabled()) {
+    console.log(`[cli] Using WSL mode`)
+    const version = app.getVersion()
+    const script = [
+      "set -e",
+      'BIN="$HOME/.opencode/bin/opencode"',
+      'if [ ! -x "$BIN" ]; then',
+      `  curl -fsSL https://opencode.ai/install | bash -s -- --version ${shellEscape(version)} --no-modify-path`,
+      "fi",
+      `${envPrefix(env)} exec "$BIN" ${args}`,
+    ].join("\n")
+
+    return { cmd: "wsl", cmdArgs: ["-e", "bash", "-lc", script] }
+  }
+
+  if (process.platform === "win32") {
+    const sidecar = getSidecarPath()
+    console.log(`[cli] Windows direct mode, sidecar: ${sidecar}`)
+    return { cmd: sidecar, cmdArgs: args.split(" ") }
+  }
+
+  const sidecar = getSidecarPath()
+  const user = shell || getUserShell()
+  const line = user.endsWith("/nu") ? `^\"${sidecar}\" ${args}` : `\"${sidecar}\" ${args}`
+  console.log(`[cli] Unix mode, shell: ${user}, command: ${line}`)
+  return { cmd: user, cmdArgs: ["-l", "-c", line] }
+}
+
+function envPrefix(env: Record<string, string>) {
+  const entries = Object.entries(env).map(([key, value]) => `${key}=${shellEscape(value)}`)
+  return entries.join(" ")
+}
+
+function shellEscape(input: string) {
+  if (!input) return "''"
+  return `'${input.replace(/'/g, `'"'"'`)}'`
+}
+
+function getCliInstallPath() {
+  const home = process.env.HOME
+  if (!home) return null
+  return join(home, CLI_INSTALL_DIR, CLI_BINARY_NAME)
+}
+
+function isWslEnabled() {
+  return store.get(WSL_ENABLED_KEY) === true
+}
+
+function parseVersion(value: string) {
+  const parts = value
+    .replace(/^v/, "")
+    .split(".")
+    .map((part) => Number.parseInt(part, 10))
+  if (parts.some((part) => Number.isNaN(part))) return null
+  return parts
+}
+
+function compareVersions(a: number[], b: number[]) {
+  const len = Math.max(a.length, b.length)
+  for (let i = 0; i < len; i += 1) {
+    const left = a[i] ?? 0
+    const right = b[i] ?? 0
+    if (left > right) return 1
+    if (left < right) return -1
+  }
+  return 0
+}

packages/desktop-electron/src/main/env.d.ts

@@ -5,25 +5,3 @@ interface ImportMetaEnv {
 interface ImportMeta {
   readonly env: ImportMetaEnv
 }
-declare module "virtual:opencode-server" {
-  export namespace Server {
-    export const listen: typeof import("../../../opencode/dist/types/src/node").Server.listen
-    export type Listener = import("../../../opencode/dist/types/src/node").Server.Listener
-  }
-  export namespace Config {
-    export const get: typeof import("../../../opencode/dist/types/src/node").Config.get
-    export type Info = import("../../../opencode/dist/types/src/node").Config.Info
-  }
-  export namespace Log {
-    export const init: typeof import("../../../opencode/dist/types/src/node").Log.init
-  }
-  export namespace Database {
-    export const Path: typeof import("../../../opencode/dist/types/src/node").Database.Path
-    export const Client: typeof import("../../../opencode/dist/types/src/node").Database.Client
-  }
-  export namespace JsonMigration {
-    export type Progress = import("../../../opencode/dist/types/src/node").JsonMigration.Progress
-    export const run: typeof import("../../../opencode/dist/types/src/node").JsonMigration.run
-  }
-  export const bootstrap: typeof import("../../../opencode/dist/types/src/node").bootstrap
-}

packages/desktop-electron/src/main/index.ts

@@ -11,8 +11,6 @@ import pkg from "electron-updater"
 import contextMenu from "electron-context-menu"
 contextMenu({ showSaveImageAs: true, showLookUpSelection: false, showSearchWithGoogle: false })
 
-process.env.OPENCODE_DISABLE_EMBEDDED_WEB_UI = "true"
-
 const APP_NAMES: Record<string, string> = {
   dev: "OpenCode Dev",
   beta: "OpenCode Beta",
@@ -29,6 +27,8 @@ const { autoUpdater } = pkg
 
 import type { InitStep, ServerReadyData, SqliteMigrationProgress, WslConfig } from "../preload/types"
 import { checkAppExists, resolveAppPath, wslPath } from "./apps"
+import type { CommandChild } from "./cli"
+import { installCli, syncCli } from "./cli"
 import { CHANNEL, UPDATER_ENABLED } from "./constants"
 import { registerIpcHandlers, sendDeepLinks, sendMenuCommand, sendSqliteMigrationProgress } from "./ipc"
 import { initLogging } from "./logging"
@@ -36,17 +36,13 @@ import { parseMarkdown } from "./markdown"
 import { createMenu } from "./menu"
 import { getDefaultServerUrl, getWslConfig, setDefaultServerUrl, setWslConfig, spawnLocalServer } from "./server"
 import { createLoadingWindow, createMainWindow, setBackgroundColor, setDockIcon } from "./windows"
-import type { Server } from "virtual:opencode-server"
 
 const initEmitter = new EventEmitter()
 let initStep: InitStep = { phase: "server_waiting" }
 
 let mainWindow: BrowserWindow | null = null
-let server: Server.Listener | null = null
-let splash: BrowserWindow | null = null
-let ready = false
+let sidecar: CommandChild | null = null
 const loadingComplete = defer<void>()
-const mainReady = defer<void>()
 
 const pendingDeepLinks: string[] = []
 
@@ -100,9 +96,11 @@ function setupApp() {
   }
 
   void app.whenReady().then(async () => {
+    // migrate()
     app.setAsDefaultProtocolClient("opencode")
     setDockIcon()
     setupAutoUpdater()
+    syncCli()
     await initialize()
   })
 }
@@ -114,11 +112,6 @@ function emitDeepLinks(urls: string[]) {
 }
 
 function focusMainWindow() {
-  if (!ready) {
-    splash?.show()
-    splash?.focus()
-    return
-  }
   if (!mainWindow) return
   mainWindow.show()
   mainWindow.focus()
@@ -128,14 +121,12 @@ function setInitStep(step: InitStep) {
   initStep = step
   logger.log("init step", { step })
   initEmitter.emit("step", step)
-  BrowserWindow.getAllWindows().forEach((win) => {
-    win.webContents.send("init-step", step)
-  })
 }
 
 async function initialize() {
   const needsMigration = !sqliteFileExists()
   const sqliteDone = needsMigration ? defer<void>() : undefined
+  let overlay: BrowserWindow | null = null
 
   const port = await getSidecarPort()
   const hostname = "127.0.0.1"
@@ -143,8 +134,8 @@ async function initialize() {
   const password = randomUUID()
 
   logger.log("spawning sidecar", { url })
-  const { listener, health } = await spawnLocalServer(hostname, port, password)
-  server = listener
+  const { child, health, events } = spawnLocalServer(hostname, port, password)
+  sidecar = child
   serverReady.resolve({
     url,
     username: "opencode",
@@ -154,9 +145,9 @@ async function initialize() {
   const loadingTask = (async () => {
     logger.log("sidecar connection started", { url })
 
-    initEmitter.on("sqlite", (progress: SqliteMigrationProgress) => {
+    events.on("sqlite", (progress: SqliteMigrationProgress) => {
       setInitStep({ phase: "sqlite_waiting" })
-      if (splash) sendSqliteMigrationProgress(splash, progress)
+      if (overlay) sendSqliteMigrationProgress(overlay, progress)
       if (mainWindow) sendSqliteMigrationProgress(mainWindow, progress)
       if (progress.type === "Done") sqliteDone?.resolve()
     })
@@ -182,37 +173,34 @@ async function initialize() {
     deepLinks: pendingDeepLinks,
   }
 
-  const startup = (async () => {
-    await loadingTask
-    setInitStep({ phase: "app_waiting" })
-    mainWindow = createMainWindow(globals, { show: false })
-
-    const ok = await Promise.race([mainReady.promise.then(() => true), delay(15_000).then(() => false)])
-    if (!ok) logger.warn("main window ready timed out")
-  })()
-
-  splash = createLoadingWindow(globals)
-
-  await startup
-  setInitStep({ phase: "done" })
-
-  if (splash) {
-    const ok = await Promise.race([loadingComplete.promise.then(() => true), delay(2_000).then(() => false)])
-    if (!ok) logger.warn("loading window complete timed out")
-    splash.close()
-    splash = null
+  if (needsMigration) {
+    const show = await Promise.race([loadingTask.then(() => false), delay(1_000).then(() => true)])
+    if (show) {
+      overlay = createLoadingWindow(globals)
+      await delay(1_000)
+    }
   }
 
+  await loadingTask
+  setInitStep({ phase: "done" })
+
+  if (overlay) {
+    await loadingComplete.promise
+  }
+
+  mainWindow = createMainWindow(globals)
   wireMenu()
-  ready = true
-  mainWindow?.show()
-  mainWindow?.focus()
+
+  overlay?.close()
 }
 
 function wireMenu() {
   if (!mainWindow) return
   createMenu({
     trigger: (id) => mainWindow && sendMenuCommand(mainWindow, id),
+    installCli: () => {
+      void installCli()
+    },
     checkForUpdates: () => {
       void checkForUpdates(true)
     },
@@ -227,6 +215,7 @@ function wireMenu() {
 
 registerIpcHandlers({
   killSidecar: () => killSidecar(),
+  installCli: async () => installCli(),
   awaitInitialization: async (sendStep) => {
     sendStep(initStep)
     const listener = (step: InitStep) => sendStep(step)
@@ -251,7 +240,6 @@ registerIpcHandlers({
   wslPath: async (path, mode) => wslPath(path, mode),
   resolveAppPath: async (appName) => resolveAppPath(appName),
   loadingWindowComplete: () => loadingComplete.resolve(),
-  mainWindowReady: () => mainReady.resolve(),
   runUpdater: async (alertOnFail) => checkForUpdates(alertOnFail),
   checkUpdate: async () => checkUpdate(),
   installUpdate: async () => installUpdate(),
@@ -259,9 +247,16 @@ registerIpcHandlers({
 })
 
 function killSidecar() {
-  if (!server) return
-  server.stop()
-  server = null
+  if (!sidecar) return
+  const pid = sidecar.pid
+  sidecar.kill()
+  sidecar = null
+  // tree-kill is async; also send process group signal as immediate fallback
+  if (pid && process.platform !== "win32") {
+    try {
+      process.kill(-pid, "SIGTERM")
+    } catch {}
+  }
 }
 
 function ensureLoopbackNoProxy() {

packages/desktop-electron/src/main/ipc.ts

@@ -13,6 +13,7 @@ const pickerFilters = (ext?: string[]) => {
 
 type Deps = {
   killSidecar: () => void
+  installCli: () => Promise<string>
   awaitInitialization: (sendStep: (step: InitStep) => void) => Promise<ServerReadyData>
   getDefaultServerUrl: () => Promise<string | null> | string | null
   setDefaultServerUrl: (url: string | null) => Promise<void> | void
@@ -25,7 +26,6 @@ type Deps = {
   wslPath: (path: string, mode: "windows" | "linux" | null) => Promise<string>
   resolveAppPath: (appName: string) => Promise<string | null>
   loadingWindowComplete: () => void
-  mainWindowReady: () => void
   runUpdater: (alertOnFail: boolean) => Promise<void> | void
   checkUpdate: () => Promise<{ updateAvailable: boolean; version?: string }>
   installUpdate: () => Promise<void> | void
@@ -34,6 +34,7 @@ type Deps = {
 
 export function registerIpcHandlers(deps: Deps) {
   ipcMain.handle("kill-sidecar", () => deps.killSidecar())
+  ipcMain.handle("install-cli", () => deps.installCli())
   ipcMain.handle("await-initialization", (event: IpcMainInvokeEvent) => {
     const send = (step: InitStep) => event.sender.send("init-step", step)
     return deps.awaitInitialization(send)
@@ -55,7 +56,6 @@ export function registerIpcHandlers(deps: Deps) {
   )
   ipcMain.handle("resolve-app-path", (_event: IpcMainInvokeEvent, appName: string) => deps.resolveAppPath(appName))
   ipcMain.on("loading-window-complete", () => deps.loadingWindowComplete())
-  ipcMain.on("main-window-ready", () => deps.mainWindowReady())
   ipcMain.handle("run-updater", (_event: IpcMainInvokeEvent, alertOnFail: boolean) => deps.runUpdater(alertOnFail))
   ipcMain.handle("check-update", () => deps.checkUpdate())
   ipcMain.handle("install-update", () => deps.installUpdate())

packages/desktop-electron/src/main/menu.ts

@@ -5,6 +5,7 @@ import { createMainWindow } from "./windows"
 
 type Deps = {
   trigger: (id: string) => void
+  installCli: () => void
   checkForUpdates: () => void
   reload: () => void
   relaunch: () => void
@@ -23,6 +24,10 @@ export function createMenu(deps: Deps) {
           enabled: UPDATER_ENABLED,
           click: () => deps.checkForUpdates(),
         },
+        {
+          label: "Install CLI...",
+          click: () => deps.installCli(),
+        },
         {
           label: "Reload Webview",
           click: () => deps.reload(),

packages/desktop-electron/src/main/server.ts

@@ -1,6 +1,5 @@
-import { app } from "electron"
+import { serve, type CommandChild } from "./cli"
 import { DEFAULT_SERVER_URL_KEY, WSL_ENABLED_KEY } from "./constants"
-import { getUserShell, loadShellEnv } from "./shell-env"
 import { store } from "./store"
 
 export type WslConfig = { enabled: boolean }
@@ -30,16 +29,8 @@ export function setWslConfig(config: WslConfig) {
   store.set(WSL_ENABLED_KEY, config.enabled)
 }
 
-export async function spawnLocalServer(hostname: string, port: number, password: string) {
-  prepareServerEnv(password)
-  const { Log, Server } = await import("virtual:opencode-server")
-  await Log.init({ level: "WARN" })
-  const listener = await Server.listen({
-    port,
-    hostname,
-    username: "opencode",
-    password,
-  })
+export function spawnLocalServer(hostname: string, port: number, password: string) {
+  const { child, exit, events } = serve(hostname, port, password)
 
   const wait = (async () => {
     const url = `http://${hostname}:${port}`
@@ -51,26 +42,19 @@ export async function spawnLocalServer(hostname: string, port: number, password:
       }
     }
 
-    await ready()
+    const terminated = async () => {
+      const payload = await exit
+      throw new Error(
+        `Sidecar terminated before becoming healthy (code=${payload.code ?? "unknown"} signal=${
+          payload.signal ?? "unknown"
+        })`,
+      )
+    }
+
+    await Promise.race([ready(), terminated()])
   })()
 
-  return { listener, health: { wait } }
-}
-
-function prepareServerEnv(password: string) {
-  const shell = process.platform === "win32" ? null : getUserShell()
-  const shellEnv = shell ? (loadShellEnv(shell) ?? {}) : {}
-  const env = {
-    ...process.env,
-    ...shellEnv,
-    OPENCODE_EXPERIMENTAL_ICON_DISCOVERY: "true",
-    OPENCODE_EXPERIMENTAL_FILEWATCHER: "true",
-    OPENCODE_CLIENT: "desktop",
-    OPENCODE_SERVER_USERNAME: "opencode",
-    OPENCODE_SERVER_PASSWORD: password,
-    XDG_STATE_HOME: app.getPath("userData"),
-  }
-  Object.assign(process.env, env)
+  return { child, health: { wait }, events }
 }
 
 export async function checkHealth(url: string, password?: string | null): Promise<boolean> {
@@ -98,3 +82,5 @@ export async function checkHealth(url: string, password?: string | null): Promis
     return false
   }
 }
+
+export type { CommandChild }

packages/desktop-electron/src/main/shell-env.ts

@@ -1,7 +1,7 @@
 import { spawnSync } from "node:child_process"
 import { basename } from "node:path"
 
-const TIMEOUT = 5_000
+const SHELL_ENV_TIMEOUT = 5_000
 
 type Probe = { type: "Loaded"; value: Record<string, string> } | { type: "Timeout" } | { type: "Unavailable" }
 
@@ -20,28 +20,28 @@ export function parseShellEnv(out: Buffer) {
   return env
 }
 
-function probe(shell: string, mode: "-il" | "-l"): Probe {
+function probeShellEnv(shell: string, mode: "-il" | "-l"): Probe {
   const out = spawnSync(shell, [mode, "-c", "env -0"], {
     stdio: ["ignore", "pipe", "ignore"],
-    timeout: TIMEOUT,
+    timeout: SHELL_ENV_TIMEOUT,
     windowsHide: true,
   })
 
   const err = out.error as NodeJS.ErrnoException | undefined
   if (err) {
     if (err.code === "ETIMEDOUT") return { type: "Timeout" }
-    console.log(`[server] Shell env probe failed for ${shell} ${mode}: ${err.message}`)
+    console.log(`[cli] Shell env probe failed for ${shell} ${mode}: ${err.message}`)
     return { type: "Unavailable" }
   }
 
   if (out.status !== 0) {
-    console.log(`[server] Shell env probe exited with non-zero status for ${shell} ${mode}`)
+    console.log(`[cli] Shell env probe exited with non-zero status for ${shell} ${mode}`)
     return { type: "Unavailable" }
   }
 
   const env = parseShellEnv(out.stdout)
   if (Object.keys(env).length === 0) {
-    console.log(`[server] Shell env probe returned empty env for ${shell} ${mode}`)
+    console.log(`[cli] Shell env probe returned empty env for ${shell} ${mode}`)
     return { type: "Unavailable" }
   }
 
@@ -56,27 +56,27 @@ export function isNushell(shell: string) {
 
 export function loadShellEnv(shell: string) {
   if (isNushell(shell)) {
-    console.log(`[server] Skipping shell env probe for nushell: ${shell}`)
+    console.log(`[cli] Skipping shell env probe for nushell: ${shell}`)
     return null
   }
 
-  const interactive = probe(shell, "-il")
+  const interactive = probeShellEnv(shell, "-il")
   if (interactive.type === "Loaded") {
-    console.log(`[server] Loaded shell environment with -il (${Object.keys(interactive.value).length} vars)`)
+    console.log(`[cli] Loaded shell environment with -il (${Object.keys(interactive.value).length} vars)`)
     return interactive.value
   }
   if (interactive.type === "Timeout") {
-    console.warn(`[server] Interactive shell env probe timed out: ${shell}`)
+    console.warn(`[cli] Interactive shell env probe timed out: ${shell}`)
     return null
   }
 
-  const login = probe(shell, "-l")
+  const login = probeShellEnv(shell, "-l")
   if (login.type === "Loaded") {
-    console.log(`[server] Loaded shell environment with -l (${Object.keys(login.value).length} vars)`)
+    console.log(`[cli] Loaded shell environment with -l (${Object.keys(login.value).length} vars)`)
     return login.value
   }
 
-  console.warn(`[server] Falling back to app environment: ${shell}`)
+  console.warn(`[cli] Falling back to app environment: ${shell}`)
   return null
 }
 

packages/desktop-electron/src/main/windows.ts

@@ -21,10 +21,6 @@ export function getBackgroundColor(): string | undefined {
   return backgroundColor
 }
 
-function back(mode = tone()) {
-  return backgroundColor ?? (mode === "dark" ? "#101010" : "#f8f8f8")
-}
-
 function iconsDir() {
   return app.isPackaged ? join(process.resourcesPath, "icons") : join(root, "../../resources/icons")
 }
@@ -58,7 +54,7 @@ export function setDockIcon() {
   if (!icon.isEmpty()) app.dock?.setIcon(icon)
 }
 
-export function createMainWindow(globals: Globals, opts: { show?: boolean } = {}) {
+export function createMainWindow(globals: Globals) {
   const state = windowState({
     defaultWidth: 1280,
     defaultHeight: 800,
@@ -70,10 +66,10 @@ export function createMainWindow(globals: Globals, opts: { show?: boolean } = {}
     y: state.y,
     width: state.width,
     height: state.height,
-    show: opts.show ?? true,
+    show: true,
     title: "OpenCode",
     icon: iconPath(),
-    backgroundColor: back(mode),
+    backgroundColor,
     ...(process.platform === "darwin"
       ? {
           titleBarStyle: "hidden" as const,
@@ -108,235 +104,29 @@ export function createLoadingWindow(globals: Globals) {
     height: 480,
     resizable: false,
     center: true,
-    show: false,
-    frame: false,
+    show: true,
     icon: iconPath(),
-    backgroundColor: back(mode),
+    backgroundColor,
+    ...(process.platform === "darwin" ? { titleBarStyle: "hidden" as const } : {}),
+    ...(process.platform === "win32"
+      ? {
+          frame: false,
+          titleBarStyle: "hidden" as const,
+          titleBarOverlay: overlay({ mode }),
+        }
+      : {}),
     webPreferences: {
       preload: join(root, "../preload/index.mjs"),
       sandbox: false,
     },
   })
 
-  win.once("ready-to-show", () => {
-    if (!win.isDestroyed()) win.show()
-  })
-
-  loadSplash(win, mode)
+  loadWindow(win, "loading.html")
   injectGlobals(win, globals)
 
   return win
 }
 
-function loadSplash(win: BrowserWindow, mode: "dark" | "light") {
-  void win.loadURL(`data:text/html;charset=UTF-8,${encodeURIComponent(page(mode))}`)
-}
-
-function page(mode: "dark" | "light") {
-  const dark = mode === "dark"
-  const bg = back(mode)
-  const base = dark ? "#7e7e7e" : "#8f8f8f"
-  const weak = dark ? "#343434" : "#dbdbdb"
-  const strong = dark ? "#ededed" : "#171717"
-  const track = dark ? "rgba(255,255,255,0.078)" : "rgba(0,0,0,0.051)"
-  const warn = dark ? "#fbb73c" : "#ebb76e"
-  const pulse = mark(base, strong)
-  const splash = mark(weak, strong)
-
-  return `<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <title>OpenCode</title>
-    <style>
-      :root {
-        color-scheme: ${mode};
-      }
-
-      html,
-      body {
-        width: 100%;
-        height: 100%;
-        margin: 0;
-        overflow: hidden;
-        background: ${bg};
-      }
-
-      body {
-        font-family: Inter, ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif;
-      }
-
-      #root {
-        display: flex;
-        width: 100%;
-        height: 100%;
-        align-items: center;
-        justify-content: center;
-      }
-
-      #pulse,
-      #migrate {
-        display: flex;
-        align-items: center;
-        justify-content: center;
-      }
-
-      #pulse[hidden],
-      #migrate[hidden] {
-        display: none;
-      }
-
-      #pulse svg {
-        width: 64px;
-        height: 80px;
-        opacity: 0.5;
-        animation: pulse 1.6s ease-in-out infinite;
-        transform-origin: center;
-      }
-
-      #migrate {
-        flex-direction: column;
-        gap: 44px;
-      }
-
-      #migrate svg {
-        width: 80px;
-        height: 100px;
-        opacity: 0.15;
-      }
-
-      #copy {
-        display: flex;
-        width: 240px;
-        flex-direction: column;
-        align-items: center;
-        gap: 16px;
-      }
-
-      #status {
-        width: 100%;
-        overflow: hidden;
-        color: ${strong};
-        text-align: center;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-        font-size: 14px;
-        line-height: 20px;
-      }
-
-      #bar {
-        width: 80px;
-        height: 4px;
-        overflow: hidden;
-        background: ${track};
-      }
-
-      #fill {
-        width: 25%;
-        height: 100%;
-        background: ${warn};
-      }
-
-      @keyframes pulse {
-        0%,
-        100% {
-          opacity: 0.5;
-        }
-
-        50% {
-          opacity: 0.15;
-        }
-      }
-    </style>
-  </head>
-  <body>
-    <div id="root">
-      <div id="pulse">${pulse}</div>
-      <div id="migrate" hidden>
-        ${splash}
-        <div id="copy" aria-live="polite">
-          <span id="status">Just a moment...</span>
-          <div id="bar"><div id="fill"></div></div>
-        </div>
-      </div>
-    </div>
-    <script>
-      ;(() => {
-        const lines = ["Just a moment...", "Migrating your database", "This may take a couple of minutes"]
-        const pulse = document.getElementById("pulse")
-        const migrate = document.getElementById("migrate")
-        const status = document.getElementById("status")
-        const fill = document.getElementById("fill")
-        let step = { phase: "server_waiting" }
-        let line = 0
-        let seen = false
-        let value = 0
-        let done = false
-
-        function render() {
-          const sql = step.phase === "sqlite_waiting" || (seen && step.phase === "done")
-          pulse.hidden = sql
-          migrate.hidden = !sql
-          if (!sql) return
-          status.textContent = step.phase === "done" ? "All done" : lines[line]
-          fill.style.width = String(step.phase === "done" ? 100 : Math.max(25, Math.min(100, value))) + "%"
-        }
-
-        function finish() {
-          if (done) return
-          done = true
-          window.api?.loadingWindowComplete?.()
-        }
-
-        function set(step_) {
-          step = step_ || step
-          render()
-          if (step.phase === "done") finish()
-        }
-
-        const timers = [3000, 9000].map((ms, i) =>
-          setTimeout(() => {
-            line = i + 1
-            render()
-          }, ms),
-        )
-
-        const off = window.api?.onInitStep?.((step_) => set(step_)) ?? (() => {})
-        const progress =
-          window.api?.onSqliteMigrationProgress?.((next) => {
-            seen = true
-            if (next.type === "InProgress") {
-              value = Math.max(0, Math.min(100, next.value))
-              step = { phase: "sqlite_waiting" }
-              render()
-              return
-            }
-            value = 100
-            step = { phase: "done" }
-            render()
-            finish()
-          }) ?? (() => {})
-
-        window.api?.awaitInitialization?.((step_) => set(step_))?.catch(() => undefined)
-
-        addEventListener("beforeunload", () => {
-          off()
-          progress()
-          timers.forEach(clearTimeout)
-        })
-
-        render()
-      })()
-    </script>
-  </body>
-</html>`
-}
-
-function mark(base: string, strong: string) {
-  return `<svg viewBox="0 0 80 100" fill="none" xmlns="http://www.w3.org/2000/svg" aria-hidden="true"><path d="M60 80H20V40H60V80Z" fill="${base}" /><path d="M60 20H20V80H60V20ZM80 100H0V0H80V100Z" fill="${strong}" /></svg>`
-}
-
 function loadWindow(win: BrowserWindow, html: string) {
   const devUrl = process.env.ELECTRON_RENDERER_URL
   if (devUrl) {

packages/desktop-electron/src/preload/index.ts

@@ -11,11 +11,6 @@ const api: ElectronAPI = {
       ipcRenderer.removeListener("init-step", handler)
     })
   },
-  onInitStep: (cb) => {
-    const handler = (_: unknown, step: InitStep) => cb(step)
-    ipcRenderer.on("init-step", handler)
-    return () => ipcRenderer.removeListener("init-step", handler)
-  },
   getDefaultServerUrl: () => ipcRenderer.invoke("get-default-server-url"),
   setDefaultServerUrl: (url) => ipcRenderer.invoke("set-default-server-url", url),
   getWslConfig: () => ipcRenderer.invoke("get-wsl-config"),
@@ -65,7 +60,6 @@ const api: ElectronAPI = {
   setZoomFactor: (factor) => ipcRenderer.invoke("set-zoom-factor", factor),
   setTitlebar: (theme) => ipcRenderer.invoke("set-titlebar", theme),
   loadingWindowComplete: () => ipcRenderer.send("loading-window-complete"),
-  mainWindowReady: () => ipcRenderer.send("main-window-ready"),
   runUpdater: (alertOnFail) => ipcRenderer.invoke("run-updater", alertOnFail),
   checkUpdate: () => ipcRenderer.invoke("check-update"),
   installUpdate: () => ipcRenderer.invoke("install-update"),

packages/desktop-electron/src/preload/types.ts

@@ -1,8 +1,4 @@
-export type InitStep =
-  | { phase: "server_waiting" }
-  | { phase: "sqlite_waiting" }
-  | { phase: "app_waiting" }
-  | { phase: "done" }
+export type InitStep = { phase: "server_waiting" } | { phase: "sqlite_waiting" } | { phase: "done" }
 
 export type ServerReadyData = {
   url: string
@@ -23,7 +19,6 @@ export type ElectronAPI = {
   killSidecar: () => Promise<void>
   installCli: () => Promise<string>
   awaitInitialization: (onStep: (step: InitStep) => void) => Promise<ServerReadyData>
-  onInitStep: (cb: (step: InitStep) => void) => () => void
   getDefaultServerUrl: () => Promise<string | null>
   setDefaultServerUrl: (url: string | null) => Promise<void>
   getWslConfig: () => Promise<WslConfig>
@@ -71,7 +66,6 @@ export type ElectronAPI = {
   setZoomFactor: (factor: number) => Promise<void>
   setTitlebar: (theme: TitlebarTheme) => Promise<void>
   loadingWindowComplete: () => void
-  mainWindowReady: () => void
   runUpdater: (alertOnFail: boolean) => Promise<void>
   checkUpdate: () => Promise<{ updateAvailable: boolean; version?: string }>
   installUpdate: () => Promise<void>

packages/desktop-electron/src/renderer/html.test.ts

@@ -16,7 +16,7 @@ const html = async (name: string) => Bun.file(join(dir, name)).text()
  * All local resource references must use relative paths (`./`).
  */
 describe("electron renderer html", () => {
-  for (const name of ["index.html"]) {
+  for (const name of ["index.html", "loading.html"]) {
     describe(name, () => {
       test("script src attributes use relative paths", async () => {
         const content = await html(name)

packages/desktop-electron/src/renderer/index.tsx

@@ -332,7 +332,6 @@ render(() => {
                 defaultServer={defaultServer.latest ?? ServerConnection.Key.make("sidecar")}
                 servers={servers()}
                 router={MemoryRouter}
-                onReady={() => window.api.mainWindowReady()}
               >
                 <Inner />
               </AppInterface>

packages/desktop-electron/src/renderer/loading.html

@@ -0,0 +1,22 @@
+<!doctype html>
+<html lang="en" style="background-color: var(--background-base)">
+  <head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <title>OpenCode</title>
+    <link rel="icon" type="image/png" href="./favicon-96x96-v3.png" sizes="96x96" />
+    <link rel="icon" type="image/svg+xml" href="./favicon-v3.svg" />
+    <link rel="shortcut icon" href="./favicon-v3.ico" />
+    <link rel="apple-touch-icon" sizes="180x180" href="./apple-touch-icon-v3.png" />
+    <meta name="theme-color" content="#F8F7F7" />
+    <meta name="theme-color" content="#131010" media="(prefers-color-scheme: dark)" />
+    <meta property="og:image" content="./social-share.png" />
+    <meta property="twitter:image" content="./social-share.png" />
+    <script id="oc-theme-preload-script" src="./oc-theme-preload.js"></script>
+  </head>
+  <body class="antialiased overscroll-none text-12-regular overflow-hidden">
+    <noscript>You need to enable JavaScript to run this app.</noscript>
+    <div id="root" class="flex flex-col h-dvh"></div>
+    <script src="./loading.tsx" type="module"></script>
+  </body>
+</html>

packages/desktop-electron/src/renderer/loading.tsx

@@ -0,0 +1,83 @@
+import { MetaProvider } from "@solidjs/meta"
+import { render } from "solid-js/web"
+import "@opencode-ai/app/index.css"
+import { Font } from "@opencode-ai/ui/font"
+import { Splash } from "@opencode-ai/ui/logo"
+import { Progress } from "@opencode-ai/ui/progress"
+import "./styles.css"
+import { createEffect, createMemo, createSignal, onCleanup, onMount } from "solid-js"
+import type { InitStep, SqliteMigrationProgress } from "../preload/types"
+
+const root = document.getElementById("root")!
+const lines = ["Just a moment...", "Migrating your database", "This may take a couple of minutes"]
+const delays = [3000, 9000]
+
+render(() => {
+  const [step, setStep] = createSignal<InitStep | null>(null)
+  const [line, setLine] = createSignal(0)
+  const [percent, setPercent] = createSignal(0)
+
+  const phase = createMemo(() => step()?.phase)
+
+  const value = createMemo(() => {
+    if (phase() === "done") return 100
+    return Math.max(25, Math.min(100, percent()))
+  })
+
+  window.api.awaitInitialization((next) => setStep(next as InitStep)).catch(() => undefined)
+
+  onMount(() => {
+    setLine(0)
+    setPercent(0)
+
+    const timers = delays.map((ms, i) => setTimeout(() => setLine(i + 1), ms))
+
+    const listener = window.api.onSqliteMigrationProgress((progress: SqliteMigrationProgress) => {
+      if (progress.type === "InProgress") setPercent(Math.max(0, Math.min(100, progress.value)))
+      if (progress.type === "Done") {
+        setPercent(100)
+        setStep({ phase: "done" })
+      }
+    })
+
+    onCleanup(() => {
+      listener()
+      timers.forEach(clearTimeout)
+    })
+  })
+
+  createEffect(() => {
+    if (phase() !== "done") return
+
+    const timer = setTimeout(() => window.api.loadingWindowComplete(), 1000)
+    onCleanup(() => clearTimeout(timer))
+  })
+
+  const status = createMemo(() => {
+    if (phase() === "done") return "All done"
+    if (phase() === "sqlite_waiting") return lines[line()]
+    return "Just a moment..."
+  })
+
+  return (
+    <MetaProvider>
+      <div class="w-screen h-screen bg-background-base flex items-center justify-center">
+        <Font />
+        <div class="flex flex-col items-center gap-11">
+          <Splash class="w-20 h-25 opacity-15" />
+          <div class="w-60 flex flex-col items-center gap-4" aria-live="polite">
+            <span class="w-full overflow-hidden text-center text-ellipsis whitespace-nowrap text-text-strong text-14-normal">
+              {status()}
+            </span>
+            <Progress
+              value={value()}
+              class="w-20 [&_[data-slot='progress-track']]:h-1 [&_[data-slot='progress-track']]:border-0 [&_[data-slot='progress-track']]:rounded-none [&_[data-slot='progress-track']]:bg-surface-weak [&_[data-slot='progress-fill']]:rounded-none [&_[data-slot='progress-fill']]:bg-icon-warning-base"
+              aria-label="Database migration progress"
+              getValueLabel={({ value }) => `${Math.round(value)}%`}
+            />
+          </div>
+        </div>
+      </div>
+    </MetaProvider>
+  )
+}, root)

packages/desktop/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@opencode-ai/desktop",
   "private": true,
-  "version": "1.4.1",
+  "version": "1.3.17",
   "type": "module",
   "license": "MIT",
   "scripts": {

packages/enterprise/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opencode-ai/enterprise",
-  "version": "1.4.1",
+  "version": "1.3.17",
   "private": true,
   "type": "module",
   "license": "MIT",

packages/extensions/zed/extension.toml

@@ -1,7 +1,7 @@
 id = "opencode"
 name = "OpenCode"
 description = "The open source coding agent."
-version = "1.4.1"
+version = "1.3.17"
 schema_version = 1
 authors = ["Anomaly"]
 repository = "https://github.com/anomalyco/opencode"
@@ -11,26 +11,26 @@ name = "OpenCode"
 icon = "./icons/opencode.svg"
 
 [agent_servers.opencode.targets.darwin-aarch64]
-archive = "https://github.com/anomalyco/opencode/releases/download/v1.4.1/opencode-darwin-arm64.zip"
+archive = "https://github.com/anomalyco/opencode/releases/download/v1.3.17/opencode-darwin-arm64.zip"
 cmd = "./opencode"
 args = ["acp"]
 
 [agent_servers.opencode.targets.darwin-x86_64]
-archive = "https://github.com/anomalyco/opencode/releases/download/v1.4.1/opencode-darwin-x64.zip"
+archive = "https://github.com/anomalyco/opencode/releases/download/v1.3.17/opencode-darwin-x64.zip"
 cmd = "./opencode"
 args = ["acp"]
 
 [agent_servers.opencode.targets.linux-aarch64]
-archive = "https://github.com/anomalyco/opencode/releases/download/v1.4.1/opencode-linux-arm64.tar.gz"
+archive = "https://github.com/anomalyco/opencode/releases/download/v1.3.17/opencode-linux-arm64.tar.gz"
 cmd = "./opencode"
 args = ["acp"]
 
 [agent_servers.opencode.targets.linux-x86_64]
-archive = "https://github.com/anomalyco/opencode/releases/download/v1.4.1/opencode-linux-x64.tar.gz"
+archive = "https://github.com/anomalyco/opencode/releases/download/v1.3.17/opencode-linux-x64.tar.gz"
 cmd = "./opencode"
 args = ["acp"]
 
 [agent_servers.opencode.targets.windows-x86_64]
-archive = "https://github.com/anomalyco/opencode/releases/download/v1.4.1/opencode-windows-x64.zip"
+archive = "https://github.com/anomalyco/opencode/releases/download/v1.3.17/opencode-windows-x64.zip"
 cmd = "./opencode.exe"
 args = ["acp"]

packages/function/package.json

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

packages/mobile-voice/.cursor/settings.json

@@ -1,7 +0,0 @@
-{
-  "plugins": {
-    "figma": {
-      "enabled": true
-    }
-  }
-}

packages/mobile-voice/.gitignore

@@ -1,43 +0,0 @@
-# Learn more https://docs.github.com/en/get-started/getting-started-with-git/ignoring-files
-
-# dependencies
-node_modules/
-
-# Expo
-.expo/
-dist/
-web-build/
-expo-env.d.ts
-
-# Native
-.kotlin/
-*.orig.*
-*.jks
-*.p8
-*.p12
-*.key
-*.mobileprovision
-
-# Metro
-.metro-health-check*
-
-# debug
-npm-debug.*
-yarn-debug.*
-yarn-error.*
-
-# macOS
-.DS_Store
-*.pem
-
-# local env files
-.env*.local
-
-# typescript
-*.tsbuildinfo
-
-app-example
-
-# generated native folders
-/ios
-/android

packages/mobile-voice/AGENTS.md

@@ -1,183 +0,0 @@
-# mobile-voice Agent Guide
-
-This file defines package-specific guidance for agents working in `packages/mobile-voice`.
-
-## Scope And Precedence
-
-- Follow root `AGENTS.md` first.
-- This file overrides root guidance for this package when rules conflict.
-- If additional local guides are added later, treat the closest guide as highest priority.
-
-## Project Overview
-
-- Expo + React Native app for voice dictation and OpenCode session monitoring.
-- Uses native/device-heavy modules such as `whisper.rn`, `react-native-audio-api`, `expo-notifications`, and `expo-camera`.
-- Development builds are required for native module changes.
-
-## Commands
-
-Run all commands from `packages/mobile-voice`.
-
-- Install deps: `bun install`
-- Start Metro: `bun run start`
-- Start dev client server (recommended): `bunx expo start --dev-client --clear --host lan`
-- iOS run: `bun run ios`
-- Android run: `bun run android`
-- Lint: `bun run lint`
-- Typecheck: `bun run typecheck`
-- Expo doctor: `bunx expo-doctor`
-- Dependency compatibility check: `bunx expo install --check`
-- Export bundle smoke test: `bunx expo export --platform ios --clear`
-
-## Build / Verification Expectations
-
-- For JS-only changes: run `bun run lint` and verify app behavior via dev client.
-- For TS-heavy refactors: run `bun run typecheck` in addition to lint.
-- For native dependency/config/plugin changes: rebuild dev client via EAS before validation.
-- If notifications, camera, microphone, or audio-session behavior changes, verify on a physical iOS device.
-- Do not claim a fix unless you validated in Metro logs and app runtime behavior.
-
-## Single-Test Guidance
-
-- This package currently has no dedicated unit test script.
-- Use targeted validation commands instead:
-  - `bun run lint`
-  - `bun run typecheck`
-  - `bunx expo export --platform ios --clear`
-  - manual runtime test in dev client
-
-## Architecture Priorities
-
-- Keep screens focused on composition and orchestration. Once a screen owns multiple workflows, extract hooks/components before adding more local state.
-- Prefer extracting pure helpers and config objects before introducing new stores or abstractions.
-- Treat `src/app/index.tsx` as a composition root, not as the permanent home for onboarding, dictation, monitoring, pairing, persistence, and all UI details.
-- Avoid mirrored `state + ref` pairs unless they are needed for imperative native APIs, race cancellation, or subscription callbacks.
-
-## Code Style And Patterns
-
-### Formatting / Structure
-
-- Preserve existing style (`semi: false`, concise JSX, stable import grouping).
-- Keep UI changes localized and behavior-preserving; avoid unrelated formatting churn.
-- Prefer feature-adjacent hooks/components over growing a single screen file.
-
-### React State / Effects
-
-- Effects are for subscriptions, timers, persistence, network I/O, and native bridge setup/cleanup.
-- Do not add `useEffect` just to derive render data from props or state. Derive during render instead.
-- Prefer one source of truth. If a value can be computed from existing state, do not store it separately.
-- Use `useMemo` only when computation is expensive or stable identity actually matters.
-- Use `useCallback` only when stable function identity matters for dependencies, cleanup, or memoized children.
-- When UI branches are driven by a small finite state, prefer config tables/objects over long nested ternaries.
-
-### Types
-
-- Avoid `any`; prefer local type aliases for component state and network payloads.
-- Keep exported/shared boundaries typed explicitly.
-- Parse persisted and network payloads as `unknown` first, then validate before use.
-- Use discriminated unions for UI modes/status where practical.
-
-### Naming
-
-- Prefer short, readable names consistent with nearby code.
-- Keep naming aligned with existing app state keys (`monitorStatus`, `activeSessionId`, etc.).
-
-### Error Handling / Logging
-
-- Fail gracefully in UI (alerts, disabled actions, fallback text).
-- Avoid bare `catch {}` or `.catch(() => {})` for meaningful work. If failure is intentionally best-effort, leave a short comment or use a helper that makes that explicit.
-- Log actionable diagnostics for runtime workflows such as server health checks, relay registration, and notification token lifecycle.
-- Never log secrets or full APNs tokens.
-- Keep hot-path logging behind `__DEV__` when possible.
-
-### Network / Relay Integration
-
-- Normalize and validate URLs before storing server configs.
-- Use `AbortController` or request IDs for overlapping requests, streams, and polling.
-- Keep relay registration idempotent.
-- Guard duplicate scan/add flows to avoid repeated server entries.
-
-### Notifications / APNs
-
-- This package currently assumes APNs relay registration uses the `production` environment only. Do not add environment switching unless explicitly requested.
-- On registration changes, ensure old token unregister flow remains intact.
-- Treat permission failures as non-fatal and degrade to foreground monitoring when needed.
-
-### Performance / RN
-
-- Validate performance-sensitive changes in a dev client or release build, not only Metro dev mode.
-- During recording and monitoring flows, keep JS-thread work light.
-- Prefer Reanimated/native-thread-friendly animations for motion.
-- For small menus a `ScrollView` is fine; if a list grows beyond a small bounded menu, move to `FlatList` or `FlashList`.
-
-## Lint / Quality Bar
-
-- Keep hooks lint warnings clean before finishing.
-- Treat `any`, `no-console`, complexity, and max-lines warnings as refactor prompts, not noise to suppress.
-- Do not disable React Hooks lint rules inline unless there is a documented native-interop reason.
-- When introducing new persistence or network payloads, add or reuse a parser instead of scattering casts.
-
-## Native-Module Safety
-
-- If adding a native module, ensure it is in `package.json` with an SDK-compatible version.
-- Rebuild the dev client after native module additions or changes.
-- For optional native capability usage, prefer runtime fallback paths instead of hard crashes.
-
-## Expo Native Config (EAS)
-
-- Treat `packages/mobile-voice/app.json` as the source of truth for iOS native metadata in EAS cloud builds.
-- Do not rely on manual edits in `ios/mobilevoice/Info.plist`, entitlements files, or `PrivacyInfo.xcprivacy`; for this package they are generated outputs.
-- Keep generated native folders untracked in git (`/ios`, `/android`) to avoid mixed CNG/bare behavior during EAS builds.
-- Put App Store compliance and permission metadata in app config using these fields:
-  - `expo.ios.infoPlist` for Info.plist keys (usage strings, ATS, Bonjour, and related keys).
-  - `expo.ios.config.usesNonExemptEncryption` for export-compliance encryption declaration.
-  - `expo.ios.entitlements` for iOS entitlements.
-  - `expo.ios.privacyManifests` for Apple privacy manifest declarations.
-- Keep `app.json` entries explicit and review-friendly:
-  - Permission descriptions should be complete, product-specific sentences.
-  - Compliance keys should be set intentionally rather than relying on implicit defaults.
-  - Preserve existing JSON style in this package (concise arrays and stable key grouping).
-- After native config changes, verify resolved config with `bunx expo config --type prebuild --json` and check the resulting `ios` fields.
-
-Example shape:
-
-```json
-{
-  "expo": {
-    "ios": {
-      "infoPlist": {
-        "NSCameraUsageDescription": "...",
-        "NSMicrophoneUsageDescription": "..."
-      },
-      "config": {
-        "usesNonExemptEncryption": false
-      },
-      "entitlements": {
-        "com.apple.developer.kernel.extended-virtual-addressing": true
-      },
-      "privacyManifests": {
-        "NSPrivacyAccessedAPITypes": []
-      }
-    }
-  }
-}
-```
-
-## Common Pitfalls
-
-- Black screen + "No script URL provided" often means a stale dev client binary.
-- `expo-doctor` duplicate module warnings may appear in Bun workspaces; prioritize runtime verification.
-- `expo lint` may auto-generate `eslint.config.js`; do not commit accidental generated config unless requested.
-
-## Before Finishing
-
-- Run `bun run lint`.
-- If behavior could break startup, run `bunx expo export --platform ios --clear`.
-- Confirm no accidental config side effects were introduced.
-- Summarize what was verified on-device vs only in tooling.
-
-
-- Dev build (internal/dev client):
-  - bunx eas build --profile development --platform ios
-- Production build + auto-submit:
-  - bunx eas build --profile production --platform ios --auto-submit

packages/mobile-voice/README.md

@@ -1,39 +0,0 @@
-# Mobile Voice
-
-Expo app for voice dictation and OpenCode session monitoring.
-
-## Current monitoring behavior
-
-- Foreground: app reads OpenCode SSE (`GET /event`) and updates monitor status live.
-- Background/terminated: app relies on APNs notifications sent by `apn-relay`.
-- The app registers its native APNs device token with relay route `POST /v1/device/register`.
-
-## App requirements
-
-- Use a development build or production build (not Expo Go).
-- `expo-notifications` plugin is enabled with `enableBackgroundRemoteNotifications: true`.
-- Notification permission must be granted.
-
-## Server entry fields in app
-
-When adding a server, provide:
-
-- OpenCode URL
-- APN relay URL
-- Relay shared secret
-
-Default APN relay URL: `https://apn.dev.opencode.ai`
-
-The app uses these values to:
-
-- send prompts to OpenCode
-- register/unregister APNs token with relay
-- receive background push updates for monitored sessions
-
-## Local dev
-
-```bash
-npx expo start
-```
-
-Use your machine LAN IP / reachable host values for OpenCode and relay when testing on a physical device.

packages/mobile-voice/app.json

@@ -1,101 +0,0 @@
-{
-  "expo": {
-    "name": "Control",
-    "slug": "control",
-    "version": "1.0.2",
-    "orientation": "portrait",
-    "icon": "./assets/images/icon.png",
-    "scheme": "mobilevoice",
-    "userInterfaceStyle": "automatic",
-    "ios": {
-      "icon": "./assets/images/icon.png",
-      "bundleIdentifier": "com.anomalyco.mobilevoice",
-      "config": {
-        "usesNonExemptEncryption": false
-      },
-      "entitlements": {
-        "com.apple.developer.kernel.extended-virtual-addressing": true
-      },
-      "infoPlist": {
-        "NSMicrophoneUsageDescription": "Control uses the microphone while you hold Record to turn your speech into text for an OpenCode session.",
-        "NSCameraUsageDescription": "Control uses the camera to scan the OpenCode pairing QR code shown on your computer.",
-        "NSLocalNetworkUsageDescription": "Control uses your local network to discover and connect to OpenCode servers running on your computer.",
-        "NSBonjourServices": ["_http._tcp."],
-        "NSAppTransportSecurity": {
-          "NSAllowsLocalNetworking": true,
-          "NSExceptionDomains": {
-            "100.64.0.0/10": {
-              "NSExceptionAllowsInsecureHTTPLoads": true
-            },
-            "ts.net": {
-              "NSIncludesSubdomains": true,
-              "NSExceptionAllowsInsecureHTTPLoads": true
-            }
-          }
-        }
-      }
-    },
-    "android": {
-      "adaptiveIcon": {
-        "backgroundColor": "#E6F4FE",
-        "foregroundImage": "./assets/images/android-icon-foreground.png",
-        "backgroundImage": "./assets/images/android-icon-background.png",
-        "monochromeImage": "./assets/images/android-icon-monochrome.png"
-      },
-      "permissions": [
-        "RECORD_AUDIO",
-        "POST_NOTIFICATIONS",
-        "android.permission.FOREGROUND_SERVICE",
-        "android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK",
-        "android.permission.RECORD_AUDIO",
-        "android.permission.MODIFY_AUDIO_SETTINGS",
-        "android.permission.ACCESS_NETWORK_STATE",
-        "android.permission.ACCESS_WIFI_STATE",
-        "android.permission.CHANGE_WIFI_MULTICAST_STATE"
-      ],
-      "predictiveBackGestureEnabled": false
-    },
-    "web": {
-      "output": "static",
-      "favicon": "./assets/images/favicon.png"
-    },
-    "plugins": [
-      "expo-router",
-      [
-        "expo-splash-screen",
-        {
-          "backgroundColor": "#121212",
-          "android": {
-            "image": "./assets/images/splash-icon.png",
-            "imageWidth": 76
-          }
-        }
-      ],
-      "react-native-audio-api",
-      "expo-asset",
-      "expo-audio",
-      [
-        "expo-notifications",
-        {
-          "enableBackgroundRemoteNotifications": true,
-          "sounds": ["./assets/sounds/alert.wav"]
-        }
-      ]
-    ],
-    "experiments": {
-      "typedRoutes": true,
-      "reactCompiler": true
-    },
-    "extra": {
-      "router": {},
-      "eas": {
-        "projectId": "50b3dac3-8b5e-4142-b749-65ecf7b2904d"
-      }
-    },
-    "owner": "anomaly-co",
-    "runtimeVersion": "1.0.2",
-    "updates": {
-      "url": "https://u.expo.dev/50b3dac3-8b5e-4142-b749-65ecf7b2904d"
-    }
-  }
-}

packages/mobile-voice/assets/expo.icon/Assets/expo-symbol 2.svg

@@ -1,3 +0,0 @@
-<svg width="652" height="606" viewBox="0 0 652 606" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M353.554 0H298.446C273.006 0 249.684 14.6347 237.962 37.9539L4.37994 502.646C-1.04325 513.435 -1.45067 526.178 3.2716 537.313L22.6123 582.918C34.6475 611.297 72.5404 614.156 88.4414 587.885L309.863 222.063C313.34 216.317 319.439 212.826 326 212.826C332.561 212.826 338.659 216.317 342.137 222.063L563.559 587.885C579.46 614.156 617.352 611.297 629.388 582.918L648.728 537.313C653.451 526.178 653.043 513.435 647.62 502.646L414.038 37.9539C402.316 14.6347 378.994 0 353.554 0Z" fill="white"/>
-</svg>

packages/mobile-voice/assets/expo.icon/icon.json

@@ -1,40 +0,0 @@
-{
-  "fill" : {
-    "automatic-gradient" : "extended-srgb:0.00000,0.47843,1.00000,1.00000"
-  },
-  "groups" : [
-    {
-      "layers" : [
-        {
-          "image-name" : "expo-symbol 2.svg",
-          "name" : "expo-symbol 2",
-          "position" : {
-            "scale" : 1,
-            "translation-in-points" : [
-              1.1008400065293245e-05,
-              -16.046875
-            ]
-          }
-        },
-        {
-          "image-name" : "grid.png",
-          "name" : "grid"
-        }
-      ],
-      "shadow" : {
-        "kind" : "neutral",
-        "opacity" : 0.5
-      },
-      "translucency" : {
-        "enabled" : true,
-        "value" : 0.5
-      }
-    }
-  ],
-  "supported-platforms" : {
-    "circles" : [
-      "watchOS"
-    ],
-    "squares" : "shared"
-  }
-}