diff --git a/CHANGELOG.md b/CHANGELOG.md
index 01aacef046..138743024c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,15 @@ file is the human-readable summary of what changed and why.
   session, prompt, token, commit, branch, and agent stay in English (the
   glossary lives in `.codev/glossary/vi.md`).
   ([#307](https://github.com/quickbeard/codev-code/pull/307))
+- **The app menu is translated too** — File, Edit, View, Go, Window and Help
+  and everything inside them stayed English no matter which language the rest
+  of the app was in: the menu was built from fixed English text rather than
+  from the dictionaries. It now follows your language like every other
+  surface, on the macOS menu bar and the Windows/Linux titlebar menu alike,
+  and switching language updates it without a restart. Developer terms stay in
+  English where Vietnamese developers expect them — session, terminal,
+  webview, developer tools.
+  ([#322](https://github.com/quickbeard/codev-code/pull/322))
 
 ### Privacy
 
diff --git a/DIVERGENCES.md b/DIVERGENCES.md
index 8e43663adf..0b04163905 100644
--- a/DIVERGENCES.md
+++ b/DIVERGENCES.md
@@ -185,7 +185,8 @@ from the squash message first, or use a plain merge.
 | `packages/app/src/pages/layout.tsx`, `packages/app/src/pages/layout-new.tsx` | Dropped the `<TabsInfoPopup />` mount and its import from both layouts (added upstream in v1.17.18; since v1.18.3 upstream itself removed the sibling `HelpButton`, so nothing is imported from `help-button` anymore) | `TabsInfoPopup` is a dev-channel-only "Introducing Tabs" promo whose `muted autoplay loop` `<video>` mounts on every layout render. The fork's Windows e2e runs on GPU-less GitHub-hosted runners (software GPU — see the runner-swap row), where continuous video decode wedges the GPU command buffer (`kTransientFailure`), making the whole app-e2e suite flaky and ~3–5× slower. It never ships (release builds use a non-`dev` `CODEV_CHANNEL`), so unmounting it costs users nothing. | Keep ours: don't re-add the `<TabsInfoPopup />` mount or restore it to the import. |
 | `packages/app/src/components/help-button.tsx` | Deleted (as of the v1.18.3 sync). The fork had removed the `TabsInfoPopup` component and its `introducing-tabs.mp4` import, keeping the rebranded `HelpButton`; upstream v1.18.3 deleted `HelpButton` itself, leaving only the popup — so nothing remains and the file is gone. | The popup is upstream's temporary, OpenCode-branded "Introducing Tabs" promo (upstream's own comment says it's removable after the rollout), unmounted per the row above; removing the definition lets the 13 MB video be deleted (row below). | Keep deleted (`git rm` the upstream side of modify/delete conflicts). If upstream mounts `TabsInfoPopup` somewhere new, drop that mount per the row above. When upstream deletes the popup itself, this row and the rows around it retire. |
 | `packages/app/src/assets/help/` (introducing-tabs.mp4, placeholder.png, home.png, tabs.png — whole directory) | Deleted | The 13 MB promo video's and the v1.18 home/tabs screenshots' only consumer was the removed `TabsInfoPopup` (row above) and they bloat every clone; `placeholder.png` is referenced by nothing. | Keep deleted (`git rm` the upstream side of modify/delete conflicts); delete new upstream assets under this directory whose only consumer is the removed popup. |
-| `packages/app/src/desktop-menu.ts`, `packages/app/src/components/windows-app-menu.tsx` | App-menu label "OpenCode" → "CoDev"; "OpenCode Documentation" item → "CoDev Documentation" (href `opencode.ai/docs` stays — real URL); trigger `aria-label` "OpenCode menu" → "CoDev menu" (×2). Plus a **"Check for Updates..." item added to the Help menu**, it and a preceding separator both `platforms: ["windows"]`; `desktop-menu.ts` gains an exported `desktopMenuItemDisabled(item, {updaterStatus, commandDisabled})` — sibling to the existing `desktopMenuVisible` — which `WindowsAppMenu` now calls to honour `enabled: "updater"`. | Upstream only ever exposes the update check from the macOS app menu (`platforms: ["macos"]`), and `createMenu` early-returns on non-darwin while `WindowsAppMenu` filters on `"windows"` — so on Windows and Linux there was no menu path to it at all, leaving Settings → General as the only manual entry point. `WindowsAppMenu` renders for both Windows and Linux (`titlebar.tsx` gates on `windows() \|\| linux()`) but filters with the `"windows"` key, so `platforms: ["windows"]` reaches both without widening `DesktopMenuPlatform`. The separator carries the same restriction or macOS's Help menu ends on a stray divider. `enabled: "updater"` was silently ignored in this component — only `command` entries could disable — so a dev build would have shown an item that errors on click; the updater's own `disabled` status is the renderer-side equivalent of the main process's `UPDATER_ENABLED`. | Keep our labels, the Help entry, and `entryDisabled`; take upstream's surrounding menu changes. Rebrand any new "OpenCode" label/aria-label. If upstream adds its own non-macOS update entry, drop ours for theirs. Covered by `packages/app/src/desktop-menu.test.ts` ("offers an update check on every platform exactly once"), which will fail on a duplicate rather than let both ship, plus the `item disabled state` block over `desktopMenuItemDisabled`. Keep the disabled logic in `desktop-menu.ts` rather than inlining it back into the component — it is unreachable from a test there, since the app package has no component-render harness. |
+| `packages/app/src/desktop-menu.ts`, `packages/app/src/components/windows-app-menu.tsx` | App-menu label "OpenCode" → "CoDev"; "OpenCode Documentation" item → "CoDev Documentation" (href `opencode.ai/docs` stays — real URL); trigger `aria-label` "OpenCode menu" → "CoDev menu" (×2). Plus a **"Check for Updates..." item added to the Help menu**, it and a preceding separator both `platforms: ["windows"]`; `desktop-menu.ts` gains an exported `desktopMenuItemDisabled(item, {updaterStatus, commandDisabled})` — sibling to the existing `desktopMenuVisible` — which `WindowsAppMenu` now calls to honour `enabled: "updater"`. | Upstream only ever exposes the update check from the macOS app menu (`platforms: ["macos"]`), and `createMenu` early-returns on non-darwin while `WindowsAppMenu` filters on `"windows"` — so on Windows and Linux there was no menu path to it at all, leaving Settings → General as the only manual entry point. `WindowsAppMenu` renders for both Windows and Linux (`titlebar.tsx` gates on `windows() \|\| linux()`) but filters with the `"windows"` key, so `platforms: ["windows"]` reaches both without widening `DesktopMenuPlatform`. The separator carries the same restriction or macOS's Help menu ends on a stray divider. `enabled: "updater"` was silently ignored in this component — only `command` entries could disable — so a dev build would have shown an item that errors on click; the updater's own `disabled` status is the renderer-side equivalent of the main process's `UPDATER_ENABLED`. | Keep our labels (they live in the dicts now — see the localized desktop menu row), the Help entry, and `entryDisabled`; take upstream's surrounding menu changes. Rebrand any new "OpenCode" label/aria-label. If upstream adds its own non-macOS update entry, drop ours for theirs. Covered by `packages/app/src/desktop-menu.test.ts` ("offers an update check on every platform exactly once"), which will fail on a duplicate rather than let both ship, plus the `item disabled state` block over `desktopMenuItemDisabled`. Keep the disabled logic in `desktop-menu.ts` rather than inlining it back into the component — it is unreachable from a test there, since the app package has no component-render harness. |
+| Localized desktop menu: `packages/app/src/desktop-menu.ts`, `packages/app/src/desktop-menu.test.ts`, `packages/app/src/components/windows-app-menu.tsx`, `packages/app/src/i18n/{en,es}.ts`, `packages/desktop/src/main/{menu,ipc,index}.ts` | Every menu label is a dictionary key (`labelKey`, typed as `keyof typeof dict` against the English dict) instead of English text, and both renderers resolve it: `windows-app-menu.tsx` through `useLanguage().t`, and the macOS menu bar through the fork-only `packages/desktop/src/main/menu-i18n.ts` — `createMenu` is now async and awaits a translator that dynamic-imports the selected locale's dict (`@opencode-ai/app/i18n/*`, a new export — see the `packages/app/package.json` row), so Windows and Linux, which return before building a native menu, load no dictionary at all. The locale comes from the same `codev.global.dat` `language` record the renderer's own i18n reads, parsed by the electron-free `main/menu-locale.ts` (`pickMenuLocale`, unit-tested) and falling back to `app.getLocale()` when nothing was ever chosen. `menu.ts` keeps the last `Deps` so its exported `refreshMenuLanguage()` can rebuild the bar; `ipc.ts`'s `store-set` handler calls it when that record is written, and `index.ts` calls `void createMenu(...)`. i18n gains the `menu.*` block (45 keys, en/es/vi), and `desktop-menu.test.ts` gains a test asserting every `labelKey` resolves in all three locales. | The app menu was the last surface that stayed English in a translated UI: the labels were literals in a table shared by the macOS native menu and the Windows/Linux titlebar menu, and the main process — which builds the former — has no i18n of its own. Keys rather than an English-plus-key pair because a duplicated English string is a string that drifts. | Keep the keys and both resolvers. An upstream menu item arrives with a literal label: give it a `menu.*` key in all three dicts instead — the parity test fails otherwise, which is the intended tripwire. Do not make `createMenu` synchronous again; the dictionary load is what keeps the native menu out of the startup path. Keep `pickMenuLocale` in its own electron-free module so it stays testable. |
 | Hardcoded product-string rebrand in TUI + web app: `packages/tui/src/app.tsx`, `packages/tui/src/routes/session/permission.tsx`, `packages/tui/src/attention.ts` (+ `packages/opencode/test/cli/cmd/tui/attention.test.ts`), `packages/app/src/wsl/settings-model.ts` (+ `.test.ts`), `packages/ui/src/components/favicon.tsx` | User-visible "OpenCode" strings outside the i18n dicts → fork brand: update-complete toast "Successfully updated to OpenCode v…" → "CoDev Code"; permission dialog "…until OpenCode is restarted" → "CoDev Code" (the sibling patterns line was already rebranded); OS-notification fallback title `opencode` → `codev` and built-in sound-pack display name "OpenCode Default" → "CoDev Code Default" (pack id `opencode.default` stays — internal identifier; the three default-title expectations in `packages/opencode/test/cli/cmd/tui/attention.test.ts` follow, while its explicit-title pass-through fixture stays `opencode`); WSL settings actions "Install/Update OpenCode" → "…CoDev" (+ test expectations/titles; fixture paths `/usr/local/bin/opencode` stay); PWA `apple-mobile-web-app-title` "OpenCode" → "CoDev Code" (matches the rebranded `site.webmanifest`, favicon-assets row) | These render in surfaces the fork ships (TUI + embedded web UI); the i18n-dict strings remain a known gap (UI branding bullet below). | Keep our strings; take upstream's surrounding changes. Rebrand any new hardcoded user-visible "OpenCode" string in these surfaces; leave identifiers, URLs, and fixture paths. |
 | **Universal macOS builds**: `packages/desktop/electron.vite.config.ts`, `packages/desktop/electron-builder.config.ts`, `packages/desktop/package.json` | Three changes that together make `electron-builder --mac --universal` (and `--x64`) produce a working app. (1) The `codev:node-pty-narrower` plugin and its `nodePtyPkg` constant are gone; the main build externalises `"@lydell/node-pty"` itself. (2) `@lydell/node-pty` moves from `devDependencies` to `dependencies`, so the wrapper is actually packed. (3) `mac.x64ArchFiles` is set to `**/app.asar.unpacked/node_modules/**`. | (1) Upstream rewrote the import to `@lydell/node-pty-${process.platform}-${process.arch}` — the **build host's** arch, resolved once, while `electron-vite build` runs before `electron-builder` and emits one bundle for whatever is packaged after it. On Apple Silicon that baked `darwin-arm64` in, so an `--x64` or `--universal` build shipped an Electron shell that starts and then cannot load its terminal backend. The wrapper's own entry does the same platform/arch lookup at run time, so externalising it picks the right binary on the machine that runs the app. (2) The wrapper was a devDependency and therefore never shipped: the old narrowing worked only because it pointed at the *platform* packages, which are `optionalDependencies`. Verified against a packaged build — `asar list` showed `@lydell/node-pty-darwin-*` present and `@lydell/node-pty/index.js` absent — so `require("@lydell/node-pty")` could not resolve. The bundled server (`packages/opencode/dist/node/node.js`) already required the bare wrapper, so this was a live bug in packaged builds before the vite change, not one it introduced. (3) All six platform packages ship in both the x64 and arm64 halves, so eight Mach-O files (node-pty's `pty.node` and its extension-less `spawn-helper`, `@parcel/watcher`, `msgpackr-extract`) are byte-identical across them; `@electron/universal` reads that as a mistake and refuses to merge. They are prebuilt binaries chosen at run time, not per-arch build output. | Keep all three. On conflict take upstream's files and re-apply. Do not reintroduce host-arch narrowing to silence a bundler warning, and do not move `@lydell/node-pty` back to `devDependencies` — the two are load-bearing together. Verify a packaged build rather than trusting the build log: `grep -o "@lydell/node-pty[a-z0-9-]*" out/main/index.js` must print the bare wrapper with no platform suffix, `asar list` must contain `/node_modules/@lydell/node-pty/index.js`, and the app must load its `pty.node` from inside the bundle when run from **outside** this repo — inside it, Node's module walk-up finds the repo's `node_modules` and masks a missing wrapper. |
 | Desktop app text + identifier rebrand: `packages/desktop/**` (README, `package.json`, `src/renderer/index.html`, `src/renderer/i18n/{en,es}.ts`, `src/main/{index,windows,server,logging}.ts`, `src/main/wsl/{sidecar,startup,servers,servers.test}.ts`, `src/main/install-state.test.ts`, `scripts/copy-metainfo.ts`, `electron-builder.config.ts`) plus the WSL/deep-link surfaces it shares with `packages/app` (`src/wsl/{types,settings-model,settings-model.test,settings,dialog-add-server}.ts(x)`, `src/i18n/{en,es}.ts`, `src/pages/layout/{deep-links,helpers.test}.ts`, `src/app.tsx`, `src/index.ts`) and `packages/desktop/src/{preload,renderer}` | Every user-visible "OpenCode" the desktop app renders → "CoDev" (originally "CoDev Code"; the "Code" suffix was dropped in 2026-08 once the app carried a Work section beside Code): crash dialogs, window `<title>`, updater/CLI-installed i18n (en+es, with the CLI-command hint `'opencode'`→`'codev'`), the unpackaged app-name fallback `"OpenCode Dev"`, the AppStream metainfo (product name, description, `developer` → `<name>CoDev</name>` with the upstream `id="ly.anoma"` dropped, the three URLs repointed to the fork repo, upstream's lander screenshot removed), the OS deep-link handler display name, README, and `package.json` (`homepage` → the fork repo, `author` → `CoDev <minhnh49@viettel.com.vn>`; both were briefly deleted outright, which broke `deb`/`rpm` packaging — electron-builder derives the Debian `Maintainer` field from `author.email` and refuses to build fpm targets without `homepage`, so the two fields have to carry fork values rather than be absent. `AppImage`/`nsis`/`dmg` do not use fpm and never noticed. Values match the AppStream metainfo `scripts/copy-metainfo.ts` already emits: `<developer><name>CoDev</name>` and `<url type="homepage">`). Codebase identifiers renamed `Opencode`→`Codev`/`opencode`→`codev` (`WslOpencodeCheck`, `resolveWslOpencode`, `installWslOpencode`, `expectOpencodeVersion`, `releaseOpencodeResolve`, `checkOpencode`/`refreshOpencodeCheck*`/`setOpencodeCheck`, `opencodeChecks`, `wslOpencodeAction`, …) together with the internal wire values whose producer and consumer both ship here (`virtual:opencode-server`, the `opencode:{node-pty,virtual-server,copy-server}` vite plugin names, the `wsl-servers-install-opencode` IPC channel, the `install-opencode` job kind, the `__OPENCODE__` deep-link bridge global, the `opencode:deep-link` renderer event, the `opencode-onboarding-` temp dir, the `wsl.onboarding.installOpencode*` i18n keys), and the server-log collector path `<xdgData>/opencode/log` → `/codev/log` (a real bug fix — the fork CLI writes to `<xdgData>/codev/log`, `packages/core/src/global.ts` `app = "codev"`, so debug-log export was silently collecting nothing). Two stale product-named locals renamed to what they hold (`opencode`→`binary` in wsl/sidecar.ts, `opencode`→`checked` in the servers test). | The fork ships the desktop app, so every surface it shows and every identifier a maintainer reads should say codev. | Keep our strings + identifiers; take upstream's surrounding changes. PRESERVED deliberately, do not rename: `@opencode-ai/*` package ids, the `opencode` data dir in install-state, the basic-auth username `"opencode"` (must match the server default in `packages/server/src/auth.ts`), and the `../opencode/dist` build paths. The persisted store names were preserved here originally and are now rebranded with a migration — see the persisted-store-name row below. |
@@ -206,7 +207,7 @@ from the squash message first, or use a plain merge.
 | `packages/app/src/components/prompt-input-v2.tsx` | `onUnpaidClick` opens `DialogConnectProvider` (lazy import) instead of the free-models "unpaid" dialogs; their now-unused imports dropped. (The legacy `prompt-input.tsx` carried the same swap until its deletion — see the legacy prompt-input removal row.) | With the hosted providers hidden, "unpaid" means nothing is connected, and the free-models dialogs would render empty lists (this path is reachable on the web deployment; on desktop the gate covers it). | Keep the handler swap; take upstream's surrounding prompt-input changes. |
 | `packages/desktop/src/renderer/index.tsx` | Calls `installConsoleFormatting()` (fork-only `./console-format`) before anything else logs. | `spyRendererConsole` receives Chromium's flattened console-message string, so any renderer `console.*` with an object argument reached the terminal and the exported debug logs as `[object Object]`; the wrapper serializes structured arguments (Error-aware, circular-safe, truncated) at the source. | Keep the import and call; take upstream's surrounding entry changes. |
 | Desktop gateway SSO wiring: `packages/desktop/src/main/index.ts`, `packages/desktop/src/preload/{index,types}.ts`, `packages/desktop/src/renderer/index.tsx` | Main instantiates the fork-only `src/main/gateway-sso/` controller (wrapping `@codev/gateway` `login`/`silentSso` — node-only loopback OAuth — with `shell.openExternal` and a `net.fetch` wrapper) and registers its `gateway-sso-*` IPC channels next to the sandbox ones, passing an `onConfigured` callback that restarts the running sandboxes (`SandboxController.restartRunning`) because a guest is handed its codev config once at boot and cannot see credentials that appear afterwards; preload exposes the `gatewaySso` namespace (subscribe fan-out, sandbox pattern) with types re-exported from `@opencode-ai/app/gateway/types`; the renderer platform maps `gatewaySso: window.api.gatewaySso`. | SSO login for the desktop configure gate must run in the main process (`node:http` loopback server, `~/.codev/auth.json` writes); `net.fetch` so enterprise proxies/PAC apply (egress precedent). | Keep the wiring; take upstream's surrounding changes. Keep channel names `gateway-sso-*` stable. |
-| `packages/app/package.json` | Added `"./gateway/types": "./src/gateway/types.ts"` to `exports`. | The desktop preload aliases the app-owned gateway SSO wire types (sandbox/types pattern). | Keep the export; take upstream's other manifest changes. |
+| `packages/app/package.json` | Added `"./gateway/types": "./src/gateway/types.ts"` and `"./i18n/*": "./src/i18n/*.ts"` to `exports`. | The desktop preload aliases the app-owned gateway SSO wire types (sandbox/types pattern); the desktop main process imports the locale dicts to translate the macOS menu bar (`./i18n/*` mirrors how `@opencode-ai/ui` already exports its own — see the localized desktop menu row). | Keep both exports; take upstream's other manifest changes. |
 | `packages/app/src/i18n/{en,es}.ts` | Added the `gateway.configure.*` key family (configure-gate dialog) and reworded `sidebar.gettingStarted.line1` — the "includes free models" pitch no longer holds with the hosted providers hidden. | Strings for the fork's configure gate; the getting-started card must not advertise models the fork does not offer. | Keep our keys and copy; take upstream's surrounding i18n changes. |
 | `packages/desktop/src/main/index.ts` | Deleted upstream's `app.commandLine.appendSwitch("proxy-bypass-list", "<-loopback>")`. | Chromium's `<-loopback>` bypass rule means the opposite of what it reads as: it *subtracts* the implicit rules that keep loopback off the proxy, i.e. it opts localhost traffic *into* proxying (`net/docs/proxy.md`). Today it is inert — Electron reads `--proxy-bypass-list` only together with `--proxy-server` (`shell/browser/browser_process_impl.cc`), which the app never passes — but it becomes actively harmful the moment anything launches the app with `--proxy-server`: the renderer's sidecar traffic would be routed into the proxy. Chromium already bypasses loopback by default, so nothing replaces it. | Keep deleted. If upstream adds new proxy switches, check them against Chromium's implicit-bypass semantics before taking them. |
 | Startup proxy-stall gate: `packages/desktop/src/main/{index,ipc}.ts`, `packages/desktop/src/preload/{index,types}.ts`, `packages/desktop/src/renderer/index.tsx`, `packages/app/src/app.tsx`, `packages/app/src/context/platform.tsx` | Three additive pieces. (1) `main/index.ts` fires `session.defaultSession.resolveProxy(url)` for the sidecar URL as soon as the port is known (fire-and-forget, result logged). (2) A `local-server-health` IPC chain: main answers with the Node-fetch `checkHealth` against the spawned sidecar once `serverReady` resolves (`false` if initialization failed), preload exposes `localServerHealth()`, the renderer platform maps it, and `platform.tsx` gains the optional `localServerHealth?()` capability. (3) `app.tsx` `ConnectionGate`: the health-check effect is restructured around an inner `poll`; when the 10 s blocking window expires without a healthy answer and the connection is the built-in sidecar, it asks `platform.localServerHealth` — if the host process vouches for the server it keeps blocking on the splash for up to another 50 s instead of showing the unreachable error. Background mode and `type: "http"` behavior are unchanged, and without the capability (web) the gate behaves exactly as upstream. | Chromium queues every renderer request — loopback included — until proxy initialization (PAC download / WPAD discovery) resolves; the implicit loopback-bypass rules are only applied once the resolution service is READY (`net/proxy_resolution/configured_proxy_resolution_service.cc`). On corporate networks that takes tens of seconds (measured 21 s vs 64 ms with an unreachable PAC host), so users behind a proxy saw "Could not reach Local Server" at every launch while the server was healthy the whole time — main's own Node-fetch health check (loopback in `NO_PROXY`) had already passed before the window opened. The prewarm overlaps proxy init with sidecar startup; the gate fallback distinguishes "server down" from "renderer network stack not ready". | Keep all three pieces; take upstream's surrounding changes. If upstream restructures `ConnectionGate`, re-apply the vouch-then-extend fallback around whatever its blocking window becomes. Keep the `local-server-health` channel name stable. |
@@ -295,7 +296,7 @@ from the squash message first, or use a plain merge.
 | Dialogs close on a button, never on an outside click: `packages/ui/src/components/dialog.tsx`, `packages/ui/src/components/dialog.css`, `packages/ui/src/v2/components/dialog-v2.tsx`, `packages/ui/src/v2/components/dialog-v2.css`, `packages/ui/src/components/image-preview.tsx`, plus the `*.stories.tsx` beside the two dialogs | All three `Kobalte.Content`s take `onInteractOutside={(e) => e.preventDefault()}`, which is what actually blocks Kobalte's dismissable layer (the context row above only removes the explicit overlay click). Both `Dialog`s gained `closeLabel?`/`hideClose?` and now render the `Kobalte.CloseButton` themselves, as the last child of their content, absolutely positioned at the content's top-right — v1 at 16px/20px (12px/12px when `data-no-header`), v2 at 14px/14px, both at `z-index: 30` so they clear the settings tab header's sticky `z-index: 10`. The button was removed from v2's `DialogHeader` (which loses its `hideClose`/`closeLabel` props and its `data-hide-close` attribute) and from v1's header `Switch`, whose `action` branch used to *replace* it; `action` now simply renders. Headers reserve the corner in `padding-right` (v1 52px, v2 42px) and v1's title takes `flex: 1`; both containers take a `min-height` (v1 52px, v2 48px) so a short `fit` dialog cannot clip the button. `aria-label` defaults to `ui.common.close` through `useI18n` — the first v2 component to use the UI i18n context, which has an English fallback. | Every dialog needed a visible way out once the backdrop stopped being one, including the dozen whose call sites passed `hideClose`. Pinning the button to the content corner rather than laying it out in the header is what lets header-less dialogs (settings, release notes, the command palettes) have one at all; keeping it inside `Kobalte.Content` keeps it inside the focus trap and the modal's pointer-events layer. | Keep the corner button and the `onInteractOutside` guards. Upstream owns the header/body/footer layout — take its changes and re-apply the `padding-right` reserve and the close button on top. If upstream adds its own close button to `DialogHeader`, drop ours from `Dialog` rather than shipping two. |
 | Dialog close buttons at the call sites: `packages/app/src/sandbox/{dialog-add,dialog-add-default,dialog-delete,dialog-mounts}.tsx`, `packages/app/src/wsl/{dialog-add-server,dialog-delete}.tsx`, `packages/app/src/components/{dialog-manage-models,dialog-connect-provider,dialog-select-model-unpaid-v2,session-actions-menu,settings-v2/dialog-server-v2}.tsx`, `packages/app/src/components/gateway/dialog-configure.tsx`, `packages/app/src/components/dialog-select-file.tsx`, `packages/app/src/components/dialog-command-palette-v2.css` | Dropped every `hideClose`/`closeLabel` prop from `DialogHeader` (the button moved to `Dialog`, and hiding it is no longer wanted anywhere it was hidden). `dialog-configure` passes `hideClose` on its `Dialog` instead — it is the configure gate, which the dialog stack also marks `persistent`, so a close button there would be inert. The two search-first dialogs reserve the corner the button now occupies: `dialog-select-file` via `[&_[data-slot=list-search-wrapper]]:pr-10`, the v2 command palette via `padding-right` on `.command-palette-v2-search`. | Fork-only sandbox/WSL/gateway dialogs aside, these are upstream files whose only change is a removed prop. | Take upstream's version of these call sites and re-drop `hideClose`. The `hideClose` on `dialog-configure` is fork-only and must stay. |
 
-| Gateway key recovery: `packages/app/src/desktop-menu.ts`, `packages/app/src/i18n/{en,es}.ts`, `packages/desktop/src/preload/{index,types}.ts` | A "Log in/Configure" item dispatching the fork-only `gateway.apiKey.new` command — in the macOS app menu under Settings, and in the Windows/Linux **File** menu (`platforms: ["windows"]`) under its Settings, the same split Settings itself uses since those builds render no app menu. The label names the sign-in, not the key: re-authenticating is what the item is reached for, minting a key is the side effect, and the session-upload toast's **Log in** button dispatches the same command. The command id stays `gateway.apiKey.new` — it is the wire name the desktop menus dispatch. i18n gains `command.gateway.apiKey.new` and `toast.sessionUpload.paused.{title,description,action.login}`. Preload gains the `gateway-sso-ensure-key` and `gateway-sso-consume-upload-nudge` channels on the existing `gatewaySso` namespace (the nudge rides this namespace because signing back in is its entire remedy, and `GatewaySsoPlatform` in the fork-only `packages/app/src/gateway/types.ts` is where it can be typed without touching upstream's `platform.tsx`). The logic is fork-only: `packages/desktop/src/main/gateway-sso/controller.ts` gains `ensureKey()`, the desktop twin of codev-hub's `ensureFreshGatewayKey` — validate the stored key against the gateway's `/key/info` (`@codev/gateway`'s already-exported `validateApiKey`, previously with no production caller), bounded by a 2.5s race so a slow gateway cannot delay startup; a definite 401/403 tries `silentSso` + `fetchApiKey` and re-saves the record with every other field intact, returning the credential for the renderer to merge into the local server's auth registry (only the renderer writes to the server); anything else is left alone. `packages/app/src/components/gateway/gateway-configure-gate.tsx` (fork-only) registers the command behind its existing driver election and runs the pre-flight once per window after sync settles, opening `DialogConfigure` only on `needs-login`; on mount it also consumes the session-upload sign-in nudge (see the desktop session upload row) and raises a persistent toast whose **Log in** action is that same `openConfigure`. `DialogConfigure` gains a `dismissable` prop driving both `setPersistent` and `hideClose`: the gate's copy stays trapped (the provider-setup screen the dialog rework deliberately exempts), while the two new entry points — the menu command and the pre-flight — are escapable, since a provider is configured in both cases and the dialog otherwise has no close button, no backdrop dismissal and no Escape. | Gateway keys expire on a schedule CoDev does not control, and nothing in the desktop app noticed: `DialogConfigure` had exactly one caller, the gate, which fires only when no provider is connected — and a dead key is still a connected provider, so every message 401'd with the sign-in flow unreachable. The silent re-mint mirrors what the hub already does for CLI launches, so the common case costs the user nothing. | Keep the menu item on both platforms (dropping the `platforms: ["windows"]` twin loses it entirely on Windows/Linux, which render no app menu) and keep the pre-flight's "only a definite rejection acts" rule — treating an unreachable gateway as a dead key would lock people out on a flaky network. Take upstream's surrounding menu/i18n/preload changes. Keep the "Log in/Configure" label paired with the toast action label — they name one flow. |
+| Gateway key recovery: `packages/app/src/desktop-menu.ts`, `packages/app/src/i18n/{en,es}.ts`, `packages/desktop/src/preload/{index,types}.ts` | A "Log in/Configure" item (`menu.login` in the dicts) dispatching the fork-only `gateway.apiKey.new` command — in the macOS app menu under Settings, and in the Windows/Linux **File** menu (`platforms: ["windows"]`) under its Settings, the same split Settings itself uses since those builds render no app menu. The label names the sign-in, not the key: re-authenticating is what the item is reached for, minting a key is the side effect, and the session-upload toast's **Log in** button dispatches the same command. The command id stays `gateway.apiKey.new` — it is the wire name the desktop menus dispatch. i18n gains `command.gateway.apiKey.new` and `toast.sessionUpload.paused.{title,description,action.login}`. Preload gains the `gateway-sso-ensure-key` and `gateway-sso-consume-upload-nudge` channels on the existing `gatewaySso` namespace (the nudge rides this namespace because signing back in is its entire remedy, and `GatewaySsoPlatform` in the fork-only `packages/app/src/gateway/types.ts` is where it can be typed without touching upstream's `platform.tsx`). The logic is fork-only: `packages/desktop/src/main/gateway-sso/controller.ts` gains `ensureKey()`, the desktop twin of codev-hub's `ensureFreshGatewayKey` — validate the stored key against the gateway's `/key/info` (`@codev/gateway`'s already-exported `validateApiKey`, previously with no production caller), bounded by a 2.5s race so a slow gateway cannot delay startup; a definite 401/403 tries `silentSso` + `fetchApiKey` and re-saves the record with every other field intact, returning the credential for the renderer to merge into the local server's auth registry (only the renderer writes to the server); anything else is left alone. `packages/app/src/components/gateway/gateway-configure-gate.tsx` (fork-only) registers the command behind its existing driver election and runs the pre-flight once per window after sync settles, opening `DialogConfigure` only on `needs-login`; on mount it also consumes the session-upload sign-in nudge (see the desktop session upload row) and raises a persistent toast whose **Log in** action is that same `openConfigure`. `DialogConfigure` gains a `dismissable` prop driving both `setPersistent` and `hideClose`: the gate's copy stays trapped (the provider-setup screen the dialog rework deliberately exempts), while the two new entry points — the menu command and the pre-flight — are escapable, since a provider is configured in both cases and the dialog otherwise has no close button, no backdrop dismissal and no Escape. | Gateway keys expire on a schedule CoDev does not control, and nothing in the desktop app noticed: `DialogConfigure` had exactly one caller, the gate, which fires only when no provider is connected — and a dead key is still a connected provider, so every message 401'd with the sign-in flow unreachable. The silent re-mint mirrors what the hub already does for CLI launches, so the common case costs the user nothing. | Keep the menu item on both platforms (dropping the `platforms: ["windows"]` twin loses it entirely on Windows/Linux, which render no app menu) and keep the pre-flight's "only a definite rejection acts" rule — treating an unreachable gateway as a dead key would lock people out on a flaky network. Take upstream's surrounding menu/i18n/preload changes. Keep the "Log in/Configure" label paired with the toast action label — they name one flow. |
 
 | `packages/core/src/filesystem/search.ts`, `packages/app/e2e/utils/mock-server.ts` | `fffLayer`'s `find` drops the worktree-root entry: fff ranks the root itself into an empty-query result, where it leads every list as a bare `/` — a mention naming no file — while the ripgrep fallback never emits it. The e2e mock server gains an `agents` config field (defaulting to the previous single primary agent) so a spec can supply subagents; the `@` menu hides primary agents, so the default list left nothing to rank files against. | Empty-query `@` menus (see the `@` autocomplete rows) made the root visible for the first time, at the top of the list. Both search layers should answer the same way. | Keep the root filter and the `agents` default; take upstream's surrounding changes. |
 
diff --git a/packages/app/package.json b/packages/app/package.json
index ddd531a6fc..35cbe88b1d 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -6,6 +6,7 @@
   "exports": {
     ".": "./src/index.ts",
     "./desktop-menu": "./src/desktop-menu.ts",
+    "./i18n/*": "./src/i18n/*.ts",
     "./updater": "./src/updater.ts",
     "./wsl/types": "./src/wsl/types.ts",
     "./sandbox/types": "./src/sandbox/types.ts",
diff --git a/packages/app/src/components/windows-app-menu.tsx b/packages/app/src/components/windows-app-menu.tsx
index bc23805227..db6e6e074c 100644
--- a/packages/app/src/components/windows-app-menu.tsx
+++ b/packages/app/src/components/windows-app-menu.tsx
@@ -6,6 +6,7 @@ import { IconButtonV2 } from "@opencode-ai/ui/v2/icon-button-v2"
 import { Icon as IconV2 } from "@opencode-ai/ui/v2/icon"
 
 import { useCommand } from "@/context/command"
+import { useLanguage } from "@/context/language"
 import {
   DESKTOP_MENU,
   desktopMenuItemDisabled,
@@ -20,6 +21,7 @@ export function WindowsAppMenu(props: {
   platform: ReturnType<typeof usePlatform>
   variant?: "legacy" | "v2"
 }) {
+  const language = useLanguage()
   let lastFocused: HTMLElement | undefined
 
   const rememberFocus = () => {
@@ -85,7 +87,7 @@ export function WindowsAppMenu(props: {
           <DropdownMenu.Group>
             <DropdownMenu.GroupLabel class="desktop-app-menu-heading">CoDev</DropdownMenu.GroupLabel>
             {DESKTOP_MENU.filter((menu) => desktopMenuVisible(menu, "windows")).map((menu) => (
-              <DesktopMenuSubmenu label={menu.label}>
+              <DesktopMenuSubmenu label={language.t(menu.labelKey)}>
                 {menu.items
                   ?.filter((entry) => desktopMenuVisible(entry, "windows"))
                   .map((entry) =>
@@ -93,7 +95,7 @@ export function WindowsAppMenu(props: {
                       <DropdownMenu.Separator />
                     ) : (
                       <DesktopMenuItem
-                        label={entry.label ?? ""}
+                        label={entry.labelKey ? language.t(entry.labelKey) : ""}
                         keybind={entry.command ? props.command.keybind(entry.command) : entry.accelerator?.windows}
                         disabled={desktopMenuItemDisabled(entry, {
                           updaterStatus: props.platform.updater?.state().status,
diff --git a/packages/app/src/desktop-menu.test.ts b/packages/app/src/desktop-menu.test.ts
index d55cbce61c..e0724342a2 100644
--- a/packages/app/src/desktop-menu.test.ts
+++ b/packages/app/src/desktop-menu.test.ts
@@ -4,13 +4,31 @@ import { DESKTOP_MENU, desktopMenuItemDisabled, desktopMenuVisible, type Desktop
 describe("desktop menu", () => {
   test("exports logs through the desktop command registry", () => {
     const items = DESKTOP_MENU.flatMap((menu) => menu.items ?? []).filter(
-      (item) => item.type === "item" && item.label === "Export Logs...",
+      (item) => item.type === "item" && item.labelKey === "menu.exportLogs",
     )
 
     expect(items).toHaveLength(2)
     expect(items.every((item) => item.type === "item" && item.command === "logs.export" && !item.action)).toBe(true)
   })
 
+  // The menu is the one surface whose labels are resolved twice — by the
+  // renderer for the Windows/Linux titlebar menu and by the desktop main
+  // process for the macOS menu bar — and neither can fall back to English text
+  // that is no longer in the table. A key missing from a locale renders that
+  // item blank there.
+  test("translates every menu label in every locale", async () => {
+    const keys = DESKTOP_MENU.flatMap((menu) => [
+      menu.labelKey,
+      ...(menu.items ?? []).flatMap((item) => (item.type === "item" && item.labelKey ? [item.labelKey] : [])),
+    ])
+
+    expect(keys.length).toBeGreaterThan(0)
+    for (const locale of ["en", "es", "vi"]) {
+      const { dict } = (await import(`./i18n/${locale}`)) as { dict: Record<string, string> }
+      expect({ locale, missing: keys.filter((key) => !dict[key]) }).toEqual({ locale, missing: [] })
+    }
+  })
+
   test("offers an update check on every platform exactly once", () => {
     for (const platform of ["macos", "windows"] as const) {
       const items = DESKTOP_MENU.filter((menu) => desktopMenuVisible(menu, platform)).flatMap((menu) =>
@@ -45,7 +63,7 @@ describe("desktop menu", () => {
     }
 
     test("defers to the command registry for command entries", () => {
-      const entry = { type: "item", label: "Export Logs...", command: "logs.export" } as const
+      const entry = { type: "item", labelKey: "menu.exportLogs", command: "logs.export" } as const
 
       expect(desktopMenuItemDisabled(entry, { commandDisabled: (id) => id === "logs.export" })).toBe(true)
       expect(desktopMenuItemDisabled(entry, { commandDisabled: never })).toBe(false)
@@ -54,7 +72,7 @@ describe("desktop menu", () => {
     test("leaves link and role entries alone", () => {
       expect(
         desktopMenuItemDisabled(
-          { type: "item", label: "Report a Bug", href: "https://example.test" },
+          { type: "item", labelKey: "menu.reportBug", href: "https://example.test" },
           {
             commandDisabled: never,
           },
diff --git a/packages/app/src/desktop-menu.ts b/packages/app/src/desktop-menu.ts
index 4602053b7a..a11c997c33 100644
--- a/packages/app/src/desktop-menu.ts
+++ b/packages/app/src/desktop-menu.ts
@@ -1,6 +1,13 @@
 import { DOCS_URL } from "@codev/brand"
+import type { dict } from "./i18n/en"
 import type { UpdaterState } from "./updater"
 
+// Menu labels are dictionary keys, not text: this table is read by the macOS
+// native menu in the desktop main process and by the Windows/Linux titlebar
+// menu in the renderer, and both resolve it against the app dictionaries. A
+// literal here is a label that never translates.
+export type DesktopMenuLabelKey = keyof typeof dict
+
 export type DesktopMenuPlatform = "macos" | "windows"
 
 export type DesktopMenuAction =
@@ -48,7 +55,7 @@ export type DesktopMenuRole =
 
 export type DesktopMenuItem = {
   type: "item"
-  label?: string
+  labelKey?: DesktopMenuLabelKey
   command?: string
   action?: DesktopMenuAction
   role?: DesktopMenuRole
@@ -67,7 +74,7 @@ export type DesktopMenuEntry = DesktopMenuItem | DesktopMenuSeparator
 
 export type DesktopMenu = {
   id: string
-  label: string
+  labelKey: DesktopMenuLabelKey
   role?: DesktopMenuRole
   items?: DesktopMenuEntry[]
   platforms?: DesktopMenuPlatform[]
@@ -76,17 +83,17 @@ export type DesktopMenu = {
 export const DESKTOP_MENU: DesktopMenu[] = [
   {
     id: "app",
-    label: "CoDev",
+    labelKey: "menu.app",
     platforms: ["macos"],
     items: [
       { type: "item", role: "about" },
-      { type: "item", label: "Check for Updates...", action: "app.checkForUpdates", enabled: "updater" },
-      { type: "item", label: "Settings", command: "settings.open", accelerator: { macos: "Cmd+," } },
-      { type: "item", label: "Log in/Configure", command: "gateway.apiKey.new" },
-      { type: "item", label: "Upload Session Logs", action: "upload.sessions" },
-      { type: "item", label: "Reload Webview", action: "view.reload" },
-      { type: "item", label: "Restart", action: "app.relaunch" },
-      { type: "item", label: "Export Logs...", command: "logs.export" },
+      { type: "item", labelKey: "menu.checkForUpdates", action: "app.checkForUpdates", enabled: "updater" },
+      { type: "item", labelKey: "menu.settings", command: "settings.open", accelerator: { macos: "Cmd+," } },
+      { type: "item", labelKey: "menu.login", command: "gateway.apiKey.new" },
+      { type: "item", labelKey: "menu.uploadSessionLogs", action: "upload.sessions" },
+      { type: "item", labelKey: "menu.reloadWebview", action: "view.reload" },
+      { type: "item", labelKey: "menu.restart", action: "app.relaunch" },
+      { type: "item", labelKey: "menu.exportLogs", command: "logs.export" },
       { type: "separator" },
       { type: "item", role: "hide" },
       { type: "item", role: "hideOthers" },
@@ -97,18 +104,18 @@ export const DESKTOP_MENU: DesktopMenu[] = [
   },
   {
     id: "file",
-    label: "File",
+    labelKey: "menu.file",
     items: [
       {
         type: "item",
-        label: "New Session",
+        labelKey: "menu.newSession",
         command: "session.new",
         accelerator: { macos: "Shift+Cmd+S" },
       },
-      { type: "item", label: "Open Project...", command: "project.open", accelerator: { macos: "Cmd+O" } },
+      { type: "item", labelKey: "menu.openProject", command: "project.open", accelerator: { macos: "Cmd+O" } },
       {
         type: "item",
-        label: "Settings",
+        labelKey: "menu.settings",
         command: "settings.open",
         accelerator: { windows: "Ctrl+," },
         platforms: ["windows"],
@@ -117,41 +124,41 @@ export const DESKTOP_MENU: DesktopMenu[] = [
       // Windows/Linux menu does not render — same split Settings itself uses.
       {
         type: "item",
-        label: "Log in/Configure",
+        labelKey: "menu.login",
         command: "gateway.apiKey.new",
         platforms: ["windows"],
       },
       // macOS carries this in the app menu below its sign-in sibling.
       {
         type: "item",
-        label: "Upload Session Logs",
+        labelKey: "menu.uploadSessionLogs",
         action: "upload.sessions",
         platforms: ["windows"],
       },
       {
         type: "item",
-        label: "New Window",
+        labelKey: "menu.newWindow",
         action: "window.new",
         accelerator: { macos: "Cmd+Shift+N", windows: "Ctrl+Shift+N" },
       },
       { type: "separator" },
-      { type: "item", label: "Close Window", action: "window.close", role: "close" },
+      { type: "item", labelKey: "menu.closeWindow", action: "window.close", role: "close" },
     ],
   },
   {
     id: "edit",
-    label: "Edit",
+    labelKey: "menu.edit",
     items: [
-      { type: "item", label: "Undo", action: "edit.undo", role: "undo", accelerator: { windows: "Ctrl+Z" } },
-      { type: "item", label: "Redo", action: "edit.redo", role: "redo", accelerator: { windows: "Ctrl+Y" } },
+      { type: "item", labelKey: "menu.undo", action: "edit.undo", role: "undo", accelerator: { windows: "Ctrl+Z" } },
+      { type: "item", labelKey: "menu.redo", action: "edit.redo", role: "redo", accelerator: { windows: "Ctrl+Y" } },
       { type: "separator" },
-      { type: "item", label: "Cut", action: "edit.cut", role: "cut", accelerator: { windows: "Ctrl+X" } },
-      { type: "item", label: "Copy", action: "edit.copy", role: "copy", accelerator: { windows: "Ctrl+C" } },
-      { type: "item", label: "Paste", action: "edit.paste", role: "paste", accelerator: { windows: "Ctrl+V" } },
-      { type: "item", label: "Delete", action: "edit.delete" },
+      { type: "item", labelKey: "menu.cut", action: "edit.cut", role: "cut", accelerator: { windows: "Ctrl+X" } },
+      { type: "item", labelKey: "menu.copy", action: "edit.copy", role: "copy", accelerator: { windows: "Ctrl+C" } },
+      { type: "item", labelKey: "menu.paste", action: "edit.paste", role: "paste", accelerator: { windows: "Ctrl+V" } },
+      { type: "item", labelKey: "menu.delete", action: "edit.delete" },
       {
         type: "item",
-        label: "Select All",
+        labelKey: "menu.selectAll",
         action: "edit.selectAll",
         role: "selectAll",
         accelerator: { windows: "Ctrl+A" },
@@ -160,47 +167,64 @@ export const DESKTOP_MENU: DesktopMenu[] = [
   },
   {
     id: "view",
-    label: "View",
+    labelKey: "menu.view",
     items: [
-      { type: "item", label: "Toggle Sidebar", command: "sidebar.toggle" },
-      { type: "item", label: "Toggle Terminal", command: "terminal.toggle", accelerator: { macos: "Ctrl+`" } },
-      { type: "item", label: "Toggle File Tree", command: "fileTree.toggle" },
+      { type: "item", labelKey: "menu.toggleSidebar", command: "sidebar.toggle" },
+      { type: "item", labelKey: "menu.toggleTerminal", command: "terminal.toggle", accelerator: { macos: "Ctrl+`" } },
+      { type: "item", labelKey: "menu.toggleFileTree", command: "fileTree.toggle" },
       { type: "separator" },
-      { type: "item", label: "Reload", action: "view.reload", role: "reload" },
-      { type: "item", label: "Toggle Developer Tools", action: "view.toggleDevTools", role: "toggleDevTools" },
+      { type: "item", labelKey: "menu.reload", action: "view.reload", role: "reload" },
+      { type: "item", labelKey: "menu.toggleDevTools", action: "view.toggleDevTools", role: "toggleDevTools" },
       { type: "separator" },
       {
         type: "item",
-        label: "Actual Size",
+        labelKey: "menu.actualSize",
         action: "view.resetZoom",
         role: "resetZoom",
         accelerator: { windows: "Ctrl+0" },
       },
-      { type: "item", label: "Zoom In", action: "view.zoomIn", role: "zoomIn", accelerator: { windows: "Ctrl++" } },
-      { type: "item", label: "Zoom Out", action: "view.zoomOut", role: "zoomOut", accelerator: { windows: "Ctrl+-" } },
+      {
+        type: "item",
+        labelKey: "menu.zoomIn",
+        action: "view.zoomIn",
+        role: "zoomIn",
+        accelerator: { windows: "Ctrl++" },
+      },
+      {
+        type: "item",
+        labelKey: "menu.zoomOut",
+        action: "view.zoomOut",
+        role: "zoomOut",
+        accelerator: { windows: "Ctrl+-" },
+      },
       { type: "separator" },
-      { type: "item", label: "Toggle Full Screen", action: "view.toggleFullscreen", role: "togglefullscreen" },
+      { type: "item", labelKey: "menu.toggleFullScreen", action: "view.toggleFullscreen", role: "togglefullscreen" },
     ],
   },
   {
     id: "go",
-    label: "Go",
+    labelKey: "menu.go",
     items: [
-      { type: "item", label: "Back", command: "common.goBack", accelerator: { macos: "Cmd+[" } },
-      { type: "item", label: "Forward", command: "common.goForward", accelerator: { macos: "Cmd+]" } },
+      { type: "item", labelKey: "menu.back", command: "common.goBack", accelerator: { macos: "Cmd+[" } },
+      { type: "item", labelKey: "menu.forward", command: "common.goForward", accelerator: { macos: "Cmd+]" } },
       { type: "separator" },
-      { type: "item", label: "Previous Session", command: "session.previous", accelerator: { macos: "Option+Up" } },
-      { type: "item", label: "Next Session", command: "session.next", accelerator: { macos: "Option+Down" } },
+      {
+        type: "item",
+        labelKey: "menu.previousSession",
+        command: "session.previous",
+        accelerator: { macos: "Option+Up" },
+      },
+      { type: "item", labelKey: "menu.nextSession", command: "session.next", accelerator: { macos: "Option+Down" } },
       { type: "separator" },
       {
         type: "item",
-        label: "Previous Project",
+        labelKey: "menu.previousProject",
         command: "project.previous",
         accelerator: { macos: "Cmd+Option+Up" },
       },
       {
         type: "item",
-        label: "Next Project",
+        labelKey: "menu.nextProject",
         command: "project.next",
         accelerator: { macos: "Cmd+Option+Down" },
       },
@@ -208,30 +232,30 @@ export const DESKTOP_MENU: DesktopMenu[] = [
   },
   {
     id: "window",
-    label: "Window",
+    labelKey: "menu.window",
     role: "windowMenu",
     items: [
-      { type: "item", label: "Minimize", action: "window.minimize" },
-      { type: "item", label: "Maximize", action: "window.toggleMaximize" },
+      { type: "item", labelKey: "menu.minimize", action: "window.minimize" },
+      { type: "item", labelKey: "menu.maximize", action: "window.toggleMaximize" },
       { type: "separator" },
-      { type: "item", label: "Close Window", action: "window.close" },
+      { type: "item", labelKey: "menu.closeWindow", action: "window.close" },
     ],
   },
   {
     id: "help",
-    label: "Help",
+    labelKey: "menu.help",
     items: [
-      { type: "item", label: "CoDev Documentation", href: DOCS_URL },
-      { type: "item", label: "Export Logs...", command: "logs.export" },
+      { type: "item", labelKey: "menu.documentation", href: DOCS_URL },
+      { type: "item", labelKey: "menu.exportLogs", command: "logs.export" },
       { type: "separator" },
       {
         type: "item",
-        label: "Share Feedback",
+        labelKey: "menu.shareFeedback",
         href: "https://github.com/quickbeard/codev-code/issues/new?template=feature-request.yml",
       },
       {
         type: "item",
-        label: "Report a Bug",
+        labelKey: "menu.reportBug",
         href: "https://github.com/quickbeard/codev-code/issues/new?template=bug-report.yml",
       },
       // macOS has this in the app menu, which the Windows/Linux menu does not
@@ -240,7 +264,7 @@ export const DESKTOP_MENU: DesktopMenu[] = [
       { type: "separator", platforms: ["windows"] },
       {
         type: "item",
-        label: "Check for Updates...",
+        labelKey: "menu.checkForUpdates",
         action: "app.checkForUpdates",
         enabled: "updater",
         platforms: ["windows"],
diff --git a/packages/app/src/i18n/en.ts b/packages/app/src/i18n/en.ts
index 30ae834e18..60cf1480da 100644
--- a/packages/app/src/i18n/en.ts
+++ b/packages/app/src/i18n/en.ts
@@ -673,6 +673,54 @@ export const dict = {
     "Your CoDev sign-in expired, so sessions are no longer uploaded for analysis. Log in again to resume — pending sessions upload automatically afterwards.",
   "toast.sessionUpload.paused.action.login": "Log in",
 
+  // The desktop app menu (macOS native menu bar and the Windows/Linux
+  // titlebar menu) — see desktop-menu.ts.
+  "menu.app": "CoDev",
+  "menu.file": "File",
+  "menu.edit": "Edit",
+  "menu.view": "View",
+  "menu.go": "Go",
+  "menu.window": "Window",
+  "menu.help": "Help",
+  "menu.checkForUpdates": "Check for Updates...",
+  "menu.settings": "Settings",
+  "menu.login": "Log in/Configure",
+  "menu.uploadSessionLogs": "Upload Session Logs",
+  "menu.reloadWebview": "Reload Webview",
+  "menu.restart": "Restart",
+  "menu.exportLogs": "Export Logs...",
+  "menu.newSession": "New Session",
+  "menu.openProject": "Open Project...",
+  "menu.newWindow": "New Window",
+  "menu.closeWindow": "Close Window",
+  "menu.undo": "Undo",
+  "menu.redo": "Redo",
+  "menu.cut": "Cut",
+  "menu.copy": "Copy",
+  "menu.paste": "Paste",
+  "menu.delete": "Delete",
+  "menu.selectAll": "Select All",
+  "menu.toggleSidebar": "Toggle Sidebar",
+  "menu.toggleTerminal": "Toggle Terminal",
+  "menu.toggleFileTree": "Toggle File Tree",
+  "menu.reload": "Reload",
+  "menu.toggleDevTools": "Toggle Developer Tools",
+  "menu.actualSize": "Actual Size",
+  "menu.zoomIn": "Zoom In",
+  "menu.zoomOut": "Zoom Out",
+  "menu.toggleFullScreen": "Toggle Full Screen",
+  "menu.back": "Back",
+  "menu.forward": "Forward",
+  "menu.previousSession": "Previous Session",
+  "menu.nextSession": "Next Session",
+  "menu.previousProject": "Previous Project",
+  "menu.nextProject": "Next Project",
+  "menu.minimize": "Minimize",
+  "menu.maximize": "Maximize",
+  "menu.documentation": "CoDev Documentation",
+  "menu.shareFeedback": "Share Feedback",
+  "menu.reportBug": "Report a Bug",
+
   "error.page.title": "Something went wrong",
   "error.page.description": "An error occurred while loading the application.",
   "error.page.description.localServerStartup": "An error occurred while starting the local server.",
diff --git a/packages/app/src/i18n/es.ts b/packages/app/src/i18n/es.ts
index c9048b9b6f..38deb9d53c 100644
--- a/packages/app/src/i18n/es.ts
+++ b/packages/app/src/i18n/es.ts
@@ -665,6 +665,54 @@ export const dict = {
     "Tu sesión de CoDev caducó, así que las sesiones ya no se suben para su análisis. Vuelve a iniciar sesión para reanudarla: las sesiones pendientes se subirán automáticamente después.",
   "toast.sessionUpload.paused.action.login": "Iniciar sesión",
 
+  // The desktop app menu (macOS native menu bar and the Windows/Linux
+  // titlebar menu) — see desktop-menu.ts.
+  "menu.app": "CoDev",
+  "menu.file": "Archivo",
+  "menu.edit": "Editar",
+  "menu.view": "Ver",
+  "menu.go": "Ir",
+  "menu.window": "Ventana",
+  "menu.help": "Ayuda",
+  "menu.checkForUpdates": "Buscar actualizaciones...",
+  "menu.settings": "Ajustes",
+  "menu.login": "Iniciar sesión/Configurar",
+  "menu.uploadSessionLogs": "Subir registros de sesión",
+  "menu.reloadWebview": "Recargar webview",
+  "menu.restart": "Reiniciar",
+  "menu.exportLogs": "Exportar registros...",
+  "menu.newSession": "Nueva sesión",
+  "menu.openProject": "Abrir proyecto...",
+  "menu.newWindow": "Nueva ventana",
+  "menu.closeWindow": "Cerrar ventana",
+  "menu.undo": "Deshacer",
+  "menu.redo": "Rehacer",
+  "menu.cut": "Cortar",
+  "menu.copy": "Copiar",
+  "menu.paste": "Pegar",
+  "menu.delete": "Eliminar",
+  "menu.selectAll": "Seleccionar todo",
+  "menu.toggleSidebar": "Alternar barra lateral",
+  "menu.toggleTerminal": "Alternar terminal",
+  "menu.toggleFileTree": "Alternar árbol de archivos",
+  "menu.reload": "Recargar",
+  "menu.toggleDevTools": "Alternar herramientas de desarrollo",
+  "menu.actualSize": "Tamaño real",
+  "menu.zoomIn": "Acercar",
+  "menu.zoomOut": "Alejar",
+  "menu.toggleFullScreen": "Alternar pantalla completa",
+  "menu.back": "Atrás",
+  "menu.forward": "Adelante",
+  "menu.previousSession": "Sesión anterior",
+  "menu.nextSession": "Siguiente sesión",
+  "menu.previousProject": "Proyecto anterior",
+  "menu.nextProject": "Siguiente proyecto",
+  "menu.minimize": "Minimizar",
+  "menu.maximize": "Maximizar",
+  "menu.documentation": "Documentación de CoDev",
+  "menu.shareFeedback": "Enviar comentarios",
+  "menu.reportBug": "Informar de un error",
+
   "error.page.title": "Algo salió mal",
   "error.page.description": "Ocurrió un error al cargar la aplicación.",
   "error.page.description.localServerStartup": "Ocurrió un error al iniciar el servidor local.",
diff --git a/packages/app/src/i18n/vi.ts b/packages/app/src/i18n/vi.ts
index 01de138634..ef18a3a947 100644
--- a/packages/app/src/i18n/vi.ts
+++ b/packages/app/src/i18n/vi.ts
@@ -670,6 +670,54 @@ export const dict = {
     "Phiên đăng nhập CoDev của bạn đã hết hạn nên các phiên làm việc không còn được tải lên để phân tích. Hãy đăng nhập lại để tiếp tục — các phiên đang chờ sẽ tự động được tải lên sau đó.",
   "toast.sessionUpload.paused.action.login": "Đăng nhập",
 
+  // The desktop app menu (macOS native menu bar and the Windows/Linux
+  // titlebar menu) — see desktop-menu.ts.
+  "menu.app": "CoDev",
+  "menu.file": "Tệp",
+  "menu.edit": "Chỉnh sửa",
+  "menu.view": "Hiển thị",
+  "menu.go": "Điều hướng",
+  "menu.window": "Cửa sổ",
+  "menu.help": "Trợ giúp",
+  "menu.checkForUpdates": "Kiểm tra cập nhật...",
+  "menu.settings": "Cài đặt",
+  "menu.login": "Đăng nhập/Cấu hình",
+  "menu.uploadSessionLogs": "Tải session logs lên",
+  "menu.reloadWebview": "Tải lại webview",
+  "menu.restart": "Khởi động lại",
+  "menu.exportLogs": "Xuất logs...",
+  "menu.newSession": "Session mới",
+  "menu.openProject": "Mở dự án...",
+  "menu.newWindow": "Cửa sổ mới",
+  "menu.closeWindow": "Đóng cửa sổ",
+  "menu.undo": "Hoàn tác",
+  "menu.redo": "Làm lại",
+  "menu.cut": "Cắt",
+  "menu.copy": "Sao chép",
+  "menu.paste": "Dán",
+  "menu.delete": "Xóa",
+  "menu.selectAll": "Chọn tất cả",
+  "menu.toggleSidebar": "Bật/tắt thanh bên",
+  "menu.toggleTerminal": "Bật/tắt terminal",
+  "menu.toggleFileTree": "Bật/tắt cây tệp",
+  "menu.reload": "Tải lại",
+  "menu.toggleDevTools": "Bật/tắt developer tools",
+  "menu.actualSize": "Kích thước thực",
+  "menu.zoomIn": "Phóng to",
+  "menu.zoomOut": "Thu nhỏ",
+  "menu.toggleFullScreen": "Bật/tắt toàn màn hình",
+  "menu.back": "Quay lại",
+  "menu.forward": "Tiến tới",
+  "menu.previousSession": "Session trước",
+  "menu.nextSession": "Session tiếp theo",
+  "menu.previousProject": "Dự án trước",
+  "menu.nextProject": "Dự án tiếp theo",
+  "menu.minimize": "Thu nhỏ cửa sổ",
+  "menu.maximize": "Phóng to cửa sổ",
+  "menu.documentation": "Tài liệu CoDev",
+  "menu.shareFeedback": "Gửi phản hồi",
+  "menu.reportBug": "Báo lỗi",
+
   "error.page.title": "Đã xảy ra sự cố",
   "error.page.description": "Đã xảy ra lỗi khi tải ứng dụng.",
   "error.page.description.localServerStartup": "Đã xảy ra lỗi khi khởi động server cục bộ.",
diff --git a/packages/desktop/src/main/index.ts b/packages/desktop/src/main/index.ts
index dc4a25b935..08c5c4378b 100644
--- a/packages/desktop/src/main/index.ts
+++ b/packages/desktop/src/main/index.ts
@@ -534,7 +534,7 @@ const main = Effect.gen(function* () {
 
   const windows = restoreMainWindows()
   if (windows.length) {
-    createMenu({
+    void createMenu({
       trigger: (id) => {
         const win = getLastFocusedWindow()
         if (win) sendMenuCommand(win, id)
diff --git a/packages/desktop/src/main/ipc.ts b/packages/desktop/src/main/ipc.ts
index 69755c78f4..e61ced689a 100644
--- a/packages/desktop/src/main/ipc.ts
+++ b/packages/desktop/src/main/ipc.ts
@@ -7,6 +7,7 @@ import type { DesktopMenuAction } from "@opencode-ai/app/desktop-menu"
 
 import type { FatalRendererError, ServerReadyData, TitlebarTheme } from "../preload/types"
 import { runDesktopMenuAction } from "./desktop-menu-actions"
+import { refreshMenuLanguage } from "./menu"
 import { setForceFocus } from "./debug"
 import { assertAttachmentBudget, createPickedFileAuthorizations } from "./attachment-picker"
 import { getStore, removeStoreFileIfEmpty } from "./store"
@@ -119,6 +120,9 @@ export function registerIpcHandlers(deps: Deps) {
   })
   ipcMain.handle("store-set", (_event: IpcMainInvokeEvent, name: string, key: string, value: string) => {
     getStore(name).set(key, value)
+    // Fork: the macOS menu bar is built in this process from the locale this
+    // very write carries, so it has to be told when the language changes.
+    if (name === "codev.global.dat" && key === "language") refreshMenuLanguage()
   })
   ipcMain.handle("store-delete", (_event: IpcMainInvokeEvent, name: string, key: string) => {
     getStore(name).delete(key)
diff --git a/packages/desktop/src/main/menu-i18n.ts b/packages/desktop/src/main/menu-i18n.ts
new file mode 100644
index 0000000000..ea9a270d47
--- /dev/null
+++ b/packages/desktop/src/main/menu-i18n.ts
@@ -0,0 +1,26 @@
+import { app } from "electron"
+import type { DesktopMenuLabelKey } from "@opencode-ai/app/desktop-menu"
+
+import { pickMenuLocale } from "./menu-locale"
+import { getStore } from "./store"
+
+// Fork: the macOS native menu bar is built in the main process, which has no
+// renderer i18n — so it resolves DESKTOP_MENU's dictionary keys itself. The
+// locale comes from the record the app persisted into the renderer-owned
+// global store, the same one src/renderer/i18n reads, so the menu bar and the
+// UI can never disagree about the language.
+const GLOBAL_STORE = "codev.global.dat"
+
+// Dynamic imports so a language nobody selected is never loaded, and so the
+// Windows and Linux builds — where createMenu returns before calling this —
+// pay for no dictionary at all.
+export async function menuTranslator() {
+  const { dict: english } = await import("@opencode-ai/app/i18n/en")
+  const locale = pickMenuLocale(getStore(GLOBAL_STORE).get("language"), app.getLocale())
+  if (locale === "en") return (key: DesktopMenuLabelKey) => english[key]
+  const { dict } = locale === "vi" ? await import("@opencode-ai/app/i18n/vi") : await import("@opencode-ai/app/i18n/es")
+  const translated: Record<string, string> = dict
+  // A locale dict can trail English by a key between translation passes; an
+  // English label beats rendering "undefined" in the menu bar.
+  return (key: DesktopMenuLabelKey) => translated[key] ?? english[key]
+}
diff --git a/packages/desktop/src/main/menu-locale.test.ts b/packages/desktop/src/main/menu-locale.test.ts
new file mode 100644
index 0000000000..6d0ef1360c
--- /dev/null
+++ b/packages/desktop/src/main/menu-locale.test.ts
@@ -0,0 +1,28 @@
+import { describe, expect, test } from "bun:test"
+
+import { pickMenuLocale } from "./menu-locale"
+
+describe("pickMenuLocale", () => {
+  // The shape the app actually persists (checked against a real
+  // codev.global.dat): the language record, JSON-stringified.
+  test("reads the locale out of the stored language record", () => {
+    expect(pickMenuLocale('{"locale":"vi","direction":"ltr"}', "en-US")).toBe("vi")
+    expect(pickMenuLocale('{ "locale" : "es" }', "en-US")).toBe("es")
+  })
+
+  test("accepts a bare locale and an already-parsed record", () => {
+    expect(pickMenuLocale("vi", "en-US")).toBe("vi")
+    expect(pickMenuLocale({ locale: "es" }, "en-US")).toBe("es")
+  })
+
+  test("falls back to the system locale when nothing was chosen", () => {
+    expect(pickMenuLocale(undefined, "vi-VN")).toBe("vi")
+    expect(pickMenuLocale(null, "es-ES")).toBe("es")
+    expect(pickMenuLocale(undefined, "fr-FR")).toBe("en")
+  })
+
+  test("ignores a locale the menu has no dictionary for", () => {
+    expect(pickMenuLocale('{"locale":"de"}', "vi-VN")).toBe("vi")
+    expect(pickMenuLocale("th", "fr-FR")).toBe("en")
+  })
+})
diff --git a/packages/desktop/src/main/menu-locale.ts b/packages/desktop/src/main/menu-locale.ts
new file mode 100644
index 0000000000..80e112e74c
--- /dev/null
+++ b/packages/desktop/src/main/menu-locale.ts
@@ -0,0 +1,23 @@
+// Fork: the locale the macOS menu bar builds in, picked from the record the
+// renderer persists into the global store. Kept apart from menu-i18n.ts so it
+// stays importable — and testable — outside the Electron runtime.
+
+export const MENU_LOCALES = ["en", "es", "vi"] as const
+
+export type MenuLocale = (typeof MENU_LOCALES)[number]
+
+// `stored` is whatever the store holds under `language`: the app writes the
+// language record JSON-stringified, so matching the locale out of the text
+// avoids a parse that would have to be guarded (renderer/index.tsx reads the
+// same record the same way). A bare locale string and an already-parsed record
+// both still resolve. `system` is the fallback when nothing was ever chosen —
+// the main-process equivalent of the renderer detecting navigator.languages.
+export function pickMenuLocale(stored: unknown, system: string): MenuLocale {
+  const value =
+    typeof stored === "string"
+      ? (stored.match(/"locale"\s*:\s*"([^"]+)"/)?.[1] ?? stored)
+      : (stored as { locale?: unknown } | null | undefined)?.locale
+  const selected = MENU_LOCALES.find((locale) => locale === value)
+  if (selected) return selected
+  return MENU_LOCALES.find((locale) => system.toLowerCase().startsWith(locale)) ?? "en"
+}
diff --git a/packages/desktop/src/main/menu.ts b/packages/desktop/src/main/menu.ts
index 5d367a5cf7..6f3332877b 100644
--- a/packages/desktop/src/main/menu.ts
+++ b/packages/desktop/src/main/menu.ts
@@ -4,11 +4,13 @@ import {
   DESKTOP_MENU,
   desktopMenuVisible,
   type DesktopMenuEntry,
+  type DesktopMenuItem,
   type DesktopMenuRole,
 } from "@opencode-ai/app/desktop-menu"
 
 import { UPDATER_ENABLED } from "./constants"
 import { runDesktopMenuAction } from "./desktop-menu-actions"
+import { menuTranslator } from "./menu-i18n"
 
 type Deps = {
   trigger: (id: string) => void
@@ -17,28 +19,48 @@ type Deps = {
   uploadSessions: () => void
 }
 
-export function createMenu(deps: Deps) {
+// Fork: the menu carries dictionary keys rather than English text, so building
+// it now waits on the locale's dictionary. Deps are remembered so a language
+// change can rebuild the bar without the caller having to hold them.
+let current: Deps | undefined
+
+export async function createMenu(deps: Deps) {
   if (process.platform !== "darwin") return
+  current = deps
 
+  const t = await menuTranslator()
   const template = DESKTOP_MENU.filter((menu) => desktopMenuVisible(menu, "macos")).map((menu) => {
     if (menu.role) return { role: nativeRole(menu.role) }
     return {
-      label: menu.label,
+      label: t(menu.labelKey),
       submenu: menu.items
         ?.filter((entry) => desktopMenuVisible(entry, "macos"))
-        .map((entry) => nativeItem(entry, deps)),
+        .map((entry) => nativeItem(entry, deps, t)),
     }
   })
 
   Menu.setApplicationMenu(Menu.buildFromTemplate(template))
 }
 
-function nativeItem(entry: DesktopMenuEntry, deps: Deps): MenuItemConstructorOptions {
+// Fork: the app persists a language change into the global store the menu
+// reads, so rebuild the bar instead of leaving it in the previous locale until
+// the next launch. A no-op before the first createMenu — and on every platform
+// that never builds a native menu.
+export function refreshMenuLanguage() {
+  if (!current) return
+  void createMenu(current)
+}
+
+function nativeItem(
+  entry: DesktopMenuEntry,
+  deps: Deps,
+  t: (key: NonNullable<DesktopMenuItem["labelKey"]>) => string,
+): MenuItemConstructorOptions {
   if (entry.type === "separator") return { type: "separator" }
   if (entry.role) return { role: nativeRole(entry.role) }
 
   const item: MenuItemConstructorOptions = {
-    label: entry.label,
+    label: entry.labelKey ? t(entry.labelKey) : undefined,
     accelerator: entry.accelerator?.macos,
     enabled: entry.enabled === "updater" ? UPDATER_ENABLED : undefined,
   }