docs: finalize upstream desktop sync changelog
Some checks are pending
deploy / deploy (push) Waiting to run
generate / generate (push) Waiting to run
nix-eval / nix-eval (push) Waiting to run
publish / version (push) Waiting to run
publish / build-cli (push) Blocked by required conditions
publish / sign-cli-windows (push) Blocked by required conditions
publish / build-electron (map[bun_install_flags:--os=darwin --cpu=arm64 host:macos-26 platform_flag:--mac --arm64 target:aarch64-apple-darwin]) (push) Blocked by required conditions
publish / build-electron (map[bun_install_flags:--os=darwin --cpu=x64 host:macos-26-intel platform_flag:--mac --x64 target:x86_64-apple-darwin]) (push) Blocked by required conditions
publish / build-electron (map[host:blacksmith-4vcpu-ubuntu-2404 platform_flag:--linux target:x86_64-unknown-linux-gnu]) (push) Blocked by required conditions
publish / build-electron (map[host:blacksmith-4vcpu-ubuntu-2404-arm platform_flag:--linux --arm64 target:aarch64-unknown-linux-gnu]) (push) Blocked by required conditions
publish / build-electron (map[host:blacksmith-4vcpu-windows-2025 platform_flag:--win target:x86_64-pc-windows-msvc]) (push) Blocked by required conditions
publish / build-electron (map[host:windows-2025 platform_flag:--win --arm64 target:aarch64-pc-windows-msvc]) (push) Blocked by required conditions
publish / publish (push) Blocked by required conditions
test / unit (linux) (push) Waiting to run
test / unit (windows) (push) Waiting to run
test / e2e (linux) (push) Waiting to run
test / e2e (windows) (push) Waiting to run
typecheck / typecheck (push) Waiting to run
Some checks are pending
deploy / deploy (push) Waiting to run
generate / generate (push) Waiting to run
nix-eval / nix-eval (push) Waiting to run
publish / version (push) Waiting to run
publish / build-cli (push) Blocked by required conditions
publish / sign-cli-windows (push) Blocked by required conditions
publish / build-electron (map[bun_install_flags:--os=darwin --cpu=arm64 host:macos-26 platform_flag:--mac --arm64 target:aarch64-apple-darwin]) (push) Blocked by required conditions
publish / build-electron (map[bun_install_flags:--os=darwin --cpu=x64 host:macos-26-intel platform_flag:--mac --x64 target:x86_64-apple-darwin]) (push) Blocked by required conditions
publish / build-electron (map[host:blacksmith-4vcpu-ubuntu-2404 platform_flag:--linux target:x86_64-unknown-linux-gnu]) (push) Blocked by required conditions
publish / build-electron (map[host:blacksmith-4vcpu-ubuntu-2404-arm platform_flag:--linux --arm64 target:aarch64-unknown-linux-gnu]) (push) Blocked by required conditions
publish / build-electron (map[host:blacksmith-4vcpu-windows-2025 platform_flag:--win target:x86_64-pc-windows-msvc]) (push) Blocked by required conditions
publish / build-electron (map[host:windows-2025 platform_flag:--win --arm64 target:aarch64-pc-windows-msvc]) (push) Blocked by required conditions
publish / publish (push) Blocked by required conditions
test / unit (linux) (push) Waiting to run
test / unit (windows) (push) Waiting to run
test / e2e (linux) (push) Waiting to run
test / e2e (windows) (push) Waiting to run
typecheck / typecheck (push) Waiting to run
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
parent
995b823ee4
commit
74372f6840
1 changed files with 11 additions and 3 deletions
|
|
@ -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)
|
||||
|
|
|
|||
Loading…
Reference in a new issue