From 74372f6840fb2a0347defd11d3b6e53d1d83fbe9 Mon Sep 17 00:00:00 2001 From: axcho Date: Tue, 25 Aug 2026 14:15:55 -0400 Subject: [PATCH] docs: finalize upstream desktop sync changelog Co-authored-by: Cursor --- CHANGELOGS/2026-08-25-upstream-desktop-sync.md | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/CHANGELOGS/2026-08-25-upstream-desktop-sync.md b/CHANGELOGS/2026-08-25-upstream-desktop-sync.md index 5bc7fce79d..e466a59f4c 100644 --- a/CHANGELOGS/2026-08-25-upstream-desktop-sync.md +++ b/CHANGELOGS/2026-08-25-upstream-desktop-sync.md @@ -42,16 +42,24 @@ Auto-merged locales that already retained voice keys: `ar`, `br`, `bs`, `en`, `e - Updated `packages/app/src/voice/voice-settings.tsx` to import `ExternalLink` from `@/components/external-link` (upstream renamed `link.tsx`). - Ran `bun install` after the merge so vendored `@opencode-ai/client` (with `./promise` export) is linked. -- Repaired incomplete local `drizzle-orm@1.0.0-rc.2` install that blocked `@opencode-ai/desktop` typecheck (OneDrive/bun store had directories without package files). +- Repaired incomplete local installs that blocked monorepo typecheck on Windows/OneDrive (`drizzle-orm`, `marked-shiki` peer `marked@18`, enterprise `custom-elements.d.ts` symlink). +- Aligned `bun.lock` desktop `drizzle-orm` entry to `catalog:`. ## Verification +- `bun typecheck` (root turbo, 30 packages) — passed - `bun typecheck` in `packages/opencode` — passed -- `bun typecheck` in `packages/desktop` — passed after Link + drizzle-orm repair -- `bun typecheck` in `packages/app` — previously failed with missing client linkage before `bun install`; client now linked +- `bun typecheck` in `packages/desktop` — passed +- Pushed to `cloudaxe/dev` (`9f5a50a369..995b823ee4`) - No remaining `<<<<<<<` / `>>>>>>>` conflict markers - Voice module paths still present: `packages/app/src/voice/`, `packages/desktop/src/main/voice/` +## Resulting commits on `dev` + +- `fc2c29bd3a` — `chore: merge upstream opencode desktop changes` +- `851e958191` — `fix(desktop): adapt voice settings to upstream ExternalLink` +- `995b823ee4` — `chore: use catalog drizzle-orm in lockfile` + ## Integration method - Merge commit (no rebase, no force-push)