From 94e4bce990c888c401725dabaa558b9825564927 Mon Sep 17 00:00:00 2001
From: "PC2\\micha" <remotac@gmail.com>
Date: Sun, 28 Jun 2026 20:07:39 +0800
Subject: [PATCH 01/22] fix: kill process tree on Windows via taskkill before
 SIGTERM fallback

On Windows, child.kill('SIGTERM') only terminates the cmd.exe wrapper,
leaving the inner opencode.exe serve running as an orphan. This adds
killProcessTree() which runs taskkill /PID /T /F first, then falls
back to child.kill('SIGTERM') for the close() method.

Fixes #1889
---
 packages/vscode/src/opencode.ts | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/packages/vscode/src/opencode.ts b/packages/vscode/src/opencode.ts
index 540a9aba..95f7f239 100644
--- a/packages/vscode/src/opencode.ts
+++ b/packages/vscode/src/opencode.ts
@@ -133,6 +133,19 @@ function shouldUseWindowsShell(binary: string): boolean {
   return !ext && !trimmed.includes('\\') && !trimmed.includes('/');
 }
 
+function killProcessTree(pid: number | undefined): void {
+  if (!Number.isInteger(pid)) return;
+  if (process.platform === 'win32') {
+    try {
+      spawnSync('taskkill', ['/PID', String(pid), '/T', '/F'], {
+        stdio: 'ignore', timeout: 5000, windowsHide: true,
+      });
+    } catch {
+      // ignore
+    }
+  }
+}
+
 function appendToPath(dir: string) {
   const trimmed = (dir || '').trim();
   if (!trimmed) return;
@@ -695,6 +708,7 @@ async function spawnManagedOpenCodeServer(
   return {
     url,
     close: () => {
+      killProcessTree(child.pid);
       try {
         child.kill('SIGTERM');
       } catch {

From 72a24c388f6dbb6eb4ccc93619edf91b4dcf9c88 Mon Sep 17 00:00:00 2001
From: Brian Ketelsen <bketelsen@gmail.com>
Date: Tue, 30 Jun 2026 23:26:51 -0400
Subject: [PATCH 02/22] fix(pwa): focus existing window on notification click

The service worker's notificationclick handler called
self.clients.openWindow(url) unconditionally, spawning a new window/PWA
instance on every notification click even when one was already open.

Focus an existing window client and navigate it to the (relative)
deep-link, resolved against self.location.origin, falling back to
openWindow only when no window is available.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 packages/web/src/sw.ts | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/packages/web/src/sw.ts b/packages/web/src/sw.ts
index 7ed2a8cc..3583d41b 100644
--- a/packages/web/src/sw.ts
+++ b/packages/web/src/sw.ts
@@ -67,5 +67,30 @@ self.addEventListener('notificationclick', (event) => {
   const data = (event.notification.data ?? null) as { url?: string } | null;
   const url = data?.url ?? '/';
 
-  event.waitUntil(self.clients.openWindow(url));
+  event.waitUntil((async () => {
+    // Prefer focusing an already-open window (e.g. the installed PWA) and
+    // navigating it to the target, instead of always spawning a new window.
+    const target = new URL(url, self.location.origin).href;
+    const windowClients = await self.clients.matchAll({
+      type: 'window',
+      includeUncontrolled: true,
+    });
+
+    for (const client of windowClients) {
+      try {
+        if ('navigate' in client) {
+          await client.navigate(target);
+        }
+      } catch {
+        // navigate() can reject for uncontrolled clients; fall back to focus.
+      }
+      if ('focus' in client) {
+        return client.focus();
+      }
+    }
+
+    if (self.clients.openWindow) {
+      return self.clients.openWindow(target);
+    }
+  })());
 });

From 83d4bc7b59c015e672eac63c2e0f3a145cb461c1 Mon Sep 17 00:00:00 2001
From: herjarsa <herjarsa@users.noreply.github.com>
Date: Thu, 9 Jul 2026 21:55:57 +0200
Subject: [PATCH 03/22] fix(chat): save previous-session anchor in microtask
 with bail check

When switching sessions, the previous session's viewport anchor save
was deferred via setTimeout(..., 0). This races with the new session's
restoreSnapshot effect: the timer can fire after React has flushed
the new session's render and before the restore effect runs, leaving
the saved anchor and the restored scroll position fighting over the
same viewport store entry. The save reads messages (can be expensive)
on the same tick as the new session's skeleton render.

Replace setTimeout(..., 0) with queueMicrotask() so the save runs
immediately after the current synchronous call stack and before the
next macrotask / paint. This guarantees the save completes before the
new session's restoreSnapshot effect fires.

Add a bail check: if the user switched sessions again between the
microtask scheduling and execution (rapid switching), the save is
now stale. Comparing the captured newId to the current currentSessionId
at microtask runtime avoids clobbering the in-flight session's anchor
with data from a session that is no longer "previous".

This is the queueMicrotask + bail change acknowledged as 'great' in
the review of #1675, extracted as a focused single-file PR.
---
 packages/ui/src/sync/session-ui-store.ts | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/packages/ui/src/sync/session-ui-store.ts b/packages/ui/src/sync/session-ui-store.ts
index 397fb484..154ae984 100644
--- a/packages/ui/src/sync/session-ui-store.ts
+++ b/packages/ui/src/sync/session-ui-store.ts
@@ -617,7 +617,16 @@ export const useSessionUIStore = create<SessionUIState>()((set, get) => ({
     // skeleton to render and reads messages which can be expensive.
     if (previousSessionId && previousSessionId !== id) {
       const prevId = previousSessionId
-      setTimeout(() => {
+      const newId = id
+      // queueMicrotask runs after the current synchronous call stack (and
+      // before the next macrotask / setTimeout(0) / paint), so the previous
+      // session's anchor is saved before the new session's restoreSnapshot
+      // effect fires. This eliminates the race where save and restore
+      // interleave against the same viewport store entry.
+      queueMicrotask(() => {
+        // Bail if the user already switched again — save is now stale.
+        const current = get().currentSessionId
+        if (current !== newId) return
         const memState = getViewportSessionMemory(prevId)
         if (!memState?.isStreaming) {
           const prevMessages = getSyncMessages(prevId)
@@ -625,7 +634,7 @@ export const useSessionUIStore = create<SessionUIState>()((set, get) => ({
             useViewportStore.getState().updateViewportAnchor(prevId, prevMessages.length - 1)
           }
         }
-      }, 0)
+      });
     }
 
     // Mark session viewed in notification store + update active session ref

From 128122fdd92bbd02d4eb26fb07648d1a2caa3365 Mon Sep 17 00:00:00 2001
From: Greg Haynes <greg@greghaynes.net>
Date: Sun, 12 Jul 2026 19:54:35 -0700
Subject: [PATCH 04/22] fix(web): shorten PWA install app name

---
 packages/web/index.html                                 | 2 +-
 packages/web/public/site.webmanifest                    | 2 +-
 packages/web/server/lib/opencode/pwa-manifest-routes.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/web/index.html b/packages/web/index.html
index 2434decd..9ee0b466 100644
--- a/packages/web/index.html
+++ b/packages/web/index.html
@@ -24,7 +24,7 @@
     <!-- Web app manifest (endpoint-first with data URL fallback) -->
     <script>
       const baseUrl = location.origin;
-      const defaultAppName = 'OpenChamber - AI Coding Assistant';
+      const defaultAppName = 'OpenChamber';
       const defaultShortName = 'OpenChamber';
       const pwaNameStorageKey = 'openchamber.pwaName';
       const pwaOrientationStorageKey = 'openchamber.pwaOrientation';
diff --git a/packages/web/public/site.webmanifest b/packages/web/public/site.webmanifest
index 81afd4b5..7caf52bf 100644
--- a/packages/web/public/site.webmanifest
+++ b/packages/web/public/site.webmanifest
@@ -1,5 +1,5 @@
 {
-  "name": "OpenChamber - AI Coding Companion",
+  "name": "OpenChamber",
   "short_name": "OpenChamber",
   "description": "OpenChamber desktop companion for the OpenCode AI coding agent",
   "start_url": "/",
diff --git a/packages/web/server/lib/opencode/pwa-manifest-routes.js b/packages/web/server/lib/opencode/pwa-manifest-routes.js
index a883776e..8350abc0 100644
--- a/packages/web/server/lib/opencode/pwa-manifest-routes.js
+++ b/packages/web/server/lib/opencode/pwa-manifest-routes.js
@@ -1,4 +1,4 @@
-const DEFAULT_PWA_APP_NAME = 'OpenChamber - AI Coding Assistant';
+const DEFAULT_PWA_APP_NAME = 'OpenChamber';
 const mapPwaOrientationToManifest = (value) => {
   if (value === 'portrait') {
     return 'portrait-primary';

From a3b861972e8e9e5cd29f4095b729dff01614c899 Mon Sep 17 00:00:00 2001
From: Mark Lopez <m@silvenga.com>
Date: Sat, 18 Jul 2026 16:49:11 -0500
Subject: [PATCH 05/22] feat: allow user CA's when validating server's certs
 under android

---
 packages/mobile/android/app/src/main/AndroidManifest.xml | 7 +------
 .../app/src/main/res/xml/network_security_config.xml     | 9 +++++++++
 2 files changed, 10 insertions(+), 6 deletions(-)
 create mode 100644 packages/mobile/android/app/src/main/res/xml/network_security_config.xml

diff --git a/packages/mobile/android/app/src/main/AndroidManifest.xml b/packages/mobile/android/app/src/main/AndroidManifest.xml
index d00b87da..53d0b3b1 100644
--- a/packages/mobile/android/app/src/main/AndroidManifest.xml
+++ b/packages/mobile/android/app/src/main/AndroidManifest.xml
@@ -1,17 +1,12 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- usesCleartextTraffic: OpenChamber connects to user-hosted servers over
-         plain http:// on the local network (LAN transport). Android blocks all
-         cleartext HTTP by default (targetSdk >= 28), which silently failed every
-         LAN probe and forced Android onto relay-only. This mirrors the iOS ATS
-         exceptions (NSAllowsArbitraryLoadsInWebContent + NSAllowsLocalNetworking). -->
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:usesCleartextTraffic="true"
         android:theme="@style/AppTheme">
         <activity
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode|navigation"
diff --git a/packages/mobile/android/app/src/main/res/xml/network_security_config.xml b/packages/mobile/android/app/src/main/res/xml/network_security_config.xml
new file mode 100644
index 00000000..8a76775f
--- /dev/null
+++ b/packages/mobile/android/app/src/main/res/xml/network_security_config.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <base-config cleartextTrafficPermitted="true">
+        <trust-anchors>
+            <certificates src="system" />
+            <certificates src="user" />
+        </trust-anchors>
+    </base-config>
+</network-security-config>

From 3685a1423893b7c44b74881c26734b36d8af4b17 Mon Sep 17 00:00:00 2001
From: tttpob <i@tpob.io>
Date: Tue, 4 Aug 2026 15:52:14 +0800
Subject: [PATCH 06/22] fix(ui): keep empty composer caret visible

---
 packages/ui/src/components/chat/composer/editor/theme.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/ui/src/components/chat/composer/editor/theme.ts b/packages/ui/src/components/chat/composer/editor/theme.ts
index 0b685c96..b484af27 100644
--- a/packages/ui/src/components/chat/composer/editor/theme.ts
+++ b/packages/ui/src/components/chat/composer/editor/theme.ts
@@ -19,6 +19,8 @@ export const COMPOSER_EDITOR_THEME_SPEC = {
     '&.cm-focused': { outline: 'none' },
     '.cm-content': {
         padding: '0',
+        // Keep the drawn empty-document cursor inside the scroller's horizontal clip.
+        paddingInlineStart: '1px',
         fontFamily: 'inherit',
         fontSize: 'inherit',
         lineHeight: 'inherit',

From 4b6cf1d40a7af3f9d3094de894e6eddb65662b85 Mon Sep 17 00:00:00 2001
From: tttpob <i@tpob.io>
Date: Tue, 4 Aug 2026 15:12:51 +0800
Subject: [PATCH 07/22] fix(vscode): reuse manager output channel across
 restarts

---
 packages/vscode/src/opencode.ts | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/vscode/src/opencode.ts b/packages/vscode/src/opencode.ts
index c1f60f73..d694abbd 100644
--- a/packages/vscode/src/opencode.ts
+++ b/packages/vscode/src/opencode.ts
@@ -14,6 +14,17 @@ import { registerManagedProcess, unregisterManagedProcess, reapOrphanedProcesses
 const t = vscode.l10n.t;
 
 const READY_CHECK_TIMEOUT_MS = 30000;
+
+// Reuse a single output channel across restarts instead of creating (and
+// leaking) a new one on every waitForReady call.
+let managerOutputChannel: vscode.OutputChannel | null = null;
+
+function getManagerOutputChannel(): vscode.OutputChannel {
+  if (!managerOutputChannel) {
+    managerOutputChannel = vscode.window.createOutputChannel('OpenChamberManager');
+  }
+  return managerOutputChannel;
+}
 const WINDOWS_EXECUTABLE_EXTENSIONS = (process.env.PATHEXT || '.EXE;.CMD;.BAT;.COM')
   .split(';')
   .map((ext) => ext.trim().toLowerCase())
@@ -612,7 +623,6 @@ async function waitForReady(
   timeoutMs = 15000,
   authHeaders: Record<string, string> = {}
 ): Promise<ReadyResult> {
-  const outputChannel = vscode.window.createOutputChannel('OpenChamberManager');
   const start = Date.now();
   const candidates = getCandidateBaseUrls(serverUrl);
   let attempts = 0;
@@ -640,7 +650,7 @@ async function waitForReady(
         }
 
         clearTimeout(timeout);
-        outputChannel?.appendLine(
+        getManagerOutputChannel().appendLine(
           `Health check to ${url.toString()} returned ${res.status} with body: ${JSON.stringify(body)}`
         );
 

From 0bbbcd6445a8b56448149b38c20c2c52093ab5bc Mon Sep 17 00:00:00 2001
From: Zeying Tian <tzy20001018@gmail.com>
Date: Sun, 9 Aug 2026 03:03:05 -0400
Subject: [PATCH 08/22] fix(small-model): omit thinkingConfig for non-reasoning
 Google models

---
 .../web/server/lib/small-model/DOCUMENTATION.md  |  3 ++-
 packages/web/server/lib/small-model/call.js      | 15 +++++++--------
 packages/web/server/lib/small-model/call.test.js | 16 ++++++++++++++++
 3 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/packages/web/server/lib/small-model/DOCUMENTATION.md b/packages/web/server/lib/small-model/DOCUMENTATION.md
index 1776f1e1..23fdbfdd 100644
--- a/packages/web/server/lib/small-model/DOCUMENTATION.md
+++ b/packages/web/server/lib/small-model/DOCUMENTATION.md
@@ -96,7 +96,8 @@ other runtime API.
     `auth.openai.com` (single-flight) and written back to `auth.json`.
   - **Anthropic** (`type: api`): `/v1/messages` with `x-api-key`.
   - **Google** (`type: api`): `generateContent` with `x-goog-api-key`; Gemini 3
-    uses `thinkingLevel` while older Flash models use `thinkingBudget: 0`.
+    uses `thinkingLevel`, Gemini 2.x uses `thinkingBudget: 0`, and all other
+    models omit `thinkingConfig` entirely.
   - Everything else: OpenAI-compatible `/chat/completions` against the
     provider's base URL, resolved from (1) `provider.<id>.options.baseURL`
     in the OpenCode config, (2) the hardcoded `https://api.openai.com/v1`
diff --git a/packages/web/server/lib/small-model/call.js b/packages/web/server/lib/small-model/call.js
index c3a090a1..75dc315f 100644
--- a/packages/web/server/lib/small-model/call.js
+++ b/packages/web/server/lib/small-model/call.js
@@ -402,9 +402,10 @@ const getCopilotEndpoint = async ({ baseURL, headers, modelID }) => {
 
 const callGoogle = async ({ apiKey, modelID, prompt, system, maxOutputTokens, responseSchema, timeoutMs, signal }) => {
   const url = `https://generativelanguage.googleapis.com/v1beta/models/${encodeURIComponent(modelID)}:generateContent`;
-  const thinkingConfig = modelID.toLowerCase().startsWith('gemini-3')
-    ? { thinkingLevel: modelID.toLowerCase().includes('flash') ? 'minimal' : 'low' }
-    : { thinkingBudget: 0 };
+  const lowerModelID = modelID.toLowerCase();
+  const thinkingConfig = lowerModelID.startsWith('gemini-3')
+    ? { thinkingLevel: lowerModelID.includes('flash') ? 'minimal' : 'low' }
+    : lowerModelID.startsWith('gemini-2') ? { thinkingBudget: 0 } : null;
   const response = await fetch(url, {
     method: 'POST',
     headers: {
@@ -414,13 +415,11 @@ const callGoogle = async ({ apiKey, modelID, prompt, system, maxOutputTokens, re
     },
     body: JSON.stringify({
       contents: [{ role: 'user', parts: [{ text: prompt }] }],
-      ...(system ? { systemInstruction: { parts: [{ text: system }] } } : {}),
+      ...(system && { systemInstruction: { parts: [{ text: system }] } }),
       generationConfig: {
         maxOutputTokens,
-        thinkingConfig,
-        ...(responseSchema
-          ? { responseMimeType: 'application/json', responseSchema: toGoogleSchema(responseSchema) }
-          : {}),
+        ...(thinkingConfig && { thinkingConfig }),
+        ...(responseSchema && { responseMimeType: 'application/json', responseSchema: toGoogleSchema(responseSchema) }),
       },
     }),
     signal: requestSignal(timeoutMs, signal),
diff --git a/packages/web/server/lib/small-model/call.test.js b/packages/web/server/lib/small-model/call.test.js
index 154fd986..bbb6b49a 100644
--- a/packages/web/server/lib/small-model/call.test.js
+++ b/packages/web/server/lib/small-model/call.test.js
@@ -457,6 +457,22 @@ describe('callSmallModel — Google thinking configuration', () => {
     const body = JSON.parse(lastCall(fetchMock).init.body);
     expect(body.generationConfig.thinkingConfig).toEqual({ thinkingBudget: 0 });
   });
+
+  it('omits thinkingConfig for other Google/Gemini models', async () => {
+    fetchMock.mockResolvedValue(googleResponse('generated commit'));
+
+    await callSmallModel({
+      auth: { google: { type: 'api', key: 'google-key' } },
+      catalog: {},
+      workingDirectory: '/proj',
+      providerID: 'google',
+      modelID: 'gemini-1.5-flash',
+      prompt: 'generate',
+    });
+
+    const body = JSON.parse(lastCall(fetchMock).init.body);
+    expect(body.generationConfig.thinkingConfig).toBeUndefined();
+  });
 });
 
 describe('callSmallModel — GitHub Copilot endpoint routing', () => {

From 5b8ff22d351cab27390face98964c664438d6ea8 Mon Sep 17 00:00:00 2001
From: Dawnfz-Lenfeng <2912706234@qq.com>
Date: Tue, 11 Aug 2026 17:45:15 +0800
Subject: [PATCH 09/22] fix(ui): always show /init command in autocomplete

The /init command was only offered in the autocomplete when the current session had no messages yet, and it was filtered out entirely once any message existed. Since the underlying session.command endpoint works in any session, keep /init available whenever a session exists so AGENTS.md setup stays reachable mid-conversation.
---
 .../components/chat/CommandAutocomplete.tsx   | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/packages/ui/src/components/chat/CommandAutocomplete.tsx b/packages/ui/src/components/chat/CommandAutocomplete.tsx
index 77070181..d42ec53c 100644
--- a/packages/ui/src/components/chat/CommandAutocomplete.tsx
+++ b/packages/ui/src/components/chat/CommandAutocomplete.tsx
@@ -1,7 +1,6 @@
 import React from 'react';
 import { cn, fuzzyMatch } from '@/lib/utils';
 import { useSessionUIStore } from '@/sync/session-ui-store';
-import { useSessionMessages } from '@/sync/sync-context';
 import { useCommandsStore } from '@/stores/useCommandsStore';
 import { useSkillsStore } from '@/stores/useSkillsStore';
 import { ScrollableOverlay } from '@/components/ui/ScrollableOverlay';
@@ -65,8 +64,6 @@ export const CommandAutocomplete = React.forwardRef<CommandAutocompleteHandle, C
 }, ref) => {
   const { t } = useI18n();
   const currentSessionId = useSessionUIStore((state) => state.currentSessionId);
-  const sessionMessages = useSessionMessages(currentSessionId ?? '');
-  const hasMessagesInCurrentSession = sessionMessages.length > 0;
   const hasSession = Boolean(currentSessionId);
   const hasNewSessionDraft = useSessionUIStore((state) => Boolean(state.newSessionDraft?.open));
   const canStartSessionCommand = hasSession || hasNewSessionDraft;
@@ -139,7 +136,7 @@ export const CommandAutocomplete = React.forwardRef<CommandAutocompleteHandle, C
         }));
 
         const builtInCommands: CommandInfo[] = [
-          ...(hasSession && !hasMessagesInCurrentSession
+          ...(hasSession
             ? [{ id: 'openchamber:init', name: 'init', source: 'openchamber' as const, description: t('chat.commandAutocomplete.command.initDescription'), isBuiltIn: true }]
             : []
           ),
@@ -195,10 +192,9 @@ export const CommandAutocomplete = React.forwardRef<CommandAutocompleteHandle, C
         ];
         const allCommands = mergeCommandAutocompleteItems(builtInCommands, customCommands, skillCommands);
 
-        const allowInitCommand = !hasMessagesInCurrentSession;
-        const filtered = (searchQuery
+        const filtered = searchQuery
           ? allCommands.filter(cmd => commandMatchesSearch(cmd, searchQuery))
-          : allCommands).filter(cmd => allowInitCommand || cmd.name !== 'init');
+          : allCommands;
 
         filtered.sort((a, b) => {
           const aStartsWith = a.name.toLowerCase().startsWith(searchQuery.toLowerCase());
@@ -211,9 +207,8 @@ export const CommandAutocomplete = React.forwardRef<CommandAutocompleteHandle, C
         setCommands(filtered);
       } catch {
 
-        const allowInitCommand = !hasMessagesInCurrentSession;
         const builtInCommands: CommandInfo[] = [
-          ...(hasSession && !hasMessagesInCurrentSession
+          ...(hasSession
             ? [{ id: 'openchamber:init', name: 'init', source: 'openchamber' as const, description: t('chat.commandAutocomplete.command.initDescription'), isBuiltIn: true }]
             : []
           ),
@@ -268,12 +263,12 @@ export const CommandAutocomplete = React.forwardRef<CommandAutocompleteHandle, C
           ),
         ];
 
-        const filtered = (searchQuery
+        const filtered = searchQuery
           ? builtInCommands.filter(cmd =>
               fuzzyMatch(cmd.name, searchQuery) ||
               (cmd.description && fuzzyMatch(cmd.description, searchQuery))
             )
-          : builtInCommands).filter(cmd => allowInitCommand || cmd.name !== 'init');
+          : builtInCommands;
 
         setCommands(filtered);
       } finally {
@@ -282,7 +277,7 @@ export const CommandAutocomplete = React.forwardRef<CommandAutocompleteHandle, C
     };
 
     loadCommands();
-  }, [searchQuery, hasMessagesInCurrentSession, hasSession, canStartSessionCommand, canUseReviewHandoffFlow, commandsWithMetadata, skills, t]);
+  }, [searchQuery, hasSession, canStartSessionCommand, canUseReviewHandoffFlow, commandsWithMetadata, skills, t]);
 
   React.useEffect(() => {
     setSelectedIndex(0);

From 19e9686170a1e64da33a68c2b3bd27e145308dfb Mon Sep 17 00:00:00 2001
From: weixiang <weixiang1862@gmail.com>
Date: Wed, 5 Aug 2026 11:19:44 +0800
Subject: [PATCH 10/22] fix(ui): allow entering already-added directories in
 the add-project picker

---
 .../ui/src/components/session/DirectoryExplorerDialog.tsx   | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/ui/src/components/session/DirectoryExplorerDialog.tsx b/packages/ui/src/components/session/DirectoryExplorerDialog.tsx
index 56b5dcab..03dacb53 100644
--- a/packages/ui/src/components/session/DirectoryExplorerDialog.tsx
+++ b/packages/ui/src/components/session/DirectoryExplorerDialog.tsx
@@ -359,7 +359,7 @@ export const DirectoryExplorerDialog: React.FC<DirectoryExplorerDialogProps> = (
   const canSubmitClone = canAddProject && cloneRemoteUrl.trim().length > 0;
   const highlightedRow = rows[highlightedIndex] ?? null;
   const hasHighlightedBrowseItem = Boolean(
-    highlightedRow && (highlightedRow.type === 'up' || (highlightedRow.type === 'directory' && !highlightedRow.disabled))
+    highlightedRow && (highlightedRow.type === 'up' || highlightedRow.type === 'directory')
   );
   const submitModifierLabel = typeof navigator !== 'undefined' && /Mac|iPhone|iPad/.test(navigator.platform)
     ? '⌘'
@@ -486,7 +486,6 @@ export const DirectoryExplorerDialog: React.FC<DirectoryExplorerDialogProps> = (
       if (row.path) browseToDisplayPath(row.path);
       return;
     }
-    if (row.disabled) return;
     browseToEntry(row);
   }, [browseToDisplayPath, browseToEntry]);
 
@@ -665,7 +664,6 @@ export const DirectoryExplorerDialog: React.FC<DirectoryExplorerDialogProps> = (
                     }
                   }}
                   type="button"
-                  disabled={row.type === 'directory' && row.disabled}
                   onMouseEnter={() => setHighlightedIndex(index)}
                   onMouseDown={(event) => event.preventDefault()}
                   onClick={() => executeRow(row)}
@@ -673,7 +671,7 @@ export const DirectoryExplorerDialog: React.FC<DirectoryExplorerDialogProps> = (
                     'flex w-full cursor-pointer items-center gap-2 rounded-lg px-2 py-1.5 text-left transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary/50',
                     isActive && 'bg-interactive-selection text-interactive-selection-foreground',
                     !isActive && 'hover:bg-interactive-hover/50',
-                    row.type === 'directory' && row.disabled && 'cursor-not-allowed opacity-45 hover:bg-transparent'
+                    row.type === 'directory' && row.disabled && 'opacity-45'
                   )}
                 >
                   {row.type === 'up' ? (

From 633429303551586fa51f766d92fc2310ca39a578 Mon Sep 17 00:00:00 2001
From: Ttungx <1323593614@qq.com>
Date: Fri, 14 Aug 2026 15:34:34 +0800
Subject: [PATCH 11/22] fix(ui): normalize Windows paths in skill visibility
 filtering

---
 .../ui/src/stores/skillVisibility.test.ts     | 28 +++++++++++++++++++
 packages/ui/src/stores/skillVisibility.ts     |  8 ++++--
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/packages/ui/src/stores/skillVisibility.test.ts b/packages/ui/src/stores/skillVisibility.test.ts
index 1aa9f353..c4470fc5 100644
--- a/packages/ui/src/stores/skillVisibility.test.ts
+++ b/packages/ui/src/stores/skillVisibility.test.ts
@@ -6,6 +6,9 @@ const skill = (name: string, path: string) => ({ name, path });
 const AGENTS = (name: string) => skill(name, `/repo/.agents/skills/${name}/SKILL.md`);
 const CLAUDE = (name: string) => skill(name, `/repo/.claude/skills/${name}/SKILL.md`);
 const OPENCODE = (name: string) => skill(name, `/home/u/.config/opencode/skill/${name}/SKILL.md`);
+const WIN_AGENTS = (name: string) => skill(name, String.raw`C:\Users\u\.agents\skills\${name}\SKILL.md`);
+const WIN_CLAUDE = (name: string) => skill(name, String.raw`C:\Users\u\.claude\skills\${name}\SKILL.md`);
+const WIN_OPENCODE = (name: string) => skill(name, String.raw`C:\Users\u\.config\opencode\skill\${name}\SKILL.md`);
 
 const ENABLED = { claudeDisabled: false, allDisabled: false };
 
@@ -20,6 +23,13 @@ describe('resolveSkillRoot', () => {
   test('does not match a directory that merely contains the name', () => {
     expect(resolveSkillRoot('/repo/my.claude.backup/skills/a/SKILL.md')).toBe('opencode');
   });
+
+  test('classifies Windows backslash paths', () => {
+    expect(resolveSkillRoot(WIN_CLAUDE('a').path)).toBe('claude');
+    expect(resolveSkillRoot(WIN_AGENTS('a').path)).toBe('agents');
+    expect(resolveSkillRoot(WIN_OPENCODE('a').path)).toBe('opencode');
+    expect(resolveSkillRoot(String.raw`C:\repo\my.claude.backup\skills\a\SKILL.md`)).toBe('opencode');
+  });
 });
 
 describe('filterSkillsByRuntimeFlags', () => {
@@ -72,4 +82,22 @@ describe('filterSkillsByRuntimeFlags', () => {
     const result = filterSkillsByRuntimeFlags([CLAUDE('only-claude'), AGENTS('other')], ENABLED);
     expect(result.map((s) => s.name).sort()).toEqual(['only-claude', 'other']);
   });
+
+  test('drops Windows .agents and .claude skills when external skills are disabled', () => {
+    const skills = [WIN_AGENTS('a'), WIN_CLAUDE('b'), WIN_OPENCODE('c')];
+    const result = filterSkillsByRuntimeFlags(skills, { claudeDisabled: false, allDisabled: true });
+    expect(result.map((s) => s.name)).toEqual(['c']);
+  });
+
+  test('drops only Windows .claude skills when claude skills are disabled', () => {
+    const skills = [WIN_AGENTS('a'), WIN_CLAUDE('b'), WIN_OPENCODE('c')];
+    const result = filterSkillsByRuntimeFlags(skills, { claudeDisabled: true, allDisabled: false });
+    expect(result.map((s) => s.name).sort()).toEqual(['a', 'c']);
+  });
+
+  test('prefers the .agents copy for a duplicated name on Windows', () => {
+    const result = filterSkillsByRuntimeFlags([WIN_CLAUDE('dup'), WIN_AGENTS('dup')], ENABLED);
+    expect(result).toHaveLength(1);
+    expect(result[0].path).toContain('.agents');
+  });
 });
diff --git a/packages/ui/src/stores/skillVisibility.ts b/packages/ui/src/stores/skillVisibility.ts
index ebb28377..da321c27 100644
--- a/packages/ui/src/stores/skillVisibility.ts
+++ b/packages/ui/src/stores/skillVisibility.ts
@@ -35,8 +35,12 @@ const AGENTS_ROOT = /(^|\/)\.agents\//;
 type SkillRoot = 'claude' | 'agents' | 'opencode';
 
 export const resolveSkillRoot = (skillPath: string): SkillRoot => {
-  if (CLAUDE_ROOT.test(skillPath)) return 'claude';
-  if (AGENTS_ROOT.test(skillPath)) return 'agents';
+  // Server discovery joins paths with the platform separator, so Windows
+  // skill paths arrive with backslashes. Normalize before matching the
+  // root regexes, which are expressed with forward slashes.
+  const normalized = skillPath.replace(/\\/g, '/');
+  if (CLAUDE_ROOT.test(normalized)) return 'claude';
+  if (AGENTS_ROOT.test(normalized)) return 'agents';
   return 'opencode';
 };
 

From a43ee30b75e4d1b9f16bd3c510fa2fe371b2269b Mon Sep 17 00:00:00 2001
From: Rui Valdemar Santos <rvaldemar93@gmail.com>
Date: Mon, 17 Aug 2026 15:46:30 +0100
Subject: [PATCH 12/22] fix(chat): show visible error toast when no provider or
 model is selected

Sending a message without a provider/model selection failed silently:
only a console.warn was emitted and the UI gave no feedback. Surface a
toast (i18n key chat.chatInput.toast.noModelSelected, added to all 11
locales) so the user knows why the message was not sent.
---
 packages/ui/src/components/chat/ChatInput.tsx | 1 +
 packages/ui/src/lib/i18n/messages/de.ts       | 1 +
 packages/ui/src/lib/i18n/messages/en.ts       | 1 +
 packages/ui/src/lib/i18n/messages/es.ts       | 1 +
 packages/ui/src/lib/i18n/messages/fr.ts       | 1 +
 packages/ui/src/lib/i18n/messages/ja.ts       | 1 +
 packages/ui/src/lib/i18n/messages/ko.ts       | 1 +
 packages/ui/src/lib/i18n/messages/pl.ts       | 1 +
 packages/ui/src/lib/i18n/messages/pt-BR.ts    | 1 +
 packages/ui/src/lib/i18n/messages/uk.ts       | 1 +
 packages/ui/src/lib/i18n/messages/zh-CN.ts    | 1 +
 packages/ui/src/lib/i18n/messages/zh-TW.ts    | 1 +
 12 files changed, 12 insertions(+)

diff --git a/packages/ui/src/components/chat/ChatInput.tsx b/packages/ui/src/components/chat/ChatInput.tsx
index 1df58ebb..402ccfa0 100644
--- a/packages/ui/src/components/chat/ChatInput.tsx
+++ b/packages/ui/src/components/chat/ChatInput.tsx
@@ -1002,6 +1002,7 @@ const ChatInputComponent: React.FC<ChatInputProps> = ({ onOpenSettings, scrollTo
 
         if (!providerIdToSend || !modelIdToSend) {
             console.warn('Cannot send message: provider or model not selected');
+            toast.error(t('chat.chatInput.toast.noModelSelected'));
             return;
         }
 
diff --git a/packages/ui/src/lib/i18n/messages/de.ts b/packages/ui/src/lib/i18n/messages/de.ts
index fbb8a6cb..ab06c3d5 100644
--- a/packages/ui/src/lib/i18n/messages/de.ts
+++ b/packages/ui/src/lib/i18n/messages/de.ts
@@ -2032,6 +2032,7 @@ export const dict = {
   'chat.chatInput.toast.attachmentsTooLarge': 'Anhänge sind zu groß zum Senden. Bitte versuche, die Anzahl oder Größe der Bilder zu reduzieren.',
   'chat.chatInput.toast.sendAttachmentsFailed': 'Fehler beim Senden der Anhänge. Versuche weniger Dateien oder kleinere Bilder.',
   'chat.chatInput.toast.messageSendFailed': 'Nachricht konnte nicht gesendet werden. Anhänge wurden wiederhergestellt.',
+  'chat.chatInput.toast.noModelSelected': 'Wähle vor dem Senden einen Anbieter und ein Modell aus.',
   'chat.chatInput.toast.clipboardAttachFailed': 'Fehler beim Anhängen des Bildes aus der Zwischenablage',
   'chat.chatInput.toast.addedFileMentions': '{count} Datei(er) hinzugefügt',
   'chat.chatInput.toast.attachFileFailed': 'Fehler beim Anhängen der Datei',
diff --git a/packages/ui/src/lib/i18n/messages/en.ts b/packages/ui/src/lib/i18n/messages/en.ts
index 52e6c94d..a68a6a28 100644
--- a/packages/ui/src/lib/i18n/messages/en.ts
+++ b/packages/ui/src/lib/i18n/messages/en.ts
@@ -2204,6 +2204,7 @@ export const dict = {
   'chat.chatInput.toast.attachmentsTooLarge': 'Attachments are too large to send. Please try reducing the number or size of images.',
   'chat.chatInput.toast.sendAttachmentsFailed': 'Failed to send attachments. Try fewer files or smaller images.',
   'chat.chatInput.toast.messageSendFailed': 'Message failed to send. Attachments restored.',
+  'chat.chatInput.toast.noModelSelected': 'Select a provider and model before sending.',
   'chat.chatInput.toast.clipboardAttachFailed': 'Failed to attach image from clipboard',
   'chat.chatInput.toast.addedFileMentions': 'Added {count} file mention(s)',
   'chat.chatInput.toast.attachFileFailed': 'Failed to attach file',
diff --git a/packages/ui/src/lib/i18n/messages/es.ts b/packages/ui/src/lib/i18n/messages/es.ts
index 52e3b35f..d361b922 100644
--- a/packages/ui/src/lib/i18n/messages/es.ts
+++ b/packages/ui/src/lib/i18n/messages/es.ts
@@ -2170,6 +2170,7 @@ export const dict: Record<I18nKey, string> = {
   "chat.chatInput.toast.attachmentsTooLarge": "Los adjuntos son demasiado grandes para enviar. Intenta reducir la cantidad o el tamaño de las imágenes.",
   "chat.chatInput.toast.sendAttachmentsFailed": "No se pudieron enviar los adjuntos. Intenta con menos archivos o imágenes más pequeñas.",
   "chat.chatInput.toast.messageSendFailed": "El mensaje no se pudo enviar. Los adjuntos se restauraron.",
+  "chat.chatInput.toast.noModelSelected": "Selecciona un proveedor y un modelo antes de enviar.",
   "chat.chatInput.toast.clipboardAttachFailed": "No se pudo adjuntar la imagen desde el portapapeles",
   "chat.chatInput.toast.addedFileMentions": "Se añadieron {count} mención(es) de archivo",
   "chat.chatInput.toast.attachFileFailed": "No se pudo adjuntar el archivo",
diff --git a/packages/ui/src/lib/i18n/messages/fr.ts b/packages/ui/src/lib/i18n/messages/fr.ts
index 9aed071b..0f06bcf6 100644
--- a/packages/ui/src/lib/i18n/messages/fr.ts
+++ b/packages/ui/src/lib/i18n/messages/fr.ts
@@ -1918,6 +1918,7 @@ export const dict = {
   'chat.chatInput.toast.attachmentsTooLarge': 'Les pièces jointes sont trop volumineuses pour être envoyées. Veuillez essayer de réduire le nombre ou la taille des images.',
   'chat.chatInput.toast.sendAttachmentsFailed': 'Échec de l\'envoi des pièces jointes. Essayez moins de fichiers ou des images plus petites.',
   'chat.chatInput.toast.messageSendFailed': 'Le message n\'a pas pu être envoyé. Pièces jointes restaurées.',
+  'chat.chatInput.toast.noModelSelected': 'Sélectionnez un fournisseur et un modèle avant d\'envoyer.',
   'chat.chatInput.toast.clipboardAttachFailed': 'Échec de la pièce jointe de l\'image du presse-papiers',
   'chat.chatInput.toast.addedFileMentions': 'Ajout des mentions du fichier {count}',
   'chat.chatInput.toast.attachFileFailed': 'Impossible de joindre le fichier',
diff --git a/packages/ui/src/lib/i18n/messages/ja.ts b/packages/ui/src/lib/i18n/messages/ja.ts
index 1d4959f7..3edaf39a 100644
--- a/packages/ui/src/lib/i18n/messages/ja.ts
+++ b/packages/ui/src/lib/i18n/messages/ja.ts
@@ -2200,6 +2200,7 @@ export const dict: Record<I18nKey, string> = {
   'chat.chatInput.toast.attachmentsTooLarge': '添付ファイルが大きすぎて送信できません。画像の数またはサイズを減らしてください。',
   'chat.chatInput.toast.sendAttachmentsFailed': '添付ファイルの送信に失敗しました。ファイルを減らすかサイズを小さくしてください。',
   'chat.chatInput.toast.messageSendFailed': 'メッセージの送信に失敗しました。添付ファイルは復元されました。',
+  'chat.chatInput.toast.noModelSelected': '送信する前にプロバイダーとモデルを選択してください。',
   'chat.chatInput.toast.clipboardAttachFailed': 'クリップボードからの画像添付に失敗しました',
   'chat.chatInput.toast.addedFileMentions': '{count}件のファイルメンションを追加しました',
   'chat.chatInput.toast.attachFileFailed': 'ファイルの添付に失敗しました',
diff --git a/packages/ui/src/lib/i18n/messages/ko.ts b/packages/ui/src/lib/i18n/messages/ko.ts
index 52449bc8..d55a0657 100644
--- a/packages/ui/src/lib/i18n/messages/ko.ts
+++ b/packages/ui/src/lib/i18n/messages/ko.ts
@@ -2204,6 +2204,7 @@ export const dict: Record<I18nKey, string> = {
   'chat.chatInput.toast.attachmentsTooLarge': '첨부 파일이 너무 커서 보낼 수 없습니다. 이미지 수나 크기를 줄여 보세요.',
   'chat.chatInput.toast.sendAttachmentsFailed': '첨부 파일 전송 실패. 파일 수나 이미지 크기를 줄여 보세요.',
   'chat.chatInput.toast.messageSendFailed': '메시지 전송에 실패했습니다. 첨부 파일을 복원했습니다.',
+  'chat.chatInput.toast.noModelSelected': '전송하기 전에 제공업체와 모델을 선택하세요.',
   'chat.chatInput.toast.clipboardAttachFailed': '클립보드 이미지 첨부 실패',
   'chat.chatInput.toast.addedFileMentions': '파일 멘션 {count}개 추가됨',
   'chat.chatInput.toast.attachFileFailed': '첨부 파일 실패',
diff --git a/packages/ui/src/lib/i18n/messages/pl.ts b/packages/ui/src/lib/i18n/messages/pl.ts
index b903014d..b6d66c4a 100644
--- a/packages/ui/src/lib/i18n/messages/pl.ts
+++ b/packages/ui/src/lib/i18n/messages/pl.ts
@@ -1239,6 +1239,7 @@ export const dict: Record<I18nKey, string> = {
   'chat.chatInput.toast.clipboardAttachFailed': 'Nie udało się dołączyć obrazu ze schowka',
   'chat.chatInput.toast.compactFailed': 'Nie udało się skompaktować sesji',
   'chat.chatInput.toast.messageSendFailed': 'Nie udało się wysłać wiadomości. Załączniki zostały przywrócone.',
+  'chat.chatInput.toast.noModelSelected': 'Wybierz dostawcę i model przed wysłaniem.',
   'chat.chatInput.toast.openSessionFirst': 'Najpierw otwórz sesję',
   'chat.chatInput.toast.reviewFailed': 'Nie udało się przejrzeć zmian',
   'chat.chatInput.toast.planFeatureFailed': 'Nie udało się rozpocząć planowania funkcji',
diff --git a/packages/ui/src/lib/i18n/messages/pt-BR.ts b/packages/ui/src/lib/i18n/messages/pt-BR.ts
index 500cc98b..bf2729a2 100644
--- a/packages/ui/src/lib/i18n/messages/pt-BR.ts
+++ b/packages/ui/src/lib/i18n/messages/pt-BR.ts
@@ -2170,6 +2170,7 @@ export const dict: Record<I18nKey, string> = {
   "chat.chatInput.toast.attachmentsTooLarge": "Os anexos são grandes demais para enviar. Tente reduzir a quantidade ou o tamanho das imagens.",
   "chat.chatInput.toast.sendAttachmentsFailed": "Não foi possível enviar os anexos. Tente com menos arquivos ou imagens menores.",
   "chat.chatInput.toast.messageSendFailed": "A mensagem não pôde ser enviada. Os anexos foram restaurados.",
+  "chat.chatInput.toast.noModelSelected": "Selecione um provedor e um modelo antes de enviar.",
   "chat.chatInput.toast.clipboardAttachFailed": "Não foi possível anexar a imagem da área de transferência",
   "chat.chatInput.toast.addedFileMentions": "Foram adicionadas {count} menção(es) de arquivo",
   "chat.chatInput.toast.attachFileFailed": "Não foi possível anexar o arquivo",
diff --git a/packages/ui/src/lib/i18n/messages/uk.ts b/packages/ui/src/lib/i18n/messages/uk.ts
index fa1496f5..839c0f1f 100644
--- a/packages/ui/src/lib/i18n/messages/uk.ts
+++ b/packages/ui/src/lib/i18n/messages/uk.ts
@@ -2170,6 +2170,7 @@ export const dict: Record<I18nKey, string> = {
   "chat.chatInput.toast.attachmentsTooLarge": "Вкладені файли завеликі для надсилання. Спробуйте зменшити кількість або розмір зображень.",
   "chat.chatInput.toast.sendAttachmentsFailed": "Не вдалося надіслати вкладення. Спробуйте зменшити кількість файлів або зображень.",
   "chat.chatInput.toast.messageSendFailed": "Не вдалося надіслати повідомлення. Вкладення відновлено.",
+  "chat.chatInput.toast.noModelSelected": "Виберіть постачальника та модель перед надсиланням.",
   "chat.chatInput.toast.clipboardAttachFailed": "Не вдалося вкласти зображення з буфера обміну",
   "chat.chatInput.toast.addedFileMentions": "Додано згадки файлів {count}",
   "chat.chatInput.toast.attachFileFailed": "Не вдалося прикріпити файл",
diff --git a/packages/ui/src/lib/i18n/messages/zh-CN.ts b/packages/ui/src/lib/i18n/messages/zh-CN.ts
index 2b670e97..1a330deb 100644
--- a/packages/ui/src/lib/i18n/messages/zh-CN.ts
+++ b/packages/ui/src/lib/i18n/messages/zh-CN.ts
@@ -2170,6 +2170,7 @@ export const dict: Record<I18nKey, string> = {
   'chat.chatInput.toast.attachmentsTooLarge': '附件过大，无法发送。请减少图片数量或大小。',
   'chat.chatInput.toast.sendAttachmentsFailed': '发送附件失败。请尝试更少文件或更小图片。',
   'chat.chatInput.toast.messageSendFailed': '消息发送失败，附件已恢复。',
+  'chat.chatInput.toast.noModelSelected': '发送前请先选择提供商和模型。',
   'chat.chatInput.toast.clipboardAttachFailed': '从剪贴板附加图片失败',
   'chat.chatInput.toast.addedFileMentions': '已添加 {count} 个文件提及',
   'chat.chatInput.toast.attachFileFailed': '附加文件失败',
diff --git a/packages/ui/src/lib/i18n/messages/zh-TW.ts b/packages/ui/src/lib/i18n/messages/zh-TW.ts
index 313d59ed..80867470 100644
--- a/packages/ui/src/lib/i18n/messages/zh-TW.ts
+++ b/packages/ui/src/lib/i18n/messages/zh-TW.ts
@@ -2174,6 +2174,7 @@ export const dict: Record<I18nKey, string> = {
   'chat.chatInput.toast.attachmentsTooLarge': '附件過大，無法傳送。請減少圖片數量或大小。',
   'chat.chatInput.toast.sendAttachmentsFailed': '傳送附件失敗。請嘗試更少檔案或更小圖片。',
   'chat.chatInput.toast.messageSendFailed': '訊息傳送失敗，附件已恢復。',
+  'chat.chatInput.toast.noModelSelected': '傳送前請先選擇提供者與模型。',
   'chat.chatInput.toast.clipboardAttachFailed': '從剪貼簿附加圖片失敗',
   'chat.chatInput.toast.addedFileMentions': '已加入 {count} 個檔案提及',
   'chat.chatInput.toast.attachFileFailed': '附加檔案失敗',

From 3feacad69bc3e91c0c8bf8c566713aa1da4ccad5 Mon Sep 17 00:00:00 2001
From: bashrusakh <bashrusakh@users.noreply.github.com>
Date: Wed, 19 Aug 2026 10:38:53 +1100
Subject: [PATCH 13/22] fix(server): keep env-provided OPENCODE_BINARY when
 settings clear the override

---
 CHANGELOG.md                                  |  1 +
 .../web/server/lib/opencode/env-runtime.js    |  8 ++++-
 .../server/lib/opencode/env-runtime.test.js   | 33 +++++++++++++++++++
 3 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6c9a9353..3958c0c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,7 @@ All notable changes to this project will be documented in this file.
 - Desktop: browser pages served from a self-signed loopback HTTPS address now load instead of being blocked by the certificate warning.
 - Browser: typing a comment on a page no longer triggers app shortcuts.
 - Skills Catalog: the source is now named ClawHub instead of "ClawdHub" (thanks to @makeittech).
+- Settings: an explicitly set `OPENCODE_BINARY` environment variable is no longer discarded when settings contain an empty opencodeBinary value; the environment variable keeps pointing the managed OpenCode server at the binary you chose.
 
 ## [1.18.4] - 2026-08-14
 
diff --git a/packages/web/server/lib/opencode/env-runtime.js b/packages/web/server/lib/opencode/env-runtime.js
index 23950d63..003c97f4 100644
--- a/packages/web/server/lib/opencode/env-runtime.js
+++ b/packages/web/server/lib/opencode/env-runtime.js
@@ -1011,7 +1011,13 @@ export const createOpenCodeEnvRuntime = (deps) => {
       const normalized = normalizeOpencodeBinarySetting(settings.opencodeBinary);
 
       if (normalized === '') {
-        delete process.env.OPENCODE_BINARY;
+        // The empty-string sentinel drops a previously APPLIED settings
+        // override (source === 'settings'). An OPENCODE_BINARY provided by
+        // the user's own environment is explicit configuration and must not
+        // be destroyed by an empty setting.
+        if (state.resolvedOpencodeBinarySource === 'settings') {
+          delete process.env.OPENCODE_BINARY;
+        }
         state.resolvedOpencodeBinary = null;
         state.resolvedOpencodeBinarySource = null;
         clearWslOpencodeResolution();
diff --git a/packages/web/server/lib/opencode/env-runtime.test.js b/packages/web/server/lib/opencode/env-runtime.test.js
index 7f51f40f..d02529a4 100644
--- a/packages/web/server/lib/opencode/env-runtime.test.js
+++ b/packages/web/server/lib/opencode/env-runtime.test.js
@@ -200,6 +200,39 @@ describe('OpenCode env runtime', () => {
     expect(state.resolvedOpencodeBinarySource).toBe('settings');
   });
 
+  it('keeps an env-provided OPENCODE_BINARY when the setting is an empty-string sentinel', async () => {
+    const dir = createTempDir('openchamber-env-opencode-');
+    const binary = path.join(dir, 'opencode');
+    fs.writeFileSync(binary, '#!/bin/sh\nexit 0\n');
+    if (process.platform !== 'win32') fs.chmodSync(binary, 0o755);
+    process.env.OPENCODE_BINARY = binary;
+    const { runtime, state } = createRuntime({ opencodeBinary: '' });
+
+    await expect(runtime.applyOpencodeBinaryFromSettings()).resolves.toBeNull();
+    expect(process.env.OPENCODE_BINARY).toBe(binary);
+    expect(state.resolvedOpencodeBinary).toBeNull();
+    expect(state.resolvedOpencodeBinarySource).toBeNull();
+  });
+
+  it('drops a previously applied settings override when the setting is cleared to an empty string', async () => {
+    const dir = createTempDir('openchamber-settings-opencode-');
+    const binary = path.join(dir, 'opencode');
+    fs.writeFileSync(binary, '#!/bin/sh\nexit 0\n');
+    if (process.platform !== 'win32') fs.chmodSync(binary, 0o755);
+    const settings = { opencodeBinary: binary };
+    const { runtime, state } = createRuntime(settings);
+
+    await expect(runtime.applyOpencodeBinaryFromSettings()).resolves.toBe(binary);
+    expect(process.env.OPENCODE_BINARY).toBe(binary);
+    expect(state.resolvedOpencodeBinarySource).toBe('settings');
+
+    settings.opencodeBinary = '';
+    await expect(runtime.applyOpencodeBinaryFromSettings()).resolves.toBeNull();
+    expect(process.env.OPENCODE_BINARY).toBeUndefined();
+    expect(state.resolvedOpencodeBinary).toBeNull();
+    expect(state.resolvedOpencodeBinarySource).toBeNull();
+  });
+
   it('prefers the bundled CLI over a user-installed OpenCode from PATH', () => {
     const bundledDir = createTempDir('openchamber-bundled-opencode-');
     const bundledBinary = path.join(bundledDir, process.platform === 'win32' ? 'opencode.exe' : 'opencode');

From ac41d4e8c9cdf9d66431cc905dc2c48118a1815e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pascal=20Andr=C3=A9?= <pascalandr@gmail.com>
Date: Fri, 21 Aug 2026 11:57:59 +0200
Subject: [PATCH 14/22] fix(settings): persist editor font size

---
 packages/web/server/lib/opencode/settings-helpers.js   |  3 +++
 .../web/server/lib/opencode/settings-helpers.test.js   | 10 ++++++++++
 2 files changed, 13 insertions(+)

diff --git a/packages/web/server/lib/opencode/settings-helpers.js b/packages/web/server/lib/opencode/settings-helpers.js
index 5095806a..3cca764f 100644
--- a/packages/web/server/lib/opencode/settings-helpers.js
+++ b/packages/web/server/lib/opencode/settings-helpers.js
@@ -601,6 +601,9 @@ export const createSettingsHelpers = (dependencies) => {
     if (typeof candidate.terminalFontSize === 'number' && Number.isFinite(candidate.terminalFontSize)) {
       result.terminalFontSize = Math.max(9, Math.min(52, Math.round(candidate.terminalFontSize)));
     }
+    if (typeof candidate.editorFontSize === 'number' && Number.isFinite(candidate.editorFontSize)) {
+      result.editorFontSize = Math.max(9, Math.min(32, Math.round(candidate.editorFontSize)));
+    }
     if (typeof candidate.terminalShell === 'string') {
       const shell = candidate.terminalShell.trim().toLowerCase();
       if (TERMINAL_SHELL_VALUES.has(shell)) result.terminalShell = shell;
diff --git a/packages/web/server/lib/opencode/settings-helpers.test.js b/packages/web/server/lib/opencode/settings-helpers.test.js
index 543c5531..a27b6bac 100644
--- a/packages/web/server/lib/opencode/settings-helpers.test.js
+++ b/packages/web/server/lib/opencode/settings-helpers.test.js
@@ -82,6 +82,16 @@ describe('settings helpers', () => {
     expect(helpers.sanitizeSettingsUpdate({ collapsibleUserMessages: 'true' })).toEqual({});
   });
 
+  it('sanitizes and returns the persisted editor font size', () => {
+    const helpers = createTestHelpers();
+
+    expect(helpers.sanitizeSettingsUpdate({ editorFontSize: 20.6 })).toEqual({ editorFontSize: 21 });
+    expect(helpers.sanitizeSettingsUpdate({ editorFontSize: 8 })).toEqual({ editorFontSize: 9 });
+    expect(helpers.sanitizeSettingsUpdate({ editorFontSize: 33 })).toEqual({ editorFontSize: 32 });
+    expect(helpers.sanitizeSettingsUpdate({ editorFontSize: Number.NaN })).toEqual({});
+    expect(helpers.formatSettingsResponse({ editorFontSize: 20 })).toMatchObject({ editorFontSize: 20 });
+  });
+
   it('accepts messageStreamTransport as a persisted shared setting', () => {
     const helpers = createTestHelpers();
 

From cb1f961ea91ffcb341f36663544c7657afb6fc4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pascal=20Andr=C3=A9?= <pascalandr@gmail.com>
Date: Fri, 21 Aug 2026 12:00:01 +0200
Subject: [PATCH 15/22] fix(chat): handle truncated diff headers

---
 .../chat/message/parts/ToolPart.test.ts       | 25 ++++++++++++++++++-
 .../components/chat/message/toolRenderers.tsx |  2 +-
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/packages/ui/src/components/chat/message/parts/ToolPart.test.ts b/packages/ui/src/components/chat/message/parts/ToolPart.test.ts
index 2faf34c3..d0697c59 100644
--- a/packages/ui/src/components/chat/message/parts/ToolPart.test.ts
+++ b/packages/ui/src/components/chat/message/parts/ToolPart.test.ts
@@ -2,7 +2,7 @@ import { describe, expect, test } from 'bun:test';
 
 import { getStreamingOutputAppend, getToolOutput, renderTerminalOutput } from './toolOutput';
 import { readTaskTagSessionIdFromOutput } from './taskSessionIdParser';
-import { tryParseJsonOutput } from '../toolRenderers';
+import { parseDiffToUnified, tryParseJsonOutput } from '../toolRenderers';
 import { getStreamingThrottleText } from '../../hooks/useStreamingTextThrottle';
 import { getToolDescriptionFallback } from './toolRenderUtils';
 
@@ -42,6 +42,29 @@ describe('getToolOutput', () => {
     });
 });
 
+describe('parseDiffToUnified', () => {
+    test('handles a streamed diff with a bare Index header', () => {
+        expect(parseDiffToUnified('Index:')).toEqual([]);
+        expect(parseDiffToUnified('Index:\n@@ -1,1 +1,1 @@\n-old\n+new')).toEqual([
+            {
+                file: 'file',
+                oldStart: 1,
+                newStart: 1,
+                lines: [
+                    { type: 'removed', lineNumber: 1, content: 'old' },
+                    { type: 'added', lineNumber: 1, content: 'new' },
+                ],
+            },
+        ]);
+    });
+
+    test('preserves spaces when extracting the indexed filename', () => {
+        const [hunk] = parseDiffToUnified('Index: src/my file.ts\n@@ -1,1 +1,1 @@\n-old\n+new');
+
+        expect(hunk?.file).toBe('my file.ts');
+    });
+});
+
 describe('renderTerminalOutput', () => {
     test('renders carriage-return progress updates as their latest value', () => {
         expect(renderTerminalOutput('Downloading 10%\r\u001B[2KDownloading 90%')).toBe('Downloading 90%');
diff --git a/packages/ui/src/components/chat/message/toolRenderers.tsx b/packages/ui/src/components/chat/message/toolRenderers.tsx
index 3c4dd773..3a5cd403 100644
--- a/packages/ui/src/components/chat/message/toolRenderers.tsx
+++ b/packages/ui/src/components/chat/message/toolRenderers.tsx
@@ -575,7 +575,7 @@ export const parseDiffToUnified = (diffText: string): UnifiedDiffHunk[] => {
 
         if (line.startsWith('Index:') || line.startsWith('===') || line.startsWith('---') || line.startsWith('+++')) {
             if (line.startsWith('Index:')) {
-                currentFile = line.split(' ')[1].split('/').pop() || 'file';
+                currentFile = line.slice('Index:'.length).trim().split('/').pop() || 'file';
             }
             i++;
             continue;

From a498d1935d90258df055f5f3b5b8d2130c9ad835 Mon Sep 17 00:00:00 2001
From: gaojunran <nebula2021@126.com>
Date: Sat, 22 Aug 2026 11:44:23 +0800
Subject: [PATCH 16/22] fix(git): don't treat bare HEAD as a branch diff base

git switch -c / git checkout -b from the current branch record
'branch: Created from HEAD' in the reflog, but parseBranchCreationSource
only rejected 'HEAD@{...}' (detached start) and raw commit hashes. The
bare HEAD passed through, so getBranchBase returned { base: 'HEAD' }
and the branch scope computed diffs against HEAD itself, which is empty
when the service is checked out on that branch and wrong otherwise.

Treat bare HEAD like HEAD@{...}: no named source is recorded, so return
null and let the UI ask the user to pick a base.
---
 packages/web/server/lib/git/service.js      | 7 +++++--
 packages/web/server/lib/git/service.test.js | 8 ++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/packages/web/server/lib/git/service.js b/packages/web/server/lib/git/service.js
index d8e97b37..77d507be 100644
--- a/packages/web/server/lib/git/service.js
+++ b/packages/web/server/lib/git/service.js
@@ -2660,7 +2660,8 @@ const BRANCH_CREATION_SOURCE_RE = /^branch: Created from (.+)$/;
  * Parse a branch reflog (`git reflog show --format=%gs <branch>`) and return the
  * ref the branch was created from, when that source is itself a named ref.
  *
- * Returns null when the branch was created from `HEAD@{...}` or a raw commit
+ * Returns null when the branch was created from `HEAD` (bare, as `git switch -c`
+ * / `git checkout -b` without an explicit start point record) or a raw commit
  * (detached start): the original branch name is not recorded anywhere in that
  * case, and guessing a base from commit topology would be a heuristic, not an
  * answer. Callers should ask the user to pick a base instead.
@@ -2675,7 +2676,9 @@ export function parseBranchCreationSource(reflogText) {
     const match = lines[index].match(BRANCH_CREATION_SOURCE_RE);
     if (!match) continue;
     const source = match[1].trim();
-    if (!source || /^HEAD@/.test(source) || /^[0-9a-f]{7,40}$/i.test(source)) {
+    // Bare `HEAD` (`git switch -c` from the current branch) and `HEAD@{...}`
+    // (detached start) both lack a named source; a raw commit hash does too.
+    if (!source || /^HEAD(@|$)/.test(source) || /^[0-9a-f]{7,40}$/i.test(source)) {
       return null;
     }
     return source;
diff --git a/packages/web/server/lib/git/service.test.js b/packages/web/server/lib/git/service.test.js
index eb86c2ac..8875fae0 100644
--- a/packages/web/server/lib/git/service.test.js
+++ b/packages/web/server/lib/git/service.test.js
@@ -1354,6 +1354,14 @@ describe('parseBranchCreationSource', () => {
     expect(parseBranchCreationSource(reflog)).toBeNull();
   });
 
+  it('returns null when the branch was created from the current HEAD without a named source', () => {
+    // `git switch -c <branch>` / `git checkout -b <branch>` from the current
+    // branch record `branch: Created from HEAD` in the reflog (git 2.x). The
+    // source branch name is not recorded, so no base can be derived from it.
+    const reflog = 'branch: Created from HEAD';
+    expect(parseBranchCreationSource(reflog)).toBeNull();
+  });
+
   it('returns null when the branch was created from a raw commit', () => {
     const reflog = 'branch: Created from 9a3b2c1d4e5f6a7b8c9d0e1f2a3b4c5d6e7f8a9b';
     expect(parseBranchCreationSource(reflog)).toBeNull();

From d6a5192fba048a3fa44684f10a63498f525f8ee5 Mon Sep 17 00:00:00 2001
From: fitzgpt <fitzgpt@users.noreply.github.com>
Date: Mon, 24 Aug 2026 02:21:35 +0300
Subject: [PATCH 17/22] fix(server): percent-encode non-ASCII directory headers
 to OpenCode

---
 .../lib/markdown-image-grants/routes.js       |  4 +++-
 .../lib/markdown-image-grants/routes.test.js  | 14 +++++++++++
 .../server/lib/openchamber-sessions/routes.js |  5 +++-
 .../lib/openchamber-sessions/routes.test.js   | 23 +++++++++++++++++++
 4 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/packages/web/server/lib/markdown-image-grants/routes.js b/packages/web/server/lib/markdown-image-grants/routes.js
index 25b36c7d..a30c83ce 100644
--- a/packages/web/server/lib/markdown-image-grants/routes.js
+++ b/packages/web/server/lib/markdown-image-grants/routes.js
@@ -200,7 +200,9 @@ const fetchMessage = async ({ sessionId, messageId, directory, buildOpenCodeUrl,
   const response = await fetch(url, {
     headers: {
       accept: 'application/json',
-      'x-opencode-directory': directory,
+      // Percent-encoded to match the SDK wire format; raw non-ASCII values
+      // are rejected by OpenCode.
+      'x-opencode-directory': encodeURIComponent(directory),
       ...getOpenCodeAuthHeaders(),
     },
     signal: AbortSignal.timeout(10_000),
diff --git a/packages/web/server/lib/markdown-image-grants/routes.test.js b/packages/web/server/lib/markdown-image-grants/routes.test.js
index d44661b2..8916fbdc 100644
--- a/packages/web/server/lib/markdown-image-grants/routes.test.js
+++ b/packages/web/server/lib/markdown-image-grants/routes.test.js
@@ -74,6 +74,20 @@ const prepare = (app, directory, sources) => request(app)
   .expect(200);
 
 describe('session image assets', () => {
+  it('percent-encodes the directory header on the message fetch', async () => {
+    const fixture = await createFixture();
+    await prepare(fixture.app, fixture.directory, ['image.png']);
+
+    expect(fixture.fetchMock).toHaveBeenCalledWith(
+      expect.any(URL),
+      expect.objectContaining({
+        headers: expect.objectContaining({
+          'x-opencode-directory': encodeURIComponent(fixture.directory),
+        }),
+      }),
+    );
+  });
+
   it('prepares workspace and OpenCode temporary images with one message fetch', async () => {
     const fixture = await createFixture({ sources: ['workspace.png'] });
     await fs.writeFile(path.join(fixture.directory, 'workspace.png'), PNG);
diff --git a/packages/web/server/lib/openchamber-sessions/routes.js b/packages/web/server/lib/openchamber-sessions/routes.js
index 7c69df0a..6c58b333 100644
--- a/packages/web/server/lib/openchamber-sessions/routes.js
+++ b/packages/web/server/lib/openchamber-sessions/routes.js
@@ -83,7 +83,10 @@ const resolveVariant = (providers, providerID, modelID, variant) => {
 const parseConfigModel = (value) => splitModel(value);
 
 const buildDirectoryHeaders = (directory) => ({
-  ...(directory ? { 'x-opencode-directory': directory } : {}),
+  // OpenCode rejects non-ASCII header values; the official SDK sends this
+  // header percent-encoded, so match that wire format (non-ASCII checkout
+  // paths such as "Masaüstü" otherwise fail every dispatched prompt).
+  ...(directory ? { 'x-opencode-directory': encodeURIComponent(directory) } : {}),
 });
 
 const fetchJson = async (url, authHeaders, fallback, directory) => {
diff --git a/packages/web/server/lib/openchamber-sessions/routes.test.js b/packages/web/server/lib/openchamber-sessions/routes.test.js
index 3f6fbe5b..c95fd6e2 100644
--- a/packages/web/server/lib/openchamber-sessions/routes.test.js
+++ b/packages/web/server/lib/openchamber-sessions/routes.test.js
@@ -161,6 +161,29 @@ describe('openchamber session routes', () => {
     }
   });
 
+  it('percent-encodes the directory header for non-ASCII checkout paths', async () => {
+    const originalFetch = globalThis.fetch;
+    globalThis.fetch = vi.fn(async () => ({ ok: true, json: async () => ({ id: 'ses_123' }) }));
+    try {
+      const { app } = createApp();
+      await request(app)
+        .post('/api/openchamber/sessions')
+        .send({ directory: '/home/user/Masaüstü/projeler', title: 'Side task' })
+        .expect(200);
+
+      expect(globalThis.fetch).toHaveBeenCalledWith(
+        expect.any(String),
+        expect.objectContaining({
+          headers: expect.objectContaining({
+            'x-opencode-directory': encodeURIComponent('/home/user/Masaüstü/projeler'),
+          }),
+        }),
+      );
+    } finally {
+      globalThis.fetch = originalFetch;
+    }
+  });
+
   it('parses JSON body without global middleware', async () => {
     const originalFetch = globalThis.fetch;
     globalThis.fetch = vi.fn(async () => ({ ok: true, json: async () => ({ id: 'ses_123' }) }));

From 89cfbd1b9ae120d111d2294e48294aaf2094b06f Mon Sep 17 00:00:00 2001
From: fitzgpt <fitzgpt@users.noreply.github.com>
Date: Mon, 24 Aug 2026 16:22:58 +0300
Subject: [PATCH 18/22] docs(server): note the encoded directory header in
 markdown image grants

---
 .../web/server/lib/markdown-image-grants/DOCUMENTATION.md     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/web/server/lib/markdown-image-grants/DOCUMENTATION.md b/packages/web/server/lib/markdown-image-grants/DOCUMENTATION.md
index 1b2a390d..845d2fce 100644
--- a/packages/web/server/lib/markdown-image-grants/DOCUMENTATION.md
+++ b/packages/web/server/lib/markdown-image-grants/DOCUMENTATION.md
@@ -34,3 +34,7 @@ server implementation. VS Code does not call this route for workspace images;
 those use its local filesystem bridge. If called, the grant route returns an
 explicit unsupported response because OpenCode temporary images are not
 supported there.
+
+Requests to OpenCode carry the directory in a percent-encoded
+`x-opencode-directory` header, matching the SDK wire format; OpenCode rejects
+raw non-ASCII header values.

From 61741e58c4ee9480a418bfbc76c0637e9f260827 Mon Sep 17 00:00:00 2001
From: Ayoub Achour <medayoubachour69@gmail.com>
Date: Thu, 27 Aug 2026 04:10:09 +0100
Subject: [PATCH 19/22] fix(tunnels): update cloudflared download link

---
 CHANGELOG.md                                             | 2 ++
 .../components/sections/openchamber/TunnelSettings.tsx   | 2 +-
 packages/web/server/lib/cloudflare-tunnel.js             | 2 +-
 packages/web/server/lib/tunnels/install-help.js          | 4 ++--
 packages/web/server/lib/tunnels/install-help.test.js     | 9 +++++++++
 5 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a743d8b3..7a909e5a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+- Settings: fixed the Cloudflare Tunnel download link shown when cloudflared is not installed (thanks to @AyoubAchour).
+
 ## [1.21.0] - 2026-08-26
 
 - **Chat scrolling rebuilt around your message.** Sending parks your message near the top and the reply streams in below it, gliding smoothly a paragraph at a time. Scrolling up immediately hands you the wheel; the scroll-to-bottom pill carries the model's working status while you're away.
diff --git a/packages/ui/src/components/sections/openchamber/TunnelSettings.tsx b/packages/ui/src/components/sections/openchamber/TunnelSettings.tsx
index e03855d6..7294a1f4 100644
--- a/packages/ui/src/components/sections/openchamber/TunnelSettings.tsx
+++ b/packages/ui/src/components/sections/openchamber/TunnelSettings.tsx
@@ -205,7 +205,7 @@ const getFallbackInstallCommand = (provider: string, platform = getClientInstall
   if (platform === 'darwin') {
     return 'brew install cloudflared';
   }
-  return 'https://developers.cloudflare.com/cloudflare-one/networks/connectors/cloudflared/downloads/';
+  return 'https://developers.cloudflare.com/cloudflare-one/networks/connectors/cloudflare-tunnel/downloads/';
 };
 
 const createTunnelDependencyInstallInfo = (provider: string, checkData?: TunnelCheckResponse): TunnelDependencyInstallInfo => {
diff --git a/packages/web/server/lib/cloudflare-tunnel.js b/packages/web/server/lib/cloudflare-tunnel.js
index 8d1e81af..a4f2460c 100644
--- a/packages/web/server/lib/cloudflare-tunnel.js
+++ b/packages/web/server/lib/cloudflare-tunnel.js
@@ -64,7 +64,7 @@ Install instructions for your platform:
   Windows:  winget install --id Cloudflare.cloudflared
   Linux:    Download from https://github.com/cloudflare/cloudflared/releases
 
-Or visit: https://developers.cloudflare.com/cloudflare-one/networks/connectors/cloudflared/downloads/
+Or visit: https://developers.cloudflare.com/cloudflare-one/networks/connectors/cloudflare-tunnel/downloads/
 `);
 }
 
diff --git a/packages/web/server/lib/tunnels/install-help.js b/packages/web/server/lib/tunnels/install-help.js
index e31aa696..7890ebfa 100644
--- a/packages/web/server/lib/tunnels/install-help.js
+++ b/packages/web/server/lib/tunnels/install-help.js
@@ -6,11 +6,11 @@ import {
 const PROVIDER_INSTALL_INFO = {
   [TUNNEL_PROVIDER_CLOUDFLARE]: {
     dependency: 'cloudflared',
-    installUrl: 'https://developers.cloudflare.com/cloudflare-one/networks/connectors/cloudflared/downloads/',
+    installUrl: 'https://developers.cloudflare.com/cloudflare-one/networks/connectors/cloudflare-tunnel/downloads/',
     commands: {
       darwin: 'brew install cloudflared',
       win32: 'winget install --id Cloudflare.cloudflared',
-      linux: 'Download cloudflared from https://developers.cloudflare.com/cloudflare-one/networks/connectors/cloudflared/downloads/',
+      linux: 'Download cloudflared from https://developers.cloudflare.com/cloudflare-one/networks/connectors/cloudflare-tunnel/downloads/',
     },
   },
   [TUNNEL_PROVIDER_NGROK]: {
diff --git a/packages/web/server/lib/tunnels/install-help.test.js b/packages/web/server/lib/tunnels/install-help.test.js
index 0bea9142..021c38e9 100644
--- a/packages/web/server/lib/tunnels/install-help.test.js
+++ b/packages/web/server/lib/tunnels/install-help.test.js
@@ -28,4 +28,13 @@ describe('getTunnelDependencyInstallInfo', () => {
 
     expect(info.installCommand).toBe('brew install cloudflared');
   });
+
+  it('returns the current Linux cloudflared download guidance', () => {
+    const info = getTunnelDependencyInstallInfo(TUNNEL_PROVIDER_CLOUDFLARE, 'linux');
+    const downloadUrl = 'https://developers.cloudflare.com/cloudflare-one/networks/connectors/cloudflare-tunnel/downloads/';
+
+    expect(info.installUrl).toBe(downloadUrl);
+    expect(info.installCommand).toBe(`Download cloudflared from ${downloadUrl}`);
+    expect(info.message).toContain(downloadUrl);
+  });
 });

From 7aae5a6634f0973f29eacf97ee1bb4f5febac13c Mon Sep 17 00:00:00 2001
From: ChangeHow <23733347+ChangeHow@users.noreply.github.com>
Date: Fri, 28 Aug 2026 00:37:49 +0800
Subject: [PATCH 20/22] fix: preserve Markdown blocks when copying messages
 (#2944)

* fix: preserve Markdown blocks when copying messages

* fix: preserve blank lines when copying code

---------

Co-authored-by: Iuliia Ivashko <yulia.ivashko@gmail.com>
---
 .../ui/src/components/chat/ChatMessage.tsx    |  37 +-----
 .../src/components/chat/markdown/decorate.ts  |  71 +++++++++-
 packages/ui/src/index.css                     |   4 +
 packages/ui/src/lib/clipboard.test.ts         |  51 ++++++++
 .../ui/src/lib/messages/messageText.test.ts   | 122 ++++++++++++++++++
 packages/ui/src/lib/messages/messageText.ts   |  33 ++++-
 6 files changed, 277 insertions(+), 41 deletions(-)
 create mode 100644 packages/ui/src/lib/messages/messageText.test.ts

diff --git a/packages/ui/src/components/chat/ChatMessage.tsx b/packages/ui/src/components/chat/ChatMessage.tsx
index 20a86cde..8144b0a9 100644
--- a/packages/ui/src/components/chat/ChatMessage.tsx
+++ b/packages/ui/src/components/chat/ChatMessage.tsx
@@ -21,7 +21,7 @@ import { deriveMessageRole } from './message/messageRole';
 import { filterVisibleParts, normalizeParts } from './message/partUtils';
 import { normalizeUserDisplayParts } from './message/normalizeUserDisplayParts';
 import { isHiddenUserMessage } from './message/hiddenUserMessage';
-import { flattenAssistantTextParts } from '@/lib/messages/messageText';
+import { flattenAssistantTextParts, flattenUserTextParts } from '@/lib/messages/messageText';
 import { isLikelyProviderAuthFailure, PROVIDER_AUTH_FAILURE_MESSAGE } from '@/lib/messages/providerAuthError';
 import { getProviderModelDisplayName } from '@/lib/modelDisplay';
 import { lazyWithChunkRecovery } from '@/lib/chunkLoadRecovery';
@@ -702,40 +702,7 @@ const ChatMessage: React.FC<ChatMessageProps> = ({
 
     const messageTextContent = React.useMemo(() => {
         if (isUser) {
-            const shellOutputs = displayParts
-                .filter((part): part is Part & { type: 'text'; shellAction?: { output?: unknown } } => part.type === 'text')
-                .map((part) => {
-                    const output = part.shellAction?.output;
-                    return typeof output === 'string' ? output.trim() : '';
-                })
-                .filter((output) => output.length > 0);
-
-            if (shellOutputs.length > 0) {
-                return shellOutputs.join('\n\n');
-            }
-
-            const shellCommands = displayParts
-                .filter((part): part is Part & { type: 'text'; shellAction?: { command?: unknown } } => part.type === 'text')
-                .map((part) => {
-                    const command = part.shellAction?.command;
-                    return typeof command === 'string' ? command.trim() : '';
-                })
-                .filter((command) => command.length > 0);
-
-            if (shellCommands.length > 0) {
-                return shellCommands.join('\n');
-            }
-
-            const textParts = displayParts
-                .filter((part): part is Part & { type: 'text'; text?: string; content?: string } => part.type === 'text')
-                .map((part) => {
-                    const text = part.text || part.content || '';
-                    return text.trim();
-                })
-                .filter((text) => text.length > 0);
-
-            const combined = textParts.join('\n');
-            return combined.replace(/\n\s*\n+/g, '\n');
+            return flattenUserTextParts(displayParts);
         }
 
         if (assistantErrorText && assistantErrorText.trim().length > 0) {
diff --git a/packages/ui/src/components/chat/markdown/decorate.ts b/packages/ui/src/components/chat/markdown/decorate.ts
index 8981ebce..1ab6a6bd 100644
--- a/packages/ui/src/components/chat/markdown/decorate.ts
+++ b/packages/ui/src/components/chat/markdown/decorate.ts
@@ -156,9 +156,8 @@ const layoutCodeLines = (pre: HTMLPreElement): void => {
     row.setAttribute('data-md-code-line', '');
 
     const number = document.createElement('span');
-    number.setAttribute('data-md-code-line-number', '');
+    number.setAttribute('data-md-code-line-number', String(index + 1));
     number.setAttribute('aria-hidden', 'true');
-    number.textContent = String(index + 1);
 
     const content = document.createElement('span');
     content.setAttribute('data-md-code-line-content', '');
@@ -168,7 +167,6 @@ const layoutCodeLines = (pre: HTMLPreElement): void => {
     } else {
       content.textContent = sourceLine;
     }
-
     row.append(number, content);
     fragment.appendChild(row);
     if (index < sourceLines.length - 1 || hasTrailingNewline) {
@@ -543,6 +541,67 @@ const closeAllMenus = (container: HTMLElement): void => {
   }
 };
 
+const getContainingMarkdownCode = (node: Node): HTMLElement | null => {
+  const element = node.nodeType === 1 ? node as Element : node.parentElement;
+  return element?.closest<HTMLElement>('pre code[data-md-code-lines]') ?? null;
+};
+
+const getMarkdownCodeSelectionText = (range: Range): string | null => {
+  const code = getContainingMarkdownCode(range.startContainer);
+  if (!code || code !== getContainingMarkdownCode(range.endContainer)) return null;
+  // Line numbers are CSS-generated, so the DOM range is already the exact
+  // source selection, including boundaries between rows and empty lines.
+  return range.toString();
+};
+
+type MarkdownCopyState = {
+  registrations: number;
+  handler: (event: ClipboardEvent) => void;
+  menuHandler: (event: Event) => void;
+};
+
+const markdownCopyStates = new WeakMap<Document, MarkdownCopyState>();
+
+const registerMarkdownCodeCopy = (doc: Document): (() => void) => {
+  let state = markdownCopyStates.get(doc);
+  if (!state) {
+    const getSelectedText = (): string | null => {
+      const selection = doc.getSelection();
+      if (!selection || selection.rangeCount !== 1 || selection.isCollapsed) return null;
+      return getMarkdownCodeSelectionText(selection.getRangeAt(0));
+    };
+    const handler = (event: ClipboardEvent) => {
+      if (!event.clipboardData) return;
+      const text = getSelectedText();
+      if (text === null) return;
+      event.preventDefault();
+      event.stopPropagation();
+      event.clipboardData.setData('text/plain', text);
+    };
+    const menuHandler = (event: Event) => {
+      const text = getSelectedText();
+      if (text === null) return;
+      event.preventDefault();
+      void copyTextToClipboard(text);
+    };
+    state = { registrations: 0, handler, menuHandler };
+    markdownCopyStates.set(doc, state);
+    doc.addEventListener('copy', handler, true);
+    doc.defaultView?.addEventListener('openchamber:copy', menuHandler);
+  }
+  state.registrations += 1;
+
+  return () => {
+    const current = markdownCopyStates.get(doc);
+    if (!current) return;
+    current.registrations -= 1;
+    if (current.registrations > 0) return;
+    doc.removeEventListener('copy', current.handler, true);
+    doc.defaultView?.removeEventListener('openchamber:copy', current.menuHandler);
+    markdownCopyStates.delete(doc);
+  };
+};
+
 /**
  * Attach a single delegated click listener for all in-markdown actions: code
  * copy, table copy/download menus, mermaid copy/download, loopback preview.
@@ -552,6 +611,7 @@ export const attachMarkdownInteractions = (
   container: HTMLElement,
   ctx: DecorateContext,
 ): (() => void) => {
+  const unregisterCodeCopy = registerMarkdownCodeCopy(container.ownerDocument);
   const handleClick = (event: MouseEvent) => {
     const target = event.target;
     if (!(target instanceof Element)) return;
@@ -658,5 +718,8 @@ export const attachMarkdownInteractions = (
   };
 
   container.addEventListener('click', handleClick);
-  return () => container.removeEventListener('click', handleClick);
+  return () => {
+    unregisterCodeCopy();
+    container.removeEventListener('click', handleClick);
+  };
 };
diff --git a/packages/ui/src/index.css b/packages/ui/src/index.css
index 16d067b2..265f77be 100644
--- a/packages/ui/src/index.css
+++ b/packages/ui/src/index.css
@@ -1432,6 +1432,10 @@ html:not(.dark) .chat-scroll {
   white-space: nowrap;
 }
 
+.markdown-content [data-md-code-line-number]::before {
+  content: attr(data-md-code-line-number);
+}
+
 .markdown-content [data-md-code-line-content] {
   min-width: 0;
 }
diff --git a/packages/ui/src/lib/clipboard.test.ts b/packages/ui/src/lib/clipboard.test.ts
index db92ba5c..de395381 100644
--- a/packages/ui/src/lib/clipboard.test.ts
+++ b/packages/ui/src/lib/clipboard.test.ts
@@ -1,6 +1,9 @@
 import { afterEach, describe, expect, test } from 'bun:test';
 
+import { marked } from 'marked';
+
 import { copyMarkdownToClipboard } from './clipboard';
+import { flattenAssistantTextParts } from './messages/messageText';
 
 const originalNavigator = Object.getOwnPropertyDescriptor(globalThis, 'navigator');
 const originalClipboardItem = Object.getOwnPropertyDescriptor(globalThis, 'ClipboardItem');
@@ -84,4 +87,52 @@ describe('copyMarkdownToClipboard', () => {
     expect(result).toEqual({ ok: true, method: 'clipboard' });
     expect(fallbackText).toBe('# title');
   });
+
+  test('assistant copy payload keeps Markdown block separation in every clipboard format', async () => {
+    let writtenItem: { data: Record<string, Blob> } | undefined;
+    class FakeClipboardItem {
+      static supports(type: string): boolean {
+        return type === 'text/markdown';
+      }
+
+      readonly data: Record<string, Blob>;
+
+      constructor(data: Record<string, Blob>) {
+        this.data = data;
+      }
+    }
+
+    Object.defineProperty(globalThis, 'ClipboardItem', { configurable: true, value: FakeClipboardItem });
+    Object.defineProperty(globalThis, 'navigator', {
+      configurable: true,
+      value: {
+        clipboard: {
+          write: async (items: Array<{ data: Record<string, Blob> }>) => {
+            writtenItem = items[0];
+          },
+        },
+      },
+    });
+
+    const parts = [
+      { id: 'p0', sessionID: 's', messageID: 'm', type: 'text', text: '第一段' },
+      { id: 'p1', sessionID: 's', messageID: 'm', type: 'text', text: '第二段' },
+      { id: 'p2', sessionID: 's', messageID: 'm', type: 'text', text: '```js\nconsole.log(1)\n\n\nconsole.log(2)\n```' },
+      { id: 'p3', sessionID: 's', messageID: 'm', type: 'text', text: '第三段' },
+    ];
+
+    // Same path as ChatMessage.tsx handleCopyMessage:
+    const text = flattenAssistantTextParts(parts as Parameters<typeof flattenAssistantTextParts>[0]);
+    const html = marked.parse(text, { gfm: true, breaks: false }) as string;
+    const result = await copyMarkdownToClipboard(text, html);
+
+    const expected = '第一段\n\n第二段\n\n```js\nconsole.log(1)\n\n\nconsole.log(2)\n```\n\n第三段';
+    expect(result).toEqual({ ok: true, method: 'clipboard' });
+    expect(await writtenItem?.data['text/plain']?.text()).toBe(expected);
+    expect(await writtenItem?.data['text/markdown']?.text()).toBe(expected);
+    const htmlText = await writtenItem?.data['text/html']?.text();
+    expect(htmlText).toContain('<p>第一段</p>');
+    expect(htmlText).toContain('<p>第二段</p>');
+    expect(htmlText).not.toContain('<p>第一段\n第二段</p>');
+  });
 });
diff --git a/packages/ui/src/lib/messages/messageText.test.ts b/packages/ui/src/lib/messages/messageText.test.ts
new file mode 100644
index 00000000..f62afad1
--- /dev/null
+++ b/packages/ui/src/lib/messages/messageText.test.ts
@@ -0,0 +1,122 @@
+import { describe, expect, test } from 'bun:test';
+
+import type { Part } from '@opencode-ai/sdk/v2';
+import { flattenAssistantTextParts, flattenUserTextParts } from './messageText';
+
+// Regression tests for https://github.com/openchamber/openchamber/issues/2867
+//
+// `flattenAssistantTextParts` used to collapse every blank line into a single
+// `\n`. Markdown block structure (paragraphs, lists, fenced code blocks)
+// requires a blank line (`\n\n`); a single `\n` is a CommonMark soft break.
+// `ChatMessage.tsx`'s `handleCopyMessage` feeds the flattened string into
+// `copyMarkdownToClipboard`, which writes it to `text/plain`, `text/markdown`
+// and its markdown-rendered HTML into `text/html`.
+
+const basePart = (overrides: Record<string, unknown>): Part =>
+  ({
+    id: 'p1',
+    sessionID: 's',
+    messageID: 'm',
+    type: 'text',
+    text: '',
+    ...overrides,
+  }) as Part;
+
+const makeParts = (texts: string[]): Part[] =>
+  texts.map((text, index) => basePart({ id: `p${index}`, text }));
+
+const makeUserParts = (
+  entries: Array<{ text?: string; shellAction?: { output?: unknown; command?: unknown } }>,
+): Part[] =>
+  entries.map((entry, index) =>
+    basePart({ id: `u${index}`, text: entry.text ?? '', shellAction: entry.shellAction }),
+  );
+
+describe('flattenAssistantTextParts', () => {
+  const parts = makeParts([
+    '第一段',
+    '第二段',
+    '```js\nconsole.log(1)\n```',
+    '第三段',
+    '- item 1\n- item 2',
+  ]);
+
+  test('blank lines between paragraphs/code blocks/lists are preserved', () => {
+    expect(flattenAssistantTextParts(parts)).toBe(
+      '第一段\n\n第二段\n\n```js\nconsole.log(1)\n```\n\n第三段\n\n- item 1\n- item 2',
+    );
+  });
+
+  test('a code fence is not glued to the following paragraph', () => {
+    const flattened = flattenAssistantTextParts(parts);
+    expect(flattened).not.toContain('```\n第三段');
+    expect(flattened).toContain('```\n\n第三段');
+  });
+
+  test('list items keep single newlines inside their part', () => {
+    expect(flattenAssistantTextParts(parts)).toContain('\n\n- item 1\n- item 2');
+  });
+
+  test('internal blank-line runs are preserved', () => {
+    const text = 'a\n\n\n\nb\n \n \nd';
+    expect(flattenAssistantTextParts(makeParts([text]))).toBe(text);
+  });
+
+  test('multiple blank lines inside a fenced code block are preserved', () => {
+    const fenced = '```js\na\n\n\nb\n```';
+    expect(flattenAssistantTextParts(makeParts([fenced]))).toBe(fenced);
+  });
+
+  test('part boundaries produce block separators', () => {
+    expect(flattenAssistantTextParts(makeParts(['first', 'second']))).toBe('first\n\nsecond');
+  });
+
+  test('empty and whitespace-only parts are dropped', () => {
+    expect(flattenAssistantTextParts([])).toBe('');
+    expect(flattenAssistantTextParts(makeParts(['', '   ', '\n']))).toBe('');
+  });
+
+  test('single part without blank lines is returned unchanged', () => {
+    const single = 'only line\nsecond line';
+    expect(flattenAssistantTextParts(makeParts([single]))).toBe(single);
+  });
+
+  test('non-text parts are ignored', () => {
+    const partsWithTool: Part[] = [
+      ...makeParts(['before']),
+      { id: 't1', sessionID: 's', messageID: 'm', type: 'tool', tool: 'bash' } as Part,
+      ...makeParts(['after']),
+    ];
+    expect(flattenAssistantTextParts(partsWithTool)).toBe('before\n\nafter');
+  });
+});
+
+describe('flattenUserTextParts', () => {
+  test('plain text parts keep blank-line block separators', () => {
+    const parts = makeUserParts([{ text: '第一段\n\n\n第二段' }, { text: '下一段' }]);
+    expect(flattenUserTextParts(parts)).toBe('第一段\n\n\n第二段\n\n下一段');
+  });
+
+  test('shell outputs win over other content and are joined with blank lines', () => {
+    const parts = makeUserParts([
+      { text: 'note', shellAction: { command: 'ls -la' } },
+      { text: '', shellAction: { output: '  file-a\nfile-b  ' } },
+      { text: '', shellAction: { output: 'done' } },
+    ]);
+    expect(flattenUserTextParts(parts)).toBe('file-a\nfile-b\n\ndone');
+  });
+
+  test('shell commands fall back to a single-newline command list', () => {
+    const parts = makeUserParts([
+      { shellAction: { command: ' bun install ' } },
+      { shellAction: { command: 'bun test' } },
+      { text: 'ignored when commands exist' },
+    ]);
+    expect(flattenUserTextParts(parts)).toBe('bun install\nbun test');
+  });
+
+  test('returns empty string for parts without text', () => {
+    expect(flattenUserTextParts([])).toBe('');
+    expect(flattenUserTextParts(makeUserParts([{ text: '  ' }]))).toBe('');
+  });
+});
diff --git a/packages/ui/src/lib/messages/messageText.ts b/packages/ui/src/lib/messages/messageText.ts
index 8bca994f..30579536 100644
--- a/packages/ui/src/lib/messages/messageText.ts
+++ b/packages/ui/src/lib/messages/messageText.ts
@@ -1,6 +1,7 @@
 import type { Part } from '@opencode-ai/sdk/v2';
 
 type TextLikePart = Part & { text?: string; content?: string };
+type UserTextPart = Part & { text?: string; content?: string; shellAction?: { output?: unknown; command?: unknown } };
 
 export const flattenAssistantTextParts = (parts: Part[]): string => {
     const textParts = parts
@@ -8,8 +9,36 @@ export const flattenAssistantTextParts = (parts: Part[]): string => {
         .map((part) => (part.text || part.content || '').trim())
         .filter((text) => text.length > 0);
 
-    const combined = textParts.join('\n');
-    return combined.replace(/\n\s*\n+/g, '\n');
+    return textParts.join('\n\n');
+};
+
+export const flattenUserTextParts = (parts: Part[]): string => {
+    const textParts = parts.filter((part): part is UserTextPart => part?.type === 'text');
+
+    const shellOutputs = textParts
+        .map((part) => {
+            const output = part.shellAction?.output;
+            return typeof output === 'string' ? output.trim() : '';
+        })
+        .filter((output) => output.length > 0);
+    if (shellOutputs.length > 0) {
+        return shellOutputs.join('\n\n');
+    }
+
+    const shellCommands = textParts
+        .map((part) => {
+            const command = part.shellAction?.command;
+            return typeof command === 'string' ? command.trim() : '';
+        })
+        .filter((command) => command.length > 0);
+    if (shellCommands.length > 0) {
+        return shellCommands.join('\n');
+    }
+
+    const plainTexts = textParts
+        .map((part) => (part.text || part.content || '').trim())
+        .filter((text) => text.length > 0);
+    return plainTexts.join('\n\n');
 };
 
 export const suggestPlanTitleFromText = (text: string): string => {

From 03f4b5e3e0e8ed4292fc976cd4b9a3f93c9b7808 Mon Sep 17 00:00:00 2001
From: Bohdan Triapitsyn <artmore@protonmail.com>
Date: Thu, 27 Aug 2026 18:23:40 +0300
Subject: [PATCH 21/22] fix(ui): scope agent memory to project context owner

---
 .../components/layout/RightSidebarTabs.tsx    | 32 ++------
 .../session/project-context/DOCUMENTATION.md  | 14 +++-
 .../session/project-context/MemorySection.tsx |  4 +-
 .../project-context/ProjectNotesTodoPanel.tsx |  6 +-
 packages/ui/src/hooks/useAgentMemorySync.ts   | 17 +---
 .../src/hooks/useProjectContextOwner.test.ts  | 48 +++++++++++
 .../ui/src/hooks/useProjectContextOwner.ts    | 80 +++++++++++++++++++
 .../ui/src/stores/useAgentMemoryStore.test.ts | 38 ++++++++-
 packages/ui/src/stores/useAgentMemoryStore.ts | 29 +++++--
 9 files changed, 214 insertions(+), 54 deletions(-)
 create mode 100644 packages/ui/src/hooks/useProjectContextOwner.test.ts
 create mode 100644 packages/ui/src/hooks/useProjectContextOwner.ts

diff --git a/packages/ui/src/components/layout/RightSidebarTabs.tsx b/packages/ui/src/components/layout/RightSidebarTabs.tsx
index 8138bef1..842e4b88 100644
--- a/packages/ui/src/components/layout/RightSidebarTabs.tsx
+++ b/packages/ui/src/components/layout/RightSidebarTabs.tsx
@@ -6,46 +6,26 @@ import { useProjectsStore } from '@/stores/useProjectsStore';
 import { useDirectoryStore } from '@/stores/useDirectoryStore';
 import { formatDirectoryName } from '@/lib/utils';
 import { useSessionUIStore } from '@/sync/session-ui-store';
-import { CHAT_DRAFT_PROJECT_ID, getChatsRootForHome, getChatsRootFromDirectory, isChatDirectoryPath } from '@/lib/chatDirectories';
+import { CHAT_DRAFT_PROJECT_ID } from '@/lib/chatDirectories';
 import { useI18n } from '@/lib/i18n';
+import { useProjectContextOwner } from '@/hooks/useProjectContextOwner';
 
 export const ProjectContextPanel: React.FC<{
   onActionComplete?: () => void;
   onOpenPlan?: (plan: { id: string; title: string }) => void;
 }> = ({ onActionComplete, onOpenPlan }) => {
-  const activeProjectId = useProjectsStore((state) => state.activeProjectId);
   const projects = useProjectsStore((state) => state.projects);
   const homeDirectory = useDirectoryStore((state) => state.homeDirectory);
   const { t } = useI18n();
   const gitDirectories = useGitStore((state) => state.directories);
-  const isChatContext = useSessionUIStore((state) => (
-    state.newSessionDraft.open
-      ? state.newSessionDraft.target === 'chat'
-      : isChatDirectoryPath(state.currentSessionDirectory)
-  ));
   const chatSessionDirectory = useSessionUIStore((state) => state.currentSessionDirectory);
-  const chatsRoot = getChatsRootFromDirectory(chatSessionDirectory) ?? getChatsRootForHome(homeDirectory);
+  const projectRef = useProjectContextOwner(chatSessionDirectory);
+  const isChatContext = projectRef?.id === CHAT_DRAFT_PROJECT_ID;
 
   const activeProject = React.useMemo(() => {
     if (isChatContext) return null;
-    if (activeProjectId) {
-      return projects.find((project) => project.id === activeProjectId) ?? projects[0] ?? null;
-    }
-    return projects[0] ?? null;
-  }, [activeProjectId, isChatContext, projects]);
-
-  const projectRef = React.useMemo(() => {
-    if (isChatContext && chatsRoot) {
-      return { id: CHAT_DRAFT_PROJECT_ID, path: chatsRoot };
-    }
-    if (!activeProject) {
-      return null;
-    }
-    return {
-      id: activeProject.id,
-      path: activeProject.path,
-    };
-  }, [activeProject, chatsRoot, isChatContext]);
+    return projects.find((project) => project.id === projectRef?.id) ?? null;
+  }, [isChatContext, projectRef?.id, projects]);
 
   const projectLabel = React.useMemo(() => {
     if (isChatContext) return t('sessions.sidebar.activity.chatsTitle');
diff --git a/packages/ui/src/components/session/project-context/DOCUMENTATION.md b/packages/ui/src/components/session/project-context/DOCUMENTATION.md
index 29b41d2f..d2e010ee 100644
--- a/packages/ui/src/components/session/project-context/DOCUMENTATION.md
+++ b/packages/ui/src/components/session/project-context/DOCUMENTATION.md
@@ -106,10 +106,16 @@ its own tool. It feeds this panel only — what a session is told about memory i
 decided server-side by `packages/web/server/lib/session-knowledge`, so it
 reaches sessions that have no UI at all and survives compaction.
 
-Both sides resolve a worktree to its project before touching the store — the
-client through `resolveProjectForSessionDirectory`, the server through
-`agent-memory/project-resolution`. Keying by the session directory instead filed
-a worktree's memories under a project nothing reads.
+`useProjectContextOwner` is the client authority shared by this panel and the
+memory sync. It resolves managed chat directories to the Chats root and a
+worktree to its project before either consumer touches a store. The server uses
+`agent-memory/project-resolution` for the same worktree rule. Keying by a
+worktree session directory would file memories under a project nothing reads.
+
+Project memory is rendered only when the store's `projectPath` matches the
+panel owner. An owner switch hides the previous project's entries before the
+new request starts. A failed request marks the new owner unavailable instead of
+presenting that hidden list as authoritative empty memory.
 
 Turning the switch back on re-reads the store only after the setting has
 finished being written. The switch flips the client immediately, which makes the
diff --git a/packages/ui/src/components/session/project-context/MemorySection.tsx b/packages/ui/src/components/session/project-context/MemorySection.tsx
index 61b4ea42..f88350ef 100644
--- a/packages/ui/src/components/session/project-context/MemorySection.tsx
+++ b/packages/ui/src/components/session/project-context/MemorySection.tsx
@@ -11,7 +11,7 @@ import { useI18n } from '@/lib/i18n';
 import { AGENT_MEMORY_BODY_MAX_LENGTH, AGENT_MEMORY_TITLE_MAX_LENGTH, type AgentMemoryEntry, type AgentMemoryScope } from '@/lib/agentMemoryApi';
 import { classifyMemory, memoryViewKey, type MemoryBadge } from '@/lib/agentMemoryBadges';
 import { cn } from '@/lib/utils';
-import { useAgentMemoryStore } from '@/stores/useAgentMemoryStore';
+import { selectProjectMemoryForPath, useAgentMemoryStore } from '@/stores/useAgentMemoryStore';
 import { useUIStore } from '@/stores/useUIStore';
 
 /**
@@ -160,7 +160,7 @@ export const MemorySection: React.FC<{
   const [expandedId, setExpandedId] = React.useState<string | null>(null);
 
   const globalEntries = useAgentMemoryStore((state) => state.global);
-  const projectEntries = useAgentMemoryStore((state) => state.project);
+  const projectEntries = useAgentMemoryStore((state) => selectProjectMemoryForPath(state, projectPath));
   const globalFailed = useAgentMemoryStore((state) => state.globalFailed);
   const projectFailed = useAgentMemoryStore((state) => state.projectFailed);
   const deleteEntry = useAgentMemoryStore((state) => state.deleteEntry);
diff --git a/packages/ui/src/components/session/project-context/ProjectNotesTodoPanel.tsx b/packages/ui/src/components/session/project-context/ProjectNotesTodoPanel.tsx
index e26b70ca..72b9fd20 100644
--- a/packages/ui/src/components/session/project-context/ProjectNotesTodoPanel.tsx
+++ b/packages/ui/src/components/session/project-context/ProjectNotesTodoPanel.tsx
@@ -7,7 +7,7 @@ import { Input } from '@/components/ui/input';
 import { useI18n } from '@/lib/i18n';
 import { resolveProjectContextId, type ProjectRef, type ProjectTodoItem } from '@/lib/projectContextApi';
 import { cn } from '@/lib/utils';
-import { useAgentMemoryStore } from '@/stores/useAgentMemoryStore';
+import { selectProjectMemoryForPath, useAgentMemoryStore } from '@/stores/useAgentMemoryStore';
 import { countHighlightedMemories, memoryViewKey } from '@/lib/agentMemoryBadges';
 import { EMPTY_PROJECT_CONTEXT_ENTRY, useProjectContextStore } from '@/stores/useProjectContextStore';
 import { useUIStore } from '@/stores/useUIStore';
@@ -133,7 +133,9 @@ export const ProjectNotesTodoPanel: React.FC<ProjectNotesTodoPanelProps> = ({
   const memoryDisabledByServer = useAgentMemoryStore((state) => state.disabled);
   const memoryVisible = memoryEnabled && !memoryDisabledByServer;
   const globalMemory = useAgentMemoryStore((state) => state.global);
-  const projectMemory = useAgentMemoryStore((state) => state.project);
+  const projectMemory = useAgentMemoryStore(
+    (state) => selectProjectMemoryForPath(state, projectRef?.path ?? null),
+  );
 
   const isMobile = useUIStore((state) => state.isMobile);
   const storedTab = useUIStore((state) => state.projectContextTab);
diff --git a/packages/ui/src/hooks/useAgentMemorySync.ts b/packages/ui/src/hooks/useAgentMemorySync.ts
index 40982d1c..24abdcca 100644
--- a/packages/ui/src/hooks/useAgentMemorySync.ts
+++ b/packages/ui/src/hooks/useAgentMemorySync.ts
@@ -13,12 +13,10 @@
 
 import React from 'react';
 
-import { resolveProjectForSessionDirectory } from '@/lib/projectResolution';
 import { subscribeOpenchamberEvents } from '@/lib/openchamberEvents';
 import { useAgentMemoryStore } from '@/stores/useAgentMemoryStore';
-import { useProjectsStore } from '@/stores/useProjectsStore';
-import { useSessionUIStore } from '@/sync/session-ui-store';
 import { useUIStore } from '@/stores/useUIStore';
+import { useProjectContextOwner } from '@/hooks/useProjectContextOwner';
 
 /**
  * The directory is a parameter rather than read from `useEffectiveDirectory`,
@@ -29,18 +27,9 @@ export const useAgentMemorySync = (directory: string | null): void => {
   const enabled = useUIStore((state) => (
     state.agentMemoryFeatureAvailable && state.agentMemoryToolEnabled
   ));
-  const projects = useProjectsStore((state) => state.projects);
-  const availableWorktreesByProject = useSessionUIStore((state) => state.availableWorktreesByProject);
-  const effectiveDirectory = directory ?? '';
   const load = useAgentMemoryStore((state) => state.load);
-
-  const projectPath = React.useMemo(() => {
-    if (!effectiveDirectory) {
-      return null;
-    }
-    const resolved = resolveProjectForSessionDirectory(projects, availableWorktreesByProject, effectiveDirectory);
-    return resolved?.path ?? null;
-  }, [availableWorktreesByProject, effectiveDirectory, projects]);
+  const owner = useProjectContextOwner(directory);
+  const projectPath = owner?.path ?? null;
 
   React.useEffect(() => {
     if (!enabled) {
diff --git a/packages/ui/src/hooks/useProjectContextOwner.test.ts b/packages/ui/src/hooks/useProjectContextOwner.test.ts
new file mode 100644
index 00000000..a18ae9e1
--- /dev/null
+++ b/packages/ui/src/hooks/useProjectContextOwner.test.ts
@@ -0,0 +1,48 @@
+import { describe, expect, test } from 'bun:test';
+
+import { CHAT_DRAFT_PROJECT_ID } from '@/lib/chatDirectories';
+import { resolveProjectContextOwner } from './useProjectContextOwner';
+
+const projects = [
+  { id: 'openchamber', path: '/workspace/openchamber', label: 'OpenChamber' },
+];
+
+describe('resolveProjectContextOwner', () => {
+  test('resolves a managed chat directory to the Chats root instead of the active project', () => {
+    const owner = resolveProjectContextOwner({
+      projects,
+      worktreesByProject: new Map(),
+      directory: '/Users/test/.config/openchamber/chats/2026-08-27/session-a',
+      activeProjectId: 'openchamber',
+      chatDraftOpen: false,
+      chatDraftTarget: 'project',
+      homeDirectory: '/Users/test',
+    });
+
+    expect(owner).toEqual({
+      id: CHAT_DRAFT_PROJECT_ID,
+      path: '/Users/test/.config/openchamber/chats',
+    });
+  });
+
+  test('resolves a worktree session to its owning project', () => {
+    const owner = resolveProjectContextOwner({
+      projects,
+      worktreesByProject: new Map([
+        ['/workspace/openchamber', [{
+          path: '/workspace/openchamber-feature',
+          projectDirectory: '/workspace/openchamber',
+          branch: 'feature',
+          label: 'feature',
+        }]],
+      ]),
+      directory: '/workspace/openchamber-feature',
+      activeProjectId: null,
+      chatDraftOpen: false,
+      chatDraftTarget: 'project',
+      homeDirectory: '/Users/test',
+    });
+
+    expect(owner).toEqual({ id: 'openchamber', path: '/workspace/openchamber' });
+  });
+});
diff --git a/packages/ui/src/hooks/useProjectContextOwner.ts b/packages/ui/src/hooks/useProjectContextOwner.ts
new file mode 100644
index 00000000..4b9faac1
--- /dev/null
+++ b/packages/ui/src/hooks/useProjectContextOwner.ts
@@ -0,0 +1,80 @@
+import React from 'react';
+
+import { CHAT_DRAFT_PROJECT_ID, getChatsRootForHome, getChatsRootFromDirectory } from '@/lib/chatDirectories';
+import { normalizePath } from '@/lib/pathNormalization';
+import { resolveProjectForSessionDirectory } from '@/lib/projectResolution';
+import type { ProjectRef } from '@/lib/projectContextApi';
+import { useDirectoryStore } from '@/stores/useDirectoryStore';
+import { useProjectsStore } from '@/stores/useProjectsStore';
+import { useSessionUIStore } from '@/sync/session-ui-store';
+import type { WorktreeMetadata } from '@/types/worktree';
+import type { ProjectEntry } from '@/lib/api/types';
+
+interface ProjectContextOwnerInput {
+  projects: ProjectEntry[];
+  worktreesByProject: Map<string, WorktreeMetadata[]>;
+  directory: string | null;
+  activeProjectId: string | null;
+  chatDraftOpen: boolean;
+  chatDraftTarget: 'chat' | 'project';
+  homeDirectory: string | null;
+}
+
+export const resolveProjectContextOwner = ({
+  projects,
+  worktreesByProject,
+  directory,
+  activeProjectId,
+  chatDraftOpen,
+  chatDraftTarget,
+  homeDirectory,
+}: ProjectContextOwnerInput): ProjectRef | null => {
+  const chatsRoot = getChatsRootFromDirectory(directory) ?? getChatsRootForHome(homeDirectory);
+  const normalizedDirectory = normalizePath(directory);
+  const normalizedChatsRoot = normalizePath(chatsRoot);
+  const ownsChats = chatDraftOpen
+    ? chatDraftTarget === 'chat'
+    : Boolean(normalizedDirectory && normalizedChatsRoot && (
+      normalizedDirectory === normalizedChatsRoot || normalizedDirectory.startsWith(`${normalizedChatsRoot}/`)
+    ));
+
+  if (ownsChats && chatsRoot) {
+    return { id: CHAT_DRAFT_PROJECT_ID, path: chatsRoot };
+  }
+
+  const sessionProject = resolveProjectForSessionDirectory(projects, worktreesByProject, directory);
+  if (sessionProject) {
+    return { id: sessionProject.id, path: sessionProject.path };
+  }
+
+  const activeProject = projects.find((project) => project.id === activeProjectId) ?? projects[0] ?? null;
+  return activeProject ? { id: activeProject.id, path: activeProject.path } : null;
+};
+
+/** The single owner used by Project knowledge and agent-memory synchronization. */
+export const useProjectContextOwner = (directory: string | null): ProjectRef | null => {
+  const projects = useProjectsStore((state) => state.projects);
+  const activeProjectId = useProjectsStore((state) => state.activeProjectId);
+  const homeDirectory = useDirectoryStore((state) => state.homeDirectory);
+  const worktreesByProject = useSessionUIStore((state) => state.availableWorktreesByProject);
+  const chatDraftOpen = useSessionUIStore((state) => state.newSessionDraft.open);
+  const chatDraftTarget = useSessionUIStore((state) => state.newSessionDraft.target);
+
+  return React.useMemo(() => resolveProjectContextOwner({
+    projects,
+    worktreesByProject,
+    directory,
+    activeProjectId,
+    chatDraftOpen,
+    chatDraftTarget,
+    homeDirectory,
+  }), [
+    activeProjectId,
+    chatDraftOpen,
+    chatDraftTarget,
+    directory,
+    homeDirectory,
+    projects,
+    worktreesByProject,
+  ]);
+};
diff --git a/packages/ui/src/stores/useAgentMemoryStore.test.ts b/packages/ui/src/stores/useAgentMemoryStore.test.ts
index 54cd9e32..a0e7bd60 100644
--- a/packages/ui/src/stores/useAgentMemoryStore.test.ts
+++ b/packages/ui/src/stores/useAgentMemoryStore.test.ts
@@ -21,6 +21,10 @@ interface MemoryReadResult {
   projectFailed: boolean;
 }
 
+interface PendingMemoryRead {
+  resolve?: (result: MemoryReadResult) => void;
+}
+
 /**
  * Swappable implementations rather than mock helpers: each test states the one
  * behaviour it needs.
@@ -45,7 +49,7 @@ mock.module('@/lib/agentMemoryApi', () => ({
   },
 }));
 
-const { useAgentMemoryStore } = await import('./useAgentMemoryStore');
+const { selectProjectMemoryForPath, useAgentMemoryStore } = await import('./useAgentMemoryStore');
 
 beforeEach(() => {
   useAgentMemoryStore.getState().reset();
@@ -86,6 +90,38 @@ describe('load', () => {
     expect(state.error).toBe('offline');
   });
 
+  test("does not expose the previous project's memories under the Chats owner", async () => {
+    await useAgentMemoryStore.getState().load('/workspace/openchamber');
+
+    const pending: PendingMemoryRead = {};
+    readImpl = () => new Promise((resolve) => {
+      pending.resolve = resolve;
+    });
+    const chatsPath = '/Users/test/.config/openchamber/chats';
+    const loadingChats = useAgentMemoryStore.getState().load(chatsPath);
+
+    const switched = useAgentMemoryStore.getState();
+    expect(selectProjectMemoryForPath(switched, chatsPath)).toEqual([]);
+    expect(switched.projectPath).toBe(chatsPath);
+
+    pending.resolve?.({ global: [entry({ id: 'g1' })], project: [], globalFailed: false, projectFailed: false });
+    await loadingChats;
+
+    expect(selectProjectMemoryForPath(useAgentMemoryStore.getState(), chatsPath)).toEqual([]);
+  });
+
+  test('a failed load for a new owner stays distinct from an empty project', async () => {
+    await useAgentMemoryStore.getState().load('/workspace/openchamber');
+    readImpl = async () => { throw new Error('offline'); };
+
+    await useAgentMemoryStore.getState().load('/Users/test/.config/openchamber/chats');
+
+    const state = useAgentMemoryStore.getState();
+    expect(state.project).toEqual([]);
+    expect(state.projectFailed).toBe(true);
+    expect(state.error).toBe('offline');
+  });
+
   test('a disabled feature clears the lists rather than reporting an error', async () => {
     await useAgentMemoryStore.getState().load('/tmp/project');
     readImpl = async () => { throw new AgentMemoryDisabledError(); };
diff --git a/packages/ui/src/stores/useAgentMemoryStore.ts b/packages/ui/src/stores/useAgentMemoryStore.ts
index 188a3ef8..55bcbf73 100644
--- a/packages/ui/src/stores/useAgentMemoryStore.ts
+++ b/packages/ui/src/stores/useAgentMemoryStore.ts
@@ -57,6 +57,14 @@ const EMPTY_STATE = {
   error: null as string | null,
 };
 
+const EMPTY_MEMORY: AgentMemoryEntry[] = [];
+
+/** Never expose one owner's project entries under another owner's heading. */
+export const selectProjectMemoryForPath = (
+  state: AgentMemoryState,
+  projectPath: string | null,
+): AgentMemoryEntry[] => state.projectPath === projectPath ? state.project : EMPTY_MEMORY;
+
 /**
  * Only the newest load may write to the store. Turning the feature back on
  * fires a load before the setting has finished being written, so an older
@@ -93,13 +101,20 @@ export const useAgentMemoryStore = create<AgentMemoryState>((set, get) => ({
 
   load: async (projectPath) => {
     const requestId = ++loadSequence;
-    set({ loading: true, projectPath });
+    const previous = get();
+    const ownerChanged = previous.projectPath !== projectPath;
+    if (ownerChanged) {
+      set({ loading: true, projectPath, project: [], projectFailed: false });
+    } else {
+      set({ loading: true, projectPath });
+    }
     try {
       const snapshot = await fetchAgentMemory(projectPath);
       if (requestId !== loadSequence) return;
+      const current = get();
       set({
-        global: snapshot.global,
-        project: snapshot.project,
+        global: snapshot.globalFailed ? current.global : snapshot.global,
+        project: snapshot.projectFailed ? current.project : snapshot.project,
         projectPath,
         globalFailed: snapshot.globalFailed,
         projectFailed: snapshot.projectFailed,
@@ -119,7 +134,12 @@ export const useAgentMemoryStore = create<AgentMemoryState>((set, get) => ({
         return;
       }
       // Whatever was loaded before stays. Only the error is new.
-      set({ loading: false, error: errorMessage(error, 'Failed to load agent memory') });
+      set({
+        loading: false,
+        globalFailed: true,
+        projectFailed: true,
+        error: errorMessage(error, 'Failed to load agent memory'),
+      });
     }
   },
 
@@ -156,4 +176,3 @@ export const useAgentMemoryStore = create<AgentMemoryState>((set, get) => ({
     set({ ...EMPTY_STATE });
   },
 }));
-

From 43c4cc625fbe2d3fe3e2a02e6f032405652a04ee Mon Sep 17 00:00:00 2001
From: Bohdan Triapitsyn <artmore@protonmail.com>
Date: Thu, 27 Aug 2026 20:18:05 +0300
Subject: [PATCH 22/22] fix(ui): open saved plans against their owning project

Saved Project knowledge plans opened as an empty editor whenever the
viewer could not resolve the owning project from the current directory:
managed chats (openchamber:chats is not a registered project), worktrees
outside the repo path, and plan tabs restored after a reload. Titles
still rendered because the list reads the manifest through the correct
owner.

- Thread the owner explicitly (savedProjectPlan = { projectRef, planId })
  from the panel, mobile surfaces, and persisted context tabs; PlanView
  no longer guesses the project.
- An unrecognized directory resolves to no owner instead of borrowing
  the active project's knowledge.
- Serialize plan writes per document (planSaveQueue) so close/switch
  within the autosave debounce no longer drops the last edits, saves
  cannot land out of order, and a recovered save clears the error banner.
- Send saved-plan contents inline in Improve/Implement prompts (they
  have no file path); disable those actions for managed-chat plans,
  which have no project directory to create a session in.
- Drop persisted plan tabs that carry an id without an owner rather than
  reopening them against a guessed project.
---
 packages/ui/src/apps/MobileApp.tsx            |   5 +-
 .../ui/src/apps/MobileWorkspaceDrawer.tsx     |   3 +-
 .../ui/src/components/layout/ContextPanel.tsx |   7 +-
 .../components/layout/RightSidebarTabs.tsx    |  48 ++-
 .../session/project-context/DOCUMENTATION.md  |  12 +
 .../session/project-context/PlansSection.tsx  |  17 +-
 .../project-context/ProjectNotesTodoPanel.tsx |   9 +-
 packages/ui/src/components/views/PlanView.tsx | 334 ++++++++++++++----
 .../src/hooks/useProjectContextOwner.test.ts  |  42 +++
 .../ui/src/hooks/useProjectContextOwner.ts    |  11 +-
 packages/ui/src/lib/planSaveQueue.test.ts     | 142 ++++++++
 packages/ui/src/lib/planSaveQueue.ts          |  61 ++++
 packages/ui/src/lib/projectContextApi.ts      |  11 +
 .../stores/useUIStore.contextPanel.test.ts    | 177 ++++++++++
 packages/ui/src/stores/useUIStore.ts          |  72 +++-
 15 files changed, 826 insertions(+), 125 deletions(-)
 create mode 100644 packages/ui/src/lib/planSaveQueue.test.ts
 create mode 100644 packages/ui/src/lib/planSaveQueue.ts

diff --git a/packages/ui/src/apps/MobileApp.tsx b/packages/ui/src/apps/MobileApp.tsx
index 5c4a5079..9178e36b 100644
--- a/packages/ui/src/apps/MobileApp.tsx
+++ b/packages/ui/src/apps/MobileApp.tsx
@@ -22,6 +22,7 @@ import { useUpdatePolling } from '@/hooks/useUpdatePolling';
 import { useWindowTitle } from '@/hooks/useWindowTitle';
 import { opencodeClient } from '@/lib/opencode/client';
 import type { RuntimeAPIs } from '@/lib/api/types';
+import type { ProjectRef } from '@/lib/projectContextApi';
 import { readTabletLayout, useOrientation, useTabletLayout } from '@/lib/device';
 import { useHardwareKeyboard } from '@/lib/hardwareKeyboard';
 import { useI18n } from '@/lib/i18n';
@@ -111,7 +112,7 @@ const MobileShell: React.FC<{ onActiveConnectionDeleted: () => void }> = ({ onAc
   const [workspaceTab, setWorkspaceTab] = React.useState<MobileWorkspaceTab>('changes');
   // A plan opened from the workspace drawer's Notes tab, shown as a fullscreen
   // layer on top of it (back returns to the notes).
-  const [openPlan, setOpenPlan] = React.useState<{ id: string; title: string } | null>(null);
+  const [openPlan, setOpenPlan] = React.useState<{ id: string; title: string; projectRef: ProjectRef } | null>(null);
   const [settingsInitialMobileStage, setSettingsInitialMobileStage] = React.useState<'nav' | 'page-content'>('nav');
   // When set, the Changes surface opens directly into the per-file diff for this path.
   const [pendingChangesDiff, setPendingChangesDiff] = React.useState<{ path: string; staged: boolean } | null>(null);
@@ -542,7 +543,7 @@ const MobileShell: React.FC<{ onActiveConnectionDeleted: () => void }> = ({ onAc
           >
             <ErrorBoundary>
               <PlanView
-                projectPlanId={openPlan.id}
+                savedProjectPlan={{ projectRef: openPlan.projectRef, planId: openPlan.id }}
                 onNavigatedToChat={() => {
                   closeSurface();
                   closeWorkspace();
diff --git a/packages/ui/src/apps/MobileWorkspaceDrawer.tsx b/packages/ui/src/apps/MobileWorkspaceDrawer.tsx
index f0847aa1..40a3649a 100644
--- a/packages/ui/src/apps/MobileWorkspaceDrawer.tsx
+++ b/packages/ui/src/apps/MobileWorkspaceDrawer.tsx
@@ -9,6 +9,7 @@ import { ErrorBoundary } from '@/components/ui/ErrorBoundary';
 import { SortableTabsStrip, type SortableTabsStripItem } from '@/components/ui/sortable-tabs-strip';
 import { TerminalView } from '@/components/views/TerminalView';
 import { useI18n } from '@/lib/i18n';
+import type { ProjectRef } from '@/lib/projectContextApi';
 import { cn } from '@/lib/utils';
 import { useDirectoryStore } from '@/stores/useDirectoryStore';
 import { useMcpConfigStore } from '@/stores/useMcpConfigStore';
@@ -105,7 +106,7 @@ export const MobileWorkspaceDrawer: React.FC<{
   /** When set, the Changes tab opens directly into the per-file diff. */
   pendingChangesDiff: { path: string; staged: boolean } | null;
   /** Notes tab: opens a plan fullscreen (layered above the drawer). */
-  onOpenPlan: (plan: { id: string; title: string }) => void;
+  onOpenPlan: (plan: { id: string; title: string; projectRef: ProjectRef }) => void;
   /** MCP tab: jump to the MCP settings page pre-seeded with a new server draft. */
   onOpenMcpSettings: () => void;
   variant?: 'drawer' | 'panel';
diff --git a/packages/ui/src/components/layout/ContextPanel.tsx b/packages/ui/src/components/layout/ContextPanel.tsx
index aa52be5d..cd22371e 100644
--- a/packages/ui/src/components/layout/ContextPanel.tsx
+++ b/packages/ui/src/components/layout/ContextPanel.tsx
@@ -943,7 +943,12 @@ export const ContextPanel: React.FC = () => {
             : activeTab?.mode === 'notes'
                 ? <ProjectContextPanel />
         : activeTab?.mode === 'plan'
-            ? <React.Suspense fallback={null}><PlanView targetPath={activeTab.targetPath} projectPlanId={activeTab.projectPlanId} /></React.Suspense>
+            ? <React.Suspense fallback={null}><PlanView
+                targetPath={activeTab.targetPath}
+                savedProjectPlan={activeTab.projectPlanId && activeTab.projectPlanRef
+                  ? { projectRef: activeTab.projectPlanRef, planId: activeTab.projectPlanId }
+                  : null}
+              /></React.Suspense>
             : null;
 
   const browserTabs = React.useMemo(
diff --git a/packages/ui/src/components/layout/RightSidebarTabs.tsx b/packages/ui/src/components/layout/RightSidebarTabs.tsx
index 842e4b88..3907a341 100644
--- a/packages/ui/src/components/layout/RightSidebarTabs.tsx
+++ b/packages/ui/src/components/layout/RightSidebarTabs.tsx
@@ -6,43 +6,53 @@ import { useProjectsStore } from '@/stores/useProjectsStore';
 import { useDirectoryStore } from '@/stores/useDirectoryStore';
 import { formatDirectoryName } from '@/lib/utils';
 import { useSessionUIStore } from '@/sync/session-ui-store';
-import { CHAT_DRAFT_PROJECT_ID } from '@/lib/chatDirectories';
-import { useI18n } from '@/lib/i18n';
 import { useProjectContextOwner } from '@/hooks/useProjectContextOwner';
+import { CHAT_DRAFT_PROJECT_ID } from '@/lib/chatDirectories';
+import type { ProjectRef } from '@/lib/projectContextApi';
+import { useI18n } from '@/lib/i18n';
 
 export const ProjectContextPanel: React.FC<{
   onActionComplete?: () => void;
-  onOpenPlan?: (plan: { id: string; title: string }) => void;
+  onOpenPlan?: (plan: { id: string; title: string; projectRef: ProjectRef }) => void;
 }> = ({ onActionComplete, onOpenPlan }) => {
-  const projects = useProjectsStore((state) => state.projects);
   const homeDirectory = useDirectoryStore((state) => state.homeDirectory);
   const { t } = useI18n();
   const gitDirectories = useGitStore((state) => state.directories);
   const chatSessionDirectory = useSessionUIStore((state) => state.currentSessionDirectory);
-  const projectRef = useProjectContextOwner(chatSessionDirectory);
-  const isChatContext = projectRef?.id === CHAT_DRAFT_PROJECT_ID;
 
-  const activeProject = React.useMemo(() => {
-    if (isChatContext) return null;
-    return projects.find((project) => project.id === projectRef?.id) ?? null;
-  }, [isChatContext, projectRef?.id, projects]);
+  // One owner decision shared with the panel, agent memory, and PlanView:
+  // chats resolve to the Chats owner, worktrees to their project, and an
+  // unrecognized directory owns nothing (null) rather than borrowing
+  // whichever project happens to be active.
+  const projectRef = useProjectContextOwner(chatSessionDirectory);
+
+  // Display-only lookup: a user-renamed project label wins over the directory
+  // name. The owner decision stays with the hook — this must not reintroduce
+  // a fallback.
+  const projects = useProjectsStore((state) => state.projects);
+  const labeledProject = React.useMemo(
+    () => (projectRef ? projects.find((project) => project.id === projectRef.id) ?? null : null),
+    [projectRef, projects],
+  );
 
   const projectLabel = React.useMemo(() => {
-    if (isChatContext) return t('sessions.sidebar.activity.chatsTitle');
-    if (!activeProject) {
+    if (!projectRef) {
       return null;
     }
-    return activeProject.label?.trim()
-      || formatDirectoryName(activeProject.path, homeDirectory)
-      || activeProject.path;
-  }, [activeProject, homeDirectory, isChatContext, t]);
+    if (projectRef.id === CHAT_DRAFT_PROJECT_ID) {
+      return t('sessions.sidebar.activity.chatsTitle');
+    }
+    return labeledProject?.label?.trim()
+      || formatDirectoryName(projectRef.path, homeDirectory)
+      || projectRef.path;
+  }, [homeDirectory, labeledProject, projectRef, t]);
 
   const canCreateWorktree = React.useMemo(() => {
-    if (!activeProject) {
+    if (!projectRef || projectRef.id === CHAT_DRAFT_PROJECT_ID) {
       return false;
     }
-    return gitDirectories.get(activeProject.path)?.isGitRepo === true;
-  }, [activeProject, gitDirectories]);
+    return gitDirectories.get(projectRef.path)?.isGitRepo === true;
+  }, [gitDirectories, projectRef]);
 
   return (
     /* The panel scrolls its own tab content; a scroller here would nest. */
diff --git a/packages/ui/src/components/session/project-context/DOCUMENTATION.md b/packages/ui/src/components/session/project-context/DOCUMENTATION.md
index d2e010ee..5e7819a4 100644
--- a/packages/ui/src/components/session/project-context/DOCUMENTATION.md
+++ b/packages/ui/src/components/session/project-context/DOCUMENTATION.md
@@ -60,6 +60,18 @@ Leaving the section or the project closes it, so its editor never sits over a
 list it no longer matches. Hosts that own a fullscreen plan surface (mobile)
 still pass `onOpenPlan` and keep theirs.
 
+The panel owns the only source of truth for which project a plan belongs to,
+and it never lets the editor guess. `PlanView` receives the owner as
+`savedProjectPlan={{ projectRef, planId }}` — load and autosave both go to that
+exact project. An earlier version let the editor re-derive the project from the
+current directory, which silently opened an empty document for plans stored
+under the managed Chats owner (`openchamber:chats`), for plans opened from a
+worktree the directory lookup missed, and for plan tabs restored after a
+reload. Persisted plan tabs carry `projectPlanRef` for the same reason; a saved-plan
+tab persisted with an id but no owner is dropped on rehydrate rather than
+reopened against a guessed project. A plain session plan tab legitimately has
+neither an id nor an owner and is kept.
+
 ## Pins belong to one session
 
 Notes and plans are project data, but attaching one writes its id to the current
diff --git a/packages/ui/src/components/session/project-context/PlansSection.tsx b/packages/ui/src/components/session/project-context/PlansSection.tsx
index a5d00fc1..d6c7f560 100644
--- a/packages/ui/src/components/session/project-context/PlansSection.tsx
+++ b/packages/ui/src/components/session/project-context/PlansSection.tsx
@@ -5,7 +5,7 @@ import { toast } from '@/components/ui';
 import { Icon } from '@/components/icon/Icon';
 import { requestFileAccess } from '@/lib/desktop';
 import { getCurrentIntlLocale, useI18n } from '@/lib/i18n';
-import { parsePlanMarkdown, type ProjectPlanLink, type ProjectRef } from '@/lib/projectContextApi';
+import { parsePlanMarkdown, resolveProjectContextId, type ProjectPlanLink, type ProjectRef } from '@/lib/projectContextApi';
 import { runtimeFetch } from '@/lib/runtime-fetch';
 import { cn } from '@/lib/utils';
 import { useDirectoryStore } from '@/stores/useDirectoryStore';
@@ -23,8 +23,9 @@ export const PlansSection: React.FC<{
   plans: ProjectPlanLink[];
   /** Panel-wide filter, matched against plan titles. */
   query: string;
-  /** Hosts without a ContextPanel (mobile) render their own plan viewer. */
-  onOpenPlan?: (plan: { id: string; title: string }) => void;
+  /** Hosts without a ContextPanel (mobile) render their own plan viewer. The
+      plan carries its owner so the host viewer never guesses the project. */
+  onOpenPlan?: (plan: { id: string; title: string; projectRef: ProjectRef }) => void;
   pinnedPlanIds: ReadonlySet<string>;
   onTogglePinned: (planId: string, pinned: boolean) => Promise<boolean>;
 }> = ({ projectRef, plans, query, onOpenPlan, pinnedPlanIds, onTogglePinned }) => {
@@ -155,7 +156,7 @@ export const PlansSection: React.FC<{
   const handleOpenPlan = React.useCallback(
     (plan: ProjectPlanLink) => {
       if (onOpenPlan) {
-        onOpenPlan({ id: plan.id, title: plan.title });
+        onOpenPlan({ id: plan.id, title: plan.title, projectRef });
         return;
       }
       const panelDirectory = currentDirectory?.trim() || projectRef.path.trim();
@@ -165,11 +166,15 @@ export const PlansSection: React.FC<{
       openContextPanelTab(panelDirectory, {
         mode: 'plan',
         projectPlanId: plan.id,
-        dedupeKey: `plan:${plan.id}`,
+        projectPlanRef: projectRef,
+        // Storage identity is derived from the project path, not the settings
+        // id, so the tab identity uses the same derivation. Two projects
+        // sharing a settings id but not a path must not merge plan tabs.
+        dedupeKey: `plan:${resolveProjectContextId(projectRef)}:${plan.id}`,
         label: plan.title,
       });
     },
-    [currentDirectory, onOpenPlan, openContextPanelTab, projectRef.path]
+    [currentDirectory, onOpenPlan, openContextPanelTab, projectRef]
   );
 
   return (
diff --git a/packages/ui/src/components/session/project-context/ProjectNotesTodoPanel.tsx b/packages/ui/src/components/session/project-context/ProjectNotesTodoPanel.tsx
index 72b9fd20..9fad4bb6 100644
--- a/packages/ui/src/components/session/project-context/ProjectNotesTodoPanel.tsx
+++ b/packages/ui/src/components/session/project-context/ProjectNotesTodoPanel.tsx
@@ -29,8 +29,9 @@ interface ProjectNotesTodoPanelProps {
   canCreateWorktree?: boolean;
   onActionComplete?: () => void;
   /** When provided, opening a plan calls this instead of the desktop context
-      panel tab — hosts without ContextPanel (mobile) render their own viewer. */
-  onOpenPlan?: (plan: { id: string; title: string }) => void;
+      panel tab — hosts without ContextPanel (mobile) render their own viewer.
+      The plan carries its owner so the host's viewer cannot guess wrong. */
+  onOpenPlan?: (plan: { id: string; title: string; projectRef: ProjectRef }) => void;
   className?: string;
 }
 
@@ -501,10 +502,10 @@ export const ProjectNotesTodoPanel: React.FC<ProjectNotesTodoPanelProps> = ({
           />
         ) : null}
 
-        {activeTab === 'plans' && openPlan ? (
+        {activeTab === 'plans' && openPlan && projectRef ? (
           <React.Suspense fallback={null}>
             <PlanView
-              projectPlanId={openPlan.id}
+              savedProjectPlan={{ projectRef, planId: openPlan.id }}
               onNavigatedToChat={() => setOpenPlan(null)}
             />
           </React.Suspense>
diff --git a/packages/ui/src/components/views/PlanView.tsx b/packages/ui/src/components/views/PlanView.tsx
index 24c07aaa..a1e9793e 100644
--- a/packages/ui/src/components/views/PlanView.tsx
+++ b/packages/ui/src/components/views/PlanView.tsx
@@ -38,7 +38,10 @@ import { useEffectiveDirectory } from '@/hooks/useEffectiveDirectory';
 import { EditorView } from '@codemirror/view';
 import { copyTextToClipboard } from '@/lib/clipboard';
 import { generateBranchName } from '@/lib/git/branchNameGenerator';
-import { fetchProjectPlan, parsePlanMarkdown } from '@/lib/projectContextApi';
+import { fetchProjectPlan, parsePlanMarkdown, resolveProjectContextId, type SavedProjectPlanTarget } from '@/lib/projectContextApi';
+import { CHAT_DRAFT_PROJECT_ID } from '@/lib/chatDirectories';
+import { createPlanSaveQueue } from '@/lib/planSaveQueue';
+import { getRuntimeKey, subscribeRuntimeEndpointChanged } from '@/lib/runtime-switch';
 import { useProjectContextStore } from '@/stores/useProjectContextStore';
 import { createWorktreeSessionForNewBranch } from '@/lib/worktreeSessionCreator';
 import { TodoSendDialog, type TodoSendExecution } from '@/components/session/TodoSendDialog';
@@ -49,9 +52,12 @@ import { useI18n } from '@/lib/i18n';
 
 type PlanViewProps = {
   targetPath?: string | null;
-  /** Saved project plan to open. Project plans are server-owned and addressed
-      by id; they never carry a client-visible filesystem path. */
-  projectPlanId?: string | null;
+  /** Saved project plan to open, with the project that owns it. The owner is
+      part of the prop so the view never guesses it from the current directory:
+      plan tabs outlive directory changes (persisted context tabs, mobile
+      overlays), and for managed chats the owner is not a registered project a
+      directory lookup could ever find. */
+  savedProjectPlan?: SavedProjectPlanTarget | null;
   /** Called after a send action routes the user to the chat — hosts that show
       PlanView in an overlay (mobile fullscreen surface) close it here. */
   onNavigatedToChat?: () => void;
@@ -149,12 +155,16 @@ const resolveProjectRefForDirectory = (
   return match ? { id: match.id, path: match.path } : null;
 };
 
+const subscribeActiveRuntimeKey = (onStoreChange: () => void): (() => void) => {
+  return subscribeRuntimeEndpointChanged(() => onStoreChange());
+};
+
 type SelectedLineRange = {
   start: number;
   end: number;
 };
 
-export const PlanView: React.FC<PlanViewProps> = ({ targetPath = null, projectPlanId = null, onNavigatedToChat }) => {
+export const PlanView: React.FC<PlanViewProps> = ({ targetPath = null, savedProjectPlan = null, onNavigatedToChat }) => {
   const { t } = useI18n();
   const currentSessionId = useSessionUIStore((state) => state.currentSessionId);
   const createSession = useSessionUIStore((state) => state.createSession);
@@ -170,6 +180,7 @@ export const PlanView: React.FC<PlanViewProps> = ({ targetPath = null, projectPl
   const effectiveDirectory = useEffectiveDirectory() ?? '';
   const setSessionSwitcherOpen = useUIStore((state) => state.setSessionSwitcherOpen);
   const runtimeApis = useRuntimeAPIs();
+  const activeRuntimeKey = React.useSyncExternalStore(subscribeActiveRuntimeKey, getRuntimeKey, getRuntimeKey);
   const { isMobile } = useDeviceInfo();
   const { currentTheme } = useThemeSystem();
 
@@ -190,9 +201,37 @@ export const PlanView: React.FC<PlanViewProps> = ({ targetPath = null, projectPl
     () => resolveProjectRefForDirectory(projectDirectory, projects, activeProjectId),
     [activeProjectId, projectDirectory, projects],
   );
+  // Destructured to primitives so the load/save effects key on stable values
+  // instead of a descriptor object rebuilt on every parent render.
+  const savedPlanProjectId = savedProjectPlan?.projectRef.id ?? null;
+  const savedPlanProjectPath = savedProjectPlan?.projectRef.path ?? null;
+  const savedPlanProjectRef = React.useMemo(
+    () => savedPlanProjectId && savedPlanProjectPath
+      ? { id: savedPlanProjectId, path: savedPlanProjectPath }
+      : null,
+    [savedPlanProjectId, savedPlanProjectPath],
+  );
+  const savedPlanId = savedProjectPlan?.planId ?? null;
+  // Stable logical identity, composed from primitives: an effect keyed on the
+  // descriptor object would reload — and flush — the same plan whenever a
+  // parent rebuilds the owner object with identical values.
+  const savedPlanKey = savedPlanProjectRef && savedPlanId
+    ? JSON.stringify(['saved-plan', activeRuntimeKey, resolveProjectContextId(savedPlanProjectRef), savedPlanId])
+    : null;
+  // Managed chats have no project directory to create a session in: their
+  // sessions live in per-session directories under the chats root, which
+  // createSession cannot prepare. Until a managed-chat send path exists,
+  // Improve/Implement stay unavailable for plans stored under the Chats
+  // owner — an OpenCode session created directly in the shared root would
+  // break the managed-chats model.
+  const isManagedChatPlan = savedPlanProjectRef?.id === CHAT_DRAFT_PROJECT_ID;
   const canCreateWorktree = React.useMemo(
-    () => (currentProjectRef ? gitDirectories.get(currentProjectRef.path)?.isGitRepo === true : false),
-    [currentProjectRef, gitDirectories],
+    () => {
+      // Worktree creation follows the session the plan would be sent to.
+      const sendTarget = savedPlanProjectRef ?? currentProjectRef;
+      return sendTarget ? gitDirectories.get(sendTarget.path)?.isGitRepo === true : false;
+    },
+    [currentProjectRef, gitDirectories, savedPlanProjectRef],
   );
   const [pendingPlanSend, setPendingPlanSend] = React.useState<PendingPlanSend | null>(null);
   const [isPlanSendSubmitting, setIsPlanSendSubmitting] = React.useState(false);
@@ -202,7 +241,6 @@ export const PlanView: React.FC<PlanViewProps> = ({ targetPath = null, projectPl
   // `resolvedPath` so nothing downstream can mistake a project plan for a file
   // the user could open, edit, or be shown a path for.
   const [loadedProjectPlanId, setLoadedProjectPlanId] = React.useState<string | null>(null);
-  const savePlan = useProjectContextStore((state) => state.savePlan);
   const hasDocument = Boolean(resolvedPath) || Boolean(loadedProjectPlanId);
   const displayPath = React.useMemo(() => {
     if (!resolvedPath || !sessionDirectory || !homeDirectory) {
@@ -214,6 +252,7 @@ export const PlanView: React.FC<PlanViewProps> = ({ targetPath = null, projectPl
   const { isPlaying: isTTSPlaying, play: playTTS, stop: stopTTS } = useMessageTTS();
   const showMessageTTSButtons = useConfigStore((state) => state.showMessageTTSButtons);
   const [saveError, setSaveError] = React.useState<string | null>(null);
+  const [loadError, setLoadError] = React.useState<string | null>(null);
   const planFileLabel = React.useMemo(() => {
     return displayPath ? displayPath.split('/').pop() || t('planView.file.defaultName') : t('planView.file.defaultName');
   }, [displayPath, t]);
@@ -381,9 +420,96 @@ export const PlanView: React.FC<PlanViewProps> = ({ targetPath = null, projectPl
     return extensions;
   }, [currentTheme, resolvedPath, editorFontSize]);
 
+  // Pending-save bookkeeping for the open document. One ref record, not state:
+  // debounced writes and close-time flushes must read the newest buffer and
+  // revision without another render. `editRevision` advances on every editor
+  // change; `savedRevision` only after a successful write of that exact
+  // revision, so a slow in-flight save can never mark newer edits as saved.
+  // `key` and `runtimeKey` make every write self-identifying: content never
+  // crosses documents or runtimes, no matter when a queued write settles.
+  const docRef = React.useRef<{
+    key: string | null;
+    target: SavedProjectPlanTarget | { filePath: string } | null;
+    content: string;
+    editRevision: number;
+    savedRevision: number;
+    runtimeKey: string;
+  }>({ key: null, target: null, content: '', editRevision: 0, savedRevision: 0, runtimeKey: '' });
+  const saveQueue = React.useState(createPlanSaveQueue)[0];
+
+  // Filesystem writes keep the runtime adapter precedence the view always
+  // used: the active RuntimeAPIs first, the registry as fallback.
+  const writeDocument = React.useCallback(async (target: NonNullable<typeof docRef.current['target']>, text: string): Promise<void> => {
+    if ('filePath' in target) {
+      const files = runtimeApis.files ?? getRegisteredRuntimeAPIs()?.files;
+      if (files?.writeFile) {
+        const result = await files.writeFile(target.filePath, text);
+        if (!result?.success) {
+          throw new Error('Plan file write failed');
+        }
+        return;
+      }
+      const response = await runtimeFetch('/api/fs/write', {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({ path: target.filePath, content: text }),
+      });
+      if (!response.ok) {
+        throw new Error(`Failed to write plan file (${response.status})`);
+      }
+      return;
+    }
+    const saved = await useProjectContextStore.getState().savePlan(target.projectRef, target.planId, text);
+    if (!saved) {
+      throw new Error('Plan save rejected: the plan no longer exists');
+    }
+  }, [runtimeApis.files]);
+  const writeDocumentRef = React.useRef(writeDocument);
+  writeDocumentRef.current = writeDocument;
+
+  // Queue any unflushed edits. Runs on document switches and on unmount, both
+  // of which cancel the debounced save — without this the last 350ms of typing
+  // is silently dropped. The queue orders it behind any write already in
+  // flight for the same document, and the captured runtime key stops content
+  // from one host being written into another after a runtime switch.
+  const scheduleSave = React.useCallback(() => {
+    const doc = docRef.current;
+    if (!doc.key || !doc.target || doc.editRevision <= doc.savedRevision) {
+      return;
+    }
+    const captured = {
+      key: doc.key,
+      target: doc.target,
+      content: doc.content,
+      revision: doc.editRevision,
+      runtimeKey: doc.runtimeKey,
+      write: writeDocumentRef.current,
+    };
+    saveQueue.schedule(captured.key, captured.revision, async () => {
+      if (getRuntimeKey() !== captured.runtimeKey) {
+        // The runtime switched while this write waited: writing through the
+        // new connection would land one host's edits on another.
+        return;
+      }
+      await captured.write(captured.target, captured.content);
+      const current = docRef.current;
+      if (current.key === captured.key) {
+        current.savedRevision = Math.max(current.savedRevision, captured.revision);
+        // A recovered save clears the stale failure banner.
+        setSaveError(null);
+      }
+    }).catch((error) => {
+      if (docRef.current.key === captured.key) {
+        setSaveError(error instanceof Error ? error.message : 'Plan save failed');
+      }
+    });
+  }, [saveQueue]);
+
   React.useEffect(() => {
     // Saved project plans opened via context panel should work even when session plan mode is off.
-    if (!planModeEnabled && !targetPath && !projectPlanId) {
+    if (!planModeEnabled && !targetPath && !savedPlanId) {
+      scheduleSave();
+      docRef.current = { key: null, target: null, content: '', editRevision: 0, savedRevision: 0, runtimeKey: '' };
       setResolvedPath(null);
       setLoadedProjectPlanId(null);
       setContent('');
@@ -416,31 +542,49 @@ export const PlanView: React.FC<PlanViewProps> = ({ targetPath = null, projectPl
     };
 
     const run = async () => {
+      // Flush the outgoing document before the bookkeeping is replaced, so
+      // edits typed within the debounce window survive a plan switch. React
+      // reuses this component instance across saved-plan tabs.
+      scheduleSave();
+      docRef.current = { key: null, target: null, content: '', editRevision: 0, savedRevision: 0, runtimeKey: '' };
       setResolvedPath(null);
       setLoadedProjectPlanId(null);
       setContent('');
       setSaveError(null);
+      setLoadError(null);
 
-      if (projectPlanId) {
-        if (!currentProjectRef) {
-          return;
-        }
+      if (savedPlanId && savedPlanProjectRef && savedPlanKey) {
+        // A plan re-opened while its own flush is still writing must read the
+        // post-write state, not race it. The queue reset afterwards is safe:
+        // every write for this key has settled, and the reloaded document
+        // restarts its revision counter at zero.
+        await saveQueue.pendingFor(savedPlanKey);
+        if (cancelled) return;
+        saveQueue.reset(savedPlanKey);
         setLoading(true);
         try {
-          const plan = await fetchProjectPlan(currentProjectRef, projectPlanId);
+          const plan = await fetchProjectPlan(savedPlanProjectRef, savedPlanId);
           if (cancelled) return;
           if (!plan) {
             // The plan or its markdown is gone. Leave the view empty and
             // unsaveable rather than presenting an editor that would recreate
             // a document the user deleted.
-            setSaveError(t('planView.error.loadFailed'));
+            setLoadError('Plan not found');
             return;
           }
+          docRef.current = {
+            key: savedPlanKey,
+            target: { projectRef: savedPlanProjectRef, planId: savedPlanId },
+            content: plan.raw,
+            editRevision: 0,
+            savedRevision: 0,
+            runtimeKey: activeRuntimeKey,
+          };
           setContent(plan.raw);
-          setLoadedProjectPlanId(projectPlanId);
+          setLoadedProjectPlanId(savedPlanId);
         } catch (error) {
           if (cancelled) return;
-          setSaveError(error instanceof Error ? error.message : t('planView.error.loadFailed'));
+          setLoadError(error instanceof Error ? error.message : 'Plan load failed');
         } finally {
           if (!cancelled) setLoading(false);
         }
@@ -448,10 +592,22 @@ export const PlanView: React.FC<PlanViewProps> = ({ targetPath = null, projectPl
       }
 
       if (targetPath) {
+        const fileKey = JSON.stringify(['plan-file', activeRuntimeKey, targetPath]);
+        await saveQueue.pendingFor(fileKey);
+        if (cancelled) return;
+        saveQueue.reset(fileKey);
         setLoading(true);
         try {
           const text = await readText(targetPath);
           if (cancelled) return;
+          docRef.current = {
+            key: fileKey,
+            target: { filePath: targetPath },
+            content: text,
+            editRevision: 0,
+            savedRevision: 0,
+            runtimeKey: activeRuntimeKey,
+          };
           setResolvedPath(targetPath);
           setContent(text);
         } catch {
@@ -477,10 +633,9 @@ export const PlanView: React.FC<PlanViewProps> = ({ targetPath = null, projectPl
         const homePath = resolveTilde(buildHomePlanPath(session.time.created, session.slug), homeDirectory || null);
 
         let resolved: string | null = null;
-        let text: string | null = null;
 
         try {
-          text = await readText(repoPath);
+          await readText(repoPath);
           resolved = repoPath;
         } catch {
           // ignore
@@ -488,7 +643,7 @@ export const PlanView: React.FC<PlanViewProps> = ({ targetPath = null, projectPl
 
         if (!resolved) {
           try {
-            text = await readText(homePath);
+            await readText(homePath);
             resolved = homePath;
           } catch {
             // ignore
@@ -497,12 +652,26 @@ export const PlanView: React.FC<PlanViewProps> = ({ targetPath = null, projectPl
 
         if (cancelled) return;
 
-        if (!resolved || text === null) {
+        if (!resolved) {
           setResolvedPath(null);
           setContent('');
           return;
         }
 
+        const sessionFileKey = JSON.stringify(['plan-file', activeRuntimeKey, resolved]);
+        await saveQueue.pendingFor(sessionFileKey);
+        if (cancelled) return;
+        const text = await readText(resolved);
+        if (cancelled) return;
+        saveQueue.reset(sessionFileKey);
+        docRef.current = {
+          key: sessionFileKey,
+          target: { filePath: resolved },
+          content: text,
+          editRevision: 0,
+          savedRevision: 0,
+          runtimeKey: activeRuntimeKey,
+        };
         setResolvedPath(resolved);
         setContent(text);
       } catch {
@@ -519,55 +688,42 @@ export const PlanView: React.FC<PlanViewProps> = ({ targetPath = null, projectPl
     return () => {
       cancelled = true;
     };
-  }, [currentProjectRef, homeDirectory, planModeEnabled, projectPlanId, runtimeApis.files, sessionDirectory, session?.slug, session?.time?.created, t, targetPath]);
+  }, [activeRuntimeKey, homeDirectory, planModeEnabled, runtimeApis.files, savedPlanId, savedPlanKey, savedPlanProjectRef, saveQueue, scheduleSave, session?.slug, session?.time?.created, sessionDirectory, targetPath]);
 
+  // Synchronous buffer tracking: if an edit and an unmount land in the same
+  // batch, the passive content effect would never run and a flush would save
+  // a stale buffer.
+  const handleContentChange = React.useCallback((next: string) => {
+    docRef.current.content = next;
+    docRef.current.editRevision += 1;
+    setContent(next);
+  }, []);
+
+  // The debounced write and the close/switch flush go through the same queue
+  // (scheduleSave), so two saves of one document can never complete out of
+  // order and a flush never duplicates a debounce of the same revision.
   React.useEffect(() => {
     if (!resolvedPath && !loadedProjectPlanId) {
       return;
     }
 
-    const controller = window.setTimeout(async () => {
-      setSaveError(null);
-      try {
-        if (loadedProjectPlanId) {
-          if (!currentProjectRef) {
-            throw new Error(t('planView.error.writeFailed'));
-          }
-          const saved = await savePlan(currentProjectRef, loadedProjectPlanId, content);
-          if (!saved) {
-            throw new Error(t('planView.error.writeFailed'));
-          }
-          return;
-        }
-
-        if (!resolvedPath) {
-          return;
-        }
-
-        if (runtimeApis.files?.writeFile) {
-          const result = await runtimeApis.files.writeFile(resolvedPath, content);
-          if (!result?.success) {
-            throw new Error(t('planView.error.writeFailed'));
-          }
-        } else {
-          const response = await runtimeFetch('/api/fs/write', {
-            method: 'POST',
-            headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify({ path: resolvedPath, content }),
-          });
-          if (!response.ok) {
-            throw new Error(t('planView.error.writePlanFileFailed', { status: response.status }));
-          }
-        }
-      } catch (error) {
-        setSaveError(error instanceof Error ? error.message : t('planView.error.saveFailed'));
-      }
+    const controller = window.setTimeout(() => {
+      scheduleSave();
     }, 350);
 
     return () => {
       window.clearTimeout(controller);
     };
-  }, [content, currentProjectRef, loadedProjectPlanId, resolvedPath, runtimeApis.files, savePlan, t]);
+  }, [content, loadedProjectPlanId, resolvedPath, scheduleSave]);
+
+  // Closing the view inside the 350ms debounce window would drop the last
+  // edits: the cleanup above cancels the timer. Same for switching documents,
+  // which the load effect handles before replacing the bookkeeping.
+  React.useEffect(() => {
+    return () => {
+      scheduleSave();
+    };
+  }, [scheduleSave]);
 
   React.useEffect(() => {
     return () => {
@@ -584,7 +740,11 @@ export const PlanView: React.FC<PlanViewProps> = ({ targetPath = null, projectPl
 
   const handleConfirmPlanSend = React.useCallback(
     async (execution: TodoSendExecution) => {
-      if (!currentProjectRef || !pendingPlanSend) {
+      // A saved plan sends against its own project — the one it is stored
+      // under — not against whatever directory the viewer is currently in.
+      // For filesystem plans those are the same directory.
+      const sendTargetProject = savedPlanProjectRef ?? currentProjectRef;
+      if (!sendTargetProject || !pendingPlanSend || isManagedChatPlan) {
         return;
       }
 
@@ -601,32 +761,45 @@ export const PlanView: React.FC<PlanViewProps> = ({ targetPath = null, projectPl
           plan_path: resolvedPath ?? '',
         },
       );
-      const syntheticParts = [{ synthetic: true as const, text: instructionsText }];
+      // Saved project plans have no file path for the agent to read. Without
+      // this the instructions say "read that file" with an empty path and the
+      // plan contents never reach the session, so the plan substance rides
+      // along in the synthetic message instead.
+      const planSubstance = resolvedPath
+        ? instructionsText
+        : [
+            instructionsText,
+            '',
+            'The plan is not stored as a file in the repository and has no file path. Its full current contents follow below this note and are the source of truth for the plan. Where the instructions above refer to the plan file, treat the plan as stored in OpenChamber project knowledge (it is edited through the OpenChamber UI): propose plan revisions as plan text in the chat rather than editing a file.',
+            '',
+            content,
+          ].join('\n');
+      const syntheticParts = [{ synthetic: true as const, text: planSubstance }];
       setIsPlanSendSubmitting(true);
 
       try {
         routeToChat();
 
         let sessionId: string | null = null;
-        let directoryHint: string | null = currentProjectRef.path;
+        let directoryHint: string | null = sendTargetProject.path;
 
         if (pendingPlanSend.target === 'worktree') {
           if (!canCreateWorktree) {
             return;
           }
-          const created = await createWorktreeSessionForNewBranch(currentProjectRef.path, generateBranchName());
+          const created = await createWorktreeSessionForNewBranch(sendTargetProject.path, generateBranchName());
           if (!created?.id) {
             return;
           }
           sessionId = created.id;
           directoryHint = created.path;
         } else {
-          const sessionResult = await createSession(undefined, currentProjectRef.path, null);
+          const sessionResult = await createSession(undefined, sendTargetProject.path, null);
           if (!sessionResult?.id) {
             return;
           }
           sessionId = sessionResult.id;
-          directoryHint = sessionResult.directory ?? currentProjectRef.path;
+          directoryHint = sessionResult.directory ?? sendTargetProject.path;
           initializeNewOpenChamberSession(sessionResult.id, useConfigStore.getState().agents ?? []);
         }
 
@@ -664,8 +837,10 @@ export const PlanView: React.FC<PlanViewProps> = ({ targetPath = null, projectPl
         // source. Here we only compose header + full content.
         const goalObjective = execution.runAsGoal === true
           ? [
-              `Implement the plan "${sendPromptTitle}" end-to-end${resolvedPath ? ` (plan file: ${resolvedPath})` : ''}.`,
-              'Re-read that file for full details — it is the source of truth.',
+              `Implement the plan "${sendPromptTitle}" end-to-end${resolvedPath ? ` (plan file: ${resolvedPath})` : ' (the full plan follows)'}.`,
+              resolvedPath
+                ? 'Re-read that file for full details — it is the source of truth.'
+                : 'The full plan follows in this message and is the source of truth.',
               '',
               content,
             ].join('\n')
@@ -687,7 +862,7 @@ export const PlanView: React.FC<PlanViewProps> = ({ targetPath = null, projectPl
         setIsPlanSendSubmitting(false);
       }
     },
-    [canCreateWorktree, content, createSession, currentProjectRef, initializeNewOpenChamberSession, pendingPlanSend, resolvedPath, routeToChat, sendMessage, sendPromptTitle, setCurrentSession]
+    [canCreateWorktree, content, createSession, currentProjectRef, initializeNewOpenChamberSession, isManagedChatPlan, pendingPlanSend, resolvedPath, routeToChat, savedPlanProjectRef, sendMessage, sendPromptTitle, setCurrentSession]
   );
 
   const blockWidgets = React.useMemo(() => {
@@ -716,6 +891,11 @@ export const PlanView: React.FC<PlanViewProps> = ({ targetPath = null, projectPl
       <div className="flex min-w-0 items-center gap-2 border-b border-border/40 px-3 py-1.5 flex-shrink-0">
         <div className="min-w-0 flex-1">
           <div className="typography-ui-label font-medium truncate">{parsedTitle}</div>
+          {loadError ? (
+            <div className="typography-micro text-[color:var(--status-error)] truncate" title={loadError}>
+              {t('planView.error.loadFailed')}
+            </div>
+          ) : null}
           {saveError ? (
             <div className="typography-micro text-[color:var(--status-error)] truncate" title={saveError}>
               {t('planView.error.saveFailed')}
@@ -733,7 +913,7 @@ export const PlanView: React.FC<PlanViewProps> = ({ targetPath = null, projectPl
                       size="sm"
                       className="h-5 w-5 p-0"
                       aria-label={t('planView.actions.improvePlanAria')}
-                      disabled={!content.trim()}
+                      disabled={!content.trim() || isManagedChatPlan}
                     >
                       <Icon name="loop-right-ai" className="size-4" />
                     </Button>
@@ -742,7 +922,10 @@ export const PlanView: React.FC<PlanViewProps> = ({ targetPath = null, projectPl
                 <TooltipContent sideOffset={8}>{t('planView.actions.improve')}</TooltipContent>
               </Tooltip>
               <DropdownMenuContent align="end">
-                <DropdownMenuItem onClick={() => setPendingPlanSend({ action: 'improve', target: 'session' })}>
+                <DropdownMenuItem
+                  onClick={() => setPendingPlanSend({ action: 'improve', target: 'session' })}
+                  disabled={isManagedChatPlan}
+                >
                   {t('planView.actions.sendToNewSession')}
                 </DropdownMenuItem>
                 <DropdownMenuItem
@@ -762,7 +945,7 @@ export const PlanView: React.FC<PlanViewProps> = ({ targetPath = null, projectPl
                       size="sm"
                       className="h-5 w-5 p-0"
                       aria-label={t('planView.actions.implementPlanAria')}
-                      disabled={!content.trim()}
+                      disabled={!content.trim() || isManagedChatPlan}
                     >
                       <Icon name="code-ai" className="size-4" />
                     </Button>
@@ -771,7 +954,10 @@ export const PlanView: React.FC<PlanViewProps> = ({ targetPath = null, projectPl
                 <TooltipContent sideOffset={8}>{t('planView.actions.implement')}</TooltipContent>
               </Tooltip>
               <DropdownMenuContent align="end">
-                <DropdownMenuItem onClick={() => setPendingPlanSend({ action: 'implement', target: 'session' })}>
+                <DropdownMenuItem
+                  onClick={() => setPendingPlanSend({ action: 'implement', target: 'session' })}
+                  disabled={isManagedChatPlan}
+                >
                   {t('planView.actions.sendToNewSession')}
                 </DropdownMenuItem>
                 <DropdownMenuItem
@@ -853,7 +1039,7 @@ export const PlanView: React.FC<PlanViewProps> = ({ targetPath = null, projectPl
           }
         }}
         target={pendingPlanSend?.target ?? 'session'}
-        projectDirectory={currentProjectRef?.path ?? null}
+        projectDirectory={savedPlanProjectRef?.path ?? currentProjectRef?.path ?? null}
         submitting={isPlanSendSubmitting}
         allowRunAsGoal
         onConfirm={handleConfirmPlanSend}
@@ -885,7 +1071,7 @@ export const PlanView: React.FC<PlanViewProps> = ({ targetPath = null, projectPl
                   <div className="relative h-full" ref={editorWrapperRef}>
                     <CodeMirrorEditor
                       value={content}
-                      onChange={setContent}
+                      onChange={handleContentChange}
                       readOnly={false}
                       className="h-full"
                       extensions={editorExtensions}
diff --git a/packages/ui/src/hooks/useProjectContextOwner.test.ts b/packages/ui/src/hooks/useProjectContextOwner.test.ts
index a18ae9e1..6f69f11e 100644
--- a/packages/ui/src/hooks/useProjectContextOwner.test.ts
+++ b/packages/ui/src/hooks/useProjectContextOwner.test.ts
@@ -45,4 +45,46 @@ describe('resolveProjectContextOwner', () => {
 
     expect(owner).toEqual({ id: 'openchamber', path: '/workspace/openchamber' });
   });
+
+  test('returns null for a recognized directory that owns nothing, instead of borrowing the active project', () => {
+    const owner = resolveProjectContextOwner({
+      projects,
+      worktreesByProject: new Map(),
+      directory: '/some/other/project',
+      activeProjectId: 'openchamber',
+      chatDraftOpen: false,
+      chatDraftTarget: 'project',
+      homeDirectory: '/Users/test',
+    });
+
+    expect(owner).toBeNull();
+  });
+
+  test('falls back to the active project only when there is no directory at all', () => {
+    const owner = resolveProjectContextOwner({
+      projects,
+      worktreesByProject: new Map(),
+      directory: null,
+      activeProjectId: 'openchamber',
+      chatDraftOpen: false,
+      chatDraftTarget: 'project',
+      homeDirectory: '/Users/test',
+    });
+
+    expect(owner).toEqual({ id: 'openchamber', path: '/workspace/openchamber' });
+  });
+
+  test('never falls back to the first project when the active project is unknown', () => {
+    const owner = resolveProjectContextOwner({
+      projects,
+      worktreesByProject: new Map(),
+      directory: null,
+      activeProjectId: 'missing-project',
+      chatDraftOpen: false,
+      chatDraftTarget: 'project',
+      homeDirectory: '/Users/test',
+    });
+
+    expect(owner).toBeNull();
+  });
 });
diff --git a/packages/ui/src/hooks/useProjectContextOwner.ts b/packages/ui/src/hooks/useProjectContextOwner.ts
index 4b9faac1..bc003020 100644
--- a/packages/ui/src/hooks/useProjectContextOwner.ts
+++ b/packages/ui/src/hooks/useProjectContextOwner.ts
@@ -47,7 +47,16 @@ export const resolveProjectContextOwner = ({
     return { id: sessionProject.id, path: sessionProject.path };
   }
 
-  const activeProject = projects.find((project) => project.id === activeProjectId) ?? projects[0] ?? null;
+  // A concrete directory that resolves to nothing owns nothing. Falling back
+  // to the active project here showed one project's knowledge under another
+  // project's name (the "plans open empty" bug), so the panel stays empty
+  // instead of lying. The active-project fallback is only for states with no
+  // directory at all, such as a new-session draft that has not landed yet.
+  if (normalizedDirectory) {
+    return null;
+  }
+
+  const activeProject = projects.find((project) => project.id === activeProjectId) ?? null;
   return activeProject ? { id: activeProject.id, path: activeProject.path } : null;
 };
 
diff --git a/packages/ui/src/lib/planSaveQueue.test.ts b/packages/ui/src/lib/planSaveQueue.test.ts
new file mode 100644
index 00000000..d1d4687a
--- /dev/null
+++ b/packages/ui/src/lib/planSaveQueue.test.ts
@@ -0,0 +1,142 @@
+import { describe, expect, test } from 'bun:test';
+
+import { createPlanSaveQueue } from './planSaveQueue';
+
+type Deferred = { promise: Promise<void>; resolve: () => void; reject: () => void };
+
+const deferred = (): Deferred => {
+  let resolve!: () => void;
+  let reject!: () => void;
+  const promise = new Promise<void>((res, rej) => {
+    resolve = res;
+    reject = rej;
+  });
+  return { promise, resolve, reject };
+};
+
+describe('planSaveQueue', () => {
+  test('runs writes for one document in schedule order even when they resolve out of order', async () => {
+    const queue = createPlanSaveQueue();
+    const order: string[] = [];
+    const first = deferred();
+    const second = deferred();
+
+    const firstDone = queue.schedule('doc', 1, async () => {
+      await first.promise;
+      order.push('first');
+    });
+    const secondDone = queue.schedule('doc', 2, async () => {
+      order.push('second');
+    });
+
+    // Second started only after first settles, regardless of timing.
+    first.resolve();
+    await firstDone;
+    second.resolve();
+    await secondDone;
+
+    expect(order).toEqual(['first', 'second']);
+  });
+
+  test('skips a revision at or below the last queued revision for the same document', async () => {
+    const queue = createPlanSaveQueue();
+    let writes = 0;
+
+    await queue.schedule('doc', 3, async () => {
+      writes += 1;
+    });
+    await queue.schedule('doc', 3, async () => {
+      writes += 1;
+    });
+    await queue.schedule('doc', 2, async () => {
+      writes += 1;
+    });
+
+    expect(writes).toBe(1);
+  });
+
+  test('never lets a write for one document block another document', async () => {
+    const queue = createPlanSaveQueue();
+    const blocked = deferred();
+
+    const blockedDone = queue.schedule('a', 1, async () => {
+      await blocked.promise;
+    });
+    let otherRan = false;
+    await queue.schedule('b', 1, async () => {
+      otherRan = true;
+    });
+
+    expect(otherRan).toBe(true);
+    blocked.resolve();
+    await blockedDone;
+  });
+
+  test('pendingFor waits for the outstanding chain of that document only', async () => {
+    const queue = createPlanSaveQueue();
+    const slow = deferred();
+    let slowSettled = false;
+
+    void queue.schedule('a', 1, async () => {
+      await slow.promise;
+      slowSettled = true;
+    });
+    await queue.schedule('b', 1, async () => {});
+
+    await queue.pendingFor('b');
+    expect(slowSettled).toBe(false);
+
+    slow.resolve();
+    await queue.pendingFor('a');
+    expect(slowSettled).toBe(true);
+  });
+
+  test('reset clears the revision watermark so a reloaded document can save again', async () => {
+    const queue = createPlanSaveQueue();
+    let writes = 0;
+
+    await queue.schedule('doc', 5, async () => {
+      writes += 1;
+    });
+    queue.reset('doc');
+    await queue.schedule('doc', 1, async () => {
+      writes += 1;
+    });
+
+    expect(writes).toBe(2);
+  });
+
+  test('a failed write does not poison the chain for later writes', async () => {
+    const queue = createPlanSaveQueue();
+
+    const failing = queue.schedule('doc', 1, async () => {
+      throw new Error('write failed');
+    });
+    let secondRan = false;
+    const second = queue.schedule('doc', 2, async () => {
+      secondRan = true;
+    });
+
+    await expect(failing).rejects.toThrow('write failed');
+    await second;
+    expect(secondRan).toBe(true);
+    await queue.pendingFor('doc');
+  });
+
+  test('allows the same revision to retry after its write fails', async () => {
+    const queue = createPlanSaveQueue();
+    let attempts = 0;
+
+    const failing = queue.schedule('doc', 1, async () => {
+      attempts += 1;
+      throw new Error('write failed');
+    });
+    await expect(failing).rejects.toThrow('write failed');
+
+    await queue.schedule('doc', 1, async () => {
+      attempts += 1;
+    });
+
+    expect(attempts).toBe(2);
+  });
+});
diff --git a/packages/ui/src/lib/planSaveQueue.ts b/packages/ui/src/lib/planSaveQueue.ts
new file mode 100644
index 00000000..647f91d6
--- /dev/null
+++ b/packages/ui/src/lib/planSaveQueue.ts
@@ -0,0 +1,61 @@
+/**
+ * Write queue for open plan documents.
+ *
+ * Debounced autosave and close-time flushes must reach the disk in edit order,
+ * and a document re-opened while its own write is still in flight must read
+ * the post-write state, not race it. The queue serializes writes per logical
+ * document key and deduplicates revisions so a flush of revision N can never
+ * run behind, or twice behind, a debounced save of the same revision.
+ */
+
+interface PlanSaveQueue {
+  /**
+   * Queue one write for `key`. Writes for the same key run in schedule order;
+   * writes for different keys never block each other. A revision at or below
+   * the last queued revision for that key is skipped — the queued write
+   * already carries newer content — and the returned promise tracks the
+   * outstanding chain so callers can still await it.
+   */
+  schedule: (key: string, revision: number, write: () => Promise<void>) => Promise<void>;
+  /** Resolves when every write queued for `key` has settled. */
+  pendingFor: (key: string) => Promise<void>;
+  /**
+   * Forgets the revision watermark for `key`. Call when a document is freshly
+   * loaded: its revision counter restarts, and stale watermarks from a
+   * previous open must not swallow the first real edit.
+   */
+  reset: (key: string) => void;
+}
+
+export const createPlanSaveQueue = (): PlanSaveQueue => {
+  const chains = new Map<string, Promise<void>>();
+  const lastRevision = new Map<string, number>();
+
+  return {
+    schedule: (key, revision, write) => {
+      if (revision <= (lastRevision.get(key) ?? Number.NEGATIVE_INFINITY)) {
+        return chains.get(key) ?? Promise.resolve();
+      }
+      lastRevision.set(key, revision);
+      const previous = chains.get(key) ?? Promise.resolve();
+      // A failed write must not poison the chain: the next write for this
+      // document is still safe to attempt, and error surfacing belongs to the
+      // caller that owns UI state.
+      const next = previous.then(write, write);
+      chains.set(key, next.catch(() => {
+        // Keep newer queued revisions deduplicated, but let the caller retry
+        // this exact revision after its write has failed.
+        if (lastRevision.get(key) === revision) {
+          lastRevision.delete(key);
+        }
+      }));
+      return next;
+    },
+    pendingFor: async (key) => {
+      await chains.get(key);
+    },
+    reset: (key) => {
+      lastRevision.delete(key);
+    },
+  };
+};
diff --git a/packages/ui/src/lib/projectContextApi.ts b/packages/ui/src/lib/projectContextApi.ts
index ba555cb0..a1f991f9 100644
--- a/packages/ui/src/lib/projectContextApi.ts
+++ b/packages/ui/src/lib/projectContextApi.ts
@@ -57,6 +57,17 @@ export interface ProjectRef {
   path: string;
 }
 
+/**
+ * A saved project plan plus the project that owns it, carried as one value so
+ * a viewer can never end up with a plan id whose owner it has to guess.
+ * PlanView resolves no owner on its own: the panel (or the persisted tab,
+ * or the mobile surface) that opened the plan knows the owner exactly.
+ */
+export interface SavedProjectPlanTarget {
+  projectRef: ProjectRef;
+  planId: string;
+}
+
 export const PROJECT_NOTE_BODY_MAX_LENGTH = 3000;
 export const PROJECT_TODO_TEXT_MAX_LENGTH = 120;
 
diff --git a/packages/ui/src/stores/useUIStore.contextPanel.test.ts b/packages/ui/src/stores/useUIStore.contextPanel.test.ts
index 9f89be00..749272f8 100644
--- a/packages/ui/src/stores/useUIStore.contextPanel.test.ts
+++ b/packages/ui/src/stores/useUIStore.contextPanel.test.ts
@@ -28,6 +28,183 @@ describe('useUIStore context panel tabs', () => {
     expect(tabs).toHaveLength(1);
     expect(tabs[0]?.readOnly).toBe(false);
   });
+
+  test('keeps a plan tab that carries its owning project', () => {
+    const directory = '/repo';
+    const projectRef = { id: 'proj_1', path: '/repo' };
+
+    useUIStore.getState().openContextPanelTab(directory, {
+      mode: 'plan',
+      projectPlanId: 'plan-1',
+      projectPlanRef: projectRef,
+      dedupeKey: `plan:${projectRef.id}:plan-1`,
+      label: 'My plan',
+    });
+
+    const tabs = useUIStore.getState().contextPanelByDirectory[directory]?.tabs ?? [];
+    expect(tabs).toHaveLength(1);
+    expect(tabs[0]?.projectPlanId).toBe('plan-1');
+    expect(tabs[0]?.projectPlanRef).toEqual(projectRef);
+  });
+
+  test('dedupes plan tabs by owner and plan id, not by plan id alone', () => {
+    const directory = '/repo';
+
+    useUIStore.getState().openContextPanelTab(directory, {
+      mode: 'plan',
+      projectPlanId: 'plan-1',
+      projectPlanRef: { id: 'proj_1', path: '/repo' },
+      dedupeKey: 'plan:proj_1:plan-1',
+    });
+    useUIStore.getState().openContextPanelTab(directory, {
+      mode: 'plan',
+      projectPlanId: 'plan-1',
+      projectPlanRef: { id: 'proj_1', path: '/repo' },
+      dedupeKey: 'plan:proj_1:plan-1',
+    });
+
+    const tabs = useUIStore.getState().contextPanelByDirectory[directory]?.tabs ?? [];
+    expect(tabs).toHaveLength(1);
+  });
+
+  test('drops persisted plan tabs whose owner is missing instead of guessing it', () => {
+    const directory = '/repo';
+    const persisted = {
+      contextPanelByDirectory: {
+        [directory]: {
+          isOpen: true,
+          expanded: false,
+          widthByMode: {},
+          touchedAt: 1,
+          activeTabId: 'plan:plan-1',
+          tabs: [
+            // Pre-owner tab: has an id but no projectPlanRef.
+            {
+              id: 'plan:plan-1',
+              mode: 'plan',
+              targetPath: null,
+              projectPlanId: 'plan-1',
+              projectPlanRef: null,
+              dedupeKey: 'plan:plan-1',
+              label: 'Old plan',
+              sessionTitleFallback: null,
+              readOnly: false,
+              stagedDiff: false,
+              diffScope: null,
+              touchedAt: 1,
+            },
+          ],
+        },
+      },
+    };
+
+    // SAFETY: the object mirrors the persisted context-panel shape exactly;
+    // setState bypasses the persist middleware's typing, not its migration.
+    useUIStore.setState(persisted as never);
+    // Sanitization runs whenever panel state is touched; opening a valid tab
+    // is the ordinary touch that would flush stale persisted tabs out.
+    useUIStore.getState().openContextPanelTab(directory, {
+      mode: 'plan',
+      projectPlanId: 'plan-2',
+      projectPlanRef: { id: 'proj_1', path: '/repo' },
+      dedupeKey: 'plan:proj_1:plan-2',
+    });
+
+    const tabs = useUIStore.getState().contextPanelByDirectory[directory]?.tabs ?? [];
+    expect(tabs).toHaveLength(1);
+    expect(tabs[0]?.projectPlanId).toBe('plan-2');
+  });
+
+  test('keeps a generic filesystem plan tab that has no saved-plan identity', () => {
+    const directory = '/repo';
+    useUIStore.getState().openContextSurface(directory, 'plan');
+    // A later touch runs the same sanitizer rehydrate uses.
+    useUIStore.getState().openContextPanelTab(directory, { mode: 'diff' });
+
+    const tabs = useUIStore.getState().contextPanelByDirectory[directory]?.tabs ?? [];
+    const planTab = tabs.find((tab) => tab.mode === 'plan');
+    expect(planTab).toBeDefined();
+    expect(planTab?.projectPlanId).toBeNull();
+    expect(planTab?.projectPlanRef).toBeNull();
+  });
+
+  test('keeps a persisted generic plan tab through rehydration-like touches', () => {
+    const directory = '/repo';
+    const persisted = {
+      contextPanelByDirectory: {
+        [directory]: {
+          isOpen: true,
+          expanded: false,
+          widthByMode: {},
+          touchedAt: 1,
+          activeTabId: 'plan',
+          tabs: [
+            {
+              id: 'plan',
+              mode: 'plan',
+              targetPath: null,
+              projectPlanId: null,
+              projectPlanRef: null,
+              dedupeKey: 'plan',
+              label: 'Plan',
+              sessionTitleFallback: null,
+              readOnly: false,
+              stagedDiff: false,
+              diffScope: null,
+              touchedAt: 1,
+            },
+          ],
+        },
+      },
+    };
+
+    // SAFETY: the object mirrors the persisted context-panel shape exactly;
+    // setState bypasses the persist middleware's typing, not its migration.
+    useUIStore.setState(persisted as never);
+    useUIStore.getState().openContextPanelTab(directory, { mode: 'diff' });
+
+    const tabs = useUIStore.getState().contextPanelByDirectory[directory]?.tabs ?? [];
+    expect(tabs.some((tab) => tab.mode === 'plan')).toBe(true);
+  });
+
+  test('drops a persisted saved-plan tab carrying an owner but no plan id', () => {
+    const directory = '/repo';
+    const persisted = {
+      contextPanelByDirectory: {
+        [directory]: {
+          isOpen: true,
+          expanded: false,
+          widthByMode: {},
+          touchedAt: 1,
+          activeTabId: null,
+          tabs: [
+            {
+              id: 'plan:proj_1:plan-1',
+              mode: 'plan',
+              targetPath: null,
+              projectPlanId: null,
+              projectPlanRef: { id: 'proj_1', path: '/repo' },
+              dedupeKey: 'plan:proj_1:plan-1',
+              label: 'Half-identified',
+              sessionTitleFallback: null,
+              readOnly: false,
+              stagedDiff: false,
+              diffScope: null,
+              touchedAt: 1,
+            },
+          ],
+        },
+      },
+    };
+
+    // SAFETY: the object mirrors the persisted context-panel shape exactly;
+    // setState bypasses the persist middleware's typing, not its migration.
+    useUIStore.setState(persisted as never);
+    useUIStore.getState().openContextPanelTab(directory, { mode: 'diff' });
+
+    const tabs = useUIStore.getState().contextPanelByDirectory[directory]?.tabs ?? [];
+    expect(tabs.some((tab) => tab.mode === 'plan')).toBe(false);
+  });
 });
 
 describe('useUIStore openContextSurface', () => {
diff --git a/packages/ui/src/stores/useUIStore.ts b/packages/ui/src/stores/useUIStore.ts
index 8ec57362..214bc2a1 100644
--- a/packages/ui/src/stores/useUIStore.ts
+++ b/packages/ui/src/stores/useUIStore.ts
@@ -8,6 +8,7 @@ import type { DraftStarterRef } from '@/lib/draftStarters';
 import { DEFAULT_MONO_FONT, DEFAULT_UI_FONT, type MonoFontOption, type UiFontOption } from '@/lib/fontOptions';
 import { getStoredMobileKeyboardMode, type MobileKeyboardMode } from '@/lib/mobileKeyboardMode';
 import type { TerminalShell } from '@/lib/api/types';
+import type { ProjectRef } from '@/lib/projectContextApi';
 import { useFilesViewTabsStore } from './useFilesViewTabsStore';
 import { isWindowsArm64 } from '@/lib/platform';
 import { isVSCodeRuntime } from '@/lib/desktop';
@@ -37,6 +38,10 @@ type ContextPanelTab = {
       panel. Project plans are addressed by id because their markdown is
       server-owned and has no client-visible path. */
   projectPlanId: string | null;
+  /** The project that owns `projectPlanId`. Persisted with the tab so a
+      restored plan tab opens against its own project instead of guessing the
+      owner from whatever directory happens to be current. */
+  projectPlanRef: ProjectRef | null;
   dedupeKey: string;
   label: string | null;
   sessionTitleFallback: string | null;
@@ -50,6 +55,7 @@ type ContextPanelTabDescriptor = {
   mode: ContextPanelMode;
   targetPath?: string | null;
   projectPlanId?: string | null;
+  projectPlanRef?: ProjectRef | null;
   dedupeKey?: string | null;
   label?: string | null;
   sessionTitleFallback?: string | null;
@@ -191,6 +197,18 @@ const normalizePendingDiffScope = (value: unknown): PendingDiffScope | null => {
   return value === 'working' || value === 'staged' || value === 'turn' || value === 'branch' ? value : null;
 };
 
+/** A plan tab's owner must be a complete project reference or nothing; a
+    half-valid one is worse than none because it points the editor somewhere. */
+const normalizeContextPanelProjectPlanRef = (value: unknown): ProjectRef | null => {
+  if (!value || typeof value !== 'object' || Array.isArray(value)) {
+    return null;
+  }
+  const candidate = value as { id?: unknown; path?: unknown };
+  const id = typeof candidate.id === 'string' ? candidate.id.trim() : '';
+  const path = typeof candidate.path === 'string' ? candidate.path.trim() : '';
+  return id && path ? { id, path } : null;
+};
+
 const buildDefaultContextPanelTabDedupeKey = (mode: ContextPanelMode, targetPath: string | null): string => {
   if (mode === 'file') {
     return targetPath || mode;
@@ -240,6 +258,7 @@ const createContextPanelTab = (descriptor: ContextPanelTabDescriptor): ContextPa
     projectPlanId: typeof descriptor.projectPlanId === 'string' && descriptor.projectPlanId.trim()
       ? descriptor.projectPlanId.trim()
       : null,
+    projectPlanRef: normalizeContextPanelProjectPlanRef(descriptor.projectPlanRef),
     dedupeKey,
     label: normalizeContextTabLabel(descriptor.label),
     sessionTitleFallback: normalizeContextTabLabel(descriptor.sessionTitleFallback),
@@ -300,6 +319,7 @@ const sanitizeContextPanelTabs = (tabs: unknown): ContextPanelTab[] => {
       mode?: unknown;
       targetPath?: unknown;
       projectPlanId?: unknown;
+      projectPlanRef?: unknown;
       dedupeKey?: unknown;
       label?: unknown;
       sessionTitleFallback?: unknown;
@@ -323,6 +343,19 @@ const sanitizeContextPanelTabs = (tabs: unknown): ContextPanelTab[] => {
     }
 
     const targetPath = normalizeContextTargetPath(typeof candidate.targetPath === 'string' ? candidate.targetPath : null);
+    const projectPlanId = typeof candidate.projectPlanId === 'string' && candidate.projectPlanId.trim()
+      ? candidate.projectPlanId.trim()
+      : null;
+    const projectPlanRef = normalizeContextPanelProjectPlanRef(candidate.projectPlanRef);
+    // `mode: 'plan'` covers two documents: a saved Project knowledge plan
+    // (needs both the plan id and its owning project) and a plain session
+    // filesystem plan (has neither). Only the half-identified form — id
+    // without owner — is unopenable: the editor would have to guess the
+    // project from the current directory, which is exactly the bug that made
+    // saved plans open empty. Such tabs are dropped rather than resurrected.
+    if (candidate.mode === 'plan' && (projectPlanId !== null) !== (projectPlanRef !== null)) {
+      continue;
+    }
     const dedupeKey = normalizeContextPanelTabDedupeKey(
       candidate.mode,
       targetPath,
@@ -338,9 +371,8 @@ const sanitizeContextPanelTabs = (tabs: unknown): ContextPanelTab[] => {
       id,
       mode: candidate.mode,
       targetPath,
-      projectPlanId: typeof candidate.projectPlanId === 'string' && candidate.projectPlanId.trim()
-        ? candidate.projectPlanId.trim()
-        : null,
+      projectPlanId,
+      projectPlanRef,
       dedupeKey,
       label: normalizeContextTabLabel(typeof candidate.label === 'string' ? candidate.label : null),
       sessionTitleFallback: normalizeContextTabLabel(typeof candidate.sessionTitleFallback === 'string' ? candidate.sessionTitleFallback : null),
@@ -405,20 +437,22 @@ const upsertContextPanelTab = (
   const existingIndex = baseTabs.findIndex((tab) => tab.id === nextTab.id);
   const tabs = existingIndex === -1
     ? [...baseTabs, nextTab]
-    : baseTabs.map((tab, index) => (index === existingIndex
-      ? {
-          ...tab,
-          mode: nextTab.mode,
-          targetPath: nextTab.targetPath || tab.targetPath,
-          dedupeKey: nextTab.dedupeKey,
-          label: nextTab.label,
-          sessionTitleFallback: nextTab.sessionTitleFallback || tab.sessionTitleFallback,
-          stagedDiff: nextTab.stagedDiff,
-          diffScope: nextTab.diffScope,
-          readOnly: nextTab.readOnly,
-          touchedAt: Date.now(),
-        }
-      : tab));
+     : baseTabs.map((tab, index) => (index === existingIndex
+       ? {
+           ...tab,
+           mode: nextTab.mode,
+           targetPath: nextTab.targetPath || tab.targetPath,
+           projectPlanId: nextTab.projectPlanId ?? tab.projectPlanId,
+           projectPlanRef: nextTab.projectPlanRef ?? tab.projectPlanRef,
+           dedupeKey: nextTab.dedupeKey,
+           label: nextTab.label,
+           sessionTitleFallback: nextTab.sessionTitleFallback || tab.sessionTitleFallback,
+           stagedDiff: nextTab.stagedDiff,
+           diffScope: nextTab.diffScope,
+           readOnly: nextTab.readOnly,
+           touchedAt: Date.now(),
+         }
+       : tab));
 
   // A background upsert (an agent working a page) keeps the panel exactly as
   // the user left it: closed stays closed, and whatever tab they were on
@@ -545,6 +579,10 @@ const sanitizeContextPanelByDirectory = (
     let tabs = sanitizeContextPanelTabs(candidate.tabs);
     let activeTabId = typeof candidate.activeTabId === 'string' ? candidate.activeTabId : null;
 
+    // Legacy single-tab state can name a saved project plan, but it carries
+    // no owner and cannot be migrated into an openable saved-plan tab — that
+    // combination is dropped by sanitize above. A generic filesystem plan tab
+    // (no plan id) revives fine from the descriptor alone.
     if (tabs.length === 0 && (candidate.mode === 'diff' || candidate.mode === 'file' || candidate.mode === 'context' || candidate.mode === 'plan' || candidate.mode === 'chat')) {
       tabs = [createContextPanelTab({
         mode: candidate.mode,