From 31390cb259dd92a40ee21401a08a5ebf74cc35a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pascal=20Andr=C3=A9?= <pascalandr@gmail.com>
Date: Thu, 13 Aug 2026 10:21:00 +0200
Subject: [PATCH 1/6] fix(ui): preserve assistant output after raw HTML (#646)

## Summary
- sanitize raw HTML tokens in assistant Markdown with the existing
allowlist
- prevent dropped tags such as `<style>` from consuming or altering the
rest of a response
- add a focused regression for the malformed inline-code sequence
reported in #645

## Validation
- `node --conditions=browser --import tsx --test --test-force-exit
packages/ui/src/lib/markdown.test.ts`
- `npm run typecheck --workspace @codenomad/ui`
- `npm run build --workspace @codenomad/ui`
- `git diff --check`

Closes #645
---
 packages/ui/src/components/message-part.tsx |  2 +-
 packages/ui/src/lib/markdown.test.ts        | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/packages/ui/src/components/message-part.tsx b/packages/ui/src/components/message-part.tsx
index beba90b4..6b89102c 100644
--- a/packages/ui/src/components/message-part.tsx
+++ b/packages/ui/src/components/message-part.tsx
@@ -238,7 +238,7 @@ export default function MessagePart(props: MessagePartProps) {
                     sessionId={props.sessionId}
                     isDark={isDark()}
                     size={isAssistantMessage() ? "tight" : "base"}
-                    escapeRawHtml={props.messageType === "user"}
+                    escapeRawHtml
                     onRendered={props.onRendered}
                   />
                 </Show>
diff --git a/packages/ui/src/lib/markdown.test.ts b/packages/ui/src/lib/markdown.test.ts
index 03d4497c..dee304f2 100644
--- a/packages/ui/src/lib/markdown.test.ts
+++ b/packages/ui/src/lib/markdown.test.ts
@@ -112,3 +112,18 @@ describe("renderMarkdown bracket math delimiters", () => {
     }
   })
 })
+
+describe("renderMarkdown raw HTML", () => {
+  it("preserves text after style tags inside malformed inline code", async () => {
+    const content = [
+      "- evidence: [source] `return ",
+      '`<!DOCTYPE html><html><head><meta charset="utf-8"><style>${options.styles.join(";")}</style></head>',
+      '<body>${options.html}</body></html>`;` - and the test remains visible',
+    ].join("")
+
+    const html = await renderMarkdown(content, { suppressHighlight: true, escapeRawHtml: true })
+
+    assert.doesNotMatch(html, /<style>/)
+    assert.match(html, /and the test remains visible/)
+  })
+})

From 6d100501ac2e53bb9f6c838d0d6317fa8bc8440d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pascal=20Andr=C3=A9?= <pascalandr@gmail.com>
Date: Thu, 13 Aug 2026 10:21:55 +0200
Subject: [PATCH 2/6] fix(tauri): restore notifications in remote windows
 (#641)

## Summary

- identify remote CodeNomad webviews explicitly as Tauri hosts
- grant remote-* windows the minimum native notification permissions
- keep dialogs, opener access, menus, and other desktop privileges
restricted to the main window

## Cause

Remote windows were marked with the remote window context but not with
the Tauri runtime host. The UI therefore selected the Web Notification
API inside WebView2, where requesting permission had no effect. Those
windows also did not match a Tauri capability that allowed notification
plugin commands.

## Implementation

The initialization script now sets both runtime host and window context
before remote UI scripts run. A dedicated capability permits only
permission checks, permission requests, and notification delivery for
configured HTTP/HTTPS remote origins.

## Validation

- cargo test --manifest-path packages/tauri-app/src-tauri/Cargo.toml: 85
passed
- npm run typecheck --workspace @codenomad/ui
- npm run build:ui
- git diff --check
- two independent review rounds: zero findings after least-privilege
cleanup

Fixes #640
---
 .github/workflows/pr-build.yml                |  1 +
 .../remote-window-notifications.json          | 15 ++++
 .../src-tauri/gen/schemas/capabilities.json   |  2 +-
 packages/tauri-app/src-tauri/src/main.rs      | 76 ++++++++++++++++---
 packages/tauri-app/src-tauri/tauri.conf.json  |  3 +-
 .../provider-auth/provider-manager-modal.tsx  |  4 +-
 packages/ui/src/lib/external-url.ts           |  4 +-
 packages/ui/src/lib/runtime-env.test.ts       | 23 ++++++
 packages/ui/src/lib/runtime-env.ts            |  3 +
 .../ui/src/lib/settings/behavior-registry.ts  |  4 +-
 10 files changed, 117 insertions(+), 18 deletions(-)
 create mode 100644 packages/tauri-app/src-tauri/capabilities/remote-window-notifications.json
 create mode 100644 packages/ui/src/lib/runtime-env.test.ts

diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml
index 52b56b40..cbcfbbc9 100644
--- a/.github/workflows/pr-build.yml
+++ b/.github/workflows/pr-build.yml
@@ -110,6 +110,7 @@ jobs:
           packages/ui/src/lib/hooks/use-foreground-refresh.test.ts
           packages/ui/src/lib/launch-errors.test.ts
           packages/ui/src/lib/message-selection-position.test.ts
+          packages/ui/src/lib/runtime-env.test.ts
           packages/ui/src/lib/trailing-resync.test.ts
           packages/ui/src/stores/abort-created-workspace-cleanup.test.ts
           packages/ui/src/stores/app-session-reconciliation.test.ts
diff --git a/packages/tauri-app/src-tauri/capabilities/remote-window-notifications.json b/packages/tauri-app/src-tauri/capabilities/remote-window-notifications.json
new file mode 100644
index 00000000..210c8d88
--- /dev/null
+++ b/packages/tauri-app/src-tauri/capabilities/remote-window-notifications.json
@@ -0,0 +1,15 @@
+{
+  "$schema": "https://schema.tauri.app/capabilities.json",
+  "identifier": "remote-window-notifications",
+  "description": "Grant remote CodeNomad windows access only to native OS notifications.",
+  "local": false,
+  "remote": {
+    "urls": ["http://*:*", "https://*:*"]
+  },
+  "windows": ["remote-*"],
+  "permissions": [
+    "notification:allow-is-permission-granted",
+    "notification:allow-request-permission",
+    "notification:allow-notify"
+  ]
+}
diff --git a/packages/tauri-app/src-tauri/gen/schemas/capabilities.json b/packages/tauri-app/src-tauri/gen/schemas/capabilities.json
index 3ab025a9..37b0f153 100644
--- a/packages/tauri-app/src-tauri/gen/schemas/capabilities.json
+++ b/packages/tauri-app/src-tauri/gen/schemas/capabilities.json
@@ -1 +1 @@
-{"main-window-native-dialogs":{"identifier":"main-window-native-dialogs","description":"Grant the main window access to required core features and native dialog commands.","remote":{"urls":["http://127.0.0.1:*","http://localhost:*","http://tauri.localhost/*","https://tauri.localhost/*"]},"local":true,"windows":["main"],"permissions":["core:default","core:menu:default","dialog:allow-open","opener:allow-default-urls","opener:allow-open-url","notification:allow-is-permission-granted","notification:allow-request-permission","notification:allow-notify","notification:allow-show","core:webview:allow-set-webview-zoom"]}}
\ No newline at end of file
+{"main-window-native-dialogs":{"identifier":"main-window-native-dialogs","description":"Grant the main window access to required core features and native dialog commands.","remote":{"urls":["http://127.0.0.1:*","http://localhost:*","http://tauri.localhost/*","https://tauri.localhost/*"]},"local":true,"windows":["main"],"permissions":["core:default","core:menu:default","dialog:allow-open","opener:allow-default-urls","opener:allow-open-url","notification:allow-is-permission-granted","notification:allow-request-permission","notification:allow-notify","notification:allow-show","core:webview:allow-set-webview-zoom"]},"remote-window-notifications":{"identifier":"remote-window-notifications","description":"Grant remote CodeNomad windows access only to native OS notifications.","remote":{"urls":["http://*:*","https://*:*"]},"local":false,"windows":["remote-*"],"permissions":["notification:allow-is-permission-granted","notification:allow-request-permission","notification:allow-notify"]}}
\ No newline at end of file
diff --git a/packages/tauri-app/src-tauri/src/main.rs b/packages/tauri-app/src-tauri/src/main.rs
index 4dc14261..d5c5fd70 100644
--- a/packages/tauri-app/src-tauri/src/main.rs
+++ b/packages/tauri-app/src-tauri/src/main.rs
@@ -47,7 +47,8 @@ use windows_sys::Win32::UI::Shell::SetCurrentProcessExplicitAppUserModelID;
 const ZOOM_STEP: f64 = 0.1;
 const RELEASES_URL: &str = "https://github.com/NeuralNomadsAI/CodeNomad/releases/latest";
 const LOCAL_WINDOW_CONTEXT_SCRIPT: &str = "window.__CODENOMAD_WINDOW_CONTEXT__ = 'local';";
-const REMOTE_WINDOW_CONTEXT_SCRIPT: &str = "window.__CODENOMAD_WINDOW_CONTEXT__ = 'remote';";
+const REMOTE_WINDOW_CONTEXT_SCRIPT: &str =
+    "window.__CODENOMAD_RUNTIME_HOST__ = 'tauri'; window.__CODENOMAD_WINDOW_CONTEXT__ = 'remote';";
 
 #[cfg(windows)]
 const WINDOWS_APP_USER_MODEL_ID: &str = "ai.neuralnomads.codenomad.client";
@@ -218,19 +219,20 @@ fn should_allow_window_origin<R: Runtime>(
     window_label: &str,
     url: &Url,
 ) -> bool {
-    if should_allow_internal(url) {
-        return true;
-    }
-
     let state = app_handle.state::<AppState>();
     let Ok(allowed) = state.remote_origins.lock() else {
         return false;
     };
-    if let Some(origin) = allowed.get(window_label) {
-        return origin == &url.origin().ascii_serialization();
-    }
+    should_allow_registered_origin(allowed.get(window_label).map(String::as_str), url)
+}
 
-    false
+fn should_allow_registered_origin(registered_origin: Option<&str>, url: &Url) -> bool {
+    if let Some(origin) = registered_origin {
+        if matches!(url.scheme(), "http" | "https") {
+            return origin == url.origin().ascii_serialization();
+        }
+    }
+    should_allow_internal(url)
 }
 
 fn intercept_navigation<R: Runtime>(webview: &Webview<R>, url: &Url) -> bool {
@@ -1059,8 +1061,13 @@ fn build_about_metadata(version: &str, include_update_link: bool) -> AboutMetada
 
 #[cfg(test)]
 mod menu_tests {
-    use super::{build_about_metadata, run_update_with_fallback, RELEASES_URL};
+    use super::{
+        build_about_metadata, run_update_with_fallback, should_allow_registered_origin,
+        RELEASES_URL, REMOTE_WINDOW_CONTEXT_SCRIPT,
+    };
+    use serde_json::json;
     use std::sync::atomic::{AtomicBool, Ordering};
+    use url::Url;
 
     #[test]
     fn failed_update_uses_release_fallback() {
@@ -1091,4 +1098,53 @@ mod menu_tests {
         assert_eq!(metadata.website, None);
         assert_eq!(metadata.website_label, None);
     }
+
+    #[test]
+    fn remote_windows_identify_as_remote_tauri_windows() {
+        assert!(REMOTE_WINDOW_CONTEXT_SCRIPT.contains("__CODENOMAD_RUNTIME_HOST__ = 'tauri'"));
+        assert!(REMOTE_WINDOW_CONTEXT_SCRIPT.contains("__CODENOMAD_WINDOW_CONTEXT__ = 'remote'"));
+
+        let capability: serde_json::Value = serde_json::from_str(include_str!(
+            "../capabilities/remote-window-notifications.json"
+        ))
+        .unwrap();
+        assert_eq!(capability["local"], false);
+        assert_eq!(
+            capability["remote"]["urls"],
+            json!(["http://*:*", "https://*:*"])
+        );
+        assert_eq!(capability["windows"], json!(["remote-*"]));
+        assert_eq!(
+            capability["permissions"],
+            json!([
+                "notification:allow-is-permission-granted",
+                "notification:allow-request-permission",
+                "notification:allow-notify"
+            ])
+        );
+
+        let config: serde_json::Value =
+            serde_json::from_str(include_str!("../tauri.conf.json")).unwrap();
+        assert!(config["app"]["security"]["capabilities"]
+            .as_array()
+            .unwrap()
+            .contains(&json!("remote-window-notifications")));
+    }
+
+    #[test]
+    fn remote_windows_stay_on_their_registered_http_origin() {
+        let origin = "https://remote.example:9898";
+        assert!(should_allow_registered_origin(
+            Some(origin),
+            &Url::parse("https://remote.example:9898/settings").unwrap()
+        ));
+        assert!(!should_allow_registered_origin(
+            Some(origin),
+            &Url::parse("http://localhost:9898/").unwrap()
+        ));
+        assert!(should_allow_registered_origin(
+            Some(origin),
+            &Url::parse("about:blank").unwrap()
+        ));
+    }
 }
diff --git a/packages/tauri-app/src-tauri/tauri.conf.json b/packages/tauri-app/src-tauri/tauri.conf.json
index e01de7c3..273e4c8d 100644
--- a/packages/tauri-app/src-tauri/tauri.conf.json
+++ b/packages/tauri-app/src-tauri/tauri.conf.json
@@ -37,7 +37,8 @@
         ]
       },
       "capabilities": [
-        "main-window-native-dialogs"
+        "main-window-native-dialogs",
+        "remote-window-notifications"
       ]
     }
   },
diff --git a/packages/ui/src/components/provider-auth/provider-manager-modal.tsx b/packages/ui/src/components/provider-auth/provider-manager-modal.tsx
index a7f4e5b8..4bbf6af7 100644
--- a/packages/ui/src/components/provider-auth/provider-manager-modal.tsx
+++ b/packages/ui/src/components/provider-auth/provider-manager-modal.tsx
@@ -6,7 +6,7 @@ import type { OpencodeClient } from "@opencode-ai/sdk/v2/client"
 import { openExternalUrl } from "../../lib/external-url"
 import { useI18n } from "../../lib/i18n"
 import { requestData } from "../../lib/opencode-api"
-import { isTauriHost } from "../../lib/runtime-env"
+import { isLocalTauriHost } from "../../lib/runtime-env"
 import {
   extractProviderAuthErrorMessage,
   genericApiMethod,
@@ -186,7 +186,7 @@ export const ProviderManagerModal: Component<ProviderManagerModalProps> = (props
   }
 
   function isBrowserHostForOAuth(): boolean {
-    return !isTauriHost() && typeof window !== "undefined"
+    return !isLocalTauriHost() && typeof window !== "undefined"
   }
 
   function prepareOAuthPopupWindow(): Window | null {
diff --git a/packages/ui/src/lib/external-url.ts b/packages/ui/src/lib/external-url.ts
index f9e7547e..c8fce4b5 100644
--- a/packages/ui/src/lib/external-url.ts
+++ b/packages/ui/src/lib/external-url.ts
@@ -1,11 +1,11 @@
-import { isTauriHost } from "./runtime-env"
+import { isLocalTauriHost } from "./runtime-env"
 
 export async function openExternalUrl(url: string, context = "ui"): Promise<boolean> {
   if (typeof window === "undefined") {
     return false
   }
 
-  if (isTauriHost()) {
+  if (isLocalTauriHost()) {
     try {
       const { openUrl } = await import("@tauri-apps/plugin-opener")
       await openUrl(url)
diff --git a/packages/ui/src/lib/runtime-env.test.ts b/packages/ui/src/lib/runtime-env.test.ts
new file mode 100644
index 00000000..10a30599
--- /dev/null
+++ b/packages/ui/src/lib/runtime-env.test.ts
@@ -0,0 +1,23 @@
+import assert from "node:assert/strict"
+import { describe, it } from "node:test"
+import { isLocalTauriHost, type RuntimeEnvironment } from "./runtime-env.ts"
+
+const environment = (host: RuntimeEnvironment["host"], windowContext: RuntimeEnvironment["windowContext"]) => ({
+  host,
+  windowContext,
+})
+
+describe("isLocalTauriHost", () => {
+  it("enables native-only features in the local Tauri window", () => {
+    assert.equal(isLocalTauriHost(environment("tauri", "local")), true)
+  })
+
+  it("keeps native-only features disabled in remote Tauri windows", () => {
+    assert.equal(isLocalTauriHost(environment("tauri", "remote")), false)
+  })
+
+  it("does not classify web or Electron windows as local Tauri", () => {
+    assert.equal(isLocalTauriHost(environment("web", "remote")), false)
+    assert.equal(isLocalTauriHost(environment("electron", "local")), false)
+  })
+})
diff --git a/packages/ui/src/lib/runtime-env.ts b/packages/ui/src/lib/runtime-env.ts
index 3f90374d..747f0938 100644
--- a/packages/ui/src/lib/runtime-env.ts
+++ b/packages/ui/src/lib/runtime-env.ts
@@ -117,6 +117,9 @@ export const runtimeEnv = detectRuntimeEnvironment()
 export const isElectronHost = () => detectHost() === "electron"
 export const isTauriHost = () => detectHost() === "tauri"
 export const isWebHost = () => detectHost() === "web"
+export const isLocalTauriHost = (
+  environment: Pick<RuntimeEnvironment, "host" | "windowContext"> = detectRuntimeEnvironment(),
+) => environment.host === "tauri" && environment.windowContext === "local"
 export const isDesktopHost = () => isElectronHost() || isTauriHost()
 export const isMobilePlatform = () => detectPlatform() === "mobile"
 export const isLocalWindow = () => detectWindowContext() === "local"
diff --git a/packages/ui/src/lib/settings/behavior-registry.ts b/packages/ui/src/lib/settings/behavior-registry.ts
index 0cca660f..99e9e374 100644
--- a/packages/ui/src/lib/settings/behavior-registry.ts
+++ b/packages/ui/src/lib/settings/behavior-registry.ts
@@ -7,7 +7,7 @@ import type {
 } from "../../stores/preferences"
 import type { Command } from "../commands"
 import { tGlobal } from "../i18n"
-import { isTauriHost, isWebHost } from "../runtime-env"
+import { isLocalTauriHost, isWebHost } from "../runtime-env"
 
 export type BehaviorSettingKind = "toggle" | "enum"
 
@@ -302,7 +302,7 @@ export function getBehaviorSettings(actions: BehaviorRegistryActions): BehaviorS
         }
       },
     },
-    ...(isTauriHost()
+    ...(isLocalTauriHost()
       ? [
           {
             kind: "toggle" as const,

From b8e7b16350973aad907ecdf8510d445cbc2c4647 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pascal=20Andr=C3=A9?= <pascalandr@gmail.com>
Date: Thu, 13 Aug 2026 10:22:30 +0200
Subject: [PATCH 3/6] feat(desktop): open workspaces in native apps (#638)

## Summary
- add project folder, terminal, and explicit editor actions to the
command palette and native File menus
- replace the Files-row copy button with desktop context actions while
preserving internal file navigation and web/remote copy fallback
- resolve trusted workspace roots through the authenticated local server
and enforce canonical path containment in Electron and Tauri
- use safe platform launch policies, including Windows Open/Edit/Open
With handling and executable rejection on Unix
- localize all new UI actions across supported locales

## Validation
- npm run typecheck
- npm run test:native --workspace @neuralnomads/codenomad-electron-app
(122 passed)
- cargo test (86 passed)
- npm run build
- git diff --check
- independent security, platform, and UX reviews: zero findings

Closes #570
---
 packages/electron-app/electron/main/ipc.ts    |  75 ++-
 packages/electron-app/electron/main/menu.ts   |  50 +-
 .../electron/main/workspace-open.test.ts      |  80 +++
 .../electron/main/workspace-open.ts           | 238 +++++++
 .../electron-app/electron/preload/index.cjs   |   7 +
 packages/electron-app/package.json            |   2 +-
 packages/tauri-app/src-tauri/src/main.rs      | 150 ++++-
 .../tauri-app/src-tauri/src/workspace_open.rs | 632 ++++++++++++++++++
 packages/ui/src/App.tsx                       |  26 +-
 .../shell/right-panel/tabs/FilesTab.tsx       | 129 +++-
 .../shell/right-panel/tabs/files-runtime.tsx  |   2 +
 packages/ui/src/lib/hooks/use-commands.ts     |  70 ++
 .../ui/src/lib/i18n/messages/de/commands.ts   |  13 +
 .../ui/src/lib/i18n/messages/de/instance.ts   |   9 +
 .../ui/src/lib/i18n/messages/en/commands.ts   |  13 +
 .../ui/src/lib/i18n/messages/en/instance.ts   |   9 +
 .../ui/src/lib/i18n/messages/es/commands.ts   |  13 +
 .../ui/src/lib/i18n/messages/es/instance.ts   |   9 +
 .../ui/src/lib/i18n/messages/fr/commands.ts   |  13 +
 .../ui/src/lib/i18n/messages/fr/instance.ts   |   9 +
 .../ui/src/lib/i18n/messages/he/commands.ts   |  13 +
 .../ui/src/lib/i18n/messages/he/instance.ts   |   9 +
 .../ui/src/lib/i18n/messages/ja/commands.ts   |  13 +
 .../ui/src/lib/i18n/messages/ja/instance.ts   |   9 +
 .../ui/src/lib/i18n/messages/ne/commands.ts   |  13 +
 .../ui/src/lib/i18n/messages/ne/instance.ts   |   9 +
 .../ui/src/lib/i18n/messages/ru/commands.ts   |  13 +
 .../ui/src/lib/i18n/messages/ru/instance.ts   |   9 +
 .../src/lib/i18n/messages/zh-Hans/commands.ts |  13 +
 .../src/lib/i18n/messages/zh-Hans/instance.ts |   9 +
 packages/ui/src/lib/workspace-open.ts         |  40 ++
 packages/ui/src/styles/panels/right-panel.css |   4 +
 packages/ui/src/types/global.d.ts             |   9 +
 33 files changed, 1688 insertions(+), 24 deletions(-)
 create mode 100644 packages/electron-app/electron/main/workspace-open.test.ts
 create mode 100644 packages/electron-app/electron/main/workspace-open.ts
 create mode 100644 packages/tauri-app/src-tauri/src/workspace_open.rs
 create mode 100644 packages/ui/src/lib/workspace-open.ts

diff --git a/packages/electron-app/electron/main/ipc.ts b/packages/electron-app/electron/main/ipc.ts
index 6e664d90..661ad9ce 100644
--- a/packages/electron-app/electron/main/ipc.ts
+++ b/packages/electron-app/electron/main/ipc.ts
@@ -1,7 +1,9 @@
-import { BrowserWindow, Notification, dialog, ipcMain, powerSaveBlocker, type OpenDialogOptions } from "electron"
+import { BrowserWindow, Notification, dialog, ipcMain, powerSaveBlocker, shell, type OpenDialogOptions } from "electron"
 import fs from "fs"
 import { requestMicrophoneAccess } from "./permissions"
 import type { CliProcessManager, CliStatus } from "./process-manager"
+import { openWorkspaceTarget, type WorkspaceEditor, type WorkspaceOpenTarget } from "./workspace-open"
+import { setWorkspaceMenuEnabled } from "./menu"
 
 let wakeLockId: number | null = null
 
@@ -18,6 +20,34 @@ interface DialogOpenResult {
   paths: string[]
 }
 
+async function resolveLocalWorkspaceFolder(
+  mainWindow: BrowserWindow,
+  cliManager: CliProcessManager,
+  instanceId: string,
+  worktreeSlug: string,
+): Promise<string> {
+  const baseUrl = cliManager.getStatus().url
+  if (!baseUrl) throw new Error("Local CodeNomad server is unavailable")
+  const cookieName = cliManager.getAuthCookieName()
+  const cookie = (await mainWindow.webContents.session.cookies.get({ url: baseUrl, name: cookieName }))[0]
+  const headers = cookie ? { Cookie: `${cookie.name}=${cookie.value}` } : undefined
+  const workspaceResponse = await fetch(`${baseUrl.replace(/\/$/, "")}/api/workspaces/${encodeURIComponent(instanceId)}`, { headers })
+  if (!workspaceResponse.ok) throw new Error("Workspace is not active")
+  const workspace = await workspaceResponse.json() as { path?: unknown }
+  if (typeof workspace.path !== "string") throw new Error("Workspace path is unavailable")
+  if (worktreeSlug === "root") return workspace.path
+
+  const worktreeResponse = await fetch(
+    `${baseUrl.replace(/\/$/, "")}/api/workspaces/${encodeURIComponent(instanceId)}/worktrees`,
+    { headers },
+  )
+  if (!worktreeResponse.ok) throw new Error("Workspace worktrees are unavailable")
+  const payload = await worktreeResponse.json() as { worktrees?: Array<{ slug?: unknown; directory?: unknown }> }
+  const worktree = payload.worktrees?.find((candidate) => candidate.slug === worktreeSlug)
+  if (!worktree || typeof worktree.directory !== "string") throw new Error("Selected worktree is unavailable")
+  return worktree.directory
+}
+
 export function setupCliIPC(mainWindow: BrowserWindow, cliManager: CliProcessManager) {
   cliManager.on("status", (status: CliStatus) => {
     if (!mainWindow.isDestroyed()) {
@@ -88,6 +118,49 @@ export function setupCliIPC(mainWindow: BrowserWindow, cliManager: CliProcessMan
     return directories
   })
 
+  ipcMain.handle(
+    "workspace:openTarget",
+    async (event, payload: { target?: unknown; instanceId?: unknown; worktreeSlug?: unknown; path?: unknown; editor?: unknown }): Promise<{ ok: true }> => {
+      if (mainWindow.isDestroyed() || event.sender !== mainWindow.webContents || event.senderFrame !== mainWindow.webContents.mainFrame) {
+        throw new Error("Workspace open requests are limited to the local main window")
+      }
+      const localUrl = cliManager.getStatus().url
+      if (!localUrl || new URL(event.senderFrame.url).origin !== new URL(localUrl).origin) {
+        throw new Error("Workspace open requests require the local CodeNomad origin")
+      }
+      const target = payload?.target
+      const instanceId = payload?.instanceId
+      const worktreeSlug = payload?.worktreeSlug
+      const editor = payload?.editor
+      if (
+        (target !== "default" && target !== "reveal" && target !== "terminal" && target !== "editor")
+        || typeof instanceId !== "string"
+        || typeof worktreeSlug !== "string"
+        || (payload.path !== undefined && typeof payload.path !== "string")
+        || (editor !== undefined && editor !== "vscode" && editor !== "cursor" && editor !== "zed" && editor !== "vscodium")
+      ) {
+        throw new Error("Invalid workspace open request")
+      }
+      const workspaceFolder = await resolveLocalWorkspaceFolder(mainWindow, cliManager, instanceId, worktreeSlug)
+      await openWorkspaceTarget(
+        target as WorkspaceOpenTarget,
+        workspaceFolder,
+        payload.path as string | undefined,
+        editor as WorkspaceEditor | undefined,
+        { openPath: (path) => shell.openPath(path), revealPath: (path) => shell.showItemInFolder(path) },
+      )
+      return { ok: true }
+    },
+  )
+
+  ipcMain.handle("workspace:setMenuEnabled", (event, enabled: unknown): { ok: true } => {
+    if (mainWindow.isDestroyed() || event.sender !== mainWindow.webContents || event.senderFrame !== mainWindow.webContents.mainFrame) {
+      throw new Error("Workspace menu updates are limited to the local main window")
+    }
+    setWorkspaceMenuEnabled(enabled === true)
+    return { ok: true }
+  })
+
   ipcMain.handle("power:setWakeLock", async (_event, enabled: boolean): Promise<{ enabled: boolean }> => {
     const next = Boolean(enabled)
     if (next) {
diff --git a/packages/electron-app/electron/main/menu.ts b/packages/electron-app/electron/main/menu.ts
index 7ecbc195..ae345ba4 100644
--- a/packages/electron-app/electron/main/menu.ts
+++ b/packages/electron-app/electron/main/menu.ts
@@ -1,12 +1,34 @@
-import { Menu, BrowserWindow, MenuItemConstructorOptions } from "electron"
+import { app, Menu, BrowserWindow, MenuItemConstructorOptions } from "electron"
 
 interface ApplicationMenuActions {
   reload(): void
   forceReload(): void
 }
 
+let workspaceActionsRequested = false
+let applicationMenu: Menu | null = null
+let localMainWindow: BrowserWindow | null = null
+
+function updateWorkspaceMenuState() {
+  const enabled = workspaceActionsRequested && BrowserWindow.getFocusedWindow() === localMainWindow
+  for (const id of ["open-workspace-folder", "open-workspace-terminal", "open-workspace-editor"]) {
+    const item = applicationMenu?.getMenuItemById(id)
+    if (item) item.enabled = enabled
+  }
+}
+
+export function setWorkspaceMenuEnabled(enabled: boolean) {
+  workspaceActionsRequested = enabled
+  updateWorkspaceMenuState()
+}
+
 export function createApplicationMenu(mainWindow: BrowserWindow, actions: ApplicationMenuActions) {
+  localMainWindow = mainWindow
   const isMac = process.platform === "darwin"
+  const sendCommand = (id: string) => () => {
+    if (id.startsWith("open-workspace-") && BrowserWindow.getFocusedWindow() !== mainWindow) return
+    mainWindow.webContents.send("menu:action", id)
+  }
 
   const template: MenuItemConstructorOptions[] = [
     ...(isMac
@@ -31,9 +53,20 @@ export function createApplicationMenu(mainWindow: BrowserWindow, actions: Applic
         {
           label: "New Instance",
           accelerator: "CmdOrCtrl+N",
-          click: () => {
-            mainWindow.webContents.send("menu:newInstance")
-          },
+          click: sendCommand("new-instance"),
+        },
+        { type: "separator" as const },
+        { id: "open-workspace-folder", label: "Open Project Folder", click: sendCommand("open-workspace-folder") },
+        { id: "open-workspace-terminal", label: "Open Terminal Here", click: sendCommand("open-workspace-terminal") },
+        {
+          id: "open-workspace-editor",
+          label: "Open Project In",
+          submenu: [
+            { label: "VS Code", click: sendCommand("open-workspace-editor-vscode") },
+            { label: "Cursor", click: sendCommand("open-workspace-editor-cursor") },
+            { label: "Zed", click: sendCommand("open-workspace-editor-zed") },
+            { label: "VSCodium", click: sendCommand("open-workspace-editor-vscodium") },
+          ],
         },
         { type: "separator" as const },
         isMac ? { role: "close" as const } : { role: "quit" as const },
@@ -85,5 +118,14 @@ export function createApplicationMenu(mainWindow: BrowserWindow, actions: Applic
   ]
 
   const menu = Menu.buildFromTemplate(template)
+  applicationMenu = menu
   Menu.setApplicationMenu(menu)
+  updateWorkspaceMenuState()
+  mainWindow.webContents.on("did-start-navigation", (_event, _url, _isInPlace, isMainFrame) => {
+    if (!isMainFrame) return
+    workspaceActionsRequested = false
+    updateWorkspaceMenuState()
+  })
+  app.on("browser-window-focus", updateWorkspaceMenuState)
+  app.on("browser-window-blur", updateWorkspaceMenuState)
 }
diff --git a/packages/electron-app/electron/main/workspace-open.test.ts b/packages/electron-app/electron/main/workspace-open.test.ts
new file mode 100644
index 00000000..a59b824d
--- /dev/null
+++ b/packages/electron-app/electron/main/workspace-open.test.ts
@@ -0,0 +1,80 @@
+import assert from "node:assert/strict"
+import { EventEmitter } from "node:events"
+import { mkdtempSync, mkdirSync, rmSync, writeFileSync } from "node:fs"
+import { tmpdir } from "node:os"
+import { join } from "node:path"
+import test from "node:test"
+import type { ChildProcess } from "node:child_process"
+import { defaultOpenMode, editorCandidates, openWorkspaceTarget } from "./workspace-open"
+
+test("selects only the requested editor", () => {
+  assert.deepEqual(editorCandidates("zed", "linux", {}), [{ command: "zed", verifyStart: true }])
+  assert.deepEqual(editorCandidates("vscodium", "darwin", {}), [
+    { command: "/usr/bin/open", args: ["-a", "VSCodium"], waitForExit: true },
+  ])
+})
+
+test("opens only paths inside the workspace", async () => {
+  const root = mkdtempSync(join(tmpdir(), "codenomad-workspace-"))
+  const outside = mkdtempSync(join(tmpdir(), "codenomad-outside-"))
+  const opened: string[] = []
+  const dependencies = {
+    openPath: async (path: string) => { opened.push(path); return "" },
+    revealPath: () => undefined,
+  }
+
+  try {
+    await openWorkspaceTarget("default", root, ".", undefined, dependencies)
+    assert.deepEqual(opened, [root])
+    await assert.rejects(openWorkspaceTarget("default", root, outside, undefined, dependencies), /outside the workspace/)
+  } finally {
+    rmSync(root, { recursive: true, force: true })
+    rmSync(outside, { recursive: true, force: true })
+  }
+})
+
+test("edits Windows scripts and rejects executable default-open targets", () => {
+  const root = mkdtempSync(join(tmpdir(), "codenomad-executable-"))
+  const script = join(root, "run.cmd")
+  writeFileSync(script, "echo unsafe")
+  try {
+    assert.equal(defaultOpenMode(script, "win32"), "edit")
+    const document = join(root, "notes.txt")
+    writeFileSync(document, "safe")
+    assert.equal(defaultOpenMode(document, "win32"), "open")
+    const executable = join(root, "run.exe")
+    writeFileSync(executable, "unsafe")
+    assert.equal(defaultOpenMode(executable, "win32"), "choose")
+  } finally {
+    rmSync(root, { recursive: true, force: true })
+  }
+})
+
+test("launches terminals in the selected directory without a shell", async () => {
+  const root = mkdtempSync(join(tmpdir(), "codenomad-terminal-"))
+  const nested = join(root, "nested")
+  mkdirSync(nested)
+  const launches: Array<{ command: string; args: readonly string[]; cwd: string }> = []
+  const spawnProcess = (command: string, args: readonly string[], options: { cwd: string }) => {
+    launches.push({ command, args, cwd: options.cwd })
+    const child = new EventEmitter() as ChildProcess
+    child.unref = () => child
+    queueMicrotask(() => {
+      child.emit("spawn")
+      child.emit("exit", 0)
+    })
+    return child
+  }
+
+  try {
+    await openWorkspaceTarget("terminal", root, "nested", undefined, {
+      openPath: async () => "",
+      revealPath: () => undefined,
+      spawnProcess,
+    })
+    assert.equal(launches[0]?.cwd, nested)
+    assert.equal(launches[0]?.args.includes(nested), false)
+  } finally {
+    rmSync(root, { recursive: true, force: true })
+  }
+})
diff --git a/packages/electron-app/electron/main/workspace-open.ts b/packages/electron-app/electron/main/workspace-open.ts
new file mode 100644
index 00000000..4a4a11e1
--- /dev/null
+++ b/packages/electron-app/electron/main/workspace-open.ts
@@ -0,0 +1,238 @@
+import { spawn, type ChildProcess } from "node:child_process"
+import { existsSync, realpathSync, statSync } from "node:fs"
+import { extname, isAbsolute, join, relative, resolve } from "node:path"
+
+export type WorkspaceOpenTarget = "default" | "reveal" | "terminal" | "editor"
+export type WorkspaceEditor = "vscode" | "cursor" | "zed" | "vscodium"
+
+interface LaunchCandidate {
+  command: string
+  args?: string[]
+  passPath?: boolean
+  waitForExit?: boolean
+  verifyStart?: boolean
+}
+
+type SpawnProcess = (command: string, args: readonly string[], options: {
+  cwd: string
+  detached: boolean
+  stdio: "ignore"
+}) => ChildProcess
+
+interface WorkspaceOpenDependencies {
+  openPath: (path: string) => Promise<string>
+  revealPath: (path: string) => void
+  spawnProcess?: SpawnProcess
+}
+
+const BLOCKED_DEFAULT_OPEN_EXTENSIONS = new Set([
+  ".appimage", ".application", ".chm", ".com", ".cpl", ".desktop", ".exe", ".jar", ".lnk", ".msi",
+  ".msp", ".pif", ".scr", ".url",
+])
+
+const SAFE_WINDOWS_OPEN_EXTENSIONS = new Set([
+  ".7z", ".avi", ".bmp", ".c", ".cc", ".cfg", ".conf", ".cpp", ".cs", ".css", ".csv", ".dart",
+  ".diff", ".docx", ".env", ".flac", ".fs", ".fsx", ".gif", ".go", ".gz", ".h", ".hpp",
+  ".htm", ".html", ".ini", ".java", ".jpeg", ".jpg", ".json", ".jsonc", ".jsx", ".kt", ".kts",
+  ".less", ".lock", ".log", ".lua", ".md", ".markdown", ".mkv", ".mov", ".mp3", ".mp4", ".ogg",
+  ".patch", ".pdf", ".png", ".pptx", ".r", ".rar", ".rmd", ".rs", ".scss", ".sql", ".svg",
+  ".svelte", ".swift", ".tar", ".toml", ".ts", ".tsx", ".txt", ".vue", ".wav", ".webm", ".webp",
+  ".xlsx", ".xml", ".yaml", ".yml", ".zip",
+])
+
+const WINDOWS_EDIT_EXTENSIONS = new Set([
+  ".bat", ".cmd", ".js", ".jse", ".pl", ".ps1", ".psd1", ".psm1", ".py", ".pyw", ".rb", ".reg",
+  ".vbe", ".vbs", ".wsf", ".wsh",
+])
+
+export function defaultOpenMode(path: string, platform: NodeJS.Platform): "open" | "edit" | "choose" {
+  const stats = statSync(path)
+  const extension = extname(path).toLowerCase()
+  if (stats.isDirectory()) {
+    if (platform === "darwin" && extension === ".app") throw new Error("Application bundles cannot be opened externally")
+    return "open"
+  }
+  if (platform === "win32") {
+    if (SAFE_WINDOWS_OPEN_EXTENSIONS.has(extension)) return "open"
+    if (WINDOWS_EDIT_EXTENSIONS.has(extension)) return "edit"
+    return "choose"
+  }
+  if (BLOCKED_DEFAULT_OPEN_EXTENSIONS.has(extension)) {
+    throw new Error("Executable files cannot be opened externally")
+  }
+  if (stats.isFile() && (stats.mode & 0o111) !== 0) {
+    throw new Error("Executable files cannot be opened externally")
+  }
+  return "open"
+}
+
+export function editorCandidates(editor: WorkspaceEditor, platform: NodeJS.Platform, env: NodeJS.ProcessEnv): LaunchCandidate[] {
+  if (platform === "darwin") {
+    const names: Record<WorkspaceEditor, string> = {
+      vscode: "Visual Studio Code",
+      cursor: "Cursor",
+      zed: "Zed",
+      vscodium: "VSCodium",
+    }
+    return [{ command: "/usr/bin/open", args: ["-a", names[editor]], waitForExit: true }]
+  }
+
+  if (platform === "win32") {
+    const paths: Record<WorkspaceEditor, Array<string | undefined>> = {
+      vscode: [
+        env.LOCALAPPDATA && join(env.LOCALAPPDATA, "Programs", "Microsoft VS Code", "Code.exe"),
+        env.ProgramFiles && join(env.ProgramFiles, "Microsoft VS Code", "Code.exe"),
+      ],
+      cursor: [env.LOCALAPPDATA && join(env.LOCALAPPDATA, "Programs", "cursor", "Cursor.exe")],
+      zed: [env.LOCALAPPDATA && join(env.LOCALAPPDATA, "Programs", "Zed", "Zed.exe")],
+      vscodium: [
+        env.LOCALAPPDATA && join(env.LOCALAPPDATA, "Programs", "VSCodium", "VSCodium.exe"),
+        env.ProgramFiles && join(env.ProgramFiles, "VSCodium", "VSCodium.exe"),
+      ],
+    }
+    return paths[editor]
+      .filter((command): command is string => Boolean(command))
+      .filter((command) => !isAbsolute(command) || existsSync(command))
+      .map((command) => ({ command }))
+  }
+
+  const commands: Record<WorkspaceEditor, string> = { vscode: "code", cursor: "cursor", zed: "zed", vscodium: "codium" }
+  return [{ command: commands[editor], verifyStart: true }]
+}
+
+export function terminalCandidates(platform: NodeJS.Platform, env: NodeJS.ProcessEnv, folder = "."): LaunchCandidate[] {
+  if (platform === "darwin") return [{ command: "/usr/bin/open", args: ["-a", "Terminal"], waitForExit: true }]
+  if (platform === "win32") {
+    const systemRoot = env.SystemRoot?.trim() || "C:\\Windows"
+    const command = env.ComSpec?.trim() || join(systemRoot, "System32", "cmd.exe")
+    const powershell = join(systemRoot, "System32", "WindowsPowerShell", "v1.0", "powershell.exe")
+    const script = `Set-Location -LiteralPath '${folder.replace(/'/g, "''")}'`
+    const encoded = Buffer.from(script, "utf16le").toString("base64")
+    return [{
+      command,
+      args: ["/D", "/C", "start", "", powershell, "-NoExit", "-EncodedCommand", encoded],
+      passPath: false,
+      waitForExit: true,
+    }]
+  }
+
+  const configured = env.TERMINAL?.trim()
+  return [
+    ...(configured ? [{ command: configured, passPath: false, verifyStart: true }] : []),
+    ...["xdg-terminal-exec", "x-terminal-emulator", "gnome-terminal", "konsole", "kitty", "alacritty", "wezterm"]
+      .map((command) => ({ command, passPath: false, verifyStart: true })),
+  ]
+}
+
+function launch(candidate: LaunchCandidate, selectedPath: string, cwd: string, spawnProcess: SpawnProcess): Promise<void> {
+  return new Promise((resolve, reject) => {
+    let settled = false
+    let verificationTimer: ReturnType<typeof setTimeout> | undefined
+    const finish = (error?: Error) => {
+      if (settled) return
+      settled = true
+      if (verificationTimer) clearTimeout(verificationTimer)
+      if (error) reject(error)
+      else resolve()
+    }
+    const args = [...(candidate.args ?? []), ...(candidate.passPath === false ? [] : [selectedPath])]
+    const child = spawnProcess(candidate.command, args, {
+      cwd,
+      detached: true,
+      stdio: "ignore",
+    })
+    child.once("spawn", () => {
+      if (!candidate.waitForExit) {
+        if (candidate.verifyStart) {
+          verificationTimer = setTimeout(() => {
+            child.unref()
+            finish()
+          }, 250)
+          return
+        }
+        child.unref()
+        finish()
+      }
+    })
+    child.once("exit", (code) => {
+      if (!candidate.waitForExit && !candidate.verifyStart) return
+      if (code === 0) finish()
+      else finish(new Error(`${candidate.command} exited with code ${code ?? "unknown"}`))
+    })
+    child.once("error", (error) => finish(error))
+  })
+}
+
+async function launchFirst(candidates: LaunchCandidate[], selectedPath: string, cwd: string, spawnProcess: SpawnProcess): Promise<void> {
+  let lastError: unknown
+  for (const candidate of candidates) {
+    try {
+      await launch(candidate, selectedPath, cwd, spawnProcess)
+      return
+    } catch (error) {
+      lastError = error
+    }
+  }
+  throw lastError instanceof Error ? lastError : new Error("No supported application was found")
+}
+
+export async function openWorkspaceTarget(
+  target: WorkspaceOpenTarget,
+  workspaceFolder: string,
+  path = ".",
+  editor?: WorkspaceEditor,
+  dependencies?: WorkspaceOpenDependencies,
+): Promise<void> {
+  if (!dependencies) throw new Error("Native workspace openers are unavailable")
+  const spawnProcess = dependencies.spawnProcess ?? spawn
+  const root = realpathSync(workspaceFolder)
+  if (!statSync(root).isDirectory()) throw new Error("Workspace folder does not exist")
+  const selectedPath = realpathSync(resolve(root, path))
+  const relativePath = relative(root, selectedPath)
+  if (relativePath === ".." || relativePath.startsWith(`..${process.platform === "win32" ? "\\" : "/"}`) || isAbsolute(relativePath)) {
+    throw new Error("Selected path is outside the workspace")
+  }
+  const cwd = statSync(selectedPath).isDirectory() ? selectedPath : resolve(selectedPath, "..")
+
+  if (target === "default") {
+    const mode = defaultOpenMode(selectedPath, process.platform)
+    if (mode === "edit" || mode === "choose") {
+      const systemRoot = process.env.SystemRoot?.trim() || "C:\\Windows"
+      const powershell = join(systemRoot, "System32", "WindowsPowerShell", "v1.0", "powershell.exe")
+      const rundll32 = join(systemRoot, "System32", "rundll32.exe")
+      const script = `$ErrorActionPreference='Stop'; Start-Process -FilePath '${selectedPath.replace(/'/g, "''")}' -Verb Edit`
+      const encoded = Buffer.from(script, "utf16le").toString("base64")
+      const candidates: LaunchCandidate[] = [
+        ...(mode === "edit" ? [{
+          command: powershell,
+          args: ["-NoProfile", "-NonInteractive", "-EncodedCommand", encoded],
+          passPath: false,
+          waitForExit: true,
+        }] : []),
+        {
+          command: rundll32,
+          args: ["shell32.dll,OpenAs_RunDLL"],
+          verifyStart: true,
+        },
+      ]
+      await launchFirst(candidates, selectedPath, cwd, spawnProcess)
+      return
+    }
+    const error = await dependencies.openPath(selectedPath)
+    if (error) throw new Error(error)
+    return
+  }
+
+  if (target === "reveal") {
+    dependencies.revealPath(selectedPath)
+    return
+  }
+
+  if (!statSync(selectedPath).isDirectory() && target === "terminal") throw new Error("Terminal target is not a folder")
+  if (target === "editor" && !editor) throw new Error("Editor is required")
+
+  const candidates = target === "terminal"
+    ? terminalCandidates(process.platform, process.env, selectedPath)
+    : editorCandidates(editor!, process.platform, process.env)
+  await launchFirst(candidates, selectedPath, cwd, spawnProcess)
+}
diff --git a/packages/electron-app/electron/preload/index.cjs b/packages/electron-app/electron/preload/index.cjs
index 0a35f669..618b5858 100644
--- a/packages/electron-app/electron/preload/index.cjs
+++ b/packages/electron-app/electron/preload/index.cjs
@@ -26,6 +26,13 @@ const localElectronAPI = {
   restartCli: () => ipcRenderer.invoke("cli:restart"),
   openDialog: (options) => ipcRenderer.invoke("dialog:open", options),
   getDirectoryPaths: (paths) => ipcRenderer.invoke("filesystem:getDirectoryPaths", paths),
+  openWorkspaceTarget: (payload) => ipcRenderer.invoke("workspace:openTarget", payload),
+  setWorkspaceMenuEnabled: (enabled) => ipcRenderer.invoke("workspace:setMenuEnabled", Boolean(enabled)),
+  onMenuAction: (callback) => {
+    const handler = (_event, action) => callback(action)
+    ipcRenderer.on("menu:action", handler)
+    return () => ipcRenderer.removeListener("menu:action", handler)
+  },
   getPathForFile: (file) => {
     try {
       return webUtils.getPathForFile(file)
diff --git a/packages/electron-app/package.json b/packages/electron-app/package.json
index 339f56e8..f7b79147 100644
--- a/packages/electron-app/package.json
+++ b/packages/electron-app/package.json
@@ -24,7 +24,7 @@
     "prebuild": "npm run prepare:resources",
     "build": "electron-vite build",
     "typecheck": "tsc --noEmit -p tsconfig.json",
-    "test:native": "node --import tsx --test electron/main/client-state-cross-host.test.ts electron/main/client-state-process.test.ts electron/main/client-state.test.ts electron/main/client-state-ipc.test.ts electron/main/client-state-navigation.test.ts electron/main/client-state-lifecycle.test.ts electron/main/process-stop.test.ts electron/main/renderer-client-state-flush.test.ts electron/main/renderer-origin.test.ts electron/main/serialized-lifecycle.test.ts electron/main/window-state.test.ts",
+    "test:native": "node --import tsx --test electron/main/client-state-cross-host.test.ts electron/main/client-state-process.test.ts electron/main/client-state.test.ts electron/main/client-state-ipc.test.ts electron/main/client-state-navigation.test.ts electron/main/client-state-lifecycle.test.ts electron/main/process-stop.test.ts electron/main/renderer-client-state-flush.test.ts electron/main/renderer-origin.test.ts electron/main/serialized-lifecycle.test.ts electron/main/window-state.test.ts electron/main/workspace-open.test.ts",
     "preview": "electron-vite preview",
     "build:binaries": "node scripts/build.js",
     "build:mac": "node scripts/build.js mac",
diff --git a/packages/tauri-app/src-tauri/src/main.rs b/packages/tauri-app/src-tauri/src/main.rs
index d5c5fd70..b327d248 100644
--- a/packages/tauri-app/src-tauri/src/main.rs
+++ b/packages/tauri-app/src-tauri/src/main.rs
@@ -10,6 +10,7 @@ mod linux_tls;
 mod managed_node;
 mod shutdown;
 mod windows_update;
+mod workspace_open;
 
 use cli_manager::{CliProcessManager, CliStatus};
 use desktop_event_transport::{
@@ -23,7 +24,9 @@ use std::collections::{HashMap, HashSet};
 use std::future::Future;
 use std::sync::Mutex;
 use std::time::{SystemTime, UNIX_EPOCH};
-use tauri::menu::{AboutMetadata, MenuBuilder, MenuItem, PredefinedMenuItem, SubmenuBuilder};
+use tauri::menu::{
+    AboutMetadata, MenuBuilder, MenuItem, PredefinedMenuItem, Submenu, SubmenuBuilder,
+};
 use tauri::plugin::{Builder as PluginBuilder, TauriPlugin};
 use tauri::webview::{PageLoadEvent, Webview};
 use tauri::{
@@ -62,6 +65,70 @@ pub struct AppState {
     pub remote_skip_tls_verify: Mutex<HashMap<String, bool>>,
     pub remote_tls_handlers: Mutex<HashSet<String>>,
     pub remote_titles: Mutex<HashMap<String, String>>,
+    pub workspace_menu_items: Mutex<Option<WorkspaceMenuItems>>,
+    pub workspace_menu_requested_enabled: Mutex<bool>,
+}
+
+pub struct WorkspaceMenuItems {
+    folder: MenuItem<Wry>,
+    terminal: MenuItem<Wry>,
+    editor: Submenu<Wry>,
+}
+
+fn update_workspace_menu_state(app: &AppHandle) {
+    let state = app.state::<AppState>();
+    let requested = state
+        .workspace_menu_requested_enabled
+        .lock()
+        .map(|value| *value)
+        .unwrap_or(false);
+    let focused = app
+        .get_webview_window("main")
+        .and_then(|window| window.is_focused().ok())
+        .unwrap_or(false);
+    if let Ok(items) = state.workspace_menu_items.lock() {
+        if let Some(items) = items.as_ref() {
+            let enabled = requested && focused;
+            let _ = items.folder.set_enabled(enabled);
+            let _ = items.terminal.set_enabled(enabled);
+            let _ = items.editor.set_enabled(enabled);
+        }
+    };
+}
+
+#[tauri::command]
+fn set_workspace_menu_enabled(
+    window: tauri::WebviewWindow,
+    app: AppHandle,
+    state: tauri::State<'_, AppState>,
+    enabled: bool,
+) -> Result<(), String> {
+    if window.label() != "main" {
+        return Err("Workspace menu updates are limited to the local main window".into());
+    }
+    if !enabled {
+        *state
+            .workspace_menu_requested_enabled
+            .lock()
+            .map_err(|error| error.to_string())? = false;
+        update_workspace_menu_state(&app);
+        return Ok(());
+    }
+    let config = state
+        .manager
+        .desktop_event_stream_config()
+        .ok_or("Local CodeNomad server is unavailable")?;
+    let expected = Url::parse(&config.base_url).map_err(|error| error.to_string())?;
+    let current = window.url().map_err(|error| error.to_string())?;
+    if current.origin() != expected.origin() {
+        return Err("Workspace menu updates require the local CodeNomad origin".into());
+    }
+    *state
+        .workspace_menu_requested_enabled
+        .lock()
+        .map_err(|error| error.to_string())? = enabled;
+    update_workspace_menu_state(&app);
+    Ok(())
 }
 
 #[derive(Debug, Deserialize)]
@@ -368,6 +435,9 @@ async fn open_remote_window_impl(
     let app_handle = app.clone();
     let label_for_cleanup = label.clone();
     window.on_window_event(move |event| {
+        if matches!(event, WindowEvent::Focused(_)) {
+            update_workspace_menu_state(&app_handle);
+        }
         if let WindowEvent::Destroyed = event {
             if let Ok(mut origins) = app_handle.state::<AppState>().remote_origins.lock() {
                 origins.remove(&label_for_cleanup);
@@ -607,8 +677,21 @@ fn main() {
             remote_skip_tls_verify: Mutex::new(HashMap::new()),
             remote_tls_handlers: Mutex::new(HashSet::new()),
             remote_titles: Mutex::new(HashMap::new()),
+            workspace_menu_items: Mutex::new(None),
+            workspace_menu_requested_enabled: Mutex::new(false),
         })
         .on_page_load(|webview, payload| {
+            if webview.label() == "main" && payload.event() == PageLoadEvent::Started {
+                if let Ok(mut enabled) = webview
+                    .app_handle()
+                    .state::<AppState>()
+                    .workspace_menu_requested_enabled
+                    .lock()
+                {
+                    *enabled = false;
+                }
+                update_workspace_menu_state(&webview.app_handle());
+            }
             if matches!(
                 payload.event(),
                 PageLoadEvent::Started | PageLoadEvent::Finished
@@ -629,6 +712,12 @@ fn main() {
                 shutdown::install_windows_session_end_handler(&window)
                     .map_err(|err| std::io::Error::new(std::io::ErrorKind::Other, err))?;
                 let _ = window.eval(LOCAL_WINDOW_CONTEXT_SCRIPT);
+                let app_handle = app.handle().clone();
+                window.on_window_event(move |event| {
+                    if matches!(event, WindowEvent::Focused(_)) {
+                        update_workspace_menu_state(&app_handle);
+                    }
+                });
             }
             if let Some(shortcut) = fullscreen_shortcut() {
                 let shortcut_manager = app.handle().global_shortcut();
@@ -675,14 +764,27 @@ fn main() {
             client_state::client_state_clear,
             client_state::client_state_renderer_flushed,
             client_state::client_state_navigation_flushed,
-            windows_update::install_stable_update
+            windows_update::install_stable_update,
+            workspace_open::open_workspace_target,
+            set_workspace_menu_enabled
         ])
         .on_menu_event(|app_handle, event| {
             match event.id().0.as_str() {
                 // File menu
-                "new_instance" => {
+                action @ ("new-instance"
+                | "open-workspace-folder"
+                | "open-workspace-terminal"
+                | "open-workspace-editor-vscode"
+                | "open-workspace-editor-cursor"
+                | "open-workspace-editor-zed"
+                | "open-workspace-editor-vscodium") => {
                     if let Some(window) = app_handle.get_webview_window("main") {
-                        let _ = window.emit("menu:newInstance", ());
+                        if action.starts_with("open-workspace-")
+                            && !window.is_focused().unwrap_or(false)
+                        {
+                            return;
+                        }
+                        let _ = window.emit("menu:action", action);
                     }
                 }
                 "quit" => {
@@ -885,22 +987,60 @@ fn build_menu(app: &AppHandle) -> tauri::Result<()> {
     // File menu - create New Instance with accelerator
     let new_instance_item = MenuItem::with_id(
         app,
-        "new_instance",
+        "new-instance",
         "New Instance",
         true,
         Some("CmdOrCtrl+N"),
     )?;
+    let open_folder_item = MenuItem::with_id(
+        app,
+        "open-workspace-folder",
+        "Open Project Folder",
+        true,
+        None::<&str>,
+    )?;
+    let open_terminal_item = MenuItem::with_id(
+        app,
+        "open-workspace-terminal",
+        "Open Terminal Here",
+        true,
+        None::<&str>,
+    )?;
+    let open_editor_menu = SubmenuBuilder::new(app, "Open Project In")
+        .text("open-workspace-editor-vscode", "VS Code")
+        .text("open-workspace-editor-cursor", "Cursor")
+        .text("open-workspace-editor-zed", "Zed")
+        .text("open-workspace-editor-vscodium", "VSCodium")
+        .build()?;
+    open_folder_item.set_enabled(false)?;
+    open_terminal_item.set_enabled(false)?;
+    open_editor_menu.set_enabled(false)?;
+    if let Ok(mut items) = app.state::<AppState>().workspace_menu_items.lock() {
+        *items = Some(WorkspaceMenuItems {
+            folder: open_folder_item.clone(),
+            terminal: open_terminal_item.clone(),
+            editor: open_editor_menu.clone(),
+        });
+    }
 
     let file_menu = if is_mac {
         SubmenuBuilder::new(app, "File")
             .item(&new_instance_item)
             .separator()
+            .item(&open_folder_item)
+            .item(&open_terminal_item)
+            .item(&open_editor_menu)
+            .separator()
             .close_window()
             .build()?
     } else {
         SubmenuBuilder::new(app, "File")
             .item(&new_instance_item)
             .separator()
+            .item(&open_folder_item)
+            .item(&open_terminal_item)
+            .item(&open_editor_menu)
+            .separator()
             .text("quit", "Quit")
             .build()?
     };
diff --git a/packages/tauri-app/src-tauri/src/workspace_open.rs b/packages/tauri-app/src-tauri/src/workspace_open.rs
new file mode 100644
index 00000000..76cbded3
--- /dev/null
+++ b/packages/tauri-app/src-tauri/src/workspace_open.rs
@@ -0,0 +1,632 @@
+use crate::{cli_manager::CliProcessManager, AppState};
+#[cfg(windows)]
+use base64::{engine::general_purpose::STANDARD as BASE64, Engine as _};
+use serde::de::DeserializeOwned;
+use serde::Deserialize;
+#[cfg(unix)]
+use std::os::unix::fs::PermissionsExt;
+use std::path::{Path, PathBuf};
+use std::process::{Command, Stdio};
+use tauri::State;
+
+#[derive(Clone)]
+struct LaunchCandidate {
+    command: PathBuf,
+    args: Vec<String>,
+    pass_path: bool,
+    wait_for_exit: bool,
+    verify_start: bool,
+}
+
+#[derive(Deserialize)]
+struct WorkspaceDescriptor {
+    path: String,
+}
+
+#[derive(Deserialize)]
+struct WorktreeDescriptor {
+    slug: String,
+    directory: String,
+}
+
+#[derive(Deserialize)]
+struct WorktreeListResponse {
+    worktrees: Vec<WorktreeDescriptor>,
+}
+
+fn get_local_json<T: DeserializeOwned>(
+    manager: &CliProcessManager,
+    path: &str,
+) -> Result<T, String> {
+    let config = manager
+        .desktop_event_stream_config()
+        .ok_or("Local CodeNomad server is unavailable")?;
+    let url = format!("{}{}", config.base_url.trim_end_matches('/'), path);
+    let client = reqwest::blocking::Client::new();
+    let mut request = client.get(url);
+    if let Some(cookie) = config.session_cookie {
+        request = request.header(
+            reqwest::header::COOKIE,
+            format!("{}={cookie}", config.cookie_name),
+        );
+    }
+    request
+        .send()
+        .and_then(reqwest::blocking::Response::error_for_status)
+        .map_err(|error| error.to_string())?
+        .json::<T>()
+        .map_err(|error| error.to_string())
+}
+
+fn resolve_active_workspace_folder(
+    manager: &CliProcessManager,
+    instance_id: &str,
+    worktree_slug: &str,
+) -> Result<String, String> {
+    if instance_id.is_empty()
+        || !instance_id
+            .bytes()
+            .all(|byte| byte.is_ascii_alphanumeric() || byte == b'-' || byte == b'_')
+    {
+        return Err("Invalid workspace id".into());
+    }
+    let workspace: WorkspaceDescriptor =
+        get_local_json(manager, &format!("/api/workspaces/{instance_id}"))?;
+    if worktree_slug == "root" {
+        return Ok(workspace.path);
+    }
+    let payload: WorktreeListResponse =
+        get_local_json(manager, &format!("/api/workspaces/{instance_id}/worktrees"))?;
+    payload
+        .worktrees
+        .into_iter()
+        .find(|worktree| worktree.slug == worktree_slug)
+        .map(|worktree| worktree.directory)
+        .ok_or_else(|| "Selected worktree is unavailable".into())
+}
+
+fn editor_candidates(editor: &str) -> Result<Vec<LaunchCandidate>, String> {
+    #[cfg(target_os = "macos")]
+    {
+        let name = match editor {
+            "vscode" => "Visual Studio Code",
+            "cursor" => "Cursor",
+            "zed" => "Zed",
+            "vscodium" => "VSCodium",
+            _ => return Err("Unsupported editor".into()),
+        };
+        return Ok(vec![LaunchCandidate {
+            command: "/usr/bin/open".into(),
+            args: vec!["-a".into(), name.into()],
+            pass_path: true,
+            wait_for_exit: true,
+            verify_start: false,
+        }]);
+    }
+
+    #[cfg(windows)]
+    {
+        let paths: Vec<PathBuf> = match editor {
+            "vscode" => vec![
+                std::env::var_os("LOCALAPPDATA")
+                    .map(PathBuf::from)
+                    .map(|path| path.join("Programs/Microsoft VS Code/Code.exe")),
+                std::env::var_os("ProgramFiles")
+                    .map(PathBuf::from)
+                    .map(|path| path.join("Microsoft VS Code/Code.exe")),
+            ],
+            "cursor" => vec![std::env::var_os("LOCALAPPDATA")
+                .map(PathBuf::from)
+                .map(|path| path.join("Programs/cursor/Cursor.exe"))],
+            "zed" => vec![std::env::var_os("LOCALAPPDATA")
+                .map(PathBuf::from)
+                .map(|path| path.join("Programs/Zed/Zed.exe"))],
+            "vscodium" => vec![
+                std::env::var_os("LOCALAPPDATA")
+                    .map(PathBuf::from)
+                    .map(|path| path.join("Programs/VSCodium/VSCodium.exe")),
+                std::env::var_os("ProgramFiles")
+                    .map(PathBuf::from)
+                    .map(|path| path.join("VSCodium/VSCodium.exe")),
+            ],
+            _ => return Err("Unsupported editor".into()),
+        }
+        .into_iter()
+        .flatten()
+        .filter(|path| !path.is_absolute() || path.is_file())
+        .collect();
+        return Ok(paths
+            .into_iter()
+            .map(|command| LaunchCandidate {
+                command,
+                args: Vec::new(),
+                pass_path: true,
+                wait_for_exit: false,
+                verify_start: false,
+            })
+            .collect());
+    }
+
+    #[cfg(all(not(windows), not(target_os = "macos")))]
+    {
+        let command = match editor {
+            "vscode" => "code",
+            "cursor" => "cursor",
+            "zed" => "zed",
+            "vscodium" => "codium",
+            _ => return Err("Unsupported editor".into()),
+        };
+        Ok(vec![LaunchCandidate {
+            command: command.into(),
+            args: Vec::new(),
+            pass_path: true,
+            wait_for_exit: false,
+            verify_start: true,
+        }])
+    }
+}
+
+fn terminal_candidates(folder: &Path) -> Vec<LaunchCandidate> {
+    #[cfg(target_os = "macos")]
+    return vec![LaunchCandidate {
+        command: "/usr/bin/open".into(),
+        args: vec!["-a".into(), "Terminal".into()],
+        pass_path: true,
+        wait_for_exit: true,
+        verify_start: false,
+    }];
+
+    #[cfg(windows)]
+    {
+        let system_root = std::env::var_os("SystemRoot")
+            .map(PathBuf::from)
+            .unwrap_or_else(|| r"C:\Windows".into());
+        let command = std::env::var_os("ComSpec")
+            .map(PathBuf::from)
+            .unwrap_or_else(|| system_root.join("System32/cmd.exe"));
+        let powershell = system_root.join("System32/WindowsPowerShell/v1.0/powershell.exe");
+        let escaped = folder.to_string_lossy().replace('\'', "''");
+        let script = format!("Set-Location -LiteralPath '{escaped}'");
+        return vec![LaunchCandidate {
+            command,
+            args: vec![
+                "/D".into(),
+                "/C".into(),
+                "start".into(),
+                "".into(),
+                powershell.to_string_lossy().into_owned(),
+                "-NoExit".into(),
+                "-EncodedCommand".into(),
+                encode_powershell_script(&script),
+            ],
+            pass_path: false,
+            wait_for_exit: true,
+            verify_start: false,
+        }];
+    }
+
+    #[cfg(all(not(windows), not(target_os = "macos")))]
+    {
+        let configured = std::env::var("TERMINAL")
+            .ok()
+            .map(|value| value.trim().to_string())
+            .filter(|value| !value.is_empty())
+            .into_iter();
+        configured
+            .chain(
+                [
+                    "xdg-terminal-exec",
+                    "x-terminal-emulator",
+                    "gnome-terminal",
+                    "konsole",
+                    "kitty",
+                    "alacritty",
+                    "wezterm",
+                ]
+                .map(str::to_string),
+            )
+            .map(|command| LaunchCandidate {
+                command: command.into(),
+                args: Vec::new(),
+                pass_path: false,
+                wait_for_exit: false,
+                verify_start: true,
+            })
+            .collect()
+    }
+}
+
+#[cfg(windows)]
+fn encode_powershell_script(script: &str) -> String {
+    let bytes: Vec<u8> = script.encode_utf16().flat_map(u16::to_le_bytes).collect();
+    BASE64.encode(bytes)
+}
+
+fn spawn_candidate(
+    candidate: &LaunchCandidate,
+    selected_path: &Path,
+    cwd: &Path,
+) -> std::io::Result<()> {
+    let mut command = Command::new(&candidate.command);
+    command.args(&candidate.args);
+    if candidate.pass_path {
+        command.arg(selected_path);
+    }
+    let mut child = command
+        .current_dir(cwd)
+        .stdin(Stdio::null())
+        .stdout(Stdio::null())
+        .stderr(Stdio::null())
+        .spawn()?;
+    if candidate.wait_for_exit {
+        let status = child.wait()?;
+        if !status.success() {
+            return Err(std::io::Error::new(
+                std::io::ErrorKind::Other,
+                format!("{} exited with {status}", candidate.command.display()),
+            ));
+        }
+    } else if candidate.verify_start {
+        for _ in 0..10 {
+            if let Some(status) = child.try_wait()? {
+                if status.success() {
+                    return Ok(());
+                }
+                return Err(std::io::Error::new(
+                    std::io::ErrorKind::Other,
+                    format!("{} exited with {status}", candidate.command.display()),
+                ));
+            }
+            std::thread::sleep(std::time::Duration::from_millis(25));
+        }
+        std::thread::spawn(move || {
+            let _ = child.wait();
+        });
+    }
+    Ok(())
+}
+
+fn launch_first(
+    candidates: Vec<LaunchCandidate>,
+    selected_path: &Path,
+    cwd: &Path,
+) -> Result<(), String> {
+    let mut last_error = None;
+    for candidate in candidates {
+        match spawn_candidate(&candidate, selected_path, cwd) {
+            Ok(()) => return Ok(()),
+            Err(error) => last_error = Some(error),
+        }
+    }
+    Err(last_error
+        .map(|error| error.to_string())
+        .unwrap_or_else(|| "No supported application was found".into()))
+}
+
+fn resolve_workspace_path(
+    workspace_folder: &str,
+    path: &str,
+) -> Result<(PathBuf, PathBuf), String> {
+    let root = PathBuf::from(workspace_folder)
+        .canonicalize()
+        .map_err(|error| error.to_string())?;
+    if !root.is_dir() {
+        return Err("Workspace folder does not exist".into());
+    }
+    let selected = root
+        .join(path)
+        .canonicalize()
+        .map_err(|error| error.to_string())?;
+    if !selected.starts_with(&root) {
+        return Err("Selected path is outside the workspace".into());
+    }
+    Ok((root, selected))
+}
+
+#[cfg(windows)]
+fn platform_launch_path(path: &Path) -> PathBuf {
+    let value = path.to_string_lossy();
+    if let Some(rest) = value.strip_prefix(r"\\?\UNC\") {
+        return format!(r"\\{rest}").into();
+    }
+    value.strip_prefix(r"\\?\").unwrap_or(&value).into()
+}
+
+#[derive(Debug, PartialEq, Eq)]
+enum DefaultOpenMode {
+    Open,
+    Edit,
+    Choose,
+}
+
+fn default_open_mode(path: &Path) -> Result<DefaultOpenMode, String> {
+    #[cfg(not(windows))]
+    const BLOCKED: &[&str] = &[
+        "appimage",
+        "application",
+        "chm",
+        "com",
+        "cpl",
+        "desktop",
+        "exe",
+        "jar",
+        "lnk",
+        "msi",
+        "msp",
+        "pif",
+        "scr",
+        "url",
+    ];
+    #[cfg(windows)]
+    const SAFE_WINDOWS_OPEN: &[&str] = &[
+        "7z", "avi", "bmp", "c", "cc", "cfg", "conf", "cpp", "cs", "css", "csv", "dart", "diff",
+        "docx", "env", "flac", "fs", "fsx", "gif", "go", "gz", "h", "hpp", "htm", "html", "ini",
+        "java", "jpeg", "jpg", "json", "jsonc", "jsx", "kt", "kts", "less", "lock", "log", "lua",
+        "md", "markdown", "mkv", "mov", "mp3", "mp4", "ogg", "patch", "pdf", "png", "pptx", "r",
+        "rar", "rmd", "rs", "scss", "sql", "svg", "svelte", "swift", "tar", "toml", "ts", "tsx",
+        "txt", "vue", "wav", "webm", "webp", "xlsx", "xml", "yaml", "yml", "zip",
+    ];
+    #[cfg(windows)]
+    const WINDOWS_EDIT: &[&str] = &[
+        "bat", "cmd", "js", "jse", "pl", "ps1", "psd1", "psm1", "py", "pyw", "rb", "reg", "vbe",
+        "vbs", "wsf", "wsh",
+    ];
+    let metadata = path.metadata().map_err(|error| error.to_string())?;
+    let extension = path
+        .extension()
+        .and_then(|value| value.to_str())
+        .unwrap_or_default()
+        .to_ascii_lowercase();
+    if metadata.is_dir() {
+        if cfg!(target_os = "macos") && extension == "app" {
+            return Err("Application bundles cannot be opened externally".into());
+        }
+        return Ok(DefaultOpenMode::Open);
+    }
+    #[cfg(windows)]
+    {
+        return Ok(if SAFE_WINDOWS_OPEN.contains(&extension.as_str()) {
+            DefaultOpenMode::Open
+        } else if WINDOWS_EDIT.contains(&extension.as_str()) {
+            DefaultOpenMode::Edit
+        } else {
+            DefaultOpenMode::Choose
+        });
+    }
+
+    #[cfg(unix)]
+    {
+        if BLOCKED.contains(&extension.as_str()) {
+            return Err("Executable files cannot be opened externally".into());
+        }
+        if metadata.is_file() && metadata.permissions().mode() & 0o111 != 0 {
+            return Err("Executable files cannot be opened externally".into());
+        }
+        return Ok(DefaultOpenMode::Open);
+    }
+
+    #[cfg(not(any(windows, unix)))]
+    Ok(DefaultOpenMode::Open)
+}
+
+#[cfg(not(windows))]
+fn platform_launch_path(path: &Path) -> PathBuf {
+    path.to_path_buf()
+}
+
+fn open_workspace_target_impl(
+    manager: &CliProcessManager,
+    target: String,
+    instance_id: String,
+    worktree_slug: String,
+    path: Option<String>,
+    editor: Option<String>,
+) -> Result<(), String> {
+    let workspace_folder = resolve_active_workspace_folder(manager, &instance_id, &worktree_slug)?;
+    let (root, selected) =
+        resolve_workspace_path(&workspace_folder, path.as_deref().unwrap_or("."))?;
+    let cwd = if selected.is_dir() {
+        selected.clone()
+    } else {
+        selected.parent().unwrap_or(root.as_path()).to_path_buf()
+    };
+    let launch_path = platform_launch_path(&selected);
+    let launch_cwd = platform_launch_path(&cwd);
+
+    match target.as_str() {
+        "default" => {
+            let mode = default_open_mode(&selected)?;
+            #[cfg(windows)]
+            if mode != DefaultOpenMode::Open {
+                let system_root = std::env::var_os("SystemRoot")
+                    .map(PathBuf::from)
+                    .unwrap_or_else(|| r"C:\Windows".into());
+                let powershell = system_root.join("System32/WindowsPowerShell/v1.0/powershell.exe");
+                let rundll32 = system_root.join("System32/rundll32.exe");
+                let escaped = launch_path.to_string_lossy().replace('\'', "''");
+                let script = format!(
+                    "$ErrorActionPreference='Stop'; Start-Process -FilePath '{escaped}' -Verb Edit"
+                );
+                let mut candidates = Vec::new();
+                if mode == DefaultOpenMode::Edit {
+                    candidates.push(LaunchCandidate {
+                        command: powershell,
+                        args: vec![
+                            "-NoProfile".into(),
+                            "-NonInteractive".into(),
+                            "-EncodedCommand".into(),
+                            encode_powershell_script(&script),
+                        ],
+                        pass_path: false,
+                        wait_for_exit: true,
+                        verify_start: false,
+                    });
+                }
+                candidates.push(LaunchCandidate {
+                    command: rundll32,
+                    args: vec!["shell32.dll,OpenAs_RunDLL".into()],
+                    pass_path: true,
+                    wait_for_exit: false,
+                    verify_start: true,
+                });
+                return launch_first(candidates, &launch_path, &launch_cwd);
+            }
+            #[cfg(target_os = "macos")]
+            let candidates = vec![LaunchCandidate {
+                command: "/usr/bin/open".into(),
+                args: Vec::new(),
+                pass_path: true,
+                wait_for_exit: true,
+                verify_start: false,
+            }];
+            #[cfg(windows)]
+            let candidates = vec![LaunchCandidate {
+                command: "explorer.exe".into(),
+                args: Vec::new(),
+                pass_path: true,
+                wait_for_exit: false,
+                verify_start: false,
+            }];
+            #[cfg(all(not(windows), not(target_os = "macos")))]
+            let candidates = vec![
+                LaunchCandidate {
+                    command: "xdg-open".into(),
+                    args: Vec::new(),
+                    pass_path: true,
+                    wait_for_exit: false,
+                    verify_start: true,
+                },
+                LaunchCandidate {
+                    command: "gio".into(),
+                    args: vec!["open".into()],
+                    pass_path: true,
+                    wait_for_exit: false,
+                    verify_start: true,
+                },
+            ];
+            launch_first(candidates, &launch_path, &launch_cwd)
+        }
+        "reveal" => {
+            #[cfg(target_os = "macos")]
+            let candidates = vec![LaunchCandidate {
+                command: "/usr/bin/open".into(),
+                args: vec!["-R".into()],
+                pass_path: true,
+                wait_for_exit: true,
+                verify_start: false,
+            }];
+            #[cfg(windows)]
+            let candidates = vec![LaunchCandidate {
+                command: "explorer.exe".into(),
+                args: vec![format!("/select,{}", launch_path.display())],
+                pass_path: false,
+                wait_for_exit: false,
+                verify_start: false,
+            }];
+            #[cfg(all(not(windows), not(target_os = "macos")))]
+            let candidates = vec![
+                LaunchCandidate {
+                    command: "xdg-open".into(),
+                    args: Vec::new(),
+                    pass_path: true,
+                    wait_for_exit: false,
+                    verify_start: true,
+                },
+                LaunchCandidate {
+                    command: "gio".into(),
+                    args: vec!["open".into()],
+                    pass_path: true,
+                    wait_for_exit: false,
+                    verify_start: true,
+                },
+            ];
+            let reveal_path = if cfg!(all(not(windows), not(target_os = "macos"))) {
+                launch_cwd.as_path()
+            } else {
+                launch_path.as_path()
+            };
+            launch_first(candidates, reveal_path, &launch_cwd)
+        }
+        "terminal" => {
+            if !selected.is_dir() {
+                return Err("Terminal target is not a folder".into());
+            }
+            launch_first(terminal_candidates(&launch_path), &launch_path, &launch_cwd)
+        }
+        "editor" => launch_first(
+            editor_candidates(editor.as_deref().ok_or("Editor is required")?)?,
+            &launch_path,
+            &launch_cwd,
+        ),
+        _ => Err("Unsupported workspace open target".into()),
+    }
+}
+
+#[tauri::command]
+pub async fn open_workspace_target(
+    window: tauri::WebviewWindow,
+    state: State<'_, AppState>,
+    target: String,
+    instance_id: String,
+    worktree_slug: String,
+    path: Option<String>,
+    editor: Option<String>,
+) -> Result<(), String> {
+    if window.label() != "main" {
+        return Err("Workspace open requests are limited to the local main window".into());
+    }
+    let config = state
+        .manager
+        .desktop_event_stream_config()
+        .ok_or("Local CodeNomad server is unavailable")?;
+    let expected = url::Url::parse(&config.base_url).map_err(|error| error.to_string())?;
+    let current = window.url().map_err(|error| error.to_string())?;
+    if current.origin() != expected.origin() {
+        return Err("Workspace open requests require the local CodeNomad origin".into());
+    }
+
+    let manager = state.manager.clone();
+    tauri::async_runtime::spawn_blocking(move || {
+        open_workspace_target_impl(&manager, target, instance_id, worktree_slug, path, editor)
+    })
+    .await
+    .map_err(|error| error.to_string())?
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn rejects_paths_outside_the_workspace() {
+        let workspace = tempfile::tempdir().unwrap();
+        let outside = tempfile::tempdir().unwrap();
+        let result = resolve_workspace_path(
+            workspace.path().to_str().unwrap(),
+            outside.path().to_str().unwrap(),
+        );
+        assert!(result.is_err());
+    }
+
+    #[test]
+    fn edits_windows_scripts_and_rejects_executable_default_open_targets() {
+        let workspace = tempfile::tempdir().unwrap();
+        let script = workspace.path().join("run.cmd");
+        std::fs::write(&script, "echo unsafe").unwrap();
+        #[cfg(windows)]
+        assert_eq!(default_open_mode(&script).unwrap(), DefaultOpenMode::Edit);
+        let document = workspace.path().join("notes.txt");
+        std::fs::write(&document, "safe").unwrap();
+        #[cfg(windows)]
+        assert_eq!(default_open_mode(&document).unwrap(), DefaultOpenMode::Open);
+        let executable = workspace.path().join("run.exe");
+        std::fs::write(&executable, "unsafe").unwrap();
+        #[cfg(windows)]
+        assert_eq!(
+            default_open_mode(&executable).unwrap(),
+            DefaultOpenMode::Choose
+        );
+        #[cfg(unix)]
+        assert!(default_open_mode(&executable).is_err());
+    }
+}
diff --git a/packages/ui/src/App.tsx b/packages/ui/src/App.tsx
index 38fde7ff..eadd9701 100644
--- a/packages/ui/src/App.tsx
+++ b/packages/ui/src/App.tsx
@@ -28,6 +28,8 @@ import { initReleaseNotifications } from "./stores/releases"
 import { isTauriHost, isWebHost, runtimeEnv } from "./lib/runtime-env"
 import { useI18n } from "./lib/i18n"
 import { setWakeLockDesired } from "./lib/native/wake-lock"
+import { resolveResolvable } from "./lib/commands"
+import { setWorkspaceMenuEnabled } from "./lib/workspace-open"
 import {
   isSelectingFolder,
   setIsSelectingFolder,
@@ -608,26 +610,42 @@ const App: Component = () => {
     getActiveSessionIdForInstance: activeSessionIdForInstance,
   })
 
-  // Listen for Tauri menu events
+  // Native menus execute the same commands as the command palette.
   onMount(() => {
+    const executeMenuAction = (action: unknown) => {
+      if (typeof action !== "string") return
+      const command = paletteCommands().find((candidate) => candidate.id === action)
+      if (command && !(command.disabled && resolveResolvable(command.disabled))) executeCommand(command)
+    }
+
     if (isTauriHost()) {
       const tauriBridge = (window as { __TAURI__?: { event?: { listen: (event: string, handler: (event: { payload: unknown }) => void) => Promise<() => void> } } }).__TAURI__
       if (tauriBridge?.event) {
         let unlistenMenu: (() => void) | null = null
 
-        tauriBridge.event.listen("menu:newInstance", () => {
-          handleNewInstanceRequest()
+        tauriBridge.event.listen("menu:action", (event) => {
+          executeMenuAction(event.payload)
         }).then((unlisten) => {
           unlistenMenu = unlisten
         }).catch((error) => {
-          log.error("Failed to listen for menu:newInstance event", error)
+          log.error("Failed to listen for native menu actions", error)
         })
 
         onCleanup(() => {
           unlistenMenu?.()
         })
       }
+      return
     }
+
+    const unsubscribe = window.electronAPI?.onMenuAction?.(executeMenuAction)
+    onCleanup(() => unsubscribe?.())
+  })
+
+  createEffect(() => {
+    void setWorkspaceMenuEnabled(Boolean(activeInstance())).catch((error) => {
+      log.warn("Failed to update native workspace menu state", error)
+    })
   })
 
   return (
diff --git a/packages/ui/src/components/instance/shell/right-panel/tabs/FilesTab.tsx b/packages/ui/src/components/instance/shell/right-panel/tabs/FilesTab.tsx
index b9f6ceec..b1c96f0e 100644
--- a/packages/ui/src/components/instance/shell/right-panel/tabs/FilesTab.tsx
+++ b/packages/ui/src/components/instance/shell/right-panel/tabs/FilesTab.tsx
@@ -1,18 +1,42 @@
 import { For, Show, Suspense, createEffect, createMemo, createSignal, lazy, type Accessor, type Component, type JSX } from "solid-js"
 import type { FileNode } from "@opencode-ai/sdk/v2/client"
 
-import { Copy, RefreshCw, Save, Search, WrapText } from "lucide-solid"
+import { Copy, ExternalLink, FolderOpen, RefreshCw, Save, Search, TerminalSquare, WrapText } from "lucide-solid"
 
 import SplitFilePanel from "../components/SplitFilePanel"
 import { Markdown } from "../../../../markdown"
 import { copyToClipboard } from "../../../../../lib/clipboard"
 import { showToastNotification } from "../../../../../lib/notifications"
 import { useTheme } from "../../../../../lib/theme"
+import ActionOverflowMenu, { type ActionOverflowMenuItem } from "../../../../action-overflow-menu"
+import { canOpenWorkspacePaths, openWorkspacePath } from "../../../../../lib/workspace-open"
 
 const LazyMonacoFileViewer = lazy(() =>
   import("../../../../file-viewer/monaco-file-viewer").then((module) => ({ default: module.MonacoFileViewer })),
 )
 
+const isWindowsDesktop = typeof navigator !== "undefined" && /windows/i.test(navigator.userAgent)
+const isMacDesktop = typeof navigator !== "undefined" && /macintosh|mac os x/i.test(navigator.userAgent)
+const safeWindowsOpenExtensions = new Set([
+  "7z", "avi", "bmp", "c", "cc", "cfg", "conf", "cpp", "cs", "css", "csv", "dart", "diff", "docx",
+  "env", "flac", "fs", "fsx", "gif", "go", "gz", "h", "hpp", "htm", "html", "ini", "java", "jpeg", "jpg",
+  "json", "jsonc", "jsx", "kt", "kts", "less", "lock", "log", "lua", "md", "markdown", "mkv", "mov", "mp3",
+  "mp4", "ogg", "patch", "pdf", "png", "pptx", "r", "rar", "rmd", "rs", "scss", "sql", "svg", "svelte",
+  "swift", "tar", "toml", "ts", "tsx", "txt", "vue", "wav", "webm", "webp", "xlsx", "xml", "yaml", "yml", "zip",
+])
+const windowsEditExtensions = new Set([
+  "bat", "cmd", "js", "jse", "pl", "ps1", "psd1", "psm1", "py", "pyw", "rb", "reg", "vbe", "vbs", "wsf", "wsh",
+])
+
+function windowsDefaultAction(path: string): "open" | "edit" | "choose" {
+  const name = path.split(/[\\/]/).pop() ?? ""
+  const dot = name.lastIndexOf(".")
+  const extension = dot > 0 ? name.slice(dot + 1).toLowerCase() : ""
+  if (!isWindowsDesktop || (extension && safeWindowsOpenExtensions.has(extension))) return "open"
+  if (extension && windowsEditExtensions.has(extension)) return "edit"
+  return "choose"
+}
+
 function isMarkdownPath(path: string | null | undefined): boolean {
   if (!path) return false
   return /\.(md|markdown|mdown|mkdn)$/i.test(path)
@@ -36,6 +60,8 @@ interface FilesTabProps {
 
   parentPath: Accessor<string | null>
   scopeKey: Accessor<string>
+  instanceId: string
+  worktreeSlug: Accessor<string>
 
   onLoadEntries: (path: string) => void
   onRequestOpenFile: (path: string) => void
@@ -114,6 +140,78 @@ const FilesTab: Component<FilesTabProps> = (props) => {
     })
   }
 
+  const handleNativeOpen = async (
+    target: "default" | "reveal" | "terminal",
+    path: string,
+  ) => {
+    try {
+      await openWorkspacePath({
+        target,
+        instanceId: props.instanceId,
+        worktreeSlug: props.worktreeSlug(),
+        path,
+      })
+    } catch (error) {
+      showToastNotification({
+        message: props.t("instanceShell.filesShell.toast.openError", {
+          message: error instanceof Error ? error.message : String(error),
+        }),
+        variant: "error",
+      })
+    }
+  }
+
+  const rowActions = (item: FileNode): ActionOverflowMenuItem[] => {
+    const items: ActionOverflowMenuItem[] = []
+    if (canOpenWorkspacePaths()) {
+      if (item.type === "directory") {
+        const isMacApp = isMacDesktop && item.path.toLowerCase().endsWith(".app")
+        items.push(
+          {
+            key: "open-folder",
+            label: props.t(isMacApp
+              ? "instanceShell.filesShell.actions.showInFolder"
+              : "instanceShell.filesShell.actions.openFolder"),
+            icon: <FolderOpen class="w-3.5 h-3.5" />,
+            onSelect: () => handleNativeOpen(isMacApp ? "reveal" : "default", item.path),
+          },
+          {
+            key: "open-terminal",
+            label: props.t("instanceShell.filesShell.actions.openTerminal"),
+            icon: <TerminalSquare class="w-3.5 h-3.5" />,
+            onSelect: () => handleNativeOpen("terminal", item.path),
+          },
+        )
+      } else {
+        if (isWindowsDesktop) {
+          items.push({
+            key: "open-default",
+            label: props.t({
+              open: "instanceShell.filesShell.actions.openDefault",
+              edit: "instanceShell.filesShell.actions.editDefault",
+              choose: "instanceShell.filesShell.actions.chooseApplication",
+            }[windowsDefaultAction(item.path)]),
+            icon: <ExternalLink class="w-3.5 h-3.5" />,
+            onSelect: () => handleNativeOpen("default", item.path),
+          })
+        }
+        items.push({
+          key: "show-in-folder",
+          label: props.t("instanceShell.filesShell.actions.showInFolder"),
+          icon: <FolderOpen class="w-3.5 h-3.5" />,
+          onSelect: () => handleNativeOpen("reveal", item.path),
+        })
+      }
+    }
+    items.push({
+      key: "copy-path",
+      label: props.t("instanceShell.filesShell.actions.copyPath"),
+      icon: <Copy class="w-3.5 h-3.5" />,
+      onSelect: () => handleCopyPath(item.path),
+    })
+    return items
+  }
+
   createEffect(() => {
     if (!showingMarkdownPreview()) return
     requestAnimationFrame(() => markdownPreviewRef?.focus())
@@ -189,15 +287,28 @@ const FilesTab: Component<FilesTabProps> = (props) => {
                   <div class="file-list-item-stats">
                     <span class="text-[10px] text-secondary">{item.type}</span>
                   </div>
-                  <button
-                    type="button"
-                    class="git-change-row-action"
-                    title={props.t("instanceShell.filesShell.actions.copyPath")}
-                    aria-label={props.t("instanceShell.filesShell.actions.copyPath")}
-                    onClick={(event) => void handleCopyPath(item.path, event)}
+                  <Show
+                    when={canOpenWorkspacePaths()}
+                    fallback={
+                      <button
+                        type="button"
+                        class="git-change-row-action"
+                        title={props.t("instanceShell.filesShell.actions.copyPath")}
+                        aria-label={props.t("instanceShell.filesShell.actions.copyPath")}
+                        onClick={(event) => void handleCopyPath(item.path, event)}
+                      >
+                        <Copy class="w-3 h-3" />
+                      </button>
+                    }
                   >
-                    <Copy class="w-3 h-3" />
-                  </button>
+                    <div onClick={(event) => event.stopPropagation()} onPointerDown={(event) => event.stopPropagation()}>
+                      <ActionOverflowMenu
+                        items={rowActions(item)}
+                        label={props.t("instanceShell.filesShell.actions.more", { name: item.name })}
+                        triggerClass="git-change-row-action file-row-action-menu"
+                      />
+                    </div>
+                  </Show>
                 </div>
               </div>
             </div>
diff --git a/packages/ui/src/components/instance/shell/right-panel/tabs/files-runtime.tsx b/packages/ui/src/components/instance/shell/right-panel/tabs/files-runtime.tsx
index 462b20a1..10584998 100644
--- a/packages/ui/src/components/instance/shell/right-panel/tabs/files-runtime.tsx
+++ b/packages/ui/src/components/instance/shell/right-panel/tabs/files-runtime.tsx
@@ -296,6 +296,8 @@ export function createFilesTabRuntime(options: FilesTabRuntimeOptions): () => JS
       wordWrapMode={filesWordWrapMode}
       parentPath={browserParentPath}
       scopeKey={browserScopeKey}
+      instanceId={options.instanceId}
+      worktreeSlug={options.worktreeSlug}
       onLoadEntries={(path: string) => void loadBrowserEntries(path)}
       onRequestOpenFile={(path: string) => void handleOpenBrowserFileRequest(path)}
       onRefresh={() => void refreshFilesTab()}
diff --git a/packages/ui/src/lib/hooks/use-commands.ts b/packages/ui/src/lib/hooks/use-commands.ts
index e11c9765..9460bf6b 100644
--- a/packages/ui/src/lib/hooks/use-commands.ts
+++ b/packages/ui/src/lib/hooks/use-commands.ts
@@ -21,6 +21,8 @@ import { requestData } from "../opencode-api"
 import { emitSessionSidebarRequest } from "../session-sidebar-events"
 import { tGlobal } from "../i18n"
 import { registerBehaviorCommands } from "../settings/behavior-registry"
+import { canOpenWorkspacePaths, openWorkspacePath, type WorkspaceEditor, type WorkspaceOpenTarget } from "../workspace-open"
+import { getDefaultWorktreeSlug, getWorktreeSlugForSession } from "../../stores/worktrees"
 
 const log = getLogger("actions")
 
@@ -82,6 +84,36 @@ export function useCommands(options: UseCommandsOptions) {
     const activeInstance = options.getActiveInstance
     const activeSessionIdForInstance = options.getActiveSessionIdForInstance
 
+    const activeWorkspace = () => {
+      const instance = activeInstance()
+      if (!instance) return null
+      const sessionId = activeSessionIdForInstance()
+      const worktreeSlug = !sessionId || sessionId === "info"
+        ? getDefaultWorktreeSlug(instance.id)
+        : getWorktreeSlugForSession(instance.id, sessionId)
+      return { instanceId: instance.id, worktreeSlug }
+    }
+
+    const openActiveWorkspace = async (target: WorkspaceOpenTarget, editor?: WorkspaceEditor) => {
+      const workspace = activeWorkspace()
+      if (!workspace) {
+        showAlertDialog(tGlobal("commands.openWorkspace.projectRequired.message"), {
+          title: tGlobal("commands.openWorkspace.projectRequired.title"),
+        })
+        return
+      }
+      try {
+        await openWorkspacePath({ target, ...workspace, editor })
+      } catch (error) {
+        showAlertDialog(tGlobal("commands.openWorkspace.failed.message", {
+          message: error instanceof Error ? error.message : String(error),
+        }), {
+          title: tGlobal("commands.openWorkspace.failed.title"),
+          variant: "error",
+        })
+      }
+    }
+
     commandRegistry.register({
       id: "new-instance",
       label: () => tGlobal("commands.newInstance.label"),
@@ -104,6 +136,44 @@ export function useCommands(options: UseCommandsOptions) {
       },
     })
 
+    if (canOpenWorkspacePaths()) {
+      commandRegistry.register({
+        id: "open-workspace-folder",
+        label: () => tGlobal("commands.openWorkspace.folder.label"),
+        description: () => tGlobal("commands.openWorkspace.folder.description"),
+        category: "Instance",
+        keywords: () => splitKeywords("commands.openWorkspace.folder.keywords"),
+        disabled: () => !activeInstance(),
+        action: () => openActiveWorkspace("default"),
+      })
+      commandRegistry.register({
+        id: "open-workspace-terminal",
+        label: () => tGlobal("commands.openWorkspace.terminal.label"),
+        description: () => tGlobal("commands.openWorkspace.terminal.description"),
+        category: "Instance",
+        keywords: () => splitKeywords("commands.openWorkspace.terminal.keywords"),
+        disabled: () => !activeInstance(),
+        action: () => openActiveWorkspace("terminal"),
+      })
+      const editors: Array<[WorkspaceEditor, string]> = [
+        ["vscode", "VS Code"],
+        ["cursor", "Cursor"],
+        ["zed", "Zed"],
+        ["vscodium", "VSCodium"],
+      ]
+      for (const [editor, name] of editors) {
+        commandRegistry.register({
+          id: `open-workspace-editor-${editor}`,
+          label: () => tGlobal("commands.openWorkspace.editor.label", { editor: name }),
+          description: () => tGlobal("commands.openWorkspace.editor.description", { editor: name }),
+          category: "Instance",
+          keywords: () => [name, ...splitKeywords("commands.openWorkspace.editor.keywords")],
+          disabled: () => !activeInstance(),
+          action: () => openActiveWorkspace("editor", editor),
+        })
+      }
+    }
+
     commandRegistry.register({
       id: "instance-next",
       label: () => tGlobal("commands.nextInstance.label"),
diff --git a/packages/ui/src/lib/i18n/messages/de/commands.ts b/packages/ui/src/lib/i18n/messages/de/commands.ts
index 5962a1aa..82e96514 100644
--- a/packages/ui/src/lib/i18n/messages/de/commands.ts
+++ b/packages/ui/src/lib/i18n/messages/de/commands.ts
@@ -14,6 +14,19 @@ export const commandMessages = {
   "commands.newInstance.label": "Neue Instanz",
   "commands.newInstance.description": "Ordnerauswahl öffnen, um eine neue Instanz zu erstellen",
   "commands.newInstance.keywords": "ordner, projekt, arbeitsbereich",
+  "commands.openWorkspace.folder.label": "Projektordner öffnen",
+  "commands.openWorkspace.folder.description": "Aktuellen Projektordner im Dateimanager öffnen",
+  "commands.openWorkspace.folder.keywords": "Ordner, Explorer, Finder, Dateien",
+  "commands.openWorkspace.terminal.label": "Terminal hier öffnen",
+  "commands.openWorkspace.terminal.description": "Externes Terminal im aktuellen Projektordner öffnen",
+  "commands.openWorkspace.terminal.keywords": "Terminal, Shell, Konsole",
+  "commands.openWorkspace.editor.label": "Projekt in {editor} öffnen",
+  "commands.openWorkspace.editor.description": "Aktuellen Projektordner in {editor} öffnen",
+  "commands.openWorkspace.editor.keywords": "Editor, IDE, Code",
+  "commands.openWorkspace.failed.title": "Projekt konnte nicht geöffnet werden",
+  "commands.openWorkspace.failed.message": "{message}",
+  "commands.openWorkspace.projectRequired.title": "Kein Projekt geöffnet",
+  "commands.openWorkspace.projectRequired.message": "Öffnen Sie zuerst ein Projekt.",
 
   "commands.closeInstance.label": "Tab schließen",
   "commands.closeInstance.description": "Den aktuellen obersten Tab schließen",
diff --git a/packages/ui/src/lib/i18n/messages/de/instance.ts b/packages/ui/src/lib/i18n/messages/de/instance.ts
index d3eaa263..c622b2f0 100644
--- a/packages/ui/src/lib/i18n/messages/de/instance.ts
+++ b/packages/ui/src/lib/i18n/messages/de/instance.ts
@@ -167,6 +167,15 @@ export const instanceMessages = {
   "instanceShell.filesShell.search.ariaLabel": "Dateien in diesem Ordner filtern",
   "instanceShell.filesShell.search.empty": "Keine passenden Dateien.",
   "instanceShell.filesShell.actions.copyPath": "Pfad kopieren",
+  "instanceShell.filesShell.actions.more": "Weitere Aktionen für {name}",
+  "instanceShell.filesShell.actions.openDefault": "Mit Standardanwendung öffnen",
+  "instanceShell.filesShell.actions.editDefault": "Mit Standardanwendung bearbeiten",
+  "instanceShell.filesShell.actions.chooseApplication": "Öffnen mit...",
+  "instanceShell.filesShell.actions.showInFolder": "Im Ordner anzeigen",
+  "instanceShell.filesShell.actions.openFolder": "Im Dateimanager öffnen",
+  "instanceShell.filesShell.actions.openTerminal": "Terminal hier öffnen",
+  "instanceShell.filesShell.actions.openEditor": "In {editor} öffnen",
+  "instanceShell.filesShell.toast.openError": "Öffnen fehlgeschlagen: {message}",
   "instanceShell.filesShell.toast.copyPathSuccess": "Pfad kopiert",
   "instanceShell.filesShell.toast.copyPathError": "Pfad konnte nicht kopiert werden",
   "instanceShell.filesShell.previewMarkdown": "Markdown-Vorschau",
diff --git a/packages/ui/src/lib/i18n/messages/en/commands.ts b/packages/ui/src/lib/i18n/messages/en/commands.ts
index 3dabac04..cfabd78a 100644
--- a/packages/ui/src/lib/i18n/messages/en/commands.ts
+++ b/packages/ui/src/lib/i18n/messages/en/commands.ts
@@ -14,6 +14,19 @@ export const commandMessages = {
   "commands.newInstance.label": "New Instance",
   "commands.newInstance.description": "Open folder picker to create new instance",
   "commands.newInstance.keywords": "folder, project, workspace",
+  "commands.openWorkspace.folder.label": "Open Project Folder",
+  "commands.openWorkspace.folder.description": "Open the current project folder in the file manager",
+  "commands.openWorkspace.folder.keywords": "folder, explorer, finder, files",
+  "commands.openWorkspace.terminal.label": "Open Terminal Here",
+  "commands.openWorkspace.terminal.description": "Open an external terminal in the current project folder",
+  "commands.openWorkspace.terminal.keywords": "terminal, shell, console",
+  "commands.openWorkspace.editor.label": "Open Project in {editor}",
+  "commands.openWorkspace.editor.description": "Open the current project folder in {editor}",
+  "commands.openWorkspace.editor.keywords": "editor, ide, code",
+  "commands.openWorkspace.failed.title": "Could not open project",
+  "commands.openWorkspace.failed.message": "{message}",
+  "commands.openWorkspace.projectRequired.title": "No project open",
+  "commands.openWorkspace.projectRequired.message": "Open a project first.",
 
   "commands.closeInstance.label": "Close Tab",
   "commands.closeInstance.description": "Close the current top-level tab",
diff --git a/packages/ui/src/lib/i18n/messages/en/instance.ts b/packages/ui/src/lib/i18n/messages/en/instance.ts
index bd4fb699..dc3d40fb 100644
--- a/packages/ui/src/lib/i18n/messages/en/instance.ts
+++ b/packages/ui/src/lib/i18n/messages/en/instance.ts
@@ -167,6 +167,15 @@ export const instanceMessages = {
   "instanceShell.filesShell.search.ariaLabel": "Filter files in this folder",
   "instanceShell.filesShell.search.empty": "No matching files.",
   "instanceShell.filesShell.actions.copyPath": "Copy path",
+  "instanceShell.filesShell.actions.more": "More actions for {name}",
+  "instanceShell.filesShell.actions.openDefault": "Open with default application",
+  "instanceShell.filesShell.actions.editDefault": "Edit with default application",
+  "instanceShell.filesShell.actions.chooseApplication": "Open with...",
+  "instanceShell.filesShell.actions.showInFolder": "Show in folder",
+  "instanceShell.filesShell.actions.openFolder": "Open in file manager",
+  "instanceShell.filesShell.actions.openTerminal": "Open terminal here",
+  "instanceShell.filesShell.actions.openEditor": "Open in {editor}",
+  "instanceShell.filesShell.toast.openError": "Could not open: {message}",
   "instanceShell.filesShell.toast.copyPathSuccess": "Copied path",
   "instanceShell.filesShell.toast.copyPathError": "Failed to copy path",
   "instanceShell.filesShell.previewMarkdown": "Preview Markdown",
diff --git a/packages/ui/src/lib/i18n/messages/es/commands.ts b/packages/ui/src/lib/i18n/messages/es/commands.ts
index 68e9c302..6bd4dd7c 100644
--- a/packages/ui/src/lib/i18n/messages/es/commands.ts
+++ b/packages/ui/src/lib/i18n/messages/es/commands.ts
@@ -14,6 +14,19 @@ export const commandMessages = {
   "commands.newInstance.label": "Nueva instancia",
   "commands.newInstance.description": "Abrir el selector de carpetas para crear una nueva instancia",
   "commands.newInstance.keywords": "carpeta, proyecto, workspace",
+  "commands.openWorkspace.folder.label": "Abrir carpeta del proyecto",
+  "commands.openWorkspace.folder.description": "Abrir la carpeta del proyecto actual en el explorador de archivos",
+  "commands.openWorkspace.folder.keywords": "carpeta, explorador, archivos",
+  "commands.openWorkspace.terminal.label": "Abrir terminal aquí",
+  "commands.openWorkspace.terminal.description": "Abrir un terminal externo en la carpeta del proyecto actual",
+  "commands.openWorkspace.terminal.keywords": "terminal, shell, consola",
+  "commands.openWorkspace.editor.label": "Abrir proyecto en {editor}",
+  "commands.openWorkspace.editor.description": "Abrir la carpeta del proyecto actual en {editor}",
+  "commands.openWorkspace.editor.keywords": "editor, ide, código",
+  "commands.openWorkspace.failed.title": "No se pudo abrir el proyecto",
+  "commands.openWorkspace.failed.message": "{message}",
+  "commands.openWorkspace.projectRequired.title": "No hay ningún proyecto abierto",
+  "commands.openWorkspace.projectRequired.message": "Abre primero un proyecto.",
 
   "commands.closeInstance.label": "Cerrar pestaña",
   "commands.closeInstance.description": "Cerrar la pestaña superior actual",
diff --git a/packages/ui/src/lib/i18n/messages/es/instance.ts b/packages/ui/src/lib/i18n/messages/es/instance.ts
index e24672a8..dbd096b3 100644
--- a/packages/ui/src/lib/i18n/messages/es/instance.ts
+++ b/packages/ui/src/lib/i18n/messages/es/instance.ts
@@ -167,6 +167,15 @@ export const instanceMessages = {
   "instanceShell.filesShell.search.ariaLabel": "Filtrar archivos de esta carpeta",
   "instanceShell.filesShell.search.empty": "No hay archivos coincidentes.",
   "instanceShell.filesShell.actions.copyPath": "Copiar ruta",
+  "instanceShell.filesShell.actions.more": "Más acciones para {name}",
+  "instanceShell.filesShell.actions.openDefault": "Abrir con la aplicación predeterminada",
+  "instanceShell.filesShell.actions.editDefault": "Editar con la aplicación predeterminada",
+  "instanceShell.filesShell.actions.chooseApplication": "Abrir con...",
+  "instanceShell.filesShell.actions.showInFolder": "Mostrar en la carpeta",
+  "instanceShell.filesShell.actions.openFolder": "Abrir en el explorador de archivos",
+  "instanceShell.filesShell.actions.openTerminal": "Abrir terminal aquí",
+  "instanceShell.filesShell.actions.openEditor": "Abrir en {editor}",
+  "instanceShell.filesShell.toast.openError": "No se pudo abrir: {message}",
   "instanceShell.filesShell.toast.copyPathSuccess": "Ruta copiada",
   "instanceShell.filesShell.toast.copyPathError": "No se pudo copiar la ruta",
   "instanceShell.filesShell.previewMarkdown": "Vista previa Markdown",
diff --git a/packages/ui/src/lib/i18n/messages/fr/commands.ts b/packages/ui/src/lib/i18n/messages/fr/commands.ts
index f846bc88..683b4221 100644
--- a/packages/ui/src/lib/i18n/messages/fr/commands.ts
+++ b/packages/ui/src/lib/i18n/messages/fr/commands.ts
@@ -14,6 +14,19 @@ export const commandMessages = {
   "commands.newInstance.label": "Nouvelle instance",
   "commands.newInstance.description": "Ouvrir le sélecteur de dossiers pour créer une nouvelle instance",
   "commands.newInstance.keywords": "dossier, projet, espace de travail",
+  "commands.openWorkspace.folder.label": "Ouvrir le dossier du projet",
+  "commands.openWorkspace.folder.description": "Ouvrir le dossier du projet actuel dans le gestionnaire de fichiers",
+  "commands.openWorkspace.folder.keywords": "dossier, explorateur, fichiers",
+  "commands.openWorkspace.terminal.label": "Ouvrir un terminal ici",
+  "commands.openWorkspace.terminal.description": "Ouvrir un terminal externe dans le dossier du projet actuel",
+  "commands.openWorkspace.terminal.keywords": "terminal, shell, console",
+  "commands.openWorkspace.editor.label": "Ouvrir le projet dans {editor}",
+  "commands.openWorkspace.editor.description": "Ouvrir le dossier du projet actuel dans {editor}",
+  "commands.openWorkspace.editor.keywords": "éditeur, ide, code",
+  "commands.openWorkspace.failed.title": "Impossible d'ouvrir le projet",
+  "commands.openWorkspace.failed.message": "{message}",
+  "commands.openWorkspace.projectRequired.title": "Aucun projet ouvert",
+  "commands.openWorkspace.projectRequired.message": "Ouvrez d'abord un projet.",
 
   "commands.closeInstance.label": "Fermer l'onglet",
   "commands.closeInstance.description": "Fermer l'onglet de premier niveau actuel",
diff --git a/packages/ui/src/lib/i18n/messages/fr/instance.ts b/packages/ui/src/lib/i18n/messages/fr/instance.ts
index 51b865dc..f14360a3 100644
--- a/packages/ui/src/lib/i18n/messages/fr/instance.ts
+++ b/packages/ui/src/lib/i18n/messages/fr/instance.ts
@@ -165,6 +165,15 @@ export const instanceMessages = {
   "instanceShell.filesShell.search.ariaLabel": "Filtrer les fichiers de ce dossier",
   "instanceShell.filesShell.search.empty": "Aucun fichier correspondant.",
   "instanceShell.filesShell.actions.copyPath": "Copier le chemin",
+  "instanceShell.filesShell.actions.more": "Plus d'actions pour {name}",
+  "instanceShell.filesShell.actions.openDefault": "Ouvrir avec l'application par défaut",
+  "instanceShell.filesShell.actions.editDefault": "Modifier avec l'application par défaut",
+  "instanceShell.filesShell.actions.chooseApplication": "Ouvrir avec...",
+  "instanceShell.filesShell.actions.showInFolder": "Afficher dans le dossier",
+  "instanceShell.filesShell.actions.openFolder": "Ouvrir dans le gestionnaire de fichiers",
+  "instanceShell.filesShell.actions.openTerminal": "Ouvrir un terminal ici",
+  "instanceShell.filesShell.actions.openEditor": "Ouvrir dans {editor}",
+  "instanceShell.filesShell.toast.openError": "Impossible d'ouvrir : {message}",
   "instanceShell.filesShell.toast.copyPathSuccess": "Chemin copié",
   "instanceShell.filesShell.toast.copyPathError": "Impossible de copier le chemin",
   "instanceShell.filesShell.previewMarkdown": "Aperçu Markdown",
diff --git a/packages/ui/src/lib/i18n/messages/he/commands.ts b/packages/ui/src/lib/i18n/messages/he/commands.ts
index a432e042..7cb77583 100644
--- a/packages/ui/src/lib/i18n/messages/he/commands.ts
+++ b/packages/ui/src/lib/i18n/messages/he/commands.ts
@@ -14,6 +14,19 @@ export const commandMessages = {
   "commands.newInstance.label": "מופע חדש",
   "commands.newInstance.description": "פתח בורר תיקיות ליצירת מופע חדש",
   "commands.newInstance.keywords": "תיקייה, פרויקט, סביבת עבודה",
+  "commands.openWorkspace.folder.label": "פתיחת תיקיית הפרויקט",
+  "commands.openWorkspace.folder.description": "פתיחת תיקיית הפרויקט הנוכחי במנהל הקבצים",
+  "commands.openWorkspace.folder.keywords": "תיקייה, קבצים, סייר",
+  "commands.openWorkspace.terminal.label": "פתיחת מסוף כאן",
+  "commands.openWorkspace.terminal.description": "פתיחת מסוף חיצוני בתיקיית הפרויקט הנוכחי",
+  "commands.openWorkspace.terminal.keywords": "מסוף, shell, קונסולה",
+  "commands.openWorkspace.editor.label": "פתיחת הפרויקט ב-{editor}",
+  "commands.openWorkspace.editor.description": "פתיחת תיקיית הפרויקט הנוכחי ב-{editor}",
+  "commands.openWorkspace.editor.keywords": "עורך, ide, קוד",
+  "commands.openWorkspace.failed.title": "לא ניתן לפתוח את הפרויקט",
+  "commands.openWorkspace.failed.message": "{message}",
+  "commands.openWorkspace.projectRequired.title": "אין פרויקט פתוח",
+  "commands.openWorkspace.projectRequired.message": "יש לפתוח פרויקט תחילה.",
 
   "commands.closeInstance.label": "סגור לשונית",
   "commands.closeInstance.description": "סגור את הלשונית העליונה הנוכחית",
diff --git a/packages/ui/src/lib/i18n/messages/he/instance.ts b/packages/ui/src/lib/i18n/messages/he/instance.ts
index 3e42ff08..f5974b8b 100644
--- a/packages/ui/src/lib/i18n/messages/he/instance.ts
+++ b/packages/ui/src/lib/i18n/messages/he/instance.ts
@@ -167,6 +167,15 @@ export const instanceMessages = {
   "instanceShell.filesShell.search.ariaLabel": "סנן קבצים בתיקייה הזו",
   "instanceShell.filesShell.search.empty": "לא נמצאו קבצים תואמים.",
   "instanceShell.filesShell.actions.copyPath": "העתק נתיב",
+  "instanceShell.filesShell.actions.more": "פעולות נוספות עבור {name}",
+  "instanceShell.filesShell.actions.openDefault": "פתיחה באמצעות יישום ברירת המחדל",
+  "instanceShell.filesShell.actions.editDefault": "עריכה באמצעות יישום ברירת המחדל",
+  "instanceShell.filesShell.actions.chooseApplication": "פתיחה באמצעות...",
+  "instanceShell.filesShell.actions.showInFolder": "הצגה בתיקייה",
+  "instanceShell.filesShell.actions.openFolder": "פתיחה במנהל הקבצים",
+  "instanceShell.filesShell.actions.openTerminal": "פתיחת מסוף כאן",
+  "instanceShell.filesShell.actions.openEditor": "פתיחה ב-{editor}",
+  "instanceShell.filesShell.toast.openError": "לא ניתן לפתוח: {message}",
   "instanceShell.filesShell.toast.copyPathSuccess": "הנתיב הועתק",
   "instanceShell.filesShell.toast.copyPathError": "העתקת הנתיב נכשלה",
   "instanceShell.filesShell.previewMarkdown": "תצוגת Markdown",
diff --git a/packages/ui/src/lib/i18n/messages/ja/commands.ts b/packages/ui/src/lib/i18n/messages/ja/commands.ts
index c00b13d4..5e2a5bce 100644
--- a/packages/ui/src/lib/i18n/messages/ja/commands.ts
+++ b/packages/ui/src/lib/i18n/messages/ja/commands.ts
@@ -14,6 +14,19 @@ export const commandMessages = {
   "commands.newInstance.label": "新しいインスタンス",
   "commands.newInstance.description": "フォルダ選択を開いて新しいインスタンスを作成",
   "commands.newInstance.keywords": "フォルダ, プロジェクト, ワークスペース, folder, project, workspace",
+  "commands.openWorkspace.folder.label": "プロジェクトフォルダーを開く",
+  "commands.openWorkspace.folder.description": "現在のプロジェクトフォルダーをファイルマネージャーで開く",
+  "commands.openWorkspace.folder.keywords": "フォルダー, エクスプローラー, ファイル",
+  "commands.openWorkspace.terminal.label": "ここでターミナルを開く",
+  "commands.openWorkspace.terminal.description": "現在のプロジェクトフォルダーで外部ターミナルを開く",
+  "commands.openWorkspace.terminal.keywords": "ターミナル, シェル, コンソール",
+  "commands.openWorkspace.editor.label": "プロジェクトを{editor}で開く",
+  "commands.openWorkspace.editor.description": "現在のプロジェクトフォルダーを{editor}で開く",
+  "commands.openWorkspace.editor.keywords": "エディター, ide, コード",
+  "commands.openWorkspace.failed.title": "プロジェクトを開けませんでした",
+  "commands.openWorkspace.failed.message": "{message}",
+  "commands.openWorkspace.projectRequired.title": "プロジェクトが開かれていません",
+  "commands.openWorkspace.projectRequired.message": "先にプロジェクトを開いてください。",
 
   "commands.closeInstance.label": "タブを閉じる",
   "commands.closeInstance.description": "現在のトップレベルタブを閉じる",
diff --git a/packages/ui/src/lib/i18n/messages/ja/instance.ts b/packages/ui/src/lib/i18n/messages/ja/instance.ts
index 51952de5..b061b71f 100644
--- a/packages/ui/src/lib/i18n/messages/ja/instance.ts
+++ b/packages/ui/src/lib/i18n/messages/ja/instance.ts
@@ -167,6 +167,15 @@ export const instanceMessages = {
   "instanceShell.filesShell.search.ariaLabel": "このフォルダーのファイルを絞り込む",
   "instanceShell.filesShell.search.empty": "一致するファイルがありません。",
   "instanceShell.filesShell.actions.copyPath": "パスをコピー",
+  "instanceShell.filesShell.actions.more": "{name}のその他の操作",
+  "instanceShell.filesShell.actions.openDefault": "既定のアプリケーションで開く",
+  "instanceShell.filesShell.actions.editDefault": "既定のアプリケーションで編集",
+  "instanceShell.filesShell.actions.chooseApplication": "アプリケーションを選択して開く...",
+  "instanceShell.filesShell.actions.showInFolder": "フォルダーに表示",
+  "instanceShell.filesShell.actions.openFolder": "ファイルマネージャーで開く",
+  "instanceShell.filesShell.actions.openTerminal": "ここでターミナルを開く",
+  "instanceShell.filesShell.actions.openEditor": "{editor}で開く",
+  "instanceShell.filesShell.toast.openError": "開けませんでした: {message}",
   "instanceShell.filesShell.toast.copyPathSuccess": "パスをコピーしました",
   "instanceShell.filesShell.toast.copyPathError": "パスをコピーできませんでした",
   "instanceShell.filesShell.previewMarkdown": "Markdown プレビュー",
diff --git a/packages/ui/src/lib/i18n/messages/ne/commands.ts b/packages/ui/src/lib/i18n/messages/ne/commands.ts
index f7c9eab6..35bc74aa 100644
--- a/packages/ui/src/lib/i18n/messages/ne/commands.ts
+++ b/packages/ui/src/lib/i18n/messages/ne/commands.ts
@@ -14,6 +14,19 @@ export const commandMessages = {
   "commands.newInstance.label": "नयाँ उदाहरण (New Instance)",
   "commands.newInstance.description": "नयाँ उदाहरण सिर्जना गर्न फोल्डर चयनकर्ता खोल्नुहोस्",
   "commands.newInstance.keywords": "फोल्डर, परियोजना, कार्यस्थान",
+  "commands.openWorkspace.folder.label": "परियोजना फोल्डर खोल्नुहोस्",
+  "commands.openWorkspace.folder.description": "हालको परियोजना फोल्डर फाइल व्यवस्थापकमा खोल्नुहोस्",
+  "commands.openWorkspace.folder.keywords": "फोल्डर, फाइल, एक्सप्लोरर",
+  "commands.openWorkspace.terminal.label": "यहाँ टर्मिनल खोल्नुहोस्",
+  "commands.openWorkspace.terminal.description": "हालको परियोजना फोल्डरमा बाह्य टर्मिनल खोल्नुहोस्",
+  "commands.openWorkspace.terminal.keywords": "टर्मिनल, shell, कन्सोल",
+  "commands.openWorkspace.editor.label": "परियोजना {editor} मा खोल्नुहोस्",
+  "commands.openWorkspace.editor.description": "हालको परियोजना फोल्डर {editor} मा खोल्नुहोस्",
+  "commands.openWorkspace.editor.keywords": "सम्पादक, ide, कोड",
+  "commands.openWorkspace.failed.title": "परियोजना खोल्न सकिएन",
+  "commands.openWorkspace.failed.message": "{message}",
+  "commands.openWorkspace.projectRequired.title": "कुनै परियोजना खुलेको छैन",
+  "commands.openWorkspace.projectRequired.message": "पहिले परियोजना खोल्नुहोस्।",
 
   "commands.closeInstance.label": "ट्याब बन्द गर्नुहोस्",
   "commands.closeInstance.description": "हालको शीर्ष-स्तरको ट्याब बन्द गर्नुहोस्",
diff --git a/packages/ui/src/lib/i18n/messages/ne/instance.ts b/packages/ui/src/lib/i18n/messages/ne/instance.ts
index 5bb3f3e0..76006511 100644
--- a/packages/ui/src/lib/i18n/messages/ne/instance.ts
+++ b/packages/ui/src/lib/i18n/messages/ne/instance.ts
@@ -167,6 +167,15 @@ export const instanceMessages = {
   "instanceShell.filesShell.search.ariaLabel": "यस फोल्डरमा फाइलहरू फिल्टर गर्नुहोस्",
   "instanceShell.filesShell.search.empty": "कुनै मिल्दो फाइलहरू छैनन्।",
   "instanceShell.filesShell.actions.copyPath": "मार्ग (Path) प्रतिलिपि गर्नुहोस्",
+  "instanceShell.filesShell.actions.more": "{name} का लागि थप कार्यहरू",
+  "instanceShell.filesShell.actions.openDefault": "पूर्वनिर्धारित अनुप्रयोगमा खोल्नुहोस्",
+  "instanceShell.filesShell.actions.editDefault": "पूर्वनिर्धारित अनुप्रयोगमा सम्पादन गर्नुहोस्",
+  "instanceShell.filesShell.actions.chooseApplication": "यससँग खोल्नुहोस्...",
+  "instanceShell.filesShell.actions.showInFolder": "फोल्डरमा देखाउनुहोस्",
+  "instanceShell.filesShell.actions.openFolder": "फाइल व्यवस्थापकमा खोल्नुहोस्",
+  "instanceShell.filesShell.actions.openTerminal": "यहाँ टर्मिनल खोल्नुहोस्",
+  "instanceShell.filesShell.actions.openEditor": "{editor} मा खोल्नुहोस्",
+  "instanceShell.filesShell.toast.openError": "खोल्न सकिएन: {message}",
   "instanceShell.filesShell.toast.copyPathSuccess": "मार्ग प्रतिलिपि गरियो",
   "instanceShell.filesShell.toast.copyPathError": "मार्ग प्रतिलिपि गर्न असफल भयो",
   "instanceShell.filesShell.previewMarkdown": "Markdown पूर्वावलोकन",
diff --git a/packages/ui/src/lib/i18n/messages/ru/commands.ts b/packages/ui/src/lib/i18n/messages/ru/commands.ts
index 8d674f48..782b5a62 100644
--- a/packages/ui/src/lib/i18n/messages/ru/commands.ts
+++ b/packages/ui/src/lib/i18n/messages/ru/commands.ts
@@ -14,6 +14,19 @@ export const commandMessages = {
   "commands.newInstance.label": "Новый экземпляр",
   "commands.newInstance.description": "Открыть выбор папки для создания нового экземпляра",
   "commands.newInstance.keywords": "папка, проект, рабочее пространство",
+  "commands.openWorkspace.folder.label": "Открыть папку проекта",
+  "commands.openWorkspace.folder.description": "Открыть папку текущего проекта в файловом менеджере",
+  "commands.openWorkspace.folder.keywords": "папка, проводник, файлы",
+  "commands.openWorkspace.terminal.label": "Открыть терминал здесь",
+  "commands.openWorkspace.terminal.description": "Открыть внешний терминал в папке текущего проекта",
+  "commands.openWorkspace.terminal.keywords": "терминал, оболочка, консоль",
+  "commands.openWorkspace.editor.label": "Открыть проект в {editor}",
+  "commands.openWorkspace.editor.description": "Открыть папку текущего проекта в {editor}",
+  "commands.openWorkspace.editor.keywords": "редактор, ide, код",
+  "commands.openWorkspace.failed.title": "Не удалось открыть проект",
+  "commands.openWorkspace.failed.message": "{message}",
+  "commands.openWorkspace.projectRequired.title": "Проект не открыт",
+  "commands.openWorkspace.projectRequired.message": "Сначала откройте проект.",
 
   "commands.closeInstance.label": "Закрыть вкладку",
   "commands.closeInstance.description": "Закрыть текущую верхнеуровневую вкладку",
diff --git a/packages/ui/src/lib/i18n/messages/ru/instance.ts b/packages/ui/src/lib/i18n/messages/ru/instance.ts
index 80437e05..53b6e0bf 100644
--- a/packages/ui/src/lib/i18n/messages/ru/instance.ts
+++ b/packages/ui/src/lib/i18n/messages/ru/instance.ts
@@ -167,6 +167,15 @@ export const instanceMessages = {
   "instanceShell.filesShell.search.ariaLabel": "Фильтровать файлы в этой папке",
   "instanceShell.filesShell.search.empty": "Совпадающих файлов нет.",
   "instanceShell.filesShell.actions.copyPath": "Скопировать путь",
+  "instanceShell.filesShell.actions.more": "Дополнительные действия для {name}",
+  "instanceShell.filesShell.actions.openDefault": "Открыть в приложении по умолчанию",
+  "instanceShell.filesShell.actions.editDefault": "Изменить в приложении по умолчанию",
+  "instanceShell.filesShell.actions.chooseApplication": "Открыть с помощью...",
+  "instanceShell.filesShell.actions.showInFolder": "Показать в папке",
+  "instanceShell.filesShell.actions.openFolder": "Открыть в файловом менеджере",
+  "instanceShell.filesShell.actions.openTerminal": "Открыть терминал здесь",
+  "instanceShell.filesShell.actions.openEditor": "Открыть в {editor}",
+  "instanceShell.filesShell.toast.openError": "Не удалось открыть: {message}",
   "instanceShell.filesShell.toast.copyPathSuccess": "Путь скопирован",
   "instanceShell.filesShell.toast.copyPathError": "Не удалось скопировать путь",
   "instanceShell.filesShell.previewMarkdown": "Предпросмотр Markdown",
diff --git a/packages/ui/src/lib/i18n/messages/zh-Hans/commands.ts b/packages/ui/src/lib/i18n/messages/zh-Hans/commands.ts
index a8078c14..eabf6036 100644
--- a/packages/ui/src/lib/i18n/messages/zh-Hans/commands.ts
+++ b/packages/ui/src/lib/i18n/messages/zh-Hans/commands.ts
@@ -14,6 +14,19 @@ export const commandMessages = {
   "commands.newInstance.label": "新建实例",
   "commands.newInstance.description": "打开文件夹选择器以创建新实例",
   "commands.newInstance.keywords": "folder, project, workspace, 文件夹, 项目, 工作区",
+  "commands.openWorkspace.folder.label": "打开项目文件夹",
+  "commands.openWorkspace.folder.description": "在文件管理器中打开当前项目文件夹",
+  "commands.openWorkspace.folder.keywords": "文件夹, 资源管理器, 文件",
+  "commands.openWorkspace.terminal.label": "在此处打开终端",
+  "commands.openWorkspace.terminal.description": "在当前项目文件夹中打开外部终端",
+  "commands.openWorkspace.terminal.keywords": "终端, shell, 控制台",
+  "commands.openWorkspace.editor.label": "在{editor}中打开项目",
+  "commands.openWorkspace.editor.description": "在{editor}中打开当前项目文件夹",
+  "commands.openWorkspace.editor.keywords": "编辑器, ide, 代码",
+  "commands.openWorkspace.failed.title": "无法打开项目",
+  "commands.openWorkspace.failed.message": "{message}",
+  "commands.openWorkspace.projectRequired.title": "没有打开的项目",
+  "commands.openWorkspace.projectRequired.message": "请先打开一个项目。",
 
   "commands.closeInstance.label": "关闭标签页",
   "commands.closeInstance.description": "关闭当前顶层标签页",
diff --git a/packages/ui/src/lib/i18n/messages/zh-Hans/instance.ts b/packages/ui/src/lib/i18n/messages/zh-Hans/instance.ts
index 6a29f202..119bad8f 100644
--- a/packages/ui/src/lib/i18n/messages/zh-Hans/instance.ts
+++ b/packages/ui/src/lib/i18n/messages/zh-Hans/instance.ts
@@ -167,6 +167,15 @@ export const instanceMessages = {
   "instanceShell.filesShell.search.ariaLabel": "筛选此文件夹中的文件",
   "instanceShell.filesShell.search.empty": "没有匹配的文件。",
   "instanceShell.filesShell.actions.copyPath": "复制路径",
+  "instanceShell.filesShell.actions.more": "{name}的更多操作",
+  "instanceShell.filesShell.actions.openDefault": "使用默认应用打开",
+  "instanceShell.filesShell.actions.editDefault": "使用默认应用编辑",
+  "instanceShell.filesShell.actions.chooseApplication": "打开方式...",
+  "instanceShell.filesShell.actions.showInFolder": "在文件夹中显示",
+  "instanceShell.filesShell.actions.openFolder": "在文件管理器中打开",
+  "instanceShell.filesShell.actions.openTerminal": "在此处打开终端",
+  "instanceShell.filesShell.actions.openEditor": "在{editor}中打开",
+  "instanceShell.filesShell.toast.openError": "无法打开：{message}",
   "instanceShell.filesShell.toast.copyPathSuccess": "路径已复制",
   "instanceShell.filesShell.toast.copyPathError": "无法复制路径",
   "instanceShell.filesShell.previewMarkdown": "Markdown 预览",
diff --git a/packages/ui/src/lib/workspace-open.ts b/packages/ui/src/lib/workspace-open.ts
new file mode 100644
index 00000000..e069daea
--- /dev/null
+++ b/packages/ui/src/lib/workspace-open.ts
@@ -0,0 +1,40 @@
+import { isDesktopHost, isLocalWindow, isTauriHost } from "./runtime-env"
+
+export type WorkspaceOpenTarget = "default" | "reveal" | "terminal" | "editor"
+export type WorkspaceEditor = "vscode" | "cursor" | "zed" | "vscodium"
+
+export interface WorkspaceOpenRequest {
+  target: WorkspaceOpenTarget
+  instanceId: string
+  worktreeSlug: string
+  path?: string
+  editor?: WorkspaceEditor
+}
+
+export function canOpenWorkspacePaths(): boolean {
+  return isDesktopHost() && isLocalWindow()
+}
+
+export async function openWorkspacePath(request: WorkspaceOpenRequest): Promise<void> {
+  if (!canOpenWorkspacePaths()) throw new Error("Native workspace actions are unavailable")
+
+  if (isTauriHost()) {
+    const invoke = window.__TAURI__?.core?.invoke
+    if (!invoke) throw new Error("Tauri bridge is unavailable")
+    await invoke("open_workspace_target", { ...request })
+    return
+  }
+
+  const openTarget = window.electronAPI?.openWorkspaceTarget
+  if (!openTarget) throw new Error("Electron bridge is unavailable")
+  await openTarget(request)
+}
+
+export async function setWorkspaceMenuEnabled(enabled: boolean): Promise<void> {
+  if (!isDesktopHost() || !isLocalWindow()) return
+  if (isTauriHost()) {
+    await window.__TAURI__?.core?.invoke("set_workspace_menu_enabled", { enabled })
+    return
+  }
+  await window.electronAPI?.setWorkspaceMenuEnabled?.(enabled)
+}
diff --git a/packages/ui/src/styles/panels/right-panel.css b/packages/ui/src/styles/panels/right-panel.css
index 612bf22f..e8b8f8f3 100644
--- a/packages/ui/src/styles/panels/right-panel.css
+++ b/packages/ui/src/styles/panels/right-panel.css
@@ -415,6 +415,10 @@
   transition: background-color 150ms ease, color 150ms ease, border-color 150ms ease;
 }
 
+.file-list-item .action-overflow-trigger.file-row-action-menu {
+  display: inline-flex;
+}
+
 .git-change-row-action:hover {
   background-color: var(--surface-hover);
   border-color: var(--border-base);
diff --git a/packages/ui/src/types/global.d.ts b/packages/ui/src/types/global.d.ts
index e4c3a6ab..b922c343 100644
--- a/packages/ui/src/types/global.d.ts
+++ b/packages/ui/src/types/global.d.ts
@@ -35,6 +35,15 @@ declare global {
     restartCli?: () => Promise<unknown>
     openDialog?: (options: ElectronDialogOptions) => Promise<ElectronDialogResult>
     getDirectoryPaths?: (paths: string[]) => Promise<string[]>
+    openWorkspaceTarget?: (payload: {
+      target: "default" | "reveal" | "terminal" | "editor"
+      instanceId: string
+      worktreeSlug: string
+      path?: string
+      editor?: "vscode" | "cursor" | "zed" | "vscodium"
+    }) => Promise<{ ok: true }>
+    setWorkspaceMenuEnabled?: (enabled: boolean) => Promise<{ ok: true }>
+    onMenuAction?: (callback: (action: string) => void) => () => void
     getPathForFile?: (file: File) => string | null
     requestMicrophoneAccess?: () => Promise<{ granted: boolean }>
     setWakeLock?: (enabled: boolean) => Promise<{ enabled: boolean }>

From 3bf3f584ad2bb0071682193dcbd4391233e6fe83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pascal=20Andr=C3=A9?= <pascalandr@gmail.com>
Date: Thu, 13 Aug 2026 10:33:23 +0200
Subject: [PATCH 4/6] feat(ui): manage visible provider models (#637)

## Summary
- add per-provider model visibility controls to Settings > Providers and
the floating provider dialog
- persist exact hidden model IDs as CodeNomad presentation preferences
- keep large plugin catalogs manageable with search and Show all / Hide
all actions

## Behavior
- all current and newly reported models remain visible by default
- unchecked models are hidden only from model picker lists
- active/default models remain usable even when hidden
- favorites remain persisted and return when their models are shown
again
- the same management UI is available from Settings and the floating
model-picker dialog

This intentionally mirrors OpenChamber/OpenCode Desktop client-side
hiding. It does not rewrite OpenCode configuration or change model
execution/default semantics.

## Validation
- npm run typecheck
- node --import tsx --test packages/ui/src/lib/model-visibility.test.ts
- npm run build --workspace @codenomad/ui
- Gatekeeper reviews: PASS

Closes #636
---
 .github/workflows/pr-build.yml                |   1 +
 packages/server/src/settings/service.test.ts  |  58 +++++++
 packages/server/src/settings/service.ts       |  32 +++-
 .../src/settings/yaml-doc-store.test.ts       |  84 ++++++++++
 .../server/src/settings/yaml-doc-store.ts     |  50 +++++-
 packages/server/src/sidecars/manager.test.ts  |  47 ++++++
 packages/server/src/sidecars/manager.ts       |  25 ++-
 packages/ui/src/components/model-selector.tsx | 143 ++++++++++++------
 .../provider-auth/provider-manager-modal.tsx  | 111 +++++++++++---
 .../provider-model-visibility-manager.tsx     | 123 +++++++++++++++
 .../ui/src/lib/i18n/messages/de/settings.ts   |  14 ++
 .../ui/src/lib/i18n/messages/en/settings.ts   |  14 ++
 .../ui/src/lib/i18n/messages/es/settings.ts   |  14 ++
 .../ui/src/lib/i18n/messages/fr/settings.ts   |  14 ++
 .../ui/src/lib/i18n/messages/he/settings.ts   |  14 ++
 .../ui/src/lib/i18n/messages/ja/settings.ts   |  14 ++
 .../ui/src/lib/i18n/messages/ne/settings.ts   |  14 ++
 .../ui/src/lib/i18n/messages/ru/settings.ts   |  14 ++
 .../src/lib/i18n/messages/zh-Hans/settings.ts |  14 ++
 packages/ui/src/lib/model-visibility.test.ts  |  76 ++++++++++
 packages/ui/src/lib/model-visibility.ts       |  39 +++++
 packages/ui/src/stores/preferences.tsx        |  85 ++++++++++-
 .../src/styles/components/provider-auth.css   |   7 +-
 .../components/provider-model-visibility.css  |  89 +++++++++++
 packages/ui/src/styles/controls.css           |   1 +
 25 files changed, 1010 insertions(+), 87 deletions(-)
 create mode 100644 packages/server/src/settings/service.test.ts
 create mode 100644 packages/server/src/settings/yaml-doc-store.test.ts
 create mode 100644 packages/server/src/sidecars/manager.test.ts
 create mode 100644 packages/ui/src/components/provider-auth/provider-model-visibility-manager.tsx
 create mode 100644 packages/ui/src/lib/model-visibility.test.ts
 create mode 100644 packages/ui/src/lib/model-visibility.ts
 create mode 100644 packages/ui/src/styles/components/provider-model-visibility.css

diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml
index cbcfbbc9..c73a8f1a 100644
--- a/.github/workflows/pr-build.yml
+++ b/.github/workflows/pr-build.yml
@@ -110,6 +110,7 @@ jobs:
           packages/ui/src/lib/hooks/use-foreground-refresh.test.ts
           packages/ui/src/lib/launch-errors.test.ts
           packages/ui/src/lib/message-selection-position.test.ts
+          packages/ui/src/lib/model-visibility.test.ts
           packages/ui/src/lib/runtime-env.test.ts
           packages/ui/src/lib/trailing-resync.test.ts
           packages/ui/src/stores/abort-created-workspace-cleanup.test.ts
diff --git a/packages/server/src/settings/service.test.ts b/packages/server/src/settings/service.test.ts
new file mode 100644
index 00000000..505a5cca
--- /dev/null
+++ b/packages/server/src/settings/service.test.ts
@@ -0,0 +1,58 @@
+import assert from "node:assert/strict"
+import { describe, it } from "node:test"
+import { SettingsService } from "./service"
+
+function serviceWithStore(store: Record<string, unknown>) {
+  const service = Object.create(SettingsService.prototype) as SettingsService
+  Object.assign(service as any, { configStore: store, eventBus: undefined })
+  return service
+}
+
+describe("SettingsService config persistence", () => {
+  it("normalizes and persists a document patch once", () => {
+    let writes = 0
+    const service = serviceWithStore({
+      get: () => ({ server: { logLevel: "info" } }),
+      replace: (value: unknown) => {
+        writes += 1
+        return value
+      },
+      mergePatch: () => assert.fail("must not persist an intermediate document"),
+    })
+
+    const result = service.mergePatchDoc("config", { ui: { theme: "dark" } })
+    assert.equal(writes, 1)
+    assert.deepEqual(result, { server: { logLevel: "INFO" }, ui: { theme: "dark" } })
+  })
+
+  it("normalizes and persists a server-owner patch once", () => {
+    let writes = 0
+    const service = serviceWithStore({
+      getOwner: () => ({ logLevel: "info", sidecars: [] }),
+      replaceOwner: (_owner: string, value: unknown) => {
+        writes += 1
+        return value
+      },
+      mergePatchOwner: () => assert.fail("must not persist an intermediate owner"),
+    })
+
+    const result = service.mergePatchOwner("config", "server", { sidecars: [{ id: "one" }] })
+    assert.equal(writes, 1)
+    assert.deepEqual(result, { logLevel: "INFO", sidecars: [{ id: "one" }] })
+  })
+
+  it("does not report a persisted patch as failed when an event listener throws", () => {
+    let warnings = 0
+    const service = serviceWithStore({
+      getOwner: () => ({}),
+      mergePatchOwner: (_owner: string, patch: unknown) => patch,
+    })
+    Object.assign(service as any, {
+      eventBus: { publish: () => { throw new Error("listener failed") } },
+      logger: { warn: () => { warnings += 1 } },
+    })
+
+    assert.deepEqual(service.mergePatchOwner("config", "ui", { theme: "dark" }), { theme: "dark" })
+    assert.equal(warnings, 1)
+  })
+})
diff --git a/packages/server/src/settings/service.ts b/packages/server/src/settings/service.ts
index f4f0409c..7bb10e72 100644
--- a/packages/server/src/settings/service.ts
+++ b/packages/server/src/settings/service.ts
@@ -6,6 +6,7 @@ import { YamlDocStore, type SettingsDoc } from "./yaml-doc-store"
 import { migrateSettingsLayout } from "./migrate"
 import type { WorkspaceEventPayload } from "../api-types"
 import { sanitizeConfigOwner } from "./public-config"
+import { applyMergePatch } from "./merge-patch"
 
 export type DocKind = "config" | "state"
 
@@ -67,8 +68,16 @@ export class SettingsService {
     private readonly logger: Logger,
   ) {
     migrateSettingsLayout(location, logger)
-    this.configStore = new YamlDocStore(location.configYamlPath, logger.child({ component: "settings-config" }))
-    this.stateStore = new YamlDocStore(location.stateYamlPath, logger.child({ component: "settings-state" }))
+    this.configStore = new YamlDocStore(
+      location.configYamlPath,
+      logger.child({ component: "settings-config" }),
+      { throwOnPersistError: true },
+    )
+    this.stateStore = new YamlDocStore(
+      location.stateYamlPath,
+      logger.child({ component: "settings-state" }),
+      { throwOnPersistError: true },
+    )
   }
 
   getDoc(kind: DocKind): SettingsDoc {
@@ -85,9 +94,12 @@ export class SettingsService {
   }
 
   mergePatchDoc(kind: DocKind, patch: unknown): SettingsDoc {
+    if (!isPlainObject(patch)) {
+      throw new Error("Patch must be a JSON object")
+    }
     const updated =
       kind === "config"
-        ? this.configStore.replace(normalizeConfigDoc(this.configStore.mergePatch(patch)))
+        ? this.configStore.replace(normalizeConfigDoc(applyMergePatch(this.configStore.get(), patch) as SettingsDoc))
         : this.stateStore.mergePatch(patch)
     this.publish(kind, "*")
     return updated
@@ -104,10 +116,16 @@ export class SettingsService {
   }
 
   mergePatchOwner(kind: DocKind, owner: string, patch: unknown): SettingsDoc {
+    if (!isPlainObject(patch)) {
+      throw new Error("Patch must be a JSON object")
+    }
     const updated =
       kind === "config"
         ? owner === "server"
-          ? this.configStore.replaceOwner(owner, normalizeServerConfigOwner(this.configStore.mergePatchOwner(owner, patch)))
+          ? this.configStore.replaceOwner(
+              owner,
+              normalizeServerConfigOwner(applyMergePatch(this.configStore.getOwner(owner), patch) as SettingsDoc),
+            )
           : this.configStore.mergePatchOwner(owner, patch)
         : this.stateStore.mergePatchOwner(owner, patch)
     this.publish(kind, owner, updated)
@@ -123,6 +141,10 @@ export class SettingsService {
       owner,
       value: kind === "config" ? sanitizeConfigOwner(owner, nextValue) : nextValue,
     } as any
-    this.eventBus.publish(payload)
+    try {
+      this.eventBus.publish(payload)
+    } catch (error) {
+      this.logger.warn({ err: error, kind, owner }, "Failed to publish settings change")
+    }
   }
 }
diff --git a/packages/server/src/settings/yaml-doc-store.test.ts b/packages/server/src/settings/yaml-doc-store.test.ts
new file mode 100644
index 00000000..1dc98edc
--- /dev/null
+++ b/packages/server/src/settings/yaml-doc-store.test.ts
@@ -0,0 +1,84 @@
+import assert from "node:assert/strict"
+import fs from "node:fs"
+import os from "node:os"
+import path from "node:path"
+import { describe, it } from "node:test"
+import { YamlDocStore } from "./yaml-doc-store"
+
+describe("YamlDocStore", () => {
+  it("reports persistence failures without replacing the cached document", () => {
+    const root = fs.mkdtempSync(path.join(os.tmpdir(), "codenomad-yaml-store-"))
+    const parent = path.join(root, "settings")
+    const file = path.join(parent, "config.yaml")
+    const store = new YamlDocStore(file, { warn() {} } as any, { throwOnPersistError: true })
+
+    try {
+      store.replace({ version: 1 })
+      fs.rmSync(parent, { recursive: true })
+      fs.writeFileSync(parent, "blocks directory creation")
+
+      assert.throws(() => store.replace({ version: 2 }))
+      assert.deepEqual(store.get(), { version: 1 })
+    } finally {
+      fs.rmSync(root, { recursive: true, force: true })
+    }
+  })
+
+  it("keeps the live document intact when atomic replacement fails", () => {
+    const root = fs.mkdtempSync(path.join(os.tmpdir(), "codenomad-yaml-store-"))
+    const file = path.join(root, "config.yaml")
+    const store = new YamlDocStore(file, { warn() {} } as any, { throwOnPersistError: true })
+    const renameSync = fs.renameSync
+
+    try {
+      store.replace({ version: 1 })
+      ;(fs as any).renameSync = () => { throw new Error("replacement failed") }
+
+      assert.throws(() => store.replace({ version: 2 }))
+      assert.match(fs.readFileSync(file, "utf8"), /version: 1/)
+      assert.deepEqual(store.get(), { version: 1 })
+
+      ;(fs as any).renameSync = renameSync
+      store.replace({ version: 2 })
+      assert.match(fs.readFileSync(file, "utf8"), /version: 2/)
+    } finally {
+      ;(fs as any).renameSync = renameSync
+      fs.rmSync(root, { recursive: true, force: true })
+    }
+  })
+
+  it("preserves private file permissions", { skip: process.platform === "win32" }, () => {
+    const root = fs.mkdtempSync(path.join(os.tmpdir(), "codenomad-yaml-store-"))
+    const file = path.join(root, "config.yaml")
+    const store = new YamlDocStore(file, { warn() {} } as any, { throwOnPersistError: true })
+
+    try {
+      store.replace({ version: 1 })
+      fs.chmodSync(file, 0o664)
+      store.replace({ version: 2 })
+      assert.equal(fs.statSync(file).mode & 0o777, 0o664)
+    } finally {
+      fs.rmSync(root, { recursive: true, force: true })
+    }
+  })
+
+  it("updates the final target without replacing a symlink chain", { skip: process.platform === "win32" }, () => {
+    const root = fs.mkdtempSync(path.join(os.tmpdir(), "codenomad-yaml-store-"))
+    const target = path.join(root, "target.yaml")
+    const intermediate = path.join(root, "current.yaml")
+    const link = path.join(root, "config.yaml")
+    fs.writeFileSync(target, "version: 1\n")
+    fs.symlinkSync(target, intermediate)
+    fs.symlinkSync(intermediate, link)
+    const store = new YamlDocStore(link, { warn() {} } as any, { throwOnPersistError: true })
+
+    try {
+      store.replace({ version: 2 })
+      assert.equal(fs.lstatSync(link).isSymbolicLink(), true)
+      assert.equal(fs.lstatSync(intermediate).isSymbolicLink(), true)
+      assert.match(fs.readFileSync(target, "utf8"), /version: 2/)
+    } finally {
+      fs.rmSync(root, { recursive: true, force: true })
+    }
+  })
+})
diff --git a/packages/server/src/settings/yaml-doc-store.ts b/packages/server/src/settings/yaml-doc-store.ts
index 91c5540c..95090c10 100644
--- a/packages/server/src/settings/yaml-doc-store.ts
+++ b/packages/server/src/settings/yaml-doc-store.ts
@@ -1,5 +1,6 @@
 import fs from "fs"
 import path from "path"
+import { randomUUID } from "node:crypto"
 import { parse as parseYaml, stringify as stringifyYaml } from "yaml"
 import type { Logger } from "../logger"
 import { applyMergePatch, isPlainObject } from "./merge-patch"
@@ -18,6 +19,25 @@ function normalizeDoc(input: unknown): SettingsDoc {
   return input
 }
 
+function resolveWriteDestination(filePath: string): string {
+  let current = path.resolve(filePath)
+  const seen = new Set<string>()
+
+  while (true) {
+    let stat: fs.Stats
+    try {
+      stat = fs.lstatSync(current)
+    } catch (error: any) {
+      if (error?.code === "ENOENT") return current
+      throw error
+    }
+    if (!stat.isSymbolicLink()) return current
+    if (seen.has(current)) throw new Error(`Circular settings symlink: ${filePath}`)
+    seen.add(current)
+    current = path.resolve(path.dirname(current), fs.readlinkSync(current))
+  }
+}
+
 export class YamlDocStore {
   private cache: SettingsDoc = {}
   private loaded = false
@@ -25,6 +45,7 @@ export class YamlDocStore {
   constructor(
     private readonly filePath: string,
     private readonly logger: Logger,
+    private readonly options: { throwOnPersistError?: boolean } = {},
   ) {}
 
   load(): SettingsDoc {
@@ -58,9 +79,17 @@ export class YamlDocStore {
 
   replace(next: unknown): SettingsDoc {
     const normalized = normalizeDoc(next)
+    const previousCache = this.cache
+    const previousLoaded = this.loaded
     this.cache = normalized
     this.loaded = true
-    this.persist()
+    try {
+      this.persist()
+    } catch (error) {
+      this.cache = previousCache
+      this.loaded = previousLoaded
+      throw error
+    }
     return this.cache
   }
 
@@ -99,12 +128,27 @@ export class YamlDocStore {
   }
 
   private persist() {
+    let tempPath: string | undefined
     try {
-      fs.mkdirSync(path.dirname(this.filePath), { recursive: true })
+      const destination = resolveWriteDestination(this.filePath)
+      fs.mkdirSync(path.dirname(destination), { recursive: true })
       const yaml = stringifyYaml(this.cache as any)
-      fs.writeFileSync(this.filePath, ensureTrailingNewline(yaml), "utf-8")
+      const mode = fs.existsSync(destination) ? fs.statSync(destination).mode & 0o777 : 0o600
+      tempPath = `${destination}.${process.pid}.${randomUUID()}.tmp`
+      fs.writeFileSync(tempPath, ensureTrailingNewline(yaml), { encoding: "utf-8", mode })
+      if (process.platform !== "win32") fs.chmodSync(tempPath, mode)
+      fs.renameSync(tempPath, destination)
     } catch (error) {
       this.logger.warn({ err: error, filePath: this.filePath }, "Failed to persist YAML doc")
+      if (this.options.throwOnPersistError) throw error
+    } finally {
+      if (tempPath) {
+        try {
+          fs.rmSync(tempPath, { force: true })
+        } catch (error) {
+          this.logger.warn({ err: error, tempPath }, "Failed to remove temporary YAML doc")
+        }
+      }
     }
   }
 }
diff --git a/packages/server/src/sidecars/manager.test.ts b/packages/server/src/sidecars/manager.test.ts
new file mode 100644
index 00000000..65eb1d12
--- /dev/null
+++ b/packages/server/src/sidecars/manager.test.ts
@@ -0,0 +1,47 @@
+import assert from "node:assert/strict"
+import { describe, it } from "node:test"
+import { SideCarManager } from "./manager"
+
+const existing = {
+  id: "existing",
+  kind: "port",
+  name: "Existing",
+  port: 65534,
+  insecure: true,
+  prefixMode: "strip",
+  createdAt: "2026-01-01T00:00:00.000Z",
+  updatedAt: "2026-01-01T00:00:00.000Z",
+}
+
+function manager(sidecars: unknown[] = []) {
+  return new SideCarManager({
+    settings: {
+      getOwner: () => ({ sidecars }),
+      mergePatchOwner: () => { throw new Error("disk full") },
+    } as any,
+    eventBus: { publish() {} } as any,
+    logger: { warn() {} } as any,
+  })
+}
+
+describe("SideCarManager persistence rollback", () => {
+  it("restores create, update, and delete state when persistence fails", async () => {
+    const createManager = manager()
+    await assert.rejects(createManager.create({
+      kind: "port",
+      name: "New",
+      port: 65533,
+      insecure: true,
+      prefixMode: "strip",
+    }))
+    assert.deepEqual(await createManager.list(), [])
+
+    const updateManager = manager([existing])
+    await assert.rejects(updateManager.update(existing.id, { name: "Changed" }))
+    assert.equal((await updateManager.get(existing.id))?.name, existing.name)
+
+    const deleteManager = manager([existing])
+    await assert.rejects(deleteManager.delete(existing.id))
+    assert.equal((await deleteManager.get(existing.id))?.id, existing.id)
+  })
+})
diff --git a/packages/server/src/sidecars/manager.ts b/packages/server/src/sidecars/manager.ts
index 57593c30..5fce0677 100644
--- a/packages/server/src/sidecars/manager.ts
+++ b/packages/server/src/sidecars/manager.ts
@@ -82,7 +82,13 @@ export class SideCarManager {
 
     this.configs.set(record.id, record)
     this.runtime.set(record.id, { status: "stopped" })
-    this.persistConfigs()
+    try {
+      this.persistConfigs()
+    } catch (error) {
+      this.configs.delete(record.id)
+      this.runtime.delete(record.id)
+      throw error
+    }
     await this.refreshPortSideCar(record.id)
     return this.toSideCar(record)
   }
@@ -98,13 +104,19 @@ export class SideCarManager {
   ): Promise<SideCar> {
     const record = this.requireConfig(id)
 
+    const previous = { ...record }
     record.name = typeof input.name === "string" ? input.name.trim() : record.name
     record.port = typeof input.port === "number" ? input.port : record.port
     record.insecure = typeof input.insecure === "boolean" ? input.insecure : record.insecure
     record.prefixMode = typeof input.prefixMode === "string" ? input.prefixMode : record.prefixMode
     record.updatedAt = new Date().toISOString()
 
-    this.persistConfigs()
+    try {
+      this.persistConfigs()
+    } catch (error) {
+      this.configs.set(id, previous)
+      throw error
+    }
     await this.refreshPortSideCar(id)
     return this.toSideCar(record)
   }
@@ -113,9 +125,16 @@ export class SideCarManager {
     const record = this.configs.get(id)
     if (!record) return false
 
+    const runtime = this.runtime.get(id)
     this.configs.delete(id)
     this.runtime.delete(id)
-    this.persistConfigs()
+    try {
+      this.persistConfigs()
+    } catch (error) {
+      this.configs.set(id, record)
+      if (runtime) this.runtime.set(id, runtime)
+      throw error
+    }
     this.options.eventBus.publish({ type: "sidecar.removed", sidecarId: id })
     return true
   }
diff --git a/packages/ui/src/components/model-selector.tsx b/packages/ui/src/components/model-selector.tsx
index fba3680d..0ae19371 100644
--- a/packages/ui/src/components/model-selector.tsx
+++ b/packages/ui/src/components/model-selector.tsx
@@ -5,8 +5,9 @@ import { ChevronDown, PlugZap, Star } from "lucide-solid"
 import type { Model } from "../types/session"
 import { useI18n } from "../lib/i18n"
 import { getLogger } from "../lib/logger"
-import { uiState, toggleFavoriteModelPreference } from "../stores/preferences"
+import { getProviderModelVisibilityPreference, uiState, toggleFavoriteModelPreference } from "../stores/preferences"
 import { ProviderManagerModal } from "./provider-auth/provider-manager-modal"
+import { isModelVisible, resolvePickerValue } from "../lib/model-visibility"
 const log = getLogger("session")
 
 interface ModelSelectorProps {
@@ -20,6 +21,7 @@ interface FlatModel extends Model {
   providerName: string
   key: string
   searchText: string
+  unavailable?: boolean
 }
 
 interface ModelGroup {
@@ -67,7 +69,7 @@ export default function ModelSelector(props: ModelSelectorProps) {
     }
   })
 
-  const allModels = createMemo<FlatModel[]>(() =>
+  const catalogModels = createMemo<FlatModel[]>(() =>
     instanceProviders().flatMap((p) =>
       p.models.map((m) => ({
         ...m,
@@ -78,6 +80,13 @@ export default function ModelSelector(props: ModelSelectorProps) {
     ),
   )
 
+  const allModels = createMemo(() => catalogModels().filter((model) =>
+    isModelVisible(
+      getProviderModelVisibilityPreference(model.providerId),
+      model.id,
+    ),
+  ))
+
   const sortedModels = createMemo<FlatModel[]>(() =>
     [...allModels()].sort((left, right) => {
       const providerComparison = compareIds(left.providerId, right.providerId)
@@ -106,9 +115,22 @@ export default function ModelSelector(props: ModelSelectorProps) {
 
   const hasFavorites = createMemo(() => favoriteModels().length > 0)
 
-  const currentModelValue = createMemo(() =>
-    allModels().find((m) => m.providerId === props.currentModel.providerId && m.id === props.currentModel.modelId),
-  )
+  const currentModelValue = createMemo<FlatModel | undefined>(() => {
+    const current = props.currentModel
+    const found = catalogModels().find((model) => model.providerId === current.providerId && model.id === current.modelId)
+    if (found) return found
+    if (!current.providerId || !current.modelId) return undefined
+    const providerName = instanceProviders().find((provider) => provider.id === current.providerId)?.name ?? current.providerId
+    return {
+      id: current.modelId,
+      name: t("modelSelector.unavailableModel", { model: current.modelId }),
+      providerId: current.providerId,
+      providerName,
+      key: `${current.providerId}/${current.modelId}`,
+      searchText: `${current.modelId} ${providerName} ${current.providerId}`,
+      unavailable: true,
+    }
+  })
 
   const currentModelIsFavorite = createMemo(() => {
     const current = props.currentModel
@@ -134,10 +156,9 @@ export default function ModelSelector(props: ModelSelectorProps) {
   })
 
   const visibleOptions = createMemo<FlatModel[]>(() => {
-    if (!favoritesOnlyEnabled()) {
-      return sortedModels()
-    }
-    return favoriteModels()
+    const visible = favoritesOnlyEnabled() ? favoriteModels() : sortedModels()
+    const current = currentModelValue()
+    return current?.unavailable ? [current, ...visible] : visible
   })
 
   const groupedVisibleOptions = createMemo<ModelGroup[]>(() => {
@@ -169,8 +190,27 @@ export default function ModelSelector(props: ModelSelectorProps) {
     ]),
   )
 
+  const comboboxValue = createMemo(() => {
+    const options = pickerOptions().filter((option): option is FlatModel => !isProviderHeaderOption(option))
+    return resolvePickerValue(currentModelValue(), options)
+  })
+
+  const currentModelLabel = createMemo(() =>
+    t("modelSelector.trigger.primary", { model: currentModelValue()?.name ?? t("modelSelector.none") }),
+  )
+
+  const currentModelAccessibleLabel = createMemo(() => {
+    const current = currentModelValue()
+    if (!current) return currentModelLabel()
+    return t("modelSelector.trigger.ariaLabel", {
+      model: current.name,
+      provider: current.providerName,
+      id: `${current.providerId}/${current.id}`,
+    })
+  })
+
   const handleChange = async (value: PickerOption | null) => {
-    if (!value || isProviderHeaderOption(value)) return
+    if (!value || isProviderHeaderOption(value) || value.unavailable) return
     await props.onModelChange({ providerId: value.providerId, modelId: value.id })
   }
 
@@ -268,7 +308,7 @@ export default function ModelSelector(props: ModelSelectorProps) {
     <div class="sidebar-selector">
       <Combobox<PickerOption>
         open={isOpen()}
-        value={currentModelValue()}
+        value={comboboxValue()}
         onChange={handleChange}
         onOpenChange={(next) => {
           if (!next && suppressNextClose) return
@@ -278,7 +318,7 @@ export default function ModelSelector(props: ModelSelectorProps) {
         optionValue="key"
         optionTextValue="searchText"
         optionLabel={(option) => (isProviderHeaderOption(option) ? option.providerName : option.name)}
-        optionDisabled={isProviderHeaderOption}
+        optionDisabled={(option) => isProviderHeaderOption(option) || Boolean(option.unavailable)}
         placeholder={t("modelSelector.placeholder.search")}
         defaultFilter={customFilter}
         allowsEmptyCollection
@@ -314,56 +354,59 @@ export default function ModelSelector(props: ModelSelectorProps) {
                     <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 13l4 4L19 7" />
                   </svg>
                 </Combobox.ItemIndicator>
-                <button
-                  type="button"
-                  class="selector-option-star"
-                  data-active={isFavorite()}
-                  aria-label={
-                    isFavorite()
-                      ? t("modelSelector.favorite.remove")
-                      : t("modelSelector.favorite.add")
-                  }
-                  onPointerDown={preventListboxPress}
-                  onPointerUp={preventListboxPress}
-                  onMouseDown={preventListboxPress}
-                  onMouseUp={preventListboxPress}
-                  onKeyDown={(event) => {
-                    if (event.key !== "Enter" && event.key !== " ") return
-                    event.preventDefault()
-                    event.stopPropagation()
-                    suppressNextClose = true
-                    setTimeout(() => {
-                      suppressNextClose = false
-                    }, 0)
-                  }}
-                  onClick={(event) => {
-                    event.preventDefault()
-                    event.stopPropagation()
-                    toggleFavoriteModelPreference({
-                      providerId: model.providerId,
-                      modelId: model.id,
-                    })
-                  }}
-                >
-                  <Star
-                    class="w-4 h-4"
-                    fill={isFavorite() ? "currentColor" : "none"}
-                  />
-                </button>
+                {!model.unavailable && (
+                  <button
+                    type="button"
+                    class="selector-option-star"
+                    data-active={isFavorite()}
+                    aria-label={
+                      isFavorite()
+                        ? t("modelSelector.favorite.remove")
+                        : t("modelSelector.favorite.add")
+                    }
+                    onPointerDown={preventListboxPress}
+                    onPointerUp={preventListboxPress}
+                    onMouseDown={preventListboxPress}
+                    onMouseUp={preventListboxPress}
+                    onKeyDown={(event) => {
+                      if (event.key !== "Enter" && event.key !== " ") return
+                      event.preventDefault()
+                      event.stopPropagation()
+                      suppressNextClose = true
+                      setTimeout(() => {
+                        suppressNextClose = false
+                      }, 0)
+                    }}
+                    onClick={(event) => {
+                      event.preventDefault()
+                      event.stopPropagation()
+                      toggleFavoriteModelPreference({
+                        providerId: model.providerId,
+                        modelId: model.id,
+                      })
+                    }}
+                  >
+                    <Star
+                      class="w-4 h-4"
+                      fill={isFavorite() ? "currentColor" : "none"}
+                    />
+                  </button>
+                )}
               </>
             </Combobox.Item>
           )
         }}
       >
         <Combobox.Control class="relative w-full" data-model-selector-control>
-          <Combobox.Input class="sr-only" data-model-selector />
+          <Combobox.Input class="sr-only" data-model-selector aria-label={currentModelAccessibleLabel()} />
           <Combobox.Trigger
             ref={triggerRef}
             class="selector-trigger"
+            aria-label={currentModelAccessibleLabel()}
           >
             <div class="selector-trigger-label selector-trigger-label--stacked flex-1 min-w-0">
               <span class="selector-trigger-primary selector-trigger-primary--align-left">
-                {t("modelSelector.trigger.primary", { model: currentModelValue()?.name ?? t("modelSelector.none") })}
+                {currentModelLabel()}
               </span>
           {currentModelValue() && (
                 <span class="selector-trigger-secondary" dir="ltr">
diff --git a/packages/ui/src/components/provider-auth/provider-manager-modal.tsx b/packages/ui/src/components/provider-auth/provider-manager-modal.tsx
index 4bbf6af7..45dbec84 100644
--- a/packages/ui/src/components/provider-auth/provider-manager-modal.tsx
+++ b/packages/ui/src/components/provider-auth/provider-manager-modal.tsx
@@ -17,6 +17,10 @@ import {
 } from "../../lib/provider-auth"
 import { instances } from "../../stores/instances"
 import { fetchProviders } from "../../stores/sessions"
+import {
+  ProviderModelVisibilityManager,
+  type ProviderVisibilityModel,
+} from "./provider-model-visibility-manager"
 
 type AuthStage = "idle" | "prompts" | "authorizing" | "code" | "waiting" | "success" | "error"
 
@@ -38,6 +42,7 @@ type ListedProvider = {
   id: string
   name: string
   modelCount: number
+  models: ProviderVisibilityModel[]
   source: "env" | "config" | "custom" | "api" | "unknown"
 }
 
@@ -50,11 +55,13 @@ interface ProviderManagerModalProps {
   onOpenChange?: (open: boolean) => void
 }
 
-function modelCountFromProvider(provider: any): number {
+function modelsFromProvider(provider: any): ProviderVisibilityModel[] {
   const models = provider?.models
-  if (Array.isArray(models)) return models.length
-  if (models && typeof models === "object") return Object.keys(models).length
-  return 0
+  if (!models || typeof models !== "object" || Array.isArray(models)) return []
+  return Object.entries(models).map(([id, model]) => ({
+    id,
+    name: typeof (model as any)?.name === "string" ? (model as any).name : id,
+  }))
 }
 
 export const ProviderManagerModal: Component<ProviderManagerModalProps> = (props) => {
@@ -66,6 +73,9 @@ export const ProviderManagerModal: Component<ProviderManagerModalProps> = (props
   const [configData, setConfigData] = createSignal<Record<string, any>>({})
   const [selectedProviderId, setSelectedProviderId] = createSignal<string | null>(null)
   const [activeProviderId, setActiveProviderId] = createSignal<string | null>(null)
+  const [managedProviderId, setManagedProviderId] = createSignal<string | null>(null)
+  const manageModelButtons = new Map<string, HTMLButtonElement>()
+  let managedProviderTriggerId: string | null = null
   const [selectedMethodIndex, setSelectedMethodIndex] = createSignal(0)
   const [apiKey, setApiKey] = createSignal("")
   const [promptValues, setPromptValues] = createSignal<Record<string, string>>({})
@@ -118,6 +128,10 @@ export const ProviderManagerModal: Component<ProviderManagerModalProps> = (props
     availableProviders().filter((provider) => isConfiguredProvider(provider)),
   )
 
+  const managedProvider = createMemo(() =>
+    configuredProviders().find((provider) => provider.id === managedProviderId()) ?? null,
+  )
+
   const getDisconnectMode = (provider: ListedProvider): DisconnectMode => {
     if (provider.source === "env") return "not-disconnectable"
     if (provider.source === "config" || configuredProviderIds().has(provider.id)) return "disable-in-config"
@@ -270,15 +284,19 @@ export const ProviderManagerModal: Component<ProviderManagerModalProps> = (props
       if (version !== loadVersion) return
       const nextConfigData = (configResponse?.data ?? {}) as Record<string, any>
       const nextConfiguredIds = new Set(Object.keys((nextConfigData.provider ?? {}) as Record<string, unknown>))
-      const listed = ((providerListResponse?.data?.all ?? []) as any[]).map((provider) => ({
-        id: String(provider.id ?? ""),
-        name: String(provider.name ?? provider.id ?? ""),
-        modelCount: modelCountFromProvider(provider),
-        source:
-          provider?.source === "env" || provider?.source === "config" || provider?.source === "custom" || provider?.source === "api"
-            ? provider.source
-            : "unknown",
-      })).filter((provider) => provider.id.length > 0)
+      const listed = ((providerListResponse?.data?.all ?? []) as any[]).map((provider) => {
+        const models = modelsFromProvider(provider)
+        return {
+          id: String(provider.id ?? ""),
+          name: String(provider.name ?? provider.id ?? ""),
+          modelCount: models.length,
+          models,
+          source:
+            provider?.source === "env" || provider?.source === "config" || provider?.source === "custom" || provider?.source === "api"
+              ? provider.source
+              : "unknown",
+        } as ListedProvider
+      }).filter((provider) => provider.id.length > 0)
       setAvailableProviders(listed)
       setConnectedProviderIds(new Set((providerListResponse?.data?.connected ?? []) as string[]))
       setConfiguredProviderIds(nextConfiguredIds)
@@ -309,6 +327,7 @@ export const ProviderManagerModal: Component<ProviderManagerModalProps> = (props
     setConfiguredProviderIds(new Set<string>())
     setConfigData({})
     setSelectedProviderId(null)
+    setManagedProviderId(null)
     setLoadError(null)
     setLoading(false)
   }
@@ -344,6 +363,23 @@ export const ProviderManagerModal: Component<ProviderManagerModalProps> = (props
     await loadProviderData(authClient).catch(() => undefined)
   }
 
+  async function refreshProviderData() {
+    const authClient = client()
+    const instanceId = props.instanceId
+    if (!authClient) return
+    setLoading(true)
+    await fetchProviders(instanceId).catch(() => undefined)
+    if (client() !== authClient || props.instanceId !== instanceId) return
+    await loadProviderData(authClient)
+  }
+
+  function closeModelManager() {
+    setManagedProviderId(null)
+    queueMicrotask(() => {
+      if (managedProviderTriggerId) manageModelButtons.get(managedProviderTriggerId)?.focus()
+    })
+  }
+
   async function submitApiAuth(providerId: string, authClient: OpencodeClient, instanceId: string, operationVersion: number) {
     await requestData(
       (authClient as any).auth.set({ providerID: providerId, auth: { type: "api", key: apiKey().trim() } }),
@@ -578,7 +614,7 @@ export const ProviderManagerModal: Component<ProviderManagerModalProps> = (props
                 <button type="button" class="selector-button selector-button-primary" disabled={!selectedProviderOption()} onClick={() => resetFlow(selectedProviderOption()?.id ?? null)}>
                   {t("settings.providers.actions.connect")}
                 </button>
-                <button type="button" class="settings-pill-button" disabled={loading()} onClick={() => client() && void loadProviderData(client()!)}>
+                <button type="button" class="settings-pill-button" disabled={loading()} onClick={() => void refreshProviderData()}>
                   <RefreshCw class={loading() ? "providers-spin-icon" : "providers-button-icon"} />
                   {t("settings.providers.refresh")}
                 </button>
@@ -694,16 +730,43 @@ export const ProviderManagerModal: Component<ProviderManagerModalProps> = (props
 
               <section class="providers-list-section">
                 <h3 class="settings-card-title">{t("settings.providers.configured.title")}</h3>
-                <Show when={loading()}><div class="providers-loading-row" role="status"><Loader2 class="providers-spin-icon" /><span>{t("settings.providers.loading")}</span></div></Show>
-                <Show when={!loading() && configuredProviders().length === 0}><div class="settings-card-message" role="status">{t("settings.providers.empty.noConfiguredProviders")}</div></Show>
-                <div class="providers-grid">
-                  <For each={configuredProviders()}>{(provider) => (
-                    <article class="providers-card">
-                      <div class="providers-card-main"><div class="providers-card-mark"><ShieldCheck class="providers-card-mark-icon" /></div><div class="providers-card-copy"><div class="providers-card-title-row"><h4 class="providers-card-title">{provider.name || provider.id}</h4></div><p class="providers-card-meta">{provider.id}</p><p class="providers-card-methods">{methodSummary(provider.id)}</p><p class="providers-card-source">{describeProviderSource(provider)}</p></div></div>
-                       <div class="providers-card-footer"><span class="providers-model-count">{provider.modelCount === 1 ? t("settings.providers.models.one", { count: provider.modelCount }) : t("settings.providers.models.other", { count: provider.modelCount })}</span><Show when={getDisconnectMode(provider) !== "disable-in-config"}><button type="button" class="selector-button selector-button-secondary providers-disconnect-button" disabled={getDisconnectMode(provider) === "not-disconnectable" || stage() !== "idle"} onClick={() => void disconnectProvider(provider.id)} title={getDisconnectMode(provider) === "not-disconnectable" ? t("settings.providers.source.env") : t("settings.providers.actions.disconnect")}>{t("settings.providers.actions.disconnect")}</button></Show></div>
-                    </article>
-                  )}</For>
-                </div>
+                <Show when={managedProvider()} fallback={
+                  <>
+                    <Show when={loading()}><div class="providers-loading-row" role="status"><Loader2 class="providers-spin-icon" /><span>{t("settings.providers.loading")}</span></div></Show>
+                    <Show when={!loading() && configuredProviders().length === 0}><div class="settings-card-message" role="status">{t("settings.providers.empty.noConfiguredProviders")}</div></Show>
+                    <div class="providers-grid">
+                      <For each={configuredProviders()}>{(provider) => (
+                        <article class="providers-card">
+                          <div class="providers-card-main"><div class="providers-card-mark"><ShieldCheck class="providers-card-mark-icon" /></div><div class="providers-card-copy"><div class="providers-card-title-row"><h4 class="providers-card-title">{provider.name || provider.id}</h4></div><p class="providers-card-meta">{provider.id}</p><p class="providers-card-methods">{methodSummary(provider.id)}</p><p class="providers-card-source">{describeProviderSource(provider)}</p></div></div>
+                          <div class="providers-card-footer">
+                            <span class="providers-model-count">{provider.modelCount === 1 ? t("settings.providers.models.one", { count: provider.modelCount }) : t("settings.providers.models.other", { count: provider.modelCount })}</span>
+                            <div class="provider-model-card-actions">
+                              <button
+                                ref={(element) => manageModelButtons.set(provider.id, element)}
+                                type="button"
+                                class="selector-button selector-button-secondary"
+                                onClick={() => {
+                                  managedProviderTriggerId = provider.id
+                                  setManagedProviderId(provider.id)
+                                }}
+                              >{t("settings.providers.actions.manageModels")}</button>
+                              <Show when={getDisconnectMode(provider) !== "disable-in-config"}><button type="button" class="selector-button selector-button-secondary providers-disconnect-button" disabled={getDisconnectMode(provider) === "not-disconnectable" || stage() !== "idle"} onClick={() => void disconnectProvider(provider.id)} title={getDisconnectMode(provider) === "not-disconnectable" ? t("settings.providers.source.env") : t("settings.providers.actions.disconnect")}>{t("settings.providers.actions.disconnect")}</button></Show>
+                            </div>
+                          </div>
+                        </article>
+                      )}</For>
+                    </div>
+                  </>
+                }>
+                  {(provider) => (
+                    <ProviderModelVisibilityManager
+                      providerId={provider().id}
+                      providerName={provider().name || provider().id}
+                      models={provider().models}
+                      onBack={closeModelManager}
+                    />
+                  )}
+                </Show>
               </section>
             </Show>
           </div>
diff --git a/packages/ui/src/components/provider-auth/provider-model-visibility-manager.tsx b/packages/ui/src/components/provider-auth/provider-model-visibility-manager.tsx
new file mode 100644
index 00000000..0ceea2a4
--- /dev/null
+++ b/packages/ui/src/components/provider-auth/provider-model-visibility-manager.tsx
@@ -0,0 +1,123 @@
+import { ArrowLeft } from "lucide-solid"
+import { createEffect, createMemo, createSignal, For, on, onMount, Show, type Component } from "solid-js"
+import { useI18n } from "../../lib/i18n"
+import { useConfig } from "../../stores/preferences"
+
+export interface ProviderVisibilityModel {
+  id: string
+  name: string
+}
+
+interface ProviderModelVisibilityManagerProps {
+  providerId: string
+  providerName: string
+  models: readonly ProviderVisibilityModel[]
+  onBack: () => void
+}
+
+const compareModel = (left: ProviderVisibilityModel, right: ProviderVisibilityModel) =>
+  left.name.localeCompare(right.name, undefined, { sensitivity: "base" }) ||
+  left.id.localeCompare(right.id, undefined, { sensitivity: "base" })
+
+export const ProviderModelVisibilityManager: Component<ProviderModelVisibilityManagerProps> = (props) => {
+  const { t } = useI18n()
+  const {
+    getProviderModelVisibilityPreference,
+    providerModelVisibilitySaveFailed,
+    setProviderModelVisibility,
+  } = useConfig()
+  const [query, setQuery] = createSignal("")
+  const headingId = "provider-model-visibility-heading"
+  let searchInput: HTMLInputElement | undefined
+
+  const models = createMemo(() => [...props.models].sort(compareModel))
+  const modelIds = createMemo(() => models().map((model) => model.id))
+  const preference = createMemo(() => getProviderModelVisibilityPreference(props.providerId))
+  const hiddenIds = createMemo(() => new Set(preference().hiddenModelIds))
+  const visibleCount = createMemo(() => modelIds().filter((id) => !hiddenIds().has(id)).length)
+  const filteredModels = createMemo(() => {
+    const value = query().trim().toLocaleLowerCase()
+    if (!value) return models()
+    return models().filter((model) =>
+      model.name.toLocaleLowerCase().includes(value) || model.id.toLocaleLowerCase().includes(value),
+    )
+  })
+
+  createEffect(on(() => props.providerId, () => setQuery("")))
+  onMount(() => queueMicrotask(() => searchInput?.focus()))
+
+  const save = (hiddenModelIds: readonly string[]) =>
+    void setProviderModelVisibility(props.providerId, { hiddenModelIds }).catch(() => undefined)
+
+  const toggleModel = (modelId: string, visible: boolean) => {
+    const current = preference().hiddenModelIds
+    save(visible ? current.filter((id) => id !== modelId) : [...current, modelId])
+  }
+
+  const hideAll = () => save([...preference().hiddenModelIds, ...modelIds()])
+
+  return (
+    <section class="provider-model-visibility" aria-labelledby={headingId}>
+      <header class="provider-model-visibility-header">
+        <button type="button" class="selector-button selector-button-secondary" onClick={props.onBack}>
+          <ArrowLeft class="w-4 h-4" />
+          {t("settings.providers.modelVisibility.back")}
+        </button>
+        <div>
+          <h4 id={headingId} class="settings-card-title">
+            {t("settings.providers.modelVisibility.title", { provider: props.providerName })}
+          </h4>
+          <p class="settings-card-subtitle">{t("settings.providers.modelVisibility.subtitle")}</p>
+        </div>
+      </header>
+
+      <div class="provider-model-visibility-toolbar">
+        <label class="sr-only" for="provider-model-visibility-search">{t("settings.providers.modelVisibility.search.label")}</label>
+        <input
+          ref={searchInput}
+          id="provider-model-visibility-search"
+          type="search"
+          class="providers-input"
+          value={query()}
+          onInput={(event) => setQuery(event.currentTarget.value)}
+          placeholder={t("settings.providers.modelVisibility.search.placeholder")}
+        />
+        <span class="provider-model-visibility-count" role="status">
+          {t("settings.providers.modelVisibility.count.visible", { visible: visibleCount(), total: models().length })}
+        </span>
+        <button type="button" class="selector-button selector-button-secondary" onClick={() => save([])}>
+          {t("settings.providers.modelVisibility.actions.showAll")}
+        </button>
+        <button type="button" class="selector-button selector-button-secondary" onClick={hideAll}>
+          {t("settings.providers.modelVisibility.actions.hideAll")}
+        </button>
+      </div>
+
+      <Show when={providerModelVisibilitySaveFailed(props.providerId)}>
+        <p class="settings-error-message" role="alert">{t("settings.providers.modelVisibility.save.failed")}</p>
+      </Show>
+
+      <Show
+        when={filteredModels().length > 0}
+        fallback={<p class="settings-card-message" role="status">{t("settings.providers.modelVisibility.list.empty")}</p>}
+      >
+        <div
+          class="provider-model-visibility-list"
+          role="list"
+          aria-label={t("settings.providers.modelVisibility.list.label", { provider: props.providerName })}
+        >
+          <For each={filteredModels()}>{(model) => (
+            <label class="provider-model-visibility-item" role="listitem">
+              <input
+                type="checkbox"
+                checked={!hiddenIds().has(model.id)}
+                onChange={(event) => toggleModel(model.id, event.currentTarget.checked)}
+              />
+              <span><strong>{model.name || model.id}</strong><small dir="ltr">{model.id}</small></span>
+            </label>
+          )}</For>
+        </div>
+      </Show>
+    </section>
+  )
+}
diff --git a/packages/ui/src/lib/i18n/messages/de/settings.ts b/packages/ui/src/lib/i18n/messages/de/settings.ts
index 49794fa8..716b6427 100644
--- a/packages/ui/src/lib/i18n/messages/de/settings.ts
+++ b/packages/ui/src/lib/i18n/messages/de/settings.ts
@@ -28,11 +28,25 @@ export const settingsMessages = {
   "modelSelector.placeholder.search": "Modelle suchen...",
   "modelSelector.none": "Keines",
   "modelSelector.trigger.primary": "Modell: {model}",
+  "modelSelector.trigger.ariaLabel": "Modell: {model}, Anbieter: {provider}, ID: {id}",
   "modelSelector.favoritesOnly.toggle.ariaLabel": "Nur Favoriten umschalten",
   "modelSelector.favoritesOnly.showAll": "Alle Modelle anzeigen",
   "modelSelector.favorite.add": "Zu Favoriten hinzufügen",
   "modelSelector.favorite.remove": "Aus Favoriten entfernen",
   "modelSelector.manageProviders": "Anbieter verwalten",
+  "modelSelector.unavailableModel": "{model} (nicht verfügbar)",
+  "settings.providers.actions.manageModels": "Modelle verwalten",
+  "settings.providers.modelVisibility.back": "Zurück zu Anbietern",
+  "settings.providers.modelVisibility.title": "Modelle für {provider}",
+  "settings.providers.modelVisibility.subtitle": "Wählen Sie, welche Modelle CodeNomad in der Modellauswahl anzeigt.",
+  "settings.providers.modelVisibility.search.label": "Anbietermodelle suchen",
+  "settings.providers.modelVisibility.search.placeholder": "Nach Modellname oder ID suchen...",
+  "settings.providers.modelVisibility.count.visible": "{visible} von {total} sichtbar",
+  "settings.providers.modelVisibility.actions.showAll": "Alle anzeigen",
+  "settings.providers.modelVisibility.actions.hideAll": "Alle ausblenden",
+  "settings.providers.modelVisibility.list.empty": "Keine Modelle entsprechen dieser Suche.",
+  "settings.providers.modelVisibility.list.label": "Modelle für {provider}",
+  "settings.providers.modelVisibility.save.failed": "Die Modellsichtbarkeit konnte nicht gespeichert werden.",
 
   "thinkingSelector.variant.default": "Standard",
   "thinkingSelector.label": "Denken: {variant}",
diff --git a/packages/ui/src/lib/i18n/messages/en/settings.ts b/packages/ui/src/lib/i18n/messages/en/settings.ts
index 7e79f5e0..c275900d 100644
--- a/packages/ui/src/lib/i18n/messages/en/settings.ts
+++ b/packages/ui/src/lib/i18n/messages/en/settings.ts
@@ -28,11 +28,25 @@ export const settingsMessages = {
   "modelSelector.placeholder.search": "Search models...",
   "modelSelector.none": "None",
   "modelSelector.trigger.primary": "Model: {model}",
+  "modelSelector.trigger.ariaLabel": "Model: {model}, provider: {provider}, ID: {id}",
   "modelSelector.favoritesOnly.toggle.ariaLabel": "Toggle favorites only",
   "modelSelector.favoritesOnly.showAll": "Show all models",
   "modelSelector.favorite.add": "Add to favorites",
   "modelSelector.favorite.remove": "Remove from favorites",
   "modelSelector.manageProviders": "Manage Providers",
+  "modelSelector.unavailableModel": "{model} (unavailable)",
+  "settings.providers.actions.manageModels": "Manage models",
+  "settings.providers.modelVisibility.back": "Back to providers",
+  "settings.providers.modelVisibility.title": "Models for {provider}",
+  "settings.providers.modelVisibility.subtitle": "Choose which models CodeNomad shows in model selectors.",
+  "settings.providers.modelVisibility.search.label": "Search provider models",
+  "settings.providers.modelVisibility.search.placeholder": "Search by model name or ID...",
+  "settings.providers.modelVisibility.count.visible": "{visible} of {total} visible",
+  "settings.providers.modelVisibility.actions.showAll": "Show all",
+  "settings.providers.modelVisibility.actions.hideAll": "Hide all",
+  "settings.providers.modelVisibility.list.empty": "No models match this search.",
+  "settings.providers.modelVisibility.list.label": "Models for {provider}",
+  "settings.providers.modelVisibility.save.failed": "Failed to save model visibility.",
 
   "thinkingSelector.variant.default": "Default",
   "thinkingSelector.label": "Thinking: {variant}",
diff --git a/packages/ui/src/lib/i18n/messages/es/settings.ts b/packages/ui/src/lib/i18n/messages/es/settings.ts
index 268c3062..4ce787ca 100644
--- a/packages/ui/src/lib/i18n/messages/es/settings.ts
+++ b/packages/ui/src/lib/i18n/messages/es/settings.ts
@@ -28,11 +28,25 @@ export const settingsMessages = {
   "modelSelector.placeholder.search": "Buscar modelos...",
   "modelSelector.none": "Ninguno",
   "modelSelector.trigger.primary": "Modelo: {model}",
+  "modelSelector.trigger.ariaLabel": "Modelo: {model}, proveedor: {provider}, ID: {id}",
   "modelSelector.favoritesOnly.toggle.ariaLabel": "Alternar solo favoritos",
   "modelSelector.favoritesOnly.showAll": "Mostrar todos los modelos",
   "modelSelector.favorite.add": "Agregar a favoritos",
   "modelSelector.favorite.remove": "Quitar de favoritos",
   "modelSelector.manageProviders": "Gestionar proveedores",
+  "modelSelector.unavailableModel": "{model} (no disponible)",
+  "settings.providers.actions.manageModels": "Gestionar modelos",
+  "settings.providers.modelVisibility.back": "Volver a proveedores",
+  "settings.providers.modelVisibility.title": "Modelos de {provider}",
+  "settings.providers.modelVisibility.subtitle": "Elige qué modelos muestra CodeNomad en los selectores.",
+  "settings.providers.modelVisibility.search.label": "Buscar modelos del proveedor",
+  "settings.providers.modelVisibility.search.placeholder": "Buscar por nombre o ID del modelo...",
+  "settings.providers.modelVisibility.count.visible": "{visible} de {total} visibles",
+  "settings.providers.modelVisibility.actions.showAll": "Mostrar todos",
+  "settings.providers.modelVisibility.actions.hideAll": "Ocultar todos",
+  "settings.providers.modelVisibility.list.empty": "Ningún modelo coincide con esta búsqueda.",
+  "settings.providers.modelVisibility.list.label": "Modelos de {provider}",
+  "settings.providers.modelVisibility.save.failed": "No se pudo guardar la visibilidad de los modelos.",
 
   "thinkingSelector.variant.default": "Por defecto",
   "thinkingSelector.label": "Pensamiento: {variant}",
diff --git a/packages/ui/src/lib/i18n/messages/fr/settings.ts b/packages/ui/src/lib/i18n/messages/fr/settings.ts
index 65c924f7..890079d3 100644
--- a/packages/ui/src/lib/i18n/messages/fr/settings.ts
+++ b/packages/ui/src/lib/i18n/messages/fr/settings.ts
@@ -28,11 +28,25 @@ export const settingsMessages = {
   "modelSelector.placeholder.search": "Rechercher des modèles...",
   "modelSelector.none": "Aucun",
   "modelSelector.trigger.primary": "Modèle : {model}",
+  "modelSelector.trigger.ariaLabel": "Modèle : {model}, fournisseur : {provider}, identifiant : {id}",
   "modelSelector.favoritesOnly.toggle.ariaLabel": "Basculer en favoris uniquement",
   "modelSelector.favoritesOnly.showAll": "Afficher tous les modèles",
   "modelSelector.favorite.add": "Ajouter aux favoris",
   "modelSelector.favorite.remove": "Retirer des favoris",
   "modelSelector.manageProviders": "Gérer les fournisseurs",
+  "modelSelector.unavailableModel": "{model} (indisponible)",
+  "settings.providers.actions.manageModels": "Gérer les modèles",
+  "settings.providers.modelVisibility.back": "Retour aux fournisseurs",
+  "settings.providers.modelVisibility.title": "Modèles pour {provider}",
+  "settings.providers.modelVisibility.subtitle": "Choisissez les modèles affichés par CodeNomad dans les sélecteurs.",
+  "settings.providers.modelVisibility.search.label": "Rechercher les modèles du fournisseur",
+  "settings.providers.modelVisibility.search.placeholder": "Rechercher par nom ou identifiant...",
+  "settings.providers.modelVisibility.count.visible": "{visible} sur {total} visibles",
+  "settings.providers.modelVisibility.actions.showAll": "Tout afficher",
+  "settings.providers.modelVisibility.actions.hideAll": "Tout masquer",
+  "settings.providers.modelVisibility.list.empty": "Aucun modèle ne correspond à cette recherche.",
+  "settings.providers.modelVisibility.list.label": "Modèles pour {provider}",
+  "settings.providers.modelVisibility.save.failed": "Impossible d’enregistrer la visibilité des modèles.",
 
   "thinkingSelector.variant.default": "Par défaut",
   "thinkingSelector.label": "Réflexion : {variant}",
diff --git a/packages/ui/src/lib/i18n/messages/he/settings.ts b/packages/ui/src/lib/i18n/messages/he/settings.ts
index a7f9c7fb..9967c766 100644
--- a/packages/ui/src/lib/i18n/messages/he/settings.ts
+++ b/packages/ui/src/lib/i18n/messages/he/settings.ts
@@ -28,11 +28,25 @@ export const settingsMessages = {
   "modelSelector.placeholder.search": "חפש מודלים...",
   "modelSelector.none": "ללא",
   "modelSelector.trigger.primary": "מודל: {model}",
+  "modelSelector.trigger.ariaLabel": "מודל: {model}, ספק: {provider}, מזהה: {id}",
   "modelSelector.favoritesOnly.toggle.ariaLabel": "הצג מועדפים בלבד",
   "modelSelector.favoritesOnly.showAll": "הצג את כל המודלים",
   "modelSelector.favorite.add": "הוסף למועדפים",
   "modelSelector.favorite.remove": "הסר ממועדפים",
   "modelSelector.manageProviders": "נהל ספקים",
+  "modelSelector.unavailableModel": "{model} (לא זמין)",
+  "settings.providers.actions.manageModels": "ניהול מודלים",
+  "settings.providers.modelVisibility.back": "חזרה לספקים",
+  "settings.providers.modelVisibility.title": "מודלים עבור {provider}",
+  "settings.providers.modelVisibility.subtitle": "בחר אילו מודלים CodeNomad יציג בבוררי המודלים.",
+  "settings.providers.modelVisibility.search.label": "חיפוש מודלים של הספק",
+  "settings.providers.modelVisibility.search.placeholder": "חיפוש לפי שם או מזהה מודל...",
+  "settings.providers.modelVisibility.count.visible": "{visible} מתוך {total} גלויים",
+  "settings.providers.modelVisibility.actions.showAll": "הצג הכול",
+  "settings.providers.modelVisibility.actions.hideAll": "הסתר הכול",
+  "settings.providers.modelVisibility.list.empty": "אין מודלים התואמים לחיפוש.",
+  "settings.providers.modelVisibility.list.label": "מודלים עבור {provider}",
+  "settings.providers.modelVisibility.save.failed": "שמירת נראות המודלים נכשלה.",
 
   "thinkingSelector.variant.default": "ברירת מחדל",
   "thinkingSelector.label": "חשיבה: {variant}",
diff --git a/packages/ui/src/lib/i18n/messages/ja/settings.ts b/packages/ui/src/lib/i18n/messages/ja/settings.ts
index 6b266a10..dfcb9a04 100644
--- a/packages/ui/src/lib/i18n/messages/ja/settings.ts
+++ b/packages/ui/src/lib/i18n/messages/ja/settings.ts
@@ -28,11 +28,25 @@ export const settingsMessages = {
   "modelSelector.placeholder.search": "モデルを検索...",
   "modelSelector.none": "なし",
   "modelSelector.trigger.primary": "モデル: {model}",
+  "modelSelector.trigger.ariaLabel": "モデル: {model}、プロバイダー: {provider}、ID: {id}",
   "modelSelector.favoritesOnly.toggle.ariaLabel": "お気に入りのみ",
   "modelSelector.favoritesOnly.showAll": "すべてのモデルを表示",
   "modelSelector.favorite.add": "お気に入りに追加",
   "modelSelector.favorite.remove": "お気に入りから削除",
   "modelSelector.manageProviders": "プロバイダーを管理",
+  "modelSelector.unavailableModel": "{model}（利用不可）",
+  "settings.providers.actions.manageModels": "モデルを管理",
+  "settings.providers.modelVisibility.back": "プロバイダーに戻る",
+  "settings.providers.modelVisibility.title": "{provider} のモデル",
+  "settings.providers.modelVisibility.subtitle": "CodeNomad のモデル選択に表示するモデルを選びます。",
+  "settings.providers.modelVisibility.search.label": "プロバイダーのモデルを検索",
+  "settings.providers.modelVisibility.search.placeholder": "モデル名または ID で検索...",
+  "settings.providers.modelVisibility.count.visible": "{total} 件中 {visible} 件を表示",
+  "settings.providers.modelVisibility.actions.showAll": "すべて表示",
+  "settings.providers.modelVisibility.actions.hideAll": "すべて非表示",
+  "settings.providers.modelVisibility.list.empty": "検索に一致するモデルはありません。",
+  "settings.providers.modelVisibility.list.label": "{provider} のモデル",
+  "settings.providers.modelVisibility.save.failed": "モデルの表示設定を保存できませんでした。",
 
   "thinkingSelector.variant.default": "デフォルト",
   "thinkingSelector.label": "思考: {variant}",
diff --git a/packages/ui/src/lib/i18n/messages/ne/settings.ts b/packages/ui/src/lib/i18n/messages/ne/settings.ts
index cbfbb095..769fc191 100644
--- a/packages/ui/src/lib/i18n/messages/ne/settings.ts
+++ b/packages/ui/src/lib/i18n/messages/ne/settings.ts
@@ -28,11 +28,25 @@ export const settingsMessages = {
   "modelSelector.placeholder.search": "मोडेलहरू खोज्नुहोस्...",
   "modelSelector.none": "कुनै छैन",
   "modelSelector.trigger.primary": "मोडेल: {model}",
+  "modelSelector.trigger.ariaLabel": "मोडेल: {model}, प्रदायक: {provider}, आईडी: {id}",
   "modelSelector.favoritesOnly.toggle.ariaLabel": "मनपर्ने मात्र टगल गर्नुहोस्",
   "modelSelector.favoritesOnly.showAll": "सबै मोडेलहरू देखाउनुहोस्",
   "modelSelector.favorite.add": "मनपर्नेमा थप्नुहोस्",
   "modelSelector.favorite.remove": "मनपर्नेबाट हटाउनुहोस्",
   "modelSelector.manageProviders": "प्रदायकहरू व्यवस्थापन गर्नुहोस्",
+  "modelSelector.unavailableModel": "{model} (उपलब्ध छैन)",
+  "settings.providers.actions.manageModels": "मोडेलहरू व्यवस्थापन गर्नुहोस्",
+  "settings.providers.modelVisibility.back": "प्रदायकहरूमा फर्कनुहोस्",
+  "settings.providers.modelVisibility.title": "{provider} का मोडेलहरू",
+  "settings.providers.modelVisibility.subtitle": "CodeNomad का मोडेल चयनकर्तामा देखिने मोडेलहरू छान्नुहोस्।",
+  "settings.providers.modelVisibility.search.label": "प्रदायकका मोडेलहरू खोज्नुहोस्",
+  "settings.providers.modelVisibility.search.placeholder": "मोडेल नाम वा ID बाट खोज्नुहोस्...",
+  "settings.providers.modelVisibility.count.visible": "{total} मध्ये {visible} देखिने",
+  "settings.providers.modelVisibility.actions.showAll": "सबै देखाउनुहोस्",
+  "settings.providers.modelVisibility.actions.hideAll": "सबै लुकाउनुहोस्",
+  "settings.providers.modelVisibility.list.empty": "यो खोजसँग मिल्ने मोडेल छैन।",
+  "settings.providers.modelVisibility.list.label": "{provider} का मोडेलहरू",
+  "settings.providers.modelVisibility.save.failed": "मोडेल दृश्यता सुरक्षित गर्न असफल भयो।",
 
   "thinkingSelector.variant.default": "पूर्वनिर्धारित",
   "thinkingSelector.label": "सोचाइ: {variant}",
diff --git a/packages/ui/src/lib/i18n/messages/ru/settings.ts b/packages/ui/src/lib/i18n/messages/ru/settings.ts
index d364ab5a..15a03ae8 100644
--- a/packages/ui/src/lib/i18n/messages/ru/settings.ts
+++ b/packages/ui/src/lib/i18n/messages/ru/settings.ts
@@ -28,11 +28,25 @@ export const settingsMessages = {
   "modelSelector.placeholder.search": "Поиск моделей…",
   "modelSelector.none": "Нет",
   "modelSelector.trigger.primary": "Модель: {model}",
+  "modelSelector.trigger.ariaLabel": "Модель: {model}, провайдер: {provider}, ID: {id}",
   "modelSelector.favoritesOnly.toggle.ariaLabel": "Только избранное",
   "modelSelector.favoritesOnly.showAll": "Показать все модели",
   "modelSelector.favorite.add": "Добавить в избранное",
   "modelSelector.favorite.remove": "Удалить из избранного",
   "modelSelector.manageProviders": "Управление провайдерами",
+  "modelSelector.unavailableModel": "{model} (недоступна)",
+  "settings.providers.actions.manageModels": "Управление моделями",
+  "settings.providers.modelVisibility.back": "Назад к провайдерам",
+  "settings.providers.modelVisibility.title": "Модели {provider}",
+  "settings.providers.modelVisibility.subtitle": "Выберите модели, которые CodeNomad показывает в списках выбора.",
+  "settings.providers.modelVisibility.search.label": "Поиск моделей провайдера",
+  "settings.providers.modelVisibility.search.placeholder": "Поиск по имени или ID модели...",
+  "settings.providers.modelVisibility.count.visible": "Видно {visible} из {total}",
+  "settings.providers.modelVisibility.actions.showAll": "Показать все",
+  "settings.providers.modelVisibility.actions.hideAll": "Скрыть все",
+  "settings.providers.modelVisibility.list.empty": "Нет моделей, соответствующих поиску.",
+  "settings.providers.modelVisibility.list.label": "Модели {provider}",
+  "settings.providers.modelVisibility.save.failed": "Не удалось сохранить видимость моделей.",
 
   "thinkingSelector.variant.default": "По умолчанию",
   "thinkingSelector.label": "Размышления: {variant}",
diff --git a/packages/ui/src/lib/i18n/messages/zh-Hans/settings.ts b/packages/ui/src/lib/i18n/messages/zh-Hans/settings.ts
index 1eed86ce..ef046df6 100644
--- a/packages/ui/src/lib/i18n/messages/zh-Hans/settings.ts
+++ b/packages/ui/src/lib/i18n/messages/zh-Hans/settings.ts
@@ -28,11 +28,25 @@ export const settingsMessages = {
   "modelSelector.placeholder.search": "搜索模型...",
   "modelSelector.none": "无",
   "modelSelector.trigger.primary": "模型：{model}",
+  "modelSelector.trigger.ariaLabel": "模型：{model}，提供商：{provider}，ID：{id}",
   "modelSelector.favoritesOnly.toggle.ariaLabel": "仅显示收藏",
   "modelSelector.favoritesOnly.showAll": "显示所有模型",
   "modelSelector.favorite.add": "添加到收藏",
   "modelSelector.favorite.remove": "从收藏移除",
   "modelSelector.manageProviders": "管理提供商",
+  "modelSelector.unavailableModel": "{model}（不可用）",
+  "settings.providers.actions.manageModels": "管理模型",
+  "settings.providers.modelVisibility.back": "返回提供商列表",
+  "settings.providers.modelVisibility.title": "{provider} 的模型",
+  "settings.providers.modelVisibility.subtitle": "选择 CodeNomad 在模型选择器中显示的模型。",
+  "settings.providers.modelVisibility.search.label": "搜索提供商模型",
+  "settings.providers.modelVisibility.search.placeholder": "按模型名称或 ID 搜索...",
+  "settings.providers.modelVisibility.count.visible": "显示 {visible}/{total}",
+  "settings.providers.modelVisibility.actions.showAll": "全部显示",
+  "settings.providers.modelVisibility.actions.hideAll": "全部隐藏",
+  "settings.providers.modelVisibility.list.empty": "没有与搜索匹配的模型。",
+  "settings.providers.modelVisibility.list.label": "{provider} 的模型",
+  "settings.providers.modelVisibility.save.failed": "无法保存模型可见性设置。",
 
   "thinkingSelector.variant.default": "默认",
   "thinkingSelector.label": "思考：{variant}",
diff --git a/packages/ui/src/lib/model-visibility.test.ts b/packages/ui/src/lib/model-visibility.test.ts
new file mode 100644
index 00000000..d720b287
--- /dev/null
+++ b/packages/ui/src/lib/model-visibility.test.ts
@@ -0,0 +1,76 @@
+import assert from "node:assert/strict"
+import fs from "node:fs"
+import test from "node:test"
+import {
+  isModelVisible,
+  normalizeModelVisibilityPreference,
+  normalizeModelVisibilityPreferences,
+  resolvePickerValue,
+} from "./model-visibility"
+
+test("normalizes malformed preferences fail-open", () => {
+  assert.deepEqual(normalizeModelVisibilityPreference(null), { hiddenModelIds: [] })
+  assert.deepEqual(normalizeModelVisibilityPreference({ mode: "custom", modelIds: ["legacy"] }), { hiddenModelIds: [] })
+  assert.deepEqual(normalizeModelVisibilityPreference({ hiddenModelIds: "hidden" }), { hiddenModelIds: [] })
+  assert.deepEqual(normalizeModelVisibilityPreferences([]), {})
+  assert.deepEqual(normalizeModelVisibilityPreferences({ broken: { hiddenModelIds: null } }), {
+    broken: { hiddenModelIds: [] },
+  })
+})
+
+test("keeps unique non-empty exact IDs without catalog-based deletion", () => {
+  assert.deepEqual(
+    normalizeModelVisibilityPreference({ hiddenModelIds: ["Model-A", "model-a", "", "Model-A", 7] }),
+    { hiddenModelIds: ["Model-A", "model-a"] },
+  )
+})
+
+test("matches hidden IDs exactly and case-sensitively", () => {
+  const preference = { hiddenModelIds: ["Model-A"] }
+  assert.equal(isModelVisible(preference, "Model-A"), false)
+  assert.equal(isModelVisible(preference, "model-a"), true)
+})
+
+test("new models and missing preferences are visible by default", () => {
+  assert.equal(isModelVisible({ hiddenModelIds: ["known"] }, "new"), true)
+  assert.equal(isModelVisible(undefined, "new"), true)
+})
+
+test("a current model receives no helper-level visibility override", () => {
+  assert.equal(isModelVisible({ hiddenModelIds: ["current"] }, "current"), false)
+})
+
+test("uses the current model as the picker value only while it remains in the collection", () => {
+  const current = { key: "provider/current" }
+  assert.equal(resolvePickerValue(current, [current]), current)
+  assert.equal(resolvePickerValue(current, [{ key: "provider/visible" }]), undefined)
+})
+
+test("provider refresh updates shared and modal catalogs without disposing active instances", () => {
+  const source = fs.readFileSync(
+    new URL("../components/provider-auth/provider-manager-modal.tsx", import.meta.url),
+    "utf8",
+  )
+  const start = source.indexOf("async function refreshProviderData()")
+  const end = source.indexOf("function closeModelManager()", start)
+  const refresh = source.slice(start, end)
+
+  assert.ok(start >= 0 && end > start)
+  assert.match(refresh, /await fetchProviders\(instanceId\)/)
+  assert.match(refresh, /await loadProviderData\(authClient\)/)
+  assert.doesNotMatch(refresh, /global\.dispose/)
+})
+
+test("model picker wires collection-safe selection and an accessible current-model label", () => {
+  const source = fs.readFileSync(new URL("../components/model-selector.tsx", import.meta.url), "utf8")
+  assert.match(source, /value=\{comboboxValue\(\)\}/)
+  assert.equal(source.match(/aria-label=\{currentModelAccessibleLabel\(\)\}/g)?.length, 2)
+  assert.match(source, /id: `\$\{current\.providerId\}\/\$\{current\.id\}`/)
+})
+
+test("serializes visibility writes across providers before installing server snapshots", () => {
+  const source = fs.readFileSync(new URL("../stores/preferences.tsx", import.meta.url), "utf8")
+  assert.match(source, /let modelVisibilityWriteQueue = Promise\.resolve\(\)/)
+  assert.match(source, /const previous = modelVisibilityWriteQueue/)
+  assert.match(source, /modelVisibilityWriteQueue = write/)
+})
diff --git a/packages/ui/src/lib/model-visibility.ts b/packages/ui/src/lib/model-visibility.ts
new file mode 100644
index 00000000..02ff9031
--- /dev/null
+++ b/packages/ui/src/lib/model-visibility.ts
@@ -0,0 +1,39 @@
+export type ModelVisibilityPreference = { hiddenModelIds: readonly string[] }
+
+export type ModelVisibilityPreferences = Record<string, ModelVisibilityPreference>
+
+export function normalizeModelVisibilityPreference(value: unknown): ModelVisibilityPreference {
+  if (!value || typeof value !== "object" || Array.isArray(value)) return { hiddenModelIds: [] }
+  const hiddenModelIds = (value as { hiddenModelIds?: unknown }).hiddenModelIds
+  if (!Array.isArray(hiddenModelIds)) return { hiddenModelIds: [] }
+
+  return {
+    hiddenModelIds: Array.from(new Set(hiddenModelIds.filter(
+      (id): id is string => typeof id === "string" && id.length > 0,
+    ))),
+  }
+}
+
+export function normalizeModelVisibilityPreferences(value: unknown): ModelVisibilityPreferences {
+  if (!value || typeof value !== "object" || Array.isArray(value)) return {}
+  const result: ModelVisibilityPreferences = {}
+  for (const [providerId, preference] of Object.entries(value as Record<string, unknown>)) {
+    if (!providerId) continue
+    result[providerId] = normalizeModelVisibilityPreference(preference)
+  }
+  return result
+}
+
+export function isModelVisible(
+  preference: ModelVisibilityPreference | undefined,
+  modelId: string,
+): boolean {
+  return !normalizeModelVisibilityPreference(preference).hiddenModelIds.includes(modelId)
+}
+
+export function resolvePickerValue<T extends { key: string }>(
+  current: T | undefined,
+  options: readonly { key: string }[],
+): T | undefined {
+  return current && options.some((option) => option.key === current.key) ? current : undefined
+}
diff --git a/packages/ui/src/stores/preferences.tsx b/packages/ui/src/stores/preferences.tsx
index 2f39824b..63d289ef 100644
--- a/packages/ui/src/stores/preferences.tsx
+++ b/packages/ui/src/stores/preferences.tsx
@@ -14,6 +14,12 @@ import {
 import { getLogger } from "../lib/logger"
 import { loadSpeechCapabilities, resetSpeechCapabilities } from "./speech"
 import { buildSpeechPatch } from "../lib/speech-patch"
+import {
+  normalizeModelVisibilityPreference,
+  normalizeModelVisibilityPreferences,
+  type ModelVisibilityPreference,
+  type ModelVisibilityPreferences,
+} from "../lib/model-visibility"
 
 const log = getLogger("actions")
 
@@ -103,6 +109,7 @@ export interface UiSettings {
   usageMetricsExpansion: ExpansionPreference
   autoCleanupBlankSessions: boolean
   keepUnseenSubagentIdleStatus: boolean
+  modelVisibility: ModelVisibilityPreferences
 
   // OS notifications
   osNotificationsEnabled: boolean
@@ -193,6 +200,7 @@ const defaultUiSettings: UiSettings = {
   usageMetricsExpansion: "collapsed",
   autoCleanupBlankSessions: true,
   keepUnseenSubagentIdleStatus: false,
+  modelVisibility: {},
 
   osNotificationsEnabled: false,
   osNotificationsAllowWhenVisible: false,
@@ -299,6 +307,7 @@ function normalizeUiSettings(input?: Partial<UiSettings> | null): UiSettings {
     autoCleanupBlankSessions: sanitized.autoCleanupBlankSessions ?? defaultUiSettings.autoCleanupBlankSessions,
     keepUnseenSubagentIdleStatus:
       sanitized.keepUnseenSubagentIdleStatus ?? defaultUiSettings.keepUnseenSubagentIdleStatus,
+    modelVisibility: normalizeModelVisibilityPreferences(sanitized.modelVisibility),
     osNotificationsEnabled: sanitized.osNotificationsEnabled ?? defaultUiSettings.osNotificationsEnabled,
     osNotificationsAllowWhenVisible:
       sanitized.osNotificationsAllowWhenVisible ?? defaultUiSettings.osNotificationsAllowWhenVisible,
@@ -616,7 +625,11 @@ async function patchStateOwner(owner: string, patch: unknown) {
 function updateUiSettings(updates: Partial<UiSettings>) {
   const current = uiConfigBucket()
   const nextSettings = normalizeUiSettings({ ...(current.settings ?? {}), ...updates })
-  const patch = { settings: nextSettings }
+  const patch = {
+    settings: Object.fromEntries(
+      Object.keys(updates).map((key) => [key, nextSettings[key as keyof UiSettings]]),
+    ),
+  }
   void patchConfigOwner("ui", patch).catch((error) => log.error("Failed to patch ui settings", error))
 }
 
@@ -624,6 +637,67 @@ function updatePreferences(updates: Partial<UiSettings>): void {
   updateUiSettings(updates)
 }
 
+const modelVisibilityWriteQueues = new Map<string, Promise<void>>()
+let modelVisibilityWriteQueue = Promise.resolve()
+const [pendingModelVisibility, setPendingModelVisibility] = createSignal(new Map<string, ModelVisibilityPreference>())
+const [modelVisibilityWriteFailures, setModelVisibilityWriteFailures] = createSignal(new Set<string>())
+
+function getProviderModelVisibilityPreference(providerId: string): ModelVisibilityPreference {
+  return pendingModelVisibility().get(providerId)
+    ?? normalizeModelVisibilityPreference(preferences().modelVisibility[providerId])
+}
+
+function providerModelVisibilitySaveFailed(providerId: string): boolean {
+  return modelVisibilityWriteFailures().has(providerId)
+}
+
+async function setProviderModelVisibility(providerId: string, preference: ModelVisibilityPreference): Promise<void> {
+  if (!providerId) return
+  const normalized = normalizeModelVisibilityPreference(preference)
+  setPendingModelVisibility((current) => new Map(current).set(providerId, normalized))
+  setModelVisibilityWriteFailures((current) => {
+    const next = new Set(current)
+    next.delete(providerId)
+    return next
+  })
+  const previous = modelVisibilityWriteQueue
+  const write = previous
+    .catch(() => undefined)
+    .then(() => patchConfigOwner("ui", {
+      settings: {
+        modelVisibility: {
+          [providerId]: normalized,
+        },
+      },
+    }))
+
+  modelVisibilityWriteQueue = write
+  modelVisibilityWriteQueues.set(providerId, write)
+  void write.then(
+    () => {
+      if (modelVisibilityWriteQueues.get(providerId) !== write) return
+      modelVisibilityWriteQueues.delete(providerId)
+      setPendingModelVisibility((current) => {
+        const next = new Map(current)
+        next.delete(providerId)
+        return next
+      })
+    },
+    (error) => {
+      log.error("Failed to update provider model visibility", error)
+      if (modelVisibilityWriteQueues.get(providerId) !== write) return
+      modelVisibilityWriteQueues.delete(providerId)
+      setPendingModelVisibility((current) => {
+        const next = new Map(current)
+        next.delete(providerId)
+        return next
+      })
+      setModelVisibilityWriteFailures((current) => new Set(current).add(providerId))
+    },
+  )
+  await write
+}
+
 function setThemePreference(preference: ThemePreference): void {
   if (themePreference() === preference) return
   void patchConfigOwner("ui", { theme: preference }).catch((error) => log.error("Failed to set theme", error))
@@ -945,6 +1019,9 @@ interface ConfigContextValue {
   useTauriNativeEventTransport: typeof useTauriNativeEventTransport
   setUseTauriNativeEventTransport: typeof setUseTauriNativeEventTransport
   updatePreferences: typeof updatePreferences
+  setProviderModelVisibility: typeof setProviderModelVisibility
+  getProviderModelVisibilityPreference: typeof getProviderModelVisibilityPreference
+  providerModelVisibilitySaveFailed: typeof providerModelVisibilitySaveFailed
   themePreference: typeof themePreference
   setThemePreference: typeof setThemePreference
 
@@ -1008,6 +1085,9 @@ const configContextValue: ConfigContextValue = {
   useTauriNativeEventTransport,
   setUseTauriNativeEventTransport,
   updatePreferences,
+  setProviderModelVisibility,
+  getProviderModelVisibilityPreference,
+  providerModelVisibilitySaveFailed,
   themePreference,
   setThemePreference,
   serverSettings,
@@ -1105,6 +1185,9 @@ export {
   themePreference,
   setThemePreference,
   updatePreferences,
+  setProviderModelVisibility,
+  getProviderModelVisibilityPreference,
+  providerModelVisibilitySaveFailed,
   setListeningMode,
   updateEnvironmentVariables,
   addEnvironmentVariable,
diff --git a/packages/ui/src/styles/components/provider-auth.css b/packages/ui/src/styles/components/provider-auth.css
index 3132b842..8647dc83 100644
--- a/packages/ui/src/styles/components/provider-auth.css
+++ b/packages/ui/src/styles/components/provider-auth.css
@@ -90,7 +90,7 @@
 
 .providers-grid {
   display: grid;
-  grid-template-columns: repeat(auto-fit, minmax(240px, 1fr));
+  grid-template-columns: repeat(auto-fit, minmax(min(20rem, 100%), 1fr));
   gap: 0.875rem;
 }
 
@@ -211,6 +211,11 @@
   border-top: 1px solid color-mix(in oklab, var(--border-base) 70%, transparent);
 }
 
+.providers-card-footer .selector-button {
+  flex-shrink: 0;
+  white-space: nowrap;
+}
+
 .providers-disconnect-button {
   width: min(9rem, 50%);
   min-width: 6.5rem;
diff --git a/packages/ui/src/styles/components/provider-model-visibility.css b/packages/ui/src/styles/components/provider-model-visibility.css
new file mode 100644
index 00000000..50cc9fb6
--- /dev/null
+++ b/packages/ui/src/styles/components/provider-model-visibility.css
@@ -0,0 +1,89 @@
+.provider-model-visibility {
+  display: flex;
+  flex-direction: column;
+  gap: 1rem;
+}
+
+.provider-model-visibility-header {
+  display: flex;
+  align-items: flex-start;
+  gap: 0.75rem;
+  padding-bottom: 1rem;
+  border-bottom: 1px solid var(--border-base);
+}
+
+.provider-model-visibility-header > .selector-button {
+  flex: 0 0 auto;
+  width: auto;
+}
+
+.provider-model-visibility-item span {
+  display: flex;
+  min-width: 0;
+  flex-direction: column;
+  gap: 0.2rem;
+}
+
+.provider-model-visibility-item small {
+  color: var(--text-muted);
+  font-size: var(--font-size-xs);
+  font-weight: var(--font-weight-normal);
+  overflow-wrap: anywhere;
+}
+
+.provider-model-visibility-toolbar {
+  display: grid;
+  grid-template-columns: minmax(10rem, 1fr) auto auto auto;
+  align-items: center;
+  gap: 0.5rem;
+}
+
+.provider-model-visibility-count {
+  color: var(--text-secondary);
+  font-size: var(--font-size-xs);
+}
+
+.provider-model-visibility-list {
+  height: min(22rem, 45dvh);
+  overflow-y: auto;
+  border: 1px solid var(--border-base);
+  background: var(--surface-base);
+}
+
+.provider-model-visibility-item {
+  display: flex;
+  align-items: center;
+  gap: 0.75rem;
+  min-height: 3.375rem;
+  padding: 0.55rem 0.75rem;
+  border-bottom: 1px solid color-mix(in oklab, var(--border-base) 70%, transparent);
+  color: var(--text-primary);
+  cursor: pointer;
+}
+
+.provider-model-visibility-item:hover {
+  background: var(--surface-secondary);
+}
+
+.provider-model-card-actions {
+  display: flex;
+  align-items: center;
+  gap: 0.5rem;
+}
+
+@media (max-width: 700px) {
+  .provider-model-visibility-toolbar {
+    grid-template-columns: 1fr;
+  }
+
+  .provider-model-visibility-header,
+  .provider-model-card-actions {
+    align-items: stretch;
+    flex-direction: column;
+  }
+
+  .provider-model-visibility-toolbar .selector-button {
+    width: 100%;
+    justify-content: center;
+  }
+}
diff --git a/packages/ui/src/styles/controls.css b/packages/ui/src/styles/controls.css
index 2199a644..f88e0210 100644
--- a/packages/ui/src/styles/controls.css
+++ b/packages/ui/src/styles/controls.css
@@ -14,3 +14,4 @@
 @import "./components/settings-info.css";
 @import "./components/config-files-settings.css";
 @import "./components/provider-auth.css";
+@import "./components/provider-model-visibility.css";

From ac153312cc4da73479ad9bb9034c9d0000b3a5bf Mon Sep 17 00:00:00 2001
From: Shantur Rathore <i@shantur.com>
Date: Thu, 13 Aug 2026 09:39:25 +0100
Subject: [PATCH 5/6] Bump version to 0.19.0

---
 package-lock.json                            | 84 +++++++++++---------
 package.json                                 |  2 +-
 packages/electron-app/package.json           |  2 +-
 packages/opencode-plugin/package.json        |  2 +-
 packages/server/package-lock.json            |  4 +-
 packages/server/package.json                 |  2 +-
 packages/tauri-app/Cargo.lock                |  2 +-
 packages/tauri-app/package.json              |  2 +-
 packages/tauri-app/src-tauri/Cargo.toml      |  2 +-
 packages/tauri-app/src-tauri/tauri.conf.json |  2 +-
 packages/ui/package.json                     |  2 +-
 11 files changed, 59 insertions(+), 47 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 473c9074..0e815cfb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "codenomad-workspace",
-  "version": "0.18.0",
+  "version": "0.19.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "codenomad-workspace",
-      "version": "0.18.0",
+      "version": "0.19.0",
       "license": "MIT",
       "dependencies": {
         "7zip-bin": "^5.2.0",
@@ -73,7 +73,6 @@
       "version": "7.28.5",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/code-frame": "^7.27.1",
         "@babel/generator": "^7.28.5",
@@ -4296,7 +4295,6 @@
       "version": "7.20.5",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/parser": "^7.20.7",
         "@babel/types": "^7.20.7",
@@ -4398,7 +4396,6 @@
       "version": "22.19.0",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "undici-types": "~6.21.0"
       }
@@ -4473,7 +4470,6 @@
       "integrity": "sha512-MCbrb508JZHqe7bUibmZj/lyojdhLRnfkmyXnkrCM2zVrjTgL89U8UEfInpKTvPeTnxsw2hmyZxnhsdNR6yhwg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "cac": "^6.7.14",
         "colorette": "^2.0.20",
@@ -4556,7 +4552,6 @@
       "version": "6.12.6",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -4759,6 +4754,7 @@
       "version": "5.3.2",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "archiver-utils": "^2.1.0",
         "async": "^3.2.4",
@@ -4776,6 +4772,7 @@
       "version": "2.1.0",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "glob": "^7.1.4",
         "graceful-fs": "^4.2.0",
@@ -4796,6 +4793,7 @@
       "version": "2.3.8",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "core-util-is": "~1.0.0",
         "inherits": "~2.0.3",
@@ -4809,12 +4807,14 @@
     "node_modules/archiver-utils/node_modules/safe-buffer": {
       "version": "5.1.2",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/archiver-utils/node_modules/string_decoder": {
       "version": "1.1.1",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "safe-buffer": "~5.1.0"
       }
@@ -5128,6 +5128,7 @@
       "version": "4.1.0",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "buffer": "^5.5.0",
         "inherits": "^2.0.4",
@@ -5191,7 +5192,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "baseline-browser-mapping": "^2.9.0",
         "caniuse-lite": "^1.0.30001759",
@@ -5682,6 +5682,7 @@
       "version": "4.1.2",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "buffer-crc32": "^0.2.13",
         "crc32-stream": "^4.0.2",
@@ -5811,6 +5812,7 @@
       "version": "1.2.2",
       "dev": true,
       "license": "Apache-2.0",
+      "peer": true,
       "bin": {
         "crc32": "bin/crc32.njs"
       },
@@ -5822,6 +5824,7 @@
       "version": "4.0.3",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "crc-32": "^1.2.0",
         "readable-stream": "^3.4.0"
@@ -6187,7 +6190,6 @@
       "version": "24.13.3",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "app-builder-lib": "24.13.3",
         "builder-util": "24.13.1",
@@ -6354,6 +6356,7 @@
       "version": "24.13.3",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "app-builder-lib": "24.13.3",
         "archiver": "^5.3.1",
@@ -6365,6 +6368,7 @@
       "version": "10.1.0",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "graceful-fs": "^4.2.0",
         "jsonfile": "^6.0.1",
@@ -6378,6 +6382,7 @@
       "version": "6.2.0",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "universalify": "^2.0.0"
       },
@@ -6389,6 +6394,7 @@
       "version": "2.0.1",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">= 10.0.0"
       }
@@ -7123,7 +7129,8 @@
     "node_modules/fs-constants": {
       "version": "1.0.0",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/fs-extra": {
       "version": "8.1.0",
@@ -8340,7 +8347,8 @@
     "node_modules/isarray": {
       "version": "1.0.0",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/isbinaryfile": {
       "version": "5.0.6",
@@ -8390,7 +8398,6 @@
       "version": "1.21.7",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "bin": {
         "jiti": "bin/jiti.js"
       }
@@ -8547,6 +8554,7 @@
       "version": "1.0.1",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "readable-stream": "^2.0.5"
       },
@@ -8558,6 +8566,7 @@
       "version": "2.3.8",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "core-util-is": "~1.0.0",
         "inherits": "~2.0.3",
@@ -8571,12 +8580,14 @@
     "node_modules/lazystream/node_modules/safe-buffer": {
       "version": "5.1.2",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/lazystream/node_modules/string_decoder": {
       "version": "1.1.1",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "safe-buffer": "~5.1.0"
       }
@@ -8641,22 +8652,26 @@
     "node_modules/lodash.defaults": {
       "version": "4.2.0",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/lodash.difference": {
       "version": "4.5.0",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/lodash.flatten": {
       "version": "4.4.0",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/lodash.isplainobject": {
       "version": "4.0.6",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/lodash.sortby": {
       "version": "4.7.0",
@@ -8668,7 +8683,8 @@
     "node_modules/lodash.union": {
       "version": "4.6.0",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/lowercase-keys": {
       "version": "2.0.0",
@@ -8722,7 +8738,6 @@
     "node_modules/marked": {
       "version": "12.0.2",
       "license": "MIT",
-      "peer": true,
       "bin": {
         "marked": "bin/marked.js"
       },
@@ -9483,7 +9498,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "nanoid": "^3.3.11",
         "picocolors": "^1.1.1",
@@ -9631,7 +9645,8 @@
     "node_modules/process-nextick-args": {
       "version": "2.0.1",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/process-warning": {
       "version": "3.0.0",
@@ -9880,6 +9895,7 @@
       "version": "3.6.2",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "inherits": "^2.0.3",
         "string_decoder": "^1.1.1",
@@ -9893,6 +9909,7 @@
       "version": "1.1.3",
       "dev": true,
       "license": "Apache-2.0",
+      "peer": true,
       "dependencies": {
         "minimatch": "^5.1.0"
       }
@@ -10195,7 +10212,6 @@
       "version": "4.52.5",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/estree": "1.0.8"
       },
@@ -10419,7 +10435,6 @@
     "node_modules/seroval": {
       "version": "1.3.2",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=10"
       }
@@ -10743,7 +10758,6 @@
     "node_modules/solid-js": {
       "version": "1.9.10",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "csstype": "^3.1.0",
         "seroval": "~1.3.0",
@@ -10884,6 +10898,7 @@
       "version": "1.3.0",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "safe-buffer": "~5.2.0"
       }
@@ -11217,6 +11232,7 @@
       "version": "2.2.0",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "bl": "^4.0.3",
         "end-of-stream": "^1.4.1",
@@ -11409,7 +11425,6 @@
       "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -11659,7 +11674,6 @@
       "version": "5.9.3",
       "dev": true,
       "license": "Apache-2.0",
-      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -12007,7 +12021,6 @@
       "version": "5.4.21",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "esbuild": "^0.21.3",
         "postcss": "^8.4.43",
@@ -12866,7 +12879,6 @@
       "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
         "fast-uri": "^3.0.1",
@@ -13061,7 +13073,6 @@
       "integrity": "sha512-fS6iqSPZDs3dr/y7Od6y5nha8dW1YnbgtsyotCVvoFGKbERG++CVRFv1meyGDE1SNItQA8BrnCw7ScdAhRJ3XQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "bin": {
         "rollup": "dist/bin/rollup"
       },
@@ -13350,6 +13361,7 @@
       "version": "4.1.1",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "archiver-utils": "^3.0.4",
         "compress-commons": "^4.1.2",
@@ -13363,6 +13375,7 @@
       "version": "3.0.4",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "glob": "^7.2.3",
         "graceful-fs": "^4.2.0",
@@ -13382,7 +13395,6 @@
     "node_modules/zod": {
       "version": "3.25.76",
       "license": "MIT",
-      "peer": true,
       "funding": {
         "url": "https://github.com/sponsors/colinhacks"
       }
@@ -13397,7 +13409,7 @@
     },
     "packages/electron-app": {
       "name": "@neuralnomads/codenomad-electron-app",
-      "version": "0.18.0",
+      "version": "0.19.0",
       "license": "MIT",
       "dependencies": {
         "yaml": "^2.4.2"
@@ -13424,7 +13436,7 @@
     },
     "packages/opencode-plugin": {
       "name": "@codenomad/codenomad-opencode-plugin",
-      "version": "0.18.0",
+      "version": "0.19.0",
       "license": "MIT",
       "dependencies": {
         "@opencode-ai/plugin": "1.3.7"
@@ -13436,7 +13448,7 @@
     },
     "packages/server": {
       "name": "@neuralnomads/codenomad",
-      "version": "0.18.0",
+      "version": "0.19.0",
       "license": "MIT",
       "dependencies": {
         "@fastify/cors": "^8.5.0",
@@ -13479,7 +13491,7 @@
     },
     "packages/tauri-app": {
       "name": "@codenomad/tauri-app",
-      "version": "0.18.0",
+      "version": "0.19.0",
       "license": "MIT",
       "devDependencies": {
         "@tauri-apps/cli": "^2.9.4"
@@ -13487,7 +13499,7 @@
     },
     "packages/ui": {
       "name": "@codenomad/ui",
-      "version": "0.18.0",
+      "version": "0.19.0",
       "license": "MIT",
       "dependencies": {
         "@git-diff-view/solid": "^0.0.8",
diff --git a/package.json b/package.json
index dd823123..30ee74dd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codenomad-workspace",
-  "version": "0.18.0",
+  "version": "0.19.0",
   "private": true,
   "description": "CodeNomad monorepo workspace",
   "license": "MIT",
diff --git a/packages/electron-app/package.json b/packages/electron-app/package.json
index f7b79147..58db2c55 100644
--- a/packages/electron-app/package.json
+++ b/packages/electron-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@neuralnomads/codenomad-electron-app",
-  "version": "0.18.0",
+  "version": "0.19.0",
   "description": "CodeNomad - AI coding assistant",
   "license": "MIT",
   "author": {
diff --git a/packages/opencode-plugin/package.json b/packages/opencode-plugin/package.json
index b2193719..6f7e8c63 100644
--- a/packages/opencode-plugin/package.json
+++ b/packages/opencode-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@codenomad/codenomad-opencode-plugin",
-  "version": "0.18.0",
+  "version": "0.19.0",
   "private": true,
   "license": "MIT",
   "type": "module",
diff --git a/packages/server/package-lock.json b/packages/server/package-lock.json
index eff79de6..7b45e136 100644
--- a/packages/server/package-lock.json
+++ b/packages/server/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@neuralnomads/codenomad",
-  "version": "0.18.0",
+  "version": "0.19.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@neuralnomads/codenomad",
-      "version": "0.18.0",
+      "version": "0.19.0",
       "license": "MIT",
       "dependencies": {
         "@fastify/cors": "^11.2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index 3ca35925..bb658946 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@neuralnomads/codenomad",
-  "version": "0.18.0",
+  "version": "0.19.0",
   "description": "CodeNomad Server",
   "license": "MIT",
   "author": {
diff --git a/packages/tauri-app/Cargo.lock b/packages/tauri-app/Cargo.lock
index 9e381964..43446163 100644
--- a/packages/tauri-app/Cargo.lock
+++ b/packages/tauri-app/Cargo.lock
@@ -497,7 +497,7 @@ dependencies = [
 
 [[package]]
 name = "codenomad-tauri"
-version = "0.18.0"
+version = "0.19.0"
 dependencies = [
  "anyhow",
  "base64 0.22.1",
diff --git a/packages/tauri-app/package.json b/packages/tauri-app/package.json
index 64645e0a..4f1f6cc5 100644
--- a/packages/tauri-app/package.json
+++ b/packages/tauri-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@codenomad/tauri-app",
-  "version": "0.18.0",
+  "version": "0.19.0",
   "private": true,
   "license": "MIT",
   "scripts": {
diff --git a/packages/tauri-app/src-tauri/Cargo.toml b/packages/tauri-app/src-tauri/Cargo.toml
index d99219a8..8c0c22ff 100644
--- a/packages/tauri-app/src-tauri/Cargo.toml
+++ b/packages/tauri-app/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "codenomad-tauri"
-version = "0.18.0"
+version = "0.19.0"
 edition = "2021"
 license = "MIT"
 
diff --git a/packages/tauri-app/src-tauri/tauri.conf.json b/packages/tauri-app/src-tauri/tauri.conf.json
index 273e4c8d..bed5e90d 100644
--- a/packages/tauri-app/src-tauri/tauri.conf.json
+++ b/packages/tauri-app/src-tauri/tauri.conf.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
   "productName": "CodeNomad",
-  "version": "0.18.0",
+  "version": "0.19.0",
   "identifier": "ai.neuralnomads.codenomad.client",
   "build": {
     "beforeDevCommand": "npm run dev:bootstrap",
diff --git a/packages/ui/package.json b/packages/ui/package.json
index 8c365390..9a7e6b32 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@codenomad/ui",
-  "version": "0.18.0",
+  "version": "0.19.0",
   "private": true,
   "license": "MIT",
   "type": "module",

From 9185b38e0f6b231802a39daac3d9b2d3d62f8a66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pascal=20Andr=C3=A9?= <pascalandr@gmail.com>
Date: Thu, 13 Aug 2026 11:26:57 +0200
Subject: [PATCH 6/6] fix(ui): contain provider card actions (#651)

## Summary
- size provider card actions to their content on desktop
- prevent the global full-width selector button rule from overflowing
the Provider Authentication dialog
- retain full-width stacked actions in the existing narrow/mobile layout

## Validation
- `npm run typecheck --workspace @codenomad/ui`
- `npm run build --workspace @codenomad/ui`
- `git diff --check`

Follow-up to #637.

Closes #650.
---
 .../ui/src/styles/components/provider-model-visibility.css | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/ui/src/styles/components/provider-model-visibility.css b/packages/ui/src/styles/components/provider-model-visibility.css
index 50cc9fb6..3ae8785f 100644
--- a/packages/ui/src/styles/components/provider-model-visibility.css
+++ b/packages/ui/src/styles/components/provider-model-visibility.css
@@ -71,6 +71,10 @@
   gap: 0.5rem;
 }
 
+.provider-model-card-actions .selector-button {
+  width: auto;
+}
+
 @media (max-width: 700px) {
   .provider-model-visibility-toolbar {
     grid-template-columns: 1fr;
@@ -82,7 +86,8 @@
     flex-direction: column;
   }
 
-  .provider-model-visibility-toolbar .selector-button {
+  .provider-model-visibility-toolbar .selector-button,
+  .provider-model-card-actions .selector-button {
     width: 100%;
     justify-content: center;
   }
