From 955d106465663581376da0955c0eb953432d8e6d Mon Sep 17 00:00:00 2001
From: taibai <taibai233@qq.com>
Date: Mon, 8 Jun 2026 16:21:26 +0800
Subject: [PATCH 01/64] feat(tui): empty enter scrolls viewport to bottom

---
 internal/cli/chat_tui.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/internal/cli/chat_tui.go b/internal/cli/chat_tui.go
index cdee4d263..929aa8e37 100644
--- a/internal/cli/chat_tui.go
+++ b/internal/cli/chat_tui.go
@@ -1041,6 +1041,7 @@ func (m chatTUI) update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			line := strings.TrimSpace(m.input.Value())
 
 			if line == "" {
+				m.viewport.GotoBottom()
 				return m, nil
 			}
 			if line == "exit" || line == "quit" || line == ":q" {

From d7c3c919a8093432ed1baa8a4acecd1a262a80a7 Mon Sep 17 00:00:00 2001
From: taibai <taibai233@qq.com>
Date: Mon, 8 Jun 2026 17:35:51 +0800
Subject: [PATCH 02/64] fix(tui): also scroll to bottom on empty enter during
 running state

---
 internal/cli/chat_tui.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/internal/cli/chat_tui.go b/internal/cli/chat_tui.go
index 929aa8e37..af39bf6f9 100644
--- a/internal/cli/chat_tui.go
+++ b/internal/cli/chat_tui.go
@@ -1017,6 +1017,7 @@ func (m chatTUI) update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			if m.state == tuiRunning {
 				line := strings.TrimSpace(m.input.Value())
 				if line == "" {
+					m.viewport.GotoBottom()
 					return m, nil
 				}
 				if m.queueEditCursor >= 0 && m.queueEditCursor < len(m.pendingInterject) {

From 0914389e2e6e10a16833767fe73cdcc3323cbe78 Mon Sep 17 00:00:00 2001
From: taibai <taibai233@qq.com>
Date: Mon, 8 Jun 2026 17:44:42 +0800
Subject: [PATCH 03/64] test(tui): add regression test for empty-enter
 scroll-to-bottom in both idle and running state

---
 internal/cli/chat_tui_test.go | 48 +++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/internal/cli/chat_tui_test.go b/internal/cli/chat_tui_test.go
index ca2b247dc..0050bcf1e 100644
--- a/internal/cli/chat_tui_test.go
+++ b/internal/cli/chat_tui_test.go
@@ -1101,6 +1101,54 @@ func TestTranscriptTailFollow(t *testing.T) {
 	}
 }
 
+// TestEmptyEnterScrollsToBottom proves that pressing Enter with an empty composer
+// scrolls the viewport to the bottom in both idle and running states, so the user
+// can quickly tail-follow after scrolling up to read history.
+func TestEmptyEnterScrollsToBottom(t *testing.T) {
+	ctrl := control.New(control.Options{})
+	ch := make(chan event.Event, 1)
+	notice := agentEventMsg(event.Event{Kind: event.Notice, Level: event.LevelInfo, Text: "line"})
+	adv := func(m chatTUI, msg tea.Msg) chatTUI {
+		n, _ := m.Update(msg)
+		return n.(chatTUI)
+	}
+
+	// --- idle state ---
+	t.Run("idle", func(t *testing.T) {
+		cur := adv(newChatTUI(ctrl, "", ch, 80), tea.WindowSizeMsg{Width: 80, Height: 8})
+		for i := 0; i < 12; i++ {
+			cur = adv(cur, notice)
+		}
+		// Scroll up to leave the bottom.
+		cur = adv(cur, tea.MouseWheelMsg{Button: tea.MouseWheelUp})
+		if cur.viewport.AtBottom() {
+			t.Fatal("wheel-up should break the bottom pin")
+		}
+		// Empty enter → should snap back to bottom.
+		cur = adv(cur, tea.KeyPressMsg{Code: tea.KeyEnter})
+		if !cur.viewport.AtBottom() {
+			t.Error("empty enter while idle should scroll viewport to bottom")
+		}
+	})
+
+	// --- running state ---
+	t.Run("running", func(t *testing.T) {
+		cur := adv(newChatTUI(ctrl, "", ch, 80), tea.WindowSizeMsg{Width: 80, Height: 8})
+		for i := 0; i < 12; i++ {
+			cur = adv(cur, notice)
+		}
+		cur.state = tuiRunning
+		cur = adv(cur, tea.MouseWheelMsg{Button: tea.MouseWheelUp})
+		if cur.viewport.AtBottom() {
+			t.Fatal("wheel-up should break the bottom pin")
+		}
+		cur = adv(cur, tea.KeyPressMsg{Code: tea.KeyEnter})
+		if !cur.viewport.AtBottom() {
+			t.Error("empty enter while running should scroll viewport to bottom")
+		}
+	})
+}
+
 func TestFoldedPasteUsesPlaceholderAndExpandsOnSend(t *testing.T) {
 	m := newTestChatTUI()
 	pasted := "{\n  \"a\": 1,\n  \"b\": 2,\n  \"c\": 3,\n  \"d\": 4\n}"

From e40a98eb5569e78d58bd26d05183cfb41db382e1 Mon Sep 17 00:00:00 2001
From: YHH <359807859@qq.com>
Date: Tue, 9 Jun 2026 03:13:13 -0700
Subject: [PATCH 04/64] fix(cli): disable codegraph in ACP session config test
 (#3663)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

TestACPFactoryLoadsSessionCwdProjectConfig builds a full controller via
boot.Build with the default config, which starts the codegraph serve
daemon when the binary is installed. The daemon opens
<workspaceRoot>/.codegraph/codegraph.db and on Windows holds the handle
past Close, so t.TempDir cleanup fails with "being used by another
process". The test only exercises ACP project-command loading, so turn
codegraph off — matching the boot tests' convention.

Co-authored-by: reasonix <reasonix@deepseek.com>
---
 internal/cli/acp_test.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/internal/cli/acp_test.go b/internal/cli/acp_test.go
index 3e71cbf92..5196acae6 100644
--- a/internal/cli/acp_test.go
+++ b/internal/cli/acp_test.go
@@ -75,6 +75,9 @@ func TestACPFactoryLoadsSessionCwdProjectConfig(t *testing.T) {
 	if err := os.WriteFile(filepath.Join(project, "reasonix.toml"), []byte(`
 default_model = "local"
 
+[codegraph]
+enabled = false
+
 [[providers]]
 name = "local"
 kind = "acp-test-provider"

From da8b7b566163e0a7c429723ed0f576ac2c0baecb Mon Sep 17 00:00:00 2001
From: YHH <359807859@qq.com>
Date: Tue, 9 Jun 2026 03:28:23 -0700
Subject: [PATCH 05/64] feat(desktop): build a Linux .deb package on release
 (#3634)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The desktop release dropped Debian/Ubuntu packaging in the v2 rewrite —
Linux only shipped a bare-binary tar.gz (discussion #3627). Add a .deb
built with goreleaser/nfpm in desktop-build.sh's linux branch.

- desktop/build/linux/nfpm.yaml + reasonix.desktop describe the package:
  binary to /usr/bin, .desktop entry, icon to /usr/share/pixmaps, and
  libgtk-3-0 + libwebkit2gtk-4.1-0 runtime deps apt resolves on install.
- The .deb is a human-download artifact only (like the macOS .dmg); the
  Linux updater channel stays the tar.gz, so cmd/sign's manifest skips
  .deb files. A test locks the linux-amd64 key to the tarball.
- release-desktop.yml installs nfpm (pinned v2.46.3) on the Linux runner.

The existing sign / upload / release / R2-mirror steps already glob dist/*,
so the .deb is signed, attached to the GitHub release, and mirrored with no
further workflow changes.

Co-authored-by: reasonix <reasonix@deepseek.com>
---
 .github/workflows/release-desktop.yml |  6 ++++
 desktop/.gitignore                    |  8 ++++++
 desktop/build/linux/nfpm.yaml         | 41 +++++++++++++++++++++++++++
 desktop/build/linux/reasonix.desktop  |  9 ++++++
 desktop/cmd/sign/main.go              |  5 ++++
 desktop/cmd/sign/main_test.go         | 11 +++++++
 scripts/desktop-build.sh              | 10 ++++++-
 7 files changed, 89 insertions(+), 1 deletion(-)
 create mode 100644 desktop/build/linux/nfpm.yaml
 create mode 100644 desktop/build/linux/reasonix.desktop

diff --git a/.github/workflows/release-desktop.yml b/.github/workflows/release-desktop.yml
index 26c0ca54a..214994966 100644
--- a/.github/workflows/release-desktop.yml
+++ b/.github/workflows/release-desktop.yml
@@ -92,6 +92,12 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y gcc libgtk-3-dev libwebkit2gtk-4.1-dev
 
+      # Linux: nfpm builds the .deb in desktop-build.sh's linux branch. go install
+      # drops it in ~/go/bin, already on PATH (same place the wails CLI lands below).
+      - name: Install nfpm
+        if: runner.os == 'Linux'
+        run: go install github.com/goreleaser/nfpm/v2/cmd/nfpm@v2.46.3
+
       # Windows: NSIS provides makensis for `wails build -nsis`.
       - name: Install NSIS
         if: runner.os == 'Windows'
diff --git a/desktop/.gitignore b/desktop/.gitignore
index 3e30c7aac..d4f6c4e5f 100644
--- a/desktop/.gitignore
+++ b/desktop/.gitignore
@@ -19,6 +19,14 @@
 /build/darwin/*
 !/build/darwin/entitlements.plist
 
+# Commit the hand-written Linux .deb packaging inputs (nfpm config + .desktop entry).
+# `wails build` does not generate these, so they must live in git. The .deb is built
+# by scripts/desktop-build.sh's linux branch via goreleaser/nfpm. Parent un-ignored first.
+!/build/linux
+/build/linux/*
+!/build/linux/nfpm.yaml
+!/build/linux/reasonix.desktop
+
 # Go test binaries
 *.test
 
diff --git a/desktop/build/linux/nfpm.yaml b/desktop/build/linux/nfpm.yaml
new file mode 100644
index 000000000..85408acfd
--- /dev/null
+++ b/desktop/build/linux/nfpm.yaml
@@ -0,0 +1,41 @@
+# nfpm config for the Linux .deb package. scripts/desktop-build.sh's linux branch
+# runs `nfpm package` after `wails build`, from the desktop/ dir (so the src paths
+# below are relative to desktop/). The .deb is a human-download artifact only — like
+# the macOS .dmg — so the Linux updater channel stays the .tar.gz and cmd/sign's
+# manifest skips .deb files.
+#
+# $DEB_VERSION and $DEB_ARCH are exported by desktop-build.sh. DEB_VERSION is the tag
+# minus a leading "v" and any prerelease suffix (a strict X.Y.Z that dpkg accepts);
+# DEB_ARCH is the Go arch name, which already matches Debian's (amd64, arm64).
+name: "reasonix-desktop"
+arch: "${DEB_ARCH}"
+platform: "linux"
+version: "${DEB_VERSION}"
+section: "utils"
+priority: "optional"
+maintainer: "esengine <esengine@users.noreply.github.com>"
+description: |
+  Reasonix desktop — a Wails shell around the Go kernel.
+vendor: "Reasonix Contributors"
+homepage: "https://github.com/esengine/DeepSeek-Reasonix"
+license: "MIT"
+# Runtime libraries the WebKitGTK 4.1 build links against (-tags webkit2_41); apt
+# pulls them in on install. These package names ship from Ubuntu 22.04 / Debian 12 on.
+depends:
+  - libgtk-3-0
+  - libwebkit2gtk-4.1-0
+contents:
+  - src: ./build/bin/reasonix-desktop
+    dst: /usr/bin/reasonix-desktop
+    file_info:
+      mode: 0755
+  - src: ./build/linux/reasonix.desktop
+    dst: /usr/share/applications/reasonix.desktop
+    file_info:
+      mode: 0644
+  # appicon.png is 1024x1024 — not a standard hicolor size dir, so install it under
+  # the size-agnostic pixmaps path that the .desktop's `Icon=reasonix-desktop` finds.
+  - src: ./build/appicon.png
+    dst: /usr/share/pixmaps/reasonix-desktop.png
+    file_info:
+      mode: 0644
diff --git a/desktop/build/linux/reasonix.desktop b/desktop/build/linux/reasonix.desktop
new file mode 100644
index 000000000..806276a08
--- /dev/null
+++ b/desktop/build/linux/reasonix.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Name=Reasonix
+Comment=Reasonix desktop — a Wails shell around the Go kernel
+Exec=reasonix-desktop
+Icon=reasonix-desktop
+Categories=Development;Utility;
+Terminal=false
+StartupWMClass=reasonix-desktop
diff --git a/desktop/cmd/sign/main.go b/desktop/cmd/sign/main.go
index 8aa205586..751072536 100644
--- a/desktop/cmd/sign/main.go
+++ b/desktop/cmd/sign/main.go
@@ -207,6 +207,11 @@ func genManifest(dir, version, tag string) error {
 
 // matchPlatform returns the platform key embedded in a file name, or "" if none.
 func matchPlatform(name string) string {
+	// The .deb is a human-download package (like the macOS .dmg); the Linux updater
+	// channel is the .tar.gz. Skip it so it doesn't shadow the tarball's linux-amd64 key.
+	if strings.HasSuffix(name, ".deb") {
+		return ""
+	}
 	if strings.Contains(name, "windows-amd64") && !strings.HasSuffix(name, "-installer.exe") {
 		return ""
 	}
diff --git a/desktop/cmd/sign/main_test.go b/desktop/cmd/sign/main_test.go
index a5403259b..f5d903144 100644
--- a/desktop/cmd/sign/main_test.go
+++ b/desktop/cmd/sign/main_test.go
@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"os"
 	"path/filepath"
+	"strings"
 	"testing"
 
 	"aead.dev/minisign"
@@ -57,6 +58,7 @@ func TestGenManifest(t *testing.T) {
 		"Reasonix-windows-amd64-installer.exe",
 		"Reasonix-windows-amd64.zip", // portable download, not the updater channel
 		"Reasonix-linux-amd64.tar.gz",
+		"Reasonix-linux-amd64.deb",            // human download, not the updater channel
 		"Reasonix-linux-amd64.tar.gz.minisig", // must be skipped
 		"README.txt",                          // unmatched, must be skipped
 	}
@@ -98,4 +100,13 @@ func TestGenManifest(t *testing.T) {
 	if win.SHA256 == "" || win.Size == 0 {
 		t.Fatalf("windows asset missing digest/size: %+v", win)
 	}
+	// The Linux updater channel must stay the .tar.gz; the co-located .deb is a
+	// human download and must not shadow the linux-amd64 key.
+	lin, ok := m.Platforms["linux-amd64"]
+	if !ok {
+		t.Fatal("linux-amd64 missing")
+	}
+	if !strings.HasSuffix(lin.URL, "/Reasonix-linux-amd64.tar.gz") {
+		t.Fatalf("linux-amd64 url = %q, want the .tar.gz, not the .deb", lin.URL)
+	}
 }
diff --git a/scripts/desktop-build.sh b/scripts/desktop-build.sh
index 9d8ba7eda..071cdb53f 100755
--- a/scripts/desktop-build.sh
+++ b/scripts/desktop-build.sh
@@ -9,7 +9,8 @@
 #            Reasonix-darwin-universal.dmg               (drag-to-install; human download)
 #   Windows: Reasonix-windows-<arch>-installer.exe       (NSIS per-user installer; updater channel)
 #            Reasonix-windows-<arch>.zip                 (portable human download)
-#   Linux:   Reasonix-linux-<arch>.tar.gz                (bare binary)
+#   Linux:   Reasonix-linux-<arch>.tar.gz                (bare binary; updater channel)
+#            Reasonix-linux-<arch>.deb                   (Debian/Ubuntu package; human download)
 #
 # Usage: scripts/desktop-build.sh <os/arch> <version> [channel]
 #   e.g. scripts/desktop-build.sh darwin/arm64 v1.1.0
@@ -138,6 +139,13 @@ windows)
 	;;
 linux)
 	tar -czf "$ROOT/dist/${APPNAME}-linux-${arch}.tar.gz" -C build/bin "$BINNAME"
+	# Also build a .deb for Debian/Ubuntu users (goreleaser/nfpm; see
+	# desktop/build/linux/nfpm.yaml). Human-download only: the Linux updater channel
+	# stays the tarball and cmd/sign's manifest skips .deb files. nfpm reads
+	# $DEB_VERSION/$DEB_ARCH — dpkg wants a strict numeric version, so reuse numver.
+	DEB_VERSION="$numver" DEB_ARCH="$arch" \
+		nfpm package --config build/linux/nfpm.yaml --packager deb \
+		--target "$ROOT/dist/${APPNAME}-linux-${arch}.deb"
 	;;
 *)
 	echo "unsupported os: $os" >&2

From 9dd3bb3517e5a676e474e16a25c144b21dba7c1b Mon Sep 17 00:00:00 2001
From: paradoxSCH <64133628+paradoxSCH@users.noreply.github.com>
Date: Tue, 9 Jun 2026 18:51:08 +0800
Subject: [PATCH 06/64] fix(memory): handle forget failures in desktop (#3662)

---
 .../frontend/src/components/MemoryPanel.tsx   | 27 ++++++++++++++++
 desktop/frontend/src/styles.css               | 11 +++++++
 internal/memory/store.go                      | 31 ++++++++++++++++++-
 internal/memory/store_test.go                 | 20 ++++++++++++
 4 files changed, 88 insertions(+), 1 deletion(-)

diff --git a/desktop/frontend/src/components/MemoryPanel.tsx b/desktop/frontend/src/components/MemoryPanel.tsx
index 3a4afe5e8..d72cbbf87 100644
--- a/desktop/frontend/src/components/MemoryPanel.tsx
+++ b/desktop/frontend/src/components/MemoryPanel.tsx
@@ -80,6 +80,11 @@ function memoryDocPreview(body: string): string {
   return lines.length > 6 ? `${preview}\n...` : preview;
 }
 
+function errorMessage(err: unknown): string {
+  if (err instanceof Error) return err.message;
+  return String(err || "Unknown error");
+}
+
 // MemoryPanel is the desktop memory manager: a right-side drawer over the loaded
 // REASONIX.md hierarchy and saved auto-memories. Unlike Claude Code's /memory
 // (which shells out to $EDITOR) it edits docs in place, and unlike Codex (no UI
@@ -111,6 +116,7 @@ export function MemoryPanel({
   const [typeFilter, setTypeFilter] = useState("all");
   const [expanded, setExpanded] = useState<string | null>(null);
   const [confirmForget, setConfirmForget] = useState<string | null>(null);
+  const [error, setError] = useState<string | null>(null);
   const factRefs = useRef<Record<string, HTMLElement | null>>({});
 
   // Filter input — a single substring search across docs and facts. The
@@ -198,10 +204,13 @@ export function MemoryPanel({
   const forgetFact = async (name: string) => {
     if (busy) return;
     setBusy(true);
+    setError(null);
     try {
       await onForget(name);
       if (expanded === name) setExpanded(null);
       setConfirmForget(null);
+    } catch (err) {
+      setError(errorMessage(err));
     } finally {
       setBusy(false);
     }
@@ -223,9 +232,12 @@ export function MemoryPanel({
     const trimmed = note.trim();
     if (!trimmed || busy) return;
     setBusy(true);
+    setError(null);
     try {
       await onRemember(activeScope, trimmed);
       setNote("");
+    } catch (err) {
+      setError(errorMessage(err));
     } finally {
       setBusy(false);
     }
@@ -239,9 +251,12 @@ export function MemoryPanel({
   const saveEdit = async () => {
     if (editingPath === null || busy) return;
     setBusy(true);
+    setError(null);
     try {
       await onSaveDoc(editingPath, draft);
       setEditingPath(null);
+    } catch (err) {
+      setError(errorMessage(err));
     } finally {
       setBusy(false);
     }
@@ -308,6 +323,7 @@ export function MemoryPanel({
                   ))}
                 </div>
               </div>
+              {error && <div className="mem-error" role="alert">{error}</div>}
               {facts.length === 0 ? (
                 <div className="mem-empty">{t("memory.noFacts")}</div>
               ) : filteredFacts.length === 0 ? (
@@ -582,6 +598,7 @@ export function MemorySettingsPage() {
 	const [expanded, setExpanded] = useState<string | null>(null);
 	const [expandedDoc, setExpandedDoc] = useState<string | null>(null);
 	const [confirmForget, setConfirmForget] = useState<string | null>(null);
+	const [error, setError] = useState<string | null>(null);
 	const [tab, setTab] = useState<"memories" | "docs">("memories");
 	const [showAdd, setShowAdd] = useState(false);
 	const factRefs = useRef<Record<string, HTMLElement | null>>({});
@@ -662,11 +679,14 @@ export function MemorySettingsPage() {
 	const forgetFact = useCallback(async (name: string) => {
 		if (busy) return;
 		setBusy(true);
+		setError(null);
 		try {
 			await app.Forget(name);
 			await reload();
 			if (expanded === name) setExpanded(null);
 			setConfirmForget(null);
+		} catch (err) {
+			setError(errorMessage(err));
 		} finally {
 			setBusy(false);
 		}
@@ -680,11 +700,14 @@ export function MemorySettingsPage() {
 		const trimmed = note.trim();
 		if (!trimmed || busy) return;
 		setBusy(true);
+		setError(null);
 		try {
 			await app.Remember(activeScope, trimmed);
 			await reload();
 			setNote("");
 			setShowAdd(false);
+		} catch (err) {
+			setError(errorMessage(err));
 		} finally {
 			setBusy(false);
 		}
@@ -698,10 +721,13 @@ export function MemorySettingsPage() {
 	const saveEdit = useCallback(async () => {
 		if (editingPath === null || busy) return;
 		setBusy(true);
+		setError(null);
 		try {
 			await app.SaveDoc(editingPath, draft);
 			await reload();
 			setEditingPath(null);
+		} catch (err) {
+			setError(errorMessage(err));
 		} finally {
 			setBusy(false);
 		}
@@ -827,6 +853,7 @@ export function MemorySettingsPage() {
 						))}
 					</div>
 				</div>
+				{error && <div className="mem-error" role="alert">{error}</div>}
 				{facts.length === 0 ? (
 					<div className="mem-empty">{t("memory.noFacts")}</div>
 				) : filteredFacts.length === 0 ? (
diff --git a/desktop/frontend/src/styles.css b/desktop/frontend/src/styles.css
index 714665af9..9ff15e4d4 100644
--- a/desktop/frontend/src/styles.css
+++ b/desktop/frontend/src/styles.css
@@ -5065,6 +5065,17 @@ a[href] {
   color: var(--danger, #d66);
   font-size: 11.5px;
 }
+.mem-error {
+  margin-top: 8px;
+  padding: 7px 9px;
+  border: 1px solid color-mix(in srgb, var(--danger, #d66) 34%, transparent);
+  border-radius: 6px;
+  background: color-mix(in srgb, var(--danger, #d66) 10%, transparent);
+  color: var(--danger, #d66);
+  font-size: 11.5px;
+  line-height: 1.4;
+  overflow-wrap: anywhere;
+}
 .mem-fact--hl {
   background: var(--accent-soft, rgba(120, 170, 255, 0.12));
   border-color: color-mix(in srgb, var(--accent) 42%, transparent);
diff --git a/internal/memory/store.go b/internal/memory/store.go
index 8eb773daa..c779d92ea 100644
--- a/internal/memory/store.go
+++ b/internal/memory/store.go
@@ -130,12 +130,41 @@ func (s Store) Delete(name string) error {
 	if name == "" {
 		return fmt.Errorf("memory needs a name")
 	}
-	if err := os.Remove(filepath.Join(s.Dir, name+".md")); err != nil && !os.IsNotExist(err) {
+	if err := removeMemoryFile(filepath.Join(s.Dir, name+".md")); err != nil {
 		return err
 	}
 	return s.flushIndex(s.indexLinesExcept(name))
 }
 
+func removeMemoryFile(path string) error {
+	err := os.Remove(path)
+	if err == nil || os.IsNotExist(err) {
+		return nil
+	}
+	if !os.IsPermission(err) {
+		return err
+	}
+	repairOwnerWrite(path, false)
+	repairOwnerWrite(filepath.Dir(path), true)
+	err = os.Remove(path)
+	if err == nil || os.IsNotExist(err) {
+		return nil
+	}
+	return err
+}
+
+func repairOwnerWrite(path string, dir bool) {
+	info, err := os.Stat(path)
+	if err != nil {
+		return
+	}
+	need := os.FileMode(0o600)
+	if dir {
+		need = 0o700
+	}
+	_ = os.Chmod(path, info.Mode().Perm()|need)
+}
+
 // render serializes a memory to frontmatter + body. The frontmatter mirrors the
 // auto-memory shape (name / description / metadata.type) so the files are
 // interchangeable with that ecosystem and re-readable by loadMemory.
diff --git a/internal/memory/store_test.go b/internal/memory/store_test.go
index 1aa4b33ef..13e3a8940 100644
--- a/internal/memory/store_test.go
+++ b/internal/memory/store_test.go
@@ -146,6 +146,26 @@ func TestStoreDeleteMissingIsNoError(t *testing.T) {
 	}
 }
 
+func TestStoreDeleteRepairsReadOnlyMemoryFile(t *testing.T) {
+	s := Store{Dir: t.TempDir()}
+	if _, err := s.Save(Memory{Name: "locked", Description: "d", Type: TypeProject, Body: "b"}); err != nil {
+		t.Fatal(err)
+	}
+	path := filepath.Join(s.Dir, "locked.md")
+	if err := os.Chmod(path, 0o400); err != nil {
+		t.Fatal(err)
+	}
+	if err := s.Delete("locked"); err != nil {
+		t.Fatalf("delete read-only memory: %v", err)
+	}
+	if _, err := os.Stat(path); !os.IsNotExist(err) {
+		t.Fatalf("locked.md should be gone, stat err = %v", err)
+	}
+	if strings.Contains(s.Index(), "locked.md") {
+		t.Fatalf("deleted read-only entry still in index:\n%s", s.Index())
+	}
+}
+
 // TestNormalizeType maps unknown types to project and keeps known ones.
 func TestNormalizeType(t *testing.T) {
 	if got := NormalizeType("feedback"); got != TypeFeedback {

From 30477177de392be35b580cf3fc60d7a3c955ad48 Mon Sep 17 00:00:00 2001
From: YHH <359807859@qq.com>
Date: Tue, 9 Jun 2026 03:58:26 -0700
Subject: [PATCH 07/64] fix(rewind): fail loudly past a compacted boundary
 (#3598) + suffix-scan CanCode (#3438) (#3672)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(control): fail conversation rewind loudly past a compacted boundary

A turn's conversation-rewind boundary is the message-log index at turn
start. Compaction shrinks the log without rewriting boundaries, so for a
turn compacted away the boundary now exceeds len(Messages). Rewind tested
`boundary <= len` and, when false, skipped the truncation but still emitted
a "rewound conversation" success — code restored, conversation silently not.
Return a clear failure instead, and only report success when the log was
actually truncated.

Closes #3598

* fix(desktop): mark a turn code-rewindable when a later turn changed files

RestoreCode(turn) reverts every file touched in that turn or any later one,
so a turn that changed no files of its own can still rewind code when a
later turn did. CanCode only checked the turn's own paths, disabling the
code/both rewind buttons for such turns. Propagate CanCode backwards over
the oldest-first checkpoint list so the UI matches the backend's capability.

Refs #3438

---------

Co-authored-by: reasonix <reasonix@deepseek.com>
---
 desktop/app.go                      |  10 +++
 desktop/checkpoints_cancode_test.go |  71 +++++++++++++++++++
 internal/control/controller.go      |  28 ++++----
 internal/control/rewind_e2e_test.go | 101 ++++++++++++++++++++++++++++
 4 files changed, 198 insertions(+), 12 deletions(-)
 create mode 100644 desktop/checkpoints_cancode_test.go
 create mode 100644 internal/control/rewind_e2e_test.go

diff --git a/desktop/app.go b/desktop/app.go
index 74d8ee4f4..702069446 100644
--- a/desktop/app.go
+++ b/desktop/app.go
@@ -741,6 +741,16 @@ func (a *App) CheckpointsForTab(tabID string) []CheckpointMeta {
 			CanConversation: ctrl.CheckpointHasBoundary(m.Turn),
 		})
 	}
+	// RestoreCode(turn) reverts every file touched in this turn or any later one, so
+	// a turn can rewind code even when it changed no files itself — as long as a
+	// later turn did. Propagate CanCode backwards over the oldest-first list.
+	hasCodeAfter := false
+	for i := len(out) - 1; i >= 0; i-- {
+		if len(out[i].Files) > 0 {
+			hasCodeAfter = true
+		}
+		out[i].CanCode = hasCodeAfter
+	}
 	return out
 }
 
diff --git a/desktop/checkpoints_cancode_test.go b/desktop/checkpoints_cancode_test.go
new file mode 100644
index 000000000..f9e035622
--- /dev/null
+++ b/desktop/checkpoints_cancode_test.go
@@ -0,0 +1,71 @@
+package main
+
+import (
+	"encoding/json"
+	"os"
+	"path/filepath"
+	"strconv"
+	"testing"
+	"time"
+
+	"reasonix/internal/agent"
+	"reasonix/internal/checkpoint"
+	"reasonix/internal/control"
+	"reasonix/internal/event"
+)
+
+func seedCheckpoint(t *testing.T, ckptDir string, c checkpoint.Checkpoint) {
+	t.Helper()
+	b, err := json.Marshal(c)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if err := os.WriteFile(filepath.Join(ckptDir, "turn-"+strconv.Itoa(c.Turn)+".json"), b, 0o644); err != nil {
+		t.Fatal(err)
+	}
+}
+
+// TestCheckpointsCanCodePropagatesToEarlierTurns covers #3438: RestoreCode(turn)
+// reverts files touched in that turn or any later one, so a turn with no file
+// changes of its own can still rewind code when a later turn changed files. The
+// desktop CanCode flag must reflect that suffix capability, not just the turn's
+// own paths.
+func TestCheckpointsCanCodePropagatesToEarlierTurns(t *testing.T) {
+	dir := t.TempDir()
+	sessionPath := filepath.Join(dir, "s.jsonl")
+	ckptDir := sessionPath[:len(sessionPath)-len(".jsonl")] + ".ckpt"
+	if err := os.MkdirAll(ckptDir, 0o755); err != nil {
+		t.Fatal(err)
+	}
+	content := "old"
+	now := time.Now()
+	seedCheckpoint(t, ckptDir, checkpoint.Checkpoint{Turn: 0, Time: now, Prompt: "ask only", MsgIndex: 0})
+	seedCheckpoint(t, ckptDir, checkpoint.Checkpoint{Turn: 1, Time: now, Prompt: "edit a file", MsgIndex: 2,
+		Files: []checkpoint.FileSnap{{Path: "a.txt", Content: &content}}})
+	seedCheckpoint(t, ckptDir, checkpoint.Checkpoint{Turn: 2, Time: now, Prompt: "ask again", MsgIndex: 4})
+
+	ag := agent.New(nil, nil, agent.NewSession("sys"), agent.Options{}, event.Discard)
+	ctrl := control.New(control.Options{Executor: ag, SessionDir: dir, Label: "test"})
+	ctrl.SetSessionPath(sessionPath)
+
+	app := &App{}
+	app.setTestCtrl(ctrl, "test")
+
+	metas := app.CheckpointsForTab("test")
+	if len(metas) != 3 {
+		t.Fatalf("checkpoints = %d, want 3", len(metas))
+	}
+	got := map[int]bool{}
+	for _, m := range metas {
+		got[m.Turn] = m.CanCode
+	}
+	if !got[0] {
+		t.Error("turn 0 (no files of its own) should allow code rewind — turn 1 changed files")
+	}
+	if !got[1] {
+		t.Error("turn 1 changed files, should allow code rewind")
+	}
+	if got[2] {
+		t.Error("turn 2 is after the last file-bearing turn, should NOT allow code rewind")
+	}
+}
diff --git a/internal/control/controller.go b/internal/control/controller.go
index 6e57edbe3..b11dbcb1b 100644
--- a/internal/control/controller.go
+++ b/internal/control/controller.go
@@ -1050,20 +1050,24 @@ func (c *Controller) Rewind(turn int, scope RewindScope) error {
 			return c.rewindFail(fmt.Errorf("conversation rewind unavailable for turn %d (resumed session)", turn))
 		}
 		s := c.executor.Session()
-		if boundary <= len(s.Messages) {
-			s.Messages = s.Messages[:boundary]
-			c.mu.Lock()
-			c.cpTurn = turn // renumber future turns from here; later turns are gone
-			for k := range c.cpBound {
-				if k >= turn {
-					delete(c.cpBound, k)
-				}
-			}
-			c.mu.Unlock()
-			if err := c.Snapshot(); err != nil {
-				slog.Warn("controller: snapshot after rewind", "err", err)
+		// boundary is the message-log index at turn start; compaction shrinks the
+		// log without rewriting boundaries, so a stale boundary past the end means
+		// the turn was compacted away — fail loudly instead of skipping silently.
+		if boundary > len(s.Messages) {
+			return c.rewindFail(fmt.Errorf("conversation rewind unavailable for turn %d: the conversation was compacted past this point", turn))
+		}
+		s.Messages = s.Messages[:boundary]
+		c.mu.Lock()
+		c.cpTurn = turn // renumber future turns from here; later turns are gone
+		for k := range c.cpBound {
+			if k >= turn {
+				delete(c.cpBound, k)
 			}
 		}
+		c.mu.Unlock()
+		if err := c.Snapshot(); err != nil {
+			slog.Warn("controller: snapshot after rewind", "err", err)
+		}
 		c.sink.Emit(event.Event{Kind: event.Notice, Level: event.LevelInfo,
 			Text: fmt.Sprintf("rewound conversation to turn %d", turn)})
 	}
diff --git a/internal/control/rewind_e2e_test.go b/internal/control/rewind_e2e_test.go
new file mode 100644
index 000000000..3ce498dc7
--- /dev/null
+++ b/internal/control/rewind_e2e_test.go
@@ -0,0 +1,101 @@
+package control
+
+import (
+	"context"
+	"strings"
+	"testing"
+
+	"reasonix/internal/agent"
+	"reasonix/internal/event"
+	"reasonix/internal/provider"
+	"reasonix/internal/tool"
+)
+
+func runTwoTurns(t *testing.T) (*Controller, *agent.Agent, *[]event.Event) {
+	t.Helper()
+	dir := t.TempDir()
+	prov := &scriptedTurns{turns: [][]provider.Chunk{
+		textTurn("first answer"),
+		textTurn("second answer"),
+	}}
+	ag := agent.New(prov, tool.NewRegistry(), agent.NewSession("sys"), agent.Options{}, event.Discard)
+	var events []event.Event
+	c := New(Options{
+		Runner:     ag,
+		Executor:   ag,
+		SessionDir: dir,
+		Label:      "test",
+		Sink:       event.FuncSink(func(e event.Event) { events = append(events, e) }),
+	})
+	c.SetSessionPath(agent.NewSessionPath(dir, "test"))
+	if err := c.runTurnWithRaw(context.Background(), "first prompt", "first prompt"); err != nil {
+		t.Fatalf("turn 1: %v", err)
+	}
+	if err := c.runTurnWithRaw(context.Background(), "second prompt", "second prompt"); err != nil {
+		t.Fatalf("turn 2: %v", err)
+	}
+	return c, ag, &events
+}
+
+// TestRewindConversationFailsLoudlyAfterCompaction reproduces #3598: once
+// compaction shrinks the message log below a turn's recorded boundary, a
+// conversation/both rewind to that turn skipped the truncation but still emitted
+// a success notice — code rolled back, conversation silently did not.
+func TestRewindConversationFailsLoudlyAfterCompaction(t *testing.T) {
+	c, ag, events := runTwoTurns(t)
+
+	c.mu.Lock()
+	lastTurn := c.cpTurn - 1
+	boundary := c.cpBound[lastTurn]
+	c.mu.Unlock()
+	if boundary <= 1 {
+		t.Fatalf("expected the latest turn's boundary above 1, got cpBound=%v", c.cpBound)
+	}
+
+	// Auto-compaction replaces the prefix with a summary, shrinking the log below
+	// the recorded boundary; compaction does not rewrite checkpoint boundaries.
+	sess := ag.Session()
+	sess.Messages = []provider.Message{{Role: provider.RoleUser, Content: "summary"}}
+
+	*events = nil
+	err := c.Rewind(lastTurn, RewindBoth)
+	if err == nil || !strings.Contains(err.Error(), "compacted") {
+		t.Fatalf("Rewind after compaction error = %v, want a 'compacted past' failure", err)
+	}
+	for _, e := range *events {
+		if e.Kind == event.Notice && strings.Contains(e.Text, "rewound conversation") {
+			t.Fatalf("emitted a false conversation-rewind success after skipping truncation: %q", e.Text)
+		}
+	}
+	if got := len(ag.Session().Messages); got != 1 {
+		t.Fatalf("session messages = %d, want the compacted log left intact at 1", got)
+	}
+}
+
+// TestRewindConversationSucceedsWithLiveBoundary is the companion happy path: a
+// boundary still within the log truncates the conversation and reports success.
+func TestRewindConversationSucceedsWithLiveBoundary(t *testing.T) {
+	c, ag, events := runTwoTurns(t)
+
+	c.mu.Lock()
+	lastTurn := c.cpTurn - 1
+	boundary := c.cpBound[lastTurn]
+	c.mu.Unlock()
+
+	*events = nil
+	if err := c.Rewind(lastTurn, RewindConversation); err != nil {
+		t.Fatalf("Rewind with a live boundary: %v", err)
+	}
+	if got := len(ag.Session().Messages); got != boundary {
+		t.Fatalf("session truncated to %d messages, want boundary %d", got, boundary)
+	}
+	ok := false
+	for _, e := range *events {
+		if e.Kind == event.Notice && strings.Contains(e.Text, "rewound conversation") {
+			ok = true
+		}
+	}
+	if !ok {
+		t.Fatal("expected a conversation-rewind success notice")
+	}
+}

From efa50ee78da0d70b6fa62331b42386cad41b0e58 Mon Sep 17 00:00:00 2001
From: YHH <359807859@qq.com>
Date: Tue, 9 Jun 2026 04:09:28 -0700
Subject: [PATCH 08/64] chore(ci): add Dependabot config and CodeQL code
 scanning (#3676)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(ci): add Dependabot config and CodeQL code scanning

Enable Dependabot version updates (gomod for the root and desktop
modules; npm for desktop/frontend, site, and npm/reasonix; github-actions)
with grouped minor/patch PRs to keep noise down, and add a CodeQL workflow
(go, javascript-typescript, actions; build-mode none so the multi-module
repo needs no build step) on push/PR to main-v2 plus a weekly scan.

* chore(ci): use codeql-action v4 (v3 deprecates Dec 2026)

* fix(ci): CodeQL Go requires a build — use autobuild, not none

---------

Co-authored-by: reasonix <reasonix@deepseek.com>
---
 .github/dependabot.yml       | 55 ++++++++++++++++++++++++++++++++++++
 .github/workflows/codeql.yml | 40 ++++++++++++++++++++++++++
 2 files changed, 95 insertions(+)
 create mode 100644 .github/dependabot.yml
 create mode 100644 .github/workflows/codeql.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 000000000..53b33bcd5
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,55 @@
+version: 2
+updates:
+  - package-ecosystem: "gomod"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 5
+    groups:
+      go:
+        patterns: ["*"]
+        update-types: ["minor", "patch"]
+
+  - package-ecosystem: "gomod"
+    directory: "/desktop"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 5
+    groups:
+      go:
+        patterns: ["*"]
+        update-types: ["minor", "patch"]
+
+  - package-ecosystem: "npm"
+    directory: "/desktop/frontend"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 5
+    groups:
+      npm:
+        patterns: ["*"]
+        update-types: ["minor", "patch"]
+
+  - package-ecosystem: "npm"
+    directory: "/site"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 5
+    groups:
+      npm:
+        patterns: ["*"]
+        update-types: ["minor", "patch"]
+
+  - package-ecosystem: "npm"
+    directory: "/npm/reasonix"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 5
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    groups:
+      actions:
+        patterns: ["*"]
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
new file mode 100644
index 000000000..0ae666d51
--- /dev/null
+++ b/.github/workflows/codeql.yml
@@ -0,0 +1,40 @@
+name: CodeQL
+
+on:
+  push:
+    branches: ["main-v2"]
+  pull_request:
+    branches: ["main-v2"]
+  schedule:
+    - cron: "27 3 * * 1"
+
+jobs:
+  analyze:
+    name: Analyze (${{ matrix.language }})
+    runs-on: ubuntu-latest
+    permissions:
+      security-events: write
+      packages: read
+      actions: read
+      contents: read
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - language: go
+            build-mode: autobuild
+          - language: javascript-typescript
+            build-mode: none
+          - language: actions
+            build-mode: none
+    steps:
+      - uses: actions/checkout@v4
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v4
+        with:
+          languages: ${{ matrix.language }}
+          build-mode: ${{ matrix.build-mode }}
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v4
+        with:
+          category: "/language:${{ matrix.language }}"

From 74c148323cb369220afa1d2e93ac0ee580f9c3cf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 9 Jun 2026 04:24:14 -0700
Subject: [PATCH 09/64] chore(deps): bump the go group in /desktop with 5
 updates (#3680)

Bumps the go group in /desktop with 5 updates:

| Package | From | To |
| --- | --- | --- |
| [fyne.io/systray](https://github.com/fyne-io/systray) | `1.12.1` | `1.12.2` |
| [github.com/wailsapp/wails/v2](https://github.com/wailsapp/wails) | `2.11.0` | `2.12.0` |
| [golang.org/x/mod](https://github.com/golang/mod) | `0.36.0` | `0.37.0` |
| [golang.org/x/sys](https://github.com/golang/sys) | `0.45.0` | `0.46.0` |
| [golang.org/x/text](https://github.com/golang/text) | `0.37.0` | `0.38.0` |


Updates `fyne.io/systray` from 1.12.1 to 1.12.2
- [Changelog](https://github.com/fyne-io/systray/blob/master/CHANGELOG.md)
- [Commits](https://github.com/fyne-io/systray/compare/v1.12.1...v1.12.2)

Updates `github.com/wailsapp/wails/v2` from 2.11.0 to 2.12.0
- [Release notes](https://github.com/wailsapp/wails/releases)
- [Commits](https://github.com/wailsapp/wails/compare/v2.11.0...v2.12.0)

Updates `golang.org/x/mod` from 0.36.0 to 0.37.0
- [Commits](https://github.com/golang/mod/compare/v0.36.0...v0.37.0)

Updates `golang.org/x/sys` from 0.45.0 to 0.46.0
- [Commits](https://github.com/golang/sys/compare/v0.45.0...v0.46.0)

Updates `golang.org/x/text` from 0.37.0 to 0.38.0
- [Release notes](https://github.com/golang/text/releases)
- [Commits](https://github.com/golang/text/compare/v0.37.0...v0.38.0)

---
updated-dependencies:
- dependency-name: fyne.io/systray
  dependency-version: 1.12.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: go
- dependency-name: github.com/wailsapp/wails/v2
  dependency-version: 2.12.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: go
- dependency-name: golang.org/x/mod
  dependency-version: 0.37.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: go
- dependency-name: golang.org/x/sys
  dependency-version: 0.46.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: go
- dependency-name: golang.org/x/text
  dependency-version: 0.38.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: go
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 desktop/go.mod | 11 ++++++-----
 desktop/go.sum | 22 ++++++++++++----------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/desktop/go.mod b/desktop/go.mod
index 12bb60d21..f44e08584 100644
--- a/desktop/go.mod
+++ b/desktop/go.mod
@@ -13,16 +13,17 @@ require reasonix v0.0.0
 
 require (
 	aead.dev/minisign v0.3.0
-	fyne.io/systray v1.12.1
+	fyne.io/systray v1.12.2
 	github.com/godbus/dbus/v5 v5.2.2
 	github.com/minio/selfupdate v0.6.0
-	github.com/wailsapp/wails/v2 v2.11.0
-	golang.org/x/mod v0.36.0
-	golang.org/x/sys v0.45.0
-	golang.org/x/text v0.37.0
+	github.com/wailsapp/wails/v2 v2.12.0
+	golang.org/x/mod v0.37.0
+	golang.org/x/sys v0.46.0
+	golang.org/x/text v0.38.0
 )
 
 require (
+	git.sr.ht/~jackmordaunt/go-toast/v2 v2.0.3 // indirect
 	github.com/BurntSushi/toml v1.6.0 // indirect
 	github.com/bep/debounce v1.2.1 // indirect
 	github.com/clipperhouse/uax29/v2 v2.7.0 // indirect
diff --git a/desktop/go.sum b/desktop/go.sum
index 8361f7b30..193c4e07f 100644
--- a/desktop/go.sum
+++ b/desktop/go.sum
@@ -1,8 +1,10 @@
 aead.dev/minisign v0.2.0/go.mod h1:zdq6LdSd9TbuSxchxwhpA9zEb9YXcVGoE8JakuiGaIQ=
 aead.dev/minisign v0.3.0 h1:8Xafzy5PEVZqYDNP60yJHARlW1eOQtsKNp/Ph2c0vRA=
 aead.dev/minisign v0.3.0/go.mod h1:NLvG3Uoq3skkRMDuc3YHpWUTMTrSExqm+Ij73W13F6Y=
-fyne.io/systray v1.12.1 h1:ygBD6aZXwiOmZoY5N+ukbH9pih0Kq6fYgVeMYbr5skQ=
-fyne.io/systray v1.12.1/go.mod h1:RVwqP9nYMo7h5zViCBHri2FgjXF7H2cub7MAq4NSoLs=
+fyne.io/systray v1.12.2 h1:Y8DZxgLHsVQt6rY9Zrkkg+j67S7vv/1F2viOWKPpVeA=
+fyne.io/systray v1.12.2/go.mod h1:RVwqP9nYMo7h5zViCBHri2FgjXF7H2cub7MAq4NSoLs=
+git.sr.ht/~jackmordaunt/go-toast/v2 v2.0.3 h1:N3IGoHHp9pb6mj1cbXbuaSXV/UMKwmbKLf53nQmtqMA=
+git.sr.ht/~jackmordaunt/go-toast/v2 v2.0.3/go.mod h1:QtOLZGz8olr4qH2vWK0QH0w0O4T9fEIjMuWpKUsH7nc=
 github.com/BurntSushi/toml v1.6.0 h1:dRaEfpa2VI55EwlIW72hMRHdWouJeRF7TPYhI+AUQjk=
 github.com/BurntSushi/toml v1.6.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
 github.com/bep/debounce v1.2.1 h1:v67fRdBA9UQu2NhLFXrSg0Brw7CexQekrBwDMM8bzeY=
@@ -74,8 +76,8 @@ github.com/wailsapp/go-webview2 v1.0.23 h1:jmv8qhz1lHibCc79bMM/a/FqOnnzOGEisLav+
 github.com/wailsapp/go-webview2 v1.0.23/go.mod h1:qJmWAmAmaniuKGZPWwne+uor3AHMB5PFhqiK0Bbj8kc=
 github.com/wailsapp/mimetype v1.4.1 h1:pQN9ycO7uo4vsUUuPeHEYoUkLVkaRntMnHJxVwYhwHs=
 github.com/wailsapp/mimetype v1.4.1/go.mod h1:9aV5k31bBOv5z6u+QP8TltzvNGJPmNJD4XlAL3U+j3o=
-github.com/wailsapp/wails/v2 v2.11.0 h1:seLacV8pqupq32IjS4Y7V8ucab0WZwtK6VvUVxSBtqQ=
-github.com/wailsapp/wails/v2 v2.11.0/go.mod h1:jrf0ZaM6+GBc1wRmXsM8cIvzlg0karYin3erahI4+0k=
+github.com/wailsapp/wails/v2 v2.12.0 h1:BHO/kLNWFHYjCzucxbzAYZWUjub1Tvb4cSguQozHn5c=
+github.com/wailsapp/wails/v2 v2.12.0/go.mod h1:mo1bzK1DEJrobt7YrBjgxvb5Sihb1mhAY09hppbibQg=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
@@ -83,8 +85,8 @@ golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWP
 golang.org/x/crypto v0.0.0-20211209193657-4570a0811e8b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.52.0 h1:RMs7fP2rXdep0CftQlK8Uf+kibLm7qkCcradZWYz988=
 golang.org/x/crypto v0.52.0/go.mod h1:1QgfPxDqh0T2M/elOJtp9RvuR95kVjir0e6/BvEmGbc=
-golang.org/x/mod v0.36.0 h1:JJjpVx6myfUsUdAzZuOSTTmRE0PfZeNWzzvKrP7amb4=
-golang.org/x/mod v0.36.0/go.mod h1:moc6ELqsWcOw5Ef3xVprK5ul/MvtVvkIXLziUOICjUQ=
+golang.org/x/mod v0.37.0 h1:vF1DjpVEshcIqoEaauuHebaLk1O1forxjxBaVn884JQ=
+golang.org/x/mod v0.37.0/go.mod h1:m8S8VeM9r4dzDwjrKO0a1sZP3YjeMamRRlD+fmR2Q/0=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20210505024714-0287a6fb4125/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
@@ -98,14 +100,14 @@ golang.org/x/sys v0.0.0-20210228012217-479acdf4ea46/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY=
-golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
+golang.org/x/sys v0.46.0 h1:noSf2Fq6F8DBgS+LysIkx7rIExoNHJsxOAtPp4rthXw=
+golang.org/x/sys v0.46.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc=
-golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38=
+golang.org/x/text v0.38.0 h1:sXmwo9DwP3OK9EZ7PqAdaooSGozfl/3a6/xJcbzPRhE=
+golang.org/x/text v0.38.0/go.mod h1:YXZt3QhHUKYT53r2lLKFIVi6Ao1jdzrTR/KQ09qyxF4=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

From 8e605194075d1a30b472d0475eb06d049596370b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 9 Jun 2026 04:24:20 -0700
Subject: [PATCH 10/64] chore(deps-dev): bump @vitejs/plugin-react in
 /desktop/frontend (#3687)

Bumps [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/tree/HEAD/packages/plugin-react) from 4.7.0 to 5.2.0.
- [Release notes](https://github.com/vitejs/vite-plugin-react/releases)
- [Changelog](https://github.com/vitejs/vite-plugin-react/blob/plugin-react@5.2.0/packages/plugin-react/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite-plugin-react/commits/plugin-react@5.2.0/packages/plugin-react)

---
updated-dependencies:
- dependency-name: "@vitejs/plugin-react"
  dependency-version: 5.2.0
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 desktop/frontend/package-lock.json | 64 +++++++++++++++---------------
 desktop/frontend/package.json      |  2 +-
 desktop/frontend/pnpm-lock.yaml    | 62 ++++++++++++++---------------
 3 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/desktop/frontend/package-lock.json b/desktop/frontend/package-lock.json
index d478c6c51..ef8e307cc 100644
--- a/desktop/frontend/package-lock.json
+++ b/desktop/frontend/package-lock.json
@@ -23,7 +23,7 @@
         "@types/node": "^25.9.1",
         "@types/react": "^18.3.12",
         "@types/react-dom": "^18.3.1",
-        "@vitejs/plugin-react": "^4.3.4",
+        "@vitejs/plugin-react": "^5.2.0",
         "terser": "^5.48.0",
         "tsx": "^4.22.4",
         "typescript": "^5.6.3",
@@ -816,9 +816,9 @@
       }
     },
     "node_modules/@rolldown/pluginutils": {
-      "version": "1.0.0-beta.27",
-      "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.0-beta.27.tgz",
-      "integrity": "sha512-+d0F4MKMCbeVUJwG96uQ4SgAznZNSq93I3V+9NHA4OpvqG8mRCpGdKmK8l/dl02h2CCDHwW2FqilnTyDcAnqjA==",
+      "version": "1.0.0-rc.3",
+      "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.0-rc.3.tgz",
+      "integrity": "sha512-eybk3TjzzzV97Dlj5c+XrBFW57eTNhzod66y9HrBlzJ6NsCrWCp/2kaPS3K9wJmurBC0Tdw4yPjXKZqlznim3Q==",
       "dev": true,
       "license": "MIT"
     },
@@ -1347,24 +1347,24 @@
       "license": "ISC"
     },
     "node_modules/@vitejs/plugin-react": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-4.7.0.tgz",
-      "integrity": "sha512-gUu9hwfWvvEDBBmgtAowQCojwZmJ5mcLn3aufeCsitijs3+f2NsrPtlAWIR6OPiqljl96GVCUbLe0HyqIpVaoA==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-5.2.0.tgz",
+      "integrity": "sha512-YmKkfhOAi3wsB1PhJq5Scj3GXMn3WvtQ/JC0xoopuHoXSdmtdStOpFrYaT1kie2YgFBcIe64ROzMYRjCrYOdYw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/core": "^7.28.0",
+        "@babel/core": "^7.29.0",
         "@babel/plugin-transform-react-jsx-self": "^7.27.1",
         "@babel/plugin-transform-react-jsx-source": "^7.27.1",
-        "@rolldown/pluginutils": "1.0.0-beta.27",
+        "@rolldown/pluginutils": "1.0.0-rc.3",
         "@types/babel__core": "^7.20.5",
-        "react-refresh": "^0.17.0"
+        "react-refresh": "^0.18.0"
       },
       "engines": {
-        "node": "^14.18.0 || >=16.0.0"
+        "node": "^20.19.0 || >=22.12.0"
       },
       "peerDependencies": {
-        "vite": "^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0"
+        "vite": "^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0"
       }
     },
     "node_modules/acorn": {
@@ -2148,23 +2148,6 @@
         "url": "https://opencollective.com/unified"
       }
     },
-    "node_modules/mdast-util-gfm-autolink-literal": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/mdast-util-gfm-autolink-literal/-/mdast-util-gfm-autolink-literal-2.0.1.tgz",
-      "integrity": "sha512-5HVP2MKaP6L+G6YaxPNjuL0BPrq9orG3TsrZ9YXbA3vDw/ACI4MEsnoDpn6ZNm7GnZgtAcONJyPhOP8tNJQavQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/mdast": "^4.0.0",
-        "ccount": "^2.0.0",
-        "devlop": "^1.0.0",
-        "mdast-util-find-and-replace": "^3.0.0",
-        "micromark-util-character": "^2.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
     "node_modules/mdast-util-gfm-footnote": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/mdast-util-gfm-footnote/-/mdast-util-gfm-footnote-2.1.0.tgz",
@@ -2230,6 +2213,23 @@
         "url": "https://opencollective.com/unified"
       }
     },
+    "node_modules/mdast-util-gfm/node_modules/mdast-util-gfm-autolink-literal": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/mdast-util-gfm-autolink-literal/-/mdast-util-gfm-autolink-literal-2.0.0.tgz",
+      "integrity": "sha512-FyzMsduZZHSc3i0Px3PQcBT4WJY/X/RCtEJKuybiC6sjPqLv7h1yqAkmILZtuxMSsUyaLUWNp71+vQH2zqp5cg==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/mdast": "^4.0.0",
+        "ccount": "^2.0.0",
+        "devlop": "^1.0.0",
+        "mdast-util-find-and-replace": "^3.0.0",
+        "micromark-util-character": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
     "node_modules/mdast-util-math": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/mdast-util-math/-/mdast-util-math-3.0.0.tgz",
@@ -3160,9 +3160,9 @@
       }
     },
     "node_modules/react-refresh": {
-      "version": "0.17.0",
-      "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.17.0.tgz",
-      "integrity": "sha512-z6F7K9bV85EfseRCp2bzrpyQ0Gkw1uLoCel9XBVWPg/TjRj94SkJzUTGfOa4bs7iJvBWtQG0Wq7wnI0syw3EBQ==",
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.18.0.tgz",
+      "integrity": "sha512-QgT5//D3jfjJb6Gsjxv0Slpj23ip+HtOpnNgnb2S5zU3CB26G/IDPGoy4RJB42wzFE46DRsstbW6tKHoKbhAxw==",
       "dev": true,
       "license": "MIT",
       "engines": {
diff --git a/desktop/frontend/package.json b/desktop/frontend/package.json
index 0edb49adb..533614e18 100644
--- a/desktop/frontend/package.json
+++ b/desktop/frontend/package.json
@@ -30,7 +30,7 @@
     "@types/node": "^25.9.1",
     "@types/react": "^18.3.12",
     "@types/react-dom": "^18.3.1",
-    "@vitejs/plugin-react": "^4.3.4",
+    "@vitejs/plugin-react": "^5.2.0",
     "terser": "^5.48.0",
     "tsx": "^4.22.4",
     "typescript": "^5.6.3",
diff --git a/desktop/frontend/pnpm-lock.yaml b/desktop/frontend/pnpm-lock.yaml
index 66662beca..f6b116da4 100644
--- a/desktop/frontend/pnpm-lock.yaml
+++ b/desktop/frontend/pnpm-lock.yaml
@@ -52,8 +52,8 @@ importers:
         specifier: ^18.3.1
         version: 18.3.7(@types/react@18.3.29)
       '@vitejs/plugin-react':
-        specifier: ^4.3.4
-        version: 4.7.0(vite@6.4.2(@types/node@25.9.1)(terser@5.48.0)(tsx@4.22.4))
+        specifier: ^5.2.0
+        version: 5.2.0(vite@6.4.2(@types/node@25.9.1)(terser@5.48.0)(tsx@4.22.4))
       terser:
         specifier: ^5.48.0
         version: 5.48.0
@@ -483,8 +483,8 @@ packages:
   '@jridgewell/trace-mapping@0.3.31':
     resolution: {integrity: sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==}
 
-  '@rolldown/pluginutils@1.0.0-beta.27':
-    resolution: {integrity: sha512-+d0F4MKMCbeVUJwG96uQ4SgAznZNSq93I3V+9NHA4OpvqG8mRCpGdKmK8l/dl02h2CCDHwW2FqilnTyDcAnqjA==}
+  '@rolldown/pluginutils@1.0.0-rc.3':
+    resolution: {integrity: sha512-eybk3TjzzzV97Dlj5c+XrBFW57eTNhzod66y9HrBlzJ6NsCrWCp/2kaPS3K9wJmurBC0Tdw4yPjXKZqlznim3Q==}
 
   '@rollup/rollup-android-arm-eabi@4.60.4':
     resolution: {integrity: sha512-F5QXMSiFebS9hKZj02XhWLLnRpJ3B3AROP0tWbFBSj+6kCbg5m9j5JoHKd4mmSVy5mS/IMQloYgYxCuJC0fxEQ==}
@@ -676,11 +676,11 @@ packages:
   '@ungap/structured-clone@1.3.1':
     resolution: {integrity: sha512-mUFwbeTqrVgDQxFveS+df2yfap6iuP20NAKAsBt5jDEoOTDew+zwLAOilHCeQJOVSvmgCX4ogqIrA0mnyr08yQ==}
 
-  '@vitejs/plugin-react@4.7.0':
-    resolution: {integrity: sha512-gUu9hwfWvvEDBBmgtAowQCojwZmJ5mcLn3aufeCsitijs3+f2NsrPtlAWIR6OPiqljl96GVCUbLe0HyqIpVaoA==}
-    engines: {node: ^14.18.0 || >=16.0.0}
+  '@vitejs/plugin-react@5.2.0':
+    resolution: {integrity: sha512-YmKkfhOAi3wsB1PhJq5Scj3GXMn3WvtQ/JC0xoopuHoXSdmtdStOpFrYaT1kie2YgFBcIe64ROzMYRjCrYOdYw==}
+    engines: {node: ^20.19.0 || >=22.12.0}
     peerDependencies:
-      vite: ^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0
+      vite: ^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0
 
   acorn@8.16.0:
     resolution: {integrity: sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==}
@@ -690,8 +690,8 @@ packages:
   bail@2.0.2:
     resolution: {integrity: sha512-0xO6mYd7JB2YesxDKplafRpsiOzPt9V02ddPCLbY1xYGPOX24NTyN50qnUxgCPcSoYMhKpAuBTjQoRZCAkUDRw==}
 
-  baseline-browser-mapping@2.10.32:
-    resolution: {integrity: sha512-wbPvpyjJPC0zdfdKXxqEL3Ea+bOMD/87X4lftiJkkaBiuG6ALQy1SLmEd7BSmVCuwCQsBrCamgBoLyfFDD1EPg==}
+  baseline-browser-mapping@2.10.34:
+    resolution: {integrity: sha512-IMDedajPifLnHNY0X9n8hKxRTQ6/eTHwr5bDo04WnuqxyKw6LYtQywCuuqPZwhl3aBXMvQpJov42GLCwRRdQzw==}
     engines: {node: '>=6.0.0'}
     hasBin: true
 
@@ -703,8 +703,8 @@ packages:
   buffer-from@1.1.2:
     resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==}
 
-  caniuse-lite@1.0.30001793:
-    resolution: {integrity: sha512-iwSsYWaCOoh26cV8NwNRViHlrfUvYsHDfRVcbtmw0Kg6PJIZZXwMkj1442FYLBGkeUf1juAsU3DTfxW579mrPA==}
+  caniuse-lite@1.0.30001797:
+    resolution: {integrity: sha512-l8xKG+gwAIExZGl9FrF7KUwuOmk6wbEPC9Xoy/RtnWv1XG0Q4LFlagaLpUv3Kiza3W/wm27zy0yWJEieYKAP6w==}
 
   ccount@2.0.1:
     resolution: {integrity: sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==}
@@ -756,8 +756,8 @@ packages:
   devlop@1.1.0:
     resolution: {integrity: sha512-RWmIqhcFf1lRYBvNmr7qTNuyCt/7/ns2jbpp1+PalgE/rDQcBT0fioSMUpJ93irlUhC5hrg4cYqe6U+0ImW0rA==}
 
-  electron-to-chromium@1.5.364:
-    resolution: {integrity: sha512-G/dYE3+AYhyHwzTwg8UbnXf7zqMERYh7l2jJ3QujhFsH8agSYwtnGAR2aZ7f0AakIKJXd5En/Hre4igIUrdlYw==}
+  electron-to-chromium@1.5.370:
+    resolution: {integrity: sha512-D5tSHJReAb/Kf3Hu9F/GO4lJuSWzEWHwvQ/kKSUP7pimNgvxkSKj+gUQhHpKKACwrin7rS3byU7IxreF56rl5g==}
 
   entities@6.0.1:
     resolution: {integrity: sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g==}
@@ -1043,8 +1043,8 @@ packages:
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
     hasBin: true
 
-  node-releases@2.0.46:
-    resolution: {integrity: sha512-GYVXHE2KnrzAfsAjl4uP++evGFCrAU1jta4ubEjIG7YWt/64Gqv66a30yKwWczVjA6j3bM4nBwH7Pk1JmDHaxQ==}
+  node-releases@2.0.47:
+    resolution: {integrity: sha512-Uzmd6LXpouKo8EUK68IjH4+E01w/hXyV3R3g/geCJo+rXLNfh1xucB+LOzYEOQPSiUK3h/xZf0cQGcSsmyL2Og==}
     engines: {node: '>=18'}
 
   parse-entities@4.0.2:
@@ -1078,8 +1078,8 @@ packages:
       '@types/react': '>=18'
       react: '>=18'
 
-  react-refresh@0.17.0:
-    resolution: {integrity: sha512-z6F7K9bV85EfseRCp2bzrpyQ0Gkw1uLoCel9XBVWPg/TjRj94SkJzUTGfOa4bs7iJvBWtQG0Wq7wnI0syw3EBQ==}
+  react-refresh@0.18.0:
+    resolution: {integrity: sha512-QgT5//D3jfjJb6Gsjxv0Slpj23ip+HtOpnNgnb2S5zU3CB26G/IDPGoy4RJB42wzFE46DRsstbW6tKHoKbhAxw==}
     engines: {node: '>=0.10.0'}
 
   react@18.3.1:
@@ -1549,7 +1549,7 @@ snapshots:
       '@jridgewell/resolve-uri': 3.1.2
       '@jridgewell/sourcemap-codec': 1.5.5
 
-  '@rolldown/pluginutils@1.0.0-beta.27': {}
+  '@rolldown/pluginutils@1.0.0-rc.3': {}
 
   '@rollup/rollup-android-arm-eabi@4.60.4':
     optional: true
@@ -1698,14 +1698,14 @@ snapshots:
 
   '@ungap/structured-clone@1.3.1': {}
 
-  '@vitejs/plugin-react@4.7.0(vite@6.4.2(@types/node@25.9.1)(terser@5.48.0)(tsx@4.22.4))':
+  '@vitejs/plugin-react@5.2.0(vite@6.4.2(@types/node@25.9.1)(terser@5.48.0)(tsx@4.22.4))':
     dependencies:
       '@babel/core': 7.29.7
       '@babel/plugin-transform-react-jsx-self': 7.29.7(@babel/core@7.29.7)
       '@babel/plugin-transform-react-jsx-source': 7.29.7(@babel/core@7.29.7)
-      '@rolldown/pluginutils': 1.0.0-beta.27
+      '@rolldown/pluginutils': 1.0.0-rc.3
       '@types/babel__core': 7.20.5
-      react-refresh: 0.17.0
+      react-refresh: 0.18.0
       vite: 6.4.2(@types/node@25.9.1)(terser@5.48.0)(tsx@4.22.4)
     transitivePeerDependencies:
       - supports-color
@@ -1714,19 +1714,19 @@ snapshots:
 
   bail@2.0.2: {}
 
-  baseline-browser-mapping@2.10.32: {}
+  baseline-browser-mapping@2.10.34: {}
 
   browserslist@4.28.2:
     dependencies:
-      baseline-browser-mapping: 2.10.32
-      caniuse-lite: 1.0.30001793
-      electron-to-chromium: 1.5.364
-      node-releases: 2.0.46
+      baseline-browser-mapping: 2.10.34
+      caniuse-lite: 1.0.30001797
+      electron-to-chromium: 1.5.370
+      node-releases: 2.0.47
       update-browserslist-db: 1.2.3(browserslist@4.28.2)
 
   buffer-from@1.1.2: {}
 
-  caniuse-lite@1.0.30001793: {}
+  caniuse-lite@1.0.30001797: {}
 
   ccount@2.0.1: {}
 
@@ -1762,7 +1762,7 @@ snapshots:
     dependencies:
       dequal: 2.0.3
 
-  electron-to-chromium@1.5.364: {}
+  electron-to-chromium@1.5.370: {}
 
   entities@6.0.1: {}
 
@@ -2340,7 +2340,7 @@ snapshots:
 
   nanoid@3.3.12: {}
 
-  node-releases@2.0.46: {}
+  node-releases@2.0.47: {}
 
   parse-entities@4.0.2:
     dependencies:
@@ -2392,7 +2392,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  react-refresh@0.17.0: {}
+  react-refresh@0.18.0: {}
 
   react@18.3.1:
     dependencies:

From 270fcdd0baa9265d226b1a75460585c9e2bc2d6a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 9 Jun 2026 04:24:25 -0700
Subject: [PATCH 11/64] chore(deps): bump astro from 5.18.2 to 6.4.4 in /site
 (#3684)

Bumps [astro](https://github.com/withastro/astro/tree/HEAD/packages/astro) from 5.18.2 to 6.4.4.
- [Release notes](https://github.com/withastro/astro/releases)
- [Changelog](https://github.com/withastro/astro/blob/main/packages/astro/CHANGELOG.md)
- [Commits](https://github.com/withastro/astro/commits/astro@6.4.4/packages/astro)

---
updated-dependencies:
- dependency-name: astro
  dependency-version: 6.4.4
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 site/package-lock.json | 1308 +++++++++-------------------------------
 site/package.json      |    2 +-
 2 files changed, 302 insertions(+), 1008 deletions(-)

diff --git a/site/package-lock.json b/site/package-lock.json
index cdc424515..b3c2b04c0 100644
--- a/site/package-lock.json
+++ b/site/package-lock.json
@@ -7,34 +7,42 @@
       "name": "reasonix-site",
       "dependencies": {
         "@fontsource-variable/inter": "^5.1.0",
-        "astro": "^5.7.0"
+        "astro": "^6.4.4"
       }
     },
     "node_modules/@astrojs/compiler": {
-      "version": "2.13.1",
-      "resolved": "https://registry.npmjs.org/@astrojs/compiler/-/compiler-2.13.1.tgz",
-      "integrity": "sha512-f3FN83d2G/v32ipNClRKgYv30onQlMZX1vCeZMjPsMMPl1mDpmbl0+N5BYo4S/ofzqJyS5hvwacEo0CCVDn/Qg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@astrojs/compiler/-/compiler-4.0.0.tgz",
+      "integrity": "sha512-eouss7G8ygdZqHuke033VMcVw5HTZUu+PXd/h06DGDUg/jt5btPYPqh66ENWw/mU78rBrf/oeC4oqoBwMtDMNA==",
       "license": "MIT"
     },
     "node_modules/@astrojs/internal-helpers": {
-      "version": "0.7.6",
-      "resolved": "https://registry.npmjs.org/@astrojs/internal-helpers/-/internal-helpers-0.7.6.tgz",
-      "integrity": "sha512-GOle7smBWKfMSP8osUIGOlB5kaHdQLV3foCsf+5Q9Wsuu+C6Fs3Ez/ttXmhjZ1HkSgsogcM1RXSjjOVieHq16Q==",
-      "license": "MIT"
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/@astrojs/internal-helpers/-/internal-helpers-0.10.0.tgz",
+      "integrity": "sha512-Ry2R3VPeIN4uPCSA4xQc+e+vsJXkalKpEbDc07hV+a/o5Bs2N/s/uDcPJH/05L19DKh9tAy7e6JM3YZ6Cxfezw==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/hast": "^3.0.4",
+        "@types/mdast": "^4.0.4",
+        "js-yaml": "^4.1.1",
+        "picomatch": "^4.0.4",
+        "retext-smartypants": "^6.2.0",
+        "shiki": "^4.0.2",
+        "smol-toml": "^1.6.0",
+        "unified": "^11.0.5"
+      }
     },
     "node_modules/@astrojs/markdown-remark": {
-      "version": "6.3.11",
-      "resolved": "https://registry.npmjs.org/@astrojs/markdown-remark/-/markdown-remark-6.3.11.tgz",
-      "integrity": "sha512-hcaxX/5aC6lQgHeGh1i+aauvSwIT6cfyFjKWvExYSxUhZZBBdvCliOtu06gbQyhbe0pGJNoNmqNlQZ5zYUuIyQ==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@astrojs/markdown-remark/-/markdown-remark-7.2.0.tgz",
+      "integrity": "sha512-+YxmVQu1Bd+MFfSzjq1rOJvD9+nIOJzz5YIIhdIH01RrxRkKbyKoEgyIqP3yv51MhzMDgd79QaPv+kCVPT8vHw==",
       "license": "MIT",
       "dependencies": {
-        "@astrojs/internal-helpers": "0.7.6",
-        "@astrojs/prism": "3.3.0",
+        "@astrojs/internal-helpers": "0.10.0",
+        "@astrojs/prism": "4.0.2",
         "github-slugger": "^2.0.0",
         "hast-util-from-html": "^2.0.3",
         "hast-util-to-text": "^4.0.2",
-        "import-meta-resolve": "^4.2.0",
-        "js-yaml": "^4.1.1",
         "mdast-util-definitions": "^6.0.0",
         "rehype-raw": "^7.0.0",
         "rehype-stringify": "^10.0.1",
@@ -42,39 +50,35 @@
         "remark-parse": "^11.0.0",
         "remark-rehype": "^11.1.2",
         "remark-smartypants": "^3.0.2",
-        "shiki": "^3.21.0",
-        "smol-toml": "^1.6.0",
         "unified": "^11.0.5",
         "unist-util-remove-position": "^5.0.0",
-        "unist-util-visit": "^5.0.0",
+        "unist-util-visit": "^5.1.0",
         "unist-util-visit-parents": "^6.0.2",
         "vfile": "^6.0.3"
       }
     },
     "node_modules/@astrojs/prism": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/@astrojs/prism/-/prism-3.3.0.tgz",
-      "integrity": "sha512-q8VwfU/fDZNoDOf+r7jUnMC2//H2l0TuQ6FkGJL8vD8nw/q5KiL3DS1KKBI3QhI9UQhpJ5dc7AtqfbXWuOgLCQ==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@astrojs/prism/-/prism-4.0.2.tgz",
+      "integrity": "sha512-KTivpmnz6lDsC6o9H4+DNm2SrE/GHzw8cNAvEJwAvUT+eoaEnn/4NtbDNfRRaxaJHdp15gf+tfHAWiXR4wB3BA==",
       "license": "MIT",
       "dependencies": {
         "prismjs": "^1.30.0"
       },
       "engines": {
-        "node": "18.20.8 || ^20.3.0 || >=22.0.0"
+        "node": ">=22.12.0"
       }
     },
     "node_modules/@astrojs/telemetry": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/@astrojs/telemetry/-/telemetry-3.3.0.tgz",
-      "integrity": "sha512-UFBgfeldP06qu6khs/yY+q1cDAaArM2/7AEIqQ9Cuvf7B1hNLq0xDrZkct+QoIGyjq56y8IaE2I3CTvG99mlhQ==",
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/@astrojs/telemetry/-/telemetry-3.3.2.tgz",
+      "integrity": "sha512-j8DNruA8ors99Al39RYZPJK4DC1bKkoNm93mAMuBhY9TCNC4R8n1q7ovFnJ5qhGh5Lsh7pa1gpQVpYpsJPeTHQ==",
       "license": "MIT",
       "dependencies": {
-        "ci-info": "^4.2.0",
-        "debug": "^4.4.0",
-        "dlv": "^1.1.3",
+        "ci-info": "^4.4.0",
         "dset": "^3.1.4",
-        "is-docker": "^3.0.0",
-        "is-wsl": "^3.1.0",
+        "is-docker": "^4.0.0",
+        "is-wsl": "^3.1.1",
         "which-pm-runs": "^1.1.0"
       },
       "engines": {
@@ -139,6 +143,34 @@
         "node": ">=18"
       }
     },
+    "node_modules/@clack/core": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/@clack/core/-/core-1.4.1.tgz",
+      "integrity": "sha512-FILJa1gGKEFTGZAJE9RpVhrjKz3c3h4ar60dSv6cGuDqufQ84YEIS3GAGvZiN+H6yaLbbvTFNejjCC4tXpZEuw==",
+      "license": "MIT",
+      "dependencies": {
+        "fast-wrap-ansi": "^0.2.0",
+        "sisteransi": "^1.0.5"
+      },
+      "engines": {
+        "node": ">= 20.12.0"
+      }
+    },
+    "node_modules/@clack/prompts": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/@clack/prompts/-/prompts-1.5.1.tgz",
+      "integrity": "sha512-zccHj2z2oCCO4yrDiRSlFOxWerGqRiysP7a5jPK6uoI9URKAquwY42Dd/iUP8JWHxEzdRe4TlbvZCo8z1/mhrw==",
+      "license": "MIT",
+      "dependencies": {
+        "@clack/core": "1.4.1",
+        "fast-string-width": "^3.0.2",
+        "fast-wrap-ansi": "^0.2.0",
+        "sisteransi": "^1.0.5"
+      },
+      "engines": {
+        "node": ">= 20.12.0"
+      }
+    },
     "node_modules/@emnapi/runtime": {
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.10.0.tgz",
@@ -1406,64 +1438,97 @@
       ]
     },
     "node_modules/@shikijs/core": {
-      "version": "3.23.0",
-      "resolved": "https://registry.npmjs.org/@shikijs/core/-/core-3.23.0.tgz",
-      "integrity": "sha512-NSWQz0riNb67xthdm5br6lAkvpDJRTgB36fxlo37ZzM2yq0PQFFzbd8psqC2XMPgCzo1fW6cVi18+ArJ44wqgA==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/core/-/core-4.2.0.tgz",
+      "integrity": "sha512-Hc87Ab1Ld/vEbZRCbwx344I5v+4RU8CVToUTRkqXL1+TjbuOp9U5Xa0M23V4GEWHxVn+yO5otb+HkQVm3ptWQQ==",
       "license": "MIT",
       "dependencies": {
-        "@shikijs/types": "3.23.0",
+        "@shikijs/primitive": "4.2.0",
+        "@shikijs/types": "4.2.0",
         "@shikijs/vscode-textmate": "^10.0.2",
         "@types/hast": "^3.0.4",
         "hast-util-to-html": "^9.0.5"
+      },
+      "engines": {
+        "node": ">=20"
       }
     },
     "node_modules/@shikijs/engine-javascript": {
-      "version": "3.23.0",
-      "resolved": "https://registry.npmjs.org/@shikijs/engine-javascript/-/engine-javascript-3.23.0.tgz",
-      "integrity": "sha512-aHt9eiGFobmWR5uqJUViySI1bHMqrAgamWE1TYSUoftkAeCCAiGawPMwM+VCadylQtF4V3VNOZ5LmfItH5f3yA==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/engine-javascript/-/engine-javascript-4.2.0.tgz",
+      "integrity": "sha512-fjETeq1k5ffyXqRgS6+3hpvqseLalp1kjNfRbXpUgWR8FpZ1CmQfiNHovc5lncYjt/Vg5JK/WJEmLahjwMa0og==",
       "license": "MIT",
       "dependencies": {
-        "@shikijs/types": "3.23.0",
+        "@shikijs/types": "4.2.0",
         "@shikijs/vscode-textmate": "^10.0.2",
-        "oniguruma-to-es": "^4.3.4"
+        "oniguruma-to-es": "^4.3.6"
+      },
+      "engines": {
+        "node": ">=20"
       }
     },
     "node_modules/@shikijs/engine-oniguruma": {
-      "version": "3.23.0",
-      "resolved": "https://registry.npmjs.org/@shikijs/engine-oniguruma/-/engine-oniguruma-3.23.0.tgz",
-      "integrity": "sha512-1nWINwKXxKKLqPibT5f4pAFLej9oZzQTsby8942OTlsJzOBZ0MWKiwzMsd+jhzu8YPCHAswGnnN1YtQfirL35g==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/engine-oniguruma/-/engine-oniguruma-4.2.0.tgz",
+      "integrity": "sha512-hTorK1dffPkpbMUk6Z+828PgRo7d07HbnizoP0hNPFjhxMHctj0Px/qoHeGMYafc6ju+u9iMldN4JbVzNQM++g==",
       "license": "MIT",
       "dependencies": {
-        "@shikijs/types": "3.23.0",
+        "@shikijs/types": "4.2.0",
         "@shikijs/vscode-textmate": "^10.0.2"
+      },
+      "engines": {
+        "node": ">=20"
       }
     },
     "node_modules/@shikijs/langs": {
-      "version": "3.23.0",
-      "resolved": "https://registry.npmjs.org/@shikijs/langs/-/langs-3.23.0.tgz",
-      "integrity": "sha512-2Ep4W3Re5aB1/62RSYQInK9mM3HsLeB91cHqznAJMuylqjzNVAVCMnNWRHFtcNHXsoNRayP9z1qj4Sq3nMqYXg==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/langs/-/langs-4.2.0.tgz",
+      "integrity": "sha512-bwrVRlJ0wUhZxAbVdvBbv2TTC9yLsh4C/IO5Ofz0T8MQntgDvyVnkbjw9vi50r1kx7RCIJdnJnjZAwmAsXFLZQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@shikijs/types": "4.2.0"
+      },
+      "engines": {
+        "node": ">=20"
+      }
+    },
+    "node_modules/@shikijs/primitive": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/primitive/-/primitive-4.2.0.tgz",
+      "integrity": "sha512-NOq+DtUkVBJtZMVXL5A0vI0Xk8nvDYaXetFHSJFlOqjDZIVhIPRYFdGkSoElDqNuegikcc3A76SNUa8dTqtAYA==",
       "license": "MIT",
       "dependencies": {
-        "@shikijs/types": "3.23.0"
+        "@shikijs/types": "4.2.0",
+        "@shikijs/vscode-textmate": "^10.0.2",
+        "@types/hast": "^3.0.4"
+      },
+      "engines": {
+        "node": ">=20"
       }
     },
     "node_modules/@shikijs/themes": {
-      "version": "3.23.0",
-      "resolved": "https://registry.npmjs.org/@shikijs/themes/-/themes-3.23.0.tgz",
-      "integrity": "sha512-5qySYa1ZgAT18HR/ypENL9cUSGOeI2x+4IvYJu4JgVJdizn6kG4ia5Q1jDEOi7gTbN4RbuYtmHh0W3eccOrjMA==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/themes/-/themes-4.2.0.tgz",
+      "integrity": "sha512-RX8IHYeLv8Cu2W6ruc3RxUqWn0IYCqSrMBzi/uRGAmfyDNOnNO5BF/Px7o97n4XTpmFTo5GbRaazuOWj+2ak2w==",
       "license": "MIT",
       "dependencies": {
-        "@shikijs/types": "3.23.0"
+        "@shikijs/types": "4.2.0"
+      },
+      "engines": {
+        "node": ">=20"
       }
     },
     "node_modules/@shikijs/types": {
-      "version": "3.23.0",
-      "resolved": "https://registry.npmjs.org/@shikijs/types/-/types-3.23.0.tgz",
-      "integrity": "sha512-3JZ5HXOZfYjsYSk0yPwBrkupyYSLpAE26Qc0HLghhZNGTZg/SKxXIIgoxOpmmeQP0RRSDJTk1/vPfw9tbw+jSQ==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/types/-/types-4.2.0.tgz",
+      "integrity": "sha512-VT/MKtlpOhEPZloSH3Pb9WCZEBDoQVMa9jedp5UAwmJOar1DVc9DRODAxmYPW9M93IK4ryuqRejFfmlvlVDemw==",
       "license": "MIT",
       "dependencies": {
         "@shikijs/vscode-textmate": "^10.0.2",
         "@types/hast": "^3.0.4"
+      },
+      "engines": {
+        "node": ">=20"
       }
     },
     "node_modules/@shikijs/vscode-textmate": {
@@ -1532,92 +1597,6 @@
       "integrity": "sha512-mUFwbeTqrVgDQxFveS+df2yfap6iuP20NAKAsBt5jDEoOTDew+zwLAOilHCeQJOVSvmgCX4ogqIrA0mnyr08yQ==",
       "license": "ISC"
     },
-    "node_modules/acorn": {
-      "version": "8.16.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz",
-      "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==",
-      "license": "MIT",
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/ansi-align": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.1.tgz",
-      "integrity": "sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==",
-      "license": "ISC",
-      "dependencies": {
-        "string-width": "^4.1.0"
-      }
-    },
-    "node_modules/ansi-align/node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ansi-align/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "license": "MIT"
-    },
-    "node_modules/ansi-align/node_modules/string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "license": "MIT",
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ansi-align/node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ansi-regex": {
-      "version": "6.2.2",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz",
-      "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
-      }
-    },
-    "node_modules/ansi-styles": {
-      "version": "6.2.3",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz",
-      "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
     "node_modules/anymatch": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
@@ -1669,80 +1648,72 @@
       }
     },
     "node_modules/astro": {
-      "version": "5.18.2",
-      "resolved": "https://registry.npmjs.org/astro/-/astro-5.18.2.tgz",
-      "integrity": "sha512-TnFwLnAXty5MXKPDGuKXqK4AMBXG+FH6RUdK7Oyc3gyfNoFIthT+4eRbzOK43bdRlLaZuxgciDSjgtggZ3OtGQ==",
+      "version": "6.4.4",
+      "resolved": "https://registry.npmjs.org/astro/-/astro-6.4.4.tgz",
+      "integrity": "sha512-hVe8tq3lqt/Dr0UyB//yUmQSlHMTU8scTiF/vQddQVahLE4TTaSdH5H0nb7OvRcwo0UmlAO8DWYar4jNaS7H+A==",
       "license": "MIT",
       "dependencies": {
-        "@astrojs/compiler": "^2.13.0",
-        "@astrojs/internal-helpers": "0.7.6",
-        "@astrojs/markdown-remark": "6.3.11",
-        "@astrojs/telemetry": "3.3.0",
+        "@astrojs/compiler": "^4.0.0",
+        "@astrojs/internal-helpers": "0.10.0",
+        "@astrojs/markdown-remark": "7.2.0",
+        "@astrojs/telemetry": "3.3.2",
         "@capsizecss/unpack": "^4.0.0",
+        "@clack/prompts": "^1.1.0",
         "@oslojs/encoding": "^1.1.0",
         "@rollup/pluginutils": "^5.3.0",
-        "acorn": "^8.15.0",
         "aria-query": "^5.3.2",
         "axobject-query": "^4.1.0",
-        "boxen": "8.0.1",
-        "ci-info": "^4.3.1",
+        "ci-info": "^4.4.0",
         "clsx": "^2.1.1",
-        "common-ancestor-path": "^1.0.1",
+        "common-ancestor-path": "^2.0.0",
         "cookie": "^1.1.1",
-        "cssesc": "^3.0.0",
-        "debug": "^4.4.3",
-        "deterministic-object-hash": "^2.0.2",
-        "devalue": "^5.6.2",
+        "devalue": "^5.8.1",
         "diff": "^8.0.3",
-        "dlv": "^1.1.3",
         "dset": "^3.1.4",
-        "es-module-lexer": "^1.7.0",
+        "es-module-lexer": "^2.0.0",
         "esbuild": "^0.27.3",
-        "estree-walker": "^3.0.3",
         "flattie": "^1.1.1",
-        "fontace": "~0.4.0",
+        "fontace": "~0.4.1",
+        "get-tsconfig": "5.0.0-beta.4",
         "github-slugger": "^2.0.0",
         "html-escaper": "3.0.3",
         "http-cache-semantics": "^4.2.0",
-        "import-meta-resolve": "^4.2.0",
         "js-yaml": "^4.1.1",
+        "jsonc-parser": "^3.3.1",
         "magic-string": "^0.30.21",
-        "magicast": "^0.5.1",
+        "magicast": "^0.5.2",
         "mrmime": "^2.0.1",
         "neotraverse": "^0.6.18",
-        "p-limit": "^6.2.0",
-        "p-queue": "^8.1.1",
+        "obug": "^2.1.1",
+        "p-limit": "^7.3.0",
+        "p-queue": "^9.1.0",
         "package-manager-detector": "^1.6.0",
         "piccolore": "^0.1.3",
-        "picomatch": "^4.0.3",
-        "prompts": "^2.4.2",
+        "picomatch": "^4.0.4",
         "rehype": "^13.0.2",
-        "semver": "^7.7.3",
-        "shiki": "^3.21.0",
+        "semver": "^7.7.4",
+        "shiki": "^4.0.2",
         "smol-toml": "^1.6.0",
-        "svgo": "^4.0.0",
-        "tinyexec": "^1.0.2",
+        "svgo": "^4.0.1",
+        "tinyclip": "^0.1.12",
+        "tinyexec": "^1.0.4",
         "tinyglobby": "^0.2.15",
-        "tsconfck": "^3.1.6",
         "ultrahtml": "^1.6.0",
-        "unifont": "~0.7.3",
-        "unist-util-visit": "^5.0.0",
-        "unstorage": "^1.17.4",
+        "unifont": "~0.7.4",
+        "unist-util-visit": "^5.1.0",
+        "unstorage": "^1.17.5",
         "vfile": "^6.0.3",
-        "vite": "^6.4.1",
-        "vitefu": "^1.1.1",
+        "vite": "^7.3.2",
+        "vitefu": "^1.1.2",
         "xxhash-wasm": "^1.1.0",
-        "yargs-parser": "^21.1.1",
-        "yocto-spinner": "^0.2.3",
-        "zod": "^3.25.76",
-        "zod-to-json-schema": "^3.25.1",
-        "zod-to-ts": "^1.2.0"
+        "yargs-parser": "^22.0.0",
+        "zod": "^4.3.6"
       },
       "bin": {
-        "astro": "astro.js"
+        "astro": "bin/astro.mjs"
       },
       "engines": {
-        "node": "18.20.8 || ^20.3.0 || >=22.0.0",
+        "node": ">=22.12.0",
         "npm": ">=9.6.5",
         "pnpm": ">=7.1.0"
       },
@@ -1773,52 +1744,12 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
-    "node_modules/base-64": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/base-64/-/base-64-1.0.0.tgz",
-      "integrity": "sha512-kwDPIFCGx0NZHog36dj+tHiwP4QMzsZ3AgMViUBKI0+V5n4U0ufTCUMhnQ04diaRI8EX/QcPfql7zlhZ7j4zgg==",
-      "license": "MIT"
-    },
     "node_modules/boolbase": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
       "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
       "license": "ISC"
     },
-    "node_modules/boxen": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/boxen/-/boxen-8.0.1.tgz",
-      "integrity": "sha512-F3PH5k5juxom4xktynS7MoFY+NUWH5LC4CnH11YB8NPew+HLpmBLCybSAEyb2F+4pRXhuhWqFesoQd6DAyc2hw==",
-      "license": "MIT",
-      "dependencies": {
-        "ansi-align": "^3.0.1",
-        "camelcase": "^8.0.0",
-        "chalk": "^5.3.0",
-        "cli-boxes": "^3.0.0",
-        "string-width": "^7.2.0",
-        "type-fest": "^4.21.0",
-        "widest-line": "^5.0.0",
-        "wrap-ansi": "^9.0.0"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/camelcase": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-8.0.0.tgz",
-      "integrity": "sha512-8WB3Jcas3swSvjIeA2yvCJ+Miyz5l1ZmB6HFb9R1317dt9LCQoswg/BGrmAmkWVEszSrrg4RwmO46qIm2OEnSA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=16"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/ccount": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/ccount/-/ccount-2.0.1.tgz",
@@ -1829,18 +1760,6 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
-    "node_modules/chalk": {
-      "version": "5.6.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.6.2.tgz",
-      "integrity": "sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA==",
-      "license": "MIT",
-      "engines": {
-        "node": "^12.17.0 || ^14.13 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
     "node_modules/character-entities": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-2.0.2.tgz",
@@ -1901,18 +1820,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/cli-boxes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-3.0.0.tgz",
-      "integrity": "sha512-/lzGpEWL/8PfI0BmBOPRwp0c/wFNX1RdUML3jK/RcSBA9T8mZDdQpqYBKtCFTOfQbwPqWEOpjqW+Fnayc0969g==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/clsx": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz",
@@ -1942,10 +1849,13 @@
       }
     },
     "node_modules/common-ancestor-path": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/common-ancestor-path/-/common-ancestor-path-1.0.1.tgz",
-      "integrity": "sha512-L3sHRo1pXXEqX8VU28kfgUY+YGsk09hPqZiZmLacNib6XNTCM8ubYeT7ryXQw8asB1sKgcU5lkB7ONug08aB8w==",
-      "license": "ISC"
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/common-ancestor-path/-/common-ancestor-path-2.0.0.tgz",
+      "integrity": "sha512-dnN3ibLeoRf2HNC+OlCiNc5d2zxbLJXOtiZUudNFSXZrNSydxcCsSpRzXwfu7BBWCIfHPw+xTayeBvJCP/D8Ng==",
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": ">= 18"
+      }
     },
     "node_modules/cookie": {
       "version": "1.1.1",
@@ -2016,18 +1926,6 @@
         "url": "https://github.com/sponsors/fb55"
       }
     },
-    "node_modules/cssesc": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
-      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
-      "license": "MIT",
-      "bin": {
-        "cssesc": "bin/cssesc"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/csso": {
       "version": "5.0.5",
       "resolved": "https://registry.npmjs.org/csso/-/csso-5.0.5.tgz",
@@ -2122,18 +2020,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/deterministic-object-hash": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/deterministic-object-hash/-/deterministic-object-hash-2.0.2.tgz",
-      "integrity": "sha512-KxektNH63SrbfUyDiwXqRb1rLwKt33AmMv+5Nhsw1kqZ13SJBRTgZHtGbE+hH3a1mVW1cz+4pqSWVPAtLVXTzQ==",
-      "license": "MIT",
-      "dependencies": {
-        "base-64": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
     "node_modules/devalue": {
       "version": "5.8.1",
       "resolved": "https://registry.npmjs.org/devalue/-/devalue-5.8.1.tgz",
@@ -2162,12 +2048,6 @@
         "node": ">=0.3.1"
       }
     },
-    "node_modules/dlv": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz",
-      "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==",
-      "license": "MIT"
-    },
     "node_modules/dom-serializer": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
@@ -2244,12 +2124,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/emoji-regex": {
-      "version": "10.6.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.6.0.tgz",
-      "integrity": "sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==",
-      "license": "MIT"
-    },
     "node_modules/entities": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/entities/-/entities-6.0.1.tgz",
@@ -2263,9 +2137,9 @@
       }
     },
     "node_modules/es-module-lexer": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.7.0.tgz",
-      "integrity": "sha512-jEQoCwk8hyb2AZziIOLhDqpm5+2ww5uIE6lkO/6jcOCusfk6LhMHpXXfBLXTZ7Ydyt0j4VoUQv6uGNYbdW+kBA==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-2.1.0.tgz",
+      "integrity": "sha512-n27zTYMjYu1aj4MjCWzSP7G9r75utsaoc8m61weK+W8JMBGGQybd43GstCXZ3WNmSFtGT9wi59qQTW6mhTR5LQ==",
       "license": "MIT"
     },
     "node_modules/esbuild": {
@@ -2321,15 +2195,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/estree-walker": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz",
-      "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/estree": "^1.0.0"
-      }
-    },
     "node_modules/eventemitter3": {
       "version": "5.0.4",
       "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.4.tgz",
@@ -2342,6 +2207,30 @@
       "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
       "license": "MIT"
     },
+    "node_modules/fast-string-truncated-width": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/fast-string-truncated-width/-/fast-string-truncated-width-3.0.3.tgz",
+      "integrity": "sha512-0jjjIEL6+0jag3l2XWWizO64/aZVtpiGE3t0Zgqxv0DPuxiMjvB3M24fCyhZUO4KomJQPj3LTSUnDP3GpdwC0g==",
+      "license": "MIT"
+    },
+    "node_modules/fast-string-width": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/fast-string-width/-/fast-string-width-3.0.2.tgz",
+      "integrity": "sha512-gX8LrtNEI5hq8DVUfRQMbr5lpaS4nMIWV+7XEbXk2b8kiQIizgnlr12B4dA3ZEx3308ze0O4Q1R+cHts8kyUJg==",
+      "license": "MIT",
+      "dependencies": {
+        "fast-string-truncated-width": "^3.0.2"
+      }
+    },
+    "node_modules/fast-wrap-ansi": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/fast-wrap-ansi/-/fast-wrap-ansi-0.2.2.tgz",
+      "integrity": "sha512-7F2Fl+TjRSenLqlU3UjSH0iyqopqoZIu7eZVpEirP2g1GtWa2G/ecEmBdgz31+Mxr+ELclgg6sokpSFIQiZ02Q==",
+      "license": "MIT",
+      "dependencies": {
+        "fast-string-width": "^3.0.2"
+      }
+    },
     "node_modules/fdir": {
       "version": "6.5.0",
       "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
@@ -2403,16 +2292,19 @@
         "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
       }
     },
-    "node_modules/get-east-asian-width": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.6.0.tgz",
-      "integrity": "sha512-QRbvDIbx6YklUe6RxeTeleMR0yv3cYH6PsPZHcnVn7xv7zO1BHN8r0XETu8n6Ye3Q+ahtSarc3WgtNWmehIBfA==",
+    "node_modules/get-tsconfig": {
+      "version": "5.0.0-beta.4",
+      "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-5.0.0-beta.4.tgz",
+      "integrity": "sha512-7nF7C9fIPFEMHgEMEfgIlO9wDdZ8CyHw27rWciFZfHvHDReIiPhsYuzPRXsfvBCqFy1l8RRyyWV7QLM+ZhUJsQ==",
       "license": "MIT",
+      "dependencies": {
+        "resolve-pkg-maps": "^1.0.0"
+      },
       "engines": {
-        "node": ">=18"
+        "node": ">=20.20.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://github.com/privatenumber/get-tsconfig?sponsor=1"
       }
     },
     "node_modules/github-slugger": {
@@ -2637,16 +2529,6 @@
       "integrity": "sha512-dTxcvPXqPvXBQpq5dUr6mEMJX4oIEFv6bwom3FDwKRDsuIjjJGANqhBuoAn9c1RQJIdAKav33ED65E2ys+87QQ==",
       "license": "BSD-2-Clause"
     },
-    "node_modules/import-meta-resolve": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/import-meta-resolve/-/import-meta-resolve-4.2.0.tgz",
-      "integrity": "sha512-Iqv2fzaTQN28s/FwZAoFq0ZSs/7hMAHJVX+w8PZl3cY19Pxk6jFFalxQoIfW2826i/fDLXv8IiEZRIT0lDuWcg==",
-      "license": "MIT",
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
     "node_modules/iron-webcrypto": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/iron-webcrypto/-/iron-webcrypto-1.2.1.tgz",
@@ -2657,29 +2539,20 @@
       }
     },
     "node_modules/is-docker": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-3.0.0.tgz",
-      "integrity": "sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-4.0.0.tgz",
+      "integrity": "sha512-LHE+wROyG/Y/0ZnbktRCoTix2c1RhgWaZraMZ8o1Q7zCh0VSrICJQO5oqIIISrcSBtrXv0o233w1IYwsWCjTzA==",
       "license": "MIT",
       "bin": {
         "is-docker": "cli.js"
       },
       "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+        "node": ">=20"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/is-inside-container": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-inside-container/-/is-inside-container-1.0.0.tgz",
@@ -2698,6 +2571,21 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/is-inside-container/node_modules/is-docker": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-3.0.0.tgz",
+      "integrity": "sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==",
+      "license": "MIT",
+      "bin": {
+        "is-docker": "cli.js"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/is-plain-obj": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-4.1.0.tgz",
@@ -2747,14 +2635,11 @@
         "js-yaml": "bin/js-yaml.js"
       }
     },
-    "node_modules/kleur": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
-      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
+    "node_modules/jsonc-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz",
+      "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==",
+      "license": "MIT"
     },
     "node_modules/longest-streak": {
       "version": "3.1.0",
@@ -3687,6 +3572,19 @@
         "url": "https://github.com/fb55/nth-check?sponsor=1"
       }
     },
+    "node_modules/obug": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/obug/-/obug-2.1.2.tgz",
+      "integrity": "sha512-AWGB9WFcRXOQs48Z/udjI5ZcZMHXwX8XPByNpOydgcGsDLIzjGizhoMWJyKAWze7AVW/2W1i+/gPX4YtKe5cyg==",
+      "funding": [
+        "https://github.com/sponsors/sxzz",
+        "https://opencollective.com/debug"
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">=12.20.0"
+      }
+    },
     "node_modules/ofetch": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/ofetch/-/ofetch-1.5.1.tgz",
@@ -3722,43 +3620,43 @@
       }
     },
     "node_modules/p-limit": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-6.2.0.tgz",
-      "integrity": "sha512-kuUqqHNUqoIWp/c467RI4X6mmyuojY5jGutNU0wVTmEOOfcuwLqyMVoAi9MKi2Ak+5i9+nhmrK4ufZE8069kHA==",
+      "version": "7.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-7.3.0.tgz",
+      "integrity": "sha512-7cIXg/Z0M5WZRblrsOla88S4wAK+zOQQWeBYfV3qJuJXMr+LnbYjaadrFaS0JILfEDPVqHyKnZ1Z/1d6J9VVUw==",
       "license": "MIT",
       "dependencies": {
-        "yocto-queue": "^1.1.1"
+        "yocto-queue": "^1.2.1"
       },
       "engines": {
-        "node": ">=18"
+        "node": ">=20"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/p-queue": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/p-queue/-/p-queue-8.1.1.tgz",
-      "integrity": "sha512-aNZ+VfjobsWryoiPnEApGGmf5WmNsCo9xu8dfaYamG5qaLP7ClhLN6NgsFe6SwJ2UbLEBK5dv9x8Mn5+RVhMWQ==",
+      "version": "9.3.0",
+      "resolved": "https://registry.npmjs.org/p-queue/-/p-queue-9.3.0.tgz",
+      "integrity": "sha512-7NED7xhQ74Ngp4JP/2e0VZHp7vSWfJfqeiR92jPgxsz6m0Se4P03YoTKa9dDXyZ3r6P616gUXttrB6nnHYKang==",
       "license": "MIT",
       "dependencies": {
-        "eventemitter3": "^5.0.1",
-        "p-timeout": "^6.1.2"
+        "eventemitter3": "^5.0.4",
+        "p-timeout": "^7.0.0"
       },
       "engines": {
-        "node": ">=18"
+        "node": ">=20"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/p-timeout": {
-      "version": "6.1.4",
-      "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-6.1.4.tgz",
-      "integrity": "sha512-MyIV3ZA/PmyBN/ud8vV9XzwTrNtR4jFrObymZYnZqMmW0zA8Z17vnT0rBgFE/TlohB+YCHqXMgZzb3Csp49vqg==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-7.0.1.tgz",
+      "integrity": "sha512-AxTM2wDGORHGEkPCt8yqxOTMgpfbEHqF51f/5fJCmwFC3C/zNcGT63SymH2ttOAaiIws2zVg4+izQCjrakcwHg==",
       "license": "MIT",
       "engines": {
-        "node": ">=14.16"
+        "node": ">=20"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -3861,19 +3759,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/prompts": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
-      "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
-      "license": "MIT",
-      "dependencies": {
-        "kleur": "^3.0.3",
-        "sisteransi": "^1.0.5"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/property-information": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/property-information/-/property-information-7.2.0.tgz",
@@ -4069,6 +3954,15 @@
         "url": "https://opencollective.com/unified"
       }
     },
+    "node_modules/resolve-pkg-maps": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz",
+      "integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==",
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1"
+      }
+    },
     "node_modules/retext": {
       "version": "9.0.0",
       "resolved": "https://registry.npmjs.org/retext/-/retext-9.0.0.tgz",
@@ -4241,19 +4135,22 @@
       }
     },
     "node_modules/shiki": {
-      "version": "3.23.0",
-      "resolved": "https://registry.npmjs.org/shiki/-/shiki-3.23.0.tgz",
-      "integrity": "sha512-55Dj73uq9ZXL5zyeRPzHQsK7Nbyt6Y10k5s7OjuFZGMhpp4r/rsLBH0o/0fstIzX1Lep9VxefWljK/SKCzygIA==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/shiki/-/shiki-4.2.0.tgz",
+      "integrity": "sha512-hjNax6o/ylDy9lefQEaSDtzaT3iVNtZ3WmpQnbuQNoG4xvnSKf2kSKbihZVO4JRG1TTMejs7CmNRYlWgAL66pQ==",
       "license": "MIT",
       "dependencies": {
-        "@shikijs/core": "3.23.0",
-        "@shikijs/engine-javascript": "3.23.0",
-        "@shikijs/engine-oniguruma": "3.23.0",
-        "@shikijs/langs": "3.23.0",
-        "@shikijs/themes": "3.23.0",
-        "@shikijs/types": "3.23.0",
+        "@shikijs/core": "4.2.0",
+        "@shikijs/engine-javascript": "4.2.0",
+        "@shikijs/engine-oniguruma": "4.2.0",
+        "@shikijs/langs": "4.2.0",
+        "@shikijs/themes": "4.2.0",
+        "@shikijs/types": "4.2.0",
         "@shikijs/vscode-textmate": "^10.0.2",
         "@types/hast": "^3.0.4"
+      },
+      "engines": {
+        "node": ">=20"
       }
     },
     "node_modules/sisteransi": {
@@ -4293,23 +4190,6 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
-    "node_modules/string-width": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz",
-      "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==",
-      "license": "MIT",
-      "dependencies": {
-        "emoji-regex": "^10.3.0",
-        "get-east-asian-width": "^1.0.0",
-        "strip-ansi": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/stringify-entities": {
       "version": "4.0.4",
       "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-4.0.4.tgz",
@@ -4324,21 +4204,6 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
-    "node_modules/strip-ansi": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz",
-      "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==",
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^6.2.2"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
-      }
-    },
     "node_modules/svgo": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/svgo/-/svgo-4.0.1.tgz",
@@ -4370,6 +4235,15 @@
       "integrity": "sha512-pkY1fj1cKHb2seWDy0B16HeWyczlJA9/WW3u3c4z/NiWDsO3DOU5D7nhTLE9CF0yXv/QZFY7sEJmj24dK+Rrqw==",
       "license": "MIT"
     },
+    "node_modules/tinyclip": {
+      "version": "0.1.14",
+      "resolved": "https://registry.npmjs.org/tinyclip/-/tinyclip-0.1.14.tgz",
+      "integrity": "sha512-F1oWdz8tjT17qe1d5JgDK6z03WGOhYYAN0lK3/D/fzNiy93xswLLEw7pk+3g05onhAy6Bsc6PLNUGhdgVjemMQ==",
+      "license": "MIT",
+      "engines": {
+        "node": "^16.14.0 || >= 17.3.0"
+      }
+    },
     "node_modules/tinyexec": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-1.2.4.tgz",
@@ -4415,26 +4289,6 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
-    "node_modules/tsconfck": {
-      "version": "3.1.6",
-      "resolved": "https://registry.npmjs.org/tsconfck/-/tsconfck-3.1.6.tgz",
-      "integrity": "sha512-ks6Vjr/jEw0P1gmOVwutM3B7fWxoWBL2KRDb1JfqGVawBmO5UsvmWOQFGHBPl5yxYz4eERr19E6L7NMv+Fej4w==",
-      "license": "MIT",
-      "bin": {
-        "tsconfck": "bin/tsconfck.js"
-      },
-      "engines": {
-        "node": "^18 || >=20"
-      },
-      "peerDependencies": {
-        "typescript": "^5.0.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/tslib": {
       "version": "2.8.1",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
@@ -4442,32 +4296,6 @@
       "license": "0BSD",
       "optional": true
     },
-    "node_modules/type-fest": {
-      "version": "4.41.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.41.0.tgz",
-      "integrity": "sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==",
-      "license": "(MIT OR CC0-1.0)",
-      "engines": {
-        "node": ">=16"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/typescript": {
-      "version": "5.9.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
-      "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
-      "license": "Apache-2.0",
-      "peer": true,
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
-      },
-      "engines": {
-        "node": ">=14.17"
-      }
-    },
     "node_modules/ufo": {
       "version": "1.6.4",
       "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.6.4.tgz",
@@ -4778,23 +4606,23 @@
       }
     },
     "node_modules/vite": {
-      "version": "6.4.3",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-6.4.3.tgz",
-      "integrity": "sha512-NTKlcQjlAK7MlQoyb6LgaqHc8sso/pVyUJYWMws3jg21uTJw/LddqIFPcPqP6PzpgbIcZyKI85sFE4HBrQDA8A==",
+      "version": "7.3.5",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-7.3.5.tgz",
+      "integrity": "sha512-KuOaNhcnGFN2zIPGA7wRmzF+lJA1sea7rHq17aiJ++9lzY1WWG6Jpwqwe1KNbRVPIqHmr8GLYx7jbrQcN/7/ww==",
       "license": "MIT",
       "dependencies": {
-        "esbuild": "^0.25.0",
-        "fdir": "^6.4.4",
-        "picomatch": "^4.0.2",
-        "postcss": "^8.5.3",
-        "rollup": "^4.34.9",
-        "tinyglobby": "^0.2.13"
+        "esbuild": "^0.27.0",
+        "fdir": "^6.5.0",
+        "picomatch": "^4.0.3",
+        "postcss": "^8.5.6",
+        "rollup": "^4.43.0",
+        "tinyglobby": "^0.2.15"
       },
       "bin": {
         "vite": "bin/vite.js"
       },
       "engines": {
-        "node": "^18.0.0 || ^20.0.0 || >=22.0.0"
+        "node": "^20.19.0 || >=22.12.0"
       },
       "funding": {
         "url": "https://github.com/vitejs/vite?sponsor=1"
@@ -4803,14 +4631,14 @@
         "fsevents": "~2.3.3"
       },
       "peerDependencies": {
-        "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0",
+        "@types/node": "^20.19.0 || >=22.12.0",
         "jiti": ">=1.21.0",
-        "less": "*",
+        "less": "^4.0.0",
         "lightningcss": "^1.21.0",
-        "sass": "*",
-        "sass-embedded": "*",
-        "stylus": "*",
-        "sugarss": "*",
+        "sass": "^1.70.0",
+        "sass-embedded": "^1.70.0",
+        "stylus": ">=0.54.8",
+        "sugarss": "^5.0.0",
         "terser": "^5.16.0",
         "tsx": "^4.8.1",
         "yaml": "^2.4.2"
@@ -4851,463 +4679,6 @@
         }
       }
     },
-    "node_modules/vite/node_modules/@esbuild/aix-ppc64": {
-      "version": "0.25.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.12.tgz",
-      "integrity": "sha512-Hhmwd6CInZ3dwpuGTF8fJG6yoWmsToE+vYgD4nytZVxcu1ulHpUQRAB1UJ8+N1Am3Mz4+xOByoQoSZf4D+CpkA==",
-      "cpu": [
-        "ppc64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "aix"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/android-arm": {
-      "version": "0.25.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.12.tgz",
-      "integrity": "sha512-VJ+sKvNA/GE7Ccacc9Cha7bpS8nyzVv0jdVgwNDaR4gDMC/2TTRc33Ip8qrNYUcpkOHUT5OZ0bUcNNVZQ9RLlg==",
-      "cpu": [
-        "arm"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/android-arm64": {
-      "version": "0.25.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.12.tgz",
-      "integrity": "sha512-6AAmLG7zwD1Z159jCKPvAxZd4y/VTO0VkprYy+3N2FtJ8+BQWFXU+OxARIwA46c5tdD9SsKGZ/1ocqBS/gAKHg==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/android-x64": {
-      "version": "0.25.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.12.tgz",
-      "integrity": "sha512-5jbb+2hhDHx5phYR2By8GTWEzn6I9UqR11Kwf22iKbNpYrsmRB18aX/9ivc5cabcUiAT/wM+YIZ6SG9QO6a8kg==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/darwin-arm64": {
-      "version": "0.25.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.12.tgz",
-      "integrity": "sha512-N3zl+lxHCifgIlcMUP5016ESkeQjLj/959RxxNYIthIg+CQHInujFuXeWbWMgnTo4cp5XVHqFPmpyu9J65C1Yg==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/darwin-x64": {
-      "version": "0.25.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.12.tgz",
-      "integrity": "sha512-HQ9ka4Kx21qHXwtlTUVbKJOAnmG1ipXhdWTmNXiPzPfWKpXqASVcWdnf2bnL73wgjNrFXAa3yYvBSd9pzfEIpA==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.25.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.12.tgz",
-      "integrity": "sha512-gA0Bx759+7Jve03K1S0vkOu5Lg/85dou3EseOGUes8flVOGxbhDDh/iZaoek11Y8mtyKPGF3vP8XhnkDEAmzeg==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/freebsd-x64": {
-      "version": "0.25.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.12.tgz",
-      "integrity": "sha512-TGbO26Yw2xsHzxtbVFGEXBFH0FRAP7gtcPE7P5yP7wGy7cXK2oO7RyOhL5NLiqTlBh47XhmIUXuGciXEqYFfBQ==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/linux-arm": {
-      "version": "0.25.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.12.tgz",
-      "integrity": "sha512-lPDGyC1JPDou8kGcywY0YILzWlhhnRjdof3UlcoqYmS9El818LLfJJc3PXXgZHrHCAKs/Z2SeZtDJr5MrkxtOw==",
-      "cpu": [
-        "arm"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/linux-arm64": {
-      "version": "0.25.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.12.tgz",
-      "integrity": "sha512-8bwX7a8FghIgrupcxb4aUmYDLp8pX06rGh5HqDT7bB+8Rdells6mHvrFHHW2JAOPZUbnjUpKTLg6ECyzvas2AQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/linux-ia32": {
-      "version": "0.25.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.12.tgz",
-      "integrity": "sha512-0y9KrdVnbMM2/vG8KfU0byhUN+EFCny9+8g202gYqSSVMonbsCfLjUO+rCci7pM0WBEtz+oK/PIwHkzxkyharA==",
-      "cpu": [
-        "ia32"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/linux-loong64": {
-      "version": "0.25.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.12.tgz",
-      "integrity": "sha512-h///Lr5a9rib/v1GGqXVGzjL4TMvVTv+s1DPoxQdz7l/AYv6LDSxdIwzxkrPW438oUXiDtwM10o9PmwS/6Z0Ng==",
-      "cpu": [
-        "loong64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/linux-mips64el": {
-      "version": "0.25.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.12.tgz",
-      "integrity": "sha512-iyRrM1Pzy9GFMDLsXn1iHUm18nhKnNMWscjmp4+hpafcZjrr2WbT//d20xaGljXDBYHqRcl8HnxbX6uaA/eGVw==",
-      "cpu": [
-        "mips64el"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/linux-ppc64": {
-      "version": "0.25.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.12.tgz",
-      "integrity": "sha512-9meM/lRXxMi5PSUqEXRCtVjEZBGwB7P/D4yT8UG/mwIdze2aV4Vo6U5gD3+RsoHXKkHCfSxZKzmDssVlRj1QQA==",
-      "cpu": [
-        "ppc64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/linux-riscv64": {
-      "version": "0.25.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.12.tgz",
-      "integrity": "sha512-Zr7KR4hgKUpWAwb1f3o5ygT04MzqVrGEGXGLnj15YQDJErYu/BGg+wmFlIDOdJp0PmB0lLvxFIOXZgFRrdjR0w==",
-      "cpu": [
-        "riscv64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/linux-s390x": {
-      "version": "0.25.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.12.tgz",
-      "integrity": "sha512-MsKncOcgTNvdtiISc/jZs/Zf8d0cl/t3gYWX8J9ubBnVOwlk65UIEEvgBORTiljloIWnBzLs4qhzPkJcitIzIg==",
-      "cpu": [
-        "s390x"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/linux-x64": {
-      "version": "0.25.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.12.tgz",
-      "integrity": "sha512-uqZMTLr/zR/ed4jIGnwSLkaHmPjOjJvnm6TVVitAa08SLS9Z0VM8wIRx7gWbJB5/J54YuIMInDquWyYvQLZkgw==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/netbsd-arm64": {
-      "version": "0.25.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.12.tgz",
-      "integrity": "sha512-xXwcTq4GhRM7J9A8Gv5boanHhRa/Q9KLVmcyXHCTaM4wKfIpWkdXiMog/KsnxzJ0A1+nD+zoecuzqPmCRyBGjg==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "netbsd"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/netbsd-x64": {
-      "version": "0.25.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.12.tgz",
-      "integrity": "sha512-Ld5pTlzPy3YwGec4OuHh1aCVCRvOXdH8DgRjfDy/oumVovmuSzWfnSJg+VtakB9Cm0gxNO9BzWkj6mtO1FMXkQ==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "netbsd"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/openbsd-arm64": {
-      "version": "0.25.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.12.tgz",
-      "integrity": "sha512-fF96T6KsBo/pkQI950FARU9apGNTSlZGsv1jZBAlcLL1MLjLNIWPBkj5NlSz8aAzYKg+eNqknrUJ24QBybeR5A==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "openbsd"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/openbsd-x64": {
-      "version": "0.25.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.12.tgz",
-      "integrity": "sha512-MZyXUkZHjQxUvzK7rN8DJ3SRmrVrke8ZyRusHlP+kuwqTcfWLyqMOE3sScPPyeIXN/mDJIfGXvcMqCgYKekoQw==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "openbsd"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/openharmony-arm64": {
-      "version": "0.25.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.25.12.tgz",
-      "integrity": "sha512-rm0YWsqUSRrjncSXGA7Zv78Nbnw4XL6/dzr20cyrQf7ZmRcsovpcRBdhD43Nuk3y7XIoW2OxMVvwuRvk9XdASg==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "openharmony"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/sunos-x64": {
-      "version": "0.25.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.12.tgz",
-      "integrity": "sha512-3wGSCDyuTHQUzt0nV7bocDy72r2lI33QL3gkDNGkod22EsYl04sMf0qLb8luNKTOmgF/eDEDP5BFNwoBKH441w==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "sunos"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/win32-arm64": {
-      "version": "0.25.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.12.tgz",
-      "integrity": "sha512-rMmLrur64A7+DKlnSuwqUdRKyd3UE7oPJZmnljqEptesKM8wx9J8gx5u0+9Pq0fQQW8vqeKebwNXdfOyP+8Bsg==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/win32-ia32": {
-      "version": "0.25.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.12.tgz",
-      "integrity": "sha512-HkqnmmBoCbCwxUKKNPBixiWDGCpQGVsrQfJoVGYLPT41XWF8lHuE5N6WhVia2n4o5QK5M4tYr21827fNhi4byQ==",
-      "cpu": [
-        "ia32"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/win32-x64": {
-      "version": "0.25.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.12.tgz",
-      "integrity": "sha512-alJC0uCZpTFrSL0CCDjcgleBXPnCrEAhTBILpeAp7M/OFgoqtAetfBzX0xM00MUsVVPpVjlPuMbREqnZCXaTnA==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/vite/node_modules/esbuild": {
-      "version": "0.25.12",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.12.tgz",
-      "integrity": "sha512-bbPBYYrtZbkt6Os6FiTLCTFxvq4tt3JKall1vRwshA3fdVztsLAatFaZobhkBC8/BrPetoa0oksYoKXoG4ryJg==",
-      "hasInstallScript": true,
-      "license": "MIT",
-      "bin": {
-        "esbuild": "bin/esbuild"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.25.12",
-        "@esbuild/android-arm": "0.25.12",
-        "@esbuild/android-arm64": "0.25.12",
-        "@esbuild/android-x64": "0.25.12",
-        "@esbuild/darwin-arm64": "0.25.12",
-        "@esbuild/darwin-x64": "0.25.12",
-        "@esbuild/freebsd-arm64": "0.25.12",
-        "@esbuild/freebsd-x64": "0.25.12",
-        "@esbuild/linux-arm": "0.25.12",
-        "@esbuild/linux-arm64": "0.25.12",
-        "@esbuild/linux-ia32": "0.25.12",
-        "@esbuild/linux-loong64": "0.25.12",
-        "@esbuild/linux-mips64el": "0.25.12",
-        "@esbuild/linux-ppc64": "0.25.12",
-        "@esbuild/linux-riscv64": "0.25.12",
-        "@esbuild/linux-s390x": "0.25.12",
-        "@esbuild/linux-x64": "0.25.12",
-        "@esbuild/netbsd-arm64": "0.25.12",
-        "@esbuild/netbsd-x64": "0.25.12",
-        "@esbuild/openbsd-arm64": "0.25.12",
-        "@esbuild/openbsd-x64": "0.25.12",
-        "@esbuild/openharmony-arm64": "0.25.12",
-        "@esbuild/sunos-x64": "0.25.12",
-        "@esbuild/win32-arm64": "0.25.12",
-        "@esbuild/win32-ia32": "0.25.12",
-        "@esbuild/win32-x64": "0.25.12"
-      }
-    },
     "node_modules/vitefu": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/vitefu/-/vitefu-1.1.3.tgz",
@@ -5346,38 +4717,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/widest-line": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-5.0.0.tgz",
-      "integrity": "sha512-c9bZp7b5YtRj2wOe6dlj32MK+Bx/M/d+9VB2SHM1OtsUHR0aV0tdP6DWh/iMt0kWi1t5g1Iudu6hQRNd1A4PVA==",
-      "license": "MIT",
-      "dependencies": {
-        "string-width": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/wrap-ansi": {
-      "version": "9.0.2",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.2.tgz",
-      "integrity": "sha512-42AtmgqjV+X1VpdOfyTGOYRi0/zsoLqtXQckTmqTeybT+BDIbM/Guxo7x3pE2vtpr1ok6xRqM9OpBe+Jyoqyww==",
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^6.2.1",
-        "string-width": "^7.0.0",
-        "strip-ansi": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-      }
-    },
     "node_modules/xxhash-wasm": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/xxhash-wasm/-/xxhash-wasm-1.1.0.tgz",
@@ -5385,12 +4724,12 @@
       "license": "MIT"
     },
     "node_modules/yargs-parser": {
-      "version": "21.1.1",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
-      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+      "version": "22.0.0",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-22.0.0.tgz",
+      "integrity": "sha512-rwu/ClNdSMpkSrUb+d6BRsSkLUq1fmfsY6TOpYzTwvwkg1/NRG85KBy3kq++A8LKQwX6lsu+aWad+2khvuXrqw==",
       "license": "ISC",
       "engines": {
-        "node": ">=12"
+        "node": "^20.19.0 || ^22.12.0 || >=23"
       }
     },
     "node_modules/yocto-queue": {
@@ -5405,60 +4744,15 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/yocto-spinner": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/yocto-spinner/-/yocto-spinner-0.2.3.tgz",
-      "integrity": "sha512-sqBChb33loEnkoXte1bLg45bEBsOP9N1kzQh5JZNKj/0rik4zAPTNSAVPj3uQAdc6slYJ0Ksc403G2XgxsJQFQ==",
-      "license": "MIT",
-      "dependencies": {
-        "yoctocolors": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=18.19"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/yoctocolors": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/yoctocolors/-/yoctocolors-2.1.2.tgz",
-      "integrity": "sha512-CzhO+pFNo8ajLM2d2IW/R93ipy99LWjtwblvC1RsoSUMZgyLbYFr221TnSNT7GjGdYui6P459mw9JH/g/zW2ug==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/zod": {
-      "version": "3.25.76",
-      "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.76.tgz",
-      "integrity": "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==",
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-4.4.3.tgz",
+      "integrity": "sha512-ytENFjIJFl2UwYglde2jchW2Hwm4GJFLDiSXWdTrJQBIN9Fcyp7n4DhxJEiWNAJMV1/BqWfW/kkg71UDcHJyTQ==",
       "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/colinhacks"
       }
     },
-    "node_modules/zod-to-json-schema": {
-      "version": "3.25.2",
-      "resolved": "https://registry.npmjs.org/zod-to-json-schema/-/zod-to-json-schema-3.25.2.tgz",
-      "integrity": "sha512-O/PgfnpT1xKSDeQYSCfRI5Gy3hPf91mKVDuYLUHZJMiDFptvP41MSnWofm8dnCm0256ZNfZIM7DSzuSMAFnjHA==",
-      "license": "ISC",
-      "peerDependencies": {
-        "zod": "^3.25.28 || ^4"
-      }
-    },
-    "node_modules/zod-to-ts": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/zod-to-ts/-/zod-to-ts-1.2.0.tgz",
-      "integrity": "sha512-x30XE43V+InwGpvTySRNz9kB7qFU8DlyEy7BsSTCHPH1R0QasMmHWZDCzYm6bVXtj/9NNJAZF3jW8rzFvH5OFA==",
-      "peerDependencies": {
-        "typescript": "^4.9.4 || ^5.0.2",
-        "zod": "^3"
-      }
-    },
     "node_modules/zwitch": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/zwitch/-/zwitch-2.0.4.tgz",
diff --git a/site/package.json b/site/package.json
index 563f66269..15596d5a0 100644
--- a/site/package.json
+++ b/site/package.json
@@ -8,7 +8,7 @@
     "preview": "astro preview"
   },
   "dependencies": {
-    "astro": "^5.7.0",
+    "astro": "^6.4.4",
     "@fontsource-variable/inter": "^5.1.0"
   }
 }

From 56fca8acb7e6b4afe307e7c70fde17a7b030da28 Mon Sep 17 00:00:00 2001
From: YHH <359807859@qq.com>
Date: Tue, 9 Jun 2026 04:25:41 -0700
Subject: [PATCH 12/64] chore(ci): drop /npm/reasonix from Dependabot (#3692)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

/npm/reasonix only declares this project's own @reasonix/cli-* platform
binaries as optionalDependencies — versioned by the release pipeline, not
third-party deps. Dependabot was opening useless 0.0.0->1.0.0 self-bump PRs
for them; remove the ecosystem entry.

Co-authored-by: reasonix <reasonix@deepseek.com>
---
 .github/dependabot.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 53b33bcd5..cd9cf45c1 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -40,12 +40,6 @@ updates:
         patterns: ["*"]
         update-types: ["minor", "patch"]
 
-  - package-ecosystem: "npm"
-    directory: "/npm/reasonix"
-    schedule:
-      interval: "weekly"
-    open-pull-requests-limit: 5
-
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:

From 0f4be9cb59d468974b8b6b16e7cb2301d0cde778 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 9 Jun 2026 04:33:49 -0700
Subject: [PATCH 13/64] chore(deps): bump the actions group across 1 directory
 with 13 updates (#3688)

Bumps the actions group with 13 updates in the / directory:

| Package | From | To |
| --- | --- | --- |
| [actions/checkout](https://github.com/actions/checkout) | `4` | `6` |
| [actions/setup-go](https://github.com/actions/setup-go) | `5` | `6` |
| [pnpm/action-setup](https://github.com/pnpm/action-setup) | `4` | `6` |
| [actions/setup-node](https://github.com/actions/setup-node) | `4` | `6` |
| [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) | `7` | `9` |
| [actions/upload-artifact](https://github.com/actions/upload-artifact) | `4` | `7` |
| [actions/github-script](https://github.com/actions/github-script) | `7` | `9` |
| [actions/setup-python](https://github.com/actions/setup-python) | `5` | `6` |
| [actions/upload-pages-artifact](https://github.com/actions/upload-pages-artifact) | `3` | `5` |
| [actions/deploy-pages](https://github.com/actions/deploy-pages) | `4` | `5` |
| [actions/labeler](https://github.com/actions/labeler) | `5` | `6` |
| [actions/download-artifact](https://github.com/actions/download-artifact) | `4` | `8` |
| [goreleaser/goreleaser-action](https://github.com/goreleaser/goreleaser-action) | `6` | `7` |



Updates `actions/checkout` from 4 to 6
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v4...v6)

Updates `actions/setup-go` from 5 to 6
- [Release notes](https://github.com/actions/setup-go/releases)
- [Commits](https://github.com/actions/setup-go/compare/v5...v6)

Updates `pnpm/action-setup` from 4 to 6
- [Release notes](https://github.com/pnpm/action-setup/releases)
- [Commits](https://github.com/pnpm/action-setup/compare/v4...v6)

Updates `actions/setup-node` from 4 to 6
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](https://github.com/actions/setup-node/compare/v4...v6)

Updates `golangci/golangci-lint-action` from 7 to 9
- [Release notes](https://github.com/golangci/golangci-lint-action/releases)
- [Commits](https://github.com/golangci/golangci-lint-action/compare/v7...v9)

Updates `actions/upload-artifact` from 4 to 7
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v4...v7)

Updates `actions/github-script` from 7 to 9
- [Release notes](https://github.com/actions/github-script/releases)
- [Commits](https://github.com/actions/github-script/compare/v7...v9)

Updates `actions/setup-python` from 5 to 6
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/v5...v6)

Updates `actions/upload-pages-artifact` from 3 to 5
- [Release notes](https://github.com/actions/upload-pages-artifact/releases)
- [Commits](https://github.com/actions/upload-pages-artifact/compare/v3...v5)

Updates `actions/deploy-pages` from 4 to 5
- [Release notes](https://github.com/actions/deploy-pages/releases)
- [Commits](https://github.com/actions/deploy-pages/compare/v4...v5)

Updates `actions/labeler` from 5 to 6
- [Release notes](https://github.com/actions/labeler/releases)
- [Commits](https://github.com/actions/labeler/compare/v5...v6)

Updates `actions/download-artifact` from 4 to 8
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](https://github.com/actions/download-artifact/compare/v4...v8)

Updates `goreleaser/goreleaser-action` from 6 to 7
- [Release notes](https://github.com/goreleaser/goreleaser-action/releases)
- [Commits](https://github.com/goreleaser/goreleaser-action/compare/v6...v7)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: actions
- dependency-name: actions/deploy-pages
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: actions
- dependency-name: actions/download-artifact
  dependency-version: '8'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: actions
- dependency-name: actions/github-script
  dependency-version: '9'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: actions
- dependency-name: actions/labeler
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: actions
- dependency-name: actions/setup-go
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: actions
- dependency-name: actions/setup-node
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: actions
- dependency-name: actions/setup-python
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: actions
- dependency-name: actions/upload-artifact
  dependency-version: '7'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: actions
- dependency-name: actions/upload-pages-artifact
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: actions
- dependency-name: golangci/golangci-lint-action
  dependency-version: '9'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: actions
- dependency-name: goreleaser/goreleaser-action
  dependency-version: '7'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: actions
- dependency-name: pnpm/action-setup
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: actions
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/ci.yml                  | 32 +++++++++++------------
 .github/workflows/codeql.yml              |  2 +-
 .github/workflows/e2e-bot.yml             |  8 +++---
 .github/workflows/issue-auto-label.yml    |  2 +-
 .github/workflows/issue-version-label.yml |  2 +-
 .github/workflows/pages.yml               |  8 +++---
 .github/workflows/pr-auto-label.yml       |  2 +-
 .github/workflows/pr-version-label.yml    |  2 +-
 .github/workflows/release-desktop.yml     | 26 +++++++++---------
 .github/workflows/release-npm.yml         | 10 +++----
 .github/workflows/release.yml             | 12 ++++-----
 11 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f43329e4e..92527cf9e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,9 +21,9 @@ jobs:
         os: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
-      - uses: actions/setup-go@v5
+      - uses: actions/setup-go@v6
         with:
           go-version-file: go.mod
           cache: true
@@ -58,9 +58,9 @@ jobs:
   race:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
-      - uses: actions/setup-go@v5
+      - uses: actions/setup-go@v6
         with:
           go-version-file: go.mod
           cache: true
@@ -79,20 +79,20 @@ jobs:
       run:
         working-directory: desktop
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
-      - uses: actions/setup-go@v5
+      - uses: actions/setup-go@v6
         with:
           go-version-file: desktop/go.mod
           cache: true
           cache-dependency-path: desktop/go.sum
 
-      - uses: pnpm/action-setup@v4
+      - uses: pnpm/action-setup@v6
         with:
           version: 10
           run_install: false
 
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v6
         with:
           node-version: "24"
           cache: pnpm
@@ -145,15 +145,15 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
-      - uses: actions/setup-go@v5
+      - uses: actions/setup-go@v6
         with:
           go-version-file: go.mod
           cache: true
 
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v7
+        uses: golangci/golangci-lint-action@v9
         with:
           version: v2.12.2
           args: --timeout=5m
@@ -162,9 +162,9 @@ jobs:
     runs-on: ubuntu-latest
     continue-on-error: true # informational — stdlib vulns need a Go patch release
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
-      - uses: actions/setup-go@v5
+      - uses: actions/setup-go@v6
         with:
           go-version-file: go.mod
           cache: true
@@ -178,9 +178,9 @@ jobs:
   coverage:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
-      - uses: actions/setup-go@v5
+      - uses: actions/setup-go@v6
         with:
           go-version-file: go.mod
           cache: true
@@ -189,7 +189,7 @@ jobs:
         run: go test -coverprofile=coverage.out -covermode=atomic ./...
 
       - name: upload coverage
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: coverage-report
           path: coverage.out
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 0ae666d51..413818f9a 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -28,7 +28,7 @@ jobs:
           - language: actions
             build-mode: none
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v4
         with:
diff --git a/.github/workflows/e2e-bot.yml b/.github/workflows/e2e-bot.yml
index 6d7685f42..08d522b4a 100644
--- a/.github/workflows/e2e-bot.yml
+++ b/.github/workflows/e2e-bot.yml
@@ -27,7 +27,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Acknowledge
-        uses: actions/github-script@v7
+        uses: actions/github-script@v9
         with:
           script: |
             await github.rest.reactions.createForIssueComment({
@@ -37,16 +37,16 @@ jobs:
 
       # Default-branch checkout: this is where the harness (cmd/e2ebench), the
       # suite, and a run --metrics-capable agent live.
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
-      - uses: actions/setup-go@v5
+      - uses: actions/setup-go@v6
         with:
           go-version: '1.22'
           cache: true
 
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: '3.12'
 
diff --git a/.github/workflows/issue-auto-label.yml b/.github/workflows/issue-auto-label.yml
index ef232ea55..7b1a9c0b1 100644
--- a/.github/workflows/issue-auto-label.yml
+++ b/.github/workflows/issue-auto-label.yml
@@ -20,7 +20,7 @@ jobs:
   classify:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/github-script@v7
+      - uses: actions/github-script@v9
         env:
           DEEPSEEK_API_KEY: ${{ secrets.DEEPSEEK_API_KEY }}
         with:
diff --git a/.github/workflows/issue-version-label.yml b/.github/workflows/issue-version-label.yml
index 7e3256abf..81c9578fb 100644
--- a/.github/workflows/issue-version-label.yml
+++ b/.github/workflows/issue-version-label.yml
@@ -18,7 +18,7 @@ jobs:
   label:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/github-script@v7
+      - uses: actions/github-script@v9
         with:
           script: |
             const body = context.payload.issue.body || '';
diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml
index d805453e4..a2d9fc755 100644
--- a/.github/workflows/pages.yml
+++ b/.github/workflows/pages.yml
@@ -19,8 +19,8 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
+      - uses: actions/checkout@v6
+      - uses: actions/setup-node@v6
         with:
           node-version: '22'
           cache: npm
@@ -30,7 +30,7 @@ jobs:
         run: |
           npm ci
           npm run build
-      - uses: actions/upload-pages-artifact@v3
+      - uses: actions/upload-pages-artifact@v5
         with:
           path: site/dist
 
@@ -42,4 +42,4 @@ jobs:
       url: ${{ steps.deploy.outputs.page_url }}
     steps:
       - id: deploy
-        uses: actions/deploy-pages@v4
+        uses: actions/deploy-pages@v5
diff --git a/.github/workflows/pr-auto-label.yml b/.github/workflows/pr-auto-label.yml
index 6d8455182..6f1b429b7 100644
--- a/.github/workflows/pr-auto-label.yml
+++ b/.github/workflows/pr-auto-label.yml
@@ -23,6 +23,6 @@ jobs:
   label:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/labeler@v5
+      - uses: actions/labeler@v6
         with:
           sync-labels: false
diff --git a/.github/workflows/pr-version-label.yml b/.github/workflows/pr-version-label.yml
index e34908ab0..d2d764e4d 100644
--- a/.github/workflows/pr-version-label.yml
+++ b/.github/workflows/pr-version-label.yml
@@ -20,7 +20,7 @@ jobs:
   label:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/github-script@v7
+      - uses: actions/github-script@v9
         with:
           script: |
             const base = context.payload.pull_request.base.ref;
diff --git a/.github/workflows/release-desktop.yml b/.github/workflows/release-desktop.yml
index 214994966..91d8c8137 100644
--- a/.github/workflows/release-desktop.yml
+++ b/.github/workflows/release-desktop.yml
@@ -42,9 +42,9 @@ jobs:
     name: cache hit guard
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
-      - uses: actions/setup-go@v5
+      - uses: actions/setup-go@v6
         with:
           go-version-file: go.mod
           cache: true
@@ -69,18 +69,18 @@ jobs:
       run:
         shell: bash # desktop-build.sh is bash; windows runners default to pwsh otherwise
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
-      - uses: actions/setup-go@v5
+      - uses: actions/setup-go@v6
         with:
           go-version-file: desktop/go.mod
           cache: true
           cache-dependency-path: desktop/go.sum
 
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v6
         with:
           node-version: "22"
-      - uses: pnpm/action-setup@v4
+      - uses: pnpm/action-setup@v6
         with:
           version: 10
 
@@ -169,7 +169,7 @@ jobs:
           MINISIGN_PASSWORD: ${{ secrets.MINISIGN_PASSWORD }}
         run: go run ./cmd/sign sign ../dist/*
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         with:
           name: dist-${{ matrix.name }}
           path: dist/*
@@ -183,15 +183,15 @@ jobs:
     # approve); canary uses the open `canary` environment so maintainers self-serve.
     environment: ${{ (github.event_name == 'workflow_dispatch' && inputs.channel == 'canary') && 'canary' || 'release' }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
-      - uses: actions/setup-go@v5
+      - uses: actions/setup-go@v6
         with:
           go-version-file: desktop/go.mod
           cache: true
           cache-dependency-path: desktop/go.sum
 
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v8
         with:
           path: dist
           pattern: dist-*
@@ -228,7 +228,7 @@ jobs:
 
       - name: Upload canary dist for mirror
         if: steps.ver.outputs.channel == 'canary'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: canary-dist
           path: dist/*
@@ -243,7 +243,7 @@ jobs:
     env:
       HAS_R2: ${{ secrets.R2_ACCESS_KEY_ID != '' && secrets.R2_SECRET_ACCESS_KEY != '' && secrets.R2_ACCOUNT_ID != '' && secrets.R2_BUCKET != '' }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: Resolve version
         id: ver
@@ -260,7 +260,7 @@ jobs:
       # artifact. Stable pulls from the published release.
       - name: Download canary dist
         if: env.HAS_R2 == 'true' && steps.ver.outputs.channel == 'canary'
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           name: canary-dist
           path: assets
diff --git a/.github/workflows/release-npm.yml b/.github/workflows/release-npm.yml
index 3f01aaf2b..d50bab73a 100644
--- a/.github/workflows/release-npm.yml
+++ b/.github/workflows/release-npm.yml
@@ -33,8 +33,8 @@ jobs:
     name: cache hit guard
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-go@v5
+      - uses: actions/checkout@v6
+      - uses: actions/setup-go@v6
         with:
           go-version-file: go.mod
           cache: true
@@ -48,12 +48,12 @@ jobs:
     # `release` environment (esengine approves); a canary dispatch runs free.
     environment: ${{ github.event_name == 'workflow_dispatch' && 'canary' || 'release' }}
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-go@v5
+      - uses: actions/checkout@v6
+      - uses: actions/setup-go@v6
         with:
           go-version-file: go.mod
           cache: true
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v6
         with:
           node-version: '22'
           registry-url: 'https://registry.npmjs.org'
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index efb7ea10a..0d47986c5 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -19,8 +19,8 @@ jobs:
     name: cache hit guard
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-go@v5
+      - uses: actions/checkout@v6
+      - uses: actions/setup-go@v6
         with:
           go-version-file: go.mod
           cache: true
@@ -34,14 +34,14 @@ jobs:
     # `release` environment so only esengine can approve it going public.
     environment: release
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
-      - uses: actions/setup-go@v5
+      - uses: actions/setup-go@v6
         with:
           go-version-file: go.mod
           cache: true
-      - uses: goreleaser/goreleaser-action@v6
+      - uses: goreleaser/goreleaser-action@v7
         with:
           version: '~> v2'
           args: release --clean
@@ -57,7 +57,7 @@ jobs:
     env:
       HAS_R2: ${{ secrets.R2_ACCESS_KEY_ID != '' && secrets.R2_SECRET_ACCESS_KEY != '' && secrets.R2_ACCOUNT_ID != '' && secrets.R2_BUCKET != '' }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: Download CodeGraph release assets
         if: env.HAS_R2 == 'true'

From f5b8923381f32afec8c5467f739bcf9ca9813701 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 9 Jun 2026 04:33:55 -0700
Subject: [PATCH 14/64] chore(deps): bump react-markdown in /desktop/frontend
 (#3689)

Bumps [react-markdown](https://github.com/remarkjs/react-markdown) from 9.1.0 to 10.1.0.
- [Release notes](https://github.com/remarkjs/react-markdown/releases)
- [Changelog](https://github.com/remarkjs/react-markdown/blob/main/changelog.md)
- [Commits](https://github.com/remarkjs/react-markdown/compare/9.1.0...10.1.0)

---
updated-dependencies:
- dependency-name: react-markdown
  dependency-version: 10.1.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 desktop/frontend/package-lock.json |  8 ++++----
 desktop/frontend/package.json      |  2 +-
 desktop/frontend/pnpm-lock.yaml    | 31 +++++++++++++++++-------------
 3 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/desktop/frontend/package-lock.json b/desktop/frontend/package-lock.json
index ef8e307cc..a5bc64fbb 100644
--- a/desktop/frontend/package-lock.json
+++ b/desktop/frontend/package-lock.json
@@ -14,7 +14,7 @@
         "lucide-react": "^0.460.0",
         "react": "^18.3.1",
         "react-dom": "^18.3.1",
-        "react-markdown": "^9.0.1",
+        "react-markdown": "^10.1.0",
         "rehype-katex": "^7.0.1",
         "remark-gfm": "^4.0.0",
         "remark-math": "^6.0.0"
@@ -3133,9 +3133,9 @@
       }
     },
     "node_modules/react-markdown": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/react-markdown/-/react-markdown-9.1.0.tgz",
-      "integrity": "sha512-xaijuJB0kzGiUdG7nc2MOMDUDBWPyGAjZtUrow9XxUeua8IqeP+VlIfAZ3bphpcLTnSZXz6z9jcVC/TCwbfgdw==",
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/react-markdown/-/react-markdown-10.1.0.tgz",
+      "integrity": "sha512-qKxVopLT/TyA6BX3Ue5NwabOsAzm0Q7kAPwq6L+wWDwisYs7R8vZ0nRXqq6rkueboxpkjvLGU9fWifiX/ZZFxQ==",
       "license": "MIT",
       "dependencies": {
         "@types/hast": "^3.0.0",
diff --git a/desktop/frontend/package.json b/desktop/frontend/package.json
index 533614e18..34a2b6e3c 100644
--- a/desktop/frontend/package.json
+++ b/desktop/frontend/package.json
@@ -21,7 +21,7 @@
     "lucide-react": "^0.460.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "react-markdown": "^9.0.1",
+    "react-markdown": "^10.1.0",
     "rehype-katex": "^7.0.1",
     "remark-gfm": "^4.0.0",
     "remark-math": "^6.0.0"
diff --git a/desktop/frontend/pnpm-lock.yaml b/desktop/frontend/pnpm-lock.yaml
index f6b116da4..2f93bfe68 100644
--- a/desktop/frontend/pnpm-lock.yaml
+++ b/desktop/frontend/pnpm-lock.yaml
@@ -30,8 +30,8 @@ importers:
         specifier: ^18.3.1
         version: 18.3.1(react@18.3.1)
       react-markdown:
-        specifier: ^9.0.1
-        version: 9.1.0(@types/react@18.3.29)(react@18.3.1)
+        specifier: ^10.1.0
+        version: 10.1.0(@types/react@18.3.29)(react@18.3.1)
       rehype-katex:
         specifier: ^7.0.1
         version: 7.0.1
@@ -641,6 +641,9 @@ packages:
   '@types/estree@1.0.8':
     resolution: {integrity: sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==}
 
+  '@types/estree@1.0.9':
+    resolution: {integrity: sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==}
+
   '@types/hast@3.0.4':
     resolution: {integrity: sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==}
 
@@ -1064,16 +1067,16 @@ packages:
     resolution: {integrity: sha512-FfR8sjd4em2T6fb3I2MwAJU7HWVMr9zba+enmQeeWFfCbm+UOC/0X4DS8XtpUTMwWMGbjKYP7xjfNekzyGmB3A==}
     engines: {node: ^10 || ^12 || >=14}
 
-  property-information@7.1.0:
-    resolution: {integrity: sha512-TwEZ+X+yCJmYfL7TPUOcvBZ4QfoT5YenQiJuX//0th53DE6w0xxLEtfK3iyryQFddXuvkIk51EEgrJQ0WJkOmQ==}
+  property-information@7.2.0:
+    resolution: {integrity: sha512-IAtzIB6sUiWaJYrX9smp3V46pBGbBeLFRGdh25kg1334VcBlD8HzhPeNIWQH9zhGmo2itIe25EHt9dQP7G5hmg==}
 
   react-dom@18.3.1:
     resolution: {integrity: sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==}
     peerDependencies:
       react: ^18.3.1
 
-  react-markdown@9.1.0:
-    resolution: {integrity: sha512-xaijuJB0kzGiUdG7nc2MOMDUDBWPyGAjZtUrow9XxUeua8IqeP+VlIfAZ3bphpcLTnSZXz6z9jcVC/TCwbfgdw==}
+  react-markdown@10.1.0:
+    resolution: {integrity: sha512-qKxVopLT/TyA6BX3Ue5NwabOsAzm0Q7kAPwq6L+wWDwisYs7R8vZ0nRXqq6rkueboxpkjvLGU9fWifiX/ZZFxQ==}
     peerDependencies:
       '@types/react': '>=18'
       react: '>=18'
@@ -1661,10 +1664,12 @@ snapshots:
 
   '@types/estree-jsx@1.0.5':
     dependencies:
-      '@types/estree': 1.0.8
+      '@types/estree': 1.0.9
 
   '@types/estree@1.0.8': {}
 
+  '@types/estree@1.0.9': {}
+
   '@types/hast@3.0.4':
     dependencies:
       '@types/unist': 3.0.3
@@ -1869,7 +1874,7 @@ snapshots:
       '@types/unist': 3.0.3
       devlop: 1.1.0
       hastscript: 9.0.1
-      property-information: 7.1.0
+      property-information: 7.2.0
       vfile: 6.0.3
       vfile-location: 5.0.3
       web-namespaces: 2.0.1
@@ -1884,7 +1889,7 @@ snapshots:
 
   hast-util-to-jsx-runtime@2.3.6:
     dependencies:
-      '@types/estree': 1.0.8
+      '@types/estree': 1.0.9
       '@types/hast': 3.0.4
       '@types/unist': 3.0.3
       comma-separated-tokens: 2.0.3
@@ -1894,7 +1899,7 @@ snapshots:
       mdast-util-mdx-expression: 2.0.1
       mdast-util-mdx-jsx: 3.2.0
       mdast-util-mdxjs-esm: 2.0.1
-      property-information: 7.1.0
+      property-information: 7.2.0
       space-separated-tokens: 2.0.2
       style-to-js: 1.1.21
       unist-util-position: 5.0.0
@@ -1918,7 +1923,7 @@ snapshots:
       '@types/hast': 3.0.4
       comma-separated-tokens: 2.0.3
       hast-util-parse-selector: 4.0.0
-      property-information: 7.1.0
+      property-information: 7.2.0
       space-separated-tokens: 2.0.2
 
   highlight.js@11.11.1: {}
@@ -2366,7 +2371,7 @@ snapshots:
       picocolors: 1.1.1
       source-map-js: 1.2.1
 
-  property-information@7.1.0: {}
+  property-information@7.2.0: {}
 
   react-dom@18.3.1(react@18.3.1):
     dependencies:
@@ -2374,7 +2379,7 @@ snapshots:
       react: 18.3.1
       scheduler: 0.23.2
 
-  react-markdown@9.1.0(@types/react@18.3.29)(react@18.3.1):
+  react-markdown@10.1.0(@types/react@18.3.29)(react@18.3.1):
     dependencies:
       '@types/hast': 3.0.4
       '@types/mdast': 4.0.4

From 450c000595ef4ad129899d3737fd14ba23c7fc8c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 9 Jun 2026 04:34:01 -0700
Subject: [PATCH 15/64] chore(deps): bump lucide-react in /desktop/frontend
 (#3686)

Bumps [lucide-react](https://github.com/lucide-icons/lucide/tree/HEAD/packages/lucide-react) from 0.460.0 to 1.17.0.
- [Release notes](https://github.com/lucide-icons/lucide/releases)
- [Commits](https://github.com/lucide-icons/lucide/commits/1.17.0/packages/lucide-react)

---
updated-dependencies:
- dependency-name: lucide-react
  dependency-version: 1.17.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 desktop/frontend/package-lock.json | 10 +++++-----
 desktop/frontend/package.json      |  2 +-
 desktop/frontend/pnpm-lock.yaml    | 12 ++++++------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/desktop/frontend/package-lock.json b/desktop/frontend/package-lock.json
index a5bc64fbb..3e67c71e8 100644
--- a/desktop/frontend/package-lock.json
+++ b/desktop/frontend/package-lock.json
@@ -11,7 +11,7 @@
         "@tanstack/react-virtual": "^3.14.2",
         "highlight.js": "^11.10.0",
         "katex": "^0.17.0",
-        "lucide-react": "^0.460.0",
+        "lucide-react": "^1.17.0",
         "react": "^18.3.1",
         "react-dom": "^18.3.1",
         "react-markdown": "^10.1.0",
@@ -2071,12 +2071,12 @@
       }
     },
     "node_modules/lucide-react": {
-      "version": "0.460.0",
-      "resolved": "https://registry.npmjs.org/lucide-react/-/lucide-react-0.460.0.tgz",
-      "integrity": "sha512-BVtq/DykVeIvRTJvRAgCsOwaGL8Un3Bxh8MbDxMhEWlZay3T4IpEKDEpwt5KZ0KJMHzgm6jrltxlT5eXOWXDHg==",
+      "version": "1.17.0",
+      "resolved": "https://registry.npmjs.org/lucide-react/-/lucide-react-1.17.0.tgz",
+      "integrity": "sha512-9FA9evdox/JQL5PT57fdA1x/yg8T7knJ98+zjTL3UfKza6pflQUUh3XtaQIHKvnsJw1lmsEyHVlt5jchYxOQ5w==",
       "license": "ISC",
       "peerDependencies": {
-        "react": "^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0-rc"
+        "react": "^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0"
       }
     },
     "node_modules/markdown-table": {
diff --git a/desktop/frontend/package.json b/desktop/frontend/package.json
index 34a2b6e3c..ba0974593 100644
--- a/desktop/frontend/package.json
+++ b/desktop/frontend/package.json
@@ -18,7 +18,7 @@
     "@tanstack/react-virtual": "^3.14.2",
     "highlight.js": "^11.10.0",
     "katex": "^0.17.0",
-    "lucide-react": "^0.460.0",
+    "lucide-react": "^1.17.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-markdown": "^10.1.0",
diff --git a/desktop/frontend/pnpm-lock.yaml b/desktop/frontend/pnpm-lock.yaml
index 2f93bfe68..e7f0748b3 100644
--- a/desktop/frontend/pnpm-lock.yaml
+++ b/desktop/frontend/pnpm-lock.yaml
@@ -21,8 +21,8 @@ importers:
         specifier: ^0.17.0
         version: 0.17.0
       lucide-react:
-        specifier: ^0.460.0
-        version: 0.460.0(react@18.3.1)
+        specifier: ^1.17.0
+        version: 1.17.0(react@18.3.1)
       react:
         specifier: ^18.3.1
         version: 18.3.1
@@ -895,10 +895,10 @@ packages:
   lru-cache@5.1.1:
     resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==}
 
-  lucide-react@0.460.0:
-    resolution: {integrity: sha512-BVtq/DykVeIvRTJvRAgCsOwaGL8Un3Bxh8MbDxMhEWlZay3T4IpEKDEpwt5KZ0KJMHzgm6jrltxlT5eXOWXDHg==}
+  lucide-react@1.17.0:
+    resolution: {integrity: sha512-9FA9evdox/JQL5PT57fdA1x/yg8T7knJ98+zjTL3UfKza6pflQUUh3XtaQIHKvnsJw1lmsEyHVlt5jchYxOQ5w==}
     peerDependencies:
-      react: ^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0-rc
+      react: ^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0
 
   markdown-table@3.0.4:
     resolution: {integrity: sha512-wiYz4+JrLyb/DqW2hkFJxP7Vd7JuTDm77fvbM8VfEQdmSMqcImWeeRbHwZjBjIFki/VaMK2BhFi7oUUZeM5bqw==}
@@ -1969,7 +1969,7 @@ snapshots:
     dependencies:
       yallist: 3.1.1
 
-  lucide-react@0.460.0(react@18.3.1):
+  lucide-react@1.17.0(react@18.3.1):
     dependencies:
       react: 18.3.1
 

From 8db604e0bd1084f953a55a63150403a03bc0a59c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 9 Jun 2026 04:51:15 -0700
Subject: [PATCH 16/64] chore(deps): bump the go group across 1 directory with
 3 updates (#3678)

Bumps the go group with 3 updates in the / directory: [golang.org/x/sys](https://github.com/golang/sys), [golang.org/x/term](https://github.com/golang/term) and [golang.org/x/text](https://github.com/golang/text).


Updates `golang.org/x/sys` from 0.45.0 to 0.46.0
- [Commits](https://github.com/golang/sys/compare/v0.45.0...v0.46.0)

Updates `golang.org/x/term` from 0.43.0 to 0.44.0
- [Commits](https://github.com/golang/term/compare/v0.43.0...v0.44.0)

Updates `golang.org/x/text` from 0.37.0 to 0.38.0
- [Release notes](https://github.com/golang/text/releases)
- [Commits](https://github.com/golang/text/compare/v0.37.0...v0.38.0)

---
updated-dependencies:
- dependency-name: golang.org/x/sys
  dependency-version: 0.46.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: go
- dependency-name: golang.org/x/term
  dependency-version: 0.44.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: go
- dependency-name: golang.org/x/text
  dependency-version: 0.38.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: go
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 go.mod |  8 ++++----
 go.sum | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/go.mod b/go.mod
index df5e51c7d..d046b3d67 100644
--- a/go.mod
+++ b/go.mod
@@ -17,9 +17,9 @@ require (
 	github.com/yuin/goldmark v1.8.2
 	go.uber.org/goleak v1.3.0
 	golang.org/x/net v0.55.0
-	golang.org/x/sys v0.45.0
-	golang.org/x/term v0.43.0
-	golang.org/x/text v0.37.0
+	golang.org/x/sys v0.46.0
+	golang.org/x/term v0.44.0
+	golang.org/x/text v0.38.0
 )
 
 require (
@@ -35,5 +35,5 @@ require (
 	github.com/muesli/cancelreader v0.2.2 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
-	golang.org/x/sync v0.20.0 // indirect
+	golang.org/x/sync v0.21.0 // indirect
 )
diff --git a/go.sum b/go.sum
index 70736883e..3aa60a3bd 100644
--- a/go.sum
+++ b/go.sum
@@ -69,14 +69,14 @@ golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM
 golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo=
 golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8=
 golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww=
-golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4=
-golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
-golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY=
-golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
-golang.org/x/term v0.43.0 h1:S4RLU2sB31O/NCl+zFN9Aru9A/Cq2aqKpTZJ6B+DwT4=
-golang.org/x/term v0.43.0/go.mod h1:lrhlHNdQJHO+1qVYiHfFKVuVioJIheAc3fBSMFYEIsk=
-golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc=
-golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38=
+golang.org/x/sync v0.21.0 h1:HLII4xRRTtCRkxYp4HNFF0Js/Og6q2i++KXbg0gHCwM=
+golang.org/x/sync v0.21.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
+golang.org/x/sys v0.46.0 h1:noSf2Fq6F8DBgS+LysIkx7rIExoNHJsxOAtPp4rthXw=
+golang.org/x/sys v0.46.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
+golang.org/x/term v0.44.0 h1:0rLvDRCtNj0gZkyIXhCyOb2OAzEhLVqc4B+hrsBhrmc=
+golang.org/x/term v0.44.0/go.mod h1:7ze4MdzUzLXpSAoFP1H0bOI9aXDqveSvatT5vKcFh2Y=
+golang.org/x/text v0.38.0 h1:sXmwo9DwP3OK9EZ7PqAdaooSGozfl/3a6/xJcbzPRhE=
+golang.org/x/text v0.38.0/go.mod h1:YXZt3QhHUKYT53r2lLKFIVi6Ao1jdzrTR/KQ09qyxF4=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

From 24e00e2ea0962790b5ad10cb1952ed75e22d5630 Mon Sep 17 00:00:00 2001
From: YHH <359807859@qq.com>
Date: Tue, 9 Jun 2026 05:47:19 -0700
Subject: [PATCH 17/64] test: structurally guard nil-deref so staticcheck
 SA5011 can't misfire (#3706)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The release golangci-lint v2.12.2 binary CI runs flags SA5011 (possible nil
pointer dereference) on two `if x == nil { t.Fatal(...) }`-guarded derefs,
even though they are correct (Fatal stops the test). The finding was masked by
the golangci-lint-action cache until #3678 changed go.sum and invalidated it,
then surfaced on main-v2 and every open PR. A locally-built golangci-lint does
not reproduce it, so this is a staticcheck quirk in the pinned binary, not a
real defect.

Restructure both sites with flow-based guards (else-if / switch) the analyzer
always respects — no behaviour change, no unreachable `return` (which a
Fatal-aware analyzer would flag locally).

Co-authored-by: reasonix <reasonix@deepseek.com>
---
 internal/control/shell_test.go                |  3 +--
 internal/provider/anthropic/anthropic_test.go | 12 +++++-------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/internal/control/shell_test.go b/internal/control/shell_test.go
index cd3191f0d..118b26e16 100644
--- a/internal/control/shell_test.go
+++ b/internal/control/shell_test.go
@@ -135,8 +135,7 @@ func TestRunShell_FailingCommand(t *testing.T) {
 	}
 	if result == nil {
 		t.Fatal("expected a ToolResult event")
-	}
-	if result.Tool.Err == "" {
+	} else if result.Tool.Err == "" {
 		t.Error("failing command should produce an error string")
 	}
 }
diff --git a/internal/provider/anthropic/anthropic_test.go b/internal/provider/anthropic/anthropic_test.go
index 7614592b3..cfb99d49d 100644
--- a/internal/provider/anthropic/anthropic_test.go
+++ b/internal/provider/anthropic/anthropic_test.go
@@ -186,16 +186,14 @@ func TestReadStream(t *testing.T) {
 	if full == nil || full.Arguments != `{"city":"Paris"}` {
 		t.Fatalf("tool full = %+v", full)
 	}
-	if usage == nil {
+	switch {
+	case usage == nil:
 		t.Fatal("expected a usage chunk")
-	}
-	if usage.PromptTokens != 150 || usage.CompletionTokens != 25 || usage.TotalTokens != 175 {
+	case usage.PromptTokens != 150 || usage.CompletionTokens != 25 || usage.TotalTokens != 175:
 		t.Fatalf("usage tokens = %+v", usage)
-	}
-	if usage.CacheHitTokens != 50 || usage.CacheMissTokens != 100 {
+	case usage.CacheHitTokens != 50 || usage.CacheMissTokens != 100:
 		t.Fatalf("usage cache = hit %d miss %d", usage.CacheHitTokens, usage.CacheMissTokens)
-	}
-	if usage.FinishReason != "tool_calls" {
+	case usage.FinishReason != "tool_calls":
 		t.Fatalf("finish reason = %q", usage.FinishReason)
 	}
 	if !done {

From f9b6d5765dc48c1b2695062bd8fa74747ed17397 Mon Sep 17 00:00:00 2001
From: paradoxSCH <64133628+paradoxSCH@users.noreply.github.com>
Date: Tue, 9 Jun 2026 20:59:44 +0800
Subject: [PATCH 18/64] fix(agent): allow pending todo signoff (#3673)

---
 internal/agent/evidence_flow_test.go       | 62 ++++++++++++++++++++++
 internal/tool/builtin/completestep.go      |  6 +--
 internal/tool/builtin/completestep_test.go | 27 ++++++++--
 3 files changed, 88 insertions(+), 7 deletions(-)

diff --git a/internal/agent/evidence_flow_test.go b/internal/agent/evidence_flow_test.go
index 202ea579a..711267392 100644
--- a/internal/agent/evidence_flow_test.go
+++ b/internal/agent/evidence_flow_test.go
@@ -607,6 +607,68 @@ func TestEvidenceFlowRejectsTodoCompletionWithoutCompleteStep(t *testing.T) {
 	}
 }
 
+func TestEvidenceFlowRecoversAfterBatchTodoCompletionRejection(t *testing.T) {
+	todoWrite, ok := tool.LookupBuiltin("todo_write")
+	if !ok {
+		t.Fatal("todo_write builtin not registered")
+	}
+	completeStep, ok := tool.LookupBuiltin("complete_step")
+	if !ok {
+		t.Fatal("complete_step builtin not registered")
+	}
+	reg := tool.NewRegistry()
+	reg.Add(todoWrite)
+	reg.Add(completeStep)
+
+	prov := &scriptedProvider{name: "p", turns: [][]provider.Chunk{
+		{
+			toolCallChunk("c1", "todo_write", `{"todos":[
+				{"content":"Port entity imports","status":"in_progress"},
+				{"content":"Run build and tests","status":"pending"}
+			]}`),
+			toolCallChunk("c2", "todo_write", `{"todos":[
+				{"content":"Port entity imports","status":"completed"},
+				{"content":"Run build and tests","status":"completed"}
+			]}`),
+			{Type: provider.ChunkDone},
+		},
+		{
+			toolCallChunk("c3", "complete_step", `{
+				"step":"Port entity imports",
+				"result":"entity imports ported",
+				"evidence":[{"kind":"manual","summary":"checked manually"}]
+			}`),
+			toolCallChunk("c4", "complete_step", `{
+				"step":"Run build and tests",
+				"result":"build and tests ran",
+				"evidence":[{"kind":"manual","summary":"checked manually"}]
+			}`),
+			toolCallChunk("c5", "todo_write", `{"todos":[
+				{"content":"Port entity imports","status":"completed"},
+				{"content":"Run build and tests","status":"completed"}
+			]}`),
+			{Type: provider.ChunkDone},
+		},
+		{{Type: provider.ChunkText, Text: "done"}, {Type: provider.ChunkDone}},
+	}}
+
+	a := New(prov, reg, NewSession(""), Options{}, event.Discard)
+	if err := a.Run(context.Background(), "recover from a rejected batch todo update"); err != nil {
+		t.Fatalf("Run: %v", err)
+	}
+
+	stepResults := toolResults(a.session, "complete_step")
+	if len(stepResults) < 2 {
+		t.Fatalf("complete_step results = %v, want two sign-offs", stepResults)
+	}
+	if got := stepResults[1]; !strings.Contains(got, "signed off") {
+		t.Fatalf("pending todo complete_step result = %q, want successful sign-off", got)
+	}
+	if got := lastToolResult(a.session, "todo_write"); !strings.Contains(got, "2 completed") {
+		t.Fatalf("final todo_write result = %q, want all todos completed", got)
+	}
+}
+
 func TestEvidenceFlowFailedCompleteStepDoesNotAuthorizeTodoCompletion(t *testing.T) {
 	todoWrite, ok := tool.LookupBuiltin("todo_write")
 	if !ok {
diff --git a/internal/tool/builtin/completestep.go b/internal/tool/builtin/completestep.go
index 019f33a40..3640f4e7b 100644
--- a/internal/tool/builtin/completestep.go
+++ b/internal/tool/builtin/completestep.go
@@ -235,12 +235,10 @@ func verifyTodoStep(ctx context.Context, step string) (evidence.TodoStepMatch, b
 		return evidence.TodoStepMatch{}, true, fmt.Errorf("step %q has no matching todo_write item in this turn", step)
 	}
 	switch match.Status {
-	case "in_progress", "completed":
+	case "", "pending", "in_progress", "completed":
 		return match, true, nil
-	case "":
-		return evidence.TodoStepMatch{}, true, fmt.Errorf("step %q matches todo %d (%q) but its status is pending; complete_step requires in_progress or completed", step, match.Index, match.Content)
 	default:
-		return evidence.TodoStepMatch{}, true, fmt.Errorf("step %q matches todo %d (%q) but its status is %q; complete_step requires in_progress or completed", step, match.Index, match.Content, match.Status)
+		return evidence.TodoStepMatch{}, true, fmt.Errorf("step %q matches todo %d (%q) but its status is %q; complete_step requires pending, in_progress, or completed", step, match.Index, match.Content, match.Status)
 	}
 }
 
diff --git a/internal/tool/builtin/completestep_test.go b/internal/tool/builtin/completestep_test.go
index 67a4242a8..7e5843701 100644
--- a/internal/tool/builtin/completestep_test.go
+++ b/internal/tool/builtin/completestep_test.go
@@ -273,7 +273,7 @@ func TestCompleteStepMatchesTodoReceipt(t *testing.T) {
 	}
 }
 
-func TestCompleteStepRejectsTodoMismatchAndPending(t *testing.T) {
+func TestCompleteStepRejectsTodoMismatch(t *testing.T) {
 	ledger := evidence.NewLedger()
 	ledger.Record(evidence.Receipt{
 		ToolName: "todo_write",
@@ -291,8 +291,6 @@ func TestCompleteStepRejectsTodoMismatchAndPending(t *testing.T) {
 		want string
 	}{
 		{name: "missing", step: "Ship parser", want: "matching todo_write item"},
-		{name: "pending", step: "Document parser", want: "pending"},
-		{name: "pending number", step: "2", want: "pending"},
 	}
 	for _, tc := range cases {
 		t.Run(tc.name, func(t *testing.T) {
@@ -310,6 +308,29 @@ func TestCompleteStepRejectsTodoMismatchAndPending(t *testing.T) {
 	}
 }
 
+func TestCompleteStepAcceptsPendingTodo(t *testing.T) {
+	ledger := evidence.NewLedger()
+	ledger.Record(evidence.Receipt{
+		ToolName: "todo_write",
+		Success:  true,
+		Todos: []evidence.TodoItem{
+			{Content: "Add parser", Status: "pending"},
+		},
+	})
+	ctx := evidence.WithLedger(context.Background(), ledger)
+
+	out, err := completeStep{}.Execute(ctx, json.RawMessage(`{
+		"step":"Add parser",
+		"result":"parser added",
+		"evidence":[{"kind":"manual","summary":"checked manually"}]}`))
+	if err != nil {
+		t.Fatalf("pending todo should be signable with evidence: %v", err)
+	}
+	if !strings.Contains(out, "todo-matched") {
+		t.Fatalf("ack should mention todo match, got %q", out)
+	}
+}
+
 func TestCompleteStepIgnoresFailedTodoReceipt(t *testing.T) {
 	ledger := evidence.NewLedger()
 	ledger.Record(evidence.Receipt{

From 1b7cdbeeb0c2fd285942a477510e5519d0a8696b Mon Sep 17 00:00:00 2001
From: CVEngineer <129239603+CVEngineer66@users.noreply.github.com>
Date: Tue, 9 Jun 2026 21:04:06 +0800
Subject: [PATCH 19/64] fix(desktop): remove command text from approval rule
 buttons, causing layout breakage (#3700)

The 'Allow for session' and 'Always allow' buttons in the approval modal
displayed the full bash command as inline code (e.g. Bash(cd ...)), which
stretched the button elements and broke the card layout.

The command is already visible in the card header meta area and the
expandable Details section, so showing it again inside the action buttons
is redundant. Removed the RuleActionLabel component, the rule-formatting
helpers (approvalSessionRule, approvalPersistentRule, truncateSubject),
and the unused CSS classes.

Fixes https://github.com/esengine/DeepSeek-Reasonix/issues/3677

Co-authored-by: wufengfan <wufengfan@wufengfandeMacBook-Air.local>
---
 .../frontend/src/components/ApprovalModal.tsx | 40 +++----------------
 desktop/frontend/src/styles.css               | 25 ------------
 2 files changed, 5 insertions(+), 60 deletions(-)

diff --git a/desktop/frontend/src/components/ApprovalModal.tsx b/desktop/frontend/src/components/ApprovalModal.tsx
index e6726be88..4a9920c6d 100644
--- a/desktop/frontend/src/components/ApprovalModal.tsx
+++ b/desktop/frontend/src/components/ApprovalModal.tsx
@@ -26,9 +26,7 @@ export function ApprovalModal({
   const bashPrefix = isBashApproval ? bashCommandPrefix(subject) : "";
   const hasBashPrefix = bashPrefix !== "";
   const subjectSummary = subject.split("\n").find((line) => line.trim())?.trim() ?? "";
-  const exactSessionRule = approvalSessionRule(approval.tool, subject);
-  const exactPersistentRule = approvalPersistentRule(approval.tool, subject);
-  const prefixRule = hasBashPrefix ? `Bash(${bashPrefix})` : "";
+
 
   const choosePlanAction = (key: string) => {
     if (key === "1") setRevisionOpen((open) => !open);
@@ -154,12 +152,12 @@ export function ApprovalModal({
             <>
               <PromptAction
                 keyLabel="2"
-                label={<RuleActionLabel label={t("approval.allowRuleSession")} rule={prefixRule} />}
+                label={t("approval.allowRuleSession")}
                 onClick={() => onAnswer(true, true, false, "prefix")}
               />
               <PromptAction
                 keyLabel="3"
-                label={<RuleActionLabel label={t("approval.allowRulePersistent")} rule={prefixRule} />}
+                label={t("approval.allowRulePersistent")}
                 onClick={() => onAnswer(true, true, true, "prefix")}
               />
               <PromptAction keyLabel="4" label={t("approval.deny")} onClick={() => onAnswer(false, false, false)} />
@@ -168,12 +166,12 @@ export function ApprovalModal({
             <>
               <PromptAction
                 keyLabel="2"
-                label={<RuleActionLabel label={t("approval.allowRuleSession")} rule={exactSessionRule} />}
+                label={t("approval.allowRuleSession")}
                 onClick={() => onAnswer(true, true, false)}
               />
               <PromptAction
                 keyLabel="3"
-                label={<RuleActionLabel label={t("approval.allowRulePersistent")} rule={exactPersistentRule} />}
+                label={t("approval.allowRulePersistent")}
                 onClick={() => onAnswer(true, true, true)}
               />
               <PromptAction keyLabel="4" label={t("approval.deny")} onClick={() => onAnswer(false, false, false)} />
@@ -189,26 +187,7 @@ export function ApprovalModal({
   );
 }
 
-function RuleActionLabel({ label, rule }: { label: string; rule: string }) {
-  return (
-    <span className="approval-rule-label">
-      <span>{label}</span>
-      <code>{rule}</code>
-    </span>
-  );
-}
 
-function approvalSessionRule(tool: string, subject: string): string {
-  if (tool === "bash" && subject) return `Bash(${subject})`;
-  if (isFileMutationTool(tool)) return "Edit";
-  return tool;
-}
-
-function approvalPersistentRule(tool: string, subject: string): string {
-  if (tool === "bash" && subject) return `Bash(${subject})`;
-  if (isFileMutationTool(tool)) return subject ? `Edit(${subject})` : "Edit";
-  return tool;
-}
 
 function bashCommandPrefix(subject: string): string {
   const command = subject.trim();
@@ -236,12 +215,3 @@ function dangerousBashCommand(command: string): boolean {
     || /^dd\s+if=/.test(command)
     || /^fdisk\b/.test(command);
 }
-
-function isFileMutationTool(tool: string): boolean {
-  return tool === "write_file"
-    || tool === "edit_file"
-    || tool === "multi_edit"
-    || tool === "notebook_edit"
-    || tool === "delete_range"
-    || tool === "delete_symbol";
-}
diff --git a/desktop/frontend/src/styles.css b/desktop/frontend/src/styles.css
index 9ff15e4d4..068009e09 100644
--- a/desktop/frontend/src/styles.css
+++ b/desktop/frontend/src/styles.css
@@ -3369,15 +3369,6 @@ a[href] {
   line-height: 1.4;
   padding-block: 1px;
 }
-.prompt-action__label:has(.approval-rule-label) {
-  overflow: visible;
-  text-overflow: clip;
-  white-space: normal;
-}
-.prompt-action:has(.approval-rule-label) {
-  height: auto;
-  padding-block: 5px;
-}
 .prompt-detail-toggle {
   flex: 0 0 auto;
   max-width: 92px;
@@ -3435,22 +3426,6 @@ a[href] {
   max-height: 150px;
   overflow: auto;
 }
-.approval-rule-label {
-  display: inline-flex;
-  align-items: center;
-  gap: 6px;
-  min-width: 0;
-  max-width: 100%;
-}
-.approval-rule-label code {
-  min-width: 0;
-  max-width: 24ch;
-  overflow-wrap: anywhere;
-  font-family: var(--mono);
-  font-size: 11px;
-  color: var(--fg);
-}
-
 /* ── ask tool: decision details ───────────────────────────────────────────── */
 .ask-shelf__crumbs {
   display: flex;

From 3c32366ad14e8ff6bfee4e72a018290448eaeb2e Mon Sep 17 00:00:00 2001
From: YHH <359807859@qq.com>
Date: Tue, 9 Jun 2026 06:22:01 -0700
Subject: [PATCH 20/64] fix(control): don't auto-answer the ask tool in YOLO
 mode (#3624) (#3712)

* fix(control): don't auto-answer the ask tool in YOLO mode

Controller.Ask checked bypassEnabled() and silently returned the first option
of every question, so in YOLO mode the `ask` tool got a fake answer and the
user never saw the prompt. Bypass is meant to skip tool-approval gates, not to
answer the user's genuine questions. Remove both bypass checks (and the now
unused recommendedAskAnswers helper); Ask always emits an AskRequest and waits
for AnswerQuestion, even under bypass.

Combines the minimal fix from #3709 (CVEngineer66) with the behavior tests
from #3638 (warvyvr), dropping that PR's unrelated files.

Closes #3624

Co-authored-by: CVEngineer66 <CVEngineer66@users.noreply.github.com>
Co-authored-by: warvyvr <warvyvr@users.noreply.github.com>

* fix(control): drop now-unused bypassEnabled helper

Removing the bypass checks from Ask left bypassEnabled with no callers
(staticcheck unused).

---------

Co-authored-by: reasonix <reasonix@deepseek.com>
Co-authored-by: CVEngineer66 <CVEngineer66@users.noreply.github.com>
Co-authored-by: warvyvr <warvyvr@users.noreply.github.com>
---
 internal/control/controller.go |  28 +-------
 internal/control/yolo_test.go  | 116 +++++++++++++++++++++++----------
 2 files changed, 85 insertions(+), 59 deletions(-)

diff --git a/internal/control/controller.go b/internal/control/controller.go
index b11dbcb1b..24a132d6b 100644
--- a/internal/control/controller.go
+++ b/internal/control/controller.go
@@ -858,18 +858,13 @@ func (c *Controller) EnableInteractiveApproval() {
 // Ask implements agent.Asker: it emits an AskRequest and blocks until
 // AnswerQuestion(ID, …) answers or ctx is cancelled. promptMu serialises it
 // against tool-approval prompts so at most one user prompt is outstanding.
+// Unlike tool-approval gates, Ask is NOT bypassed in YOLO mode — the `ask`
+// tool exists to get a genuine user decision, and YOLO only auto-approves
+// tool calls; it must not answer the user's questions for them.
 func (c *Controller) Ask(ctx context.Context, questions []event.AskQuestion) ([]event.AskAnswer, error) {
-	if c.bypassEnabled() {
-		return recommendedAskAnswers(questions), nil
-	}
-
 	c.promptMu.Lock()
 	defer c.promptMu.Unlock()
 
-	if c.bypassEnabled() {
-		return recommendedAskAnswers(questions), nil
-	}
-
 	c.mu.Lock()
 	c.nextID++
 	id := strconv.Itoa(c.nextID)
@@ -890,23 +885,6 @@ func (c *Controller) Ask(ctx context.Context, questions []event.AskQuestion) ([]
 	}
 }
 
-func (c *Controller) bypassEnabled() bool {
-	c.mu.Lock()
-	defer c.mu.Unlock()
-	return c.bypass
-}
-
-func recommendedAskAnswers(questions []event.AskQuestion) []event.AskAnswer {
-	out := make([]event.AskAnswer, len(questions))
-	for i, q := range questions {
-		out[i] = event.AskAnswer{QuestionID: q.ID}
-		if len(q.Options) > 0 {
-			out[i].Selected = []string{q.Options[0].Label}
-		}
-	}
-	return out
-}
-
 // AnswerQuestion resolves a pending AskRequest by ID with the user's selections.
 // Unknown/expired IDs are ignored.
 func (c *Controller) AnswerQuestion(id string, answers []event.AskAnswer) {
diff --git a/internal/control/yolo_test.go b/internal/control/yolo_test.go
index 8b9e33140..f39cd0463 100644
--- a/internal/control/yolo_test.go
+++ b/internal/control/yolo_test.go
@@ -3,7 +3,6 @@ package control
 import (
 	"context"
 	"strings"
-	"sync"
 	"testing"
 	"time"
 
@@ -184,18 +183,18 @@ func TestSetModeAppliesBothGates(t *testing.T) {
 	}
 }
 
-func TestBypassAutoAnswersAskWithRecommendedOptions(t *testing.T) {
-	var askRequested bool
+func TestBypassDoesNotAutoAnswerAsk(t *testing.T) {
+	askCh := make(chan event.Ask, 1)
 	c := New(Options{
 		Sink: event.FuncSink(func(e event.Event) {
 			if e.Kind == event.AskRequest {
-				askRequested = true
+				askCh <- e.Ask
 			}
 		}),
 	})
 	c.SetBypass(true)
 
-	answers, err := c.Ask(context.Background(), []event.AskQuestion{
+	questions := []event.AskQuestion{
 		{
 			ID:     "approach",
 			Header: "Approach",
@@ -215,33 +214,69 @@ func TestBypassAutoAnswersAskWithRecommendedOptions(t *testing.T) {
 			},
 			Multi: true,
 		},
+	}
+
+	done := make(chan struct {
+		answers []event.AskAnswer
+		err     error
+	}, 1)
+	go func() {
+		answers, err := c.Ask(context.Background(), questions)
+		done <- struct {
+			answers []event.AskAnswer
+			err     error
+		}{answers, err}
+	}()
+
+	// Even with bypass on, Ask must emit an AskRequest and wait for the user.
+	var ask event.Ask
+	select {
+	case ask = <-askCh:
+	case <-time.After(2 * time.Second):
+		t.Fatal("Ask did not emit AskRequest under bypass; bypass should not auto-answer ask")
+	}
+
+	// Answer with NON-recommended options to prove the user was consulted.
+	c.AnswerQuestion(ask.ID, []event.AskAnswer{
+		{QuestionID: "approach", Selected: []string{"Alternative path"}},
+		{QuestionID: "scope", Selected: []string{"Broad"}},
 	})
-	if err != nil {
-		t.Fatalf("Ask: %v", err)
+
+	var result struct {
+		answers []event.AskAnswer
+		err     error
+	}
+	select {
+	case result = <-done:
+	case <-time.After(2 * time.Second):
+		t.Fatal("Ask stayed blocked after AnswerQuestion")
 	}
-	if askRequested {
-		t.Fatal("bypass must not emit an AskRequest event")
+	if result.err != nil {
+		t.Fatalf("Ask: %v", result.err)
 	}
-	want := []event.AskAnswer{
-		{QuestionID: "approach", Selected: []string{"Recommended path"}},
-		{QuestionID: "scope", Selected: []string{"Minimal"}},
+
+	wantAnswers := []event.AskAnswer{
+		{QuestionID: "approach", Selected: []string{"Alternative path"}},
+		{QuestionID: "scope", Selected: []string{"Broad"}},
 	}
-	if len(answers) != len(want) {
-		t.Fatalf("answers len = %d, want %d: %#v", len(answers), len(want), answers)
+	if len(result.answers) != len(wantAnswers) {
+		t.Fatalf("answers len = %d, want %d: %#v", len(result.answers), len(wantAnswers), result.answers)
 	}
-	for i := range want {
-		if answers[i].QuestionID != want[i].QuestionID || len(answers[i].Selected) != 1 || answers[i].Selected[0] != want[i].Selected[0] {
-			t.Fatalf("answers[%d] = %#v, want %#v", i, answers[i], want[i])
+	for i := range wantAnswers {
+		if result.answers[i].QuestionID != wantAnswers[i].QuestionID ||
+			len(result.answers[i].Selected) != 1 ||
+			result.answers[i].Selected[0] != wantAnswers[i].Selected[0] {
+			t.Fatalf("answers[%d] = %#v, want %#v", i, result.answers[i], wantAnswers[i])
 		}
 	}
 }
 
-func TestBypassRecheckedForAskAfterPromptLock(t *testing.T) {
-	askRequests := make(chan struct{}, 1)
+func TestAskSerializesBehindPromptLockEvenWithBypass(t *testing.T) {
+	askCh := make(chan event.Ask, 1)
 	c := New(Options{
 		Sink: event.FuncSink(func(e event.Event) {
 			if e.Kind == event.AskRequest {
-				askRequests <- struct{}{}
+				askCh <- e.Ask
 			}
 		}),
 	})
@@ -256,12 +291,9 @@ func TestBypassRecheckedForAskAfterPromptLock(t *testing.T) {
 	}}
 
 	c.promptMu.Lock()
-	started := make(chan struct{})
 	done := make(chan []event.AskAnswer, 1)
 	errs := make(chan error, 1)
-	var once sync.Once
 	go func() {
-		once.Do(func() { close(started) })
 		answers, err := c.Ask(context.Background(), questions)
 		if err != nil {
 			errs <- err
@@ -269,26 +301,42 @@ func TestBypassRecheckedForAskAfterPromptLock(t *testing.T) {
 		}
 		done <- answers
 	}()
-	<-started
+	// Give the goroutine time to block on promptMu.
 	time.Sleep(20 * time.Millisecond)
 
+	// Pre-unlock assertion: while promptMu is still held, Ask must NOT have
+	// emitted AskRequest — proving it truly serialized behind the lock.
+	select {
+	case <-askCh:
+		t.Fatal("Ask emitted AskRequest before acquiring promptMu; it did not serialize behind the lock")
+	default:
+	}
+
+	// Enable bypass while Ask is queued behind promptMu.
 	c.SetBypass(true)
+	// Release the lock — Ask proceeds but must still emit an AskRequest.
 	c.promptMu.Unlock()
 
+	// Post-unlock assertion: Ask must emit AskRequest now that it holds the lock.
+	var ask event.Ask
 	select {
-	case err := <-errs:
-		t.Fatalf("Ask: %v", err)
-	case answers := <-done:
-		if len(answers) != 1 || answers[0].QuestionID != "q1" || len(answers[0].Selected) != 1 || answers[0].Selected[0] != "Recommended" {
-			t.Fatalf("answers = %#v, want recommended option", answers)
-		}
+	case ask = <-askCh:
 	case <-time.After(2 * time.Second):
-		t.Fatal("Ask stayed blocked after bypass turned on while queued behind promptMu")
+		t.Fatal("Ask did not emit AskRequest after acquiring promptMu with bypass on; bypass should not suppress ask")
 	}
 
+	// Answer and verify we get the user's choice.
+	c.AnswerQuestion(ask.ID, []event.AskAnswer{
+		{QuestionID: "q1", Selected: []string{"Alternative"}},
+	})
+
+	var answers []event.AskAnswer
 	select {
-	case <-askRequests:
-		t.Fatal("bypass must not emit AskRequest after acquiring promptMu")
-	default:
+	case answers = <-done:
+	case <-time.After(2 * time.Second):
+		t.Fatal("Ask stayed blocked after AnswerQuestion")
+	}
+	if len(answers) != 1 || answers[0].QuestionID != "q1" || len(answers[0].Selected) != 1 || answers[0].Selected[0] != "Alternative" {
+		t.Fatalf("answers = %#v, want Alternative (user's choice, not auto-recommended)", answers)
 	}
 }

From 4e0f7c2a1380a29be273868f9e1dba6c1533489f Mon Sep 17 00:00:00 2001
From: YHH <359807859@qq.com>
Date: Tue, 9 Jun 2026 06:36:34 -0700
Subject: [PATCH 21/64] feat(skill): add read_skill for loading inline skills
 in plan mode (#3713)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

run_skill is ReadOnly()=false because subagent skills can spawn writer tool
calls, so plan mode (read-only) blocks ALL skill use — including inline skills,
which only render a body and have no side effects. That made it impossible to
consult a playbook while planning (#3491).

Add read_skill: a read-only counterpart that renders an inline skill body and
rejects subagent skills (pointing the model at run_skill). Being ReadOnly it
stays available in plan mode. Added to SubagentMetaTools so spawned agents
don't inherit it.

Closes #3491

Co-authored-by: reasonix <reasonix@deepseek.com>
---
 internal/agent/task.go       |  1 +
 internal/boot/boot.go        |  1 +
 internal/skill/tools.go      | 52 ++++++++++++++++++++++++++++++++++++
 internal/skill/tools_test.go | 27 +++++++++++++++++++
 4 files changed, 81 insertions(+)

diff --git a/internal/agent/task.go b/internal/agent/task.go
index 1f2c06eb8..74373251c 100644
--- a/internal/agent/task.go
+++ b/internal/agent/task.go
@@ -23,6 +23,7 @@ If you need to ask for clarification, fail with a precise question instead of gu
 var subagentMetaTools = []string{
 	"task",
 	"run_skill",
+	"read_skill",
 	"install_skill",
 	"install_source",
 	"explore",
diff --git a/internal/boot/boot.go b/internal/boot/boot.go
index 62ddec3c7..3116bfb09 100644
--- a/internal/boot/boot.go
+++ b/internal/boot/boot.go
@@ -491,6 +491,7 @@ func Build(ctx context.Context, opts Options) (*control.Controller, error) {
 		return &event.Profile{Model: model, Effort: effort}
 	}
 	reg.Add(skill.NewRunSkillTool(skillStore, skillRunner, skillProfile))
+	reg.Add(skill.NewReadSkillTool(skillStore))
 	reg.Add(skill.NewInstallSkillTool(skillStore, nil))
 	reg.Add(installsource.NewTool(installsource.Options{
 		ProjectRoot: root,
diff --git a/internal/skill/tools.go b/internal/skill/tools.go
index 7ad0e1dd7..13fed81f2 100644
--- a/internal/skill/tools.go
+++ b/internal/skill/tools.go
@@ -128,6 +128,58 @@ func (t *runSkillTool) profileForSkill(sk Skill) *event.Profile {
 	return &event.Profile{Model: model, Effort: effort}
 }
 
+// readSkillTool loads an inline skill body into context without running anything.
+type readSkillTool struct {
+	store *Store
+}
+
+// NewReadSkillTool builds a read-only inline-skill loader. Unlike run_skill it
+// stays available in plan mode, so a plan can consult inline playbooks.
+func NewReadSkillTool(store *Store) tool.Tool { return &readSkillTool{store: store} }
+
+func (*readSkillTool) Name() string { return "read_skill" }
+
+// ReadOnly is true: read_skill only renders an inline skill body (no subagent,
+// no side effects), so it is allowed in plan mode where run_skill is not.
+func (*readSkillTool) ReadOnly() bool { return true }
+
+func (*readSkillTool) Description() string {
+	return "Load an inline playbook from the Skills index into your context WITHOUT running anything — the skill body returns as a tool result you read and follow. Read-only, so it works in plan mode (unlike run_skill). Pass `name` as the BARE identifier (e.g. 'commit'), NOT the `[🧬 subagent]` tag. Subagent-tagged skills are rejected: use run_skill (or the dedicated tool) for those, since they execute work."
+}
+
+func (*readSkillTool) Schema() json.RawMessage {
+	return json.RawMessage(`{
+"type":"object",
+"properties":{
+  "name":{"type":"string","description":"Inline skill identifier as it appears in the pinned Skills index. Just the identifier, not the [🧬 subagent] tag."},
+  "arguments":{"type":"string","description":"Optional free-form arguments, appended as an 'Arguments:' line; the skill's own instructions decide how to use them."}
+},
+"required":["name"]
+}`)
+}
+
+func (t *readSkillTool) Execute(_ context.Context, args json.RawMessage) (string, error) {
+	var p struct {
+		Name      string `json:"name"`
+		Arguments string `json:"arguments"`
+	}
+	if err := json.Unmarshal(args, &p); err != nil {
+		return "", fmt.Errorf("invalid args: %w", err)
+	}
+	name := cleanSkillName(p.Name)
+	if name == "" {
+		return "", fmt.Errorf("read_skill requires a 'name' argument (got %q, which is just a marker/tag)", p.Name)
+	}
+	sk, ok := t.store.Read(name)
+	if !ok {
+		return "", fmt.Errorf("unknown skill %q — available: %s", name, availableNames(t.store))
+	}
+	if sk.RunAs == RunSubagent {
+		return "", fmt.Errorf("read_skill: skill %q is a subagent and must be executed, not read — use run_skill (or the dedicated %s tool)", name, name)
+	}
+	return renderInline(sk, strings.TrimSpace(p.Arguments)), nil
+}
+
 // --- dedicated subagent wrappers (explore / research / review / security_review) ---
 
 type subagentSkillTool struct {
diff --git a/internal/skill/tools_test.go b/internal/skill/tools_test.go
index af74007df..51e1f967b 100644
--- a/internal/skill/tools_test.go
+++ b/internal/skill/tools_test.go
@@ -209,3 +209,30 @@ func TestInstallSkill(t *testing.T) {
 		t.Error("install_skill should require a description")
 	}
 }
+
+func TestReadSkillLoadsInlineAndIsReadOnly(t *testing.T) {
+	home := t.TempDir()
+	writeSkill(t, home, ".reasonix/skills/note.md", "---\ndescription: take a note\n---\nDo the thing.")
+	tl := NewReadSkillTool(New(Options{HomeDir: home, DisableBuiltins: true}))
+
+	if !tl.ReadOnly() {
+		t.Fatal("read_skill must be ReadOnly so it works in plan mode")
+	}
+	out, err := tl.Execute(context.Background(), json.RawMessage(`{"name":"note","arguments":"with args"}`))
+	if err != nil {
+		t.Fatalf("execute: %v", err)
+	}
+	if !strings.Contains(out, "Do the thing.") || !strings.Contains(out, "Arguments: with args") {
+		t.Errorf("inline body/args missing:\n%s", out)
+	}
+}
+
+func TestReadSkillRejectsSubagent(t *testing.T) {
+	home := t.TempDir()
+	writeSkill(t, home, ".reasonix/skills/dig.md", "---\ndescription: dig\nrunAs: subagent\n---\nbody")
+	tl := NewReadSkillTool(New(Options{HomeDir: home, DisableBuiltins: true}))
+
+	if _, err := tl.Execute(context.Background(), json.RawMessage(`{"name":"dig"}`)); err == nil || !strings.Contains(err.Error(), "run_skill") {
+		t.Fatalf("read_skill on a subagent skill should point to run_skill, got %v", err)
+	}
+}

From b892ce21cd77eb72fbc3bce4e364acc6a0ad3893 Mon Sep 17 00:00:00 2001
From: YHH <359807859@qq.com>
Date: Tue, 9 Jun 2026 06:51:08 -0700
Subject: [PATCH 22/64] fix(config): honor an explicit proxy for no_proxy
 providers like mimo (#3635) (#3714)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(config): honor an explicit proxy for no_proxy providers (mimo)

The built-in mimo presets carry no_proxy=true so their domestic endpoint
stays off an auto-detected (GFW-circumvention) system proxy. But that bypass
was applied in every mode, so behind a mandatory corporate proxy
(proxy_mode = "custom") mimo tried a direct connection the firewall blocks —
making mimo unusable on enterprise networks (#3635).

Apply the provider-level no_proxy bypass only for auto/env proxies. An explicit
custom proxy means "route everything through this", so honor it for every
provider; a custom-proxy user who still wants a host direct uses
network.no_proxy.

Closes #3635

* test(config): structurally guard nil-deref (staticcheck SA5011)

The release golangci-lint binary CI runs flags SA5011 on guarded t.Fatal
derefs in backfill_test.go and migrate_test.go (same cache-masked false
positive as #3706); this PR touches the config package so a cold lint run
surfaces them. Guard with else-if; no behavior change.

---------

Co-authored-by: reasonix <reasonix@deepseek.com>
---
 internal/config/backfill_test.go |  3 +--
 internal/config/config.go        | 10 ++++++++++
 internal/config/migrate_test.go  |  3 +--
 internal/config/proxy_test.go    | 14 ++++++++++++++
 4 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/internal/config/backfill_test.go b/internal/config/backfill_test.go
index bbb8c3af6..a6996d381 100644
--- a/internal/config/backfill_test.go
+++ b/internal/config/backfill_test.go
@@ -21,8 +21,7 @@ func TestBackfillDeepSeekProRestoresPro(t *testing.T) {
 	pro := hasModel(c, "deepseek-v4-pro")
 	if pro == nil {
 		t.Fatal("deepseek-v4-pro not restored")
-	}
-	if pro.Price == nil || pro.Price.Output != 6 {
+	} else if pro.Price == nil || pro.Price.Output != 6 {
 		t.Errorf("pro price not the preset: %+v", pro.Price)
 	}
 }
diff --git a/internal/config/config.go b/internal/config/config.go
index 04e20fdc3..86848bc9b 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -271,7 +271,17 @@ func (c *Config) NetworkProxySpec() netclient.ProxySpec {
 
 // directProxyHosts collects the base_url hosts of providers marked no_proxy, so
 // netclient bypasses the proxy for them without knowing any provider by name.
+//
+// Only for an auto-detected proxy (auto/env): that proxy is typically a
+// GFW-circumvention one not meant for domestic endpoints (e.g. mimo), so keep
+// them direct. An explicit proxy_mode = "custom" is the user saying "route
+// everything through this" — e.g. a mandatory corporate proxy — so honor it for
+// every provider; a custom-proxy user who wants a host direct uses
+// network.no_proxy instead (#3635).
 func (c *Config) directProxyHosts() []string {
+	if c.NetworkProxyMode() == netclient.ModeCustom {
+		return nil
+	}
 	seen := map[string]bool{}
 	var out []string
 	for _, p := range c.Providers {
diff --git a/internal/config/migrate_test.go b/internal/config/migrate_test.go
index 61008544a..d80f5b932 100644
--- a/internal/config/migrate_test.go
+++ b/internal/config/migrate_test.go
@@ -47,8 +47,7 @@ func TestMigrateImportsKeyPluginsAndLang(t *testing.T) {
 	}
 	if res == nil {
 		t.Fatal("expected a migration result")
-	}
-	if !res.KeyToEnv || res.Plugins != 2 {
+	} else if !res.KeyToEnv || res.Plugins != 2 {
 		t.Errorf("result = %+v, want KeyToEnv=true Plugins=2", res)
 	}
 
diff --git a/internal/config/proxy_test.go b/internal/config/proxy_test.go
index ea040ef28..3666c031f 100644
--- a/internal/config/proxy_test.go
+++ b/internal/config/proxy_test.go
@@ -17,3 +17,17 @@ func TestDirectProxyHostsFromNoProxyProviders(t *testing.T) {
 		t.Errorf("a no_proxy provider's host should land in DirectHosts, got %v", spec.DirectHosts)
 	}
 }
+
+func TestExplicitProxyOverridesProviderNoProxy(t *testing.T) {
+	// An explicit custom proxy (e.g. a mandatory corporate proxy) must apply to
+	// every provider, including no_proxy ones like mimo, so it isn't unreachable
+	// behind the proxy (#3635).
+	c := Default()
+	c.Network.ProxyMode = "custom"
+	spec := c.NetworkProxySpec()
+	for _, h := range spec.DirectHosts {
+		if h == "token-plan-cn.xiaomimimo.com" {
+			t.Fatalf("custom proxy must not force mimo direct; DirectHosts = %v", spec.DirectHosts)
+		}
+	}
+}

From 78dd9fa42fae1a793a9b3fb9e3f8361bf6c1d23f Mon Sep 17 00:00:00 2001
From: YHH <359807859@qq.com>
Date: Tue, 9 Jun 2026 07:30:41 -0700
Subject: [PATCH 23/64] ci: suppress staticcheck SA5011 false positives in test
 files (#3715)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The pinned golangci-lint binary's staticcheck reports SA5011 (possible nil
pointer dereference) on `if x == nil { t.Fatal(...) }`-guarded derefs in tests
— it doesn't model t.Fatal as terminating. The same code is clean under a
locally-built golangci-lint, and the finding is masked by the action cache
until a go.sum change cold-busts it, so it surfaces per-package and has failed
lint on otherwise-correct PRs (handled ad hoc in #3706, #3714).

Scope a test-only SA5011 exclusion so it stops blocking PRs while SA5011 keeps
guarding production code.

Co-authored-by: reasonix <reasonix@deepseek.com>
---
 .golangci.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.golangci.yml b/.golangci.yml
index 979d92e15..fcfdb9a6d 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -33,6 +33,15 @@ linters:
       - path: _test\.go
         linters:
           - errcheck
+      # The pinned golangci-lint binary's staticcheck reports SA5011 false
+      # positives on `if x == nil { t.Fatal(...) }`-guarded derefs in tests (it
+      # doesn't treat t.Fatal as terminating); the same code is clean under a
+      # locally-built golangci-lint. Scope the suppression to tests so SA5011
+      # still guards production code.
+      - path: _test\.go
+        linters:
+          - staticcheck
+        text: SA5011
 
 issues:
   max-issues-per-linter: 0

From a8c785842cbbb82bc9da689554c2d4c399144d36 Mon Sep 17 00:00:00 2001
From: HorusEyes <IHEPBURN@LIVE.CN>
Date: Tue, 9 Jun 2026 23:12:26 +0800
Subject: [PATCH 24/64] fix: reload persist rule into in-memory Policy
 immediately (#3716)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: always allow (persist) now grants all tools for the session

When user clicks 'Always allow' (Allow Persistently) on a tool approval
prompt, the current code only remembers the grant for that specific tool
(e.g. write_file). Later in the same session, other tools like bash still
trigger permission prompts, confusing the user.

This fix makes 'Always allow' set a wildcard session grant (c.granted['*'])
so all writer tools are auto-allowed for the rest of the session without
further prompting. The actual on-disk config rule is still written as before
via OnRemember for cross-session persistence.

The normal 'Allow for this session' remains tool-specific as before.

* Revert "fix: always allow (persist) now grants all tools for the session"

This reverts commit f90ba6f58705476dfab05a095e3bc1db924f813f.

* fix: reload persist rule into in-memory Policy immediately

After OnRemember writes an 'always allow' rule to the on-disk config,
also append the parsed rule to the Gate's in-memory Policy.Allow slice
so it takes effect in the current session without requiring a restart.

Previously, clicking 'Always allow' on a tool (e.g. write_file) would:
1. Write the rule to reasonix.toml ✅
2. Set c.granted['write_file'] = true for the Approver path ✅
3. BUT: the Gate's Policy was not updated in memory ❌
   → Any code path consulting Policy.Decide() directly would still see
     the old policy and not match the new allow rule

This fix adds the parsed rule to g.Policy.Allow after writing to disk,
so the in-memory Policy stays consistent with the persisted config.

Ref: #3607

---------

Co-authored-by: HorusJiang <horusjiang@users.noreply.github.com>
---
 internal/permission/permission.go | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/internal/permission/permission.go b/internal/permission/permission.go
index 61f162580..5b49b3b18 100644
--- a/internal/permission/permission.go
+++ b/internal/permission/permission.go
@@ -340,6 +340,14 @@ func (g *Gate) Check(ctx context.Context, toolName string, args json.RawMessage,
 			// later subject (a different file / command) is allowed without
 			// re-prompting. Deny rules still take precedence on every call.
 			g.OnRemember(toolName)
+			// Also add the rule to the in-memory Policy immediately so it
+			// takes effect in the current session without requiring a restart.
+			// The session-level grant (controller.granted) already covers the
+			// Approver path, but any code path that consults Policy.Decide()
+			// directly would miss the rule until the next controller build.
+			if rule, ok := ParseRule(toolName); ok {
+				g.Policy.Allow = append(g.Policy.Allow, rule)
+			}
 		}
 		return true, "", nil
 	default:

From cb92a254f71c769d2dfe1143fafad28e7892b9f3 Mon Sep 17 00:00:00 2001
From: paradoxSCH <64133628+paradoxSCH@users.noreply.github.com>
Date: Tue, 9 Jun 2026 23:15:09 +0800
Subject: [PATCH 25/64] fix(serve): restore query helper (#3658)

---
 internal/serve/index.html    |  1 +
 internal/serve/serve_test.go | 12 ++++++++++++
 2 files changed, 13 insertions(+)

diff --git a/internal/serve/index.html b/internal/serve/index.html
index dde7b345b..7852f5901 100644
--- a/internal/serve/index.html
+++ b/internal/serve/index.html
@@ -639,6 +639,7 @@
 
 
 
+const $ = s => document.querySelector(s);
 const $$ = s => document.querySelectorAll(s);
 const log = $('#log'), input = $('#in'), btnSend = $('#btn-send'), btnStop = $('#btn-stop');
 const statusDot = $('#status-dot-footer'), statusText = $('#status-text');
diff --git a/internal/serve/serve_test.go b/internal/serve/serve_test.go
index 5fde1efc8..8fa789bf1 100644
--- a/internal/serve/serve_test.go
+++ b/internal/serve/serve_test.go
@@ -208,6 +208,18 @@ func TestServeIndexPage(t *testing.T) {
 	}
 }
 
+func TestServeIndexDefinesQueryHelpers(t *testing.T) {
+	html := string(indexHTML)
+	for _, want := range []string{
+		"const $ = s => document.querySelector(s);",
+		"const $$ = s => document.querySelectorAll(s);",
+	} {
+		if !strings.Contains(html, want) {
+			t.Fatalf("serve index missing query helper %q", want)
+		}
+	}
+}
+
 func TestServeIndexPagePassesLanguagePreferenceToClient(t *testing.T) {
 	home := t.TempDir()
 	t.Setenv("HOME", home)

From 88d46c4056e09737b9ad4e50ad63538a20c38e03 Mon Sep 17 00:00:00 2001
From: CVEngineer <129239603+CVEngineer66@users.noreply.github.com>
Date: Tue, 9 Jun 2026 23:19:17 +0800
Subject: [PATCH 26/64] fix(dev): suppress pnpm TTY prompts and lockfile age
 checks in dev script (#3701)

* fix(dev): suppress pnpm TTY prompts and lockfile age checks in dev script

pnpm v11 aborts node_modules removal without a TTY and rejects lockfiles
with packages published within the minimum release age window. Both checks
are meant for CI safety and are irrelevant during local development.

Set PNPM_CONFIG_CONFIRM_MODULES_PURGE=false and
PNPM_CONFIG_MINIMUM_RELEASE_AGE=0 before launching wails dev.

* ci: trigger re-run

---------

Co-authored-by: wufengfan <wufengfan@wufengfandeMacBook-Air.local>
---
 dev | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dev b/dev
index 87e93cf3b..8d3704cd6 100755
--- a/dev
+++ b/dev
@@ -29,6 +29,9 @@ wails_port="${REASONIX_DESKTOP_WAILS_PORT:-$((vite_port + 29000))}"
 
 export REASONIX_DESKTOP_VITE_PORT="$vite_port"
 export REASONIX_DEV=1
+# pnpm v11: suppress TTY prompts and skip lockfile age checks in headless mode.
+export PNPM_CONFIG_CONFIRM_MODULES_PURGE=false
+export PNPM_CONFIG_MINIMUM_RELEASE_AGE=0
 
 echo "Reasonix desktop dev"
 echo "  worktree: $root"

From 1658230355c22e9ef1ea6579b031b1f4dfdbe798 Mon Sep 17 00:00:00 2001
From: CnsMaple <92523839+CnsMaple@users.noreply.github.com>
Date: Tue, 9 Jun 2026 23:23:11 +0800
Subject: [PATCH 27/64] fix(setup): align custom provider base URL between
 wizard probe and chat client (#3669)

Wizard now probes the same candidate URLs (root + /v1 + compat suffixes) the chat client resolves, and the anthropic provider strips a trailing /v1 from base_url so a pasted OpenAI-shape URL no longer produces /v1/v1/messages.
---
 internal/cli/cli.go                           | 41 ++++++++-
 internal/cli/cli_test.go                      | 85 +++++++++++++++++++
 internal/provider/anthropic/anthropic.go      | 17 +++-
 internal/provider/anthropic/anthropic_test.go | 40 +++++++++
 4 files changed, 180 insertions(+), 3 deletions(-)

diff --git a/internal/cli/cli.go b/internal/cli/cli.go
index f45c2f87f..938d2b2ce 100644
--- a/internal/cli/cli.go
+++ b/internal/cli/cli.go
@@ -12,6 +12,7 @@ import (
 	"flag"
 	"fmt"
 	"io"
+	"log/slog"
 	"net/url"
 	"os"
 	"os/signal"
@@ -944,6 +945,42 @@ func fetchOrFallback(probe *config.ProviderEntry, famName string) []string {
 	return models
 }
 
+// fetchModelListCompat walks the full set of model-list URL candidates a given
+// base URL can resolve to (root, /v1, known OpenAI/Anthropic compat suffixes)
+// and returns the first successful fetch. This is the wizard-time probe for a
+// *user-supplied* custom provider — its baseURL is whatever the user pasted,
+// and "whatever they pasted" might be https://x.com (root, probe /v1/models)
+// or https://x.com/v1 (versioned, probe /v1/models directly). Previously the
+// wizard hardcoded `baseURL + "/models"`, which works for OpenAI-shape URLs
+// but silently fails for Anthropic-shape roots and the reverse — so the
+// wizard's idea of "what models exist" diverged from the chat client's actual
+// endpoint. Returning the empty slice (not an error) on full miss lets the
+// wizard fall through to a manual text input without an error message.
+func fetchModelListCompat(ctx context.Context, baseURL, apiKey string) ([]string, error) {
+	candidates, err := config.BuildModelFetchURLs(baseURL, "")
+	if err != nil {
+		return nil, err
+	}
+	var lastErr error
+	for _, u := range candidates {
+		models, err := openai.FetchModels(ctx, u, apiKey)
+		if err == nil {
+			return models, nil
+		}
+		lastErr = err
+		// An endpoint-miss is not a hard error — try the next candidate.
+		// Anything else (auth, 5xx, bad TLS) bubbles up immediately because
+		// retrying it on a sibling URL won't help.
+		if !openai.IsModelFetchEndpointMiss(err) {
+			return nil, err
+		}
+	}
+	if lastErr != nil {
+		slog.Debug("model-list probe: all candidates missed", "base_url", baseURL, "err", lastErr)
+	}
+	return nil, nil
+}
+
 // buildFamilyEntry returns a single ProviderEntry exposing the user's
 // selected models under one entry. It preserves the preset's API key env,
 // base URL, kind, context window, pricing, and effort — the things that
@@ -1159,7 +1196,7 @@ func promptCustomProviderFromURL() ([]config.ProviderEntry, error) {
 	fmt.Printf("  %s\n", dim(fmt.Sprintf(i18n.M.FetchingModelsFmt, "custom")))
 	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
 	defer cancel()
-	models, err := openai.FetchModels(ctx, baseURL+"/models", apiKey)
+	models, err := fetchModelListCompat(ctx, baseURL, apiKey)
 	if err != nil || len(models) == 0 {
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "  %s\n", dim(fmt.Sprintf(i18n.M.FetchModelsFailedFmt, "custom", err)))
@@ -1265,7 +1302,7 @@ func promptAnthropicProviderFromURL() ([]config.ProviderEntry, error) {
 	fmt.Printf("  %s\n", dim(fmt.Sprintf(i18n.M.AnthropicFetchingModelsFmt, "anthropic")))
 	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
 	defer cancel()
-	models, err := openai.FetchModels(ctx, baseURL+"/models", apiKey)
+	models, err := fetchModelListCompat(ctx, baseURL, apiKey)
 	if err != nil || len(models) == 0 {
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "  %s\n", dim(fmt.Sprintf(i18n.M.AnthropicFetchModelsFailedFmt, "anthropic", err)))
diff --git a/internal/cli/cli_test.go b/internal/cli/cli_test.go
index 5f76b661c..79de4eb26 100644
--- a/internal/cli/cli_test.go
+++ b/internal/cli/cli_test.go
@@ -3,12 +3,16 @@ package cli
 import (
 	"bufio"
 	"bytes"
+	"context"
 	"errors"
 	"io"
+	"net/http"
+	"net/http/httptest"
 	"os"
 	"path/filepath"
 	"reflect"
 	"strings"
+	"sync/atomic"
 	"testing"
 
 	"reasonix/internal/config"
@@ -498,6 +502,87 @@ func TestFetchOrFallback(t *testing.T) {
 	})
 }
 
+// TestFetchModelListCompatWalksCandidates covers the wizard's custom-provider
+// model probe. Previously the probe was a single URL (baseURL+"/models"),
+// which worked for OpenAI vendors with a /v1 base URL but silently failed
+// for Anthropic-style root URLs (no /v1) and Anthropic-compatible proxies
+// (a /v1 base URL but a /v1/messages endpoint). The new helper walks
+// BuildModelFetchURLs's candidate list — root + /v1 + known compat
+// suffixes — so the same probe now succeeds for both shapes, matching
+// what the conversation-time client URL will actually be.
+func TestFetchModelListCompatWalksCandidates(t *testing.T) {
+	t.Run("anthropic root form resolves via v1 fallback", func(t *testing.T) {
+		var gotPath atomic.Value
+		gotPath.Store("")
+		srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			gotPath.Store(r.URL.Path)
+			if r.URL.Path == "/v1/models" {
+				w.Header().Set("Content-Type", "application/json")
+				_, _ = io.WriteString(w, `{"data":[{"id":"claude-test"}]}`)
+				return
+			}
+			w.WriteHeader(http.StatusNotFound)
+		}))
+		defer srv.Close()
+
+		models, err := fetchModelListCompat(context.Background(), srv.URL, "k")
+		if err != nil {
+			t.Fatalf("fetchModelListCompat: %v", err)
+		}
+		if !reflect.DeepEqual(models, []string{"claude-test"}) {
+			t.Errorf("models = %v, want [claude-test]", models)
+		}
+		if got := gotPath.Load().(string); got != "/v1/models" {
+			t.Errorf("probe path = %q, want /v1/models (root form should fall through to v1 candidate)", got)
+		}
+	})
+
+	t.Run("versioned v1 base URL hits models directly", func(t *testing.T) {
+		var gotPath atomic.Value
+		gotPath.Store("")
+		srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			gotPath.Store(r.URL.Path)
+			w.Header().Set("Content-Type", "application/json")
+			_, _ = io.WriteString(w, `{"data":[{"id":"model-a"}]}`)
+		}))
+		defer srv.Close()
+
+		models, err := fetchModelListCompat(context.Background(), srv.URL+"/v1", "k")
+		if err != nil {
+			t.Fatalf("fetchModelListCompat: %v", err)
+		}
+		if !reflect.DeepEqual(models, []string{"model-a"}) {
+			t.Errorf("models = %v, want [model-a]", models)
+		}
+		if got := gotPath.Load().(string); got != "/v1/models" {
+			t.Errorf("probe path = %q, want /v1/models", got)
+		}
+	})
+
+	t.Run("endpoint-miss on every candidate returns empty (manual flow)", func(t *testing.T) {
+		srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
+			w.WriteHeader(http.StatusNotFound)
+		}))
+		defer srv.Close()
+
+		models, err := fetchModelListCompat(context.Background(), srv.URL, "k")
+		if err != nil {
+			t.Fatalf("expected graceful empty result on all-miss, got err: %v", err)
+		}
+		if len(models) != 0 {
+			t.Errorf("expected empty models on all-miss, got %v", models)
+		}
+	})
+
+	t.Run("non-404 network error short-circuits with the real error", func(t *testing.T) {
+		// Point at a closed port — connection refused, not a 404.
+		models, err := fetchModelListCompat(context.Background(), "http://127.0.0.1:1", "k")
+		if err == nil {
+			t.Fatalf("expected error for unreachable host, got models=%v", models)
+		}
+	})
+}
+
 // TestFamilyStaticModels proves the offline fallback unions every member of a
 // family (the flash + pro SKUs), not just the first — the regression that left
 // users with only flash when the live /models probe failed.
diff --git a/internal/provider/anthropic/anthropic.go b/internal/provider/anthropic/anthropic.go
index 9d6fe141e..b7fe900e3 100644
--- a/internal/provider/anthropic/anthropic.go
+++ b/internal/provider/anthropic/anthropic.go
@@ -67,11 +67,26 @@ func New(cfg provider.Config) (provider.Provider, error) {
 	if err != nil {
 		return nil, fmt.Errorf("anthropic: network: %w", err)
 	}
+	// Anthropic's API surface is at {root}/v1/messages, so c.baseURL stores
+	// the *root* — without any trailing /v1. The setup wizard, however, lets
+	// users paste a full OpenAI-compatible URL (e.g.
+	// "https://proxy.example.com/v1") because that's what /models probes
+	// expect. Stripping the trailing /v1 here makes both forms land on the
+	// same endpoint without forcing users to remember Anthropic's quirky
+	// root-vs-versioned split. Without this, a user pasting
+	// "https://proxy.example.com/v1" would probe /v1/models successfully
+	// but get the chat client concatenating onto
+	// "https://proxy.example.com/v1/v1/messages" — a 404.
+	root := strings.TrimRight(baseURL, "/")
+	root = strings.TrimSuffix(root, "/v1")
+	if root == "" {
+		root = defaultBaseURL
+	}
 	return &client{
 		name:     name,
 		apiKey:   cfg.APIKey,
 		keyEnv:   keyEnv,
-		baseURL:  strings.TrimRight(baseURL, "/"),
+		baseURL:  root,
 		model:    cfg.Model,
 		thinking: thinking,
 		effort:   effort,
diff --git a/internal/provider/anthropic/anthropic_test.go b/internal/provider/anthropic/anthropic_test.go
index cfb99d49d..f19ddb663 100644
--- a/internal/provider/anthropic/anthropic_test.go
+++ b/internal/provider/anthropic/anthropic_test.go
@@ -326,6 +326,46 @@ func TestReadStreamThinking(t *testing.T) {
 	}
 }
 
+// TestBaseURLNormalizedForV1Messages checks the URL-rewriting step in New().
+// Anthropic's Messages endpoint is {root}/v1/messages, but the setup wizard
+// accepts OpenAI-style URLs (e.g. "https://proxy.example.com/v1") because
+// /models probes expect that shape. Without the strip, the chat client would
+// concatenate /v1/messages onto an already-versioned root and the request
+// would go to https://proxy.example.com/v1/v1/messages — failing 404.
+func TestBaseURLNormalizedForV1Messages(t *testing.T) {
+	cases := []struct {
+		name string
+		in   string
+		want string
+	}{
+		{"plain root (no /v1)", "https://api.anthropic.com", "https://api.anthropic.com"},
+		{"versioned v1 (OpenAI shape)", "https://proxy.example.com/v1", "https://proxy.example.com"},
+		{"versioned v1 with trailing slash", "https://proxy.example.com/v1/", "https://proxy.example.com"},
+		{"versioned v1 with path prefix", "https://gateway.example.com/api/v1", "https://gateway.example.com/api"},
+		{"trailing slash only", "https://api.anthropic.com/", "https://api.anthropic.com"},
+		{"empty falls back to default", "", "https://api.anthropic.com"},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			p, err := New(provider.Config{
+				Name:    "test",
+				Model:   "claude-opus-4-8",
+				BaseURL: tc.in,
+			})
+			if err != nil {
+				t.Fatalf("New: %v", err)
+			}
+			c, ok := p.(*client)
+			if !ok {
+				t.Fatalf("provider type = %T, want *client", p)
+			}
+			if c.baseURL != tc.want {
+				t.Errorf("baseURL = %q, want %q", c.baseURL, tc.want)
+			}
+		})
+	}
+}
+
 // Ensure the package wires into the registry under the expected kind.
 func TestRegistered(t *testing.T) {
 	p, err := provider.New("anthropic", provider.Config{Model: "claude-opus-4-8", Name: "claude"})

From 89aca795f6dbd9e3a61ea192bd461ce8b812a9c5 Mon Sep 17 00:00:00 2001
From: CnsMaple <92523839+CnsMaple@users.noreply.github.com>
Date: Tue, 9 Jun 2026 23:25:44 +0800
Subject: [PATCH 28/64] fix(model): persist /model selection to user
 config.toml (#3671)

C:/Program Files/Git/model now writes the chosen provider/model to default_model in the user config so the next session starts on it instead of the global default. SetDefaultModel accepts the provider/model form (validated via ResolveModel).
---
 internal/cli/model.go        | 33 +++++++++++++++++++++++++--
 internal/cli/model_test.go   | 43 ++++++++++++++++++++++++++++++++++++
 internal/config/edit.go      | 18 ++++++++++-----
 internal/config/edit_test.go | 15 +++++++++++++
 4 files changed, 102 insertions(+), 7 deletions(-)

diff --git a/internal/cli/model.go b/internal/cli/model.go
index e2c140792..6d36bcd45 100644
--- a/internal/cli/model.go
+++ b/internal/cli/model.go
@@ -2,7 +2,6 @@ package cli
 
 import (
 	"fmt"
-	"log/slog"
 
 	tea "charm.land/bubbletea/v2"
 
@@ -33,10 +32,15 @@ func (m *chatTUI) runModelSubcommand(input string) {
 		m.notice(fmt.Sprintf(i18n.M.ModelAlreadyOnFmt, ref))
 		return
 	}
+	// Persist the user's choice to ~/.config/reasonix/config.toml so the next
+	// session starts on the same model instead of falling back to the global
+	// default. Mirrors the pattern used by /theme (persistTheme), /effort, and
+	// /language.
+	m.persistModel(ref)
 	carried := m.ctrl.History()
 	prevPath := m.ctrl.SessionPath()
 	if err := m.ctrl.Snapshot(); err != nil {
-		slog.Warn("model switch: snapshot failed", "err", err)
+		m.notice("model: snapshot failed: " + err.Error())
 	}
 	m.notice(fmt.Sprintf(i18n.M.ModelSwitchingFmt, ref))
 
@@ -94,6 +98,31 @@ func (m *chatTUI) showModels() {
 	m.commitLine(renderModels(m.width, refs, m.modelRef))
 }
 
+// persistModel writes ref (a "provider/model" string) to default_model in
+// ~/.config/reasonix/config.toml so the next CLI launch starts on the same
+// model. The in-memory switch is always allowed to proceed regardless of the
+// outcome here, but every step (rejected by validation, save failed, or
+// persisted successfully) reports back to the TUI notice channel so the user
+// can see whether their /model choice will survive a restart. Run before
+// Snapshot/ModelSwitchingFmt so the persistence outcome shows up first in
+// the notice area.
+func (m *chatTUI) persistModel(ref string) {
+	path := config.UserConfigPath()
+	if path == "" {
+		return
+	}
+	edit := config.LoadForEdit(path)
+	if err := edit.SetDefaultModel(ref); err != nil {
+		m.notice(fmt.Sprintf("model: persist refused: %v (ref=%s)", err, ref))
+		return
+	}
+	if err := edit.SaveTo(path); err != nil {
+		m.notice(fmt.Sprintf("model: persist save failed: %v (ref=%s, path=%s)", err, ref, path))
+		return
+	}
+	m.notice(fmt.Sprintf("model: persisted (ref=%s, path=%s)", ref, path))
+}
+
 // modelRefs returns the configured provider/model refs for slash completion.
 func modelRefs() []string {
 	cfg, err := config.Load()
diff --git a/internal/cli/model_test.go b/internal/cli/model_test.go
index 6811845b5..c06a0fc3d 100644
--- a/internal/cli/model_test.go
+++ b/internal/cli/model_test.go
@@ -1,8 +1,11 @@
 package cli
 
 import (
+	"os"
 	"strings"
 	"testing"
+
+	"reasonix/internal/config"
 )
 
 // TestModelRefsFromConfig verifies the /model picker enumerates configured
@@ -49,3 +52,43 @@ func TestModelArgCompletion(t *testing.T) {
 		t.Fatalf("/model arg completion should offer refs, ok=%v n=%d", ok, len(items))
 	}
 }
+
+// TestPersistModelWritesDefaultModel verifies that calling persistModel with a
+// "provider/model" ref writes default_model = "<ref>" to the user config file
+// in TOML form. This is the fix for the "default model resets on every launch"
+// regression: previously /model only mutated the in-memory controller and the
+// next startup read the global default.
+func TestPersistModelWritesDefaultModel(t *testing.T) {
+	isolateUserConfig(t)
+	t.Setenv("DEEPSEEK_API_KEY", "test-key")
+	t.Setenv("MIMO_API_KEY", "")
+
+	m := newTestChatTUI()
+	m.persistModel("deepseek-flash/deepseek-v4-flash")
+
+	body, err := os.ReadFile(config.UserConfigPath())
+	if err != nil {
+		t.Fatalf("read saved config: %v", err)
+	}
+	if !strings.Contains(string(body), `default_model = "deepseek-flash/deepseek-v4-flash"`) {
+		t.Fatalf("saved config missing default_model ref:\n%s", body)
+	}
+}
+
+// TestPersistModelRejectsUnknownRef verifies that an unresolvable ref is
+// silently dropped (logged to slog, not pushed to the TUI notice channel)
+// and never lands in the config file. Reason: surface a "persist failed"
+// notice on the input box would make /model feel broken to users whose
+// stored config doesn't list the exact model ref they picked; the in-
+// memory switch still goes through.
+func TestPersistModelRejectsUnknownRef(t *testing.T) {
+	isolateUserConfig(t)
+	t.Setenv("DEEPSEEK_API_KEY", "test-key")
+
+	m := newTestChatTUI()
+	m.persistModel("ghost/never-existed")
+
+	if _, err := os.Stat(config.UserConfigPath()); !os.IsNotExist(err) {
+		t.Fatalf("unknown ref must not create config file, stat err=%v", err)
+	}
+}
diff --git a/internal/config/edit.go b/internal/config/edit.go
index a4742ed38..08df216ad 100644
--- a/internal/config/edit.go
+++ b/internal/config/edit.go
@@ -29,12 +29,20 @@ const (
 	listDeny  = "deny"
 )
 
-// SetDefaultModel points default_model at an existing provider. It errors if no
-// provider by that name is configured, so a UI can't strand the config on a
-// model that doesn't exist.
+// SetDefaultModel points default_model at an existing model. It accepts both
+// forms used by the runtime resolver:
+//   - "provider"          — the provider's own default model;
+//   - "provider/model"    — that specific model under that provider.
+//
+// Either is rejected when the target does not exist, so a UI can't strand
+// the config on a model that doesn't exist.
 func (c *Config) SetDefaultModel(name string) error {
-	if _, ok := c.Provider(name); !ok {
-		return fmt.Errorf("set default: no provider %q (configured: %s)", name, c.providerNames())
+	name = strings.TrimSpace(name)
+	if name == "" {
+		return fmt.Errorf("set default: empty name")
+	}
+	if _, ok := c.ResolveModel(name); !ok {
+		return fmt.Errorf("set default: no such model %q (configured: %s)", name, c.providerNames())
 	}
 	c.DefaultModel = name
 	return nil
diff --git a/internal/config/edit_test.go b/internal/config/edit_test.go
index 0b3778250..6b278a755 100644
--- a/internal/config/edit_test.go
+++ b/internal/config/edit_test.go
@@ -20,6 +20,21 @@ func TestSetDefaultModel(t *testing.T) {
 	if err := c.SetDefaultModel("nope"); err == nil {
 		t.Error("expected error for unknown provider")
 	}
+	// "provider/model" form is also accepted: the /model picker stores the
+	// full ref so a user can land on a non-default model under the same
+	// provider across restarts.
+	if err := c.SetDefaultModel("mimo-pro/mimo-v2.5-pro"); err != nil {
+		t.Fatalf("set provider/model default: %v", err)
+	}
+	if c.DefaultModel != "mimo-pro/mimo-v2.5-pro" {
+		t.Errorf("default = %q, want mimo-pro/mimo-v2.5-pro", c.DefaultModel)
+	}
+	if err := c.SetDefaultModel("mimo-pro/missing"); err == nil {
+		t.Error("expected error for unknown model under known provider")
+	}
+	if err := c.SetDefaultModel(""); err == nil {
+		t.Error("expected error for empty name")
+	}
 }
 
 func TestUIThemeNormalizes(t *testing.T) {

From da31fd4c60cd55eeedb3670b0805c617ab12ecce Mon Sep 17 00:00:00 2001
From: wade1999 <wade19990814@gmail.com>
Date: Tue, 9 Jun 2026 23:28:35 +0800
Subject: [PATCH 29/64] fix(desktop): keep Windows tray loop on locked OS
 thread (#3717)

Wrap the Windows systray loop in runtime.LockOSThread() so fyne.io/systray's Win32 hidden-window message loop stays pinned to one OS thread; the scheduler migrating the goroutine left the tray unresponsive while the app was in the tray. Fixes #3516.
---
 desktop/tray_loop_windows.go      | 16 ++++++++++++++--
 desktop/tray_loop_windows_test.go | 30 ++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 2 deletions(-)
 create mode 100644 desktop/tray_loop_windows_test.go

diff --git a/desktop/tray_loop_windows.go b/desktop/tray_loop_windows.go
index 6721011db..b48bd7fd5 100644
--- a/desktop/tray_loop_windows.go
+++ b/desktop/tray_loop_windows.go
@@ -2,9 +2,21 @@
 
 package main
 
-import "fyne.io/systray"
+import (
+	"runtime"
+
+	"fyne.io/systray"
+)
 
 func startDesktopTray(onReady, onExit func()) func() {
-	go systray.Run(onReady, onExit)
+	go runDesktopTrayLoop(func() {
+		systray.Run(onReady, onExit)
+	})
 	return systray.Quit
 }
+
+func runDesktopTrayLoop(run func()) {
+	runtime.LockOSThread()
+	defer runtime.UnlockOSThread()
+	run()
+}
diff --git a/desktop/tray_loop_windows_test.go b/desktop/tray_loop_windows_test.go
new file mode 100644
index 000000000..8924ae947
--- /dev/null
+++ b/desktop/tray_loop_windows_test.go
@@ -0,0 +1,30 @@
+//go:build windows
+
+package main
+
+import (
+	"runtime"
+	"testing"
+
+	"golang.org/x/sys/windows"
+)
+
+func TestDesktopTrayLoopRunsOnLockedOSThread(t *testing.T) {
+	done := make(chan struct{})
+	runDesktopTrayLoop(func() {
+		first := windows.GetCurrentThreadId()
+		for i := 0; i < 100; i++ {
+			runtime.Gosched()
+		}
+		if got := windows.GetCurrentThreadId(); got != first {
+			t.Fatalf("tray loop moved OS threads: first=%d got=%d", first, got)
+		}
+		close(done)
+	})
+
+	select {
+	case <-done:
+	default:
+		t.Fatal("tray loop did not run")
+	}
+}

From 32d3c3e353ed79666d2f62fe613299f339939a4e Mon Sep 17 00:00:00 2001
From: 55 <38285521+lizhengwu@users.noreply.github.com>
Date: Tue, 9 Jun 2026 23:49:08 +0800
Subject: [PATCH 30/64] fix(tui): suspend cleanly on Ctrl+Z (#3697)

Map Ctrl+Z to Bubble Tea's tea.Suspend so an explicit user suspend releases terminal state before stopping. First mitigation for #3655; the Unix SIGTTIN job-control guard is tracked separately.
---
 internal/cli/chat_tui.go      |  2 ++
 internal/cli/chat_tui_test.go | 13 +++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/internal/cli/chat_tui.go b/internal/cli/chat_tui.go
index af39bf6f9..51216a924 100644
--- a/internal/cli/chat_tui.go
+++ b/internal/cli/chat_tui.go
@@ -806,6 +806,8 @@ func (m chatTUI) update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		case "pgdown":
 			m.viewport.PageDown()
 			return m, finalize(m, cmds)
+		case "ctrl+z":
+			return m, tea.Suspend
 		}
 		// A question card is modal: keys drive it. In its free-text ("Type
 		// something") mode, the keystroke goes to the textarea — Enter confirms the
diff --git a/internal/cli/chat_tui_test.go b/internal/cli/chat_tui_test.go
index 0050bcf1e..29fc7387b 100644
--- a/internal/cli/chat_tui_test.go
+++ b/internal/cli/chat_tui_test.go
@@ -1288,6 +1288,19 @@ func TestDoubleCtrlCQuit(t *testing.T) {
 	}
 }
 
+func TestCtrlZSendsSuspend(t *testing.T) {
+	m := newTestChatTUI()
+	ctrlZ := tea.KeyPressMsg{Code: 'z', Mod: tea.ModCtrl}
+
+	_, cmd := m.Update(ctrlZ)
+	if cmd == nil {
+		t.Fatal("expected Ctrl+Z to return a suspend command")
+	}
+	if msg := cmd(); msg != (tea.SuspendMsg{}) {
+		t.Fatalf("expected tea.SuspendMsg, got %T", msg)
+	}
+}
+
 // TestCtrlCClearsInput verifies that a single Ctrl+C while idle with non-empty
 // input clears the composer without arming the double-press quit gesture.
 func TestCtrlCClearsInput(t *testing.T) {

From 11a13780d32b5357bbb80aa46bb50efaed9e999e Mon Sep 17 00:00:00 2001
From: CnsMaple <92523839+CnsMaple@users.noreply.github.com>
Date: Tue, 9 Jun 2026 23:52:25 +0800
Subject: [PATCH 31/64] fix(tui): keep plan mode on Esc; Ctrl+C copy beats
 clear (#3670)

Complete #3051: drop the plan-mode arm from the Esc handler so mode switches are exclusively Shift+Tab driven (Esc must not silently drop to a less-permissive mode). Also hoist Ctrl+C selection-copy above clear-input so copying a selection no longer wipes a half-typed draft.
---
 internal/cli/chat_tui.go      | 46 +++++++++++++++------------
 internal/cli/chat_tui_test.go | 59 +++++++++++++++++++++++++++++++++++
 2 files changed, 85 insertions(+), 20 deletions(-)

diff --git a/internal/cli/chat_tui.go b/internal/cli/chat_tui.go
index 51216a924..56fc6a804 100644
--- a/internal/cli/chat_tui.go
+++ b/internal/cli/chat_tui.go
@@ -923,10 +923,13 @@ func (m chatTUI) update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		switch msg.String() {
 		case "esc":
 			// "Back out" of the most specific in-progress state: un-send a just-sent
-			// turn (server not yet replied), cancel a streaming turn, turn plan mode
-			// off, or clear typed-but-unsent input. YOLO mode is only exited via
-			// Shift+Tab cycle (/plan → YOLO → normal) or --yolo flag. Scrollback is
-			// the terminal's now, so there's no viewport to dismiss.
+			// turn (server not yet replied), cancel a streaming turn, or clear
+			// typed-but-unsent input. Mode switches (normal/plan/YOLO) are
+			// exclusively driven by Shift+Tab — Esc must not silently flip a
+			// session from plan or YOLO back to a less-permissive mode. PR #3051
+			// removed the YOLO half of this; plan mode was missed and is fixed
+			// here. Scrollback is the terminal's now, so there's no viewport to
+			// dismiss.
 			switch {
 			case m.state == tuiRunning && m.bubblePending:
 				m.unsendPending()
@@ -939,13 +942,10 @@ func (m chatTUI) update(msg tea.Msg) (tea.Model, tea.Cmd) {
 					m.state = tuiIdle
 					m.confirmBubbleSent()
 				}
-			case m.planMode:
-				m.planMode = false
-				m.ctrl.SetPlanMode(false)
 			default:
-				// Idle with nothing to back out: a double-Esc on an empty composer
-				// opens the rewind picker (Claude Code's gesture); a first Esc just
-				// arms it. Non-empty input clears as before.
+				// Idle (any mode): a double-Esc on an empty composer opens the
+				// rewind picker (Claude Code's gesture); a first Esc just arms
+				// it. Non-empty input clears as before.
 				if strings.TrimSpace(m.input.Value()) == "" {
 					if !m.lastEsc.IsZero() && time.Since(m.lastEsc) < 600*time.Millisecond {
 						m.lastEsc = time.Time{}
@@ -968,22 +968,28 @@ func (m chatTUI) update(msg tea.Msg) (tea.Model, tea.Cmd) {
 				}
 				return m, nil
 			}
-			// Idle: if the composer has text, a single press clears it (like Esc).
-			// On an empty composer: if there's an active text selection, copy to
-			// clipboard (standard terminal convention); otherwise require double-press
-			// within 1.5s to quit.
-			if strings.TrimSpace(m.input.Value()) != "" {
-				m.input.Reset()
-				m.pastedBlocks = nil
-				m.lastCtrlCAt = time.Time{}
-				return m, nil
-			}
+			// Idle: an active text selection takes precedence over the
+			// composer-clear / double-press-quit gestures. Standard terminal
+			// convention is "Ctrl+C copies the selection" — the user can still
+			// clear the input with a second Ctrl+C once the selection is gone.
+			// Hoisting this branch above the clear branch also stops the
+			// previous behaviour where Ctrl+C would dismiss a selection AND
+			// wipe any draft text the user was typing — felt like the
+			// selection was being silently lost.
 			if sel.active && !sel.empty() {
 				m.sel = sel // restore so selectedText() can read it
 				text := m.selectedText()
 				m.sel = selection{}
 				return m, tea.Batch(copyToClipboard(text), finalize(m, cmds))
 			}
+			// No selection: if the composer has text, a single press clears it
+			// (like Esc); on an empty composer a double-press within 1.5s quits.
+			if strings.TrimSpace(m.input.Value()) != "" {
+				m.input.Reset()
+				m.pastedBlocks = nil
+				m.lastCtrlCAt = time.Time{}
+				return m, nil
+			}
 			if !m.lastCtrlCAt.IsZero() && time.Since(m.lastCtrlCAt) < 1500*time.Millisecond {
 				return m, tea.Quit
 			}
diff --git a/internal/cli/chat_tui_test.go b/internal/cli/chat_tui_test.go
index 29fc7387b..1cc39170c 100644
--- a/internal/cli/chat_tui_test.go
+++ b/internal/cli/chat_tui_test.go
@@ -1470,3 +1470,62 @@ func TestTruncateSubject(t *testing.T) {
 		})
 	}
 }
+
+// TestCtrlCCopyBeatsClearInput — regression for the bug where an active
+// selection AND a non-empty composer both existed: Ctrl+C used to wipe the
+// draft text and discard the selection. The fix hoists the selection-copy
+// branch above the clear-input branch so the user's draft survives. After
+// the copy the user can still press Ctrl+C again to clear the composer.
+func TestCtrlCCopyBeatsClearInput(t *testing.T) {
+	var copied string
+	clipboardWriteAll = func(text string) error { copied = text; return nil }
+	defer func() { clipboardWriteAll = clipboard.WriteAll }()
+
+	m := newTestChatTUI()
+	m.input.SetValue("draft I'm typing") // non-empty composer
+	m.transcript = []string{"selected text"}
+	m.wrappedLines = []string{"selected text"}
+	m.sel = selection{active: true, anchor: selPos{line: 0, col: 0}, head: selPos{line: 0, col: 8}}
+
+	ctrlC := tea.KeyPressMsg{Code: 'c', Mod: 4}
+	out, cmd := m.Update(ctrlC)
+	m2 := out.(chatTUI)
+
+	// Draft text must survive the selection copy.
+	if got := m2.input.Value(); got != "draft I'm typing" {
+		t.Errorf("composer draft wiped by Ctrl+C copy; got %q, want preserved", got)
+	}
+	if cmd == nil {
+		t.Fatal("expected clipboard cmd")
+	}
+	cmd()
+	if copied != "selected" {
+		t.Errorf("clipboard = %q, want %q", copied, "selected")
+	}
+
+	// Second Ctrl+C (no selection, non-empty composer) clears the draft.
+	out2, _ := m2.Update(ctrlC)
+	m3 := out2.(chatTUI)
+	if got := m3.input.Value(); got != "" {
+		t.Errorf("second Ctrl+C should clear composer; got %q", got)
+	}
+}
+
+// TestEscInPlanModeDoesNotExitPlan — regression for the part of PR #3051 that
+// was missed: Esc was still falling into the case m.planMode branch. The
+// Shift+Tab cycle is the only path that flips plan mode; Esc must only
+// rewind / clear input. PR #3051 already removed the equivalent YOLO branch;
+// the m.ctrl.SetBypass path is exercised end-to-end in control/yolo_test.go
+// and intentionally not duplicated here.
+func TestEscInPlanModeDoesNotExitPlan(t *testing.T) {
+	m := newTestChatTUI()
+	m.planMode = true
+
+	esc := tea.KeyPressMsg{Code: tea.KeyEsc}
+	out, _ := m.Update(esc)
+	m2 := out.(chatTUI)
+
+	if !m2.planMode {
+		t.Error("Esc must not exit plan mode; only Shift+Tab should")
+	}
+}

From d9bbf77929bc140abd383e32394de18d11686783 Mon Sep 17 00:00:00 2001
From: YHH <359807859@qq.com>
Date: Tue, 9 Jun 2026 08:58:48 -0700
Subject: [PATCH 32/64] test: de-flake two windows-latest timing tests (#3726)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* test(plugin): de-flake TestStartPhaseAReturnsBeforePhaseB

The test asserted StartAvailable returns in <150ms while the helper stalls
prompts/list by 200ms — a wall-clock proxy for "phase A doesn't block on the
prompt fetch". But StartAvailable spawns a subprocess and runs the MCP
initialize handshake, and that cost alone can approach or exceed 150ms on a
slow CI runner (observed 196ms on windows-latest), so the threshold flaked
with no real regression.

Drop the timing assertion and keep the deterministic deferral checks that
already encode the contract: after phase A the prompts surface is empty, and
prompts only materialise after StartPhaseB drains them. A realistic
"phase A surfaces prompts inline" regression still trips the empty-surface
check; the removed threshold only proxied an implausible fetch-but-not-surface
case at the cost of flakiness.

* test(control): de-flake TestRunShell_CancelStopsCommand

The test waited 5s for TurnDone after Cancel, but cmd.Wait honours
shellWaitDelay (also 5s) — and on Windows cmd.Cancel spawns taskkill /F /T —
so when the kill rides the full grace, TurnDone arrives at ~shellWaitDelay and
the 5s budget loses its own race (observed 5.18s on windows-latest).

Wait shellWaitDelay + 10s instead, via a new waitForDoneWithin helper that the
existing waitForDone now delegates to. The command is still killed promptly in
practice; the larger budget only removes the dead heat with the grace period.
---
 internal/control/shell_test.go | 14 ++++++++++++--
 internal/plugin/plugin_test.go | 12 ++++++------
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/internal/control/shell_test.go b/internal/control/shell_test.go
index 118b26e16..da14af8a9 100644
--- a/internal/control/shell_test.go
+++ b/internal/control/shell_test.go
@@ -25,11 +25,16 @@ func collectSink() (event.Sink, chan event.Event, *[]event.Event) {
 }
 
 func waitForDone(t *testing.T, done chan event.Event) event.Event {
+	t.Helper()
+	return waitForDoneWithin(t, done, 5*time.Second)
+}
+
+func waitForDoneWithin(t *testing.T, done chan event.Event, d time.Duration) event.Event {
 	t.Helper()
 	select {
 	case e := <-done:
 		return e
-	case <-time.After(5 * time.Second):
+	case <-time.After(d):
 		t.Fatal("timed out waiting for TurnDone")
 		return event.Event{}
 	}
@@ -152,7 +157,12 @@ func TestRunShell_CancelStopsCommand(t *testing.T) {
 	time.Sleep(100 * time.Millisecond)
 	ctrl.Cancel()
 
-	e := waitForDone(t, done)
+	// Cancel kills the shell via the run context, but cmd.Wait honours
+	// shellWaitDelay (and on Windows cmd.Cancel spawns taskkill /F /T), so
+	// TurnDone can arrive almost a full shellWaitDelay after Cancel. Wait
+	// comfortably longer than that grace — a flat 5s budget equalled
+	// shellWaitDelay and lost the race on a loaded windows runner.
+	e := waitForDoneWithin(t, done, shellWaitDelay+10*time.Second)
 	if e.Kind != event.TurnDone {
 		t.Fatalf("done event kind = %v, want TurnDone", e.Kind)
 	}
diff --git a/internal/plugin/plugin_test.go b/internal/plugin/plugin_test.go
index ca1d9d7a0..18d40e5a4 100644
--- a/internal/plugin/plugin_test.go
+++ b/internal/plugin/plugin_test.go
@@ -431,7 +431,7 @@ func TestStartRecordsTimeoutStats(t *testing.T) {
 
 // TestStartPhaseAReturnsBeforePhaseB pins the two-phase handshake contract.
 // The helper advertises prompts and stalls prompts/list by 200ms; StartAvailable
-// must return as soon as tools are ready (well before that 200ms), and the
+// must return with tools ready while the prompts surface is still empty, and the
 // prompts must only materialise on Host after StartPhaseB has been called and
 // drained — proving prompts ride the background phase, not the boot critical path.
 func TestStartPhaseAReturnsBeforePhaseB(t *testing.T) {
@@ -449,17 +449,17 @@ func TestStartPhaseAReturnsBeforePhaseB(t *testing.T) {
 		},
 	}
 
-	t0 := time.Now()
 	host, tools := StartAvailable(ctx, []Spec{spec})
-	startDur := time.Since(t0)
 	defer host.Close()
 
 	if len(tools) == 0 {
 		t.Fatalf("want tools from helper, got 0")
 	}
-	if startDur >= 150*time.Millisecond {
-		t.Fatalf("StartAvailable took %v — phase B (200ms prompts) leaked onto the critical path", startDur)
-	}
+	// Phase A returns with tools but the prompts surface must still be empty:
+	// StartAvailable never issues prompts/list (the helper stalls it 200ms), so
+	// prompts can only appear after StartPhaseB drains them below. We assert this
+	// deferral directly instead of timing StartAvailable — subprocess spawn plus
+	// the MCP handshake make a wall-clock threshold flaky on slow CI runners.
 	if got := host.Prompts(); len(got) != 0 {
 		t.Fatalf("phase A must not surface prompts yet, got %d", len(got))
 	}

From c4e57e16cfba96027a004544a91df57c00265660 Mon Sep 17 00:00:00 2001
From: YHH <359807859@qq.com>
Date: Tue, 9 Jun 2026 09:04:44 -0700
Subject: [PATCH 33/64] test(e2e): add subagent-delegation task that forces a
 `task` sub-agent (#3725)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The committed e2e suite has no task that reliably makes the model delegate,
so it never exercises the sub-agent path end-to-end. This task seeds three
files with arbitrary numbers and instructs the agent to read them via a
single `task` sub-agent (not inline), then write their sum to result.txt.

Because e2ebench drives the headless `reasonix run` path, this covers a fresh
`task` delegation there — the exact path that regressed when persisted
sub-agent transcripts made a parent session mandatory. continue_from/fork_from
need a persisted session and are out of scope for the headless harness.
---
 benchmarks/e2e/tasks/subagent-delegation/task.toml   |  3 +++
 benchmarks/e2e/tasks/subagent-delegation/verify.sh   | 12 ++++++++++++
 .../tasks/subagent-delegation/workdir/data/alpha.txt |  1 +
 .../tasks/subagent-delegation/workdir/data/beta.txt  |  1 +
 .../tasks/subagent-delegation/workdir/data/gamma.txt |  1 +
 5 files changed, 18 insertions(+)
 create mode 100644 benchmarks/e2e/tasks/subagent-delegation/task.toml
 create mode 100644 benchmarks/e2e/tasks/subagent-delegation/verify.sh
 create mode 100644 benchmarks/e2e/tasks/subagent-delegation/workdir/data/alpha.txt
 create mode 100644 benchmarks/e2e/tasks/subagent-delegation/workdir/data/beta.txt
 create mode 100644 benchmarks/e2e/tasks/subagent-delegation/workdir/data/gamma.txt

diff --git a/benchmarks/e2e/tasks/subagent-delegation/task.toml b/benchmarks/e2e/tasks/subagent-delegation/task.toml
new file mode 100644
index 000000000..509fa48c3
--- /dev/null
+++ b/benchmarks/e2e/tasks/subagent-delegation/task.toml
@@ -0,0 +1,3 @@
+prompt = "This directory contains a data/ folder with three files: alpha.txt, beta.txt, and gamma.txt. Each file holds a single line of the form name=number. You MUST delegate the reading to a sub-agent: call the `task` tool exactly once, instructing the sub-agent to read all three files under data/ and report the three numbers back to you. Do NOT read the files yourself with your own tools. After the sub-agent reports the numbers, add them together and write ONLY the resulting integer (no other text, no trailing label or newline-prefixed words) to a file named result.txt in the current directory."
+max_steps = 15
+timeout_sec = 300
diff --git a/benchmarks/e2e/tasks/subagent-delegation/verify.sh b/benchmarks/e2e/tasks/subagent-delegation/verify.sh
new file mode 100644
index 000000000..9bedcc368
--- /dev/null
+++ b/benchmarks/e2e/tasks/subagent-delegation/verify.sh
@@ -0,0 +1,12 @@
+set -e
+# Exercises a fresh `task` sub-agent delegation in the headless `reasonix run`
+# path: 17 + 28 + 41 = 86. The numbers are arbitrary so the answer can only be
+# produced by actually reading the three seed files (the prompt mandates doing
+# that via the `task` tool). Before sub-agents could run without a parent
+# session, the `task` call errored here with "parent session is required".
+test -f result.txt
+got=$(tr -d '[:space:]' < result.txt)
+if [ "$got" != "86" ]; then
+  echo "result.txt = '$got', want 86"
+  exit 1
+fi
diff --git a/benchmarks/e2e/tasks/subagent-delegation/workdir/data/alpha.txt b/benchmarks/e2e/tasks/subagent-delegation/workdir/data/alpha.txt
new file mode 100644
index 000000000..0d9353596
--- /dev/null
+++ b/benchmarks/e2e/tasks/subagent-delegation/workdir/data/alpha.txt
@@ -0,0 +1 @@
+alpha=17
diff --git a/benchmarks/e2e/tasks/subagent-delegation/workdir/data/beta.txt b/benchmarks/e2e/tasks/subagent-delegation/workdir/data/beta.txt
new file mode 100644
index 000000000..53aae3d01
--- /dev/null
+++ b/benchmarks/e2e/tasks/subagent-delegation/workdir/data/beta.txt
@@ -0,0 +1 @@
+beta=28
diff --git a/benchmarks/e2e/tasks/subagent-delegation/workdir/data/gamma.txt b/benchmarks/e2e/tasks/subagent-delegation/workdir/data/gamma.txt
new file mode 100644
index 000000000..c9939115d
--- /dev/null
+++ b/benchmarks/e2e/tasks/subagent-delegation/workdir/data/gamma.txt
@@ -0,0 +1 @@
+gamma=41

From 6a51e865f1bba089c137c09656d355c0a2bf028c Mon Sep 17 00:00:00 2001
From: YHH <359807859@qq.com>
Date: Tue, 9 Jun 2026 09:29:35 -0700
Subject: [PATCH 34/64] ci(e2e-bot): build with go.mod's Go version, not pinned
 1.22 (#3731)

The e2e-bot pinned go-version: '1.22' with setup-go's GOTOOLCHAIN=local, but
go.mod now requires go >= 1.25.0, so the very first step ("Build harness +
fallback agent from the default branch") fails with:

  go: go.mod requires go >= 1.25.0 (running go 1.22.12; GOTOOLCHAIN=local)

That breaks every /e2e invocation before it can build anything. Every other
workflow (ci.yml, release-*.yml) already uses go-version-file: go.mod; mirror
that here so the bot tracks the repo's Go version and never goes stale again.
---
 .github/workflows/e2e-bot.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/e2e-bot.yml b/.github/workflows/e2e-bot.yml
index 08d522b4a..944f7de87 100644
--- a/.github/workflows/e2e-bot.yml
+++ b/.github/workflows/e2e-bot.yml
@@ -43,7 +43,7 @@ jobs:
 
       - uses: actions/setup-go@v6
         with:
-          go-version: '1.22'
+          go-version-file: go.mod
           cache: true
 
       - uses: actions/setup-python@v6

From 568644daae1e45f3d41e2144aed013f774d2449d Mon Sep 17 00:00:00 2001
From: lifu963 <56394323+lifu963@users.noreply.github.com>
Date: Wed, 10 Jun 2026 07:52:15 +0800
Subject: [PATCH 35/64] Continue subagent transcripts (#3586)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat(agent): add subagent transcript store

Co-authored-by: Cursor <cursoragent@cursor.com>

* feat(agent): continue task subagent transcripts

Co-authored-by: Cursor <cursoragent@cursor.com>

* feat(skill): continue subagent skill transcripts

Co-authored-by: Cursor <cursoragent@cursor.com>

* refactor(agent): require subagent transcript store

Co-authored-by: Cursor <cursoragent@cursor.com>

* fix(boot): record effective subagent identity

Co-authored-by: Cursor <cursoragent@cursor.com>

* fix(agent): release source lock after fork copy

Co-authored-by: Cursor <cursoragent@cursor.com>

* fix(cli): run review with explicit subagent session

Co-authored-by: Cursor <cursoragent@cursor.com>

* fix(agent): persist failed subagent transcripts

Co-authored-by: Cursor <cursoragent@cursor.com>

* fix(agent): mark failed foreground continuations

Co-authored-by: Cursor <cursoragent@cursor.com>

* fix(agent): bind subagents to parent sessions

Ensure persisted subagent transcripts record the active parent session and prevent in-place continuation from a different parent, keeping fork_from as the explicit copy path.

Co-authored-by: Cursor <cursoragent@cursor.com>

* fix(session): cascade subagent lifecycle cleanup

Move owned subagent artifacts with desktop trash/restore and delete them from hard-delete paths so parent session cleanup no longer leaves reusable child transcripts behind.

Co-authored-by: Cursor <cursoragent@cursor.com>

* fix(agent): run sub-agents ephemerally without a parent session

Persisted sub-agent transcripts made a parent session mandatory, so
`reasonix run` (headless, which never mints a session path) failed every
task/subagent-skill call with "subagent transcript parent session is
required". Fall back to a non-persisted run when no parent session is
active — restoring pre-transcript behaviour — and reserve continue_from/
fork_from for sessions that actually have a persisted owner.

Adds a headless-run regression guard plus task-level ephemeral coverage.

---------

Co-authored-by: lifu963 <lifu963@lifu963deMacBook-Air-2.local>
Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: esengine <359807859@qq.com>
---
 desktop/sessions.go                   |  70 ++++
 desktop/sessions_test.go              | 134 +++++++
 desktop/tabs_topic_test.go            |   5 +
 internal/acp/server_test.go           |  47 +++
 internal/acp/service.go               |   3 +
 internal/agent/agent.go               |  13 +
 internal/agent/subagent_store.go      | 495 ++++++++++++++++++++++++++
 internal/agent/subagent_store_test.go | 236 ++++++++++++
 internal/agent/task.go                | 177 ++++++++-
 internal/agent/task_test.go           | 225 +++++++++++-
 internal/boot/boot.go                 | 107 +++++-
 internal/boot/boot_test.go            | 285 +++++++++++++++
 internal/boot/subagent_model_test.go  |  35 ++
 internal/cli/review.go                |   2 +-
 internal/control/controller.go        |   6 +
 internal/serve/serve.go               |   4 +
 internal/serve/serve_test.go          |  33 ++
 internal/skill/tools.go               |  27 +-
 internal/skill/tools_test.go          |  36 +-
 19 files changed, 1891 insertions(+), 49 deletions(-)
 create mode 100644 internal/agent/subagent_store.go
 create mode 100644 internal/agent/subagent_store_test.go

diff --git a/desktop/sessions.go b/desktop/sessions.go
index 777bbb40a..1b8b5d4ae 100644
--- a/desktop/sessions.go
+++ b/desktop/sessions.go
@@ -10,6 +10,7 @@ import (
 	"strings"
 	"time"
 
+	"reasonix/internal/agent"
 	"reasonix/internal/fileutil"
 )
 
@@ -126,6 +127,9 @@ func trashSessionArtifacts(dir, sessionPath, key string) error {
 	if err := movePathIfExists(strings.TrimSuffix(sessionPath, ".jsonl")+".ckpt", filepath.Join(itemDir, ckptName)); err != nil {
 		return err
 	}
+	if err := trashSubagentArtifacts(dir, sessionPath, itemDir); err != nil {
+		return err
+	}
 	meta := trashedSessionMeta{Key: key, DeletedAt: time.Now().UnixMilli()}
 	b, err := json.MarshalIndent(meta, "", "  ")
 	if err != nil {
@@ -193,6 +197,9 @@ func restoreTrashedSessionFile(dir, path string) error {
 	if err := os.MkdirAll(dir, 0o755); err != nil {
 		return err
 	}
+	if err := checkRestoreSubagentConflicts(dir, itemDir); err != nil {
+		return err
+	}
 	if err := movePathIfExists(trashPath, target); err != nil {
 		return err
 	}
@@ -203,6 +210,9 @@ func restoreTrashedSessionFile(dir, path string) error {
 	if err := movePathIfExists(filepath.Join(itemDir, ckptName), filepath.Join(dir, ckptName)); err != nil {
 		return err
 	}
+	if err := restoreSubagentArtifacts(dir, itemDir); err != nil {
+		return err
+	}
 	return os.RemoveAll(itemDir)
 }
 
@@ -242,6 +252,66 @@ func movePathIfExists(src, dst string) error {
 	return os.Rename(src, dst)
 }
 
+func trashSubagentArtifacts(dir, sessionPath, itemDir string) error {
+	artifacts, err := agent.ListSubagentsByParent(dir, agent.BranchID(sessionPath))
+	if err != nil {
+		return err
+	}
+	trashSubagentDir := filepath.Join(itemDir, "subagents")
+	for _, artifact := range artifacts {
+		if err := movePathIfExists(artifact.SessionPath, filepath.Join(trashSubagentDir, filepath.Base(artifact.SessionPath))); err != nil {
+			return err
+		}
+		if err := movePathIfExists(artifact.MetaPath, filepath.Join(trashSubagentDir, filepath.Base(artifact.MetaPath))); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func checkRestoreSubagentConflicts(dir, itemDir string) error {
+	trashSubagentDir := filepath.Join(itemDir, "subagents")
+	entries, err := os.ReadDir(trashSubagentDir)
+	if err != nil {
+		if os.IsNotExist(err) {
+			return nil
+		}
+		return err
+	}
+	for _, entry := range entries {
+		if entry.IsDir() {
+			continue
+		}
+		target := filepath.Join(dir, "subagents", entry.Name())
+		if _, err := os.Stat(target); err == nil {
+			return fmt.Errorf("subagent artifact already exists: %s", entry.Name())
+		} else if !os.IsNotExist(err) {
+			return err
+		}
+	}
+	return nil
+}
+
+func restoreSubagentArtifacts(dir, itemDir string) error {
+	trashSubagentDir := filepath.Join(itemDir, "subagents")
+	entries, err := os.ReadDir(trashSubagentDir)
+	if err != nil {
+		if os.IsNotExist(err) {
+			return nil
+		}
+		return err
+	}
+	for _, entry := range entries {
+		if entry.IsDir() {
+			continue
+		}
+		if err := movePathIfExists(filepath.Join(trashSubagentDir, entry.Name()), filepath.Join(dir, "subagents", entry.Name())); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
 func validateSessionPath(dir, sessionPath string) (string, string, error) {
 	if strings.TrimSpace(sessionPath) == "" {
 		return "", "", fmt.Errorf("empty session path")
diff --git a/desktop/sessions_test.go b/desktop/sessions_test.go
index 6e9d0035e..6d3b39035 100644
--- a/desktop/sessions_test.go
+++ b/desktop/sessions_test.go
@@ -5,6 +5,8 @@ import (
 	"os"
 	"path/filepath"
 	"testing"
+
+	"reasonix/internal/agent"
 )
 
 // --- loadSessionTitles ---
@@ -164,6 +166,40 @@ func TestDeleteSessionFile(t *testing.T) {
 	}
 }
 
+func TestDeleteSessionFileMovesOwnedSubagentsToTrash(t *testing.T) {
+	dir := t.TempDir()
+	sessionPath := filepath.Join(dir, "session.jsonl")
+	os.WriteFile(sessionPath, []byte("data"), 0o644)
+	writeSubagentArtifact(t, dir, "sa_20260102_030405_000000000_aabbccddeeff", agent.BranchID(sessionPath))
+	writeSubagentArtifact(t, dir, "sa_20260102_030405_000000000_112233445566", "other-parent")
+
+	if err := deleteSessionFile(dir, sessionPath); err != nil {
+		t.Fatalf("delete: %v", err)
+	}
+
+	ownedJSONL := filepath.Join(dir, "subagents", "sa_20260102_030405_000000000_aabbccddeeff.jsonl")
+	ownedMeta := filepath.Join(dir, "subagents", "sa_20260102_030405_000000000_aabbccddeeff.meta.json")
+	if _, err := os.Stat(ownedJSONL); !os.IsNotExist(err) {
+		t.Fatalf("owned subagent jsonl should be moved out of active dir, stat err = %v", err)
+	}
+	if _, err := os.Stat(ownedMeta); !os.IsNotExist(err) {
+		t.Fatalf("owned subagent meta should be moved out of active dir, stat err = %v", err)
+	}
+	trashSubagentDir := filepath.Join(dir, sessionTrashDir, "session.jsonl", "subagents")
+	if _, err := os.Stat(filepath.Join(trashSubagentDir, "sa_20260102_030405_000000000_aabbccddeeff.jsonl")); err != nil {
+		t.Fatalf("owned subagent jsonl should be in trash: %v", err)
+	}
+	if _, err := os.Stat(filepath.Join(trashSubagentDir, "sa_20260102_030405_000000000_aabbccddeeff.meta.json")); err != nil {
+		t.Fatalf("owned subagent meta should be in trash: %v", err)
+	}
+	if _, err := os.Stat(filepath.Join(dir, "subagents", "sa_20260102_030405_000000000_112233445566.jsonl")); err != nil {
+		t.Fatalf("unowned subagent jsonl should remain active: %v", err)
+	}
+	if _, err := os.Stat(filepath.Join(dir, "subagents", "sa_20260102_030405_000000000_112233445566.meta.json")); err != nil {
+		t.Fatalf("unowned subagent meta should remain active: %v", err)
+	}
+}
+
 func TestDeleteSessionFileNoTitle(t *testing.T) {
 	dir := t.TempDir()
 	sessionPath := filepath.Join(dir, "no-title.jsonl")
@@ -225,6 +261,61 @@ func TestRestoreTrashedSessionFile(t *testing.T) {
 	}
 }
 
+func TestRestoreTrashedSessionFileRestoresSubagents(t *testing.T) {
+	dir := t.TempDir()
+	sessionPath := filepath.Join(dir, "session.jsonl")
+	if err := os.WriteFile(sessionPath, []byte("data"), 0o644); err != nil {
+		t.Fatal(err)
+	}
+	ref := "sa_20260102_030405_000000000_aabbccddeeff"
+	writeSubagentArtifact(t, dir, ref, agent.BranchID(sessionPath))
+	if err := deleteSessionFile(dir, sessionPath); err != nil {
+		t.Fatalf("trash: %v", err)
+	}
+
+	trashPath := filepath.Join(dir, sessionTrashDir, "session.jsonl", "session.jsonl")
+	if err := restoreTrashedSessionFile(dir, trashPath); err != nil {
+		t.Fatalf("restore: %v", err)
+	}
+
+	if _, err := os.Stat(filepath.Join(dir, "subagents", ref+".jsonl")); err != nil {
+		t.Fatalf("subagent jsonl should be restored: %v", err)
+	}
+	if _, err := os.Stat(filepath.Join(dir, "subagents", ref+".meta.json")); err != nil {
+		t.Fatalf("subagent meta should be restored: %v", err)
+	}
+}
+
+func TestRestoreTrashedSessionFileRejectsSubagentConflict(t *testing.T) {
+	dir := t.TempDir()
+	sessionPath := filepath.Join(dir, "session.jsonl")
+	if err := os.WriteFile(sessionPath, []byte("data"), 0o644); err != nil {
+		t.Fatal(err)
+	}
+	ref := "sa_20260102_030405_000000000_aabbccddeeff"
+	writeSubagentArtifact(t, dir, ref, agent.BranchID(sessionPath))
+	if err := deleteSessionFile(dir, sessionPath); err != nil {
+		t.Fatalf("trash: %v", err)
+	}
+	if err := os.MkdirAll(filepath.Join(dir, "subagents"), 0o755); err != nil {
+		t.Fatal(err)
+	}
+	if err := os.WriteFile(filepath.Join(dir, "subagents", ref+".jsonl"), []byte("conflict"), 0o644); err != nil {
+		t.Fatal(err)
+	}
+
+	trashPath := filepath.Join(dir, sessionTrashDir, "session.jsonl", "session.jsonl")
+	if err := restoreTrashedSessionFile(dir, trashPath); err == nil {
+		t.Fatal("restore should fail on subagent conflict")
+	}
+	if _, err := os.Stat(trashPath); err != nil {
+		t.Fatalf("trash item should remain after failed restore: %v", err)
+	}
+	if _, err := os.Stat(sessionPath); !os.IsNotExist(err) {
+		t.Fatalf("parent session should not be restored after conflict, stat err = %v", err)
+	}
+}
+
 func TestPurgeTrashedSessionFile(t *testing.T) {
 	dir := t.TempDir()
 	sessionPath := filepath.Join(dir, "session.jsonl")
@@ -253,6 +344,24 @@ func TestPurgeTrashedSessionFile(t *testing.T) {
 	}
 }
 
+func TestPurgeTrashedSessionFileRemovesSubagents(t *testing.T) {
+	dir := t.TempDir()
+	sessionPath := filepath.Join(dir, "session.jsonl")
+	os.WriteFile(sessionPath, []byte("data"), 0o644)
+	ref := "sa_20260102_030405_000000000_aabbccddeeff"
+	writeSubagentArtifact(t, dir, ref, agent.BranchID(sessionPath))
+	if err := deleteSessionFile(dir, sessionPath); err != nil {
+		t.Fatalf("trash: %v", err)
+	}
+	trashPath := filepath.Join(dir, sessionTrashDir, "session.jsonl", "session.jsonl")
+	if err := purgeTrashedSessionFile(dir, trashPath); err != nil {
+		t.Fatalf("purge: %v", err)
+	}
+	if _, err := os.Stat(filepath.Join(dir, sessionTrashDir, "session.jsonl", "subagents", ref+".jsonl")); !os.IsNotExist(err) {
+		t.Fatalf("trashed subagent should be removed by purge, stat err = %v", err)
+	}
+}
+
 func TestListTrashedSessionFilesRejectsSymlinkEscape(t *testing.T) {
 	dir := t.TempDir()
 	outside := filepath.Join(t.TempDir(), "outside.jsonl")
@@ -325,6 +434,31 @@ func TestDeleteSessionFileRejectsSymlinkEscape(t *testing.T) {
 	}
 }
 
+func writeSubagentArtifact(t *testing.T, dir, ref, parentSession string) {
+	t.Helper()
+	subagentDir := filepath.Join(dir, "subagents")
+	if err := os.MkdirAll(subagentDir, 0o755); err != nil {
+		t.Fatal(err)
+	}
+	if err := os.WriteFile(filepath.Join(subagentDir, ref+".jsonl"), []byte(`{"role":"user","content":"sub"}`+"\n"), 0o644); err != nil {
+		t.Fatal(err)
+	}
+	meta := agent.SubagentMeta{
+		Ref:           ref,
+		Status:        agent.SubagentCompleted,
+		Kind:          "task",
+		Name:          "task",
+		ParentSession: parentSession,
+	}
+	data, err := json.Marshal(meta)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if err := os.WriteFile(filepath.Join(subagentDir, ref+".meta.json"), data, 0o644); err != nil {
+		t.Fatal(err)
+	}
+}
+
 // --- sessionTitlesPath ---
 
 func TestSessionTitlesPath(t *testing.T) {
diff --git a/desktop/tabs_topic_test.go b/desktop/tabs_topic_test.go
index 6e10cccaf..bd555164c 100644
--- a/desktop/tabs_topic_test.go
+++ b/desktop/tabs_topic_test.go
@@ -907,6 +907,8 @@ func TestTrashTopicMovesRelatedSessionsToTrash(t *testing.T) {
 		t.Fatalf("mkdir sessions: %v", err)
 	}
 	sessionPath := writeTopicSession(t, dir, "trash-me.jsonl", topicID, "Trash history", projectRoot)
+	ref := "sa_20260102_030405_000000000_aabbccddeeff"
+	writeSubagentArtifact(t, dir, ref, agent.BranchID(sessionPath))
 
 	if err := NewApp().TrashTopic(topicID); err != nil {
 		t.Fatalf("trash topic: %v", err)
@@ -918,6 +920,9 @@ func TestTrashTopicMovesRelatedSessionsToTrash(t *testing.T) {
 	if _, err := os.Stat(trashPath); err != nil {
 		t.Fatalf("topic session should be moved to trash: %v", err)
 	}
+	if _, err := os.Stat(filepath.Join(dir, sessionTrashDir, "trash-me.jsonl", "subagents", ref+".jsonl")); err != nil {
+		t.Fatalf("topic subagent should be moved to trash: %v", err)
+	}
 	if got := loadTopicTitle(projectRoot, topicID); got != "" {
 		t.Fatalf("topic title should be removed, got %q", got)
 	}
diff --git a/internal/acp/server_test.go b/internal/acp/server_test.go
index 001423ecd..9e79b568e 100644
--- a/internal/acp/server_test.go
+++ b/internal/acp/server_test.go
@@ -4,11 +4,14 @@ import (
 	"context"
 	"encoding/json"
 	"io"
+	"os"
+	"path/filepath"
 	"strings"
 	"sync"
 	"testing"
 	"time"
 
+	"reasonix/internal/agent"
 	"reasonix/internal/control"
 	"reasonix/internal/event"
 )
@@ -376,6 +379,50 @@ func TestServeRejectsPathLikeSessionID(t *testing.T) {
 	}
 }
 
+func TestDeleteSessionFilesDeletesOwnedSubagents(t *testing.T) {
+	dir := t.TempDir()
+	sessionPath := filepath.Join(dir, "session.jsonl")
+	if err := os.WriteFile(sessionPath, []byte(`{"role":"user","content":"hi"}`+"\n"), 0o644); err != nil {
+		t.Fatal(err)
+	}
+	ref := "sa_20260102_030405_000000000_aabbccddeeff"
+	writeACPSubagentArtifact(t, dir, ref, agent.BranchID(sessionPath))
+
+	if err := deleteSessionFiles(sessionPath); err != nil {
+		t.Fatalf("deleteSessionFiles: %v", err)
+	}
+	if _, err := os.Stat(filepath.Join(dir, "subagents", ref+".jsonl")); !os.IsNotExist(err) {
+		t.Fatalf("subagent jsonl should be deleted, stat err = %v", err)
+	}
+	if _, err := os.Stat(filepath.Join(dir, "subagents", ref+".meta.json")); !os.IsNotExist(err) {
+		t.Fatalf("subagent meta should be deleted, stat err = %v", err)
+	}
+}
+
+func writeACPSubagentArtifact(t *testing.T, dir, ref, parentSession string) {
+	t.Helper()
+	subagentDir := filepath.Join(dir, "subagents")
+	if err := os.MkdirAll(subagentDir, 0o755); err != nil {
+		t.Fatal(err)
+	}
+	if err := os.WriteFile(filepath.Join(subagentDir, ref+".jsonl"), []byte(`{"role":"user","content":"sub"}`+"\n"), 0o644); err != nil {
+		t.Fatal(err)
+	}
+	data, err := json.Marshal(agent.SubagentMeta{
+		Ref:           ref,
+		Status:        agent.SubagentCompleted,
+		Kind:          "task",
+		Name:          "task",
+		ParentSession: parentSession,
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+	if err := os.WriteFile(filepath.Join(subagentDir, ref+".meta.json"), data, 0o644); err != nil {
+		t.Fatal(err)
+	}
+}
+
 func TestServeUnknownMethod(t *testing.T) {
 	factory := &fakeFactory{behavior: func(context.Context, event.Sink, string) error { return nil }}
 	client, stop := startServer(t, factory)
diff --git a/internal/acp/service.go b/internal/acp/service.go
index 659932dfb..ea1eb4ebd 100644
--- a/internal/acp/service.go
+++ b/internal/acp/service.go
@@ -917,6 +917,9 @@ func deleteSessionFiles(sessionPath string) error {
 			return err
 		}
 	}
+	if err := agent.DeleteSubagentsByParent(filepath.Dir(sessionPath), agent.BranchID(sessionPath)); err != nil {
+		return err
+	}
 	return nil
 }
 
diff --git a/internal/agent/agent.go b/internal/agent/agent.go
index 063a0fa70..269bfc5e5 100644
--- a/internal/agent/agent.go
+++ b/internal/agent/agent.go
@@ -53,6 +53,7 @@ type Asker interface {
 
 // callContextKey carries the executing tool call's identity into Execute.
 type callContextKey struct{}
+type parentSessionContextKey struct{}
 
 // callContext is the per-call context a tool can read. parentID is the call being
 // executed and sink is the agent's event sink (the `task` tool uses both to nest
@@ -81,6 +82,18 @@ func CallContext(ctx context.Context) (parentID string, sink event.Sink, asker A
 	return cc.parentID, cc.sink, cc.asker, true
 }
 
+// WithParentSession stamps the active parent session ID onto a turn context so
+// persisted sub-agents can record and enforce their owning conversation.
+func WithParentSession(ctx context.Context, parentSession string) context.Context {
+	return context.WithValue(ctx, parentSessionContextKey{}, strings.TrimSpace(parentSession))
+}
+
+// ParentSession returns the active parent session ID carried by a turn context.
+func ParentSession(ctx context.Context) string {
+	parentSession, _ := ctx.Value(parentSessionContextKey{}).(string)
+	return strings.TrimSpace(parentSession)
+}
+
 // Gate decides, per tool call, whether it may run. The agent consults it at
 // execute time (after the plan-mode gate). It is interface-shaped so the agent
 // stays independent of the permission package and of how "ask" is resolved
diff --git a/internal/agent/subagent_store.go b/internal/agent/subagent_store.go
new file mode 100644
index 000000000..d61f8194e
--- /dev/null
+++ b/internal/agent/subagent_store.go
@@ -0,0 +1,495 @@
+package agent
+
+import (
+	"crypto/rand"
+	"crypto/sha256"
+	"encoding/hex"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"os"
+	"path/filepath"
+	"sort"
+	"strings"
+	"sync"
+	"time"
+
+	"reasonix/internal/fileutil"
+	"reasonix/internal/tool"
+)
+
+type SubagentStatus string
+
+const (
+	SubagentRunning   SubagentStatus = "running"
+	SubagentCompleted SubagentStatus = "completed"
+	SubagentFailed    SubagentStatus = "failed"
+)
+
+// SubagentMeta is the sidecar for a persisted sub-agent transcript. It captures
+// the execution identity that must stay stable for continuation/fork.
+type SubagentMeta struct {
+	Ref              string         `json:"ref"`
+	CreatedAt        time.Time      `json:"createdAt"`
+	UpdatedAt        time.Time      `json:"updatedAt"`
+	Status           SubagentStatus `json:"status"`
+	Kind             string         `json:"kind"` // task | skill
+	Name             string         `json:"name"`
+	WorkspaceRoot    string         `json:"workspaceRoot"`
+	ParentSession    string         `json:"parentSession,omitempty"`
+	ParentToolCallID string         `json:"parentToolCallId,omitempty"`
+	SystemPromptHash string         `json:"systemPromptHash"`
+	ToolScope        []string       `json:"toolScope"`
+	ToolSchemaHash   string         `json:"toolSchemaHash"`
+	Model            string         `json:"model"`
+	Effort           string         `json:"effort"`
+}
+
+// SubagentSpec describes the current invocation identity.
+type SubagentSpec struct {
+	Kind             string
+	Name             string
+	WorkspaceRoot    string
+	ParentSession    string
+	ParentToolCallID string
+	SystemPrompt     string
+	Registry         *tool.Registry
+	Model            string
+	Effort           string
+}
+
+// SubagentRun is a prepared transcript run. Call Release exactly once.
+type SubagentRun struct {
+	Ref     string
+	Session *Session
+	Meta    SubagentMeta
+
+	store   *SubagentStore
+	release func()
+}
+
+// SubagentArtifact is a persisted sub-agent transcript and metadata pair owned
+// by a parent session. One file may be missing after a crash; lifecycle cleanup
+// should operate on the paths that exist.
+type SubagentArtifact struct {
+	Ref         string
+	SessionPath string
+	MetaPath    string
+	Meta        SubagentMeta
+}
+
+func (r *SubagentRun) Release() {
+	if r != nil && r.release != nil {
+		r.release()
+		r.release = nil
+	}
+}
+
+// EphemeralSubagentRun is a non-persisted run for callers without an owning
+// parent session — e.g. headless `reasonix run`, which never mints a session
+// path. Its empty Ref makes the store's MarkRunning/SaveCompleted/SaveFailed
+// methods no-op and keeps FormatSubagentResult from emitting a transcript
+// reference, so the sub-agent behaves exactly as it did before persisted
+// transcripts existed. It holds no lock, so Release is a no-op.
+func EphemeralSubagentRun(systemPrompt string) *SubagentRun {
+	return &SubagentRun{Session: NewSession(systemPrompt)}
+}
+
+// SubagentStore persists sub-agent transcripts under config.SessionDir()/subagents.
+// Its locks are process-local; cross-process mutation is intentionally out of v1.
+type SubagentStore struct {
+	dir string
+
+	mu     sync.Mutex
+	locked map[string]bool
+}
+
+func NewSubagentStore(dir string) *SubagentStore {
+	if strings.TrimSpace(dir) == "" {
+		return nil
+	}
+	return &SubagentStore{dir: dir, locked: map[string]bool{}}
+}
+
+// ListSubagentsByParent returns persisted sub-agent artifacts whose metadata
+// declares the given parent session owner.
+func ListSubagentsByParent(sessionDir, parentSession string) ([]SubagentArtifact, error) {
+	parentSession = strings.TrimSpace(parentSession)
+	if strings.TrimSpace(sessionDir) == "" || parentSession == "" {
+		return nil, nil
+	}
+	dir := filepath.Join(sessionDir, "subagents")
+	entries, err := os.ReadDir(dir)
+	if err != nil {
+		if os.IsNotExist(err) {
+			return nil, nil
+		}
+		return nil, err
+	}
+	out := []SubagentArtifact{}
+	for _, entry := range entries {
+		if entry.IsDir() || !strings.HasSuffix(entry.Name(), ".meta.json") {
+			continue
+		}
+		ref := strings.TrimSuffix(entry.Name(), ".meta.json")
+		if !validSubagentRef(ref) {
+			continue
+		}
+		metaPath := filepath.Join(dir, entry.Name())
+		data, err := os.ReadFile(metaPath)
+		if err != nil {
+			return nil, err
+		}
+		var meta SubagentMeta
+		if err := json.Unmarshal(data, &meta); err != nil {
+			continue
+		}
+		if strings.TrimSpace(meta.ParentSession) != parentSession {
+			continue
+		}
+		out = append(out, SubagentArtifact{
+			Ref:         ref,
+			SessionPath: filepath.Join(dir, ref+".jsonl"),
+			MetaPath:    metaPath,
+			Meta:        meta,
+		})
+	}
+	return out, nil
+}
+
+// DeleteSubagentsByParent permanently removes sub-agent artifacts owned by a
+// parent session. Missing counterpart files are ignored.
+func DeleteSubagentsByParent(sessionDir, parentSession string) error {
+	artifacts, err := ListSubagentsByParent(sessionDir, parentSession)
+	if err != nil {
+		return err
+	}
+	for _, artifact := range artifacts {
+		for _, path := range []string{artifact.SessionPath, artifact.MetaPath} {
+			if err := os.Remove(path); err != nil && !os.IsNotExist(err) {
+				return err
+			}
+		}
+	}
+	return nil
+}
+
+func (s *SubagentStore) PrepareFresh(spec SubagentSpec) (*SubagentRun, error) {
+	if s == nil {
+		return nil, fmt.Errorf("subagent transcript store is required")
+	}
+	if err := requireParentSession(spec); err != nil {
+		return nil, err
+	}
+	ref, err := s.newRef()
+	if err != nil {
+		return nil, err
+	}
+	release, err := s.lock(ref)
+	if err != nil {
+		return nil, err
+	}
+	now := time.Now().UTC()
+	meta := metaFromSpec(ref, SubagentRunning, now, now, spec)
+	return &SubagentRun{Ref: ref, Session: NewSession(spec.SystemPrompt), Meta: meta, store: s, release: release}, nil
+}
+
+func (s *SubagentStore) PrepareContinue(ref string, spec SubagentSpec) (*SubagentRun, error) {
+	if s == nil {
+		return nil, fmt.Errorf("subagent continuation is not available in this session")
+	}
+	if err := requireParentSession(spec); err != nil {
+		return nil, err
+	}
+	ref = strings.TrimSpace(ref)
+	if ref == "" {
+		return nil, fmt.Errorf("continue_from requires a subagent reference")
+	}
+	release, err := s.lock(ref)
+	if err != nil {
+		return nil, err
+	}
+	meta, err := s.LoadMeta(ref)
+	if err != nil {
+		release()
+		return nil, err
+	}
+	if err := validateContinueOwner(meta, spec); err != nil {
+		release()
+		return nil, err
+	}
+	if err := validateMeta(meta, spec); err != nil {
+		release()
+		return nil, err
+	}
+	sess, err := LoadSession(s.sessionPath(ref))
+	if err != nil {
+		release()
+		return nil, fmt.Errorf("load subagent transcript %q: %w", ref, err)
+	}
+	meta.ParentSession = spec.ParentSession
+	meta.ParentToolCallID = spec.ParentToolCallID
+	return &SubagentRun{Ref: ref, Session: sess, Meta: meta, store: s, release: release}, nil
+}
+
+func (s *SubagentStore) PrepareFork(ref string, spec SubagentSpec) (*SubagentRun, error) {
+	if s == nil {
+		return nil, fmt.Errorf("subagent continuation is not available in this session")
+	}
+	if err := requireParentSession(spec); err != nil {
+		return nil, err
+	}
+	sourceRef := strings.TrimSpace(ref)
+	if sourceRef == "" {
+		return nil, fmt.Errorf("fork_from requires a subagent reference")
+	}
+	sourceRelease, err := s.lock(sourceRef)
+	if err != nil {
+		return nil, err
+	}
+	meta, err := s.LoadMeta(sourceRef)
+	if err != nil {
+		sourceRelease()
+		return nil, err
+	}
+	if strings.TrimSpace(meta.ParentSession) == "" {
+		sourceRelease()
+		return nil, fmt.Errorf("subagent reference %q has no parent session; run a fresh subagent instead", sourceRef)
+	}
+	if err := validateMeta(meta, spec); err != nil {
+		sourceRelease()
+		return nil, err
+	}
+	sess, err := LoadSession(s.sessionPath(sourceRef))
+	if err != nil {
+		sourceRelease()
+		return nil, fmt.Errorf("load subagent transcript %q: %w", sourceRef, err)
+	}
+	sourceRelease()
+	newRef, err := s.newRef()
+	if err != nil {
+		return nil, err
+	}
+	newRelease, err := s.lock(newRef)
+	if err != nil {
+		return nil, err
+	}
+	now := time.Now().UTC()
+	newMeta := metaFromSpec(newRef, SubagentRunning, now, now, spec)
+	return &SubagentRun{Ref: newRef, Session: sess, Meta: newMeta, store: s, release: newRelease}, nil
+}
+
+func (s *SubagentStore) MarkRunning(run *SubagentRun) error {
+	if s == nil || run == nil || run.Ref == "" {
+		return nil
+	}
+	meta := run.Meta
+	meta.Status = SubagentRunning
+	meta.UpdatedAt = time.Now().UTC()
+	return s.saveMeta(meta)
+}
+
+func (s *SubagentStore) SaveCompleted(run *SubagentRun) error {
+	if s == nil || run == nil || run.Ref == "" {
+		return nil
+	}
+	if err := run.Session.Save(s.sessionPath(run.Ref)); err != nil {
+		return err
+	}
+	meta := run.Meta
+	meta.Status = SubagentCompleted
+	meta.UpdatedAt = time.Now().UTC()
+	run.Meta = meta
+	return s.saveMeta(meta)
+}
+
+func (s *SubagentStore) SaveFailed(run *SubagentRun) error {
+	if s == nil || run == nil || run.Ref == "" {
+		return nil
+	}
+	var sessionErr error
+	if run.Session != nil {
+		sessionErr = run.Session.Save(s.sessionPath(run.Ref))
+	}
+	meta := run.Meta
+	meta.Status = SubagentFailed
+	meta.UpdatedAt = time.Now().UTC()
+	run.Meta = meta
+	return errors.Join(sessionErr, s.saveMeta(meta))
+}
+
+func (s *SubagentStore) LoadMeta(ref string) (SubagentMeta, error) {
+	var meta SubagentMeta
+	if !validSubagentRef(ref) {
+		return meta, fmt.Errorf("invalid subagent reference %q", ref)
+	}
+	data, err := os.ReadFile(s.metaPath(ref))
+	if err != nil {
+		return meta, fmt.Errorf("load subagent metadata %q: %w", ref, err)
+	}
+	if err := json.Unmarshal(data, &meta); err != nil {
+		return meta, fmt.Errorf("decode subagent metadata %q: %w", ref, err)
+	}
+	return meta, nil
+}
+
+func metaFromSpec(ref string, status SubagentStatus, created, updated time.Time, spec SubagentSpec) SubagentMeta {
+	scope, schemaHash := toolIdentity(spec.Registry)
+	return SubagentMeta{
+		Ref:              ref,
+		CreatedAt:        created,
+		UpdatedAt:        updated,
+		Status:           status,
+		Kind:             strings.TrimSpace(spec.Kind),
+		Name:             strings.TrimSpace(spec.Name),
+		WorkspaceRoot:    strings.TrimSpace(spec.WorkspaceRoot),
+		ParentSession:    strings.TrimSpace(spec.ParentSession),
+		ParentToolCallID: strings.TrimSpace(spec.ParentToolCallID),
+		SystemPromptHash: bytesHash([]byte(spec.SystemPrompt)),
+		ToolScope:        scope,
+		ToolSchemaHash:   schemaHash,
+		Model:            strings.TrimSpace(spec.Model),
+		Effort:           strings.TrimSpace(spec.Effort),
+	}
+}
+
+func validateMeta(meta SubagentMeta, spec SubagentSpec) error {
+	if meta.Status == SubagentRunning {
+		return fmt.Errorf("subagent reference %q is still in progress", meta.Ref)
+	}
+	if meta.Status == SubagentFailed {
+		return fmt.Errorf("subagent reference %q failed and cannot be continued", meta.Ref)
+	}
+	want := metaFromSpec(meta.Ref, meta.Status, meta.CreatedAt, meta.UpdatedAt, spec)
+	switch {
+	case meta.Kind != want.Kind:
+		return fmt.Errorf("subagent reference %q has kind %q, want %q", meta.Ref, meta.Kind, want.Kind)
+	case meta.Name != want.Name:
+		return fmt.Errorf("subagent reference %q has name %q, want %q", meta.Ref, meta.Name, want.Name)
+	case meta.WorkspaceRoot != want.WorkspaceRoot:
+		return fmt.Errorf("subagent reference %q belongs to workspace %q, current workspace is %q", meta.Ref, meta.WorkspaceRoot, want.WorkspaceRoot)
+	case meta.SystemPromptHash != want.SystemPromptHash:
+		return fmt.Errorf("subagent reference %q uses a different subagent persona; run a fresh subagent to use the current persona", meta.Ref)
+	case !sameStrings(meta.ToolScope, want.ToolScope):
+		return fmt.Errorf("subagent reference %q uses a different tool scope", meta.Ref)
+	case meta.ToolSchemaHash != want.ToolSchemaHash:
+		return fmt.Errorf("subagent reference %q uses different tool schemas", meta.Ref)
+	case meta.Model != want.Model || meta.Effort != want.Effort:
+		return fmt.Errorf("subagent reference %q uses model/effort %q/%q, current run would use %q/%q", meta.Ref, meta.Model, meta.Effort, want.Model, want.Effort)
+	}
+	return nil
+}
+
+func requireParentSession(spec SubagentSpec) error {
+	if strings.TrimSpace(spec.ParentSession) == "" {
+		return fmt.Errorf("subagent transcript parent session is required")
+	}
+	return nil
+}
+
+func validateContinueOwner(meta SubagentMeta, spec SubagentSpec) error {
+	current := strings.TrimSpace(spec.ParentSession)
+	owner := strings.TrimSpace(meta.ParentSession)
+	if owner == current {
+		return nil
+	}
+	if owner == "" {
+		return fmt.Errorf("subagent reference %q has no parent session; run a fresh subagent instead", meta.Ref)
+	}
+	return fmt.Errorf("subagent reference %q belongs to parent session %q, current parent session is %q; use fork_from to copy it into this session", meta.Ref, owner, current)
+}
+
+func (s *SubagentStore) lock(ref string) (func(), error) {
+	if !validSubagentRef(ref) {
+		return nil, fmt.Errorf("invalid subagent reference %q", ref)
+	}
+	s.mu.Lock()
+	defer s.mu.Unlock()
+	if s.locked[ref] {
+		return nil, fmt.Errorf("subagent reference %q is already running; retry after it finishes", ref)
+	}
+	s.locked[ref] = true
+	return func() {
+		s.mu.Lock()
+		delete(s.locked, ref)
+		s.mu.Unlock()
+	}, nil
+}
+
+func (s *SubagentStore) newRef() (string, error) {
+	var b [6]byte
+	if _, err := rand.Read(b[:]); err != nil {
+		return "", err
+	}
+	return "sa_" + time.Now().UTC().Format("20060102_150405_000000000") + "_" + hex.EncodeToString(b[:]), nil
+}
+
+func (s *SubagentStore) sessionPath(ref string) string { return filepath.Join(s.dir, ref+".jsonl") }
+func (s *SubagentStore) metaPath(ref string) string    { return filepath.Join(s.dir, ref+".meta.json") }
+
+func (s *SubagentStore) saveMeta(meta SubagentMeta) error {
+	if err := os.MkdirAll(s.dir, 0o755); err != nil {
+		return err
+	}
+	data, err := json.MarshalIndent(meta, "", "  ")
+	if err != nil {
+		return err
+	}
+	data = append(data, '\n')
+	tmp, err := os.CreateTemp(s.dir, ".subagent-meta.*.tmp")
+	if err != nil {
+		return err
+	}
+	tmpPath := tmp.Name()
+	if _, err := tmp.Write(data); err != nil {
+		tmp.Close()
+		os.Remove(tmpPath)
+		return err
+	}
+	if err := tmp.Close(); err != nil {
+		os.Remove(tmpPath)
+		return err
+	}
+	return fileutil.ReplaceFile(tmpPath, s.metaPath(meta.Ref))
+}
+
+func validSubagentRef(ref string) bool {
+	if !strings.HasPrefix(ref, "sa_") {
+		return false
+	}
+	for _, r := range ref {
+		if (r >= 'a' && r <= 'z') || (r >= 'A' && r <= 'Z') || (r >= '0' && r <= '9') || r == '_' || r == '-' {
+			continue
+		}
+		return false
+	}
+	return true
+}
+
+func toolIdentity(reg *tool.Registry) ([]string, string) {
+	if reg == nil {
+		return nil, bytesHash(nil)
+	}
+	names := reg.Names()
+	sort.Strings(names)
+	schemas := normalizeToolSchemas(reg.Schemas())
+	data, _ := json.Marshal(schemas)
+	return names, bytesHash(data)
+}
+
+func bytesHash(data []byte) string {
+	h := sha256.Sum256(data)
+	return hex.EncodeToString(h[:])
+}
+
+func sameStrings(a, b []string) bool {
+	if len(a) != len(b) {
+		return false
+	}
+	for i := range a {
+		if a[i] != b[i] {
+			return false
+		}
+	}
+	return true
+}
diff --git a/internal/agent/subagent_store_test.go b/internal/agent/subagent_store_test.go
new file mode 100644
index 000000000..2b0d97760
--- /dev/null
+++ b/internal/agent/subagent_store_test.go
@@ -0,0 +1,236 @@
+package agent
+
+import (
+	"strings"
+	"testing"
+
+	"reasonix/internal/provider"
+	"reasonix/internal/tool"
+)
+
+func TestSubagentStoreContinueLoadsSavedTranscript(t *testing.T) {
+	store := NewSubagentStore(t.TempDir())
+	spec := testSubagentSpec(t, "review")
+	run, err := store.PrepareFresh(spec)
+	if err != nil {
+		t.Fatalf("PrepareFresh: %v", err)
+	}
+	run.Session.Add(provider.Message{Role: provider.RoleUser, Content: "review diff"})
+	run.Session.Add(provider.Message{Role: provider.RoleAssistant, Content: "finding A"})
+	if err := store.SaveCompleted(run); err != nil {
+		t.Fatalf("SaveCompleted: %v", err)
+	}
+	run.Release()
+
+	continued, err := store.PrepareContinue(run.Ref, spec)
+	if err != nil {
+		t.Fatalf("PrepareContinue: %v", err)
+	}
+	defer continued.Release()
+	if continued.Ref != run.Ref {
+		t.Fatalf("continued ref = %q, want %q", continued.Ref, run.Ref)
+	}
+	if got := continued.Session.Snapshot(); len(got) != 3 || got[2].Content != "finding A" {
+		t.Fatalf("continued transcript = %+v, want saved messages", got)
+	}
+}
+
+func TestSubagentStoreForkCreatesIndependentReference(t *testing.T) {
+	store := NewSubagentStore(t.TempDir())
+	spec := testSubagentSpec(t, "review")
+	run, err := store.PrepareFresh(spec)
+	if err != nil {
+		t.Fatalf("PrepareFresh: %v", err)
+	}
+	run.Session.Add(provider.Message{Role: provider.RoleUser, Content: "review diff"})
+	if err := store.SaveCompleted(run); err != nil {
+		t.Fatalf("SaveCompleted: %v", err)
+	}
+	run.Release()
+
+	forked, err := store.PrepareFork(run.Ref, spec)
+	if err != nil {
+		t.Fatalf("PrepareFork: %v", err)
+	}
+	defer forked.Release()
+	if forked.Ref == run.Ref {
+		t.Fatalf("fork ref should be new, got %q", forked.Ref)
+	}
+	if got := forked.Session.Snapshot(); len(got) != 2 || got[1].Content != "review diff" {
+		t.Fatalf("fork transcript = %+v, want copied messages", got)
+	}
+	if forked.Meta.ParentSession != spec.ParentSession {
+		t.Fatalf("fork parent session = %q, want %q", forked.Meta.ParentSession, spec.ParentSession)
+	}
+}
+
+func TestSubagentStoreRejectsContinueFromDifferentParentSession(t *testing.T) {
+	store := NewSubagentStore(t.TempDir())
+	spec := testSubagentSpec(t, "review")
+	run, err := store.PrepareFresh(spec)
+	if err != nil {
+		t.Fatalf("PrepareFresh: %v", err)
+	}
+	if err := store.SaveCompleted(run); err != nil {
+		t.Fatalf("SaveCompleted: %v", err)
+	}
+	run.Release()
+
+	other := spec
+	other.ParentSession = "other-parent"
+	if _, err := store.PrepareContinue(run.Ref, other); err == nil || !strings.Contains(err.Error(), "use fork_from") {
+		t.Fatalf("PrepareContinue error = %v, want parent ownership failure", err)
+	}
+}
+
+func TestSubagentStoreForkFromDifferentParentSessionCreatesCurrentOwner(t *testing.T) {
+	store := NewSubagentStore(t.TempDir())
+	spec := testSubagentSpec(t, "review")
+	run, err := store.PrepareFresh(spec)
+	if err != nil {
+		t.Fatalf("PrepareFresh: %v", err)
+	}
+	run.Session.Add(provider.Message{Role: provider.RoleUser, Content: "review diff"})
+	if err := store.SaveCompleted(run); err != nil {
+		t.Fatalf("SaveCompleted: %v", err)
+	}
+	run.Release()
+
+	other := spec
+	other.ParentSession = "other-parent"
+	forked, err := store.PrepareFork(run.Ref, other)
+	if err != nil {
+		t.Fatalf("PrepareFork: %v", err)
+	}
+	defer forked.Release()
+	if forked.Ref == run.Ref {
+		t.Fatalf("fork ref should be new, got %q", forked.Ref)
+	}
+	if forked.Meta.ParentSession != "other-parent" {
+		t.Fatalf("fork parent session = %q, want other-parent", forked.Meta.ParentSession)
+	}
+	sourceMeta, err := store.LoadMeta(run.Ref)
+	if err != nil {
+		t.Fatalf("LoadMeta source: %v", err)
+	}
+	if sourceMeta.ParentSession != spec.ParentSession {
+		t.Fatalf("source parent session = %q, want %q", sourceMeta.ParentSession, spec.ParentSession)
+	}
+}
+
+func TestSubagentStoreForkReleasesSourceLockAfterCopy(t *testing.T) {
+	store := NewSubagentStore(t.TempDir())
+	spec := testSubagentSpec(t, "review")
+	run, err := store.PrepareFresh(spec)
+	if err != nil {
+		t.Fatalf("PrepareFresh: %v", err)
+	}
+	run.Session.Add(provider.Message{Role: provider.RoleUser, Content: "review diff"})
+	if err := store.SaveCompleted(run); err != nil {
+		t.Fatalf("SaveCompleted: %v", err)
+	}
+	run.Release()
+
+	forked, err := store.PrepareFork(run.Ref, spec)
+	if err != nil {
+		t.Fatalf("PrepareFork: %v", err)
+	}
+	defer forked.Release()
+	continued, err := store.PrepareContinue(run.Ref, spec)
+	if err != nil {
+		t.Fatalf("source should not stay locked by fork run: %v", err)
+	}
+	continued.Release()
+}
+
+func TestSubagentStoreRejectsIncompatibleTranscript(t *testing.T) {
+	store := NewSubagentStore(t.TempDir())
+	spec := testSubagentSpec(t, "review")
+	run, err := store.PrepareFresh(spec)
+	if err != nil {
+		t.Fatalf("PrepareFresh: %v", err)
+	}
+	if err := store.SaveCompleted(run); err != nil {
+		t.Fatalf("SaveCompleted: %v", err)
+	}
+	run.Release()
+
+	other := spec
+	other.Name = "security-review"
+	if _, err := store.PrepareContinue(run.Ref, other); err == nil || !strings.Contains(err.Error(), "name") {
+		t.Fatalf("PrepareContinue error = %v, want incompatible name", err)
+	}
+}
+
+func TestSubagentStoreRejectsConcurrentContinue(t *testing.T) {
+	store := NewSubagentStore(t.TempDir())
+	spec := testSubagentSpec(t, "review")
+	run, err := store.PrepareFresh(spec)
+	if err != nil {
+		t.Fatalf("PrepareFresh: %v", err)
+	}
+	if err := store.SaveCompleted(run); err != nil {
+		t.Fatalf("SaveCompleted: %v", err)
+	}
+	run.Release()
+
+	first, err := store.PrepareContinue(run.Ref, spec)
+	if err != nil {
+		t.Fatalf("first PrepareContinue: %v", err)
+	}
+	defer first.Release()
+	if _, err := store.PrepareContinue(run.Ref, spec); err == nil || !strings.Contains(err.Error(), "already running") {
+		t.Fatalf("second PrepareContinue error = %v, want lock error", err)
+	}
+}
+
+func TestSubagentStoreSaveFailedPersistsTranscriptAndRejectsReuse(t *testing.T) {
+	store := NewSubagentStore(t.TempDir())
+	spec := testSubagentSpec(t, "review")
+	run, err := store.PrepareFresh(spec)
+	if err != nil {
+		t.Fatalf("PrepareFresh: %v", err)
+	}
+	run.Session.Add(provider.Message{Role: provider.RoleUser, Content: "failed continuation"})
+	if err := store.SaveFailed(run); err != nil {
+		t.Fatalf("SaveFailed: %v", err)
+	}
+	run.Release()
+
+	loaded, err := LoadSession(store.sessionPath(run.Ref))
+	if err != nil {
+		t.Fatalf("LoadSession: %v", err)
+	}
+	if got := loaded.Snapshot(); len(got) != 2 || got[1].Content != "failed continuation" {
+		t.Fatalf("failed transcript = %+v, want persisted failed prompt", got)
+	}
+	meta, err := store.LoadMeta(run.Ref)
+	if err != nil {
+		t.Fatalf("LoadMeta: %v", err)
+	}
+	if meta.Status != SubagentFailed {
+		t.Fatalf("status = %q, want failed", meta.Status)
+	}
+	if _, err := store.PrepareContinue(run.Ref, spec); err == nil || !strings.Contains(err.Error(), "failed and cannot be continued") {
+		t.Fatalf("PrepareContinue error = %v, want failed ref rejection", err)
+	}
+	if _, err := store.PrepareFork(run.Ref, spec); err == nil || !strings.Contains(err.Error(), "failed and cannot be continued") {
+		t.Fatalf("PrepareFork error = %v, want failed ref rejection", err)
+	}
+}
+
+func testSubagentSpec(t *testing.T, name string) SubagentSpec {
+	t.Helper()
+	reg := tool.NewRegistry()
+	reg.Add(fakeTool{name: "read_file", readOnly: true})
+	return SubagentSpec{
+		Kind:          "skill",
+		Name:          name,
+		WorkspaceRoot: t.TempDir(),
+		ParentSession: "parent-session",
+		SystemPrompt:  "review persona",
+		Registry:      reg,
+		Model:         "deepseek",
+		Effort:        "max",
+	}
+}
diff --git a/internal/agent/task.go b/internal/agent/task.go
index 74373251c..fe3de071d 100644
--- a/internal/agent/task.go
+++ b/internal/agent/task.go
@@ -3,6 +3,7 @@ package agent
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"io"
 	"strings"
@@ -66,6 +67,11 @@ type TaskTool struct {
 	subagentModel     string
 	subagentEffort    string
 	resolveProvider   func(modelRef, effort string) (provider.Provider, *provider.Pricing, int, error)
+	transcripts       *SubagentStore
+	workspaceRoot     string
+	baseModel         string
+	baseEffort        string
+	identityProfile   func(modelRef, effort string) (string, string)
 }
 
 // NewTaskTool wires a task tool to the parent agent's environment so its
@@ -99,6 +105,22 @@ func NewTaskTool(prov provider.Provider, pricing *provider.Pricing, parentReg *t
 	}
 }
 
+// WithTranscripts enables persisted sub-agent transcript continuation for this
+// task tool. The base model/effort are the parent provider identity used when no
+// subagent override is configured.
+func (t *TaskTool) WithTranscripts(store *SubagentStore, workspaceRoot, baseModel, baseEffort string) *TaskTool {
+	t.transcripts = store
+	t.workspaceRoot = strings.TrimSpace(workspaceRoot)
+	t.baseModel = strings.TrimSpace(baseModel)
+	t.baseEffort = strings.TrimSpace(baseEffort)
+	return t
+}
+
+func (t *TaskTool) WithTranscriptIdentityResolver(resolve func(modelRef, effort string) (string, string)) *TaskTool {
+	t.identityProfile = resolve
+	return t
+}
+
 func (t *TaskTool) Name() string { return "task" }
 
 func (t *TaskTool) Description() string {
@@ -115,7 +137,9 @@ func (t *TaskTool) Schema() json.RawMessage {
   "max_steps":{"type":"integer","description":"Optional cap on tool-call rounds. Defaults to half the parent's cap (min 5).","minimum":1},
   "run_in_background":{"type":"boolean","description":"Run the sub-agent asynchronously: returns a job id immediately and keeps working across turns. Collect its final answer with wait, and you'll be notified when it finishes. Use for long, independent sub-tasks you don't need to block on right now."},
   "model":{"type":"string","description":"Optional model override for the sub-agent (a configured provider/model name)."},
-  "effort":{"type":"string","description":"Optional reasoning effort for the sub-agent (e.g. high, max)."}
+  "effort":{"type":"string","description":"Optional reasoning effort for the sub-agent (e.g. high, max)."},
+  "continue_from":{"type":"string","description":"Optional subagent transcript reference to continue in place. The current kind, prompt persona, tools, model, effort, and workspace must match the saved transcript."},
+  "fork_from":{"type":"string","description":"Optional subagent transcript reference to copy into a new transcript before running this task. Mutually exclusive with continue_from."}
 },
 "required":["prompt"]
 }`)
@@ -163,6 +187,8 @@ func (t *TaskTool) Execute(ctx context.Context, args json.RawMessage) (string, e
 		RunInBackground bool     `json:"run_in_background"`
 		Model           string   `json:"model"`
 		Effort          string   `json:"effort"`
+		ContinueFrom    string   `json:"continue_from"`
+		ForkFrom        string   `json:"fork_from"`
 	}
 	if err := json.Unmarshal(args, &p); err != nil {
 		return "", fmt.Errorf("invalid args: %w", err)
@@ -188,6 +214,16 @@ func (t *TaskTool) Execute(ctx context.Context, args json.RawMessage) (string, e
 
 	subReg := t.buildSubReg(p.Tools)
 	modelRef, effortRef := t.effectiveProfile(p.Model, p.Effort)
+	parentID, parent, _, _ := CallContext(ctx)
+	run, err := t.prepareTranscriptRun(subReg, modelRef, effortRef, ParentSession(ctx), parentID, p.ContinueFrom, p.ForkFrom)
+	if err != nil {
+		return "", err
+	}
+	prov, pricing, ctxWin, err := t.resolveSubSessionRuntime(modelRef, effortRef)
+	if err != nil {
+		run.Release()
+		return "", fmt.Errorf("sub-agent profile: %w", err)
+	}
 
 	// Background: register a job that runs the sub-agent under the manager's
 	// session context (so it survives this turn) and return immediately. The
@@ -196,22 +232,115 @@ func (t *TaskTool) Execute(ctx context.Context, args json.RawMessage) (string, e
 	if p.RunInBackground {
 		jm, ok := jobs.FromContext(ctx)
 		if !ok {
+			if run != nil {
+				run.Release()
+			}
 			return "", fmt.Errorf("background execution is not available in this context")
 		}
-		parentID, parent, _, _ := CallContext(ctx)
 		nested := subSinkFor(parentID, parent)
 		label := p.Description
 		if label == "" {
 			label = "task"
 		}
+		if t.transcripts != nil && run != nil && run.Ref != "" {
+			if err := t.transcripts.MarkRunning(run); err != nil {
+				run.Release()
+				return "", err
+			}
+		}
 		job := jm.Start("task", label, func(jobCtx context.Context, _ io.Writer) (string, error) {
-			return t.runSub(jobCtx, p.Prompt, subReg, nested, maxSteps, modelRef, effortRef)
+			defer run.Release()
+			answer, err := t.runSubSession(jobCtx, p.Prompt, subReg, nested, maxSteps, prov, pricing, ctxWin, run.Session)
+			if err != nil {
+				return FormatSubagentResult("", run.Ref, true), errors.Join(err, t.transcripts.SaveFailed(run))
+			}
+			if err := t.transcripts.SaveCompleted(run); err != nil {
+				return FormatSubagentResult("", run.Ref, true), errors.Join(err, t.transcripts.SaveFailed(run))
+			}
+			return FormatSubagentResult(answer, run.Ref, false), nil
 		})
+		if run != nil && run.Ref != "" {
+			return fmt.Sprintf("Started background task %q (%s).\nSubagent reference: %s\nIt runs across turns; collect its final answer with wait (or wait will return it once done), and you'll be notified when it finishes.", job.ID, label, run.Ref), nil
+		}
 		return fmt.Sprintf("Started background task %q (%s). It runs across turns; collect its final answer with wait (or wait will return it once done), and you'll be notified when it finishes.", job.ID, label), nil
 	}
 
 	// Foreground: run synchronously, nesting events under this call.
-	return t.runSub(ctx, p.Prompt, subReg, subSink(ctx), maxSteps, modelRef, effortRef)
+	defer run.Release()
+	answer, err := t.runSubSession(ctx, p.Prompt, subReg, subSink(ctx), maxSteps, prov, pricing, ctxWin, run.Session)
+	if err != nil {
+		return "", errors.Join(err, t.transcripts.SaveFailed(run))
+	}
+	if t.transcripts != nil && run.Ref != "" {
+		if err := t.transcripts.SaveCompleted(run); err != nil {
+			return "", errors.Join(err, t.transcripts.SaveFailed(run))
+		}
+		return FormatSubagentResult(answer, run.Ref, false), nil
+	}
+	return answer, nil
+}
+
+func (t *TaskTool) prepareTranscriptRun(subReg *tool.Registry, modelRef, effortRef, parentSession, parentID, continueFrom, forkFrom string) (*SubagentRun, error) {
+	continueFrom = strings.TrimSpace(continueFrom)
+	forkFrom = strings.TrimSpace(forkFrom)
+	parentSession = strings.TrimSpace(parentSession)
+	if continueFrom != "" && forkFrom != "" {
+		return nil, fmt.Errorf("continue_from and fork_from are mutually exclusive")
+	}
+	if t.transcripts == nil {
+		return nil, fmt.Errorf("subagent transcript store is required")
+	}
+	// Headless runs (e.g. `reasonix run`) never mint a session path, so there is
+	// no parent session to own a transcript. Run the sub-agent ephemerally —
+	// exactly as before persisted transcripts existed — instead of failing the
+	// call. Continuation/fork need a persisted owner, so they error here.
+	if parentSession == "" {
+		if continueFrom != "" || forkFrom != "" {
+			return nil, fmt.Errorf("continue_from/fork_from require a persisted session; none is active in this run")
+		}
+		return EphemeralSubagentRun(t.sysPrompt), nil
+	}
+	identityModel, identityEffort := t.effectiveIdentity(modelRef, effortRef)
+	spec := SubagentSpec{
+		Kind:             "task",
+		Name:             "task",
+		WorkspaceRoot:    t.workspaceRoot,
+		ParentSession:    parentSession,
+		ParentToolCallID: parentID,
+		SystemPrompt:     t.sysPrompt,
+		Registry:         subReg,
+		Model:            identityModel,
+		Effort:           identityEffort,
+	}
+	if continueFrom != "" || forkFrom != "" {
+		if continueFrom != "" {
+			return t.transcripts.PrepareContinue(continueFrom, spec)
+		}
+		return t.transcripts.PrepareFork(forkFrom, spec)
+	}
+	return t.transcripts.PrepareFresh(spec)
+}
+
+func (t *TaskTool) effectiveIdentity(modelRef, effort string) (string, string) {
+	if t.identityProfile != nil {
+		model, eff := t.identityProfile(modelRef, effort)
+		return strings.TrimSpace(model), strings.TrimSpace(eff)
+	}
+	return t.effectiveModelIdentity(modelRef), t.effectiveEffortIdentity(effort)
+}
+
+func (t *TaskTool) effectiveModelIdentity(modelRef string) string {
+	if strings.TrimSpace(modelRef) != "" {
+		return strings.TrimSpace(modelRef)
+	}
+	return strings.TrimSpace(t.baseModel)
+}
+
+func (t *TaskTool) effectiveEffortIdentity(effort string) string {
+	if strings.TrimSpace(effort) != "" {
+		return strings.TrimSpace(effort)
+	}
+	return strings.TrimSpace(t.baseEffort)
 }
 
 // buildSubReg returns the sub-agent's tool set: the named whitelist (minus
@@ -288,19 +417,20 @@ func FilterReadOnlyRegistry(parent *tool.Registry, exclude ...string) *tool.Regi
 	return sub
 }
 
-// runSub builds a sub-agent over subReg, runs prompt to completion emitting to
-// sink, and returns its final assistant answer. Shared by the foreground and
-// background paths. modelRef and effort override the parent defaults when non-empty.
-func (t *TaskTool) runSub(ctx context.Context, prompt string, subReg *tool.Registry, sink event.Sink, maxSteps int, modelRef, effort string) (string, error) {
+func (t *TaskTool) resolveSubSessionRuntime(modelRef, effort string) (provider.Provider, *provider.Pricing, int, error) {
 	prov, pricing, ctxWin := t.prov, t.pricing, t.contextWindow
 	if t.resolveProvider != nil && (modelRef != "" || effort != "") {
 		p, pr, cw, err := t.resolveProvider(modelRef, effort)
 		if err != nil {
-			return "", fmt.Errorf("sub-agent profile: %w", err)
+			return nil, nil, 0, err
 		}
 		prov, pricing, ctxWin = p, pr, cw
 	}
-	return RunSubAgent(ctx, prov, subReg, t.sysPrompt, prompt, Options{
+	return prov, pricing, ctxWin, nil
+}
+
+func (t *TaskTool) runSubSession(ctx context.Context, prompt string, subReg *tool.Registry, sink event.Sink, maxSteps int, prov provider.Provider, pricing *provider.Pricing, ctxWin int, sess *Session) (string, error) {
+	return RunSubAgentWithSession(ctx, prov, subReg, sess, prompt, Options{
 		MaxSteps:          maxSteps,
 		Temperature:       t.temperature,
 		Pricing:           pricing,
@@ -313,13 +443,26 @@ func (t *TaskTool) runSub(ctx context.Context, prompt string, subReg *tool.Regis
 	}, sink)
 }
 
-// RunSubAgent runs prompt to completion in a fresh sub-agent session over reg,
-// emitting tool activity to sink, and returns the sub-agent's final assistant
-// answer. It is the shared core behind the `task` tool and subagent skills: a
-// caller supplies the system prompt (the task persona or the skill body), the
-// tool registry (already filtered), and the run Options (model budget, gate).
-func RunSubAgent(ctx context.Context, prov provider.Provider, reg *tool.Registry, sysPrompt, prompt string, opts Options, sink event.Sink) (string, error) {
-	sess := NewSession(sysPrompt)
+func FormatSubagentResult(answer, ref string, failed bool) string {
+	if ref == "" {
+		return answer
+	}
+	if failed {
+		if answer == "" {
+			return "Subagent reference (failed): " + ref
+		}
+		return "Subagent reference (failed): " + ref + "\n\nFinal answer:\n" + answer
+	}
+	return "Subagent reference: " + ref + "\n\nFinal answer:\n" + answer
+}
+
+// RunSubAgentWithSession continues an existing sub-agent session with prompt and
+// returns the latest final assistant answer. Fresh sub-agents pass a newly-created
+// session; continued sub-agents pass a loaded transcript session.
+func RunSubAgentWithSession(ctx context.Context, prov provider.Provider, reg *tool.Registry, sess *Session, prompt string, opts Options, sink event.Sink) (string, error) {
+	if sess == nil {
+		return "", fmt.Errorf("sub-agent session is nil")
+	}
 	sub := New(prov, reg, sess, opts, sink)
 	if err := sub.Run(ctx, prompt); err != nil {
 		return "", fmt.Errorf("sub-agent: %w", err)
diff --git a/internal/agent/task_test.go b/internal/agent/task_test.go
index 66696d65c..42ff5c167 100644
--- a/internal/agent/task_test.go
+++ b/internal/agent/task_test.go
@@ -10,21 +10,26 @@ import (
 	"reasonix/internal/tool"
 )
 
+func testTaskContext() context.Context {
+	return WithParentSession(context.Background(), "parent-session")
+}
+
 // TestTaskToolReturnsSubAgentFinalAnswer runs a task against a mock provider
-// that emits a single text turn, and verifies the tool returns exactly that
-// text — sub-agent intermediate state isn't supposed to leak.
+// that emits a single text turn, and verifies the tool returns that text with a
+// transcript reference — sub-agent intermediate state isn't supposed to leak.
 func TestTaskToolReturnsSubAgentFinalAnswer(t *testing.T) {
 	sub := &mockProvider{name: "sub", chunks: []provider.Chunk{
 		{Type: provider.ChunkText, Text: "found 3 callers of Foo"},
 		{Type: provider.ChunkDone},
 	}}
 	parentReg := tool.NewRegistry()
-	task := NewTaskTool(sub, nil, parentReg, 20, 0, 0, 0, 0, 0.0, "", "test-sys-prompt", nil, "", "", nil)
+	task := newTestTaskTool(t, sub, parentReg, "test-sys-prompt", "", "", nil)
 
-	out, err := task.Execute(context.Background(), []byte(`{"prompt":"find callers of Foo"}`))
+	out, err := task.Execute(testTaskContext(), []byte(`{"prompt":"find callers of Foo"}`))
 	if err != nil {
 		t.Fatalf("Execute: %v", err)
 	}
+	_ = subagentRefFromOutput(t, out)
 	if !strings.Contains(out, "found 3 callers of Foo") {
 		t.Errorf("got %q, want sub-agent final answer", out)
 	}
@@ -52,13 +57,13 @@ func TestTaskToolFiltersTools(t *testing.T) {
 	parentReg.Add(fakeTool{name: "read_file", readOnly: true})
 	parentReg.Add(fakeTool{name: "write_file", readOnly: false})
 	parentReg.Add(fakeTool{name: "bash", readOnly: false})
-	task := NewTaskTool(sub, nil, parentReg, 20, 0, 0, 0, 0, 0.0, "", "sys", nil, "", "", nil)
+	task := newTestTaskTool(t, sub, parentReg, "sys", "", "", nil)
 	parentReg.Add(task) // simulate the wiring in cli.setup
 	parentReg.Add(fakeTool{name: "run_skill", readOnly: false})
 	parentReg.Add(fakeTool{name: "research", readOnly: false})
 
 	args := []byte(`{"prompt":"x","tools":["read_file","task","write_file","run_skill","research"]}`)
-	if _, err := task.Execute(context.Background(), args); err != nil {
+	if _, err := task.Execute(testTaskContext(), args); err != nil {
 		t.Fatalf("Execute: %v", err)
 	}
 	// The sub-agent's tool schemas should reflect the whitelist minus meta-tools.
@@ -81,7 +86,7 @@ func TestTaskToolDefaultsToParentToolsWithoutMetaTools(t *testing.T) {
 	parentReg := tool.NewRegistry()
 	parentReg.Add(fakeTool{name: "read_file", readOnly: true})
 	parentReg.Add(fakeTool{name: "grep", readOnly: true})
-	task := NewTaskTool(sub, nil, parentReg, 20, 0, 0, 0, 0, 0.0, "", "sys", nil, "", "", nil)
+	task := newTestTaskTool(t, sub, parentReg, "sys", "", "", nil)
 	parentReg.Add(task)
 	parentReg.Add(fakeTool{name: "run_skill", readOnly: false})
 	parentReg.Add(fakeTool{name: "explore", readOnly: false})
@@ -90,7 +95,7 @@ func TestTaskToolDefaultsToParentToolsWithoutMetaTools(t *testing.T) {
 	parentReg.Add(fakeTool{name: "security_review", readOnly: false})
 	parentReg.Add(fakeTool{name: "remember", readOnly: false})
 
-	if _, err := task.Execute(context.Background(), []byte(`{"prompt":"x"}`)); err != nil {
+	if _, err := task.Execute(testTaskContext(), []byte(`{"prompt":"x"}`)); err != nil {
 		t.Fatalf("Execute: %v", err)
 	}
 	got := map[string]bool{}
@@ -113,13 +118,13 @@ func TestTaskToolUsesConfiguredProfileForExecution(t *testing.T) {
 		{Type: provider.ChunkDone},
 	}}
 	var gotModel, gotEffort string
-	task := NewTaskTool(parent, nil, tool.NewRegistry(), 20, 0, 0, 0, 0, 0.0, "", "sys", nil, "deepseek-pro", "max",
-		func(model, effort string) (provider.Provider, *provider.Pricing, int, error) {
-			gotModel, gotEffort = model, effort
-			return resolved, nil, 0, nil
-		})
+	resolve := func(model, effort string) (provider.Provider, *provider.Pricing, int, error) {
+		gotModel, gotEffort = model, effort
+		return resolved, nil, 0, nil
+	}
+	task := newTestTaskTool(t, parent, tool.NewRegistry(), "sys", "deepseek-pro", "max", resolve)
 
-	out, err := task.Execute(context.Background(), []byte(`{"prompt":"x"}`))
+	out, err := task.Execute(testTaskContext(), []byte(`{"prompt":"x"}`))
 	if err != nil {
 		t.Fatalf("Execute: %v", err)
 	}
@@ -136,13 +141,195 @@ func TestTaskToolReturnsProfileResolutionErrors(t *testing.T) {
 		{Type: provider.ChunkText, Text: "parent answer"},
 		{Type: provider.ChunkDone},
 	}}
-	task := NewTaskTool(parent, nil, tool.NewRegistry(), 20, 0, 0, 0, 0, 0.0, "", "sys", nil, "", "",
-		func(string, string) (provider.Provider, *provider.Pricing, int, error) {
-			return nil, nil, 0, errors.New("bad effort")
-		})
+	resolve := func(string, string) (provider.Provider, *provider.Pricing, int, error) {
+		return nil, nil, 0, errors.New("bad effort")
+	}
+	task := newTestTaskTool(t, parent, tool.NewRegistry(), "sys", "", "", resolve)
 
-	_, err := task.Execute(context.Background(), []byte(`{"prompt":"x","effort":"turbo"}`))
+	_, err := task.Execute(testTaskContext(), []byte(`{"prompt":"x","effort":"turbo"}`))
 	if err == nil || !strings.Contains(err.Error(), "bad effort") {
 		t.Fatalf("Execute error = %v, want profile resolution error", err)
 	}
 }
+
+func TestTaskToolRequiresTranscriptStore(t *testing.T) {
+	sub := &mockProvider{name: "sub", chunks: []provider.Chunk{
+		{Type: provider.ChunkText, Text: "answer"},
+		{Type: provider.ChunkDone},
+	}}
+	task := NewTaskTool(sub, nil, tool.NewRegistry(), 20, 0, 0, 0, 0, 0.0, "", "sys", nil, "", "", nil)
+
+	_, err := task.Execute(testTaskContext(), []byte(`{"prompt":"x"}`))
+	if err == nil || !strings.Contains(err.Error(), "transcript store is required") {
+		t.Fatalf("Execute error = %v, want transcript store requirement", err)
+	}
+}
+
+// TestTaskToolRunsEphemerallyWithoutParentSession mirrors headless `reasonix run`:
+// the store is wired but the context carries no parent session, so the sub-agent
+// must run without persistence and return its plain answer (no transcript ref).
+func TestTaskToolRunsEphemerallyWithoutParentSession(t *testing.T) {
+	sub := &mockProvider{name: "sub", chunks: []provider.Chunk{
+		{Type: provider.ChunkText, Text: "headless answer"},
+		{Type: provider.ChunkDone},
+	}}
+	task := newTestTaskTool(t, sub, tool.NewRegistry(), "sys", "", "", nil)
+
+	out, err := task.Execute(context.Background(), []byte(`{"prompt":"x"}`))
+	if err != nil {
+		t.Fatalf("Execute: %v", err)
+	}
+	if !strings.Contains(out, "headless answer") {
+		t.Fatalf("got %q, want sub-agent final answer", out)
+	}
+	if strings.Contains(out, "Subagent reference") {
+		t.Fatalf("ephemeral run should not emit a transcript reference: %q", out)
+	}
+}
+
+func TestTaskToolRejectsContinuationWithoutParentSession(t *testing.T) {
+	sub := &mockProvider{name: "sub", chunks: []provider.Chunk{
+		{Type: provider.ChunkText, Text: "answer"},
+		{Type: provider.ChunkDone},
+	}}
+	task := newTestTaskTool(t, sub, tool.NewRegistry(), "sys", "", "", nil)
+
+	_, err := task.Execute(context.Background(), []byte(`{"prompt":"x","continue_from":"sa_whatever"}`))
+	if err == nil || !strings.Contains(err.Error(), "persisted session") {
+		t.Fatalf("Execute error = %v, want persisted-session requirement", err)
+	}
+}
+
+func TestTaskToolPersistsAndContinuesTranscript(t *testing.T) {
+	sub := &mockProvider{name: "sub", streams: [][]provider.Chunk{
+		{
+			{Type: provider.ChunkText, Text: "first answer"},
+			{Type: provider.ChunkDone},
+		},
+		{
+			{Type: provider.ChunkText, Text: "second answer"},
+			{Type: provider.ChunkDone},
+		},
+	}}
+	reg := tool.NewRegistry()
+	reg.Add(fakeTool{name: "read_file", readOnly: true})
+	store := NewSubagentStore(t.TempDir())
+	task := newTestTaskTool(t, sub, reg, "sys", "", "", nil).
+		WithTranscripts(store, t.TempDir(), "base-model", "base-effort")
+
+	first, err := task.Execute(testTaskContext(), []byte(`{"prompt":"first task"}`))
+	if err != nil {
+		t.Fatalf("first Execute: %v", err)
+	}
+	ref := subagentRefFromOutput(t, first)
+	meta, err := store.LoadMeta(ref)
+	if err != nil {
+		t.Fatalf("LoadMeta: %v", err)
+	}
+	if meta.ParentSession != "parent-session" {
+		t.Fatalf("parent session = %q, want parent-session", meta.ParentSession)
+	}
+	if !strings.Contains(first, "first answer") {
+		t.Fatalf("first output = %q, want answer", first)
+	}
+
+	second, err := task.Execute(testTaskContext(), []byte(`{"prompt":"second task","continue_from":"`+ref+`"}`))
+	if err != nil {
+		t.Fatalf("second Execute: %v", err)
+	}
+	if !strings.Contains(second, "second answer") {
+		t.Fatalf("second output = %q, want answer", second)
+	}
+	if len(sub.requests) != 2 {
+		t.Fatalf("provider requests = %d, want 2", len(sub.requests))
+	}
+	msgs := sub.requests[1].Messages
+	if len(msgs) < 4 {
+		t.Fatalf("continued request messages = %+v, want prior transcript plus new task", msgs)
+	}
+	if msgs[1].Content != "first task" || msgs[2].Content != "first answer" || lastUser(sub.requests[1]) != "second task" {
+		t.Fatalf("continued request messages = %+v, want first task/answer then second task", msgs)
+	}
+}
+
+func TestTaskToolFailedForegroundContinuationPersistsAndRejectsReuse(t *testing.T) {
+	sub := &mockProvider{name: "sub", streams: [][]provider.Chunk{
+		{
+			{Type: provider.ChunkText, Text: "first answer"},
+			{Type: provider.ChunkDone},
+		},
+		{
+			{Type: provider.ChunkError, Err: errors.New("provider failed")},
+		},
+	}}
+	store := NewSubagentStore(t.TempDir())
+	reg := tool.NewRegistry()
+	reg.Add(fakeTool{name: "read_file", readOnly: true})
+	task := NewTaskTool(sub, nil, reg, 20, 0, 0, 0, 0, 0.0, "", "sys", nil, "", "", nil).
+		WithTranscripts(store, t.TempDir(), "base-model", "base-effort")
+
+	first, err := task.Execute(testTaskContext(), []byte(`{"prompt":"first task"}`))
+	if err != nil {
+		t.Fatalf("first Execute: %v", err)
+	}
+	ref := subagentRefFromOutput(t, first)
+
+	_, err = task.Execute(testTaskContext(), []byte(`{"prompt":"second task","continue_from":"`+ref+`"}`))
+	if err == nil || !strings.Contains(err.Error(), "provider failed") {
+		t.Fatalf("second Execute error = %v, want provider failure", err)
+	}
+	meta, err := store.LoadMeta(ref)
+	if err != nil {
+		t.Fatalf("LoadMeta: %v", err)
+	}
+	if meta.Status != SubagentFailed {
+		t.Fatalf("status = %q, want failed", meta.Status)
+	}
+	loaded, err := LoadSession(store.sessionPath(ref))
+	if err != nil {
+		t.Fatalf("LoadSession: %v", err)
+	}
+	msgs := loaded.Snapshot()
+	if len(msgs) != 4 || msgs[1].Content != "first task" || msgs[2].Content != "first answer" || msgs[3].Content != "second task" {
+		t.Fatalf("failed continuation transcript = %+v, want first task/answer plus second task", msgs)
+	}
+	if _, err := task.Execute(testTaskContext(), []byte(`{"prompt":"third task","continue_from":"`+ref+`"}`)); err == nil || !strings.Contains(err.Error(), "failed and cannot be continued") {
+		t.Fatalf("reuse error = %v, want failed ref rejection", err)
+	}
+}
+
+func TestTaskToolRejectsMismatchedContinuationProfile(t *testing.T) {
+	sub := &mockProvider{name: "sub", chunks: []provider.Chunk{
+		{Type: provider.ChunkText, Text: "answer"},
+		{Type: provider.ChunkDone},
+	}}
+	task := newTestTaskTool(t, sub, tool.NewRegistry(), "sys", "", "", nil).
+		WithTranscripts(NewSubagentStore(t.TempDir()), t.TempDir(), "base-model", "")
+
+	out, err := task.Execute(testTaskContext(), []byte(`{"prompt":"first task"}`))
+	if err != nil {
+		t.Fatalf("first Execute: %v", err)
+	}
+	ref := subagentRefFromOutput(t, out)
+	_, err = task.Execute(testTaskContext(), []byte(`{"prompt":"second task","continue_from":"`+ref+`","model":"other-model"}`))
+	if err == nil || !strings.Contains(err.Error(), "model/effort") {
+		t.Fatalf("mismatched model error = %v, want compatibility failure", err)
+	}
+}
+
+func subagentRefFromOutput(t *testing.T, out string) string {
+	t.Helper()
+	for _, line := range strings.Split(out, "\n") {
+		if strings.HasPrefix(line, "Subagent reference: ") {
+			return strings.TrimSpace(strings.TrimPrefix(line, "Subagent reference: "))
+		}
+	}
+	t.Fatalf("no subagent reference in output:\n%s", out)
+	return ""
+}
+
+func newTestTaskTool(t *testing.T, prov provider.Provider, reg *tool.Registry, sysPrompt, subagentModel, subagentEffort string, resolve func(string, string) (provider.Provider, *provider.Pricing, int, error)) *TaskTool {
+	t.Helper()
+	return NewTaskTool(prov, nil, reg, 20, 0, 0, 0, 0, 0.0, "", sysPrompt, nil, subagentModel, subagentEffort, resolve).
+		WithTranscripts(NewSubagentStore(t.TempDir()), t.TempDir(), "base-model", "base-effort")
+}
diff --git a/internal/boot/boot.go b/internal/boot/boot.go
index 3116bfb09..ba89cfd74 100644
--- a/internal/boot/boot.go
+++ b/internal/boot/boot.go
@@ -375,6 +375,7 @@ func Build(ctx context.Context, opts Options) (*control.Controller, error) {
 	if opts.MaxSteps > 0 {
 		maxSteps = opts.MaxSteps
 	}
+	subagentStore := newSubagentStore(config.SessionDir())
 
 	// Permission policy gates every tool call. The headless gate (no Approver)
 	// resolves "ask" to allow — preserving `reasonix run` autonomy — while deny
@@ -431,12 +432,17 @@ func Build(ctx context.Context, opts Options) (*control.Controller, error) {
 		}
 		return p, me.Price, me.ContextWindow, nil
 	}
+	subagentIdentity := func(modelRef, effort string) (string, string) {
+		return subagentEffectiveIdentity(cfg, modelName, entry, modelRef, effort)
+	}
 	taskModel := firstNonEmpty(cfg.Agent.SubagentModels["task"], cfg.Agent.SubagentModel)
 	taskEffort := firstNonEmpty(cfg.Agent.SubagentEfforts["task"], cfg.Agent.SubagentEffort)
 	reg.Add(agent.NewTaskTool(execProv, entry.Price, reg, maxSteps,
 		entry.ContextWindow, cfg.Agent.SoftCompactRatio, cfg.Agent.CompactRatio, cfg.Agent.CompactForceRatio,
 		cfg.Agent.Temperature, config.ArchiveDir(), "", headlessGate,
-		taskModel, taskEffort, resolveSubagentProvider))
+		taskModel, taskEffort, resolveSubagentProvider).
+		WithTranscripts(subagentStore, root, modelName, entry.Effort).
+		WithTranscriptIdentityResolver(subagentIdentity))
 
 	// The `remember` tool lets the model persist durable facts to the project's
 	// auto-memory store; `forget` prunes ones that turn out wrong. The saved index
@@ -456,7 +462,7 @@ func Build(ctx context.Context, opts Options) (*control.Controller, error) {
 	// as system prompt, a tool set scoped to the skill's allowed-tools (minus the
 	// task/skill meta-tools, to bar recursion), and an optional per-skill model.
 	// Its tool activity nests under the invoking call, like `task`.
-	skillRunner := func(sctx context.Context, sk skill.Skill, task string) (string, error) {
+	skillRunner := func(sctx context.Context, sk skill.Skill, task string, runOpts skill.SubagentRunOptions) (string, error) {
 		prov, price, ctxWin := execProv, entry.Price, entry.ContextWindow
 		modelRef := subagentModelRef(cfg, sk)
 		effortRef := subagentEffortRef(cfg, sk)
@@ -468,13 +474,56 @@ func Build(ctx context.Context, opts Options) (*control.Controller, error) {
 			prov, price, ctxWin = p, pr, cw
 		}
 		subReg := agent.FilterRegistry(reg, sk.AllowedTools, agent.SubagentMetaTools()...)
+		continueFrom, forkFrom := strings.TrimSpace(runOpts.ContinueFrom), strings.TrimSpace(runOpts.ForkFrom)
+		if continueFrom != "" && forkFrom != "" {
+			return "", fmt.Errorf("continue_from and fork_from are mutually exclusive")
+		}
+		parentID, _, _, _ := agent.CallContext(sctx)
+		parentSession := agent.ParentSession(sctx)
+		var run *agent.SubagentRun
+		if subagentStore == nil || parentSession == "" {
+			// Headless runs (e.g. `reasonix run`) have no persistent session to
+			// own a transcript. Run the skill sub-agent ephemerally, as before
+			// persisted transcripts existed, instead of failing. Continuation and
+			// fork need a persisted owner, so they error here.
+			if continueFrom != "" || forkFrom != "" {
+				return "", fmt.Errorf("continue_from/fork_from require a persisted session; none is active in this run")
+			}
+			run = agent.EphemeralSubagentRun(sk.Body)
+		} else {
+			identityModel, identityEffort := subagentIdentity(modelRef, effortRef)
+			spec := agent.SubagentSpec{
+				Kind:             "skill",
+				Name:             sk.Name,
+				WorkspaceRoot:    root,
+				ParentSession:    parentSession,
+				ParentToolCallID: parentID,
+				SystemPrompt:     sk.Body,
+				Registry:         subReg,
+				Model:            identityModel,
+				Effort:           identityEffort,
+			}
+			var prepErr error
+			switch {
+			case continueFrom != "":
+				run, prepErr = subagentStore.PrepareContinue(continueFrom, spec)
+			case forkFrom != "":
+				run, prepErr = subagentStore.PrepareFork(forkFrom, spec)
+			default:
+				run, prepErr = subagentStore.PrepareFresh(spec)
+			}
+			if prepErr != nil {
+				return "", prepErr
+			}
+		}
+		defer run.Release()
 		steps := maxSteps
 		if steps > 0 {
 			if steps /= 2; steps < 5 {
 				steps = 5
 			}
 		}
-		return agent.RunSubAgent(sctx, prov, subReg, sk.Body, task, agent.Options{
+		answer, err := agent.RunSubAgentWithSession(sctx, prov, subReg, run.Session, task, agent.Options{
 			MaxSteps:      steps,
 			Temperature:   cfg.Agent.Temperature,
 			Pricing:       price,
@@ -482,6 +531,13 @@ func Build(ctx context.Context, opts Options) (*control.Controller, error) {
 			ContextWindow: ctxWin,
 			ArchiveDir:    config.ArchiveDir(),
 		}, agent.NestedSink(sctx, event.Discard))
+		if err != nil {
+			return "", errors.Join(err, subagentStore.SaveFailed(run))
+		}
+		if err := subagentStore.SaveCompleted(run); err != nil {
+			return "", errors.Join(err, subagentStore.SaveFailed(run))
+		}
+		return agent.FormatSubagentResult(answer, run.Ref, false), nil
 	}
 	skillProfile := func(sk skill.Skill) *event.Profile {
 		model, effort := subagentModelRef(cfg, sk), subagentEffortRef(cfg, sk)
@@ -871,6 +927,51 @@ func isGitMarker(path string) bool {
 	return err == nil && (fi.IsDir() || fi.Mode().IsRegular())
 }
 
+func newSubagentStore(sessionDir string) *agent.SubagentStore {
+	sessionDir = strings.TrimSpace(sessionDir)
+	if sessionDir == "" {
+		return nil
+	}
+	return agent.NewSubagentStore(filepath.Join(sessionDir, "subagents"))
+}
+
+func subagentEffectiveIdentity(cfg *config.Config, baseModelRef string, base *config.ProviderEntry, modelRef, effort string) (string, string) {
+	var entry config.ProviderEntry
+	if base != nil {
+		entry = *base
+	}
+	ref := strings.TrimSpace(modelRef)
+	if ref == "" {
+		ref = strings.TrimSpace(baseModelRef)
+	}
+	if cfg != nil && ref != "" {
+		if resolved, ok := cfg.ResolveModel(ref); ok {
+			entry = *resolved
+		} else if strings.TrimSpace(modelRef) != "" {
+			entry.Model = ref
+		}
+	} else if strings.TrimSpace(modelRef) != "" {
+		entry.Model = strings.TrimSpace(modelRef)
+	}
+	if rawEffort := strings.TrimSpace(effort); rawEffort != "" {
+		if normalized, err := config.NormalizeEffort(&entry, rawEffort); err == nil {
+			entry.Effort = normalized
+		} else {
+			entry.Effort = rawEffort
+		}
+	}
+	modelID := strings.TrimSpace(entry.Name)
+	model := strings.TrimSpace(entry.Model)
+	if modelID != "" && model != "" {
+		modelID += "/" + model
+	} else if model != "" {
+		modelID = model
+	} else if modelID == "" {
+		modelID = ref
+	}
+	return modelID, strings.TrimSpace(config.EffectiveEffort(&entry))
+}
+
 // NewProvider builds a provider.Provider from a configured entry. Exported so
 // custom assemblers (e.g. the ACP per-session factory) can reuse it without
 // going through the full Build.
diff --git a/internal/boot/boot_test.go b/internal/boot/boot_test.go
index 0dea91825..1809eba44 100644
--- a/internal/boot/boot_test.go
+++ b/internal/boot/boot_test.go
@@ -5,6 +5,7 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"net/http"
 	"net/http/httptest"
@@ -13,9 +14,11 @@ import (
 	"path/filepath"
 	"runtime"
 	"strings"
+	"sync"
 	"testing"
 	"time"
 
+	"reasonix/internal/agent"
 	"reasonix/internal/config"
 	"reasonix/internal/event"
 	"reasonix/internal/netclient"
@@ -81,6 +84,288 @@ api_key_env = "REASONIX_TEST_KEY_UNSET"
 	}
 }
 
+func TestBuildSubagentSkillFailedContinuationPersistsTranscript(t *testing.T) {
+	isolateConfigHome(t)
+	dir := robustTempDir(t)
+	t.Chdir(dir)
+
+	registerBootSubagentTestProvider()
+	prov := &bootSubagentTestProvider{}
+	setBootSubagentTestProvider(t, prov)
+	writeFile(t, dir, "reasonix.toml", `
+default_model = "test-model"
+
+[codegraph]
+enabled = false
+
+[agent]
+system_prompt = "BASE"
+
+[[providers]]
+name = "test-model"
+kind = "boot-subagent-test"
+model = "x"
+`)
+
+	ctrl, err := Build(context.Background(), Options{Sink: event.Discard})
+	if err != nil {
+		t.Fatalf("Build: %v", err)
+	}
+	defer ctrl.Close()
+	sessionPath := agent.NewSessionPath(ctrl.SessionDir(), ctrl.Label())
+	ctrl.SetSessionPath(sessionPath)
+
+	if err := ctrl.Run(context.Background(), "first review"); err != nil {
+		t.Fatalf("first Run: %v", err)
+	}
+	ref := subagentRefFromHistory(t, ctrl.History())
+	prov.setContinueRef(ref)
+
+	if err := ctrl.Run(context.Background(), "continue review"); err != nil {
+		t.Fatalf("second Run: %v", err)
+	}
+	store := agent.NewSubagentStore(filepath.Join(config.SessionDir(), "subagents"))
+	meta, err := store.LoadMeta(ref)
+	if err != nil {
+		t.Fatalf("LoadMeta: %v", err)
+	}
+	if meta.Status != agent.SubagentFailed {
+		t.Fatalf("status = %q, want failed", meta.Status)
+	}
+	if meta.ParentSession != agent.BranchID(sessionPath) {
+		t.Fatalf("parent session = %q, want %q", meta.ParentSession, agent.BranchID(sessionPath))
+	}
+	sess, err := agent.LoadSession(filepath.Join(config.SessionDir(), "subagents", ref+".jsonl"))
+	if err != nil {
+		t.Fatalf("LoadSession: %v", err)
+	}
+	msgs := sess.Snapshot()
+	if len(msgs) != 4 || msgs[1].Content != "first skill task" || msgs[2].Content != "first skill answer" || msgs[3].Content != "second skill task" {
+		t.Fatalf("failed skill transcript = %+v, want first task/answer plus second task", msgs)
+	}
+}
+
+const bootSubagentTestProviderKind = "boot-subagent-test"
+
+var (
+	bootSubagentTestProviderOnce    sync.Once
+	bootSubagentTestProviderCurrent *bootSubagentTestProvider
+	bootSubagentTestProviderMu      sync.Mutex
+)
+
+func registerBootSubagentTestProvider() {
+	bootSubagentTestProviderOnce.Do(func() {
+		provider.Register(bootSubagentTestProviderKind, func(provider.Config) (provider.Provider, error) {
+			bootSubagentTestProviderMu.Lock()
+			defer bootSubagentTestProviderMu.Unlock()
+			if bootSubagentTestProviderCurrent == nil {
+				return nil, errors.New("boot subagent test provider is not installed")
+			}
+			return bootSubagentTestProviderCurrent, nil
+		})
+	})
+}
+
+func setBootSubagentTestProvider(t *testing.T, p *bootSubagentTestProvider) {
+	t.Helper()
+	bootSubagentTestProviderMu.Lock()
+	bootSubagentTestProviderCurrent = p
+	bootSubagentTestProviderMu.Unlock()
+	t.Cleanup(func() {
+		bootSubagentTestProviderMu.Lock()
+		if bootSubagentTestProviderCurrent == p {
+			bootSubagentTestProviderCurrent = nil
+		}
+		bootSubagentTestProviderMu.Unlock()
+	})
+}
+
+type bootSubagentTestProvider struct {
+	mu          sync.Mutex
+	calls       int
+	continueRef string
+}
+
+func (p *bootSubagentTestProvider) Name() string { return "boot-subagent-test" }
+
+func (p *bootSubagentTestProvider) setContinueRef(ref string) {
+	p.mu.Lock()
+	defer p.mu.Unlock()
+	p.continueRef = ref
+}
+
+func (p *bootSubagentTestProvider) Stream(context.Context, provider.Request) (<-chan provider.Chunk, error) {
+	p.mu.Lock()
+	call := p.calls
+	p.calls++
+	ref := p.continueRef
+	p.mu.Unlock()
+
+	var chunks []provider.Chunk
+	switch call {
+	case 0:
+		chunks = []provider.Chunk{{Type: provider.ChunkToolCall, ToolCall: &provider.ToolCall{ID: "review-1", Name: "review", Arguments: `{"task":"first skill task"}`}}}
+	case 1:
+		chunks = []provider.Chunk{{Type: provider.ChunkText, Text: "first skill answer"}, {Type: provider.ChunkDone}}
+	case 2:
+		chunks = []provider.Chunk{{Type: provider.ChunkText, Text: "parent first done"}, {Type: provider.ChunkDone}}
+	case 3:
+		args, _ := json.Marshal(map[string]string{"task": "second skill task", "continue_from": ref})
+		chunks = []provider.Chunk{{Type: provider.ChunkToolCall, ToolCall: &provider.ToolCall{ID: "review-2", Name: "review", Arguments: string(args)}}}
+	case 4:
+		chunks = []provider.Chunk{{Type: provider.ChunkError, Err: errors.New("subagent skill failed")}}
+	case 5:
+		chunks = []provider.Chunk{{Type: provider.ChunkText, Text: "parent second done"}, {Type: provider.ChunkDone}}
+	default:
+		chunks = []provider.Chunk{{Type: provider.ChunkError, Err: fmt.Errorf("unexpected provider call %d", call)}}
+	}
+	ch := make(chan provider.Chunk, len(chunks))
+	for _, chunk := range chunks {
+		ch <- chunk
+	}
+	close(ch)
+	return ch, nil
+}
+
+func subagentRefFromHistory(t *testing.T, msgs []provider.Message) string {
+	t.Helper()
+	for _, msg := range msgs {
+		if msg.Role != provider.RoleTool {
+			continue
+		}
+		for _, line := range strings.Split(msg.Content, "\n") {
+			if strings.HasPrefix(line, "Subagent reference: ") {
+				return strings.TrimSpace(strings.TrimPrefix(line, "Subagent reference: "))
+			}
+		}
+	}
+	t.Fatalf("no subagent reference in history: %+v", msgs)
+	return ""
+}
+
+// TestBuildHeadlessRunRunsTaskSubagentWithoutSessionPath reproduces headless
+// `reasonix run`: a controller built via Build with NO SetSessionPath (exactly
+// what internal/cli.runAgent does) must still be able to run a `task` sub-agent.
+// Before the ephemeral fallback this failed with "parent session is required".
+func TestBuildHeadlessRunRunsTaskSubagentWithoutSessionPath(t *testing.T) {
+	isolateConfigHome(t)
+	dir := robustTempDir(t)
+	t.Chdir(dir)
+
+	registerHeadlessTaskTestProvider()
+	prov := &headlessTaskTestProvider{}
+	setHeadlessTaskTestProvider(t, prov)
+	writeFile(t, dir, "reasonix.toml", `
+default_model = "test-model"
+
+[codegraph]
+enabled = false
+
+[agent]
+system_prompt = "BASE"
+
+[[providers]]
+name = "test-model"
+kind = "boot-headless-test"
+model = "x"
+`)
+
+	ctrl, err := Build(context.Background(), Options{Sink: event.Discard})
+	if err != nil {
+		t.Fatalf("Build: %v", err)
+	}
+	defer ctrl.Close()
+
+	// Deliberately NOT calling SetSessionPath — this is the headless run path.
+	if err := ctrl.Run(context.Background(), "use a task subagent"); err != nil {
+		t.Fatalf("Run: %v", err)
+	}
+	if got := ctrl.SessionPath(); got != "" {
+		t.Fatalf("headless run should keep an empty session path, got %q", got)
+	}
+
+	var toolContent string
+	for _, msg := range ctrl.History() {
+		if msg.Role == provider.RoleTool {
+			toolContent += "\n" + msg.Content
+		}
+	}
+	if strings.Contains(toolContent, "parent session is required") {
+		t.Fatalf("task subagent failed in headless run mode: %s", toolContent)
+	}
+	if !strings.Contains(toolContent, "subagent answer") {
+		t.Fatalf("task tool result = %q, want sub-agent answer", toolContent)
+	}
+	if strings.Contains(toolContent, "Subagent reference") {
+		t.Fatalf("ephemeral headless run should not persist a transcript reference: %s", toolContent)
+	}
+}
+
+const headlessTaskTestProviderKind = "boot-headless-test"
+
+var (
+	headlessTaskTestProviderOnce    sync.Once
+	headlessTaskTestProviderCurrent *headlessTaskTestProvider
+	headlessTaskTestProviderMu      sync.Mutex
+)
+
+func registerHeadlessTaskTestProvider() {
+	headlessTaskTestProviderOnce.Do(func() {
+		provider.Register(headlessTaskTestProviderKind, func(provider.Config) (provider.Provider, error) {
+			headlessTaskTestProviderMu.Lock()
+			defer headlessTaskTestProviderMu.Unlock()
+			if headlessTaskTestProviderCurrent == nil {
+				return nil, errors.New("headless task test provider is not installed")
+			}
+			return headlessTaskTestProviderCurrent, nil
+		})
+	})
+}
+
+func setHeadlessTaskTestProvider(t *testing.T, p *headlessTaskTestProvider) {
+	t.Helper()
+	headlessTaskTestProviderMu.Lock()
+	headlessTaskTestProviderCurrent = p
+	headlessTaskTestProviderMu.Unlock()
+	t.Cleanup(func() {
+		headlessTaskTestProviderMu.Lock()
+		if headlessTaskTestProviderCurrent == p {
+			headlessTaskTestProviderCurrent = nil
+		}
+		headlessTaskTestProviderMu.Unlock()
+	})
+}
+
+type headlessTaskTestProvider struct {
+	mu    sync.Mutex
+	calls int
+}
+
+func (p *headlessTaskTestProvider) Name() string { return "boot-headless-test" }
+
+func (p *headlessTaskTestProvider) Stream(context.Context, provider.Request) (<-chan provider.Chunk, error) {
+	p.mu.Lock()
+	call := p.calls
+	p.calls++
+	p.mu.Unlock()
+
+	var chunks []provider.Chunk
+	switch call {
+	case 0:
+		chunks = []provider.Chunk{{Type: provider.ChunkToolCall, ToolCall: &provider.ToolCall{ID: "task-1", Name: "task", Arguments: `{"prompt":"find callers"}`}}}
+	case 1:
+		chunks = []provider.Chunk{{Type: provider.ChunkText, Text: "subagent answer"}, {Type: provider.ChunkDone}}
+	default:
+		chunks = []provider.Chunk{{Type: provider.ChunkText, Text: "parent done"}, {Type: provider.ChunkDone}}
+	}
+	ch := make(chan provider.Chunk, len(chunks))
+	for _, chunk := range chunks {
+		ch <- chunk
+	}
+	close(ch)
+	return ch, nil
+}
+
 func TestNewProviderAppliesConfiguredDefaultEffort(t *testing.T) {
 	var gotReq map[string]any
 	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
diff --git a/internal/boot/subagent_model_test.go b/internal/boot/subagent_model_test.go
index b2f9f8d65..e120a5a3d 100644
--- a/internal/boot/subagent_model_test.go
+++ b/internal/boot/subagent_model_test.go
@@ -89,3 +89,38 @@ func TestSubagentEffortRefAcceptsToolNameAliases(t *testing.T) {
 		t.Fatalf("security_review alias should configure security-review effort, got %q", got)
 	}
 }
+
+func TestSubagentEffectiveIdentityUsesResolvedModelAndEffort(t *testing.T) {
+	cfg := config.Default()
+	cfg.Providers = []config.ProviderEntry{{
+		Name:             "custom",
+		Kind:             "openai",
+		Models:           []string{"alpha", "beta"},
+		Default:          "beta",
+		SupportedEfforts: []string{"low", "high"},
+		DefaultEffort:    "high",
+	}}
+	base, ok := cfg.ResolveModel("custom")
+	if !ok {
+		t.Fatal("custom provider should resolve")
+	}
+
+	model, effort := subagentEffectiveIdentity(cfg, "custom", base, "", "")
+	if model != "custom/beta" || effort != "high" {
+		t.Fatalf("identity = %q/%q, want custom/beta/high", model, effort)
+	}
+
+	model, effort = subagentEffectiveIdentity(cfg, "custom", base, "alpha", "low")
+	if model != "custom/alpha" || effort != "low" {
+		t.Fatalf("override identity = %q/%q, want custom/alpha/low", model, effort)
+	}
+}
+
+func TestNewSubagentStoreRequiresSessionDir(t *testing.T) {
+	if got := newSubagentStore(""); got != nil {
+		t.Fatalf("empty session dir should disable subagent store, got %#v", got)
+	}
+	if got := newSubagentStore(t.TempDir()); got == nil {
+		t.Fatal("non-empty session dir should create subagent store")
+	}
+}
diff --git a/internal/cli/review.go b/internal/cli/review.go
index 58a90513b..f91841db9 100644
--- a/internal/cli/review.go
+++ b/internal/cli/review.go
@@ -90,7 +90,7 @@ func reviewCommand(args []string) int {
 
 	// 7. Run the review subagent.
 	ctx := context.Background()
-	result, err := agent.RunSubAgent(ctx, prov, reg, reviewSk.Body, task, agent.Options{
+	result, err := agent.RunSubAgentWithSession(ctx, prov, reg, agent.NewSession(reviewSk.Body), task, agent.Options{
 		MaxSteps:      12,
 		Temperature:   cfg.Agent.Temperature,
 		Pricing:       entry.Price,
diff --git a/internal/control/controller.go b/internal/control/controller.go
index 24a132d6b..d611d3051 100644
--- a/internal/control/controller.go
+++ b/internal/control/controller.go
@@ -443,6 +443,7 @@ func (c *Controller) runTurnWithRaw(ctx context.Context, input, raw string) erro
 func (c *Controller) runTurnWithRawDisplay(ctx context.Context, input, raw, display string) error {
 	c.maybeSessionStart(ctx)
 	c.maybeAutoPlan(ctx, raw)
+	ctx = agent.WithParentSession(ctx, c.parentSessionID())
 	input = c.Compose(input)
 	startMessages := c.messageCount()
 	defer c.snapshotActivityIfChanged(startMessages)
@@ -781,6 +782,7 @@ func (c *Controller) notice(text string) {
 // just needs the exit status — no TurnDone event, no cancel bookkeeping.
 func (c *Controller) Run(ctx context.Context, input string) error {
 	c.maybeSessionStart(ctx)
+	ctx = agent.WithParentSession(ctx, c.parentSessionID())
 	startMessages := c.messageCount()
 	defer c.snapshotActivityIfChanged(startMessages)
 	if c.hooks.Enabled() {
@@ -1405,6 +1407,10 @@ func (c *Controller) SessionPath() string {
 	return c.sessionPath
 }
 
+func (c *Controller) parentSessionID() string {
+	return agent.BranchID(c.SessionPath())
+}
+
 // History returns the executor's current message log (for repopulating a
 // resumed frontend's view).
 func (c *Controller) History() []provider.Message {
diff --git a/internal/serve/serve.go b/internal/serve/serve.go
index 3e211833c..a71b2f2a7 100644
--- a/internal/serve/serve.go
+++ b/internal/serve/serve.go
@@ -888,6 +888,10 @@ func (s *Server) deleteSession(w http.ResponseWriter, r *http.Request) {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return
 	}
+	if err := agent.DeleteSubagentsByParent(dir, agent.BranchID(abs)); err != nil {
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
 	w.WriteHeader(http.StatusNoContent)
 }
 
diff --git a/internal/serve/serve_test.go b/internal/serve/serve_test.go
index 8fa789bf1..b3d44b6ac 100644
--- a/internal/serve/serve_test.go
+++ b/internal/serve/serve_test.go
@@ -12,6 +12,7 @@ import (
 	"testing"
 	"time"
 
+	"reasonix/internal/agent"
 	"reasonix/internal/config"
 	"reasonix/internal/control"
 	"reasonix/internal/provider"
@@ -282,6 +283,8 @@ func TestDeleteSessionRequiresSessionNameInsideSessionDir(t *testing.T) {
 			t.Fatal(err)
 		}
 	}
+	ref := "sa_20260102_030405_000000000_aabbccddeeff"
+	writeServeSubagentArtifact(t, dir, ref, agent.BranchID(old))
 	sibling := dir + "-other"
 	if err := os.MkdirAll(sibling, 0o755); err != nil {
 		t.Fatal(err)
@@ -322,6 +325,36 @@ func TestDeleteSessionRequiresSessionNameInsideSessionDir(t *testing.T) {
 	if _, err := os.Stat(old); !os.IsNotExist(err) {
 		t.Fatalf("old session still exists or stat failed unexpectedly: %v", err)
 	}
+	if _, err := os.Stat(filepath.Join(dir, "subagents", ref+".jsonl")); !os.IsNotExist(err) {
+		t.Fatalf("old session subagent jsonl still exists or stat failed unexpectedly: %v", err)
+	}
+	if _, err := os.Stat(filepath.Join(dir, "subagents", ref+".meta.json")); !os.IsNotExist(err) {
+		t.Fatalf("old session subagent meta still exists or stat failed unexpectedly: %v", err)
+	}
+}
+
+func writeServeSubagentArtifact(t *testing.T, dir, ref, parentSession string) {
+	t.Helper()
+	subagentDir := filepath.Join(dir, "subagents")
+	if err := os.MkdirAll(subagentDir, 0o755); err != nil {
+		t.Fatal(err)
+	}
+	if err := os.WriteFile(filepath.Join(subagentDir, ref+".jsonl"), []byte(`{"role":"user","content":"sub"}`+"\n"), 0o644); err != nil {
+		t.Fatal(err)
+	}
+	data, err := json.Marshal(agent.SubagentMeta{
+		Ref:           ref,
+		Status:        agent.SubagentCompleted,
+		Kind:          "task",
+		Name:          "task",
+		ParentSession: parentSession,
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+	if err := os.WriteFile(filepath.Join(subagentDir, ref+".meta.json"), data, 0o644); err != nil {
+		t.Fatal(err)
+	}
 }
 
 func TestServeSubmitMalformedJSON(t *testing.T) {
diff --git a/internal/skill/tools.go b/internal/skill/tools.go
index 13fed81f2..57ce5630b 100644
--- a/internal/skill/tools.go
+++ b/internal/skill/tools.go
@@ -17,7 +17,12 @@ import (
 // the final answer. boot wires this over the agent's sub-agent machinery; nil
 // means subagent skills are unavailable in this session (they error rather than
 // silently inlining, which would lose the isolation the author asked for).
-type SubagentRunner func(ctx context.Context, sk Skill, task string) (string, error)
+type SubagentRunOptions struct {
+	ContinueFrom string
+	ForkFrom     string
+}
+
+type SubagentRunner func(ctx context.Context, sk Skill, task string, opts SubagentRunOptions) (string, error)
 
 // ProfileResolver returns the model/effort profile a subagent skill will use.
 // It is optional; without one, skill frontmatter still supplies display metadata.
@@ -61,7 +66,9 @@ func (*runSkillTool) Schema() json.RawMessage {
 "type":"object",
 "properties":{
   "name":{"type":"string","description":"Skill identifier as it appears in the pinned Skills index (e.g. 'explore', 'review'). Case-sensitive. Just the identifier, not the [🧬 subagent] tag."},
-  "arguments":{"type":"string","description":"Free-form arguments. For inline skills: appended as an 'Arguments:' line; the skill's own instructions decide how to use them. For subagent skills: REQUIRED — becomes the entire task the subagent receives."}
+  "arguments":{"type":"string","description":"Free-form arguments. For inline skills: appended as an 'Arguments:' line; the skill's own instructions decide how to use them. For subagent skills: REQUIRED — becomes the entire task the subagent receives."},
+  "continue_from":{"type":"string","description":"Optional subagent transcript reference to continue in place. Only valid for runAs=subagent skills."},
+  "fork_from":{"type":"string","description":"Optional subagent transcript reference to copy before running. Only valid for runAs=subagent skills; mutually exclusive with continue_from."}
 },
 "required":["name"]
 }`)
@@ -71,6 +78,8 @@ func (t *runSkillTool) Execute(ctx context.Context, args json.RawMessage) (strin
 	var p struct {
 		Name      string `json:"name"`
 		Arguments string `json:"arguments"`
+		Continue  string `json:"continue_from"`
+		Fork      string `json:"fork_from"`
 	}
 	if err := json.Unmarshal(args, &p); err != nil {
 		return "", fmt.Errorf("invalid args: %w", err)
@@ -84,6 +93,7 @@ func (t *runSkillTool) Execute(ctx context.Context, args json.RawMessage) (strin
 		return "", fmt.Errorf("unknown skill %q — available: %s", name, availableNames(t.store))
 	}
 	rawArgs := strings.TrimSpace(p.Arguments)
+	opts := SubagentRunOptions{ContinueFrom: strings.TrimSpace(p.Continue), ForkFrom: strings.TrimSpace(p.Fork)}
 
 	if sk.RunAs == RunSubagent {
 		if t.runner == nil {
@@ -92,7 +102,10 @@ func (t *runSkillTool) Execute(ctx context.Context, args json.RawMessage) (strin
 		if rawArgs == "" {
 			return "", fmt.Errorf("run_skill: skill %q is a subagent and requires 'arguments' — the subagent has no other context, so describe the concrete task", name)
 		}
-		return t.runner(ctx, sk, rawArgs)
+		return t.runner(ctx, sk, rawArgs, opts)
+	}
+	if opts.ContinueFrom != "" || opts.ForkFrom != "" {
+		return "", fmt.Errorf("run_skill: continue_from/fork_from are only valid for runAs=subagent skills")
 	}
 	return renderInline(sk, rawArgs), nil
 }
@@ -198,12 +211,14 @@ func (t *subagentSkillTool) Description() string { return t.description }
 
 func (t *subagentSkillTool) Schema() json.RawMessage {
 	return json.RawMessage(`{"type":"object","properties":{"task":{"type":"string","description":` +
-		strconv.Quote(t.taskDesc) + `}},"required":["task"]}`)
+		strconv.Quote(t.taskDesc) + `},"continue_from":{"type":"string","description":"Optional subagent transcript reference to continue in place."},"fork_from":{"type":"string","description":"Optional subagent transcript reference to copy before running. Mutually exclusive with continue_from."}},"required":["task"]}`)
 }
 
 func (t *subagentSkillTool) Execute(ctx context.Context, args json.RawMessage) (string, error) {
 	var p struct {
-		Task string `json:"task"`
+		Task     string `json:"task"`
+		Continue string `json:"continue_from"`
+		Fork     string `json:"fork_from"`
 	}
 	if err := json.Unmarshal(args, &p); err != nil {
 		return "", fmt.Errorf("invalid args: %w", err)
@@ -224,7 +239,7 @@ func (t *subagentSkillTool) Execute(ctx context.Context, args json.RawMessage) (
 	if t.runner == nil {
 		return "", fmt.Errorf("%s: no subagent runner is configured in this session", t.toolName)
 	}
-	return t.runner(ctx, sk, task)
+	return t.runner(ctx, sk, task, SubagentRunOptions{ContinueFrom: strings.TrimSpace(p.Continue), ForkFrom: strings.TrimSpace(p.Fork)})
 }
 
 func (t *subagentSkillTool) ResolveProfile(json.RawMessage) *event.Profile {
diff --git a/internal/skill/tools_test.go b/internal/skill/tools_test.go
index 51e1f967b..3b359175b 100644
--- a/internal/skill/tools_test.go
+++ b/internal/skill/tools_test.go
@@ -49,7 +49,7 @@ func TestRunSkillSubagentRuns(t *testing.T) {
 	home := t.TempDir()
 	writeSkill(t, home, ".reasonix/skills/dig.md", "---\ndescription: dig\nrunAs: subagent\n---\nbody")
 	var gotTask string
-	runner := func(_ context.Context, sk Skill, task string) (string, error) {
+	runner := func(_ context.Context, sk Skill, task string, _ SubagentRunOptions) (string, error) {
 		gotTask = task
 		return "answer from " + sk.Name, nil
 	}
@@ -86,7 +86,9 @@ func TestRunSkillSubagentResolvesProfile(t *testing.T) {
 func TestRunSkillSubagentRequiresArgs(t *testing.T) {
 	home := t.TempDir()
 	writeSkill(t, home, ".reasonix/skills/dig.md", "---\ndescription: dig\nrunAs: subagent\n---\nbody")
-	runner := func(_ context.Context, _ Skill, _ string) (string, error) { return "x", nil }
+	runner := func(_ context.Context, _ Skill, _ string, _ SubagentRunOptions) (string, error) {
+		return "x", nil
+	}
 	tl := NewRunSkillTool(New(Options{HomeDir: home, DisableBuiltins: true}), runner)
 	if _, err := tl.Execute(context.Background(), json.RawMessage(`{"name":"dig"}`)); err == nil {
 		t.Error("subagent skill should require arguments")
@@ -111,7 +113,7 @@ func TestCleanSkillName(t *testing.T) {
 
 func TestBuiltinSubagentToolsRunner(t *testing.T) {
 	var ran string
-	runner := func(_ context.Context, sk Skill, task string) (string, error) {
+	runner := func(_ context.Context, sk Skill, task string, _ SubagentRunOptions) (string, error) {
 		ran = sk.Name + ":" + task
 		return "ok", nil
 	}
@@ -136,6 +138,34 @@ func TestBuiltinSubagentToolsRunner(t *testing.T) {
 	}
 }
 
+func TestBuiltinSubagentToolsPassContinuationOptions(t *testing.T) {
+	var got SubagentRunOptions
+	runner := func(_ context.Context, _ Skill, _ string, opts SubagentRunOptions) (string, error) {
+		got = opts
+		return "ok", nil
+	}
+	tools := BuiltinSubagentTools(New(Options{HomeDir: t.TempDir()}), runner)
+	var review interface {
+		Name() string
+		Execute(context.Context, json.RawMessage) (string, error)
+	}
+	for _, tl := range tools {
+		if tl.Name() == "review" {
+			review = tl
+			break
+		}
+	}
+	if review == nil {
+		t.Fatal("review wrapper tool not built")
+	}
+	if _, err := review.Execute(context.Background(), json.RawMessage(`{"task":"again","continue_from":"sa_prev"}`)); err != nil {
+		t.Fatalf("execute: %v", err)
+	}
+	if got.ContinueFrom != "sa_prev" || got.ForkFrom != "" {
+		t.Fatalf("continuation opts = %+v, want continue_from sa_prev", got)
+	}
+}
+
 func TestBuiltinSubagentToolResolvesProfile(t *testing.T) {
 	store := New(Options{HomeDir: t.TempDir()})
 	tools := BuiltinSubagentTools(store, nil, func(sk Skill) *event.Profile {

From 51811c1d04a288a829642b45cf8186592a223f0f Mon Sep 17 00:00:00 2001
From: YHH <359807859@qq.com>
Date: Tue, 9 Jun 2026 17:02:45 -0700
Subject: [PATCH 36/64] fix(security): resolve open code-scanning alerts
 (archive extraction, command injection, untrusted checkout, integer bounds)
 (#3718)

* @
fix(codegraph): resolve symlinks when extracting third-party bundle

The lexical tar/zip-slip guard missed the symlink-redirect escape: an
in-bounds symlink extracted as a parent component lets a later entry be
written through it to land outside the cache dir. Resolve the real parent
with EvalSymlinks before validating, and judge a symlink target from its
resolved location. Closes the go/unsafe-unzip-symlink + go/zipslip alerts.
@

* @
fix(scripts): run gh without a shell in backfill-issue-labels

execSync built a shell command string from interpolated values; switch to
execFileSync with an argv array so label and issue arguments can never be
parsed as shell. Closes the js/command-line-injection alert.
@

* @
ci(e2e-bot): gate untrusted PR-head run behind an environment

Running PR-head code with the provider secret was guarded only by the
author_association check. Add an `e2e-bot` deployment environment (configure
required reviewers to force per-run approval) and pin the checkout to the
head commit resolved at trigger time, detached, so a mid-run force-push
cannot swap in different code. Addresses actions/untrusted-checkout-toctou.
@

* @
fix: bound integer conversions flagged by code scanning

parseHexColor parses single bytes; parse them as 8-bit unsigned and return
int so the per-channel value is provably in range, dropping the
int64->int conversions at the call sites. Clamp the Myers maxD against a
negative n+m overflow too, so make() can never see a wrapped size.
@

---------

Co-authored-by: reasonix <reasonix@deepseek.com>
---
 .github/workflows/e2e-bot.yml             | 13 ++++-
 internal/cli/theme.go                     | 12 ++---
 internal/codegraph/install.go             | 59 +++++++++++++++--------
 internal/codegraph/install_test.go        | 15 +++---
 internal/codegraph/symlink_escape_test.go | 40 +++++++++++++++
 internal/diff/diff.go                     |  4 +-
 scripts/backfill-issue-labels.mjs         | 13 ++---
 7 files changed, 114 insertions(+), 42 deletions(-)

diff --git a/.github/workflows/e2e-bot.yml b/.github/workflows/e2e-bot.yml
index 944f7de87..755e44b8f 100644
--- a/.github/workflows/e2e-bot.yml
+++ b/.github/workflows/e2e-bot.yml
@@ -25,6 +25,11 @@ jobs:
       contains(github.event.comment.body, '/e2e') &&
       contains(fromJSON('["OWNER","MEMBER","COLLABORATOR"]'), github.event.comment.author_association)
     runs-on: ubuntu-latest
+    # Running PR-head code with the provider secret is gated twice: the author_
+    # association check above, and this deployment environment. Configure the
+    # `e2e-bot` environment with required reviewers in repo settings to force a
+    # human approval per run (actions/untrusted-checkout-toctou).
+    environment: e2e-bot
     steps:
       - name: Acknowledge
         uses: actions/github-script@v9
@@ -62,7 +67,13 @@ jobs:
       - name: Check out the PR head
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: gh pr checkout ${{ github.event.issue.number }}
+        # Pin to the head commit resolved now and check it out detached, not the
+        # mutable PR ref: a force-push mid-run can't swap in different code after
+        # the trusted-author gate passed.
+        run: |
+          SHA=$(gh pr view ${{ github.event.issue.number }} --json headRefOid -q .headRefOid)
+          git fetch -q origin "$SHA"
+          git checkout -q --detach "$SHA"
 
       - name: Build the agent from the PR head
         # The whole point of the bot is to drive the PR's code, not main-v2's. Fall
diff --git a/internal/cli/theme.go b/internal/cli/theme.go
index f90a457da..fff65a41b 100644
--- a/internal/cli/theme.go
+++ b/internal/cli/theme.go
@@ -252,7 +252,7 @@ func parseOSC11Response(s string) (terminalRGB, bool) {
 	payload = strings.TrimSpace(payload)
 	if strings.HasPrefix(payload, "#") {
 		r, g, b, ok := parseHexColor(payload)
-		return terminalRGB{int(r), int(g), int(b)}, ok
+		return terminalRGB{r, g, b}, ok
 	}
 	for _, prefix := range []string{"rgb:", "rgba:"} {
 		if strings.HasPrefix(payload, prefix) {
@@ -318,15 +318,15 @@ func bgSGR(c cliColor) string {
 	return fmt.Sprintf("\033[48;5;%dm", c.xterm)
 }
 
-func parseHexColor(hex string) (int64, int64, int64, bool) {
+func parseHexColor(hex string) (int, int, int, bool) {
 	hex = strings.TrimPrefix(hex, "#")
 	if len(hex) != 6 {
 		return 0, 0, 0, false
 	}
-	r, errR := strconv.ParseInt(hex[0:2], 16, 64)
-	g, errG := strconv.ParseInt(hex[2:4], 16, 64)
-	b, errB := strconv.ParseInt(hex[4:6], 16, 64)
-	return r, g, b, errR == nil && errG == nil && errB == nil
+	r, errR := strconv.ParseUint(hex[0:2], 16, 8)
+	g, errG := strconv.ParseUint(hex[2:4], 16, 8)
+	b, errB := strconv.ParseUint(hex[4:6], 16, 8)
+	return int(r), int(g), int(b), errR == nil && errG == nil && errB == nil
 }
 
 func supportsTrueColor() bool {
diff --git a/internal/codegraph/install.go b/internal/codegraph/install.go
index bacbc9ddf..dea87060f 100644
--- a/internal/codegraph/install.go
+++ b/internal/codegraph/install.go
@@ -258,27 +258,42 @@ func sha256For(sums, name string) (string, error) {
 	return "", fmt.Errorf("codegraph: %s not listed in SHA256SUMS", name)
 }
 
-// safeJoin joins dir and a (possibly hostile) archive entry name, rejecting any
-// path that would escape dir — the zip-slip / tar-slip guard.
-func safeJoin(dir, name string) (string, error) {
-	p := filepath.Join(dir, name)
-	if p != dir && !strings.HasPrefix(p, dir+string(os.PathSeparator)) {
+// resolveWithin returns the real path to write archive entry name under root
+// (parents created), rejecting escapes. EvalSymlinks on the parent also catches
+// the symlink-redirect variant a lexical "../" check misses: a parent component
+// an earlier entry turned into a symlink, written *through* to land outside root.
+func resolveWithin(root, name string) (string, error) {
+	target := filepath.Join(root, name)
+	if target != root && !strings.HasPrefix(target, root+string(os.PathSeparator)) {
 		return "", fmt.Errorf("unsafe path %q in archive", name)
 	}
-	return p, nil
+	if target == root {
+		return root, nil
+	}
+	parent := filepath.Dir(target)
+	if err := os.MkdirAll(parent, 0o755); err != nil {
+		return "", err
+	}
+	realParent, err := filepath.EvalSymlinks(parent)
+	if err != nil {
+		return "", err
+	}
+	if realParent != root && !strings.HasPrefix(realParent, root+string(os.PathSeparator)) {
+		return "", fmt.Errorf("unsafe path %q in archive: escapes via symlink", name)
+	}
+	return filepath.Join(realParent, filepath.Base(target)), nil
 }
 
-// safeSymlink rejects a symlink whose destination escapes dir. linkPath is the
-// symlink's own (already safeJoin'd) location; linkname is its raw target. Without
-// this a symlink to ../../etc lets a later archive entry written "through" it land
-// outside dir — the tar-slip-via-symlink the path check alone misses.
-func safeSymlink(dir, linkPath, linkname string) error {
+// symlinkWithin rejects a symlink whose target escapes root. linkPath is the
+// symlink's already-resolved real location (from resolveWithin), so a relative
+// target is judged from where the link truly lands, not its lexical archive path.
+func symlinkWithin(root, linkPath, linkname string) error {
 	dest := linkname
 	if !filepath.IsAbs(dest) {
 		dest = filepath.Join(filepath.Dir(linkPath), linkname)
 	}
 	dest = filepath.Clean(dest)
-	if dest != dir && !strings.HasPrefix(dest, dir+string(os.PathSeparator)) {
+	if dest != root && !strings.HasPrefix(dest, root+string(os.PathSeparator)) {
 		return fmt.Errorf("unsafe symlink %q -> %q in archive", linkPath, linkname)
 	}
 	return nil
@@ -290,6 +305,10 @@ func extractTarGz(data []byte, dir string) error {
 		return err
 	}
 	defer gz.Close()
+	root, err := filepath.EvalSymlinks(dir)
+	if err != nil {
+		return err
+	}
 	tr := tar.NewReader(gz)
 	for {
 		hdr, err := tr.Next()
@@ -299,7 +318,7 @@ func extractTarGz(data []byte, dir string) error {
 		if err != nil {
 			return err
 		}
-		target, err := safeJoin(dir, hdr.Name)
+		target, err := resolveWithin(root, hdr.Name)
 		if err != nil {
 			return err
 		}
@@ -309,10 +328,7 @@ func extractTarGz(data []byte, dir string) error {
 				return err
 			}
 		case tar.TypeSymlink:
-			if err := safeSymlink(dir, target, hdr.Linkname); err != nil {
-				return err
-			}
-			if err := os.MkdirAll(filepath.Dir(target), 0o755); err != nil {
+			if err := symlinkWithin(root, target, hdr.Linkname); err != nil {
 				return err
 			}
 			_ = os.Remove(target)
@@ -332,8 +348,12 @@ func extractZip(data []byte, dir string) error {
 	if err != nil {
 		return err
 	}
+	root, err := filepath.EvalSymlinks(dir)
+	if err != nil {
+		return err
+	}
 	for _, f := range zr.File {
-		target, err := safeJoin(dir, f.Name)
+		target, err := resolveWithin(root, f.Name)
 		if err != nil {
 			return err
 		}
@@ -357,9 +377,6 @@ func extractZip(data []byte, dir string) error {
 }
 
 func writeFileFromReader(target string, r io.Reader, mode os.FileMode) error {
-	if err := os.MkdirAll(filepath.Dir(target), 0o755); err != nil {
-		return err
-	}
 	f, err := os.OpenFile(target, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, mode.Perm())
 	if err != nil {
 		return err
diff --git a/internal/codegraph/install_test.go b/internal/codegraph/install_test.go
index 08489492d..b846823f0 100644
--- a/internal/codegraph/install_test.go
+++ b/internal/codegraph/install_test.go
@@ -76,13 +76,16 @@ func TestSha256For(t *testing.T) {
 	}
 }
 
-func TestSafeJoinRejectsTraversal(t *testing.T) {
-	dir := t.TempDir()
-	if _, err := safeJoin(dir, "../escape"); err == nil {
-		t.Fatal("safeJoin should reject ../escape")
+func TestResolveWithinRejectsTraversal(t *testing.T) {
+	root, err := filepath.EvalSymlinks(t.TempDir())
+	if err != nil {
+		t.Fatal(err)
+	}
+	if _, err := resolveWithin(root, "../escape"); err == nil {
+		t.Fatal("resolveWithin should reject ../escape")
 	}
-	if _, err := safeJoin(dir, "bin/codegraph"); err != nil {
-		t.Fatalf("safeJoin rejected a normal path: %v", err)
+	if _, err := resolveWithin(root, "bin/codegraph"); err != nil {
+		t.Fatalf("resolveWithin rejected a normal path: %v", err)
 	}
 }
 
diff --git a/internal/codegraph/symlink_escape_test.go b/internal/codegraph/symlink_escape_test.go
index c84f2df5b..4ee046193 100644
--- a/internal/codegraph/symlink_escape_test.go
+++ b/internal/codegraph/symlink_escape_test.go
@@ -35,6 +35,46 @@ func TestExtractRejectsEscapingSymlink(t *testing.T) {
 	}
 }
 
+// tarGz builds a tar.gz from the given headers in order, each with no body.
+func tarGz(hdrs ...*tar.Header) []byte {
+	var buf bytes.Buffer
+	gz := gzip.NewWriter(&buf)
+	tw := tar.NewWriter(gz)
+	for _, h := range hdrs {
+		_ = tw.WriteHeader(h)
+	}
+	tw.Close()
+	gz.Close()
+	return buf.Bytes()
+}
+
+// TestExtractRejectsSymlinkRedirectEscape covers the variant a lexical path check
+// misses: an in-bounds symlink ("real/up" -> "..", which lands on root) is made a
+// parent of a second symlink, so the second link's real location is root/escape
+// even though its archive path is real/up/escape. Resolving the parent before
+// validating the target is what catches it (go/unsafe-unzip-symlink).
+func TestExtractRejectsSymlinkRedirectEscape(t *testing.T) {
+	dir := t.TempDir()
+	if err := os.Symlink("probe-target", filepath.Join(dir, "probe-link")); err != nil {
+		t.Skipf("symlink creation is not available in this environment: %v", err)
+	}
+	_ = os.Remove(filepath.Join(dir, "probe-link"))
+	data := tarGz(
+		&tar.Header{Name: "real/", Typeflag: tar.TypeDir, Mode: 0o755},
+		&tar.Header{Name: "real/up", Typeflag: tar.TypeSymlink, Linkname: "..", Mode: 0o777},
+		&tar.Header{Name: "real/up/escape", Typeflag: tar.TypeSymlink, Linkname: "..", Mode: 0o777},
+	)
+	err := extractTarGz(data, dir)
+	if err == nil || !strings.Contains(err.Error(), "unsafe symlink") {
+		t.Fatalf("symlink-redirect escape should be rejected, got %v", err)
+	}
+	if _, err := os.Lstat(filepath.Dir(dir)); err == nil {
+		if _, err := os.Lstat(filepath.Join(filepath.Dir(dir), "escape")); err == nil {
+			t.Fatal("escape symlink was planted outside the extraction dir")
+		}
+	}
+}
+
 // TestExtractAllowsInternalSymlink keeps legitimate in-bundle symlinks working.
 func TestExtractAllowsInternalSymlink(t *testing.T) {
 	dir := t.TempDir()
diff --git a/internal/diff/diff.go b/internal/diff/diff.go
index 1850476ad..60df68078 100644
--- a/internal/diff/diff.go
+++ b/internal/diff/diff.go
@@ -154,8 +154,8 @@ func myers(a, b []string) ([]op, bool) {
 		return nil, true
 	}
 	maxD := n + m
-	if maxD > maxDiffEdits {
-		maxD = maxDiffEdits // bound the trace's O(D²) footprint
+	if maxD > maxDiffEdits || maxD < 0 {
+		maxD = maxDiffEdits // bound the trace's O(D²) footprint (and any n+m overflow)
 	}
 	offset := maxD // shift negative k into a non-negative array index
 	v := make([]int, 2*maxD+1)
diff --git a/scripts/backfill-issue-labels.mjs b/scripts/backfill-issue-labels.mjs
index 985190c56..39d14eabb 100644
--- a/scripts/backfill-issue-labels.mjs
+++ b/scripts/backfill-issue-labels.mjs
@@ -11,7 +11,7 @@
 //   --only-unlabeled   skip issues that already have an area label
 //   --limit N          process at most N issues (default 200)
 
-import { execSync } from 'node:child_process';
+import { execFileSync } from 'node:child_process';
 
 const args = process.argv.slice(2);
 const dryRun = args.includes('--dry-run');
@@ -52,8 +52,8 @@ const SYSTEM = [
   'Reply with JSON only: {"area":[],"platform":[],"severity":[]}',
 ].join('\n');
 
-function gh(cmd) {
-  return execSync(`gh ${cmd}`, { encoding: 'utf8', maxBuffer: 64 * 1024 * 1024 });
+function gh(args) {
+  return execFileSync('gh', args, { encoding: 'utf8', maxBuffer: 64 * 1024 * 1024 });
 }
 
 async function classify(title, body) {
@@ -76,7 +76,9 @@ async function classify(title, body) {
   return [...(parsed.area || []), ...(parsed.platform || []), ...(parsed.severity || [])].filter((l) => ALLOWED.has(l));
 }
 
-const issues = JSON.parse(gh(`issue list --state open --limit ${limit} --json number,title,body,labels`));
+const issues = JSON.parse(
+  gh(['issue', 'list', '--state', 'open', '--limit', String(limit), '--json', 'number,title,body,labels']),
+);
 console.log(`${issues.length} open issues; dryRun=${dryRun} onlyUnlabeled=${onlyUnlabeled}`);
 
 let changed = 0;
@@ -101,8 +103,7 @@ for (const it of issues) {
   if (dryRun) {
     console.log(`#${it.number}: would add ${toAdd.join(', ')}  — ${it.title.slice(0, 50)}`);
   } else {
-    const flags = toAdd.map((l) => `--add-label "${l}"`).join(' ');
-    gh(`issue edit ${it.number} ${flags}`);
+    gh(['issue', 'edit', String(it.number), ...toAdd.flatMap((l) => ['--add-label', l])]);
     console.log(`#${it.number}: +${toAdd.join(', ')}`);
   }
   changed++;

From 07de1b57e3c3947eb2acd97ce2667c64636d8cc1 Mon Sep 17 00:00:00 2001
From: YHH <359807859@qq.com>
Date: Tue, 9 Jun 2026 17:22:00 -0700
Subject: [PATCH 37/64] fix(desktop): strip controller-injected prefixes from
 chat display (#3720)

Strip controller-injected prefixes ([Plan mode] marker, <memory-update>, <background-jobs>) and synthetic Role:user messages from the chat display so agent-mode internals no longer leak into the desktop/TUI transcript. Closes #3738, Closes #3720.
---
 desktop/app.go                 |   3 +
 desktop/sessions.go            |   3 +-
 internal/cli/chat_tui.go       |   2 +-
 internal/control/input.go      |  58 +++++++++++++++
 internal/control/input_test.go | 124 +++++++++++++++++++++++++++++++++
 5 files changed, 188 insertions(+), 2 deletions(-)

diff --git a/desktop/app.go b/desktop/app.go
index 702069446..203de28de 100644
--- a/desktop/app.go
+++ b/desktop/app.go
@@ -1293,6 +1293,9 @@ func historyMessages(msgs []provider.Message, resolveUserContent func(string) st
 		content := m.Content
 		if m.Role == provider.RoleUser {
 			content = resolveUserContent(m.Content)
+			if control.IsSyntheticUserMessage(content) {
+				continue
+			}
 		}
 		reasoning := ""
 		if m.Role == provider.RoleAssistant {
diff --git a/desktop/sessions.go b/desktop/sessions.go
index 1b8b5d4ae..b9a57aa0f 100644
--- a/desktop/sessions.go
+++ b/desktop/sessions.go
@@ -11,6 +11,7 @@ import (
 	"time"
 
 	"reasonix/internal/agent"
+	"reasonix/internal/control"
 	"reasonix/internal/fileutil"
 )
 
@@ -471,7 +472,7 @@ func sessionDisplayResolver(dir, sessionPath string) func(content string) string
 				return display
 			}
 		}
-		return content
+		return control.StripComposePrefixes(content)
 	}
 }
 
diff --git a/internal/cli/chat_tui.go b/internal/cli/chat_tui.go
index 56fc6a804..2b058f450 100644
--- a/internal/cli/chat_tui.go
+++ b/internal/cli/chat_tui.go
@@ -3448,7 +3448,7 @@ func replaySectionsFor(history []provider.Message, width int, renderer *mdRender
 	for _, m := range history {
 		switch m.Role {
 		case provider.RoleUser:
-			content := strings.TrimPrefix(m.Content, control.PlanModeMarker+"\n\n")
+			content := control.StripComposePrefixes(m.Content)
 			out = append(out, renderUserBubble(content, width, false)+"\n\n")
 		case provider.RoleAssistant:
 			body := strings.TrimSpace(m.Content)
diff --git a/internal/control/input.go b/internal/control/input.go
index e56cf0d12..27c5bd281 100644
--- a/internal/control/input.go
+++ b/internal/control/input.go
@@ -2,16 +2,74 @@ package control
 
 import (
 	"context"
+	"regexp"
 	"strings"
 
 	"reasonix/internal/skill"
 )
 
+var reComposeBlock = regexp.MustCompile(`(?s)^\s*<(?:memory-update|background-jobs)>.*?</(?:memory-update|background-jobs)>\s*\n`)
+
 // PlanModeMarker is prepended to every user turn while plan mode is on. It rides
 // in the user message (not the system prompt or tools), so the cache-stable
 // prompt prefix is left untouched and the toggle costs nothing in cache hits.
 const PlanModeMarker = "[Plan mode — read-only. Explore the codebase first (read_file, ls, grep, glob, web_fetch, task are available; writers are refused by the harness), then present a LAYERED plan as your reply and stop — do not write files, edit, or run side-effecting bash. Structure the plan as a two-level markdown list so it becomes a layered task list: each PHASE is a top-level numbered list item (a coherent milestone, e.g. \"1. Add the config loader\"), and each phase's concrete, verifiable sub-steps are bullets indented beneath it (e.g. \"   - parse the TOML into Config\"). Use plain numbered list items for phases — do NOT write phases as markdown headings (##, ###) — so both levels parse. Keep phases few (about 2-6). The user will be asked to approve before any changes are made.]"
 
+// StripComposePrefixes removes controller-injected prefixes from a composed
+// user message so that the display text matches what the user actually typed.
+// It strips the PlanModeMarker, <memory-update>…</memory-update>, and
+// <background-jobs>…</background-jobs> blocks that Compose prepends to user
+// turns. This is used as a fallback when no .display.json sidecar recording
+// exists (e.g. sessions created before the display-recording feature, or
+// synthetic user messages injected by the controller).
+func StripComposePrefixes(content string) string {
+	s := content
+	for {
+		next := reComposeBlock.ReplaceAllStringFunc(s, func(match string) string {
+			return ""
+		})
+		if next == s {
+			break
+		}
+		s = next
+	}
+	s = strings.TrimPrefix(s, PlanModeMarker+"\n\n")
+	s = strings.TrimPrefix(s, PlanModeMarker)
+	s = strings.TrimSpace(s)
+	return s
+}
+
+// IsSyntheticUserMessage returns true if the content matches one of the known
+// synthetic user messages injected by the controller or agent loop (plan
+// approval, stream recovery, readiness retry, etc.). These should not be shown
+// in the chat UI.
+func IsSyntheticUserMessage(content string) bool {
+	trimmed := strings.TrimSpace(content)
+	if trimmed == planApprovedMessage {
+		return true
+	}
+	for _, prefix := range syntheticPrefixes {
+		if strings.HasPrefix(trimmed, prefix) {
+			return true
+		}
+	}
+	return false
+}
+
+// syntheticPrefixes must be kept in sync with the synthetic user messages
+// injected by the controller (planApprovedMessage) and agent loop
+// (streamRecoveryMessage, finalReadinessRetryMessage, emptyFinalRetryMessage,
+// executorHandoffRetryMessage in internal/agent/agent.go).
+var syntheticPrefixes = []string{
+	"Plan approved — plan mode is off",
+	"Host final-answer readiness check failed",
+	"You are already in the executor phase",
+	"The previous assistant response was interrupted while a tool call",
+	"The previous assistant response was interrupted during streaming",
+	"The previous assistant response was interrupted before visible",
+	"The previous assistant response finished without any visible answer",
+}
+
 // Compose applies the plan-mode marker to a turn's text when plan mode is on,
 // returning the message to actually send to the model. The frontend keeps
 // showing the raw text as the user bubble.
diff --git a/internal/control/input_test.go b/internal/control/input_test.go
index 2b6336b2e..a5cb4cf60 100644
--- a/internal/control/input_test.go
+++ b/internal/control/input_test.go
@@ -371,3 +371,127 @@ func TestRunTurnAutoPlanScoresRawPromptNotResolvedRefs(t *testing.T) {
 		t.Fatal("controller plan mode should remain off")
 	}
 }
+
+func TestStripComposePrefixes(t *testing.T) {
+	tests := []struct {
+		name  string
+		input string
+		want  string
+	}{
+		{
+			name:  "plain user message unchanged",
+			input: "explain this function",
+			want:  "explain this function",
+		},
+		{
+			name:  "plan mode marker stripped",
+			input: PlanModeMarker + "\n\nexplain this function",
+			want:  "explain this function",
+		},
+		{
+			name:  "plan mode marker without trailing newlines",
+			input: PlanModeMarker,
+			want:  "",
+		},
+		{
+			name:  "memory update block stripped",
+			input: "<memory-update>\nThe following project-memory changes were just made and apply from now on:\n- Saved memory \"rmb\": user balance\n</memory-update>\n\nexplain this",
+			want:  "explain this",
+		},
+		{
+			name:  "background jobs block stripped",
+			input: "<background-jobs>\n1 completed\n</background-jobs>\n\nexplain this",
+			want:  "explain this",
+		},
+		{
+			name:  "memory and plan marker both stripped",
+			input: "<memory-update>\n- note\n</memory-update>\n\n" + PlanModeMarker + "\n\nexplain this",
+			want:  "explain this",
+		},
+		{
+			name:  "empty after stripping",
+			input: PlanModeMarker + "\n\n",
+			want:  "",
+		},
+		{
+			name:  "memory update only no user text",
+			input: "<memory-update>\n- note\n</memory-update>\n\n",
+			want:  "",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got := StripComposePrefixes(tt.input)
+			if got != tt.want {
+				t.Errorf("StripComposePrefixes() = %q, want %q", got, tt.want)
+			}
+		})
+	}
+}
+
+func TestIsSyntheticUserMessage(t *testing.T) {
+	tests := []struct {
+		name  string
+		input string
+		want  bool
+	}{
+		{
+			name:  "plan approved message",
+			input: planApprovedMessage,
+			want:  true,
+		},
+		{
+			name:  "stream recovery interrupted tool",
+			input: "The previous assistant response was interrupted while a tool call was streaming. Continue the same task now.",
+			want:  true,
+		},
+		{
+			name:  "stream recovery interrupted text",
+			input: "The previous assistant response was interrupted during streaming. Continue the same task from immediately after the partial assistant message above.",
+			want:  true,
+		},
+		{
+			name:  "empty final retry",
+			input: "The previous assistant response finished without any visible answer text. Continue the same task now and provide a concise visible answer.",
+			want:  true,
+		},
+		{
+			name:  "readiness retry",
+			input: "Host final-answer readiness check failed. Before giving a final answer, address the missing host-observable receipts: missing evidence.",
+			want:  true,
+		},
+		{
+			name:  "executor handoff",
+			input: "You are already in the executor phase. The planner's read-only limitations do not apply to you.",
+			want:  true,
+		},
+		{
+			name:  "regular user message",
+			input: "explain this function",
+			want:  false,
+		},
+		{
+			name:  "plan mode marker in message",
+			input: PlanModeMarker + "\n\nexplain this",
+			want:  false,
+		},
+		{
+			name:  "stream recovery interrupted before visible",
+			input: "The previous assistant response was interrupted during streaming before visible answer text was completed. Continue the same task now.",
+			want:  true,
+		},
+		{
+			name:  "user quoting interrupted response not synthetic",
+			input: "The previous assistant response was interrupted by my VPN, can you retry?",
+			want:  false,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got := IsSyntheticUserMessage(tt.input)
+			if got != tt.want {
+				t.Errorf("IsSyntheticUserMessage() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}

From a64c91798f68559df21a5cdca16f93a25cf85fa1 Mon Sep 17 00:00:00 2001
From: YHH <359807859@qq.com>
Date: Tue, 9 Jun 2026 17:59:38 -0700
Subject: [PATCH 38/64] fix(provider): time out a stalled SSE stream instead of
 hanging (#3374) (#3745)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* @
fix(provider): time out a stalled SSE stream instead of hanging

A half-open connection (a proxy switched mid-stream, no RST) left scanner.Scan()
blocked forever: the UI sat on "thinking", Ctrl+C/Esc were unresponsive, and the
only way out was kill -9. Add an idle watchdog to both the openai-compatible and
anthropic stream readers — if a started stream goes silent past streamIdleTimeout
the body is closed and a clear "stream stalled" error surfaces, returning the
session to the input prompt. The watchdog owns the timer; the read loop pings a
buffered channel, so there is no Timer.Reset race, and the openai replay path
(#3148) is untouched. Closes #3374.
@

* fix(provider): make the SSE idle timeout per-client, not a global var

The first cut used a package-level var so tests could shorten it, but a test writing it raced another test stream watchdog reading it under go test -race. Store the window on the client (defaultStreamIdleTimeout via New); tests set the field on their own client before Stream, so the go statement orders the write before the watchdog read. A zero-value client falls back to the default.

---------

Co-authored-by: reasonix <reasonix@deepseek.com>
---
 internal/provider/anthropic/anthropic.go  | 86 ++++++++++++++++----
 internal/provider/anthropic/stall_test.go | 65 +++++++++++++++
 internal/provider/openai/openai.go        | 97 +++++++++++++++++------
 internal/provider/openai/stall_test.go    | 65 +++++++++++++++
 4 files changed, 271 insertions(+), 42 deletions(-)
 create mode 100644 internal/provider/anthropic/stall_test.go
 create mode 100644 internal/provider/openai/stall_test.go

diff --git a/internal/provider/anthropic/anthropic.go b/internal/provider/anthropic/anthropic.go
index b7fe900e3..fe3b59606 100644
--- a/internal/provider/anthropic/anthropic.go
+++ b/internal/provider/anthropic/anthropic.go
@@ -25,11 +25,20 @@ import (
 	"net/http"
 	"strings"
 	"sync"
+	"sync/atomic"
+	"time"
 
 	"reasonix/internal/netclient"
 	"reasonix/internal/provider"
 )
 
+// defaultStreamIdleTimeout caps how long a started SSE stream may go silent before
+// it's treated as a dropped connection — a half-open TCP connection (proxy switched
+// mid-stream) sends no RST, so scanner.Scan() would block forever. Generous on
+// purpose; live streams emit far more often. Stored per-client (client.idleTimeout)
+// so a test can shorten it without a shared global that races other watchdogs.
+const defaultStreamIdleTimeout = 120 * time.Second
+
 const (
 	// anthropicVersion is the required API version header value.
 	anthropicVersion = "2023-06-01"
@@ -83,14 +92,15 @@ func New(cfg provider.Config) (provider.Provider, error) {
 		root = defaultBaseURL
 	}
 	return &client{
-		name:     name,
-		apiKey:   cfg.APIKey,
-		keyEnv:   keyEnv,
-		baseURL:  root,
-		model:    cfg.Model,
-		thinking: thinking,
-		effort:   effort,
-		http:     httpClient, // no overall timeout; lifecycle is ctx-driven
+		name:        name,
+		apiKey:      cfg.APIKey,
+		keyEnv:      keyEnv,
+		baseURL:     root,
+		model:       cfg.Model,
+		thinking:    thinking,
+		effort:      effort,
+		http:        httpClient, // no overall timeout; lifecycle is ctx-driven
+		idleTimeout: defaultStreamIdleTimeout,
 	}, nil
 }
 
@@ -100,14 +110,15 @@ func newHTTPClient(cfg provider.Config) (*http.Client, error) {
 }
 
 type client struct {
-	name     string
-	apiKey   string
-	keyEnv   string // api_key_env name, surfaced in auth errors
-	baseURL  string
-	model    string
-	thinking string // "adaptive" enables extended thinking; "" = off (config-driven)
-	effort   string // output_config.effort: low|medium|high|xhigh|max; "" = provider default
-	http     *http.Client
+	name        string
+	apiKey      string
+	keyEnv      string // api_key_env name, surfaced in auth errors
+	baseURL     string
+	model       string
+	thinking    string // "adaptive" enables extended thinking; "" = off (config-driven)
+	effort      string // output_config.effort: low|medium|high|xhigh|max; "" = provider default
+	http        *http.Client
+	idleTimeout time.Duration // SSE stall watchdog window; defaultStreamIdleTimeout unless a test overrides
 }
 
 func (c *client) Name() string { return c.name }
@@ -269,6 +280,41 @@ func (c *client) readStream(resp *http.Response, out chan<- provider.Chunk) {
 	defer resp.Body.Close()
 	defer close(out)
 
+	// Close the body if the stream stalls past c.idleTimeout so scanner.Scan()
+	// unblocks instead of hanging on a half-open connection. The watchdog owns the
+	// timer; the read loop only pings the buffered activity channel (no Timer.Reset
+	// race). A context cancel already unblocks the scan via the transport.
+	idleTimeout := c.idleTimeout
+	if idleTimeout <= 0 { // zero-value client (constructed without New)
+		idleTimeout = defaultStreamIdleTimeout
+	}
+	done := make(chan struct{})
+	defer close(done)
+	activity := make(chan struct{}, 1)
+	var stalled atomic.Bool
+	go func() {
+		idle := time.NewTimer(idleTimeout)
+		defer idle.Stop()
+		for {
+			select {
+			case <-idle.C:
+				stalled.Store(true)
+				resp.Body.Close()
+				return
+			case <-activity:
+				if !idle.Stop() {
+					select {
+					case <-idle.C:
+					default:
+					}
+				}
+				idle.Reset(idleTimeout)
+			case <-done:
+				return
+			}
+		}
+	}()
+
 	tools := map[int]*provider.ToolCall{} // tool_use blocks, keyed by content index
 	var inTok, outTok, cacheCreate, cacheRead int
 	var stopReason string
@@ -278,6 +324,10 @@ func (c *client) readStream(resp *http.Response, out chan<- provider.Chunk) {
 	scanner.Buffer(make([]byte, 0, 64*1024), 1024*1024)
 
 	for scanner.Scan() {
+		select { // ping the idle watchdog; non-blocking so a full buffer is fine
+		case activity <- struct{}{}:
+		default:
+		}
 		line := strings.TrimSpace(scanner.Text())
 		// SSE carries `event:` and `data:` lines; the data JSON's own `type` field
 		// is authoritative, so we only need the data payloads.
@@ -356,6 +406,10 @@ func (c *client) readStream(resp *http.Response, out chan<- provider.Chunk) {
 		}
 	}
 
+	if stalled.Load() {
+		out <- provider.Chunk{Type: provider.ChunkError, Err: fmt.Errorf("%s: stream stalled — no data for %s, connection likely dropped", c.name, idleTimeout)}
+		return
+	}
 	if err := scanner.Err(); err != nil {
 		out <- provider.Chunk{Type: provider.ChunkError, Err: fmt.Errorf("%s: read stream: %w", c.name, err)}
 		return
diff --git a/internal/provider/anthropic/stall_test.go b/internal/provider/anthropic/stall_test.go
new file mode 100644
index 000000000..93d4b718d
--- /dev/null
+++ b/internal/provider/anthropic/stall_test.go
@@ -0,0 +1,65 @@
+package anthropic
+
+import (
+	"context"
+	"io"
+	"net/http"
+	"net/http/httptest"
+	"strings"
+	"testing"
+	"time"
+
+	"reasonix/internal/provider"
+)
+
+// TestStreamStallTimesOut covers issue #3374 for the Anthropic provider: a
+// half-open connection sends the SSE head then goes silent without an RST, which
+// would hang scanner.Scan() forever. The idle watchdog must surface a stall error.
+func TestStreamStallTimesOut(t *testing.T) {
+	release := make(chan struct{})
+	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
+		w.Header().Set("Content-Type", "text/event-stream")
+		w.WriteHeader(http.StatusOK)
+		if f, ok := w.(http.Flusher); ok {
+			f.Flush()
+		}
+		_, _ = io.WriteString(w, ": ping\n\n")
+		if f, ok := w.(http.Flusher); ok {
+			f.Flush()
+		}
+		<-release // stall: never send data, never close
+	}))
+	defer srv.Close()
+	defer close(release)
+
+	p, err := New(provider.Config{Name: "claude", BaseURL: srv.URL, Model: "claude-opus-4-8", APIKey: "k"})
+	if err != nil {
+		t.Fatalf("New: %v", err)
+	}
+	p.(*client).idleTimeout = 150 * time.Millisecond
+	ch, err := p.Stream(context.Background(), provider.Request{
+		Messages:  []provider.Message{{Role: provider.RoleUser, Content: "hi"}},
+		MaxTokens: 16,
+	})
+	if err != nil {
+		t.Fatalf("Stream: %v", err)
+	}
+
+	deadline := time.After(5 * time.Second)
+	for {
+		select {
+		case chunk, ok := <-ch:
+			if !ok {
+				t.Fatal("stream closed without surfacing a stall error")
+			}
+			if chunk.Type == provider.ChunkError {
+				if !strings.Contains(chunk.Err.Error(), "stalled") {
+					t.Fatalf("error = %v, want a 'stalled' error", chunk.Err)
+				}
+				return
+			}
+		case <-deadline:
+			t.Fatal("stream did not time out on a stalled connection — it hung")
+		}
+	}
+}
diff --git a/internal/provider/openai/openai.go b/internal/provider/openai/openai.go
index 8b8159161..3c64b9eb4 100644
--- a/internal/provider/openai/openai.go
+++ b/internal/provider/openai/openai.go
@@ -20,12 +20,22 @@ import (
 	"sort"
 	"strings"
 	"sync"
+	"sync/atomic"
 	"time"
 
 	"reasonix/internal/netclient"
 	"reasonix/internal/provider"
 )
 
+// defaultStreamIdleTimeout caps how long a started SSE stream may go without any
+// bytes before it's treated as a dropped connection. A half-open TCP connection
+// (e.g. a proxy switched mid-stream) sends no RST, so scanner.Scan() would block
+// forever; this turns that hang into a recoverable error. Generous on purpose —
+// live streams emit tokens/keepalives far more often. Stored per-client
+// (client.idleTimeout) so a test can shorten it without a shared global that
+// would race other streams' watchdogs.
+const defaultStreamIdleTimeout = 120 * time.Second
+
 func init() {
 	provider.Register("openai", New)
 }
@@ -93,15 +103,16 @@ func New(cfg provider.Config) (provider.Provider, error) {
 		return nil, fmt.Errorf("openai: network: %w", err)
 	}
 	return &client{
-		name:     name,
-		apiKey:   cfg.APIKey,
-		keyEnv:   keyEnv,
-		baseURL:  strings.TrimRight(cfg.BaseURL, "/"),
-		model:    cfg.Model,
-		deepseek: deepseek,
-		minimax:  minimax,
-		effort:   effort,
-		http:     httpClient,
+		name:        name,
+		apiKey:      cfg.APIKey,
+		keyEnv:      keyEnv,
+		baseURL:     strings.TrimRight(cfg.BaseURL, "/"),
+		model:       cfg.Model,
+		deepseek:    deepseek,
+		minimax:     minimax,
+		effort:      effort,
+		http:        httpClient,
+		idleTimeout: defaultStreamIdleTimeout,
 	}, nil
 }
 
@@ -116,15 +127,16 @@ func newHTTPClient(cfg provider.Config) (*http.Client, error) {
 }
 
 type client struct {
-	name     string
-	apiKey   string
-	keyEnv   string // api_key_env name, surfaced in auth errors
-	baseURL  string
-	model    string
-	http     *http.Client
-	deepseek bool
-	minimax  bool   // true for api.minimaxi.com — emits MiniMax-M3's thinking knob instead of reasoning_effort
-	effort   string // reasoning_effort for OpenAI; thinking.type for MiniMax; "" = auto/provider default
+	name        string
+	apiKey      string
+	keyEnv      string // api_key_env name, surfaced in auth errors
+	baseURL     string
+	model       string
+	http        *http.Client
+	deepseek    bool
+	minimax     bool          // true for api.minimaxi.com — emits MiniMax-M3's thinking knob instead of reasoning_effort
+	effort      string        // reasoning_effort for OpenAI; thinking.type for MiniMax; "" = auto/provider default
+	idleTimeout time.Duration // SSE stall watchdog window; defaultStreamIdleTimeout unless a test overrides
 }
 
 func (c *client) Name() string { return c.name }
@@ -290,17 +302,43 @@ func (c *client) buildRequest(req provider.Request) chatRequest {
 func (c *client) readStream(ctx context.Context, resp *http.Response, out chan<- provider.Chunk) (emitted bool, _ error) {
 	defer resp.Body.Close()
 
-	// Close the response body when the context is canceled so scanner.Scan()
-	// unblocks instead of hanging on a stalled connection. done lets the goroutine
-	// exit when readStream returns normally — otherwise it outlives the call, and
-	// blocks forever on a non-cancellable context whose Done() is nil.
+	// Close the response body when the context is canceled (user interrupt) or the
+	// stream stalls past c.idleTimeout, so scanner.Scan() unblocks instead of
+	// hanging on a half-open connection. done lets the watchdog exit on a normal
+	// return — otherwise it outlives the call and blocks forever on a non-cancellable
+	// context whose Done() is nil. The watchdog owns the timer; the read loop only
+	// pings the buffered activity channel, so there's no Timer.Reset race.
+	idleTimeout := c.idleTimeout
+	if idleTimeout <= 0 { // zero-value client (constructed without New)
+		idleTimeout = defaultStreamIdleTimeout
+	}
 	done := make(chan struct{})
 	defer close(done)
+	activity := make(chan struct{}, 1)
+	var stalled atomic.Bool
 	go func() {
-		select {
-		case <-ctx.Done():
-			resp.Body.Close()
-		case <-done:
+		idle := time.NewTimer(idleTimeout)
+		defer idle.Stop()
+		for {
+			select {
+			case <-ctx.Done():
+				resp.Body.Close()
+				return
+			case <-idle.C:
+				stalled.Store(true)
+				resp.Body.Close()
+				return
+			case <-activity:
+				if !idle.Stop() {
+					select {
+					case <-idle.C:
+					default:
+					}
+				}
+				idle.Reset(idleTimeout)
+			case <-done:
+				return
+			}
 		}
 	}()
 
@@ -314,6 +352,10 @@ func (c *client) readStream(ctx context.Context, resp *http.Response, out chan<-
 	scanner.Buffer(make([]byte, 0, 64*1024), 1024*1024)
 
 	for scanner.Scan() {
+		select { // ping the idle watchdog; non-blocking so a full buffer is fine
+		case activity <- struct{}{}:
+		default:
+		}
 		line := strings.TrimSpace(scanner.Text())
 		if line == "" || !strings.HasPrefix(line, "data:") {
 			continue
@@ -384,6 +426,9 @@ func (c *client) readStream(ctx context.Context, resp *http.Response, out chan<-
 		}
 	}
 
+	if stalled.Load() {
+		return emitted, fmt.Errorf("%s: stream stalled — no data for %s, connection likely dropped", c.name, idleTimeout)
+	}
 	if err := scanner.Err(); err != nil {
 		return emitted, fmt.Errorf("%s: read stream: %w", c.name, err)
 	}
diff --git a/internal/provider/openai/stall_test.go b/internal/provider/openai/stall_test.go
new file mode 100644
index 000000000..9b27c0b19
--- /dev/null
+++ b/internal/provider/openai/stall_test.go
@@ -0,0 +1,65 @@
+package openai
+
+import (
+	"context"
+	"io"
+	"net/http"
+	"net/http/httptest"
+	"strings"
+	"testing"
+	"time"
+
+	"reasonix/internal/provider"
+)
+
+// TestStreamStallTimesOut covers issue #3374: a half-open connection (a proxy
+// switched mid-stream) sends the SSE head then goes silent without an RST, so
+// scanner.Scan() would block forever and Ctrl+C-less sessions hang until kill -9.
+// The idle watchdog must surface a stall error instead of hanging.
+func TestStreamStallTimesOut(t *testing.T) {
+	release := make(chan struct{})
+	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
+		w.Header().Set("Content-Type", "text/event-stream")
+		w.WriteHeader(http.StatusOK)
+		flush(w)
+		_, _ = io.WriteString(w, ": keep-alive\n\n") // one comment, resets the watchdog once
+		flush(w)
+		<-release // then stall: never send data, never close — half-open connection
+	}))
+	defer srv.Close()
+	defer close(release)
+
+	p, err := New(provider.Config{Name: "deepseek", BaseURL: srv.URL, Model: "deepseek-v4", APIKey: "k"})
+	if err != nil {
+		t.Fatalf("New: %v", err)
+	}
+	p.(*client).idleTimeout = 150 * time.Millisecond
+	ch, err := p.Stream(context.Background(), provider.Request{Messages: []provider.Message{{Role: provider.RoleUser, Content: "hi"}}})
+	if err != nil {
+		t.Fatalf("Stream: %v", err)
+	}
+
+	deadline := time.After(5 * time.Second)
+	for {
+		select {
+		case chunk, ok := <-ch:
+			if !ok {
+				t.Fatal("stream closed without surfacing a stall error")
+			}
+			if chunk.Type == provider.ChunkError {
+				if !strings.Contains(chunk.Err.Error(), "stalled") {
+					t.Fatalf("error = %v, want a 'stalled' error", chunk.Err)
+				}
+				return
+			}
+		case <-deadline:
+			t.Fatal("stream did not time out on a stalled connection — it hung")
+		}
+	}
+}
+
+func flush(w http.ResponseWriter) {
+	if f, ok := w.(http.Flusher); ok {
+		f.Flush()
+	}
+}

From 137e3c6865ec11505e9dd0a1c872185952587f54 Mon Sep 17 00:00:00 2001
From: YHH <359807859@qq.com>
Date: Tue, 9 Jun 2026 18:24:44 -0700
Subject: [PATCH 39/64] fix(bash): reap the process group after a command
 completes (#3702) (#3748)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(bash): reap the process group after a command completes

A foreground bash command that forked a lingering child (e.g. bazel run, which starts a persistent server) left it alive: Setpgid put it in the command process group, but cmd.Wait only reaps the shell leader and setKillTree only kills the group on cancel/timeout. Normal completion left the strays running, accumulating into an OOM (#3702). Kill the group after Run() on both the foreground and background paths. POSIX-only; Windows is a documented no-op (after-exit tree cleanup there needs a Job Object).

* test(bash): fix reap test — use CommandContext and pass pid via file

The first cut used exec.Command with setKillTree, but Go rejects a non-nil Cancel without CommandContext; it also read the bg pid from the inherited stdout, which the backgrounded child holds open. Create with context.Background(), redirect the child fds, and pass the pid through a temp file.

---------

Co-authored-by: reasonix <reasonix@deepseek.com>
---
 internal/tool/builtin/bash.go              |  9 +++-
 internal/tool/builtin/bash_kill_other.go   | 11 +++++
 internal/tool/builtin/bash_kill_windows.go |  7 +++
 internal/tool/builtin/bash_reap_test.go    | 57 ++++++++++++++++++++++
 4 files changed, 83 insertions(+), 1 deletion(-)
 create mode 100644 internal/tool/builtin/bash_reap_test.go

diff --git a/internal/tool/builtin/bash.go b/internal/tool/builtin/bash.go
index 10cbc86f9..2702b98a9 100644
--- a/internal/tool/builtin/bash.go
+++ b/internal/tool/builtin/bash.go
@@ -149,7 +149,9 @@ func (b bash) Execute(ctx context.Context, args json.RawMessage) (string, error)
 			cmd.WaitDelay = bashWaitDelay
 			cmd.Stdout = out
 			cmd.Stderr = out
-			return "", cmd.Run()
+			runErr := cmd.Run()
+			reapTree(cmd) // reap process-group stragglers the job left running (#3702)
+			return "", runErr
 		})
 		return fmt.Sprintf("Started background job %q. It keeps running across turns; read new output with bash_output(job_id=%q), wait for it with wait, or stop it with kill_shell(job_id=%q).", job.ID, job.ID, job.ID), nil
 	}
@@ -175,6 +177,11 @@ func (b bash) Execute(ctx context.Context, args json.RawMessage) (string, error)
 	cmd.Stdout = w
 	cmd.Stderr = w
 	err := cmd.Run()
+	// A foreground command that spawned a lingering child (e.g. `bazel run`'s
+	// server) leaves it in the process group; Wait only reaped the shell leader.
+	// Kill the group so those don't accumulate into an OOM (#3702). On cancel/
+	// timeout setKillTree's Cancel already did this; this covers normal exit.
+	reapTree(cmd)
 	out := buf.String()
 
 	if errors.Is(context.Cause(runCtx), errBashTimeout) {
diff --git a/internal/tool/builtin/bash_kill_other.go b/internal/tool/builtin/bash_kill_other.go
index 8741075a7..5076ce994 100644
--- a/internal/tool/builtin/bash_kill_other.go
+++ b/internal/tool/builtin/bash_kill_other.go
@@ -20,3 +20,14 @@ func setKillTree(cmd *exec.Cmd) {
 		return syscall.Kill(-cmd.Process.Pid, syscall.SIGKILL)
 	}
 }
+
+// reapTree kills any members the command's process group left running after it
+// returned — a foreground command that forked a daemon (e.g. `bazel run`'s
+// server) leaves it behind, and Wait only reaped the shell leader. The group id
+// is the leader's pid (Setpgid). ESRCH (empty group) is fine. See #3702.
+func reapTree(cmd *exec.Cmd) {
+	if cmd.Process == nil {
+		return
+	}
+	_ = syscall.Kill(-cmd.Process.Pid, syscall.SIGKILL)
+}
diff --git a/internal/tool/builtin/bash_kill_windows.go b/internal/tool/builtin/bash_kill_windows.go
index f728f7b73..f9366b721 100644
--- a/internal/tool/builtin/bash_kill_windows.go
+++ b/internal/tool/builtin/bash_kill_windows.go
@@ -23,3 +23,10 @@ func setKillTree(cmd *exec.Cmd) {
 		return cmd.Process.Kill()
 	}
 }
+
+// reapTree is the post-completion process-group cleanup the POSIX build does for
+// #3702. On Windows it's a no-op: once the shell leader exits there's no live
+// parent for taskkill /T to walk, and spawning taskkill on every bash call would
+// tax the hot path for little gain — proper after-exit tree cleanup needs a Job
+// Object, which is out of scope here.
+func reapTree(*exec.Cmd) {}
diff --git a/internal/tool/builtin/bash_reap_test.go b/internal/tool/builtin/bash_reap_test.go
new file mode 100644
index 000000000..f06fddafc
--- /dev/null
+++ b/internal/tool/builtin/bash_reap_test.go
@@ -0,0 +1,57 @@
+//go:build !windows
+
+package builtin
+
+import (
+	"context"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"strconv"
+	"strings"
+	"syscall"
+	"testing"
+	"time"
+)
+
+// TestReapTreeKillsGroupStragglers covers #3702: a foreground command that
+// backgrounds a child (here a long sleep, standing in for `bazel run`'s server)
+// leaves it in the process group after Wait reaps the shell leader. reapTree must
+// kill it so such processes don't accumulate into an OOM. The child redirects its
+// fds and the pid is passed via a file so the inherited stdout can't block Wait.
+func TestReapTreeKillsGroupStragglers(t *testing.T) {
+	pidFile := filepath.Join(t.TempDir(), "pid")
+	cmd := exec.CommandContext(context.Background(), "sh", "-c",
+		"sleep 60 >/dev/null 2>&1 & echo $! > "+pidFile)
+	setKillTree(cmd) // Setpgid — the shell leads its own group
+	if err := cmd.Run(); err != nil {
+		t.Fatalf("run: %v", err)
+	}
+
+	data, err := os.ReadFile(pidFile)
+	if err != nil {
+		t.Fatalf("read pid file: %v", err)
+	}
+	pid, err := strconv.Atoi(strings.TrimSpace(string(data)))
+	if err != nil {
+		t.Fatalf("parse backgrounded pid %q: %v", data, err)
+	}
+	if err := syscall.Kill(pid, 0); err != nil {
+		t.Skipf("backgrounded child %d not alive after shell exit (%v)", pid, err)
+	}
+
+	reapTree(cmd)
+
+	dead := false
+	for i := 0; i < 50; i++ {
+		if syscall.Kill(pid, 0) != nil {
+			dead = true
+			break
+		}
+		time.Sleep(20 * time.Millisecond)
+	}
+	if !dead {
+		_ = syscall.Kill(pid, syscall.SIGKILL) // don't leak the sleep in CI
+		t.Fatalf("backgrounded child %d survived reapTree", pid)
+	}
+}

From bdabda35d1924ac77d6bd168a97a30836a8fb61e Mon Sep 17 00:00:00 2001
From: YHH <359807859@qq.com>
Date: Tue, 9 Jun 2026 19:44:35 -0700
Subject: [PATCH 40/64] fix(codegraph): stop leaking detached MCP daemons and
 indexing the whole drive (#3747) (#3755)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(proc): assign the job object before the launcher runs so detached MCP children are reaped

A Windows stdio MCP launcher (cmd.exe -> node.exe, as the CodeGraph
daemon re-parents itself off its shim) raced the job-object assignment:
the job was assigned only after Start returned, so a fast shim could exec
its grandchild and exit before the assignment, leaving node.exe orphaned
in no job. KillTracked and an abrupt reasonix exit then both missed it,
and dozens of codegraph daemons leaked past a session (#3747).

Create the child suspended, assign it to the job, then resume — so every
descendant is captured before the launcher can spawn anything.

* fix(codegraph): refuse to index a filesystem root

When the workspace root resolved to a drive root (C:\), CodeGraph's
cwd-aware serve --mcp walked the entire volume — C:\Windows, Program
Files, everything — pinning ~1GB of RAM (#3747). Reject filesystem roots
(and an empty root) at both spawn sites before launching serve.

---------

Co-authored-by: reasonix <reasonix@deepseek.com>
---
 internal/boot/boot.go                |  3 ++
 internal/codegraph/codegraph.go      | 18 +++++++++
 internal/codegraph/codegraph_test.go | 22 +++++++++++
 internal/control/controller.go       |  3 ++
 internal/plugin/transport_stdio.go   |  5 ++-
 internal/proc/kill_other.go          |  9 +++--
 internal/proc/kill_other_test.go     | 13 +++---
 internal/proc/kill_windows.go        | 59 +++++++++++++++++++++++-----
 internal/proc/kill_windows_test.go   | 37 +++++++++++++----
 9 files changed, 141 insertions(+), 28 deletions(-)

diff --git a/internal/boot/boot.go b/internal/boot/boot.go
index ba89cfd74..a058dfff1 100644
--- a/internal/boot/boot.go
+++ b/internal/boot/boot.go
@@ -245,6 +245,9 @@ func Build(ctx context.Context, opts Options) (*control.Controller, error) {
 	if cfg.Codegraph.Enabled {
 		bin, ok := codegraph.Resolve(cfg.Codegraph.Path)
 		switch {
+		case ok && !codegraph.IndexableRoot(root):
+			sink.Emit(event.Event{Kind: event.Notice, Level: event.LevelWarn,
+				Text: "codegraph: project root is a filesystem root — skipped to avoid indexing the whole volume"})
 		case ok:
 			spec := plugin.Spec{
 				Name:              "codegraph",
diff --git a/internal/codegraph/codegraph.go b/internal/codegraph/codegraph.go
index 6d8f59a61..04e5cf93d 100644
--- a/internal/codegraph/codegraph.go
+++ b/internal/codegraph/codegraph.go
@@ -159,6 +159,24 @@ func Initialized(root string) bool {
 	return err == nil && fi.IsDir()
 }
 
+// IndexableRoot reports whether root is a real project directory CodeGraph can
+// safely be pinned to. A filesystem root (a Windows drive root like C:\, a UNC
+// share root, or the unix /) is rejected: serve --mcp walks its working
+// directory, so a root cwd makes it index the whole volume — C:\Windows,
+// C:\Program Files, everything — pinning gigabytes of RAM (#3747). An empty
+// root is rejected too: there is nothing to pin a cwd-aware server to.
+func IndexableRoot(root string) bool {
+	root = strings.TrimSpace(root)
+	if root == "" {
+		return false
+	}
+	abs, err := filepath.Abs(root)
+	if err != nil {
+		return false
+	}
+	return filepath.Dir(abs) != abs // a filesystem root is its own parent
+}
+
 func expand(p string) string {
 	p = os.ExpandEnv(p)
 	if strings.HasPrefix(p, "~/") {
diff --git a/internal/codegraph/codegraph_test.go b/internal/codegraph/codegraph_test.go
index 64c97e4dd..bdd530b5b 100644
--- a/internal/codegraph/codegraph_test.go
+++ b/internal/codegraph/codegraph_test.go
@@ -91,3 +91,25 @@ func TestEnsureInitPropagatesFailure(t *testing.T) {
 		t.Fatal("EnsureInit should return the init failure")
 	}
 }
+
+func TestIndexableRootRejectsFilesystemRoots(t *testing.T) {
+	if got := IndexableRoot(t.TempDir()); !got {
+		t.Fatal("a real project dir must be indexable")
+	}
+	for _, root := range []string{"", "   "} {
+		if IndexableRoot(root) {
+			t.Fatalf("IndexableRoot(%q) = true; want false", root)
+		}
+	}
+	var roots []string
+	if runtime.GOOS == "windows" {
+		roots = []string{`C:\`, `c:\`, `\\server\share`}
+	} else {
+		roots = []string{"/"}
+	}
+	for _, root := range roots {
+		if IndexableRoot(root) {
+			t.Fatalf("IndexableRoot(%q) = true; want false (filesystem root)", root)
+		}
+	}
+}
diff --git a/internal/control/controller.go b/internal/control/controller.go
index d611d3051..1d4baaf24 100644
--- a/internal/control/controller.go
+++ b/internal/control/controller.go
@@ -1728,6 +1728,9 @@ func (c *Controller) connectCodegraphMCPServer(cfg *config.Config) (int, error)
 	if err != nil {
 		return 0, err
 	}
+	if !codegraph.IndexableRoot(cwd) {
+		return 0, fmt.Errorf("codegraph: refusing to index %q — a filesystem root would index the whole volume", cwd)
+	}
 	if err := codegraph.EnsureInit(c.pluginCtx, bin, cwd); err != nil {
 		return 0, fmt.Errorf("codegraph init: %w", err)
 	}
diff --git a/internal/plugin/transport_stdio.go b/internal/plugin/transport_stdio.go
index e14e762b4..b968f98ca 100644
--- a/internal/plugin/transport_stdio.go
+++ b/internal/plugin/transport_stdio.go
@@ -74,13 +74,14 @@ func newStdioTransport(ctx context.Context, s Spec) (*stdioTransport, error) {
 	if err != nil {
 		return nil, err
 	}
-	if err := cmd.Start(); err != nil {
+	job, err := proc.StartTracked(cmd)
+	if err != nil {
 		return nil, err
 	}
 	t := &stdioTransport{
 		name:    s.Name,
 		cmd:     cmd,
-		job:     proc.TrackTree(cmd),
+		job:     job,
 		stdin:   stdin,
 		stdout:  bufio.NewReader(stdout),
 		stderr:  stderr,
diff --git a/internal/proc/kill_other.go b/internal/proc/kill_other.go
index 7634df749..aa5ad08ab 100644
--- a/internal/proc/kill_other.go
+++ b/internal/proc/kill_other.go
@@ -12,9 +12,12 @@ func KillTree(cmd *exec.Cmd) {
 	_ = cmd.Process.Kill()
 }
 
-// TrackTree is a no-op off Windows (returns 0); KillTracked then falls back to
-// KillTree, which is sufficient where the platform reaps the child directly.
-func TrackTree(_ *exec.Cmd) uintptr { return 0 }
+// StartTracked starts cmd. Off Windows there is no Job Object to track it in —
+// the platform reaps the child directly — so it just starts and returns a 0
+// handle, and KillTracked falls back to KillTree.
+func StartTracked(cmd *exec.Cmd) (uintptr, error) {
+	return 0, cmd.Start()
+}
 
 // KillTracked terminates cmd's process tree; the handle is unused off Windows.
 func KillTracked(cmd *exec.Cmd, _ uintptr) { KillTree(cmd) }
diff --git a/internal/proc/kill_other_test.go b/internal/proc/kill_other_test.go
index cf8065c57..cdacbcfd2 100644
--- a/internal/proc/kill_other_test.go
+++ b/internal/proc/kill_other_test.go
@@ -26,15 +26,16 @@ func TestKillTreeTerminatesChild(t *testing.T) {
 }
 
 func TestKillTrackedTerminatesChild(t *testing.T) {
-	if TrackTree(nil) != 0 {
-		t.Fatal("TrackTree is a no-op off Windows; want 0")
-	}
 	cmd := exec.Command("sleep", "30")
-	if err := cmd.Start(); err != nil {
-		t.Fatalf("Start: %v", err)
+	job, err := StartTracked(cmd)
+	if err != nil {
+		t.Fatalf("StartTracked: %v", err)
+	}
+	if job != 0 {
+		t.Fatalf("StartTracked job = %d off Windows; want 0", job)
 	}
 
-	KillTracked(cmd, 0)
+	KillTracked(cmd, job)
 
 	done := make(chan error, 1)
 	go func() { done <- cmd.Wait() }()
diff --git a/internal/proc/kill_windows.go b/internal/proc/kill_windows.go
index 5a7bc9d13..f139d7308 100644
--- a/internal/proc/kill_windows.go
+++ b/internal/proc/kill_windows.go
@@ -5,6 +5,7 @@ package proc
 import (
 	"os/exec"
 	"strconv"
+	"syscall"
 	"unsafe"
 
 	"golang.org/x/sys/windows"
@@ -24,14 +25,29 @@ func KillTree(cmd *exec.Cmd) {
 	_ = cmd.Process.Kill()
 }
 
-// TrackTree assigns cmd to a new Job Object set to terminate every process in
-// it when the job handle is closed. A launcher's detached grandchild (e.g. the
-// CodeGraph node daemon, which re-parents itself away from the launcher) stays
-// in the job even though it leaves cmd's live child tree, so KillTracked — and,
-// crucially, an abrupt reasonix exit, which closes the handle — still reaps it,
-// where taskkill /T would miss it. Returns 0 on failure; the caller then relies
-// on KillTree alone.
-func TrackTree(cmd *exec.Cmd) uintptr {
+// StartTracked starts cmd inside a new Job Object whose KILL_ON_JOB_CLOSE flag
+// fells the whole tree — including a launcher's detached grandchild (cmd.exe →
+// node.exe, as the CodeGraph daemon re-parents itself off the launcher) — when
+// the handle closes via KillTracked or an abrupt reasonix exit. The child is
+// created suspended and assigned to the job before it runs, so a fast shim can
+// no longer exec its grandchild and exit before assignment, orphaning a node
+// the job never captured (#3747). It is always resumed before returning, even
+// when job assignment fails, so a child is never left wedged suspended. Returns
+// the job handle, 0 if it could not be created — then KillTracked relies on
+// KillTree alone.
+func StartTracked(cmd *exec.Cmd) (uintptr, error) {
+	if cmd.SysProcAttr == nil {
+		cmd.SysProcAttr = &syscall.SysProcAttr{}
+	}
+	cmd.SysProcAttr.CreationFlags |= windows.CREATE_SUSPENDED
+	if err := cmd.Start(); err != nil {
+		return 0, err
+	}
+	defer resumeProcess(uint32(cmd.Process.Pid))
+	return assignJob(cmd), nil
+}
+
+func assignJob(cmd *exec.Cmd) uintptr {
 	if cmd == nil || cmd.Process == nil {
 		return 0
 	}
@@ -62,8 +78,31 @@ func TrackTree(cmd *exec.Cmd) uintptr {
 	return uintptr(job)
 }
 
-// KillTracked terminates cmd's whole process tree. When job (from TrackTree) is
-// non-zero, terminating it kills even detached descendants; the KillTree pass
+// resumeProcess resumes every thread of pid. A CREATE_SUSPENDED process has a
+// single suspended primary thread, so this releases it once the job is assigned.
+func resumeProcess(pid uint32) {
+	snap, err := windows.CreateToolhelp32Snapshot(windows.TH32CS_SNAPTHREAD, 0)
+	if err != nil {
+		return
+	}
+	defer func() { _ = windows.CloseHandle(snap) }()
+	var te windows.ThreadEntry32
+	te.Size = uint32(unsafe.Sizeof(te))
+	for err := windows.Thread32First(snap, &te); err == nil; err = windows.Thread32Next(snap, &te) {
+		if te.OwnerProcessID != pid {
+			continue
+		}
+		th, err := windows.OpenThread(windows.THREAD_SUSPEND_RESUME, false, te.ThreadID)
+		if err != nil {
+			continue
+		}
+		_, _ = windows.ResumeThread(th)
+		_ = windows.CloseHandle(th)
+	}
+}
+
+// KillTracked terminates cmd's whole process tree. When job (from StartTracked)
+// is non-zero, terminating it kills even detached descendants; the KillTree pass
 // then catches anything spawned in the gap before the job was assigned.
 func KillTracked(cmd *exec.Cmd, job uintptr) {
 	if job != 0 {
diff --git a/internal/proc/kill_windows_test.go b/internal/proc/kill_windows_test.go
index 5ae592012..f770e73ca 100644
--- a/internal/proc/kill_windows_test.go
+++ b/internal/proc/kill_windows_test.go
@@ -3,6 +3,7 @@
 package proc
 
 import (
+	"errors"
 	"io"
 	"os/exec"
 	"testing"
@@ -37,7 +38,7 @@ func TestKillTreeUnblocksWaitOnSurvivingGrandchild(t *testing.T) {
 	}
 }
 
-// TrackTree must create a Job Object for a started process, and KillTracked
+// StartTracked must create a Job Object for the started process, and KillTracked
 // must take the whole tracked tree down (the job reaps even descendants a plain
 // taskkill /T would miss — see the codegraph daemon leak this guards against).
 func TestKillTrackedReapsTrackedTree(t *testing.T) {
@@ -47,15 +48,14 @@ func TestKillTrackedReapsTrackedTree(t *testing.T) {
 	if err != nil {
 		t.Fatalf("StdoutPipe: %v", err)
 	}
-	if err := cmd.Start(); err != nil {
-		t.Fatalf("Start: %v", err)
+	job, err := StartTracked(cmd)
+	if err != nil {
+		t.Fatalf("StartTracked: %v", err)
 	}
-	go func() { _, _ = io.Copy(io.Discard, stdout) }()
-
-	job := TrackTree(cmd)
 	if job == 0 {
-		t.Fatal("TrackTree returned 0 — job object not created")
+		t.Fatal("StartTracked returned 0 — job object not created")
 	}
+	go func() { _, _ = io.Copy(io.Discard, stdout) }()
 	time.Sleep(500 * time.Millisecond) // let cmd.exe exec the ping grandchild into the job
 
 	KillTracked(cmd, job)
@@ -68,3 +68,26 @@ func TestKillTrackedReapsTrackedTree(t *testing.T) {
 		t.Fatal("cmd.Wait blocked after KillTracked — tracked tree survived")
 	}
 }
+
+// StartTracked creates the child suspended to win the job-assignment race, so it
+// must resume it or the process hangs forever. A child that exits with a known
+// code proves the resume fired: Wait returns that code instead of timing out.
+func TestStartTrackedResumesSuspendedChild(t *testing.T) {
+	cmd := exec.Command("cmd", "/c", "exit", "7")
+	HideWindow(cmd)
+	if _, err := StartTracked(cmd); err != nil {
+		t.Fatalf("StartTracked: %v", err)
+	}
+
+	done := make(chan error, 1)
+	go func() { done <- cmd.Wait() }()
+	select {
+	case err := <-done:
+		var ee *exec.ExitError
+		if !errors.As(err, &ee) || ee.ExitCode() != 7 {
+			t.Fatalf("exit = %v, want exit status 7", err)
+		}
+	case <-time.After(8 * time.Second):
+		t.Fatal("cmd.Wait blocked — StartTracked left the child suspended")
+	}
+}

From 061ac30fcfcfd9c0a48e324da632a09edf1768bf Mon Sep 17 00:00:00 2001
From: lightfront <lightfront@users.noreply.github.com>
Date: Wed, 10 Jun 2026 10:52:36 +0800
Subject: [PATCH 41/64] fix(desktop): convert \slashed to \not for KaTeX
 compatibility (#3750)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(desktop): convert \\slashed to \\not for KaTeX compatibility

KaTeX doesn't support the \\slashed command from the LaTeX 'slashed'
package, which is commonly used in physics for Feynman slash notation
(\\slashed{p}, \\slashed{\\partial}).

Convert \\slashed{X} to \\not{X} before passing to KaTeX. The \\not
command provides a similar visual effect (a slash through the character)
and is supported by KaTeX.

This prevents KaTeX parse errors when the model emits physics notation
using \\slashed.

Tests: 3 new cases added, 111/111 passing

* fix(desktop): handle unbraced \\\\slashed forms like \\\\slashed\\\\epsilon(0)

The previous fix only handled \\\\slashed{X} (braced form). User-reported
issue: \\\\slashed\\\\epsilon(0) (Greek letter + function call, no braces)
was not being converted and still showed as red KaTeX error.

Extended the regex to handle two additional forms:
- \\\\slashed X       → \\\\not X       (single letter, no braces)
- \\\\slashed\\\\epsilon      → \\\\not{\\\\epsilon}    (backslash command)
- \\\\slashed\\\\epsilon(0)   → \\\\not{\\\\epsilon(0)}  (backslash command + function)
- \\\\slashed a       → \\\\not a       (single ASCII letter)

This covers the common physics notation \\\\slashed{p} where the model
sometimes forgets the braces around the argument.

Tests: 2 new cases added, 113/113 math-golden passing.

---------

Co-authored-by: Xingbo Zhao <xbzhao@impcas.ac.cn>
---
 .../src/__tests__/math-golden.test.ts         | 19 ++++++++++++++++++
 .../frontend/src/components/latexNormalize.ts | 20 +++++++++++++++++++
 2 files changed, 39 insertions(+)

diff --git a/desktop/frontend/src/__tests__/math-golden.test.ts b/desktop/frontend/src/__tests__/math-golden.test.ts
index e676bde0d..2d12bd8a9 100644
--- a/desktop/frontend/src/__tests__/math-golden.test.ts
+++ b/desktop/frontend/src/__tests__/math-golden.test.ts
@@ -133,6 +133,25 @@ eq(normalizeMath("\\(x^2\\)"), "$x^2$", "\\(…\\) → $…$");
 eq(normalizeMath("\\[E=mc^2\\]"), "$$E=mc^2$$", "\\[…\\] → $$…$$");
 eq(normalizeMath("\\\\[4pt]"), "\\\\[4pt]", "\\\\[ line-break spacing protected");
 
+// ── normalizeMath — \\slashed conversion (regression) ─────────────────────────────
+// KaTeX doesn't support \\slashed (used in physics for Feynman slash notation),
+// so convert it to \\not which has a similar visual effect.
+check("\\\\slashed{p} is converted to \\not{p}", () => {
+  return normalizeMath("$\\\\slashed{p}$") === "$\\\\not{p}$";
+});
+check("\\\\slashed{\\\\partial} is converted to \\not{\\\\partial}", () => {
+  return normalizeMath("$\\\\slashed{\\\\partial}$") === "$\\\\not{\\\\partial}$";
+});
+check("\\\\slashed in prose context", () => {
+  return normalizeMath("The momentum $\\\\slashed{p}$ is conserved") === "The momentum $\\\\not{p}$ is conserved";
+});
+check("\\\\slashed\\\\epsilon(0) → \\not{\\epsilon(0)} (Greek + function)", () => {
+  return normalizeMath("$\\slashed\\epsilon(0)$") === "$\\not{\\epsilon(0)}$";
+});
+check("\\\\slashed a → \\not a (single letter)", () => {
+  return normalizeMath("$\\\\slashed a$") === "$\\\\not a$";
+});
+
 console.log("\nnormalizeMath — non-math dollar filtering");
 eq(normalizeMath("costs $5$ today"), "costs &#36;5&#36; today", "$5$ not math");
 eq(normalizeMath("env $PATH$ here"), "env &#36;PATH&#36; here", "$PATH$ not math");
diff --git a/desktop/frontend/src/components/latexNormalize.ts b/desktop/frontend/src/components/latexNormalize.ts
index 0b94d4fbe..43b00d1aa 100644
--- a/desktop/frontend/src/components/latexNormalize.ts
+++ b/desktop/frontend/src/components/latexNormalize.ts
@@ -21,6 +21,26 @@ const TEXT_COMMANDS = new Set([
 ]);
 
 export function latexNormalizeForKatex(source: string): string {
+  // Convert \slashed{X} → \not{X} and \slashed X → \not X. KaTeX doesn't
+  // support \slashed, but \not provides a similar visual effect (slash
+  // through the character). This is commonly used in physics for Feynman
+  // slash notation (\slashed{p}, \slashed{\partial}).
+  // Handles two forms:
+  //   1. Braced:    \slashed{X}     → \not{X}
+  //   2. Unbraced:  \slashed X      → \not X   (single token, no spaces)
+  source = source.replace(/\\slashed\s*\{((?:[^{}]|\{[^{}]*\})*)\}/g, "\\not{$1}");
+  // Also handle unbraced forms:
+  //   \slashed\epsilon      → \not{\epsilon}
+  //   \slashed\epsilon(0)    → \not{\epsilon(0)}
+  //   \slashed a              → \not a
+  //   \slashed x              → \not x
+  // Match a backslash command (optionally followed by (...) for function calls)
+  // or a single ASCII letter. Use a function so we can add braces around
+  // function-call forms.
+  source = source.replace(/\\slashed\s*(\\[A-Za-z]+(?:\([^)]*\))?|[A-Za-z])/g, (_match, inner) => {
+    return inner.includes("(") ? `\\not{${inner}}` : `\\not ${inner}`;
+  });
+
   let out = "";
   let i = 0;
 

From 94e53a3189574ca264a425d1379792ff41180973 Mon Sep 17 00:00:00 2001
From: YHH <359807859@qq.com>
Date: Tue, 9 Jun 2026 20:01:54 -0700
Subject: [PATCH 42/64] test(desktop): use single-backslash inputs in the
 slashed golden tests (#3761)

The \slashed -> \not cases (#3750) wrote their braced inputs with a
double backslash (\slashed{p}); real model output is a single one. The
regex matched either way so the tests passed, but they exercised a form
the model never emits. Switch them to single-backslash inputs and the
eq() helper the surrounding golden tests already use.

Co-authored-by: reasonix <reasonix@deepseek.com>
---
 .../src/__tests__/math-golden.test.ts         | 25 ++++++-------------
 1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/desktop/frontend/src/__tests__/math-golden.test.ts b/desktop/frontend/src/__tests__/math-golden.test.ts
index 2d12bd8a9..d70bc8980 100644
--- a/desktop/frontend/src/__tests__/math-golden.test.ts
+++ b/desktop/frontend/src/__tests__/math-golden.test.ts
@@ -133,24 +133,13 @@ eq(normalizeMath("\\(x^2\\)"), "$x^2$", "\\(…\\) → $…$");
 eq(normalizeMath("\\[E=mc^2\\]"), "$$E=mc^2$$", "\\[…\\] → $$…$$");
 eq(normalizeMath("\\\\[4pt]"), "\\\\[4pt]", "\\\\[ line-break spacing protected");
 
-// ── normalizeMath — \\slashed conversion (regression) ─────────────────────────────
-// KaTeX doesn't support \\slashed (used in physics for Feynman slash notation),
-// so convert it to \\not which has a similar visual effect.
-check("\\\\slashed{p} is converted to \\not{p}", () => {
-  return normalizeMath("$\\\\slashed{p}$") === "$\\\\not{p}$";
-});
-check("\\\\slashed{\\\\partial} is converted to \\not{\\\\partial}", () => {
-  return normalizeMath("$\\\\slashed{\\\\partial}$") === "$\\\\not{\\\\partial}$";
-});
-check("\\\\slashed in prose context", () => {
-  return normalizeMath("The momentum $\\\\slashed{p}$ is conserved") === "The momentum $\\\\not{p}$ is conserved";
-});
-check("\\\\slashed\\\\epsilon(0) → \\not{\\epsilon(0)} (Greek + function)", () => {
-  return normalizeMath("$\\slashed\\epsilon(0)$") === "$\\not{\\epsilon(0)}$";
-});
-check("\\\\slashed a → \\not a (single letter)", () => {
-  return normalizeMath("$\\\\slashed a$") === "$\\\\not a$";
-});
+// ── normalizeMath — \slashed conversion (regression) ──────────────────────────
+// KaTeX has no \slashed (Feynman slash notation); it is rewritten to \not.
+eq(normalizeMath("$\\slashed{p}$"), "$\\not{p}$", "\\slashed{p} → \\not{p}");
+eq(normalizeMath("$\\slashed{\\partial}$"), "$\\not{\\partial}$", "\\slashed{\\partial} → \\not{\\partial}");
+eq(normalizeMath("The momentum $\\slashed{p}$ is conserved"), "The momentum $\\not{p}$ is conserved", "\\slashed in prose");
+eq(normalizeMath("$\\slashed\\epsilon(0)$"), "$\\not{\\epsilon(0)}$", "\\slashed\\epsilon(0) → \\not{\\epsilon(0)} (unbraced fn)");
+eq(normalizeMath("$\\slashed a$"), "$\\not a$", "\\slashed a → \\not a (unbraced letter)");
 
 console.log("\nnormalizeMath — non-math dollar filtering");
 eq(normalizeMath("costs $5$ today"), "costs &#36;5&#36; today", "$5$ not math");

From 204eaf0cc64014b871a26d570fd51e40a5581c06 Mon Sep 17 00:00:00 2001
From: SivanCola <liuxw96@foxmail.com>
Date: Wed, 10 Jun 2026 11:32:18 +0800
Subject: [PATCH 43/64] feat(desktop): themeable workspace UI, tool-approval
 modes, and /goal loop (#3752)

Lands three changes from #3752:

- Desktop: graphite UI redesign with slate/carbon/nocturne/amber theme
  directions (light+dark), Cmd-K command palette, and a status bar /
  composer / sidebar refresh. Default desktop appearance is now light.
- Controller: separate tool approvals from business asks and plan
  approval. Posture is ask/auto/yolo; deny rules still block upstream,
  auto keeps explicit ask rules while auto-approving the writer fallback,
  and plan approval plus the ask tool stay user decisions in every mode.
- Controller: opt-in /goal autonomous loop that self-continues up to 50
  turns, driven by [goal:complete|blocked|continue] markers, bounded and
  cancellable, with a repeated-block stop.
---
 desktop/app.go                                |  247 +-
 desktop/frontend/package.json                 |    1 +
 .../check-browser-preview-stability.mjs       |  371 +
 desktop/frontend/src/App.tsx                  |  923 +-
 .../src/components/AnchoredPopover.tsx        |  106 +-
 desktop/frontend/src/components/AppChrome.tsx |  174 +
 .../src/components/CapabilitiesPanel.tsx      |   19 +-
 .../src/components/CommandPalette.tsx         |   26 +-
 desktop/frontend/src/components/Composer.tsx  |  460 +-
 .../frontend/src/components/ContextPanel.tsx  |   92 +-
 .../src/components/EffortSwitcher.tsx         |   53 +-
 .../frontend/src/components/HistoryPanel.tsx  |   69 +-
 .../frontend/src/components/MemoryPanel.tsx   |   28 +-
 .../src/components/ModalCloseButton.tsx       |   20 +
 .../frontend/src/components/ModelSwitcher.tsx |   44 +-
 .../src/components/NotificationCenter.tsx     |  103 -
 .../frontend/src/components/ProcessCard.tsx   |    8 +-
 .../frontend/src/components/ProjectTree.tsx   |  284 +-
 .../src/components/ResizableDrawer.tsx        |    6 +-
 .../frontend/src/components/SettingsPanel.tsx |  115 +-
 desktop/frontend/src/components/StatusBar.tsx |  130 +-
 .../src/components/StreamingIndicator.tsx     |   93 -
 desktop/frontend/src/components/TabBar.tsx    |   43 +-
 desktop/frontend/src/components/ToolCard.tsx  |    5 +-
 desktop/frontend/src/components/Tooltip.tsx   |   18 +-
 desktop/frontend/src/components/Welcome.tsx   |   11 +-
 .../src/components/WorkspacePanel.tsx         |   58 +-
 desktop/frontend/src/lib/bridge.ts            |  569 +-
 desktop/frontend/src/lib/i18n.tsx             |    7 +-
 desktop/frontend/src/lib/layoutPreferences.ts |    2 +
 .../frontend/src/lib/notificationCenter.ts    |  106 -
 desktop/frontend/src/lib/theme.ts             |   77 +-
 desktop/frontend/src/lib/types.ts             |   73 +-
 desktop/frontend/src/lib/useController.ts     |   89 +-
 .../frontend/src/lib/useMountTransition.ts    |   97 +
 desktop/frontend/src/locales/en.ts            |  137 +-
 desktop/frontend/src/locales/zh.ts            |  143 +-
 desktop/frontend/src/styles.css               | 9878 +++++++++++++----
 desktop/settings_app.go                       |   12 +-
 desktop/tab_profile_test.go                   |  212 +-
 desktop/tabs.go                               |  752 +-
 desktop/tabs_telemetry_test.go                |   53 +
 desktop/tabs_topic_test.go                    |   75 +-
 docs/SPEC.md                                  |   34 +
 go.sum                                        |   16 +
 internal/agent/ask.go                         |   12 +-
 internal/agent/ask_test.go                    |   24 +
 internal/cli/chat_tui.go                      |  108 +-
 internal/cli/cli.go                           |    9 +-
 internal/cli/complete.go                      |    1 +
 internal/cli/gitstatus.go                     |    2 +-
 internal/cli/statusline_test.go               |   16 +-
 internal/config/config.go                     |   21 +-
 internal/config/edit.go                       |    2 +-
 internal/config/edit_test.go                  |    1 +
 internal/control/auto_plan.go                 |    6 +-
 internal/control/controller.go                |  551 +-
 internal/control/goal_test.go                 |  151 +
 internal/control/input.go                     |   60 +
 internal/control/input_test.go                |   50 +
 internal/control/yolo_test.go                 |  644 +-
 internal/i18n/i18n.go                         |    7 +-
 internal/i18n/messages_en.go                  |   11 +-
 internal/i18n/messages_zh.go                  |   11 +-
 internal/permission/permission.go             |    7 +-
 internal/serve/index.html                     |   19 +-
 internal/serve/serve.go                       |   34 +-
 67 files changed, 13663 insertions(+), 3923 deletions(-)
 create mode 100644 desktop/frontend/scripts/check-browser-preview-stability.mjs
 create mode 100644 desktop/frontend/src/components/AppChrome.tsx
 create mode 100644 desktop/frontend/src/components/ModalCloseButton.tsx
 delete mode 100644 desktop/frontend/src/components/NotificationCenter.tsx
 delete mode 100644 desktop/frontend/src/components/StreamingIndicator.tsx
 delete mode 100644 desktop/frontend/src/lib/notificationCenter.ts
 create mode 100644 desktop/frontend/src/lib/useMountTransition.ts
 create mode 100644 desktop/tabs_telemetry_test.go
 create mode 100644 internal/control/goal_test.go

diff --git a/desktop/app.go b/desktop/app.go
index 203de28de..f6fb677ec 100644
--- a/desktop/app.go
+++ b/desktop/app.go
@@ -376,6 +376,11 @@ func (a *App) restoreOrBuildTabs() {
 			tab.model = entry.Model
 			tab.effort = cloneStringPtr(entry.Effort)
 			tab.mode = persistedTabMode(entry.Mode)
+			tab.goal = strings.TrimSpace(entry.Goal)
+			tab.toolApprovalMode = normalizeToolApprovalMode(entry.ToolApprovalMode)
+			if tab.toolApprovalMode == control.ToolApprovalAsk && tabModeHasAutoApproveTools(entry.Mode) {
+				tab.toolApprovalMode = control.ToolApprovalYolo
+			}
 			tab.SessionPath = strings.TrimSpace(entry.SessionPath)
 			tab.sink = &tabEventSink{tabID: tab.ID, app: a, ctx: ctx}
 			a.mu.Lock()
@@ -418,13 +423,14 @@ func (a *App) createTabEntry(scope, workspaceRoot, topicID string) *WorkspaceTab
 
 func (a *App) createTabEntryWithID(scope, workspaceRoot, topicID, id string) *WorkspaceTab {
 	return &WorkspaceTab{
-		ID:            id,
-		Scope:         scope,
-		WorkspaceRoot: workspaceRoot,
-		TopicID:       topicID,
-		TopicTitle:    topicTitleForTab(scope, workspaceRoot, topicID),
-		mode:          "normal",
-		disabledMCP:   map[string]ServerView{},
+		ID:               id,
+		Scope:            scope,
+		WorkspaceRoot:    workspaceRoot,
+		TopicID:          topicID,
+		TopicTitle:       topicTitleForTab(scope, workspaceRoot, topicID),
+		mode:             "normal",
+		toolApprovalMode: control.ToolApprovalAsk,
+		disabledMCP:      map[string]ServerView{},
 	}
 }
 
@@ -601,18 +607,21 @@ func (a *App) ApproveTabWithScope(tabID, id string, allow, session, persist bool
 	}
 }
 
-// SetPlanMode toggles read-only plan mode.
+// SetPlanMode toggles the read-only plan axis while preserving the current
+// tool-auto-approval axis.
 func (a *App) SetPlanMode(on bool) {
-	if on {
-		a.SetModeForTab("", "plan")
-		return
-	}
-	a.SetModeForTab("", "normal")
+	a.setPlanModeForTab("", on)
 }
 
-// SetMode applies a composer gating mode ("plan" | "yolo" | anything else =
+func (a *App) setPlanModeForTab(tabID string, on bool) {
+	current := a.currentModeForTab(tabID)
+	a.SetModeForTab(tabID, tabModeFromAxes(on, tabModeHasAutoApproveTools(current)))
+}
+
+// SetMode applies a composer gating mode ("plan" | "yolo" | "plan-yolo" |
+// anything else =
 // normal) in one call, so a turn submitted right after the switch can't race a
-// half-applied SetPlanMode/SetBypass pair.
+// half-applied plan/tool-auto-approval pair.
 func (a *App) SetMode(mode string) {
 	a.SetModeForTab("", mode)
 }
@@ -626,10 +635,18 @@ func (a *App) SetModeForTab(tabID, mode string) {
 		return
 	}
 	tab.mode = normalized
+	tab.toolApprovalMode = normalizeToolApprovalMode(tab.toolApprovalMode)
+	if tabModeHasAutoApproveTools(normalized) {
+		tab.toolApprovalMode = control.ToolApprovalYolo
+	} else if tab.toolApprovalMode == control.ToolApprovalYolo {
+		tab.toolApprovalMode = control.ToolApprovalAsk
+	}
 	ctrl := tab.Ctrl
+	approvalMode := tab.toolApprovalMode
 	tabIDForSave := tab.ID
 	a.mu.Unlock()
 	applyTabModeToController(ctrl, normalized)
+	applyTabToolApprovalModeToController(ctrl, approvalMode)
 	a.mu.Lock()
 	if a.tabs[tabIDForSave] == tab {
 		a.saveTabsLocked()
@@ -646,11 +663,81 @@ func applyTabModeToController(ctrl *control.Controller, mode string) {
 		ctrl.SetMode(true, false)
 	case "yolo":
 		ctrl.SetMode(false, true)
+	case "plan-yolo":
+		ctrl.SetMode(true, true)
 	default:
 		ctrl.SetMode(false, false)
 	}
 }
 
+func applyTabToolApprovalModeToController(ctrl *control.Controller, mode string) {
+	if ctrl == nil {
+		return
+	}
+	ctrl.SetToolApprovalMode(normalizeToolApprovalMode(mode))
+}
+
+func (a *App) currentModeForTab(tabID string) string {
+	a.mu.RLock()
+	tab := a.tabByIDLocked(tabID)
+	mode := "normal"
+	if tab != nil {
+		mode = currentTabMode(tab)
+	}
+	a.mu.RUnlock()
+	return mode
+}
+
+func normalizeCollaborationMode(mode string) string {
+	switch strings.ToLower(strings.TrimSpace(mode)) {
+	case "plan":
+		return "plan"
+	case "goal":
+		return "goal"
+	default:
+		return "normal"
+	}
+}
+
+func (a *App) SetCollaborationMode(mode string) {
+	a.SetCollaborationModeForTab("", mode)
+}
+
+func (a *App) SetCollaborationModeForTab(tabID, mode string) {
+	mode = normalizeCollaborationMode(mode)
+	a.mu.Lock()
+	tab := a.tabByIDLocked(tabID)
+	if tab == nil {
+		a.mu.Unlock()
+		return
+	}
+	approvalMode := currentTabToolApprovalMode(tab)
+	switch mode {
+	case "plan":
+		tab.mode = tabModeFromAxes(true, approvalMode == control.ToolApprovalYolo)
+		tab.goal = ""
+	case "goal":
+		tab.mode = tabModeFromAxes(false, approvalMode == control.ToolApprovalYolo)
+	default:
+		tab.mode = tabModeFromAxes(false, approvalMode == control.ToolApprovalYolo)
+		tab.goal = ""
+	}
+	ctrl := tab.Ctrl
+	goal := tab.goal
+	plan := tabModeHasPlan(tab.mode)
+	tabIDForSave := tab.ID
+	a.mu.Unlock()
+	if ctrl != nil {
+		ctrl.SetPlanMode(plan)
+		ctrl.SetGoal(goal)
+	}
+	a.mu.Lock()
+	if a.tabs[tabIDForSave] == tab {
+		a.saveTabsLocked()
+	}
+	a.mu.Unlock()
+}
+
 // QuestionAnswer is the frontend's reply to one question in an ask_request.
 type QuestionAnswer struct {
 	QuestionID string   `json:"questionId"`
@@ -1553,12 +1640,16 @@ func (a *App) jobsForCtrl(ctrl *control.Controller, out []JobView) []JobView {
 
 // Meta describes the session for the frontend's header and status line.
 type Meta struct {
-	Label        string `json:"label"`
-	Ready        bool   `json:"ready"`
-	StartupErr   string `json:"startupErr,omitempty"`
-	EventChannel string `json:"eventChannel"`
-	Cwd          string `json:"cwd"`
-	Bypass       bool   `json:"bypass"` // YOLO mode on (auto-approve every tool call)
+	Label            string `json:"label"`
+	Ready            bool   `json:"ready"`
+	StartupErr       string `json:"startupErr,omitempty"`
+	EventChannel     string `json:"eventChannel"`
+	Cwd              string `json:"cwd"`
+	AutoApproveTools bool   `json:"autoApproveTools"`
+	Bypass           bool   `json:"bypass"` // legacy JSON key for YOLO/full-access tool auto-approval
+	ToolApprovalMode string `json:"toolApprovalMode"`
+	Goal             string `json:"goal,omitempty"`
+	GoalStatus       string `json:"goalStatus,omitempty"`
 }
 
 // Meta reports the model label, readiness, any startup error, the working
@@ -1577,25 +1668,110 @@ func (a *App) MetaForTab(tabID string) Meta {
 	if cwd == "" {
 		cwd, _ = os.Getwd()
 	}
+	autoApproveTools := tab.Ctrl != nil && tab.Ctrl.AutoApproveTools()
+	toolApprovalMode := currentTabToolApprovalMode(tab)
+	goal := currentTabGoal(tab)
+	goalStatus := currentTabGoalStatus(tab)
 	return Meta{
-		Label:        tab.Label,
-		Ready:        tab.Ready,
-		StartupErr:   tab.StartupErr,
-		EventChannel: eventChannel,
-		Cwd:          cwd,
-		Bypass:       tab.Ctrl != nil && tab.Ctrl.Bypass(),
+		Label:            tab.Label,
+		Ready:            tab.Ready,
+		StartupErr:       tab.StartupErr,
+		EventChannel:     eventChannel,
+		Cwd:              cwd,
+		AutoApproveTools: autoApproveTools,
+		Bypass:           autoApproveTools,
+		ToolApprovalMode: toolApprovalMode,
+		Goal:             goal,
+		GoalStatus:       goalStatus,
 	}
 }
 
-// SetBypass toggles YOLO mode for the session: auto-approve every tool call
-// (writers and bash run without asking). Deny rules still apply. Runtime-only —
-// not written to config, so it resets on relaunch.
-func (a *App) SetBypass(on bool) {
+func (a *App) SetGoal(goal string) {
+	a.SetGoalForTab("", goal)
+}
+
+func (a *App) SetGoalForTab(tabID, goal string) {
+	goal = strings.TrimSpace(goal)
+	a.mu.Lock()
+	tab := a.tabByIDLocked(tabID)
+	if tab == nil {
+		a.mu.Unlock()
+		return
+	}
+	tab.goal = goal
+	if goal != "" {
+		tab.mode = tabModeFromAxes(false, currentTabToolApprovalMode(tab) == control.ToolApprovalYolo)
+	}
+	ctrl := tab.Ctrl
+	plan := tabModeHasPlan(tab.mode)
+	tabIDForSave := tab.ID
+	a.mu.Unlock()
+	if ctrl != nil {
+		ctrl.SetPlanMode(plan)
+		ctrl.SetGoal(goal)
+	}
+	a.mu.Lock()
+	if a.tabs[tabIDForSave] == tab {
+		a.saveTabsLocked()
+	}
+	a.mu.Unlock()
+}
+
+func (a *App) ClearGoal() {
+	a.SetGoal("")
+}
+
+func (a *App) ClearGoalForTab(tabID string) {
+	a.SetGoalForTab(tabID, "")
+}
+
+// SetAutoApproveTools toggles YOLO/full-access tool auto-approval:
+// approval-gated tool calls run without asking, while ask questions and plan
+// approvals still wait for the user. Runtime-only — not written to config.
+func (a *App) SetAutoApproveTools(on bool) {
 	if on {
-		a.SetModeForTab("", "yolo")
+		a.SetToolApprovalModeForTab("", control.ToolApprovalYolo)
 		return
 	}
-	a.SetModeForTab("", "normal")
+	a.SetToolApprovalModeForTab("", control.ToolApprovalAsk)
+}
+
+func (a *App) setAutoApproveToolsForTab(tabID string, on bool) {
+	if on {
+		a.SetToolApprovalModeForTab(tabID, control.ToolApprovalYolo)
+		return
+	}
+	a.SetToolApprovalModeForTab(tabID, control.ToolApprovalAsk)
+}
+
+// SetBypass is the legacy Wails binding for SetAutoApproveTools.
+func (a *App) SetBypass(on bool) {
+	a.SetAutoApproveTools(on)
+}
+
+func (a *App) SetToolApprovalMode(mode string) {
+	a.SetToolApprovalModeForTab("", mode)
+}
+
+func (a *App) SetToolApprovalModeForTab(tabID, mode string) {
+	mode = normalizeToolApprovalMode(mode)
+	a.mu.Lock()
+	tab := a.tabByIDLocked(tabID)
+	if tab == nil {
+		a.mu.Unlock()
+		return
+	}
+	tab.toolApprovalMode = mode
+	tab.mode = tabModeFromAxes(tabModeHasPlan(currentTabMode(tab)), mode == control.ToolApprovalYolo)
+	ctrl := tab.Ctrl
+	tabIDForSave := tab.ID
+	a.mu.Unlock()
+	applyTabToolApprovalModeToController(ctrl, mode)
+	a.mu.Lock()
+	if a.tabs[tabIDForSave] == tab {
+		a.saveTabsLocked()
+	}
+	a.mu.Unlock()
 }
 
 // CommandInfo describes one available slash command for the composer's "/" menu.
@@ -1616,6 +1792,7 @@ func (a *App) Commands() []CommandInfo {
 		{Name: "model", Description: i18n.M.CmdModel, Kind: "builtin"},
 		{Name: "effort", Description: i18n.M.CmdEffort, Kind: "builtin"},
 		{Name: "memory", Description: i18n.M.CmdMemory, Kind: "builtin"},
+		{Name: "goal", Description: i18n.M.CmdGoal, Kind: "builtin"},
 		{Name: "remember", Description: i18n.M.CmdRemember, Kind: "builtin"},
 		{Name: "mcp", Description: i18n.M.CmdMcp, Kind: "builtin"},
 		{Name: "hooks", Description: i18n.M.CmdHooks, Kind: "builtin"},
@@ -2874,6 +3051,8 @@ func (a *App) SetModelForTab(tabID, name string) error {
 	a.mu.Unlock()
 	newCtrl.EnableInteractiveApproval()
 	applyTabModeToController(newCtrl, tab.mode)
+	applyTabToolApprovalModeToController(newCtrl, tab.toolApprovalMode)
+	newCtrl.SetGoal(tab.goal)
 
 	path := agent.ContinueSessionPath(prevPath, newCtrl.SessionDir(), newCtrl.Label())
 	if len(carried) > 0 {
@@ -2966,6 +3145,8 @@ func (a *App) SetEffortForTab(tabID, level string) error {
 	a.mu.Unlock()
 	newCtrl.EnableInteractiveApproval()
 	applyTabModeToController(newCtrl, tab.mode)
+	applyTabToolApprovalModeToController(newCtrl, tab.toolApprovalMode)
+	newCtrl.SetGoal(tab.goal)
 	path := agent.ContinueSessionPath(prevPath, newCtrl.SessionDir(), newCtrl.Label())
 	if len(carried) > 0 {
 		newCtrl.Resume(&agent.Session{Messages: carried}, path)
diff --git a/desktop/frontend/package.json b/desktop/frontend/package.json
index ba0974593..d71a7b5dc 100644
--- a/desktop/frontend/package.json
+++ b/desktop/frontend/package.json
@@ -8,6 +8,7 @@
     "build": "node scripts/check-css-syntax.mjs src/styles.css && node scripts/check-z-index-tokens.mjs src/styles.css && tsc --noEmit && vite build",
     "preview": "vite preview",
     "check:css": "node scripts/check-css-syntax.mjs src/styles.css && node scripts/check-z-index-tokens.mjs src/styles.css",
+    "check:browser-preview": "node scripts/check-browser-preview-stability.mjs",
     "test:todo-visibility": "node scripts/test-todo-visibility.mjs",
     "typecheck": "tsc --noEmit",
     "test": "tsx src/__tests__/math-golden.test.ts && tsx src/__tests__/text-size.test.ts && tsx src/__tests__/provider-model-refresh.test.ts",
diff --git a/desktop/frontend/scripts/check-browser-preview-stability.mjs b/desktop/frontend/scripts/check-browser-preview-stability.mjs
new file mode 100644
index 000000000..f7e3c9b65
--- /dev/null
+++ b/desktop/frontend/scripts/check-browser-preview-stability.mjs
@@ -0,0 +1,371 @@
+import fs from "node:fs";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+
+const scriptDir = path.dirname(fileURLToPath(import.meta.url));
+const frontendRoot = path.resolve(scriptDir, "..");
+
+function read(rel) {
+  return fs.readFileSync(path.join(frontendRoot, rel), "utf8");
+}
+
+function fail(message) {
+  console.error(message);
+  process.exitCode = 1;
+}
+
+function mustNotContain(rel, source, needle, reason) {
+  if (source.includes(needle)) {
+    fail(`${rel}: found forbidden "${needle}" (${reason})`);
+  }
+}
+
+function mustContain(rel, source, needle, reason) {
+  if (!source.includes(needle)) {
+    fail(`${rel}: missing "${needle}" (${reason})`);
+  }
+}
+
+const anchoredPopover = read("src/components/AnchoredPopover.tsx");
+mustNotContain(
+  "src/components/AnchoredPopover.tsx",
+  anchoredPopover,
+  "anchored-popover__backdrop",
+  "non-modal popovers must not render a transparent page-covering click layer",
+);
+mustNotContain(
+  "src/components/AnchoredPopover.tsx",
+  anchoredPopover,
+  "document.querySelector<HTMLElement>(\"[data-anchored-popover='active']\")",
+  "popover positioning must measure its own ref, not the first matching portal in the document",
+);
+mustContain(
+  "src/components/AnchoredPopover.tsx",
+  anchoredPopover,
+  "const popoverRef = useRef<HTMLDivElement>(null);",
+  "popover positioning and outside-click handling must be scoped to the current instance",
+);
+mustContain(
+  "src/components/AnchoredPopover.tsx",
+  anchoredPopover,
+  "popoverRef.current?.getBoundingClientRect()",
+  "popover positioning must use the current popover instance",
+);
+
+const statusBar = read("src/components/StatusBar.tsx");
+mustNotContain(
+  "src/components/StatusBar.tsx",
+  statusBar,
+  "modelsw__backdrop",
+  "status-bar popovers must not cover the whole viewport after opening",
+);
+mustContain(
+  "src/components/StatusBar.tsx",
+  statusBar,
+  "wrapRef.current?.contains(target)",
+  "status-bar popover outside-click handling must be scoped to the wrapper",
+);
+
+const composer = read("src/components/Composer.tsx");
+mustContain(
+  "src/components/Composer.tsx",
+  composer,
+  "composer-action-trigger",
+  "more actions must live behind the compact plus affordance",
+);
+mustContain(
+  "src/components/Composer.tsx",
+  composer,
+  "composer-mode-chip--plan",
+  "active plan mode must surface as a dismissible composer chip",
+);
+mustContain(
+  "src/components/Composer.tsx",
+  composer,
+  "composer-mode-chip--goal",
+  "active goal mode must surface as a dismissible composer chip",
+);
+mustContain(
+  "src/components/Composer.tsx",
+  composer,
+  "composer-intent-menu__item${planModeOn",
+  "plan mode must be created from the plus menu",
+);
+mustContain(
+  "src/components/Composer.tsx",
+  composer,
+  "composer-modebar--approval",
+  "tool approval must use a direct segmented control",
+);
+mustNotContain(
+  "src/components/Composer.tsx",
+  composer,
+  "composer-modebar--collaboration",
+  "collaboration modes must not occupy the always-visible segmented control",
+);
+mustNotContain(
+  "src/components/Composer.tsx",
+  composer,
+  "composer-intent-chip",
+  "plan/goal chips must not return to the always-visible composer row",
+);
+mustNotContain(
+  "src/components/Composer.tsx",
+  composer,
+  "composer-plan-toggle",
+  "plan mode must not be an always-visible standalone control",
+);
+mustNotContain(
+  "src/components/Composer.tsx",
+  composer,
+  "composer-access-trigger",
+  "tool approval must not regress to a single dropdown trigger",
+);
+
+const projectTree = read("src/components/ProjectTree.tsx");
+mustContain(
+  "src/components/ProjectTree.tsx",
+  projectTree,
+  "GLOBAL_PROJECT_ORDER_KEY",
+  "Global must participate in project tree reorder through a stable virtual key",
+);
+mustContain(
+  "src/components/ProjectTree.tsx",
+  projectTree,
+  "draggable={draggableProject}",
+  "project rows should be directly draggable for reorder",
+);
+mustContain(
+  "src/components/ProjectTree.tsx",
+  projectTree,
+  "target.closest(\".project-tree__action-slot\")",
+  "project row drag must not start from the new-topic action area",
+);
+mustNotContain(
+  "src/components/ProjectTree.tsx",
+  projectTree,
+  "project-tree__drag-handle",
+  "project reorder should not expose a separate drag handle",
+);
+mustContain(
+  "src/components/ProjectTree.tsx",
+  projectTree,
+  "manuallyCollapsedRef",
+  "project-tree async refresh must read the latest manual collapse state",
+);
+mustContain(
+  "src/components/ProjectTree.tsx",
+  projectTree,
+  "project-tree__collapse-all",
+  "project tree needs a dedicated collapse-all affordance",
+);
+mustContain(
+  "src/components/ProjectTree.tsx",
+  projectTree,
+  "collapseSnapshot",
+  "collapse-all must be reversible to the previous tree view",
+);
+mustContain(
+  "src/components/ProjectTree.tsx",
+  projectTree,
+  "collapsibleFolderKeys",
+  "collapse-all must target every expandable project folder key",
+);
+
+const styles = read("src/styles.css");
+mustNotContain(
+  "src/styles.css",
+  styles,
+  ".anchored-popover__backdrop",
+  "stale backdrop CSS can hide accidental page-covering layers",
+);
+mustNotContain(
+  "src/styles.css",
+  styles,
+  ".modelsw__backdrop",
+  "stale backdrop CSS can hide accidental page-covering layers",
+);
+mustNotContain(
+  "src/styles.css",
+  styles,
+  ".composer-access-trigger",
+  "stale single approval dropdown CSS should not survive the segmented control migration",
+);
+mustContain(
+  "src/styles.css",
+  styles,
+  ".composer-modebar--approval",
+  "approval segmented control needs dedicated state styling",
+);
+mustContain(
+  "src/styles.css",
+  styles,
+  ".composer-mode-chip",
+  "active plan/goal chips need shared dismiss styling",
+);
+mustContain(
+  "src/styles.css",
+  styles,
+  ".composer-intent-switch",
+  "plan/goal plus menu needs explicit switch feedback",
+);
+mustNotContain(
+  "src/styles.css",
+  styles,
+  ".project-tree__drag-handle",
+  "project reorder should not expose a separate drag handle",
+);
+mustContain(
+  "src/styles.css",
+  styles,
+  ".project-tree__folder--draggable",
+  "project reorder needs whole-row drag cursor feedback",
+);
+mustContain(
+  "src/styles.css",
+  styles,
+  ".project-tree__collapse-all",
+  "project collapse-all button must keep its compact icon affordance",
+);
+mustContain(
+  "src/styles.css",
+  styles,
+  ".project-tree__collapse-all--restore",
+  "restorable project tree state must have a distinct visual affordance",
+);
+mustContain(
+  "src/styles.css",
+  styles,
+  "grid-template-rows 0.2s cubic-bezier",
+  "project folder collapse needs an intentional height transition",
+);
+
+const app = read("src/App.tsx");
+mustContain(
+  "src/App.tsx",
+  app,
+  "const [rightDockMode, setRightDockMode] = useState<RightDockMode>(\"context\");",
+  "the right dock should open on overview as the first information layer",
+);
+mustContain(
+  "src/App.tsx",
+  app,
+  "openWorkspacePanel(\"context\");",
+  "reopening the right dock should return to the overview entry point",
+);
+mustContain(
+  "src/App.tsx",
+  app,
+  "{SHOW_CONTEXT_DOCK && (\n                  <button\n                    type=\"button\"\n                    role=\"tab\"\n                    aria-selected={rightDockMode === \"context\"}",
+  "right dock tabs should be ordered overview, files, changes",
+);
+mustContain(
+  "src/App.tsx",
+  app,
+  "const rightDockDetailActive = rightDockMode === \"context\" ? contextDetailActive : workspacePreviewActive;",
+  "right dock width must derive from the current tab's own detail state",
+);
+mustNotContain(
+  "src/App.tsx",
+  app,
+  "rightDockMode === \"context\"\n      ? RIGHT_DOCK_CONTEXT_WIDTH",
+  "context view must not have a separate hard-coded width that fights the shared narrow/detail widths",
+);
+mustContain(
+  "src/App.tsx",
+  app,
+  "onDetailModeChange={handleContextDetailModeChange}",
+  "context detail pages must be able to request the detail-width dock",
+);
+
+const workspacePanel = read("src/components/WorkspacePanel.tsx");
+mustContain(
+  "src/components/WorkspacePanel.tsx",
+  workspacePanel,
+  "const previewModeActive = open && (filePreviewActive || changeDetailActive);",
+  "changes view should not force a wide dock until a file preview or change detail is open",
+);
+mustContain(
+  "src/components/WorkspacePanel.tsx",
+  workspacePanel,
+  "workspace-panel--detail-only",
+  "changes view needs a narrow single-column layout before detail expansion",
+);
+
+const contextPanel = read("src/components/ContextPanel.tsx");
+mustContain(
+  "src/components/ContextPanel.tsx",
+  contextPanel,
+  "onDetailModeChange?.(true);",
+  "context detail entry must notify the parent dock to use detail width",
+);
+mustContain(
+  "src/styles.css",
+  styles,
+  ".workspace-panel--detail-only",
+  "changes view needs CSS support for the narrow single-column state",
+);
+mustContain(
+  "src/styles.css",
+  styles,
+  "grid-template-columns: minmax(0, 1fr);",
+  "context overview must fit the narrow right dock without forcing a two-column chart layout",
+);
+
+const bridge = read("src/lib/bridge.ts");
+mustContain(
+  "src/lib/bridge.ts",
+  bridge,
+  "function mockScenario(): \"demo\" | \"fresh\" | \"running\"",
+  "browser preview needs explicit scenarios instead of always presenting busy mock data",
+);
+mustContain(
+  "src/lib/bridge.ts",
+  bridge,
+  "value === \"running\"",
+  "running preview must be opt-in with ?mock=running",
+);
+mustContain(
+  "src/lib/bridge.ts",
+  bridge,
+  "const runningMock = scenario === \"running\";",
+  "busy topic/tab state must be gated behind the running scenario",
+);
+mustContain(
+  "src/lib/bridge.ts",
+  bridge,
+  "const mockTopicRunsInScenario = (topicId: string) => runningMock && mockTopicIsRunning(topicId);",
+  "all mock runtime state must stay behind the explicit running scenario",
+);
+mustContain(
+  "src/lib/bridge.ts",
+  bridge,
+  "if (!runningMock) return;",
+  "mock runtime event injection must be disabled for the default browser preview",
+);
+mustNotContain(
+  "src/lib/bridge.ts",
+  bridge,
+  "running: mockTopicIsRunning(",
+  "tab running state must not bypass the explicit running scenario",
+);
+for (const status of ["streaming", "thinking", "waiting_confirmation"]) {
+  mustContain(
+    "src/lib/bridge.ts",
+    bridge,
+    `status: runningMock ? "${status}"`,
+    `mock ${status} state must not appear in the default browser preview`,
+  );
+}
+mustContain(
+  "src/lib/bridge.ts",
+  bridge,
+  "running: runningMock && mockTopicIsRunning(\"topic_p3b_pd\")",
+  "mock tab running state must not be active in the default browser preview",
+);
+
+if (process.exitCode) {
+  process.exit(process.exitCode);
+}
+
+console.log("Browser preview stability check passed");
diff --git a/desktop/frontend/src/App.tsx b/desktop/frontend/src/App.tsx
index 66dae8311..681cb0f7d 100644
--- a/desktop/frontend/src/App.tsx
+++ b/desktop/frontend/src/App.tsx
@@ -1,23 +1,19 @@
-import { useCallback, useDeferredValue, useEffect, useMemo, useRef, useState } from "react";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import type { CSSProperties, KeyboardEvent, PointerEvent as ReactPointerEvent } from "react";
 import { ShellExpandProvider, useShellExpand } from "./lib/shellExpand";
 import {
+  Activity,
+  Command,
   Download,
   SquarePen,
-  CircleGauge,
   FileText,
   FileJson,
   GitBranch,
   History,
   Settings as SettingsIcon,
   Pencil,
-  PanelLeftClose,
-  PanelLeftOpen,
-  PanelRightClose,
-  PanelRightOpen,
   Trash2,
 } from "lucide-react";
-import logoWordmark from "./assets/logo-wordmark.svg";
 import { useToast } from "./lib/toast";
 import { asArray } from "./lib/array";
 import { clearLegacyLangPref, normalizeLangPref, readLegacyLangPref, t, useI18n, useT } from "./lib/i18n";
@@ -30,6 +26,7 @@ import { ApprovalModal } from "./components/ApprovalModal";
 import { AskCard } from "./components/AskCard";
 import { StatusBar } from "./components/StatusBar";
 import { HistoryPanel } from "./components/HistoryPanel";
+import { CommandPalette, type PaletteItem } from "./components/CommandPalette";
 import { SettingsPanel } from "./components/SettingsPanel";
 import { UpdateBanner } from "./components/UpdateBanner";
 import { ContextPanel } from "./components/ContextPanel";
@@ -37,13 +34,27 @@ import { WorkspacePanel } from "./components/WorkspacePanel";
 import { Tooltip } from "./components/Tooltip";
 import { StartupSplash, shouldShowStartupSplash } from "./components/StartupSplash";
 import { OnboardingOverlay } from "./components/OnboardingOverlay";
-import { TabBar } from "./components/TabBar";
+import { AppChrome } from "./components/AppChrome";
 import { ProjectTree } from "./components/ProjectTree";
 import { CopyButton } from "./components/CopyButton";
-import { CommandPalette, type PaletteItem } from "./components/CommandPalette";
 import { parseTodos } from "./lib/tools";
 import { shouldShowTodoPanel } from "./lib/todoVisibility";
-import type { ComposerInsertRequest, Meta, Mode, SessionMeta, SettingsTab, TabMeta } from "./lib/types";
+import {
+  modeHasAutoApproveTools,
+  modeHasPlan,
+  modeFromAxes,
+  normalizeCollaborationMode,
+  normalizeMode,
+  normalizeToolApprovalMode,
+  type CollaborationMode,
+  type ComposerInsertRequest,
+  type Mode,
+  type ProjectNode,
+  type SessionMeta,
+  type SettingsTab,
+  type TabMeta,
+  type ToolApprovalMode,
+} from "./lib/types";
 import { loadLayoutSize, saveLayoutSize } from "./lib/layoutPreferences";
 import {
   applyTheme,
@@ -54,35 +65,33 @@ import {
   normalizeThemePreference,
   normalizeThemeStyleForTheme,
   readLegacyThemePreference,
-  themeForStyle,
   type Theme,
 } from "./lib/theme";
 import { applyTextSize, DEFAULT_TEXT_SIZE, getTextSize, nextTextSize } from "./lib/textSize";
 import { useWindowStatePersistence } from "./lib/windowState";
+import logoWordmark from "./assets/logo-wordmark.svg";
 
 const SIDEBAR_COLLAPSED_KEY = "reasonix.sidebar.collapsed";
 const SIDEBAR_DEFAULT_WIDTH = 264;
-const SIDEBAR_DEFAULT_RATIO = 0.175;
-const SIDEBAR_MIN_WIDTH = 228;
-const SIDEBAR_MAX_WIDTH = 420;
+const SIDEBAR_MIN_WIDTH = 248;
+const SIDEBAR_MAX_WIDTH = 300;
+const SIDEBAR_VIEWPORT_RATIO = 0.18;
 const CHAT_MIN_WIDTH = 400;
+const CHAT_DOCKED_MIN_WIDTH = 640;
 const WORKSPACE_RESIZER_WIDTH = 8;
 
 function isThemeMode(value: string): value is Theme {
   return value === "auto" || value === "light" || value === "dark";
 }
-const CONTEXT_PANEL_MIN_WIDTH = 340;
-const RIGHT_DOCK_MIN_WIDTH = CONTEXT_PANEL_MIN_WIDTH;
-const RIGHT_DOCK_CONTEXT_WIDTH = 380;
-const RIGHT_DOCK_TREE_DEFAULT_WIDTH = 320;
-const RIGHT_DOCK_TREE_DEFAULT_RATIO = 0.25;
-const RIGHT_DOCK_TREE_MIN_WIDTH = 260;
+const RIGHT_DOCK_TREE_DEFAULT_WIDTH = 300;
+const RIGHT_DOCK_TREE_MIN_WIDTH = 300;
 const RIGHT_DOCK_TREE_MAX_WIDTH = 560;
-const RIGHT_DOCK_PREVIEW_DEFAULT_WIDTH = 640;
+const RIGHT_DOCK_PREVIEW_DEFAULT_WIDTH = 660;
+const RIGHT_DOCK_PREVIEW_MIN_WIDTH = RIGHT_DOCK_PREVIEW_DEFAULT_WIDTH;
 const RIGHT_DOCK_MAX_WIDTH = 860;
 
 type RightDockMode = "context" | "files" | "changed";
-const SHOW_CONTEXT_DOCK = false;
+const SHOW_CONTEXT_DOCK = true;
 type HistoryScopeFilter = { scope: "global" | "project"; workspaceRoot: string };
 type DesktopPlatform = "darwin" | "windows" | "linux";
 type HistoryViewState =
@@ -94,37 +103,23 @@ function clampSidebarWidth(width: number): number {
   return Math.min(SIDEBAR_MAX_WIDTH, Math.max(SIDEBAR_MIN_WIDTH, Math.round(width)));
 }
 
-function clampRightDockWidth(width: number): number {
-  return Math.min(RIGHT_DOCK_MAX_WIDTH, Math.max(RIGHT_DOCK_MIN_WIDTH, Math.round(width)));
+function clampRightDockPreviewWidth(width: number): number {
+  return Math.min(RIGHT_DOCK_MAX_WIDTH, Math.max(RIGHT_DOCK_PREVIEW_MIN_WIDTH, Math.round(width)));
 }
 
 function clampRightDockTreeWidth(width: number): number {
   return Math.min(RIGHT_DOCK_TREE_MAX_WIDTH, Math.max(RIGHT_DOCK_TREE_MIN_WIDTH, Math.round(width)));
 }
 
-function viewportWidthFallback(): number {
-  if (typeof window === "undefined") return 0;
-  const width = Math.round(window.innerWidth || 0);
-  return Number.isFinite(width) && width > 0 ? width : 0;
-}
-
 function defaultSidebarWidth(): number {
-  const width = viewportWidthFallback();
-  if (width <= 0) return SIDEBAR_DEFAULT_WIDTH;
-  return clampSidebarWidth(width * SIDEBAR_DEFAULT_RATIO);
+  if (typeof window !== "undefined") {
+    return clampSidebarWidth(window.innerWidth * SIDEBAR_VIEWPORT_RATIO);
+  }
+  return SIDEBAR_DEFAULT_WIDTH;
 }
 
 function defaultRightDockTreeWidth(): number {
-  const width = viewportWidthFallback();
-  if (width <= 0) return RIGHT_DOCK_TREE_DEFAULT_WIDTH;
-  return clampRightDockTreeWidth(width * RIGHT_DOCK_TREE_DEFAULT_RATIO);
-}
-
-function resolveRightDockWidth(mainWidth: number, desiredDockWidth: number, minWidth: number): number {
-  const budget = Math.max(0, Math.round(mainWidth) - CHAT_MIN_WIDTH - WORKSPACE_RESIZER_WIDTH);
-  if (budget < minWidth) return 0;
-  const desired = Math.min(RIGHT_DOCK_MAX_WIDTH, Math.max(minWidth, Math.round(desiredDockWidth)));
-  return Math.min(budget, desired);
+  return RIGHT_DOCK_TREE_DEFAULT_WIDTH;
 }
 
 function loadSidebarCollapsed(): boolean {
@@ -146,11 +141,11 @@ function saveSidebarCollapsed(collapsed: boolean): void {
 }
 
 function loadSidebarWidth(): number {
-  return loadLayoutSize("sidebarWidth", defaultSidebarWidth(), clampSidebarWidth);
+  return loadLayoutSize("sidebarWidthGraphite", defaultSidebarWidth(), clampSidebarWidth);
 }
 
 function saveSidebarWidth(width: number): void {
-  saveLayoutSize("sidebarWidth", width, clampSidebarWidth);
+  saveLayoutSize("sidebarWidthGraphite", width, clampSidebarWidth);
 }
 
 function normalizeDesktopPlatform(value: string): DesktopPlatform {
@@ -184,11 +179,11 @@ function saveRightDockTreeWidth(width: number): void {
 }
 
 function loadRightDockPreviewWidth(): number {
-  return loadLayoutSize("rightDockPreviewWidth", RIGHT_DOCK_PREVIEW_DEFAULT_WIDTH, clampRightDockWidth);
+  return loadLayoutSize("rightDockPreviewWidth", RIGHT_DOCK_PREVIEW_DEFAULT_WIDTH, clampRightDockPreviewWidth);
 }
 
 function saveRightDockPreviewWidth(width: number): void {
-  saveLayoutSize("rightDockPreviewWidth", width, clampRightDockWidth);
+  saveLayoutSize("rightDockPreviewWidth", width, clampRightDockPreviewWidth);
 }
 
 function tabWorkspaceTitle(tab?: TabMeta): string {
@@ -205,21 +200,17 @@ function topicTitle(tab?: TabMeta): string {
   return topic === workspaceTitle ? workspaceTitle : `${workspaceTitle} / ${topic}`;
 }
 
+function topicDisplayTitle(tab?: TabMeta): string {
+  if (!tab) return "Global";
+  return tab.topicTitle || (tab.scope === "global" ? tabWorkspaceTitle(tab) : "Untitled");
+}
+
 function topicScopeLabel(tab?: TabMeta): string {
   if (!tab) return t("scope.global");
   if (tab.scope === "global") return tab.workspaceName || t("scope.global");
   return t("scope.project", { name: tab.workspaceName || tab.workspaceRoot || "Project" });
 }
 
-function appChromeScopeLabel(tab?: TabMeta, meta?: Meta): string {
-  if (tab?.scope === "project" || tab?.scope === "global") return tabWorkspaceTitle(tab);
-  return workspaceDisplayName(meta?.cwd) || meta?.label || "Global";
-}
-
-function normalizeModeValue(mode?: string): Mode {
-  return mode === "plan" || mode === "yolo" ? mode : "normal";
-}
-
 function sessionsForScope(sessions: SessionMeta[], filter: HistoryScopeFilter): SessionMeta[] {
   if (filter.scope === "project") {
     return sessions.filter((session) => session.scope === "project" && session.workspaceRoot === filter.workspaceRoot);
@@ -227,6 +218,23 @@ function sessionsForScope(sessions: SessionMeta[], filter: HistoryScopeFilter):
   return sessions.filter((session) => (session.scope || "global") === "global");
 }
 
+function activeTopicTurnsFromTree(nodes: ProjectNode[], tab?: TabMeta): number | undefined {
+  if (!tab?.topicId) return undefined;
+  const activeScope = tab.scope === "global" ? "global" : "project";
+  const stack = [...nodes];
+  while (stack.length > 0) {
+    const node = stack.shift();
+    if (!node) continue;
+    if (node.kind === "topic" || node.kind === "global_topic") {
+      const nodeScope = node.kind === "global_topic" ? "global" : "project";
+      const sameRoot = nodeScope === "global" || node.root === tab.workspaceRoot;
+      if (node.topicId === tab.topicId && nodeScope === activeScope && sameRoot) return node.turns ?? 0;
+    }
+    if (node.children?.length) stack.push(...node.children);
+  }
+  return undefined;
+}
+
 function workspaceDisplayName(path?: string): string {
   if (!path) return "";
   const parts = path.split(/[/\\]/).filter(Boolean);
@@ -371,7 +379,10 @@ export default function App() {
     approve,
     answerQuestion,
     setControllerMode,
-    newSession,
+    setCollaborationMode: setControllerCollaborationMode,
+    setToolApprovalMode: setControllerToolApprovalMode,
+    setGoal: setControllerGoal,
+    clearGoal: clearControllerGoal,
     listSessions,
     listTrashedSessions,
     resumeSession,
@@ -396,6 +407,9 @@ export default function App() {
   const { locale, setPref: setLocalePref } = useI18n();
   const t = useT();
   const [modesByTab, setModesByTab] = useState<Record<string, Mode>>({});
+  const [collaborationModesByTab, setCollaborationModesByTab] = useState<Record<string, CollaborationMode>>({});
+  const [toolApprovalModesByTab, setToolApprovalModesByTab] = useState<Record<string, ToolApprovalMode>>({});
+  const [goalsByTab, setGoalsByTab] = useState<Record<string, string>>({});
   const [tabMetas, setTabMetas] = useState<TabMeta[]>([]);
   const [tabOrderIds, setTabOrderIds] = useState<string[]>([]);
   const [tabRevealSignal, setTabRevealSignal] = useState(0);
@@ -405,6 +419,8 @@ export default function App() {
   const [needsOnboarding, setNeedsOnboarding] = useState<boolean | null>(null);
   const [settingsTarget, setSettingsTarget] = useState<SettingsTab | null>(null);
   const [histView, setHistView] = useState<HistoryViewState | null>(null);
+  const [paletteOpen, setPaletteOpen] = useState(false);
+  const [paletteSessions, setPaletteSessions] = useState<SessionMeta[]>([]);
   const { showToast } = useToast();
   const [sidebarCollapsed, setSidebarCollapsed] = useState(loadSidebarCollapsed);
   const [sidebarWidth, setSidebarWidth] = useState(loadSidebarWidth);
@@ -413,23 +429,81 @@ export default function App() {
   const [rightDockTreeWidth, setRightDockTreeWidth] = useState(loadRightDockTreeWidth);
   const [rightDockPreviewWidth, setRightDockPreviewWidth] = useState(loadRightDockPreviewWidth);
   const [workspacePreviewActive, setWorkspacePreviewActive] = useState(false);
+  const [contextDetailActive, setContextDetailActive] = useState(false);
   const [workspacePanelResizing, setWorkspacePanelResizing] = useState(false);
   const [workspacePanelMaximized, setWorkspacePanelMaximized] = useState(false);
-  const [rightDockMode, setRightDockMode] = useState<RightDockMode>("files");
+  const [rightDockMode, setRightDockMode] = useState<RightDockMode>("context");
   const [dockRefreshKey, setDockRefreshKey] = useState(0);
   const [projectRevision, setProjectRevision] = useState(0);
   const [composerInsertRequest, setComposerInsertRequest] = useState<ComposerInsertRequest | null>(null);
+  const [transientOverlayDismissSignal, setTransientOverlayDismissSignal] = useState(0);
   const [desktopPlatform, setDesktopPlatform] = useState<DesktopPlatform>(detectBrowserPlatform);
   const [renamingTopicId, setRenamingTopicId] = useState<string | null>(null);
   const [topicTitleDraft, setTopicTitleDraft] = useState("");
   const [topicExportOpen, setTopicExportOpen] = useState(false);
-  const [paletteOpen, setPaletteOpen] = useState(false);
+  const [sidebarTogglePressed, setSidebarTogglePressed] = useState(false);
+  const [workspaceTogglePressed, setWorkspaceTogglePressed] = useState(false);
+  const [savedTopicTurnCount, setSavedTopicTurnCount] = useState<number | undefined>(undefined);
   const topicRenameSkipCommitRef = useRef(false);
   const topicRenameCommitHandledRef = useRef(false);
+  const appRef = useRef<HTMLDivElement>(null);
+  const sidebarTogglePressTimerRef = useRef<number | null>(null);
+  const workspaceTogglePressTimerRef = useRef<number | null>(null);
 
   // Persist window geometry across launches.
   useWindowStatePersistence();
 
+  const closeTransientOverlays = useCallback(() => {
+    setTransientOverlayDismissSignal((signal) => signal + 1);
+  }, []);
+
+  const pulseSidebarToggle = useCallback(() => {
+    if (typeof window === "undefined") return;
+    if (sidebarTogglePressTimerRef.current !== null) {
+      window.clearTimeout(sidebarTogglePressTimerRef.current);
+    }
+    setSidebarTogglePressed(true);
+    sidebarTogglePressTimerRef.current = window.setTimeout(() => {
+      sidebarTogglePressTimerRef.current = null;
+      setSidebarTogglePressed(false);
+    }, 260);
+  }, []);
+
+  const pulseWorkspaceToggle = useCallback(() => {
+    if (typeof window === "undefined") return;
+    if (workspaceTogglePressTimerRef.current !== null) {
+      window.clearTimeout(workspaceTogglePressTimerRef.current);
+    }
+    setWorkspaceTogglePressed(true);
+    workspaceTogglePressTimerRef.current = window.setTimeout(() => {
+      workspaceTogglePressTimerRef.current = null;
+      setWorkspaceTogglePressed(false);
+    }, 260);
+  }, []);
+
+  const anchorAppScrollToChat = useCallback(() => {
+    if (typeof window === "undefined") return;
+    const el = appRef.current;
+    if (!el) return;
+    const pin = () => {
+      el.scrollLeft = 0;
+    };
+    pin();
+    window.requestAnimationFrame(pin);
+    window.setTimeout(pin, 300);
+  }, []);
+
+  useEffect(() => {
+    return () => {
+      if (sidebarTogglePressTimerRef.current !== null) {
+        window.clearTimeout(sidebarTogglePressTimerRef.current);
+      }
+      if (workspaceTogglePressTimerRef.current !== null) {
+        window.clearTimeout(workspaceTogglePressTimerRef.current);
+      }
+    };
+  }, []);
+
   useEffect(() => {
     let cancelled = false;
     const override = browserPlatformOverride();
@@ -480,40 +554,39 @@ export default function App() {
   useEffect(() => {
     if (typeof window === "undefined" || !window.runtime) return;
     return window.runtime.EventsOn("app:open-settings", () => {
+      closeTransientOverlays();
       setSettingsTarget("general");
     });
-  }, []);
+  }, [closeTransientOverlays]);
   const [pendingPlanRevision, setPendingPlanRevision] = useState<string | null>(null);
   const [footerHeight, setFooterHeight] = useState(0);
-  const layoutRef = useRef<HTMLDivElement>(null);
+  const footerHeightRef = useRef(0);
   const footerRef = useRef<HTMLElement>(null);
-  const [layoutWidth, setLayoutWidth] = useState(0);
-  const preferredWorkspacePanelWidth =
-    rightDockMode === "context"
-      ? RIGHT_DOCK_CONTEXT_WIDTH
-      : workspacePreviewActive
-      ? rightDockPreviewWidth
-      : rightDockTreeWidth;
-  const sidebarRenderWidth = sidebarCollapsed ? 0 : sidebarWidth;
-  const measuredMainWidth = layoutWidth > 0 ? Math.max(0, layoutWidth - sidebarRenderWidth) : CHAT_MIN_WIDTH + WORKSPACE_RESIZER_WIDTH + preferredWorkspacePanelWidth;
-  const workspacePanelMinWidth = workspacePreviewActive ? RIGHT_DOCK_MIN_WIDTH : RIGHT_DOCK_TREE_MIN_WIDTH;
-
-  const budget = Math.max(0, measuredMainWidth - CHAT_MIN_WIDTH - WORKSPACE_RESIZER_WIDTH);
-  const workspacePanelFloating = workspacePanelOpen && !workspacePanelMaximized && budget < workspacePanelMinWidth;
+  const rightDockDetailActive = rightDockMode === "context" ? contextDetailActive : workspacePreviewActive;
+  const preferredWorkspacePanelWidth = rightDockDetailActive ? rightDockPreviewWidth : rightDockTreeWidth;
+  const workspacePanelMinWidth = rightDockDetailActive ? RIGHT_DOCK_PREVIEW_MIN_WIDTH : RIGHT_DOCK_TREE_MIN_WIDTH;
 
   const resolvedWorkspacePanelWidth = workspacePanelOpen && !workspacePanelMaximized
-    ? (workspacePanelFloating ? Math.min(measuredMainWidth, Math.max(workspacePanelMinWidth, preferredWorkspacePanelWidth)) : resolveRightDockWidth(measuredMainWidth, preferredWorkspacePanelWidth, workspacePanelMinWidth))
+    ? Math.max(workspacePanelMinWidth, preferredWorkspacePanelWidth)
     : preferredWorkspacePanelWidth;
 
   const workspacePanelRenderable = workspacePanelOpen && (workspacePanelMaximized || resolvedWorkspacePanelWidth > 0);
-  const workspacePanelGridOpen = workspacePanelRenderable && !workspacePanelMaximized && !workspacePanelFloating;
+  const workspacePanelGridOpen = workspacePanelRenderable && !workspacePanelMaximized;
   const workspacePanelRenderWidth = workspacePanelMaximized ? preferredWorkspacePanelWidth : resolvedWorkspacePanelWidth;
   const activeTab = useMemo(
     () => tabMetas.find((tab) => tab.id === activeTabId) ?? tabMetas.find((tab) => tab.active),
     [activeTabId, tabMetas],
   );
   const startupSplashHold = state.meta?.ready !== true && !state.meta?.startupErr;
-  const mode = activeTabId ? modesByTab[activeTabId] ?? "normal" : "normal";
+  const legacyMode = activeTabId ? modesByTab[activeTabId] ?? "normal" : "normal";
+  const goal = activeTabId ? goalsByTab[activeTabId] ?? state.meta?.goal ?? activeTab?.goal ?? "" : "";
+  const collaborationMode = activeTabId
+    ? collaborationModesByTab[activeTabId] ?? normalizeCollaborationMode(state.meta?.goal ? "goal" : activeTab?.collaborationMode, goal, legacyMode)
+    : "normal";
+  const toolApprovalMode = activeTabId
+    ? toolApprovalModesByTab[activeTabId] ?? normalizeToolApprovalMode(state.meta?.toolApprovalMode ?? activeTab?.toolApprovalMode, legacyMode, state.meta?.autoApproveTools ?? state.meta?.bypass)
+    : "ask";
+  const controllerReady = state.meta?.ready === true;
   const setMode = useCallback(
     (next: Mode | ((prev: Mode) => Mode)) => {
       if (!activeTabId) return;
@@ -527,7 +600,6 @@ export default function App() {
     [activeTabId],
   );
   const topicbarEditing = Boolean(activeTab?.topicId && activeTab.topicId === renamingTopicId);
-  const topicbarProjectPrefix = activeTab ? tabWorkspaceTitle(activeTab) : "";
   const visibleTabId = activeTabId;
   const visibleTabs = useMemo(() => {
     const byId = new Map(tabMetas.map((tab) => [tab.id, tab]));
@@ -535,10 +607,14 @@ export default function App() {
     const missing = tabMetas.filter((tab) => !tabOrderIds.includes(tab.id));
     return [...ordered, ...missing].map((tab) => ({
       ...tab,
-      mode: modesByTab[tab.id] ?? normalizeModeValue(tab.mode),
+      running: tab.id === visibleTabId ? tab.running || state.running : tab.running,
+      mode: modesByTab[tab.id] ?? normalizeMode(tab.mode),
+      collaborationMode: collaborationModesByTab[tab.id] ?? normalizeCollaborationMode(tab.collaborationMode, goalsByTab[tab.id] ?? tab.goal, normalizeMode(tab.mode)),
+      toolApprovalMode: toolApprovalModesByTab[tab.id] ?? normalizeToolApprovalMode(tab.toolApprovalMode, normalizeMode(tab.mode), tab.toolApprovalMode === "yolo"),
+      goal: goalsByTab[tab.id] ?? tab.goal ?? "",
       active: tab.id === visibleTabId,
     }));
-  }, [modesByTab, tabMetas, tabOrderIds, visibleTabId]);
+  }, [collaborationModesByTab, goalsByTab, modesByTab, state.running, tabMetas, tabOrderIds, toolApprovalModesByTab, visibleTabId]);
 
   useEffect(() => {
     const ids = tabMetas.map((tab) => tab.id);
@@ -557,7 +633,7 @@ export default function App() {
       let changed = false;
       const next: Record<string, Mode> = {};
       for (const tab of tabMetas) {
-        const mode = normalizeModeValue(tab.mode);
+        const mode = normalizeMode(tab.mode);
         next[tab.id] = mode;
         if (current[tab.id] !== mode) changed = true;
       }
@@ -566,6 +642,45 @@ export default function App() {
       }
       return changed ? next : current;
     });
+    setCollaborationModesByTab((current) => {
+      let changed = false;
+      const next: Record<string, CollaborationMode> = {};
+      for (const tab of tabMetas) {
+        const value = normalizeCollaborationMode(tab.collaborationMode, tab.goal, normalizeMode(tab.mode));
+        next[tab.id] = value;
+        if (current[tab.id] !== value) changed = true;
+      }
+      for (const id of Object.keys(current)) {
+        if (!ids.has(id)) changed = true;
+      }
+      return changed ? next : current;
+    });
+    setToolApprovalModesByTab((current) => {
+      let changed = false;
+      const next: Record<string, ToolApprovalMode> = {};
+      for (const tab of tabMetas) {
+        const value = normalizeToolApprovalMode(tab.toolApprovalMode, normalizeMode(tab.mode));
+        next[tab.id] = value;
+        if (current[tab.id] !== value) changed = true;
+      }
+      for (const id of Object.keys(current)) {
+        if (!ids.has(id)) changed = true;
+      }
+      return changed ? next : current;
+    });
+    setGoalsByTab((current) => {
+      let changed = false;
+      const next: Record<string, string> = {};
+      for (const tab of tabMetas) {
+        const value = tab.goal ?? "";
+        next[tab.id] = value;
+        if (current[tab.id] !== value) changed = true;
+      }
+      for (const id of Object.keys(current)) {
+        if (!ids.has(id)) changed = true;
+      }
+      return changed ? next : current;
+    });
   }, [tabMetas]);
 
   useEffect(() => {
@@ -576,6 +691,16 @@ export default function App() {
     setTopicTitleDraft("");
   }, [activeTab?.topicId, renamingTopicId]);
 
+  useEffect(() => {
+    if (!activeTabId || !state.meta) return;
+    const nextGoal = state.meta.goalStatus === "running" ? state.meta.goal ?? "" : "";
+    setGoalsByTab((current) => (current[activeTabId] === nextGoal ? current : { ...current, [activeTabId]: nextGoal }));
+    setCollaborationModesByTab((current) => {
+      const nextMode = nextGoal ? "goal" : normalizeCollaborationMode(undefined, "", legacyMode);
+      return current[activeTabId] === nextMode ? current : { ...current, [activeTabId]: nextMode };
+    });
+  }, [activeTabId, legacyMode, state.meta]);
+
   const syncModeToController = useCallback((m: Mode) => setControllerMode(m), [setControllerMode]);
 
   useEffect(() => {
@@ -584,18 +709,69 @@ export default function App() {
 
   // applyMode is the single source of truth for the input mode: it updates the
   // local pill and pushes the matching gate state to the controller (plan = read
-  // only; yolo = auto-approve every tool call). normal clears both.
+  // only; yolo = auto-approve approval-gated tools while user decisions still wait).
+  // normal clears both.
   const applyMode = useCallback(
     (m: Mode) => {
+      if (!activeTabId) return;
+      const nextCollaborationMode: CollaborationMode = modeHasPlan(m) ? "plan" : "normal";
+      const nextToolApprovalMode: ToolApprovalMode = modeHasAutoApproveTools(m) ? "yolo" : "ask";
       setMode(m);
+      setCollaborationModesByTab((current) => (current[activeTabId] === nextCollaborationMode ? current : { ...current, [activeTabId]: nextCollaborationMode }));
+      setToolApprovalModesByTab((current) => (current[activeTabId] === nextToolApprovalMode ? current : { ...current, [activeTabId]: nextToolApprovalMode }));
+      setGoalsByTab((current) => (current[activeTabId] ? { ...current, [activeTabId]: "" } : current));
       void syncModeToController(m);
     },
-    [setMode, syncModeToController],
+    [activeTabId, setMode, syncModeToController],
+  );
+  const applyCollaborationMode = useCallback(
+    (m: CollaborationMode) => {
+      if (!activeTabId) return;
+      setCollaborationModesByTab((current) => (current[activeTabId] === m ? current : { ...current, [activeTabId]: m }));
+      if (m === "normal" || m === "plan") {
+        setGoalsByTab((current) => (current[activeTabId] ? { ...current, [activeTabId]: "" } : current));
+      }
+      setMode(modeFromAxes(m === "plan", toolApprovalMode === "yolo"));
+      void setControllerCollaborationMode(m);
+    },
+    [activeTabId, setControllerCollaborationMode, setMode, toolApprovalMode],
   );
-  // Shift+Tab cycles auto(normal) → plan → yolo → auto.
+  const applyToolApprovalMode = useCallback(
+    (m: ToolApprovalMode) => {
+      if (!activeTabId) return;
+      setToolApprovalModesByTab((current) => (current[activeTabId] === m ? current : { ...current, [activeTabId]: m }));
+      setMode(modeFromAxes(collaborationMode === "plan", m === "yolo"));
+      void setControllerToolApprovalMode(m);
+    },
+    [activeTabId, collaborationMode, setControllerToolApprovalMode, setMode],
+  );
+  const applyGoal = useCallback(
+    (nextGoal: string) => {
+      if (!activeTabId) return;
+      const trimmed = nextGoal.trim();
+      setGoalsByTab((current) => (current[activeTabId] === trimmed ? current : { ...current, [activeTabId]: trimmed }));
+      setCollaborationModesByTab((current) => {
+        const nextMode = trimmed ? "goal" : "normal";
+        return current[activeTabId] === nextMode ? current : { ...current, [activeTabId]: nextMode };
+      });
+      setMode(modeFromAxes(false, toolApprovalMode === "yolo"));
+      void (trimmed ? setControllerGoal(trimmed) : clearControllerGoal());
+    },
+    [activeTabId, clearControllerGoal, setControllerGoal, setMode, toolApprovalMode],
+  );
+  const startGoal = useCallback(
+    (nextGoal: string) => {
+      const trimmed = nextGoal.trim();
+      if (!trimmed) return;
+      applyGoal(trimmed);
+      send(trimmed, `/goal ${trimmed}`);
+    },
+    [applyGoal, send],
+  );
+  // Shift+Tab toggles only the collaboration axis; tool permission stays independent.
   const cycleMode = useCallback(() => {
-    applyMode(mode === "normal" ? "plan" : mode === "plan" ? "yolo" : "normal");
-  }, [mode, applyMode]);
+    applyCollaborationMode(collaborationMode === "plan" ? "normal" : "plan");
+  }, [applyCollaborationMode, collaborationMode]);
 
   // Switching models rebuilds the controller, which starts in normal mode — so
   // re-apply the current mode, or the pill would say plan/YOLO while the fresh
@@ -603,19 +779,23 @@ export default function App() {
   const switchModel = useCallback(
     async (name: string) => {
       await setModel(name);
-      await syncModeToController(mode);
+      await setControllerCollaborationMode(collaborationMode);
+      await setControllerToolApprovalMode(toolApprovalMode);
+      if (goal.trim()) await setControllerGoal(goal);
     },
-    [setModel, mode, syncModeToController],
+    [collaborationMode, goal, setControllerCollaborationMode, setControllerGoal, setControllerToolApprovalMode, setModel, toolApprovalMode],
   );
 
   // Startup and workspace/model rebuilds create a fresh controller in normal
   // mode. Re-apply the UI mode once the controller is ready, including the case
-  // where the user picked YOLO while boot was still loading and SetBypass was a
-  // harmless no-op.
+  // where the user picked YOLO while boot was still loading and the legacy
+  // SetBypass binding was a harmless no-op.
   useEffect(() => {
-    if (state.meta?.ready !== true || mode === "normal") return;
-    void syncModeToController(mode);
-  }, [state.meta, mode, syncModeToController]);
+    if (!controllerReady) return;
+    void setControllerCollaborationMode(collaborationMode);
+    void setControllerToolApprovalMode(toolApprovalMode);
+    if (goal.trim()) void setControllerGoal(goal);
+  }, [collaborationMode, controllerReady, goal, setControllerCollaborationMode, setControllerGoal, setControllerToolApprovalMode, toolApprovalMode]);
 
   // The live task list pinned above the composer comes from the most recent
   // successful top-level todo_write result; failed or still-running attempts do
@@ -637,13 +817,10 @@ export default function App() {
   const [dismissedTodo, setDismissedTodo] = useState<string | null>(null);
   const showTodos = shouldShowTodoPanel(todoItem?.id, dismissedTodo, todos);
 
-  // useDeferredValue lets React prioritise Composer input (high-priority) over
-  // Transcript re-renders (low-priority) during streaming. When a keystroke
-  // and a transcript update collide, the keystroke is processed immediately
-  // and the transcript re-render is deferred to idle time.
-  const deferredItems = useDeferredValue(state.items);
   const sessionTitle = topicTitle(activeTab);
   const sessionHasContent = state.items.length > 0 || Boolean(state.live?.text || state.live?.reasoning);
+  const transcriptTurnCount = useMemo(() => state.items.reduce((count, item) => count + (item.kind === "user" ? 1 : 0), 0), [state.items]);
+  const currentTurnCount = Math.max(transcriptTurnCount, savedTopicTurnCount ?? 0);
   const getSessionMarkdown = useCallback(
     () => sessionItemsToMarkdown(sessionTitle, state.items, state.live),
     [sessionTitle, state.items, state.live],
@@ -705,9 +882,26 @@ export default function App() {
         return;
       }
       if (trimmed === "/memory") {
+        closeTransientOverlays();
         setSettingsTarget("memory");
         return;
       }
+      const goalCommand = /^\/goal(?:\s+(.*))?$/.exec(trimmed);
+      if (goalCommand) {
+        const arg = (goalCommand[1] ?? "").trim();
+        if (arg && !["status", "clear", "off", "stop", "done"].includes(arg.toLowerCase())) {
+          applyGoal(arg);
+        } else if (["clear", "off", "stop", "done"].includes(arg.toLowerCase())) {
+          applyGoal("");
+        }
+        send(trimmed, submitText.trim());
+        return;
+      }
+      if (collaborationMode === "goal" && !goal.trim()) {
+        applyGoal(trimmed);
+        send(trimmed, `/goal ${submitText.trim()}`);
+        return;
+      }
       const theme = /^\/theme(?:\s+(\S+))?$/.exec(trimmed);
       if (theme) {
         const arg = theme[1]?.toLowerCase();
@@ -725,19 +919,21 @@ export default function App() {
           return;
         }
         if (isThemeStyle(arg)) {
-          const next = themeForStyle(arg);
-          await app.SetDesktopAppearance(next, arg);
-          applyTheme(next, arg);
-          notice(t("settings.themeChanged", { theme: next, style: arg }));
+          const cur = getTheme();
+          await app.SetDesktopAppearance(cur, arg);
+          applyTheme(cur, arg);
+          notice(t("settings.themeChanged", { theme: cur, style: arg }));
           return;
         }
         notice(t("settings.themeUnknown", { name: arg }), "warn");
         return;
       }
-      await syncModeToController(mode);
+      await setControllerCollaborationMode(collaborationMode);
+      await setControllerToolApprovalMode(toolApprovalMode);
+      if (goal.trim()) await setControllerGoal(goal);
       send(trimmed, submitText.trim());
     },
-    [switchModel, syncModeToController, mode, send, runShell, notice, t],
+    [applyGoal, closeTransientOverlays, collaborationMode, goal, send, runShell, notice, setControllerCollaborationMode, setControllerGoal, setControllerToolApprovalMode, switchModel, t, toolApprovalMode],
   );
 
   const refreshTabMetas = useCallback(async (): Promise<TabMeta[]> => {
@@ -759,6 +955,24 @@ export default function App() {
     });
   }, [refreshTabMetas]);
 
+  useEffect(() => {
+    let cancelled = false;
+    if (!activeTab?.topicId) {
+      setSavedTopicTurnCount(undefined);
+      return () => {
+        cancelled = true;
+      };
+    }
+    void app.ListProjectTree().then((nodes) => {
+      if (!cancelled) setSavedTopicTurnCount(activeTopicTurnsFromTree(asArray<ProjectNode>(nodes), activeTab));
+    }).catch(() => {
+      if (!cancelled) setSavedTopicTurnCount(undefined);
+    });
+    return () => {
+      cancelled = true;
+    };
+  }, [activeTab?.scope, activeTab?.workspaceRoot, activeTab?.topicId, projectRevision]);
+
   useEffect(() => {
     let cancelled = false;
     (async () => {
@@ -779,48 +993,47 @@ export default function App() {
   useEffect(() => {
     const el = footerRef.current;
     if (!el || typeof ResizeObserver === "undefined") return;
-    const update = () => setFooterHeight(Math.round(el.getBoundingClientRect().height));
-    update();
-    const observer = new ResizeObserver(update);
-    observer.observe(el);
-    return () => observer.disconnect();
-  }, []);
-
-  useEffect(() => {
-    const el = layoutRef.current;
-    if (!el || typeof ResizeObserver === "undefined") return;
+    let frame = 0;
     const update = () => {
-      const width = el.getBoundingClientRect().width;
-      if (width && Number.isFinite(width)) setLayoutWidth(Math.round(width));
+      if (frame) window.cancelAnimationFrame(frame);
+      frame = window.requestAnimationFrame(() => {
+        frame = 0;
+        const next = Math.round(el.getBoundingClientRect().height);
+        if (Math.abs(footerHeightRef.current - next) < 2) return;
+        footerHeightRef.current = next;
+        setFooterHeight(next);
+      });
     };
     update();
     const observer = new ResizeObserver(update);
     observer.observe(el);
-    return () => observer.disconnect();
+    return () => {
+      if (frame) window.cancelAnimationFrame(frame);
+      observer.disconnect();
+    };
   }, []);
 
-  const startNewSession = useCallback(async () => {
-    await newSession();
-  }, [newSession]);
-
   const toggleSidebar = useCallback(() => {
-    setSidebarCollapsed((collapsed) => {
-      const next = !collapsed;
-      saveSidebarCollapsed(next);
-      return next;
-    });
-  }, []);
+    closeTransientOverlays();
+    pulseSidebarToggle();
+    anchorAppScrollToChat();
+    const nextCollapsed = !sidebarCollapsed;
+    setSidebarCollapsed(nextCollapsed);
+    saveSidebarCollapsed(nextCollapsed);
+  }, [anchorAppScrollToChat, closeTransientOverlays, pulseSidebarToggle, sidebarCollapsed]);
 
   const setExpandedSidebarWidth = useCallback((width: number) => {
+    closeTransientOverlays();
     const next = clampSidebarWidth(width);
     setSidebarWidth(next);
     saveSidebarWidth(next);
-  }, []);
+  }, [closeTransientOverlays]);
 
   const startSidebarResize = useCallback(
     (event: ReactPointerEvent<HTMLButtonElement>) => {
       if (sidebarCollapsed) return;
       event.preventDefault();
+      closeTransientOverlays();
       setSidebarResizing(true);
       let nextWidth = sidebarWidth;
       const onMove = (moveEvent: PointerEvent) => {
@@ -843,7 +1056,7 @@ export default function App() {
       window.addEventListener("pointerup", onDone);
       window.addEventListener("pointercancel", onDone);
     },
-    [sidebarCollapsed, sidebarWidth],
+    [closeTransientOverlays, sidebarCollapsed, sidebarWidth],
   );
 
   const resizeSidebarWithKeyboard = useCallback(
@@ -865,9 +1078,9 @@ export default function App() {
 
   const setSavedWorkspacePanelWidth = useCallback(
     (width: number) => {
-      if (rightDockMode === "context") return;
-      if (workspacePreviewActive) {
-        const next = clampRightDockWidth(width);
+      closeTransientOverlays();
+      if (rightDockDetailActive) {
+        const next = clampRightDockPreviewWidth(width);
         setRightDockPreviewWidth(next);
         saveRightDockPreviewWidth(next);
         return;
@@ -876,23 +1089,25 @@ export default function App() {
       setRightDockTreeWidth(next);
       saveRightDockTreeWidth(next);
     },
-    [rightDockMode, workspacePreviewActive],
+    [closeTransientOverlays, rightDockDetailActive],
   );
 
   const ensureWorkspacePanelWidth = useCallback(
     (width: number) => {
+      closeTransientOverlays();
       if (rightDockMode === "context") return;
-      const next = clampRightDockWidth(width);
+      const next = clampRightDockPreviewWidth(width);
       setRightDockPreviewWidth(next);
       saveRightDockPreviewWidth(next);
     },
-    [rightDockMode],
+    [closeTransientOverlays, rightDockMode],
   );
 
   const startWorkspacePanelResize = useCallback(
     (event: ReactPointerEvent<HTMLButtonElement>) => {
       if (!workspacePanelOpen) return;
       event.preventDefault();
+      closeTransientOverlays();
       setWorkspacePanelResizing(true);
       const startX = event.clientX;
       const startDockWidth = preferredWorkspacePanelWidth;
@@ -900,9 +1115,8 @@ export default function App() {
       const onMove = (moveEvent: PointerEvent) => {
         const delta = moveEvent.clientX - startX;
         nextDockWidth = startDockWidth - delta;
-        if (rightDockMode === "context") return;
-        if (workspacePreviewActive) {
-          setRightDockPreviewWidth(clampRightDockWidth(nextDockWidth));
+        if (rightDockDetailActive) {
+          setRightDockPreviewWidth(clampRightDockPreviewWidth(nextDockWidth));
         } else {
           setRightDockTreeWidth(clampRightDockTreeWidth(nextDockWidth));
         }
@@ -922,7 +1136,7 @@ export default function App() {
       window.addEventListener("pointerup", onDone);
       window.addEventListener("pointercancel", onDone);
     },
-    [preferredWorkspacePanelWidth, rightDockMode, setSavedWorkspacePanelWidth, workspacePanelOpen, workspacePreviewActive],
+    [closeTransientOverlays, preferredWorkspacePanelWidth, rightDockDetailActive, setSavedWorkspacePanelWidth, workspacePanelOpen],
   );
 
   const resizeWorkspacePanelWithKeyboard = useCallback(
@@ -932,17 +1146,26 @@ export default function App() {
         setSavedWorkspacePanelWidth(preferredWorkspacePanelWidth + (event.key === "ArrowLeft" ? 16 : -16));
       } else if (event.key === "Home") {
         event.preventDefault();
-        setSavedWorkspacePanelWidth(workspacePreviewActive ? RIGHT_DOCK_MIN_WIDTH : RIGHT_DOCK_TREE_MIN_WIDTH);
+        setSavedWorkspacePanelWidth(rightDockDetailActive ? RIGHT_DOCK_PREVIEW_MIN_WIDTH : RIGHT_DOCK_TREE_MIN_WIDTH);
       } else if (event.key === "End") {
         event.preventDefault();
-        setSavedWorkspacePanelWidth(workspacePreviewActive ? RIGHT_DOCK_MAX_WIDTH : RIGHT_DOCK_TREE_MAX_WIDTH);
+        setSavedWorkspacePanelWidth(rightDockDetailActive ? RIGHT_DOCK_MAX_WIDTH : RIGHT_DOCK_TREE_MAX_WIDTH);
       }
     },
-    [preferredWorkspacePanelWidth, setSavedWorkspacePanelWidth, workspacePreviewActive],
+    [preferredWorkspacePanelWidth, rightDockDetailActive, setSavedWorkspacePanelWidth],
   );
 
   const openWorkspacePanel = useCallback(
     (mode: RightDockMode = rightDockMode) => {
+      closeTransientOverlays();
+      if (mode !== rightDockMode) {
+        setWorkspacePreviewActive(false);
+        setContextDetailActive(false);
+      } else if (mode === "context") {
+        setWorkspacePreviewActive(false);
+      } else {
+        setContextDetailActive(false);
+      }
       setRightDockMode(mode);
       let nextMaximized = workspacePanelMaximized;
       if (mode === "context") {
@@ -961,16 +1184,26 @@ export default function App() {
       }
       setWorkspacePanelOpen(true);
     },
-    [rightDockMode, workspacePanelMaximized, workspacePanelOpen],
+    [closeTransientOverlays, rightDockMode, workspacePanelMaximized, workspacePanelOpen],
   );
 
   const closeWorkspacePanel = useCallback(() => {
+    closeTransientOverlays();
     if (!workspacePanelOpen) {
       return;
     }
     setWorkspacePanelMaximized(false);
     setWorkspacePanelOpen(false);
-  }, [workspacePanelOpen]);
+  }, [closeTransientOverlays, workspacePanelOpen]);
+
+  const toggleWorkspacePanel = useCallback(() => {
+    pulseWorkspaceToggle();
+    if (workspacePanelRenderable) {
+      closeWorkspacePanel();
+      return;
+    }
+    openWorkspacePanel("context");
+  }, [closeWorkspacePanel, openWorkspacePanel, pulseWorkspaceToggle, workspacePanelRenderable]);
 
   const openRightDockMode = useCallback(
     (mode: RightDockMode) => {
@@ -979,11 +1212,30 @@ export default function App() {
     [openWorkspacePanel],
   );
 
+  const handleWorkspacePreviewModeChange = useCallback(
+    (active: boolean) => {
+      if (workspacePreviewActive === active) return;
+      closeTransientOverlays();
+      setWorkspacePreviewActive(active);
+    },
+    [closeTransientOverlays, workspacePreviewActive],
+  );
+
+  const handleContextDetailModeChange = useCallback(
+    (active: boolean) => {
+      if (contextDetailActive === active) return;
+      closeTransientOverlays();
+      setContextDetailActive(active);
+    },
+    [closeTransientOverlays, contextDetailActive],
+  );
+
   const layoutStyle = useMemo(
     () =>
       ({
         "--sidebar-expanded-width": `${sidebarWidth}px`,
         "--chat-min-width": `${CHAT_MIN_WIDTH}px`,
+        "--chat-docked-min-width": `${CHAT_DOCKED_MIN_WIDTH}px`,
         "--workspace-width": `${workspacePanelRenderWidth}px`,
         "--workspace-resizer-width": `${WORKSPACE_RESIZER_WIDTH}px`,
       }) as CSSProperties,
@@ -1003,12 +1255,14 @@ export default function App() {
   }, []);
 
   const handleTabChange = useCallback(async (id: string) => {
+    closeTransientOverlays();
     await switchTab(id);
     await refreshTabMetas();
     setTabRevealSignal((signal) => signal + 1);
-  }, [refreshTabMetas, switchTab]);
+  }, [closeTransientOverlays, refreshTabMetas, switchTab]);
 
   const handleTabClose = useCallback(async (id: string) => {
+    closeTransientOverlays();
     setModesByTab((current) => {
       if (!(id in current)) return current;
       const next = { ...current };
@@ -1029,9 +1283,10 @@ export default function App() {
     await closeTab(id);
     await refreshTabMetas();
     setTabRevealSignal((signal) => signal + 1);
-  }, [activeTabId, closeTab, refreshTabMetas]);
+  }, [activeTabId, closeTab, closeTransientOverlays, refreshTabMetas]);
 
   const handleTabsClose = useCallback(async (ids: string[], nextActiveTabId?: string) => {
+    closeTransientOverlays();
     const currentIds = tabMetas.map((tab) => tab.id);
     const targets = ids.filter((id, index) => currentIds.includes(id) && ids.indexOf(id) === index);
     if (targets.length === 0) return;
@@ -1043,7 +1298,7 @@ export default function App() {
     }
     await refreshTabMetas();
     setTabRevealSignal((signal) => signal + 1);
-  }, [closeTab, refreshTabMetas, switchTab, tabMetas]);
+  }, [closeTab, closeTransientOverlays, refreshTabMetas, switchTab, tabMetas]);
 
   const handleTabsReorder = useCallback(async (ids: string[]) => {
     setTabOrderIds(ids);
@@ -1058,9 +1313,10 @@ export default function App() {
   }, [refreshTabMetas, reorderTabs]);
 
   const handleNewTab = useCallback(async () => {
-    const activeWorkspaceRoot = activeTab?.workspaceRoot || state.meta?.cwd || "";
-    const targetScope = activeTab?.scope === "global" || !activeWorkspaceRoot ? "global" : "project";
-    const workspaceRoot = targetScope === "project" ? activeWorkspaceRoot : "";
+    closeTransientOverlays();
+    const activeWorkspaceRoot = activeTab?.scope === "project" ? activeTab.workspaceRoot || "" : "";
+    const targetScope = activeWorkspaceRoot ? "project" : "global";
+    const workspaceRoot = activeWorkspaceRoot;
     const topic = await app.CreateTopic(targetScope, workspaceRoot, "");
     if (targetScope === "global" || !workspaceRoot) {
       await openGlobalTab(topic.id);
@@ -1070,18 +1326,7 @@ export default function App() {
     setProjectRevision((value) => value + 1);
     await refreshTabMetas();
     setTabRevealSignal((signal) => signal + 1);
-  }, [activeTab?.scope, activeTab?.workspaceRoot, openGlobalTab, openProjectTab, refreshTabMetas, state.meta?.cwd]);
-
-  // ── Command palette (⌘K) ────────────────────────────────────────────
-  useEffect(() => {
-    const onKeyDown = (event: globalThis.KeyboardEvent) => {
-      if (!(event.metaKey || event.ctrlKey) || event.altKey || event.shiftKey || event.key.toLowerCase() !== "k") return;
-      event.preventDefault();
-      setPaletteOpen((open) => !open);
-    };
-    window.addEventListener("keydown", onKeyDown, { capture: true });
-    return () => window.removeEventListener("keydown", onKeyDown, { capture: true });
-  }, []);
+  }, [activeTab?.scope, activeTab?.workspaceRoot, closeTransientOverlays, openGlobalTab, openProjectTab, refreshTabMetas]);
 
   const handleMessageAction = useCallback(async (turn: number, scope: string) => {
     await rewind(turn, scope);
@@ -1098,6 +1343,7 @@ export default function App() {
   }, [refreshTabMetas, rewind]);
 
   const handleOpenTopic = useCallback(async (scope: string, workspaceRoot: string, topicId: string) => {
+    closeTransientOverlays();
     if (scope === "global") {
       await openGlobalTab(topicId);
     } else {
@@ -1105,70 +1351,28 @@ export default function App() {
     }
     await refreshTabMetas();
     setTabRevealSignal((signal) => signal + 1);
-  }, [openGlobalTab, openProjectTab, refreshTabMetas]);
+  }, [closeTransientOverlays, openGlobalTab, openProjectTab, refreshTabMetas]);
 
   // History drawer: project menus can open a scoped saved-session list. Idle row
   // clicks resume; running row clicks only preview through PreviewSession.
   const openProjectHistory = useCallback(async (scope: "global" | "project", workspaceRoot: string) => {
+    closeTransientOverlays();
     const filter = { scope, workspaceRoot };
     setHistView({ kind: "history", source: "scope", filter, sessions: sessionsForScope(await listSessions(), filter) });
-  }, [listSessions]);
+  }, [closeTransientOverlays, listSessions]);
   const openAllHistory = useCallback(async () => {
+    closeTransientOverlays();
     setHistView({ kind: "history", source: "all", sessions: await listSessions() });
-  }, [listSessions]);
+  }, [closeTransientOverlays, listSessions]);
   const openTrash = useCallback(async () => {
+    closeTransientOverlays();
     setHistView({ kind: "trash", sessions: await listTrashedSessions() });
-  }, [listTrashedSessions]);
-  const closeHistory = useCallback(() => setHistView(null), []);
-
-  // ── Command palette (⌘K) item builder ───────────────────────────────
-  const buildPaletteItems = useCallback((): PaletteItem[] => {
-    const items: PaletteItem[] = [];
-
-    for (const tab of tabMetas) {
-      items.push({
-        id: `tab:${tab.id}`,
-        title: tab.topicTitle || "Untitled",
-        hint: tab.scope === "global" ? "Global" : tab.workspaceName || tab.workspaceRoot,
-        group: t("sidebar.conversations"),
-        keywords: [tab.label],
-        run: () => void handleTabChange(tab.id),
-      });
-    }
+  }, [closeTransientOverlays, listTrashedSessions]);
+  const closeHistory = useCallback(() => {
+    closeTransientOverlays();
+    setHistView(null);
+  }, [closeTransientOverlays]);
 
-    items.push(
-      {
-        id: "action:new-session",
-        title: t("topbar.newSession"),
-        group: "Actions",
-        keywords: ["new", "chat", "session"],
-        run: () => void handleNewTab(),
-      },
-      {
-        id: "action:history",
-        title: t("sidebar.allHistory"),
-        group: "Actions",
-        keywords: ["history", "sessions", "past"],
-        run: () => void openAllHistory(),
-      },
-      {
-        id: "action:settings",
-        title: t("topbar.settings"),
-        group: "Actions",
-        keywords: ["preferences", "config", "options"],
-        run: () => setSettingsTarget("general"),
-      },
-      {
-        id: "action:trash",
-        title: t("sidebar.trash"),
-        group: "Actions",
-        keywords: ["deleted", "bin"],
-        run: () => void openTrash(),
-      },
-    );
-
-    return items;
-  }, [tabMetas, handleTabChange, handleNewTab, openAllHistory, openTrash, t]);
   const onResumeSession = useCallback(
     async (session: SessionMeta) => {
       if (state.running) return;
@@ -1200,6 +1404,49 @@ export default function App() {
     },
     [openGlobalTab, openProjectTab, refreshTabMetas, state.running, resumeSession, t, showToast],
   );
+
+  // Command palette: ⌘K / Ctrl+K opens a fuzzy navigator over commands and
+  // recent sessions. Sessions are snapshotted on open so the list is stable
+  // while the palette is up.
+  const openPalette = useCallback(async () => {
+    closeTransientOverlays();
+    setPaletteOpen(true);
+    setPaletteSessions(await listSessions().catch(() => []));
+  }, [closeTransientOverlays, listSessions]);
+  useEffect(() => {
+    const onKey = (e: globalThis.KeyboardEvent) => {
+      if ((e.ctrlKey || e.metaKey) && e.key.toLowerCase() === "k") {
+        e.preventDefault();
+        setPaletteOpen((cur) => {
+          if (!cur) void openPalette();
+          return cur;
+        });
+      } else if (e.key === "Escape") {
+        setPaletteOpen(false);
+      }
+    };
+    document.addEventListener("keydown", onKey);
+    return () => document.removeEventListener("keydown", onKey);
+  }, [openPalette]);
+  const paletteItems = useMemo<PaletteItem[]>(() => {
+    const cmds: PaletteItem[] = [
+      { id: "cmd-new", group: t("palette.group.commands"), title: t("palette.cmd.newSession"), keywords: ["new", "新建"], run: () => void handleNewTab() },
+      { id: "cmd-history", group: t("palette.group.commands"), title: t("palette.cmd.history"), keywords: ["history", "历史"], run: () => void openAllHistory() },
+      { id: "cmd-trash", group: t("palette.group.commands"), title: t("palette.cmd.trash"), keywords: ["trash", "回收站"], run: () => void openTrash() },
+      { id: "cmd-settings", group: t("palette.group.commands"), title: t("palette.cmd.settings"), keywords: ["settings", "设置"], run: () => setSettingsTarget("general") },
+      { id: "cmd-appearance", group: t("palette.group.commands"), title: t("palette.cmd.appearance"), keywords: ["theme", "appearance", "外观", "主题"], run: () => setSettingsTarget("appearance") },
+      { id: "cmd-memory", group: t("palette.group.commands"), title: t("palette.cmd.memory"), keywords: ["memory", "记忆"], run: () => setSettingsTarget("memory") },
+      { id: "cmd-models", group: t("palette.group.commands"), title: t("palette.cmd.models"), keywords: ["model", "模型"], run: () => setSettingsTarget("models") },
+    ];
+    const sessionItems: PaletteItem[] = paletteSessions.slice(0, 12).map((s) => ({
+      id: `sess-${s.path}`,
+      group: t("palette.group.sessions"),
+      title: s.title?.trim() || s.preview || t("history.emptySession"),
+      hint: s.workspaceRoot || undefined,
+      run: () => void onResumeSession(s),
+    }));
+    return [...cmds, ...sessionItems];
+  }, [t, paletteSessions, handleNewTab, openAllHistory, openTrash, onResumeSession]);
   // Delete / rename act on disk, then re-fetch so the panel reflects the change.
   const onDeleteSession = useCallback(
     async (path: string) => {
@@ -1270,12 +1517,6 @@ export default function App() {
     return picked;
   }, [pickWorkspace, switchWorkspace, refreshTabMetas]);
 
-  const removeWorkspace = useCallback(async (path: string) => {
-    await app.RemoveWorkspace(path);
-    setProjectRevision((value) => value + 1);
-    await refreshTabMetas();
-  }, [refreshTabMetas]);
-
   const refreshProjectsAndTabs = useCallback(async () => {
     setProjectRevision((value) => value + 1);
     const tabs = await refreshTabMetas();
@@ -1332,26 +1573,28 @@ export default function App() {
       ? t("sidebar.expand")
       : t("sidebar.collapse");
   const sidebarNavTooltipDisabled = !sidebarCollapsed;
-  const workspacePanelResetWidth = rightDockMode === "context"
-    ? RIGHT_DOCK_CONTEXT_WIDTH
-    : workspacePreviewActive
+  const browserPreviewChrome = typeof window !== "undefined" && !window.runtime;
+  const workspacePanelResetWidth = rightDockDetailActive
     ? RIGHT_DOCK_PREVIEW_DEFAULT_WIDTH
     : defaultRightDockTreeWidth();
-  const workspacePanelMaxWidth = workspacePreviewActive ? RIGHT_DOCK_MAX_WIDTH : RIGHT_DOCK_TREE_MAX_WIDTH;
+  const workspacePanelMaxWidth = rightDockDetailActive ? RIGHT_DOCK_MAX_WIDTH : RIGHT_DOCK_TREE_MAX_WIDTH;
+  const topicbarTitle = topicDisplayTitle(activeTab);
+  const topicbarWorkspaceLabel = activeTab ? tabWorkspaceTitle(activeTab) : "";
+  const topicbarWorkspacePath = activeTab?.scope === "project" ? activeTab.workspaceRoot || state.meta?.cwd : "";
+  const topicbarSubtitleVisible = Boolean(topicbarWorkspaceLabel);
+  const topicbarSubtitleTitle = topicbarWorkspacePath || topicbarWorkspaceLabel;
 
   return (
     <ShellExpandProvider>
     <ShellHotkeys />
     <TextSizeHotkeys />
-    <div className={`app app--${desktopPlatform}`}>
+    <div ref={appRef} className={["app", `app--${desktopPlatform}`, browserPreviewChrome ? "app--browser-preview" : ""].filter(Boolean).join(" ")}>
       <div
-        ref={layoutRef}
         className={[
           "layout",
           sidebarCollapsed ? "layout--sidebar-collapsed" : "",
           sidebarResizing ? "layout--resizing layout--sidebar-resizing" : "",
           workspacePanelGridOpen ? "layout--workspace-open" : "",
-          workspacePanelFloating ? "layout--workspace-floating" : "",
           workspacePanelOpen && workspacePanelMaximized ? "layout--workspace-maximized" : "",
           workspacePanelResizing ? "layout--resizing layout--workspace-resizing" : "",
         ]
@@ -1359,42 +1602,45 @@ export default function App() {
           .join(" ")}
         style={layoutStyle}
       >
-        <header className="app-chrome">
+        <AppChrome
+          platform={desktopPlatform}
+          browserPreviewChrome={browserPreviewChrome}
+          tabs={visibleTabs}
+          activeTabId={visibleTabId}
+          revealActiveSignal={tabRevealSignal}
+          commandCompact={workspacePanelGridOpen}
+          sidebarTogglePressed={sidebarTogglePressed}
+          sidebarExpandBlocked={sidebarExpandBlocked}
+          sidebarCollapsed={sidebarCollapsed}
+          sidebarToggleTitle={sidebarToggleTitle}
+          workspacePanelMaximized={workspacePanelMaximized}
+          workspacePanelRenderable={workspacePanelRenderable}
+          workspaceTogglePressed={workspaceTogglePressed}
+          workspacePanelLabel={workspacePanelRenderable ? t("rightDock.collapse") : t("rightDock.expand")}
+          onToggleSidebar={toggleSidebar}
+          onToggleWorkspacePanel={toggleWorkspacePanel}
+          onTabChange={(id) => void handleTabChange(id)}
+          onTabClose={(id) => void handleTabClose(id)}
+          onTabsClose={(ids, nextActiveTabId) => void handleTabsClose(ids, nextActiveTabId)}
+          onTabsReorder={(ids) => void handleTabsReorder(ids)}
+          onNewTab={() => void handleNewTab()}
+          onOpenPalette={() => void openPalette()}
+        />
+
+        <aside className={`sidebar${sidebarCollapsed ? " sidebar--collapsed" : ""}`} aria-label={t("sidebar.navigation")}>
+          <div className="sidebar__brand" aria-hidden={sidebarCollapsed}>
+            <img src={logoWordmark} alt="Reasonix" className="sidebar__brand-logo" draggable={false} />
+          </div>
+
           <button
-            className={[
-              "app-chrome__panel-toggle",
-              "app-chrome__panel-toggle--left",
-              !sidebarCollapsed ? "app-chrome__panel-toggle--active" : "",
-              sidebarExpandBlocked ? "app-chrome__panel-toggle--blocked" : "",
-            ].filter(Boolean).join(" ")}
-            type="button"
-            onClick={sidebarExpandBlocked ? undefined : toggleSidebar}
-            aria-label={sidebarToggleTitle}
-            aria-disabled={sidebarExpandBlocked}
+            className="sidebar__new"
+            onClick={() => {
+              void handleNewTab();
+            }}
           >
-            {sidebarCollapsed ? <PanelLeftOpen size={16} /> : <PanelLeftClose size={16} />}
+            <SquarePen size={18} />
+            <span>{t("topbar.newSession")}</span>
           </button>
-          <div className="app-chrome__identity" aria-label="Reasonix">
-            <img src={logoWordmark} alt="" className="app-chrome__logo" draggable={false} />
-            <span className="app-chrome__separator">/</span>
-            <span className="app-chrome__scope">{appChromeScopeLabel(activeTab, state.meta)}</span>
-          </div>
-          <div className="app-chrome__spacer" />
-        </header>
-
-        <aside className={`sidebar${sidebarCollapsed ? " sidebar--collapsed" : ""}`} aria-label={t("sidebar.navigation")}>
-          <Tooltip label={t("topbar.newSession")} fill>
-            <button
-              className="sidebar__new"
-              onClick={() => {
-                if (state.running) cancel();
-                void startNewSession();
-              }}
-            >
-              <SquarePen size={15} />
-              <span>{t("topbar.newSession")}</span>
-            </button>
-          </Tooltip>
 
           <section className="sidebar__section sidebar__section--projects">
             <ProjectTree
@@ -1434,7 +1680,10 @@ export default function App() {
             <Tooltip label={t("topbar.settings")} fill side="right" disabled={sidebarNavTooltipDisabled}>
               <button
                 className="sidebar__navitem"
-                onClick={() => setSettingsTarget("general")}
+                onClick={() => {
+                  closeTransientOverlays();
+                  setSettingsTarget("general");
+                }}
               >
                 <SettingsIcon size={15} />
                 <span>{t("topbar.settings")}</span>
@@ -1458,47 +1707,12 @@ export default function App() {
         />
 
         <section className="chat-pane">
-          <header className="workspace-tabs-bar">
-            <TabBar
-              tabs={visibleTabs}
-              activeTabId={visibleTabId}
-              revealActiveSignal={tabRevealSignal}
-              onTabChange={(id) => void handleTabChange(id)}
-              onTabClose={(id) => void handleTabClose(id)}
-              onTabsClose={(ids, nextActiveTabId) => void handleTabsClose(ids, nextActiveTabId)}
-              onTabsReorder={(ids) => void handleTabsReorder(ids)}
-              onNewTab={() => void handleNewTab()}
-            />
-            {!workspacePanelMaximized && (
-              <Tooltip
-                label={workspacePanelRenderable ? t("rightDock.collapse") : t("rightDock.expand")}
-                className={[
-                  "workspace-dock-toggle",
-                  workspacePanelRenderable ? "workspace-dock-toggle--open" : "workspace-dock-toggle--closed",
-                ].join(" ")}
-              >
-                <button
-                  className="workspace-dock-toggle__button"
-                  type="button"
-                  onClick={workspacePanelRenderable ? closeWorkspacePanel : () => openWorkspacePanel("files")}
-                  aria-label={workspacePanelRenderable ? t("rightDock.collapse") : t("rightDock.expand")}
-                  aria-pressed={workspacePanelRenderable}
-                >
-                  {workspacePanelRenderable ? <PanelRightClose size={15} /> : <PanelRightOpen size={15} />}
-                </button>
-              </Tooltip>
-            )}
-          </header>
-
           <>
           <header className="topicbar">
             <div className="topicbar__identity">
               <div className="topicbar__title-row">
                 {topicbarEditing ? (
                   <div className="topicbar__title-edit">
-                    {topicbarProjectPrefix && (
-                      <span className="topicbar__title-prefix">{topicbarProjectPrefix} /</span>
-                    )}
                     <input
                       autoFocus
                       className="topicbar__title-input"
@@ -1518,7 +1732,7 @@ export default function App() {
                     />
                   </div>
                 ) : (
-                  <h1>{topicTitle(activeTab)}</h1>
+                  <h1 title={topicTitle(activeTab)}>{topicbarTitle}</h1>
                 )}
                 <Tooltip label={t("topicBar.renameSession")}>
                   <button
@@ -1532,6 +1746,11 @@ export default function App() {
                   </button>
                 </Tooltip>
               </div>
+              {topicbarSubtitleVisible && (
+                <div className="topicbar__subtitle" title={topicbarSubtitleTitle}>
+                  <span>{topicbarWorkspaceLabel}</span>
+                </div>
+              )}
             </div>
             <div className="topicbar__spacer" />
             <div className="topicbar__actions">
@@ -1539,12 +1758,12 @@ export default function App() {
                 getText={getSessionMarkdown}
                 label={t("topicBar.copyAll")}
                 showLabel={false}
-                className="topicbar__action-btn topicbar__action-btn--icon"
+                className="topicbar__action-btn topicbar__action-btn--icon topicbar__action-btn--utility"
               />
               <div className={`topicbar__export${topicExportOpen ? " topicbar__export--open" : ""}`}>
                 <Tooltip label={t("topicBar.export")}>
                   <button
-                    className="topicbar__action-btn topicbar__action-btn--icon"
+                    className="topicbar__action-btn topicbar__action-btn--icon topicbar__action-btn--utility"
                     type="button"
                     disabled={!sessionHasContent}
                     aria-label={t("topicBar.export")}
@@ -1568,6 +1787,29 @@ export default function App() {
                   </div>
                 )}
               </div>
+              <Tooltip label={t("workspace.changedTab")}>
+                <button
+                  className="topicbar__action-btn topicbar__action-btn--label"
+                  type="button"
+                  aria-label={t("workspace.changedTab")}
+                  aria-pressed={workspacePanelRenderable && rightDockMode === "changed"}
+                  onClick={() => openRightDockMode("changed")}
+                >
+                  <GitBranch size={14} />
+                  <span>{t("workspace.changedTab")}</span>
+                </button>
+              </Tooltip>
+              <Tooltip label={t("topicBar.command")}>
+                <button
+                  className="topicbar__action-btn topicbar__action-btn--label topicbar__action-btn--accent"
+                  type="button"
+                  aria-label={t("topicBar.command")}
+                  onClick={() => void openPalette()}
+                >
+                  <Command size={14} />
+                  <span>{t("topicBar.command")}</span>
+                </button>
+              </Tooltip>
             </div>
           </header>
 
@@ -1584,16 +1826,16 @@ export default function App() {
                 <span className="loading-screen__text">{t("common.loading")}</span>
               </div>
             ) : (
-	              <Transcript
-	                items={deferredItems}
-	                live={state.live}
-	                footerHeight={footerHeight}
-	                onPrompt={send}
-	                onRewind={handleMessageAction}
-	                checkpoints={state.checkpoints}
-	                actionPending={state.messageAction != null}
-	                rewindDisabled={state.running || state.messageAction != null || state.approval != null || state.ask != null}
-	              />
+              <Transcript
+                items={state.items}
+                live={state.live}
+                footerHeight={footerHeight}
+                onPrompt={send}
+                onRewind={handleMessageAction}
+                checkpoints={state.checkpoints}
+                actionPending={state.messageAction != null}
+                rewindDisabled={state.running || state.messageAction != null || state.approval != null || state.ask != null}
+              />
             )}
           </main>
 
@@ -1605,7 +1847,7 @@ export default function App() {
                 onAnswer={(allow, session, persist, scope) => {
                   // Approving an exit_plan_mode plan leaves plan mode; sync the
                   // tab-local indicator and persisted safe mode immediately.
-                  if (state.approval!.tool === "exit_plan_mode" && allow) applyMode("normal");
+                  if (state.approval!.tool === "exit_plan_mode" && allow) applyCollaborationMode("normal");
                   approve(state.approval!.id, allow, session, persist, scope);
                 }}
                 onRevisePlan={(text) => {
@@ -1613,7 +1855,7 @@ export default function App() {
                   approve(state.approval!.id, false, false, false);
                 }}
                 onExitPlan={() => {
-                  applyMode("normal");
+                  applyCollaborationMode("normal");
                   approve(state.approval!.id, false, false, false);
                 }}
               />
@@ -1625,9 +1867,11 @@ export default function App() {
                 onDismiss={() => answerQuestion(state.ask!.id, [])}
               />
             )}
-	              <Composer
-	              running={state.running}
-              mode={mode}
+            <Composer
+              running={state.running}
+              collaborationMode={collaborationMode}
+              toolApprovalMode={toolApprovalMode}
+              goal={goal}
               cwd={state.meta?.cwd}
               modelLabel={state.meta?.label ?? t("status.connecting")}
               tabId={activeTabId}
@@ -1636,18 +1880,20 @@ export default function App() {
               onCancel={cancel}
               onCycleMode={cycleMode}
               onSetMode={applyMode}
+              onSetCollaborationMode={applyCollaborationMode}
+              onSetToolApprovalMode={applyToolApprovalMode}
+              onSetGoal={startGoal}
+              onClearGoal={() => applyGoal("")}
               onSwitchModel={switchModel}
               onSetEffort={setEffort}
-              onPickFolder={switchFolder}
-              onRemoveWorkspace={removeWorkspace}
               insertRequest={composerInsertRequest}
-	              disabled={state.meta?.ready === false || state.messageAction != null || state.approval != null || state.ask != null}
-	              decisionPending={state.messageAction != null || state.approval != null || state.ask != null}
+              disabled={state.meta?.ready === false || state.messageAction != null || state.approval != null || state.ask != null}
+              decisionPending={state.messageAction != null || state.approval != null || state.ask != null}
               ready={state.meta?.ready === true}
               turnStartAt={state.turnStartAt}
               turnTokens={state.turnTokens}
               retry={state.retry}
-              workspaceRefreshSignal={projectRevision}
+              transientDismissSignal={transientOverlayDismissSignal}
             />
             <StatusBar
               context={state.context}
@@ -1655,9 +1901,12 @@ export default function App() {
               balance={state.balance}
               jobs={state.jobs}
               running={state.running}
-              mode={mode}
+              collaborationMode={collaborationMode}
+              toolApprovalMode={toolApprovalMode}
               cost={state.sessionCost}
               currency={state.sessionCurrency}
+              modelLabel={state.meta?.label}
+              currentTurnCount={currentTurnCount}
             />
           </footer>
           </>
@@ -1687,6 +1936,12 @@ export default function App() {
             ].join(" ")}
             aria-label={t("rightDock.workbench")}
           >
+            <div className="workbench-dock__head">
+              <div className="workbench-dock__heading">
+                <h2>{t("workspace.title")}</h2>
+              </div>
+              <span className="workbench-dock__head-spacer" />
+            </div>
             <div className="workbench-dock__tools">
               <div className="workbench-dock__tabs" role="tablist" aria-label={t("rightDock.views")}>
                 {SHOW_CONTEXT_DOCK && (
@@ -1697,7 +1952,7 @@ export default function App() {
                     className={`workbench-dock__tab${rightDockMode === "context" ? " workbench-dock__tab--active" : ""}`}
                     onClick={() => openRightDockMode("context")}
                   >
-                    <CircleGauge size={13} />
+                    <Activity size={13} />
                     <span className="workbench-dock__tab-label">{t("rightDock.overview")}</span>
                   </button>
                 )}
@@ -1733,6 +1988,7 @@ export default function App() {
                   sessionCurrency={state.sessionCurrency}
                   scopeLabel={topicScopeLabel(activeTab)}
                   refreshKey={dockRefreshKey}
+                  onDetailModeChange={handleContextDetailModeChange}
                 />
               ) : (
                 <WorkspacePanel
@@ -1741,8 +1997,11 @@ export default function App() {
                   maximized={workspacePanelMaximized}
                   panelWidth={workspacePanelRenderWidth}
                   onClose={() => setWorkspacePanel(false)}
-                  onToggleMaximized={() => setWorkspacePanelMaximized((value) => !value)}
-                  onPreviewModeChange={setWorkspacePreviewActive}
+                  onToggleMaximized={() => {
+                    closeTransientOverlays();
+                    setWorkspacePanelMaximized((value) => !value);
+                  }}
+                  onPreviewModeChange={handleWorkspacePreviewModeChange}
                   onAddToChat={addWorkspaceTextToComposer}
                   onRequestPanelWidth={ensureWorkspacePanelWidth}
                   refreshKey={dockRefreshKey}
@@ -1779,19 +2038,19 @@ export default function App() {
         />
       )}
 
+      <CommandPalette
+        open={paletteOpen}
+        onClose={() => setPaletteOpen(false)}
+        items={paletteItems}
+        placeholder={t("palette.placeholder")}
+        emptyText={t("palette.empty")}
+      />
+
       {startupSplashVisible && (
         <StartupSplash hold={startupSplashHold} onDone={() => setStartupSplashVisible(false)} />
       )}
 
       {needsOnboarding && <OnboardingOverlay onComplete={() => setNeedsOnboarding(false)} />}
-
-      <CommandPalette
-        open={paletteOpen}
-        onClose={() => setPaletteOpen(false)}
-        items={buildPaletteItems()}
-        placeholder="Quick actions…"
-        emptyText="No matches"
-      />
     </div>
     </ShellExpandProvider>
   );
diff --git a/desktop/frontend/src/components/AnchoredPopover.tsx b/desktop/frontend/src/components/AnchoredPopover.tsx
index dd85aef1a..9474748d7 100644
--- a/desktop/frontend/src/components/AnchoredPopover.tsx
+++ b/desktop/frontend/src/components/AnchoredPopover.tsx
@@ -6,9 +6,11 @@ type PopoverPosition = {
   left: number;
   top: number;
 };
+type PopoverPhase = "closed" | "open" | "closing";
 
 const EDGE_GAP = 8;
 const DEFAULT_OFFSET = 8;
+export const ANCHORED_POPOVER_CLOSE_MS = 140;
 
 function clamp(value: number, min: number, max: number): number {
   return Math.min(Math.max(value, min), max);
@@ -49,6 +51,7 @@ export function AnchoredPopover({
   offset = DEFAULT_OFFSET,
   placement = "auto",
   style,
+  closing = false,
 }: {
   open: boolean;
   anchorRef: RefObject<HTMLElement>;
@@ -59,61 +62,100 @@ export function AnchoredPopover({
   offset?: number;
   placement?: "auto" | "bottom";
   style?: CSSProperties;
+  closing?: boolean;
 }) {
+  const [phase, setPhase] = useState<PopoverPhase>(open ? "open" : "closed");
   const [position, setPosition] = useState<PopoverPosition | null>(null);
   const popoverRef = useRef<HTMLDivElement>(null);
+  const phaseRef = useRef<PopoverPhase>(phase);
 
   useLayoutEffect(() => {
-    if (!open) {
+    let id: number | undefined;
+    if (open) {
+      phaseRef.current = "open";
+      setPhase("open");
+      return undefined;
+    }
+    if (phaseRef.current === "closed") return undefined;
+    phaseRef.current = "closing";
+    setPhase("closing");
+    const reduceMotion = window.matchMedia("(prefers-reduced-motion: reduce)").matches;
+    id = window.setTimeout(() => {
+      phaseRef.current = "closed";
+      setPhase("closed");
+      setPosition(null);
+    }, reduceMotion ? 0 : ANCHORED_POPOVER_CLOSE_MS);
+    return () => {
+      if (id !== undefined) window.clearTimeout(id);
+    };
+  }, [open]);
+
+  const rendered = closing || phase !== "closed";
+
+  useLayoutEffect(() => {
+    if (!rendered) {
       setPosition(null);
       return;
     }
-    const anchor = anchorRef.current?.getBoundingClientRect();
-    const menu = document.querySelector<HTMLElement>("[data-anchored-popover='active']")?.getBoundingClientRect();
-    if (!anchor || !menu) return;
-    const next = calculatePosition(anchor, menu, align, offset, placement);
-    setPosition((current) => (samePosition(current, next) ? current : next));
-  }, [open, align, offset, placement]);
+    const updatePosition = () => {
+      const anchor = anchorRef.current?.getBoundingClientRect();
+      const menu = popoverRef.current?.getBoundingClientRect();
+      if (!anchor || !menu) return;
+      const next = calculatePosition(anchor, menu, align, offset, placement);
+      setPosition((current) => (samePosition(current, next) ? current : next));
+    };
+    updatePosition();
+    const frame = window.requestAnimationFrame(updatePosition);
+    return () => window.cancelAnimationFrame(frame);
+  }, [rendered, anchorRef, align, offset, placement]);
 
   useEffect(() => {
-    if (!open) return;
+    if (!open || closing) return;
     const closeOnEscape = (event: KeyboardEvent) => {
       if (event.key === "Escape") onClose();
     };
+    const closeOnOutsideClick = (event: MouseEvent) => {
+      const target = event.target;
+      if (!(target instanceof Node)) return;
+      if (popoverRef.current?.contains(target) || anchorRef.current?.contains(target)) return;
+      onClose();
+    };
     const closeOnViewportChange = () => onClose();
     window.addEventListener("keydown", closeOnEscape);
+    document.addEventListener("click", closeOnOutsideClick);
     window.addEventListener("resize", closeOnViewportChange);
     return () => {
       window.removeEventListener("keydown", closeOnEscape);
+      document.removeEventListener("click", closeOnOutsideClick);
       window.removeEventListener("resize", closeOnViewportChange);
     };
-  }, [onClose, open]);
+  }, [anchorRef, onClose, open]);
 
-  if (!open) return null;
+  if (!rendered) return null;
 
   return createPortal(
-    <>
-      <div className="anchored-popover__backdrop" onMouseDown={onClose} />
-      <div
-        ref={popoverRef}
-        data-anchored-popover="active"
-        className={`anchored-popover ${className}`}
-        style={{
-          ...style,
-          left: position?.left ?? -9999,
-          top: position?.top ?? -9999,
-          visibility: position ? "visible" : "hidden",
-        }}
-        onMouseDown={(event) => {
-          event.stopPropagation();
-        }}
-        onClick={(event) => {
-          event.stopPropagation();
-        }}
-      >
-        {children}
-      </div>
-    </>,
+    <div
+      ref={popoverRef}
+      data-anchored-popover="active"
+      data-ready={position ? "true" : "false"}
+      data-state={closing || phase === "closing" ? "closing" : "open"}
+      aria-hidden={closing || phase === "closing" ? true : undefined}
+      className={`anchored-popover ${className}`}
+      style={{
+        ...style,
+        left: position?.left ?? -9999,
+        top: position?.top ?? -9999,
+        visibility: position ? "visible" : "hidden",
+      }}
+      onMouseDown={(event) => {
+        event.stopPropagation();
+      }}
+      onClick={(event) => {
+        event.stopPropagation();
+      }}
+    >
+      {children}
+    </div>,
     document.body,
   );
 }
diff --git a/desktop/frontend/src/components/AppChrome.tsx b/desktop/frontend/src/components/AppChrome.tsx
new file mode 100644
index 000000000..d647d44fb
--- /dev/null
+++ b/desktop/frontend/src/components/AppChrome.tsx
@@ -0,0 +1,174 @@
+import { Minus, PanelLeft, PanelRight, Search, Square, X } from "lucide-react";
+import { TabBar } from "./TabBar";
+import type { TabMeta } from "../lib/types";
+import { useT } from "../lib/i18n";
+
+type DesktopPlatform = "darwin" | "windows" | "linux";
+
+interface AppChromeProps {
+  platform: DesktopPlatform;
+  browserPreviewChrome: boolean;
+  tabs: TabMeta[];
+  activeTabId?: string;
+  revealActiveSignal: number;
+  commandCompact: boolean;
+  sidebarTogglePressed: boolean;
+  sidebarExpandBlocked: boolean;
+  sidebarCollapsed: boolean;
+  sidebarToggleTitle: string;
+  workspacePanelMaximized: boolean;
+  workspacePanelRenderable: boolean;
+  workspaceTogglePressed: boolean;
+  workspacePanelLabel: string;
+  onToggleSidebar: () => void;
+  onToggleWorkspacePanel: () => void;
+  onTabChange: (tabId: string) => void;
+  onTabClose: (tabId: string) => void;
+  onTabsClose: (tabIds: string[], nextActiveTabId?: string) => void;
+  onTabsReorder: (tabIds: string[]) => void;
+  onNewTab: () => void;
+  onOpenPalette: () => void;
+}
+
+export function AppChrome({
+  platform,
+  browserPreviewChrome,
+  tabs,
+  activeTabId,
+  revealActiveSignal,
+  commandCompact,
+  sidebarTogglePressed,
+  sidebarExpandBlocked,
+  sidebarCollapsed,
+  sidebarToggleTitle,
+  workspacePanelMaximized,
+  workspacePanelRenderable,
+  workspaceTogglePressed,
+  workspacePanelLabel,
+  onToggleSidebar,
+  onToggleWorkspacePanel,
+  onTabChange,
+  onTabClose,
+  onTabsClose,
+  onTabsReorder,
+  onNewTab,
+  onOpenPalette,
+}: AppChromeProps) {
+  const t = useT();
+  const darwinChrome = platform === "darwin";
+  const detachCommand = !darwinChrome;
+  const showWindowsPreviewControls = browserPreviewChrome && platform === "windows";
+  const chromeClassName = [
+    "app-chrome",
+    "app-chrome--tabs",
+    darwinChrome ? "app-chrome--darwin-tabs" : "app-chrome--native-tabs",
+    !darwinChrome ? "app-chrome--identityless" : "",
+    showWindowsPreviewControls ? "app-chrome--preview-window-controls" : "",
+    `app-chrome--platform-${platform}`,
+  ].filter(Boolean).join(" ");
+
+  const tabBar = (
+    <TabBar
+      tabs={tabs}
+      activeTabId={activeTabId}
+      revealActiveSignal={revealActiveSignal}
+      onTabChange={onTabChange}
+      onTabClose={onTabClose}
+      onTabsClose={onTabsClose}
+      onTabsReorder={onTabsReorder}
+      onNewTab={onNewTab}
+      onOpenPalette={detachCommand ? undefined : onOpenPalette}
+      commandCompact={commandCompact}
+    />
+  );
+
+  return (
+    <header className={chromeClassName}>
+      {browserPreviewChrome && darwinChrome && (
+        <div className="app-chrome__traffic" aria-hidden="true">
+          <span />
+          <span />
+          <span />
+        </div>
+      )}
+      <button
+        className={[
+          "app-chrome__panel-toggle",
+          "app-chrome__panel-toggle--left",
+          sidebarTogglePressed ? "app-chrome__panel-toggle--pressed" : "",
+          sidebarExpandBlocked ? "app-chrome__panel-toggle--blocked" : "",
+        ].filter(Boolean).join(" ")}
+        type="button"
+        onClick={sidebarExpandBlocked ? undefined : onToggleSidebar}
+        aria-label={sidebarToggleTitle}
+        aria-pressed={!sidebarCollapsed}
+        aria-disabled={sidebarExpandBlocked}
+      >
+        <PanelLeft size={16} />
+      </button>
+
+      {darwinChrome ? (
+        <div className="app-chrome__tab-strip app-chrome__tab-strip--darwin">
+          {tabBar}
+        </div>
+      ) : (
+        <>
+          <div className="app-chrome__tab-strip app-chrome__tab-strip--native">
+            {tabBar}
+          </div>
+          {detachCommand && (
+            <div
+              className={[
+                "app-chrome__tools",
+                workspaceTogglePressed ? "app-chrome__tools--workspace-pressed" : "",
+              ].filter(Boolean).join(" ")}
+              aria-label={t("tabBar.commandSearch")}
+            >
+              <button
+                className="tabbar__command tabbar__command--compact app-chrome__command"
+                type="button"
+                onClick={onOpenPalette}
+                aria-label={t("palette.placeholder")}
+              >
+                <Search size={13} className="tabbar__command-icon" />
+                <span className="tabbar__command-text tabbar__command-text--full">{t("tabBar.commandSearch")}</span>
+                <span className="tabbar__command-text tabbar__command-text--compact">{t("tabBar.commandSearchCompact")}</span>
+                <kbd className="tabbar__command-kbd">⌘K</kbd>
+              </button>
+            </div>
+          )}
+        </>
+      )}
+
+      {!workspacePanelMaximized && (
+        <button
+          className={[
+            "app-chrome__panel-toggle",
+            "app-chrome__panel-toggle--right",
+            workspacePanelRenderable ? "app-chrome__panel-toggle--active" : "",
+            workspaceTogglePressed ? "app-chrome__panel-toggle--pressed" : "",
+          ].filter(Boolean).join(" ")}
+          type="button"
+          onClick={onToggleWorkspacePanel}
+          aria-label={workspacePanelLabel}
+          aria-pressed={workspacePanelRenderable}
+        >
+          <PanelRight size={16} />
+        </button>
+      )}
+      {showWindowsPreviewControls && (
+        <div className="app-chrome__window-controls app-chrome__window-controls--windows" aria-hidden="true">
+          <span className="app-chrome__window-control app-chrome__window-control--minimize">
+            <Minus size={12} strokeWidth={1.9} />
+          </span>
+          <span className="app-chrome__window-control app-chrome__window-control--maximize">
+            <Square size={10} strokeWidth={1.8} />
+          </span>
+          <span className="app-chrome__window-control app-chrome__window-control--close">
+            <X size={12} strokeWidth={1.9} />
+          </span>
+        </div>
+      )}
+    </header>
+  );
+}
diff --git a/desktop/frontend/src/components/CapabilitiesPanel.tsx b/desktop/frontend/src/components/CapabilitiesPanel.tsx
index 3ae7665c2..d886e2177 100644
--- a/desktop/frontend/src/components/CapabilitiesPanel.tsx
+++ b/desktop/frontend/src/components/CapabilitiesPanel.tsx
@@ -6,6 +6,7 @@ import type { CapabilitiesView, MCPServerInput, ServerView, SkillRootSkillView,
 import { InlineConfirmButton } from "./InlineConfirmButton";
 import { ResizableDrawer } from "./ResizableDrawer";
 import { Tooltip } from "./Tooltip";
+import { ModalCloseButton } from "./ModalCloseButton";
 
 // CapabilitiesPanel is the desktop MCP & Skills drawer — the GUI counterpart to
 // the CLI's /mcp + /skill, aligning with Claude Code's Customize → Connectors:
@@ -137,16 +138,14 @@ export function CapabilitiesPanel({
             <div className="drawer__title">{t("caps.title")}</div>
             {view && <div className="drawer__summary">{summary}</div>}
           </div>
-          <Tooltip label={t("common.close")}>
-            <button className="chip" onClick={onClose}>
-              ✕
-            </button>
-          </Tooltip>
-          <Tooltip label={t("caps.refresh")}>
-            <button className="chip" disabled={busy} onClick={() => void reload()}>
-              ↻
-            </button>
-          </Tooltip>
+          <div className="drawer__actions">
+            <Tooltip label={t("caps.refresh")}>
+              <button className="chip" disabled={busy} onClick={() => void reload()}>
+                ↻
+              </button>
+            </Tooltip>
+            <ModalCloseButton label={t("common.close")} onClick={onClose} />
+          </div>
         </header>
 
         {!view ? (
diff --git a/desktop/frontend/src/components/CommandPalette.tsx b/desktop/frontend/src/components/CommandPalette.tsx
index 98743fbb3..03b20667b 100644
--- a/desktop/frontend/src/components/CommandPalette.tsx
+++ b/desktop/frontend/src/components/CommandPalette.tsx
@@ -1,4 +1,6 @@
 import { useEffect, useMemo, useRef, useState } from "react";
+import { Command, Search } from "lucide-react";
+import { useMountTransition } from "../lib/useMountTransition";
 
 // CommandPalette is a ⌘K / Ctrl+K modal that surfaces the desktop app's
 // long-tail navigation surface. Tabs through sessions, slash-commands, and
@@ -49,6 +51,9 @@ export function CommandPalette({
   const [query, setQuery] = useState("");
   const [active, setActive] = useState(0);
   const inputRef = useRef<HTMLInputElement>(null);
+  // Keep the palette mounted through its exit animation after `open` flips
+  // false; `status` drives the enter/exit keyframes via data-state.
+  const { mounted, status } = useMountTransition(open, 200);
 
   // Re-init whenever the palette opens: clear the query, reset the
   // highlight, and steal focus. Doing it on the open edge (not on every
@@ -158,16 +163,22 @@ export function CommandPalette({
     return () => document.removeEventListener("keydown", onKey);
   }, [open, flat, active, onClose]);
 
-  if (!open) return null;
+  if (!mounted) return null;
 
   // The running counter maps a flat-index back to its group header so we
   // can render the section dividers in order.
   let running = 0;
 
   return (
-    <div className="drawer-backdrop" onClick={onClose} role="presentation">
-      <div className="palette" onClick={(e) => e.stopPropagation()} role="dialog" aria-modal="true" aria-label={placeholder}>
+    <div
+      className="drawer-backdrop"
+      data-state={status}
+      onClick={onClose}
+      role="presentation"
+    >
+      <div className="palette" data-state={status} onClick={(e) => e.stopPropagation()} role="dialog" aria-modal="true" aria-label={placeholder}>
         <div className="palette__inputrow">
+          <Search className="palette__search-icon" size={18} aria-hidden="true" />
           <input
             ref={inputRef}
             className="palette__input"
@@ -202,8 +213,13 @@ export function CommandPalette({
                         onClose();
                       }}
                     >
-                      <span className="palette__title">{it.title}</span>
-                      {it.hint && <span className="palette__hint">{it.hint}</span>}
+                      <span className="palette__item-icon" aria-hidden="true">
+                        <Command size={15} />
+                      </span>
+                      <span className="palette__body">
+                        <span className="palette__title">{it.title}</span>
+                        {it.hint && <span className="palette__hint">{it.hint}</span>}
+                      </span>
                     </button>
                   );
                 })}
diff --git a/desktop/frontend/src/components/Composer.tsx b/desktop/frontend/src/components/Composer.tsx
index b0f8bbe09..676485302 100644
--- a/desktop/frontend/src/components/Composer.tsx
+++ b/desktop/frontend/src/components/Composer.tsx
@@ -1,12 +1,12 @@
 import { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";
-import type { CSSProperties, ClipboardEvent, DragEvent, KeyboardEvent, PointerEvent as ReactPointerEvent, ReactNode } from "react";
-import { AlertTriangle, ArrowUp, Check, ChevronDown, Eye, FileText, Folder, FolderGit2, FolderPlus, List, MessageSquare, Search, Square, Trash2, X, Zap } from "lucide-react";
+import type { CSSProperties, ClipboardEvent, DragEvent, KeyboardEvent, PointerEvent as ReactPointerEvent } from "react";
+import { ArrowUp, Eye, FileText, Folder, List, MessageSquare, Plus, Search, Shield, ShieldAlert, ShieldCheck, Square, Target, Trash2, X } from "lucide-react";
 import { asArray } from "../lib/array";
 import { DedupIndex, sha256 } from "../lib/attachDedup";
 import { app, onFilesDropped } from "../lib/bridge";
 import { SPINNER_WORDS, useI18n } from "../lib/i18n";
 import { clearLayoutSize, loadOptionalLayoutSize, saveLayoutSize } from "../lib/layoutPreferences";
-import type { CommandInfo, ComposerInsertRequest, DirEntry, EffortInfo, HistoryMessage, Mode, SessionMeta, SessionReference, SlashArgItem, SlashArgsResult, WorkspaceView } from "../lib/types";
+import { type CollaborationMode, type CommandInfo, type ComposerInsertRequest, type DirEntry, type EffortInfo, type HistoryMessage, type Mode, type SessionMeta, type SessionReference, type SlashArgItem, type SlashArgsResult, type ToolApprovalMode } from "../lib/types";
 import {
   formatWorkspaceReference,
   parseWorkspaceReference,
@@ -16,10 +16,10 @@ import {
 import { SlashMenu } from "./SlashMenu";
 import { ArgMenu } from "./ArgMenu";
 import { VirtualMenu } from "./VirtualMenu";
+import { ANCHORED_POPOVER_CLOSE_MS, AnchoredPopover } from "./AnchoredPopover";
 import { EffortSwitcher } from "./EffortSwitcher";
 import { ModelSwitcher } from "./ModelSwitcher";
 import { Tooltip } from "./Tooltip";
-import { AnchoredPopover } from "./AnchoredPopover";
 
 interface Attachment {
   path: string;
@@ -38,7 +38,7 @@ interface WorkspaceReference {
 
 const LONG_PASTE_MIN_CHARS = 2000;
 const LONG_PASTE_MIN_LINES = 20;
-const COMPOSER_MIN_HEIGHT = 86;
+const COMPOSER_MIN_HEIGHT = 104;
 const COMPOSER_MAX_HEIGHT = 360;
 const COMPOSER_MAX_VIEWPORT_RATIO = 0.4;
 const COMPOSER_AUTO_RESERVED_HEIGHT = 58;
@@ -248,7 +248,9 @@ async function buildSessionContext(refs: SessionReference[]): Promise<string> {
 
 export function Composer({
   running,
-  mode,
+  collaborationMode,
+  toolApprovalMode,
+  goal,
   cwd,
   modelLabel,
   tabId,
@@ -257,10 +259,12 @@ export function Composer({
   onCancel,
   onCycleMode,
   onSetMode,
+  onSetCollaborationMode,
+  onSetToolApprovalMode,
+  onSetGoal,
+  onClearGoal,
   onSwitchModel,
   onSetEffort,
-  onPickFolder,
-  onRemoveWorkspace,
   insertRequest,
   disabled,
   decisionPending = false,
@@ -268,10 +272,12 @@ export function Composer({
   turnStartAt,
   turnTokens,
   retry,
-  workspaceRefreshSignal,
+  transientDismissSignal,
 }: {
   running: boolean;
-  mode: Mode;
+  collaborationMode: CollaborationMode;
+  toolApprovalMode: ToolApprovalMode;
+  goal?: string;
   cwd?: string;
   modelLabel: string;
   tabId?: string;
@@ -282,10 +288,12 @@ export function Composer({
   onCancel: () => string | undefined;
   onCycleMode: () => void;
   onSetMode: (mode: Mode) => void;
+  onSetCollaborationMode: (mode: CollaborationMode) => void;
+  onSetToolApprovalMode: (mode: ToolApprovalMode) => void;
+  onSetGoal: (goal: string) => void;
+  onClearGoal: () => void;
   onSwitchModel: (name: string) => void;
   onSetEffort: (level: string) => void;
-  onPickFolder: (path?: string) => Promise<string>;
-  onRemoveWorkspace: (path: string) => Promise<void>;
   insertRequest?: ComposerInsertRequest | null;
   disabled?: boolean;
   decisionPending?: boolean;
@@ -297,7 +305,7 @@ export function Composer({
   turnStartAt?: number;
   turnTokens?: number;
   retry?: { attempt: number; max: number };
-  workspaceRefreshSignal?: number;
+  transientDismissSignal?: number;
 }) {
   const { t, locale } = useI18n();
   const now = useTick(running);
@@ -312,34 +320,29 @@ export function Composer({
   const [active, setActive] = useState(0);
   const [dismissed, setDismissed] = useState(false);
   const [dragOver, setDragOver] = useState(false);
-  const [workspaceMenuOpen, setWorkspaceMenuOpen] = useState(false);
-  const [workspaceQuery, setWorkspaceQuery] = useState("");
-  const [workspaces, setWorkspaces] = useState<WorkspaceView[]>([]);
-  // Two-click delete: the first click on the trash icon moves the row into a
-  // "Confirm?" state and shows a real label ("Delete?") on the icon; the
-  // second click (within ~3s) actually fires the removal. A click anywhere
-  // else, Escape, or a workspace switch resets the row. We keep the existing
-  // server-side RemoveWorkspace as the actual delete so the projects file
-  // stays the single source of truth — this is purely a confirmation gate.
-  const [confirmRemovePath, setConfirmRemovePath] = useState<string | null>(null);
   const [composerHeight, setComposerHeight] = useState<number | null>(loadComposerHeight);
   const [composerResizing, setComposerResizing] = useState(false);
   const [textareaAutoHeight, setTextareaAutoHeight] = useState<number | null>(null);
   const [textareaAutoOverflow, setTextareaAutoOverflow] = useState(false);
+  const [intentMenuOpen, setIntentMenuOpen] = useState(false);
+  const [intentMenuClosing, setIntentMenuClosing] = useState(false);
   const [showPastChats, setShowPastChats] = useState(false);
   const [pastChats, setPastChats] = useState<SessionMeta[]>([]);
   const [pastChatQuery, setPastChatQuery] = useState("");
   const [sessionRefs, setSessionRefs] = useState<SessionReference[]>([]);
   const [loadingPastChats, setLoadingPastChats] = useState(false);
   const [submitting, setSubmitting] = useState(false);
+  const [composerPrompt, setComposerPrompt] = useState<string | null>(null);
   const taRef = useRef<HTMLTextAreaElement>(null);
   const composerCardRef = useRef<HTMLDivElement>(null);
-  const workspaceAnchorRef = useRef<HTMLDivElement>(null);
+  const intentMenuAnchorRef = useRef<HTMLButtonElement>(null);
+  const intentCloseTimerRef = useRef<number | null>(null);
   const wasRunning = useRef(running);
   const composingRef = useRef(false);
   const lastCompositionEndAt = useRef(0);
   const lastSelectionRef = useRef({ start: 0, end: 0 });
   const consumedInsertIdRef = useRef(0);
+  const lastTransientDismissSignal = useRef(transientDismissSignal);
   const submittingRef = useRef(false);
   // Snapshot of the current cwd so async callbacks (openPastChats) can detect
   // workspace switches and discard stale responses (issue #3601).
@@ -557,6 +560,12 @@ export function Composer({
     setDismissed(false);
   }, [slashQuery, atRaw]);
 
+  useEffect(() => {
+    if (transientDismissSignal === undefined || transientDismissSignal === lastTransientDismissSignal.current) return;
+    lastTransientDismissSignal.current = transientDismissSignal;
+    setDismissed(true);
+  }, [transientDismissSignal]);
+
   // When the @ trigger disappears (user deleted the @), close the past:chats
   // sub-menu and reset related state. Without this, showPastChats can outlive
   // the @ token and leave the session list visible with no way to dismiss it.
@@ -662,15 +671,53 @@ export function Composer({
     requestAnimationFrame(() => taRef.current?.focus());
   };
 
+  const clearIntentCloseTimer = useCallback(() => {
+    if (intentCloseTimerRef.current === null) return;
+    window.clearTimeout(intentCloseTimerRef.current);
+    intentCloseTimerRef.current = null;
+  }, []);
+
+  const openIntentMenu = useCallback(() => {
+    clearIntentCloseTimer();
+    setIntentMenuClosing(false);
+    setIntentMenuOpen(true);
+  }, [clearIntentCloseTimer]);
+
+  const closeIntentMenu = useCallback((afterClose?: () => void) => {
+    clearIntentCloseTimer();
+    setIntentMenuClosing(true);
+    window.requestAnimationFrame(() => setIntentMenuOpen(false));
+    const reduceMotion = window.matchMedia("(prefers-reduced-motion: reduce)").matches;
+    intentCloseTimerRef.current = window.setTimeout(() => {
+      intentCloseTimerRef.current = null;
+      setIntentMenuClosing(false);
+      afterClose?.();
+    }, reduceMotion ? 0 : ANCHORED_POPOVER_CLOSE_MS);
+  }, [clearIntentCloseTimer]);
+
+  useEffect(() => () => clearIntentCloseTimer(), [clearIntentCloseTimer]);
+
   const fileDedupKey = async (file: File): Promise<AttachmentDedupKey> => ({
     hash: await sha256(file),
     source: `file:${file.name}:${file.size}:${file.lastModified}`,
   });
 
+  const planModeOn = collaborationMode === "plan";
+  const activeGoal = (goal ?? "").trim();
+  const goalModeOn = collaborationMode === "goal";
+
   const submit = async () => {
     if (disabled || submittingRef.current) return;
-    const t = text.trim();
-    if ((!t && attachments.length === 0 && workspaceRefs.length === 0) || pendingPaste > 0) return;
+    const trimmedText = text.trim();
+    if (pendingPaste > 0) return;
+    if (!trimmedText && attachments.length === 0 && workspaceRefs.length === 0) {
+      if (goalModeOn && !activeGoal) {
+        setComposerPrompt(t("composer.goalInputRequired"));
+        requestAnimationFrame(() => taRef.current?.focus());
+      }
+      return;
+    }
+    setComposerPrompt(null);
     submittingRef.current = true;
     setSubmitting(true);
     try {
@@ -678,13 +725,13 @@ export function Composer({
       ...workspaceRefs.map((ref) => formatWorkspaceReference(ref.path, ref.isDir)),
       ...attachments.map((a) => `@${a.path}`),
     ].join(" ");
-    const displayText = [t, refs].filter(Boolean).join(t && refs ? " " : "");
+    const displayText = [trimmedText, refs].filter(Boolean).join(trimmedText && refs ? " " : "");
     // PR-B: when past:chats refs are attached, prepend their formatted transcript
     // to submitText only (displayText stays unchanged so the user still sees their
     // original prompt in the input preview). With no refs we keep the original
     // submitText verbatim — no header, no rewording, byte-identical to pre-PR-B.
     const sessionContext = sessionRefs.length === 0 ? "" : await buildSessionContext(sessionRefs);
-    const baseSubmitText = [expandPastedBlocks(t), refs].filter(Boolean).join(t && refs ? " " : "");
+    const baseSubmitText = [expandPastedBlocks(trimmedText), refs].filter(Boolean).join(trimmedText && refs ? " " : "");
     const submitText = sessionContext ? `${sessionContext}${baseSubmitText}` : baseSubmitText;
     onSend(displayText, submitText);
     setText("");
@@ -778,7 +825,9 @@ export function Composer({
     }
   };
 
-  useEffect(() => onFilesDropped((paths) => void attachDroppedPaths(paths)), []);
+  useEffect(() => {
+    return onFilesDropped((paths) => void attachDroppedPaths(paths));
+  }, []);
 
   const onPaste = (e: ClipboardEvent<HTMLTextAreaElement>) => {
     const files = Array.from(e.clipboardData.files);
@@ -886,6 +935,7 @@ export function Composer({
   const pickCommand = (c: CommandInfo) => setTextCaretEnd("/" + c.name + " ");
 
   const activePastedBlocks = pastedBlocks.filter((block) => text.includes(block.label));
+  const shellModeActive = text.trimStart().startsWith("!");
 
   const removeWorkspaceReference = (target: WorkspaceReference) => {
     const key = workspaceReferenceKey(target);
@@ -913,54 +963,6 @@ export function Composer({
     setTextCaretEnd(next);
   };
 
-  const workspaceName = useMemo(() => {
-    if (!cwd) return "";
-    const parts = cwd.split(/[/\\]/).filter(Boolean);
-    return parts.length > 0 ? parts[parts.length - 1] : cwd;
-  }, [cwd]);
-
-  const loadWorkspaces = () => {
-    app.ListWorkspaces().then((next) => setWorkspaces(asArray(next))).catch(() => setWorkspaces([]));
-  };
-
-  useEffect(() => {
-    if (workspaceMenuOpen) loadWorkspaces();
-  }, [workspaceMenuOpen, cwd, workspaceRefreshSignal]);
-
-  const filteredWorkspaces = useMemo(() => {
-    const q = workspaceQuery.trim().toLowerCase();
-    if (!q) return workspaces;
-    return workspaces.filter((w) => `${w.name} ${w.path}`.toLowerCase().includes(q));
-  }, [workspaceQuery, workspaces]);
-
-  const chooseWorkspace = async (path?: string) => {
-    const next = await onPickFolder(path);
-    if (next) {
-      setWorkspaceMenuOpen(false);
-      setWorkspaceQuery("");
-    }
-  };
-
-  const removeWorkspace = async (path: string) => {
-    await onRemoveWorkspace(path);
-    setWorkspaces((prev) => prev.filter((w) => w.path !== path));
-    setConfirmRemovePath(null);
-  };
-
-  // First click on the trash icon arms the confirmation; second click fires.
-  // We reset the armed state after a short idle window so the user doesn't
-  // accidentally delete a workspace they walked past 30s ago.
-  useEffect(() => {
-    if (!confirmRemovePath) return;
-    const id = window.setTimeout(() => setConfirmRemovePath(null), 3000);
-    return () => window.clearTimeout(id);
-  }, [confirmRemovePath]);
-
-  // Escape / menu close / workspace switch all clear the armed delete.
-  useEffect(() => {
-    if (!workspaceMenuOpen) setConfirmRemovePath(null);
-  }, [workspaceMenuOpen]);
-
   useEffect(() => {
     const onResize = () => setComposerHeight((height) => (height === null ? null : clampComposerHeight(height)));
     window.addEventListener("resize", onResize);
@@ -1213,8 +1215,8 @@ export function Composer({
     const composing = isImeKeyEvent(e, composingRef.current, lastCompositionEndAt.current);
     if (e.key === "Enter" && composing) return;
 
-    // Shift+Tab cycles the input mode (normal → plan → YOLO → normal). Handled
-    // before the menus so it works even while one is open.
+    // Shift+Tab toggles plan mode only. Tool access is deliberately changed via
+    // the access menu so keyboard cycling never crosses a permission boundary.
     if (e.key === "Tab" && e.shiftKey && !composing) {
       e.preventDefault();
       onCycleMode();
@@ -1291,11 +1293,39 @@ export function Composer({
     ? ({ height: `${textareaAutoHeight}px`, overflowY: textareaAutoOverflow ? "auto" : "hidden" } as CSSProperties)
     : undefined;
   const composerAutoExpanded = composerHeight === null && textareaAutoHeight !== null && textareaAutoHeight > 40;
-  const modeOptions: Array<{ id: Mode; label: string; icon: ReactNode }> = [
-    { id: "normal", label: "auto", icon: <Zap size={13} /> },
-    { id: "plan", label: "plan", icon: <List size={13} /> },
-    { id: "yolo", label: "yolo", icon: <AlertTriangle size={13} /> },
-  ];
+  const draftGoal = text.trim();
+  void onSetMode;
+  const chooseApprovalMode = (nextMode: ToolApprovalMode) => {
+    onSetToolApprovalMode(nextMode);
+    requestAnimationFrame(() => taRef.current?.focus());
+  };
+  const choosePlanMode = () => {
+    closeIntentMenu(() => {
+      onSetCollaborationMode(planModeOn ? "normal" : "plan");
+      requestAnimationFrame(() => taRef.current?.focus());
+    });
+  };
+  const chooseGoalMode = () => {
+    if (goalModeOn) {
+      closeIntentMenu(() => {
+        onClearGoal();
+        requestAnimationFrame(() => taRef.current?.focus());
+      });
+      return;
+    }
+    if (draftGoal) {
+      closeIntentMenu(() => {
+        onSetGoal(draftGoal);
+        setText("");
+        requestAnimationFrame(() => taRef.current?.focus());
+      });
+      return;
+    }
+    closeIntentMenu(() => {
+      onSetCollaborationMode("goal");
+      requestAnimationFrame(() => taRef.current?.focus());
+    });
+  };
   const runActivity = retry
     ? t("status.retrying", { attempt: retry.attempt, max: retry.max })
     : running && turnStartAt
@@ -1307,12 +1337,11 @@ export function Composer({
           return `${word}… ${fmtElapsed(elapsedMs)}${tok}`;
         })()
       : null;
-  const hasWorkspace = Boolean(cwd);
   const hasEffort = Boolean(effort?.supported);
   const composerMetaClass = [
     "composer-meta",
-    hasWorkspace ? "composer-meta--has-workspace" : "composer-meta--no-workspace",
     hasEffort ? "composer-meta--has-effort" : "composer-meta--no-effort",
+    planModeOn || goalModeOn ? "composer-meta--has-intent-chip" : "composer-meta--no-intent-chip",
   ].join(" ");
 
   return (
@@ -1322,75 +1351,48 @@ export function Composer({
       onDropCapture={onFileDropCapture}
     >
       <AnchoredPopover
-        open={workspaceMenuOpen && !!cwd}
-        anchorRef={workspaceAnchorRef}
-        onClose={() => setWorkspaceMenuOpen(false)}
-        className="workspace-switcher workspace-switcher--portal"
+        open={intentMenuOpen}
+        closing={intentMenuClosing}
+        anchorRef={intentMenuAnchorRef}
+        onClose={() => closeIntentMenu()}
+        className="composer-access-menu composer-intent-menu"
+        align="start"
       >
-          <label className="workspace-switcher__search">
-            <Search size={14} />
-            <input
-              autoFocus
-              value={workspaceQuery}
-              onChange={(e) => setWorkspaceQuery(e.target.value)}
-              onKeyDown={(e) => {
-                if (e.key === "Escape") setWorkspaceMenuOpen(false);
-              }}
-              placeholder={t("composer.searchProjects")}
-            />
-          </label>
-          <div className="workspace-switcher__list">
-            {filteredWorkspaces.map((w) => (
-              <div className="workspace-switcher__row" key={w.path}>
-                <button
-                  className={`workspace-switcher__item${w.current ? " workspace-switcher__item--current" : ""}`}
-                  title={w.path}
-                  onClick={() => {
-                    if (w.current) {
-                      setWorkspaceMenuOpen(false);
-                      return;
-                    }
-                    void chooseWorkspace(w.path);
-                  }}
-                >
-                  <FolderGit2 size={15} />
-                  <span>{w.name}</span>
-                  {w.current && <Check size={15} />}
-                </button>
-                <button
-                  className={`workspace-switcher__remove${confirmRemovePath === w.path ? " workspace-switcher__remove--armed" : ""}${w.current ? " workspace-switcher__remove--current" : ""}`}
-                  type="button"
-                  aria-label={confirmRemovePath === w.path ? t("composer.confirmRemoveProject") : t("composer.removeProject")}
-                  title={
-                    w.current
-                      ? t("composer.cannotRemoveCurrent")
-                      : confirmRemovePath === w.path
-                        ? t("composer.confirmRemoveProject")
-                        : t("composer.removeProject")
-                  }
-                  disabled={running || w.current}
-                  onClick={(event) => {
-                    event.stopPropagation();
-                    if (w.current) return;
-                    if (confirmRemovePath === w.path) {
-                      void removeWorkspace(w.path);
-                    } else {
-                      setConfirmRemovePath(w.path);
-                    }
-                  }}
-                >
-                  {confirmRemovePath === w.path ? <Check size={14} /> : <Trash2 size={14} />}
-                </button>
-              </div>
-            ))}
-            {filteredWorkspaces.length === 0 && <div className="workspace-switcher__empty">{t("composer.noProjectMatches")}</div>}
-          </div>
-          <div className="workspace-switcher__actions">
-            <button type="button" onClick={() => void chooseWorkspace()}>
-              <FolderPlus size={15} />
-              <span>{t("composer.addProject")}</span>
-            </button>
-          </div>
+        <div className="composer-access-menu__section">
+          <div className="composer-access-menu__label">{t("composer.intentMenuTitle")}</div>
+          <button
+            type="button"
+            className={`composer-access-menu__item composer-intent-menu__item${planModeOn ? " composer-access-menu__item--active" : ""}`}
+            onClick={choosePlanMode}
+            disabled={disabled || running}
+            title={planModeOn ? t("composer.exitPlanTitle") : t("composer.enterPlanTitle")}
+          >
+            <List size={16} />
+            <span className="composer-access-menu__copy">
+              <span className="composer-access-menu__title">{t("composer.modePlan")}</span>
+              <span className="composer-access-menu__desc">{t("composer.planModeDesc")}</span>
+            </span>
+            <span className={`composer-intent-switch${planModeOn ? " composer-intent-switch--on" : ""}`} aria-hidden="true">
+              <span />
+            </span>
+          </button>
+          <button
+            type="button"
+            className={`composer-access-menu__item composer-intent-menu__item${goalModeOn ? " composer-access-menu__item--active" : ""}`}
+            onClick={chooseGoalMode}
+            disabled={disabled || running}
+            title={goalModeOn ? activeGoal || t("composer.goalModeActiveDesc") : t("composer.goalModeDesc")}
+          >
+            <Target size={16} />
+            <span className="composer-access-menu__copy">
+              <span className="composer-access-menu__title">{t("composer.modeGoal")}</span>
+              <span className="composer-access-menu__desc">{goalModeOn ? activeGoal || t("composer.goalModeActiveDesc") : t("composer.goalModeDesc")}</span>
+            </span>
+            <span className={`composer-intent-switch${goalModeOn ? " composer-intent-switch--on" : ""}`} aria-hidden="true">
+              <span />
+            </span>
+          </button>
+        </div>
       </AnchoredPopover>
       {menuMode === "slash" && (
         <SlashMenu items={slashMatches} activeIndex={active} onPick={pickCommand} onHover={setActive} />
@@ -1531,23 +1533,8 @@ export function Composer({
           />
         )
       )}
-      <div className="composer-toolbar">
-        <div className="composer-modebar" role="toolbar" aria-label={t("composer.modeTitle")}>
-          {modeOptions.map((option) => (
-            <button
-              key={option.id}
-              type="button"
-              className={`composer-modebar__item composer-modebar__item--${option.id}${mode === option.id ? " composer-modebar__item--active" : ""}`}
-              onClick={() => onSetMode(option.id)}
-              aria-pressed={mode === option.id}
-              disabled={disabled || running}
-            >
-              {option.icon}
-              <span>{option.label}</span>
-            </button>
-          ))}
-        </div>
-        {runActivity && (
+      {runActivity && (
+        <div className="composer-toolbar composer-toolbar--status-only">
           <div className="composer-runstatus" role="status" aria-live="polite">
             <span className="composer-runstatus__dot" />
             <span className="composer-runstatus__text">{runActivity}</span>
@@ -1558,8 +1545,8 @@ export function Composer({
               </button>
             </Tooltip>
           </div>
-        )}
-      </div>
+        </div>
+      )}
       {(attachments.length > 0 || workspaceRefs.length > 0 || sessionRefs.length > 0) && (
         <div className="composer-context" aria-label={t("composer.contextItems")}>
           {attachments.map((a) => (
@@ -1678,17 +1665,20 @@ export function Composer({
           onDoubleClick={resetComposerHeight}
         />
         <div
-          className={`composer${dragOver ? " composer--dragover" : ""}${disabled ? " composer--disabled" : ""}${text.trimStart().startsWith("!") ? " composer--shell" : ""}`}
+          className={`composer${dragOver ? " composer--dragover" : ""}${disabled ? " composer--disabled" : ""}${shellModeActive ? " composer--shell" : ""}`}
           onDrop={onDrop}
           onDragOver={onDragOver}
           onDragLeave={onDragLeave}
         >
-          <span className="composer__caret">{text.trimStart().startsWith("!") ? "$" : "›"}</span>
+          <span className="composer__caret">{shellModeActive ? "$" : "›"}</span>
           <textarea
             ref={taRef}
             className="composer__input"
             value={text}
-            onChange={(e) => setText(e.target.value)}
+            onChange={(e) => {
+              setText(e.target.value);
+              if (composerPrompt) setComposerPrompt(null);
+            }}
             onSelect={rememberCaret}
             onClick={rememberCaret}
             onKeyUp={rememberCaret}
@@ -1703,16 +1693,21 @@ export function Composer({
               lastCompositionEndAt.current = Date.now();
             }}
             style={textareaStyle}
-            placeholder={disabled ? t("common.loading") : t("composer.placeholder")}
+            placeholder={disabled ? t("common.loading") : goalModeOn && !activeGoal ? t("composer.goalInputPlaceholder") : t("composer.placeholder")}
             rows={1}
             disabled={disabled}
           />
+          {composerPrompt && (
+            <span className="composer__prompt" role="status">
+              {composerPrompt}
+            </span>
+          )}
           {!running && (
             <Tooltip label={t("composer.send")}>
               <button
                 className="composer__btn composer__btn--send"
                 onClick={submit}
-                disabled={submitting || pendingPaste > 0 || (!text.trim() && attachments.length === 0 && workspaceRefs.length === 0) || disabled}
+                disabled={submitting || pendingPaste > 0 || ((!text.trim() && attachments.length === 0 && workspaceRefs.length === 0) && !(goalModeOn && !activeGoal)) || disabled}
               >
                 <ArrowUp size={16} />
               </button>
@@ -1720,22 +1715,101 @@ export function Composer({
           )}
         </div>
         <div className={composerMetaClass}>
-          {cwd && (
-            <div className="composer-meta__control composer-meta__control--workspace composer-workspace-wrap" ref={workspaceAnchorRef}>
-              <button
-                className={`composer__workspace${workspaceMenuOpen ? " composer__workspace--open" : ""}`}
-                onClick={() => {
-                  if (!running) setWorkspaceMenuOpen((open) => !open);
-                }}
-                disabled={running}
-              >
-                <FolderGit2 size={13} />
-                <span>{workspaceName}</span>
-                <ChevronDown size={12} />
-              </button>
-            </div>
-          )}
           <div className="composer-meta__params">
+            <div className="composer-meta__control composer-meta__control--intent">
+              <Tooltip label={t("composer.intentMenuTitle")} disabled={intentMenuOpen || intentMenuClosing}>
+                <button
+                  ref={intentMenuAnchorRef}
+                  type="button"
+                  className={`composer-action-trigger${intentMenuOpen || intentMenuClosing ? " composer-action-trigger--open" : ""}`}
+                  onClick={() => (intentMenuOpen || intentMenuClosing ? closeIntentMenu() : openIntentMenu())}
+                  disabled={disabled || running}
+                  aria-haspopup="menu"
+                  aria-expanded={intentMenuOpen && !intentMenuClosing}
+                  title={intentMenuOpen || intentMenuClosing ? undefined : t("composer.intentMenuTitle")}
+                >
+                  <Plus size={17} />
+                </button>
+              </Tooltip>
+              {planModeOn && (
+                <Tooltip label={t("composer.exitPlanTitle")}>
+                  <button
+                    type="button"
+                    className="composer-mode-chip composer-mode-chip--plan"
+                    onClick={choosePlanMode}
+                    disabled={disabled}
+                    title={t("composer.exitPlanTitle")}
+                    aria-label={t("composer.exitPlanTitle")}
+                  >
+                    <span className="composer-mode-chip__icon composer-mode-chip__icon--mode" aria-hidden="true">
+                      <List size={14} />
+                    </span>
+                    <span className="composer-mode-chip__icon composer-mode-chip__icon--dismiss" aria-hidden="true">
+                      <X size={11} />
+                    </span>
+                    <span className="composer-mode-chip__label">{t("composer.modePlan")}</span>
+                  </button>
+                </Tooltip>
+              )}
+              {goalModeOn && (
+                <Tooltip label={t("composer.exitGoalTitle")}>
+                  <button
+                    type="button"
+                    className="composer-mode-chip composer-mode-chip--goal"
+                    onClick={chooseGoalMode}
+                    disabled={disabled}
+                    title={activeGoal || t("composer.exitGoalTitle")}
+                    aria-label={t("composer.exitGoalTitle")}
+                  >
+                    <span className="composer-mode-chip__icon composer-mode-chip__icon--mode" aria-hidden="true">
+                      <Target size={14} />
+                    </span>
+                    <span className="composer-mode-chip__icon composer-mode-chip__icon--dismiss" aria-hidden="true">
+                      <X size={11} />
+                    </span>
+                    <span className="composer-mode-chip__label">{t("composer.modeGoal")}</span>
+                  </button>
+                </Tooltip>
+              )}
+            </div>
+            <div className="composer-meta__control composer-meta__control--approval">
+              <div className="composer-modebar composer-modebar--approval" data-mode={toolApprovalMode} title={t("composer.accessMenuTitle")}>
+                <span className="composer-modebar__thumb" aria-hidden="true" />
+                <button
+                  type="button"
+                  className={`composer-modebar__item composer-modebar__item--ask${toolApprovalMode === "ask" ? " composer-modebar__item--active" : ""}`}
+                  onClick={() => chooseApprovalMode("ask")}
+                  disabled={disabled || running}
+                  aria-pressed={toolApprovalMode === "ask"}
+                  title={t("composer.accessAskTitle")}
+                >
+                  <Shield size={14} />
+                  <span>{t("composer.modeAsk")}</span>
+                </button>
+                <button
+                  type="button"
+                  className={`composer-modebar__item composer-modebar__item--auto${toolApprovalMode === "auto" ? " composer-modebar__item--active" : ""}`}
+                  onClick={() => chooseApprovalMode("auto")}
+                  disabled={disabled || running}
+                  aria-pressed={toolApprovalMode === "auto"}
+                  title={t("composer.accessAutoTitle")}
+                >
+                  <ShieldCheck size={14} />
+                  <span>{t("composer.modeNormal")}</span>
+                </button>
+                <button
+                  type="button"
+                  className={`composer-modebar__item composer-modebar__item--yolo${toolApprovalMode === "yolo" ? " composer-modebar__item--active" : ""}`}
+                  onClick={() => chooseApprovalMode("yolo")}
+                  disabled={disabled || running}
+                  aria-pressed={toolApprovalMode === "yolo"}
+                  title={t("composer.accessYoloTitle")}
+                >
+                  <ShieldAlert size={14} />
+                  <span>{t("composer.modeYolo")}</span>
+                </button>
+              </div>
+            </div>
             <div className="composer-meta__control composer-meta__control--model">
               <ModelSwitcher label={modelLabel} tabId={tabId} onPick={onSwitchModel} />
             </div>
diff --git a/desktop/frontend/src/components/ContextPanel.tsx b/desktop/frontend/src/components/ContextPanel.tsx
index 3cd20f23f..0b0db1e6d 100644
--- a/desktop/frontend/src/components/ContextPanel.tsx
+++ b/desktop/frontend/src/components/ContextPanel.tsx
@@ -16,6 +16,7 @@ interface ContextPanelProps {
   sessionCurrency?: string;
   scopeLabel?: string;
   refreshKey?: number;
+  onDetailModeChange?: (active: boolean) => void;
 }
 
 type ContextDetail = "read" | "changed";
@@ -92,7 +93,7 @@ function contextHealth(usagePct: number, cachePct: number, readCount: number): H
   };
 }
 
-export function ContextPanel({ tabId, context, usage, sessionCost, sessionCurrency, scopeLabel, refreshKey }: ContextPanelProps) {
+export function ContextPanel({ tabId, context, usage, sessionCost, sessionCurrency, scopeLabel, refreshKey, onDetailModeChange }: ContextPanelProps) {
   const t = useT();
   const [info, setInfo] = useState<ContextPanelInfo | null>(null);
   const [detailView, setDetailView] = useState<ContextDetail | null>(null);
@@ -116,19 +117,37 @@ export function ContextPanel({ tabId, context, usage, sessionCost, sessionCurren
     void refresh();
   }, [refresh, refreshKey]);
 
+  useEffect(() => {
+    onDetailModeChange?.(detailView !== null);
+  }, [detailView, onDetailModeChange]);
+
+  useEffect(() => {
+    return () => onDetailModeChange?.(false);
+  }, [onDetailModeChange]);
+
+  const hasPanelUsage = Boolean(
+    (info?.requestCount ?? 0) > 0 ||
+    (info?.promptTokens ?? 0) > 0 ||
+    (info?.completionTokens ?? 0) > 0 ||
+    (info?.reasoningTokens ?? 0) > 0 ||
+    (info?.cacheHitTokens ?? 0) > 0 ||
+    (info?.cacheMissTokens ?? 0) > 0
+  );
   const usedTokens = context?.used && context.used > 0 ? context.used : info?.usedTokens ?? 0;
   const windowTokens = context?.window && context.window > 0 ? context.window : info?.windowTokens ?? 0;
-  const promptTokens = usage?.promptTokens && usage.promptTokens > 0 ? usage.promptTokens : info?.promptTokens ?? 0;
-  const completionTokens = usage?.completionTokens && usage.completionTokens > 0 ? usage.completionTokens : info?.completionTokens ?? 0;
-  const reasoningTokens = usage?.reasoningTokens && usage.reasoningTokens > 0 ? usage.reasoningTokens : info?.reasoningTokens ?? 0;
-  const cacheHitTokens = usage?.cacheHitTokens && usage.cacheHitTokens > 0 ? usage.cacheHitTokens : info?.cacheHitTokens ?? 0;
-  const cacheMissTokens = usage?.cacheMissTokens && usage.cacheMissTokens > 0 ? usage.cacheMissTokens : info?.cacheMissTokens ?? 0;
-  const cost = sessionCost && sessionCost > 0 ? sessionCost : info?.sessionCost ?? info?.sessionCostUsd ?? 0;
+  const promptTokens = hasPanelUsage ? info?.promptTokens ?? 0 : usage?.promptTokens ?? 0;
+  const completionTokens = hasPanelUsage ? info?.completionTokens ?? 0 : usage?.completionTokens ?? 0;
+  const reasoningTokens = hasPanelUsage ? info?.reasoningTokens ?? 0 : usage?.reasoningTokens ?? 0;
+  const cacheHitTokens = hasPanelUsage ? info?.cacheHitTokens ?? 0 : usage?.cacheHitTokens ?? 0;
+  const cacheMissTokens = hasPanelUsage ? info?.cacheMissTokens ?? 0 : usage?.cacheMissTokens ?? 0;
+  const cost = info?.sessionCost && info.sessionCost > 0 ? info.sessionCost : sessionCost && sessionCost > 0 ? sessionCost : info?.sessionCostUsd ?? 0;
   const currency = sessionCurrency || info?.sessionCurrency || usage?.currency || "¥";
+  const isMock = info?.mock === true;
   const readFiles = asArray(info?.readFiles);
   const changedFiles = asArray(info?.changedFiles);
 
   const usagePct = windowTokens > 0 ? Math.round((usedTokens / windowTokens) * 100) : 0;
+  const compactPct = context?.compactRatio ? Math.round(context.compactRatio * 100) : 0;
   const cachePct = cacheHitTokens + cacheMissTokens > 0
     ? Math.round((cacheHitTokens / (cacheHitTokens + cacheMissTokens)) * 100)
     : 0;
@@ -145,8 +164,10 @@ export function ContextPanel({ tabId, context, usage, sessionCost, sessionCurren
     ...readFiles.map((file) => file.time),
     ...changedFiles.map((file) => file.latestTime ?? 0),
   ].filter((time) => time > 0);
-  const elapsed = eventTimes.length > 1 ? Math.max(...eventTimes) - Math.min(...eventTimes) : 0;
-  const requestCount = Math.max(readFiles.length + changedFiles.length, 0);
+  const derivedElapsed = eventTimes.length > 1 ? Math.max(...eventTimes) - Math.min(...eventTimes) : 0;
+  const elapsed = info?.elapsedMs && info.elapsedMs > 0 ? info.elapsedMs : derivedElapsed;
+  const derivedRequestCount = Math.max(readFiles.length + changedFiles.length, 0);
+  const requestCount = info?.requestCount && info.requestCount > 0 ? info.requestCount : derivedRequestCount;
   const readRows = readFiles.map((f, i) => ({
     key: `${f.path}-${i}`,
     path: f.path,
@@ -181,11 +202,13 @@ export function ContextPanel({ tabId, context, usage, sessionCost, sessionCurren
     : t("context.readNote", { count: detailCount });
 
   const openDetail = (next: ContextDetail) => {
+    onDetailModeChange?.(true);
     setDetailView(next);
     setQuery("");
   };
 
   const closeDetail = () => {
+    onDetailModeChange?.(false);
     setDetailView(null);
     setQuery("");
   };
@@ -196,6 +219,7 @@ export function ContextPanel({ tabId, context, usage, sessionCost, sessionCurren
         <div className="context-panel__heading-main">
           <span>{detailView ? detailTitle : t("context.overview")}</span>
           <strong>{scopeLabel || t("context.scopeGlobal")}</strong>
+          {isMock && <em>{t("context.mockData")}</em>}
         </div>
         {detailView && (
           <button className="context-panel__back" type="button" onClick={closeDetail}>
@@ -224,13 +248,16 @@ export function ContextPanel({ tabId, context, usage, sessionCost, sessionCurren
         ) : (
           <section className="context-panel__overview">
             <section className="context-panel__usage">
-              <div className="context-panel__donut" style={donutStyle}>
-                <div className="context-panel__donut-core">
-                  <strong>{fmtTokens(usedTokens)}</strong>
-                  <span>/ {fmtTokens(windowTokens)} tokens</span>
+              <SectionHeading title={t("context.windowTitle")} meta={t("context.windowSubtitle")} />
+              <div className="context-panel__usage-visual">
+                <div className="context-panel__donut" style={donutStyle}>
+                  <div className="context-panel__donut-core">
+                    <strong>{fmtTokens(usedTokens)}</strong>
+                    <span>/ {fmtTokens(windowTokens)} tokens</span>
+                  </div>
                 </div>
+                <div className="context-panel__percent">{usagePct}%</div>
               </div>
-              <div className="context-panel__percent">{usagePct}%</div>
               <div className="context-panel__breakdown">
                 <TokenLegend label={t("context.prompt")} value={promptTokens} color="prompt" />
                 <TokenLegend label={t("context.completion")} value={completionTokens} color="completion" />
@@ -241,18 +268,32 @@ export function ContextPanel({ tabId, context, usage, sessionCost, sessionCurren
                   <strong>{usedTokens.toLocaleString()} / {windowTokens.toLocaleString()}</strong>
                 </div>
               </div>
+            </section>
+            <section className="context-panel__section">
+              <SectionHeading title={t("context.runtimeMetrics")} />
               <div className="context-panel__stats">
-                <MetricCard label={t("context.cacheHit")} value={cachePct > 0 ? `${cachePct}%` : "-"} tone="accent" />
-                <MetricCard label={t("context.sessionCost")} value={fmtMoney(cost, currency)} />
                 <MetricCard label={t("context.requests")} value={requestCount > 0 ? String(requestCount) : "-"} />
                 <MetricCard label={t("context.time")} value={fmtDuration(elapsed, t)} />
               </div>
             </section>
-            <div className={`context-panel__health context-panel__health--${health.tone}`}>
-              <span>{t("context.health")}</span>
-              <strong>{t(health.labelKey, health.vars)}</strong>
-              <small>{t(health.bodyKey, health.vars)}</small>
-            </div>
+            <section className="context-panel__section">
+              <SectionHeading title={t("context.costMetrics")} />
+              <div className="context-panel__stats">
+                <MetricCard label={t("context.cacheHit")} value={cachePct > 0 ? `${cachePct}%` : "-"} tone="accent" />
+                <MetricCard label={t("context.sessionCost")} value={fmtMoney(cost, currency)} />
+              </div>
+            </section>
+            <section className="context-panel__section context-panel__section--status">
+              <SectionHeading title={t("context.sessionStatus")} />
+              <div className={`context-panel__health context-panel__health--${health.tone}`}>
+                <span>{t("context.health")}</span>
+                <strong>{t(health.labelKey, health.vars)}</strong>
+                <small>{t(health.bodyKey, health.vars)}</small>
+              </div>
+              <div className="context-panel__stats context-panel__stats--single">
+                <MetricCard label={t("context.compaction")} value={compactPct > 0 ? `${compactPct}%` : "-"} />
+              </div>
+            </section>
             <PreviewSection
               title={t("context.referencedFiles")}
               meta={t("context.readMeta", { count: readRows.length })}
@@ -281,6 +322,15 @@ export function ContextPanel({ tabId, context, usage, sessionCost, sessionCurren
   );
 }
 
+function SectionHeading({ title, meta }: { title: string; meta?: string }) {
+  return (
+    <header className="context-panel__section-head">
+      <h3>{title}</h3>
+      {meta && <span>{meta}</span>}
+    </header>
+  );
+}
+
 function PreviewSection({
   title,
   meta,
diff --git a/desktop/frontend/src/components/EffortSwitcher.tsx b/desktop/frontend/src/components/EffortSwitcher.tsx
index 42d8b7539..76453dc23 100644
--- a/desktop/frontend/src/components/EffortSwitcher.tsx
+++ b/desktop/frontend/src/components/EffortSwitcher.tsx
@@ -1,9 +1,8 @@
-import { useRef, useState } from "react";
+import { useCallback, useEffect, useRef, useState } from "react";
 import { Check, ChevronsUpDown, Gauge } from "lucide-react";
 import { asArray } from "../lib/array";
-import { useT } from "../lib/i18n";
 import type { EffortInfo } from "../lib/types";
-import { AnchoredPopover } from "./AnchoredPopover";
+import { ANCHORED_POPOVER_CLOSE_MS, AnchoredPopover } from "./AnchoredPopover";
 
 export function EffortSwitcher({
   effort,
@@ -14,18 +13,47 @@ export function EffortSwitcher({
   disabled: boolean;
   onPick: (level: string) => void;
 }) {
-  const t = useT();
   const [open, setOpen] = useState(false);
+  const [closing, setClosing] = useState(false);
   const triggerRef = useRef<HTMLButtonElement>(null);
+  const closeTimerRef = useRef<number | null>(null);
   const levels = asArray(effort?.levels);
-  if (!effort?.supported || levels.length === 0) return null;
+  const current = effort?.current || "auto";
+
+  const clearCloseTimer = useCallback(() => {
+    if (closeTimerRef.current === null) return;
+    window.clearTimeout(closeTimerRef.current);
+    closeTimerRef.current = null;
+  }, []);
+
+  const openMenu = useCallback(() => {
+    clearCloseTimer();
+    setClosing(false);
+    setOpen(true);
+  }, [clearCloseTimer]);
+
+  const closeMenu = useCallback((afterClose?: () => void) => {
+    clearCloseTimer();
+    setClosing(true);
+    window.requestAnimationFrame(() => setOpen(false));
+    const reduceMotion = window.matchMedia("(prefers-reduced-motion: reduce)").matches;
+    closeTimerRef.current = window.setTimeout(() => {
+      closeTimerRef.current = null;
+      setClosing(false);
+      afterClose?.();
+    }, reduceMotion ? 0 : ANCHORED_POPOVER_CLOSE_MS);
+  }, [clearCloseTimer]);
+
+  useEffect(() => () => clearCloseTimer(), [clearCloseTimer]);
 
-  const current = effort.current || "auto";
   const pick = (level: string) => {
-    setOpen(false);
-    if (level !== current) onPick(level);
+    closeMenu(() => {
+      if (level !== current) onPick(level);
+    });
   };
 
+  if (!effort?.supported || levels.length === 0) return null;
+
   return (
     <div className="modelsw effortsw">
       <button
@@ -33,17 +61,18 @@ export function EffortSwitcher({
         type="button"
         className={`modelsw__trigger effortsw__trigger ${current !== "auto" ? "effortsw__trigger--explicit" : ""}`}
         disabled={disabled}
-        aria-expanded={open}
-        onClick={() => setOpen((v) => !v)}
+        aria-expanded={open && !closing}
+        onClick={() => (open || closing ? closeMenu() : openMenu())}
       >
         <Gauge size={13} className="modelsw__kind" />
-        <span className="modelsw__label">{t("status.effort", { level: current })}</span>
+        <span className="modelsw__label">{current}</span>
         <ChevronsUpDown size={11} />
       </button>
       <AnchoredPopover
         open={open && !disabled}
+        closing={closing}
         anchorRef={triggerRef}
-        onClose={() => setOpen(false)}
+        onClose={() => closeMenu()}
         className="modelsw__menu modelsw__menu--portal effortsw__menu"
         align="end"
       >
diff --git a/desktop/frontend/src/components/HistoryPanel.tsx b/desktop/frontend/src/components/HistoryPanel.tsx
index e668c4ab8..7be92a02c 100644
--- a/desktop/frontend/src/components/HistoryPanel.tsx
+++ b/desktop/frontend/src/components/HistoryPanel.tsx
@@ -5,9 +5,10 @@ import { t, useT } from "../lib/i18n";
 import { sessionActivityTime } from "../lib/session";
 import type { HistoryMessage, SessionMeta } from "../lib/types";
 import { historyMessagesToItems, type Item } from "../lib/useController";
-import { Tooltip } from "./Tooltip";
 import { Transcript } from "./Transcript";
 import { ContextMenu, contextMenuPointFromEvent, type ContextMenuItem, type ContextMenuPoint } from "./ContextMenu";
+import { useDeferredClose } from "../lib/useMountTransition";
+import { ModalCloseButton } from "./ModalCloseButton";
 
 type HistoryScopeFilter = "all" | "project" | "global";
 type HistoryStatusFilter = "all" | "current" | "open";
@@ -43,6 +44,8 @@ export function HistoryPanel({
 }) {
   const tr = useT();
   const isTrash = kind === "trash";
+  // Play the modal exit animation, then let the parent unmount us.
+  const { status, requestClose } = useDeferredClose(onClose, 240);
   const [editing, setEditing] = useState<string | null>(null);
   const [draft, setDraft] = useState("");
   const [query, setQuery] = useState("");
@@ -175,7 +178,6 @@ export function HistoryPanel({
   }, [filteredSessions, loadPreview, preview]);
 
   const previewItems = useMemo(() => previewMessagesToItems(preview?.messages ?? []), [preview?.messages]);
-  const showPreview = preview !== null;
   const selectedSession = useMemo(
     () => (preview ? filteredSessions.find((s) => s.path === preview.path) ?? null : null),
     [filteredSessions, preview],
@@ -341,9 +343,10 @@ export function HistoryPanel({
   };
 
   return (
-    <div className="management-modal-backdrop history-modal-backdrop" onClick={(e) => { if (e.target === e.currentTarget) onClose(); }}>
+    <div className="management-modal-backdrop history-modal-backdrop" data-state={status} onClick={(e) => { if (e.target === e.currentTarget) requestClose(); }}>
       <section
-        className={`management-modal history-modal${showPreview || running ? " history-modal--wide" : ""}`}
+        className="management-modal history-modal"
+        data-state={status}
         aria-label={tr(isTrash ? "history.trashTitle" : "history.title")}
         onClick={(e) => e.stopPropagation()}
       >
@@ -362,11 +365,7 @@ export function HistoryPanel({
               {tr(actionConfirmClearTrash ? "history.confirmClearTrash" : "history.clearTrash")}
             </button>
           )}
-          <Tooltip label={tr("common.close")}>
-            <button className="chip" onClick={onClose}>
-              ✕
-            </button>
-          </Tooltip>
+          <ModalCloseButton label={tr("common.close")} onClick={requestClose} />
         </div>
       </header>
 
@@ -428,7 +427,10 @@ export function HistoryPanel({
             ) : (
               groups.map((g) => (
                 <section className="mem-section" key={g.label}>
-                  <div className="mem-section__title">{g.label}</div>
+                  <div className="mem-section__title hist-group__title">
+                    <span>{g.label}</span>
+                    <span className="hist-group__count">{g.items.length}</span>
+                  </div>
                   {g.items.map((s) => {
                     const selected = preview?.path === s.path;
                     return (
@@ -464,22 +466,18 @@ export function HistoryPanel({
                           >
                             <div className="hist-item__preview">{sessionDisplayTitle(s, tr("history.emptySession"))}</div>
                             <div className="hist-item__meta">
+                              {!isTrash && s.current && <span className="hist-item__badge hist-item__badge--current">{tr("history.current")}</span>}
+                              {!isTrash && !s.current && s.open && <span className="hist-item__badge hist-item__badge--open">{tr("history.open")}</span>}
+                              {isTrash && <span className="hist-item__badge hist-item__badge--deleted">{tr("history.deleted")}</span>}
                               {sessionLocation(s, tr) && <span className="hist-item__scope">{sessionLocation(s, tr)}</span>}
-                              {!isTrash && s.current && <span className="hist-item__badge">{tr("history.current")}</span>}
-                              {!isTrash && !s.current && s.open && <span className="hist-item__badge">{tr("history.open")}</span>}
-                              <span>{tr(s.turns === 1 ? "history.turnOne" : "history.turnOther", { n: s.turns })}</span>
-                              <span>·</span>
-                              <span>{timeLabel(isTrash ? s.deletedAt || sessionActivityTime(s) : sessionActivityTime(s))}</span>
-                              {isTrash && s.deletedAt && (
-                                <>
-                                  <span>·</span>
-                                  <span>{tr("history.deleted")}</span>
-                                </>
-                              )}
+                              <span className="hist-item__metaspacer" />
+                              <span className="hist-item__stat">{tr(s.turns === 1 ? "history.turnOne" : "history.turnOther", { n: s.turns })}</span>
+                              <span className="hist-item__dot">·</span>
+                              <span className="hist-item__stat">{timeLabel(isTrash ? s.deletedAt || sessionActivityTime(s) : sessionActivityTime(s))}</span>
                               {!isTrash && running && (
                                 <>
-                                  <span>·</span>
-                                  <span>{tr("history.preview")}</span>
+                                  <span className="hist-item__dot">·</span>
+                                  <span className="hist-item__stat">{tr("history.preview")}</span>
                                 </>
                               )}
                             </div>
@@ -636,15 +634,20 @@ function HistoryFilterSelect({
 }) {
   const visibleOptions = options.filter((option) => option.id === "all" || option.id === value || option.count > 0);
   return (
-    <label className="history-filter-select">
-      <span>{label}</span>
-      <select value={value} onChange={(event) => onChange(event.target.value)}>
-        {visibleOptions.map((option) => (
-          <option key={option.id} value={option.id} disabled={option.id !== "all" && option.count === 0}>
-            {option.label} ({option.count})
-          </option>
-        ))}
-      </select>
-    </label>
+    <div className="history-filter" role="group" aria-label={label}>
+      {visibleOptions.map((option) => (
+        <button
+          key={option.id}
+          type="button"
+          className={`history-filter__pill${value === option.id ? " history-filter__pill--on" : ""}`}
+          aria-pressed={value === option.id}
+          disabled={option.id !== "all" && option.count === 0}
+          onClick={() => onChange(option.id)}
+        >
+          {option.label}
+          <span className="history-filter__count">{option.count}</span>
+        </button>
+      ))}
+    </div>
   );
 }
diff --git a/desktop/frontend/src/components/MemoryPanel.tsx b/desktop/frontend/src/components/MemoryPanel.tsx
index d72cbbf87..a7edf7e22 100644
--- a/desktop/frontend/src/components/MemoryPanel.tsx
+++ b/desktop/frontend/src/components/MemoryPanel.tsx
@@ -1,10 +1,11 @@
-import { ChevronDown, ChevronRight, Search, Trash2 } from "lucide-react";
+import { ChevronDown, ChevronRight, FileText, Search, Trash2 } from "lucide-react";
 import { useCallback, useEffect, useMemo, useRef, useState, type ReactNode } from "react";
 import { app } from "../lib/bridge";
 import { useT } from "../lib/i18n";
 import type { MemoryFact, MemoryView } from "../lib/types";
 import { ResizableDrawer } from "./ResizableDrawer";
 import { Tooltip } from "./Tooltip";
+import { ModalCloseButton } from "./ModalCloseButton";
 
 type LinkInfo = {
   name: string;
@@ -273,11 +274,7 @@ export function MemoryPanel({
               </div>
             )}
           </div>
-          <Tooltip label={t("common.close")}>
-            <button className="chip" onClick={onClose}>
-              ✕
-            </button>
-          </Tooltip>
+          <ModalCloseButton label={t("common.close")} onClick={onClose} />
         </header>
 
         {!view?.available ? (
@@ -349,6 +346,7 @@ export function MemoryPanel({
                     return (
                       <article
                         className={`mem-fact${highlight === f.name ? " mem-fact--hl" : ""}`}
+                        data-mem-type={f.type || "other"}
                         key={f.name}
                         ref={(el) => {
                           factRefs.current[f.name] = el;
@@ -366,7 +364,8 @@ export function MemoryPanel({
                           <span className="mem-fact__main">
                             <span className="mem-fact__title">{displayTitle(f)}</span>
                             <span className="mem-fact__meta">
-                              {f.name} · {f.type}
+                              {f.type && <span className="mem-fact__type" data-mem-type={f.type}>{f.type}</span>}
+                              <span className="mem-fact__slug">{f.name}</span>
                             </span>
                             <span className="mem-fact__desc">{f.description}</span>
                           </span>
@@ -508,8 +507,12 @@ export function MemoryPanel({
                 return (
                   <div className="mem-doc" key={d.path}>
                     <div className="mem-doc__head">
-                      <span className={`badge badge--${d.scope}`}>{d.scope}</span>
-                      <span className="mem-doc__path">{d.path}</span>
+                      <span className="mem-doc__icon"><FileText size={15} /></span>
+                      <span className="mem-doc__info">
+                        <span className="mem-doc__name">{memoryDocTitle(d.scope, t)}</span>
+                        <span className="mem-doc__path">{d.path}</span>
+                      </span>
+                      <span className={`mem-doc__tag badge--${d.scope}`}>{memoryScopeLabel(d.scope, t)}</span>
                       {!editing && (
                         <button
                           className="btn btn--small"
@@ -879,6 +882,7 @@ export function MemorySettingsPage() {
 							return (
 								<article
 									className={"mem-fact" + (highlight === f.name ? " mem-fact--hl" : "")}
+									data-mem-type={f.type || "other"}
 									key={f.name}
 									ref={(el) => {
 										factRefs.current[f.name] = el;
@@ -896,7 +900,8 @@ export function MemorySettingsPage() {
 										<span className="mem-fact__main">
 											<span className="mem-fact__title">{displayTitle(f)}</span>
 											<span className="mem-fact__meta">
-												{f.name} · {f.type}
+												{f.type && <span className="mem-fact__type" data-mem-type={f.type}>{f.type}</span>}
+												<span className="mem-fact__slug">{f.name}</span>
 											</span>
 											<span className="mem-fact__desc">{f.description}</span>
 										</span>
@@ -998,7 +1003,7 @@ export function MemorySettingsPage() {
 						<div className="mem-doc" key={d.path}>
 							<div className="mem-doc__head">
 								<div className="mem-doc__identity">
-									<span className={"badge badge--" + d.scope}>{memoryScopeLabel(d.scope, t)}</span>
+									<span className="mem-doc__icon"><FileText size={15} /></span>
 									<div>
 										<strong>{memoryDocTitle(d.scope, t)}</strong>
 										<span className="mem-doc__path">{d.path}</span>
@@ -1006,6 +1011,7 @@ export function MemorySettingsPage() {
 									</div>
 								</div>
 								<div className="mem-doc__head-actions">
+									<span className={"mem-doc__tag badge--" + d.scope}>{memoryScopeLabel(d.scope, t)}</span>
 									{!editing && (
 										<button
 											className="btn btn--small"
diff --git a/desktop/frontend/src/components/ModalCloseButton.tsx b/desktop/frontend/src/components/ModalCloseButton.tsx
new file mode 100644
index 000000000..d3f991d67
--- /dev/null
+++ b/desktop/frontend/src/components/ModalCloseButton.tsx
@@ -0,0 +1,20 @@
+import type { ButtonHTMLAttributes } from "react";
+import { X } from "lucide-react";
+import { Tooltip } from "./Tooltip";
+
+interface ModalCloseButtonProps extends Omit<ButtonHTMLAttributes<HTMLButtonElement>, "children"> {
+  label: string;
+}
+
+export function ModalCloseButton({ label, className = "", type = "button", ...props }: ModalCloseButtonProps) {
+  const ariaLabel = props["aria-label"] ?? label;
+  const classes = `modal-close-button${className ? ` ${className}` : ""}`;
+
+  return (
+    <Tooltip label={label}>
+      <button {...props} type={type} className={classes} aria-label={ariaLabel}>
+        <X size={15} strokeWidth={1.9} />
+      </button>
+    </Tooltip>
+  );
+}
diff --git a/desktop/frontend/src/components/ModelSwitcher.tsx b/desktop/frontend/src/components/ModelSwitcher.tsx
index d25bc7ff6..492891a4d 100644
--- a/desktop/frontend/src/components/ModelSwitcher.tsx
+++ b/desktop/frontend/src/components/ModelSwitcher.tsx
@@ -1,29 +1,56 @@
-import { useEffect, useRef, useState } from "react";
+import { useCallback, useEffect, useRef, useState } from "react";
 import { Brain, Check, ChevronsUpDown } from "lucide-react";
 import { asArray } from "../lib/array";
 import { app } from "../lib/bridge";
 import { useT } from "../lib/i18n";
 import type { ModelInfo } from "../lib/types";
-import { AnchoredPopover } from "./AnchoredPopover";
+import { ANCHORED_POPOVER_CLOSE_MS, AnchoredPopover } from "./AnchoredPopover";
 
 // ModelSwitcher opens an upward popover listing configured providers. Selecting
 // one switches the active model while the current conversation continues.
 export function ModelSwitcher({ label, tabId, onPick }: { label: string; tabId?: string; onPick: (name: string) => void }) {
   const t = useT();
   const [open, setOpen] = useState(false);
+  const [closing, setClosing] = useState(false);
   const [models, setModels] = useState<ModelInfo[]>([]);
   const triggerRef = useRef<HTMLButtonElement>(null);
+  const closeTimerRef = useRef<number | null>(null);
   const triggerWidth = triggerRef.current?.getBoundingClientRect().width;
 
+  const clearCloseTimer = useCallback(() => {
+    if (closeTimerRef.current === null) return;
+    window.clearTimeout(closeTimerRef.current);
+    closeTimerRef.current = null;
+  }, []);
+
+  const openMenu = useCallback(() => {
+    clearCloseTimer();
+    setClosing(false);
+    setOpen(true);
+  }, [clearCloseTimer]);
+
+  const closeMenu = useCallback((afterClose?: () => void) => {
+    clearCloseTimer();
+    setClosing(true);
+    window.requestAnimationFrame(() => setOpen(false));
+    const reduceMotion = window.matchMedia("(prefers-reduced-motion: reduce)").matches;
+    closeTimerRef.current = window.setTimeout(() => {
+      closeTimerRef.current = null;
+      setClosing(false);
+      afterClose?.();
+    }, reduceMotion ? 0 : ANCHORED_POPOVER_CLOSE_MS);
+  }, [clearCloseTimer]);
+
   useEffect(() => {
     if (open) {
       (tabId ? app.ModelsForTab(tabId) : app.Models()).then((next) => setModels(asArray(next))).catch(() => {});
     }
   }, [open, tabId]);
 
+  useEffect(() => () => clearCloseTimer(), [clearCloseTimer]);
+
   const pick = (name: string) => {
-    setOpen(false);
-    onPick(name);
+    closeMenu(() => onPick(name));
   };
 
   return (
@@ -32,8 +59,8 @@ export function ModelSwitcher({ label, tabId, onPick }: { label: string; tabId?:
         ref={triggerRef}
         type="button"
         className="modelsw__trigger"
-        aria-expanded={open}
-        onClick={() => setOpen((v) => !v)}
+        aria-expanded={open && !closing}
+        onClick={() => (open || closing ? closeMenu() : openMenu())}
       >
         <Brain size={13} className="modelsw__kind" />
         <span className="modelsw__label">{label}</span>
@@ -41,10 +68,11 @@ export function ModelSwitcher({ label, tabId, onPick }: { label: string; tabId?:
       </button>
       <AnchoredPopover
         open={open}
+        closing={closing}
         anchorRef={triggerRef}
-        onClose={() => setOpen(false)}
+        onClose={() => closeMenu()}
         className="modelsw__menu modelsw__menu--portal"
-        style={{ width: triggerWidth, minWidth: triggerWidth }}
+        style={{ width: triggerWidth, minWidth: triggerWidth ? Math.max(triggerWidth, 160) : undefined }}
       >
         <div role="listbox">
           {models.length === 0 && <div className="modelsw__empty">{t("status.noModels")}</div>}
diff --git a/desktop/frontend/src/components/NotificationCenter.tsx b/desktop/frontend/src/components/NotificationCenter.tsx
deleted file mode 100644
index 57fe1a57b..000000000
--- a/desktop/frontend/src/components/NotificationCenter.tsx
+++ /dev/null
@@ -1,103 +0,0 @@
-import { useEffect, useState } from "react";
-import { Bell, X } from "lucide-react";
-import { clear, markAllRead, snapshot, subscribe, type Notification, unread } from "../lib/notificationCenter";
-
-// NotificationCenter is the in-app drawer of recent notifications.
-// The trigger chip sits in the topbar (a small Bell icon) and shows
-// an unread dot when unread() > 0. Opening the drawer calls
-// markAllRead() and renders the snapshot in reverse-chronological
-// order. Each entry is dismissable; a "Clear all" link at the foot
-// empties the store.
-//
-// The list is reactive: subscribe() is called once on mount, and
-// the local copy is replaced on every push. The drawer doesn't poll.
-//
-// We use real relative time formatting ('3m ago', '2h ago') without
-// a date-fns dep — the formatter is a 12-line helper that handles
-// the only two cases that matter in this UI (sub-minute and sub-day).
-export function NotificationCenter({
-  open,
-  onClose,
-}: {
-  open: boolean;
-  onClose: () => void;
-}) {
-  const [list, setList] = useState<Notification[]>(snapshot());
-  useEffect(() => subscribe(setList), []);
-  // Mark all read on open; the unread dot in the trigger chip
-  // disappears immediately.
-  useEffect(() => {
-    if (open) markAllRead();
-  }, [open]);
-
-  if (!open) return null;
-  return (
-    <div className="drawer-backdrop" onClick={onClose} role="presentation">
-      <aside className="drawer" role="dialog" aria-modal="true" aria-label="Notifications" onClick={(e) => e.stopPropagation()}>
-        <header className="drawer__head">
-          <div className="drawer__title">Notifications</div>
-          <span className="drawer__spacer" />
-          {list.length > 0 && (
-            <button type="button" className="chip" onClick={() => clear()}>
-              Clear all
-            </button>
-          )}
-          <button type="button" className="chip" onClick={onClose} aria-label="Close notifications">
-            <X size={13} />
-          </button>
-        </header>
-        <div className="drawer__body notif">
-          {list.length === 0 ? (
-            <div className="notif__empty">No notifications yet.</div>
-          ) : (
-            <ul className="notif__list">
-              {list.map((n) => (
-                <li key={n.id} className={`notif__item notif__item--${n.level}`}>
-                  <div className="notif__head">
-                    <Bell size={11} aria-hidden="true" />
-                    <span className="notif__title">{n.title}</span>
-                    {n.source && <span className="notif__source">{n.source}</span>}
-                    <span className="notif__spacer" />
-                    <span className="notif__ago">{formatAgo(n.at)}</span>
-                  </div>
-                  {n.body && <div className="notif__body">{n.body}</div>}
-                </li>
-              ))}
-            </ul>
-          )}
-        </div>
-      </aside>
-    </div>
-  );
-}
-
-// NotificationBell is the topbar trigger chip. It shows an unread
-// dot when unread() > 0. Subscribes to the store so the dot updates
-// without the parent re-rendering.
-export function NotificationBell({ onClick }: { onClick: () => void }) {
-  const [n, setN] = useState<number>(unread());
-  useEffect(() => subscribe(() => setN(unread())), []);
-  return (
-    <button
-      type="button"
-      className="chip chip--icon notif-bell"
-      onClick={onClick}
-      title="Notifications"
-      aria-label={`Notifications (${n} unread)`}
-    >
-      <Bell size={13} />
-      {n > 0 && <span className="notif-bell__dot" aria-hidden="true" />}
-    </button>
-  );
-}
-
-function formatAgo(at: number): string {
-  const ms = Date.now() - at;
-  if (ms < 60_000) return "just now";
-  const m = Math.floor(ms / 60_000);
-  if (m < 60) return `${m}m ago`;
-  const h = Math.floor(m / 60);
-  if (h < 24) return `${h}h ago`;
-  const d = Math.floor(h / 24);
-  return `${d}d ago`;
-}
diff --git a/desktop/frontend/src/components/ProcessCard.tsx b/desktop/frontend/src/components/ProcessCard.tsx
index 274f3e5f2..9404d63f1 100644
--- a/desktop/frontend/src/components/ProcessCard.tsx
+++ b/desktop/frontend/src/components/ProcessCard.tsx
@@ -155,7 +155,13 @@ export function ProcessCard({
           </span>
         )}
       </button>
-      {hasBody && actualOpen && <div className="process-card__body">{children}</div>}
+      {hasBody && (
+        <div className="process-card__wrap" aria-hidden={!actualOpen}>
+          <div>
+            <div className="process-card__body">{children}</div>
+          </div>
+        </div>
+      )}
     </div>
   );
 }
diff --git a/desktop/frontend/src/components/ProjectTree.tsx b/desktop/frontend/src/components/ProjectTree.tsx
index 6aaa9b299..c04fda5f1 100644
--- a/desktop/frontend/src/components/ProjectTree.tsx
+++ b/desktop/frontend/src/components/ProjectTree.tsx
@@ -4,11 +4,11 @@
 // new topic.
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import type { CSSProperties, DragEvent as ReactDragEvent, KeyboardEvent as ReactKeyboardEvent, MouseEvent as ReactMouseEvent } from "react";
-import { Archive, ChevronRight, ChevronDown, Pencil, Plus, Folder, FolderPlus, Search, BriefcaseBusiness, Copy, FolderOpen, XCircle, History, Check } from "lucide-react";
+import { Archive, ChevronRight, Pencil, Plus, Folder, FolderPlus, Search, BriefcaseBusiness, Copy, FolderOpen, XCircle, History, Check, ListCollapse, ListRestart } from "lucide-react";
 import { asArray } from "../lib/array";
 import { app } from "../lib/bridge";
-import type { ProjectNode } from "../lib/types";
-import { getLocale, useT, type Translator } from "../lib/i18n";
+import type { ProjectNode, ProjectTopicStatus } from "../lib/types";
+import { getLocale, useT, type DictKey, type Translator } from "../lib/i18n";
 import { PROJECT_COLOR_OPTIONS, projectColorValue } from "../lib/projectColors";
 import { ContextMenu, contextMenuPointFromEvent, type ContextMenuItem, type ContextMenuPoint } from "./ContextMenu";
 import { Tooltip } from "./Tooltip";
@@ -40,13 +40,41 @@ function topicIsActive(node: ProjectNode, activeScope?: string, activeWorkspaceR
 }
 
 function topicMetaLine(node: ProjectNode, t: Translator): string {
+  const parts: string[] = [];
   const turns = node.turns ?? 0;
-  if (turns <= 0) return "";
-  const last = node.lastActivityAt ? ` · ${topicActivityLabel(node.lastActivityAt)}` : "";
-  return `${t(turns === 1 ? "history.turnOne" : "history.turnOther", { n: turns })}${last}`;
+  if (turns > 0) parts.push(t(turns === 1 ? "history.turnOne" : "history.turnOther", { n: turns }));
+  const activityAt = node.lastActivityAt || node.createdAt || 0;
+  if (activityAt) parts.push(topicActivityLabel(activityAt, t));
+  if (parts.length === 0) parts.push(t("projectTree.justNow"));
+  return parts.join(" · ");
 }
 
-function topicActivityLabel(ms: number): string {
+const topicStatusLabels: Record<ProjectTopicStatus, DictKey> = {
+  thinking: "projectTree.status.thinking",
+  streaming: "projectTree.status.streaming",
+  waiting_confirmation: "projectTree.status.waitingConfirmation",
+  paused: "projectTree.status.paused",
+  error: "projectTree.status.error",
+};
+
+function normalizeTopicStatus(status?: string): ProjectTopicStatus | "" {
+  if (!status) return "";
+  if (status === "thinking" || status === "streaming" || status === "waiting_confirmation" || status === "paused" || status === "error") {
+    return status;
+  }
+  return "";
+}
+
+function topicStatus(node: ProjectNode): ProjectTopicStatus | "" {
+  return normalizeTopicStatus(node.status) || (node.running ? "streaming" : "");
+}
+
+function topicStatusLabel(node: ProjectNode, t: Translator): string {
+  const status = topicStatus(node);
+  return status ? t(topicStatusLabels[status]) : "";
+}
+
+function topicActivityLabel(ms: number, t: Translator): string {
   if (ms <= 0) return "";
   const delta = Date.now() - ms;
   const locale = getLocale();
@@ -54,7 +82,7 @@ function topicActivityLabel(ms: number): string {
   const minute = 60_000;
   const hour = 60 * minute;
   const day = 24 * hour;
-  if (delta < minute) return new Date(ms).toLocaleTimeString([], { hour: "2-digit", minute: "2-digit" });
+  if (delta < minute) return t("projectTree.justNow");
   if (delta < hour) return rtf.format(-Math.max(1, Math.round(delta / minute)), "minute");
   if (delta < day) return rtf.format(-Math.round(delta / hour), "hour");
   if (delta < 7 * day) return rtf.format(-Math.round(delta / day), "day");
@@ -63,10 +91,36 @@ function topicActivityLabel(ms: number): string {
 
 type ProjectDropPosition = "before" | "after";
 
+type CollapseSnapshot = {
+  expanded: Set<string>;
+  manuallyCollapsed: Set<string>;
+};
+
+const GLOBAL_PROJECT_ORDER_KEY = "__global__";
+
+function projectOrderKey(node: ProjectNode): string {
+  if (node.kind === "global_folder") return GLOBAL_PROJECT_ORDER_KEY;
+  if (node.kind === "project" && node.root) return node.root;
+  return "";
+}
+
 function projectRoots(nodes: ProjectNode[]): string[] {
   return nodes
-    .filter((node) => node.kind === "project" && Boolean(node.root))
-    .map((node) => node.root!);
+    .map(projectOrderKey)
+    .filter((key) => key !== "");
+}
+
+function collapsibleFolderKeys(nodes: ProjectNode[], depth = 0): string[] {
+  const keys: string[] = [];
+  for (const node of nodes) {
+    if (!node) continue;
+    const children = asArray(node.children);
+    if ((node.kind === "project" || node.kind === "global_folder") && children.length > 0) {
+      keys.push(projectNodeKey(node, depth));
+    }
+    keys.push(...collapsibleFolderKeys(children, depth + 1));
+  }
+  return keys;
 }
 
 function reorderedProjectRoots(nodes: ProjectNode[], draggedRoot: string, targetRoot: string, position: ProjectDropPosition): string[] {
@@ -80,14 +134,19 @@ function reorderedProjectRoots(nodes: ProjectNode[], draggedRoot: string, target
 }
 
 function applyProjectOrder(nodes: ProjectNode[], roots: string[]): ProjectNode[] {
-  const byRoot = new Map(nodes.filter((node) => node.kind === "project" && node.root).map((node) => [node.root!, node]));
+  const projectEntries = nodes
+    .map((node): [string, ProjectNode] => [projectOrderKey(node), node])
+    .filter(([key]) => key !== "");
+  const byRoot = new Map<string, ProjectNode>(projectEntries);
   const orderedProjects = roots.map((root) => byRoot.get(root)).filter((node): node is ProjectNode => Boolean(node));
-  const nonProjects = nodes.filter((node) => node.kind !== "project");
+  const orderedKeys = new Set(roots);
+  const nonProjects = nodes.filter((node) => !orderedKeys.has(projectOrderKey(node)));
   return [...nonProjects, ...orderedProjects];
 }
 
-function projectAccentStyle(color?: string): CSSProperties | undefined {
-  const value = projectColorValue(color);
+// Global rows use the same project tree recipe; the fallback supplies their non-workspace accent.
+function projectAccentStyle(color?: string, fallbackValue?: string): CSSProperties | undefined {
+  const value = projectColorValue(color) || fallbackValue;
   if (!value) return undefined;
   return { "--project-accent": value } as CSSProperties;
 }
@@ -156,8 +215,10 @@ export function ProjectTree({
   const [confirmRemoveProject, setConfirmRemoveProject] = useState<string | null>(null);
   const [dragProjectRoot, setDragProjectRoot] = useState<string | null>(null);
   const [dropProject, setDropProject] = useState<{ root: string; position: ProjectDropPosition } | null>(null);
+  const [collapseSnapshot, setCollapseSnapshot] = useState<CollapseSnapshot | null>(null);
   const [platform, setPlatform] = useState("");
   const creatingRef = useRef(false);
+  const manuallyCollapsedRef = useRef(manuallyCollapsed);
 
   const closeMenu = useCallback(() => {
     setMenuTopic(null);
@@ -167,6 +228,14 @@ export function ProjectTree({
     setConfirmRemoveProject(null);
   }, []);
 
+  const updateManuallyCollapsed = useCallback((updater: (prev: Set<string>) => Set<string>) => {
+    setManuallyCollapsed((prev) => {
+      const next = updater(prev);
+      manuallyCollapsedRef.current = next;
+      return next;
+    });
+  }, []);
+
   const refresh = useCallback(async () => {
     try {
       const nodes = await app.ListProjectTree();
@@ -174,14 +243,19 @@ export function ProjectTree({
       setTree(list);
       setExpanded((prev) => {
         const next = new Set(prev);
+        const collapsed = manuallyCollapsedRef.current;
         for (const node of list) {
-          if (node?.key && !manuallyCollapsed.has(node.key)) next.add(node.key);
+          if (node?.key && !collapsed.has(node.key)) next.add(node.key);
         }
         return next;
       });
     } catch {
       /* bridge unavailable */
     }
+  }, []);
+
+  useEffect(() => {
+    manuallyCollapsedRef.current = manuallyCollapsed;
   }, [manuallyCollapsed]);
 
   useEffect(() => {
@@ -206,7 +280,7 @@ export function ProjectTree({
       else next.add(key);
       return next;
     });
-    setManuallyCollapsed((prev) => {
+    updateManuallyCollapsed((prev) => {
       const next = new Set(prev);
       if (willCollapse) next.add(key);
       else next.delete(key);
@@ -214,6 +288,60 @@ export function ProjectTree({
     });
   };
 
+  const folderKeys = useMemo(() => collapsibleFolderKeys(tree), [tree]);
+  const searchActive = query.trim().length > 0;
+  const hasExpandedFolders = !searchActive && folderKeys.some((key) => expanded.has(key));
+  const canRestoreCollapsedView = collapseSnapshot !== null;
+  const canToggleCollapsedView = !searchActive && folderKeys.length > 0 && (hasExpandedFolders || canRestoreCollapsedView);
+  const collapseToggleLabel = t(canRestoreCollapsedView ? "projectTree.restoreCollapsedTooltip" : "projectTree.collapseAllTooltip");
+
+  const toggleCollapsedView = useCallback(() => {
+    if (searchActive || folderKeys.length === 0) return;
+    if (collapseSnapshot) {
+      const currentFolderKeys = new Set(folderKeys);
+      setExpanded(() => {
+        const next = new Set<string>();
+        for (const key of collapseSnapshot.expanded) {
+          if (currentFolderKeys.has(key)) next.add(key);
+        }
+        return next;
+      });
+      updateManuallyCollapsed(() => {
+        const next = new Set<string>();
+        for (const key of collapseSnapshot.manuallyCollapsed) {
+          if (currentFolderKeys.has(key)) next.add(key);
+        }
+        return next;
+      });
+      setCollapseSnapshot(null);
+      return;
+    }
+    if (!hasExpandedFolders) return;
+    setCollapseSnapshot({
+      expanded: new Set(expanded),
+      manuallyCollapsed: new Set(manuallyCollapsed),
+    });
+    setExpanded((prev) => {
+      let changed = false;
+      const next = new Set(prev);
+      for (const key of folderKeys) {
+        if (next.delete(key)) changed = true;
+      }
+      return changed ? next : prev;
+    });
+    updateManuallyCollapsed((prev) => {
+      let changed = false;
+      const next = new Set(prev);
+      for (const key of folderKeys) {
+        if (!next.has(key)) {
+          next.add(key);
+          changed = true;
+        }
+      }
+      return changed ? next : prev;
+    });
+  }, [collapseSnapshot, expanded, folderKeys, hasExpandedFolders, manuallyCollapsed, searchActive, updateManuallyCollapsed]);
+
   const handleAddProject = async () => {
     if (addingProject) return;
     setAddingProject(true);
@@ -236,7 +364,7 @@ export function ProjectTree({
       next.add(key);
       return next;
     });
-    setManuallyCollapsed((prev) => {
+    updateManuallyCollapsed((prev) => {
       if (!prev.has(key)) return prev;
       const next = new Set(prev);
       next.delete(key);
@@ -384,6 +512,18 @@ export function ProjectTree({
     setDropProject(null);
   }, []);
 
+  useEffect(() => {
+    if (!dragProjectRoot) return;
+    window.addEventListener("dragend", clearProjectDrag);
+    window.addEventListener("drop", clearProjectDrag);
+    window.addEventListener("blur", clearProjectDrag);
+    return () => {
+      window.removeEventListener("dragend", clearProjectDrag);
+      window.removeEventListener("drop", clearProjectDrag);
+      window.removeEventListener("blur", clearProjectDrag);
+    };
+  }, [clearProjectDrag, dragProjectRoot]);
+
   const activeAncestorKeys = useMemo(() => {
     const walk = (nodes: ProjectNode[], ancestors: string[]): string[] | null => {
       for (const node of nodes) {
@@ -423,9 +563,14 @@ export function ProjectTree({
 
     if (node.kind === "topic" || node.kind === "global_topic") {
       const scope = node.kind === "global_topic" ? "global" : "project";
+      const scopeClass = scope === "global" ? " project-tree__topic--global" : " project-tree__topic--project";
+      const accentStyle = projectAccentStyle(node.projectColor, scope === "global" ? "var(--project-tree-global-accent)" : undefined);
       const active = topicIsActive(node, activeScope, activeWorkspaceRoot, activeTopicId);
       const label = (node.label || node.topicId || "Untitled").replace(/^●\s*/, "");
       const meta = topicMetaLine(node, t);
+      const status = topicStatus(node);
+      const statusLabel = topicStatusLabel(node, t);
+      const title = [label, statusLabel, meta].filter(Boolean).join(" · ");
       const topicId = node.topicId ?? "";
       const topicMenuOpen = menuTopic === topicId;
       const openTopicMenu = (event: ReactMouseEvent<HTMLElement> | ReactKeyboardEvent<HTMLElement>) => {
@@ -479,14 +624,14 @@ export function ProjectTree({
       return (
         <div
           key={key}
-          className={`project-tree__topic${active ? " project-tree__topic--active" : ""}${topicMenuOpen ? " project-tree__topic--menu-open" : ""}`}
-          style={projectAccentStyle(node.projectColor)}
+          className={`project-tree__topic${scopeClass}${active ? " project-tree__topic--active" : ""}${node.running ? " project-tree__topic--running" : ""}${status ? ` project-tree__topic--status-${status}` : ""}${topicMenuOpen ? " project-tree__topic--menu-open" : ""}${meta ? " project-tree__topic--has-meta" : ""}`}
+          style={accentStyle}
           onContextMenu={openTopicMenu}
         >
           <button
             type="button"
             className="project-tree__topic-main"
-            title={meta ? `${label} · ${meta}` : label}
+            title={title}
             style={{ paddingLeft: 14 + depth * 16 }}
             onClick={() => onOpenTopic(scope, node.root ?? "", topicId)}
             onKeyDown={(event) => {
@@ -496,7 +641,15 @@ export function ProjectTree({
             }}
           >
             <span className="project-tree__topic-copy">
-              <span className="project-tree__topic-label">{label}</span>
+              <span className="project-tree__topic-heading">
+                <span className="project-tree__topic-label">{label}</span>
+                {statusLabel && <span className={`project-tree__topic-status project-tree__topic-status--${status}`}>{statusLabel}</span>}
+              </span>
+              {meta && (
+                <span className="project-tree__topic-meta">
+                  <span className="project-tree__topic-meta-text">{meta}</span>
+                </span>
+              )}
             </span>
           </button>
           <ContextMenu
@@ -512,43 +665,46 @@ export function ProjectTree({
     }
 
     const scope = node.kind === "global_folder" ? "global" : "project";
+    const scopeClass = scope === "global" ? " project-tree__folder--global" : " project-tree__folder--project";
+    const accentStyle = projectAccentStyle(node.projectColor, scope === "global" ? "var(--project-tree-global-accent)" : undefined);
     const projectRoot = scope === "global" ? "" : node.root ?? "";
+    const projectDragKey = scope === "global" ? GLOBAL_PROJECT_ORDER_KEY : projectRoot;
     const projectPath = node.root ?? "";
     const colorTargetRoot = scope === "global" ? "" : projectPath;
     const projectLabel = node.label || (scope === "global" ? "Global" : "Untitled");
     const projectActive = activeScope === scope && (scope === "global" || activeWorkspaceRoot === node.root);
-    const draggableProject = projectDragEnabled && scope === "project" && depth === 0 && Boolean(projectRoot) && editingProject?.key !== key;
-    const projectDropPosition = dropProject?.root === projectRoot ? dropProject.position : null;
-    const handleProjectDragStart = (event: ReactDragEvent<HTMLDivElement>) => {
+    const draggableProject = projectDragEnabled && depth === 0 && Boolean(projectDragKey) && editingProject?.key !== key;
+    const projectDropPosition = dropProject?.root === projectDragKey ? dropProject.position : null;
+    const handleProjectDragStart = (event: ReactDragEvent<HTMLElement>) => {
       if (!draggableProject) return;
-      const target = event.target as HTMLElement | null;
-      if (target?.closest("button,input,textarea,select")) {
+      const target = event.target;
+      if (target instanceof Element && target.closest(".project-tree__action-slot")) {
         event.preventDefault();
         return;
       }
       event.dataTransfer.effectAllowed = "move";
-      event.dataTransfer.setData("text/plain", projectRoot);
-      setDragProjectRoot(projectRoot);
+      event.dataTransfer.setData("text/plain", projectDragKey);
+      setDragProjectRoot(projectDragKey);
       setDropProject(null);
     };
     const handleProjectDragOver = (event: ReactDragEvent<HTMLDivElement>) => {
-      if (!draggableProject || !dragProjectRoot || dragProjectRoot === projectRoot) return;
+      if (!draggableProject || !dragProjectRoot || dragProjectRoot === projectDragKey) return;
       event.preventDefault();
       event.dataTransfer.dropEffect = "move";
       const rect = event.currentTarget.getBoundingClientRect();
       const position: ProjectDropPosition = event.clientY < rect.top + rect.height / 2 ? "before" : "after";
       setDropProject((current) => {
-        if (current?.root === projectRoot && current.position === position) return current;
-        return { root: projectRoot, position };
+        if (current?.root === projectDragKey && current.position === position) return current;
+        return { root: projectDragKey, position };
       });
     };
     const handleProjectDrop = (event: ReactDragEvent<HTMLDivElement>) => {
       if (!draggableProject) return;
       const draggedRoot = dragProjectRoot || event.dataTransfer.getData("text/plain");
-      const position = dropProject?.root === projectRoot ? dropProject.position : "after";
+      const position = dropProject?.root === projectDragKey ? dropProject.position : "after";
       event.preventDefault();
       clearProjectDrag();
-      if (draggedRoot && draggedRoot !== projectRoot) void commitProjectReorder(draggedRoot, projectRoot, position);
+      if (draggedRoot && draggedRoot !== projectDragKey) void commitProjectReorder(draggedRoot, projectDragKey, position);
     };
     const openProjectMenu = (event: ReactMouseEvent<HTMLElement> | ReactKeyboardEvent<HTMLElement>) => {
       event.preventDefault();
@@ -652,9 +808,11 @@ export function ProjectTree({
               onBlur={() => void commitRenameProject(projectRoot)}
             />
           </div>
-          {isExpanded && hasChildren && (
-            <div className="project-tree__children">
-              {children.map((child) => renderNode(child, depth + 1))}
+          {hasChildren && (
+            <div className={`project-tree__children${isExpanded ? " project-tree__children--expanded" : ""}`}>
+              <div className="project-tree__children-inner">
+                {children.map((child) => renderNode(child, depth + 1))}
+              </div>
             </div>
           )}
         </div>
@@ -664,8 +822,8 @@ export function ProjectTree({
     return (
       <div key={key}>
         <div
-          className={`project-tree__folder${projectActive ? " project-tree__folder--active" : ""}${menuProject?.key === key ? " project-tree__folder--menu-open" : ""}${dragProjectRoot === projectRoot ? " project-tree__folder--dragging" : ""}${projectDropPosition ? ` project-tree__folder--drop-${projectDropPosition}` : ""}`}
-          style={projectAccentStyle(node.projectColor)}
+          className={`project-tree__folder${scopeClass}${draggableProject ? " project-tree__folder--draggable" : ""}${projectActive ? " project-tree__folder--active" : ""}${menuProject?.key === key ? " project-tree__folder--menu-open" : ""}${dragProjectRoot === projectDragKey ? " project-tree__folder--dragging" : ""}${projectDropPosition ? ` project-tree__folder--drop-${projectDropPosition}` : ""}`}
+          style={accentStyle}
           draggable={draggableProject}
           aria-grabbed={draggableProject ? dragProjectRoot === projectRoot : undefined}
           onDragStart={handleProjectDragStart}
@@ -692,7 +850,9 @@ export function ProjectTree({
             aria-expanded={hasChildren ? isExpanded : undefined}
           >
             {hasChildren ? (
-              isExpanded ? <ChevronDown size={12} /> : <ChevronRight size={12} />
+              <span className={`project-tree__chevron${isExpanded ? " project-tree__chevron--open" : ""}`}>
+                <ChevronRight size={12} />
+              </span>
             ) : (
               <span style={{ width: 12 }} />
             )}
@@ -722,9 +882,11 @@ export function ProjectTree({
             onClose={closeMenu}
           />
         </div>
-        {isExpanded && hasChildren && (
-          <div className="project-tree__children">
-            {children.map((child) => renderNode(child, depth + 1))}
+        {hasChildren && (
+          <div className={`project-tree__children${isExpanded ? " project-tree__children--expanded" : ""}`}>
+            <div className="project-tree__children-inner">
+              {children.map((child) => renderNode(child, depth + 1))}
+            </div>
           </div>
         )}
       </div>
@@ -743,20 +905,34 @@ export function ProjectTree({
       </label>
       <div className="project-tree__header">
         <span className="project-tree__header-title">
-          <BriefcaseBusiness size={13} />
+          <BriefcaseBusiness className="project-tree__header-icon" size={13} />
           {t("projectTree.workspaceTitle")}
         </span>
-        <Tooltip label={t("projectTree.addProjectTooltip")} className="project-tree__action-slot">
-          <button
-            type="button"
-            className="project-tree__add-project"
-            aria-label={t("projectTree.addProjectTooltip")}
-            disabled={addingProject}
-            onClick={() => void handleAddProject()}
-          >
-            <FolderPlus size={13} />
-          </button>
-        </Tooltip>
+        <span className="project-tree__header-actions">
+          <Tooltip label={collapseToggleLabel} className="project-tree__action-slot project-tree__header-action-slot project-tree__action-slot--collapse">
+            <button
+              type="button"
+              className={`project-tree__collapse-all${canRestoreCollapsedView ? " project-tree__collapse-all--restore" : ""}`}
+              aria-label={collapseToggleLabel}
+              aria-pressed={canRestoreCollapsedView}
+              disabled={!canToggleCollapsedView}
+              onClick={toggleCollapsedView}
+            >
+              {canRestoreCollapsedView ? <ListRestart size={14} /> : <ListCollapse size={14} />}
+            </button>
+          </Tooltip>
+          <Tooltip label={t("projectTree.addProjectTooltip")} className="project-tree__action-slot project-tree__header-action-slot project-tree__action-slot--add">
+            <button
+              type="button"
+              className="project-tree__add-project"
+              aria-label={t("projectTree.addProjectTooltip")}
+              disabled={addingProject}
+              onClick={() => void handleAddProject()}
+            >
+              <FolderPlus size={14} />
+            </button>
+          </Tooltip>
+        </span>
       </div>
       <div className="project-tree__list">
         {visibleTree.length === 0 ? (
diff --git a/desktop/frontend/src/components/ResizableDrawer.tsx b/desktop/frontend/src/components/ResizableDrawer.tsx
index b8c8ace5f..514438b4d 100644
--- a/desktop/frontend/src/components/ResizableDrawer.tsx
+++ b/desktop/frontend/src/components/ResizableDrawer.tsx
@@ -2,6 +2,7 @@ import { useCallback, useEffect, useMemo, useState } from "react";
 import type { CSSProperties, KeyboardEvent, PointerEvent as ReactPointerEvent, ReactNode } from "react";
 import { useT } from "../lib/i18n";
 import { loadLayoutSize, saveLayoutSize, type LayoutSizeKey } from "../lib/layoutPreferences";
+import { useDeferredClose } from "../lib/useMountTransition";
 
 const DRAWER_DEFAULT_WIDTH = 440;
 const DRAWER_MIN_WIDTH = 360;
@@ -55,6 +56,8 @@ export function ResizableDrawer({
     loadLayoutSize(config.key, config.defaultWidth, (value) => clampDrawerWidth(value, wide)),
   );
   const [resizing, setResizing] = useState(false);
+  // Slide the drawer back out before the parent unmounts it.
+  const { status, requestClose } = useDeferredClose(onClose, 240);
   const effectiveWidth = useMemo(() => clampDrawerWidth(width, wide, viewportWidth), [viewportWidth, wide, width]);
   const style = useMemo(() => ({ "--drawer-width": `${effectiveWidth}px` }) as CSSProperties, [effectiveWidth]);
 
@@ -119,9 +122,10 @@ export function ResizableDrawer({
   );
 
   return (
-    <div className={`drawer-backdrop${subtle ? " drawer-backdrop--subtle" : ""}`} onClick={onClose}>
+    <div className={`drawer-backdrop${subtle ? " drawer-backdrop--subtle" : ""}`} data-state={status} onClick={requestClose}>
       <aside
         className={`drawer${wide ? " drawer--wide" : ""}${resizing ? " drawer--resizing" : ""}`}
+        data-state={status}
         onClick={(e) => e.stopPropagation()}
         style={style}
       >
diff --git a/desktop/frontend/src/components/SettingsPanel.tsx b/desktop/frontend/src/components/SettingsPanel.tsx
index 620155751..5b3a850b5 100644
--- a/desktop/frontend/src/components/SettingsPanel.tsx
+++ b/desktop/frontend/src/components/SettingsPanel.tsx
@@ -1,6 +1,7 @@
 import { useEffect, useMemo, useRef, useState, type ReactNode } from "react";
 import { Check, ChevronDown } from "lucide-react";
 import { asArray } from "../lib/array";
+import { useDeferredClose } from "../lib/useMountTransition";
 import { app } from "../lib/bridge";
 import { normalizeLangPref, useI18n, useT, type DictKey, type LangPref } from "../lib/i18n";
 import { mergedFetchedProviderModels, providerDefaultModel } from "../lib/providerModels";
@@ -8,13 +9,10 @@ import { useUpdater } from "../lib/useUpdater";
 import {
   THEME_STYLES,
   applyTheme,
-  defaultStyleForTheme,
-  getResolvedTheme,
   getTheme,
   getThemeStyle,
   normalizeThemePreference,
   normalizeThemeStyleForTheme,
-  themeForStyle,
   type Theme,
   type ThemeStyle,
 } from "../lib/theme";
@@ -26,6 +24,7 @@ import { Tooltip } from "./Tooltip";
 import { AnchoredPopover } from "./AnchoredPopover";
 import { MCPServersSettingsPage, SkillsSettingsPage } from "./CapabilitiesPanel";
 import { MemorySettingsPage } from "./MemoryPanel";
+import { ModalCloseButton } from "./ModalCloseButton";
 
 const SETTINGS_TABS: SettingsTab[] = ["general", "models", "mcp", "skills", "memory", "permissions", "sandbox", "network", "appearance", "updates"];
 
@@ -42,6 +41,8 @@ export function SettingsPanel({ onClose, onChanged, initialTab }: { onClose: ()
   const [textSize, setTextSizeState] = useState<TextSize>(getTextSize());
   const [fontFamily, setFontFamilyState] = useState<FontFamily>(getFontFamily());
   const [tab, setTab] = useState<SettingsTab>(initialTab === "providers" ? "models" : initialTab ?? "general");
+  // Play the modal exit animation, then let the parent unmount us.
+  const { status, requestClose } = useDeferredClose(onClose, 240);
 
   const reload = async () => setS(normalizeSettingsView(await app.Settings().catch(() => null)));
   useEffect(() => {
@@ -84,11 +85,11 @@ export function SettingsPanel({ onClose, onChanged, initialTab }: { onClose: ()
   // Close on Esc
   useEffect(() => {
     const onKey = (e: KeyboardEvent) => {
-      if (e.key === "Escape" && !document.querySelector("[data-anchored-popover='active']")) onClose();
+      if (e.key === "Escape" && !document.querySelector("[data-anchored-popover='active']")) requestClose();
     };
     document.addEventListener("keydown", onKey);
     return () => document.removeEventListener("keydown", onKey);
-  }, [onClose]);
+  }, [requestClose]);
 
   // The settings-reliant pages (general, models, network, permissions,
   // sandbox, appearance, updates) need SettingsView loaded. MCP, Skills, and Memory
@@ -96,13 +97,11 @@ export function SettingsPanel({ onClose, onChanged, initialTab }: { onClose: ()
   const needsSettings = tab === "general" || tab === "models" || tab === "network" || tab === "permissions" || tab === "sandbox" || tab === "appearance" || tab === "updates";
 
   return (
-    <div className="settings-modal-backdrop" onClick={(e) => { if (e.target === e.currentTarget) onClose(); }}>
-      <div className="settings-modal">
-        <header className="settings-modal__head">
-          <div className="settings-modal__title">{t("settings.title")}</div>
-          <Tooltip label={t("common.close")}>
-            <button className="chip" aria-label={t("common.close")} onClick={onClose}>✕</button>
-          </Tooltip>
+    <div className="management-modal-backdrop settings-modal-backdrop" data-state={status} onClick={(e) => { if (e.target === e.currentTarget) requestClose(); }}>
+      <div className="management-modal settings-modal" data-state={status}>
+        <header className="management-modal__head settings-modal__head">
+          <div className="management-modal__title settings-modal__title">{t("settings.title")}</div>
+          <ModalCloseButton label={t("common.close")} onClick={requestClose} />
         </header>
 
         <div className="settings-center">
@@ -124,34 +123,30 @@ export function SettingsPanel({ onClose, onChanged, initialTab }: { onClose: ()
               <div className="empty">{t("settings.loading")}</div>
             ) : (
               <>
-                {tab === "general" && s && <SettingsPageShell s={s} tab={tab} busy={busy} apply={apply}><GeneralSection s={s} busy={busy} apply={apply} /></SettingsPageShell>}
-                {tab === "models" && s && <SettingsPageShell s={s} tab={tab} busy={busy} apply={apply}><ModelsSection s={s} busy={busy} apply={apply} backgroundApply={backgroundApply} /></SettingsPageShell>}
-                {tab === "mcp" && <SettingsPageShell s={s} tab={tab} busy={false} apply={apply}><MCPServersSettingsPage /></SettingsPageShell>}
-                {tab === "skills" && <SettingsPageShell s={s} tab={tab} busy={false} apply={apply}><SkillsSettingsPage /></SettingsPageShell>}
-                {tab === "memory" && <SettingsPageShell s={s} tab={tab} busy={false} apply={apply}><MemorySettingsPage /></SettingsPageShell>}
-                {tab === "permissions" && s && <SettingsPageShell s={s} tab={tab} busy={busy} apply={apply}><PermissionsSection s={s} busy={busy} apply={apply} /></SettingsPageShell>}
-                {tab === "sandbox" && s && <SettingsPageShell s={s} tab={tab} busy={busy} apply={apply}><SandboxSection s={s} busy={busy} apply={apply} /></SettingsPageShell>}
-                {tab === "network" && s && <SettingsPageShell s={s} tab={tab} busy={busy} apply={apply}><NetworkSection s={s} busy={busy} apply={apply} /></SettingsPageShell>}
+                {tab === "general" && s && <SettingsPageShell key={tab} s={s} tab={tab} busy={busy} apply={apply}><GeneralSection s={s} busy={busy} apply={apply} /></SettingsPageShell>}
+                {tab === "models" && s && <SettingsPageShell key={tab} s={s} tab={tab} busy={busy} apply={apply}><ModelsSection s={s} busy={busy} apply={apply} backgroundApply={backgroundApply} /></SettingsPageShell>}
+                {tab === "mcp" && <SettingsPageShell key={tab} s={s} tab={tab} busy={false} apply={apply}><MCPServersSettingsPage /></SettingsPageShell>}
+                {tab === "skills" && <SettingsPageShell key={tab} s={s} tab={tab} busy={false} apply={apply}><SkillsSettingsPage /></SettingsPageShell>}
+                {tab === "memory" && <SettingsPageShell key={tab} s={s} tab={tab} busy={false} apply={apply}><MemorySettingsPage /></SettingsPageShell>}
+                {tab === "permissions" && s && <SettingsPageShell key={tab} s={s} tab={tab} busy={busy} apply={apply}><PermissionsSection s={s} busy={busy} apply={apply} /></SettingsPageShell>}
+                {tab === "sandbox" && s && <SettingsPageShell key={tab} s={s} tab={tab} busy={busy} apply={apply}><SandboxSection s={s} busy={busy} apply={apply} /></SettingsPageShell>}
+                {tab === "network" && s && <SettingsPageShell key={tab} s={s} tab={tab} busy={busy} apply={apply}><NetworkSection s={s} busy={busy} apply={apply} /></SettingsPageShell>}
                 {tab === "appearance" && s && (
-                  <SettingsPageShell s={s} tab={tab} busy={busy} apply={apply}>
+                  <SettingsPageShell key={tab} s={s} tab={tab} busy={busy} apply={apply}>
                     <AppearanceSection
                       theme={theme}
                       themeStyle={themeStyle}
                       textSize={textSize}
                       fontFamily={fontFamily}
-                      onTheme={(t) => {
-                        const nextStyle = themeForStyle(themeStyle) === getResolvedTheme(t) ? themeStyle : defaultStyleForTheme(t);
-                        applyTheme(t, nextStyle, { persist: false });
-                        setThemeState(t);
-                        setThemeStyleState(nextStyle);
-                        void apply(() => app.SetDesktopAppearance(t, nextStyle));
+                      onTheme={(nextTheme) => {
+                        applyTheme(nextTheme, themeStyle, { persist: false });
+                        setThemeState(nextTheme);
+                        void apply(() => app.SetDesktopAppearance(nextTheme, themeStyle));
                       }}
                       onThemeStyle={(style) => {
-                        const nextTheme = themeForStyle(style);
-                        applyTheme(nextTheme, style, { persist: false });
-                        setThemeState(nextTheme);
+                        applyTheme(theme, style, { persist: false });
                         setThemeStyleState(style);
-                        void apply(() => app.SetDesktopAppearance(nextTheme, style));
+                        void apply(() => app.SetDesktopAppearance(theme, style));
                       }}
                       onTextSize={(size) => {
                         applyTextSize(size);
@@ -164,7 +159,7 @@ export function SettingsPanel({ onClose, onChanged, initialTab }: { onClose: ()
                     />
                   </SettingsPageShell>
                 )}
-                {tab === "updates" && s && <SettingsPageShell s={s} tab={tab} busy={busy} apply={apply}><UpdatesSection configPath={s.configPath} /></SettingsPageShell>}
+                {tab === "updates" && s && <SettingsPageShell key={tab} s={s} tab={tab} busy={busy} apply={apply}><UpdatesSection configPath={s.configPath} /></SettingsPageShell>}
               </>
             )}
           </main>
@@ -432,6 +427,8 @@ function normalizeSettingsView(view: SettingsView | null | undefined): SettingsV
     },
     agent,
     autoPlan: normalizeAutoPlan(view.autoPlan),
+    autoApproveTools: Boolean(view.autoApproveTools ?? view.bypass),
+    bypass: Boolean(view.autoApproveTools ?? view.bypass),
     desktopLanguage: normalizeLangPref(view.desktopLanguage),
     desktopTheme: normalizeThemePreference(view.desktopTheme),
     desktopThemeStyle: normalizeThemeStyleForTheme(view.desktopThemeStyle, normalizeThemePreference(view.desktopTheme)),
@@ -2252,6 +2249,18 @@ function SandboxSection({ s, busy, apply }: SectionProps) {
   );
 }
 
+// Visual-style metadata for the appearance theme cards. The two surface
+// swatches + accent are read from CSS variables at render time so they always
+// reflect the live token values for the currently-resolved light/dark mode.
+const THEME_STYLE_META: Record<ThemeStyle, { name: string; zh: DictKey; note: DictKey; desc: DictKey }> = {
+  graphite: { name: "Graphite", zh: "settings.style.graphite.zh", note: "settings.style.graphite.note", desc: "settings.style.graphite.desc" },
+  aurora: { name: "Aurora", zh: "settings.style.aurora.zh", note: "settings.style.aurora.note", desc: "settings.style.aurora.desc" },
+  slate: { name: "Slate", zh: "settings.style.slate.zh", note: "settings.style.slate.note", desc: "settings.style.slate.desc" },
+  carbon: { name: "Carbon", zh: "settings.style.carbon.zh", note: "settings.style.carbon.note", desc: "settings.style.carbon.desc" },
+  nocturne: { name: "Nocturne", zh: "settings.style.nocturne.zh", note: "settings.style.nocturne.note", desc: "settings.style.nocturne.desc" },
+  amber: { name: "Amber", zh: "settings.style.amber.zh", note: "settings.style.amber.note", desc: "settings.style.amber.desc" },
+};
+
 function AppearanceSection({
   theme,
   themeStyle,
@@ -2289,17 +2298,37 @@ function AppearanceSection({
         </div>
       </SettingsField>
       <SettingsField label={t("settings.themeStyle")} stacked>
-        <div className="theme-style-grid">
-          {THEME_STYLES.map((opt) => (
-            <button
-              key={opt}
-              className={`theme-style-btn${themeStyle === opt ? " theme-style-btn--on" : ""}`}
-              onClick={() => onThemeStyle(opt)}
-            >
-              <span className="theme-style-swatch" data-theme-style-swatch={opt} />
-              <span>{opt}</span>
-            </button>
-          ))}
+        <div className="theme-card-grid">
+          {THEME_STYLES.map((opt) => {
+            const meta = THEME_STYLE_META[opt];
+            const selected = themeStyle === opt;
+            return (
+              <button
+                key={opt}
+                type="button"
+                role="radio"
+                aria-checked={selected}
+                className={`theme-card${selected ? " theme-card--on" : ""}`}
+                onClick={() => onThemeStyle(opt)}
+              >
+                <span className="theme-card__head">
+                  <span className="theme-card__name">
+                    {meta.name} <span className="theme-card__zh">{t(meta.zh)}</span>
+                  </span>
+                  <span className="theme-card__tag">{t(meta.note)}</span>
+                </span>
+                <span className="theme-card__swatches" data-theme-style-card={opt}>
+                  <span className="theme-card__swatch theme-card__swatch--bg" />
+                  <span className="theme-card__swatch theme-card__swatch--surface" />
+                  <span className="theme-card__swatch theme-card__swatch--accent" />
+                </span>
+                <span className="theme-card__desc">{t(meta.desc)}</span>
+                <span className="theme-card__check" aria-hidden="true">
+                  <Check size={13} strokeWidth={3} />
+                </span>
+              </button>
+            );
+          })}
         </div>
       </SettingsField>
       <SettingsField label={t("settings.textSize")}>
diff --git a/desktop/frontend/src/components/StatusBar.tsx b/desktop/frontend/src/components/StatusBar.tsx
index 79448a4ef..cf1e05811 100644
--- a/desktop/frontend/src/components/StatusBar.tsx
+++ b/desktop/frontend/src/components/StatusBar.tsx
@@ -1,43 +1,54 @@
-import { useState } from "react";
+import { useEffect, useRef, useState } from "react";
 import { Tooltip } from "./Tooltip";
 import { useI18n } from "../lib/i18n";
-import type { BalanceInfo, ContextInfo, JobView, Mode, WireUsage } from "../lib/types";
+import { type BalanceInfo, type CollaborationMode, type ContextInfo, type JobView, type ToolApprovalMode, type WireUsage } from "../lib/types";
 
 // JobsChip is the status-bar background-jobs indicator: a count that opens an
 // upward popover listing the running jobs (id · label · status), mirroring the
 // ModelSwitcher's click-to-open pattern. With no jobs it still reserves a stable
-// "jobs 0" slot so the IDE-style status order does not jump.
+// "任务 0" slot so the IDE-style status order does not jump.
 function JobsChip({ jobs }: { jobs: JobView[] }) {
   const { t } = useI18n();
   const [open, setOpen] = useState(false);
+  const wrapRef = useRef<HTMLDivElement>(null);
+  useEffect(() => {
+    if (!open) return;
+    const closeOnOutsideClick = (event: MouseEvent) => {
+      const target = event.target;
+      if (!(target instanceof Node)) return;
+      if (wrapRef.current?.contains(target)) return;
+      setOpen(false);
+    };
+    document.addEventListener("click", closeOnOutsideClick);
+    return () => document.removeEventListener("click", closeOnOutsideClick);
+  }, [open]);
   if (jobs.length === 0) {
     return (
-      <span className="statusbar__item">
-        {t("status.jobsCount", { n: 0 })}
+      <span className="stat stat--jobs">
+        <span className="stat__label">{t("status.jobsLabel")}</span>
+        <b>-</b>
       </span>
     );
   }
   return (
-    <div className="statusbar__jobswrap">
+    <div className="statusbar__jobswrap" ref={wrapRef}>
       <Tooltip label={t("status.jobsTitle")}>
-        <button className="statusbar__item statusbar__jobs" onClick={() => setOpen((v) => !v)}>
-          {t("status.jobsCount", { n: jobs.length })}
+        <button className="stat stat--jobs statusbar__jobs" onClick={() => setOpen((v) => !v)}>
+          <span className="stat__label">{t("status.jobsLabel")}</span>
+          <b>{jobs.length}</b>
         </button>
       </Tooltip>
       {open && (
-        <>
-          <div className="modelsw__backdrop" onClick={() => setOpen(false)} />
-          <div className="modelsw__menu jobsmenu" role="listbox">
-            <div className="jobsmenu__head">{t("status.jobsTitle")}</div>
-            {jobs.map((j) => (
-              <div className="jobsmenu__item" key={j.id} role="option">
-                <span className="jobsmenu__id">{j.id}</span>
-                <span className="jobsmenu__label">{j.label || j.kind}</span>
-                <span className="jobsmenu__status">{j.status}</span>
-              </div>
-            ))}
-          </div>
-        </>
+        <div className="modelsw__menu jobsmenu" role="listbox">
+          <div className="jobsmenu__head">{t("status.jobsTitle")}</div>
+          {jobs.map((j) => (
+            <div className="jobsmenu__item" key={j.id} role="option">
+              <span className="jobsmenu__id">{j.id}</span>
+              <span className="jobsmenu__label">{j.label || j.kind}</span>
+              <span className="jobsmenu__status">{j.status}</span>
+            </div>
+          ))}
+        </div>
       )}
     </div>
   );
@@ -86,18 +97,24 @@ export function StatusBar({
   balance,
   jobs,
   running,
-  mode,
+  collaborationMode,
+  toolApprovalMode,
   cost,
   currency,
+  modelLabel,
+  currentTurnCount,
 }: {
   context: ContextInfo;
   usage?: WireUsage;
   balance?: BalanceInfo;
   jobs?: JobView[];
   running: boolean;
-  mode: Mode;
+  collaborationMode: CollaborationMode;
+  toolApprovalMode: ToolApprovalMode;
   cost?: number;
   currency?: string;
+  modelLabel?: string;
+  currentTurnCount?: number;
 }) {
   const { t } = useI18n();
   const pct = context.window ? Math.min(100, Math.round((context.used / context.window) * 100)) : null;
@@ -106,33 +123,64 @@ export function StatusBar({
   const avgPct = avgRate(usage);
   const jobsList = jobs ?? [];
   const costLabel = formatMoney(cost, currency);
+  const balanceLabel = balance?.available && balance.display ? balance.display : "-";
+  const planMode = collaborationMode === "plan";
+  const goalMode = collaborationMode === "goal";
 
   return (
     <div className="statusbar">
-      <span className={`statusbar__dot ${running ? "statusbar__dot--busy" : ""}`} />
-      <span className="statusbar__item statusbar__ctx">{pct !== null ? t("status.ctx", { pct }) : t("status.ctxUnknown")}</span>
-      <span className="statusbar__sep">·</span>
-      <span className="statusbar__item statusbar__compact">{compactPct !== null ? t("status.compact", { pct: compactPct }) : t("status.compactUnknown")}</span>
-      <span className="statusbar__sep">·</span>
-      <span className="statusbar__item statusbar__cache">{t("status.cache", { pct: nowPct ?? "-" })}</span>
-      <span className="statusbar__sep">·</span>
-      <span className="statusbar__item statusbar__avg">{t("status.cacheAvg", { pct: avgPct ?? "-" })}</span>
-      <span className="statusbar__sep">·</span>
+      <span className="stat stat--model">
+        <span className={`statusbar__dot ${running ? "statusbar__dot--busy" : ""}`} />
+        {modelLabel && <span className="statusbar__model">{modelLabel}</span>}
+      </span>
+      {typeof currentTurnCount === "number" && currentTurnCount > 0 && (
+        <span className="stat statusbar__turns" title={t("status.sessionTurnsTitle")}>
+          <span className="stat__label">{t("status.sessionTurnsLabel")}</span>
+          <b>{t(currentTurnCount === 1 ? "history.turnOne" : "history.turnOther", { n: currentTurnCount })}</b>
+        </span>
+      )}
+      <span className="stat statusbar__ctx">
+        <span className="stat__label">{t("status.ctxLabel")}</span>
+        <b>{pct !== null ? `${pct}%` : "-"}</b>
+      </span>
+      <span className="stat statusbar__compact">
+        <span className="stat__label">{t("status.compactLabel")}</span>
+        <b>{compactPct !== null ? `${compactPct}%` : "-"}</b>
+      </span>
+      <span className="stat statusbar__cache">
+        <span className="stat__label">{t("status.cacheLabel")}</span>
+        <b>{nowPct !== null ? `${nowPct}%` : "-"}</b>
+      </span>
+      <span className="stat statusbar__avg">
+        <span className="stat__label">{t("status.cacheAvgLabel")}</span>
+        <b>{avgPct !== null ? `${avgPct}%` : "-"}</b>
+      </span>
+      <span className="statusbar__spacer" />
+      <JobsChip jobs={jobsList} />
       <Tooltip label={t("status.spendTitle")}>
-        <span className="statusbar__item statusbar__cost">
-          {t("status.cost", { amount: costLabel })}
+        <span className="stat statusbar__cost">
+          <span className="stat__label">{t("status.costLabel")}</span>
+          <b>{costLabel}</b>
         </span>
       </Tooltip>
-      <span className="statusbar__sep">·</span>
-      <JobsChip jobs={jobsList} />
-      <span className="statusbar__sep">·</span>
       <Tooltip label={t("status.balanceTitle")}>
-        <span className="statusbar__item statusbar__balance">
-          {t("status.balance", { amount: balance?.available && balance.display ? balance.display : "-" })}
+        <span className="stat stat--balance statusbar__balance">
+          <span className="stat__label">{t("status.balanceLabel")}</span>
+          <b>{balanceLabel}</b>
         </span>
       </Tooltip>
-      <span className="statusbar__spacer" />
-      {mode === "plan" && <span className="statusbar__plan">{t("status.plan")}</span>}
+      {planMode && <span className="statusbar__plan">{t("status.plan")}</span>}
+      {goalMode && <span className="statusbar__plan">{t("composer.goalMode")}</span>}
+      {toolApprovalMode === "auto" && (
+        <Tooltip label={t("composer.accessAutoTitle")}>
+          <span className="statusbar__yolo">{t("composer.accessAuto")}</span>
+        </Tooltip>
+      )}
+      {toolApprovalMode === "yolo" && (
+        <Tooltip label={t("status.yoloTitle")}>
+          <span className="statusbar__yolo">{t("composer.accessYolo")}</span>
+        </Tooltip>
+      )}
     </div>
   );
 }
diff --git a/desktop/frontend/src/components/StreamingIndicator.tsx b/desktop/frontend/src/components/StreamingIndicator.tsx
deleted file mode 100644
index 73e3390b1..000000000
--- a/desktop/frontend/src/components/StreamingIndicator.tsx
+++ /dev/null
@@ -1,93 +0,0 @@
-import { useEffect, useState } from "react";
-import { Loader2, AlertCircle, RotateCcw } from "lucide-react";
-
-// StreamingIndicator is the small "thinking / stalled / error" affordance
-// shown beneath an in-flight assistant bubble. It's a state machine driven
-// by the streaming prop on the message plus a wall-clock timer that
-// escalates to "stalled" when no new chunk has arrived in 6 seconds.
-//
-//   preparing   — turn started, no text yet (a model warm-up pause)
-//   streaming   — text deltas arrived within the stall window
-//   stalled     — no deltas for >6s while still streaming (model is
-//                 thinking, network is slow, or the request dropped)
-//   error       — turn ended with `e.err` (Message already renders the
-//                 error notice, this is just a small retry hint)
-//
-// The indicator is purely visual — it doesn't talk to the controller. The
-// parent (Message) re-renders on every controller dispatch, so the timer
-// is reset implicitly when item.text grows. We track the last text length
-// we saw and the timestamp; a re-render with a longer text resets both.
-//
-// The Retry button is rendered in the `error` state only and is a no-op
-// stub — wiring the actual retry requires a controller-level re-submit
-// of the previous turn, which is a separate concern. The button is
-// there to signal the affordance; the controller integration is a
-// follow-up that adds a ResumeFrom(offset) binding.
-export type StreamingPhase = "preparing" | "streaming" | "stalled" | "error";
-
-export function StreamingIndicator({
-  text,
-  streaming,
-  errored,
-  onRetry,
-}: {
-  text: string;
-  streaming: boolean;
-  errored: boolean;
-  onRetry?: () => void;
-}) {
-  // lastLen / lastTick are the "I saw progress recently" markers. A render
-  // where the text grew (lastLen < text.length) updates lastTick to now.
-  // The stalled check is "now - lastTick > STALL_MS".
-  const [lastLen, setLastLen] = useState(text.length);
-  const [lastTick, setLastTick] = useState(() => Date.now());
-  const [, force] = useState(0); // re-render trigger for the stall timer
-
-  useEffect(() => {
-    if (text.length > lastLen) {
-      setLastLen(text.length);
-      setLastTick(Date.now());
-    }
-  }, [text.length, lastLen]);
-
-  // Heartbeat re-render: once per second while we're streaming, the
-  // indicator re-evaluates stalled vs streaming. We don't use setInterval
-  // (it drifts and survives unmount); a 1Hz setTimeout chain self-cancels
-  // on unmount and on the streaming prop flipping false.
-  useEffect(() => {
-    if (!streaming) return;
-    const id = setTimeout(() => force((n) => n + 1), 1000);
-    return () => clearTimeout(id);
-  }, [streaming, lastTick, lastLen, text.length]);
-
-  if (errored) {
-    return (
-      <div className="streaming-indicator streaming-indicator--error" role="status">
-        <AlertCircle size={11} />
-        <span>Turn ended with an error</span>
-        {onRetry && (
-          <button type="button" className="streaming-indicator__retry" onClick={onRetry}>
-            <RotateCcw size={11} />
-            <span>Retry</span>
-          </button>
-        )}
-      </div>
-    );
-  }
-  if (!streaming) return null;
-
-  const sinceTick = Date.now() - lastTick;
-  const phase: StreamingPhase = text.length === 0 ? "preparing" : sinceTick > 6000 ? "stalled" : "streaming";
-  return (
-    <div className={`streaming-indicator streaming-indicator--${phase}`} role="status" aria-live="polite">
-      <Loader2 size={11} className="streaming-indicator__spin" />
-      <span>
-        {phase === "preparing"
-          ? "Preparing…"
-          : phase === "stalled"
-            ? "Still working… (no new tokens in a moment)"
-            : "Streaming…"}
-      </span>
-    </div>
-  );
-}
diff --git a/desktop/frontend/src/components/TabBar.tsx b/desktop/frontend/src/components/TabBar.tsx
index 2592d4638..46f76b816 100644
--- a/desktop/frontend/src/components/TabBar.tsx
+++ b/desktop/frontend/src/components/TabBar.tsx
@@ -2,8 +2,8 @@
 // open project/global topic, so switching tabs switches the active conversation.
 import { useEffect, useRef, useState } from "react";
 import type { CSSProperties, DragEvent, KeyboardEvent as ReactKeyboardEvent, MouseEvent as ReactMouseEvent } from "react";
-import { FileText, Plus, X } from "lucide-react";
-import type { TabMeta } from "../lib/types";
+import { FileText, Plus, Search, X } from "lucide-react";
+import { normalizeCollaborationMode, normalizeMode, normalizeToolApprovalMode, type Mode, type TabMeta } from "../lib/types";
 import { projectColorValue } from "../lib/projectColors";
 import { useT } from "../lib/i18n";
 import { Tooltip } from "./Tooltip";
@@ -17,6 +17,8 @@ interface TabBarProps {
   onTabsClose: (tabIds: string[], nextActiveTabId?: string) => void;
   onTabsReorder: (tabIds: string[]) => void;
   onNewTab: () => void;
+  onOpenPalette?: () => void;
+  commandCompact?: boolean;
   revealActiveSignal?: number;
 }
 
@@ -40,8 +42,8 @@ function tabFullTitle(tab: TabMeta): string {
   return `${workspaceName} / ${tabDisplayTitle(tab)}`;
 }
 
-function tabMode(tab: TabMeta): "normal" | "plan" | "yolo" {
-  return tab.mode === "plan" || tab.mode === "yolo" ? tab.mode : "normal";
+function tabMode(tab: TabMeta): Mode {
+  return normalizeMode(tab.mode);
 }
 
 function projectAccentStyle(color?: string): CSSProperties | undefined {
@@ -50,7 +52,7 @@ function projectAccentStyle(color?: string): CSSProperties | undefined {
   return { "--project-accent": value } as CSSProperties;
 }
 
-export function TabBar({ tabs, activeTabId, onTabChange, onTabClose, onTabsClose, onTabsReorder, onNewTab, revealActiveSignal = 0 }: TabBarProps) {
+export function TabBar({ tabs, activeTabId, onTabChange, onTabClose, onTabsClose, onTabsReorder, onNewTab, onOpenPalette, commandCompact = false, revealActiveSignal = 0 }: TabBarProps) {
   const t = useT();
   const [draggingTabId, setDraggingTabId] = useState<string | null>(null);
   const [dropTarget, setDropTarget] = useState<{ id: string; side: DropSide } | null>(null);
@@ -187,9 +189,16 @@ export function TabBar({ tabs, activeTabId, onTabChange, onTabClose, onTabsClose
           const displayTitle = tabDisplayTitle(tab);
           const fullTitle = tabFullTitle(tab);
           const mode = tabMode(tab);
+          const collaborationMode = normalizeCollaborationMode(tab.collaborationMode, tab.goal, mode);
+          const planMode = collaborationMode === "plan";
+          const goalMode = collaborationMode === "goal";
+          const toolApprovalMode = normalizeToolApprovalMode(tab.toolApprovalMode, mode);
           const stateTitle = [
             tab.running ? "Running" : "",
-            mode === "yolo" ? "YOLO" : mode === "plan" ? "Plan" : "",
+            planMode ? "Plan" : "",
+            goalMode ? "Goal" : "",
+            toolApprovalMode === "auto" ? "Auto approve" : "",
+            toolApprovalMode === "yolo" ? "YOLO approval" : "",
           ].filter(Boolean).join(" · ");
           const annotatedTitle = stateTitle ? `${stateTitle} · ${fullTitle}` : fullTitle;
           return (
@@ -206,7 +215,8 @@ export function TabBar({ tabs, activeTabId, onTabChange, onTabClose, onTabsClose
               className={[
                 "tabbar__tab",
                 tab.id === resolvedActiveTabId ? "tabbar__tab--active" : "",
-                mode === "yolo" ? "tabbar__tab--yolo" : "",
+                tab.running ? "tabbar__tab--running" : "",
+                toolApprovalMode === "yolo" ? "tabbar__tab--yolo" : "",
                 draggingTabId === tab.id ? "tabbar__tab--dragging" : "",
                 dropTarget?.id === tab.id ? `tabbar__tab--drop-${dropTarget.side}` : "",
               ].filter(Boolean).join(" ")}
@@ -236,7 +246,10 @@ export function TabBar({ tabs, activeTabId, onTabChange, onTabClose, onTabsClose
                 />
               )}
               <span className="tabbar__tab-label">{displayTitle}</span>
-              {mode === "yolo" && <span className="tabbar__mode-badge tabbar__mode-badge--yolo">yolo</span>}
+              {planMode && <span className="tabbar__mode-badge tabbar__mode-badge--plan">plan</span>}
+              {goalMode && <span className="tabbar__mode-badge tabbar__mode-badge--plan">goal</span>}
+              {toolApprovalMode === "auto" && <span className="tabbar__mode-badge tabbar__mode-badge--plan">auto</span>}
+              {toolApprovalMode === "yolo" && <span className="tabbar__mode-badge tabbar__mode-badge--yolo">yolo</span>}
               <span
                 className="tabbar__tab-close"
                 onClick={(e) => {
@@ -255,6 +268,20 @@ export function TabBar({ tabs, activeTabId, onTabChange, onTabClose, onTabsClose
           <Plus size={13} />
         </button>
       </Tooltip>
+      {onOpenPalette && <span className="tabbar__spacer" aria-hidden="true" />}
+      {onOpenPalette && (
+        <button
+          className={["tabbar__command", commandCompact ? "tabbar__command--compact" : ""].filter(Boolean).join(" ")}
+          type="button"
+          onClick={onOpenPalette}
+          aria-label={t("palette.placeholder")}
+        >
+          <Search size={13} className="tabbar__command-icon" />
+          <span className="tabbar__command-text tabbar__command-text--full">{t("tabBar.commandSearch")}</span>
+          <span className="tabbar__command-text tabbar__command-text--compact">{t("tabBar.commandSearchCompact")}</span>
+          <kbd className="tabbar__command-kbd">⌘K</kbd>
+        </button>
+      )}
       <ContextMenu
         open={Boolean(menuTabId)}
         point={menuPoint}
diff --git a/desktop/frontend/src/components/ToolCard.tsx b/desktop/frontend/src/components/ToolCard.tsx
index 756f1581b..83776820b 100644
--- a/desktop/frontend/src/components/ToolCard.tsx
+++ b/desktop/frontend/src/components/ToolCard.tsx
@@ -1,7 +1,7 @@
 import { memo, useEffect, useState } from "react";
 import { CodeViewer } from "./CodeViewer";
 import { DiffView } from "./DiffView";
-import { ProcessCard, ProcessStatusIcon, ProcessToolIcon, type ProcessState, type ProcessTone } from "./ProcessCard";
+import { ProcessCard, ProcessStatusIcon, type ProcessState, type ProcessTone } from "./ProcessCard";
 import { useT } from "../lib/i18n";
 import { diffsFor, subjectOf, summarize } from "../lib/tools";
 import { useShellExpand } from "../lib/shellExpand";
@@ -109,7 +109,7 @@ export const ToolCard = memo(function ToolCard({ item, subcalls }: { item: ToolI
   return (
     <ProcessCard
       tone={processTone(item.status)}
-      icon={<ProcessToolIcon size={12} />}
+      icon={<ProcessStatusIcon state={processState(item.status)} label={item.status} />}
       kind="tool"
       name={
         <>
@@ -120,7 +120,6 @@ export const ToolCard = memo(function ToolCard({ item, subcalls }: { item: ToolI
       }
       meta={
         <>
-          <ProcessStatusIcon state={processState(item.status)} label={item.status} />
           {duration && <span className="tool__duration">{duration}</span>}
         </>
       }
diff --git a/desktop/frontend/src/components/Tooltip.tsx b/desktop/frontend/src/components/Tooltip.tsx
index 325952a93..33ce6ff70 100644
--- a/desktop/frontend/src/components/Tooltip.tsx
+++ b/desktop/frontend/src/components/Tooltip.tsx
@@ -20,6 +20,19 @@ function oppositeSide(side: TooltipSide): TooltipSide {
   return "left";
 }
 
+function samePosition(
+  current: { left: number; top: number; side: TooltipSide; arrowX: number; arrowY: number },
+  next: { left: number; top: number; side: TooltipSide; arrowX: number; arrowY: number },
+): boolean {
+  return (
+    current.side === next.side &&
+    Math.abs(current.left - next.left) < 0.5 &&
+    Math.abs(current.top - next.top) < 0.5 &&
+    Math.abs(current.arrowX - next.arrowX) < 0.5 &&
+    Math.abs(current.arrowY - next.arrowY) < 0.5
+  );
+}
+
 export function Tooltip({
   label,
   children,
@@ -101,13 +114,14 @@ export function Tooltip({
     const arrowX = clamp(rect.left + rect.width / 2 - left, ARROW_PAD, tipRect.width - ARROW_PAD);
     const arrowY = clamp(rect.top + rect.height / 2 - top, ARROW_PAD, tipRect.height - ARROW_PAD);
 
-    setPosition({
+    const next = {
       left,
       top,
       side: actualSide,
       arrowX,
       arrowY,
-    });
+    };
+    setPosition((current) => (samePosition(current, next) ? current : next));
   };
 
   useLayoutEffect(() => {
diff --git a/desktop/frontend/src/components/Welcome.tsx b/desktop/frontend/src/components/Welcome.tsx
index 3f99ca716..a26fae3d7 100644
--- a/desktop/frontend/src/components/Welcome.tsx
+++ b/desktop/frontend/src/components/Welcome.tsx
@@ -1,16 +1,19 @@
 import logoWordmark from "../assets/logo-wordmark.svg";
 import { useT } from "../lib/i18n";
 
-// Welcome is the empty-state landing: brand, a one-liner, the input affordances
+// Welcome is the empty-state landing: a one-liner, the input affordances
 // (/ commands, @ files, Enter), and a few clickable example prompts that send
 // immediately so a first turn is one click away.
 
 export function Welcome({ onPrompt }: { onPrompt: (text: string) => void }) {
   const t = useT();
-  const examples = [t("welcome.ex1"), t("welcome.ex2"), t("welcome.ex3")];
+  const examples = [t("welcome.ex1"), t("welcome.ex2"), t("welcome.ex3"), t("welcome.ex4")];
   return (
-    <div className="welcome">
-      <img src={logoWordmark} className="welcome__logo" alt="Reasonix" draggable={false} />
+    <div className="welcome welcome--brand">
+      <span className="welcome__brand">
+        <img src={logoWordmark} className="welcome__brand-logo" alt="Reasonix" draggable={false} />
+      </span>
+      <h2 className="welcome__title">{t("welcome.title")}</h2>
       <div className="welcome__tag">{t("welcome.tagline")}</div>
 
       <div className="welcome__hints">
diff --git a/desktop/frontend/src/components/WorkspacePanel.tsx b/desktop/frontend/src/components/WorkspacePanel.tsx
index e9a8c2e67..7da435203 100644
--- a/desktop/frontend/src/components/WorkspacePanel.tsx
+++ b/desktop/frontend/src/components/WorkspacePanel.tsx
@@ -34,11 +34,11 @@ import { Markdown } from "./Markdown";
 import { Tooltip } from "./Tooltip";
 import { AnchoredPopover } from "./AnchoredPopover";
 
-const WORKSPACE_TREE_MIN_WIDTH = 208;
-const WORKSPACE_TREE_DEFAULT_WIDTH = 240;
+const WORKSPACE_TREE_MIN_WIDTH = 300;
+const WORKSPACE_TREE_DEFAULT_WIDTH = 300;
 const WORKSPACE_TREE_MAX_WIDTH = 340;
 const WORKSPACE_PREVIEW_MIN_WIDTH = 360;
-const WORKSPACE_PREVIEW_TARGET_WIDTH = 480;
+const WORKSPACE_PREVIEW_TARGET_WIDTH = 360;
 const WORKSPACE_DUAL_PANEL_MIN_WIDTH = WORKSPACE_TREE_MIN_WIDTH + WORKSPACE_PREVIEW_MIN_WIDTH;
 const WORKSPACE_DUAL_PANEL_TARGET_WIDTH = WORKSPACE_TREE_DEFAULT_WIDTH + WORKSPACE_PREVIEW_TARGET_WIDTH;
 const WORKSPACE_CONTEXT_MENU_FILE_HEIGHT = 92;
@@ -224,6 +224,7 @@ export function WorkspacePanel({
   const [treeWidth, setTreeWidth] = useState(loadWorkspaceTreeWidth);
   const [treeResizing, setTreeResizing] = useState(false);
   const [recentOpen, setRecentOpen] = useState(false);
+  const lastPreviewModeActiveRef = useRef<boolean | null>(null);
   const recentAnchorRef = useRef<HTMLButtonElement>(null);
   const openDirsRef = useRef(openDirs);
 
@@ -249,8 +250,12 @@ export function WorkspacePanel({
   }, [selectedPath]);
 
   const toggleCommit = useCallback((hash: string) => {
-    setExpandedCommit((prev) => (prev === hash ? null : hash));
-  }, []);
+    setExpandedCommit((prev) => {
+      const next = prev === hash ? null : hash;
+      if (next) onRequestPanelWidth?.(WORKSPACE_DUAL_PANEL_TARGET_WIDTH);
+      return next;
+    });
+  }, [onRequestPanelWidth]);
 
   useEffect(() => {
     if (!open) return;
@@ -311,10 +316,19 @@ export function WorkspacePanel({
   useEffect(() => {
     if (!open) return;
     setViewMode(initialViewMode);
+    setExpandedCommit(null);
+    setCommitDetail(null);
+    setSelectionMenu(null);
+    setTreeMenu(null);
+    setRecentOpen(false);
     if (initialViewMode === "changed") {
-      void loadGitHistory();
+      setSelectedPath(null);
+      setOpenTabs([]);
+      setPreview(null);
+      return;
     }
-  }, [initialViewMode, loadGitHistory, open]);
+    setTreeVisible(true);
+  }, [initialViewMode, open]);
 
   useEffect(() => {
     if (!open) return;
@@ -433,8 +447,11 @@ export function WorkspacePanel({
 
   const breadcrumbDirs = selectedPath ? parentDirs(selectedPath) : [""];
   const pathParts = selectedPath?.split("/").filter(Boolean) ?? [];
+  const changedMode = viewMode === "changed";
   const currentFileName = selectedPath ? basename(selectedPath) : t("workspace.noFile");
   const currentFileDir = selectedPath ? parentPath(selectedPath) : "";
+  const previewTitle = changedMode && !selectedPath ? t("workspace.changedTab") : currentFileName;
+  const previewSubtitle = changedMode && !selectedPath ? shortCwd(cwd) || t("workspace.title") : currentFileDir;
   const recentFiles = useMemo(() => [...openTabs].reverse(), [openTabs]);
   const flattened = useMemo(() => {
     const rows: { path: string; entry: DirEntry }[] = [];
@@ -453,14 +470,17 @@ export function WorkspacePanel({
   const searchPlaceholder = t("workspace.filter");
 
   const effectiveTreeWidth = useMemo(() => clampWorkspaceTreeWidth(treeWidth, panelWidth), [panelWidth, treeWidth]);
-  const previewVisible = viewMode === "changed" || openTabs.length > 0 || selectedPath !== null;
+  const filePreviewActive = openTabs.length > 0 || selectedPath !== null;
+  const changeDetailActive = changedMode && expandedCommit !== null;
+  const previewVisible = changedMode || filePreviewActive;
   const selectedFileVisible = selectedPath !== null;
   const compactTreeSplit =
     treeVisible && selectedFileVisible && panelWidth !== undefined && panelWidth < WORKSPACE_DUAL_PANEL_MIN_WIDTH;
-  const actualTreeVisible = treeVisible;
-  const previewModeActive = open && previewVisible;
+  const actualTreeVisible = changedMode ? false : treeVisible;
+  const showTreeRail = previewVisible && !actualTreeVisible && !changedMode;
+  const previewModeActive = open && (filePreviewActive || changeDetailActive);
   const embeddedDockMode = !showViewTabs;
-  const showFileTools = showViewTabs || previewVisible;
+  const showFileTools = showViewTabs || filePreviewActive;
 
   const panelStyle = useMemo(
     () =>
@@ -472,6 +492,8 @@ export function WorkspacePanel({
   );
 
   useEffect(() => {
+    if (lastPreviewModeActiveRef.current === previewModeActive) return;
+    lastPreviewModeActiveRef.current = previewModeActive;
     onPreviewModeChange?.(previewModeActive);
   }, [onPreviewModeChange, previewModeActive]);
 
@@ -680,19 +702,23 @@ export function WorkspacePanel({
   return (
     <aside
       ref={panelRef}
-      className={`workspace-panel${embeddedDockMode ? " workspace-panel--embedded" : ""}${previewVisible && actualTreeVisible ? " workspace-panel--split-preview" : ""}${compactTreeSplit ? " workspace-panel--compact-split" : ""}${actualTreeVisible ? "" : " workspace-panel--tree-hidden"}${previewVisible ? "" : " workspace-panel--preview-hidden"}${treeResizing ? " workspace-panel--tree-resizing" : ""}`}
+      className={`workspace-panel${embeddedDockMode ? " workspace-panel--embedded" : ""}${changedMode ? " workspace-panel--detail-only" : ""}${previewVisible && actualTreeVisible ? " workspace-panel--split-preview" : ""}${compactTreeSplit ? " workspace-panel--compact-split" : ""}${actualTreeVisible ? "" : " workspace-panel--tree-hidden"}${previewVisible ? "" : " workspace-panel--preview-hidden"}${treeResizing ? " workspace-panel--tree-resizing" : ""}`}
       aria-label={t("workspace.title")}
       style={panelStyle}
     >
       {previewVisible && <section className="workspace-preview">
         <header className="workspace-preview__head">
           <div className="workspace-current-file" aria-label={t("workspace.currentFile")}>
-            <FileText size={15} className="workspace-current-file__icon" />
+            {changedMode && !selectedPath ? (
+              <GitBranch size={15} className="workspace-current-file__icon" />
+            ) : (
+              <FileText size={15} className="workspace-current-file__icon" />
+            )}
             <div className="workspace-current-file__text">
               <Tooltip label={selectedPath ?? undefined}>
-                <span className="workspace-current-file__name">{currentFileName}</span>
+                <span className="workspace-current-file__name">{previewTitle}</span>
               </Tooltip>
-              {currentFileDir && <span className="workspace-current-file__path">{currentFileDir}</span>}
+              {previewSubtitle && <span className="workspace-current-file__path">{previewSubtitle}</span>}
             </div>
             <Tooltip label={t("workspace.recentFiles")}>
               <button
@@ -926,7 +952,7 @@ export function WorkspacePanel({
         </div>
       </section>}
 
-      {previewVisible && !actualTreeVisible && (
+      {showTreeRail && (
         <section className="workspace-tree-rail" aria-label={t("workspace.showTree")}>
           <Tooltip label={t("workspace.showTree")} side="right">
             <button
diff --git a/desktop/frontend/src/lib/bridge.ts b/desktop/frontend/src/lib/bridge.ts
index b1964dc1f..7a109da2e 100644
--- a/desktop/frontend/src/lib/bridge.ts
+++ b/desktop/frontend/src/lib/bridge.ts
@@ -8,6 +8,7 @@
 import type * as GeneratedApp from "../../wailsjs/go/main/App";
 
 import { t } from "./i18n";
+import { modeWithAutoApproveTools, modeWithPlan, normalizeCollaborationMode, normalizeMode, normalizeToolApprovalMode } from "./types";
 
 import type {
   BalanceInfo,
@@ -47,6 +48,8 @@ import type {
   WorkspaceView,
 } from "./types";
 
+const GLOBAL_PROJECT_ORDER_KEY = "__global__";
+
 // AppBindings is derived from the Wails-generated Go → TS method signatures, so
 // the compiler catches drift between the Go binding surface and the frontend mock.
 // Run `wails generate module` after adding/renaming a bound method on App, then
@@ -96,6 +99,15 @@ export interface AppBindings {
   SetPlanMode(on: boolean): Promise<void>;
   SetMode(mode: string): Promise<void>;
   SetModeForTab(tabID: string, mode: string): Promise<void>;
+  SetAutoApproveTools(on: boolean): Promise<void>;
+  SetCollaborationMode(mode: string): Promise<void>;
+  SetCollaborationModeForTab(tabID: string, mode: string): Promise<void>;
+  SetToolApprovalMode(mode: string): Promise<void>;
+  SetToolApprovalModeForTab(tabID: string, mode: string): Promise<void>;
+  SetGoal(goal: string): Promise<void>;
+  SetGoalForTab(tabID: string, goal: string): Promise<void>;
+  ClearGoal(): Promise<void>;
+  ClearGoalForTab(tabID: string): Promise<void>;
   Compact(): Promise<void>;
   NewSession(): Promise<void>;
   History(): Promise<HistoryMessage[]>;
@@ -193,8 +205,9 @@ export interface AppBindings {
   MigrateDesktopPreferences(language: string, theme: string, style: string): Promise<void>;
   SetAgentParams(temperature: number, maxSteps: number, plannerMaxSteps: number, systemPrompt: string): Promise<void>;
   SetTrayLocale(locale: "en" | "zh"): Promise<void>;
-  // SetBypass toggles YOLO mode (auto-approve every tool call this session; deny
-  // rules still apply). Runtime-only — not written to config.
+  // SetBypass is the legacy Wails name for YOLO/full-access tool auto-approval
+  // (ask questions and plan approvals still wait; deny rules still apply).
+  // Runtime-only.
   SetBypass(on: boolean): Promise<void>;
   Version(): Promise<string>;
   CheckUpdate(): Promise<UpdateInfo | null>;
@@ -366,6 +379,7 @@ export function openExternal(url: string): void {
 // --- browser dev mock --------------------------------------------------------
 
 const listeners = new Set<(e: WireEvent) => void>();
+let mockScopedTabId: string | undefined;
 
 function mockSubscribe(cb: (e: WireEvent) => void): () => void {
   listeners.add(cb);
@@ -375,7 +389,18 @@ function mockSubscribe(cb: (e: WireEvent) => void): () => void {
 }
 
 function emit(e: WireEvent) {
-  listeners.forEach((l) => l(e));
+  const event = mockScopedTabId && !e.tabId ? { ...e, tabId: mockScopedTabId } : e;
+  listeners.forEach((l) => l(event));
+}
+
+async function withMockTabScope<T>(tabId: string, fn: () => Promise<T>): Promise<T> {
+  const previous = mockScopedTabId;
+  mockScopedTabId = tabId || previous;
+  try {
+    return await fn();
+  } finally {
+    mockScopedTabId = previous;
+  }
 }
 
 // Updater progress has its own listener set so the browser dev mock's ApplyUpdate
@@ -400,14 +425,18 @@ function browserPlatformOverride(): "darwin" | "windows" | "linux" | "" {
   return value === "darwin" || value === "windows" || value === "linux" ? value : "";
 }
 
-function mockScenario(): "demo" | "fresh" {
+function mockScenario(): "demo" | "fresh" | "running" {
   if (typeof window === "undefined") return "demo";
   const value = new URLSearchParams(window.location.search).get("mock")?.trim().toLowerCase();
-  return value === "fresh" || value === "empty" || value === "first-run" ? "fresh" : "demo";
+  if (value === "fresh" || value === "empty" || value === "first-run") return "fresh";
+  if (value === "running" || value === "busy" || value === "streaming") return "running";
+  return "demo";
 }
 
 function makeMockApp(): AppBindings {
-  const freshMock = mockScenario() === "fresh";
+  const scenario = mockScenario();
+  const freshMock = scenario === "fresh";
+  const runningMock = scenario === "running";
   let cancelled = false;
   let pendingAskPreview = false;
   let pendingApprovalPreview = false;
@@ -595,11 +624,12 @@ function makeMockApp(): AppBindings {
     },
     agent: { temperature: 0.2, maxSteps: 0, plannerMaxSteps: 12, systemPrompt: "You are Reasonix, a coding agent." },
     desktopLanguage: "",
-    desktopTheme: "dark",
+    desktopTheme: "light",
     desktopThemeStyle: "graphite",
     closeBehavior: "background",
     configPath: "~/projects/reasonix/reasonix.toml",
     providerKinds: ["openai"],
+    autoApproveTools: false,
     bypass: false,
   };
   settings.providers = settings.providers.map((provider) =>
@@ -608,6 +638,7 @@ function makeMockApp(): AppBindings {
   if (freshMock) {
     settings.configPath = "~/.config/reasonix/config.toml";
   }
+  const mockNow = Date.now();
   const mockProjectTree: ProjectNode[] = freshMock ? [] : [
     {
       key: "project_~/projects/joyquant-db",
@@ -616,9 +647,9 @@ function makeMockApp(): AppBindings {
       root: "~/projects/joyquant-db",
       projectColor: "blue",
       children: [
-        { key: "topic_dev_standard", kind: "topic", label: `● ${t("mock.topicDevStandard")}`, root: "~/projects/joyquant-db", topicId: "topic_dev_standard", projectColor: "blue" },
-        { key: "topic_db_maint", kind: "topic", label: t("mock.topicDbMaint"), root: "~/projects/joyquant-db", topicId: "topic_db_maint", projectColor: "blue" },
-        { key: "topic_env", kind: "topic", label: t("mock.topicEnv"), root: "~/projects/joyquant-db", topicId: "topic_env", projectColor: "blue" },
+        { key: "topic_dev_standard", kind: "topic", label: `● ${t("mock.topicDevStandard")}`, root: "~/projects/joyquant-db", topicId: "topic_dev_standard", projectColor: "blue", turns: 18, lastActivityAt: mockNow - 8 * 60_000, open: true, running: runningMock },
+        { key: "topic_db_maint", kind: "topic", label: t("mock.topicDbMaint"), root: "~/projects/joyquant-db", topicId: "topic_db_maint", projectColor: "blue", turns: 7, lastActivityAt: mockNow - 2 * 60 * 60_000 },
+        { key: "topic_env", kind: "topic", label: t("mock.topicEnv"), root: "~/projects/joyquant-db", topicId: "topic_env", projectColor: "blue", turns: 3, lastActivityAt: mockNow - 26 * 60 * 60_000 },
       ],
     },
     {
@@ -628,11 +659,12 @@ function makeMockApp(): AppBindings {
       root: "~/projects/joyquant-sys",
       projectColor: "purple",
       children: [
-        { key: "topic_p3b_pd", kind: "topic", label: `● ${t("mock.topicP3b")}`, root: "~/projects/joyquant-sys", topicId: "topic_p3b_pd", projectColor: "purple" },
-        { key: "topic_p3a_pd", kind: "topic", label: t("mock.topicP3a"), root: "~/projects/joyquant-sys", topicId: "topic_p3a_pd", projectColor: "purple" },
-        { key: "topic_hotfix", kind: "topic", label: t("mock.topicHotfix"), root: "~/projects/joyquant-sys", topicId: "topic_hotfix", projectColor: "purple" },
-        { key: "topic_sys_coord", kind: "topic", label: t("mock.topicSysCoord"), root: "~/projects/joyquant-sys", topicId: "topic_sys_coord", projectColor: "purple" },
-        { key: "topic_sys_standard", kind: "topic", label: t("mock.topicSysStandard"), root: "~/projects/joyquant-sys", topicId: "topic_sys_standard", projectColor: "purple" },
+        { key: "topic_p3b_pd", kind: "topic", label: `● ${t("mock.topicP3b")}`, root: "~/projects/joyquant-sys", topicId: "topic_p3b_pd", projectColor: "purple", turns: 11, lastActivityAt: mockNow - 3 * 24 * 60 * 60_000, status: runningMock ? "streaming" : undefined },
+        { key: "topic_p3a_pd", kind: "topic", label: t("mock.topicP3a"), root: "~/projects/joyquant-sys", topicId: "topic_p3a_pd", projectColor: "purple", turns: 9, lastActivityAt: mockNow - 4 * 24 * 60 * 60_000, status: runningMock ? "thinking" : undefined },
+        { key: "topic_hotfix", kind: "topic", label: t("mock.topicHotfix"), root: "~/projects/joyquant-sys", topicId: "topic_hotfix", projectColor: "purple", turns: 4, lastActivityAt: mockNow - 5 * 24 * 60 * 60_000, status: runningMock ? "thinking" : undefined },
+        { key: "topic_sys_coord", kind: "topic", label: t("mock.topicSysCoord"), root: "~/projects/joyquant-sys", topicId: "topic_sys_coord", projectColor: "purple", turns: 14, lastActivityAt: mockNow - 6 * 24 * 60 * 60_000, status: runningMock ? "waiting_confirmation" : undefined },
+        { key: "topic_sys_standard", kind: "topic", label: t("mock.topicSysStandard"), root: "~/projects/joyquant-sys", topicId: "topic_sys_standard", projectColor: "purple", turns: 6, lastActivityAt: mockNow - 7 * 24 * 60 * 60_000, status: "paused" },
+        { key: "topic_sys_exception", kind: "topic", label: t("mock.topicSysException"), root: "~/projects/joyquant-sys", topicId: "topic_sys_exception", projectColor: "purple", turns: 2, lastActivityAt: mockNow - 8 * 24 * 60 * 60_000, status: "error" },
       ],
     },
     {
@@ -641,13 +673,30 @@ function makeMockApp(): AppBindings {
       label: "Global",
       root: globalWorkspaceRoot,
       children: [
-        { key: "global_topic_product", kind: "global_topic", label: t("mock.topicProduct"), topicId: "topic_product" },
-        { key: "global_topic_ai", kind: "global_topic", label: t("mock.topicAi"), topicId: "topic_ai" },
-        { key: "global_topic_lab", kind: "global_topic", label: t("mock.topicLab"), topicId: "topic_lab" },
+        { key: "global_topic_product", kind: "global_topic", label: t("mock.topicProduct"), topicId: "topic_product", turns: 5, lastActivityAt: mockNow - 8 * 24 * 60 * 60_000 },
+        { key: "global_topic_ai", kind: "global_topic", label: t("mock.topicAi"), topicId: "topic_ai", turns: 8, lastActivityAt: mockNow - 10 * 24 * 60 * 60_000 },
+        { key: "global_topic_lab", kind: "global_topic", label: t("mock.topicLab"), topicId: "topic_lab", turns: 2, lastActivityAt: mockNow - 12 * 24 * 60 * 60_000 },
       ],
     },
   ];
-  const cloneProjectTree = () => JSON.parse(JSON.stringify(mockProjectTree)) as ProjectNode[];
+  const ensureMockGlobalFolder = (): ProjectNode => {
+    let node = mockProjectTree.find((item) => item.kind === "global_folder");
+    if (!node) {
+      node = {
+        key: "global_folder",
+        kind: "global_folder",
+        label: "Global",
+        root: globalWorkspaceRoot,
+        children: [],
+      };
+      mockProjectTree.push(node);
+    }
+    return node;
+  };
+  const cloneProjectTree = () => {
+    if (mockProjectTree.length === 0) ensureMockGlobalFolder();
+    return JSON.parse(JSON.stringify(mockProjectTree)) as ProjectNode[];
+  };
   const projectChildren = (node: ProjectNode): ProjectNode[] => Array.isArray(node.children) ? node.children : [];
   const findMockTopic = (topicId: string): ProjectNode | null => {
     for (const parent of mockProjectTree) {
@@ -662,9 +711,114 @@ function makeMockApp(): AppBindings {
     }
   };
   const topicLabel = (topicId: string, fallback: string) => (findMockTopic(topicId)?.label || fallback).replace(/^●\s*/, "");
+  const mockTopicStatus = (topicId: string) => findMockTopic(topicId)?.status ?? "";
+  const mockTopicIsRunning = (topicId: string) => {
+    const status = mockTopicStatus(topicId);
+    return status === "streaming" || status === "thinking" || status === "waiting_confirmation";
+  };
+  const mockTopicRunsInScenario = (topicId: string) => runningMock && mockTopicIsRunning(topicId);
+  const mockTopicHistory = (topicId: string): HistoryMessage[] => {
+    switch (topicId) {
+      case "topic_p3b_pd":
+        return [
+          { role: "user", content: "把 p3b P&D 的范围和风险重新整理成可执行计划。" },
+          { role: "phase", content: "分析需求范围" },
+        ];
+      case "topic_p3a_pd":
+        return [
+          { role: "user", content: "复盘 p3a 的技术方案，先不要写文件，先说明你的判断。" },
+        ];
+      case "topic_hotfix":
+        return [
+          { role: "user", content: "检查 post-p3-hotfix 的回归风险，重点看最近的 shell 输出和 git 改动。" },
+          { role: "assistant", content: "", reasoning: "我先定位最近一次 hotfix 的上下文，然后用只读命令检查状态；左侧保持“思考中”，工具细节在这里展开。" },
+        ];
+      case "topic_sys_coord":
+        return [
+          { role: "user", content: "准备执行 joyquant-sys 的同步脚本，但需要我确认后再运行。" },
+          { role: "assistant", content: "", reasoning: "这个动作会运行脚本并可能刷新本地缓存，所以需要先等用户确认。" },
+        ];
+      case "topic_sys_standard":
+        return [
+          { role: "user", content: "继续制定 SYS 项目开发规范，先停在当前检查点。" },
+          { role: "assistant", content: "已暂停在规范整理阶段。当前保留了目录约定、分支策略和待确认的发布检查项；继续时可以从这里恢复。" },
+          { role: "notice", level: "info", content: "会话已暂停：未继续执行命令，等待用户恢复或切换任务。" },
+        ];
+      case "topic_sys_exception":
+        return [
+          { role: "user", content: "演练异常处理流程，看看失败时界面怎么提示。" },
+          { role: "assistant", content: "我尝试校验恢复脚本时遇到异常，已停止继续执行。" },
+          { role: "notice", level: "warn", content: "运行异常：恢复脚本缺少必要环境变量 JOYQUANT_SYS_TOKEN。请补齐配置后重试。" },
+        ];
+      default:
+        return [];
+    }
+  };
+  const mockRuntimeInjected = new Set<string>();
+  const queueMockTopicRuntime = (tab: TabMeta) => {
+    if (!runningMock) return;
+    const status = mockTopicStatus(tab.topicId);
+    if (status !== "streaming" && status !== "thinking" && status !== "waiting_confirmation") return;
+    const key = `${tab.id}:${tab.topicId}:${status}`;
+    if (mockRuntimeInjected.has(key)) return;
+    mockRuntimeInjected.add(key);
+    window.setTimeout(() => {
+      void withMockTabScope(tab.id, async () => {
+        emitMockTurnStarted();
+        await delay(120);
+        if (tab.topicId === "topic_p3b_pd") {
+          const text = "我会先把范围拆成三层：目标、依赖、风险。当前已经确认 p3b 的交付边界，接下来补充每个模块的验收口径...";
+          for (const ch of text) {
+            emit({ kind: "text", text: ch });
+            await delay(5);
+          }
+          return;
+        }
+        if (tab.topicId === "topic_p3a_pd") {
+          emit({ kind: "reasoning", text: "我正在对比 p3a 和 p3b 的差异：先看约束，再看变更风险，最后判断是否需要拆成独立任务。\n\n" });
+          await delay(220);
+          emit({ kind: "reasoning", text: "当前倾向：先保留 p3a 的兼容路径，不急于删除旧逻辑。" });
+          return;
+        }
+        if (tab.topicId === "topic_hotfix") {
+          const id = "mock-hotfix-shell";
+          emit({ kind: "tool_dispatch", tool: { id, name: "bash", args: JSON.stringify({ command: "git status --short && npm test" }), readOnly: true } });
+          await delay(180);
+          emit({ kind: "tool_progress", tool: { id, name: "bash", readOnly: true, output: "$ git status --short\n M internal/sys/runner.go\n\n$ npm test\nrunning targeted regression tests...\n" } });
+          return;
+        }
+        if (tab.topicId === "topic_sys_coord") {
+          pendingApprovalPreview = true;
+          emit({ kind: "reasoning", text: "我已经准备好执行同步脚本，但这个操作会影响本地 workspace，需要用户确认。" });
+          await delay(160);
+          emit({
+            kind: "approval_request",
+            approval: {
+              id: "mock-sys-confirm",
+              tool: "bash",
+              subject: "npm run sync:joyquant-sys\n\n该命令会同步 SYS 项目配置并刷新本地缓存。",
+            },
+          });
+        }
+      });
+    }, 180);
+  };
   const setMockActiveTab = (tabId: string) => {
     mockTabs = mockTabs.map((tab) => ({ ...tab, active: tab.id === tabId }));
   };
+  const currentMockTurnTabId = () => mockScopedTabId || mockTabs.find((tab) => tab.active)?.id;
+  const setMockTabRunning = (tabId: string | undefined, running: boolean) => {
+    if (!tabId) return;
+    mockTabs = mockTabs.map((tab) => (tab.id === tabId ? { ...tab, running } : tab));
+  };
+  const emitMockTurnStarted = () => {
+    setMockTabRunning(currentMockTurnTabId(), true);
+    emit({ kind: "turn_started" });
+  };
+  const emitMockTurnDone = () => {
+    setMockTabRunning(currentMockTurnTabId(), false);
+    emit({ kind: "turn_done" });
+  };
   let mockTabs: TabMeta[] = freshMock ? [
     {
       id: "tab_global",
@@ -677,6 +831,8 @@ function makeMockApp(): AppBindings {
       ready: true,
       running: false,
       mode: "normal",
+      collaborationMode: "normal",
+      toolApprovalMode: "ask",
       active: true,
       cwd: globalWorkspaceRoot,
     },
@@ -689,12 +845,14 @@ function makeMockApp(): AppBindings {
       topicId: "topic_dev_standard",
       topicTitle: t("mock.trashDevStandardTitle"),
       projectColor: "blue",
-	      label: "DeepSeek-R1",
-	      ready: true,
-	      running: false,
-	      mode: "normal",
-	      active: true,
-	      cwd: "~/projects/joyquant-db",
+      label: "DeepSeek-R1",
+      ready: true,
+      running: false,
+      mode: "normal",
+      collaborationMode: "normal",
+      toolApprovalMode: "ask",
+      active: true,
+      cwd: "~/projects/joyquant-db",
     },
     {
       id: "tab_joyquant_sys",
@@ -704,12 +862,14 @@ function makeMockApp(): AppBindings {
       topicId: "topic_p3b_pd",
       topicTitle: "p3b P&D",
       projectColor: "purple",
-	      label: "DeepSeek-R1",
-	      ready: true,
-	      running: false,
-	      mode: "normal",
-	      active: false,
-	      cwd: "~/projects/joyquant-sys",
+      label: "DeepSeek-R1",
+      ready: true,
+      running: runningMock && mockTopicIsRunning("topic_p3b_pd"),
+      mode: "normal",
+      collaborationMode: "normal",
+      toolApprovalMode: "ask",
+      active: false,
+      cwd: "~/projects/joyquant-sys",
     },
     {
       id: "tab_global",
@@ -718,14 +878,45 @@ function makeMockApp(): AppBindings {
       workspaceName: "Global",
       topicId: "topic_global",
       topicTitle: "Global",
-	      label: "DeepSeek-R1",
-	      ready: true,
-	      running: false,
-	      mode: "normal",
-	      active: false,
-	      cwd: "~/projects/joyquant-db",
+      label: "DeepSeek-R1",
+      ready: true,
+      running: false,
+      mode: "normal",
+      collaborationMode: "normal",
+      toolApprovalMode: "ask",
+      active: false,
+      cwd: "~/projects/joyquant-db",
     },
   ];
+  const mockModelCatalog = [
+    { ref: "deepseek/deepseek-v4-flash", provider: "deepseek", model: "deepseek-v4-flash" },
+    { ref: "deepseek/deepseek-v4-pro", provider: "deepseek", model: "deepseek-v4-pro" },
+  ];
+  const defaultMockModelRef = mockModelCatalog[0].ref;
+  const mockModelRef = (name: string): string => {
+    const trimmed = name.trim();
+    if (!trimmed || trimmed === "DeepSeek-R1") return defaultMockModelRef;
+    const exact = mockModelCatalog.find((model) => model.ref === trimmed);
+    if (exact) return exact.ref;
+    const byModel = mockModelCatalog.find((model) => model.model === trimmed);
+    return byModel?.ref ?? trimmed;
+  };
+  const mockModelLabel = (ref: string): string => mockModelCatalog.find((model) => model.ref === mockModelRef(ref))?.model ?? ref.split("/").pop() ?? ref;
+  const mockTabModelRef = (tab?: TabMeta): string => mockModelRef(tab?.label ?? "");
+  const setMockTabModel = (tabID: string | undefined, name: string) => {
+    const ref = mockModelRef(name);
+    const label = mockModelLabel(ref);
+    let applied = false;
+    mockTabs = mockTabs.map((tab) => {
+      const match = tabID ? tab.id === tabID : tab.active;
+      if (!match) return tab;
+      applied = true;
+      return { ...tab, label };
+    });
+    if (!applied && mockTabs.length > 0) {
+      mockTabs = mockTabs.map((tab, index) => (index === 0 ? { ...tab, label } : tab));
+    }
+  };
   return {
     async Platform() {
       const override = browserPlatformOverride();
@@ -738,8 +929,35 @@ function makeMockApp(): AppBindings {
     },
         async Submit(input) {
           cancelled = false;
-      emit({ kind: "turn_started" });
+      emitMockTurnStarted();
       const trimmedInput = input.trim().toLowerCase();
+      const goalMatch = /^\/goal(?:\s+([\s\S]*))?$/.exec(input.trim());
+      if (goalMatch) {
+        const arg = (goalMatch[1] ?? "").trim();
+        const lowered = arg.toLowerCase();
+        const active = mockTabs.find((tab) => tab.active);
+        if (!arg || lowered === "status") {
+          emit({ kind: "notice", level: "info", text: active?.goal ? `goal: ${active.goal}` : "goal: none" });
+          emitMockTurnDone();
+          return;
+        }
+        if (["clear", "off", "stop", "done"].includes(lowered)) {
+          mockTabs = mockTabs.map((tab) => (tab.active ? { ...tab, goal: "", goalStatus: "stopped", collaborationMode: "normal" } : tab));
+          emit({ kind: "notice", level: "info", text: "goal cleared" });
+          emitMockTurnDone();
+          return;
+        }
+        mockTabs = mockTabs.map((tab) => (tab.active ? { ...tab, goal: arg, goalStatus: "running", collaborationMode: "goal" } : tab));
+        emit({ kind: "notice", level: "info", text: `goal set: ${arg}` });
+        await delay(350);
+        if (cancelled) return;
+        const reply = `Autonomous goal run started for: **${arg}**\n\nMock run completed.\n\n[goal:complete]`;
+        emit({ kind: "message", text: reply });
+        mockTabs = mockTabs.map((tab) => (tab.active ? { ...tab, goal: "", goalStatus: "complete", collaborationMode: "normal" } : tab));
+        emit({ kind: "notice", level: "info", text: "goal complete" });
+        emitMockTurnDone();
+        return;
+      }
       if (trimmedInput === "/approve-preview" || trimmedInput === "approve preview" || trimmedInput === "approve预览") {
         pendingApprovalPreview = true;
         await delay(250);
@@ -842,7 +1060,7 @@ function makeMockApp(): AppBindings {
             durationMs: 150,
           },
         });
-        emit({ kind: "turn_done" });
+        emitMockTurnDone();
         return;
       }
       if (trimmedInput === "/process-preview" || trimmedInput === "process preview" || trimmedInput === "过程预览") {
@@ -865,7 +1083,7 @@ function makeMockApp(): AppBindings {
           },
         });
         emit({ kind: "message", text: "Process card preview complete." });
-        emit({ kind: "turn_done" });
+        emitMockTurnDone();
         return;
       }
       // Simulate the server's pre-first-token latency so the deferred user bubble
@@ -910,20 +1128,20 @@ function makeMockApp(): AppBindings {
           sessionCacheMissTokens: 256,
         },
       });
-          emit({ kind: "turn_done" });
+          emitMockTurnDone();
         },
         async SubmitToTab(_tabID, input) {
-          await this.Submit(input);
+          await withMockTabScope(_tabID, () => this.Submit(input));
         },
         async SubmitDisplay(_display, input) {
           await this.Submit(input);
         },
         async SubmitDisplayToTab(_tabID, display, input) {
-          await this.SubmitDisplay(display, input);
+          await withMockTabScope(_tabID, () => this.SubmitDisplay(display, input));
         },
         async RunShell(command) {
           cancelled = false;
-          emit({ kind: "turn_started" });
+          emitMockTurnStarted();
           await delay(100);
           if (cancelled) return;
           const id = `shell-${command.slice(0, 32)}`;
@@ -934,17 +1152,17 @@ function makeMockApp(): AppBindings {
           await delay(100);
           if (cancelled) return;
           emit({ kind: "tool_result", tool: { id, name: "bash", output: `$ ${command}\n(mock output)\n`, readOnly: false, durationMs: 300 } });
-          emit({ kind: "turn_done" });
+          emitMockTurnDone();
         },
         async RunShellForTab(_tabID, command) {
-          await this.RunShell(command);
+          await withMockTabScope(_tabID, () => this.RunShell(command));
         },
         async Cancel() {
           cancelled = true;
-          emit({ kind: "turn_done" });
+          emitMockTurnDone();
         },
         async CancelTab(_tabID) {
-          await this.Cancel();
+          await withMockTabScope(_tabID, () => this.Cancel());
         },
         async Approve(_id, allow, session, persist) {
           await this.ApproveWithScope(_id, allow, session, persist, "");
@@ -958,13 +1176,13 @@ function makeMockApp(): AppBindings {
             kind: "message",
             text: `approval preview answered: ${allow ? suffix : "denied"}`,
           });
-          emit({ kind: "turn_done" });
+          emitMockTurnDone();
         },
         async ApproveTab(_tabID, id, allow, session, persist) {
           await this.ApproveTabWithScope(_tabID, id, allow, session, persist, "");
         },
         async ApproveTabWithScope(_tabID, id, allow, session, persist, scope) {
-          await this.ApproveWithScope(id, allow, session, persist, scope);
+          await withMockTabScope(_tabID, () => this.ApproveWithScope(id, allow, session, persist, scope));
         },
         async AnswerQuestion(_id, answers) {
       if (!pendingAskPreview) return;
@@ -973,26 +1191,97 @@ function makeMockApp(): AppBindings {
         .map((answer) => `${answer.questionId}: ${(answer.selected ?? []).join(", ") || "(no answer)"}`)
         .join("\n");
       emit({ kind: "message", text: `ask preview answered:\n\n${summary}` });
-          emit({ kind: "turn_done" });
+          emitMockTurnDone();
         },
         async AnswerQuestionForTab(_tabID, id, answers) {
-          await this.AnswerQuestion(id, answers);
+          await withMockTabScope(_tabID, () => this.AnswerQuestion(id, answers));
+        },
+        async ConfirmAction(req) {
+          void req;
+          return false;
+        },
+        async SetPlanMode(on) {
+          const active = mockTabs.find((tab) => tab.active);
+          if (active) await this.SetModeForTab(active.id, modeWithPlan(normalizeMode(active.mode), on));
+        },
+        async SetMode(mode) {
+          const active = mockTabs.find((tab) => tab.active);
+          if (active) await this.SetModeForTab(active.id, mode);
+        },
+        async SetModeForTab(tabID, mode) {
+          const nextMode = normalizeMode(mode);
+          mockTabs = mockTabs.map((tab) =>
+            tab.id === tabID
+              ? {
+                  ...tab,
+                  mode: nextMode,
+                  collaborationMode: normalizeCollaborationMode(undefined, tab.goal, nextMode),
+                  toolApprovalMode: normalizeToolApprovalMode(undefined, nextMode),
+                }
+              : tab,
+          );
+        },
+        async SetCollaborationMode(mode) {
+          const active = mockTabs.find((tab) => tab.active);
+          if (active) await this.SetCollaborationModeForTab(active.id, mode);
+        },
+        async SetCollaborationModeForTab(tabID, mode) {
+          const next = normalizeCollaborationMode(mode);
+          mockTabs = mockTabs.map((tab) => {
+            if (tab.id !== tabID) return tab;
+            const toolMode = normalizeToolApprovalMode(tab.toolApprovalMode, normalizeMode(tab.mode));
+            return {
+              ...tab,
+              collaborationMode: next,
+              goal: next === "normal" || next === "plan" ? "" : tab.goal,
+              mode: modeWithPlan(modeWithAutoApproveTools(normalizeMode(tab.mode), toolMode === "yolo"), next === "plan"),
+            };
+          });
+        },
+        async SetToolApprovalMode(mode) {
+          const active = mockTabs.find((tab) => tab.active);
+          if (active) await this.SetToolApprovalModeForTab(active.id, mode);
+        },
+        async SetToolApprovalModeForTab(tabID, mode) {
+          const next = normalizeToolApprovalMode(mode);
+          settings.autoApproveTools = next === "yolo";
+          settings.bypass = next === "yolo";
+          mockTabs = mockTabs.map((tab) =>
+            tab.id === tabID
+              ? {
+                  ...tab,
+                  toolApprovalMode: next,
+                  mode: modeWithAutoApproveTools(normalizeMode(tab.mode), next === "yolo"),
+                }
+              : tab,
+          );
+        },
+        async SetGoal(goal) {
+          const active = mockTabs.find((tab) => tab.active);
+          if (active) await this.SetGoalForTab(active.id, goal);
         },
-    async ConfirmAction(req) {
-      void req;
-      return false;
-    },
-        async SetPlanMode() {},
-	        async SetMode(mode) {
-	          const active = mockTabs.find((tab) => tab.active);
-	          if (active) await this.SetModeForTab(active.id, mode);
-	        },
-	        async SetModeForTab(tabID, mode) {
-	          const nextMode = mode === "plan" || mode === "yolo" ? mode : "normal";
-	          mockTabs = mockTabs.map((tab) => tab.id === tabID ? { ...tab, mode: nextMode } : tab);
-	        },
-    async Compact() {},
-    async NewSession() {},
+        async SetGoalForTab(tabID, goal) {
+          const nextGoal = goal.trim();
+          mockTabs = mockTabs.map((tab) =>
+            tab.id === tabID
+              ? {
+                  ...tab,
+                  goal: nextGoal,
+                  goalStatus: nextGoal ? "running" : "stopped",
+                  collaborationMode: nextGoal ? "goal" : "normal",
+                  mode: modeWithPlan(normalizeMode(tab.mode), false),
+                }
+              : tab,
+          );
+        },
+        async ClearGoal() {
+          await this.SetGoal("");
+        },
+        async ClearGoalForTab(tabID) {
+          await this.SetGoalForTab(tabID, "");
+        },
+        async Compact() {},
+        async NewSession() {},
     async Checkpoints() {
       return [
         { turn: 0, prompt: "你好呀", files: ["src/App.tsx"], time: Date.now() - 30_000, canCode: true, canConversation: true },
@@ -1020,7 +1309,12 @@ function makeMockApp(): AppBindings {
         async History() {
           return [];
         },
-        async HistoryForTab() {
+        async HistoryForTab(tabID?: string) {
+          const tab = mockTabs.find((item) => item.id === tabID) ?? mockTabs.find((item) => item.active);
+          if (tab?.topicId) {
+            queueMockTopicRuntime(tab);
+            return mockTopicHistory(tab.topicId);
+          }
           return this.History();
         },
     async ListSessions() {
@@ -1132,16 +1426,36 @@ function makeMockApp(): AppBindings {
           return this.Jobs();
         },
         async Meta() {
-      return {
-        label: "DeepSeek-R1",
-        ready: true,
-        eventChannel: EVENT_CHANNEL,
-        cwd,
-            bypass: settings.bypass,
+          const active = mockTabs.find((tab) => tab.active) ?? mockTabs[0];
+          const toolApprovalMode = normalizeToolApprovalMode(active?.toolApprovalMode, active ? normalizeMode(active.mode) : "normal", settings.autoApproveTools);
+          const autoApproveTools = toolApprovalMode === "yolo";
+          return {
+            label: active?.label ?? "DeepSeek-R1",
+            ready: active?.ready ?? true,
+            eventChannel: EVENT_CHANNEL,
+            cwd: active?.cwd || cwd,
+            autoApproveTools,
+            bypass: autoApproveTools,
+            toolApprovalMode,
+            goal: active?.goal ?? "",
+            goalStatus: active?.goalStatus ?? (active?.goal ? "running" : "stopped"),
           };
         },
-        async MetaForTab() {
-          return this.Meta();
+        async MetaForTab(tabID) {
+          const tab = mockTabs.find((item) => item.id === tabID) ?? mockTabs.find((item) => item.active) ?? mockTabs[0];
+          const toolApprovalMode = normalizeToolApprovalMode(tab?.toolApprovalMode, tab ? normalizeMode(tab.mode) : "normal", settings.autoApproveTools);
+          const autoApproveTools = toolApprovalMode === "yolo";
+          return {
+            label: tab?.label ?? "DeepSeek-R1",
+            ready: tab?.ready ?? true,
+            eventChannel: EVENT_CHANNEL,
+            cwd: tab?.cwd || cwd,
+            autoApproveTools,
+            bypass: autoApproveTools,
+            toolApprovalMode,
+            goal: tab?.goal ?? "",
+            goalStatus: tab?.goalStatus ?? (tab?.goal ? "running" : "stopped"),
+          };
         },
     async Commands() {
       return [
@@ -1420,17 +1734,20 @@ function makeMockApp(): AppBindings {
       return "data:image/png;base64,iVBORw0KGgo=";
     },
         async Models() {
-          return [
-            { ref: "deepseek/deepseek-v4-flash", provider: "deepseek", model: "deepseek-v4-flash", current: true },
-            { ref: "deepseek/deepseek-v4-pro", provider: "deepseek", model: "deepseek-v4-pro", current: false },
-          ];
+          const active = mockTabs.find((tab) => tab.active) ?? mockTabs[0];
+          const current = mockTabModelRef(active);
+          return mockModelCatalog.map((model) => ({ ...model, current: model.ref === current }));
+        },
+        async ModelsForTab(tabID) {
+          const tab = mockTabs.find((item) => item.id === tabID) ?? mockTabs.find((item) => item.active) ?? mockTabs[0];
+          const current = mockTabModelRef(tab);
+          return mockModelCatalog.map((model) => ({ ...model, current: model.ref === current }));
         },
-        async ModelsForTab() {
-          return this.Models();
+        async SetModel(name) {
+          setMockTabModel(undefined, name);
         },
-        async SetModel() {},
-        async SetModelForTab(_tabID, name) {
-          await this.SetModel(name);
+        async SetModelForTab(tabID, name) {
+          setMockTabModel(tabID, name);
         },
         async Effort() {
           return { supported: true, current: mockEffort, default: "high", levels: ["auto", "high", "max"] };
@@ -1585,8 +1902,11 @@ function makeMockApp(): AppBindings {
       settings.agent = { temperature, maxSteps, plannerMaxSteps, systemPrompt };
     },
     async SetTrayLocale(_locale: "en" | "zh") {},
+    async SetAutoApproveTools(on: boolean) {
+      await this.SetToolApprovalMode(on ? "yolo" : "ask");
+    },
     async SetBypass(on: boolean) {
-      settings.bypass = on;
+      await this.SetAutoApproveTools(on);
     },
     async Version() {
       return "v1.0.0 (browser dev)";
@@ -1641,8 +1961,9 @@ function makeMockApp(): AppBindings {
     async OpenProjectTab(workspaceRoot: string, _topicID: string) {
       const existing = mockTabs.find((tab) => tab.scope === "project" && tab.workspaceRoot === workspaceRoot && tab.topicId === _topicID);
       if (existing) {
-        setMockActiveTab(existing.id);
-        return { ...existing, active: true };
+        const active = { ...existing, active: true, running: mockTopicRunsInScenario(_topicID) };
+        mockTabs = mockTabs.map((tab) => (tab.id === existing.id ? active : { ...tab, active: false }));
+        return { ...active };
       }
       const tab: TabMeta = {
         id: "tab_" + Date.now(),
@@ -1652,12 +1973,14 @@ function makeMockApp(): AppBindings {
         topicId: _topicID,
         topicTitle: topicLabel(_topicID, t("mock.newSession")),
         projectColor: mockProjectTree.find((node) => node.root === workspaceRoot)?.projectColor,
-	        label: "deepseek-v4-flash",
-	        ready: true,
-	        running: false,
-	        mode: "normal",
-	        active: true,
-	        cwd: workspaceRoot,
+        label: "deepseek-v4-flash",
+        ready: true,
+        running: mockTopicRunsInScenario(_topicID),
+        mode: "normal",
+        collaborationMode: "normal",
+        toolApprovalMode: "ask",
+        active: true,
+        cwd: workspaceRoot,
       };
       mockTabs = [...mockTabs.map((item) => ({ ...item, active: false })), tab];
       return { ...tab };
@@ -1675,18 +1998,22 @@ function makeMockApp(): AppBindings {
         workspaceName: "Global",
         topicId: _topicID,
         topicTitle: topicLabel(_topicID, "Global"),
-	        label: "deepseek-v4-flash",
-	        ready: true,
-	        running: false,
-	        mode: "normal",
-	        active: true,
-	        cwd: "",
+        label: "deepseek-v4-flash",
+        ready: true,
+        running: false,
+        mode: "normal",
+        collaborationMode: "normal",
+        toolApprovalMode: "ask",
+        active: true,
+        cwd: "",
       };
       mockTabs = [...mockTabs.map((item) => ({ ...item, active: false })), tab];
       return { ...tab };
     },
     async SetActiveTab(_tabID: string) {
       setMockActiveTab(_tabID);
+      const tab = mockTabs.find((item) => item.id === _tabID);
+      if (tab) queueMockTopicRuntime(tab);
     },
     async ReorderTabs(_tabIDs: string[]) {
       const byId = new Map(mockTabs.map((tab) => [tab.id, tab]));
@@ -1725,18 +2052,38 @@ function makeMockApp(): AppBindings {
     },
     async ReorderProjects(workspaceRoots: string[]) {
       const projects = mockProjectTree.filter((node) => node.kind === "project");
-      if (workspaceRoots.length !== projects.length) return;
-      const byRoot = new Map(projects.map((node) => [node.root, node]));
-      const ordered = workspaceRoots.map((root) => byRoot.get(root)).filter((node): node is ProjectNode => Boolean(node));
-      if (ordered.length !== projects.length) return;
-      const globals = mockProjectTree.filter((node) => node.kind !== "project");
-      mockProjectTree.splice(0, mockProjectTree.length, ...globals, ...ordered);
+      const globals = mockProjectTree.filter((node) => node.kind === "global_folder");
+      if (!workspaceRoots.includes(GLOBAL_PROJECT_ORDER_KEY)) {
+        if (workspaceRoots.length !== projects.length) return;
+        const byRoot = new Map(projects.map((node) => [node.root, node]));
+        const ordered = workspaceRoots.map((root) => byRoot.get(root)).filter((node): node is ProjectNode => Boolean(node));
+        if (ordered.length !== projects.length) return;
+        mockProjectTree.splice(0, mockProjectTree.length, ...globals, ...ordered);
+        return;
+      }
+      const byKey = new Map<string, ProjectNode>();
+      for (const node of projects) {
+        if (node.root) byKey.set(node.root, node);
+      }
+      for (const node of globals) byKey.set(GLOBAL_PROJECT_ORDER_KEY, node);
+      const seen = new Set<string>();
+      const ordered: ProjectNode[] = [];
+      for (const key of workspaceRoots) {
+        if (seen.has(key)) return;
+        const node = byKey.get(key);
+        if (!node) return;
+        seen.add(key);
+        ordered.push(node);
+      }
+      if (ordered.length !== projects.length + globals.length) return;
+      mockProjectTree.splice(0, mockProjectTree.length, ...ordered);
     },
     async CreateTopic(_scope: string, _workspaceRoot: string, title: string) {
-      const id = "topic_" + Date.now();
+      const now = Date.now();
+      const id = "topic_" + now;
       const topicTitle = title.trim() || t("mock.newSession");
       const parent = _scope === "global"
-        ? mockProjectTree.find((node) => node.kind === "global_folder")
+        ? ensureMockGlobalFolder()
         : mockProjectTree.find((node) => node.root === _workspaceRoot);
       if (parent) {
         const global = parent.kind === "global_folder";
@@ -1747,9 +2094,10 @@ function makeMockApp(): AppBindings {
           root: parent.root,
           topicId: id,
           projectColor: parent.projectColor,
+          createdAt: now,
         }, ...projectChildren(parent)];
       }
-      return { id, title: topicTitle, createdAt: Date.now() };
+      return { id, title: topicTitle, createdAt: now };
     },
     async RenameTopic(topicID: string, title: string) {
       const topic = findMockTopic(topicID);
@@ -1780,9 +2128,12 @@ function makeMockApp(): AppBindings {
         reasoningTokens: 7521,
         cacheHitTokens: 87000,
         cacheMissTokens: 13000,
+        requestCount: 6,
+        elapsedMs: 33 * 60 * 1000,
         sessionCost: 0.018,
         sessionCurrency: "¥",
         sessionCostUsd: 0.018,
+        mock: true,
         readFiles: [
           { path: "REASONIX.md", turn: 2, time: now - 34 * 60 * 1000 },
           { path: "pyproject.toml", turn: 3, time: now - 30 * 60 * 1000 },
diff --git a/desktop/frontend/src/lib/i18n.tsx b/desktop/frontend/src/lib/i18n.tsx
index 8980b5730..9f831d610 100644
--- a/desktop/frontend/src/lib/i18n.tsx
+++ b/desktop/frontend/src/lib/i18n.tsx
@@ -10,7 +10,7 @@
 // the user-level [desktop] config; localStorage is only read once for legacy
 // migration from older desktop builds.
 
-import { createContext, useCallback, useContext, useState } from "react";
+import { createContext, useCallback, useContext, useEffect, useState } from "react";
 import type { ReactNode } from "react";
 import { en, type DictKey } from "../locales/en";
 import { zh } from "../locales/zh";
@@ -104,6 +104,11 @@ export function LocaleProvider({ children }: { children: ReactNode }) {
   const locale = detectLocale(pref);
   currentLocale = locale; // keep the mirror fresh for non-React callers
 
+  useEffect(() => {
+    if (typeof document === "undefined") return;
+    document.documentElement.lang = locale === "zh" ? "zh-CN" : "en";
+  }, [locale]);
+
   // setPref updates only the live UI; persistence is handled by desktop config.
   const setPref = useCallback((next: LangPref) => {
     setPrefState(normalizeLangPref(next));
diff --git a/desktop/frontend/src/lib/layoutPreferences.ts b/desktop/frontend/src/lib/layoutPreferences.ts
index bd8ad582f..fe6b5d907 100644
--- a/desktop/frontend/src/lib/layoutPreferences.ts
+++ b/desktop/frontend/src/lib/layoutPreferences.ts
@@ -1,5 +1,6 @@
 export type LayoutSizeKey =
   | "sidebarWidth"
+  | "sidebarWidthGraphite"
   | "rightDockWidth"
   | "rightDockTreeWidth"
   | "rightDockPreviewWidth"
@@ -17,6 +18,7 @@ const STORAGE_KEY = "reasonix.layoutPreferences.v1";
 
 const LEGACY_SIZE_KEYS: Record<LayoutSizeKey, string[]> = {
   sidebarWidth: ["reasonix.sidebar.width"],
+  sidebarWidthGraphite: [],
   rightDockWidth: [],
   rightDockTreeWidth: [],
   rightDockPreviewWidth: [],
diff --git a/desktop/frontend/src/lib/notificationCenter.ts b/desktop/frontend/src/lib/notificationCenter.ts
deleted file mode 100644
index a50017644..000000000
--- a/desktop/frontend/src/lib/notificationCenter.ts
+++ /dev/null
@@ -1,106 +0,0 @@
-// notificationCenter is the in-app side of the desktop's notification
-// surface. Long-running agent events (idle, plan approval needed,
-// update available, plugin hot-add, job done) deserve a visible
-// signal, and the OS notification center is the right home for them,
-// but the kernel doesn't yet expose a Notify() binding. This module
-// gives the rest of the app a single store for in-app notifications
-// so when the binding lands, the only change is "also dispatch
-// runtime.MessageDialog" alongside the in-app emit.
-//
-// The store is a tiny pub-sub on top of a plain array. We avoid
-// pulling in a state library (Zustand, Jotai) for a 60-line feature.
-// Subscribers are React components: the NotificationCenter drawer
-// subscribes on mount and unsubscribes on unmount.
-//
-// The store caps at MAX (50 by default). New notifications push
-// older ones out; the cap is high enough that a busy day of agent
-// runs (maybe 30 notifications) stays in-memory. We don't persist
-// across reloads — reloads are rare and the user can re-trigger
-// the source if they need to.
-
-export type NotificationLevel = "info" | "warn" | "error";
-
-export interface Notification {
-  id: string;
-  level: NotificationLevel;
-  title: string;
-  body: string;
-  // at is the wall-clock ms; used to display '3h ago' in the drawer.
-  at: number;
-  // source is a short label (e.g. 'agent', 'update', 'plugin') the
-  // drawer uses to group / filter. Optional.
-  source?: string;
-  // read is flipped the first time the user opens the drawer; the
-  // unread count in the topbar uses this to render a small dot.
-  read: boolean;
-}
-
-type Listener = (list: Notification[]) => void;
-
-const MAX = 50;
-let store: Notification[] = [];
-const listeners = new Set<Listener>();
-
-function emit() {
-  for (const l of listeners) l(store);
-}
-
-// push adds a notification to the store. Identical-`id` events (the
-// agent emits "agent:idle" once per turn) are deduped — the existing
-// entry's at is refreshed and read flipped back to false, so the
-// user gets a "fresh" signal but the list doesn't grow.
-export function push(n: Omit<Notification, "id" | "at" | "read"> & { id?: string }): void {
-  const id = n.id ?? `${n.source ?? "app"}-${Date.now()}-${Math.random().toString(36).slice(2, 7)}`;
-  const existing = store.find((x) => x.id === id);
-  if (existing) {
-    existing.at = Date.now();
-    existing.read = false;
-    existing.body = n.body;
-  } else {
-    store = [{ ...n, id, at: Date.now(), read: false }, ...store];
-    if (store.length > MAX) store.length = MAX;
-  }
-  emit();
-}
-
-// markAllRead flips every entry's read flag; called when the user
-// opens the drawer.
-export function markAllRead(): void {
-  let changed = false;
-  for (const n of store) {
-    if (!n.read) {
-      n.read = true;
-      changed = true;
-    }
-  }
-  if (changed) emit();
-}
-
-// clear wipes the store. Useful for a 'Clear all' button in the
-// drawer; also handy for tests.
-export function clear(): void {
-  store = [];
-  emit();
-}
-
-// subscribe registers a listener. Returns the unsubscribe function.
-export function subscribe(l: Listener): () => void {
-  listeners.add(l);
-  l(store);
-  return () => {
-    listeners.delete(l);
-  };
-}
-
-// unread returns the count of unread entries. Cheap O(n) over at
-// most 50 items.
-export function unread(): number {
-  let c = 0;
-  for (const n of store) if (!n.read) c++;
-  return c;
-}
-
-// snapshot is a defensive copy; used by the drawer on each render.
-export function snapshot(): Notification[] {
-  return store.slice();
-}
diff --git a/desktop/frontend/src/lib/theme.ts b/desktop/frontend/src/lib/theme.ts
index 26aa20036..e7aeae59b 100644
--- a/desktop/frontend/src/lib/theme.ts
+++ b/desktop/frontend/src/lib/theme.ts
@@ -1,6 +1,8 @@
 // theme.ts manages the appearance override. The stylesheet follows the OS via
 // prefers-color-scheme unless data-theme forces "dark" or "light". A separate
-// data-theme-style attribute changes only accent tokens.
+// data-theme-style attribute selects a visual direction (graphite/aurora/slate/
+// carbon/nocturne/amber) — orthogonal to theme, so every direction supports both
+// light & dark.
 //
 // When running inside the Wails shell, applyTheme also syncs the native window
 // theme (title bar, traffic lights, etc.) so the OS chrome matches the webview.
@@ -17,40 +19,33 @@ export type ResolvedTheme = Exclude<Theme, "auto">;
 
 export const THEME_STYLES = [
   "graphite",
-  "ember",
   "aurora",
-  "midnight",
-  "sandstone",
-  "porcelain",
-  "linen",
-  "glacier",
+  "slate",
+  "carbon",
+  "nocturne",
+  "amber",
 ] as const;
 
 export type ThemeStyle = (typeof THEME_STYLES)[number];
 
-export const THEME_STYLE_THEME: Record<ThemeStyle, ResolvedTheme> = {
-  graphite: "dark",
-  ember: "dark",
-  aurora: "dark",
-  midnight: "dark",
-  sandstone: "light",
-  porcelain: "light",
-  linen: "light",
-  glacier: "light",
+// Old style identifiers map to the closest new direction so settings stored
+// from previous versions still resolve to a valid value.
+const LEGACY_STYLE_MAP: Record<string, ThemeStyle> = {
+  ember: "carbon",
+  midnight: "nocturne",
+  sandstone: "amber",
+  porcelain: "nocturne",
+  linen: "amber",
+  glacier: "slate",
 };
 
-const DEFAULT_THEME_STYLE: Record<ResolvedTheme, ThemeStyle> = {
-  dark: "graphite",
-  light: "glacier",
-};
-// New users default to the product's dark graphite look. Existing users, and any
-// user who manually changes the theme, keep their stored desktop config.
-const DEFAULT_THEME: Theme = "dark";
+const DEFAULT_THEME_STYLE: ThemeStyle = "graphite";
+const DEFAULT_THEME: Theme = "light";
 
 const THEME_KEY = "reasonix-theme";
 const STYLE_KEY = "reasonix-theme-style";
 let currentTheme: Theme = DEFAULT_THEME;
-let currentThemeStyle: ThemeStyle = DEFAULT_THEME_STYLE.dark;
+let currentThemeStyle: ThemeStyle = DEFAULT_THEME_STYLE;
 
 export function normalizeThemePreference(value: unknown): Theme {
   if (typeof value === "object" && value !== null) {
@@ -87,21 +82,26 @@ export function getResolvedTheme(theme: Theme = getTheme()): ResolvedTheme {
   return "dark";
 }
 
-export function defaultStyleForTheme(theme: Theme): ThemeStyle {
-  return DEFAULT_THEME_STYLE[getResolvedTheme(theme)];
+// Direction is orthogonal to theme, but keep this helper so callers that
+// stored values in the old "style implies theme" model can still ask.
+export function defaultStyleForTheme(_theme: Theme = getTheme()): ThemeStyle {
+  return DEFAULT_THEME_STYLE;
 }
 
-export function themeForStyle(style: ThemeStyle): ResolvedTheme {
-  return THEME_STYLE_THEME[style];
+// themeForStyle previously returned the dark/light forced by the style. Style
+// is now independent of theme, so we keep the current theme.
+export function themeForStyle(_style: ThemeStyle): ResolvedTheme {
+  return getResolvedTheme();
 }
 
-export function getThemeStyle(theme: Theme = getTheme()): ThemeStyle {
-  if (theme === currentTheme && themeForStyle(currentThemeStyle) === getResolvedTheme(theme)) return currentThemeStyle;
-  return defaultStyleForTheme(theme);
+export function getThemeStyle(_theme: Theme = getTheme()): ThemeStyle {
+  return currentThemeStyle;
 }
 
-export function normalizeThemeStyleForTheme(style: string | undefined, theme: Theme): ThemeStyle {
-  return isThemeStyle(style) && themeForStyle(style) === getResolvedTheme(theme) ? style : defaultStyleForTheme(theme);
+export function normalizeThemeStyleForTheme(style: string | undefined, _theme?: Theme): ThemeStyle {
+  if (typeof style !== "string") return DEFAULT_THEME_STYLE;
+  if (isThemeStyle(style)) return style;
+  return LEGACY_STYLE_MAP[style] ?? DEFAULT_THEME_STYLE;
 }
 
 export function applyTheme(theme: Theme, style: ThemeStyle = getThemeStyle(theme), options: { persist?: boolean } = {}): void {
@@ -112,8 +112,7 @@ export function applyTheme(theme: Theme, style: ThemeStyle = getThemeStyle(theme
   if (theme === "auto") root.removeAttribute("data-theme");
   else root.setAttribute("data-theme", theme);
 
-  const resolved = getResolvedTheme(theme);
-  const nextStyle = themeForStyle(style) === resolved ? style : DEFAULT_THEME_STYLE[resolved];
+  const nextStyle: ThemeStyle = isThemeStyle(style) ? style : DEFAULT_THEME_STYLE;
   currentTheme = theme;
   currentThemeStyle = nextStyle;
   root.setAttribute("data-theme-style", nextStyle);
@@ -133,14 +132,14 @@ export function applyTheme(theme: Theme, style: ThemeStyle = getThemeStyle(theme
 }
 
 export function readLegacyThemePreference(): { theme: Theme; style: ThemeStyle; hasValue: boolean } {
-  if (typeof localStorage === "undefined") return { theme: DEFAULT_THEME, style: DEFAULT_THEME_STYLE.dark, hasValue: false };
+  if (typeof localStorage === "undefined") return { theme: DEFAULT_THEME, style: DEFAULT_THEME_STYLE, hasValue: false };
   let rawTheme: string | null = null;
   let rawStyle: string | null = null;
   try {
     rawTheme = localStorage.getItem(THEME_KEY);
     rawStyle = localStorage.getItem(STYLE_KEY);
   } catch {
-    return { theme: DEFAULT_THEME, style: DEFAULT_THEME_STYLE.dark, hasValue: false };
+    return { theme: DEFAULT_THEME, style: DEFAULT_THEME_STYLE, hasValue: false };
   }
   const hasValue = rawTheme !== null || rawStyle !== null;
   let theme = DEFAULT_THEME;
@@ -174,8 +173,8 @@ export function initTheme(): void {
   if (typeof window !== "undefined" && window.runtime) {
     const resolved = getResolvedTheme(theme);
     if (resolved === "light") {
-      // Light shell: matches :root[data-theme="light"] --bg (#f7f8fb).
-      WindowSetBackgroundColour(247, 248, 251, 255);
+      // Light shell: matches graphite --bg (#f4f3ef).
+      WindowSetBackgroundColour(244, 243, 239, 255);
     } else {
       // Dark shell: matches :root --bg (#090a0c).
       WindowSetBackgroundColour(9, 10, 12, 255);
diff --git a/desktop/frontend/src/lib/types.ts b/desktop/frontend/src/lib/types.ts
index c516756d5..7255662d5 100644
--- a/desktop/frontend/src/lib/types.ts
+++ b/desktop/frontend/src/lib/types.ts
@@ -131,6 +131,10 @@ export interface TabMeta {
   ready: boolean;
   running: boolean;
   mode: Mode;
+  collaborationMode?: CollaborationMode;
+  toolApprovalMode?: ToolApprovalMode;
+  goal?: string;
+  goalStatus?: GoalStatus;
   startupErr?: string;
   active: boolean;
   cwd: string;
@@ -144,12 +148,16 @@ export interface ProjectNode {
   topicId?: string;
   projectColor?: string;
   turns?: number;
+  createdAt?: number;
   lastActivityAt?: number;
   open?: boolean;
   running?: boolean;
+  status?: ProjectTopicStatus;
   children?: ProjectNode[];
 }
 
+export type ProjectTopicStatus = "thinking" | "streaming" | "waiting_confirmation" | "paused" | "error";
+
 export interface TopicMeta {
   id: string;
   title: string;
@@ -164,10 +172,13 @@ export interface ContextPanelInfo {
   reasoningTokens: number;
   cacheHitTokens: number;
   cacheMissTokens: number;
+  requestCount?: number;
+  elapsedMs?: number;
   sessionCost?: number;
   sessionCurrency?: string;
   // Deprecated compatibility alias. Prefer sessionCost + sessionCurrency.
   sessionCostUsd?: number;
+  mock?: boolean;
   readFiles: ReadFileRecord[];
   changedFiles: ChangedFileInfo[];
 }
@@ -269,12 +280,63 @@ export interface Meta {
   startupErr?: string;
   eventChannel: string;
   cwd: string;
-  bypass?: boolean; // YOLO mode on (auto-approve every tool call)
+  autoApproveTools?: boolean;
+  bypass?: boolean; // legacy JSON key for YOLO/full-access tool auto-approval
+  toolApprovalMode?: ToolApprovalMode;
+  goal?: string;
+  goalStatus?: GoalStatus;
+}
+
+export type CollaborationMode = "normal" | "plan" | "goal";
+export type ToolApprovalMode = "ask" | "auto" | "yolo";
+export type GoalStatus = "running" | "complete" | "blocked" | "stopped";
+
+export function normalizeCollaborationMode(mode?: string, goal?: string, legacyMode?: Mode): CollaborationMode {
+  if (mode === "plan" || mode === "goal" || mode === "normal") return mode;
+  if (legacyMode && modeHasPlan(legacyMode)) return "plan";
+  if ((goal ?? "").trim()) return "goal";
+  return "normal";
+}
+
+export function normalizeToolApprovalMode(mode?: string, legacyMode?: Mode, legacyAutoApproveTools?: boolean): ToolApprovalMode {
+  if (mode === "auto" || mode === "yolo" || mode === "ask") return mode;
+  if (legacyAutoApproveTools || (legacyMode && modeHasAutoApproveTools(legacyMode))) return "yolo";
+  return "ask";
+}
+
+// Mode is the compatibility string for two independent composer axes:
+// plan (read-only/user-plan gate) and yolo/full access (tool auto-approval).
+export type Mode = "normal" | "plan" | "yolo" | "plan-yolo";
+
+export function normalizeMode(mode?: string): Mode {
+  if (mode === "plan" || mode === "yolo" || mode === "plan-yolo" || mode === "yolo-plan") {
+    return mode === "yolo-plan" ? "plan-yolo" : mode;
+  }
+  return "normal";
 }
 
-// Mode is the input mode cycled by Shift+Tab: normal (shown as auto) → plan
-// (read-only) → yolo (auto-approve every tool call; deny rules still apply).
-export type Mode = "normal" | "plan" | "yolo";
+export function modeHasPlan(mode: Mode): boolean {
+  return mode === "plan" || mode === "plan-yolo";
+}
+
+export function modeHasAutoApproveTools(mode: Mode): boolean {
+  return mode === "yolo" || mode === "plan-yolo";
+}
+
+export function modeFromAxes(plan: boolean, autoApproveTools: boolean): Mode {
+  if (plan && autoApproveTools) return "plan-yolo";
+  if (plan) return "plan";
+  if (autoApproveTools) return "yolo";
+  return "normal";
+}
+
+export function modeWithPlan(mode: Mode, plan: boolean): Mode {
+  return modeFromAxes(plan, modeHasAutoApproveTools(mode));
+}
+
+export function modeWithAutoApproveTools(mode: Mode, autoApproveTools: boolean): Mode {
+  return modeFromAxes(modeHasPlan(mode), autoApproveTools);
+}
 
 export interface CommandInfo {
   name: string; // without the leading slash
@@ -555,7 +617,8 @@ export interface SettingsView {
   closeBehavior: string; // "background" | "quit"
   configPath: string;
   providerKinds: string[]; // provider implementations the kernel registered (for the kind picker)
-  bypass: boolean; // live YOLO state (runtime-only) — whether approvals are skipped this session
+  autoApproveTools: boolean;
+  bypass: boolean; // legacy JSON key for live YOLO/full-access tool auto-approval
 }
 
 // Auto-updater payloads (desktop/updater.go). UpdateInfo drives the update banner;
diff --git a/desktop/frontend/src/lib/useController.ts b/desktop/frontend/src/lib/useController.ts
index 2f3fce49d..9b4d30f48 100644
--- a/desktop/frontend/src/lib/useController.ts
+++ b/desktop/frontend/src/lib/useController.ts
@@ -8,18 +8,22 @@ import { asArray } from "./array";
 import { app, onEvent, onReady } from "./bridge";
 import { createRafBatch } from "./rafBatch";
 import { t } from "./i18n";
+import { modeHasAutoApproveTools } from "./types";
 import type {
   BalanceInfo,
   CheckpointMeta,
+  CollaborationMode,
   ContextInfo,
   EffortInfo,
   HistoryMessage,
   JobView,
   MemoryView,
   Meta,
+  Mode,
   QuestionAnswer,
   SessionMeta,
   TabMeta,
+  ToolApprovalMode,
   WireApproval,
   WireAsk,
   WireEvent,
@@ -102,6 +106,23 @@ const initialState: State = {
   seq: 0,
 };
 
+function sameMeta(a?: Meta, b?: Meta): boolean {
+  if (a === b) return true;
+  if (!a || !b) return false;
+  return (
+    a.label === b.label &&
+    a.ready === b.ready &&
+    a.startupErr === b.startupErr &&
+    a.eventChannel === b.eventChannel &&
+    a.cwd === b.cwd &&
+    a.autoApproveTools === b.autoApproveTools &&
+    a.bypass === b.bypass &&
+    a.toolApprovalMode === b.toolApprovalMode &&
+    a.goal === b.goal &&
+    a.goalStatus === b.goalStatus
+  );
+}
+
 type Action =
   | { type: "event"; e: WireEvent }
   | { type: "user"; text: string; seq: number }
@@ -391,7 +412,7 @@ function reducer(s: State, a: Action): State {
       });
       return { ...s, items: finalized, running: false, turnActive: false, live: undefined, currentAssistant: undefined, approval: undefined, ask: undefined };
     }
-    case "meta": return { ...s, meta: a.meta };
+    case "meta": return sameMeta(s.meta, a.meta) ? s : { ...s, meta: a.meta };
     case "context": return { ...s, context: a.context };
     case "balance": return { ...s, balance: a.balance };
     case "effort": return { ...s, effort: a.effort };
@@ -444,6 +465,16 @@ function errorMessage(err: unknown): string {
   return String(err || "");
 }
 
+async function refreshMetaForTab(tabId: string, dispatchTo: (tabId: string, action: Action) => void): Promise<void> {
+  try {
+    dispatchTo(tabId, { type: "meta", meta: await app.MetaForTab(tabId) });
+    dispatchTo(tabId, { type: "context", context: await app.ContextUsageForTab(tabId) });
+    dispatchTo(tabId, { type: "effort", effort: await app.EffortForTab(tabId) });
+  } catch {
+    /* ignore */
+  }
+}
+
 export function useController() {
   const statesRef = useRef<TabStates>(new Map());
   const [activeTabId, setActiveTabId] = useState<string | undefined>();
@@ -575,6 +606,7 @@ export function useController() {
         dispatchTo(targetTabId, { type: "event", e });
       }
       if (e.kind === "turn_done") {
+        void refreshMetaForTab(targetTabId, dispatchTo);
         app
           .ContextUsageForTab(targetTabId)
           .then((context) => dispatchTo(targetTabId, { type: "context", context }))
@@ -603,12 +635,24 @@ export function useController() {
   }, [dispatchTo, loadSessionDataForTab, refreshCheckpoints, syncActiveTabFromBackend]);
 
   const send = useCallback((displayText: string, submitText = displayText) => {
-    if (!activeTabId) return;
-    const seq = getOrCreateState(statesRef.current, activeTabId).seq;
-    dispatchTo(activeTabId, { type: "user", text: displayText, seq });
-    const display = displayText.trim(); const submit = submitText.trim();
-    (display !== submit ? app.SubmitDisplayToTab(activeTabId, display, submit) : app.SubmitToTab(activeTabId, submit)).catch(() => {});
-  }, [activeTabId, dispatchTo]);
+    const submitForTab = (tabId: string) => {
+      const seq = getOrCreateState(statesRef.current, tabId).seq;
+      dispatchTo(tabId, { type: "user", text: displayText, seq });
+      const display = displayText.trim();
+      const submit = submitText.trim();
+      (display !== submit ? app.SubmitDisplayToTab(tabId, display, submit) : app.SubmitToTab(tabId, submit)).catch(() => {});
+    };
+    const tabId = activeTabIdRef.current ?? activeTabId;
+    if (tabId) {
+      submitForTab(tabId);
+      return;
+    }
+    void activeTabFromBackend().then((active) => {
+      if (!active?.id) return;
+      setActiveTabId(active.id);
+      submitForTab(active.id);
+    });
+  }, [activeTabFromBackend, activeTabId, dispatchTo]);
 
   const runShell = useCallback((command: string) => {
     if (!activeTabId) return;
@@ -648,13 +692,38 @@ export function useController() {
     app.AnswerQuestionForTab(activeTabId, id, answers).catch(() => {});
   }, [activeTabId, dispatchTo]);
 
-  const setControllerMode = useCallback((mode: "plan" | "yolo" | "normal"): Promise<void> => {
+  const setControllerMode = useCallback((mode: Mode): Promise<void> => {
     if (!activeTabId) return Promise.resolve();
     return app.SetModeForTab(activeTabId, mode).then(() => {
-      if (mode === "yolo" && activeTabId) dispatchTo(activeTabId, { type: "clearApproval" });
+      if (modeHasAutoApproveTools(mode) && activeTabId) dispatchTo(activeTabId, { type: "clearApproval" });
     }).catch(() => {});
   }, [activeTabId, dispatchTo]);
 
+  const setCollaborationMode = useCallback(async (mode: CollaborationMode): Promise<void> => {
+    if (!activeTabId) return;
+    await app.SetCollaborationModeForTab(activeTabId, mode).catch(() => {});
+    await refreshMetaForTab(activeTabId, dispatchTo);
+  }, [activeTabId, dispatchTo]);
+
+  const setToolApprovalMode = useCallback(async (mode: ToolApprovalMode): Promise<void> => {
+    if (!activeTabId) return;
+    await app.SetToolApprovalModeForTab(activeTabId, mode).catch(() => {});
+    if (mode === "auto" || mode === "yolo") dispatchTo(activeTabId, { type: "clearApproval" });
+    await refreshMetaForTab(activeTabId, dispatchTo);
+  }, [activeTabId, dispatchTo]);
+
+  const setGoal = useCallback(async (goal: string): Promise<void> => {
+    if (!activeTabId) return;
+    await app.SetGoalForTab(activeTabId, goal).catch(() => {});
+    await refreshMetaForTab(activeTabId, dispatchTo);
+  }, [activeTabId, dispatchTo]);
+
+  const clearGoal = useCallback(async (): Promise<void> => {
+    if (!activeTabId) return;
+    await app.ClearGoalForTab(activeTabId).catch(() => {});
+    await refreshMetaForTab(activeTabId, dispatchTo);
+  }, [activeTabId, dispatchTo]);
+
   const newSession = useCallback(async () => {
     const tabId = activeTabId;
     if (tabId) bumpCheckpointRefreshSeq(tabId);
@@ -815,7 +884,7 @@ export function useController() {
   return {
     state: activeState,
     activeTabId,
-    send, runShell, notice, cancel, approve, answerQuestion, setControllerMode,
+    send, runShell, notice, cancel, approve, answerQuestion, setControllerMode, setCollaborationMode, setToolApprovalMode, setGoal, clearGoal,
     newSession, listSessions, listTrashedSessions, resumeSession, previewSession, deleteSession, restoreSession, purgeTrashedSession, renameSession,
     refreshMeta, pickWorkspace, switchWorkspace, compact, rewind, setModel, setEffort,
     fetchMemory, remember, forget, saveDoc,
diff --git a/desktop/frontend/src/lib/useMountTransition.ts b/desktop/frontend/src/lib/useMountTransition.ts
new file mode 100644
index 000000000..26d7e18ba
--- /dev/null
+++ b/desktop/frontend/src/lib/useMountTransition.ts
@@ -0,0 +1,97 @@
+import { useEffect, useRef, useState } from "react";
+
+// useMountTransition keeps a conditionally-rendered overlay mounted long enough
+// to play an exit animation. Callers flip `open`; the hook returns whether the
+// node should still be in the DOM (`mounted`) and its transition `status`,
+// which the component maps to a `data-state` attribute so CSS can drive both
+// the enter and the exit keyframes.
+//
+//   open  true  → mounted=true,  status "open"     (enter animation runs)
+//   open  false → mounted=true,  status "closing"  (exit animation runs)
+//   …after `duration` ms → mounted=false           (node unmounts)
+//
+// The exit timer is cancelled if `open` flips back to true mid-exit, so a
+// rapid close→open reuses the live node instead of unmounting it. Honors
+// prefers-reduced-motion by collapsing the exit delay to ~0, matching the
+// global reduced-motion rule that zeroes every animation.
+export type MountStatus = "open" | "closing";
+
+function prefersReducedMotion(): boolean {
+  if (typeof window === "undefined" || !window.matchMedia) return false;
+  return window.matchMedia("(prefers-reduced-motion: reduce)").matches;
+}
+
+export function useMountTransition(
+  open: boolean,
+  duration: number,
+): { mounted: boolean; status: MountStatus } {
+  const [mounted, setMounted] = useState(open);
+  const [status, setStatus] = useState<MountStatus>(open ? "open" : "closing");
+  const timerRef = useRef<number | null>(null);
+
+  const clearTimer = () => {
+    if (timerRef.current !== null) {
+      window.clearTimeout(timerRef.current);
+      timerRef.current = null;
+    }
+  };
+
+  useEffect(() => {
+    if (open) {
+      clearTimer();
+      setMounted(true);
+      // Defer the "open" status by a frame so the node mounts in its
+      // enter-from state before the enter animation is applied.
+      const raf = requestAnimationFrame(() => setStatus("open"));
+      return () => cancelAnimationFrame(raf);
+    }
+    if (!mounted) return;
+    setStatus("closing");
+    const wait = prefersReducedMotion() ? 0 : duration;
+    clearTimer();
+    timerRef.current = window.setTimeout(() => {
+      timerRef.current = null;
+      setMounted(false);
+    }, wait);
+    return undefined;
+  }, [open, mounted, duration]);
+
+  useEffect(() => () => clearTimer(), []);
+
+  return { mounted, status };
+}
+
+// useDeferredClose suits overlays whose mount is owned by a parent (rendered as
+// `{cond && <Panel onClose={...} />}`). The panel can't keep itself mounted, so
+// instead it defers the parent's unmount: `requestClose` flips `closing` true
+// (CSS plays the exit animation), then fires the real `onClose` after
+// `duration`. `status` maps to data-state exactly like useMountTransition, so
+// the same enter/exit CSS applies. Reduced-motion collapses the delay to ~0.
+export function useDeferredClose(
+  onClose: () => void,
+  duration: number,
+): { status: MountStatus; requestClose: () => void } {
+  const [closing, setClosing] = useState(false);
+  const timerRef = useRef<number | null>(null);
+  const onCloseRef = useRef(onClose);
+  onCloseRef.current = onClose;
+
+  const requestClose = () => {
+    if (timerRef.current !== null) return; // already closing
+    setClosing(true);
+    const wait = prefersReducedMotion() ? 0 : duration;
+    timerRef.current = window.setTimeout(() => {
+      timerRef.current = null;
+      onCloseRef.current();
+    }, wait);
+  };
+
+  useEffect(
+    () => () => {
+      if (timerRef.current !== null) window.clearTimeout(timerRef.current);
+    },
+    [],
+  );
+
+  return { status: closing ? "closing" : "open", requestClose };
+}
diff --git a/desktop/frontend/src/locales/en.ts b/desktop/frontend/src/locales/en.ts
index b899e2e6b..10f7977e8 100644
--- a/desktop/frontend/src/locales/en.ts
+++ b/desktop/frontend/src/locales/en.ts
@@ -35,31 +35,35 @@ export const en = {
   "tabBar.closeTabsToRight": "Close tabs to right",
   "tabBar.newSession": "New session",
   "tabBar.tabActions": "Tab actions",
+  "tabBar.commandSearch": "Search · Command · Open file",
+  "tabBar.commandSearchCompact": "Search",
 
   // sidebar
   "sidebar.conversations": "Chats",
   "sidebar.allHistory": "History",
   "sidebar.trash": "Trash",
+  "sidebar.memorySkills": "Memory & Skills",
   "sidebar.workspace": "Workspace",
   "sidebar.changeWorkspace": "Change",
   "sidebar.navigation": "Reasonix navigation",
-  "sidebar.collapse": "Collapse sidebar",
-  "sidebar.expand": "Expand sidebar",
-  "sidebar.expandBlocked": "Close the right file panel before expanding the sidebar",
-  "sidebar.resize": "Resize sidebar",
+  "sidebar.collapse": "Collapse navigation",
+  "sidebar.expand": "Expand navigation",
+  "sidebar.expandBlocked": "Close the workspace panel before expanding navigation",
+  "sidebar.resize": "Resize navigation",
   "drawer.resize": "Resize drawer",
 
   // right dock
-  "rightDock.resize": "Resize right panel",
-  "rightDock.expand": "Expand right workspace",
-  "rightDock.collapse": "Collapse right workspace",
-  "rightDock.workbench": "Right workbench",
-  "rightDock.views": "Right workbench views",
+  "rightDock.resize": "Resize workspace panel",
+  "rightDock.expand": "Expand workspace",
+  "rightDock.collapse": "Collapse workspace",
+  "rightDock.workbench": "Workspace panel",
+  "rightDock.views": "Workspace views",
   "rightDock.overview": "Overview",
 
   // topic bar
   "topicBar.renameSession": "Rename session",
   "topicBar.more": "More",
+  "topicBar.command": "Command",
   "topicBar.copyAll": "Copy session",
   "topicBar.export": "Export session",
   "topicBar.exportMarkdown": "Export Markdown",
@@ -216,27 +220,58 @@ export const en = {
   "caps.hideDiagnostics": "Hide diagnostic paths",
 
   // welcome / empty state
-  "welcome.tagline": "A coding agent — describe a task or ask anything.",
+  "welcome.title": "A coding agent",
+  "welcome.tagline": "Describe a task, or ask anything.",
   "welcome.hintCommands": "commands",
   "welcome.hintFiles": "reference files",
   "welcome.hintSend": "send",
   "welcome.ex1": "Explain this codebase's architecture",
   "welcome.ex2": "Summarize the recent git changes",
   "welcome.ex3": "Where is the agent run loop, and what does it do?",
+  "welcome.ex4": "Find and fix a bug in this project",
 
   // composer
-  "composer.placeholder": "Message Reasonix…  ( / commands · @ files )",
+  "composer.placeholder": "Message Reasonix…  ( / commands · @ files · ! shell )",
+  "composer.normalMode": "chat mode",
+  "composer.normalModeDesc": "Answer or work directly.",
   "composer.planMode": "plan mode",
   "composer.planModeOn": "plan mode on",
+  "composer.goalMode": "goal mode",
+  "composer.goalModeDesc": "Type a goal, then start goal mode.",
+  "composer.goalModeActiveDesc": "Keeps working until complete, blocked, or stopped.",
+  "composer.goalInputPlaceholder": "Enter a goal…",
+  "composer.goalInputRequired": "Enter a goal",
   "composer.planHint": "shift+tab",
   "composer.planHintExit": "shift+tab to exit",
+  "composer.modeAsk": "ask",
+  "composer.modeChat": "chat",
+  "composer.modeGoal": "goal",
   "composer.modeNormal": "auto",
   "composer.modePlan": "plan",
   "composer.modeYolo": "YOLO",
+  "composer.modeFullAccess": "full",
+  "composer.modeFullAccessTitle": "Full access skips all tool permission approvals; ask questions and plan confirmations still wait",
+  "composer.intentMenuTitle": "More actions",
+  "composer.accessMenuTitle": "Tool access",
+  "composer.accessAsk": "Ask first",
+  "composer.accessAskTitle": "Ask before approval-gated tool calls",
+  "composer.accessAskDesc": "Writes and shell commands request approval.",
+  "composer.accessAuto": "Auto approve",
+  "composer.accessAutoTitle": "Auto-approve ordinary tool permissions",
+  "composer.accessAutoDesc": "Auto-approves ordinary tool permissions; explicit ask/deny rules still apply.",
+  "composer.accessYolo": "YOLO approval",
+  "composer.accessYoloTitle": "YOLO approval skips all tool permission approvals",
+  "composer.accessYoloDesc": "Skips all tool permission approvals; ask questions and plan confirmations still wait.",
+  "composer.accessFull": "Full access",
+  "composer.accessFullTitle": "Full access skips all tool permission approvals",
+  "composer.accessFullDesc": "Skips tool permission approvals only; ask questions and plan confirmations still wait.",
+  "composer.planMenuTitle": "Collaboration",
+  "composer.planModeDesc": "Start with a read-only plan before writing.",
   "composer.modeHint": "shift+tab",
-  "composer.modeTitle": "Cycle run mode (shift+tab): auto → plan → yolo",
+  "composer.modeTitle": "Tool access menu; shift+tab toggles plan mode",
   "composer.enterPlanTitle": "Enter plan mode (shift+tab) — read-only; propose a plan before writing",
   "composer.exitPlanTitle": "Exit plan mode (shift+tab)",
+  "composer.exitGoalTitle": "Exit goal mode",
   "composer.searchProjects": "Search projects",
   "composer.noProjectMatches": "No matching projects",
   "composer.addProject": "Add new project",
@@ -246,6 +281,8 @@ export const en = {
   "composer.removeCurrentProjectDisabled": "Current project cannot be removed",
   "composer.resize": "Drag to resize composer, double-click to reset",
   "composer.send": "Send (Enter)",
+  "composer.shellMode": "Shell mode: prefix input with !",
+  "composer.shellModeOn": "Shell mode on: click to remove !",
   "composer.stop": "Stop (Esc)",
   "composer.stopShort": "Stop",
   "composer.pastedLabel": "[Pasted text #{id} · {lines} lines]",
@@ -260,8 +297,15 @@ export const en = {
 
   // status bar
   "status.connecting": "connecting…",
-  "status.ctx": "ctx {pct}%",
-  "status.compact": "compact {pct}%",
+  "status.ctxLabel": "ctx",
+  "status.sessionTurnsLabel": "session",
+  "status.sessionTurnsTitle": "Current session turns",
+  "status.compactLabel": "compact",
+  "status.cacheLabel": "turn hit",
+  "status.cacheAvgLabel": "avg",
+  "status.costLabel": "run",
+  "status.balanceLabel": "balance",
+  "status.jobsLabel": "jobs",
   "status.plan": "PLAN",
   "status.switchModel": "Switch model",
   "status.noModels": "no switchable models",
@@ -272,20 +316,13 @@ export const en = {
   "status.switchFolder": "{cwd}\nClick to switch project folder",
   "status.tokens": "tokens",
   "status.retrying": "retrying ({attempt}/{max})…",
-  "status.cache": "turn hit {pct}%",
-  "status.cacheAvg": "avg {pct}%",
-  "status.ctxUnknown": "ctx -",
-  "status.compactUnknown": "compact -",
-  "status.cost": "run {amount}",
   "status.balanceTitle": "Wallet balance",
-  "status.balance": "balance {amount}",
   "status.spendTitle": "Spent this session",
   "status.jobs": "{n} running",
-  "status.jobsCount": "jobs {n}",
   "status.jobsTitle": "Background jobs",
   "status.workspaceTitle": "Current workspace",
   "status.yolo": "YOLO",
-  "status.yoloTitle": "YOLO — approvals are being skipped this session",
+  "status.yoloTitle": "YOLO — tool approvals are being skipped; ask and plan decisions still wait",
 
   // approval modal
   "approval.planReady": "Plan ready",
@@ -379,6 +416,13 @@ export const en = {
   "projectTree.renameTopic": "Rename session",
   "projectTree.renameProject": "Rename display name",
   "projectTree.projectHistory": "View project history",
+  "projectTree.justNow": "just now",
+  "projectTree.running": "responding",
+  "projectTree.status.thinking": "thinking",
+  "projectTree.status.streaming": "responding",
+  "projectTree.status.waitingConfirmation": "waiting",
+  "projectTree.status.paused": "paused",
+  "projectTree.status.error": "error",
   "projectTree.removeProject": "Remove from sidebar",
   "projectTree.confirmRemoveProject": "Confirm remove from sidebar",
   "projectTree.copyPath": "Copy path",
@@ -400,6 +444,8 @@ export const en = {
   "projectTree.emptyNoProjects": "No projects yet",
   "projectTree.newTopicTooltip": "New session",
   "projectTree.addProjectTooltip": "Add new project",
+  "projectTree.collapseAllTooltip": "Collapse all projects",
+  "projectTree.restoreCollapsedTooltip": "Restore previous view",
 
   // memory drawer
   "memory.title": "Memory",
@@ -595,8 +641,8 @@ export const en = {
   "settings.modeAllow": "allow (auto-run writers)",
   "settings.modeDeny": "deny (block writers)",
   "settings.ruleForm": "Rule form: ToolName or ToolName(glob). Precedence: deny > ask > allow.",
-  "settings.yolo": "YOLO — skip all approvals (this session)",
-  "settings.yoloHint": "Auto-runs every tool call (writers, bash) without asking. Deny rules still block. Runtime-only — resets on relaunch.",
+  "settings.yolo": "YOLO — skip tool approvals (this session)",
+  "settings.yoloHint": "YOLO-approves approval-gated tool calls (writers, bash). Deny rules still block, and ask questions plus plan approvals still wait for you. Runtime-only — resets on relaunch.",
   "settings.addRule": "add {list} rule…",
   "settings.sandboxTitle": "Sandbox & workspace",
   "settings.bashSandbox": "Bash sandbox",
@@ -607,13 +653,42 @@ export const en = {
   "settings.workspaceDefault": "(default: cwd)",
   "settings.appearance": "Appearance",
   "settings.theme": "Theme",
-  "settings.themeStyle": "Accent",
+  "settings.themeStyle": "Visual style",
+  "settings.style.graphite.zh": "Graphite",
+  "settings.style.graphite.note": "Crisp",
+  "settings.style.graphite.desc": "Paper white, graphite text, and orange accents — restrained, editor-like workbench.",
+  "settings.style.aurora.zh": "Soft Aurora",
+  "settings.style.aurora.note": "Warm",
+  "settings.style.aurora.desc": "Misty violet surfaces with aurora blue-green accents, translucent panels, and springy radii.",
+  "settings.style.slate.zh": "Refined",
+  "settings.style.slate.note": "Native",
+  "settings.style.slate.desc": "Cool gray workbench with brand blue and crisp hairlines for dense professional scanning.",
+  "settings.style.carbon.zh": "Deep",
+  "settings.style.carbon.note": "Premium",
+  "settings.style.carbon.desc": "Warm charcoal and linen-gray surfaces with teal accents, richer texture, and long-focus contrast.",
+  "settings.style.nocturne.zh": "Soft",
+  "settings.style.nocturne.note": "Calm",
+  "settings.style.nocturne.desc": "Soft violet night and cloud-light surfaces with generous radii for calmer reading.",
+  "settings.style.amber.zh": "Amber",
+  "settings.style.amber.note": "Warm",
+  "settings.style.amber.desc": "Warm orange accent — bright and friendly (dark variant included).",
   "settings.themeAuto": "auto",
   "settings.themeLight": "light",
   "settings.themeDark": "dark",
   "settings.themeCurrent": "Theme: {theme} / {style}",
   "settings.themeChanged": "Theme changed to {theme} / {style}",
   "settings.themeUnknown": "Unknown theme: {name}",
+  "palette.placeholder": "Search sessions, commands, files…",
+  "palette.empty": "No matches",
+  "palette.group.commands": "Commands",
+  "palette.group.sessions": "Recent sessions",
+  "palette.cmd.newSession": "New session",
+  "palette.cmd.history": "History",
+  "palette.cmd.trash": "Trash",
+  "palette.cmd.settings": "Settings",
+  "palette.cmd.appearance": "Appearance",
+  "palette.cmd.memory": "Memory",
+  "palette.cmd.models": "Models",
   "settings.textSize": "Text size",
   "settings.textSizeSmall": "Small",
   "settings.textSizeDefault": "Default",
@@ -843,9 +918,15 @@ export const en = {
   // context panel
   "context.overview": "Session overview",
   "context.scopeGlobal": "Scope: Global",
-  "context.scopeProject": "Project · {name}",
+  "context.scopeProject": "Project scope · {name}",
+  "context.mockData": "Sample data",
+  "context.windowTitle": "Context window",
+  "context.windowSubtitle": "Current context window usage",
+  "context.runtimeMetrics": "Runtime",
+  "context.costMetrics": "Cost",
+  "context.sessionStatus": "Session status",
   "context.sessionChanges": "Session changes",
-  "context.referencedFiles": "Referenced files",
+  "context.referencedFiles": "Dependency files",
   "context.noChanges": "No changed files in this session yet",
   "context.noReads": "No files read in this session yet",
   "context.filterChanges": "Filter session changes...",
@@ -873,6 +954,7 @@ export const en = {
   "context.sessionCost": "Session cost",
   "context.requests": "Requests",
   "context.time": "Time",
+  "context.compaction": "Compaction",
   "context.durationSeconds": "{seconds}s",
   "context.durationMinutesSeconds": "{minutes}m {seconds}s",
 
@@ -901,6 +983,7 @@ export const en = {
   "mock.topicHotfix": "20260522 post-p3-hotfix P&D",
   "mock.topicSysCoord": "01 JoyQuant-SYS project coordination",
   "mock.topicSysStandard": "00 Establish project dev standards",
+  "mock.topicSysException": "Exception handling recovery drill",
   "mock.topicProduct": "Common product specs",
   "mock.topicAi": "AI engineering best practices",
   "mock.topicLab": "Exploratory experiments",
diff --git a/desktop/frontend/src/locales/zh.ts b/desktop/frontend/src/locales/zh.ts
index ff212e778..ff2229bee 100644
--- a/desktop/frontend/src/locales/zh.ts
+++ b/desktop/frontend/src/locales/zh.ts
@@ -36,31 +36,35 @@ export const zh: Record<DictKey, string> = {
   "tabBar.closeTabsToRight": "关闭右侧标签页",
   "tabBar.newSession": "新建会话",
   "tabBar.tabActions": "标签页操作",
+  "tabBar.commandSearch": "搜索 · 命令 · 打开文件",
+  "tabBar.commandSearchCompact": "搜索",
 
   // 侧边栏
   "sidebar.conversations": "会话",
   "sidebar.allHistory": "历史",
   "sidebar.trash": "回收站",
+  "sidebar.memorySkills": "记忆与技能",
   "sidebar.workspace": "工作区",
   "sidebar.changeWorkspace": "更改",
   "sidebar.navigation": "Reasonix 导航",
-  "sidebar.collapse": "收起侧边栏",
-  "sidebar.expand": "展开侧边栏",
-  "sidebar.expandBlocked": "关闭右侧文件面板后可展开侧边栏",
-  "sidebar.resize": "调整侧边栏宽度",
+  "sidebar.collapse": "收起导航",
+  "sidebar.expand": "展开导航",
+  "sidebar.expandBlocked": "关闭工作区面板后可展开导航",
+  "sidebar.resize": "调整导航栏宽度",
   "drawer.resize": "调整抽屉宽度",
 
   // 右侧停靠区
-  "rightDock.resize": "调整右侧面板宽度",
-  "rightDock.expand": "展开右侧工作区",
-  "rightDock.collapse": "收起右侧工作区",
-  "rightDock.workbench": "右侧工作台",
-  "rightDock.views": "右侧工作台视图",
+  "rightDock.resize": "调整工作区面板宽度",
+  "rightDock.expand": "展开工作区",
+  "rightDock.collapse": "收起工作区",
+  "rightDock.workbench": "工作区面板",
+  "rightDock.views": "工作区视图",
   "rightDock.overview": "概览",
 
   // 话题栏
   "topicBar.renameSession": "重命名会话",
   "topicBar.more": "更多",
+  "topicBar.command": "命令",
   "topicBar.copyAll": "复制会话",
   "topicBar.export": "导出会话",
   "topicBar.exportMarkdown": "导出 Markdown",
@@ -217,27 +221,58 @@ export const zh: Record<DictKey, string> = {
   "caps.hideDiagnostics": "隐藏诊断路径",
 
   // 欢迎 / 空状态
-  "welcome.tagline": "一个编码智能体 —— 描述任务或随便问点什么。",
+  "welcome.title": "一个编码智能体",
+  "welcome.tagline": "描述任务，或随便问点什么。",
   "welcome.hintCommands": "命令",
   "welcome.hintFiles": "引用文件",
   "welcome.hintSend": "发送",
   "welcome.ex1": "讲讲这个代码库的架构",
   "welcome.ex2": "总结最近的 git 改动",
   "welcome.ex3": "智能体的运行主循环在哪，它做了什么？",
+  "welcome.ex4": "找出并修复这个项目里的一个 bug",
 
   // 输入框
-  "composer.placeholder": "给 Reasonix 发消息…  ( / 命令 · @ 文件 )",
+  "composer.placeholder": "给 Reasonix 发消息…  ( / 命令 · @ 文件 · ! 终端 )",
+  "composer.normalMode": "对话模式",
+  "composer.normalModeDesc": "直接对话或执行任务。",
   "composer.planMode": "计划模式",
   "composer.planModeOn": "计划模式已开",
+  "composer.goalMode": "目标模式",
+  "composer.goalModeDesc": "先输入目标，再点目标启动。",
+  "composer.goalModeActiveDesc": "会自动推进，直到完成、阻塞或停止。",
+  "composer.goalInputPlaceholder": "请输入目标…",
+  "composer.goalInputRequired": "请输入目标",
   "composer.planHint": "shift+tab",
   "composer.planHintExit": "shift+tab 退出",
-  "composer.modeNormal": "auto",
-  "composer.modePlan": "plan",
-  "composer.modeYolo": "YOLO",
+  "composer.modeAsk": "询问",
+  "composer.modeChat": "对话",
+  "composer.modeGoal": "目标",
+  "composer.modeNormal": "自动",
+  "composer.modePlan": "计划",
+  "composer.modeYolo": "Yolo",
+  "composer.modeFullAccess": "完全",
+  "composer.modeFullAccessTitle": "完全访问会跳过所有工具权限审批；ask 问题和计划确认仍会等待",
+  "composer.intentMenuTitle": "更多动作",
+  "composer.accessMenuTitle": "工具权限",
+  "composer.accessAsk": "需要批准",
+  "composer.accessAskTitle": "工具调用前请求批准",
+  "composer.accessAskDesc": "写文件、跑命令等操作会先询问。",
+  "composer.accessAuto": "自动批准",
+  "composer.accessAutoTitle": "自动批准普通工具权限",
+  "composer.accessAutoDesc": "自动批准普通工具权限；显式 ask/deny 规则仍生效。",
+  "composer.accessYolo": "Yolo批准",
+  "composer.accessYoloTitle": "Yolo批准会跳过所有工具权限审批",
+  "composer.accessYoloDesc": "跳过所有工具权限审批；ask 问题和计划确认仍会等待。",
+  "composer.accessFull": "完全访问",
+  "composer.accessFullTitle": "完全访问会跳过所有工具权限审批",
+  "composer.accessFullDesc": "只跳过工具权限审批；ask 问题和计划确认仍会等待。",
+  "composer.planMenuTitle": "协作方式",
+  "composer.planModeDesc": "先只读产出计划，确认后再写入。",
   "composer.modeHint": "shift+tab",
-  "composer.modeTitle": "切换运行模式（shift+tab）：auto → plan → yolo",
+  "composer.modeTitle": "工具权限菜单；shift+tab 只切计划模式",
   "composer.enterPlanTitle": "进入计划模式（shift+tab）—— 只读；先给出计划再动手",
   "composer.exitPlanTitle": "退出计划模式（shift+tab）",
+  "composer.exitGoalTitle": "退出目标模式",
   "composer.searchProjects": "搜索项目",
   "composer.noProjectMatches": "没有匹配的项目",
   "composer.addProject": "添加新项目",
@@ -247,6 +282,8 @@ export const zh: Record<DictKey, string> = {
   "composer.removeCurrentProjectDisabled": "不能移除当前项目",
   "composer.resize": "拖动调整输入区高度，双击重置",
   "composer.send": "发送（Enter）",
+  "composer.shellMode": "Shell 模式：给输入前加 !",
+  "composer.shellModeOn": "Shell 模式已开：点击移除 !",
   "composer.stop": "停止（Esc）",
   "composer.stopShort": "停止",
   "composer.pastedLabel": "[已粘贴文本 #{id} · {lines} 行]",
@@ -261,8 +298,15 @@ export const zh: Record<DictKey, string> = {
 
   // 状态栏
   "status.connecting": "连接中…",
-  "status.ctx": "上下文 {pct}%",
-  "status.compact": "压缩 {pct}%",
+  "status.ctxLabel": "上下文",
+  "status.sessionTurnsLabel": "当前会话",
+  "status.sessionTurnsTitle": "当前会话轮数",
+  "status.compactLabel": "压缩",
+  "status.cacheLabel": "本次命中",
+  "status.cacheAvgLabel": "平均",
+  "status.costLabel": "本次",
+  "status.balanceLabel": "余额",
+  "status.jobsLabel": "任务",
   "status.plan": "计划",
   "status.switchModel": "切换模型",
   "status.noModels": "没有可切换模型",
@@ -273,20 +317,13 @@ export const zh: Record<DictKey, string> = {
   "status.switchFolder": "{cwd}\n点击切换项目目录",
   "status.tokens": "tokens",
   "status.retrying": "正在重试 ({attempt}/{max})…",
-  "status.cache": "本次命中 {pct}%",
-  "status.cacheAvg": "平均 {pct}%",
-  "status.ctxUnknown": "上下文 -",
-  "status.compactUnknown": "压缩 -",
-  "status.cost": "本次 {amount}",
   "status.balanceTitle": "钱包余额",
-  "status.balance": "余额 {amount}",
   "status.spendTitle": "本会话花费",
   "status.jobs": "{n} 个运行中",
-  "status.jobsCount": "任务 {n}",
   "status.jobsTitle": "后台作业",
   "status.workspaceTitle": "当前工作区",
   "status.yolo": "YOLO",
-  "status.yoloTitle": "YOLO —— 本会话正在跳过所有批准",
+  "status.yoloTitle": "YOLO —— 正在跳过工具批准；ask 与计划确认仍会等待",
 
   // 审批弹窗
   "approval.planReady": "计划已就绪",
@@ -380,6 +417,13 @@ export const zh: Record<DictKey, string> = {
   "projectTree.renameTopic": "重命名会话",
   "projectTree.renameProject": "修改显示名称",
   "projectTree.projectHistory": "查看项目历史",
+  "projectTree.justNow": "刚刚",
+  "projectTree.running": "输出中",
+  "projectTree.status.thinking": "思考中",
+  "projectTree.status.streaming": "输出中",
+  "projectTree.status.waitingConfirmation": "待确认",
+  "projectTree.status.paused": "已暂停",
+  "projectTree.status.error": "异常",
   "projectTree.removeProject": "移出侧边栏",
   "projectTree.confirmRemoveProject": "确认移出侧边栏",
   "projectTree.copyPath": "复制路径",
@@ -401,6 +445,8 @@ export const zh: Record<DictKey, string> = {
   "projectTree.emptyNoProjects": "还没有项目",
   "projectTree.newTopicTooltip": "新建会话",
   "projectTree.addProjectTooltip": "添加新项目",
+  "projectTree.collapseAllTooltip": "收起所有项目",
+  "projectTree.restoreCollapsedTooltip": "恢复上次展开",
 
   // 记忆抽屉
   "memory.title": "记忆",
@@ -597,8 +643,8 @@ export const zh: Record<DictKey, string> = {
   "settings.modeAllow": "allow（自动执行写操作）",
   "settings.modeDeny": "deny（阻止写操作）",
   "settings.ruleForm": "规则格式：ToolName 或 ToolName(glob)。优先级：deny > ask > allow。",
-  "settings.yolo": "YOLO —— 跳过所有批准（仅本会话）",
-  "settings.yoloHint": "所有工具调用（写文件、bash）自动执行、不再询问。deny 规则仍会拦截。仅运行时生效，重启后失效。",
+  "settings.yolo": "YOLO —— 跳过工具批准（仅本会话）",
+  "settings.yoloHint": "Yolo批准会跳过所有工具权限审批（写文件、bash）。deny 规则仍会拦截，ask 问题和计划确认仍会等待你选择。仅运行时生效，重启后失效。",
   "settings.addRule": "添加 {list} 规则…",
   "settings.sandboxTitle": "沙箱与工作区",
   "settings.bashSandbox": "Bash 沙箱",
@@ -609,13 +655,42 @@ export const zh: Record<DictKey, string> = {
   "settings.workspaceDefault": "（默认：当前目录）",
   "settings.appearance": "外观",
   "settings.theme": "主题",
-  "settings.themeStyle": "强调色",
+  "settings.themeStyle": "视觉风格",
+  "settings.style.graphite.zh": "石墨",
+  "settings.style.graphite.note": "利落",
+  "settings.style.graphite.desc": "纸面白配石墨文字与橙色强调,利落、克制,贴近编辑器工作台。",
+  "settings.style.aurora.zh": "柔雾极光",
+  "settings.style.aurora.note": "温润",
+  "settings.style.aurora.desc": "柔紫底色融合极光蓝绿,半透明面板与弹性圆角,更轻盈、有呼吸感。",
+  "settings.style.slate.zh": "精炼",
+  "settings.style.slate.note": "原生",
+  "settings.style.slate.desc": "冷灰工作台配品牌蓝,发丝边框清晰,适合高密度扫描与专业操作。",
+  "settings.style.carbon.zh": "深邃",
+  "settings.style.carbon.note": "高级",
+  "settings.style.carbon.desc": "暖炭黑与米灰表面配青绿强调,质感更厚、对比更足,适合长时间专注。",
+  "settings.style.nocturne.zh": "柔和",
+  "settings.style.nocturne.note": "呼吸",
+  "settings.style.nocturne.desc": "柔紫夜色和云白表面配大圆角留白,阅读更安静,节奏更舒缓。",
+  "settings.style.amber.zh": "琥珀",
+  "settings.style.amber.note": "暖阳",
+  "settings.style.amber.desc": "暖橙强调色,明亮亲和(含深色变体)。",
   "settings.themeAuto": "自动",
   "settings.themeLight": "浅色",
   "settings.themeDark": "深色",
   "settings.themeCurrent": "当前主题：{theme} / {style}",
   "settings.themeChanged": "已切换主题为 {theme} / {style}",
   "settings.themeUnknown": "未知主题：{name}",
+  "palette.placeholder": "搜索会话、命令、文件…",
+  "palette.empty": "没有匹配项",
+  "palette.group.commands": "命令",
+  "palette.group.sessions": "最近会话",
+  "palette.cmd.newSession": "新建会话",
+  "palette.cmd.history": "历史",
+  "palette.cmd.trash": "回收站",
+  "palette.cmd.settings": "设置",
+  "palette.cmd.appearance": "外观",
+  "palette.cmd.memory": "记忆",
+  "palette.cmd.models": "模型",
   "settings.textSize": "字号",
   "settings.textSizeSmall": "小",
   "settings.textSizeDefault": "默认",
@@ -845,9 +920,15 @@ export const zh: Record<DictKey, string> = {
   // 上下文面板
   "context.overview": "当前会话概览",
   "context.scopeGlobal": "范围：全局",
-  "context.scopeProject": "项目 · {name}",
+  "context.scopeProject": "所属项目 · {name}",
+  "context.mockData": "示例数据",
+  "context.windowTitle": "上下文窗口",
+  "context.windowSubtitle": "当前上下文窗口占用",
+  "context.runtimeMetrics": "运行指标",
+  "context.costMetrics": "成本",
+  "context.sessionStatus": "会话状态",
   "context.sessionChanges": "本会话变更",
-  "context.referencedFiles": "依据文件",
+  "context.referencedFiles": "依赖文件",
   "context.noChanges": "当前会话还没有变更文件",
   "context.noReads": "当前会话还没有读取文件",
   "context.filterChanges": "筛选本会话变更文件...",
@@ -875,6 +956,7 @@ export const zh: Record<DictKey, string> = {
   "context.sessionCost": "本次费用",
   "context.requests": "请求数",
   "context.time": "耗时",
+  "context.compaction": "压缩状态",
   "context.durationSeconds": "{seconds}秒",
   "context.durationMinutesSeconds": "{minutes}分{seconds}秒",
 
@@ -903,6 +985,7 @@ export const zh: Record<DictKey, string> = {
   "mock.topicHotfix": "20260522 post-p3-hotfix P&D",
   "mock.topicSysCoord": "01 JoyQuant-SYS 项目总协调",
   "mock.topicSysStandard": "00 制定项目开发规范",
+  "mock.topicSysException": "异常处理与恢复演练",
   "mock.topicProduct": "产品通用规范",
   "mock.topicAi": "AI 工程化最佳实践",
   "mock.topicLab": "临时探索与实验",
diff --git a/desktop/frontend/src/styles.css b/desktop/frontend/src/styles.css
index 068009e09..38c7e94bf 100644
--- a/desktop/frontend/src/styles.css
+++ b/desktop/frontend/src/styles.css
@@ -58,14 +58,18 @@
   /* brand + semantic */
   --accent: #d97757;
   --accent-fg: #1a0f0a;
+  --accent-text: var(--accent-fg);
   --accent-soft: rgba(217, 119, 87, 0.14);
   --accent-strong: #e58a6b;
+  --grad: linear-gradient(120deg, var(--accent), var(--accent-strong));
   --ok: #74b87a;
   --warn: #d9a441;
   --err: #e0696a;
   --danger: #e5484d;
   --danger-fg: #fff;
   --shell-accent: #22c55e;
+  --shadow-1: 0 1px 2px rgba(0, 0, 0, 0.22);
+  --shadow-2: 0 14px 40px rgba(0, 0, 0, 0.28);
 
   /* z-index scale */
   --z-local-raised: 2;
@@ -144,9 +148,9 @@
   --mode-auto-bg: #2f6de8;
   --mode-auto-border: #3978f0;
   --mode-auto-fg: #fff;
-  --mode-plan-bg: #d59632;
-  --mode-plan-border: #e0a542;
-  --mode-plan-fg: #170d03;
+  --mode-plan-bg: var(--accent-soft);
+  --mode-plan-border: color-mix(in srgb, var(--accent) 32%, var(--border));
+  --mode-plan-fg: var(--accent);
   --mode-yolo-bg: #f04b52;
   --mode-yolo-border: #ff6268;
   --mode-yolo-fg: #fff;
@@ -167,6 +171,21 @@
   --hl-builtin: #56b6c2;
   --hl-meta: #7f848e;
 
+  /* motion — shared timing + easing tokens. Durations mirror the values
+   * already used across the app (0.12 / 0.18 / 0.34 / 0.42s); easings reuse the
+   * existing curves. The global prefers-reduced-motion block at EOF collapses
+   * every animation/transition to ~0ms, so these tokens are safe to reuse
+   * freely without per-rule reduce overrides. */
+  --dur-fast: 120ms; /* color/border hovers, tooltips */
+  --dur-base: 180ms; /* popovers, menus, small enters */
+  --dur-slow: 340ms; /* drawers, modals, panel slides */
+  --dur-slower: 420ms; /* large overlay fades */
+  --ease-out: cubic-bezier(0.2, 0.72, 0.2, 1); /* fast-out / decelerate */
+  --ease-decelerate: cubic-bezier(0.2, 0.7, 0.1, 1); /* soft landing (splash) */
+  --ease-standard: cubic-bezier(0.25, 0.1, 0.25, 1); /* symmetric */
+  --motion-pop-scale: 0.98; /* enter-from scale for popovers/palette */
+  --motion-rise: 4px; /* enter-from translateY for popovers/menus */
+
   --radius: 9px;
   --maxw: 940px;
   --mono: ui-monospace, "SF Mono", SFMono-Regular, "Cascadia Code", Consolas,
@@ -249,9 +268,9 @@
     --mode-auto-bg: #2f5fa8;
     --mode-auto-border: #386dbb;
     --mode-auto-fg: #fff;
-    --mode-plan-bg: #c98524;
-    --mode-plan-border: #d89531;
-    --mode-plan-fg: #fff;
+    --mode-plan-bg: var(--accent-soft);
+    --mode-plan-border: color-mix(in srgb, var(--accent) 32%, var(--border));
+    --mode-plan-fg: var(--accent);
     --mode-yolo-bg: #e5484d;
     --mode-yolo-border: #ed5d62;
     --mode-yolo-fg: #fff;
@@ -313,9 +332,9 @@
   --mode-auto-bg: #2f5fa8;
   --mode-auto-border: #386dbb;
   --mode-auto-fg: #fff;
-  --mode-plan-bg: #c98524;
-  --mode-plan-border: #d89531;
-  --mode-plan-fg: #fff;
+  --mode-plan-bg: var(--accent-soft);
+  --mode-plan-border: color-mix(in srgb, var(--accent) 32%, var(--border));
+  --mode-plan-fg: var(--accent);
   --mode-yolo-bg: #e5484d;
   --mode-yolo-border: #ed5d62;
   --mode-yolo-fg: #fff;
@@ -325,53 +344,1050 @@
   color-scheme: dark;
 }
 
+/* Theme styles are "directions" — graphite / aurora / slate / carbon /
+   nocturne / amber — and each is independent of light/dark. Dark accent (brighter, dark fg) is the
+   default for every direction; the light accent is applied when the user
+   forces light (data-theme="light") or when auto-mode resolves to OS light.
+   Order: default-dark block, then forced-light override, then prefers-light
+   override (for auto / no data-theme). */
+
+/* ---- Graphite — paper, hairline borders, orange accent (desktop default). ---- */
 :root[data-theme-style="graphite"] {
-  --accent: #d97757;
-  --accent-fg: #1a0f0a;
-  --accent-soft: rgba(217, 119, 87, 0.14);
-  --accent-strong: #e58a6b;
+  --stage: #08090c;
+  --surface: #15161a;
+  --surface-2: #191a1f;
+  --surface-3: #101115;
+  --panel: #15161a;
+  --bg: #0c0d10;
+  --bg-soft: #101115;
+  --bg-elev: #15161a;
+  --bg-elev-2: #191a1f;
+  --sidebar-bg: #15161a;
+  --sidebar-hover: #1f2026;
+  --sidebar-active: rgba(255, 106, 61, 0.16);
+  --chat-bg: #0c0d10;
+  --workspace-preview-bg: #101115;
+  --workspace-files-bg: #15161a;
+  --workspace-files-hover: #202126;
+  --workspace-selection-bg: rgba(255, 106, 61, 0.16);
+  --workspace-selection-fg: #ff9a52;
+  --workspace-selection-bar: #ff6a3d;
+  --border: rgba(255, 255, 255, 0.1);
+  --border-2: rgba(255, 255, 255, 0.2);
+  --border-soft: rgba(255, 255, 255, 0.07);
+  --text: #f1f1ef;
+  --text-2: #a7a8ad;
+  --text-3: #6c6e74;
+  --fg: #f1f1ef;
+  --fg-dim: #a7a8ad;
+  --fg-faint: #6c6e74;
+  --accent: #ff6a3d;
+  --accent-fg: #0c0d10;
+  --accent-text: #ffffff;
+  --accent-soft: rgba(255, 106, 61, 0.16);
+  --accent-strong: #ff9a52;
+  --ok: #3ad17e;
+  --warn: #e3a23a;
+  --err: #f0573f;
+  --control-primary-bg: #ff6a3d;
+  --control-primary-fg: #0c0d10;
+  --code-bg: #101115;
+  --grad: linear-gradient(120deg, #ff6a3d, #ff9a52);
+  --shadow-1: 0 1px 2px rgba(0, 0, 0, 0.5);
+  --shadow-2: 0 14px 40px rgba(0, 0, 0, 0.6);
+  --r-s: 5px;
+  --r: 8px;
+  --r-l: 11px;
+  --radius: 8px;
+}
+:root[data-theme="light"][data-theme-style="graphite"] {
+  --stage: #e6e6e1;
+  --surface: #ffffff;
+  --surface-2: #ffffff;
+  --surface-3: #f0efe9;
+  --panel: #ffffff;
+  --bg: #f4f3ef;
+  --bg-soft: #f0efe9;
+  --bg-elev: #ffffff;
+  --bg-elev-2: #f6f5f1;
+  --sidebar-bg: #ffffff;
+  --sidebar-hover: #f0efe9;
+  --sidebar-active: rgba(255, 90, 44, 0.12);
+  --chat-bg: #f4f3ef;
+  --workspace-preview-bg: #ffffff;
+  --workspace-files-bg: #ffffff;
+  --workspace-files-hover: #f0efe9;
+  --workspace-selection-bg: rgba(255, 90, 44, 0.12);
+  --workspace-selection-fg: #ff5a2c;
+  --workspace-selection-bar: #ff5a2c;
+  --border: rgba(20, 22, 28, 0.12);
+  --border-2: rgba(20, 22, 28, 0.24);
+  --border-soft: rgba(20, 22, 28, 0.08);
+  --text: #16181d;
+  --text-2: #4a4d56;
+  --text-3: #85888f;
+  --fg: #16181d;
+  --fg-dim: #4a4d56;
+  --fg-faint: #85888f;
+  --accent: #ff5a2c;
+  --accent-fg: #ffffff;
+  --accent-soft: rgba(255, 90, 44, 0.12);
+  --accent-strong: #df471f;
+  --ok: #1f9d57;
+  --warn: #d98a1f;
+  --err: #d83a2a;
+  --control-primary-bg: #ff5a2c;
+  --control-primary-fg: #ffffff;
+  --control-disabled-bg: #eceae4;
+  --control-disabled-fg: #85888f;
+  --button-bg: #ffffff;
+  --button-bg-hover: #f6f5f1;
+  --button-border: rgba(20, 22, 28, 0.12);
+  --button-border-hover: rgba(20, 22, 28, 0.24);
+  --pill-bg: #ffffff;
+  --pill-border: rgba(20, 22, 28, 0.12);
+  --pill-hover-bg: #f6f5f1;
+  --list-row-hover-bg: #f0efe9;
+  --list-row-current-bg: rgba(255, 90, 44, 0.1);
+  --list-row-current-title: #16181d;
+  --list-row-current-meta: #ff5a2c;
+  --tree-row-hover-bg: #f0efe9;
+  --tree-row-current-bg: rgba(255, 90, 44, 0.1);
+  --tree-row-current-fg: #16181d;
+  --tree-row-current-icon: #4a4d56;
+  --add-bg: rgba(31, 157, 87, 0.1);
+  --add-fg: #1f9d57;
+  --del-bg: rgba(216, 58, 42, 0.1);
+  --del-fg: #d83a2a;
+  --code-bg: #f6f5f1;
+  --focus-ring: 0 0 0 3px rgba(255, 90, 44, 0.16);
+  --grad: linear-gradient(120deg, #ff5a2c, #ff8a3d);
+  --shadow-1: 0 1px 2px rgba(20, 22, 28, 0.06);
+  --shadow-2: 0 12px 34px rgba(20, 22, 28, 0.14);
+  --r-s: 5px;
+  --r: 8px;
+  --r-l: 11px;
 }
-:root[data-theme-style="ember"] {
-  --accent: #f06d38;
-  --accent-fg: #1b0a04;
-  --accent-soft: rgba(240, 109, 56, 0.16);
-  --accent-strong: #ff8c5d;
+@media (prefers-color-scheme: light) {
+  :root[data-theme-style="graphite"]:not([data-theme]) {
+    --stage: #e6e6e1;
+    --surface: #ffffff;
+    --surface-2: #ffffff;
+    --surface-3: #f0efe9;
+    --panel: #ffffff;
+    --bg: #f4f3ef;
+    --bg-soft: #f0efe9;
+    --bg-elev: #ffffff;
+    --bg-elev-2: #f6f5f1;
+    --sidebar-bg: #ffffff;
+    --sidebar-hover: #f0efe9;
+    --sidebar-active: rgba(255, 90, 44, 0.12);
+    --chat-bg: #f4f3ef;
+    --workspace-preview-bg: #ffffff;
+    --workspace-files-bg: #ffffff;
+    --workspace-files-hover: #f0efe9;
+    --workspace-selection-bg: rgba(255, 90, 44, 0.12);
+    --workspace-selection-fg: #ff5a2c;
+    --workspace-selection-bar: #ff5a2c;
+    --border: rgba(20, 22, 28, 0.12);
+    --border-2: rgba(20, 22, 28, 0.24);
+    --border-soft: rgba(20, 22, 28, 0.08);
+    --text: #16181d;
+    --text-2: #4a4d56;
+    --text-3: #85888f;
+    --fg: #16181d;
+    --fg-dim: #4a4d56;
+    --fg-faint: #85888f;
+    --accent: #ff5a2c;
+    --accent-fg: #ffffff;
+    --accent-soft: rgba(255, 90, 44, 0.12);
+    --accent-strong: #df471f;
+    --ok: #1f9d57;
+    --warn: #d98a1f;
+    --err: #d83a2a;
+    --control-primary-bg: #ff5a2c;
+    --control-primary-fg: #ffffff;
+    --control-disabled-bg: #eceae4;
+    --control-disabled-fg: #85888f;
+    --button-bg: #ffffff;
+    --button-bg-hover: #f6f5f1;
+    --button-border: rgba(20, 22, 28, 0.12);
+    --button-border-hover: rgba(20, 22, 28, 0.24);
+    --pill-bg: #ffffff;
+    --pill-border: rgba(20, 22, 28, 0.12);
+    --pill-hover-bg: #f6f5f1;
+    --list-row-hover-bg: #f0efe9;
+    --list-row-current-bg: rgba(255, 90, 44, 0.1);
+    --list-row-current-title: #16181d;
+    --list-row-current-meta: #ff5a2c;
+    --tree-row-hover-bg: #f0efe9;
+    --tree-row-current-bg: rgba(255, 90, 44, 0.1);
+    --tree-row-current-fg: #16181d;
+    --tree-row-current-icon: #4a4d56;
+    --add-bg: rgba(31, 157, 87, 0.1);
+    --add-fg: #1f9d57;
+    --del-bg: rgba(216, 58, 42, 0.1);
+    --del-fg: #d83a2a;
+    --code-bg: #f6f5f1;
+    --focus-ring: 0 0 0 3px rgba(255, 90, 44, 0.16);
+    --grad: linear-gradient(120deg, #ff5a2c, #ff8a3d);
+    --shadow-1: 0 1px 2px rgba(20, 22, 28, 0.06);
+    --shadow-2: 0 12px 34px rgba(20, 22, 28, 0.14);
+    --r-s: 5px;
+    --r: 8px;
+    --r-l: 11px;
+  }
 }
+
+/* ---- Aurora — misty violet surfaces with blue-green glow. ---- */
 :root[data-theme-style="aurora"] {
-  --accent: #34c3a6;
-  --accent-fg: #031613;
-  --accent-soft: rgba(52, 195, 166, 0.16);
-  --accent-strong: #5dd7bf;
-}
-:root[data-theme-style="midnight"] {
-  --accent: #b18cff;
-  --accent-fg: #10091e;
-  --accent-soft: rgba(177, 140, 255, 0.16);
-  --accent-strong: #c4a8ff;
-}
-:root[data-theme-style="sandstone"] {
-  --accent: #c2613f;
-  --accent-fg: #fff;
-  --accent-soft: rgba(194, 97, 63, 0.12);
-  --accent-strong: #a94f30;
+  --stage: #07060d;
+  --surface: #17162a;
+  --surface-2: #1d1b34;
+  --surface-3: #121120;
+  --panel: rgba(23, 22, 42, 0.72);
+  --bg: #0e0d18;
+  --bg-soft: #121120;
+  --bg-elev: #17162a;
+  --bg-elev-2: #1d1b34;
+  --sidebar-bg: #17162a;
+  --sidebar-hover: #201f38;
+  --sidebar-active: rgba(139, 124, 255, 0.18);
+  --chat-bg: #0e0d18;
+  --workspace-preview-bg: #121120;
+  --workspace-files-bg: #17162a;
+  --workspace-files-hover: #22213d;
+  --workspace-selection-bg: rgba(139, 124, 255, 0.18);
+  --workspace-selection-fg: #b07cff;
+  --workspace-selection-bar: #8b7cff;
+  --border: rgba(255, 255, 255, 0.07);
+  --border-2: rgba(255, 255, 255, 0.14);
+  --border-soft: rgba(255, 255, 255, 0.055);
+  --text: #ecebf7;
+  --text-2: #a9a4c6;
+  --text-3: #726c8c;
+  --fg: #ecebf7;
+  --fg-dim: #a9a4c6;
+  --fg-faint: #726c8c;
+  --accent: #8b7cff;
+  --accent-fg: #0e0d18;
+  --accent-text: #ffffff;
+  --accent-soft: rgba(139, 124, 255, 0.18);
+  --accent-strong: #38d6e6;
+  --ok: #34d399;
+  --warn: #f0b84e;
+  --err: #f0795f;
+  --control-primary-bg: #8b7cff;
+  --control-primary-fg: #0e0d18;
+  --button-bg: #17162a;
+  --button-bg-hover: #1d1b34;
+  --button-border: rgba(255, 255, 255, 0.07);
+  --button-border-hover: rgba(255, 255, 255, 0.14);
+  --pill-bg: #17162a;
+  --pill-border: rgba(255, 255, 255, 0.07);
+  --pill-hover-bg: #1d1b34;
+  --list-row-hover-bg: #201f38;
+  --list-row-current-bg: rgba(139, 124, 255, 0.16);
+  --list-row-current-title: #ecebf7;
+  --list-row-current-meta: #b07cff;
+  --tree-row-hover-bg: #201f38;
+  --tree-row-current-bg: rgba(139, 124, 255, 0.16);
+  --tree-row-current-fg: #ecebf7;
+  --tree-row-current-icon: #a9a4c6;
+  --add-bg: rgba(52, 211, 153, 0.12);
+  --add-fg: #34d399;
+  --del-bg: rgba(240, 121, 95, 0.12);
+  --del-fg: #f0795f;
+  --code-bg: #0f0e1c;
+  --focus-ring: 0 0 0 3px rgba(139, 124, 255, 0.2);
+  --grad: linear-gradient(120deg, #8b7cff, #b07cff 42%, #38d6e6);
+  --shadow-1: 0 1px 2px rgba(0, 0, 0, 0.4), 0 12px 34px rgba(0, 0, 0, 0.46);
+  --shadow-2: 0 24px 70px rgba(0, 0, 0, 0.62);
+  --r-s: 10px;
+  --r: 15px;
+  --r-l: 22px;
+  --radius: 12px;
+}
+:root[data-theme="light"][data-theme-style="aurora"] {
+  --stage: #e7e2f3;
+  --surface: #fdfcff;
+  --surface-2: #ffffff;
+  --surface-3: #efeaf8;
+  --panel: rgba(253, 252, 255, 0.74);
+  --bg: #f6f3fb;
+  --bg-soft: #efeaf8;
+  --bg-elev: #fdfcff;
+  --bg-elev-2: #ffffff;
+  --sidebar-bg: #fdfcff;
+  --sidebar-hover: #efeaf8;
+  --sidebar-active: rgba(109, 94, 252, 0.12);
+  --chat-bg: #f6f3fb;
+  --workspace-preview-bg: #fdfcff;
+  --workspace-files-bg: #fdfcff;
+  --workspace-files-hover: #efeaf8;
+  --workspace-selection-bg: rgba(109, 94, 252, 0.12);
+  --workspace-selection-fg: #6d5efc;
+  --workspace-selection-bar: #6d5efc;
+  --border: rgba(40, 22, 84, 0.09);
+  --border-2: rgba(40, 22, 84, 0.16);
+  --border-soft: rgba(40, 22, 84, 0.065);
+  --text: #1c1830;
+  --text-2: #574f70;
+  --text-3: #8c84a2;
+  --fg: #1c1830;
+  --fg-dim: #574f70;
+  --fg-faint: #8c84a2;
+  --accent: #6d5efc;
+  --accent-fg: #ffffff;
+  --accent-soft: rgba(109, 94, 252, 0.12);
+  --accent-strong: #21c8d8;
+  --ok: #1fb877;
+  --warn: #e8a33d;
+  --err: #e5604d;
+  --control-primary-bg: #6d5efc;
+  --control-primary-fg: #ffffff;
+  --control-disabled-bg: #ece8f5;
+  --control-disabled-fg: #8c84a2;
+  --button-bg: #fdfcff;
+  --button-bg-hover: #f4f0fb;
+  --button-border: rgba(40, 22, 84, 0.09);
+  --button-border-hover: rgba(40, 22, 84, 0.16);
+  --pill-bg: #fdfcff;
+  --pill-border: rgba(40, 22, 84, 0.09);
+  --pill-hover-bg: #f4f0fb;
+  --list-row-hover-bg: #efeaf8;
+  --list-row-current-bg: rgba(109, 94, 252, 0.1);
+  --list-row-current-title: #1c1830;
+  --list-row-current-meta: #6d5efc;
+  --tree-row-hover-bg: #efeaf8;
+  --tree-row-current-bg: rgba(109, 94, 252, 0.1);
+  --tree-row-current-fg: #1c1830;
+  --tree-row-current-icon: #574f70;
+  --add-bg: rgba(31, 184, 119, 0.1);
+  --add-fg: #1fb877;
+  --del-bg: rgba(229, 96, 77, 0.1);
+  --del-fg: #e5604d;
+  --code-bg: #f3effb;
+  --focus-ring: 0 0 0 3px rgba(109, 94, 252, 0.18);
+  --grad: linear-gradient(120deg, #6d5efc, #9b5cf6 42%, #21c8d8);
+  --shadow-1: 0 1px 2px rgba(26, 16, 60, 0.06), 0 10px 30px rgba(26, 16, 60, 0.08);
+  --shadow-2: 0 20px 60px rgba(26, 16, 60, 0.18);
+  --r-s: 10px;
+  --r: 15px;
+  --r-l: 22px;
 }
-:root[data-theme-style="porcelain"] {
-  --accent: #7d63c8;
-  --accent-fg: #fff;
-  --accent-soft: rgba(125, 99, 200, 0.12);
-  --accent-strong: #664eb0;
+@media (prefers-color-scheme: light) {
+  :root[data-theme-style="aurora"]:not([data-theme]) {
+    --stage: #e7e2f3;
+    --surface: #fdfcff;
+    --surface-2: #ffffff;
+    --surface-3: #efeaf8;
+    --panel: rgba(253, 252, 255, 0.74);
+    --bg: #f6f3fb;
+    --bg-soft: #efeaf8;
+    --bg-elev: #fdfcff;
+    --bg-elev-2: #ffffff;
+    --sidebar-bg: #fdfcff;
+    --sidebar-hover: #efeaf8;
+    --sidebar-active: rgba(109, 94, 252, 0.12);
+    --chat-bg: #f6f3fb;
+    --workspace-preview-bg: #fdfcff;
+    --workspace-files-bg: #fdfcff;
+    --workspace-files-hover: #efeaf8;
+    --workspace-selection-bg: rgba(109, 94, 252, 0.12);
+    --workspace-selection-fg: #6d5efc;
+    --workspace-selection-bar: #6d5efc;
+    --border: rgba(40, 22, 84, 0.09);
+    --border-2: rgba(40, 22, 84, 0.16);
+    --border-soft: rgba(40, 22, 84, 0.065);
+    --text: #1c1830;
+    --text-2: #574f70;
+    --text-3: #8c84a2;
+    --fg: #1c1830;
+    --fg-dim: #574f70;
+    --fg-faint: #8c84a2;
+    --accent: #6d5efc;
+    --accent-fg: #ffffff;
+    --accent-soft: rgba(109, 94, 252, 0.12);
+    --accent-strong: #21c8d8;
+    --ok: #1fb877;
+    --warn: #e8a33d;
+    --err: #e5604d;
+    --control-primary-bg: #6d5efc;
+    --control-primary-fg: #ffffff;
+    --control-disabled-bg: #ece8f5;
+    --control-disabled-fg: #8c84a2;
+    --button-bg: #fdfcff;
+    --button-bg-hover: #f4f0fb;
+    --button-border: rgba(40, 22, 84, 0.09);
+    --button-border-hover: rgba(40, 22, 84, 0.16);
+    --pill-bg: #fdfcff;
+    --pill-border: rgba(40, 22, 84, 0.09);
+    --pill-hover-bg: #f4f0fb;
+    --list-row-hover-bg: #efeaf8;
+    --list-row-current-bg: rgba(109, 94, 252, 0.1);
+    --list-row-current-title: #1c1830;
+    --list-row-current-meta: #6d5efc;
+    --tree-row-hover-bg: #efeaf8;
+    --tree-row-current-bg: rgba(109, 94, 252, 0.1);
+    --tree-row-current-fg: #1c1830;
+    --tree-row-current-icon: #574f70;
+    --add-bg: rgba(31, 184, 119, 0.1);
+    --add-fg: #1fb877;
+    --del-bg: rgba(229, 96, 77, 0.1);
+    --del-fg: #e5604d;
+    --code-bg: #f3effb;
+    --focus-ring: 0 0 0 3px rgba(109, 94, 252, 0.18);
+    --grad: linear-gradient(120deg, #6d5efc, #9b5cf6 42%, #21c8d8);
+    --shadow-1: 0 1px 2px rgba(26, 16, 60, 0.06), 0 10px 30px rgba(26, 16, 60, 0.08);
+    --shadow-2: 0 20px 60px rgba(26, 16, 60, 0.18);
+    --r-s: 10px;
+    --r: 15px;
+    --r-l: 22px;
+  }
 }
-:root[data-theme-style="linen"] {
-  --accent: #bd5d4d;
-  --accent-fg: #fff;
-  --accent-soft: rgba(189, 93, 77, 0.12);
-  --accent-strong: #a14c3e;
+
+/* ---- Slate — cool near-black, brand blue (product default). ---- */
+:root[data-theme-style="slate"] {
+  --stage: #070809;
+  --surface: #15181d;
+  --surface-2: #1b1f25;
+  --surface-3: #0f1216;
+  --panel: rgba(21, 24, 29, 0.78);
+  --bg: #0d0f12;
+  --bg-soft: #0f1216;
+  --bg-elev: #15181d;
+  --bg-elev-2: #1b1f25;
+  --sidebar-bg: #15181d;
+  --sidebar-hover: #1f242b;
+  --sidebar-active: rgba(77, 141, 246, 0.16);
+  --chat-bg: #0d0f12;
+  --workspace-preview-bg: #0f1216;
+  --workspace-files-bg: #15181d;
+  --workspace-files-hover: #20262d;
+  --workspace-selection-bg: rgba(77, 141, 246, 0.16);
+  --workspace-selection-fg: #6ea4f9;
+  --workspace-selection-bar: #4d8df6;
+  --border: rgba(255, 255, 255, 0.08);
+  --border-2: rgba(255, 255, 255, 0.15);
+  --border-soft: rgba(255, 255, 255, 0.06);
+  --text: #e7eaf0;
+  --text-2: #9aa2b1;
+  --text-3: #646c7a;
+  --fg: #e7eaf0;
+  --fg-dim: #9aa2b1;
+  --fg-faint: #646c7a;
+  --accent: #4d8df6;
+  --accent-fg: #061129;
+  --accent-text: #ffffff;
+  --accent-soft: rgba(77, 141, 246, 0.16);
+  --accent-strong: #6ea4f9;
+  --ok: #34d399;
+  --warn: #f0b84e;
+  --err: #f0795f;
+  --control-primary-bg: #4d8df6;
+  --control-primary-fg: #061129;
+  --button-bg: #15181d;
+  --button-bg-hover: #1b1f25;
+  --button-border: rgba(255, 255, 255, 0.08);
+  --button-border-hover: rgba(255, 255, 255, 0.15);
+  --pill-bg: #15181d;
+  --pill-border: rgba(255, 255, 255, 0.08);
+  --pill-hover-bg: #1b1f25;
+  --list-row-hover-bg: #1f242b;
+  --list-row-current-bg: rgba(77, 141, 246, 0.14);
+  --list-row-current-title: #e7eaf0;
+  --list-row-current-meta: #6ea4f9;
+  --tree-row-hover-bg: #1f242b;
+  --tree-row-current-bg: rgba(77, 141, 246, 0.14);
+  --tree-row-current-fg: #e7eaf0;
+  --tree-row-current-icon: #9aa2b1;
+  --add-bg: rgba(52, 211, 153, 0.12);
+  --add-fg: #34d399;
+  --del-bg: rgba(240, 121, 95, 0.12);
+  --del-fg: #f0795f;
+  --code-bg: #0c0e12;
+  --focus-ring: 0 0 0 3px rgba(77, 141, 246, 0.2);
+  --grad: linear-gradient(120deg, #4d8df6, #3b82f6);
+  --shadow-1: 0 1px 2px rgba(0, 0, 0, 0.4), 0 10px 28px rgba(0, 0, 0, 0.4);
+  --shadow-2: 0 20px 60px rgba(0, 0, 0, 0.55);
+  --r-s: 8px;
+  --r: 12px;
+  --r-l: 16px;
+}
+:root[data-theme="light"][data-theme-style="slate"] {
+  --stage: #e7e9ee;
+  --surface: #ffffff;
+  --surface-2: #ffffff;
+  --surface-3: #eef0f4;
+  --panel: rgba(255, 255, 255, 0.8);
+  --bg: #f5f6f9;
+  --bg-soft: #eef0f4;
+  --bg-elev: #ffffff;
+  --bg-elev-2: #f7f8fb;
+  --sidebar-bg: #ffffff;
+  --sidebar-hover: #eef0f4;
+  --sidebar-active: rgba(47, 111, 224, 0.12);
+  --chat-bg: #f5f6f9;
+  --workspace-preview-bg: #ffffff;
+  --workspace-files-bg: #ffffff;
+  --workspace-files-hover: #eef0f4;
+  --workspace-selection-bg: rgba(47, 111, 224, 0.12);
+  --workspace-selection-fg: #2f6fe0;
+  --workspace-selection-bar: #2f6fe0;
+  --border: rgba(20, 28, 46, 0.1);
+  --border-2: rgba(20, 28, 46, 0.18);
+  --border-soft: rgba(20, 28, 46, 0.07);
+  --text: #15181f;
+  --text-2: #4a5160;
+  --text-3: #828a99;
+  --fg: #15181f;
+  --fg-dim: #4a5160;
+  --fg-faint: #828a99;
+  --accent: #2f6fe0;
+  --accent-fg: #ffffff;
+  --accent-soft: rgba(47, 111, 224, 0.12);
+  --accent-strong: #1f5cc4;
+  --ok: #1f9d57;
+  --warn: #d98a1f;
+  --err: #d83a2a;
+  --control-primary-bg: #2f6fe0;
+  --control-primary-fg: #ffffff;
+  --control-disabled-bg: #eceff5;
+  --control-disabled-fg: #828a99;
+  --button-bg: #ffffff;
+  --button-bg-hover: #f7f8fb;
+  --button-border: rgba(20, 28, 46, 0.1);
+  --button-border-hover: rgba(20, 28, 46, 0.18);
+  --pill-bg: #ffffff;
+  --pill-border: rgba(20, 28, 46, 0.1);
+  --pill-hover-bg: #f7f8fb;
+  --list-row-hover-bg: #eef0f4;
+  --list-row-current-bg: rgba(47, 111, 224, 0.1);
+  --list-row-current-title: #15181f;
+  --list-row-current-meta: #2f6fe0;
+  --tree-row-hover-bg: #eef0f4;
+  --tree-row-current-bg: rgba(47, 111, 224, 0.1);
+  --tree-row-current-fg: #15181f;
+  --tree-row-current-icon: #4a5160;
+  --add-bg: rgba(31, 157, 87, 0.1);
+  --add-fg: #1f9d57;
+  --del-bg: rgba(216, 58, 42, 0.1);
+  --del-fg: #d83a2a;
+  --code-bg: #f1f3f7;
+  --focus-ring: 0 0 0 3px rgba(47, 111, 224, 0.18);
+  --grad: linear-gradient(120deg, #2f6fe0, #3b82f6);
+  --shadow-1: 0 1px 2px rgba(20, 28, 46, 0.06), 0 8px 22px rgba(20, 28, 46, 0.07);
+  --shadow-2: 0 16px 44px rgba(20, 28, 46, 0.14);
+  --r-s: 8px;
+  --r: 12px;
+  --r-l: 16px;
 }
-:root[data-theme-style="glacier"] {
-  --accent: #357fa8;
-  --accent-fg: #fff;
-  --accent-soft: rgba(53, 127, 168, 0.12);
-  --accent-strong: #276a8f;
+@media (prefers-color-scheme: light) {
+  :root[data-theme-style="slate"]:not([data-theme]) {
+    --stage: #e7e9ee;
+    --surface: #ffffff;
+    --surface-2: #ffffff;
+    --surface-3: #eef0f4;
+    --panel: rgba(255, 255, 255, 0.8);
+    --bg: #f5f6f9;
+    --bg-soft: #eef0f4;
+    --bg-elev: #ffffff;
+    --bg-elev-2: #f7f8fb;
+    --sidebar-bg: #ffffff;
+    --sidebar-hover: #eef0f4;
+    --sidebar-active: rgba(47, 111, 224, 0.12);
+    --chat-bg: #f5f6f9;
+    --workspace-preview-bg: #ffffff;
+    --workspace-files-bg: #ffffff;
+    --workspace-files-hover: #eef0f4;
+    --workspace-selection-bg: rgba(47, 111, 224, 0.12);
+    --workspace-selection-fg: #2f6fe0;
+    --workspace-selection-bar: #2f6fe0;
+    --border: rgba(20, 28, 46, 0.1);
+    --border-2: rgba(20, 28, 46, 0.18);
+    --border-soft: rgba(20, 28, 46, 0.07);
+    --text: #15181f;
+    --text-2: #4a5160;
+    --text-3: #828a99;
+    --fg: #15181f;
+    --fg-dim: #4a5160;
+    --fg-faint: #828a99;
+    --accent: #2f6fe0;
+    --accent-fg: #ffffff;
+    --accent-soft: rgba(47, 111, 224, 0.12);
+    --accent-strong: #1f5cc4;
+    --ok: #1f9d57;
+    --warn: #d98a1f;
+    --err: #d83a2a;
+    --control-primary-bg: #2f6fe0;
+    --control-primary-fg: #ffffff;
+    --control-disabled-bg: #eceff5;
+    --control-disabled-fg: #828a99;
+    --button-bg: #ffffff;
+    --button-bg-hover: #f7f8fb;
+    --button-border: rgba(20, 28, 46, 0.1);
+    --button-border-hover: rgba(20, 28, 46, 0.18);
+    --pill-bg: #ffffff;
+    --pill-border: rgba(20, 28, 46, 0.1);
+    --pill-hover-bg: #f7f8fb;
+    --list-row-hover-bg: #eef0f4;
+    --list-row-current-bg: rgba(47, 111, 224, 0.1);
+    --list-row-current-title: #15181f;
+    --list-row-current-meta: #2f6fe0;
+    --tree-row-hover-bg: #eef0f4;
+    --tree-row-current-bg: rgba(47, 111, 224, 0.1);
+    --tree-row-current-fg: #15181f;
+    --tree-row-current-icon: #4a5160;
+    --add-bg: rgba(31, 157, 87, 0.1);
+    --add-fg: #1f9d57;
+    --del-bg: rgba(216, 58, 42, 0.1);
+    --del-fg: #d83a2a;
+    --code-bg: #f1f3f7;
+    --focus-ring: 0 0 0 3px rgba(47, 111, 224, 0.18);
+    --grad: linear-gradient(120deg, #2f6fe0, #3b82f6);
+    --shadow-1: 0 1px 2px rgba(20, 28, 46, 0.06), 0 8px 22px rgba(20, 28, 46, 0.07);
+    --shadow-2: 0 16px 44px rgba(20, 28, 46, 0.14);
+    --r-s: 8px;
+    --r: 12px;
+    --r-l: 16px;
+  }
+}
+
+/* ---- Carbon — warm charcoal with teal/cyan accent. ---- */
+:root[data-theme-style="carbon"] {
+  --stage: #050505;
+  --surface: #171614;
+  --surface-2: #1e1c1a;
+  --surface-3: #100f0e;
+  --panel: rgba(23, 22, 20, 0.8);
+  --bg: #0e0d0c;
+  --bg-soft: #100f0e;
+  --bg-elev: #171614;
+  --bg-elev-2: #1e1c1a;
+  --sidebar-bg: #171614;
+  --sidebar-hover: #23211f;
+  --sidebar-active: rgba(45, 212, 191, 0.16);
+  --chat-bg: #0e0d0c;
+  --workspace-preview-bg: #100f0e;
+  --workspace-files-bg: #171614;
+  --workspace-files-hover: #24211f;
+  --workspace-selection-bg: rgba(45, 212, 191, 0.16);
+  --workspace-selection-fg: #57e1ce;
+  --workspace-selection-bar: #2dd4bf;
+  --border: rgba(255, 250, 240, 0.08);
+  --border-2: rgba(255, 250, 240, 0.15);
+  --border-soft: rgba(255, 250, 240, 0.06);
+  --text: #ede9e3;
+  --text-2: #a59f95;
+  --text-3: #6f6a61;
+  --fg: #ede9e3;
+  --fg-dim: #a59f95;
+  --fg-faint: #6f6a61;
+  --accent: #2dd4bf;
+  --accent-fg: #001a16;
+  --accent-text: #ffffff;
+  --accent-soft: rgba(45, 212, 191, 0.16);
+  --accent-strong: #57e1ce;
+  --ok: #34d399;
+  --warn: #e3a23a;
+  --err: #f0795f;
+  --control-primary-bg: #2dd4bf;
+  --control-primary-fg: #001a16;
+  --button-bg: #171614;
+  --button-bg-hover: #1e1c1a;
+  --button-border: rgba(255, 250, 240, 0.08);
+  --button-border-hover: rgba(255, 250, 240, 0.15);
+  --pill-bg: #171614;
+  --pill-border: rgba(255, 250, 240, 0.08);
+  --pill-hover-bg: #1e1c1a;
+  --list-row-hover-bg: #23211f;
+  --list-row-current-bg: rgba(45, 212, 191, 0.14);
+  --list-row-current-title: #ede9e3;
+  --list-row-current-meta: #57e1ce;
+  --tree-row-hover-bg: #23211f;
+  --tree-row-current-bg: rgba(45, 212, 191, 0.14);
+  --tree-row-current-fg: #ede9e3;
+  --tree-row-current-icon: #a59f95;
+  --add-bg: rgba(52, 211, 153, 0.12);
+  --add-fg: #34d399;
+  --del-bg: rgba(240, 121, 95, 0.12);
+  --del-fg: #f0795f;
+  --code-bg: #0d0c0b;
+  --focus-ring: 0 0 0 3px rgba(45, 212, 191, 0.18);
+  --grad: linear-gradient(120deg, #2dd4bf, #22d3ee);
+  --shadow-1: 0 1px 2px rgba(0, 0, 0, 0.5), 0 12px 30px rgba(0, 0, 0, 0.5);
+  --shadow-2: 0 22px 64px rgba(0, 0, 0, 0.62);
+  --r-s: 7px;
+  --r: 10px;
+  --r-l: 14px;
+}
+:root[data-theme="light"][data-theme-style="carbon"] {
+  --stage: #e8e6e1;
+  --surface: #ffffff;
+  --surface-2: #ffffff;
+  --surface-3: #efece6;
+  --panel: rgba(255, 255, 255, 0.82);
+  --bg: #f6f4f0;
+  --bg-soft: #efece6;
+  --bg-elev: #ffffff;
+  --bg-elev-2: #f8f6f2;
+  --sidebar-bg: #ffffff;
+  --sidebar-hover: #efece6;
+  --sidebar-active: rgba(13, 148, 136, 0.12);
+  --chat-bg: #f6f4f0;
+  --workspace-preview-bg: #ffffff;
+  --workspace-files-bg: #ffffff;
+  --workspace-files-hover: #efece6;
+  --workspace-selection-bg: rgba(13, 148, 136, 0.12);
+  --workspace-selection-fg: #0d9488;
+  --workspace-selection-bar: #0d9488;
+  --border: rgba(30, 26, 20, 0.1);
+  --border-2: rgba(30, 26, 20, 0.2);
+  --border-soft: rgba(30, 26, 20, 0.07);
+  --text: #1a1714;
+  --text-2: #544e46;
+  --text-3: #8a8378;
+  --fg: #1a1714;
+  --fg-dim: #544e46;
+  --fg-faint: #8a8378;
+  --accent: #0d9488;
+  --accent-fg: #ffffff;
+  --accent-soft: rgba(13, 148, 136, 0.12);
+  --accent-strong: #0a7a70;
+  --ok: #1f9d57;
+  --warn: #c47f1a;
+  --err: #d83a2a;
+  --control-primary-bg: #0d9488;
+  --control-primary-fg: #ffffff;
+  --control-disabled-bg: #ece8e0;
+  --control-disabled-fg: #8a8378;
+  --button-bg: #ffffff;
+  --button-bg-hover: #f8f6f2;
+  --button-border: rgba(30, 26, 20, 0.1);
+  --button-border-hover: rgba(30, 26, 20, 0.2);
+  --pill-bg: #ffffff;
+  --pill-border: rgba(30, 26, 20, 0.1);
+  --pill-hover-bg: #f8f6f2;
+  --list-row-hover-bg: #efece6;
+  --list-row-current-bg: rgba(13, 148, 136, 0.1);
+  --list-row-current-title: #1a1714;
+  --list-row-current-meta: #0d9488;
+  --tree-row-hover-bg: #efece6;
+  --tree-row-current-bg: rgba(13, 148, 136, 0.1);
+  --tree-row-current-fg: #1a1714;
+  --tree-row-current-icon: #544e46;
+  --add-bg: rgba(31, 157, 87, 0.1);
+  --add-fg: #1f9d57;
+  --del-bg: rgba(216, 58, 42, 0.1);
+  --del-fg: #d83a2a;
+  --code-bg: #f2efe9;
+  --focus-ring: 0 0 0 3px rgba(13, 148, 136, 0.17);
+  --grad: linear-gradient(120deg, #0d9488, #0891b2);
+  --shadow-1: 0 1px 2px rgba(30, 26, 20, 0.06);
+  --shadow-2: 0 16px 44px rgba(30, 26, 20, 0.14);
+  --r-s: 7px;
+  --r: 10px;
+  --r-l: 14px;
+}
+@media (prefers-color-scheme: light) {
+  :root[data-theme-style="carbon"]:not([data-theme]) {
+    --stage: #e8e6e1;
+    --surface: #ffffff;
+    --surface-2: #ffffff;
+    --surface-3: #efece6;
+    --panel: rgba(255, 255, 255, 0.82);
+    --bg: #f6f4f0;
+    --bg-soft: #efece6;
+    --bg-elev: #ffffff;
+    --bg-elev-2: #f8f6f2;
+    --sidebar-bg: #ffffff;
+    --sidebar-hover: #efece6;
+    --sidebar-active: rgba(13, 148, 136, 0.12);
+    --chat-bg: #f6f4f0;
+    --workspace-preview-bg: #ffffff;
+    --workspace-files-bg: #ffffff;
+    --workspace-files-hover: #efece6;
+    --workspace-selection-bg: rgba(13, 148, 136, 0.12);
+    --workspace-selection-fg: #0d9488;
+    --workspace-selection-bar: #0d9488;
+    --border: rgba(30, 26, 20, 0.1);
+    --border-2: rgba(30, 26, 20, 0.2);
+    --border-soft: rgba(30, 26, 20, 0.07);
+    --text: #1a1714;
+    --text-2: #544e46;
+    --text-3: #8a8378;
+    --fg: #1a1714;
+    --fg-dim: #544e46;
+    --fg-faint: #8a8378;
+    --accent: #0d9488;
+    --accent-fg: #ffffff;
+    --accent-soft: rgba(13, 148, 136, 0.12);
+    --accent-strong: #0a7a70;
+    --ok: #1f9d57;
+    --warn: #c47f1a;
+    --err: #d83a2a;
+    --control-primary-bg: #0d9488;
+    --control-primary-fg: #ffffff;
+    --control-disabled-bg: #ece8e0;
+    --control-disabled-fg: #8a8378;
+    --button-bg: #ffffff;
+    --button-bg-hover: #f8f6f2;
+    --button-border: rgba(30, 26, 20, 0.1);
+    --button-border-hover: rgba(30, 26, 20, 0.2);
+    --pill-bg: #ffffff;
+    --pill-border: rgba(30, 26, 20, 0.1);
+    --pill-hover-bg: #f8f6f2;
+    --list-row-hover-bg: #efece6;
+    --list-row-current-bg: rgba(13, 148, 136, 0.1);
+    --list-row-current-title: #1a1714;
+    --list-row-current-meta: #0d9488;
+    --tree-row-hover-bg: #efece6;
+    --tree-row-current-bg: rgba(13, 148, 136, 0.1);
+    --tree-row-current-fg: #1a1714;
+    --tree-row-current-icon: #544e46;
+    --add-bg: rgba(31, 157, 87, 0.1);
+    --add-fg: #1f9d57;
+    --del-bg: rgba(216, 58, 42, 0.1);
+    --del-fg: #d83a2a;
+    --code-bg: #f2efe9;
+    --focus-ring: 0 0 0 3px rgba(13, 148, 136, 0.17);
+    --grad: linear-gradient(120deg, #0d9488, #0891b2);
+    --shadow-1: 0 1px 2px rgba(30, 26, 20, 0.06);
+    --shadow-2: 0 16px 44px rgba(30, 26, 20, 0.14);
+    --r-s: 7px;
+    --r: 10px;
+    --r-l: 14px;
+  }
+}
+
+/* ---- Nocturne — soft violet, calm. ---- */
+:root[data-theme-style="nocturne"] {
+  --stage: #08080e;
+  --surface: #191a27;
+  --surface-2: #20212f;
+  --surface-3: #13131e;
+  --panel: rgba(25, 26, 39, 0.74);
+  --bg: #101019;
+  --bg-soft: #13131e;
+  --bg-elev: #191a27;
+  --bg-elev-2: #20212f;
+  --sidebar-bg: #191a27;
+  --sidebar-hover: #24253a;
+  --sidebar-active: rgba(129, 140, 248, 0.18);
+  --chat-bg: #101019;
+  --workspace-preview-bg: #13131e;
+  --workspace-files-bg: #191a27;
+  --workspace-files-hover: #24253a;
+  --workspace-selection-bg: rgba(129, 140, 248, 0.18);
+  --workspace-selection-fg: #a3acfa;
+  --workspace-selection-bar: #818cf8;
+  --border: rgba(255, 255, 255, 0.08);
+  --border-2: rgba(255, 255, 255, 0.14);
+  --border-soft: rgba(255, 255, 255, 0.06);
+  --text: #eceaf3;
+  --text-2: #a6a2bd;
+  --text-3: #6e6a85;
+  --fg: #eceaf3;
+  --fg-dim: #a6a2bd;
+  --fg-faint: #6e6a85;
+  --accent: #818cf8;
+  --accent-fg: #0d1024;
+  --accent-text: #ffffff;
+  --accent-soft: rgba(129, 140, 248, 0.18);
+  --accent-strong: #a3acfa;
+  --ok: #34d399;
+  --warn: #f0b84e;
+  --err: #f0795f;
+  --control-primary-bg: #818cf8;
+  --control-primary-fg: #0d1024;
+  --button-bg: #191a27;
+  --button-bg-hover: #20212f;
+  --button-border: rgba(255, 255, 255, 0.08);
+  --button-border-hover: rgba(255, 255, 255, 0.14);
+  --pill-bg: #191a27;
+  --pill-border: rgba(255, 255, 255, 0.08);
+  --pill-hover-bg: #20212f;
+  --list-row-hover-bg: #24253a;
+  --list-row-current-bg: rgba(129, 140, 248, 0.16);
+  --list-row-current-title: #eceaf3;
+  --list-row-current-meta: #a3acfa;
+  --tree-row-hover-bg: #24253a;
+  --tree-row-current-bg: rgba(129, 140, 248, 0.16);
+  --tree-row-current-fg: #eceaf3;
+  --tree-row-current-icon: #a6a2bd;
+  --add-bg: rgba(52, 211, 153, 0.12);
+  --add-fg: #34d399;
+  --del-bg: rgba(240, 121, 95, 0.12);
+  --del-fg: #f0795f;
+  --code-bg: #0e0e18;
+  --focus-ring: 0 0 0 3px rgba(129, 140, 248, 0.2);
+  --grad: linear-gradient(120deg, #818cf8, #a78bfa);
+  --shadow-1: 0 1px 2px rgba(0, 0, 0, 0.4), 0 12px 34px rgba(0, 0, 0, 0.46);
+  --shadow-2: 0 24px 70px rgba(0, 0, 0, 0.6);
+  --r-s: 11px;
+  --r: 16px;
+  --r-l: 22px;
+}
+:root[data-theme="light"][data-theme-style="nocturne"] {
+  --stage: #e9e8f2;
+  --surface: #fdfcff;
+  --surface-2: #ffffff;
+  --surface-3: #efedf7;
+  --panel: rgba(253, 252, 255, 0.78);
+  --bg: #f6f5fb;
+  --bg-soft: #efedf7;
+  --bg-elev: #fdfcff;
+  --bg-elev-2: #ffffff;
+  --sidebar-bg: #fdfcff;
+  --sidebar-hover: #efedf7;
+  --sidebar-active: rgba(99, 102, 241, 0.12);
+  --chat-bg: #f6f5fb;
+  --workspace-preview-bg: #fdfcff;
+  --workspace-files-bg: #fdfcff;
+  --workspace-files-hover: #efedf7;
+  --workspace-selection-bg: rgba(99, 102, 241, 0.12);
+  --workspace-selection-fg: #6366f1;
+  --workspace-selection-bar: #6366f1;
+  --border: rgba(40, 30, 80, 0.09);
+  --border-2: rgba(40, 30, 80, 0.16);
+  --border-soft: rgba(40, 30, 80, 0.065);
+  --text: #1b1830;
+  --text-2: #544f6e;
+  --text-3: #8a85a0;
+  --fg: #1b1830;
+  --fg-dim: #544f6e;
+  --fg-faint: #8a85a0;
+  --accent: #6366f1;
+  --accent-fg: #ffffff;
+  --accent-soft: rgba(99, 102, 241, 0.12);
+  --accent-strong: #4f52d4;
+  --ok: #1fb877;
+  --warn: #e8a33d;
+  --err: #e5604d;
+  --control-primary-bg: #6366f1;
+  --control-primary-fg: #ffffff;
+  --control-disabled-bg: #ece9f5;
+  --control-disabled-fg: #8a85a0;
+  --button-bg: #fdfcff;
+  --button-bg-hover: #f5f2fb;
+  --button-border: rgba(40, 30, 80, 0.09);
+  --button-border-hover: rgba(40, 30, 80, 0.16);
+  --pill-bg: #fdfcff;
+  --pill-border: rgba(40, 30, 80, 0.09);
+  --pill-hover-bg: #f5f2fb;
+  --list-row-hover-bg: #efedf7;
+  --list-row-current-bg: rgba(99, 102, 241, 0.1);
+  --list-row-current-title: #1b1830;
+  --list-row-current-meta: #6366f1;
+  --tree-row-hover-bg: #efedf7;
+  --tree-row-current-bg: rgba(99, 102, 241, 0.1);
+  --tree-row-current-fg: #1b1830;
+  --tree-row-current-icon: #544f6e;
+  --add-bg: rgba(31, 184, 119, 0.1);
+  --add-fg: #1fb877;
+  --del-bg: rgba(229, 96, 77, 0.1);
+  --del-fg: #e5604d;
+  --code-bg: #f2f0fb;
+  --focus-ring: 0 0 0 3px rgba(99, 102, 241, 0.18);
+  --grad: linear-gradient(120deg, #6366f1, #8b5cf6);
+  --shadow-1: 0 1px 2px rgba(26, 16, 60, 0.06), 0 10px 30px rgba(26, 16, 60, 0.08);
+  --shadow-2: 0 20px 60px rgba(26, 16, 60, 0.16);
+  --r-s: 11px;
+  --r: 16px;
+  --r-l: 22px;
+}
+@media (prefers-color-scheme: light) {
+  :root[data-theme-style="nocturne"]:not([data-theme]) {
+    --stage: #e9e8f2;
+    --surface: #fdfcff;
+    --surface-2: #ffffff;
+    --surface-3: #efedf7;
+    --panel: rgba(253, 252, 255, 0.78);
+    --bg: #f6f5fb;
+    --bg-soft: #efedf7;
+    --bg-elev: #fdfcff;
+    --bg-elev-2: #ffffff;
+    --sidebar-bg: #fdfcff;
+    --sidebar-hover: #efedf7;
+    --sidebar-active: rgba(99, 102, 241, 0.12);
+    --chat-bg: #f6f5fb;
+    --workspace-preview-bg: #fdfcff;
+    --workspace-files-bg: #fdfcff;
+    --workspace-files-hover: #efedf7;
+    --workspace-selection-bg: rgba(99, 102, 241, 0.12);
+    --workspace-selection-fg: #6366f1;
+    --workspace-selection-bar: #6366f1;
+    --border: rgba(40, 30, 80, 0.09);
+    --border-2: rgba(40, 30, 80, 0.16);
+    --border-soft: rgba(40, 30, 80, 0.065);
+    --text: #1b1830;
+    --text-2: #544f6e;
+    --text-3: #8a85a0;
+    --fg: #1b1830;
+    --fg-dim: #544f6e;
+    --fg-faint: #8a85a0;
+    --accent: #6366f1;
+    --accent-fg: #ffffff;
+    --accent-soft: rgba(99, 102, 241, 0.12);
+    --accent-strong: #4f52d4;
+    --ok: #1fb877;
+    --warn: #e8a33d;
+    --err: #e5604d;
+    --control-primary-bg: #6366f1;
+    --control-primary-fg: #ffffff;
+    --control-disabled-bg: #ece9f5;
+    --control-disabled-fg: #8a85a0;
+    --button-bg: #fdfcff;
+    --button-bg-hover: #f5f2fb;
+    --button-border: rgba(40, 30, 80, 0.09);
+    --button-border-hover: rgba(40, 30, 80, 0.16);
+    --pill-bg: #fdfcff;
+    --pill-border: rgba(40, 30, 80, 0.09);
+    --pill-hover-bg: #f5f2fb;
+    --list-row-hover-bg: #efedf7;
+    --list-row-current-bg: rgba(99, 102, 241, 0.1);
+    --list-row-current-title: #1b1830;
+    --list-row-current-meta: #6366f1;
+    --tree-row-hover-bg: #efedf7;
+    --tree-row-current-bg: rgba(99, 102, 241, 0.1);
+    --tree-row-current-fg: #1b1830;
+    --tree-row-current-icon: #544f6e;
+    --add-bg: rgba(31, 184, 119, 0.1);
+    --add-fg: #1fb877;
+    --del-bg: rgba(229, 96, 77, 0.1);
+    --del-fg: #e5604d;
+    --code-bg: #f2f0fb;
+    --focus-ring: 0 0 0 3px rgba(99, 102, 241, 0.18);
+    --grad: linear-gradient(120deg, #6366f1, #8b5cf6);
+    --shadow-1: 0 1px 2px rgba(26, 16, 60, 0.06), 0 10px 30px rgba(26, 16, 60, 0.08);
+    --shadow-2: 0 20px 60px rgba(26, 16, 60, 0.16);
+    --r-s: 11px;
+    --r: 16px;
+    --r-l: 22px;
+  }
+}
+
+/* ---- Amber — warm orange, friendly. ---- */
+:root[data-theme-style="amber"] {
+  --accent: #d4632f;
+  --accent-fg: #1a0a04;
+  --accent-soft: rgba(212, 99, 47, 0.16);
+  --accent-strong: #de7a4b;
+}
+:root[data-theme="light"][data-theme-style="amber"] {
+  --accent: #dd5b28;
+  --accent-fg: #ffffff;
+  --accent-soft: rgba(221, 91, 40, 0.12);
+  --accent-strong: #c44d20;
+}
+@media (prefers-color-scheme: light) {
+  :root[data-theme-style="amber"]:not([data-theme]) {
+    --accent: #dd5b28;
+    --accent-fg: #ffffff;
+    --accent-soft: rgba(221, 91, 40, 0.12);
+    --accent-strong: #c44d20;
+  }
 }
 
 :root[data-text-size="small"] {
@@ -424,23 +1440,44 @@ a[href] {
 .app {
   height: 100%;
   min-height: 0;
+  overflow-x: auto;
+  overflow-y: hidden;
 }
 
 .layout {
-  --sidebar-width: var(--sidebar-expanded-width, 264px);
+  --sidebar-width: var(--sidebar-expanded-width, clamp(248px, 18vw, 300px));
   --chat-min-width: 760px;
+  --chat-docked-min-width: 640px;
   --workspace-width: 420px;
   --workspace-resizer-width: 8px;
+  --app-chrome-height: 38px;
+  --topicbar-height: 56px;
+  --statusbar-height: 0px;
+  --chrome-toggle-size: 42px;
+  --chrome-left-safe-offset: 0px;
+  --chrome-left-toggle-offset: max(var(--sidebar-width), var(--chrome-left-safe-offset));
+  --chrome-right-toggle-offset: 0px;
   position: relative;
   display: grid;
   justify-content: start;
-  grid-template-rows: 38px minmax(0, 1fr);
+  grid-template-rows: var(--app-chrome-height) minmax(0, 1fr);
   grid-template-columns: var(--sidebar-width) minmax(0, 1fr);
   height: 100%;
   min-height: 0;
+  width: 100%;
   background: var(--bg);
-  transition: grid-template-columns 0.16s ease;
+  transition: grid-template-columns 0.16s ease, min-width 0.16s ease;
+}
+
+.app--darwin .layout {
+  --app-chrome-height: 44px;
+  --chrome-toggle-size: 36px;
+  --chrome-left-safe-offset: 112px;
+  transition:
+    grid-template-columns 0.28s cubic-bezier(0.2, 0.72, 0.2, 1),
+    min-width 0.28s cubic-bezier(0.2, 0.72, 0.2, 1);
 }
+
 .layout--resizing {
   cursor: col-resize;
   transition: none;
@@ -450,13 +1487,31 @@ a[href] {
 }
 .layout--sidebar-collapsed {
   --sidebar-width: 0px;
+  grid-template-columns: 0px minmax(0, 1fr);
+}
+.layout:not(.layout--sidebar-collapsed):not(.layout--workspace-open):not(.layout--workspace-maximized) {
+  grid-template-columns: var(--sidebar-expanded-width) minmax(0, 1fr);
 }
 .layout--workspace-open {
-  grid-template-columns: var(--sidebar-width) minmax(0, 1fr) var(--workspace-resizer-width) var(--workspace-width);
+  --chrome-right-toggle-offset: calc(var(--workspace-width) + var(--workspace-resizer-width));
+  min-width: calc(var(--sidebar-width) + var(--chat-docked-min-width) + var(--workspace-resizer-width) + var(--workspace-width));
+  grid-template-columns: var(--sidebar-width) minmax(var(--chat-docked-min-width), 1fr) var(--workspace-resizer-width) var(--workspace-width);
+}
+.layout--workspace-open:not(.layout--sidebar-collapsed) {
+  min-width: calc(var(--sidebar-expanded-width) + var(--chat-docked-min-width) + var(--workspace-resizer-width) + var(--workspace-width));
+  grid-template-columns: var(--sidebar-expanded-width) minmax(var(--chat-docked-min-width), 1fr) var(--workspace-resizer-width) var(--workspace-width);
+}
+.layout--workspace-open.layout--sidebar-collapsed {
+  min-width: calc(var(--chat-docked-min-width) + var(--workspace-resizer-width) + var(--workspace-width));
+  grid-template-columns: 0px minmax(var(--chat-docked-min-width), 1fr) var(--workspace-resizer-width) var(--workspace-width);
 }
 .layout--workspace-maximized {
+  min-width: 0;
   grid-template-columns: var(--sidebar-width) minmax(0, 1fr);
 }
+.layout--workspace-maximized.layout--sidebar-collapsed {
+  grid-template-columns: 0px minmax(0, 1fr);
+}
 .layout--workspace-maximized .chat-pane {
   display: none;
 }
@@ -464,36 +1519,29 @@ a[href] {
   display: none;
 }
 
-.layout--workspace-floating {
-  grid-template-columns: var(--sidebar-width) minmax(0, 1fr);
-}
-.layout--workspace-floating .workspace-panel-resizer {
-  display: none;
-}
-.layout--workspace-floating .workbench-dock {
-  position: absolute;
-  top: 38px;
-  right: 0;
-  bottom: 0;
-  width: var(--workspace-width);
-  z-index: var(--z-dock);
-  box-shadow: -4px 0 24px rgba(0, 0, 0, 0.3);
-  border-left: 1px solid var(--border);
-}
-
 .sidebar {
   grid-row: 2;
   grid-column: 1;
   display: flex;
   flex-direction: column;
   min-width: 0;
-  padding: 12px 10px;
+  padding: 12px 10px calc(12px + var(--statusbar-height));
   background: var(--sidebar-bg);
   border-right: 1px solid var(--border-soft);
   --wails-draggable: drag;
   user-select: none;
   overflow: hidden;
 }
+
+.app--darwin .sidebar {
+  transform: translateX(0);
+  opacity: 1;
+  transition:
+    opacity 0.22s ease,
+    transform 0.28s cubic-bezier(0.2, 0.72, 0.2, 1),
+    padding 0.28s cubic-bezier(0.2, 0.72, 0.2, 1),
+    border-color 0.22s ease;
+}
 .sidebar button,
 .sidebar input,
 .sidebar select {
@@ -514,20 +1562,38 @@ a[href] {
 .sidebar__new {
   display: flex;
   align-items: center;
-  gap: 9px;
-  height: 36px;
-  padding: 0 10px;
-  margin-bottom: 12px;
-  background: var(--bg-elev);
-  border: 1px solid var(--border);
-  color: var(--fg);
-  font-weight: 550;
+  gap: 12px;
+  height: 52px;
+  padding: 0 18px;
+  margin-bottom: 14px;
+  background: var(--grad);
+  border: 0;
+  border-radius: 12px;
+  color: var(--accent-text);
+  font-size: 15px;
+  font-weight: 650;
+  box-shadow: 0 6px 18px -6px var(--accent), var(--shadow-1);
+  transition:
+    color var(--dur-fast),
+    background var(--dur-fast),
+    box-shadow var(--dur-fast),
+    filter var(--dur-fast),
+    transform var(--dur-fast);
 }
 .sidebar__new:hover,
 .sidebar__navitem:hover {
   background: var(--sidebar-hover);
   color: var(--fg);
 }
+.sidebar__new:hover {
+  background: var(--grad);
+  color: var(--accent-text);
+  filter: saturate(1.08) brightness(1.03);
+  transform: translateY(-1px);
+}
+.sidebar__new:active {
+  transform: translateY(0) scale(0.99);
+}
 .sidebar__new:disabled,
 .sidebar__navitem:disabled {
   opacity: 0.55;
@@ -541,6 +1607,9 @@ a[href] {
 .sidebar__new:disabled:hover {
   background: var(--bg-elev);
   color: var(--fg);
+  filter: none;
+  transform: none;
+  box-shadow: none;
 }
 .sidebar__nav {
   display: flex;
@@ -567,6 +1636,52 @@ a[href] {
 .sidebar--collapsed {
   display: none;
 }
+
+.app--darwin .sidebar--collapsed {
+  display: flex;
+  width: 0;
+  min-width: 0;
+  max-width: 0;
+  padding-inline: 0;
+  border-right-color: transparent;
+  opacity: 0;
+  pointer-events: none;
+  transform: translateX(-18px);
+}
+
+.app--darwin .sidebar--collapsed > * {
+  visibility: hidden;
+}
+
+.app--darwin .sidebar--collapsed .sidebar__new,
+.app--darwin .sidebar--collapsed .sidebar__navitem {
+  justify-content: flex-start;
+  width: 100%;
+  padding: 0 10px;
+  gap: 9px;
+}
+
+.app--darwin .sidebar--collapsed .sidebar__new {
+  height: 36px;
+  border-radius: 8px;
+}
+
+.app--darwin .sidebar--collapsed .sidebar__new span,
+.app--darwin .sidebar--collapsed .sidebar__navitem span {
+  display: inline;
+}
+
+.app--darwin .sidebar--collapsed .sidebar__nav {
+  align-items: stretch;
+  width: 100%;
+  padding: 10px 0 8px;
+  border-top: 1px solid var(--border-soft);
+}
+
+.app--darwin .sidebar--collapsed .sidebar__section {
+  display: flex;
+}
+
 .sidebar--collapsed .sidebar__new,
 .sidebar--collapsed .sidebar__navitem {
   justify-content: center;
@@ -594,8 +1709,8 @@ a[href] {
 .sidebar-resizer {
   --wails-draggable: no-drag;
   position: absolute;
-  top: 38px;
-  bottom: 0;
+  top: var(--app-chrome-height);
+  bottom: var(--statusbar-height);
   left: calc(var(--sidebar-width) - 4px);
   z-index: var(--z-layout-resizer);
   width: 8px;
@@ -629,11 +1744,12 @@ a[href] {
   position: relative;
   grid-row: 2;
   grid-column: 3;
-  align-self: stretch;
+  align-self: start;
   justify-self: stretch;
   z-index: var(--z-layout-resizer-active);
   width: auto;
   min-width: var(--workspace-resizer-width);
+  height: calc(100% - var(--statusbar-height));
   padding: 0;
   border: 0;
   background: transparent;
@@ -657,58 +1773,8 @@ a[href] {
   background: var(--accent);
   box-shadow: 0 0 0 1px color-mix(in srgb, var(--accent) 24%, transparent);
 }
-.workspace-dock-toggle {
-  --wails-draggable: no-drag;
-  flex: 0 0 42px;
-  align-self: stretch;
-  display: inline-flex;
-  align-items: stretch;
-  justify-content: center;
-  width: 42px;
-  height: 38px;
-  border-left: 1px solid var(--border-soft);
-  border-right: 1px solid var(--border-soft);
-}
-.workspace-dock-toggle__button {
-  --wails-draggable: no-drag;
-  width: 42px;
-  height: 38px;
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  padding: 0;
-  border: 0;
-  border-radius: 0;
-  background: transparent;
-  color: var(--fg-faint);
-  box-shadow: none;
-  opacity: 0.86;
-  transition: color 0.12s, background 0.12s, box-shadow 0.12s, opacity 0.12s;
-}
-.workspace-dock-toggle__button:hover {
-  color: var(--fg);
-  background: color-mix(in srgb, var(--fg-faint) 10%, transparent);
-  opacity: 1;
-}
-.workspace-dock-toggle__button:active {
-  color: var(--accent-strong);
-  background: color-mix(in srgb, var(--accent) 10%, transparent);
-}
-.workspace-dock-toggle--open .workspace-dock-toggle__button {
-  color: var(--accent);
-  background: transparent;
-  box-shadow: inset 0 -2px 0 color-mix(in srgb, var(--accent) 86%, transparent);
-  opacity: 1;
-}
-.workspace-dock-toggle--open .workspace-dock-toggle__button:hover {
-  color: var(--accent-strong);
-  background: color-mix(in srgb, var(--fg-faint) 10%, transparent);
-}
-.layout--resizing .workspace-dock-toggle {
-  pointer-events: none;
-  opacity: 0.65;
-}
 .chat-pane {
+  position: relative;
   grid-row: 2;
   grid-column: 2;
   display: flex;
@@ -806,6 +1872,48 @@ a[href] {
   border-color: transparent;
 }
 
+.modal-close-button {
+  --wails-draggable: no-drag;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  flex: 0 0 auto;
+  width: var(--button-icon-size);
+  height: var(--button-icon-size);
+  padding: 0;
+  border: 1px solid transparent;
+  border-radius: var(--button-icon-radius, 8px);
+  background: transparent;
+  color: var(--fg-faint);
+  font: inherit;
+  line-height: 1;
+  transition:
+    color var(--dur-fast),
+    border-color var(--dur-fast),
+    background var(--dur-fast),
+    transform var(--dur-fast) var(--ease-out);
+}
+
+.modal-close-button:hover {
+  color: var(--fg);
+  border-color: var(--button-border);
+  background: color-mix(in srgb, var(--fg-faint) 8%, transparent);
+}
+
+.modal-close-button:active {
+  transform: scale(0.94);
+  background: color-mix(in srgb, var(--fg-faint) 14%, transparent);
+}
+
+.modal-close-button:focus-visible {
+  outline: 2px solid color-mix(in srgb, var(--accent) 52%, transparent);
+  outline-offset: 2px;
+}
+
+.modal-close-button:disabled {
+  opacity: 0.4;
+}
+
 .banner {
   flex: 0 0 auto;
   padding: 8px 16px;
@@ -1197,6 +2305,9 @@ a[href] {
 }
 
 .welcome {
+  --welcome-brand-width: 240px;
+  --welcome-brand-height: 56px;
+  --welcome-brand-gap: 26px;
   width: min(100%, 600px);
   max-height: 100%;
   min-height: 0;
@@ -1209,11 +2320,20 @@ a[href] {
   color: var(--fg-faint);
   overflow: hidden;
 }
-.welcome__logo {
-  width: clamp(220px, 38vw, 280px);
-  height: auto;
-  margin-bottom: 24px;
-  border-radius: 0;
+.welcome--brand {
+  margin-top: -20px;
+}
+.welcome__brand {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  margin-bottom: var(--welcome-brand-gap);
+}
+.welcome__brand-logo {
+  display: block;
+  width: var(--welcome-brand-width);
+  height: var(--welcome-brand-height);
+  object-fit: contain;
 }
 .welcome__title {
   font-size: 22px;
@@ -1249,12 +2369,12 @@ a[href] {
   text-align: center;
 }
 .welcome__examples {
-  display: flex;
-  flex-direction: column;
+  display: grid;
+  grid-template-columns: repeat(2, 1fr);
   gap: 8px;
   margin-top: 26px;
   width: 100%;
-  max-width: 380px;
+  max-width: 460px;
 }
 .welcome__ex {
   text-align: left;
@@ -1274,10 +2394,14 @@ a[href] {
 }
 
 @container (max-height: 560px) {
-  .welcome__logo {
-    width: 220px;
-    height: auto;
-    margin-bottom: 16px;
+  .welcome--brand {
+    --welcome-brand-width: 224px;
+    --welcome-brand-height: 52px;
+    --welcome-brand-gap: 22px;
+    margin-top: -16px;
+  }
+  .welcome__brand {
+    margin-bottom: var(--welcome-brand-gap);
   }
   .welcome__title {
     font-size: 20px;
@@ -1299,7 +2423,7 @@ a[href] {
 }
 
 @container (max-height: 430px) {
-  .welcome__logo {
+  .welcome__brand {
     display: none;
   }
   .welcome__title {
@@ -1550,6 +2674,7 @@ a[href] {
   --process-tone: var(--fg-dim);
   --process-tone-soft: color-mix(in srgb, var(--fg-dim) 12%, transparent);
   box-sizing: border-box;
+  position: relative;
   width: 100%;
   margin: 6px auto;
   border: 1px solid var(--border-soft);
@@ -1558,6 +2683,27 @@ a[href] {
   overflow: hidden;
   box-shadow: 0 1px 0 rgba(255, 255, 255, 0.02);
 }
+/* T1: a tone-colored sweep bar along the bottom while the card is running
+   (running cards render a .process-card__spin status icon). */
+@media (prefers-reduced-motion: no-preference) {
+  .process-card:has(.process-card__spin)::after {
+    content: "";
+    position: absolute;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    height: 2px;
+    background: linear-gradient(90deg, transparent, var(--process-tone), transparent);
+    background-size: 40% 100%;
+    background-repeat: no-repeat;
+    animation: process-sweep 1.2s ease-in-out infinite;
+    pointer-events: none;
+  }
+}
+@keyframes process-sweep {
+  from { background-position: -40% 0; }
+  to { background-position: 140% 0; }
+}
 .process-card[data-tone="success"] {
   --process-tone: var(--ok);
   --process-tone-soft: color-mix(in srgb, var(--ok) 16%, transparent);
@@ -1651,10 +2797,31 @@ a[href] {
 .process-card[data-open="false"] .process-card__chevron {
   transform: rotate(-90deg);
 }
+.process-card__wrap {
+  display: grid;
+  grid-template-rows: 0fr;
+  visibility: hidden;
+  transition: grid-template-rows var(--dur-base) var(--ease-out);
+}
+.process-card[data-open="true"] .process-card__wrap {
+  grid-template-rows: 1fr;
+  visibility: visible;
+}
+.process-card__wrap > div {
+  min-height: 0;
+  overflow: hidden;
+}
 .process-card__body {
   box-sizing: border-box;
   border-top: 1px solid var(--border-soft);
   background: var(--bg-soft);
+  animation: card-body-in var(--dur-base) var(--ease-out) both;
+}
+@keyframes card-body-in {
+  from {
+    opacity: 0;
+    transform: translateY(-4px);
+  }
 }
 .process-card__status {
   flex-shrink: 0;
@@ -2401,6 +3568,15 @@ a[href] {
 .composer__input::placeholder {
   color: var(--fg-faint);
 }
+.composer__prompt {
+  align-self: flex-end;
+  flex: 0 0 auto;
+  margin-bottom: 6px;
+  color: var(--accent);
+  font-size: 12px;
+  font-weight: 650;
+  white-space: nowrap;
+}
 .composer__btn {
   display: inline-flex;
   align-items: center;
@@ -2445,133 +3621,340 @@ a[href] {
   font-size: 12px;
 }
 
-.composer-meta--no-workspace {
-  justify-content: flex-end;
-}
-
 .composer-meta__params {
   display: inline-flex;
   align-items: center;
-  justify-content: flex-end;
-  gap: 6px;
+  justify-content: flex-start;
+  gap: 8px;
   min-width: 0;
+  flex: 1 1 auto;
   margin-left: auto;
 }
 
+.composer-meta--has-intent-chip .composer-meta__params {
+  gap: 6px;
+}
+
 .composer-meta__control {
   display: inline-flex;
   align-items: center;
-  height: 30px;
+  justify-content: center;
+  height: 32px;
   min-width: 0;
 }
 
-.composer-meta__control--workspace {
-  flex: 0 1 160px;
-  width: 160px;
-  min-width: 132px;
-  max-width: 160px;
+.composer-meta__control--model {
+  flex: 0 0 clamp(152px, 18vw, 176px);
+  width: clamp(152px, 18vw, 176px);
+  max-width: clamp(152px, 18vw, 176px);
 }
 
-.composer-meta--no-effort .composer-meta__control--workspace {
-  max-width: 160px;
+.composer-meta--has-intent-chip .composer-meta__control--model {
+  flex-basis: clamp(140px, 16vw, 164px);
+  width: clamp(140px, 16vw, 164px);
+  max-width: clamp(140px, 16vw, 164px);
 }
 
-.composer-meta--has-workspace .composer-meta__params {
-  padding-left: 12px;
-  border-left: 1px solid color-mix(in srgb, var(--border-soft) 74%, transparent);
+.composer-meta__control--effort {
+  flex: 0 0 92px;
+  width: 92px;
+  max-width: 92px;
 }
 
-.composer-meta__control--model {
-  flex: 0 1 220px;
-  max-width: min(220px, 32vw);
+.composer-meta__control--intent {
+  flex: 0 0 auto;
+  gap: 6px;
+  min-width: 32px;
+  max-width: min(132px, 24vw);
 }
 
-.composer-meta__control--effort {
-  flex: 0 0 auto;
-  max-width: 150px;
+.composer-meta__control--approval {
+  flex: 0 0 232px;
+  min-width: 216px;
+  max-width: min(232px, 34vw);
 }
 
-.composer-meta .modelsw {
+.composer-modebar {
+  --wails-draggable: no-drag;
+  --composer-modebar-index: 0;
+  --composer-modebar-active-bg: var(--bg-elev);
+  --composer-modebar-active-border: var(--border);
+  --composer-modebar-active-fg: var(--fg);
+  position: relative;
+  isolation: isolate;
+  display: grid;
+  grid-template-columns: repeat(3, minmax(0, 1fr));
+  align-items: center;
   width: 100%;
-  min-width: 0;
+  height: 32px;
+  padding: 2px;
+  border: 1px solid var(--border);
+  border-radius: 999px;
+  background: var(--surface-2);
+  box-shadow: var(--app-graphite-shadow);
+  overflow: hidden;
 }
-.composer-meta .modelsw__trigger {
-  width: 100%;
+
+.composer-modebar[data-mode="auto"],
+.composer-modebar[data-mode="plan"] {
+  --composer-modebar-index: 1;
+}
+
+.composer-modebar[data-mode="yolo"],
+.composer-modebar[data-mode="goal"] {
+  --composer-modebar-index: 2;
+}
+
+.composer-modebar--approval {
+  --composer-modebar-active-bg: var(--mode-auto-bg);
+  --composer-modebar-active-border: var(--mode-auto-border);
+  --composer-modebar-active-fg: var(--mode-auto-fg);
+}
+
+.composer-modebar--approval[data-mode="auto"] {
+  --composer-modebar-active-bg: color-mix(in srgb, var(--ok) 58%, #0b3d24);
+  --composer-modebar-active-border: color-mix(in srgb, var(--ok) 76%, #0b3d24);
+  --composer-modebar-active-fg: #fff;
+}
+
+.composer-modebar--approval[data-mode="yolo"] {
+  --composer-modebar-active-bg: var(--mode-yolo-bg);
+  --composer-modebar-active-border: var(--mode-yolo-border);
+  --composer-modebar-active-fg: var(--mode-yolo-fg);
+}
+
+.composer-modebar__thumb {
+  position: absolute;
+  top: 2px;
+  bottom: 2px;
+  left: 2px;
+  width: calc((100% - 4px) / 3);
+  border: 1px solid var(--composer-modebar-active-border);
+  border-radius: 999px;
+  background: var(--composer-modebar-active-bg);
+  box-shadow:
+    inset 0 1px 0 color-mix(in srgb, #fff 18%, transparent),
+    0 1px 3px color-mix(in srgb, #000 28%, transparent);
+  transform: translateX(calc(var(--composer-modebar-index) * 100%));
+  transition: transform 0.16s var(--ease-out), border-color 0.16s, background 0.16s, box-shadow 0.16s;
+  pointer-events: none;
+}
+
+.composer-modebar__item {
+  position: relative;
+  z-index: var(--z-local-raised);
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  gap: 4px;
   min-width: 0;
-  max-width: 100%;
-  height: 30px;
-  padding: 0 8px;
+  height: 26px;
+  padding: 0 6px;
   border: 1px solid transparent;
-  border-radius: 7px;
+  border-radius: 999px;
   background: transparent;
+  color: var(--fg-dim);
+  font: inherit;
   font-size: 12px;
+  font-weight: 620;
+  line-height: 14px;
+  transition: color 0.12s, transform 0.12s;
 }
-.composer-meta .modelsw__trigger:hover:not(:disabled),
-.composer-meta .modelsw__trigger:focus-visible {
+
+.composer-modebar__item span {
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  text-align: center;
+  line-height: 14px;
+}
+
+.composer-modebar__item svg {
+  flex: 0 0 auto;
+}
+
+.composer-modebar__item:hover:not(:disabled) {
   color: var(--fg);
-  border-color: var(--border-soft);
-  background: var(--bg-soft);
+  transform: translateY(-1px);
+}
+
+.composer-modebar__item:focus-visible {
   outline: none;
+  box-shadow: var(--focus-ring);
 }
-.composer-meta .modelsw__label {
-  min-width: 0;
+
+.composer-modebar__item--active {
+  color: var(--composer-modebar-active-fg);
 }
 
-.composer-meta .modelsw__kind,
-.composer-meta .modelsw__trigger svg,
-.composer__workspace > svg {
-  flex-shrink: 0;
+.composer-modebar__item:disabled {
+  cursor: not-allowed;
+  opacity: 0.55;
+  transform: none;
 }
 
-.composer__workspace {
+.composer-action-trigger {
   --wails-draggable: no-drag;
   display: inline-flex;
   align-items: center;
-  gap: 4px;
-  width: 100%;
+  justify-content: center;
+  flex: 0 0 32px;
+  width: 32px;
   min-width: 0;
-  max-width: 100%;
-  height: 30px;
-  padding: 0 8px;
+  height: 32px;
+  padding: 0;
   border: 1px solid transparent;
-  border-radius: 7px;
+  border-radius: 999px;
   background: transparent;
   color: var(--fg-dim);
+  box-shadow: none;
   font: inherit;
+  transition: border-color 0.14s, background 0.14s, color 0.14s, transform 0.14s var(--ease-out);
 }
-.composer__workspace:hover {
+
+.composer-action-trigger:hover:not(:disabled),
+.composer-action-trigger:focus-visible,
+.composer-action-trigger--open {
+  outline: none;
   color: var(--fg);
-  border-color: var(--border-soft);
-  background: var(--bg-soft);
+  border-color: transparent;
+  background: color-mix(in srgb, var(--fg-faint) 10%, var(--surface-2));
 }
-.composer__workspace--open {
-  color: var(--fg);
-  border-color: var(--border-soft);
-  background: var(--bg-soft);
+
+.composer-action-trigger:hover:not(:disabled) {
+  transform: none;
 }
-.composer__workspace:disabled {
-  cursor: default;
-  opacity: 0.6;
+
+.composer-action-trigger:disabled {
+  cursor: not-allowed;
+  opacity: 0.55;
+  transform: none;
 }
-.composer__workspace:disabled:hover {
-  color: var(--fg-dim);
-  background: transparent;
+
+.composer-mode-chip {
+  --wails-draggable: no-drag;
+  position: relative;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  flex: 0 1 82px;
+  gap: 6px;
+  min-width: 0;
+  max-width: 86px;
+  height: 32px;
+  padding: 0 10px 0 8px;
+  border: 1px solid var(--border);
+  border-radius: 999px;
+  background: color-mix(in srgb, var(--surface-2) 88%, var(--fg) 3%);
+  color: var(--fg);
+  box-shadow: var(--app-graphite-shadow);
+  font: inherit;
+  font-size: 12px;
+  font-weight: 650;
+  transition: border-color 0.14s, background 0.14s, color 0.14s, transform 0.14s var(--ease-out);
 }
-.composer__workspace span {
-  flex: 0 1 auto;
+
+.composer-mode-chip__label {
   min-width: 0;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
 }
-.composer__workspace > svg:last-child {
-  margin-left: auto;
-}
-.composer-workspace-wrap {
-  position: relative;
+
+.composer-mode-chip__icon {
   display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  flex: 0 0 20px;
+  width: 20px;
+  height: 20px;
+  border-radius: 999px;
+  transition: opacity 0.14s, transform 0.14s var(--ease-out), background 0.14s, color 0.14s;
+}
+
+.composer-mode-chip__icon--mode {
+  color: var(--fg-dim);
+}
+
+.composer-mode-chip__icon--dismiss {
+  position: absolute;
+  left: 8px;
+  color: #fff;
+  background: color-mix(in srgb, var(--fg-dim) 64%, transparent);
+  opacity: 0;
+  transform: scale(0.86);
+}
+
+.composer-mode-chip:hover:not(:disabled),
+.composer-mode-chip:focus-visible,
+.composer-mode-chip:active:not(:disabled),
+.tooltip-trigger:hover > .composer-mode-chip:not(:disabled),
+.tooltip-trigger:focus-within > .composer-mode-chip:not(:disabled) {
+  outline: none;
+  color: var(--fg);
+  border-color: var(--border-soft);
+  background: var(--bg-soft);
+  transform: translateY(-1px);
+}
+
+.composer-mode-chip:hover:not(:disabled) .composer-mode-chip__icon--mode,
+.composer-mode-chip:focus-visible .composer-mode-chip__icon--mode,
+.composer-mode-chip:active:not(:disabled) .composer-mode-chip__icon--mode,
+.tooltip-trigger:hover > .composer-mode-chip:not(:disabled) .composer-mode-chip__icon--mode,
+.tooltip-trigger:focus-within > .composer-mode-chip:not(:disabled) .composer-mode-chip__icon--mode {
+  opacity: 0;
+  transform: scale(0.86);
+}
+
+.composer-mode-chip:hover:not(:disabled) .composer-mode-chip__icon--dismiss,
+.composer-mode-chip:focus-visible .composer-mode-chip__icon--dismiss,
+.composer-mode-chip:active:not(:disabled) .composer-mode-chip__icon--dismiss,
+.tooltip-trigger:hover > .composer-mode-chip:not(:disabled) .composer-mode-chip__icon--dismiss,
+.tooltip-trigger:focus-within > .composer-mode-chip:not(:disabled) .composer-mode-chip__icon--dismiss {
+  opacity: 1;
+  transform: scale(1);
+}
+
+.composer-mode-chip:disabled {
+  cursor: not-allowed;
+  opacity: 0.55;
+  transform: none;
+}
+
+.composer-meta .modelsw {
+  width: 100%;
+  max-width: 100%;
+  min-width: 0;
+}
+.composer-meta .modelsw__trigger {
   width: 100%;
   min-width: 0;
+  max-width: 100%;
+  height: 32px;
+  gap: 8px;
+  padding: 0 8px;
+  border: 1px solid var(--border);
+  border-radius: 7px;
+  background: var(--surface-2);
+  color: var(--fg-dim);
+  font-size: 12px;
+}
+.composer-meta .modelsw__trigger:hover:not(:disabled),
+.composer-meta .modelsw__trigger:focus-visible {
+  color: var(--fg);
+  border-color: var(--border-soft);
+  background: var(--bg-soft);
+  outline: none;
+}
+.composer-meta .modelsw__label {
+  flex: 1 1 auto;
+  min-width: 0;
+}
+
+.composer-meta .modelsw__kind,
+.composer-meta .modelsw__trigger svg {
+  flex-shrink: 0;
 }
 
 @container (max-width: 620px) {
@@ -2580,24 +3963,37 @@ a[href] {
     padding-inline: 10px;
   }
 
-  .composer-meta__control--workspace {
-    flex-basis: 150px;
-    width: 150px;
-    min-width: 124px;
-    max-width: 150px;
+  .composer-meta__control--model {
+    flex: 1 1 132px;
+    width: auto;
+    max-width: 29vw;
   }
 
-  .composer-meta--has-workspace .composer-meta__params {
-    padding-left: 8px;
+  .composer-meta__control--intent {
+    max-width: 118px;
   }
 
-  .composer-meta__control--model {
-    flex-basis: 168px;
-    max-width: 34vw;
+  .composer-meta__control--approval {
+    flex-basis: 184px;
+    min-width: 172px;
+    max-width: 184px;
   }
 
-  .composer-meta__control--effort {
-    max-width: 124px;
+  .composer-mode-chip {
+    gap: 5px;
+    padding-inline: 8px;
+  }
+
+  .composer-modebar__item {
+    gap: 4px;
+    padding-inline: 4px;
+    font-size: 11.5px;
+  }
+
+.composer-meta__control--effort {
+    flex-basis: 76px;
+    width: 76px;
+    max-width: 76px;
   }
 }
 
@@ -2607,209 +4003,187 @@ a[href] {
     padding-inline: 8px;
   }
 
-  .composer-meta__control--workspace {
-    flex-basis: 132px;
-    width: 132px;
-    min-width: 118px;
-    max-width: 132px;
+  .composer-meta__control--model {
+    flex: 1 1 112px;
+    width: auto;
+    max-width: 32vw;
   }
 
-  .composer-meta--has-workspace .composer-meta__params {
-    padding-left: 6px;
+  .composer-meta__control--intent {
+    max-width: 106px;
   }
 
-  .composer-meta__control--model {
-    flex-basis: 128px;
-    max-width: 34vw;
+  .composer-meta__control--approval {
+    flex-basis: 148px;
+    min-width: 144px;
+    max-width: 148px;
   }
 
-  .composer-meta .modelsw__trigger,
-  .composer__workspace {
+  .composer-meta__control--effort {
+    flex-basis: 58px;
+    width: 58px;
+    max-width: 58px;
+  }
+
+  .composer-modebar__item {
+    gap: 3px;
+    padding-inline: 3px;
+    font-size: 11px;
+  }
+
+  .composer-meta .modelsw__trigger {
+    gap: 6px;
     padding-inline: 6px;
   }
 }
 
-.workspace-switcher {
+.anchored-popover {
   --wails-draggable: no-drag;
-  position: absolute;
-  left: 10px;
-  bottom: 44px;
-  z-index: var(--z-workspace-float);
-  width: clamp(260px, 24vw, 300px);
-  max-width: calc(100vw - 16px);
-  padding: 8px;
+  position: fixed;
+  z-index: var(--z-popover);
+}
+
+.anchored-popover[data-ready="true"][data-state="open"] {
+  animation: popover-in var(--dur-base) var(--ease-out) both;
+}
+
+.anchored-popover[data-state="closing"] {
+  pointer-events: none;
+  animation: popover-out var(--dur-fast) var(--ease-out) both;
+}
+
+@keyframes popover-in {
+  from {
+    opacity: 0;
+    transform: translateY(calc(-1 * var(--motion-rise))) scale(0.985);
+  }
+}
+
+@keyframes popover-out {
+  to {
+    opacity: 0;
+    transform: translateY(var(--motion-rise)) scale(0.985);
+  }
+}
+
+.composer-access-menu {
+  width: min(336px, calc(100vw - 16px));
+  padding: 7px;
   border: 1px solid var(--border);
   border-radius: 10px;
   background: var(--bg-elev);
-  box-shadow: 0 14px 34px rgba(0, 0, 0, 0.18);
+  box-shadow: 0 14px 34px rgba(0, 0, 0, 0.28);
 }
-.workspace-switcher__search {
+.composer-access-menu__section {
   display: flex;
-  align-items: center;
-  gap: 7px;
-  height: 36px;
-  padding: 0 8px;
-  border-bottom: 1px solid var(--border-soft);
+  flex-direction: column;
+  gap: 3px;
+}
+.composer-access-menu__section + .composer-access-menu__section {
+  margin-top: 6px;
+  padding-top: 6px;
+  border-top: 1px solid var(--border-soft);
+}
+.composer-access-menu__label {
+  padding: 3px 8px 5px;
   color: var(--fg-faint);
+  font-size: 11px;
+  font-weight: 650;
 }
-.workspace-switcher__search input {
-  min-width: 0;
-  flex: 1;
-  border: none;
-  background: transparent;
-  color: var(--fg);
-  font: inherit;
-  font-size: 13px;
-  outline: none;
-}
-.workspace-switcher__search input::placeholder {
-  color: var(--fg-faint);
-}
-.workspace-switcher__list {
-  max-height: 196px;
-  overflow-y: auto;
-  padding: 5px 0;
-}
-.workspace-switcher__row {
-  display: flex;
-  align-items: center;
-  gap: 4px;
-  min-height: 38px;
-  border-radius: 7px;
-}
-.workspace-switcher__row:hover {
-  background: var(--bg-soft);
-}
-.workspace-switcher__item,
-.workspace-switcher__remove,
-.workspace-switcher__actions button {
-  --workspace-current-color: var(--workspace-accent, var(--project-accent, var(--accent)));
+.composer-access-menu__item {
+  --wails-draggable: no-drag;
   width: 100%;
-  min-width: 0;
+  height: 56px;
+  min-height: 56px;
   display: flex;
   align-items: center;
-  gap: 8px;
+  gap: 9px;
+  padding: 7px 8px;
   border: none;
   border-radius: 7px;
   background: transparent;
   color: var(--fg-dim);
   font: inherit;
-  font-size: 13px;
   text-align: left;
 }
-.workspace-switcher__item {
-  flex: 1 1 auto;
-  min-height: 38px;
-  padding: 0 8px;
-}
-.workspace-switcher__item--current {
-  color: var(--workspace-current-color);
-}
-.workspace-switcher__item--current svg {
-  color: var(--workspace-current-color);
-}
-.workspace-switcher__item > svg {
-  flex: 0 0 auto;
-}
-.workspace-switcher__remove {
+.composer-access-menu__item > svg {
   flex: 0 0 auto;
-  justify-content: center;
-  width: 28px;
-  height: 28px;
-  padding: 0;
-  color: var(--fg-faint);
-  /* Always visible (was opacity: 0 + hover-only) — the trash button was
-     effectively undiscoverable for many users, so a freshly created workspace
-     looked "permanent". A low-opacity resting state keeps the row calm
-     while making the affordance legible. */
-  opacity: 0.45;
-  transition: color 0.12s, opacity 0.12s, background 0.12s, transform 0.12s;
-}
-.workspace-switcher__row:hover .workspace-switcher__remove,
-.workspace-switcher__remove:focus-visible {
-  opacity: 1;
-}
-.workspace-switcher__remove--armed {
-  opacity: 1;
-  background: color-mix(in srgb, var(--err) 18%, transparent);
-  color: var(--err);
-  transform: scale(1.05);
-}
-.workspace-switcher__remove--current {
-  cursor: not-allowed;
-  opacity: 0.25;
 }
-.workspace-switcher__row:hover .workspace-switcher__remove--current,
-.workspace-switcher__remove--current:focus-visible {
-  opacity: 0.4;
-}
-.workspace-switcher__remove:hover:not(:disabled):not(.workspace-switcher__remove--armed),
-.workspace-switcher__remove:focus-visible:not(:disabled):not(.workspace-switcher__remove--armed) {
-  background: color-mix(in srgb, var(--err) 12%, transparent);
-  color: var(--err);
-}
-.workspace-switcher__remove:disabled {
-  cursor: not-allowed;
+.composer-access-menu__item:hover,
+.composer-access-menu__item:focus-visible {
+  outline: none;
+  background: var(--bg-elev-2);
+  color: var(--fg);
 }
-.workspace-switcher__item:hover,
-.workspace-switcher__actions button:hover {
-  background: transparent;
+.composer-access-menu__item--active {
   color: var(--fg);
+  background: var(--bg-elev-2);
+}
+.composer-access-menu__copy {
+  flex: 1;
+  min-width: 0;
+  display: flex;
+  flex-direction: column;
+  gap: 2px;
 }
-.workspace-switcher__item--current:hover {
-  color: var(--workspace-current-color);
+.composer-access-menu__title {
+  color: inherit;
+  font-size: 12.5px;
+  font-weight: 650;
+  line-height: 16px;
 }
-.workspace-switcher__item span,
-.workspace-switcher__actions button span {
+.composer-access-menu__desc {
   min-width: 0;
-  flex: 1;
+  color: var(--fg-faint);
+  font-size: 11.5px;
+  line-height: 1.35;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
 }
-.workspace-switcher__item svg:last-child {
-  flex: 0 0 auto;
-  color: var(--fg-dim);
-}
-.workspace-switcher__item--current svg:last-child {
-  color: var(--workspace-current-color);
-}
-.workspace-switcher__empty {
-  padding: 9px 8px;
-  color: var(--fg-faint);
-  font-size: 12px;
+
+.composer-intent-menu {
+  width: min(258px, calc(100vw - 16px));
 }
-.workspace-switcher__actions {
-  display: flex;
-  flex-direction: column;
-  gap: 2px;
-  padding-top: 5px;
-  border-top: 1px solid var(--border-soft);
+
+.composer-intent-menu__item {
+  height: 54px;
+  min-height: 54px;
+  padding-right: 10px;
 }
-.workspace-switcher__actions button {
-  min-height: 38px;
-  padding: 0 8px;
+
+.composer-intent-switch {
+  position: relative;
+  flex: 0 0 auto;
+  width: 34px;
+  height: 20px;
+  border-radius: 999px;
+  background: var(--surface-3);
+  box-shadow: inset 0 0 0 1px var(--border);
+  transition: background 0.14s, box-shadow 0.14s;
 }
 
-.anchored-popover__backdrop {
-  --wails-draggable: no-drag;
-  position: fixed;
-  inset: 0;
-  z-index: var(--z-overlay-backdrop);
-  background: transparent;
+.composer-intent-switch::before {
+  content: "";
+  position: absolute;
+  top: 3px;
+  left: 3px;
+  width: 14px;
+  height: 14px;
+  border-radius: 999px;
+  background: var(--bg-elev);
+  box-shadow: 0 1px 3px color-mix(in srgb, #000 28%, transparent);
+  transition: transform 0.16s var(--ease-out), background 0.14s;
 }
 
-.anchored-popover {
-  --wails-draggable: no-drag;
-  position: fixed;
-  z-index: var(--z-popover);
+.composer-intent-switch--on {
+  background: var(--mode-auto-bg);
+  box-shadow: inset 0 0 0 1px var(--mode-auto-border);
 }
 
-.anchored-popover.workspace-switcher {
-  position: fixed;
-  left: auto;
-  top: auto;
-  bottom: auto;
+.composer-intent-switch--on::before {
+  transform: translateX(14px);
+  background: #fff;
 }
 
 .statusbar {
@@ -2817,8 +4191,8 @@ a[href] {
   margin: 7px auto 0;
   display: flex;
   align-items: center;
-  gap: 6px;
-  font-family: var(--sans);
+  gap: 14px;
+  font-family: var(--mono);
   font-size: var(--font-status);
   font-variant-numeric: tabular-nums;
   line-height: 1.45;
@@ -2835,18 +4209,27 @@ a[href] {
   flex-shrink: 1;
   min-width: 0;
 }
-.statusbar__item {
+/* design-spec stat: a "label + bold value" pair separated by the bar's gap. */
+.stat {
   display: inline-flex;
   align-items: center;
-  gap: 4px;
+  gap: 6px;
   min-width: 0;
+  white-space: nowrap;
   font-variant-numeric: tabular-nums;
 }
+.stat b {
+  color: var(--fg-dim);
+  font-weight: 600;
+}
+.stat__label {
+  color: var(--fg-faint);
+}
 .statusbar__dot {
-  width: 6px;
-  height: 6px;
+  width: 7px;
+  height: 7px;
   border-radius: 50%;
-  background: var(--fg-faint);
+  background: var(--ok);
   flex-shrink: 0;
 }
 .statusbar__dot--busy {
@@ -2858,40 +4241,57 @@ a[href] {
     opacity: 0.35;
   }
 }
+.stat--model {
+  flex: 0 0 132px;
+  max-width: 132px;
+  min-width: 0;
+}
 .statusbar__model {
+  display: block;
   color: var(--fg-dim);
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  min-width: 0;
 }
-.statusbar__sep {
-  opacity: 0.5;
-}
-.statusbar__cache {
+.statusbar__cache b {
   color: var(--accent-strong);
 }
-.statusbar__ctx {
+.statusbar__turns {
+  flex: 0 0 104px;
   color: var(--fg-dim);
 }
-.statusbar__compact,
+.statusbar__ctx {
+  flex: 0 0 72px;
+}
+.statusbar__compact {
+  flex: 0 0 70px;
+}
+.statusbar__cache {
+  flex: 0 0 118px;
+}
 .statusbar__avg {
-  color: var(--fg-faint);
+  flex: 0 0 86px;
 }
-.statusbar__cost {
+.statusbar__cost b,
+.statusbar__balance b {
   color: var(--ok);
 }
-.statusbar__balance {
-  color: var(--ok);
+.statusbar__cost {
+  flex: 0 0 90px;
+  justify-content: flex-end;
 }
-.statusbar__workspace {
-  max-width: 124px;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  color: var(--fg-dim);
+.stat--jobs,
+.statusbar__jobswrap {
+  flex: 0 0 52px;
+  justify-content: center;
 }
-.statusbar__modelgroup {
-  display: inline-flex;
-  align-items: center;
-  gap: 6px;
-  min-width: 0;
-  flex-shrink: 1;
+.statusbar__balance {
+  flex: 0 0 88px;
+  justify-content: flex-end;
+}
+.stat--balance b {
+  color: var(--fg);
 }
 .statusbar__jobswrap {
   position: relative;
@@ -2948,6 +4348,10 @@ a[href] {
   color: var(--accent);
   letter-spacing: 0.6px;
 }
+.statusbar__yolo {
+  color: var(--mode-yolo-fg);
+  letter-spacing: 0.6px;
+}
 /* model switcher (bottom-of-window popover) */
 .modelsw {
   position: relative;
@@ -2990,11 +4394,6 @@ a[href] {
 .statusbar .modelsw__trigger {
   font-size: inherit;
 }
-.modelsw__backdrop {
-  position: fixed;
-  inset: 0;
-  z-index: var(--z-local-backdrop);
-}
 .modelsw__menu {
   position: absolute;
   bottom: calc(100% + 8px);
@@ -3067,6 +4466,7 @@ a[href] {
 /* effort switcher: same status-bar affordance as the model switcher */
 .effortsw__trigger {
   --wails-draggable: no-drag;
+  width: 100%;
 }
 .effortsw__trigger:disabled {
   cursor: not-allowed;
@@ -3192,6 +4592,13 @@ a[href] {
 .prompt-shelf {
   max-width: var(--maxw);
   margin: 0 auto 10px;
+  animation: shelf-in var(--dur-slow) var(--ease-out) both;
+}
+@keyframes shelf-in {
+  from {
+    opacity: 0;
+    transform: translateY(10px);
+  }
 }
 .prompt-shelf__bar {
   display: flex;
@@ -3631,6 +5038,16 @@ a[href] {
 .workspace-panel--tree-hidden .workspace-preview {
   grid-column: 2;
 }
+.workspace-panel--detail-only {
+  grid-template-columns: minmax(0, 1fr);
+}
+.workspace-panel--detail-only .workspace-files,
+.workspace-panel--detail-only .workspace-tree-rail {
+  display: none;
+}
+.workspace-panel--detail-only .workspace-preview {
+  grid-column: 1;
+}
 .workspace-panel--preview-hidden {
   grid-template-columns: minmax(0, 1fr);
 }
@@ -4009,6 +5426,8 @@ a[href] {
   border-radius: 8px;
   background: var(--bg-elev);
   box-shadow: 0 12px 30px rgba(0, 0, 0, 0.36);
+  transform-origin: top left;
+  animation: menu-pop-in var(--dur-base) var(--ease-out) both;
 }
 .floating-menu button {
   display: flex;
@@ -4055,6 +5474,33 @@ a[href] {
   overflow-wrap: anywhere;
   pointer-events: none;
   white-space: pre-line;
+  animation: tooltip-in var(--dur-fast) var(--ease-out) both;
+}
+.tooltip--top {
+  --tooltip-from-y: var(--motion-rise);
+  --tooltip-from-x: 0;
+}
+.tooltip--bottom {
+  --tooltip-from-y: calc(-1 * var(--motion-rise));
+  --tooltip-from-x: 0;
+}
+.tooltip--left {
+  --tooltip-from-x: var(--motion-rise);
+  --tooltip-from-y: 0;
+}
+.tooltip--right {
+  --tooltip-from-x: calc(-1 * var(--motion-rise));
+  --tooltip-from-y: 0;
+}
+@keyframes tooltip-in {
+  from {
+    opacity: 0;
+    transform: translate(var(--tooltip-from-x, 0), var(--tooltip-from-y, 0));
+  }
+  to {
+    opacity: 1;
+    transform: translate(0, 0);
+  }
 }
 .tooltip::before {
   content: "";
@@ -4523,53 +5969,235 @@ a[href] {
   display: flex;
   justify-content: flex-end;
   z-index: var(--z-drawer-backdrop);
+  animation: backdrop-in var(--dur-base) var(--ease-out) both;
+}
+@keyframes backdrop-in {
+  from {
+    opacity: 0;
+  }
+}
+@keyframes backdrop-out {
+  to {
+    opacity: 0;
+  }
+}
+/* Overlays that opt into exit animation via useMountTransition flip
+ * data-state="closing" before unmount; reverse the backdrop fade. */
+.drawer-backdrop[data-state="closing"] {
+  animation: backdrop-out var(--dur-base) var(--ease-out) both;
 }
 .drawer-backdrop--subtle {
   background: rgba(0, 0, 0, 0.16);
 }
-.drawer {
-  position: relative;
-  width: min(var(--drawer-width, 440px), 92vw);
-  height: 100%;
-  background: var(--bg-elev);
-  border-left: 1px solid var(--border);
-  box-shadow: -18px 0 48px rgba(0, 0, 0, 0.46);
+
+/* ── command palette (⌘K) — centered modal over a dimmed backdrop ─────────── */
+.drawer-backdrop:has(> .palette) {
+  justify-content: center;
+  align-items: flex-start;
+  padding-top: 12vh;
+  background: rgba(0, 0, 0, 0.42);
+  backdrop-filter: blur(3px);
+  -webkit-backdrop-filter: blur(3px);
+}
+.palette {
+  width: min(620px, 92vw);
+  max-height: 70vh;
   display: flex;
   flex-direction: column;
-  animation: drawer-in 0.14s ease;
+  background: var(--bg-elev);
+  border: 1px solid var(--border-strong, var(--border));
+  border-radius: 14px;
+  box-shadow: 0 24px 70px rgba(0, 0, 0, 0.5);
+  overflow: hidden;
+  animation: palette-in 0.16s cubic-bezier(0.34, 1.4, 0.5, 1);
 }
-.drawer--wide {
-  width: min(var(--drawer-width, 720px), 94vw);
+.palette[data-state="closing"] {
+  animation: palette-out var(--dur-base) var(--ease-out) both;
 }
-.drawer-resizer {
-  --wails-draggable: no-drag;
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  left: -4px;
-  z-index: var(--z-local-handle);
-  width: 8px;
-  padding: 0;
-  border: 0;
-  background: transparent;
-  cursor: col-resize;
+@keyframes palette-in {
+  from {
+    transform: translateY(-12px) scale(0.97);
+    opacity: 0;
+  }
 }
-.drawer-resizer::after {
-  content: "";
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  left: 50%;
-  width: 1px;
-  transform: translateX(-50%);
-  background: transparent;
-  transition: background 0.12s, box-shadow 0.12s;
+@keyframes palette-out {
+  to {
+    transform: translateY(-8px) scale(0.98);
+    opacity: 0;
+  }
 }
-.drawer-resizer:hover::after,
-.drawer-resizer:focus-visible::after,
-.drawer--resizing .drawer-resizer::after {
-  background: var(--accent);
-  box-shadow: 0 0 0 1px color-mix(in srgb, var(--accent) 24%, transparent);
+.palette__inputrow {
+  display: flex;
+  align-items: center;
+  gap: 12px;
+  padding: 14px 16px;
+  border-bottom: 1px solid var(--border);
+}
+.palette__search-icon {
+  flex: none;
+  color: var(--fg-faint);
+}
+.palette__input {
+  flex: 1;
+  min-width: 0;
+  border: none;
+  background: transparent;
+  color: var(--fg);
+  font: inherit;
+  font-size: 15px;
+  outline: none;
+}
+.palette__input::placeholder {
+  color: var(--fg-faint);
+}
+.palette__esc {
+  flex: none;
+  font-family: var(--mono);
+  font-size: 10px;
+  color: var(--fg-faint);
+  border: 1px solid var(--border);
+  border-radius: 5px;
+  padding: 3px 6px;
+}
+.palette__list {
+  flex: 1;
+  min-height: 0;
+  overflow-y: auto;
+  padding: 8px;
+}
+.palette__empty {
+  padding: 28px 12px;
+  text-align: center;
+  color: var(--fg-faint);
+  font-size: 13px;
+}
+.palette__group + .palette__group {
+  margin-top: 6px;
+}
+.palette__group-title {
+  padding: 8px 12px 4px;
+  font-size: 10.5px;
+  font-weight: 650;
+  letter-spacing: 0.06em;
+  text-transform: uppercase;
+  color: var(--fg-faint);
+}
+.palette__item {
+  --wails-draggable: no-drag;
+  display: flex;
+  align-items: center;
+  gap: 12px;
+  width: 100%;
+  padding: 10px 12px;
+  border: none;
+  border-radius: 8px;
+  background: transparent;
+  color: var(--fg);
+  font: inherit;
+  text-align: left;
+  cursor: pointer;
+}
+.palette__item--on {
+  background: var(--accent-soft);
+}
+.palette__item-icon {
+  width: 30px;
+  height: 30px;
+  display: grid;
+  place-items: center;
+  flex: 0 0 30px;
+  border-radius: 8px;
+  background: var(--bg-soft);
+  color: var(--accent);
+}
+.palette__body {
+  flex: 1 1 auto;
+  min-width: 0;
+  display: flex;
+  flex-direction: column;
+  gap: 2px;
+}
+.palette__title {
+  display: block;
+  font-size: 13.5px;
+  font-weight: 500;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.palette__item--on .palette__title {
+  color: var(--accent);
+}
+.palette__hint {
+  display: block;
+  font-family: var(--mono);
+  font-size: 11.5px;
+  color: var(--fg-faint);
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.palette__foot {
+  flex: none;
+  display: flex;
+  gap: 16px;
+  padding: 9px 16px;
+  border-top: 1px solid var(--border);
+  font-size: 11px;
+  color: var(--fg-faint);
+}
+.palette__foot kbd {
+  font-family: var(--mono);
+  font-size: 10px;
+  color: var(--fg-dim);
+  border: 1px solid var(--border);
+  border-radius: 4px;
+  padding: 2px 5px;
+  margin-right: 3px;
+}
+.drawer {
+  position: relative;
+  width: min(var(--drawer-width, 440px), 92vw);
+  height: 100%;
+  background: var(--bg-elev);
+  border-left: 1px solid var(--border);
+  box-shadow: -18px 0 48px rgba(0, 0, 0, 0.46);
+  display: flex;
+  flex-direction: column;
+  animation: drawer-in var(--dur-slow) var(--ease-out) both;
+}
+.drawer--wide {
+  width: min(var(--drawer-width, 720px), 94vw);
+}
+.drawer-resizer {
+  --wails-draggable: no-drag;
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: -4px;
+  z-index: var(--z-local-handle);
+  width: 8px;
+  padding: 0;
+  border: 0;
+  background: transparent;
+  cursor: col-resize;
+}
+.drawer-resizer::after {
+  content: "";
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 50%;
+  width: 1px;
+  transform: translateX(-50%);
+  background: transparent;
+  transition: background 0.12s, box-shadow 0.12s;
+}
+.drawer-resizer:hover::after,
+.drawer-resizer:focus-visible::after,
+.drawer--resizing .drawer-resizer::after {
+  background: var(--accent);
+  box-shadow: 0 0 0 1px color-mix(in srgb, var(--accent) 24%, transparent);
 }
 .drawer--resizing,
 .drawer--resizing * {
@@ -4578,10 +6206,19 @@ a[href] {
 }
 @keyframes drawer-in {
   from {
-    transform: translateX(12px);
-    opacity: 0.6;
+    transform: translateX(24px);
+    opacity: 0;
+  }
+}
+@keyframes drawer-out {
+  to {
+    transform: translateX(24px);
+    opacity: 0;
   }
 }
+.drawer[data-state="closing"] {
+  animation: drawer-out var(--dur-slow) var(--ease-out) both;
+}
 .drawer__head {
   display: flex;
   align-items: center;
@@ -4631,9 +6268,28 @@ a[href] {
   margin-bottom: 10px;
   font-weight: 650;
 }
-.mem-section__row .mem-section__title {
-  margin-bottom: 3px;
+/* H4: group title with a count chip. */
+.hist-group__title {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+.hist-group__count {
+  display: inline-grid;
+  place-items: center;
+  min-width: 18px;
+  height: 16px;
+  padding: 0 6px;
+  border-radius: 999px;
+  background: var(--bg-soft);
+  border: 1px solid var(--border);
+  color: var(--fg-faint);
+  font-size: 10px;
+  letter-spacing: 0;
+  font-weight: 600;
 }
+.mem-section__row .mem-section__title {
+  margin-bottom: 3px;}
 .mem-note {
   max-width: 36em;
   color: var(--fg-faint);
@@ -4814,12 +6470,52 @@ a[href] {
 }
 .mem-doc__head {
   display: flex;
-  align-items: flex-start;
-  justify-content: space-between;
-  gap: 12px;
+  align-items: center;
+  gap: 10px;
   padding: 10px 12px;
   background: var(--bg-soft);
 }
+/* M3: file icon + name/path + scope tag layout. */
+.mem-doc__icon {
+  flex: none;
+  display: grid;
+  place-items: center;
+  width: 28px;
+  height: 28px;
+  border-radius: 7px;
+  background: var(--bg);
+  border: 1px solid var(--border);
+  color: var(--accent);
+}
+.mem-doc__info {
+  display: flex;
+  flex-direction: column;
+  gap: 2px;
+  min-width: 0;
+  flex: 1 1 auto;
+  overflow: hidden;
+}
+.mem-doc__name {
+  font-size: var(--font-control-small);
+  font-weight: 600;
+  color: var(--fg);
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.mem-doc__tag {
+  flex: none;
+  display: inline-flex;
+  align-items: center;
+  height: 18px;
+  padding: 0 9px;
+  border-radius: 999px;
+  font-size: 10.5px;
+  font-weight: 600;
+  white-space: nowrap;
+  color: var(--fg-dim);
+  background: color-mix(in srgb, currentColor 14%, transparent);
+}
 .mem-doc__identity {
   display: flex;
   align-items: flex-start;
@@ -4900,22 +6596,42 @@ a[href] {
   gap: 8px;
 }
 .mem-fact {
+  position: relative;
   border: 1px solid var(--border-soft);
   border-radius: 8px;
   background: color-mix(in srgb, var(--bg-elev) 78%, var(--bg) 22%);
   overflow: hidden;
-  transition: border-color 0.12s, background 0.12s;
+  transition: border-color 0.12s, background 0.12s, transform 0.12s cubic-bezier(0.34, 1.4, 0.5, 1), box-shadow 0.12s;
 }
 .mem-fact:hover {
   border-color: var(--border);
+  transform: translateY(-1px);
+  box-shadow: 0 4px 14px -8px rgba(0, 0, 0, 0.5);
 }
+/* M2: per-type accent stripe down the card's left edge. */
+.mem-fact::before {
+  content: "";
+  position: absolute;
+  left: 0;
+  top: 0;
+  bottom: 0;
+  width: 3px;
+  background: var(--mem-type-color, var(--fg-faint));
+  opacity: 0.85;
+}
+/* M1: type-keyed accent colors, shared by the stripe and the chip. */
+.mem-fact[data-mem-type="user"] { --mem-type-color: #3b82f6; }
+.mem-fact[data-mem-type="feedback"] { --mem-type-color: #e0a23a; }
+.mem-fact[data-mem-type="project"] { --mem-type-color: var(--accent); }
+.mem-fact[data-mem-type="reference"] { --mem-type-color: #2dd4bf; }
+.mem-fact[data-mem-type="other"] { --mem-type-color: var(--fg-faint); }
 .mem-fact__summary {
   width: 100%;
   min-width: 0;
   display: flex;
   align-items: flex-start;
   gap: 7px;
-  padding: 10px;
+  padding: 10px 10px 10px 13px;
   border: none;
   background: transparent;
   color: inherit;
@@ -4930,7 +6646,7 @@ a[href] {
 .mem-fact__main {
   display: flex;
   flex-direction: column;
-  gap: 2px;
+  gap: 4px;
   min-width: 0;
   flex: 1;
 }
@@ -4944,11 +6660,33 @@ a[href] {
   white-space: nowrap;
 }
 .mem-fact__meta {
+  display: flex;
+  align-items: center;
+  gap: 7px;
   min-width: 0;
   color: var(--fg-faint);
-  font-family: var(--mono);
   font-size: 10.5px;
   overflow: hidden;
+}
+.mem-fact__type {
+  flex: none;
+  display: inline-flex;
+  align-items: center;
+  height: 16px;
+  padding: 0 7px;
+  border-radius: 999px;
+  font-family: var(--font-sans, inherit);
+  font-size: 10px;
+  font-weight: 600;
+  letter-spacing: 0.01em;
+  text-transform: capitalize;
+  color: var(--mem-type-color, var(--fg-dim));
+  background: color-mix(in srgb, var(--mem-type-color, var(--fg-faint)) 16%, transparent);
+}
+.mem-fact__slug {
+  min-width: 0;
+  font-family: var(--mono);
+  overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
 }
@@ -6069,6 +7807,7 @@ a[href] {
   justify-content: center;
   padding: 24px;
   overflow: hidden;
+  animation: backdrop-in var(--dur-base) var(--ease-out) both;
 }
 
 .management-modal {
@@ -6081,12 +7820,11 @@ a[href] {
   border-radius: 14px;
   box-shadow: 0 16px 48px rgba(0, 0, 0, 0.32);
   overflow: hidden;
-  animation: modal-in 0.12s ease;
+  transform-origin: 50% 48%;
+  will-change: transform, opacity;
+  animation: modal-in 280ms var(--ease-out) both;
 }
 .history-modal {
-  width: min(1180px, calc(100vw - 96px));
-}
-.history-modal--wide {
   width: min(1360px, calc(100vw - 96px));
 }
 
@@ -6119,15 +7857,38 @@ a[href] {
   flex-shrink: 0;
 }
 @keyframes modal-in {
-  from {
-    transform: translateY(8px) scale(0.99);
-    opacity: 0.72;
+  0% {
+    transform: translate3d(0, 10px, 0) scale(0.982);
+    opacity: 0;
+  }
+  64% {
+    transform: translate3d(0, -1px, 0) scale(1.002);
+    opacity: 1;
+  }
+  100% {
+    transform: translate3d(0, 0, 0) scale(1);
+    opacity: 1;
   }
 }
-
-/* ── history manager: searchable list with preview and actions ─────────────── */
-.history-manager {
-  flex: 1;
+@keyframes modal-out {
+  to {
+    transform: translate3d(0, 8px, 0) scale(0.985);
+    opacity: 0;
+  }
+}
+/* Exit animations for modals/backdrops driven by useDeferredClose. */
+.management-modal[data-state="closing"],
+.settings-modal[data-state="closing"] {
+  animation: modal-out var(--dur-base) var(--ease-out) both;
+}
+.management-modal-backdrop[data-state="closing"],
+.settings-modal-backdrop[data-state="closing"] {
+  animation: backdrop-out var(--dur-base) var(--ease-out) both;
+}
+
+/* ── history manager: searchable list with preview and actions ─────────────── */
+.history-manager {
+  flex: 1;
   min-height: 0;
   display: grid;
   grid-template-rows: auto minmax(0, 1fr);
@@ -6136,6 +7897,7 @@ a[href] {
 .history-toolbar {
   display: flex;
   align-items: center;
+  flex-wrap: wrap;
   gap: 10px;
   padding: 12px 16px;
   border-bottom: 1px solid var(--border);
@@ -6161,26 +7923,52 @@ a[href] {
   max-width: 520px;
   margin: 0;
 }
-.history-filter-select {
+/* H5: segmented pill filters replace the native selects. */
+.history-filter {
   display: inline-flex;
   align-items: center;
-  gap: 7px;
-  min-width: 0;
+  gap: 2px;
   flex: 0 0 auto;
-  color: var(--fg-dim);
-  font-size: var(--font-caption);
+  padding: 3px;
+  border-radius: 999px;
+  background: var(--bg);
+  border: 1px solid var(--border);
 }
-.history-filter-select select {
+.history-filter__pill {
   --wails-draggable: no-drag;
-  min-width: 118px;
-  height: 34px;
-  padding: 0 28px 0 10px;
-  border: 1px solid var(--border);
-  border-radius: 7px;
-  background: var(--bg);
-  color: var(--fg);
+  display: inline-flex;
+  align-items: center;
+  gap: 6px;
+  height: 26px;
+  padding: 0 11px;
+  border: none;
+  border-radius: 999px;
+  background: transparent;
+  color: var(--fg-dim);
   font: inherit;
   font-size: var(--font-control-small);
+  font-weight: 550;
+  white-space: nowrap;
+  transition: background 0.12s, color 0.12s;
+}
+.history-filter__pill:hover:not(:disabled) {
+  color: var(--fg);
+}
+.history-filter__pill--on {
+  background: var(--accent-soft);
+  color: var(--accent);
+}
+.history-filter__pill:disabled {
+  opacity: 0.4;
+  cursor: default;
+}
+.history-filter__count {
+  font-size: 10px;
+  font-variant-numeric: tabular-nums;
+  color: var(--fg-faint);
+}
+.history-filter__pill--on .history-filter__count {
+  color: var(--accent);
 }
 .history-clear {
   height: 30px;
@@ -6269,12 +8057,8 @@ a[href] {
 .history-preview__body .transcript > * {
   max-width: none;
 }
-.history-filter-select select:focus {
-  border-color: var(--accent);
-  outline: none;
-  box-shadow: 0 0 0 2px var(--accent-soft);
-}
 .hist-item {
+  position: relative;
   display: flex;
   align-items: stretch;
   gap: 4px;
@@ -6283,17 +8067,30 @@ a[href] {
   border: 1px solid var(--border);
   border-radius: 8px;
   overflow: hidden;
-  transition: border-color 0.12s;
+  transition: border-color 0.12s, transform 0.12s cubic-bezier(0.34, 1.4, 0.5, 1), box-shadow 0.12s;
 }
 .hist-item:hover {
   border-color: var(--fg-faint);
+  transform: translateX(2px);
 }
 .hist-item--current {
   border-color: var(--accent-soft);
 }
+/* H1: selection shows a 3px accent bar + soft tint instead of a full ring. */
 .hist-item--selected {
-  border-color: var(--accent);
-  box-shadow: 0 0 0 1px var(--accent-soft);
+  border-color: var(--accent-soft);
+  background: var(--accent-soft);
+  box-shadow: none;
+}
+.hist-item--selected::before {
+  content: "";
+  position: absolute;
+  left: 0;
+  top: 7px;
+  bottom: 7px;
+  width: 3px;
+  border-radius: 0 3px 3px 0;
+  background: var(--accent);
 }
 .hist-item__main {
   --wails-draggable: no-drag;
@@ -6319,25 +8116,54 @@ a[href] {
 .hist-item__meta {
   display: flex;
   align-items: center;
-  flex-wrap: wrap;
+  flex-wrap: nowrap;
   gap: 6px;
   min-width: 0;
   font-size: 11px;
   color: var(--fg-faint);
 }
+.hist-item__metaspacer {
+  flex: 1 1 auto;
+  min-width: 4px;
+}
+.hist-item__stat {
+  flex: none;
+  white-space: nowrap;
+}
+.hist-item__dot {
+  flex: none;
+  opacity: 0.5;
+}
 .hist-item__scope {
-  max-width: 46%;
+  flex: 0 1 auto;
+  min-width: 0;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
   color: var(--fg-dim);
 }
+/* H2: status badges become a small color dot + label. */
 .hist-item__badge {
-  color: var(--accent);
-  text-transform: uppercase;
-  letter-spacing: 0.04em;
-  font-size: 10px;
+  display: inline-flex;
+  align-items: center;
+  gap: 5px;
+  flex: none;
+  color: var(--fg-dim);
+  font-size: 10.5px;
+  letter-spacing: 0.01em;
+  white-space: nowrap;
+}
+.hist-item__badge::before {
+  content: "";
+  width: 6px;
+  height: 6px;
+  border-radius: 999px;
+  background: var(--fg-faint);
 }
+.hist-item__badge--current { color: var(--accent); }
+.hist-item__badge--current::before { background: var(--accent); box-shadow: 0 0 0 3px var(--accent-soft); }
+.hist-item__badge--open::before { background: #3b82f6; }
+.hist-item__badge--deleted::before { background: var(--fg-faint); }
 .hist-item__rename {
   flex: 1;
   min-width: 0;
@@ -6356,8 +8182,7 @@ a[href] {
     padding: 12px;
   }
   .management-modal,
-  .history-modal,
-  .history-modal--wide {
+  .history-modal {
     width: calc(100vw - 24px);
     max-height: calc(100vh - 24px);
   }
@@ -6383,42 +8208,11 @@ a[href] {
 
 /* ── settings centre modal ──────────────────────────────────────────────────── */
 .settings-modal-backdrop {
-  position: fixed;
-  inset: 0;
-  z-index: var(--z-modal);
-  background: rgba(0, 0, 0, 0.48);
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  overflow: hidden;
+  --wails-draggable: no-drag;
 }
 
 .settings-modal {
-  display: flex;
-  flex-direction: column;
   width: min(1360px, calc(100vw - 96px));
-  height: min(900px, calc(100vh - 80px));
-  background: var(--bg-soft);
-  border: 1px solid var(--border);
-  border-radius: 14px;
-  box-shadow: 0 16px 48px rgba(0, 0, 0, 0.32);
-  overflow: hidden;
-}
-
-.settings-modal__head {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  padding: 14px 20px;
-  border-bottom: 1px solid var(--border);
-  background: var(--bg-elev);
-  flex: 0 0 auto;
-}
-
-.settings-modal__title {
-  font-size: var(--text-base);
-  font-weight: 700;
-  color: var(--fg);
 }
 
 /* ── settings centre layout ─────────────────────────────────────────────────── */
@@ -7761,67 +9555,160 @@ a[href] {
   align-items: flex-start;
   flex-direction: column;
 }
-.theme-style-grid {
+.theme-card-grid {
   display: grid;
-  grid-template-columns: repeat(auto-fit, minmax(132px, 1fr));
-  gap: 8px;
+  grid-template-columns: repeat(3, minmax(0, 1fr));
+  gap: 10px;
   width: 100%;
 }
-.theme-style-btn {
-  display: inline-flex;
-  align-items: center;
-  gap: 8px;
-  min-height: 34px;
-  border: 1px solid var(--border);
-  border-radius: 7px;
-  background: var(--bg);
-  color: var(--fg-dim);
+.theme-card {
+  position: relative;
+  display: flex;
+  flex-direction: column;
+  gap: 9px;
+  border: 1.5px solid var(--border);
+  border-radius: 12px;
+  background: var(--surface, var(--bg));
+  color: var(--fg);
   font: inherit;
-  font-size: 12px;
-  line-height: 1.25;
-  padding: 6px 10px;
   text-align: left;
+  padding: 12px 13px;
+  cursor: pointer;
+  transition: border-color 0.13s ease, transform 0.13s cubic-bezier(0.34, 1.4, 0.5, 1), box-shadow 0.13s ease;
 }
-.theme-style-btn:hover {
+.theme-card:hover {
   border-color: var(--button-border-hover);
-  background: var(--button-bg-hover);
+  transform: translateY(-2px);
 }
-.theme-style-btn--on {
+.theme-card--on {
   border-color: var(--accent);
-  background: var(--accent-soft);
-  color: var(--accent);
-  font-weight: 650;
+  box-shadow: 0 0 0 3px var(--accent-soft);
 }
-.theme-style-swatch {
-  width: 14px;
-  height: 14px;
-  border-radius: 999px;
-  box-shadow: 0 0 0 1px color-mix(in srgb, var(--fg-faint) 42%, transparent);
-  flex: 0 0 auto;
+.theme-card__head {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 8px;
 }
-.theme-style-swatch[data-theme-style-swatch="graphite"] {
-  background: #d97757;
+.theme-card__name {
+  font-size: 13.5px;
+  font-weight: 700;
+  white-space: nowrap;
 }
-.theme-style-swatch[data-theme-style-swatch="ember"] {
-  background: #f06d38;
+.theme-card__zh {
+  font-size: 12px;
+  font-weight: 500;
+  color: var(--fg-dim);
+  margin-left: 2px;
 }
-.theme-style-swatch[data-theme-style-swatch="aurora"] {
-  background: #34c3a6;
+.theme-card__tag {
+  flex: 0 0 auto;
+  font-size: 10.5px;
+  font-weight: 600;
+  color: var(--fg-dim);
+  background: var(--bg);
+  border: 1px solid var(--border);
+  padding: 2px 8px;
+  border-radius: 999px;
+  white-space: nowrap;
 }
-.theme-style-swatch[data-theme-style-swatch="midnight"] {
-  background: #b18cff;
+.theme-card__swatches {
+  display: flex;
+  gap: 6px;
 }
-.theme-style-swatch[data-theme-style-swatch="sandstone"] {
-  background: #c2613f;
+.theme-card__swatch {
+  flex: 1;
+  height: 30px;
+  border-radius: 7px;
+  box-shadow: inset 0 0 0 1px color-mix(in srgb, var(--fg-faint) 30%, transparent);
 }
-.theme-style-swatch[data-theme-style-swatch="porcelain"] {
-  background: #7d63c8;
+.theme-card__desc {
+  font-size: 11.5px;
+  line-height: 1.55;
+  color: var(--fg-dim);
 }
-.theme-style-swatch[data-theme-style-swatch="linen"] {
-  background: #bd5d4d;
+.theme-card__check {
+  position: absolute;
+  top: 11px;
+  right: 11px;
+  display: grid;
+  place-items: center;
+  width: 19px;
+  height: 19px;
+  border-radius: 999px;
+  background: var(--accent);
+  color: var(--accent-fg);
+  opacity: 0;
+  transform: scale(0.6);
+  transition: opacity 0.13s ease, transform 0.13s cubic-bezier(0.34, 1.4, 0.5, 1);
 }
-.theme-style-swatch[data-theme-style-swatch="glacier"] {
-  background: #357fa8;
+.theme-card--on .theme-card__check {
+  opacity: 1;
+  transform: scale(1);
+}
+/* The tag chip would otherwise sit under the check badge when selected. */
+.theme-card--on .theme-card__tag {
+  visibility: hidden;
+}
+
+/* Per-direction preview swatches (dark variant is the default). */
+.theme-card__swatches[data-theme-style-card="graphite"] .theme-card__swatch--bg { background: #0c0d10; }
+.theme-card__swatches[data-theme-style-card="graphite"] .theme-card__swatch--surface { background: #15161a; }
+.theme-card__swatches[data-theme-style-card="graphite"] .theme-card__swatch--accent { background: linear-gradient(120deg, #ff6a3d, #ff9a52); }
+.theme-card__swatches[data-theme-style-card="aurora"] .theme-card__swatch--bg { background: #0e0d18; }
+.theme-card__swatches[data-theme-style-card="aurora"] .theme-card__swatch--surface { background: #1d1b34; }
+.theme-card__swatches[data-theme-style-card="aurora"] .theme-card__swatch--accent { background: linear-gradient(120deg, #8b7cff, #b07cff 42%, #38d6e6); }
+.theme-card__swatches[data-theme-style-card="slate"] .theme-card__swatch--bg { background: #0d0f12; }
+.theme-card__swatches[data-theme-style-card="slate"] .theme-card__swatch--surface { background: #1b1f25; }
+.theme-card__swatches[data-theme-style-card="slate"] .theme-card__swatch--accent { background: linear-gradient(120deg, #4d8df6, #3b82f6); }
+.theme-card__swatches[data-theme-style-card="carbon"] .theme-card__swatch--bg { background: #0e0d0c; }
+.theme-card__swatches[data-theme-style-card="carbon"] .theme-card__swatch--surface { background: #1e1c1a; }
+.theme-card__swatches[data-theme-style-card="carbon"] .theme-card__swatch--accent { background: linear-gradient(120deg, #2dd4bf, #22d3ee); }
+.theme-card__swatches[data-theme-style-card="nocturne"] .theme-card__swatch--bg { background: #101019; }
+.theme-card__swatches[data-theme-style-card="nocturne"] .theme-card__swatch--surface { background: #20212f; }
+.theme-card__swatches[data-theme-style-card="nocturne"] .theme-card__swatch--accent { background: linear-gradient(120deg, #818cf8, #a78bfa); }
+.theme-card__swatches[data-theme-style-card="amber"] .theme-card__swatch--bg { background: #0f0c08; }
+.theme-card__swatches[data-theme-style-card="amber"] .theme-card__swatch--surface { background: #201a12; }
+.theme-card__swatches[data-theme-style-card="amber"] .theme-card__swatch--accent { background: linear-gradient(120deg, #d4632f, #de7a4b); }
+
+/* Light-mode preview swatches when the app is in light mode (forced or auto). */
+:root[data-theme="light"] .theme-card__swatches[data-theme-style-card="graphite"] .theme-card__swatch--bg { background: #f4f3ef; }
+:root[data-theme="light"] .theme-card__swatches[data-theme-style-card="graphite"] .theme-card__swatch--surface { background: #ffffff; }
+:root[data-theme="light"] .theme-card__swatches[data-theme-style-card="graphite"] .theme-card__swatch--accent { background: linear-gradient(120deg, #ff5a2c, #ff8a3d); }
+:root[data-theme="light"] .theme-card__swatches[data-theme-style-card="aurora"] .theme-card__swatch--bg { background: #f6f3fb; }
+:root[data-theme="light"] .theme-card__swatches[data-theme-style-card="aurora"] .theme-card__swatch--surface { background: #fdfcff; }
+:root[data-theme="light"] .theme-card__swatches[data-theme-style-card="aurora"] .theme-card__swatch--accent { background: linear-gradient(120deg, #6d5efc, #9b5cf6 42%, #21c8d8); }
+:root[data-theme="light"] .theme-card__swatches[data-theme-style-card="slate"] .theme-card__swatch--bg { background: #f5f6f9; }
+:root[data-theme="light"] .theme-card__swatches[data-theme-style-card="slate"] .theme-card__swatch--surface { background: #ffffff; }
+:root[data-theme="light"] .theme-card__swatches[data-theme-style-card="slate"] .theme-card__swatch--accent { background: linear-gradient(120deg, #2f6fe0, #3b82f6); }
+:root[data-theme="light"] .theme-card__swatches[data-theme-style-card="carbon"] .theme-card__swatch--bg { background: #f6f4f0; }
+:root[data-theme="light"] .theme-card__swatches[data-theme-style-card="carbon"] .theme-card__swatch--surface { background: #ffffff; }
+:root[data-theme="light"] .theme-card__swatches[data-theme-style-card="carbon"] .theme-card__swatch--accent { background: linear-gradient(120deg, #0d9488, #0891b2); }
+:root[data-theme="light"] .theme-card__swatches[data-theme-style-card="nocturne"] .theme-card__swatch--bg { background: #f6f5fb; }
+:root[data-theme="light"] .theme-card__swatches[data-theme-style-card="nocturne"] .theme-card__swatch--surface { background: #fdfcff; }
+:root[data-theme="light"] .theme-card__swatches[data-theme-style-card="nocturne"] .theme-card__swatch--accent { background: linear-gradient(120deg, #6366f1, #8b5cf6); }
+:root[data-theme="light"] .theme-card__swatches[data-theme-style-card="amber"] .theme-card__swatch--bg { background: #f5f6f9; }
+:root[data-theme="light"] .theme-card__swatches[data-theme-style-card="amber"] .theme-card__swatch--surface { background: #ffffff; }
+:root[data-theme="light"] .theme-card__swatches[data-theme-style-card="amber"] .theme-card__swatch--accent { background: linear-gradient(120deg, #dd5b28, #ef8a4a); }
+@media (prefers-color-scheme: light) {
+  :root:not([data-theme]) .theme-card__swatches[data-theme-style-card="graphite"] .theme-card__swatch--bg { background: #f4f3ef; }
+  :root:not([data-theme]) .theme-card__swatches[data-theme-style-card="graphite"] .theme-card__swatch--surface { background: #ffffff; }
+  :root:not([data-theme]) .theme-card__swatches[data-theme-style-card="graphite"] .theme-card__swatch--accent { background: linear-gradient(120deg, #ff5a2c, #ff8a3d); }
+  :root:not([data-theme]) .theme-card__swatches[data-theme-style-card="aurora"] .theme-card__swatch--bg { background: #f6f3fb; }
+  :root:not([data-theme]) .theme-card__swatches[data-theme-style-card="aurora"] .theme-card__swatch--surface { background: #fdfcff; }
+  :root:not([data-theme]) .theme-card__swatches[data-theme-style-card="aurora"] .theme-card__swatch--accent { background: linear-gradient(120deg, #6d5efc, #9b5cf6 42%, #21c8d8); }
+  :root:not([data-theme]) .theme-card__swatches[data-theme-style-card="slate"] .theme-card__swatch--bg { background: #f5f6f9; }
+  :root:not([data-theme]) .theme-card__swatches[data-theme-style-card="slate"] .theme-card__swatch--surface { background: #ffffff; }
+  :root:not([data-theme]) .theme-card__swatches[data-theme-style-card="slate"] .theme-card__swatch--accent { background: linear-gradient(120deg, #2f6fe0, #3b82f6); }
+  :root:not([data-theme]) .theme-card__swatches[data-theme-style-card="carbon"] .theme-card__swatch--bg { background: #f6f4f0; }
+  :root:not([data-theme]) .theme-card__swatches[data-theme-style-card="carbon"] .theme-card__swatch--surface { background: #ffffff; }
+  :root:not([data-theme]) .theme-card__swatches[data-theme-style-card="carbon"] .theme-card__swatch--accent { background: linear-gradient(120deg, #0d9488, #0891b2); }
+  :root:not([data-theme]) .theme-card__swatches[data-theme-style-card="nocturne"] .theme-card__swatch--bg { background: #f6f5fb; }
+  :root:not([data-theme]) .theme-card__swatches[data-theme-style-card="nocturne"] .theme-card__swatch--surface { background: #fdfcff; }
+  :root:not([data-theme]) .theme-card__swatches[data-theme-style-card="nocturne"] .theme-card__swatch--accent { background: linear-gradient(120deg, #6366f1, #8b5cf6); }
+  :root:not([data-theme]) .theme-card__swatches[data-theme-style-card="amber"] .theme-card__swatch--bg { background: #f5f6f9; }
+  :root:not([data-theme]) .theme-card__swatches[data-theme-style-card="amber"] .theme-card__swatch--surface { background: #ffffff; }
+  :root:not([data-theme]) .theme-card__swatches[data-theme-style-card="amber"] .theme-card__swatch--accent { background: linear-gradient(120deg, #dd5b28, #ef8a4a); }
 }
 .settings-config-path {
   margin-top: 18px;
@@ -7852,6 +9739,9 @@ a[href] {
   .set-hint {
     margin-left: 0;
   }
+  .theme-card-grid {
+    grid-template-columns: 1fr;
+  }
 }
 
 /* ── tool card extras: outcome line, nested sub-agent, multi-edit labels ───── */
@@ -7896,6 +9786,13 @@ a[href] {
   border-radius: 9px;
   background: var(--bg-soft);
   overflow: hidden;
+  animation: todobar-in var(--dur-base) var(--ease-out) both;
+}
+@keyframes todobar-in {
+  from {
+    opacity: 0;
+    transform: translateY(var(--motion-rise));
+  }
 }
 .todobar__head {
   display: flex;
@@ -7967,6 +9864,13 @@ a[href] {
   gap: 3px;
   max-height: 168px;
   overflow-y: auto;
+  animation: todo-list-in var(--dur-base) var(--ease-out) both;
+}
+@keyframes todo-list-in {
+  from {
+    opacity: 0;
+    transform: translateY(-6px);
+  }
 }
 .todobar__item {
   display: flex;
@@ -8004,7 +9908,7 @@ a[href] {
   padding-left: 20px;
 }
 
-/* ── composer mode switcher ───────────────────────────────────────────────── */
+/* ── composer run status ──────────────────────────────────────────────────── */
 .composer-toolbar {
   --wails-draggable: no-drag;
   display: flex;
@@ -8015,90 +9919,8 @@ a[href] {
   margin: 0 auto 8px;
 }
 
-.composer-modebar {
-  --wails-draggable: no-drag;
-  flex: 0 0 auto;
-  display: inline-flex;
-  align-items: center;
-  width: fit-content;
-  max-width: 100%;
-  margin: 0;
-  padding: 3px;
-  border: 1px solid var(--border);
-  border-radius: 10px;
-  background: color-mix(in srgb, var(--bg-elev) 72%, var(--bg));
-  box-shadow: inset 0 1px 0 color-mix(in srgb, var(--fg) 4%, transparent);
-}
-.composer-wrap--decision-pending .composer-modebar {
-  opacity: 0.46;
-  filter: saturate(0.55);
-}
-.composer-modebar__item {
-  --wails-draggable: no-drag;
-  --mode-active-bg: var(--mode-auto-bg);
-  --mode-active-border: var(--mode-auto-border);
-  --mode-active-fg: var(--mode-auto-fg);
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  gap: 6px;
-  height: 30px;
-  padding: 0 13px;
-  border: 1px solid transparent;
-  border-radius: 7px;
-  background: transparent;
-  color: var(--fg-faint);
-  font: inherit;
-  font-size: 13px;
-  transition: color 0.12s, border-color 0.12s, background 0.12s, box-shadow 0.12s;
-}
-.composer-modebar__item:hover:not(:disabled) {
-  color: var(--fg);
-  background: color-mix(in srgb, var(--bg-elev-2) 58%, transparent);
-}
-.composer-modebar__item:focus-visible {
-  outline: none;
-  box-shadow: 0 0 0 2px color-mix(in srgb, var(--mode-active-border) 35%, transparent);
-}
-.composer-modebar__item:disabled {
-  cursor: not-allowed;
-  opacity: 0.55;
-}
-.composer-modebar__item--normal {
-  --mode-active-bg: var(--mode-auto-bg);
-  --mode-active-border: var(--mode-auto-border);
-  --mode-active-fg: var(--mode-auto-fg);
-}
-.composer-modebar__item--plan {
-  --mode-active-bg: var(--mode-plan-bg);
-  --mode-active-border: var(--mode-plan-border);
-  --mode-active-fg: var(--mode-plan-fg);
-}
-.composer-modebar__item--yolo {
-  --mode-active-bg: var(--mode-yolo-bg);
-  --mode-active-border: var(--mode-yolo-border);
-  --mode-active-fg: var(--mode-yolo-fg);
-}
-.composer-modebar__item--active {
-  background: var(--mode-active-bg);
-  border-color: var(--mode-active-border);
-  color: var(--mode-active-fg);
-  font-weight: 620;
-  box-shadow:
-    inset 0 1px 0 color-mix(in srgb, #fff 20%, transparent),
-    0 1px 3px color-mix(in srgb, #000 36%, transparent);
-}
-.composer-modebar__item--active:hover:not(:disabled),
-.composer-modebar__item--active:focus-visible {
-  background: var(--mode-active-bg);
-  border-color: var(--mode-active-border);
-  color: var(--mode-active-fg);
-}
-.composer-modebar__item--active:focus-visible {
-  box-shadow:
-    inset 0 1px 0 color-mix(in srgb, #fff 20%, transparent),
-    0 1px 3px color-mix(in srgb, #000 36%, transparent),
-    0 0 0 2px color-mix(in srgb, var(--mode-active-border) 42%, transparent);
+.composer-toolbar--status-only {
+  justify-content: flex-end;
 }
 
 .composer-runstatus {
@@ -8351,14 +10173,11 @@ a[href] {
   .sidebar-resizer {
     display: none;
   }
-  .app-chrome {
-    padding-left: 92px;
-  }
-  .app-chrome__panel-toggle--left {
-    left: 94px;
+  .layout {
+    --chrome-left-toggle-offset: var(--chrome-left-safe-offset);
   }
-  .app-chrome__identity {
-    margin-left: 54px;
+  .app--darwin .layout {
+    --chrome-left-toggle-offset: 94px;
   }
   .chat-pane {
     grid-column: 1;
@@ -8791,6 +10610,7 @@ a[href] {
 }
 
 .app-chrome {
+  --windows-preview-controls-width: 138px;
   grid-row: 1;
   grid-column: 1 / -1;
   position: relative;
@@ -8798,8 +10618,8 @@ a[href] {
   display: flex;
   align-items: center;
   min-width: 0;
-  height: 38px;
-  padding: 0 50px 0 154px;
+  height: var(--app-chrome-height);
+  padding: 0;
   background: var(--bg-soft);
   border-bottom: 1px solid var(--border-soft);
   --wails-draggable: drag;
@@ -8811,9 +10631,11 @@ a[href] {
 }
 
 .app-chrome__panel-toggle {
-  flex: 0 0 42px;
-  width: 42px;
-  height: 38px;
+  position: absolute;
+  top: 0;
+  flex: 0 0 var(--chrome-toggle-size);
+  width: var(--chrome-toggle-size);
+  height: var(--app-chrome-height);
   display: inline-flex;
   align-items: center;
   justify-content: center;
@@ -8826,13 +10648,22 @@ a[href] {
 }
 
 .app-chrome__panel-toggle--left {
-  position: absolute;
-  left: 158px;
-  top: 0;
+  left: var(--chrome-left-toggle-offset);
+  border-left: 1px solid var(--border-soft);
+  border-right: 1px solid var(--border-soft);
+}
+
+.app-chrome__panel-toggle--right {
+  right: var(--chrome-right-toggle-offset);
   border-left: 1px solid var(--border-soft);
   border-right: 1px solid var(--border-soft);
 }
 
+.layout--resizing .app-chrome__panel-toggle {
+  pointer-events: none;
+  opacity: 0.65;
+}
+
 .app-chrome__panel-toggle:hover {
   color: var(--fg);
   background: color-mix(in srgb, var(--fg-faint) 10%, transparent);
@@ -8841,8 +10672,7 @@ a[href] {
 
 .app-chrome__panel-toggle--active {
   color: var(--accent);
-  background: transparent;
-  box-shadow: inset 0 -2px 0 color-mix(in srgb, var(--accent) 86%, transparent);
+  background: color-mix(in srgb, var(--accent) 7%, transparent);
   opacity: 1;
 }
 
@@ -8859,2031 +10689,5819 @@ a[href] {
   opacity: 0.55;
 }
 
-.app-chrome__identity {
+.app-chrome__spacer {
+  flex: 1 1 auto;
+  min-width: 16px;
+}
+
+.app-chrome__tab-strip {
+  flex: 1 1 auto;
   min-width: 0;
-  display: flex;
+  height: 100%;
+  display: none;
+}
+
+.app-chrome__identity {
+  flex: 0 0 auto;
+  min-width: 128px;
+  max-width: 220px;
+  height: 100%;
+  display: inline-flex;
   align-items: center;
   gap: 8px;
-  margin-left: 60px;
-  padding-right: 16px;
   color: var(--fg-dim);
-  font-size: 15px;
-  line-height: 1.35;
-  white-space: nowrap;
+  overflow: hidden;
+  --wails-draggable: drag;
 }
 
 .app-chrome__logo {
   flex: 0 0 auto;
-  width: 116px;
-  height: auto;
-  max-height: 27px;
-  border-radius: 0;
-}
-
-.welcome__logo,
-.app-chrome__logo {
-  filter: brightness(0) invert(1);
-}
-
-@media (prefers-color-scheme: light) {
-  :root:not([data-theme]) .welcome__logo,
-  :root:not([data-theme]) .app-chrome__logo {
-    filter: none;
-  }
-}
-
-:root[data-theme="light"] .welcome__logo,
-:root[data-theme="light"] .app-chrome__logo {
-  filter: none;
-}
-
-:root[data-theme="dark"] .welcome__logo,
-:root[data-theme="dark"] .app-chrome__logo {
-  filter: brightness(0) invert(1);
-}
-
-.app-chrome__identity strong {
-  color: var(--fg);
-  font-size: 16px;
-  font-weight: 680;
+  width: 78px;
+  max-height: 20px;
+  object-fit: contain;
 }
 
 .app-chrome__separator {
+  flex: 0 0 auto;
   color: var(--fg-faint);
+  opacity: 0.72;
 }
 
 .app-chrome__scope {
+  flex: 1 1 auto;
   min-width: 0;
   overflow: hidden;
   text-overflow: ellipsis;
-  line-height: 1.35;
-}
-
-.app-chrome__spacer {
-  flex: 1 1 auto;
-  min-width: 16px;
-}
-
-.app--windows .app-chrome {
-  --app-chrome-sidebar-label-left: 16px;
-  --app-chrome-toggle-left: var(--sidebar-width);
-  --app-chrome-main-title-left: calc(var(--sidebar-width) + 58px);
-  padding: 0 50px 0 0;
-}
-
-.app--windows .app-chrome__identity {
-  display: contents;
-  margin-left: 0;
-  padding-right: 0;
-  color: var(--fg-dim);
-  font-size: 15px;
-  line-height: 1;
   white-space: nowrap;
+  font-size: 12.5px;
+  font-weight: 560;
 }
 
-.app--windows .app-chrome__logo,
-.app--windows .app-chrome__separator,
-.app--windows .app-chrome__scope {
-  position: absolute;
-  top: 50%;
-  transform: translateY(-50%);
+.app-chrome__tools {
+  flex: 0 0 auto;
+  height: 100%;
+  display: inline-flex;
+  align-items: center;
+  justify-content: flex-end;
+  gap: 8px;
+  min-width: 0;
+  margin-left: 8px;
+  --wails-draggable: no-drag;
+  transition:
+    margin 0.28s cubic-bezier(0.2, 0.72, 0.2, 1),
+    transform 0.18s cubic-bezier(0.2, 0.8, 0.2, 1);
 }
 
-.app--windows .app-chrome__logo {
-  left: var(--app-chrome-sidebar-label-left);
-  max-width: max(64px, calc(var(--sidebar-width) - var(--app-chrome-sidebar-label-left) - 72px));
+.app-chrome__command {
+  margin-left: 0;
 }
 
-.app--windows .app-chrome__separator {
-  display: none;
+.app-chrome__tools--workspace-pressed .app-chrome__command {
+  animation: app-chrome-command-follow-toggle 260ms cubic-bezier(0.2, 0.8, 0.2, 1);
 }
 
-.app--windows .app-chrome__scope {
-  left: var(--app-chrome-main-title-left);
-  right: 50px;
-  display: block;
+@keyframes app-chrome-command-follow-toggle {
+  0% {
+    transform: translateX(1px) scale(0.985);
+  }
+  58% {
+    transform: translateX(-1px) scale(1.01);
+  }
+  100% {
+    transform: translateX(0) scale(1);
+  }
 }
 
-.app--windows .app-chrome__panel-toggle--left {
+.app-chrome__window-controls {
   position: absolute;
-  left: var(--app-chrome-toggle-left);
   top: 0;
+  right: 0;
   z-index: var(--z-local-raised);
-  border-left: 1px solid var(--border-soft);
-  border-right: 1px solid var(--border-soft);
+  height: 100%;
+  display: flex;
+  align-items: stretch;
+  justify-content: flex-end;
+  --wails-draggable: no-drag;
 }
 
-.app--windows .layout--sidebar-collapsed .app-chrome {
-  --app-chrome-sidebar-label-left: 58px;
-  --app-chrome-toggle-left: 0px;
-  --app-chrome-main-title-left: 190px;
+.app-chrome__window-control {
+  width: 46px;
+  height: 100%;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  color: var(--fg-dim);
+  background: transparent;
+  transition:
+    background 0.12s ease,
+    color 0.12s ease;
 }
 
-.app--windows .layout--sidebar-collapsed .app-chrome__logo {
-  max-width: 116px;
+.app-chrome__window-control:hover {
+  color: var(--fg);
+  background: color-mix(in srgb, var(--fg-faint) 12%, transparent);
 }
 
-@media (max-width: 820px) {
-  .app--windows .app-chrome {
-    --app-chrome-sidebar-label-left: 12px;
-  }
+.app-chrome__window-control--close:hover {
+  color: #fff;
+  background: #c42b1c;
+}
 
-  .app--windows .layout--sidebar-collapsed .app-chrome {
-    --app-chrome-sidebar-label-left: 54px;
-    --app-chrome-main-title-left: 186px;
-  }
+.app--darwin .app-chrome--tabs {
+  align-items: stretch;
+  padding: 0 calc(var(--chrome-right-toggle-offset) + var(--chrome-toggle-size) + 8px) 0 calc(var(--chrome-left-toggle-offset) + var(--chrome-toggle-size) + 8px);
+  background:
+    linear-gradient(180deg, color-mix(in srgb, var(--bg-soft) 94%, var(--bg-elev)), var(--bg-soft));
+  transition: padding 0.28s cubic-bezier(0.2, 0.72, 0.2, 1);
 }
 
-.workspace-tabs-bar {
-  position: relative;
-  flex: 0 0 auto;
+.app--darwin .app-chrome--tabs .app-chrome__tab-strip {
   display: flex;
-  align-items: stretch;
-  height: 38px;
-  background: var(--bg-soft);
-  border-bottom: 1px solid var(--border-soft);
-  --wails-draggable: drag;
+  --wails-draggable: no-drag;
 }
 
-.workspace-tabs-bar .tabbar,
-.workspace-tabs-bar .tabbar * {
+.app--darwin .app-chrome--tabs .app-chrome__tab-strip *,
+.app--darwin .app-chrome--tabs .tabbar,
+.app--darwin .app-chrome--tabs .tabbar * {
   --wails-draggable: no-drag;
 }
 
-.topicbar {
-  flex: 0 0 auto;
-  display: flex;
-  align-items: center;
-  gap: 14px;
-  min-height: 56px;
-  padding: 10px 32px;
-  background: var(--chat-bg);
-  border-bottom: 1px solid var(--border-soft);
-  --wails-draggable: drag;
-  user-select: none;
+.app--darwin .app-chrome--tabs .app-chrome__panel-toggle {
+  top: 7px;
+  height: 30px;
+  border: 1px solid transparent;
+  border-radius: 8px;
+  background: transparent;
+  transition:
+    color 0.14s ease,
+    border-color 0.14s ease,
+    background 0.14s ease,
+    right 0.28s cubic-bezier(0.2, 0.72, 0.2, 1),
+    transform 0.16s cubic-bezier(0.2, 0.8, 0.2, 1);
 }
 
-.topicbar button {
-  --wails-draggable: no-drag;
+.app--darwin .app-chrome--tabs .app-chrome__panel-toggle--left {
+  left: var(--chrome-left-safe-offset);
 }
 
-.topicbar__identity {
-  min-width: 0;
-  display: flex;
-  flex-direction: column;
+.app--darwin .app-chrome--tabs .app-chrome__panel-toggle--right {
+  right: var(--chrome-right-toggle-offset);
 }
 
-.topicbar__title-row {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-  min-width: 0;
+.app--darwin .app-chrome--tabs .app-chrome__panel-toggle:hover {
+  border-color: var(--border-soft);
+  background: color-mix(in srgb, var(--fg-faint) 9%, transparent);
 }
 
-.topicbar__title-row h1 {
-  margin: 0;
-  max-width: min(720px, 58vw);
+.app--darwin .app-chrome--tabs .app-chrome__panel-toggle--active {
+  color: var(--accent);
+  border-color: color-mix(in srgb, var(--accent) 20%, transparent);
+  background: color-mix(in srgb, var(--accent) 9%, transparent);
+}
+
+.app--darwin .app-chrome--tabs .app-chrome__panel-toggle--left,
+.app--darwin .app-chrome--tabs .app-chrome__panel-toggle--right {
+  isolation: isolate;
   overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  color: var(--fg);
-  font-size: 18px;
-  line-height: 1.25;
-  font-weight: 680;
+  color: var(--fg-dim);
 }
 
-.topicbar__title-edit {
-  display: flex;
-  align-items: center;
-  gap: 6px;
-  min-width: 0;
-  max-width: min(720px, 58vw);
-  --wails-draggable: no-drag;
+.app--darwin .app-chrome--tabs .app-chrome__panel-toggle--left::before,
+.app--darwin .app-chrome--tabs .app-chrome__panel-toggle--right::before {
+  content: "";
+  position: absolute;
+  inset: 0;
+  border-radius: inherit;
+  background: color-mix(in srgb, var(--fg-faint) 14%, transparent);
+  opacity: 0;
+  transform: scale(0.82);
+  transition:
+    opacity 0.14s ease,
+    transform 0.18s cubic-bezier(0.2, 0.8, 0.2, 1),
+    background 0.14s ease;
 }
 
-.topicbar__title-prefix {
-  flex: 0 0 auto;
-  overflow: hidden;
-  max-width: min(260px, 24vw);
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  color: var(--fg);
-  font-size: 18px;
-  line-height: 1.25;
-  font-weight: 680;
+.app--darwin .app-chrome--tabs .app-chrome__panel-toggle--left svg,
+.app--darwin .app-chrome--tabs .app-chrome__panel-toggle--right svg {
+  position: relative;
+  stroke-width: 1.85;
+  transition:
+    color 0.14s ease,
+    transform 0.18s cubic-bezier(0.2, 0.8, 0.2, 1);
 }
 
-.topicbar__title-input {
-  flex: 1 1 auto;
-  min-width: 180px;
-  width: min(420px, 40vw);
-  height: 32px;
-  padding: 0 9px;
-  border: 1px solid var(--border);
-  border-radius: 7px;
-  outline: none;
-  background: var(--bg-elev);
+.app--darwin .app-chrome--tabs .app-chrome__panel-toggle--left.app-chrome__panel-toggle--active,
+.app--darwin .app-chrome--tabs .app-chrome__panel-toggle--right.app-chrome__panel-toggle--active {
+  color: var(--fg-dim);
+  border-color: transparent;
+  background: transparent;
+}
+
+.app--darwin .app-chrome--tabs .app-chrome__panel-toggle--left:hover,
+.app--darwin .app-chrome--tabs .app-chrome__panel-toggle--right:hover {
   color: var(--fg);
-  font: inherit;
-  font-size: 18px;
-  line-height: 1.25;
-  font-weight: 680;
-  --wails-draggable: no-drag;
+  border-color: transparent;
+  background: transparent;
 }
 
-.topicbar__title-input:focus {
-  border-color: var(--accent);
-  box-shadow: 0 0 0 2px color-mix(in srgb, var(--accent) 22%, transparent);
+.app--darwin .app-chrome--tabs .app-chrome__panel-toggle--left:hover::before,
+.app--darwin .app-chrome--tabs .app-chrome__panel-toggle--right:hover::before {
+  opacity: 1;
+  transform: scale(1);
 }
 
-.topicbar__spacer {
-  flex: 1;
+.app--darwin .app-chrome--tabs .app-chrome__panel-toggle--left:active,
+.app--darwin .app-chrome--tabs .app-chrome__panel-toggle--right:active {
+  transform: scale(0.94);
 }
 
-.topicbar__actions {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-  position: relative;
-  --wails-draggable: no-drag;
+.app--darwin .app-chrome--tabs .app-chrome__panel-toggle--left:active::before,
+.app--darwin .app-chrome--tabs .app-chrome__panel-toggle--right:active::before {
+  background: color-mix(in srgb, var(--fg-faint) 22%, transparent);
+  opacity: 1;
+  transform: scale(0.92);
 }
 
-.topicbar__action-btn {
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  gap: 7px;
-  min-height: 34px;
-  padding: 0 12px;
-  border: 1px solid var(--border);
-  border-radius: 8px;
-  background: var(--bg-elev);
-  color: var(--fg-dim);
-  font: inherit;
-  font-size: 13px;
-  line-height: 1;
-  transition: color 0.12s, border-color 0.12s, background 0.12s;
+.app--darwin .app-chrome--tabs .app-chrome__panel-toggle--left:active svg,
+.app--darwin .app-chrome--tabs .app-chrome__panel-toggle--right:active svg {
+  transform: scale(0.92);
 }
 
-.topicbar__action-btn:hover:not(:disabled),
-.topicbar__action-btn:focus-visible:not(:disabled),
-.topicbar__export--open .topicbar__action-btn {
-  color: var(--fg);
-  border-color: var(--fg-faint);
-  background: var(--bg-elev-2);
+.app--darwin .app-chrome--tabs .app-chrome__panel-toggle--left.app-chrome__panel-toggle--pressed::before,
+.app--darwin .app-chrome--tabs .app-chrome__panel-toggle--right.app-chrome__panel-toggle--pressed::before {
+  animation: mac-sidebar-button-press 260ms cubic-bezier(0.2, 0.8, 0.2, 1);
 }
 
-.topicbar__action-btn:disabled {
-  cursor: not-allowed;
-  opacity: 0.5;
+.app--darwin .app-chrome--tabs .app-chrome__panel-toggle--left.app-chrome__panel-toggle--pressed svg,
+.app--darwin .app-chrome--tabs .app-chrome__panel-toggle--right.app-chrome__panel-toggle--pressed svg {
+  animation: mac-sidebar-icon-press 260ms cubic-bezier(0.2, 0.8, 0.2, 1);
 }
 
-.topicbar__action-btn--icon {
-  width: 34px;
-  min-width: 34px;
-  padding: 0;
+.app--darwin .app-chrome--tabs .app-chrome__panel-toggle--right.app-chrome__panel-toggle--pressed:not(.app-chrome__panel-toggle--active) svg {
+  animation: mac-workspace-icon-open-press 280ms cubic-bezier(0.2, 0.8, 0.2, 1);
 }
 
-.topicbar__export {
-  position: relative;
-  display: inline-flex;
+.app--darwin .app-chrome--tabs .app-chrome__panel-toggle--right.app-chrome__panel-toggle--pressed.app-chrome__panel-toggle--active svg {
+  animation: mac-workspace-icon-close-press 280ms cubic-bezier(0.2, 0.8, 0.2, 1);
 }
 
-.topicbar__export-menu {
-  position: absolute;
-  right: 0;
-  top: calc(100% + 7px);
-  z-index: var(--z-app-chrome);
-  min-width: 172px;
-  padding: 5px;
-  border: 1px solid var(--border);
-  border-radius: 8px;
-  background: var(--bg-elev);
-  box-shadow: 0 14px 34px rgba(0, 0, 0, 0.34);
+@keyframes mac-sidebar-button-press {
+  0% {
+    opacity: 1;
+    transform: scale(0.86);
+    background: color-mix(in srgb, var(--fg-faint) 24%, transparent);
+  }
+  58% {
+    opacity: 1;
+    transform: scale(1.04);
+  }
+  100% {
+    opacity: 1;
+    transform: scale(1);
+  }
 }
 
-.topicbar__export-menu button {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-  width: 100%;
-  padding: 8px 9px;
-  border: none;
-  border-radius: 6px;
-  background: transparent;
-  color: var(--fg-dim);
-  font: inherit;
-  font-size: 12.5px;
-  text-align: left;
+@keyframes mac-sidebar-icon-press {
+  0% {
+    transform: scale(0.9);
+  }
+  58% {
+    transform: scale(1.04);
+  }
+  100% {
+    transform: scale(1);
+  }
 }
 
-.topicbar__export-menu button:hover,
-.topicbar__export-menu button:focus-visible {
-  color: var(--fg);
-  background: var(--button-bg);
+@keyframes mac-workspace-icon-open-press {
+  0% {
+    transform: translateX(2px) scale(0.9);
+  }
+  58% {
+    transform: translateX(-1px) scale(1.04);
+  }
+  100% {
+    transform: translateX(0) scale(1);
+  }
 }
 
-.topicbar__icon-btn {
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  width: 30px;
-  height: 30px;
-  border: none;
-  border-radius: 7px;
+@keyframes mac-workspace-icon-close-press {
+  0% {
+    transform: translateX(-2px) scale(0.9);
+  }
+  58% {
+    transform: translateX(1px) scale(1.04);
+  }
+  100% {
+    transform: translateX(0) scale(1);
+  }
+}
+
+@media (prefers-reduced-motion: reduce) {
+  .app--darwin .sidebar,
+  .app--darwin .layout,
+  .app--darwin .app-chrome--tabs,
+  .app--darwin .app-chrome--tabs .app-chrome__panel-toggle--left,
+  .app--darwin .app-chrome--tabs .app-chrome__panel-toggle--right,
+  .app--darwin .app-chrome--tabs .app-chrome__panel-toggle--left::before,
+  .app--darwin .app-chrome--tabs .app-chrome__panel-toggle--right::before,
+  .app--darwin .app-chrome--tabs .app-chrome__panel-toggle--left svg,
+  .app--darwin .app-chrome--tabs .app-chrome__panel-toggle--right svg,
+  .app-chrome--native-tabs .app-chrome__panel-toggle,
+  .app-chrome--native-tabs .app-chrome__panel-toggle::before,
+  .app-chrome--native-tabs .app-chrome__panel-toggle svg,
+  .app-chrome--native-tabs .tabbar__tab,
+  .app-chrome--native-tabs .tabbar__new,
+  .app-chrome--native-tabs .tabbar__command {
+    transition: none;
+    animation: none;
+  }
+}
+
+.app--darwin .app-chrome--tabs .tabbar {
+  height: 100%;
+  align-items: flex-end;
+  padding: 5px 0 0;
+  gap: 5px;
+}
+
+.app--darwin .app-chrome--tabs .tabbar__tabs {
+  align-self: flex-end;
+  height: 39px;
+  max-width: calc(100% - 40px);
+  gap: 4px;
+}
+
+.app--darwin .app-chrome--tabs .tabbar__tab {
+  flex-basis: var(--tabbar-tab-width);
+  height: 34px;
+  width: var(--tabbar-tab-width);
+  min-width: var(--tabbar-tab-width);
+  max-width: var(--tabbar-tab-width);
+  align-self: flex-end;
+  padding: 0 28px 0 11px;
+  border: 1px solid transparent;
+  border-bottom: 0;
+  border-radius: 10px 10px 0 0;
   background: transparent;
-  color: var(--fg-faint);
+  color: var(--fg-dim);
 }
 
-.topicbar__icon-btn:hover {
+.app--darwin .app-chrome--tabs .tabbar__tab:not(.tabbar__tab--active):hover {
+  background: color-mix(in srgb, var(--bg-elev-2) 50%, transparent);
+  border-color: color-mix(in srgb, var(--border-soft) 70%, transparent);
+}
+
+.app--darwin .app-chrome--tabs .tabbar__tab--active {
   color: var(--fg);
-  background: var(--button-bg);
+  background: var(--chat-bg);
+  border-color: var(--border-soft);
+  box-shadow: 0 -1px 0 color-mix(in srgb, var(--fg) 5%, transparent);
 }
 
-.topicbar__icon-btn:disabled {
-  opacity: 0.45;
-  cursor: default;
+.app--darwin .app-chrome--tabs .tabbar__tab-label {
+  font-size: 12.5px;
+  font-weight: 590;
 }
 
-.topicbar__icon-btn:disabled:hover {
-  color: var(--fg-faint);
-  background: transparent;
+.app--darwin .app-chrome--tabs .tabbar__new {
+  width: 32px;
+  height: 30px;
+  margin: 4px 0 4px 0;
+  border-radius: 8px;
 }
 
-.topicbar__action-btn {
-  display: inline-flex;
+.app--windows .app-chrome--native-tabs,
+.app--linux .app-chrome--native-tabs {
   align-items: center;
-  justify-content: center;
-  gap: 6px;
-  min-width: 30px;
-  height: 30px;
-  padding: 0 8px;
-  border: none;
-  border-radius: 7px;
-  background: transparent;
-  color: var(--fg-faint);
-  font: inherit;
+  gap: 12px;
+  padding: 0 calc(var(--chrome-toggle-size) + 10px) 0 calc(var(--chrome-toggle-size) + 10px);
+  background: var(--bg-soft);
 }
 
-.topicbar__action-btn--icon {
-  width: 30px;
-  padding: 0;
+.app--windows .app-chrome--native-tabs {
+  background:
+    linear-gradient(180deg, color-mix(in srgb, var(--bg-soft) 88%, var(--bg-elev)), var(--bg-soft));
 }
 
-.topicbar__action-btn:hover:not(:disabled),
-.topicbar__action-btn:focus-visible:not(:disabled),
-.topicbar__export--open .topicbar__action-btn {
-  color: var(--fg);
-  background: var(--button-bg);
-  outline: none;
+.app--browser-preview.app--windows .app-chrome--native-tabs {
+  padding-right: calc(var(--windows-preview-controls-width) + 48px);
 }
 
-.topicbar__action-btn:disabled {
-  opacity: 0.45;
-  cursor: default;
+.app--linux .app-chrome--native-tabs {
+  background: color-mix(in srgb, var(--bg-soft) 92%, var(--bg-elev));
 }
 
-.topicbar__export {
-  position: relative;
-  display: inline-flex;
+.app--windows .app-chrome--native-tabs .app-chrome__tab-strip,
+.app--linux .app-chrome--native-tabs .app-chrome__tab-strip {
+  display: flex;
+  --wails-draggable: no-drag;
 }
 
-.topicbar__export-menu {
-  position: absolute;
-  top: calc(100% + 6px);
-  right: 0;
-  z-index: var(--z-topicbar-menu);
-  min-width: 168px;
-  padding: 5px;
-  border: 1px solid var(--border);
-  border-radius: 8px;
-  background: var(--bg-elev);
-  box-shadow: 0 16px 36px rgba(0, 0, 0, 0.36);
+.app--windows .app-chrome--native-tabs .app-chrome__tab-strip *,
+.app--linux .app-chrome--native-tabs .app-chrome__tab-strip *,
+.app--windows .app-chrome--native-tabs .tabbar,
+.app--linux .app-chrome--native-tabs .tabbar,
+.app--windows .app-chrome--native-tabs .tabbar *,
+.app--linux .app-chrome--native-tabs .tabbar * {
   --wails-draggable: no-drag;
 }
 
-.topicbar__export-menu button {
-  width: 100%;
-  min-height: 30px;
-  display: flex;
-  align-items: center;
-  gap: 8px;
-  padding: 0 8px;
-  border: none;
-  border-radius: 6px;
-  background: transparent;
-  color: var(--fg-dim);
-  font: inherit;
-  font-size: 12px;
-  text-align: left;
+.app--windows .app-chrome--native-tabs .app-chrome__identity {
+  max-width: 238px;
 }
 
-.topicbar__export-menu button:hover,
-.topicbar__export-menu button:focus-visible {
-  color: var(--fg);
-  background: var(--sidebar-hover);
-  outline: none;
+.app--linux .app-chrome--native-tabs .app-chrome__identity {
+  max-width: 214px;
 }
 
-.tabbar {
-  flex: 1 1 auto;
-  min-width: 0;
-  height: 38px;
-  display: flex;
-  align-items: center;
-  padding: 0 10px 0 0;
-  gap: 3px;
+.app--windows .app-chrome--native-tabs .app-chrome__panel-toggle,
+.app--linux .app-chrome--native-tabs .app-chrome__panel-toggle {
+  top: 4px;
+  width: 30px;
+  height: 30px;
+  border: 1px solid transparent;
+  border-radius: 8px;
   background: transparent;
-  border-bottom: none;
+  color: var(--fg-dim);
+  isolation: isolate;
   overflow: hidden;
+  transition:
+    color 0.14s ease,
+    border-color 0.14s ease,
+    background 0.14s ease,
+    transform 0.16s cubic-bezier(0.2, 0.8, 0.2, 1);
 }
 
-.tabbar__tabs {
-  display: flex;
-  align-self: stretch;
-  flex: 0 1 auto;
-  max-width: calc(100% - 36px);
-  gap: 0;
-  overflow-x: auto;
-  scrollbar-width: none;
+.app--windows .app-chrome--native-tabs .app-chrome__panel-toggle--left,
+.app--linux .app-chrome--native-tabs .app-chrome__panel-toggle--left {
+  left: 8px;
+  border-left: 1px solid transparent;
+  border-right: 1px solid transparent;
+  z-index: var(--z-local-raised);
 }
 
-.tabbar__tabs::-webkit-scrollbar {
-  display: none;
+.app--windows .app-chrome--native-tabs .app-chrome__panel-toggle--right,
+.app--linux .app-chrome--native-tabs .app-chrome__panel-toggle--right {
+  right: 8px;
+  border-left: 1px solid transparent;
+  border-right: 1px solid transparent;
 }
 
-.tabbar__tab {
-  flex: 0 1 148px;
-  position: relative;
-  height: 38px;
-  min-width: 92px;
-  max-width: 168px;
-  display: flex;
-  align-items: center;
-  padding: 0 28px 0 10px;
-  gap: 6px;
-  border: none;
-  border-right: 1px solid var(--border-soft);
-  border-radius: 0;
-  color: var(--fg-dim);
-  background: transparent;
-  font-size: 12.5px;
-  white-space: nowrap;
-  transition: background 0.12s;
+.app--browser-preview.app--windows .app-chrome--native-tabs .app-chrome__panel-toggle--right {
+  right: calc(var(--windows-preview-controls-width) + 8px);
 }
 
-.tabbar__tab:not(.tabbar__tab--active):hover {
-  background: color-mix(in srgb, var(--bg-elev-2) 42%, transparent);
+.app--windows .app-chrome--native-tabs .app-chrome__panel-toggle::before,
+.app--linux .app-chrome--native-tabs .app-chrome__panel-toggle::before {
+  content: "";
+  position: absolute;
+  inset: 0;
+  border-radius: inherit;
+  background: color-mix(in srgb, var(--fg-faint) 13%, transparent);
+  opacity: 0;
+  transform: scale(0.82);
+  transition:
+    opacity 0.14s ease,
+    transform 0.18s cubic-bezier(0.2, 0.8, 0.2, 1),
+    background 0.14s ease;
 }
 
-.tabbar__tab--active {
-  flex-basis: 174px;
-  max-width: 196px;
-  color: var(--fg);
-  background: var(--chat-bg);
-  box-shadow: inset 0 -1px 0 var(--chat-bg);
+.app--windows .app-chrome--native-tabs .app-chrome__panel-toggle svg,
+.app--linux .app-chrome--native-tabs .app-chrome__panel-toggle svg {
+  position: relative;
+  stroke-width: 1.85;
+  transition:
+    color 0.14s ease,
+    transform 0.18s cubic-bezier(0.2, 0.8, 0.2, 1);
 }
 
-.tabbar__tab--yolo {
+.app--windows .app-chrome--native-tabs .app-chrome__panel-toggle:hover,
+.app--linux .app-chrome--native-tabs .app-chrome__panel-toggle:hover {
   color: var(--fg);
+  border-color: transparent;
+  background: transparent;
+  opacity: 1;
 }
 
-.tabbar__tab--dragging {
-  opacity: 0.58;
+.app--windows .app-chrome--native-tabs .app-chrome__panel-toggle:hover::before,
+.app--linux .app-chrome--native-tabs .app-chrome__panel-toggle:hover::before {
+  opacity: 1;
+  transform: scale(1);
 }
 
-.tabbar__tab--drop-before::before,
-.tabbar__tab--drop-after::after {
-  content: "";
-  position: absolute;
-  top: 7px;
-  bottom: 7px;
-  width: 2px;
-  border-radius: 999px;
-  background: var(--accent);
-  box-shadow: 0 0 0 2px color-mix(in srgb, var(--accent) 16%, transparent);
+.app--windows .app-chrome--native-tabs .app-chrome__panel-toggle--active,
+.app--linux .app-chrome--native-tabs .app-chrome__panel-toggle--active {
+  color: var(--fg-dim);
+  border-color: transparent;
+  background: transparent;
 }
 
-.tabbar__tab--drop-before::before {
-  left: 0;
+.app--windows .app-chrome--native-tabs .app-chrome__panel-toggle--active::before,
+.app--linux .app-chrome--native-tabs .app-chrome__panel-toggle--active::before {
+  opacity: 1;
+  transform: scale(1);
+  background: color-mix(in srgb, var(--accent) 11%, transparent);
 }
 
-.tabbar__tab--drop-after::after {
-  right: 0;
+.app--windows .app-chrome--native-tabs .app-chrome__panel-toggle:active,
+.app--linux .app-chrome--native-tabs .app-chrome__panel-toggle:active {
+  transform: scale(0.94);
 }
 
-.tabbar__status {
-  flex: 0 0 7px;
-  width: 7px;
-  min-width: 7px;
-  height: 7px;
-  border-radius: 50%;
-  background: var(--project-accent, var(--accent));
+.app--windows .app-chrome--native-tabs .app-chrome__panel-toggle:active::before,
+.app--linux .app-chrome--native-tabs .app-chrome__panel-toggle:active::before {
   opacity: 1;
-  box-shadow: 0 0 0 0 color-mix(in srgb, var(--project-accent, var(--accent)) 0%, transparent);
-  transform-origin: center;
-  transition: box-shadow 0.18s ease, opacity 0.18s ease;
+  transform: scale(0.92);
+  background: color-mix(in srgb, var(--fg-faint) 22%, transparent);
 }
 
-.tabbar__tab--active .tabbar__status {
-  box-shadow: 0 0 0 4px color-mix(in srgb, var(--project-accent, var(--accent)) 18%, transparent);
-  animation: tab-status-breathe 2.6s ease-in-out infinite;
+.app--windows .app-chrome--native-tabs .app-chrome__panel-toggle:active svg,
+.app--linux .app-chrome--native-tabs .app-chrome__panel-toggle:active svg {
+  transform: scale(0.92);
 }
 
-.tabbar__status--running {
-  box-shadow: 0 0 0 5px color-mix(in srgb, var(--project-accent, var(--accent)) 24%, transparent);
-  animation: tab-status-breathe-running 1.8s ease-in-out infinite;
+.app--windows .app-chrome--native-tabs .app-chrome__panel-toggle--pressed::before,
+.app--linux .app-chrome--native-tabs .app-chrome__panel-toggle--pressed::before {
+  animation: mac-sidebar-button-press 260ms cubic-bezier(0.2, 0.8, 0.2, 1);
 }
 
-.tabbar__file-icon {
-  flex: 0 0 auto;
-  color: var(--fg-faint);
+.app--windows .app-chrome--native-tabs .app-chrome__panel-toggle--pressed svg,
+.app--linux .app-chrome--native-tabs .app-chrome__panel-toggle--pressed svg {
+  animation: mac-sidebar-icon-press 260ms cubic-bezier(0.2, 0.8, 0.2, 1);
 }
 
-.tabbar__tab--active .tabbar__file-icon {
-  color: var(--fg-dim);
+.app--windows .app-chrome--native-tabs .app-chrome__panel-toggle--right.app-chrome__panel-toggle--pressed:not(.app-chrome__panel-toggle--active) svg,
+.app--linux .app-chrome--native-tabs .app-chrome__panel-toggle--right.app-chrome__panel-toggle--pressed:not(.app-chrome__panel-toggle--active) svg {
+  animation: mac-workspace-icon-open-press 280ms cubic-bezier(0.2, 0.8, 0.2, 1);
 }
 
-@keyframes tab-status-breathe {
-  0%, 100% {
-    box-shadow: 0 0 0 4px color-mix(in srgb, var(--project-accent, var(--accent)) 16%, transparent);
-  }
-  50% {
-    box-shadow: 0 0 0 6px color-mix(in srgb, var(--project-accent, var(--accent)) 24%, transparent);
-  }
+.app--windows .app-chrome--native-tabs .app-chrome__panel-toggle--right.app-chrome__panel-toggle--pressed.app-chrome__panel-toggle--active svg,
+.app--linux .app-chrome--native-tabs .app-chrome__panel-toggle--right.app-chrome__panel-toggle--pressed.app-chrome__panel-toggle--active svg {
+  animation: mac-workspace-icon-close-press 280ms cubic-bezier(0.2, 0.8, 0.2, 1);
 }
 
-@keyframes tab-status-breathe-running {
-  0%, 100% {
-    box-shadow: 0 0 0 5px color-mix(in srgb, var(--project-accent, var(--accent)) 22%, transparent);
-  }
-  50% {
-    box-shadow: 0 0 0 7px color-mix(in srgb, var(--project-accent, var(--accent)) 12%, transparent);
-  }
+.app--windows .app-chrome--native-tabs .tabbar,
+.app--linux .app-chrome--native-tabs .tabbar {
+  height: 100%;
+  padding: 0;
+  gap: 8px;
 }
 
-.tabbar__tab-label {
+.app--windows .app-chrome--native-tabs .tabbar__tabs,
+.app--linux .app-chrome--native-tabs .tabbar__tabs {
   flex: 1 1 auto;
-  max-width: 100%;
+  max-width: none;
   min-width: 0;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  font-weight: 560;
+  align-items: center;
+  gap: 5px;
 }
 
-.tabbar__mode-badge {
-  flex: 0 0 auto;
-  height: 16px;
-  display: inline-flex;
-  align-items: center;
-  padding: 0 5px;
-  border-radius: 5px;
-  font-size: 9.5px;
-  line-height: 1;
-  font-weight: 700;
-  letter-spacing: 0;
-  text-transform: uppercase;
+.app--windows .app-chrome--native-tabs .tabbar__tab,
+.app--linux .app-chrome--native-tabs .tabbar__tab {
+  height: 30px;
+  width: var(--tabbar-tab-width);
+  min-width: var(--tabbar-tab-width);
+  max-width: var(--tabbar-tab-width);
+  align-self: center;
+  padding: 0 30px 0 10px;
+  border: 1px solid transparent;
+  border-right: 0;
+  border-radius: 7px;
+  background: transparent;
+  color: var(--fg-dim);
+  box-shadow: none;
+  transition:
+    background 0.14s ease,
+    border-color 0.14s ease,
+    box-shadow 0.14s ease,
+    color 0.14s ease,
+    transform 0.16s cubic-bezier(0.2, 0.8, 0.2, 1);
 }
 
-.tabbar__mode-badge--yolo {
-  color: var(--mode-yolo-fg);
-  background: var(--mode-yolo-bg);
+.app--windows .app-chrome--native-tabs .tabbar__tab:not(.tabbar__tab--active):hover {
+  border-color: color-mix(in srgb, var(--border) 72%, transparent);
+  background: color-mix(in srgb, var(--bg-elev-2) 50%, transparent);
+  color: var(--fg);
 }
 
-.tabbar__tab-close {
-  position: absolute;
-  right: 8px;
-  width: 16px;
-  height: 16px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  border-radius: 3px;
-  opacity: 0;
-  color: var(--fg-faint);
-  pointer-events: none;
-  transition: opacity 0.12s ease, background 0.12s ease, color 0.12s ease;
+.app--linux .app-chrome--native-tabs .tabbar__tab:not(.tabbar__tab--active):hover {
+  border-color: color-mix(in srgb, var(--border-soft) 72%, transparent);
+  background: color-mix(in srgb, var(--bg-elev-2) 38%, transparent);
+  color: var(--fg);
 }
 
-.tabbar__tab:hover .tabbar__tab-close,
-.tabbar__tab--active .tabbar__tab-close {
-  opacity: 0.78;
-  pointer-events: auto;
+.app--windows .app-chrome--native-tabs .tabbar__tab--active {
+  color: var(--fg);
+  border-color: var(--border);
+  background: var(--bg-elev);
+  box-shadow: 0 1px 0 color-mix(in srgb, #fff 45%, transparent);
 }
 
-.tabbar__tab-close:hover {
-  opacity: 1;
-  background: var(--button-bg);
+.app--linux .app-chrome--native-tabs .tabbar__tab--active {
   color: var(--fg);
+  border-color: color-mix(in srgb, var(--border-soft) 70%, transparent);
+  background: color-mix(in srgb, var(--bg-elev) 78%, transparent);
 }
 
-.tabbar__new {
+.app--windows .app-chrome--native-tabs .tabbar__tab:active,
+.app--linux .app-chrome--native-tabs .tabbar__tab:active {
+  transform: translateY(1px) scale(0.985);
+}
+
+.app--windows .app-chrome--native-tabs .tabbar__new,
+.app--linux .app-chrome--native-tabs .tabbar__new,
+.app--windows .app-chrome--native-tabs .tabbar__command,
+.app--linux .app-chrome--native-tabs .tabbar__command {
+  transition:
+    background 0.14s ease,
+    border-color 0.14s ease,
+    color 0.14s ease,
+    transform 0.16s cubic-bezier(0.2, 0.8, 0.2, 1);
+}
+
+.app--windows .app-chrome--native-tabs .tabbar__new:active,
+.app--linux .app-chrome--native-tabs .tabbar__new:active,
+.app--windows .app-chrome--native-tabs .tabbar__command:active,
+.app--linux .app-chrome--native-tabs .tabbar__command:active {
+  transform: scale(0.94);
+}
+
+.app--windows .app-chrome--native-tabs .tabbar__spacer,
+.app--linux .app-chrome--native-tabs .tabbar__spacer {
+  flex: 0 0 8px;
+  min-width: 8px;
+}
+
+.app--windows .app-chrome--native-tabs .tabbar__command,
+.app--linux .app-chrome--native-tabs .tabbar__command {
+  flex: 0 1 clamp(148px, 19vw, 280px);
+  width: clamp(148px, 19vw, 280px);
+  max-width: 280px;
+}
+
+.app--windows .app-chrome--native-tabs .tabbar__command--compact,
+.app--linux .app-chrome--native-tabs .tabbar__command--compact {
+  flex: 0 0 112px;
+  width: 112px;
+  min-width: 112px;
+}
+
+.workspace-tabs-bar {
+  position: relative;
   flex: 0 0 auto;
-  width: 30px;
-  height: 30px;
+  display: flex;
+  align-items: stretch;
+  height: 38px;
+  background: var(--bg-soft);
+  border-bottom: 1px solid var(--border-soft);
+  --wails-draggable: drag;
+}
+
+.workspace-tabs-bar .tabbar,
+.workspace-tabs-bar .tabbar * {
+  --wails-draggable: no-drag;
+}
+
+.topicbar {
+  flex: 0 0 auto;
+  container-type: inline-size;
   display: flex;
   align-items: center;
-  justify-content: center;
-  margin-left: 1px;
-  border: none;
-  border-radius: 7px;
-  background: transparent;
-  color: var(--fg-dim);
+  gap: 10px;
+  min-height: 48px;
+  padding: 6px 18px;
+  background: var(--chat-bg);
+  border-bottom: 1px solid var(--border-soft);
+  --wails-draggable: drag;
+  user-select: none;
 }
 
-.tabbar__new:hover {
-  background: var(--button-bg);
-  color: var(--fg);
+.topicbar button {
+  --wails-draggable: no-drag;
 }
 
-.project-tree {
-  --project-tree-action-column: 36px;
-  --project-tree-edge-gap: 6px;
+.topicbar__identity {
   flex: 1 1 auto;
-  min-height: 0;
+  min-width: 0;
   display: flex;
   flex-direction: column;
-  gap: 11px;
+  overflow: hidden;
 }
 
-.project-tree__search {
+.topicbar__title-row {
   display: flex;
   align-items: center;
-  gap: 8px;
-  height: 34px;
-  margin: 0 var(--project-tree-edge-gap);
-  padding: 0 10px;
-  border: 1px solid var(--border);
-  border-radius: 7px;
-  background: var(--bg-elev);
-  color: var(--fg-faint);
+  gap: 6px;
+  min-width: 0;
+  max-width: 100%;
 }
 
-.project-tree__search input {
-  flex: 1;
+.topicbar__title-row h1 {
+  margin: 0;
+  max-width: 100%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  color: var(--fg);
+  font-size: 15px;
+  line-height: 1.25;
+  font-weight: 680;
+}
+
+.topicbar__title-edit {
+  flex: 1 1 auto;
+  display: flex;
+  align-items: center;
+  gap: 6px;
   min-width: 0;
-  border: none;
+  max-width: 100%;
+  --wails-draggable: no-drag;
+}
+
+.topicbar__title-input {
+  flex: 1 1 auto;
+  min-width: 140px;
+  width: min(420px, 100%);
+  height: 28px;
+  padding: 0 9px;
+  border: 1px solid var(--border);
+  border-radius: 7px;
   outline: none;
-  background: transparent;
+  background: var(--bg-elev);
   color: var(--fg);
   font: inherit;
-  font-size: 13px;
+  font-size: 15px;
+  line-height: 1.25;
+  font-weight: 680;
+  --wails-draggable: no-drag;
 }
 
-.project-tree__search input::placeholder {
-  color: var(--fg-faint);
+.topicbar__title-input:focus {
+  border-color: var(--accent);
+  box-shadow: 0 0 0 2px color-mix(in srgb, var(--accent) 22%, transparent);
 }
 
-.project-tree__header {
+.topicbar__spacer {
+  display: none;
+}
+
+.topicbar__actions {
+  flex: 0 0 auto;
   display: flex;
   align-items: center;
-  justify-content: space-between;
   gap: 6px;
-  min-height: 28px;
-  padding: 2px var(--project-tree-edge-gap) 0 8px;
-  color: var(--fg-dim);
-  font-size: 13px;
-  font-weight: 650;
-  text-transform: none;
-  letter-spacing: 0;
+  position: relative;
+  --wails-draggable: no-drag;
 }
 
-.project-tree__header-title {
+.topicbar__actions > .tooltip-trigger {
+  display: inline-flex;
+}
+
+.topicbar__subtitle {
+  min-width: 0;
   display: flex;
   align-items: center;
-  gap: 7px;
+  gap: 5px;
+  overflow: hidden;
+}
+
+.topicbar__subtitle span {
   min-width: 0;
-  flex: 1 1 auto;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 
-.project-tree__action-slot {
-  flex: 0 0 var(--project-tree-action-column);
-  width: var(--project-tree-action-column);
+.topicbar__action-btn {
   display: inline-flex;
   align-items: center;
   justify-content: center;
+  gap: 0;
+  min-height: 28px;
+  padding: 0 11px;
+  border: 1px solid var(--border);
+  border-radius: 8px;
+  background: var(--bg-elev);
+  color: var(--fg-dim);
+  font: inherit;
+  font-size: 12.5px;
+  line-height: 1;
+  transition: color 0.12s, border-color 0.12s, background 0.12s;
 }
 
-.project-tree__add-project,
-.project-tree__new-topic {
-  --wails-draggable: no-drag;
-  width: 24px;
-  height: 24px;
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  border: 1px solid var(--border-soft);
-  border-radius: 7px;
-  background: transparent;
-  color: var(--fg-faint);
+.topicbar__action-btn--label {
+  width: 30px;
+  min-width: 30px;
   padding: 0;
-  opacity: 0.78;
 }
 
-.project-tree__add-project:hover:not(:disabled) {
-  background: var(--button-bg);
-  border-color: color-mix(in srgb, var(--accent) 28%, var(--border-soft));
-  color: var(--fg);
-  opacity: 1;
+.topicbar__action-btn--label span {
+  display: none;
 }
 
-.project-tree__add-project:disabled {
-  cursor: default;
-  opacity: 0.45;
+.topicbar__action-btn:hover:not(:disabled),
+.topicbar__action-btn:focus-visible:not(:disabled),
+.topicbar__export--open .topicbar__action-btn {
+  color: var(--fg);
+  border-color: var(--fg-faint);
+  background: var(--bg-elev-2);
 }
 
-.project-tree__list {
-  flex: 1 1 auto;
-  min-height: 0;
-  display: flex;
-  flex-direction: column;
-  overflow-y: auto;
-  overflow-x: hidden;
-  padding: 0 var(--project-tree-edge-gap) 0 8px;
-  scrollbar-width: none;
+.topicbar__action-btn:disabled {
+  cursor: not-allowed;
+  opacity: 0.5;
 }
 
-.project-tree__list::-webkit-scrollbar {
-  display: none;
+.topicbar__action-btn--icon {
+  width: 34px;
+  min-width: 34px;
+  padding: 0;
 }
 
-.project-tree__folder {
+.topicbar__action-btn--accent {
+  color: var(--accent);
+  border-color: color-mix(in srgb, var(--accent) 24%, var(--border));
+  background: color-mix(in srgb, var(--accent) 7%, var(--bg-elev));
+}
+
+.topicbar__action-btn--accent:hover:not(:disabled),
+.topicbar__action-btn--accent:focus-visible:not(:disabled) {
+  color: var(--accent);
+  border-color: color-mix(in srgb, var(--accent) 38%, var(--border));
+  background: color-mix(in srgb, var(--accent) 10%, var(--bg-elev));
+}
+
+.topicbar__export {
   position: relative;
-  height: 34px;
+  display: inline-flex;
+}
+
+.topicbar__export-menu {
+  position: absolute;
+  right: 0;
+  top: calc(100% + 7px);
+  z-index: var(--z-app-chrome);
+  min-width: 172px;
+  padding: 5px;
+  border: 1px solid var(--border);
+  border-radius: 8px;
+  background: var(--bg-elev);
+  box-shadow: 0 14px 34px rgba(0, 0, 0, 0.34);
+}
+
+.topicbar__export-menu button {
   display: flex;
   align-items: center;
-  gap: 4px;
+  gap: 8px;
+  width: 100%;
+  padding: 8px 9px;
+  border: none;
+  border-radius: 6px;
+  background: transparent;
+  color: var(--fg-dim);
+  font: inherit;
+  font-size: 12.5px;
+  text-align: left;
+}
+
+.topicbar__export-menu button:hover,
+.topicbar__export-menu button:focus-visible {
+  color: var(--fg);
+  background: var(--button-bg);
+}
+
+.topicbar__icon-btn {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  width: 30px;
+  height: 30px;
+  border: none;
+  border-radius: 7px;
+  background: transparent;
+  color: var(--fg-faint);
+}
+
+.topicbar__icon-btn:hover {
+  color: var(--fg);
+  background: var(--button-bg);
+}
+
+.topicbar__icon-btn:disabled {
+  opacity: 0.45;
+  cursor: default;
+}
+
+.topicbar__icon-btn:disabled:hover {
+  color: var(--fg-faint);
+  background: transparent;
+}
+
+.topicbar__action-btn {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  gap: 6px;
+  min-width: 30px;
+  height: 30px;
+  padding: 0 8px;
+  border: none;
+  border-radius: 7px;
+  background: transparent;
+  color: var(--fg-faint);
+  font: inherit;
+}
+
+.topicbar__action-btn--icon {
+  width: 30px;
   padding: 0;
+}
+
+.topicbar__action-btn:hover:not(:disabled),
+.topicbar__action-btn:focus-visible:not(:disabled),
+.topicbar__export--open .topicbar__action-btn {
+  color: var(--fg);
+  background: var(--button-bg);
+  outline: none;
+}
+
+.topicbar__action-btn:disabled {
+  opacity: 0.45;
+  cursor: default;
+}
+
+.topicbar__export {
+  position: relative;
+  display: inline-flex;
+}
+
+.topicbar__export-menu {
+  position: absolute;
+  top: calc(100% + 6px);
+  right: 0;
+  z-index: var(--z-topicbar-menu);
+  min-width: 168px;
+  padding: 5px;
+  border: 1px solid var(--border);
+  border-radius: 8px;
+  background: var(--bg-elev);
+  box-shadow: 0 16px 36px rgba(0, 0, 0, 0.36);
+  --wails-draggable: no-drag;
+}
+
+.topicbar__export-menu button {
+  width: 100%;
+  min-height: 30px;
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  padding: 0 8px;
+  border: none;
   border-radius: 6px;
+  background: transparent;
   color: var(--fg-dim);
-  font-size: 13.5px;
+  font: inherit;
+  font-size: 12px;
+  text-align: left;
 }
 
-.project-tree__folder:hover {
+.topicbar__export-menu button:hover,
+.topicbar__export-menu button:focus-visible {
+  color: var(--fg);
   background: var(--sidebar-hover);
+  outline: none;
 }
 
-.project-tree__folder--active,
-.project-tree__folder--menu-open {
+.tabbar {
+  --tabbar-tab-width: 176px;
+  flex: 1 1 auto;
+  min-width: 0;
+  height: 38px;
+  display: flex;
+  align-items: center;
+  padding: 0 10px 0 0;
+  gap: 3px;
+  background: transparent;
+  border-bottom: none;
+  overflow: hidden;
+}
+
+.tabbar__tabs {
+  display: flex;
+  align-self: stretch;
+  flex: 0 1 auto;
+  max-width: calc(100% - 36px);
+  gap: 0;
+  overflow-x: auto;
+  scrollbar-width: none;
+}
+
+.tabbar__tabs::-webkit-scrollbar {
+  display: none;
+}
+
+.tabbar__tab {
+  flex: 0 0 var(--tabbar-tab-width);
+  position: relative;
+  width: var(--tabbar-tab-width);
+  height: 38px;
+  min-width: var(--tabbar-tab-width);
+  max-width: var(--tabbar-tab-width);
+  display: flex;
+  align-items: center;
+  padding: 0 28px 0 10px;
+  gap: 6px;
+  border: none;
+  border-right: 1px solid var(--border-soft);
+  border-radius: 0;
+  color: var(--fg-dim);
   background: transparent;
+  font-size: 12.5px;
+  white-space: nowrap;
+  transition: background var(--dur-fast) var(--ease-out);
+  animation: tab-in var(--dur-base) var(--ease-out) both;
+}
+@keyframes tab-in {
+  from {
+    opacity: 0;
+    transform: translateY(-4px);
+  }
+}
+
+.tabbar__tab:not(.tabbar__tab--active):hover {
+  background: color-mix(in srgb, var(--bg-elev-2) 42%, transparent);
+}
+
+.tabbar__tab--active {
   color: var(--fg);
+  background: var(--chat-bg);
+  box-shadow: inset 0 -1px 0 var(--chat-bg);
 }
 
-.project-tree__folder--menu-open,
-.project-tree__folder--active:hover {
-  background: color-mix(in srgb, var(--project-accent, var(--accent)) 5%, var(--sidebar-hover));
+@media (max-width: 980px) {
+  .tabbar {
+    --tabbar-tab-width: 148px;
+  }
 }
 
-.project-tree__folder[draggable="true"] {
-  cursor: grab;
+.tabbar__tab--yolo {
+  color: var(--fg);
+}
+
+.tabbar__tab--dragging {
+  opacity: 0.58;
+}
+
+.tabbar__tab--drop-before::before,
+.tabbar__tab--drop-after::after {
+  content: "";
+  position: absolute;
+  top: 7px;
+  bottom: 7px;
+  width: 2px;
+  border-radius: 999px;
+  background: var(--accent);
+  box-shadow: 0 0 0 2px color-mix(in srgb, var(--accent) 16%, transparent);
+}
+
+.tabbar__tab--drop-before::before {
+  left: 0;
+}
+
+.tabbar__tab--drop-after::after {
+  right: 0;
+}
+
+.tabbar__status {
+  flex: 0 0 7px;
+  width: 7px;
+  min-width: 7px;
+  height: 7px;
+  border-radius: 50%;
+  background: var(--project-accent, var(--accent));
+  opacity: 1;
+  box-shadow: 0 0 0 0 color-mix(in srgb, var(--project-accent, var(--accent)) 0%, transparent);
+  transform-origin: center;
+  transition: box-shadow 0.18s ease, opacity 0.18s ease;
+}
+
+.tabbar__tab--active .tabbar__status {
+  box-shadow: 0 0 0 4px color-mix(in srgb, var(--project-accent, var(--accent)) 18%, transparent);
+  animation: tab-status-breathe 2.6s ease-in-out infinite;
+}
+
+.tabbar__status--running {
+  box-shadow: 0 0 0 5px color-mix(in srgb, var(--project-accent, var(--accent)) 24%, transparent);
+  animation: tab-status-breathe-running 1.8s ease-in-out infinite;
+}
+
+.tabbar__file-icon {
+  flex: 0 0 auto;
+  color: var(--fg-faint);
+}
+
+.tabbar__tab--active .tabbar__file-icon {
+  color: var(--fg-dim);
+}
+
+@keyframes tab-status-breathe {
+  0%, 100% {
+    box-shadow: 0 0 0 4px color-mix(in srgb, var(--project-accent, var(--accent)) 16%, transparent);
+  }
+  50% {
+    box-shadow: 0 0 0 6px color-mix(in srgb, var(--project-accent, var(--accent)) 24%, transparent);
+  }
+}
+
+@keyframes tab-status-breathe-running {
+  0%, 100% {
+    box-shadow: 0 0 0 5px color-mix(in srgb, var(--project-accent, var(--accent)) 22%, transparent);
+  }
+  50% {
+    box-shadow: 0 0 0 7px color-mix(in srgb, var(--project-accent, var(--accent)) 12%, transparent);
+  }
+}
+
+.tabbar__tab-label {
+  flex: 1 1 auto;
+  max-width: 100%;
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  font-weight: 560;
+}
+
+.tabbar__mode-badge {
+  flex: 0 0 auto;
+  height: 16px;
+  display: inline-flex;
+  align-items: center;
+  padding: 0 5px;
+  border-radius: 5px;
+  font-size: 9.5px;
+  line-height: 1;
+  font-weight: 700;
+  letter-spacing: 0;
+  text-transform: uppercase;
+}
+
+.tabbar__mode-badge--yolo {
+  color: var(--mode-yolo-fg);
+  background: var(--mode-yolo-bg);
+}
+
+.tabbar__mode-badge--plan {
+  color: var(--mode-plan-fg);
+  background: var(--mode-plan-bg);
+}
+
+.tabbar__spacer {
+  flex: 1 1 auto;
+  min-width: 12px;
+}
+
+.tabbar__tab-close {
+  position: absolute;
+  right: 8px;
+  width: 16px;
+  height: 16px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 3px;
+  opacity: 0;
+  color: var(--fg-faint);
+  pointer-events: none;
+  transition: opacity 0.12s ease, background 0.12s ease, color 0.12s ease;
+}
+
+.tabbar__tab:hover .tabbar__tab-close,
+.tabbar__tab--active .tabbar__tab-close {
+  opacity: 0.78;
+  pointer-events: auto;
+}
+
+.tabbar__tab-close:hover {
+  opacity: 1;
+  background: var(--button-bg);
+  color: var(--fg);
+}
+
+.tabbar__new {
+  flex: 0 0 auto;
+  width: 30px;
+  height: 30px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-left: 1px;
+  border: none;
+  border-radius: 7px;
+  background: transparent;
+  color: var(--fg-dim);
+}
+
+.tabbar__new:hover {
+  background: var(--button-bg);
+  color: var(--fg);
+}
+
+/* L1: command-search bar — opens the ⌘K palette. Sits after the new-tab
+   button and fills the remaining strip width like the prototype. */
+.tabbar__command {
+  flex: 1 1 auto;
+  min-width: 90px;
+  max-width: 360px;
+  height: 28px;
+  display: flex;
+  align-items: center;
+  gap: 7px;
+  margin-left: 4px;
+  padding: 0 9px;
+  border: 1px solid var(--border);
+  border-radius: 8px;
+  background: color-mix(in srgb, var(--bg-elev) 60%, transparent);
+  color: var(--fg-faint);
+  font: inherit;
+  font-size: 12px;
+  cursor: pointer;
+  transition:
+    width 0.28s cubic-bezier(0.2, 0.72, 0.2, 1),
+    min-width 0.28s cubic-bezier(0.2, 0.72, 0.2, 1),
+    max-width 0.28s cubic-bezier(0.2, 0.72, 0.2, 1),
+    flex-basis 0.28s cubic-bezier(0.2, 0.72, 0.2, 1),
+    padding 0.28s cubic-bezier(0.2, 0.72, 0.2, 1),
+    gap 0.28s cubic-bezier(0.2, 0.72, 0.2, 1),
+    border-color 0.12s,
+    background 0.12s,
+    color 0.12s;
+}
+.tabbar__command:hover {
+  border-color: var(--border-strong, var(--border));
+  background: var(--bg-elev);
+  color: var(--fg-dim);
+}
+
+.tabbar__command--compact {
+  flex: 0 0 112px;
+  width: 112px;
+  min-width: 112px;
+  max-width: 112px;
+  justify-content: center;
+  gap: 6px;
+  padding: 0 9px;
+}
+
+.tabbar__command-text--compact {
+  display: inline-flex;
+  flex: 0 0 auto;
+  max-width: 0;
+  opacity: 0;
+  pointer-events: none;
+  transform: translateX(4px);
+}
+
+.tabbar__command--compact .tabbar__command-text--full {
+  max-width: 0;
+  opacity: 0;
+  pointer-events: none;
+  transform: translateX(-4px);
+}
+
+.tabbar__command--compact .tabbar__command-text--compact {
+  display: inline-flex;
+  flex: 0 1 auto;
+  max-width: 48px;
+  opacity: 1;
+  transform: translateX(0);
+}
+
+.tabbar__command--compact .tabbar__command-kbd {
+  margin-left: 0;
+}
+
+.tabbar__command-icon {
+  flex: none;
+  opacity: 0.8;
+}
+.tabbar__command-text {
+  flex: 1 1 auto;
+  min-width: 0;
+  max-width: 220px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  text-align: left;
+  opacity: 1;
+  transform: translateX(0);
+  transition:
+    max-width 0.28s cubic-bezier(0.2, 0.72, 0.2, 1),
+    opacity 0.18s ease,
+    transform 0.22s cubic-bezier(0.2, 0.72, 0.2, 1);
+}
+
+.tabbar__command .tabbar__command-text--compact {
+  flex: 0 0 auto;
+  max-width: 0;
+  opacity: 0;
+  pointer-events: none;
+  transform: translateX(4px);
+}
+
+.tabbar__command.tabbar__command--compact .tabbar__command-text--compact {
+  flex: 0 1 auto;
+  max-width: 48px;
+  opacity: 1;
+  transform: translateX(0);
+}
+.tabbar__command-kbd {
+  flex: none;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  min-width: 30px;
+  height: 18px;
+  font-family: var(--mono);
+  font-size: 10.5px;
+  line-height: 1;
+  color: var(--fg-faint);
+  border: 1px solid var(--border);
+  border-radius: 5px;
+  padding: 0 6px;
+  background: color-mix(in srgb, var(--bg-elev) 72%, transparent);
+  transition:
+    margin 0.28s cubic-bezier(0.2, 0.72, 0.2, 1),
+    padding 0.28s cubic-bezier(0.2, 0.72, 0.2, 1),
+    background 0.12s,
+    border-color 0.12s,
+    color 0.12s;
+}
+
+.project-tree {
+  --project-tree-action-column: 36px;
+  --project-tree-edge-gap: 6px;
+  --project-tree-global-accent: color-mix(in srgb, var(--fg-faint) 68%, var(--accent));
+  --project-tree-row-radius: 8px;
+  flex: 1 1 auto;
+  min-height: 0;
+  display: flex;
+  flex-direction: column;
+  gap: 11px;
+}
+
+.project-tree__search {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  height: 34px;
+  margin: 0 var(--project-tree-edge-gap);
+  padding: 0 10px;
+  border: 1px solid var(--border);
+  border-radius: 7px;
+  background: var(--bg-elev);
+  color: var(--fg-faint);
+}
+
+.project-tree__search input {
+  flex: 1;
+  min-width: 0;
+  border: none;
+  outline: none;
+  background: transparent;
+  color: var(--fg);
+  font: inherit;
+  font-size: 13px;
+}
+
+.project-tree__search input::placeholder {
+  color: var(--fg-faint);
+}
+
+.project-tree__header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 6px;
+  min-height: 28px;
+  padding: 2px var(--project-tree-edge-gap) 0 8px;
+  color: var(--fg-dim);
+  font-size: 13px;
+  font-weight: 650;
+  text-transform: none;
+  letter-spacing: 0;
+}
+
+.project-tree__header-title {
+  display: flex;
+  align-items: center;
+  gap: 7px;
+  min-width: 0;
+  flex: 1 1 auto;
+}
+
+.project-tree__header-icon {
+  flex: 0 0 auto;
+}
+
+.project-tree__header-actions {
+  flex: 0 0 auto;
+  display: inline-flex;
+  align-items: center;
+  justify-content: flex-end;
+  gap: 3px;
+  min-width: 0;
+}
+
+.project-tree__action-slot {
+  flex: 0 0 var(--project-tree-action-column);
+  width: var(--project-tree-action-column);
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.project-tree__header-action-slot {
+  flex-basis: 22px;
+  width: 22px;
+  height: 22px;
+}
+
+.project-tree__add-project,
+.project-tree__collapse-all,
+.project-tree__new-topic {
+  --wails-draggable: no-drag;
+  width: 24px;
+  height: 24px;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  border: 1px solid var(--border-soft);
+  border-radius: 7px;
+  background: transparent;
+  color: var(--fg-faint);
+  padding: 0;
+  opacity: 0.78;
+}
+
+.project-tree__header-actions .project-tree__add-project,
+.project-tree__header-actions .project-tree__collapse-all {
+  width: 22px;
+  height: 22px;
+  border-radius: 7px;
+  background: var(--bg-elev);
+  box-shadow: 0 1px 2px color-mix(in srgb, var(--shadow) 9%, transparent);
+}
+
+.project-tree__add-project:hover:not(:disabled),
+.project-tree__collapse-all:hover:not(:disabled) {
+  background: var(--button-bg);
+  border-color: color-mix(in srgb, var(--accent) 28%, var(--border-soft));
+  color: var(--fg);
+  opacity: 1;
+}
+
+.project-tree__add-project:disabled,
+.project-tree__collapse-all:disabled {
+  cursor: default;
+  opacity: 0.34;
+}
+
+.project-tree__collapse-all--restore:not(:disabled) {
+  border-color: color-mix(in srgb, var(--accent) 24%, var(--border-soft));
+  background: color-mix(in srgb, var(--accent) 9%, var(--bg-elev));
+  color: var(--accent);
+  opacity: 0.96;
+}
+
+.project-tree__header-actions .project-tree__add-project:focus-visible,
+.project-tree__header-actions .project-tree__collapse-all:focus-visible {
+  outline: none;
+  box-shadow: var(--focus-ring);
+}
+
+.project-tree__list {
+  flex: 1 1 auto;
+  min-height: 0;
+  display: flex;
+  flex-direction: column;
+  overflow-y: auto;
+  overflow-x: hidden;
+  padding: 0 var(--project-tree-edge-gap) 0 8px;
+  scrollbar-width: none;
+}
+
+.project-tree__list::-webkit-scrollbar {
+  display: none;
+}
+
+.project-tree__folder {
+  position: relative;
+  height: 34px;
+  display: flex;
+  align-items: center;
+  gap: 4px;
+  padding: 0;
+  margin-right: 0;
+  border-radius: var(--project-tree-row-radius);
+  color: var(--fg-dim);
+  font-size: 13.5px;
+}
+
+.project-tree__folder:hover {
+  background: var(--sidebar-hover);
+}
+
+.project-tree__folder--active,
+.project-tree__folder--menu-open {
+  background: color-mix(in srgb, var(--project-accent, var(--accent)) 5%, transparent);
+  color: var(--fg);
+}
+
+.project-tree__folder--menu-open,
+.project-tree__folder--active:hover {
+  background: color-mix(in srgb, var(--project-accent, var(--accent)) 5%, var(--sidebar-hover));
+}
+
+.project-tree__folder--dragging {
+  cursor: grabbing;
+  opacity: 0.55;
+}
+
+.project-tree__folder--drop-before::before,
+.project-tree__folder--drop-after::after {
+  content: "";
+  position: absolute;
+  left: 8px;
+  right: 8px;
+  height: 2px;
+  border-radius: 999px;
+  background: var(--accent);
+  box-shadow: 0 0 0 2px color-mix(in srgb, var(--accent) 16%, transparent);
+  pointer-events: none;
+}
+
+.project-tree__folder--drop-before::before {
+  top: -2px;
+}
+
+.project-tree__folder--drop-after::after {
+  bottom: -2px;
+}
+
+.project-tree__folder--editing {
+  padding-right: 8px;
+}
+
+.project-tree__folder-main {
+  flex: 1 1 auto;
+  min-width: 0;
+  height: 100%;
+  display: flex;
+  align-items: center;
+  gap: 7px;
+  border: 0;
+  border-radius: inherit;
+  background: transparent;
+  color: inherit;
+  font: inherit;
+  padding-right: 0;
+  text-align: left;
+  font-weight: 560;
+}
+
+.project-tree__folder--global,
+.project-tree__topic--global {
+  --project-accent: var(--project-tree-global-accent);
+}
+
+.project-tree__folder-color {
+  flex: 0 0 auto;
+  width: 7px;
+  height: 7px;
+  border-radius: 999px;
+  background: var(--project-accent, var(--accent));
+  box-shadow: 0 0 0 3px color-mix(in srgb, var(--project-accent, var(--accent)) 14%, transparent);
+}
+
+.project-tree__folder-main:focus-visible {
+  outline: 2px solid var(--accent-soft);
+  outline-offset: -2px;
+}
+
+.project-tree__folder--draggable {
+  cursor: grab;
+}
+
+.project-tree__folder--draggable .project-tree__folder-main {
+  cursor: inherit;
+}
+
+.project-tree__folder--draggable:active {
+  cursor: grabbing;
+}
+
+.project-tree__folder-toggle {
+  flex: 0 0 auto;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 20px;
+  height: 20px;
+  border: none;
+  background: transparent;
+  color: inherit;
+  padding: 0;
+}
+
+.project-tree__folder-label {
+  flex: 1 1 auto;
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.project-tree__folder-input {
+  --wails-draggable: no-drag;
+  flex: 1 1 auto;
+  min-width: 0;
+  height: 26px;
+  border: 1px solid var(--accent-soft);
+  border-radius: 7px;
+  background: var(--bg-elev);
+  color: var(--fg);
+  font: inherit;
+  font-size: 13px;
+  padding: 0 8px;
+  outline: none;
+}
+
+.project-tree__new-topic {
+  opacity: 0.62;
+}
+
+.project-tree__new-topic:hover {
+  background: var(--button-bg);
+  border-color: color-mix(in srgb, var(--accent) 28%, var(--border-soft));
+  color: var(--fg);
+}
+
+.project-tree__new-topic--active {
+  opacity: 1;
+  color: var(--accent);
+  background: color-mix(in srgb, var(--accent) 12%, transparent);
+  border-color: color-mix(in srgb, var(--accent) 24%, var(--border-soft));
+}
+
+.project-tree__topic {
+  position: relative;
+  width: auto;
+  min-height: 34px;
+  display: flex;
+  align-items: center;
+  gap: 4px;
+  padding-top: 0;
+  padding-bottom: 0;
+  padding-left: 0 !important;
+  margin-left: 22px;
+  margin-right: var(--project-tree-action-column);
+  padding-right: 8px;
+  border-radius: var(--project-tree-row-radius);
+  color: var(--fg-dim);
+  font-size: 13px;
+  cursor: default;
+}
+
+.project-tree__topic--has-meta {
+  min-height: 48px;
+}
+
+.project-tree__topic--active {
+  background: color-mix(in srgb, var(--project-accent, var(--accent)) 10%, var(--sidebar-hover));
+  border-radius: 0;
+  color: var(--fg);
+}
+
+.project-tree__topic--active::before {
+  content: "";
+  position: absolute;
+  left: 0;
+  top: 0;
+  bottom: 0;
+  width: 4px;
+  background: color-mix(in srgb, var(--project-accent, var(--accent)) 88%, #ff9d22);
+  pointer-events: none;
+}
+
+.project-tree__topic--menu-open {
+  background: color-mix(in srgb, var(--accent) 6%, var(--sidebar-hover));
+  color: var(--fg);
+}
+
+.project-tree__topic:hover {
+  background: var(--list-row-hover-bg);
+}
+
+.project-tree__topic--active:hover {
+  background: color-mix(in srgb, var(--project-accent, var(--accent)) 10%, var(--sidebar-hover));
+}
+
+.project-tree__topic-main {
+  --wails-draggable: no-drag;
+  flex: 1 1 auto;
+  min-width: 0;
+  min-height: 34px;
+  display: flex;
+  align-items: center;
+  gap: 0;
+  border: none;
+  border-radius: inherit;
+  background: transparent;
+  color: inherit;
+  font: inherit;
+  text-align: left;
+}
+
+.project-tree__topic--has-meta .project-tree__topic-main {
+  min-height: 48px;
+  padding-top: 7px;
+  padding-bottom: 7px;
+}
+
+.project-tree__topic-copy {
+  min-width: 0;
+  display: flex;
+  flex-direction: column;
+  flex: 1 1 auto;
+  align-items: flex-start;
+  justify-content: center;
+  gap: 2px;
+  line-height: 1.25;
+}
+
+.project-tree__topic-heading {
+  width: 100%;
+  min-width: 0;
+  display: flex;
+  align-items: center;
+  gap: 6px;
+}
+
+.project-tree__topic-label {
+  flex: 1 1 auto;
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.project-tree__topic-status {
+  flex: 0 0 auto;
+  max-width: 64px;
+  height: 17px;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  padding: 0 5px;
+  border-radius: 5px;
+  background: color-mix(in srgb, var(--project-accent, var(--accent)) 11%, transparent);
+  color: color-mix(in srgb, var(--project-accent, var(--accent)) 72%, var(--fg-dim));
+  font-size: 10.5px;
+  font-weight: 620;
+  line-height: 1;
+  white-space: nowrap;
+}
+
+.project-tree__topic-status--waiting_confirmation {
+  background: color-mix(in srgb, var(--warn) 13%, transparent);
+  color: color-mix(in srgb, var(--warn) 82%, var(--fg));
+}
+
+.project-tree__topic-status--paused {
+  background: color-mix(in srgb, var(--fg-faint) 11%, transparent);
+  color: var(--fg-faint);
+}
+
+.project-tree__topic-status--error {
+  background: color-mix(in srgb, var(--err) 12%, transparent);
+  color: color-mix(in srgb, var(--err) 84%, var(--fg));
+}
+
+.project-tree__topic-meta {
+  max-width: 100%;
+  min-width: 0;
+  display: flex;
+  align-items: center;
+  gap: 5px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  color: var(--fg-faint);
+  font-size: 11px;
+  line-height: 1.2;
+}
+
+.project-tree__topic-main:focus-visible {
+  outline: 2px solid var(--accent-soft);
+  outline-offset: -2px;
+}
+
+.project-tree__topic--editing {
+  padding-right: 8px;
+}
+
+.project-tree__topic-input {
+  --wails-draggable: no-drag;
+  flex: 1 1 auto;
+  min-width: 0;
+  height: 26px;
+  border: 1px solid var(--accent-soft);
+  border-radius: 7px;
+  background: var(--bg-elev);
+  color: var(--fg);
+  font: inherit;
+  font-size: 13px;
+  padding: 0 8px;
+  outline: none;
+}
+
+.project-tree__children {
+  display: grid;
+  grid-template-rows: 0fr;
+  opacity: 0;
+  transform: translateY(-4px);
+  pointer-events: none;
+  transition: grid-template-rows 0.2s cubic-bezier(0.22, 1, 0.36, 1), opacity 0.16s ease, transform 0.2s cubic-bezier(0.22, 1, 0.36, 1);
+}
+
+.project-tree__children--expanded {
+  grid-template-rows: 1fr;
+  opacity: 1;
+  transform: translateY(0);
+  pointer-events: auto;
+}
+
+.project-tree__children-inner {
+  display: flex;
+  flex-direction: column;
+  min-height: 0;
+  overflow: hidden;
+}
+
+/* Chevron rotates 90° on expand; single icon keeps the rotation smooth. */
+.project-tree__chevron {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  transition: transform 0.2s ease;
+}
+
+.project-tree__chevron--open {
+  transform: rotate(90deg);
+}
+
+@media (prefers-reduced-motion: reduce) {
+  .project-tree__children,
+  .project-tree__chevron {
+    transition: none;
+  }
+
+  .project-tree__children {
+    transform: none;
+  }
+}
+
+.context-menu {
+  --wails-draggable: no-drag;
+  position: fixed;
+  z-index: var(--z-overlay-backdrop);
+  max-height: calc(100vh - 16px);
+  overflow-y: auto;
+  overscroll-behavior: contain;
+  padding: 5px;
+  border: 1px solid var(--border);
+  border-radius: 8px;
+  background: var(--bg-elev);
+  box-shadow: 0 16px 36px rgba(0, 0, 0, 0.36);
+  transform-origin: top left;
+  animation: menu-pop-in var(--dur-base) var(--ease-out) both;
+}
+@keyframes menu-pop-in {
+  from {
+    opacity: 0;
+    transform: scale(var(--motion-pop-scale)) translateY(calc(-0.5 * var(--motion-rise)));
+  }
+}
+
+.context-menu__item {
+  width: 100%;
+  min-height: 30px;
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  border: none;
+  border-radius: 6px;
+  background: transparent;
+  color: var(--fg-dim);
+  font: inherit;
+  font-size: 12px;
+  text-align: left;
+  padding: 0 8px;
+}
+
+.context-menu__item:disabled {
+  cursor: not-allowed;
+  opacity: 0.45;
+}
+
+.context-menu__item:not(:disabled):hover,
+.context-menu__item:not(:disabled):focus-visible {
+  background: var(--sidebar-hover);
+  color: var(--fg);
+  outline: none;
+}
+
+.context-menu__separator {
+  height: 1px;
+  margin: 5px 4px;
+  background: var(--border-soft);
+}
+
+.context-menu__item--danger:not(:disabled):hover,
+.context-menu__item--danger:not(:disabled):focus-visible {
+  color: #e5534b !important;
+}
+
+.project-tree__color-option {
+  min-width: 0;
+  display: flex;
+  flex: 1 1 auto;
+  align-items: center;
+  gap: 8px;
+}
+
+.project-tree__color-swatch {
+  flex: 0 0 auto;
+  width: 12px;
+  height: 12px;
+  border: 1px solid var(--border-soft);
+  border-radius: 999px;
+  background: var(--project-accent, var(--accent));
+  box-shadow: inset 0 0 0 2px color-mix(in srgb, var(--bg-elev) 72%, transparent);
+}
+
+.project-tree__color-check {
+  margin-left: auto;
+  color: var(--project-accent, var(--accent));
+}
+
+.project-tree__empty {
+  padding: 10px 12px;
+  color: var(--fg-faint);
+  font-size: 13px;
+}
+
+.project-tree__empty--subtle {
+  padding: 8px 12px;
+  font-size: 12px;
+}
+
+.project-tree__empty-state {
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+  padding: 2px 0 0;
+}
+
+.project-tree__empty-primary {
+  --wails-draggable: no-drag;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  gap: 7px;
+  height: 32px;
+  margin: 0 8px;
+  border: 1px solid color-mix(in srgb, var(--accent) 45%, var(--border));
+  border-radius: 7px;
+  background: color-mix(in srgb, var(--accent) 14%, var(--bg-elev));
+  color: var(--accent-strong);
+  font: inherit;
+  font-size: 12.5px;
+  font-weight: 620;
+}
+
+.project-tree__empty-primary:hover:not(:disabled) {
+  background: color-mix(in srgb, var(--accent) 21%, var(--bg-elev));
+  color: var(--fg);
+}
+
+.project-tree__empty-primary:disabled {
+  cursor: default;
+  opacity: 0.45;
+}
+
+.context-inspector,
+.workbench-dock {
+  grid-row: 2;
+  grid-column: 4;
+  min-width: 0;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  padding-bottom: var(--statusbar-height);
+  background: var(--workspace-files-bg);
+  border-left: 0;
+  overflow: hidden;
+}
+
+.workbench-dock {
+  justify-self: stretch;
+  width: 100%;
+  max-width: none;
+  container-type: inline-size;
+}
+
+.layout--workspace-maximized .workbench-dock {
+  width: auto;
+  max-width: none;
+}
+
+@media (prefers-reduced-motion: reduce) {
+  .layout {
+    transition: none;
+  }
+}
+
+.workbench-dock__tools {
+  flex: 0 0 auto;
+  height: 42px;
+  display: flex;
+  align-items: center;
+  justify-content: flex-start;
+  gap: 8px;
+  padding: 7px 10px 3px;
+  border-bottom: 1px solid transparent;
+}
+
+.workbench-dock__tabs {
+  flex: 0 1 auto;
+  width: max-content;
+  max-width: 100%;
+  min-width: 0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 3px;
+  padding: 3px;
+  border-radius: 8px;
+  background: var(--bg);
+  border: 1px solid var(--border-soft);
+}
+
+.workbench-dock__tab {
+  --wails-draggable: no-drag;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  gap: 5px;
+  flex: 0 1 auto;
+  min-width: 30px;
+  max-width: 118px;
+  height: 24px;
+  padding: 0 8px;
+  border: 0;
+  border-radius: 6px;
+  background: transparent;
+  color: var(--fg-faint);
+  font: inherit;
+  font-size: 11.5px;
+  font-weight: 560;
+}
+
+.workbench-dock__tab svg {
+  flex: 0 0 auto;
+}
+
+.workbench-dock__tab-label {
+  min-width: 0;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+.workbench-dock__tab:hover {
+  color: var(--fg-dim);
+}
+
+.workbench-dock__tab--active {
+  background: var(--bg-elev);
+  color: var(--fg);
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.16);
+}
+
+@container (max-width: 520px) {
+  .workbench-dock__tabs {
+    width: 100%;
+  }
+
+  .workbench-dock__tab {
+    flex: 1 1 0;
+    max-width: none;
+  }
+}
+
+@container (max-width: 340px) {
+  .workbench-dock__tabs {
+    width: auto;
+  }
+
+  .workbench-dock__tab {
+    flex: 0 0 30px;
+    width: 30px;
+    padding: 0;
+    gap: 0;
+  }
+
+  .workbench-dock__tab-label {
+    display: none;
+  }
+}
+
+.workbench-dock__body {
+  flex: 1 1 auto;
+  min-height: 0;
+  overflow: hidden;
+}
+
+.workbench-dock__body > .context-panel,
+.workbench-dock__body > .workspace-panel {
+  height: 100%;
+}
+
+.workbench-dock__body > .workspace-panel {
+  border-left: none;
+}
+
+.layout--workspace-maximized .context-inspector,
+.layout--workspace-maximized .workbench-dock {
+  grid-column: 2;
+}
+
+.context-panel {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+  padding: 0;
+  gap: 0;
+  background: var(--workspace-files-bg);
+  color: var(--fg);
+  overflow: hidden;
+}
+
+.context-panel__summary-head {
+  flex: 0 0 auto;
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  min-height: 44px;
+  padding: 8px 10px 6px;
+}
+
+.context-panel__heading-main {
+  flex: 1 1 auto;
+  min-width: 0;
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
+.context-panel__heading-main span {
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  color: var(--fg);
+  font-size: 14px;
+  line-height: 1.2;
+  font-weight: 680;
+}
+
+.context-panel__heading-main strong {
+  flex: 0 1 auto;
+  max-width: 58%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  padding: 2px 7px;
+  border: 1px solid var(--border-soft);
+  border-radius: 999px;
+  background: var(--bg);
+  color: var(--fg-dim);
+  font-size: 11px;
+  line-height: 1.25;
+  font-weight: 560;
+}
+
+.context-panel__heading-main em {
+  flex: 0 0 auto;
+  padding: 2px 6px;
+  border-radius: 999px;
+  background: rgba(249, 115, 22, 0.1);
+  color: var(--accent);
+  font-size: 10px;
+  line-height: 1.2;
+  font-style: normal;
+  font-weight: 650;
+}
+
+.context-panel__back {
+  --wails-draggable: no-drag;
+  flex: 0 0 auto;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  gap: 5px;
+  height: 26px;
+  padding: 0 9px;
+  border: 1px solid var(--border-soft);
+  border-radius: 6px;
+  background: var(--bg);
+  color: var(--fg-dim);
+  font: inherit;
+  font-size: 11.5px;
+  font-weight: 560;
+}
+
+.context-panel__back:hover {
+  background: var(--bg-hover);
+  color: var(--fg);
+}
+
+.context-panel__search {
+  flex: 0 0 auto;
+  display: flex;
+  align-items: center;
+  gap: 7px;
+  margin: 4px 10px 8px;
+  padding: 0 9px;
+  height: 32px;
+  border: 1px solid var(--border);
+  border-radius: 8px;
+  background: var(--bg);
+  color: var(--fg-faint);
+}
+
+.context-panel__search input {
+  min-width: 0;
+  flex: 1;
+  border: none;
+  outline: none;
+  background: transparent;
+  color: var(--fg);
+  font: inherit;
+  font-size: 12.5px;
+}
+
+.context-panel__search input::placeholder {
+  color: var(--fg-faint);
+}
+
+.context-panel__body {
+  flex: 1 1 auto;
+  min-height: 0;
+  overflow-y: auto;
+  padding: 0 6px 12px;
+}
+
+.context-panel__overview {
+  display: flex;
+  flex-direction: column;
+  gap: 10px;
+}
+
+.context-panel__usage,
+.context-panel__section {
+  display: flex;
+  flex-direction: column;
+  gap: 10px;
+  margin: 0 8px;
+  padding: 10px;
+  border: 1px solid var(--border-soft);
+  border-radius: 8px;
+  background: var(--bg);
+}
+
+.context-panel__section-head {
+  display: flex;
+  align-items: baseline;
+  justify-content: space-between;
+  gap: 8px;
+  min-width: 0;
+}
+
+.context-panel__section-head h3 {
+  margin: 0;
+  min-width: 0;
+  color: var(--fg);
+  font-size: 13px;
+  line-height: 1.2;
+  font-weight: 670;
+}
+
+.context-panel__section-head span {
+  flex: 0 1 auto;
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  color: var(--fg-faint);
+  font-size: 11.5px;
+  line-height: 1.2;
+}
+
+.context-panel__usage-visual {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 8px;
+}
+
+.context-panel__donut {
+  width: 136px;
+  height: 136px;
+  padding: 12px;
+  border-radius: 50%;
+}
+
+.context-panel__donut-core {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  width: 100%;
+  height: 100%;
+  border-radius: 50%;
+  background: var(--workspace-files-bg);
+  text-align: center;
+}
+
+.context-panel__donut-core strong {
+  color: var(--fg);
+  font-size: 30px;
+  line-height: 1;
+}
+
+.context-panel__donut-core span {
+  margin-top: 6px;
+  color: var(--fg-dim);
+  font-size: 12px;
+  line-height: 1.25;
+}
+
+.context-panel__percent {
+  color: var(--fg);
+  text-align: center;
+  font-size: 18px;
+  font-weight: 650;
+}
+
+.context-panel__breakdown {
+  display: flex;
+  flex-direction: column;
+  gap: 9px;
+  width: 100%;
+}
+
+.context-panel__legend-row,
+.context-panel__total {
+  display: grid;
+  grid-template-columns: 12px minmax(0, 1fr) auto;
+  align-items: center;
+  gap: 9px;
+  color: var(--fg-dim);
+  font-size: 13px;
+}
+
+.context-panel__legend-row strong,
+.context-panel__total strong {
+  color: var(--fg);
+  font-weight: 580;
+}
+
+.context-panel__legend-dot {
+  width: 10px;
+  height: 10px;
+  border-radius: 50%;
+}
+
+.context-panel__legend-dot--prompt { background: #13a7a5; }
+.context-panel__legend-dot--completion { background: #2f6df6; }
+.context-panel__legend-dot--reasoning { background: #f97316; }
+.context-panel__legend-dot--other { background: var(--border); }
+
+.context-panel__total {
+  grid-template-columns: minmax(0, 1fr) auto;
+  padding-top: 10px;
+  border-top: 1px solid var(--border-soft);
+}
+
+.context-panel__stats {
+  display: grid;
+  grid-template-columns: repeat(2, minmax(0, 1fr));
+  gap: 6px;
+}
+
+.context-panel__stats--single {
+  grid-template-columns: minmax(0, 1fr);
+}
+
+.context-panel__metric {
+  min-height: 54px;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  gap: 5px;
+  padding: 9px 11px;
+  border: 1px solid var(--border-soft);
+  border-radius: 8px;
+  background: var(--bg);
+}
+
+.context-panel__metric span {
+  color: var(--fg-dim);
+  font-size: 12px;
+}
+
+.context-panel__metric strong {
+  color: var(--fg);
+  font-size: 18px;
+  line-height: 1;
+}
+
+.context-panel__metric-accent {
+  color: var(--accent) !important;
+}
+
+.context-panel__health {
+  display: grid;
+  grid-template-columns: minmax(0, 1fr);
+  gap: 4px;
+  padding: 10px 12px;
+  border: 1px solid var(--border-soft);
+  border-radius: 8px;
+  background: var(--bg);
+}
+
+.context-panel__health span {
+  color: var(--fg-faint);
+  font-size: 11px;
+  line-height: 1.2;
+}
+
+.context-panel__health strong {
+  color: var(--fg);
+  font-size: 13px;
+  line-height: 1.2;
+  font-weight: 650;
+}
+
+.context-panel__health small {
+  color: var(--fg-dim);
+  font-size: 12px;
+  line-height: 1.35;
+}
+
+.context-panel__health--good {
+  border-color: color-mix(in srgb, #13a76f 40%, var(--border-soft));
+}
+
+.context-panel__health--notice {
+  border-color: color-mix(in srgb, var(--accent) 42%, var(--border-soft));
+}
+
+.context-panel__health--warn {
+  border-color: color-mix(in srgb, #f97316 55%, var(--border-soft));
+}
+
+.context-panel__preview {
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+  margin: 0 8px;
+}
+
+.context-panel__preview + .context-panel__preview {
+  margin-top: 6px;
+}
+
+.context-panel__preview-head {
+  display: flex;
+  align-items: center;
+  gap: 12px;
+  min-height: 28px;
+}
+
+.context-panel__preview-head h3 {
+  flex: 1;
+  margin: 0;
+  color: var(--fg);
+  font-size: 13px;
+  line-height: 1.2;
+  font-weight: 650;
+}
+
+.context-panel__preview-head > span {
+  flex: 0 0 auto;
+  color: var(--fg-faint);
+  font-size: 11.5px;
+  white-space: nowrap;
+}
+
+.context-panel__preview-head button {
+  flex: 0 0 auto;
+  border: none;
+  background: transparent;
+  color: var(--accent);
+  font: inherit;
+  font-size: 12px;
+}
+
+.context-panel__preview-head button:hover {
+  color: var(--fg);
+}
+
+.context-panel__empty {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  min-height: 160px;
+  color: var(--fg-faint);
+  font-size: 13px;
+}
+
+.context-panel__detail {
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+  padding: 0 4px;
+}
+
+.context-panel__detail-note {
+  padding: 0 4px 6px;
+  color: var(--fg-faint);
+  font-size: 12px;
+}
+
+.context-panel__file-list {
+  display: flex;
+  flex-direction: column;
+  gap: 2px;
+}
+
+.context-panel__file-row {
+  min-height: var(--tree-row-height);
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 8px;
+  padding: 4px 8px;
+  border-radius: var(--tree-row-radius);
+  background: transparent;
+  color: var(--fg-dim);
+  font-size: 12.5px;
+}
+
+.context-panel__file-row:hover {
+  background: var(--tree-row-hover-bg);
+  color: var(--fg);
+}
+
+.context-panel__file-list--compact .context-panel__file-row {
+  min-height: 34px;
+}
+
+.context-panel__file-main {
+  flex: 1 1 auto;
+  min-width: 0;
+  display: flex;
+  gap: 8px;
+  align-items: center;
+}
+
+.context-panel__file-main svg {
+  flex: 0 0 auto;
+  color: var(--fg-faint);
+}
+
+.context-panel__file-copy {
+  min-width: 0;
+  display: flex;
+  flex-direction: column;
+  gap: 2px;
+}
+
+.context-panel__file-copy > span {
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.context-panel__file-copy small {
+  color: var(--fg-faint);
+  font-size: 11px;
+  line-height: 1.1;
+}
+
+.context-panel__file-meta {
+  flex: 0 0 auto;
+  display: flex;
+  align-items: center;
+  gap: 7px;
+  color: var(--fg-faint);
+  font-size: 11.5px;
+  white-space: nowrap;
+}
+
+.context-panel__file-turn {
+  max-width: 76px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  padding: 2px 6px;
+  border-radius: 999px;
+  background: var(--bg);
+  color: var(--fg-dim);
+}
+
+.context-panel__scope {
+  flex: 0 0 auto;
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  min-height: 34px;
+  margin: 4px 10px 10px;
+  padding: 0 10px;
+  border: 1px solid var(--border-soft);
+  border-radius: 8px;
+  background: var(--bg);
+  color: var(--fg-dim);
+  font-size: 12.5px;
+}
+
+/* ----------------------------------------------------------------------------
+ * Native-feel: overscroll containment, reduced-motion, view-transition suppression
+ * -------------------------------------------------------------------------- */
+
+/* Prevent rubber-band / pull-to-refresh on scrollable panels so the webview
+   feels like a native window, not a browser tab. */
+.transcript,
+.drawer__body,
+.settings-content,
+.history-preview__body {
+  overscroll-behavior: contain;
+}
+
+/* Disable cross-document view transitions — the webview has no navigation. */
+::view-transition-old(root),
+::view-transition-new(root) {
+  animation: none !important;
+}
+
+/* ── Branch indicator (changed-files view) ──────────────────────────── */
+.workspace-branch-indicator {
+  display: flex;
+  align-items: center;
+  gap: 5px;
+  padding: 6px 10px;
+  border-bottom: 1px solid var(--border);
+  color: var(--fg-muted);
+  font-size: 12px;
+}
+
+.workspace-branch-indicator > svg {
+  flex-shrink: 0;
+  opacity: 0.6;
+}
+
+.workspace-branch-indicator > .workspace-branch-name {
+  display: flex;
+  align-items: center;
+  gap: 3px;
+  border: none;
+  background: transparent;
+  color: var(--fg);
+  cursor: pointer;
+  font-family: inherit;
+  font-size: 12px;
+  padding: 1px 4px;
+  border-radius: 3px;
+}
+
+.workspace-branch-indicator > .workspace-branch-name:hover {
+  background: var(--bg-hover, rgba(128, 128, 128, 0.08));
+}
+
+.workspace-branch-indicator > .workspace-branch-name span {
+  max-width: 160px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.workspace-branch-refresh {
+  margin-left: auto;
+  border: none;
+  background: transparent;
+  color: var(--fg-muted);
+  cursor: pointer;
+  padding: 2px;
+  border-radius: 3px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.workspace-branch-refresh:hover {
+  color: var(--fg);
+  background: var(--bg-hover, rgba(128, 128, 128, 0.08));
+}
+
+.workspace-branch-refresh:disabled {
+  opacity: 0.4;
+  cursor: default;
+}
+
+.workspace-branch-refresh .spinning {
+  animation: spin 0.6s linear infinite;
+}
+
+@keyframes spin {
+  to { transform: rotate(360deg); }
+}
+
+.workspace-branch-menu {
+  min-width: 140px;
+  max-width: 260px;
+  max-height: 300px;
+  background: var(--bg-elev);
+  border: 1px solid var(--border);
+  border-radius: 6px;
+  box-shadow: 0 6px 20px rgba(0, 0, 0, 0.2);
+  overflow: hidden;
+}
+
+.workspace-branch-menu__inner {
+  display: flex;
+  flex-direction: column;
+  overflow-y: auto;
+  background: var(--bg-elev);
+}
+
+.workspace-branch-menu__loading {
+  padding: 10px 12px;
+  color: var(--fg-muted);
+  font-size: 12px;
+  text-align: center;
+}
+
+.workspace-branch-menu__item {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  width: 100%;
+  padding: 6px 12px;
+  border: none;
+  background: transparent;
+  color: var(--fg);
+  cursor: pointer;
+  font-family: inherit;
+  font-size: 12px;
+  text-align: left;
+}
+
+.workspace-branch-menu__item:hover {
+  background: var(--bg-hover, rgba(128, 128, 128, 0.08));
+}
+
+.workspace-branch-menu__item--active {
+  font-weight: 600;
+}
+
+.workspace-branch-menu__item svg {
+  flex-shrink: 0;
+  opacity: 0.7;
+}
+
+.workspace-branch-menu__item span {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.workspace-branch-menu__item:disabled {
+  opacity: 0.4;
+  cursor: default;
+}
+
+/* ── Command palette (⌘K) ─────────────────────────────────────────── */
+.drawer-backdrop:has(.palette) {
+  justify-content: center;
+  align-items: flex-start;
+  padding-top: 12vh;
+}
+
+.palette {
+  position: relative;
+  width: min(520px, 90vw);
+  max-height: 60vh;
+  background: var(--bg-elev);
+  border: 1px solid var(--border);
+  border-radius: 10px;
+  box-shadow: 0 12px 48px rgba(0, 0, 0, 0.36);
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+  animation: palette-in 0.1s ease;
+}
+
+@keyframes palette-in {
+  from { opacity: 0; transform: translateY(-12px) scale(0.97); }
+  to   { opacity: 1; transform: translateY(0) scale(1); }
+}
+
+.palette__inputrow {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  padding: 10px 14px;
+  border-bottom: 1px solid var(--border);
+}
+
+.palette__input {
+  flex: 1;
+  border: none;
+  outline: none;
+  background: transparent;
+  color: var(--fg);
+  font-size: 14px;
+  line-height: 1.4;
+}
+
+.palette__input::placeholder {
+  color: var(--fg-muted);
+}
+
+.palette__esc {
+  font-size: 11px;
+  padding: 2px 6px;
+  border-radius: 4px;
+  border: 1px solid var(--border);
+  color: var(--fg-muted);
+  background: var(--bg-base);
+  font-family: inherit;
+  line-height: 1.3;
+}
+
+.palette__list {
+  flex: 1;
+  overflow-y: auto;
+  padding: 6px 0;
+}
+
+.palette__empty {
+  padding: 24px 14px;
+  color: var(--fg-muted);
+  text-align: center;
+  font-size: 13px;
+}
+
+.palette__group-title {
+  padding: 8px 14px 4px;
+  font-size: 11px;
+  font-weight: 600;
+  text-transform: uppercase;
+  letter-spacing: 0.04em;
+  color: var(--fg-muted);
+}
+
+.palette__item {
+  display: flex;
+  flex-direction: column;
+  gap: 2px;
+  width: 100%;
+  padding: 8px 14px;
+  border: none;
+  background: transparent;
+  color: var(--fg);
+  cursor: pointer;
+  text-align: left;
+  font-family: inherit;
+  font-size: 13px;
+  line-height: 1.3;
+}
+
+.palette__item--on {
+  background: var(--accent-bg, rgba(77, 151, 255, 0.12));
+}
+
+.palette__item:focus-visible {
+  outline: 2px solid var(--accent);
+  outline-offset: -2px;
+}
+
+.palette__title {
+  font-weight: 500;
+}
+
+.palette__hint {
+  font-size: 11px;
+  color: var(--fg-muted);
+}
+
+.palette__foot {
+  display: flex;
+  gap: 12px;
+  padding: 7px 14px;
+  border-top: 1px solid var(--border);
+  font-size: 11px;
+  color: var(--fg-muted);
+}
+
+.palette__foot kbd {
+  padding: 1px 4px;
+  border-radius: 3px;
+  border: 1px solid var(--border);
+  background: var(--bg-base);
+  font-family: inherit;
+  font-size: 10px;
+  line-height: 1.3;
+  margin-right: 2px;
+}
+
+/* Respect the OS reduced-motion preference: squash all animations and force
+   instant scrolling so the UI feels immediate rather than web-like. */
+@media (prefers-reduced-motion: reduce) {
+  *,
+  *::before,
+  *::after {
+    animation-duration: 0.01ms !important;
+    animation-iteration-count: 1 !important;
+    transition-duration: 0.01ms !important;
+    scroll-behavior: auto !important;
+  }
+}
+
+/* ----------------------------------------------------------------------------
+ * Native Workbench refresh
+ * -------------------------------------------------------------------------- */
+
+:root {
+  --bg: #090b0e;
+  --bg-soft: #101318;
+  --bg-elev: #141820;
+  --bg-elev-2: #1b202a;
+  --sidebar-bg: #0d1015;
+  --sidebar-hover: #181d26;
+  --sidebar-active: color-mix(in srgb, var(--accent) 10%, var(--bg-elev));
+  --chat-bg: #0b0d11;
+  --workspace-preview-bg: #0b0d11;
+  --workspace-files-bg: color-mix(in srgb, var(--bg-elev) 66%, var(--chat-bg));
+  --workspace-files-hover: color-mix(in srgb, var(--fg-faint) 10%, transparent);
+  --border: #29313c;
+  --border-soft: #1d232c;
+  --fg: #f5f6f8;
+  --fg-dim: #b8bec8;
+  --fg-faint: #7f8794;
+  --accent: #d97757;
+  --accent-fg: #170b06;
+  --accent-soft: rgba(217, 119, 87, 0.14);
+  --accent-strong: #e38b6b;
+  --ok: #76c878;
+  --warn: #d9a441;
+  --button-radius: 7px;
+  --radius: 8px;
+  --maxw: 920px;
+  --sans: -apple-system, "SF Pro Text", "PingFang SC", "Noto Sans SC",
+    "Microsoft YaHei", BlinkMacSystemFont, "Segoe UI", sans-serif;
+}
+
+:root[data-theme="light"] {
+  --bg: #e9edf3;
+  --bg-soft: #f0f3f8;
+  --bg-elev: #ffffff;
+  --bg-elev-2: #eef2f7;
+  --sidebar-bg: #f3f6fa;
+  --sidebar-hover: #e7edf5;
+  --sidebar-active: color-mix(in srgb, var(--accent) 9%, #ffffff);
+  --chat-bg: #f8fafc;
+  --workspace-preview-bg: #f8fafc;
+  --workspace-files-bg: #f1f4f8;
+  --workspace-files-hover: #e8edf5;
+  --border: #d5dde8;
+  --border-soft: #e3e9f1;
+  --fg: #121722;
+  --fg-dim: #4d5666;
+  --fg-faint: #8791a1;
+}
+
+.layout {
+  --chat-min-width: 700px;
+  --topicbar-height: 58px;
+  --statusbar-height: 30px;
+  background:
+    linear-gradient(180deg, color-mix(in srgb, var(--bg) 94%, var(--accent) 6%), var(--bg) 360px);
+}
+
+.app-chrome {
+  background: color-mix(in srgb, var(--bg-soft) 90%, var(--bg-elev));
+  border-bottom-color: var(--border-soft);
+}
+
+.app--darwin .app-chrome--tabs {
+  padding-right: calc(var(--chrome-right-toggle-offset) + var(--chrome-toggle-size) + 10px);
+  background: color-mix(in srgb, var(--bg-soft) 90%, var(--bg-elev));
+}
+
+.app--darwin .app-chrome--tabs .tabbar {
+  align-items: center;
+  padding: 7px 0;
+}
+
+.app--darwin .app-chrome--tabs .tabbar__tabs {
+  align-self: center;
+  height: 30px;
+  gap: 5px;
+}
+
+.app--darwin .app-chrome--tabs .tabbar__tab,
+.workspace-tabs-bar .tabbar__tab {
+  height: 30px;
+  width: var(--tabbar-tab-width);
+  min-width: var(--tabbar-tab-width);
+  max-width: var(--tabbar-tab-width);
+  align-self: center;
+  padding: 0 28px 0 10px;
+  border: 1px solid transparent;
+  border-radius: 7px;
+  background: transparent;
+  color: var(--fg-dim);
+}
+
+.app--darwin .app-chrome--tabs .tabbar__tab:not(.tabbar__tab--active):hover,
+.workspace-tabs-bar .tabbar__tab:not(.tabbar__tab--active):hover {
+  border-color: color-mix(in srgb, var(--border) 70%, transparent);
+  background: color-mix(in srgb, var(--bg-elev-2) 48%, transparent);
+}
+
+.app--darwin .app-chrome--tabs .tabbar__tab--active,
+.workspace-tabs-bar .tabbar__tab--active {
+  color: var(--fg);
+  border-color: var(--border);
+  background: var(--bg-elev);
+  box-shadow: none;
+}
+
+.app--darwin .app-chrome--tabs .tabbar__new,
+.workspace-tabs-bar .tabbar__new {
+  height: 30px;
+  margin: 0;
+  border-radius: 7px;
+}
+
+.app-chrome__panel-toggle,
+.app--darwin .app-chrome--tabs .app-chrome__panel-toggle {
+  top: 7px;
+  height: 30px;
+  width: 30px;
+  border: 1px solid transparent;
+  border-radius: 7px;
+}
+
+.app-chrome__panel-toggle:hover,
+.app--darwin .app-chrome--tabs .app-chrome__panel-toggle:hover {
+  border-color: var(--border);
+  background: var(--bg-elev);
+  color: var(--fg);
+}
+
+.app-chrome__panel-toggle--active,
+.app--darwin .app-chrome--tabs .app-chrome__panel-toggle--active {
+  color: var(--accent);
+  border-color: color-mix(in srgb, var(--accent) 22%, transparent);
+  background: color-mix(in srgb, var(--accent) 9%, transparent);
+}
+
+.app--darwin .app-chrome--tabs .app-chrome__panel-toggle--left.app-chrome__panel-toggle--active,
+.app--darwin .app-chrome--tabs .app-chrome__panel-toggle--right.app-chrome__panel-toggle--active {
+  color: var(--fg-dim);
+  border-color: transparent;
+  background: transparent;
+}
+
+.app--darwin .app-chrome--tabs .app-chrome__panel-toggle--left.app-chrome__panel-toggle--active:hover,
+.app--darwin .app-chrome--tabs .app-chrome__panel-toggle--right.app-chrome__panel-toggle--active:hover {
+  color: var(--fg);
+}
+
+.workspace-tabs-bar {
+  height: 44px;
+  align-items: center;
+  padding: 0 10px 0 48px;
+  background: color-mix(in srgb, var(--bg-soft) 90%, var(--bg-elev));
+}
+
+.sidebar {
+  padding: 12px 10px calc(12px + var(--statusbar-height));
+  background: var(--sidebar-bg);
+  border-right-color: var(--border-soft);
+}
+
+.sidebar__brand {
+  display: flex;
+  align-items: center;
+  min-height: 38px;
+  padding: 3px 8px 11px;
+  color: var(--fg);
+}
+
+.sidebar__brand-logo {
+  flex: 0 0 auto;
+  display: block;
+  width: 126px;
+  height: 29px;
+  object-fit: contain;
+  object-position: left center;
+}
+
+.sidebar__new {
+  display: flex;
+  height: 52px;
+  margin-bottom: 14px;
+  padding: 0 18px;
+  border-radius: 12px;
+  color: var(--accent-text);
+  background: var(--grad);
+  border: 0;
+  box-shadow: 0 6px 18px -6px var(--accent), var(--shadow-1);
+}
+
+.sidebar__new:hover {
+  color: var(--accent-text);
+  background: var(--grad);
+  filter: saturate(1.08) brightness(1.03);
+  transform: translateY(-1px);
+}
+
+.sidebar__section--projects {
+  min-height: 0;
+}
+
+.sidebar__nav {
+  gap: 3px;
+  padding-top: 10px;
+  border-top-color: var(--border-soft);
+}
+
+.sidebar__navitem {
+  height: 32px;
+  border-radius: 7px;
+}
+
+.sidebar--collapsed .sidebar__brand {
+  display: none;
+}
+
+.app--darwin .sidebar--collapsed .sidebar__brand {
+  display: none;
+}
+
+.project-tree {
+  --project-tree-edge-gap: 0px;
+  gap: 10px;
+}
+
+.project-tree__search {
+  height: 32px;
+  margin: 0;
+  border-radius: 8px;
+  background: transparent;
+}
+
+.project-tree__header {
+  min-height: 25px;
+  padding: 4px 4px 0;
+  color: var(--fg-faint);
+  font-size: var(--text-xs);
+  font-weight: 500;
+}
+
+.project-tree__folder {
+  min-height: 34px;
+  height: 34px;
+  border-radius: var(--project-tree-row-radius);
+}
+
+.project-tree__folder:hover,
+.project-tree__topic:hover {
+  background: var(--sidebar-hover);
+}
+
+.project-tree__folder--active,
+.project-tree__folder--menu-open,
+.project-tree__folder--active:hover {
+  background: color-mix(in srgb, var(--project-accent, var(--accent)) 7%, var(--bg-elev));
+}
+
+.project-tree__topic {
+  min-height: 36px;
+  margin-left: 18px;
+  margin-right: 4px;
+  padding-right: 8px;
+  border: 1px solid transparent;
+  border-radius: var(--project-tree-row-radius);
+}
+
+.project-tree__topic--has-meta {
+  min-height: 46px;
+}
+
+.project-tree__topic--active {
+  border-color: transparent;
+  border-radius: var(--project-tree-row-radius);
+  background: color-mix(in srgb, var(--project-accent, var(--accent)) 7%, var(--bg-elev));
+}
+
+.project-tree__topic--active::before {
+  left: 6px;
+  top: 9px;
+  bottom: 9px;
+  width: 3px;
+  border-radius: 999px;
+}
+
+.project-tree__topic-main {
+  min-height: 34px;
+  padding-left: 12px;
+}
+
+.project-tree__topic--has-meta .project-tree__topic-main {
+  min-height: 46px;
+  padding-top: 6px;
+  padding-bottom: 6px;
+}
+
+.project-tree__topic-meta-text {
+  min-width: 0;
+  display: block;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.topicbar {
+  min-height: 48px;
+  padding: 6px 18px;
+  gap: 10px;
+  background: color-mix(in srgb, var(--chat-bg) 96%, var(--bg-elev));
+}
+
+.topicbar__identity {
+  gap: 1px;
+}
+
+.topicbar__title-row h1 {
+  max-width: 100%;
+  font-size: 14.5px;
+  font-weight: 660;
+}
+
+.topicbar__subtitle {
+  max-width: 100%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  color: var(--fg-faint);
+  font-family: inherit;
+  font-size: 11.5px;
+  line-height: 1.2;
+}
+
+.topicbar__icon-btn {
+  width: 28px;
+  height: 28px;
+}
+
+.topicbar__action-btn {
+  width: 30px;
+  min-width: 30px;
+  height: 28px;
+  min-height: 28px;
+  gap: 0;
+  padding: 0;
+  border: 1px solid var(--border);
+  border-radius: 7px;
+  background: var(--bg-elev);
+  color: var(--fg-dim);
+}
+
+.topicbar__action-btn--icon,
+.topicbar__action-btn--label {
+  width: 30px;
+  min-width: 30px;
+  gap: 0;
+  padding: 0;
+}
+
+.topicbar__action-btn--label span {
+  display: none;
+}
+
+.topicbar__actions .topicbar__action-btn svg {
+  width: 14px;
+  height: 14px;
+}
+
+.topicbar__action-btn--accent {
+  color: var(--fg-dim);
+  border-color: var(--border);
+  background: var(--bg-elev);
+}
+
+.topicbar__action-btn--label[aria-pressed="true"] {
+  border-color: color-mix(in srgb, var(--fg-faint) 40%, var(--border));
+  background: var(--bg-elev-2);
+  color: var(--fg);
+}
+
+.topicbar__action-btn:hover:not(:disabled),
+.topicbar__action-btn:focus-visible:not(:disabled),
+.topicbar__export--open .topicbar__action-btn {
+  border-color: color-mix(in srgb, var(--fg-faint) 30%, var(--border));
+  background: var(--bg-elev-2);
+  color: var(--fg);
+}
+
+.banner--update {
+  min-height: 43px;
+  padding: 8px 18px;
+  border-bottom-color: color-mix(in srgb, var(--accent) 24%, var(--border-soft));
+  background: color-mix(in srgb, var(--accent) 13%, var(--chat-bg));
+}
+
+.transcript {
+  padding: 24px 32px 28px;
+}
+
+.transcript > * {
+  max-width: var(--maxw);
+}
+
+.welcome__ex {
+  border-radius: 8px;
+  background: var(--bg-elev);
+}
+
+.msg {
+  margin: 16px auto;
+}
+
+.msg--user .msg__body {
+  border-color: color-mix(in srgb, var(--accent) 22%, var(--border));
+  border-radius: 8px;
+  background: color-mix(in srgb, var(--accent) 11%, var(--bg-elev));
+}
+
+.process-card {
+  border-radius: 8px;
+  background: var(--bg-elev);
+  box-shadow: none;
+}
+
+.process-card__head {
+  min-height: 36px;
+}
+
+.footer {
+  padding: 12px 32px 6px;
+  background: color-mix(in srgb, var(--chat-bg) 96%, var(--bg-elev));
+}
+
+.composer-wrap {
+  max-width: var(--maxw);
+}
+
+.composer-card {
+  border-radius: 9px;
+  background: var(--bg-elev);
+  box-shadow: none;
+}
+
+.composer-card:focus-within {
+  border-color: color-mix(in srgb, var(--accent) 48%, var(--border));
+  box-shadow: 0 0 0 3px color-mix(in srgb, var(--accent) 15%, transparent);
+}
+
+.composer {
+  min-height: 58px;
+  padding: 10px;
+}
+
+.composer__btn {
+  width: 34px;
+  height: 34px;
+  border-radius: 8px;
+}
+
+.composer-meta {
+  min-height: 42px;
+  padding: 5px 10px 10px 30px;
+}
+
+.composer-toolbar {
+  margin-bottom: 8px;
+}
+
+.composer-modebar {
+  border-radius: 8px;
+  background: color-mix(in srgb, var(--bg-elev-2) 72%, transparent);
+}
+
+.composer-modebar__thumb {
+  border-radius: 6px;
+}
+
+.composer-modebar__item {
+  border-radius: 6px;
+}
+
+.composer-context__item,
+.meta-chip,
+.composer-meta .modelsw__trigger {
+  border-radius: 7px;
+}
+
+.statusbar {
+  max-width: var(--maxw);
+  margin-top: 6px;
+  gap: 10px;
+}
+
+.statusbar__dot {
+  background: var(--accent-3, var(--ok));
+}
+
+.statusbar__balance,
+.statusbar__cost {
+  color: var(--ok);
+}
+
+.workspace-panel-resizer::after {
+  background: var(--border-soft);
+}
+
+.workbench-dock {
+  background: color-mix(in srgb, var(--bg-elev) 60%, var(--chat-bg));
+  border-left: 1px solid var(--border-soft);
+}
+
+.workbench-dock__tools {
+  height: 52px;
+  padding: 10px 12px 8px;
+  border-bottom-color: var(--border-soft);
+}
+
+.workbench-dock__tabs {
+  width: 100%;
+  border-radius: 8px;
+  background: color-mix(in srgb, var(--bg) 72%, transparent);
+}
+
+.workbench-dock__tab {
+  flex: 1 1 0;
+  max-width: none;
+  height: 28px;
+  border-radius: 7px;
+}
+
+.workbench-dock__tab--active {
+  background: var(--bg-elev-2);
+}
+
+.workspace-panel,
+.workspace-files,
+.workspace-preview,
+.context-panel {
+  background: transparent;
+}
+
+.workspace-panel {
+  border-left: 0;
+}
+
+.workspace-search {
+  height: 34px;
+  margin: 10px 12px 8px;
+  border-radius: 8px;
+  background: var(--chat-bg);
+}
+
+.workspace-files__tools {
+  height: 0;
+  padding: 0;
+  overflow: hidden;
+}
+
+.workspace-tree-row,
+.workspace-change-row,
+.workspace-files__tab,
+.workspace-iconbtn {
+  border-radius: 7px;
+}
+
+.workspace-preview__head,
+.workspace-preview__meta {
+  border-color: var(--border-soft);
+}
+
+.workspace-preview__body {
+  background: var(--chat-bg);
+}
+
+@media (max-width: 980px) {
+  .topicbar__subtitle {
+    max-width: 100%;
+  }
+}
+
+@container (max-width: 700px) {
+  .topicbar__action-btn--label {
+    width: 30px;
+    min-width: 30px;
+    padding: 0;
+    gap: 0;
+  }
+}
+
+/* -------------------------------------------------------------------------
+   Graphite desktop implementation
+   Aligns the real app shell with the Graphite/light reference prototype while
+   preserving the existing React data flow and Wails chrome behavior.
+   ------------------------------------------------------------------------- */
+:root[data-theme-style="graphite"] {
+  --maxw: 760px;
+  --app-graphite-hairline: rgba(20, 22, 28, 0.12);
+  --app-graphite-hairline-strong: rgba(20, 22, 28, 0.22);
+  --app-graphite-shadow: 0 1px 2px rgba(20, 22, 28, 0.06);
+  --app-graphite-shadow-float: 0 12px 34px rgba(20, 22, 28, 0.14);
+  --button-radius: 7px;
+  --list-row-radius: 8px;
+  --tree-row-radius: 7px;
+  --dur-fast: 130ms;
+  --dur-base: 220ms;
+  --dur-slow: 320ms;
+  --ease-out: cubic-bezier(0.16, 1, 0.3, 1);
+}
+
+:root[data-theme="dark"][data-theme-style="graphite"] {
+  --app-graphite-hairline: rgba(255, 255, 255, 0.1);
+  --app-graphite-hairline-strong: rgba(255, 255, 255, 0.2);
+  --app-graphite-shadow: 0 1px 2px rgba(0, 0, 0, 0.5);
+  --app-graphite-shadow-float: 0 14px 40px rgba(0, 0, 0, 0.6);
+}
+
+:root[data-theme-style="graphite"] body {
+  background: var(--bg);
+}
+
+:root[data-theme-style="graphite"] .layout {
+  --app-chrome-height: 46px;
+  --topicbar-height: 58px;
+  background: var(--bg);
+}
+
+:root[data-theme-style="graphite"] .app--darwin .layout {
+  --app-chrome-height: 46px;
+}
+
+:root[data-theme-style="graphite"] .app-chrome,
+:root[data-theme-style="graphite"] .workspace-tabs-bar {
+  background: var(--bg-elev);
+  border-bottom: 1px solid var(--border-soft);
+  box-shadow: none;
+}
+
+:root[data-theme-style="graphite"] .app--darwin .app-chrome--tabs {
+  padding-left: calc(var(--chrome-left-safe-offset) + var(--chrome-toggle-size) + 8px);
+  padding-right: calc(var(--chrome-toggle-size) + 12px);
+  background: var(--bg-elev);
+  transition: background var(--dur-fast), border-color var(--dur-fast);
+}
+
+:root[data-theme-style="graphite"] .app--windows .app-chrome--native-tabs,
+:root[data-theme-style="graphite"] .app--linux .app-chrome--native-tabs {
+  gap: 12px;
+  padding-left: 48px;
+  padding-right: 48px;
+  background: var(--bg-elev);
+  transition: background var(--dur-fast), border-color var(--dur-fast);
+}
+
+:root[data-theme-style="graphite"] .app--windows .app-chrome--native-tabs {
+  background:
+    linear-gradient(180deg, color-mix(in srgb, var(--bg-elev) 94%, #fff), var(--bg-elev));
+}
+
+:root[data-theme-style="graphite"] .app--browser-preview.app--windows .app-chrome--native-tabs {
+  padding-right: calc(var(--windows-preview-controls-width) + 48px);
+}
+
+:root[data-theme-style="graphite"] .app--linux .app-chrome--native-tabs {
+  background: var(--bg-elev);
+}
+
+:root[data-theme-style="graphite"] .app-chrome__identity {
+  min-width: 128px;
+  color: var(--fg-dim);
+}
+
+:root[data-theme-style="graphite"] .app-chrome__logo {
+  width: 76px;
+  max-height: 19px;
+}
+
+:root[data-theme-style="graphite"] .app-chrome__separator {
+  color: var(--fg-faint);
+}
+
+:root[data-theme-style="graphite"] .app-chrome__scope {
+  font-size: 12.5px;
+  font-weight: 560;
+}
+
+:root[data-theme-style="graphite"] .app--browser-preview.app--darwin .app-chrome--tabs::before {
+  content: none;
+}
+
+:root[data-theme-style="graphite"] .app-chrome__traffic {
+  position: absolute;
+  left: 18px;
+  top: 16px;
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  width: 52px;
+  height: 12px;
+  pointer-events: none;
+}
+
+:root[data-theme-style="graphite"] .app-chrome__traffic span {
+  width: 12px;
+  height: 12px;
+  border-radius: 999px;
+  box-shadow: inset 0 0 0 0.5px rgba(0, 0, 0, 0.08);
+}
+
+:root[data-theme-style="graphite"] .app-chrome__traffic span:nth-child(1) {
+  background: #ff5f57;
+}
+
+:root[data-theme-style="graphite"] .app-chrome__traffic span:nth-child(2) {
+  background: #febc2e;
+}
+
+:root[data-theme-style="graphite"] .app-chrome__traffic span:nth-child(3) {
+  background: #28c840;
+}
+
+:root[data-theme-style="graphite"] .app-chrome__panel-toggle,
+:root[data-theme-style="graphite"] .app--darwin .app-chrome--tabs .app-chrome__panel-toggle {
+  top: 8px;
+  width: 30px;
+  height: 30px;
+  border: 1px solid transparent;
+  border-radius: var(--r-s);
+  color: var(--fg-faint);
+  background: transparent;
+  transition:
+    right 0.28s cubic-bezier(0.2, 0.72, 0.2, 1),
+    background var(--dur-fast),
+    border-color var(--dur-fast),
+    color var(--dur-fast),
+    transform 0.16s var(--ease-out);
+}
+
+:root[data-theme-style="graphite"] .app--darwin .app-chrome--tabs .app-chrome__panel-toggle--right {
+  right: 8px;
+}
+
+:root[data-theme-style="graphite"] .app-chrome__panel-toggle:hover,
+:root[data-theme-style="graphite"] .app--darwin .app-chrome--tabs .app-chrome__panel-toggle:hover {
+  color: var(--fg);
+  border-color: var(--border);
+  background: var(--bg-elev);
+}
+
+:root[data-theme-style="graphite"] .app-chrome__panel-toggle--active,
+:root[data-theme-style="graphite"] .app--darwin .app-chrome--tabs .app-chrome__panel-toggle--active {
+  color: var(--accent);
+  border-color: color-mix(in srgb, var(--accent) 24%, transparent);
+  background: color-mix(in srgb, var(--accent) 9%, transparent);
+}
+
+:root[data-theme-style="graphite"] .app--darwin .app-chrome--tabs .app-chrome__panel-toggle--left:hover,
+:root[data-theme-style="graphite"] .app--darwin .app-chrome--tabs .app-chrome__panel-toggle--right:hover,
+:root[data-theme-style="graphite"] .app--darwin .app-chrome--tabs .app-chrome__panel-toggle--left.app-chrome__panel-toggle--active,
+:root[data-theme-style="graphite"] .app--darwin .app-chrome--tabs .app-chrome__panel-toggle--right.app-chrome__panel-toggle--active {
+  border-color: transparent;
+  background: transparent;
+}
+
+:root[data-theme-style="graphite"] .app--darwin .app-chrome--tabs .app-chrome__panel-toggle--left.app-chrome__panel-toggle--active,
+:root[data-theme-style="graphite"] .app--darwin .app-chrome--tabs .app-chrome__panel-toggle--right.app-chrome__panel-toggle--active {
+  color: var(--fg-faint);
+}
+
+:root[data-theme-style="graphite"] .app--darwin .app-chrome--tabs .app-chrome__panel-toggle--left.app-chrome__panel-toggle--active:hover,
+:root[data-theme-style="graphite"] .app--darwin .app-chrome--tabs .app-chrome__panel-toggle--right.app-chrome__panel-toggle--active:hover {
+  color: var(--fg);
+}
+
+:root[data-theme-style="graphite"] .tabbar {
+  --tabbar-tab-width: 176px;
+  height: 100%;
+  gap: 10px;
+  align-items: center;
+  min-width: 0;
+}
+
+:root[data-theme-style="graphite"] .app--darwin .app-chrome--tabs .tabbar,
+:root[data-theme-style="graphite"] .workspace-tabs-bar .tabbar {
+  padding: 0;
+}
+
+:root[data-theme-style="graphite"] .tabbar__tabs {
+  flex: 0 1 auto;
+  min-width: 0;
+  max-width: none;
+  gap: 4px;
+  height: 46px;
+  align-items: center;
+  overflow-x: auto;
+  scrollbar-width: none;
+}
+
+:root[data-theme-style="graphite"] .tabbar__tabs::-webkit-scrollbar {
+  display: none;
+}
+
+:root[data-theme-style="graphite"] .tabbar__tab {
+  flex: 0 0 var(--tabbar-tab-width);
+  width: var(--tabbar-tab-width);
+  height: 34px;
+  min-width: var(--tabbar-tab-width);
+  max-width: var(--tabbar-tab-width);
+  gap: 8px;
+  padding: 0 37px 0 11px;
+  border: 0;
+  border-radius: var(--r-s);
+  background: transparent;
+  color: var(--fg-dim);
+  font-size: 12.5px;
+  font-weight: 500;
+  box-shadow: none;
+  transition: background var(--dur-fast), color var(--dur-fast);
+  animation: none;
+}
+
+:root[data-theme-style="graphite"] .tabbar__tab:not(.tabbar__tab--active):hover {
+  background: var(--surface-3);
+  color: var(--fg);
+}
+
+:root[data-theme-style="graphite"] .tabbar__tab--active {
+  color: var(--fg);
+  background: var(--surface-2);
+  box-shadow: var(--app-graphite-shadow);
+}
+
+:root[data-theme-style="graphite"] .tabbar__tab:focus {
+  outline: none;
+}
+
+:root[data-theme-style="graphite"] .tabbar__tab:focus-visible {
+  box-shadow: 0 0 0 3px var(--accent-soft), var(--app-graphite-shadow);
+}
+
+:root[data-theme-style="graphite"] .tabbar__tab-label {
+  flex: 1 1 auto;
+  min-width: 0;
+  font-weight: inherit;
+}
+
+:root[data-theme-style="graphite"] .tabbar__status {
+  background: var(--project-accent, var(--fg-faint));
+  box-shadow: none;
+  transform-origin: center;
+  animation: none;
+  transition: opacity var(--dur-fast), transform var(--dur-fast), background var(--dur-fast), box-shadow var(--dur-fast);
+}
+
+:root[data-theme-style="graphite"] .tabbar__tab--active .tabbar__status {
+  background: var(--project-accent, var(--fg-faint));
+  box-shadow: none;
+  animation: none;
+}
+
+:root[data-theme-style="graphite"] .tabbar__status--running,
+:root[data-theme-style="graphite"] .tabbar__tab--active .tabbar__status--running {
+  background: var(--project-accent, var(--accent));
+  box-shadow: 0 0 0 4px var(--accent-soft);
+  animation: graphite-tab-breathe 2.4s var(--ease-standard) infinite;
+}
+
+:root[data-theme-style="graphite"] .tabbar__tab-close {
+  right: 11px;
+  width: 18px;
+  height: 18px;
+  border-radius: 5px;
+  opacity: 0;
+  color: var(--fg-faint);
+  pointer-events: none;
+  transition: opacity var(--dur-fast), background var(--dur-fast), color var(--dur-fast);
+}
+
+:root[data-theme-style="graphite"] .tabbar__tab--active .tabbar__tab-close {
+  opacity: 0;
+  pointer-events: none;
+}
+
+:root[data-theme-style="graphite"] .tabbar__tab:hover .tabbar__tab-close {
+  opacity: 0.7;
+  pointer-events: auto;
+}
+
+:root[data-theme-style="graphite"] .tabbar__tab-close:hover {
+  opacity: 1;
+  background: var(--border-2);
+  color: var(--fg);
+}
+
+:root[data-theme-style="graphite"] .tabbar__new,
+:root[data-theme-style="graphite"] .tabbar__command {
+  height: 32px;
+  border-radius: var(--r-s);
+  color: var(--fg-faint);
+}
+
+:root[data-theme-style="graphite"] .tabbar__new {
+  width: 30px;
+  height: 30px;
+}
+
+:root[data-theme-style="graphite"] .tabbar__new {
+  border-color: transparent;
+  background: transparent;
+}
+
+:root[data-theme-style="graphite"] .tabbar__command {
+  width: clamp(180px, 26vw, 340px);
+  min-width: 148px;
+  max-width: 340px;
+  flex: 0 1 clamp(180px, 26vw, 340px);
+  gap: 9px;
+  padding: 0 12px;
+  border-color: transparent;
+  background: var(--surface-3);
+}
+
+:root[data-theme-style="graphite"] .tabbar__command--compact {
+  width: 112px;
+  min-width: 112px;
+  max-width: 112px;
+  flex: 0 0 112px;
+  justify-content: center;
+  gap: 6px;
+  padding: 0 9px;
+}
+
+:root[data-theme-style="graphite"] .tabbar__command--compact .tabbar__command-text--full {
+  max-width: 0;
+  opacity: 0;
+  pointer-events: none;
+  transform: translateX(-4px);
+}
+
+:root[data-theme-style="graphite"] .tabbar__command--compact .tabbar__command-text--compact {
+  display: inline-flex;
+  max-width: 48px;
+  opacity: 1;
+  transform: translateX(0);
+}
+
+:root[data-theme-style="graphite"] .tabbar__command--compact .tabbar__command-kbd {
+  margin-left: 0;
+}
+
+:root[data-theme-style="graphite"] .tabbar__mode-badge {
+  height: 16px;
+  padding: 0 5px;
+  border-radius: 5px;
+  font-size: 10px;
+  font-weight: 600;
+  letter-spacing: 0.04em;
+}
+
+:root[data-theme-style="graphite"] .tabbar__new:hover,
+:root[data-theme-style="graphite"] .tabbar__command:hover {
+  color: var(--fg);
+  border-color: var(--border);
+  background: var(--bg-elev);
+}
+
+:root[data-theme-style="graphite"] .tabbar__command-kbd {
+  margin-left: auto;
+  color: var(--fg-faint);
+  border-color: var(--border);
+  border-radius: 5px;
+  background: var(--surface-2);
+  box-shadow: inset 0 1px 0 color-mix(in srgb, #fff 58%, transparent);
+}
+
+@media (max-width: 980px) {
+  :root[data-theme-style="graphite"] .tabbar {
+    --tabbar-tab-width: 148px;
+    gap: 8px;
+  }
+
+  :root[data-theme-style="graphite"] .tabbar__spacer {
+    min-width: 8px;
+  }
+
+  :root[data-theme-style="graphite"] .tabbar__command {
+    width: clamp(132px, 22vw, 240px);
+    min-width: 132px;
+    flex-basis: clamp(132px, 22vw, 240px);
+    gap: 7px;
+    padding: 0 9px;
+  }
+
+  :root[data-theme-style="graphite"] .tabbar__command--compact {
+    width: 104px;
+    min-width: 104px;
+    flex-basis: 104px;
+    padding: 0 8px;
+  }
+}
+
+@media (max-width: 760px) {
+  :root[data-theme-style="graphite"] .tabbar {
+    gap: 6px;
+  }
+
+  :root[data-theme-style="graphite"] .tabbar__command {
+    width: 76px;
+    min-width: 76px;
+    flex-basis: 76px;
+    justify-content: center;
+    padding: 0 8px;
+  }
+
+  :root[data-theme-style="graphite"] .tabbar__command-text {
+    display: none;
+  }
+
+  :root[data-theme-style="graphite"] .tabbar__command-kbd {
+    margin-left: 0;
+    padding: 1px 4px;
+  }
+}
+
+@media (max-width: 620px) {
+  :root[data-theme-style="graphite"] .tabbar__command {
+    width: 32px;
+    min-width: 32px;
+    flex-basis: 32px;
+    padding: 0;
+  }
+
+  :root[data-theme-style="graphite"] .tabbar__command-kbd {
+    display: none;
+  }
+}
+
+:root[data-theme-style="graphite"] .sidebar {
+  padding: 14px 12px calc(8px + var(--statusbar-height));
+  background: var(--sidebar-bg);
+  border-right: 1px solid var(--border-soft);
+}
+
+:root[data-theme-style="graphite"] .sidebar__nav {
+  padding-bottom: 0;
+}
+
+@media (max-width: 820px) {
+  .statusbar__turns {
+    display: none;
+  }
+
+  :root[data-theme-style="graphite"] .sidebar {
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    z-index: var(--z-workspace-float);
+    display: flex;
+    width: clamp(196px, 42vw, 264px);
+    max-width: calc(100vw - 20px);
+    height: auto;
+    opacity: 1;
+    pointer-events: auto;
+    transform: none;
+    box-shadow: 10px 0 30px rgba(20, 22, 28, 0.1);
+  }
+
+  :root[data-theme-style="graphite"] .sidebar--collapsed,
+  :root[data-theme-style="graphite"] .app--darwin .sidebar--collapsed {
+    display: none;
+    opacity: 0;
+    pointer-events: none;
+    transform: none;
+  }
+}
+
+:root[data-theme-style="graphite"] .sidebar__brand {
+  min-height: 38px;
+  padding: 3px 6px 9px;
+  margin-bottom: 10px;
+}
+
+:root[data-theme-style="graphite"] .sidebar__brand-logo {
+  width: 128px;
+  height: 30px;
+}
+
+:root[data-theme-style="graphite"] .topicbar__subtitle {
+  font-family: var(--mono);
+  font-size: 11px;
+  color: var(--fg-faint);
+}
+
+:root[data-theme-style="graphite"] .sidebar__new {
+  display: flex;
+  height: 52px;
+  margin-bottom: 14px;
+  padding: 0 18px;
+  border: 0;
+  border-radius: 12px;
+  color: var(--accent-text);
+  background: var(--grad);
+  box-shadow: 0 6px 18px -6px var(--accent), var(--shadow-1);
+}
+
+:root[data-theme-style="graphite"] .sidebar__navitem:hover,
+:root[data-theme-style="graphite"] .project-tree__folder:hover,
+:root[data-theme-style="graphite"] .project-tree__topic:hover {
+  background: var(--sidebar-hover);
+  color: var(--fg);
+}
+
+:root[data-theme-style="graphite"] .sidebar__new:hover {
+  color: var(--accent-text);
+  background: var(--grad);
+  transform: translateY(-1px);
+  filter: saturate(1.08) brightness(1.03);
+}
+
+:root[data-theme-style="graphite"] .project-tree {
+  --project-tree-action-column: 24px;
+  --project-tree-edge-gap: 0px;
+  --project-tree-global-accent: color-mix(in srgb, var(--fg-faint) 70%, var(--accent));
+  --project-tree-row-radius: var(--r-s);
+  gap: 12px;
+}
+
+:root[data-theme-style="graphite"] .project-tree__search {
+  height: 39px;
+  margin: 0;
+  padding: 9px 12px;
+  gap: 9px;
+  border: 1px solid transparent;
+  border-radius: 8px;
+  background: var(--bg-soft);
+  color: var(--fg-faint);
+  font-size: 13px;
+  line-height: 1.45;
+}
+
+:root[data-theme-style="graphite"] .project-tree__search:focus-within,
+:root[data-theme-style="graphite"] .project-tree__search:hover {
+  border-color: var(--border-strong, var(--border));
+}
+
+:root[data-theme-style="graphite"] .project-tree__header {
+  min-height: 20px;
+  padding: 4px 8px 0;
+  color: var(--fg-faint);
+  font-size: var(--text-xs);
+  font-weight: 560;
+}
+
+:root[data-theme-style="graphite"] .project-tree__header-title {
+  gap: 0;
+  font-size: 11px;
+  font-weight: 600;
+  letter-spacing: 0.04em;
+  text-transform: uppercase;
+}
+
+:root[data-theme-style="graphite"] .project-tree__header-icon {
+  display: none;
+}
+
+:root[data-theme-style="graphite"] .project-tree__header-action-slot {
+  flex-basis: 22px;
+  width: 22px;
+}
+
+:root[data-theme-style="graphite"] .project-tree__header-actions .project-tree__add-project,
+:root[data-theme-style="graphite"] .project-tree__header-actions .project-tree__collapse-all {
+  width: 22px;
+  height: 22px;
+  border-color: var(--border);
+  background: var(--bg-elev);
+}
+
+:root[data-theme-style="graphite"] .project-tree__list {
+  margin: 0 -6px;
+  padding: 2px 6px 0;
+}
+
+:root[data-theme-style="graphite"] .project-tree__folder {
+  min-height: 34px;
+  height: 34px;
+  margin-bottom: 4px;
+  border-radius: var(--project-tree-row-radius);
+  color: var(--fg-dim);
+  font-size: 12.5px;
+  font-weight: 600;
+}
+
+:root[data-theme-style="graphite"] .project-tree__folder--active,
+:root[data-theme-style="graphite"] .project-tree__folder--menu-open,
+:root[data-theme-style="graphite"] .project-tree__folder--active:hover {
+  background: color-mix(in srgb, var(--project-accent, var(--accent)) 5%, transparent);
+  color: var(--fg);
+}
+
+:root[data-theme-style="graphite"] .project-tree__folder-main {
+  gap: 7px;
+  padding-right: 0;
+  font-size: 12.5px;
+  font-weight: 600;
+}
+
+:root[data-theme-style="graphite"] .project-tree__folder-main > svg {
+  display: none;
+}
+
+:root[data-theme-style="graphite"] .project-tree__folder-color {
+  box-shadow: none;
+}
+
+:root[data-theme-style="graphite"] .project-tree__action-slot {
+  flex-basis: 24px;
+  width: 24px;
+}
+
+:root[data-theme-style="graphite"] .project-tree__new-topic {
+  opacity: 0;
+  pointer-events: none;
+  transition: opacity var(--dur-fast), border-color var(--dur-fast), background var(--dur-fast), color var(--dur-fast);
+}
+
+:root[data-theme-style="graphite"] .project-tree__folder:hover .project-tree__new-topic,
+:root[data-theme-style="graphite"] .project-tree__new-topic:focus-visible,
+:root[data-theme-style="graphite"] .project-tree__new-topic--active {
+  opacity: 1;
+  pointer-events: auto;
+}
+
+:root[data-theme-style="graphite"] .project-tree__topic {
+  min-height: 34px;
+  margin-left: 10px;
+  margin-right: 0;
+  border: 0;
+  border-radius: var(--project-tree-row-radius);
+  color: var(--fg-dim);
+}
+
+:root[data-theme-style="graphite"] .project-tree__topic--has-meta {
+  min-height: 46px;
+}
+
+:root[data-theme-style="graphite"] .project-tree__topic--active {
+  background: color-mix(in srgb, var(--project-accent, var(--accent)) 7%, var(--bg-elev));
+}
+
+:root[data-theme-style="graphite"] .project-tree__topic--active::before {
+  left: 0;
+  top: 9px;
+  bottom: 9px;
+  width: 3px;
+  border-radius: 3px;
+  background: color-mix(in srgb, var(--project-accent, var(--accent)) 82%, var(--accent));
+}
+
+:root[data-theme-style="graphite"] .project-tree__topic--active:hover {
+  background: color-mix(in srgb, var(--project-accent, var(--accent)) 9%, var(--bg-elev));
+}
+
+:root[data-theme-style="graphite"] .project-tree__topic--has-meta .project-tree__topic-main {
+  min-height: 46px;
+  padding-top: 6px;
+  padding-bottom: 6px;
+}
+
+:root[data-theme-style="graphite"] .project-tree__topic-main {
+  min-height: 34px;
+  padding-left: 16px !important;
+  padding-right: 9px;
+}
+
+:root[data-theme-style="graphite"] .project-tree__topic-label {
+  color: var(--fg);
+  font-size: 12.5px;
+  font-weight: 500;
+}
+
+:root[data-theme-style="graphite"] .project-tree__topic-status {
+  background: color-mix(in srgb, var(--project-accent, var(--accent)) 10%, var(--bg-elev));
+  color: color-mix(in srgb, var(--project-accent, var(--accent)) 70%, var(--fg-dim));
+  box-shadow: inset 0 0 0 1px color-mix(in srgb, var(--project-accent, var(--accent)) 14%, transparent);
+}
+
+:root[data-theme-style="graphite"] .project-tree__topic-status--waiting_confirmation {
+  background: color-mix(in srgb, var(--warn) 12%, var(--bg-elev));
+  color: color-mix(in srgb, var(--warn) 82%, var(--fg));
+  box-shadow: inset 0 0 0 1px color-mix(in srgb, var(--warn) 20%, transparent);
+}
+
+:root[data-theme-style="graphite"] .project-tree__topic-status--paused {
+  background: color-mix(in srgb, var(--fg-faint) 10%, var(--bg-elev));
+  color: var(--fg-faint);
+  box-shadow: inset 0 0 0 1px color-mix(in srgb, var(--fg-faint) 18%, transparent);
+}
+
+:root[data-theme-style="graphite"] .project-tree__topic-status--error {
+  background: color-mix(in srgb, var(--err) 11%, var(--bg-elev));
+  color: color-mix(in srgb, var(--err) 85%, var(--fg));
+  box-shadow: inset 0 0 0 1px color-mix(in srgb, var(--err) 20%, transparent);
+}
+
+:root[data-theme-style="graphite"] .project-tree__topic-meta {
+  color: var(--fg-faint);
+  font-size: 11px;
+}
+
+:root[data-theme-style="graphite"] .project-tree__topic--active .project-tree__topic-label {
+  font-weight: 600;
+}
+
+:root[data-theme-style="graphite"] .project-tree__topic--active .project-tree__topic-meta {
+  color: var(--fg-faint);
+}
+
+:root[data-theme-style="graphite"] .topicbar {
+  min-height: 48px;
+  padding: 6px 18px;
+  gap: 10px;
+  background: color-mix(in srgb, var(--chat-bg) 96%, var(--bg-elev));
+  border-bottom: 1px solid var(--border-soft);
+}
+
+:root[data-theme-style="graphite"] .topicbar__action-btn--label {
+  width: 30px;
+  min-width: 30px;
+  height: 28px;
+  padding: 0;
+  gap: 0;
+  border: 1px solid var(--border);
+  border-radius: 7px;
+  background: var(--bg-elev);
+  color: var(--fg-dim);
+  box-shadow: var(--app-graphite-shadow);
+}
+
+:root[data-theme-style="graphite"] .topicbar__title-row h1 {
+  max-width: 100%;
+  font-size: 14.5px;
+  font-weight: 660;
+}
+
+:root[data-theme-style="graphite"] .topicbar__icon-btn,
+:root[data-theme-style="graphite"] .topicbar__action-btn--icon {
+  width: 30px;
+  min-width: 30px;
+  height: 28px;
+  border-radius: 7px;
+}
+
+:root[data-theme-style="graphite"] .topicbar__action-btn--utility {
+  opacity: 1;
+  transform: none;
+  border-color: var(--border);
+  background: var(--bg-elev);
+  box-shadow: var(--app-graphite-shadow);
+  transition:
+    opacity var(--dur-fast) var(--ease-out),
+    color var(--dur-fast),
+    border-color var(--dur-fast),
+    background var(--dur-fast);
+}
+
+:root[data-theme-style="graphite"] .topicbar:hover .topicbar__action-btn--utility,
+:root[data-theme-style="graphite"] .topicbar__action-btn--utility:focus-visible,
+:root[data-theme-style="graphite"] .topicbar__export--open .topicbar__action-btn--utility {
+  opacity: 1;
+}
+
+:root[data-theme-style="graphite"] .topicbar__action-btn--utility:disabled {
+  opacity: 0.42;
+}
+
+@media (hover: none) {
+  :root[data-theme-style="graphite"] .topicbar__action-btn--utility {
+    opacity: 1;
+  }
+}
+
+:root[data-theme-style="graphite"] .topicbar__action-btn--accent {
+  color: var(--fg-dim);
+  border-color: var(--border);
+  background: var(--bg-elev);
+  box-shadow: var(--app-graphite-shadow);
+}
+
+:root[data-theme-style="graphite"] .topicbar__action-btn:hover:not(:disabled),
+:root[data-theme-style="graphite"] .topicbar__export--open .topicbar__action-btn {
+  border-color: color-mix(in srgb, var(--fg-faint) 30%, var(--border));
+  background: var(--bg-elev-2);
+}
+
+:root[data-theme-style="graphite"] .topicbar__action-btn--accent:hover:not(:disabled),
+:root[data-theme-style="graphite"] .topicbar__action-btn--accent:focus-visible:not(:disabled) {
+  color: var(--fg);
+  border-color: color-mix(in srgb, var(--fg-faint) 30%, var(--border));
+  background: var(--bg-elev-2);
+}
+
+:root[data-theme-style="graphite"] .banner--update {
+  min-height: 58px;
+  margin: 12px 16px 0;
+  padding: 11px 14px 11px 18px;
+  border: 1px solid var(--app-graphite-hairline-strong);
+  border-radius: 8px;
+  background: linear-gradient(120deg, color-mix(in srgb, var(--accent) 12%, var(--chat-bg)), color-mix(in srgb, var(--chat-bg) 94%, var(--bg-elev)));
+  box-shadow: var(--app-graphite-shadow);
+  animation: graphite-drop-in var(--dur-slow) var(--ease-out) both;
+}
+
+:root[data-theme-style="graphite"] .banner--update .btn--primary {
+  border: 0;
+  border-radius: 7px;
+  color: var(--accent-fg);
+  background: linear-gradient(120deg, var(--accent), var(--accent-strong));
+  box-shadow: 0 6px 16px -8px var(--accent);
+}
+
+:root[data-theme-style="graphite"] .banner--update .btn:not(.btn--primary) {
+  border: 0;
+  color: var(--fg-dim);
+  background: transparent;
+}
+
+:root[data-theme-style="graphite"] .transcript {
+  padding: 24px 32px 28px;
+}
+
+:root[data-theme-style="graphite"] .transcript--empty {
+  padding: 26px 32px 38px;
+}
+
+:root[data-theme-style="graphite"] .welcome {
+  width: min(540px, 100%);
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 0;
+  color: var(--fg);
+  text-align: center;
+  animation: graphite-message-in var(--dur-slow) var(--ease-out) both;
+}
+
+:root[data-theme-style="graphite"] .welcome__title {
+  margin: 0;
+  color: var(--fg);
+  font-size: 22px;
+  font-weight: 700;
+  letter-spacing: 0;
+}
+
+:root[data-theme-style="graphite"] .welcome__tag {
+  margin-top: 8px;
+  color: var(--fg-dim);
+  font-size: 14px;
+  line-height: 1.6;
+}
+
+:root[data-theme-style="graphite"] .welcome__hints {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: center;
+  gap: 14px;
+  margin: 12px 0 22px;
+  color: var(--fg-faint);
+  font-size: 12px;
+}
+
+:root[data-theme-style="graphite"] .welcome__hints span {
+  display: inline-flex;
+  align-items: center;
+  gap: 5px;
+}
+
+:root[data-theme-style="graphite"] .welcome kbd {
+  min-width: 23px;
+  border: 1px solid var(--border);
+  border-radius: 5px;
+  background: var(--bg-soft);
+  color: var(--fg-dim);
+  box-shadow: none;
+}
+
+:root[data-theme-style="graphite"] .welcome__examples {
+  width: 100%;
+  max-width: 540px;
+  display: grid;
+  grid-template-columns: repeat(2, minmax(0, 1fr));
+  gap: 10px;
+  margin-top: 0;
+}
+
+:root[data-theme-style="graphite"] .welcome__ex {
+  min-height: 44px;
+  padding: 12px 14px;
+  border: 1px solid var(--border);
+  border-radius: 8px;
+  background: var(--bg-elev);
+  color: var(--fg-dim);
+  font-size: 13px;
+  line-height: 1.45;
+  text-align: left;
+  box-shadow: var(--app-graphite-shadow);
+  transition: transform var(--dur-fast) var(--ease-out), border-color var(--dur-fast), color var(--dur-fast), background var(--dur-fast);
+}
+
+:root[data-theme-style="graphite"] .welcome__ex:hover {
+  color: var(--fg);
+  border-color: color-mix(in srgb, var(--accent) 38%, var(--border));
+  background: color-mix(in srgb, var(--accent) 4%, var(--bg-elev));
+  transform: translateY(-2px);
+}
+
+:root[data-theme-style="graphite"] .msg {
+  margin: 16px auto;
+  animation: graphite-message-in var(--dur-slow) var(--ease-out) both;
+}
+
+:root[data-theme-style="graphite"] .msg--user .msg__body {
+  max-width: min(80%, 650px);
+  padding: 11px 15px;
+  border: 1px solid color-mix(in srgb, var(--accent) 22%, var(--border));
+  border-radius: 8px;
+  background: color-mix(in srgb, var(--fg) 96%, var(--accent));
+  color: var(--bg);
+  box-shadow: var(--app-graphite-shadow);
+}
+
+:root[data-theme="dark"][data-theme-style="graphite"] .msg--user .msg__body {
+  background: var(--fg);
+  color: var(--bg);
+}
+
+:root[data-theme-style="graphite"] .msg--assistant .msg__body {
+  color: var(--fg);
+  font-size: 14px;
+  line-height: 1.85;
+}
+
+:root[data-theme-style="graphite"] .msg__cursor {
+  background: var(--accent);
+  border-radius: 2px;
+}
+
+:root[data-theme-style="graphite"] .process-card,
+:root[data-theme-style="graphite"] .tool-card,
+:root[data-theme-style="graphite"] .ask-card,
+:root[data-theme-style="graphite"] .approval-modal {
+  border: 1px solid var(--border);
+  border-radius: 8px;
+  background: var(--bg-elev);
+  box-shadow: var(--app-graphite-shadow);
+  transition: border-color var(--dur-fast), transform var(--dur-fast) var(--ease-out), background var(--dur-fast);
+}
+
+:root[data-theme-style="graphite"] .process-card:hover {
+  border-color: color-mix(in srgb, var(--fg-faint) 30%, var(--border));
+  transform: translateY(-1px);
+}
+
+:root[data-theme-style="graphite"] .process-card__head {
+  min-height: 42px;
+  padding: 10px 13px;
+}
+
+:root[data-theme-style="graphite"] .process-card__head:hover {
+  background: transparent;
+}
+
+:root[data-theme-style="graphite"] .process-card__icon {
+  width: 20px;
+  height: 20px;
+  border-radius: 999px;
+  color: var(--accent);
+  background: var(--accent-soft);
+}
+
+:root[data-theme-style="graphite"] .process-card[data-tone="accent"] .process-card__icon,
+:root[data-theme-style="graphite"] .process-card[data-tone="violet"] .process-card__icon {
+  color: var(--accent-fg);
+  background: var(--grad);
+  box-shadow: 0 6px 14px -10px var(--accent);
+}
+
+:root[data-theme-style="graphite"] .process-card[data-tone="success"] .process-card__icon {
+  color: var(--ok);
+  background: color-mix(in srgb, var(--ok) 12%, transparent);
+}
+
+:root[data-theme-style="graphite"] .process-card[data-tone="warning"] .process-card__icon {
+  color: var(--warn);
+  background: color-mix(in srgb, var(--warn) 14%, transparent);
+}
+
+:root[data-theme-style="graphite"] .process-card.tool .process-card__icon {
+  width: 18px;
+  height: 18px;
+  border-radius: 0;
+  background: transparent;
+  box-shadow: none;
+}
+
+:root[data-theme-style="graphite"] .process-card__kind {
+  color: var(--fg);
+  font-size: 13px;
+  font-weight: 700;
+  letter-spacing: 0;
+  text-transform: none;
+}
+
+:root[data-theme-style="graphite"] .process-card.tool .process-card__kind,
+:root[data-theme-style="graphite"] .msg--assistant > .process-card[data-tone="violet"] .process-card__kind {
+  display: none;
+}
+
+:root[data-theme-style="graphite"] .msg--assistant > .process-card[data-tone="violet"] .process-card__name {
+  color: var(--fg);
+  font-family: inherit;
+  font-size: 13px;
+  font-weight: 700;
+}
+
+:root[data-theme-style="graphite"] .process-card__name,
+:root[data-theme-style="graphite"] .process-card__meta {
+  color: var(--fg-faint);
+  font-family: var(--mono);
+  font-size: 12px;
+  font-weight: 500;
+}
+
+:root[data-theme-style="graphite"] .process-card__status--done {
+  color: var(--ok);
+}
+
+:root[data-theme-style="graphite"] .process-card__spin {
+  width: 14px;
+  height: 14px;
+  border-width: 2px;
+}
+
+:root[data-theme-style="graphite"] .process-card[data-open="false"] .process-card__chevron {
+  transform: none;
+}
+
+:root[data-theme-style="graphite"] .process-card[data-open="true"] .process-card__chevron {
+  transform: rotate(180deg);
+}
+
+:root[data-theme-style="graphite"] .process-card__body {
+  border-top-color: transparent;
+  background: transparent;
+}
+
+:root[data-theme-style="graphite"] .reasoning__body {
+  margin: 0;
+  padding: 2px 16px 14px 39px;
+  border-left: 0;
+  color: var(--fg-dim);
+  font-size: 13px;
+  font-style: normal;
+  line-height: 1.8;
+}
+
+:root[data-theme-style="graphite"] .tool__body {
+  padding: 0 14px 13px 41px;
+  color: var(--fg-dim);
+  font-size: 12.5px;
+  line-height: 1.75;
+}
+
+:root[data-theme-style="graphite"] .tool__summary {
+  padding: 0 14px 12px 41px;
+  color: var(--fg-dim);
+  font-size: 13px;
+  line-height: 1.75;
+}
+
+:root[data-theme-style="graphite"] .notice__body {
+  padding: 12px 14px 13px 42px;
+  color: var(--fg-dim);
+  font-size: 13px;
+  line-height: 1.75;
+}
+
+@media (prefers-reduced-motion: no-preference) {
+  :root[data-theme-style="graphite"] .process-card:has(.process-card__spin)::after {
+    background: linear-gradient(90deg, transparent, var(--accent), transparent);
+    animation-duration: 1.15s;
+  }
+}
+
+:root[data-theme-style="graphite"] .footer {
+  padding: 12px 16px 38px;
+  background: color-mix(in srgb, var(--chat-bg) 96%, var(--bg-elev));
+  border-top: 1px solid var(--border-soft);
+}
+
+:root[data-theme-style="graphite"] .composer-wrap {
+  width: 100%;
+  max-width: none;
+  margin: 0;
+}
+
+:root[data-theme-style="graphite"] .composer-card {
+  border: 1px solid var(--app-graphite-hairline-strong);
+  border-radius: 11px;
+  background: var(--bg-elev);
+  box-shadow: var(--app-graphite-shadow);
+  transition: border-color var(--dur-base) var(--ease-out), box-shadow var(--dur-base) var(--ease-out), transform var(--dur-base) var(--ease-out);
+}
+
+:root[data-theme-style="graphite"] .composer-card:focus-within {
+  border-color: color-mix(in srgb, var(--accent) 48%, var(--border));
+  box-shadow: 0 0 0 3px color-mix(in srgb, var(--accent) 15%, transparent);
+  transform: translateY(-1px);
+}
+
+:root[data-theme-style="graphite"] .composer {
+  min-height: 58px;
+  padding: 10px;
+  border-bottom-color: var(--border-soft);
+}
+
+:root[data-theme-style="graphite"] .composer__caret {
+  color: var(--accent);
+}
+
+:root[data-theme-style="graphite"] .composer__input {
+  font-size: 14px;
+  line-height: 1.6;
+}
+
+:root[data-theme-style="graphite"] .composer__btn {
+  width: 34px;
+  height: 34px;
+  border-radius: 10px;
 }
 
-.project-tree__folder[draggable="true"]:active {
-  cursor: grabbing;
+:root[data-theme-style="graphite"] .composer__btn--send {
+  color: var(--accent-fg);
+  background: linear-gradient(120deg, var(--accent), var(--accent-strong));
+  box-shadow: 0 6px 16px -8px var(--accent);
 }
 
-.project-tree__folder--dragging {
-  opacity: 0.55;
+:root[data-theme-style="graphite"] .composer__btn--send:not(:disabled):hover {
+  background: linear-gradient(120deg, color-mix(in srgb, var(--accent) 94%, #ffffff), var(--accent-strong));
+  transform: translateY(-1px) scale(1.03);
 }
 
-.project-tree__folder--drop-before::before,
-.project-tree__folder--drop-after::after {
-  content: "";
-  position: absolute;
-  left: 8px;
-  right: 8px;
-  height: 2px;
-  border-radius: 999px;
-  background: var(--accent);
-  box-shadow: 0 0 0 2px color-mix(in srgb, var(--accent) 16%, transparent);
-  pointer-events: none;
+:root[data-theme-style="graphite"] .composer-meta {
+  min-height: 42px;
+  padding: 5px 12px 10px;
+  color: var(--fg-dim);
 }
 
-.project-tree__folder--drop-before::before {
-  top: -2px;
+:root[data-theme-style="graphite"] .composer-modebar,
+:root[data-theme-style="graphite"] .composer-mode-chip,
+:root[data-theme-style="graphite"] .meta-chip,
+:root[data-theme-style="graphite"] .composer-meta .modelsw__trigger,
+:root[data-theme-style="graphite"] .composer-context__item {
+  border-radius: 7px;
+  border-color: var(--border);
+  background: color-mix(in srgb, var(--bg-elev-2) 70%, transparent);
+  transition: border-color var(--dur-fast), background var(--dur-fast), color var(--dur-fast), transform var(--dur-fast) var(--ease-out);
 }
 
-.project-tree__folder--drop-after::after {
-  bottom: -2px;
+:root[data-theme-style="graphite"] .meta-chip:hover,
+:root[data-theme-style="graphite"] .composer-mode-chip:hover:not(:disabled),
+:root[data-theme-style="graphite"] .composer-mode-chip:focus-visible,
+:root[data-theme-style="graphite"] .composer-mode-chip:active:not(:disabled),
+:root[data-theme-style="graphite"] .tooltip-trigger:hover > .composer-mode-chip:not(:disabled),
+:root[data-theme-style="graphite"] .tooltip-trigger:focus-within > .composer-mode-chip:not(:disabled),
+:root[data-theme-style="graphite"] .composer-meta .modelsw__trigger:hover {
+  color: var(--fg);
+  border-color: var(--app-graphite-hairline-strong);
+  background: var(--bg-elev);
+  transform: translateY(-1px);
 }
 
-.project-tree__folder--editing {
-  padding-right: 8px;
+:root[data-theme-style="graphite"] .composer-action-trigger {
+  border-radius: 999px;
+  border-color: transparent;
+  background: transparent;
+  box-shadow: none;
 }
 
-.project-tree__folder-main {
-  flex: 1 1 auto;
-  min-width: 0;
-  height: 100%;
-  display: flex;
-  align-items: center;
-  gap: 7px;
-  border: 0;
-  border-radius: inherit;
-  background: transparent;
-  color: inherit;
-  font: inherit;
-  padding-right: 0;
-  text-align: left;
-  font-weight: 560;
+:root[data-theme-style="graphite"] .composer-action-trigger:hover:not(:disabled),
+:root[data-theme-style="graphite"] .composer-action-trigger:focus-visible,
+:root[data-theme-style="graphite"] .composer-action-trigger--open {
+  color: var(--fg);
+  border-color: transparent;
+  background: color-mix(in srgb, var(--fg-faint) 12%, var(--surface-3));
+  transform: none;
 }
 
-.project-tree__folder-color {
-  flex: 0 0 auto;
-  width: 7px;
-  height: 7px;
+:root[data-theme-style="graphite"] .composer-mode-chip {
   border-radius: 999px;
-  background: var(--project-accent, var(--accent));
-  box-shadow: 0 0 0 3px color-mix(in srgb, var(--project-accent, var(--accent)) 14%, transparent);
+  box-shadow: none;
 }
 
-.project-tree__folder-main:focus-visible {
-  outline: 2px solid var(--accent-soft);
-  outline-offset: -2px;
+:root[data-theme-style="graphite"] .composer-modebar__thumb,
+:root[data-theme-style="graphite"] .composer-modebar__item {
+  border-radius: 6px;
 }
 
-.project-tree__folder-toggle {
-  flex: 0 0 auto;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  width: 20px;
-  height: 20px;
-  border: none;
-  background: transparent;
-  color: inherit;
-  padding: 0;
+:root[data-theme-style="graphite"] .composer-modebar {
+  padding: 2px;
+  border-radius: 999px;
+  background: var(--surface-3);
+  box-shadow: none;
 }
 
-.project-tree__folder-label {
-  flex: 1 1 auto;
-  min-width: 0;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
+:root[data-theme-style="graphite"] .composer-modebar__thumb {
+  border: 1px solid var(--composer-modebar-active-border);
+  border-radius: 999px;
+  background: var(--composer-modebar-active-bg);
+  box-shadow:
+    inset 0 1px 0 color-mix(in srgb, #fff 18%, transparent),
+    0 1px 3px color-mix(in srgb, #000 28%, transparent);
 }
 
-.project-tree__folder-input {
-  --wails-draggable: no-drag;
-  flex: 1 1 auto;
-  min-width: 0;
+:root[data-theme-style="graphite"] .composer-modebar__item {
   height: 26px;
-  border: 1px solid var(--accent-soft);
-  border-radius: 7px;
-  background: var(--bg-elev);
-  color: var(--fg);
-  font: inherit;
-  font-size: 13px;
-  padding: 0 8px;
-  outline: none;
+  border-radius: 999px;
+  color: var(--text-3);
+  transition: color var(--dur-fast), background var(--dur-fast), transform var(--dur-fast) var(--ease-out);
 }
 
-.project-tree__new-topic {
-  opacity: 0.62;
+:root[data-theme-style="graphite"] .composer-modebar__item:hover:not(:disabled) {
+  color: var(--text-2);
+  background: transparent;
+  transform: translateY(-1px);
 }
 
-.project-tree__new-topic:hover {
-  background: var(--button-bg);
-  border-color: color-mix(in srgb, var(--accent) 28%, var(--border-soft));
-  color: var(--fg);
+:root[data-theme-style="graphite"] .composer-modebar__item--active,
+:root[data-theme-style="graphite"] .composer-modebar__item--active:hover:not(:disabled),
+:root[data-theme-style="graphite"] .composer-modebar__item--active:focus-visible {
+  color: var(--composer-modebar-active-fg);
+  background: transparent;
+  border-color: transparent;
+  box-shadow: none;
 }
 
-.project-tree__new-topic--active {
-  opacity: 1;
-  color: var(--accent);
-  background: color-mix(in srgb, var(--accent) 12%, transparent);
-  border-color: color-mix(in srgb, var(--accent) 24%, var(--border-soft));
+:root[data-theme-style="graphite"] .statusbar {
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: var(--z-dock);
+  max-width: none;
+  width: auto;
+  height: 30px;
+  min-height: 30px;
+  margin: 0;
+  padding: 0 16px;
+  gap: 16px;
+  border-top: 1px solid var(--border);
+  background: var(--panel);
+  box-sizing: border-box;
+  color: var(--fg-faint);
+  font-size: 11.5px;
 }
 
-.project-tree__topic {
-  position: relative;
-  width: auto;
-  min-height: 34px;
-  display: flex;
-  align-items: center;
-  gap: 4px;
-  padding-top: 0;
-  padding-bottom: 0;
-  padding-left: 0 !important;
-  margin-left: 22px;
-  margin-right: var(--project-tree-action-column);
-  padding-right: 8px;
-  border-radius: 6px;
-  color: var(--fg-dim);
-  font-size: 13px;
-  cursor: default;
+:root[data-theme-style="graphite"] .statusbar .stat {
+  gap: 5px;
 }
 
-.project-tree__topic--active {
-  background: color-mix(in srgb, var(--project-accent, var(--accent)) 10%, var(--sidebar-hover));
-  border-radius: 0;
-  color: var(--fg);
+:root[data-theme-style="graphite"] .statusbar__dot {
+  background: var(--ok);
 }
 
-.project-tree__topic--active::before {
-  content: "";
-  position: absolute;
-  left: 0;
-  top: 0;
-  bottom: 0;
-  width: 4px;
-  background: color-mix(in srgb, var(--project-accent, var(--accent)) 88%, #ff9d22);
-  pointer-events: none;
+:root[data-theme-style="graphite"] .statusbar__dot--busy {
+  background: var(--accent);
+  box-shadow: 0 0 0 4px var(--accent-soft);
 }
 
-.project-tree__topic--menu-open {
-  background: color-mix(in srgb, var(--accent) 6%, var(--sidebar-hover));
-  color: var(--fg);
+:root[data-theme-style="graphite"] .statusbar__cache b,
+:root[data-theme-style="graphite"] .statusbar__plan {
+  color: var(--accent);
 }
 
-.project-tree__topic:hover {
-  background: var(--list-row-hover-bg);
+:root[data-theme-style="graphite"] .statusbar__cost b,
+:root[data-theme-style="graphite"] .statusbar__balance b {
+  color: var(--ok);
 }
 
-.project-tree__topic--active:hover {
-  background: color-mix(in srgb, var(--project-accent, var(--accent)) 10%, var(--sidebar-hover));
+:root[data-theme-style="graphite"] .management-modal-backdrop,
+:root[data-theme-style="graphite"] .settings-modal-backdrop {
+  background: rgba(20, 22, 28, 0.26);
+  backdrop-filter: none;
+  -webkit-backdrop-filter: none;
 }
 
-.project-tree__topic-main {
-  --wails-draggable: no-drag;
-  flex: 1 1 auto;
-  min-width: 0;
-  min-height: 34px;
-  display: flex;
-  align-items: center;
-  gap: 0;
-  border: none;
-  border-radius: inherit;
-  background: transparent;
-  color: inherit;
-  font: inherit;
-  text-align: left;
+:root[data-theme-style="graphite"] .management-modal,
+:root[data-theme-style="graphite"] .settings-modal {
+  border: 1px solid var(--app-graphite-hairline-strong);
+  border-radius: 11px;
+  background: var(--bg-elev);
+  box-shadow: var(--app-graphite-shadow-float);
 }
 
-.project-tree__topic-copy {
-  min-width: 0;
-  display: flex;
-  flex: 1 1 auto;
-  align-items: center;
-  line-height: 1.2;
+:root[data-theme-style="graphite"] .management-modal__head,
+:root[data-theme-style="graphite"] .settings-modal__head {
+  min-height: 58px;
+  padding: 13px 18px;
+  border-color: var(--border-soft);
+  background: var(--bg-elev);
 }
 
-.project-tree__topic-label {
-  min-width: 0;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
+:root[data-theme-style="graphite"] .management-modal__title,
+:root[data-theme-style="graphite"] .settings-modal__title {
+  font-size: 15px;
+  font-weight: 700;
+  letter-spacing: 0;
 }
 
-.project-tree__topic-main:focus-visible {
-  outline: 2px solid var(--accent-soft);
-  outline-offset: -2px;
+:root[data-theme-style="graphite"] .management-modal__summary {
+  color: var(--fg-faint);
+  font-family: var(--mono);
+  font-size: 11px;
 }
 
-.project-tree__topic--editing {
-  padding-right: 8px;
+:root[data-theme-style="graphite"] .history-toolbar {
+  min-height: 58px;
+  padding: 11px 14px;
+  border-color: var(--border-soft);
+  background: var(--bg-soft);
 }
 
-.project-tree__topic-input {
-  --wails-draggable: no-drag;
-  flex: 1 1 auto;
-  min-width: 0;
-  height: 26px;
-  border: 1px solid var(--accent-soft);
-  border-radius: 7px;
+:root[data-theme-style="graphite"] .history-list {
+  padding: 12px;
+  border-color: var(--border-soft);
   background: var(--bg-elev);
-  color: var(--fg);
-  font: inherit;
-  font-size: 13px;
-  padding: 0 8px;
-  outline: none;
 }
 
-.project-tree__children {
-  display: flex;
-  flex-direction: column;
+:root[data-theme-style="graphite"] .history-search,
+:root[data-theme-style="graphite"] .mem-search,
+:root[data-theme-style="graphite"] .mem-input,
+:root[data-theme-style="graphite"] .mem-select,
+:root[data-theme-style="graphite"] .mem-textarea {
+  border-color: var(--border);
+  border-radius: 7px;
+  background: var(--bg-soft);
 }
 
-.context-menu {
-  --wails-draggable: no-drag;
-  position: fixed;
-  z-index: var(--z-overlay-backdrop);
-  max-height: calc(100vh - 16px);
-  overflow-y: auto;
-  overscroll-behavior: contain;
-  padding: 5px;
-  border: 1px solid var(--border);
+:root[data-theme-style="graphite"] .history-search:focus-within,
+:root[data-theme-style="graphite"] .mem-search:focus-within,
+:root[data-theme-style="graphite"] .mem-input:focus,
+:root[data-theme-style="graphite"] .mem-select:focus,
+:root[data-theme-style="graphite"] .mem-textarea:focus {
+  border-color: color-mix(in srgb, var(--accent) 44%, var(--border));
+  box-shadow: 0 0 0 3px color-mix(in srgb, var(--accent) 13%, transparent);
+}
+
+:root[data-theme-style="graphite"] .history-filter {
+  border-color: var(--border);
   border-radius: 8px;
-  background: var(--bg-elev);
-  box-shadow: 0 16px 36px rgba(0, 0, 0, 0.36);
+  background: color-mix(in srgb, var(--bg-elev) 70%, var(--bg-soft));
 }
 
-.context-menu__item {
-  width: 100%;
-  min-height: 30px;
-  display: flex;
-  align-items: center;
-  gap: 8px;
-  border: none;
+:root[data-theme-style="graphite"] .history-filter__pill {
   border-radius: 6px;
-  background: transparent;
   color: var(--fg-dim);
-  font: inherit;
-  font-size: 12px;
-  text-align: left;
-  padding: 0 8px;
 }
 
-.context-menu__item:disabled {
-  cursor: not-allowed;
-  opacity: 0.45;
+:root[data-theme-style="graphite"] .history-filter__pill--on {
+  background: var(--accent-soft);
+  color: var(--accent);
 }
 
-.context-menu__item:not(:disabled):hover,
-.context-menu__item:not(:disabled):focus-visible {
-  background: var(--sidebar-hover);
-  color: var(--fg);
-  outline: none;
+:root[data-theme-style="graphite"] .history-list .mem-section {
+  margin-bottom: 12px;
+  padding: 0;
+  border: 0;
+  background: transparent;
+  box-shadow: none;
 }
 
-.context-menu__separator {
-  height: 1px;
-  margin: 5px 4px;
-  background: var(--border-soft);
+:root[data-theme-style="graphite"] .hist-group__title {
+  padding: 0 2px 8px;
+  color: var(--fg-faint);
+  font-size: 11px;
+  letter-spacing: 0.04em;
+  text-transform: uppercase;
 }
 
-.context-menu__item--danger:not(:disabled):hover,
-.context-menu__item--danger:not(:disabled):focus-visible {
-  color: #e5534b !important;
+:root[data-theme-style="graphite"] .hist-item {
+  margin-bottom: 6px;
+  border-color: var(--border);
+  border-radius: 8px;
+  background: var(--bg-elev);
+  box-shadow: var(--app-graphite-shadow);
 }
 
-.project-tree__color-option {
-  min-width: 0;
-  display: flex;
-  flex: 1 1 auto;
-  align-items: center;
-  gap: 8px;
+:root[data-theme-style="graphite"] .hist-item:hover {
+  border-color: color-mix(in srgb, var(--fg-faint) 28%, var(--border));
+  background: var(--bg-soft);
 }
 
-.project-tree__color-swatch {
-  flex: 0 0 auto;
-  width: 12px;
-  height: 12px;
-  border: 1px solid var(--border-soft);
-  border-radius: 999px;
-  background: var(--project-accent, var(--accent));
-  box-shadow: inset 0 0 0 2px color-mix(in srgb, var(--bg-elev) 72%, transparent);
+:root[data-theme-style="graphite"] .hist-item--current {
+  border-color: color-mix(in srgb, var(--accent) 22%, var(--border));
 }
 
-.project-tree__color-check {
-  margin-left: auto;
-  color: var(--project-accent, var(--accent));
+:root[data-theme-style="graphite"] .hist-item--selected {
+  border-color: color-mix(in srgb, var(--accent) 24%, var(--border));
+  background: var(--accent-soft);
+  box-shadow: none;
 }
 
-.project-tree__empty {
-  padding: 10px 12px;
-  color: var(--fg-faint);
-  font-size: 13px;
+:root[data-theme-style="graphite"] .hist-item__main {
+  padding: 9px 11px 9px 12px;
 }
 
-.project-tree__empty--subtle {
-  padding: 8px 12px;
-  font-size: 12px;
+:root[data-theme-style="graphite"] .history-preview {
+  background: var(--chat-bg);
 }
 
-.project-tree__empty-state {
-  display: flex;
-  flex-direction: column;
-  gap: 8px;
-  padding: 2px 0 0;
+:root[data-theme-style="graphite"] .history-preview__head {
+  min-height: 60px;
+  border-color: var(--border-soft);
+  background: var(--bg-soft);
 }
 
-.project-tree__empty-primary {
-  --wails-draggable: no-drag;
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  gap: 7px;
-  height: 32px;
-  margin: 0 8px;
-  border: 1px solid color-mix(in srgb, var(--accent) 45%, var(--border));
-  border-radius: 7px;
-  background: color-mix(in srgb, var(--accent) 14%, var(--bg-elev));
-  color: var(--accent-strong);
-  font: inherit;
-  font-size: 12.5px;
-  font-weight: 620;
+:root[data-theme-style="graphite"] .history-preview__title {
+  font-size: 13px;
+  font-weight: 650;
 }
 
-.project-tree__empty-primary:hover:not(:disabled) {
-  background: color-mix(in srgb, var(--accent) 21%, var(--bg-elev));
-  color: var(--fg);
+:root[data-theme-style="graphite"] .history-preview__meta {
+  color: var(--fg-faint);
+  font-family: var(--mono);
+  font-size: 11px;
 }
 
-.project-tree__empty-primary:disabled {
-  cursor: default;
-  opacity: 0.45;
+:root[data-theme-style="graphite"] .history-preview__body .transcript {
+  padding: 14px;
 }
 
-.context-inspector,
-.workbench-dock {
-  grid-row: 2;
-  grid-column: 4;
-  min-width: 0;
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-  background: var(--workspace-files-bg);
-  border-left: 0;
-  overflow: hidden;
+:root[data-theme-style="graphite"] .settings-center__nav {
+  border-color: var(--border-soft);
+  background: var(--bg-elev);
 }
 
-.workbench-dock {
-  justify-self: stretch;
-  width: 100%;
-  max-width: none;
-  container-type: inline-size;
+:root[data-theme-style="graphite"] .settings-center__navitem {
+  border-radius: 8px;
+  transition: background var(--dur-fast), color var(--dur-fast), transform var(--dur-fast) var(--ease-out);
 }
 
-.layout--workspace-maximized .workbench-dock {
-  width: auto;
-  max-width: none;
+:root[data-theme-style="graphite"] .settings-center__navitem:hover {
+  background: var(--bg-soft);
+  transform: translateX(2px);
 }
 
-@media (prefers-reduced-motion: reduce) {
-  .layout {
-    transition: none;
-  }
+:root[data-theme-style="graphite"] .settings-center__navitem--active {
+  background: var(--accent-soft);
+  color: var(--fg);
+  box-shadow: none;
 }
 
-.workbench-dock__tools {
-  flex: 0 0 auto;
-  height: 42px;
-  display: flex;
-  align-items: center;
-  justify-content: flex-start;
-  gap: 8px;
-  padding: 7px 10px 3px;
-  border-bottom: 1px solid transparent;
+:root[data-theme-style="graphite"] .settings-center__content {
+  background: var(--chat-bg);
 }
 
-.workbench-dock__tabs {
-  flex: 0 1 auto;
-  width: max-content;
-  max-width: 100%;
-  min-width: 0;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  gap: 3px;
-  padding: 3px;
-  border-radius: 8px;
-  background: var(--bg);
-  border: 1px solid var(--border-soft);
+:root[data-theme-style="graphite"] .settings-page__header {
+  border-color: var(--border-soft);
 }
 
-.workbench-dock__tab {
-  --wails-draggable: no-drag;
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  gap: 5px;
-  flex: 0 1 auto;
-  min-width: 30px;
-  max-width: 118px;
-  height: 24px;
-  padding: 0 8px;
-  border: 0;
-  border-radius: 6px;
-  background: transparent;
-  color: var(--fg-faint);
-  font: inherit;
-  font-size: 11.5px;
-  font-weight: 560;
+:root[data-theme-style="graphite"] .settings-page__title {
+  font-size: 19px;
+  letter-spacing: 0;
 }
 
-.workbench-dock__tab svg {
-  flex: 0 0 auto;
+:root[data-theme-style="graphite"] .settings-section,
+:root[data-theme-style="graphite"] .settings-page--manager .mem-section {
+  border-color: var(--border);
+  border-radius: 8px;
+  background: var(--bg-elev);
+  box-shadow: var(--app-graphite-shadow);
 }
 
-.workbench-dock__tab-label {
-  min-width: 0;
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
+:root[data-theme-style="graphite"] .settings-field {
+  border-color: var(--border-soft);
 }
 
-.workbench-dock__tab:hover {
-  color: var(--fg-dim);
+:root[data-theme-style="graphite"] .settings-subtabs,
+:root[data-theme-style="graphite"] .set-seg,
+:root[data-theme-style="graphite"] .provider-add-segmented,
+:root[data-theme-style="graphite"] .cap-tabs {
+  border-color: var(--border);
+  border-radius: 8px;
+  background: var(--bg-soft);
 }
 
-.workbench-dock__tab--active {
+:root[data-theme-style="graphite"] .settings-subtab--active,
+:root[data-theme-style="graphite"] .set-seg__btn--on,
+:root[data-theme-style="graphite"] .provider-add-segmented__item--active,
+:root[data-theme-style="graphite"] .cap-tab--active {
   background: var(--bg-elev);
-  color: var(--fg);
-  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.16);
+  color: var(--accent);
+  box-shadow: var(--app-graphite-shadow);
 }
 
-@container (max-width: 520px) {
-  .workbench-dock__tabs {
-    width: 100%;
-  }
+:root[data-theme-style="graphite"] .prov-card,
+:root[data-theme-style="graphite"] .provider-add-panel,
+:root[data-theme-style="graphite"] .provider-access-card,
+:root[data-theme-style="graphite"] .provider-template-card,
+:root[data-theme-style="graphite"] .provider-editor,
+:root[data-theme-style="graphite"] .set-rules-grid .set-rules {
+  border-color: var(--border);
+  border-radius: 8px;
+  background: var(--bg-elev);
+  box-shadow: var(--app-graphite-shadow);
+}
 
-  .workbench-dock__tab {
-    flex: 1 1 0;
-    max-width: none;
-  }
+:root[data-theme-style="graphite"] .provider-template-card--active {
+  border-color: color-mix(in srgb, var(--accent) 42%, var(--border));
+  background: var(--accent-soft);
+  box-shadow: inset 3px 0 0 var(--accent);
 }
 
-@container (max-width: 340px) {
-  .workbench-dock__tabs {
-    width: auto;
-  }
+:root[data-theme-style="graphite"] .workspace-panel-resizer::after,
+:root[data-theme-style="graphite"] .sidebar-resizer::after {
+  background: var(--border-soft);
+}
 
-  .workbench-dock__tab {
-    flex: 0 0 30px;
-    width: 30px;
-    padding: 0;
-    gap: 0;
-  }
+:root[data-theme-style="graphite"] .workbench-dock {
+  background: var(--bg-elev);
+  border-left: 1px solid var(--border-soft);
+  box-shadow: none;
+}
 
-  .workbench-dock__tab-label {
-    display: none;
-  }
+:root[data-theme-style="graphite"] .workbench-dock__head {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  min-height: 44px;
+  padding: 12px 12px 10px 16px;
 }
 
-.workbench-dock__body {
-  flex: 1 1 auto;
-  min-height: 0;
-  overflow: hidden;
+:root[data-theme-style="graphite"] .workbench-dock__heading {
+  min-width: 0;
 }
 
-.workbench-dock__body > .context-panel,
-.workbench-dock__body > .workspace-panel {
-  height: 100%;
+:root[data-theme-style="graphite"] .workbench-dock__head h2 {
+  margin: 0;
+  color: var(--fg);
+  font-size: 13px;
+  font-weight: 700;
+  letter-spacing: 0;
 }
 
-.workbench-dock__body > .workspace-panel {
-  border-left: none;
+:root[data-theme-style="graphite"] .workbench-dock__head-spacer {
+  flex: 1 1 auto;
+  min-width: 8px;
 }
 
-.layout--workspace-maximized .context-inspector,
-.layout--workspace-maximized .workbench-dock {
-  grid-column: 2;
+:root[data-theme-style="graphite"] .workbench-dock__tools {
+  height: 40px;
+  padding: 0 12px;
+  border-bottom: 1px solid var(--border-soft);
 }
 
-.context-panel {
-  display: flex;
-  flex-direction: column;
+:root[data-theme-style="graphite"] .workbench-dock__tabs {
+  position: relative;
+  width: auto;
   height: 100%;
+  flex: 0 0 auto;
+  display: flex;
+  align-items: stretch;
+  justify-content: flex-start;
+  gap: 2px;
   padding: 0;
-  gap: 0;
-  background: var(--workspace-files-bg);
-  color: var(--fg);
-  overflow: hidden;
+  border: 0;
+  border-radius: 0;
+  background: transparent;
 }
 
-.context-panel__summary-head {
+:root[data-theme-style="graphite"] .workbench-dock__tab {
+  position: relative;
   flex: 0 0 auto;
-  display: flex;
-  align-items: center;
-  gap: 10px;
-  min-height: 44px;
-  padding: 8px 10px 6px;
+  min-width: auto;
+  max-width: none;
+  height: 40px;
+  width: auto;
+  padding: 0 12px 1px;
+  border: 0;
+  border-radius: 0;
+  justify-content: flex-start;
+  gap: 6px;
+  color: var(--fg-faint);
+  font-size: 12.5px;
+  font-weight: 600;
+  background: transparent;
 }
 
-.context-panel__heading-main {
-  flex: 1 1 auto;
-  min-width: 0;
-  display: flex;
-  align-items: center;
-  gap: 8px;
+:root[data-theme-style="graphite"] .workbench-dock__tab svg {
+  width: 14px;
+  height: 14px;
 }
 
-.context-panel__heading-main span {
-  min-width: 0;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  color: var(--fg);
-  font-size: 14px;
-  line-height: 1.2;
-  font-weight: 680;
+:root[data-theme-style="graphite"] .workbench-dock__tab-label {
+  display: inline;
+  min-width: auto;
+  overflow: visible;
+  text-overflow: clip;
 }
 
-.context-panel__heading-main strong {
-  flex: 0 1 auto;
-  max-width: 58%;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  padding: 2px 7px;
-  border: 1px solid var(--border-soft);
-  border-radius: 999px;
-  background: var(--bg);
-  color: var(--fg-dim);
-  font-size: 11px;
-  line-height: 1.25;
-  font-weight: 560;
+:root[data-theme-style="graphite"] .workbench-dock__tab--active {
+  color: var(--fg);
+  background: transparent;
+  box-shadow: none;
 }
 
-.context-panel__back {
-  --wails-draggable: no-drag;
-  flex: 0 0 auto;
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  gap: 5px;
-  height: 26px;
-  padding: 0 9px;
-  border: 1px solid var(--border-soft);
-  border-radius: 6px;
-  background: var(--bg);
+:root[data-theme-style="graphite"] .workbench-dock__tab:hover {
   color: var(--fg-dim);
-  font: inherit;
-  font-size: 11.5px;
-  font-weight: 560;
+  background: transparent;
 }
 
-.context-panel__back:hover {
-  background: var(--bg-hover);
-  color: var(--fg);
+:root[data-theme-style="graphite"] .workbench-dock__tab--active::after {
+  content: "";
+  position: absolute;
+  left: 10px;
+  right: 10px;
+  bottom: -1px;
+  height: 2px;
+  border-radius: 2px;
+  background: var(--accent);
+  animation: graphite-tab-underline var(--dur-base) var(--ease-out) both;
 }
 
-.context-panel__search {
-  flex: 0 0 auto;
-  display: flex;
-  align-items: center;
-  gap: 7px;
-  margin: 4px 10px 8px;
-  padding: 0 9px;
-  height: 32px;
-  border: 1px solid var(--border);
-  border-radius: 8px;
-  background: var(--bg);
-  color: var(--fg-faint);
+:root[data-theme-style="graphite"] .workspace-panel,
+:root[data-theme-style="graphite"] .workspace-files,
+:root[data-theme-style="graphite"] .workspace-preview,
+:root[data-theme-style="graphite"] .context-panel {
+  background: transparent;
 }
 
-.context-panel__search input {
-  min-width: 0;
-  flex: 1;
-  border: none;
-  outline: none;
-  background: transparent;
-  color: var(--fg);
-  font: inherit;
-  font-size: 12.5px;
+:root[data-theme-style="graphite"] .workspace-panel {
+  border-left: 0;
+  background: var(--bg-elev);
 }
 
-.context-panel__search input::placeholder {
-  color: var(--fg-faint);
+:root[data-theme-style="graphite"] .workspace-panel--embedded.workspace-panel--split-preview .workspace-preview {
+  border-left: 1px solid var(--border-soft);
+  animation: graphite-viewer-in var(--dur-slow) var(--ease-out) both;
 }
 
-.context-panel__body {
-  flex: 1 1 auto;
-  min-height: 0;
-  overflow-y: auto;
-  padding: 0 6px 12px;
+:root[data-theme-style="graphite"] .workspace-files {
+  background: var(--bg-elev);
+  border-right: 1px solid var(--border-soft);
 }
 
-.context-panel__overview {
-  display: flex;
-  flex-direction: column;
-  gap: 12px;
+:root[data-theme-style="graphite"] .workspace-search {
+  height: 34px;
+  margin: 10px 12px 8px;
+  border: 1px solid transparent;
+  border-radius: 8px;
+  background: var(--bg-soft);
+  color: var(--fg-faint);
+  transition: border-color var(--dur-fast), background var(--dur-fast);
 }
 
-.context-panel__usage {
-  display: grid;
-  grid-template-columns: 140px minmax(0, 1fr);
-  gap: 12px 14px;
-  align-items: center;
-  padding: 4px 8px 0;
+:root[data-theme-style="graphite"] .workspace-search:hover,
+:root[data-theme-style="graphite"] .workspace-search:focus-within {
+  border-color: var(--app-graphite-hairline-strong);
+  background: color-mix(in srgb, var(--bg-soft) 72%, var(--bg-elev));
 }
 
-.context-panel__donut {
-  width: 136px;
-  height: 136px;
-  padding: 12px;
-  border-radius: 50%;
+:root[data-theme-style="graphite"] .workspace-files__tools {
+  height: 0;
+  padding: 0;
+  overflow: hidden;
 }
 
-.context-panel__donut-core {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  width: 100%;
-  height: 100%;
-  border-radius: 50%;
-  background: var(--workspace-files-bg);
-  text-align: center;
+:root[data-theme-style="graphite"] .workspace-tree {
+  padding: 4px 8px 12px;
 }
 
-.context-panel__donut-core strong {
-  color: var(--fg);
-  font-size: 30px;
-  line-height: 1;
+:root[data-theme-style="graphite"] .workspace-tree__row,
+:root[data-theme-style="graphite"] .workspace-change,
+:root[data-theme-style="graphite"] .workspace-files__tab,
+:root[data-theme-style="graphite"] .workspace-iconbtn,
+:root[data-theme-style="graphite"] .workspace-recent-menu__item {
+  border-radius: 7px;
 }
 
-.context-panel__donut-core span {
-  margin-top: 6px;
+:root[data-theme-style="graphite"] .workspace-tree__row {
+  min-height: 30px;
+  height: 30px;
   color: var(--fg-dim);
-  font-size: 12px;
-  line-height: 1.25;
+  transition: background var(--dur-fast), color var(--dur-fast), transform var(--dur-fast) var(--ease-out);
 }
 
-.context-panel__percent {
-  grid-column: 1;
+:root[data-theme-style="graphite"] .workspace-tree__row:hover,
+:root[data-theme-style="graphite"] .workspace-change:hover,
+:root[data-theme-style="graphite"] .workspace-recent-menu__item:hover {
+  background: var(--workspace-files-hover);
   color: var(--fg);
-  text-align: center;
-  font-size: 18px;
-  font-weight: 650;
+  transform: translateX(2px);
 }
 
-.context-panel__breakdown {
-  grid-column: 2;
-  grid-row: 2 / span 2;
-  display: flex;
-  flex-direction: column;
-  gap: 11px;
+:root[data-theme-style="graphite"] .workspace-tree__row--active,
+:root[data-theme-style="graphite"] .workspace-change--active {
+  background: var(--workspace-selection-bg);
+  color: var(--workspace-selection-fg);
 }
 
-.context-panel__legend-row,
-.context-panel__total {
-  display: grid;
-  grid-template-columns: 12px minmax(0, 1fr) auto;
-  align-items: center;
-  gap: 9px;
-  color: var(--fg-dim);
-  font-size: 13px;
+:root[data-theme-style="graphite"] .workspace-tree__row--active::before {
+  left: 2px;
+  top: 7px;
+  bottom: 7px;
+  width: 3px;
+  border-radius: 999px;
+  background: var(--accent);
 }
 
-.context-panel__legend-row strong,
-.context-panel__total strong {
-  color: var(--fg);
-  font-weight: 580;
+:root[data-theme-style="graphite"] .workspace-tree__icon--dir {
+  color: var(--accent);
 }
 
-.context-panel__legend-dot {
-  width: 10px;
-  height: 10px;
-  border-radius: 50%;
+:root[data-theme-style="graphite"] .workspace-tree__row--active .workspace-tree__icon,
+:root[data-theme-style="graphite"] .workspace-tree__row--active .workspace-tree__icon--dir {
+  color: var(--accent);
 }
 
-.context-panel__legend-dot--prompt { background: #13a7a5; }
-.context-panel__legend-dot--completion { background: #2f6df6; }
-.context-panel__legend-dot--reasoning { background: #f97316; }
-.context-panel__legend-dot--other { background: var(--border); }
+:root[data-theme-style="graphite"] .workspace-change {
+  min-height: 56px;
+  padding: 8px 9px;
+  border: 1px solid transparent;
+  transition: background var(--dur-fast), border-color var(--dur-fast), color var(--dur-fast), transform var(--dur-fast) var(--ease-out);
+}
 
-.context-panel__total {
-  grid-template-columns: minmax(0, 1fr) auto;
-  padding-top: 10px;
-  border-top: 1px solid var(--border-soft);
+:root[data-theme-style="graphite"] .workspace-change:hover {
+  border-color: color-mix(in srgb, var(--fg-faint) 20%, transparent);
 }
 
-.context-panel__stats {
-  grid-column: 1 / -1;
-  display: grid;
-  grid-template-columns: repeat(2, minmax(0, 1fr));
-  gap: 6px;
-  margin-top: 10px;
+:root[data-theme-style="graphite"] .workspace-change--active {
+  border-color: color-mix(in srgb, var(--accent) 22%, transparent);
 }
 
-.context-panel__metric {
-  min-height: 54px;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  gap: 5px;
-  padding: 9px 11px;
-  border: 1px solid var(--border-soft);
-  border-radius: 8px;
-  background: var(--bg);
+:root[data-theme-style="graphite"] .workspace-change__name {
+  font-weight: 620;
 }
 
-.context-panel__metric span {
-  color: var(--fg-dim);
-  font-size: 12px;
+:root[data-theme-style="graphite"] .workspace-change__path,
+:root[data-theme-style="graphite"] .workspace-change__detail {
+  font-family: var(--mono);
+  font-size: 10.5px;
 }
 
-.context-panel__metric strong {
-  color: var(--fg);
-  font-size: 18px;
-  line-height: 1;
+:root[data-theme-style="graphite"] .workspace-change__badge {
+  height: 18px;
+  border-radius: 5px;
+  background: var(--bg-soft);
+  color: var(--fg-faint);
 }
 
-.context-panel__metric-accent {
-  color: var(--accent) !important;
+:root[data-theme-style="graphite"] .workspace-change__badge--git {
+  color: var(--accent);
+  background: var(--accent-soft);
+}
+
+:root[data-theme-style="graphite"] .workspace-empty {
+  min-height: 128px;
+  display: grid;
+  place-items: center;
+  color: var(--fg-faint);
+  font-size: 13px;
+  text-align: center;
+}
+
+:root[data-theme-style="graphite"] .workspace-preview__head,
+:root[data-theme-style="graphite"] .workspace-preview__meta {
+  border-color: var(--border-soft);
 }
 
-.context-panel__health {
-  display: grid;
-  grid-template-columns: minmax(0, 1fr);
-  gap: 4px;
-  margin: 0 8px;
-  padding: 10px 12px;
-  border: 1px solid var(--border-soft);
-  border-radius: 8px;
-  background: var(--bg);
+:root[data-theme-style="graphite"] .workspace-preview__head {
+  height: 42px;
+  gap: 9px;
+  padding: 0 12px;
+  background: var(--bg-elev);
 }
 
-.context-panel__health span {
-  color: var(--fg-faint);
-  font-size: 11px;
-  line-height: 1.2;
+:root[data-theme-style="graphite"] .workspace-current-file__icon {
+  color: var(--accent);
 }
 
-.context-panel__health strong {
-  color: var(--fg);
+:root[data-theme-style="graphite"] .workspace-current-file__name {
   font-size: 13px;
-  line-height: 1.2;
   font-weight: 650;
 }
 
-.context-panel__health small {
-  color: var(--fg-dim);
-  font-size: 12px;
-  line-height: 1.35;
+:root[data-theme-style="graphite"] .workspace-current-file__path,
+:root[data-theme-style="graphite"] .workspace-preview__meta {
+  font-family: var(--mono);
 }
 
-.context-panel__health--good {
-  border-color: color-mix(in srgb, #13a76f 40%, var(--border-soft));
+:root[data-theme-style="graphite"] .workspace-iconbtn:hover,
+:root[data-theme-style="graphite"] .workspace-current-file__recent:hover,
+:root[data-theme-style="graphite"] .workspace-current-file__recent--open {
+  color: var(--fg);
+  border-color: var(--border);
+  background: var(--bg-soft);
 }
 
-.context-panel__health--notice {
-  border-color: color-mix(in srgb, var(--accent) 42%, var(--border-soft));
+:root[data-theme-style="graphite"] .workspace-preview__meta {
+  min-height: 32px;
+  padding: 6px 12px;
+  background: color-mix(in srgb, var(--bg-elev) 94%, var(--bg-soft));
 }
 
-.context-panel__health--warn {
-  border-color: color-mix(in srgb, #f97316 55%, var(--border-soft));
+:root[data-theme-style="graphite"] .workspace-crumb {
+  color: var(--fg-dim);
 }
 
-.context-panel__preview {
-  display: flex;
-  flex-direction: column;
-  gap: 8px;
-  margin: 0 8px;
+:root[data-theme-style="graphite"] .workspace-crumb--current {
+  color: var(--fg);
 }
 
-.context-panel__preview + .context-panel__preview {
-  margin-top: 6px;
+:root[data-theme-style="graphite"] .workspace-preview__body {
+  background: var(--chat-bg);
+  padding: 10px 0 18px;
+  scrollbar-color: color-mix(in srgb, var(--fg-faint) 30%, transparent) transparent;
 }
 
-.context-panel__preview-head {
-  display: flex;
-  align-items: center;
-  gap: 12px;
-  min-height: 28px;
+:root[data-theme-style="graphite"] .workspace-preview__body .code,
+:root[data-theme-style="graphite"] .workspace-preview__body .code-block,
+:root[data-theme-style="graphite"] .workspace-preview__body .md {
+  border-radius: 0;
 }
 
-.context-panel__preview-head h3 {
-  flex: 1;
+:root[data-theme-style="graphite"] .workspace-preview__body .code {
   margin: 0;
-  color: var(--fg);
-  font-size: 13px;
-  line-height: 1.2;
-  font-weight: 650;
+  padding: 10px 14px;
+  border: 0;
+  background: transparent;
+  font-size: 12px;
+  line-height: 1.7;
 }
 
-.context-panel__preview-head > span {
-  flex: 0 0 auto;
-  color: var(--fg-faint);
-  font-size: 11.5px;
-  white-space: nowrap;
+:root[data-theme-style="graphite"] .workspace-preview__body .md {
+  padding: 2px 14px 18px;
+  background: transparent;
 }
 
-.context-panel__preview-head button {
-  flex: 0 0 auto;
-  border: none;
-  background: transparent;
-  color: var(--accent);
-  font: inherit;
-  font-size: 12px;
+:root[data-theme-style="graphite"] .workspace-preview__body .code-block__copy {
+  top: 8px;
+  right: 12px;
+  background: var(--bg-elev);
+  box-shadow: var(--app-graphite-shadow);
 }
 
-.context-panel__preview-head button:hover {
+:root[data-theme-style="graphite"] .workspace-note,
+:root[data-theme-style="graphite"] .workspace-recent-menu,
+:root[data-theme-style="graphite"] .floating-menu,
+:root[data-theme-style="graphite"] .context-menu,
+:root[data-theme-style="graphite"] .modelsw__menu {
+  border-color: var(--app-graphite-hairline-strong);
+  border-radius: 8px;
+  background: var(--bg-elev);
+  box-shadow: var(--app-graphite-shadow-float);
+}
+
+:root[data-theme-style="graphite"] .modelsw__item:hover,
+:root[data-theme-style="graphite"] .modelsw__item:focus-visible {
   color: var(--fg);
+  background: var(--surface-3);
+  outline: none;
 }
 
-.context-panel__empty {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  min-height: 160px;
+:root[data-theme-style="graphite"] .modelsw__item--current {
+  color: var(--accent);
+  background: var(--accent-soft);
+}
+
+:root[data-theme-style="graphite"] .modelsw__provider,
+:root[data-theme-style="graphite"] .modelsw__empty {
   color: var(--fg-faint);
-  font-size: 13px;
 }
 
-.context-panel__detail {
-  display: flex;
-  flex-direction: column;
-  gap: 8px;
-  padding: 0 4px;
+:root[data-theme-style="graphite"] .workspace-recent-menu__item--active {
+  color: var(--fg);
+  background: var(--accent-soft);
 }
 
-.context-panel__detail-note {
-  padding: 0 4px 6px;
-  color: var(--fg-faint);
-  font-size: 12px;
+:root[data-theme-style="graphite"] .context-panel__summary-head {
+  min-height: 44px;
+  padding: 9px 12px 7px;
 }
 
-.context-panel__file-list {
-  display: flex;
-  flex-direction: column;
-  gap: 2px;
+:root[data-theme-style="graphite"] .context-panel__heading-main span {
+  font-size: 13px;
+  font-weight: 700;
 }
 
-.context-panel__file-row {
-  min-height: var(--tree-row-height);
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  gap: 8px;
-  padding: 4px 8px;
-  border-radius: var(--tree-row-radius);
-  background: transparent;
+:root[data-theme-style="graphite"] .context-panel__heading-main strong,
+:root[data-theme-style="graphite"] .context-panel__file-turn {
+  border-color: var(--border);
+  background: var(--bg-soft);
   color: var(--fg-dim);
-  font-size: 12.5px;
 }
 
-.context-panel__file-row:hover {
-  background: var(--tree-row-hover-bg);
-  color: var(--fg);
+:root[data-theme-style="graphite"] .context-panel__search {
+  height: 34px;
+  margin: 10px 12px 8px;
+  border: 1px solid transparent;
+  border-radius: 8px;
+  background: var(--bg-soft);
 }
 
-.context-panel__file-list--compact .context-panel__file-row {
-  min-height: 34px;
+:root[data-theme-style="graphite"] .context-panel__search:hover,
+:root[data-theme-style="graphite"] .context-panel__search:focus-within {
+  border-color: var(--app-graphite-hairline-strong);
 }
 
-.context-panel__file-main {
-  flex: 1 1 auto;
-  min-width: 0;
-  display: flex;
-  gap: 8px;
-  align-items: center;
+:root[data-theme-style="graphite"] .context-panel__usage,
+:root[data-theme-style="graphite"] .context-panel__section,
+:root[data-theme-style="graphite"] .context-panel__stats,
+:root[data-theme-style="graphite"] .context-panel__preview,
+:root[data-theme-style="graphite"] .context-panel__health,
+:root[data-theme-style="graphite"] .context-panel__scope {
+  animation: graphite-message-in var(--dur-slow) var(--ease-out) both;
 }
 
-.context-panel__file-main svg {
-  flex: 0 0 auto;
-  color: var(--fg-faint);
+:root[data-theme-style="graphite"] .context-panel__metric,
+:root[data-theme-style="graphite"] .context-panel__section,
+:root[data-theme-style="graphite"] .context-panel__health,
+:root[data-theme-style="graphite"] .context-panel__preview,
+:root[data-theme-style="graphite"] .context-panel__scope {
+  border-color: var(--border);
+  border-radius: 8px;
+  background: var(--bg-elev);
+  box-shadow: var(--app-graphite-shadow);
 }
 
-.context-panel__file-copy {
-  min-width: 0;
-  display: flex;
-  flex-direction: column;
-  gap: 2px;
+:root[data-theme-style="graphite"] .context-panel__donut-core {
+  background: var(--bg-elev);
+  box-shadow: inset 0 0 0 1px var(--border);
 }
 
-.context-panel__file-copy > span {
-  min-width: 0;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
+:root[data-theme-style="graphite"] .context-panel__file-row {
+  border-radius: 7px;
+  transition: background var(--dur-fast), color var(--dur-fast), transform var(--dur-fast) var(--ease-out);
 }
 
-.context-panel__file-copy small {
-  color: var(--fg-faint);
-  font-size: 11px;
-  line-height: 1.1;
+:root[data-theme-style="graphite"] .context-panel__file-row:hover {
+  background: var(--workspace-files-hover);
+  transform: translateX(2px);
 }
 
-.context-panel__file-meta {
-  flex: 0 0 auto;
-  display: flex;
-  align-items: center;
-  gap: 7px;
-  color: var(--fg-faint);
-  font-size: 11.5px;
-  white-space: nowrap;
+:root[data-theme-style="graphite"] .workspace-tree-resizer::after {
+  background: var(--border-soft);
 }
 
-.context-panel__file-turn {
-  max-width: 76px;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  padding: 2px 6px;
-  border-radius: 999px;
-  background: var(--bg);
-  color: var(--fg-dim);
+:root[data-theme-style="graphite"] .workspace-tree-resizer:hover::after,
+:root[data-theme-style="graphite"] .workspace-tree-resizer:focus-visible::after,
+:root[data-theme-style="graphite"] .workspace-panel--tree-resizing .workspace-tree-resizer::after {
+  background: var(--accent);
+  box-shadow: 0 0 0 1px var(--accent-soft);
 }
 
-.context-panel__scope {
-  flex: 0 0 auto;
-  display: flex;
-  align-items: center;
-  gap: 8px;
-  min-height: 34px;
-  margin: 4px 10px 10px;
-  padding: 0 10px;
-  border: 1px solid var(--border-soft);
-  border-radius: 8px;
-  background: var(--bg);
-  color: var(--fg-dim);
-  font-size: 12.5px;
+:root[data-theme-style="graphite"] .drawer-backdrop:has(> .palette) {
+  background: rgba(20, 22, 28, 0.26);
+  backdrop-filter: none;
+  -webkit-backdrop-filter: none;
 }
 
-/* ----------------------------------------------------------------------------
- * Native-feel: overscroll containment, reduced-motion, view-transition suppression
- * -------------------------------------------------------------------------- */
+:root[data-theme-style="graphite"] .palette {
+  width: min(620px, 92vw);
+  border: 1px solid var(--app-graphite-hairline-strong);
+  border-radius: 11px;
+  background: var(--bg-elev);
+  box-shadow: var(--app-graphite-shadow-float);
+  animation: graphite-palette-in var(--dur-base) var(--ease-out) both;
+}
 
-/* Prevent rubber-band / pull-to-refresh on scrollable panels so the webview
-   feels like a native window, not a browser tab. */
-.transcript,
-.drawer__body,
-.settings-content,
-.history-preview__body {
-  overscroll-behavior: contain;
+:root[data-theme-style="graphite"] .palette__inputrow,
+:root[data-theme-style="graphite"] .palette__foot {
+  border-color: var(--border-soft);
 }
 
-/* Disable cross-document view transitions — the webview has no navigation. */
-::view-transition-old(root),
-::view-transition-new(root) {
-  animation: none !important;
+:root[data-theme-style="graphite"] .palette__inputrow {
+  padding: 16px 18px;
+  background: color-mix(in srgb, var(--bg-elev) 88%, var(--bg-soft));
 }
 
-/* ── Branch indicator (changed-files view) ──────────────────────────── */
-.workspace-branch-indicator {
-  display: flex;
-  align-items: center;
-  gap: 5px;
-  padding: 6px 10px;
-  border-bottom: 1px solid var(--border);
-  color: var(--fg-muted);
-  font-size: 12px;
+:root[data-theme-style="graphite"] .palette__search-icon {
+  color: var(--fg-faint);
 }
 
-.workspace-branch-indicator > svg {
-  flex-shrink: 0;
-  opacity: 0.6;
+:root[data-theme-style="graphite"] .palette__input {
+  font-size: 15px;
 }
 
-.workspace-branch-indicator > .workspace-branch-name {
-  display: flex;
-  align-items: center;
-  gap: 3px;
-  border: none;
-  background: transparent;
-  color: var(--fg);
-  cursor: pointer;
-  font-family: inherit;
-  font-size: 12px;
-  padding: 1px 4px;
-  border-radius: 3px;
+:root[data-theme-style="graphite"] .palette__esc,
+:root[data-theme-style="graphite"] .palette__foot kbd {
+  border-radius: 5px;
+  background: var(--bg-soft);
+  color: var(--fg-faint);
 }
 
-.workspace-branch-indicator > .workspace-branch-name:hover {
-  background: var(--bg-hover, rgba(128, 128, 128, 0.08));
+:root[data-theme-style="graphite"] .palette__list {
+  padding: 8px;
 }
 
-.workspace-branch-indicator > .workspace-branch-name span {
-  max-width: 160px;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
+:root[data-theme-style="graphite"] .palette__group-title {
+  color: var(--fg-faint);
+  letter-spacing: 0.04em;
+}
+
+:root[data-theme-style="graphite"] .palette__item {
+  min-height: 50px;
+  padding: 10px 12px;
+  border: 1px solid transparent;
+  border-radius: 7px;
+  transition: background var(--dur-fast), border-color var(--dur-fast), transform var(--dur-fast) var(--ease-out);
 }
 
-.workspace-branch-refresh {
-  margin-left: auto;
-  border: none;
-  background: transparent;
-  color: var(--fg-muted);
-  cursor: pointer;
-  padding: 2px;
-  border-radius: 3px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
+:root[data-theme-style="graphite"] .palette__item-icon {
+  color: var(--accent);
+  background: var(--surface-3);
 }
 
-.workspace-branch-refresh:hover {
+:root[data-theme-style="graphite"] .palette__item--on {
   color: var(--fg);
-  background: var(--bg-hover, rgba(128, 128, 128, 0.08));
+  border-color: color-mix(in srgb, var(--accent) 20%, transparent);
+  background: var(--accent-soft);
+  transform: translateY(-1px);
 }
 
-.workspace-branch-refresh:disabled {
-  opacity: 0.4;
-  cursor: default;
+:root[data-theme-style="graphite"] .palette__item--on .palette__item-icon {
+  color: var(--accent-fg);
+  background: var(--grad);
+  box-shadow: 0 6px 14px -10px var(--accent);
 }
 
-.workspace-branch-refresh .spinning {
-  animation: spin 0.6s linear infinite;
+:root[data-theme-style="graphite"] .palette__item--on .palette__title {
+  color: var(--fg);
 }
 
-@keyframes spin {
-  to { transform: rotate(360deg); }
+:root[data-theme-style="graphite"] .palette__hint {
+  color: var(--fg-faint);
 }
 
-.workspace-branch-menu {
-  min-width: 140px;
-  max-width: 260px;
-  max-height: 300px;
-  background: var(--bg-elev);
-  border: 1px solid var(--border);
-  border-radius: 6px;
-  box-shadow: 0 6px 20px rgba(0, 0, 0, 0.2);
-  overflow: hidden;
+:root[data-theme-style="graphite"] .floating-menu button,
+:root[data-theme-style="graphite"] .context-menu__item {
+  transition: background var(--dur-fast), color var(--dur-fast), transform var(--dur-fast) var(--ease-out);
 }
 
-.workspace-branch-menu__inner {
-  display: flex;
-  flex-direction: column;
-  overflow-y: auto;
-  background: var(--bg-elev);
+:root[data-theme-style="graphite"] .floating-menu button:not(:disabled):hover,
+:root[data-theme-style="graphite"] .floating-menu button:not(:disabled):focus-visible,
+:root[data-theme-style="graphite"] .context-menu__item:not(:disabled):hover,
+:root[data-theme-style="graphite"] .context-menu__item:not(:disabled):focus-visible {
+  color: var(--fg);
+  background: var(--accent-soft);
+  outline: none;
+  transform: translateX(2px);
 }
 
-.workspace-branch-menu__loading {
-  padding: 10px 12px;
-  color: var(--fg-muted);
-  font-size: 12px;
-  text-align: center;
+@keyframes graphite-message-in {
+  from {
+    opacity: 0;
+    transform: translateY(10px);
+  }
+  to {
+    opacity: 1;
+    transform: translateY(0);
+  }
 }
 
-.workspace-branch-menu__item {
-  display: flex;
-  align-items: center;
-  gap: 6px;
-  width: 100%;
-  padding: 6px 12px;
-  border: none;
-  background: transparent;
-  color: var(--fg);
-  cursor: pointer;
-  font-family: inherit;
-  font-size: 12px;
-  text-align: left;
+@keyframes graphite-drop-in {
+  from {
+    opacity: 0;
+    transform: translateY(-8px);
+  }
+  to {
+    opacity: 1;
+    transform: translateY(0);
+  }
 }
 
-.workspace-branch-menu__item:hover {
-  background: var(--bg-hover, rgba(128, 128, 128, 0.08));
+@keyframes graphite-palette-in {
+  from {
+    opacity: 0;
+    transform: translateY(-12px) scale(0.97);
+  }
+  to {
+    opacity: 1;
+    transform: translateY(0) scale(1);
+  }
 }
 
-.workspace-branch-menu__item--active {
-  font-weight: 600;
+@keyframes graphite-viewer-in {
+  from {
+    opacity: 0;
+    transform: translateX(18px);
+  }
+  to {
+    opacity: 1;
+    transform: translateX(0);
+  }
 }
 
-.workspace-branch-menu__item svg {
-  flex-shrink: 0;
-  opacity: 0.7;
+@keyframes graphite-float {
+  0%,
+  100% {
+    transform: translateY(0);
+  }
+  50% {
+    transform: translateY(-7px);
+  }
 }
 
-.workspace-branch-menu__item span {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
+@keyframes graphite-tab-underline {
+  from {
+    opacity: 0;
+    transform: scaleX(0.3);
+  }
+  to {
+    opacity: 1;
+    transform: scaleX(1);
+  }
 }
 
-.workspace-branch-menu__item:disabled {
-  opacity: 0.4;
-  cursor: default;
+@keyframes graphite-tab-breathe {
+  0%,
+  100% {
+    opacity: 0.55;
+    transform: scale(1);
+  }
+  50% {
+    opacity: 1;
+    transform: scale(1.18);
+  }
 }
 
-/* ── Command palette (⌘K) ─────────────────────────────────────────── */
-.drawer-backdrop:has(.palette) {
-  justify-content: center;
-  align-items: flex-start;
-  padding-top: 12vh;
+:root[data-theme-style="graphite"] .theme-card__swatches[data-theme-style-card="graphite"] .theme-card__swatch--bg {
+  background: #f4f3ef;
 }
 
-.palette {
-  position: relative;
-  width: min(520px, 90vw);
-  max-height: 60vh;
-  background: var(--bg-elev);
-  border: 1px solid var(--border);
-  border-radius: 10px;
-  box-shadow: 0 12px 48px rgba(0, 0, 0, 0.36);
-  display: flex;
-  flex-direction: column;
-  overflow: hidden;
-  animation: palette-in 0.1s ease;
+:root[data-theme-style="graphite"] .theme-card__swatches[data-theme-style-card="graphite"] .theme-card__swatch--surface {
+  background: #ffffff;
 }
 
-@keyframes palette-in {
-  from { opacity: 0; transform: translateY(-12px) scale(0.97); }
-  to   { opacity: 1; transform: translateY(0) scale(1); }
+:root[data-theme-style="graphite"] .theme-card__swatches[data-theme-style-card="graphite"] .theme-card__swatch--accent {
+  background: linear-gradient(120deg, #ff5a2c, #ff8a3d);
 }
 
-.palette__inputrow {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-  padding: 10px 14px;
-  border-bottom: 1px solid var(--border);
+/* Theme direction accents for the design-signature controls copied from the
+   new_design comps: panel toggles, run-mode badges, active sessions, and file
+   tree folder rows all use each theme's accent + accent-soft pair. */
+:root[data-theme-style] .app--darwin .app-chrome--tabs {
+  padding-right: calc(var(--chrome-toggle-size) + 12px);
 }
 
-.palette__input {
-  flex: 1;
-  border: none;
-  outline: none;
-  background: transparent;
-  color: var(--fg);
-  font-size: 14px;
-  line-height: 1.4;
+:root[data-theme-style] .app--darwin .app-chrome--tabs .app-chrome__panel-toggle--right {
+  right: 8px;
 }
 
-.palette__input::placeholder {
-  color: var(--fg-muted);
+:root[data-theme-style] .app--darwin .app-chrome--tabs .app-chrome__panel-toggle--left.app-chrome__panel-toggle--active,
+:root[data-theme-style] .app--darwin .app-chrome--tabs .app-chrome__panel-toggle--right.app-chrome__panel-toggle--active {
+  color: var(--accent);
 }
 
-.palette__esc {
-  font-size: 11px;
-  padding: 2px 6px;
-  border-radius: 4px;
-  border: 1px solid var(--border);
-  color: var(--fg-muted);
-  background: var(--bg-base);
-  font-family: inherit;
-  line-height: 1.3;
+:root[data-theme-style] .app--darwin .app-chrome--tabs .app-chrome__panel-toggle--left.app-chrome__panel-toggle--active::before,
+:root[data-theme-style] .app--darwin .app-chrome--tabs .app-chrome__panel-toggle--right.app-chrome__panel-toggle--active::before {
+  opacity: 1;
+  transform: scale(1);
+  background: var(--accent-soft);
+  box-shadow: inset 0 0 0 1px color-mix(in srgb, var(--accent) 24%, transparent);
 }
 
-.palette__list {
-  flex: 1;
-  overflow-y: auto;
-  padding: 6px 0;
+:root[data-theme-style] .app--darwin .app-chrome--tabs .app-chrome__panel-toggle--left.app-chrome__panel-toggle--active:hover,
+:root[data-theme-style] .app--darwin .app-chrome--tabs .app-chrome__panel-toggle--right.app-chrome__panel-toggle--active:hover {
+  color: var(--accent);
 }
 
-.palette__empty {
-  padding: 24px 14px;
-  color: var(--fg-muted);
-  text-align: center;
-  font-size: 13px;
+:root[data-theme-style] .app--darwin .app-chrome--tabs .app-chrome__panel-toggle--left.app-chrome__panel-toggle--active:hover::before,
+:root[data-theme-style] .app--darwin .app-chrome--tabs .app-chrome__panel-toggle--right.app-chrome__panel-toggle--active:hover::before {
+  background: color-mix(in srgb, var(--accent) 16%, transparent);
 }
 
-.palette__group-title {
-  padding: 8px 14px 4px;
-  font-size: 11px;
-  font-weight: 600;
-  text-transform: uppercase;
-  letter-spacing: 0.04em;
-  color: var(--fg-muted);
+:root[data-theme-style] .tabbar__mode-badge--plan {
+  color: var(--accent);
+  background: var(--accent-soft);
+  box-shadow: inset 0 0 0 1px color-mix(in srgb, var(--accent) 30%, transparent);
 }
 
-.palette__item {
-  display: flex;
-  flex-direction: column;
-  gap: 2px;
-  width: 100%;
-  padding: 8px 14px;
-  border: none;
-  background: transparent;
+:root[data-theme-style] .project-tree__topic--active {
+  border-radius: var(--project-tree-row-radius);
+  background: var(--accent-soft);
   color: var(--fg);
-  cursor: pointer;
-  text-align: left;
-  font-family: inherit;
-  font-size: 13px;
-  line-height: 1.3;
 }
 
-.palette__item--on {
-  background: var(--accent-bg, rgba(77, 151, 255, 0.12));
+:root[data-theme-style] .project-tree__topic--active:hover {
+  background: color-mix(in srgb, var(--accent) 15%, transparent);
 }
 
-.palette__item:focus-visible {
-  outline: 2px solid var(--accent);
-  outline-offset: -2px;
+:root[data-theme-style] .project-tree__topic--active::before {
+  left: 0;
+  top: 8px;
+  bottom: 8px;
+  width: 3px;
+  border-radius: 3px;
+  background: var(--accent);
 }
 
-.palette__title {
-  font-weight: 500;
+:root[data-theme-style] .project-tree__topic--active .project-tree__topic-label {
+  color: var(--fg);
+  font-weight: 600;
 }
 
-.palette__hint {
-  font-size: 11px;
-  color: var(--fg-muted);
+:root[data-theme-style] .project-tree__topic--active .project-tree__topic-meta {
+  color: var(--fg-faint);
 }
 
-.palette__foot {
-  display: flex;
-  gap: 12px;
-  padding: 7px 14px;
-  border-top: 1px solid var(--border);
-  font-size: 11px;
-  color: var(--fg-muted);
+:root[data-theme-style] .project-tree__topic--active .project-tree__topic-status {
+  background: color-mix(in srgb, var(--accent) 13%, transparent);
+  color: var(--accent);
+  box-shadow: inset 0 0 0 1px color-mix(in srgb, var(--accent) 20%, transparent);
 }
 
-.palette__foot kbd {
-  padding: 1px 4px;
-  border-radius: 3px;
-  border: 1px solid var(--border);
-  background: var(--bg-base);
-  font-family: inherit;
-  font-size: 10px;
-  line-height: 1.3;
-  margin-right: 2px;
+:root[data-theme-style] .workspace-tree__row--active,
+:root[data-theme-style] .workspace-change--active {
+  background: var(--workspace-selection-bg);
+  color: var(--workspace-selection-fg);
 }
 
-/* Respect the OS reduced-motion preference: squash all animations and force
-   instant scrolling so the UI feels immediate rather than web-like. */
-@media (prefers-reduced-motion: reduce) {
-  *,
-  *::before,
-  *::after {
-    animation-duration: 0.01ms !important;
-    animation-iteration-count: 1 !important;
-    transition-duration: 0.01ms !important;
-    scroll-behavior: auto !important;
-  }
+:root[data-theme-style] .workspace-tree__row--active::before {
+  left: 2px;
+  top: 7px;
+  bottom: 7px;
+  width: 3px;
+  background: var(--workspace-selection-bar);
+}
+
+:root[data-theme-style] .workspace-tree__icon--dir {
+  color: var(--workspace-selection-fg);
+}
+
+:root[data-theme-style] .workspace-tree__row--active .workspace-tree__icon,
+:root[data-theme-style] .workspace-tree__row--active .workspace-tree__icon--dir {
+  color: var(--workspace-selection-fg);
 }
 
 /* ── Toast ──────────────────────────────────────────────────────────── */
diff --git a/desktop/settings_app.go b/desktop/settings_app.go
index 36dd06cfd..b4d0b783c 100644
--- a/desktop/settings_app.go
+++ b/desktop/settings_app.go
@@ -101,8 +101,11 @@ type SettingsView struct {
 	// registered (provider.Kinds()), so the editor's "kind" picker offers only
 	// kinds that resolve — selecting an unregistered one would fail the rebuild.
 	ProviderKinds []string `json:"providerKinds"`
-	// Bypass is the live YOLO state (runtime-only, not from config), so the panel's
-	// toggle reflects whether approvals are currently being skipped this session.
+	// AutoApproveTools is the live YOLO/full-access state (runtime-only, not from
+	// config), so the panel's toggle reflects whether tool approvals are currently
+	// being skipped this session.
+	AutoApproveTools bool `json:"autoApproveTools"`
+	// Bypass is the legacy JSON key for the same live state.
 	Bypass bool `json:"bypass"`
 }
 
@@ -265,7 +268,7 @@ func (a *App) Settings() SettingsView {
 			Sandbox:           SandboxView{Bash: "enforce", AllowWrite: []string{}},
 			Agent:             AgentView{PlannerMaxSteps: 12},
 			AutoPlan:          "off",
-			DesktopTheme:      "dark",
+			DesktopTheme:      "light",
 			DesktopThemeStyle: "graphite",
 			CloseBehavior:     "background",
 		}
@@ -312,7 +315,8 @@ func (a *App) Settings() SettingsView {
 		CloseBehavior:     cfg.DesktopCloseBehavior(),
 		ConfigPath:        cfgPath,
 		ProviderKinds:     nonNil(provider.Kinds()),
-		Bypass:            ctrl != nil && ctrl.Bypass(),
+		AutoApproveTools:  ctrl != nil && ctrl.AutoApproveTools(),
+		Bypass:            ctrl != nil && ctrl.AutoApproveTools(),
 	}
 	added := providerAccessSet(cfg.Desktop.ProviderAccess)
 	v.OfficialProviders = officialProviderViews(officialProviderAddedSet(cfg))
diff --git a/desktop/tab_profile_test.go b/desktop/tab_profile_test.go
index 0d5d4b63a..632274f02 100644
--- a/desktop/tab_profile_test.go
+++ b/desktop/tab_profile_test.go
@@ -174,7 +174,7 @@ func TestSaveTabsPersistsYoloMode(t *testing.T) {
 	app := NewApp()
 	tab := testTab("a", t.TempDir())
 	tab.mode = "yolo"
-	tab.Ctrl.SetBypass(true)
+	tab.Ctrl.SetAutoApproveTools(true)
 	app.tabs = map[string]*WorkspaceTab{tab.ID: tab}
 	app.tabOrder = []string{tab.ID}
 	app.activeTabID = tab.ID
@@ -192,6 +192,216 @@ func TestSaveTabsPersistsYoloMode(t *testing.T) {
 	}
 }
 
+func TestSaveTabsPersistsPlanYoloMode(t *testing.T) {
+	isolateDesktopUserDirs(t)
+
+	app := NewApp()
+	tab := testTab("a", t.TempDir())
+	tab.mode = "plan-yolo"
+	tab.Ctrl.SetMode(true, true)
+	app.tabs = map[string]*WorkspaceTab{tab.ID: tab}
+	app.tabOrder = []string{tab.ID}
+	app.activeTabID = tab.ID
+
+	app.mu.Lock()
+	app.saveTabsLocked()
+	app.mu.Unlock()
+
+	got := loadTabsFile()
+	if len(got.Tabs) != 1 {
+		t.Fatalf("tabs len = %d, want 1", len(got.Tabs))
+	}
+	if got.Tabs[0].Mode != "plan-yolo" {
+		t.Fatalf("saved mode = %q, want plan-yolo", got.Tabs[0].Mode)
+	}
+}
+
+func TestSaveTabsPersistsGoalAndToolApprovalMode(t *testing.T) {
+	isolateDesktopUserDirs(t)
+
+	app := NewApp()
+	tab := testTab("a", t.TempDir())
+	tab.goal = "finish the mode redesign"
+	tab.toolApprovalMode = control.ToolApprovalAuto
+	tab.Ctrl.SetGoal(tab.goal)
+	tab.Ctrl.SetToolApprovalMode(control.ToolApprovalAuto)
+	app.tabs = map[string]*WorkspaceTab{tab.ID: tab}
+	app.tabOrder = []string{tab.ID}
+	app.activeTabID = tab.ID
+
+	app.mu.Lock()
+	app.saveTabsLocked()
+	app.mu.Unlock()
+
+	got := loadTabsFile()
+	if len(got.Tabs) != 1 {
+		t.Fatalf("tabs len = %d, want 1", len(got.Tabs))
+	}
+	if got.Tabs[0].Goal != "finish the mode redesign" {
+		t.Fatalf("saved goal = %q", got.Tabs[0].Goal)
+	}
+	if got.Tabs[0].ToolApprovalMode != control.ToolApprovalAuto {
+		t.Fatalf("saved tool approval mode = %q, want auto", got.Tabs[0].ToolApprovalMode)
+	}
+}
+
+func TestCollaborationModesPreserveToolApprovalMode(t *testing.T) {
+	isolateDesktopUserDirs(t)
+
+	app := NewApp()
+	tab := testTab("a", t.TempDir())
+	app.tabs = map[string]*WorkspaceTab{tab.ID: tab}
+	app.tabOrder = []string{tab.ID}
+	app.activeTabID = tab.ID
+	defer tab.Ctrl.Close()
+
+	app.SetToolApprovalModeForTab(tab.ID, control.ToolApprovalAuto)
+	app.SetGoalForTab(tab.ID, "finish the approval redesign")
+	if got := currentTabCollaborationMode(tab); got != "goal" {
+		t.Fatalf("collaboration mode = %q, want goal", got)
+	}
+	if tab.Ctrl.PlanMode() {
+		t.Fatal("goal mode should leave plan mode off")
+	}
+	if got := tab.Ctrl.ToolApprovalMode(); got != control.ToolApprovalAuto {
+		t.Fatalf("tool approval after goal = %q, want auto", got)
+	}
+
+	app.SetCollaborationModeForTab(tab.ID, "plan")
+	if got := currentTabCollaborationMode(tab); got != "plan" {
+		t.Fatalf("collaboration mode = %q, want plan", got)
+	}
+	if got := tab.Ctrl.Goal(); got != "" {
+		t.Fatalf("plan mode should clear goal, got %q", got)
+	}
+	if got := tab.Ctrl.ToolApprovalMode(); got != control.ToolApprovalAuto {
+		t.Fatalf("tool approval after plan = %q, want auto", got)
+	}
+
+	app.SetCollaborationModeForTab(tab.ID, "normal")
+	if got := currentTabCollaborationMode(tab); got != "normal" {
+		t.Fatalf("collaboration mode = %q, want normal", got)
+	}
+	if tab.Ctrl.PlanMode() {
+		t.Fatal("normal mode should leave plan mode off")
+	}
+	if got := tab.Ctrl.ToolApprovalMode(); got != control.ToolApprovalAuto {
+		t.Fatalf("tool approval after normal = %q, want auto", got)
+	}
+}
+
+func TestToolApprovalModesPreserveCollaborationMode(t *testing.T) {
+	isolateDesktopUserDirs(t)
+
+	app := NewApp()
+	tab := testTab("a", t.TempDir())
+	app.tabs = map[string]*WorkspaceTab{tab.ID: tab}
+	app.tabOrder = []string{tab.ID}
+	app.activeTabID = tab.ID
+	defer tab.Ctrl.Close()
+
+	app.SetCollaborationModeForTab(tab.ID, "plan")
+	for _, mode := range []string{control.ToolApprovalAsk, control.ToolApprovalAuto, control.ToolApprovalYolo} {
+		app.SetToolApprovalModeForTab(tab.ID, mode)
+		if got := currentTabCollaborationMode(tab); got != "plan" {
+			t.Fatalf("collaboration after tool mode %q = %q, want plan", mode, got)
+		}
+		if got := tab.Ctrl.ToolApprovalMode(); got != mode {
+			t.Fatalf("tool approval = %q, want %q", got, mode)
+		}
+	}
+
+	app.SetGoalForTab(tab.ID, "ship the goal runner")
+	app.SetToolApprovalModeForTab(tab.ID, control.ToolApprovalAsk)
+	if got := currentTabCollaborationMode(tab); got != "goal" {
+		t.Fatalf("collaboration after ask = %q, want goal", got)
+	}
+	app.SetToolApprovalModeForTab(tab.ID, control.ToolApprovalAuto)
+	if got := currentTabCollaborationMode(tab); got != "goal" {
+		t.Fatalf("collaboration after auto = %q, want goal", got)
+	}
+	app.SetToolApprovalModeForTab(tab.ID, control.ToolApprovalYolo)
+	if got := currentTabCollaborationMode(tab); got != "goal" {
+		t.Fatalf("collaboration after yolo = %q, want goal", got)
+	}
+}
+
+func TestMetaReportsGoalStatus(t *testing.T) {
+	isolateDesktopUserDirs(t)
+
+	app := NewApp()
+	tab := testTab("a", t.TempDir())
+	app.tabs = map[string]*WorkspaceTab{tab.ID: tab}
+	app.tabOrder = []string{tab.ID}
+	app.activeTabID = tab.ID
+	defer tab.Ctrl.Close()
+
+	meta := app.MetaForTab(tab.ID)
+	if meta.GoalStatus != control.GoalStatusStopped {
+		t.Fatalf("initial goal status = %q, want stopped", meta.GoalStatus)
+	}
+
+	app.SetGoalForTab(tab.ID, "finish the goal runner")
+	meta = app.MetaForTab(tab.ID)
+	if meta.Goal != "finish the goal runner" || meta.GoalStatus != control.GoalStatusRunning {
+		t.Fatalf("goal meta = %+v, want running goal", meta)
+	}
+
+	app.ClearGoalForTab(tab.ID)
+	meta = app.MetaForTab(tab.ID)
+	if meta.Goal != "" || meta.GoalStatus != control.GoalStatusStopped {
+		t.Fatalf("cleared goal meta = %+v, want stopped empty goal", meta)
+	}
+}
+
+func TestSetPlanModePreservesAutoApproveTools(t *testing.T) {
+	isolateDesktopUserDirs(t)
+
+	app := NewApp()
+	tab := testTab("a", t.TempDir())
+	tab.Ctrl.SetAutoApproveTools(true)
+	app.tabs = map[string]*WorkspaceTab{tab.ID: tab}
+	app.tabOrder = []string{tab.ID}
+	app.activeTabID = tab.ID
+
+	app.SetPlanMode(true)
+	if !tab.Ctrl.PlanMode() || !tab.Ctrl.AutoApproveTools() {
+		t.Fatalf("after SetPlanMode(true): plan=%v autoApproveTools=%v, want true/true", tab.Ctrl.PlanMode(), tab.Ctrl.AutoApproveTools())
+	}
+	if got := currentTabMode(tab); got != "plan-yolo" {
+		t.Fatalf("current mode = %q, want plan-yolo", got)
+	}
+
+	app.SetPlanMode(false)
+	if tab.Ctrl.PlanMode() || !tab.Ctrl.AutoApproveTools() {
+		t.Fatalf("after SetPlanMode(false): plan=%v autoApproveTools=%v, want false/true", tab.Ctrl.PlanMode(), tab.Ctrl.AutoApproveTools())
+	}
+}
+
+func TestSetBypassPreservesPlanMode(t *testing.T) {
+	isolateDesktopUserDirs(t)
+
+	app := NewApp()
+	tab := testTab("a", t.TempDir())
+	tab.Ctrl.SetPlanMode(true)
+	app.tabs = map[string]*WorkspaceTab{tab.ID: tab}
+	app.tabOrder = []string{tab.ID}
+	app.activeTabID = tab.ID
+
+	app.SetBypass(true)
+	if !tab.Ctrl.PlanMode() || !tab.Ctrl.AutoApproveTools() {
+		t.Fatalf("after SetBypass(true): plan=%v autoApproveTools=%v, want true/true", tab.Ctrl.PlanMode(), tab.Ctrl.AutoApproveTools())
+	}
+	if got := currentTabMode(tab); got != "plan-yolo" {
+		t.Fatalf("current mode = %q, want plan-yolo", got)
+	}
+
+	app.SetBypass(false)
+	if !tab.Ctrl.PlanMode() || tab.Ctrl.AutoApproveTools() {
+		t.Fatalf("after SetBypass(false): plan=%v autoApproveTools=%v, want true/false", tab.Ctrl.PlanMode(), tab.Ctrl.AutoApproveTools())
+	}
+}
+
 func userConfigPathForTest() string {
 	if dir, err := os.UserConfigDir(); err == nil {
 		return dir + "/reasonix/reasonix.toml"
diff --git a/desktop/tabs.go b/desktop/tabs.go
index 144f34a24..abfc80ee9 100644
--- a/desktop/tabs.go
+++ b/desktop/tabs.go
@@ -44,22 +44,35 @@ type WorkspaceTab struct {
 	StartupErr    string              // build error, surfaced to the frontend
 	sink          *tabEventSink       // routes events with this tab's ID
 
+	ActivityStatus string // transient project-tree status for the in-flight turn
+
 	// Per-turn autosave per tab.
 	saveMu    sync.Mutex
 	saving    bool
 	saveAgain bool
 
 	// readTelemetry tracks files read during this tab's session.
-	readTelemetry []readFileRecord
-	telemMu       sync.Mutex
+	readTelemetry  []readFileRecord
+	usageTelemetry sessionUsageStats
+	telemMu        sync.Mutex
 
-	model       string // active model ref (for meta)
-	effort      *string
-	mode        string // "normal" | "plan" | "yolo"; yolo is runtime-only
-	disabledMCP map[string]ServerView
-	mcpOrder    []string
+	model            string // active model ref (for meta)
+	effort           *string
+	mode             string // "normal" | "plan" | "yolo" | "plan-yolo"; yolo/full access is runtime-only
+	goal             string
+	toolApprovalMode string
+	disabledMCP      map[string]ServerView
+	mcpOrder         []string
 }
 
+const (
+	topicStatusThinking            = "thinking"
+	topicStatusStreaming           = "streaming"
+	topicStatusWaitingConfirmation = "waiting_confirmation"
+	topicStatusPaused              = "paused"
+	topicStatusError               = "error"
+)
+
 type readFileRecord struct {
 	Path      string `json:"path"`
 	Turn      int    `json:"turn"`
@@ -69,6 +82,28 @@ type readFileRecord struct {
 	Truncated bool   `json:"truncated,omitempty"`
 }
 
+type sessionUsageStats struct {
+	PromptTokens     int     `json:"promptTokens"`
+	CompletionTokens int     `json:"completionTokens"`
+	TotalTokens      int     `json:"totalTokens"`
+	ReasoningTokens  int     `json:"reasoningTokens"`
+	CacheHitTokens   int     `json:"cacheHitTokens"`
+	CacheMissTokens  int     `json:"cacheMissTokens"`
+	RequestCount     int     `json:"requestCount"`
+	ElapsedMs        int64   `json:"elapsedMs"`
+	SessionCost      float64 `json:"sessionCost,omitempty"`
+	SessionCurrency  string  `json:"sessionCurrency,omitempty"`
+	SessionCostUsd   float64 `json:"sessionCostUsd,omitempty"`
+
+	activeTurnStartedAt int64
+}
+
+type tabTelemetrySnapshot struct {
+	Version   int               `json:"version"`
+	ReadFiles []readFileRecord  `json:"readFiles"`
+	Usage     sessionUsageStats `json:"usage"`
+}
+
 func cloneStringPtr(v *string) *string {
 	if v == nil {
 		return nil
@@ -103,12 +138,64 @@ func (t *WorkspaceTab) recordReadFile(rec readFileRecord) {
 	t.telemMu.Unlock()
 }
 
-func (t *WorkspaceTab) readTelemetrySnapshot() []readFileRecord {
+func (t *WorkspaceTab) recordTurnStarted(now int64) {
+	t.telemMu.Lock()
+	if t.usageTelemetry.activeTurnStartedAt == 0 {
+		t.usageTelemetry.activeTurnStartedAt = now
+	}
+	t.telemMu.Unlock()
+}
+
+func (t *WorkspaceTab) recordTurnDone(now int64) {
+	t.telemMu.Lock()
+	if started := t.usageTelemetry.activeTurnStartedAt; started > 0 && now >= started {
+		t.usageTelemetry.ElapsedMs += now - started
+		t.usageTelemetry.activeTurnStartedAt = 0
+	}
+	t.telemMu.Unlock()
+}
+
+func (t *WorkspaceTab) recordUsage(e event.Event) {
+	if e.Usage == nil {
+		return
+	}
+	u := e.Usage
+	t.telemMu.Lock()
+	t.usageTelemetry.PromptTokens += u.PromptTokens
+	t.usageTelemetry.CompletionTokens += u.CompletionTokens
+	t.usageTelemetry.TotalTokens += u.TotalTokens
+	t.usageTelemetry.ReasoningTokens += u.ReasoningTokens
+	if e.SessionHit+e.SessionMiss > 0 {
+		t.usageTelemetry.CacheHitTokens = e.SessionHit
+		t.usageTelemetry.CacheMissTokens = e.SessionMiss
+	} else {
+		t.usageTelemetry.CacheHitTokens += u.CacheHitTokens
+		t.usageTelemetry.CacheMissTokens += u.CacheMissTokens
+	}
+	t.usageTelemetry.RequestCount++
+	if e.Pricing != nil {
+		cost := e.Pricing.Cost(u)
+		t.usageTelemetry.SessionCost += cost
+		t.usageTelemetry.SessionCostUsd = t.usageTelemetry.SessionCost
+		t.usageTelemetry.SessionCurrency = e.Pricing.Symbol()
+	}
+	t.telemMu.Unlock()
+}
+
+func (t *WorkspaceTab) telemetrySnapshot() tabTelemetrySnapshot {
 	t.telemMu.Lock()
 	defer t.telemMu.Unlock()
-	out := make([]readFileRecord, len(t.readTelemetry))
-	copy(out, t.readTelemetry)
-	return out
+	records := make([]readFileRecord, len(t.readTelemetry))
+	copy(records, t.readTelemetry)
+	usage := t.usageTelemetry
+	if started := usage.activeTurnStartedAt; started > 0 {
+		now := time.Now().UnixMilli()
+		if now >= started {
+			usage.ElapsedMs += now - started
+		}
+	}
+	usage.activeTurnStartedAt = 0
+	return tabTelemetrySnapshot{Version: 2, ReadFiles: records, Usage: usage}
 }
 
 // tabEventSink wraps a parent event.Sink and prepends a tabId to every wire
@@ -120,9 +207,24 @@ type tabEventSink struct {
 }
 
 func (s *tabEventSink) Emit(e event.Event) {
+	if s.app != nil {
+		switch e.Kind {
+		case event.TurnStarted:
+			s.recordTurnStarted()
+		case event.Usage:
+			s.recordUsageTelemetry(e)
+		case event.TurnDone:
+			s.recordTurnDone()
+		}
+	}
 	if s.ctx != nil {
 		runtime.EventsEmit(s.ctx, eventChannel, toWireTab(e, s.tabID))
 	}
+	if s.app != nil {
+		if status, update := topicActivityStatusFromEvent(e); update && s.app.setTabActivityStatus(s.tabID, status) {
+			s.app.emitProjectTreeChanged()
+		}
+	}
 	// Record read_file successes in the tab's telemetry.
 	if e.Kind == event.ToolResult && e.Tool.Name == "read_file" && e.Tool.Err == "" {
 		s.recordReadTelemetry(e)
@@ -133,6 +235,24 @@ func (s *tabEventSink) Emit(e event.Event) {
 	}
 }
 
+func topicActivityStatusFromEvent(e event.Event) (string, bool) {
+	switch e.Kind {
+	case event.TurnStarted, event.Reasoning, event.ToolDispatch, event.ToolProgress, event.ToolResult, event.CompactionStarted, event.CompactionDone, event.Retrying:
+		return topicStatusThinking, true
+	case event.Text, event.Message:
+		return topicStatusStreaming, true
+	case event.ApprovalRequest, event.AskRequest:
+		return topicStatusWaitingConfirmation, true
+	case event.TurnDone:
+		if e.Err != nil {
+			return topicStatusError, true
+		}
+		return "", true
+	default:
+		return "", false
+	}
+}
+
 func (a *App) emitReady(ctx context.Context) {
 	a.mu.RLock()
 	hook := a.readyHook
@@ -195,10 +315,67 @@ func (s *tabEventSink) recordReadTelemetry(e event.Event) {
 		return
 	}
 	if sp := ctrl.SessionPath(); sp != "" {
-		_ = saveTelemetry(sp+".telemetry.json", tab.readTelemetrySnapshot())
+		_ = saveTelemetry(sp+".telemetry.json", tab.telemetrySnapshot())
+	}
+}
+
+func (s *tabEventSink) recordTurnStarted() {
+	tab, sp := s.telemetryTab()
+	if tab == nil {
+		return
+	}
+	tab.recordTurnStarted(time.Now().UnixMilli())
+	if sp != "" {
+		_ = saveTelemetry(sp+".telemetry.json", tab.telemetrySnapshot())
+	}
+}
+
+func (s *tabEventSink) recordTurnDone() {
+	tab, sp := s.telemetryTab()
+	if tab == nil {
+		return
+	}
+	tab.recordTurnDone(time.Now().UnixMilli())
+	if sp != "" {
+		_ = saveTelemetry(sp+".telemetry.json", tab.telemetrySnapshot())
+	}
+}
+
+func (s *tabEventSink) recordUsageTelemetry(e event.Event) {
+	tab, sp := s.telemetryTab()
+	if tab == nil {
+		return
+	}
+	tab.recordUsage(e)
+	if sp != "" {
+		_ = saveTelemetry(sp+".telemetry.json", tab.telemetrySnapshot())
 	}
 }
 
+func (s *tabEventSink) telemetryTab() (*WorkspaceTab, string) {
+	if s.app == nil {
+		return nil, ""
+	}
+	s.app.mu.RLock()
+	tab, ok := s.app.tabs[s.tabID]
+	var ctrl *control.Controller
+	if ok && tab != nil {
+		ctrl = tab.Ctrl
+	}
+	s.app.mu.RUnlock()
+	if !ok || tab == nil {
+		return nil, ""
+	}
+	if ctrl == nil {
+		return tab, ""
+	}
+	sp := ctrl.SessionPath()
+	if sp == "" {
+		return tab, ""
+	}
+	return tab, sp
+}
+
 // --- wire event with tab ----------------------------------------------------
 
 func toWireTab(e event.Event, tabID string) wireEventTab {
@@ -234,36 +411,44 @@ type wireEventTab struct {
 
 // TabMeta is the frontend-facing shape of one tab.
 type TabMeta struct {
-	ID            string `json:"id"`
-	Scope         string `json:"scope"`
-	WorkspaceRoot string `json:"workspaceRoot"`
-	WorkspaceName string `json:"workspaceName"`
-	TopicID       string `json:"topicId"`
-	TopicTitle    string `json:"topicTitle"`
-	ProjectColor  string `json:"projectColor,omitempty"`
-	Label         string `json:"label"`
-	Ready         bool   `json:"ready"`
-	Running       bool   `json:"running"`
-	Mode          string `json:"mode"`
-	StartupErr    string `json:"startupErr,omitempty"`
-	Active        bool   `json:"active"`
-	Cwd           string `json:"cwd"`
+	ID                string `json:"id"`
+	Scope             string `json:"scope"`
+	WorkspaceRoot     string `json:"workspaceRoot"`
+	WorkspaceName     string `json:"workspaceName"`
+	TopicID           string `json:"topicId"`
+	TopicTitle        string `json:"topicTitle"`
+	ProjectColor      string `json:"projectColor,omitempty"`
+	Label             string `json:"label"`
+	Ready             bool   `json:"ready"`
+	Running           bool   `json:"running"`
+	Mode              string `json:"mode"`
+	CollaborationMode string `json:"collaborationMode"`
+	ToolApprovalMode  string `json:"toolApprovalMode"`
+	Goal              string `json:"goal,omitempty"`
+	GoalStatus        string `json:"goalStatus,omitempty"`
+	StartupErr        string `json:"startupErr,omitempty"`
+	Active            bool   `json:"active"`
+	Cwd               string `json:"cwd"`
 }
 
 func (a *App) tabMeta(tab *WorkspaceTab, active bool) TabMeta {
 	m := TabMeta{
-		ID:            tab.ID,
-		Scope:         tab.Scope,
-		WorkspaceRoot: tab.WorkspaceRoot,
-		WorkspaceName: workspaceName(tab.WorkspaceRoot),
-		TopicID:       tab.TopicID,
-		TopicTitle:    tab.TopicTitle,
-		Label:         tab.Label,
-		Ready:         tab.Ready,
-		Mode:          currentTabMode(tab),
-		StartupErr:    tab.StartupErr,
-		Active:        active,
-		Cwd:           tab.WorkspaceRoot,
+		ID:                tab.ID,
+		Scope:             tab.Scope,
+		WorkspaceRoot:     tab.WorkspaceRoot,
+		WorkspaceName:     workspaceName(tab.WorkspaceRoot),
+		TopicID:           tab.TopicID,
+		TopicTitle:        tab.TopicTitle,
+		Label:             tab.Label,
+		Ready:             tab.Ready,
+		Mode:              currentTabMode(tab),
+		CollaborationMode: currentTabCollaborationMode(tab),
+		ToolApprovalMode:  currentTabToolApprovalMode(tab),
+		Goal:              currentTabGoal(tab),
+		GoalStatus:        currentTabGoalStatus(tab),
+		StartupErr:        tab.StartupErr,
+		Active:            active,
+		Cwd:               tab.WorkspaceRoot,
 	}
 	if tab.Scope == "global" {
 		m.ProjectColor = globalProjectColor()
@@ -318,13 +503,14 @@ func (a *App) OpenProjectTab(workspaceRoot, topicID string) (TabMeta, error) {
 	tabID := a.newUniqueTabIDLocked()
 	topicTitle := topicTitleForTab("project", workspaceRoot, topicID)
 	tab := &WorkspaceTab{
-		ID:            tabID,
-		Scope:         "project",
-		WorkspaceRoot: workspaceRoot,
-		TopicID:       topicID,
-		TopicTitle:    topicTitle,
-		mode:          "normal",
-		disabledMCP:   map[string]ServerView{},
+		ID:               tabID,
+		Scope:            "project",
+		WorkspaceRoot:    workspaceRoot,
+		TopicID:          topicID,
+		TopicTitle:       topicTitle,
+		mode:             "normal",
+		toolApprovalMode: control.ToolApprovalAsk,
+		disabledMCP:      map[string]ServerView{},
 	}
 	tab.sink = &tabEventSink{tabID: tabID, app: a}
 
@@ -361,13 +547,14 @@ func (a *App) OpenGlobalTab(topicID string) (TabMeta, error) {
 	tabID := a.newUniqueTabIDLocked()
 	topicTitle := topicTitleForTab("global", "", topicID)
 	tab := &WorkspaceTab{
-		ID:            tabID,
-		Scope:         "global",
-		WorkspaceRoot: globalRoot,
-		TopicID:       topicID,
-		TopicTitle:    topicTitle,
-		mode:          "normal",
-		disabledMCP:   map[string]ServerView{},
+		ID:               tabID,
+		Scope:            "global",
+		WorkspaceRoot:    globalRoot,
+		TopicID:          topicID,
+		TopicTitle:       topicTitle,
+		mode:             "normal",
+		toolApprovalMode: control.ToolApprovalAsk,
+		disabledMCP:      map[string]ServerView{},
 	}
 	tab.sink = &tabEventSink{tabID: tabID, app: a}
 
@@ -553,6 +740,8 @@ func (a *App) buildTabController(tab *WorkspaceTab) {
 	a.bindControllerDisplayRecorder(ctrl)
 	ctrl.EnableInteractiveApproval()
 	applyTabModeToController(ctrl, tab.mode)
+	applyTabToolApprovalModeToController(ctrl, tab.toolApprovalMode)
+	ctrl.SetGoal(tab.goal)
 
 	if dir := ctrl.SessionDir(); dir != "" {
 		migratedTopics := migrateLegacySessionsIntoGlobalTopics(dir)
@@ -603,9 +792,10 @@ func (a *App) buildTabController(tab *WorkspaceTab) {
 			}
 			// Restore existing telemetry if resuming a session.
 			telemetryPath := path + ".telemetry.json"
-			if records := loadTelemetry(telemetryPath); len(records) > 0 {
+			if snapshot := loadTelemetry(telemetryPath); len(snapshot.ReadFiles) > 0 || snapshot.Usage.RequestCount > 0 {
 				tab.telemMu.Lock()
-				tab.readTelemetry = records
+				tab.readTelemetry = snapshot.ReadFiles
+				tab.usageTelemetry = snapshot.Usage
 				tab.telemMu.Unlock()
 			}
 		}
@@ -856,6 +1046,7 @@ func topicTitleFromText(text string) string {
 
 const desktopProjectsFile = "desktop-projects.json"
 const tabsFileName = "desktop-tabs.json"
+const desktopGlobalOrderToken = "__global__"
 
 type desktopProject struct {
 	Root   string   `json:"root"`
@@ -868,18 +1059,21 @@ type desktopProjectFile struct {
 	GlobalTitle  string           `json:"globalTitle,omitempty"`
 	GlobalColor  string           `json:"globalColor,omitempty"`
 	GlobalTopics []string         `json:"globalTopics,omitempty"`
+	SidebarOrder []string         `json:"sidebarOrder,omitempty"`
 	Projects     []desktopProject `json:"projects"`
 }
 
 type desktopTabEntry struct {
-	ID            string  `json:"id"`
-	Scope         string  `json:"scope"`
-	WorkspaceRoot string  `json:"workspaceRoot"`
-	TopicID       string  `json:"topicId"`
-	SessionPath   string  `json:"sessionPath,omitempty"`
-	Model         string  `json:"model,omitempty"`
-	Effort        *string `json:"effort,omitempty"`
-	Mode          string  `json:"mode,omitempty"`
+	ID               string  `json:"id"`
+	Scope            string  `json:"scope"`
+	WorkspaceRoot    string  `json:"workspaceRoot"`
+	TopicID          string  `json:"topicId"`
+	SessionPath      string  `json:"sessionPath,omitempty"`
+	Model            string  `json:"model,omitempty"`
+	Effort           *string `json:"effort,omitempty"`
+	Mode             string  `json:"mode,omitempty"`
+	Goal             string  `json:"goal,omitempty"`
+	ToolApprovalMode string  `json:"toolApprovalMode,omitempty"`
 }
 
 type desktopTabsFile struct {
@@ -903,14 +1097,16 @@ func (a *App) saveTabsLocked() {
 	for _, id := range a.orderedTabIDsLocked() {
 		if tab := a.tabs[id]; tab != nil {
 			entries = append(entries, desktopTabEntry{
-				ID:            tab.ID,
-				Scope:         tab.Scope,
-				WorkspaceRoot: tab.WorkspaceRoot,
-				TopicID:       tab.TopicID,
-				SessionPath:   tab.currentSessionPath(),
-				Model:         tab.model,
-				Effort:        cloneStringPtr(tab.effort),
-				Mode:          persistedTabMode(currentTabMode(tab)),
+				ID:               tab.ID,
+				Scope:            tab.Scope,
+				WorkspaceRoot:    tab.WorkspaceRoot,
+				TopicID:          tab.TopicID,
+				SessionPath:      tab.currentSessionPath(),
+				Model:            tab.model,
+				Effort:           cloneStringPtr(tab.effort),
+				Mode:             persistedTabMode(currentTabMode(tab)),
+				Goal:             strings.TrimSpace(currentTabGoal(tab)),
+				ToolApprovalMode: persistedToolApprovalMode(currentTabToolApprovalMode(tab)),
 			})
 		}
 	}
@@ -1033,6 +1229,35 @@ func normalizeProjectsFile(f desktopProjectFile) desktopProjectFile {
 		index[root] = len(out.Projects)
 		out.Projects = append(out.Projects, p)
 	}
+	out.SidebarOrder = normalizeSidebarOrder(f.SidebarOrder, out.Projects)
+	return out
+}
+
+func normalizeSidebarOrder(order []string, projects []desktopProject) []string {
+	projectRoots := make(map[string]bool, len(projects))
+	for _, project := range projects {
+		if project.Root != "" {
+			projectRoots[project.Root] = true
+		}
+	}
+	seen := make(map[string]bool, len(order))
+	out := make([]string, 0, len(order))
+	for _, value := range order {
+		value = strings.TrimSpace(value)
+		if value == desktopGlobalOrderToken {
+			if !seen[value] {
+				seen[value] = true
+				out = append(out, value)
+			}
+			continue
+		}
+		root := normalizeProjectRoot(value)
+		if root == "" || !projectRoots[root] || seen[root] {
+			continue
+		}
+		seen[root] = true
+		out = append(out, root)
+	}
 	return out
 }
 
@@ -1093,6 +1318,58 @@ func orderedTopicIDs(explicit []string, titleMap map[string]string) []string {
 	return append(out, remaining...)
 }
 
+func projectTreeOrderKey(node ProjectNode) string {
+	switch node.Kind {
+	case "global_folder":
+		return desktopGlobalOrderToken
+	case "project":
+		return normalizeProjectRoot(node.Root)
+	default:
+		return ""
+	}
+}
+
+func applyProjectTreeOrder(nodes []ProjectNode, order []string) []ProjectNode {
+	if len(order) == 0 {
+		return nodes
+	}
+	byKey := make(map[string]ProjectNode, len(nodes))
+	for _, node := range nodes {
+		key := projectTreeOrderKey(node)
+		if key != "" {
+			byKey[key] = node
+		}
+	}
+	seen := make(map[string]bool, len(nodes))
+	out := make([]ProjectNode, 0, len(nodes))
+	for _, value := range order {
+		key := strings.TrimSpace(value)
+		if key != desktopGlobalOrderToken {
+			key = normalizeProjectRoot(key)
+		}
+		if key == "" || seen[key] {
+			continue
+		}
+		node, ok := byKey[key]
+		if !ok {
+			continue
+		}
+		seen[key] = true
+		out = append(out, node)
+	}
+	for _, node := range nodes {
+		key := projectTreeOrderKey(node)
+		if key != "" && seen[key] {
+			continue
+		}
+		if key != "" {
+			seen[key] = true
+		}
+		out = append(out, node)
+	}
+	return out
+}
+
 func projectDisplayName(p desktopProject) string {
 	if title := strings.TrimSpace(p.Title); title != "" {
 		return title
@@ -1217,6 +1494,7 @@ func projectTitle(root string) string {
 const (
 	topicTitlesFile        = "desktop-topic-titles.json"
 	topicTitleSourcesFile  = "desktop-topic-title-sources.json"
+	topicCreatedAtsFile    = "desktop-topic-created-at.json"
 	defaultTopicTitle      = "新的会话"
 	topicTitleSourceAuto   = "auto"
 	topicTitleSourceManual = "manual"
@@ -1236,6 +1514,13 @@ func topicTitleSourcesPath(workspaceRoot string) string {
 	return filepath.Join(workspaceRoot, ".reasonix", topicTitleSourcesFile)
 }
 
+func topicCreatedAtsPath(workspaceRoot string) string {
+	if workspaceRoot == "" {
+		return filepath.Join(desktopConfigDir(), "global", topicCreatedAtsFile)
+	}
+	return filepath.Join(workspaceRoot, ".reasonix", topicCreatedAtsFile)
+}
+
 func loadTopicTitles(workspaceRoot string) map[string]string {
 	m := map[string]string{}
 	b, err := os.ReadFile(topicTitlesPath(workspaceRoot))
@@ -1256,6 +1541,16 @@ func loadTopicTitleSources(workspaceRoot string) map[string]string {
 	return m
 }
 
+func loadTopicCreatedAts(workspaceRoot string) map[string]int64 {
+	m := map[string]int64{}
+	b, err := os.ReadFile(topicCreatedAtsPath(workspaceRoot))
+	if err != nil {
+		return m
+	}
+	json.Unmarshal(b, &m)
+	return m
+}
+
 func saveTopicTitles(workspaceRoot string, m map[string]string) error {
 	b, err := json.MarshalIndent(m, "", "  ")
 	if err != nil {
@@ -1288,6 +1583,22 @@ func saveTopicTitleSources(workspaceRoot string, m map[string]string) error {
 	return os.Rename(tmp, path)
 }
 
+func saveTopicCreatedAts(workspaceRoot string, m map[string]int64) error {
+	b, err := json.MarshalIndent(m, "", "  ")
+	if err != nil {
+		return err
+	}
+	path := topicCreatedAtsPath(workspaceRoot)
+	if err := os.MkdirAll(filepath.Dir(path), 0o755); err != nil {
+		return err
+	}
+	tmp := path + ".tmp"
+	if err := os.WriteFile(tmp, b, 0o644); err != nil {
+		return err
+	}
+	return os.Rename(tmp, path)
+}
+
 func loadTopicTitle(workspaceRoot, topicID string) string {
 	return loadTopicTitles(workspaceRoot)[topicID]
 }
@@ -1296,6 +1607,10 @@ func loadTopicTitleSource(workspaceRoot, topicID string) string {
 	return loadTopicTitleSources(workspaceRoot)[topicID]
 }
 
+func loadTopicCreatedAt(workspaceRoot, topicID string) int64 {
+	return loadTopicCreatedAts(workspaceRoot)[topicID]
+}
+
 func topicTitleForTab(scope, workspaceRoot, topicID string) string {
 	titleRoot := topicTitleRoot(scope, workspaceRoot)
 	if title := strings.TrimSpace(loadTopicTitle(titleRoot, topicID)); title != "" {
@@ -1359,6 +1674,23 @@ func setTopicTitleSource(workspaceRoot, topicID, source string) error {
 	return saveTopicTitleSources(workspaceRoot, sources)
 }
 
+func setTopicCreatedAt(workspaceRoot, topicID string, createdAt int64) error {
+	created := loadTopicCreatedAts(workspaceRoot)
+	topicID = strings.TrimSpace(topicID)
+	if topicID == "" || createdAt <= 0 {
+		delete(created, topicID)
+	} else {
+		created[topicID] = createdAt
+	}
+	return saveTopicCreatedAts(workspaceRoot, created)
+}
+
+func deleteTopicCreatedAt(workspaceRoot, topicID string) {
+	created := loadTopicCreatedAts(workspaceRoot)
+	delete(created, topicID)
+	_ = saveTopicCreatedAts(workspaceRoot, created)
+}
+
 // topicIndexMu serializes recovery writes to desktop-projects.json and topic
 // title indexes. Startup builds restored tabs concurrently, and each tab may
 // repair its missing index.
@@ -1422,8 +1754,14 @@ func (a *App) tabTelemetryPath(tabID string) string {
 	return sp + ".telemetry.json"
 }
 
-func saveTelemetry(path string, records []readFileRecord) error {
-	b, err := json.MarshalIndent(records, "", "  ")
+func saveTelemetry(path string, snapshot tabTelemetrySnapshot) error {
+	if snapshot.Version == 0 {
+		snapshot.Version = 2
+	}
+	if snapshot.ReadFiles == nil {
+		snapshot.ReadFiles = []readFileRecord{}
+	}
+	b, err := json.MarshalIndent(snapshot, "", "  ")
 	if err != nil {
 		return err
 	}
@@ -1434,17 +1772,26 @@ func saveTelemetry(path string, records []readFileRecord) error {
 	return os.Rename(tmp, path)
 }
 
-func loadTelemetry(path string) []readFileRecord {
+func loadTelemetry(path string) tabTelemetrySnapshot {
 	b, err := os.ReadFile(path)
 	if err != nil {
-		return []readFileRecord{}
+		return tabTelemetrySnapshot{Version: 2, ReadFiles: []readFileRecord{}}
+	}
+	var snapshot tabTelemetrySnapshot
+	if err := json.Unmarshal(b, &snapshot); err == nil && (snapshot.Version > 0 || snapshot.ReadFiles != nil) {
+		if snapshot.ReadFiles == nil {
+			snapshot.ReadFiles = []readFileRecord{}
+		}
+		if snapshot.Usage.SessionCost == 0 && snapshot.Usage.SessionCostUsd > 0 {
+			snapshot.Usage.SessionCost = snapshot.Usage.SessionCostUsd
+		}
+		return snapshot
 	}
 	var records []readFileRecord
-	json.Unmarshal(b, &records)
-	if records == nil {
-		return []readFileRecord{}
+	if err := json.Unmarshal(b, &records); err != nil || records == nil {
+		records = []readFileRecord{}
 	}
-	return records
+	return tabTelemetrySnapshot{Version: 1, ReadFiles: records}
 }
 
 // --- project tree -----------------------------------------------------------
@@ -1459,12 +1806,65 @@ type ProjectNode struct {
 	TopicID        string        `json:"topicId,omitempty"`
 	ProjectColor   string        `json:"projectColor,omitempty"`
 	Turns          int           `json:"turns,omitempty"`
+	CreatedAt      int64         `json:"createdAt,omitempty"`
 	LastActivityAt int64         `json:"lastActivityAt,omitempty"`
 	Open           bool          `json:"open,omitempty"`
 	Running        bool          `json:"running,omitempty"`
+	Status         string        `json:"status,omitempty"`
 	Children       []ProjectNode `json:"children,omitempty"`
 }
 
+func normalizeTopicStatus(status string) string {
+	switch status {
+	case topicStatusThinking, topicStatusStreaming, topicStatusWaitingConfirmation, topicStatusPaused, topicStatusError:
+		return status
+	default:
+		return ""
+	}
+}
+
+func topicStatusPriority(status string) int {
+	switch normalizeTopicStatus(status) {
+	case topicStatusWaitingConfirmation:
+		return 60
+	case topicStatusStreaming:
+		return 40
+	case topicStatusThinking:
+		return 30
+	case topicStatusPaused:
+		return 20
+	case topicStatusError:
+		return 10
+	default:
+		return 0
+	}
+}
+
+func mergeTopicStatus(current, candidate string) string {
+	if topicStatusPriority(candidate) > topicStatusPriority(current) {
+		return normalizeTopicStatus(candidate)
+	}
+	return normalizeTopicStatus(current)
+}
+
+func activityStatusForTab(tab *WorkspaceTab) string {
+	if tab == nil {
+		return ""
+	}
+	status := normalizeTopicStatus(tab.ActivityStatus)
+	running := tab.Ctrl != nil && tab.Ctrl.Running()
+	if running {
+		if status == "" || status == topicStatusError {
+			return topicStatusThinking
+		}
+		return status
+	}
+	if status == topicStatusError || status == topicStatusPaused {
+		return status
+	}
+	return ""
+}
+
 // migrateLegacySessionsIntoGlobalTopics makes pre-topic desktop history visible
 // in the v2 sidebar. Imported v0.x sessions and older desktop sessions are plain
 // .jsonl files, sometimes with branch metadata but no topic metadata; the
@@ -1685,6 +2085,7 @@ func (a *App) CreateTopic(scope, workspaceRoot, title string) (TopicMeta, error)
 		titleSource = topicTitleSourceAuto
 	}
 	topicID := newTopicID()
+	createdAt := time.Now().UnixMilli()
 	if scope == "global" {
 		workspaceRoot = ""
 	}
@@ -1697,6 +2098,9 @@ func (a *App) CreateTopic(scope, workspaceRoot, title string) (TopicMeta, error)
 	if err := setTopicTitleWithSource(workspaceRoot, topicID, trimmedTitle, titleSource); err != nil {
 		return TopicMeta{}, err
 	}
+	if err := setTopicCreatedAt(workspaceRoot, topicID, createdAt); err != nil {
+		return TopicMeta{}, err
+	}
 	// New topics should appear first in their project/global group so the item
 	// just created is immediately visible and selected in the sidebar.
 	f := loadProjectsFile()
@@ -1713,7 +2117,7 @@ func (a *App) CreateTopic(scope, workspaceRoot, title string) (TopicMeta, error)
 		}
 	}
 	a.emitProjectTreeChanged()
-	return TopicMeta{ID: topicID, Title: trimmedTitle, CreatedAt: time.Now().UnixMilli()}, nil
+	return TopicMeta{ID: topicID, Title: trimmedTitle, CreatedAt: createdAt}, nil
 }
 
 // RenameProject updates the sidebar-only display title for a project folder.
@@ -1736,19 +2140,29 @@ func (a *App) SetProjectColor(workspaceRoot, color string) error {
 	return nil
 }
 
-// ReorderProjects persists the user-defined order of project folders.
+// ReorderProjects persists the user-defined order of project folders and,
+// when present, the virtual Global sidebar section.
 func (a *App) ReorderProjects(workspaceRoots []string) error {
 	f := loadProjectsFile()
-	if len(workspaceRoots) != len(f.Projects) {
-		return fmt.Errorf("project order length mismatch")
-	}
 	byRoot := make(map[string]desktopProject, len(f.Projects))
 	for _, project := range f.Projects {
 		byRoot[project.Root] = project
 	}
 	seen := make(map[string]bool, len(workspaceRoots))
 	next := make([]desktopProject, 0, len(workspaceRoots))
+	sidebarOrder := make([]string, 0, len(workspaceRoots))
+	hasGlobalOrder := false
 	for _, root := range workspaceRoots {
+		root = strings.TrimSpace(root)
+		if root == desktopGlobalOrderToken {
+			if seen[root] {
+				return fmt.Errorf("duplicate global section")
+			}
+			seen[root] = true
+			hasGlobalOrder = true
+			sidebarOrder = append(sidebarOrder, root)
+			continue
+		}
 		root = normalizeProjectRoot(root)
 		project, ok := byRoot[root]
 		if !ok {
@@ -1759,8 +2173,17 @@ func (a *App) ReorderProjects(workspaceRoots []string) error {
 		}
 		seen[root] = true
 		next = append(next, project)
+		sidebarOrder = append(sidebarOrder, root)
+	}
+	if len(next) != len(f.Projects) {
+		return fmt.Errorf("project order length mismatch")
 	}
 	f.Projects = next
+	if hasGlobalOrder {
+		f.SidebarOrder = sidebarOrder
+	} else {
+		f.SidebarOrder = nil
+	}
 	if err := saveProjectsFile(f); err != nil {
 		return err
 	}
@@ -1882,6 +2305,21 @@ func (a *App) updateTopicSessionTitles(topicID, title string) {
 	}
 }
 
+func (a *App) setTabActivityStatus(tabID, status string) bool {
+	a.mu.Lock()
+	defer a.mu.Unlock()
+	tab := a.tabs[tabID]
+	if tab == nil {
+		return false
+	}
+	status = normalizeTopicStatus(status)
+	if tab.ActivityStatus == status {
+		return false
+	}
+	tab.ActivityStatus = status
+	return true
+}
+
 func (a *App) emitProjectTreeChanged() {
 	if a.ctx != nil {
 		runtime.EventsEmit(a.ctx, "project-tree:changed")
@@ -1900,6 +2338,7 @@ func (a *App) DeleteTopic(topicID string) error {
 			sources := loadTopicTitleSources(p.Root)
 			delete(sources, topicID)
 			_ = saveTopicTitleSources(p.Root, sources)
+			deleteTopicCreatedAt(p.Root, topicID)
 			found = true
 			break
 		}
@@ -1912,6 +2351,7 @@ func (a *App) DeleteTopic(topicID string) error {
 			sources := loadTopicTitleSources("")
 			delete(sources, topicID)
 			_ = saveTopicTitleSources("", sources)
+			deleteTopicCreatedAt("", topicID)
 			f.GlobalTopics = removeString(f.GlobalTopics, topicID)
 			found = true
 		}
@@ -2081,6 +2521,7 @@ func (a *App) ListProjectTree() []ProjectNode {
 	openTopics := map[string]struct {
 		open    bool
 		running bool
+		status  string
 	}{}
 	a.mu.RLock()
 	for _, tab := range a.tabs {
@@ -2093,13 +2534,15 @@ func (a *App) ListProjectTree() []ProjectNode {
 		if tab.Ctrl != nil && tab.Ctrl.Running() {
 			status.running = true
 		}
+		status.status = mergeTopicStatus(status.status, activityStatusForTab(tab))
 		openTopics[key] = status
 	}
 	a.mu.RUnlock()
 
 	// Global section.
 	globalTitleMap := loadTopicTitles("")
-	if len(globalTitleMap) > 0 {
+	globalCreatedMap := loadTopicCreatedAts("")
+	if len(globalTitleMap) > 0 || len(f.Projects) == 0 {
 		globalTitle := strings.TrimSpace(f.GlobalTitle)
 		if globalTitle == "" {
 			globalTitle = "Global"
@@ -2118,9 +2561,11 @@ func (a *App) ListProjectTree() []ProjectNode {
 				TopicID:        id,
 				ProjectColor:   globalColor,
 				Turns:          summary.turns,
+				CreatedAt:      globalCreatedMap[id],
 				LastActivityAt: summary.lastActivityAt,
 				Open:           status.open,
 				Running:        status.running,
+				Status:         status.status,
 			})
 		}
 		out = append(out, ProjectNode{
@@ -2147,6 +2592,7 @@ func (a *App) ListProjectTree() []ProjectNode {
 
 		// Gather topics: explicit topic list + all known topic titles.
 		titleMap := loadTopicTitles(p.Root)
+		createdMap := loadTopicCreatedAts(p.Root)
 		topicIDs := orderedTopicIDs(p.Topics, titleMap)
 
 		children := make([]ProjectNode, 0, len(topicIDs))
@@ -2165,9 +2611,11 @@ func (a *App) ListProjectTree() []ProjectNode {
 				TopicID:        tid,
 				ProjectColor:   p.Color,
 				Turns:          summary.turns,
+				CreatedAt:      createdMap[tid],
 				LastActivityAt: summary.lastActivityAt,
 				Open:           status.open,
 				Running:        status.running,
+				Status:         status.status,
 			})
 		}
 		node.Label = title
@@ -2176,7 +2624,7 @@ func (a *App) ListProjectTree() []ProjectNode {
 		out = append(out, node)
 	}
 
-	return out
+	return applyProjectTreeOrder(out, f.SidebarOrder)
 }
 
 func topicSummaryKey(scope, workspaceRoot, topicID string) string {
@@ -2195,9 +2643,12 @@ type ContextPanelInfo struct {
 	ReasoningTokens  int               `json:"reasoningTokens"`
 	CacheHitTokens   int               `json:"cacheHitTokens"`
 	CacheMissTokens  int               `json:"cacheMissTokens"`
+	RequestCount     int               `json:"requestCount"`
+	ElapsedMs        int64             `json:"elapsedMs"`
 	SessionCost      float64           `json:"sessionCost"`
 	SessionCurrency  string            `json:"sessionCurrency,omitempty"`
 	SessionCostUsd   float64           `json:"sessionCostUsd,omitempty"`
+	Mock             bool              `json:"mock,omitempty"`
 	ReadFiles        []readFileRecord  `json:"readFiles"`
 	ChangedFiles     []ChangedFileInfo `json:"changedFiles"`
 }
@@ -2233,9 +2684,21 @@ func (a *App) ContextPanel(tabID string) ContextPanelInfo {
 		info.WindowTokens = window
 	}
 
-	if records := tab.readTelemetrySnapshot(); records != nil {
+	telemetry := tab.telemetrySnapshot()
+	if records := telemetry.ReadFiles; records != nil {
 		info.ReadFiles = records
 	}
+	usage := telemetry.Usage
+	info.PromptTokens = usage.PromptTokens
+	info.CompletionTokens = usage.CompletionTokens
+	info.ReasoningTokens = usage.ReasoningTokens
+	info.CacheHitTokens = usage.CacheHitTokens
+	info.CacheMissTokens = usage.CacheMissTokens
+	info.RequestCount = usage.RequestCount
+	info.ElapsedMs = usage.ElapsedMs
+	info.SessionCost = usage.SessionCost
+	info.SessionCurrency = usage.SessionCurrency
+	info.SessionCostUsd = usage.SessionCostUsd
 
 	// Gather workspace changes for this tab's root.
 	if ctrl != nil && tab.WorkspaceRoot != "" {
@@ -2279,35 +2742,130 @@ func (a *App) restoredTabIDLocked(id string) string {
 
 func normalizeTabMode(mode string) string {
 	switch mode {
-	case "plan", "yolo":
+	case "plan", "yolo", "plan-yolo", "yolo-plan":
+		if mode == "yolo-plan" {
+			return "plan-yolo"
+		}
 		return mode
 	default:
 		return "normal"
 	}
 }
 
+func tabModeFromAxes(plan, autoApproveTools bool) string {
+	switch {
+	case plan && autoApproveTools:
+		return "plan-yolo"
+	case plan:
+		return "plan"
+	case autoApproveTools:
+		return "yolo"
+	default:
+		return "normal"
+	}
+}
+
+func tabModeHasPlan(mode string) bool {
+	switch normalizeTabMode(mode) {
+	case "plan", "plan-yolo":
+		return true
+	default:
+		return false
+	}
+}
+
+func tabModeHasAutoApproveTools(mode string) bool {
+	switch normalizeTabMode(mode) {
+	case "yolo", "plan-yolo":
+		return true
+	default:
+		return false
+	}
+}
+
 func currentTabMode(tab *WorkspaceTab) string {
 	if tab == nil {
 		return "normal"
 	}
 	if tab.Ctrl != nil {
-		if tab.Ctrl.Bypass() {
-			return "yolo"
-		}
-		if tab.Ctrl.PlanMode() {
-			return "plan"
-		}
-		return "normal"
+		return tabModeFromAxes(tab.Ctrl.PlanMode(), tab.Ctrl.AutoApproveTools())
 	}
 	return normalizeTabMode(tab.mode)
 }
 
+func currentTabGoal(tab *WorkspaceTab) string {
+	if tab == nil {
+		return ""
+	}
+	if tab.Ctrl != nil {
+		return tab.Ctrl.Goal()
+	}
+	return strings.TrimSpace(tab.goal)
+}
+
+func currentTabGoalStatus(tab *WorkspaceTab) string {
+	if tab == nil {
+		return control.GoalStatusStopped
+	}
+	if tab.Ctrl != nil {
+		return tab.Ctrl.GoalStatus()
+	}
+	if strings.TrimSpace(tab.goal) != "" {
+		return control.GoalStatusRunning
+	}
+	return control.GoalStatusStopped
+}
+
+func currentTabCollaborationMode(tab *WorkspaceTab) string {
+	if tab == nil {
+		return "normal"
+	}
+	if tab.Ctrl != nil && tab.Ctrl.PlanMode() {
+		return "plan"
+	}
+	if strings.TrimSpace(currentTabGoal(tab)) != "" && currentTabGoalStatus(tab) == control.GoalStatusRunning {
+		return "goal"
+	}
+	return "normal"
+}
+
+func currentTabToolApprovalMode(tab *WorkspaceTab) string {
+	if tab == nil {
+		return control.ToolApprovalAsk
+	}
+	if tab.Ctrl != nil {
+		return tab.Ctrl.ToolApprovalMode()
+	}
+	return normalizeToolApprovalMode(tab.toolApprovalMode)
+}
+
+func normalizeToolApprovalMode(mode string) string {
+	switch strings.ToLower(strings.TrimSpace(mode)) {
+	case control.ToolApprovalAuto:
+		return control.ToolApprovalAuto
+	case control.ToolApprovalYolo, "full", "full-access", "bypass":
+		return control.ToolApprovalYolo
+	default:
+		return control.ToolApprovalAsk
+	}
+}
+
+func persistedToolApprovalMode(mode string) string {
+	switch normalizeToolApprovalMode(mode) {
+	case control.ToolApprovalAuto, control.ToolApprovalYolo:
+		return normalizeToolApprovalMode(mode)
+	default:
+		return ""
+	}
+}
+
 // persistedTabMode is the composer mode saved with a tab so it survives reload
-// and app relaunch. plan and yolo are both remembered (a restored yolo tab keeps
-// its status-bar indicator); "normal" is the default and isn't persisted. (#3517)
+// and app relaunch. plan, yolo, and plan-yolo are remembered (a restored yolo
+// tab keeps its status-bar indicator); "normal" is the default and isn't
+// persisted. (#3517)
 func persistedTabMode(mode string) string {
 	switch normalizeTabMode(mode) {
-	case "plan", "yolo":
+	case "plan", "yolo", "plan-yolo":
 		return normalizeTabMode(mode)
 	}
 	return ""
diff --git a/desktop/tabs_telemetry_test.go b/desktop/tabs_telemetry_test.go
new file mode 100644
index 000000000..c68f270a3
--- /dev/null
+++ b/desktop/tabs_telemetry_test.go
@@ -0,0 +1,53 @@
+package main
+
+import (
+	"os"
+	"path/filepath"
+	"testing"
+	"time"
+
+	"reasonix/internal/event"
+	"reasonix/internal/provider"
+)
+
+func TestTelemetryLoadsLegacyReadFileArray(t *testing.T) {
+	path := filepath.Join(t.TempDir(), "session.jsonl.telemetry.json")
+	if err := os.WriteFile(path, []byte(`[{"path":"README.md","turn":2,"time":1000}]`), 0o644); err != nil {
+		t.Fatalf("write legacy telemetry: %v", err)
+	}
+
+	got := loadTelemetry(path)
+	if len(got.ReadFiles) != 1 || got.ReadFiles[0].Path != "README.md" {
+		t.Fatalf("legacy read files = %+v", got.ReadFiles)
+	}
+	if got.Usage.RequestCount != 0 {
+		t.Fatalf("legacy usage request count = %d, want 0", got.Usage.RequestCount)
+	}
+}
+
+func TestWorkspaceTabAggregatesSessionUsageTelemetry(t *testing.T) {
+	tab := &WorkspaceTab{}
+	start := time.Now().Add(-2 * time.Second).UnixMilli()
+	tab.recordTurnStarted(start)
+	tab.recordUsage(event.Event{
+		Usage:       &provider.Usage{PromptTokens: 100, CompletionTokens: 40, TotalTokens: 140, CacheHitTokens: 70, CacheMissTokens: 30, ReasoningTokens: 10},
+		SessionHit:  70,
+		SessionMiss: 30,
+		Pricing:     &provider.Pricing{CacheHit: 1, Input: 2, Output: 3, Currency: "¥"},
+	})
+	tab.recordTurnDone(start + 1500)
+
+	got := tab.telemetrySnapshot().Usage
+	if got.RequestCount != 1 || got.PromptTokens != 100 || got.CompletionTokens != 40 || got.ReasoningTokens != 10 {
+		t.Fatalf("usage tokens = %+v", got)
+	}
+	if got.CacheHitTokens != 70 || got.CacheMissTokens != 30 {
+		t.Fatalf("cache tokens = hit %d miss %d", got.CacheHitTokens, got.CacheMissTokens)
+	}
+	if got.ElapsedMs != 1500 {
+		t.Fatalf("elapsed = %d, want 1500", got.ElapsedMs)
+	}
+	if got.SessionCost <= 0 || got.SessionCurrency != "¥" {
+		t.Fatalf("cost = %f %q, want positive ¥", got.SessionCost, got.SessionCurrency)
+	}
+}
diff --git a/desktop/tabs_topic_test.go b/desktop/tabs_topic_test.go
index bd555164c..1371dc3db 100644
--- a/desktop/tabs_topic_test.go
+++ b/desktop/tabs_topic_test.go
@@ -477,6 +477,42 @@ func TestReorderProjectsPersistsSidebarAndWorkspaceOrder(t *testing.T) {
 	}
 }
 
+func TestReorderProjectsPersistsGlobalSidebarOrder(t *testing.T) {
+	isolateDesktopUserDirs(t)
+
+	first := t.TempDir()
+	second := t.TempDir()
+	if err := addProject(first, "First"); err != nil {
+		t.Fatalf("add first project: %v", err)
+	}
+	if err := addProject(second, "Second"); err != nil {
+		t.Fatalf("add second project: %v", err)
+	}
+
+	app := NewApp()
+	if _, err := app.CreateTopic("global", "", "Global note"); err != nil {
+		t.Fatalf("create global topic: %v", err)
+	}
+	if err := app.ReorderProjects([]string{second, desktopGlobalOrderToken, first}); err != nil {
+		t.Fatalf("ReorderProjects with global: %v", err)
+	}
+
+	nodes := app.ListProjectTree()
+	if len(nodes) != 3 {
+		t.Fatalf("project tree len = %d, want 3: %+v", len(nodes), nodes)
+	}
+	if got := []string{nodes[0].Root, nodes[1].Kind, nodes[2].Root}; got[0] != second || got[1] != "global_folder" || got[2] != first {
+		t.Fatalf("project tree order = %v, want [%s global_folder %s]", got, second, first)
+	}
+	workspaces := app.ListWorkspaces()
+	if len(workspaces) != 2 {
+		t.Fatalf("workspaces len = %d, want 2: %+v", len(workspaces), workspaces)
+	}
+	if got := []string{workspaces[0].Path, workspaces[1].Path}; got[0] != second || got[1] != first {
+		t.Fatalf("workspace order = %v, want %v", got, []string{second, first})
+	}
+}
+
 func TestReorderProjectsRejectsInvalidOrder(t *testing.T) {
 	isolateDesktopUserDirs(t)
 
@@ -490,9 +526,10 @@ func TestReorderProjectsRejectsInvalidOrder(t *testing.T) {
 	}
 	app := NewApp()
 	for name, order := range map[string][]string{
-		"missing":   {first},
-		"unknown":   {first, filepath.Join(t.TempDir(), "missing")},
-		"duplicate": {first, first},
+		"missing":          {first},
+		"unknown":          {first, filepath.Join(t.TempDir(), "missing")},
+		"duplicate":        {first, first},
+		"duplicate-global": {desktopGlobalOrderToken, first, desktopGlobalOrderToken, second},
 	} {
 		t.Run(name, func(t *testing.T) {
 			if err := app.ReorderProjects(order); err == nil {
@@ -526,8 +563,8 @@ func TestRemoveWorkspaceUsesSharedProjectRegistryForCurrentProject(t *testing.T)
 	if got := app.ListWorkspaces(); len(got) != 0 {
 		t.Fatalf("workspaces after remove = %+v, want empty", got)
 	}
-	if got := app.ListProjectTree(); len(got) != 0 {
-		t.Fatalf("project tree after remove = %+v, want empty", got)
+	if got := app.ListProjectTree(); len(got) != 1 || got[0].Kind != "global_folder" || len(got[0].Children) != 0 {
+		t.Fatalf("project tree after remove = %+v, want empty Global folder", got)
 	}
 }
 
@@ -603,7 +640,9 @@ func TestCreateTopicDefaultsToAutoNewSessionTitle(t *testing.T) {
 	isolateDesktopUserDirs(t)
 
 	projectRoot := t.TempDir()
+	before := time.Now().UnixMilli()
 	topic, err := NewApp().CreateTopic("project", projectRoot, "")
+	after := time.Now().UnixMilli()
 	if err != nil {
 		t.Fatalf("create topic: %v", err)
 	}
@@ -616,6 +655,16 @@ func TestCreateTopicDefaultsToAutoNewSessionTitle(t *testing.T) {
 	if got := loadTopicTitleSource(projectRoot, topic.ID); got != topicTitleSourceAuto {
 		t.Fatalf("title source = %q, want auto", got)
 	}
+	if got := loadTopicCreatedAt(projectRoot, topic.ID); got < before || got > after {
+		t.Fatalf("createdAt = %d, want between %d and %d", got, before, after)
+	}
+	nodes := NewApp().ListProjectTree()
+	if len(nodes) != 1 || len(nodes[0].Children) != 1 {
+		t.Fatalf("project tree = %#v, want one project with one topic", nodes)
+	}
+	if got := nodes[0].Children[0].CreatedAt; got != topic.CreatedAt {
+		t.Fatalf("project tree createdAt = %d, want %d", got, topic.CreatedAt)
+	}
 }
 
 func TestCreateTopicAppearsFirstInProjectTree(t *testing.T) {
@@ -669,6 +718,18 @@ func TestCreateGlobalTopicAppearsFirstInProjectTree(t *testing.T) {
 	}
 }
 
+func TestListProjectTreeShowsEmptyGlobalWhenNoProjects(t *testing.T) {
+	isolateDesktopUserDirs(t)
+
+	nodes := NewApp().ListProjectTree()
+	if len(nodes) != 1 {
+		t.Fatalf("project tree = %#v, want one Global folder", nodes)
+	}
+	if nodes[0].Kind != "global_folder" || nodes[0].Label != "Global" || len(nodes[0].Children) != 0 {
+		t.Fatalf("project tree = %#v, want empty Global folder", nodes)
+	}
+}
+
 func TestSwitchWorkspaceRegistersDefaultTopicInProjectTree(t *testing.T) {
 	isolateDesktopUserDirs(t)
 
@@ -950,8 +1011,8 @@ func TestRestoreGlobalTopicSessionReindexesProjectTree(t *testing.T) {
 	if _, err := os.Stat(trashPath); err != nil {
 		t.Fatalf("global session should be in trash: %v", err)
 	}
-	if got := app.ListProjectTree(); len(got) != 0 {
-		t.Fatalf("trashed global topic should leave project tree, got %#v", got)
+	if got := app.ListProjectTree(); len(got) != 1 || got[0].Kind != "global_folder" || len(got[0].Children) != 0 {
+		t.Fatalf("trashed global topic should leave empty Global folder, got %#v", got)
 	}
 
 	if err := app.RestoreSession(trashPath); err != nil {
diff --git a/docs/SPEC.md b/docs/SPEC.md
index fcd0e8b42..6f0fb1cab 100644
--- a/docs/SPEC.md
+++ b/docs/SPEC.md
@@ -251,6 +251,40 @@ func (p Policy) Decide(toolName string, readOnly bool, args json.RawMessage) Dec
 - **Relationship to plan mode.** Plan mode (§3.4) is an orthogonal, coarser gate
   that refuses *all* writers regardless of policy; it is checked first. The
   permission layer is the fine-grained, always-on gate underneath it.
+- **User decisions are separate from tool approvals.** Runtime tool approval has
+  three user-facing postures: `ask` ("需要批准"), `auto` ("自动批准"), and
+  `yolo` ("Yolo批准"). `auto` lets the permission policy auto-approve the writer
+  fallback while preserving explicit ask/deny rules; `yolo` skips all tool
+  permission approvals for approval-gated tools such as writers and Bash.
+  Neither posture answers `ask` questions or approves `exit_plan_mode` plans for
+  the user.
+  Auto-plan is also a separate feature flag: when enabled, a complex task may
+  still enter plan mode in any tool approval posture. After a user approves a
+  plan, the controller opens a short `approvedPlanAutoApproveTools` execution
+  window so the model can perform the approved writes without re-prompting; that
+  transient window still does not auto-approve future plans. In headless `ask`
+  execution, any fallback answer is labelled as a model assumption, not as a
+  user decision.
+
+- **Collaboration mode is separate from tool approval.** The desktop composer
+  presents collaboration as `normal` ("正常模式"), `plan` ("计划模式"), and
+  `goal` ("目标模式"). `/goal <objective>` starts an autonomous, session-scoped
+  active goal: the controller prepends goal context to user turns outside the
+  cache-stable system prompt and keeps issuing continuation turns until the
+  model reports completion, repeats the same blocked state three times, the user
+  stops it, or the safety continuation limit is reached. Blocked-state matching
+  is normalized for casing, whitespace, and punctuation so minor wording drift
+  does not reset the audit; restarting a goal begins a fresh blocked audit.
+  `/goal clear` removes it. Switching into plan/normal mode clears the active
+  goal in the desktop UI so the collaboration mode remains one of the three
+  choices, while the underlying tool approval posture is preserved.
+
+| Tool approval posture | Tool approvals | Plan approval | `ask` questions |
+| --- | --- | --- | --- |
+| Need approval / `ask` | Follow permission policy (`Ask` prompts interactively) | Waits for user | Waits for user |
+| Auto approve / `auto` | Writer fallback auto-allowed; explicit ask/deny rules still apply | Waits for user | Waits for user |
+| YOLO approval / `yolo` | Approval prompts auto-allowed unless denied | Waits for user | Waits for user |
+| Approved-plan execution window | Approved plan's tool calls auto-allowed unless denied | Future plans still wait | Waits for user |
 
 Out of the box (`mode = "ask"`, no rules) `reasonix run` behaves exactly as before
 (writers resolve `Ask`→allow with no TTY), while `reasonix chat` now prompts before
diff --git a/go.sum b/go.sum
index 3aa60a3bd..e53d52ae4 100644
--- a/go.sum
+++ b/go.sum
@@ -69,14 +69,30 @@ golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM
 golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo=
 golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8=
 golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.21.0 h1:HLII4xRRTtCRkxYp4HNFF0Js/Og6q2i++KXbg0gHCwM=
 golang.org/x/sync v0.21.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.46.0 h1:noSf2Fq6F8DBgS+LysIkx7rIExoNHJsxOAtPp4rthXw=
 golang.org/x/sys v0.46.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
 golang.org/x/term v0.44.0 h1:0rLvDRCtNj0gZkyIXhCyOb2OAzEhLVqc4B+hrsBhrmc=
 golang.org/x/term v0.44.0/go.mod h1:7ze4MdzUzLXpSAoFP1H0bOI9aXDqveSvatT5vKcFh2Y=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.38.0 h1:sXmwo9DwP3OK9EZ7PqAdaooSGozfl/3a6/xJcbzPRhE=
 golang.org/x/text v0.38.0/go.mod h1:YXZt3QhHUKYT53r2lLKFIVi6Ao1jdzrTR/KQ09qyxF4=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
diff --git a/internal/agent/ask.go b/internal/agent/ask.go
index 6dfb913df..71c360510 100644
--- a/internal/agent/ask.go
+++ b/internal/agent/ask.go
@@ -15,8 +15,9 @@ import (
 // than guessing or asking in prose. The frontend renders selectable options, the
 // user picks, and the choices come back as the tool result. It reaches the user
 // through the Asker carried on the call
-// context (CallContext); with no asker (headless runs) it returns a "decide for
-// yourself" result so an autonomous run never blocks.
+// context (CallContext); with no asker (headless runs) it returns an explicit
+// model-assumption fallback so an autonomous run never blocks or pretends a user
+// answered.
 type AskTool struct{}
 
 func NewAskTool() *AskTool { return &AskTool{} }
@@ -24,7 +25,7 @@ func NewAskTool() *AskTool { return &AskTool{} }
 func (*AskTool) Name() string { return "ask" }
 
 func (*AskTool) Description() string {
-	return "Ask the user one or more multiple-choice questions when you hit a decision that is genuinely theirs to make — one you can't resolve from the request, the code, or sensible defaults. The frontend shows the options for the user to pick; their choices are returned to you. Prefer this over asking in prose for any real fork (which approach, which library, scope). Don't use it for decisions with an obvious default — pick the sensible option and proceed. Each question has a short `header` (a tab label), the `question` text, 2-4 `options` (each a `label` and optional `description`), and `multiSelect` when more than one may apply."
+	return "Ask the user one or more multiple-choice questions when you hit a decision that is genuinely theirs to make — one you can't resolve from the request, the code, or sensible defaults. The frontend shows the options for the user to pick; their choices are returned to you. Prefer this over asking in prose for any real fork (which approach, which library, scope). Don't use it for decisions with an obvious default — pick the sensible option and proceed. Tool-approval modes such as YOLO do not answer these questions for the user. Each question has a short `header` (a tab label), the `question` text, 2-4 `options` (each a `label` and optional `description`; put any recommended option first), and `multiSelect` when more than one may apply."
 }
 
 func (*AskTool) Schema() json.RawMessage {
@@ -116,8 +117,9 @@ func (*AskTool) Execute(ctx context.Context, args json.RawMessage) (string, erro
 
 	_, _, asker, ok := CallContext(ctx)
 	if !ok || asker == nil {
-		// Headless / no interactive user: don't block an autonomous run.
-		return "No interactive user is available to answer; proceed with your best judgment and state the assumption you made.", nil
+		// Headless / no interactive user: don't block an autonomous run, but make
+		// the provenance explicit so the model doesn't treat this as a user choice.
+		return "No interactive user answered. This is a model-assumption fallback, not a user answer. Proceed with your best judgment, state the assumption you made, and prefer the safest reversible option when choices differ in risk.", nil
 	}
 
 	answers, err := asker.Ask(ctx, qs)
diff --git a/internal/agent/ask_test.go b/internal/agent/ask_test.go
index 35d67bb3f..bf4d47b2d 100644
--- a/internal/agent/ask_test.go
+++ b/internal/agent/ask_test.go
@@ -104,3 +104,27 @@ func TestAskToolTrimsPromptAndOptionsBeforePrompting(t *testing.T) {
 		t.Fatalf("option text not trimmed: %+v", q.Options[0])
 	}
 }
+
+func TestAskToolHeadlessFallbackIsExplicitModelAssumption(t *testing.T) {
+	out, err := NewAskTool().Execute(context.Background(), []byte(`{
+		"questions":[{
+			"header":"Direction",
+			"question":"Which path?",
+			"options":[
+				{"label":"Keep going"},
+				{"label":"Stop"}
+			]
+		}]
+	}`))
+	if err != nil {
+		t.Fatalf("Execute: %v", err)
+	}
+	for _, want := range []string{"No interactive user answered", "model-assumption fallback", "not a user answer"} {
+		if !strings.Contains(out, want) {
+			t.Fatalf("headless fallback = %q, want it to contain %q", out, want)
+		}
+	}
+	if strings.Contains(out, "The user answered") {
+		t.Fatalf("headless fallback must not be formatted as a user answer: %q", out)
+	}
+}
diff --git a/internal/cli/chat_tui.go b/internal/cli/chat_tui.go
index 2b058f450..110290336 100644
--- a/internal/cli/chat_tui.go
+++ b/internal/cli/chat_tui.go
@@ -85,9 +85,9 @@ type chatTUI struct {
 	// Persists across turns until the work completes or a new session starts.
 	todoArgs string
 
-	// planMode mirrors the agent's read-only gate (Shift+Tab cycles it). The marker
-	// rides in outgoing user messages so the cache-stable prompt prefix is left
-	// untouched.
+	// planMode mirrors the agent's read-only gate (Shift+Tab toggles it). The
+	// marker rides in outgoing user messages so the cache-stable prompt prefix is
+	// left untouched.
 	planMode bool
 
 	// pendingInterject queues input typed while a turn runs; each TurnDone
@@ -2056,35 +2056,30 @@ func (m chatTUI) View() tea.View {
 	}
 
 	var modeTag string
-	switch {
-	case shellMode:
+	if shellMode {
 		modeTag = lipgloss.NewStyle().
 			Background(lipgloss.Color(statusShellColor.hex)).
 			Foreground(lipgloss.Color("#ffffff")).
 			Bold(true).
 			Padding(0, 1).
 			Render("Shell")
-	case m.ctrl.Bypass():
-		modeTag = lipgloss.NewStyle().
-			Background(lipgloss.Color(statusYoloColor.hex)).
-			Foreground(lipgloss.Color("#ffffff")).
-			Bold(true).
-			Padding(0, 1).
-			Render("YOLO")
-	case m.planMode:
-		modeTag = lipgloss.NewStyle().
-			Background(lipgloss.Color(statusPlanColor.hex)).
-			Foreground(lipgloss.Color("#ffffff")).
-			Bold(true).
-			Padding(0, 1).
-			Render("Plan")
-	default:
+	} else {
+		color := statusAutoColor
+		foreground := "#111827"
+		switch {
+		case m.ctrl.AutoApproveTools():
+			color = statusYoloColor
+			foreground = "#ffffff"
+		case m.planMode:
+			color = statusPlanColor
+			foreground = "#ffffff"
+		}
 		modeTag = lipgloss.NewStyle().
-			Background(lipgloss.Color(statusAutoColor.hex)).
-			Foreground(lipgloss.Color("#111827")).
+			Background(lipgloss.Color(color.hex)).
+			Foreground(lipgloss.Color(foreground)).
 			Bold(true).
 			Padding(0, 1).
-			Render("Auto")
+			Render(m.modeTagText())
 	}
 
 	ctxTag := m.contextTag()
@@ -2108,7 +2103,7 @@ func (m chatTUI) View() tea.View {
 		status = "  " + modeTag + " · " + i18n.M.ChatStatusToolApproval
 	case shellMode:
 		status = "  " + modeTag + " · " + i18n.M.ShellModeHint
-	case m.ctrl.Bypass():
+	case m.ctrl.AutoApproveTools():
 		status = "  " + modeTag + " · " + i18n.M.ChatStatusYoloIdle + " " + dim("("+i18n.M.ChatStatusCycleHint+")")
 	default:
 		status = "  " + modeTag + " · " + i18n.M.ChatStatusIdle + " " + dim("("+i18n.M.ChatStatusCycleHint+")")
@@ -2845,21 +2840,32 @@ func pastedFileRef(content string) (string, bool) {
 	return "@" + path, true
 }
 
-// cycleMode advances the input mode normal → plan → YOLO → normal (Shift+Tab),
-// mirroring the desktop composer. plan is read-only; YOLO
-// auto-approves every tool call for the session (deny rules still apply). The
-// status line's mode tag ([auto]/[plan]/[YOLO]) reflects the result.
+// cycleMode toggles plan mode (Shift+Tab), mirroring the desktop composer.
+// YOLO/full access is controlled explicitly by the startup flag/runtime binding
+// so the shortcut never crosses a permission boundary.
 func (m *chatTUI) cycleMode() {
+	m.planMode = !m.planMode
+	if m.planMode {
+		m.ctrl.ClearGoal()
+	}
+	m.ctrl.SetPlanMode(m.planMode)
+}
+
+func (m chatTUI) modeTagText() string {
+	goalMode := strings.TrimSpace(m.ctrl.Goal()) != "" && m.ctrl.GoalStatus() == control.GoalStatusRunning
 	switch {
-	case m.ctrl.Bypass():
-		m.ctrl.SetBypass(false) // YOLO → normal
+	case m.planMode && m.ctrl.AutoApproveTools():
+		return "Plan+YOLO"
+	case goalMode && m.ctrl.AutoApproveTools():
+		return "Goal+YOLO"
+	case m.ctrl.AutoApproveTools():
+		return "YOLO"
 	case m.planMode:
-		m.planMode = false
-		m.ctrl.SetPlanMode(false)
-		m.ctrl.SetBypass(true) // plan → YOLO
+		return "Plan"
+	case goalMode:
+		return "Goal"
 	default:
-		m.planMode = true
-		m.ctrl.SetPlanMode(true) // normal → plan
+		return "Auto"
 	}
 }
 
@@ -3245,6 +3251,8 @@ func (m *chatTUI) runSlashCommand(input string) tea.Cmd {
 	case "/memory":
 		m.echoLocalCommand(input)
 		m.showMemory()
+	case "/goal":
+		return m.runGoalSubcommand(input)
 	case "/remember":
 		note := strings.TrimSpace(strings.TrimPrefix(input, cmd))
 		if note == "" {
@@ -3271,6 +3279,36 @@ func (m *chatTUI) runSlashCommand(input string) tea.Cmd {
 	return nil
 }
 
+func (m *chatTUI) runGoalSubcommand(input string) tea.Cmd {
+	cmd, ok := control.ParseGoalCommand(input)
+	if !ok {
+		m.echoLocalCommand(input)
+		m.notice(i18n.M.GoalEmpty)
+		return nil
+	}
+	switch cmd.Action {
+	case control.GoalCommandSet:
+		m.planMode = false
+		m.ctrl.SetPlanMode(false)
+		m.ctrl.SetGoal(cmd.Text)
+		m.notice(fmt.Sprintf(i18n.M.GoalSetFmt, control.ShortGoalForNotice(cmd.Text)))
+		return m.startTurn("Start pursuing the active goal now.", input, input)
+	case control.GoalCommandClear:
+		m.echoLocalCommand(input)
+		m.ctrl.ClearGoal()
+		m.notice(i18n.M.GoalCleared)
+	default:
+		m.echoLocalCommand(input)
+		goal := m.ctrl.Goal()
+		if strings.TrimSpace(goal) == "" {
+			m.notice(i18n.M.GoalEmpty)
+		} else {
+			m.notice(fmt.Sprintf(i18n.M.GoalCurrentFmt, goal))
+		}
+	}
+	return nil
+}
+
 func (m *chatTUI) echoLocalCommand(input string) {
 	input = strings.TrimSpace(input)
 	if input == "" {
diff --git a/internal/cli/cli.go b/internal/cli/cli.go
index 938d2b2ce..da9ddc21e 100644
--- a/internal/cli/cli.go
+++ b/internal/cli/cli.go
@@ -361,7 +361,7 @@ func chatREPL(args []string) int {
 	cont := fs.Bool("continue", false, "resume the most recent saved session")
 	fs.BoolVar(cont, "c", false, "shorthand for --continue")
 	resume := fs.Bool("resume", false, "list saved sessions and pick one to resume")
-	yolo := fs.Bool("dangerously-skip-permissions", false, "YOLO: auto-approve every tool call this session (deny rules still apply)")
+	yolo := fs.Bool("dangerously-skip-permissions", false, "YOLO: auto-approve approval-gated tool calls this session (deny rules still apply; ask questions and plan approvals still wait for you)")
 	fs.BoolVar(yolo, "yolo", false, "alias for --dangerously-skip-permissions")
 	dir := fs.String("dir", "", "change to this directory first (project root); config, sandbox and file tools resolve from here")
 	if err := fs.Parse(args); err != nil {
@@ -462,9 +462,10 @@ func chatREPL(args []string) int {
 	// event and blocks until the user answers via ctrl.Approve. Sub-agents (the
 	// task tool) keep their headless gate from setup — no UI to prompt through.
 	ctrl.EnableInteractiveApproval()
-	// YOLO: skip every approval prompt for the session (deny rules still apply).
+	// YOLO: skip every tool approval request for the session (deny rules still
+	// apply; ask questions and plan approvals still wait for the user).
 	if *yolo {
-		ctrl.SetBypass(true)
+		ctrl.SetAutoApproveTools(true)
 	}
 
 	m := newChatTUI(ctrl, missing, eventCh, termW)
@@ -493,7 +494,7 @@ func chatREPL(args []string) int {
 		}
 		c.EnableInteractiveApproval()
 		if *yolo {
-			c.SetBypass(true)
+			c.SetAutoApproveTools(true)
 		}
 		return c, nil
 	}
diff --git a/internal/cli/complete.go b/internal/cli/complete.go
index e08b96f60..6dad8a0a4 100644
--- a/internal/cli/complete.go
+++ b/internal/cli/complete.go
@@ -82,6 +82,7 @@ func (m *chatTUI) slashItems() []compItem {
 		{label: "/language", insert: "/language ", hint: i18n.M.CmdLanguage, descend: true},
 		{label: "/help", insert: "/help ", hint: i18n.M.CmdHelp},
 		{label: "/memory", insert: "/memory ", hint: i18n.M.CmdMemory},
+		{label: "/goal", insert: "/goal ", hint: i18n.M.CmdGoal},
 		{label: "/remember", insert: "/remember ", hint: i18n.M.CmdRemember},
 		{label: "/forget", insert: "/forget ", hint: i18n.M.CmdForget},
 		{label: "/quit", insert: "/quit", hint: i18n.M.CmdQuit},
diff --git a/internal/cli/gitstatus.go b/internal/cli/gitstatus.go
index 9daedbf1f..374e148ba 100644
--- a/internal/cli/gitstatus.go
+++ b/internal/cli/gitstatus.go
@@ -133,7 +133,7 @@ var (
 
 func (m chatTUI) statusModeColor() cliColor {
 	switch {
-	case m.ctrl != nil && m.ctrl.Bypass():
+	case m.ctrl != nil && m.ctrl.AutoApproveTools():
 		return statusYoloColor
 	case m.planMode:
 		return statusPlanColor
diff --git a/internal/cli/statusline_test.go b/internal/cli/statusline_test.go
index c7bcc1497..68fbeb9b9 100644
--- a/internal/cli/statusline_test.go
+++ b/internal/cli/statusline_test.go
@@ -99,8 +99,8 @@ func TestIdleStatuslineIsCompact(t *testing.T) {
 	if !strings.Contains(plain, "Auto") || !strings.Contains(plain, "ready") {
 		t.Fatalf("idle status line missing mode status:\n%s", plain)
 	}
-	if !strings.Contains(plain, "(shift+tab to cycle)") {
-		t.Fatalf("idle status line missing mode-cycle hint:\n%s", plain)
+	if !strings.Contains(plain, "(shift+tab toggles plan)") {
+		t.Fatalf("idle status line missing plan-toggle hint:\n%s", plain)
 	}
 	for _, old := range []string{"Shift-Tab", "Ctrl-O", "Ctrl-D", "Enter sends", "Esc clears/exits state", "PgUp/PgDn"} {
 		if strings.Contains(plain, old) {
@@ -120,7 +120,7 @@ func TestYoloStatuslineUsesDangerPill(t *testing.T) {
 
 	content := renderStatuslineView(t, true)
 	plain := bottomStatusPlain(content)
-	if !strings.Contains(plain, "YOLO") || !strings.Contains(plain, "approvals skipped") || !strings.Contains(plain, "(shift+tab to cycle)") {
+	if !strings.Contains(plain, "YOLO") || !strings.Contains(plain, "approvals skipped") || !strings.Contains(plain, "(shift+tab toggles plan)") {
 		t.Fatalf("YOLO status line missing warning text:\n%s", plain)
 	}
 	if strings.Contains(plain, "[YOLO]") {
@@ -136,7 +136,7 @@ func TestPlanStatuslineUsesBluePill(t *testing.T) {
 
 	content := renderPlanStatuslineView(t)
 	plain := bottomStatusPlain(content)
-	if !strings.Contains(plain, "Plan") || !strings.Contains(plain, "ready") || !strings.Contains(plain, "(shift+tab to cycle)") {
+	if !strings.Contains(plain, "Plan") || !strings.Contains(plain, "ready") || !strings.Contains(plain, "(shift+tab toggles plan)") {
 		t.Fatalf("plan status line missing mode status:\n%s", plain)
 	}
 	if !strings.Contains(content, "\x1b[48;2;37;99;235m") {
@@ -150,10 +150,10 @@ func TestStatuslineCycleHintFollowsLanguage(t *testing.T) {
 
 	content := renderStatuslineView(t, false)
 	plain := bottomStatusPlain(content)
-	if !strings.Contains(plain, "Auto") || !strings.Contains(plain, "就绪") || !strings.Contains(plain, "(shift+tab 循环切换)") {
-		t.Fatalf("localized mode-cycle hint missing:\n%s", plain)
+	if !strings.Contains(plain, "Auto") || !strings.Contains(plain, "就绪") || !strings.Contains(plain, "(shift+tab 切换计划)") {
+		t.Fatalf("localized plan-toggle hint missing:\n%s", plain)
 	}
-	if strings.Contains(plain, "ready") || strings.Contains(plain, "shift+tab to cycle") {
+	if strings.Contains(plain, "ready") || strings.Contains(plain, "shift+tab toggles plan") {
 		t.Fatalf("localized status line should not fall back to English:\n%s", plain)
 	}
 }
@@ -236,7 +236,7 @@ func renderStatuslineView(t *testing.T, yolo bool) string {
 	t.Helper()
 
 	ctrl := control.New(control.Options{})
-	ctrl.SetBypass(yolo)
+	ctrl.SetAutoApproveTools(yolo)
 	m := newChatTUI(ctrl, "", make(chan event.Event, 1), 80)
 	next, _ := m.Update(tea.WindowSizeMsg{Width: 80, Height: 24})
 	return next.(chatTUI).View().Content
diff --git a/internal/config/config.go b/internal/config/config.go
index 86848bc9b..32106c6f8 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -62,7 +62,7 @@ type Config struct {
 // DesktopConfig so desktop preferences cannot alter terminal output or prompts.
 type UIConfig struct {
 	Theme         string `toml:"theme"`          // auto|dark|light; empty resolves to auto
-	ThemeStyle    string `toml:"theme_style"`    // graphite|ember|aurora|midnight|sandstone|porcelain|linen|glacier
+	ThemeStyle    string `toml:"theme_style"`    // graphite|aurora|slate|carbon|nocturne|amber and legacy aliases
 	CloseBehavior string `toml:"close_behavior"` // legacy desktop close behavior; prefer desktop.close_behavior
 }
 
@@ -72,7 +72,7 @@ type UIConfig struct {
 type DesktopConfig struct {
 	Language       string   `toml:"language"`        // auto|en|zh; empty/auto = browser/OS auto-detect
 	Theme          string   `toml:"theme"`           // auto|dark|light; empty resolves to dark
-	ThemeStyle     string   `toml:"theme_style"`     // graphite|ember|aurora|midnight|sandstone|porcelain|linen|glacier
+	ThemeStyle     string   `toml:"theme_style"`     // graphite|aurora|slate|carbon|nocturne|amber and legacy aliases
 	CloseBehavior  string   `toml:"close_behavior"`  // quit|background; desktop window close behavior
 	ProviderAccess []string `toml:"provider_access"` // desktop-only list of provider entries shown in Settings > Model > Access
 }
@@ -105,7 +105,7 @@ func (c *Config) UIThemeStyle() string {
 
 func normalizeThemeStyle(style string) string {
 	switch strings.ToLower(strings.TrimSpace(style)) {
-	case "graphite", "ember", "aurora", "midnight", "sandstone", "porcelain", "linen", "glacier":
+	case "graphite", "aurora", "slate", "carbon", "nocturne", "amber", "ember", "midnight", "sandstone", "porcelain", "linen", "glacier":
 		return strings.ToLower(strings.TrimSpace(style))
 	default:
 		return ""
@@ -135,7 +135,7 @@ func (c *Config) DesktopLanguage() string {
 	}
 }
 
-// DesktopTheme normalizes desktop.theme. New desktop users default to the dark
+// DesktopTheme normalizes desktop.theme. New desktop users default to the light
 // graphite product look; an explicit auto/light/dark is preserved.
 func (c *Config) DesktopTheme() string {
 	switch strings.ToLower(strings.TrimSpace(c.Desktop.Theme)) {
@@ -146,7 +146,7 @@ func (c *Config) DesktopTheme() string {
 	case "dark":
 		return "dark"
 	default:
-		return "dark"
+		return "light"
 	}
 }
 
@@ -228,8 +228,10 @@ func (c CodegraphConfig) ResolvedTier() string {
 	return "background"
 }
 
-// NetworkConfig controls outbound HTTP proxy settings. web_fetch reuses these
-// proxy settings while keeping its own SSRF-guarded dialer.
+// NetworkConfig controls ordinary outbound HTTP traffic such as model providers,
+// wallet-balance lookups, updater checks, CodeGraph downloads, and web_fetch.
+// web_fetch reuses these proxy settings while keeping its own SSRF-guarded
+// dialer.
 type NetworkConfig struct {
 	// ProxyMode is "auto" (default; environment proxy for now), "env", "custom",
 	// or "off". auto leaves room for OS proxy detection later without changing the
@@ -748,7 +750,10 @@ guessing; keep changes minimal and correct; briefly summarize what you did.
 When the request leaves a real choice to the user — which approach or library,
 the scope, or a consequential or ambiguous decision — call the ask tool to offer
 2-4 concrete options rather than guessing or burying the question in prose. Skip
-it when there's an obvious default; don't ask just to confirm.
+it when there's an obvious default; don't ask just to confirm. Approval-bypass
+modes do not answer ask questions or approve plans for the user. If no
+interactive user is available, the ask tool returns a model-assumption fallback;
+state the assumption you made before proceeding.
 For multi-step work, track progress with the todo_write tool: lay out the steps,
 keep exactly one in_progress, and flip each to completed as you finish it — update
 the list as you go, not just at the end.
diff --git a/internal/config/edit.go b/internal/config/edit.go
index 08df216ad..2292527e4 100644
--- a/internal/config/edit.go
+++ b/internal/config/edit.go
@@ -157,7 +157,7 @@ func (c *Config) SetDesktopAppearance(theme, style string) error {
 	}
 	normalized := normalizeThemeStyle(style)
 	if normalized == "" {
-		return fmt.Errorf("desktop theme style %q: must be graphite|ember|aurora|midnight|sandstone|porcelain|linen|glacier", style)
+		return fmt.Errorf("desktop theme style %q: must be graphite|aurora|slate|carbon|nocturne|amber", style)
 	}
 	c.Desktop.ThemeStyle = normalized
 	return nil
diff --git a/internal/config/edit_test.go b/internal/config/edit_test.go
index 6b278a755..cc7dd35db 100644
--- a/internal/config/edit_test.go
+++ b/internal/config/edit_test.go
@@ -64,6 +64,7 @@ func TestUIThemeStyleNormalizes(t *testing.T) {
 	}{
 		{"", ""},
 		{"AURORA", "aurora"},
+		{" nocturne ", "nocturne"},
 		{" glacier ", "glacier"},
 		{"unknown", ""},
 	} {
diff --git a/internal/control/auto_plan.go b/internal/control/auto_plan.go
index 6e44a53c2..1f912115f 100644
--- a/internal/control/auto_plan.go
+++ b/internal/control/auto_plan.go
@@ -41,12 +41,10 @@ func (c *Controller) shouldAutoPlan(ctx context.Context, input string) bool {
 	c.mu.Lock()
 	mode := c.autoPlan
 	plan := c.planMode
+	goalActive := strings.TrimSpace(c.goal) != "" && c.goalStatus == GoalStatusRunning
 	classifier := c.classifier
-	bypass := c.bypass
 	c.mu.Unlock()
-	// YOLO/bypass means "don't stop to ask" — entering plan mode would draft a
-	// plan and gate on approval, the opposite of what the user opted into.
-	if mode == autoPlanOff || plan || bypass {
+	if mode == autoPlanOff || plan || goalActive {
 		return false
 	}
 	score := autoPlanScore(input)
diff --git a/internal/control/controller.go b/internal/control/controller.go
index 1d4baaf24..0b3f0934f 100644
--- a/internal/control/controller.go
+++ b/internal/control/controller.go
@@ -25,6 +25,7 @@ import (
 	"strings"
 	"sync"
 	"time"
+	"unicode"
 
 	"reasonix/internal/agent"
 	"reasonix/internal/billing"
@@ -109,10 +110,10 @@ type Controller struct {
 	cpTurn  int
 	cpBound map[int]int
 
-	// promptMu serialises approval prompts so at most one is outstanding at a
-	// time (parallel read-only tool calls don't normally gate, writers run
-	// serially — but this keeps the contract explicit). Held across the blocking
-	// wait, so it must never be taken by the Approve command path.
+	// promptMu serialises approval and ask prompts so at most one user decision is
+	// outstanding at a time (parallel read-only tool calls don't normally gate,
+	// writers run serially — but this keeps the contract explicit). Held across
+	// the blocking wait, so it must never be taken by the Approve/Answer paths.
 	promptMu sync.Mutex
 
 	// mu guards the run state and approval bookkeeping; every critical section
@@ -121,26 +122,39 @@ type Controller struct {
 	cancel      context.CancelFunc
 	running     bool
 	planMode    bool
+	goal        string
+	goalStatus  string
+	goalTurns   int
+	goalBlocks  int
+	goalBlock   string
 	sessionPath string
-	approvals   map[string]chan approvalReply
+	approvals   map[string]pendingApproval
 	asks        map[string]chan []event.AskAnswer
 	granted     map[string]bool
 	nextID      int
 	// turn counts model turns this session, passed to hooks in their payload.
 	turn int
-	// autoApprove auto-allows writer tool calls without prompting. Set only while
-	// executing a just-approved plan: approving the plan is the go-ahead, so the
-	// model shouldn't re-prompt for every write of the work it just got cleared to
-	// do. Deny rules still bite (those never reach the approver). Reset when the
-	// execution turn returns.
-	autoApprove bool
-
-	// bypass is "YOLO" mode: while set, every approval prompt is auto-allowed for
-	// the rest of the session (writers and bash run without asking). It is a
-	// deliberate, session-scoped opt-in (the --dangerously-skip-permissions flag or
-	// a runtime toggle), never persisted. Deny rules are unaffected — they're
-	// resolved before the approver, so a denied tool is still blocked in YOLO mode.
-	bypass bool
+	// approvedPlanAutoApproveTools auto-allows writer tool calls without prompting.
+	// Set only while executing a just-approved plan: approving the plan is the
+	// go-ahead, so the model shouldn't re-prompt for every write of the work it
+	// just got cleared to do. Deny rules still bite (those never reach the
+	// approver). Reset when the execution turn returns.
+	approvedPlanAutoApproveTools bool
+
+	// toolApprovalMode is the runtime approval posture for permission-gated tool
+	// calls. "ask" prompts by default, "auto" lets the policy auto-approve the
+	// writer fallback while preserving ask/deny rules, and "yolo" skips every
+	// tool approval prompt except plan approval. It never answers AskRequest.
+	toolApprovalMode string
+
+	// autoApproveTools is "YOLO/full access" mode: while set, every tool approval
+	// request is auto-allowed for the rest of the session (writers and bash run
+	// without asking). It is a deliberate, session-scoped opt-in (the
+	// --dangerously-skip-permissions flag or a runtime toggle), never persisted.
+	// Deny rules are unaffected — they're resolved before the approver, so a
+	// denied tool is still blocked. It never answers AskRequest or plan approval:
+	// those remain user decisions.
+	autoApproveTools bool
 
 	// pendingMemory holds memory notes added mid-session (via "#" quick-add or a
 	// memory edit) that haven't yet been folded into a turn. Compose drains it
@@ -159,6 +173,24 @@ type approvalReply struct {
 	scope   string
 }
 
+type pendingApproval struct {
+	tool      string
+	subject   string
+	autoDrain bool
+	reply     chan approvalReply
+}
+
+const (
+	ToolApprovalAsk  = "ask"
+	ToolApprovalAuto = "auto"
+	ToolApprovalYolo = "yolo"
+)
+
+const (
+	maxGoalAutoTurns = 50
+	goalContinueTurn = "Continue pursuing the active goal. If it is complete, provide the concise final result and end with [goal:complete]. If it is truly blocked on a user-owned decision after trying sensible defaults, end with [goal:blocked:<short reason>]. Otherwise do the next useful work and end with [goal:continue]."
+)
+
 // RememberResult describes what happened when an approval rule was persisted.
 type RememberResult struct {
 	Rule      string
@@ -226,36 +258,37 @@ func New(opts Options) *Controller {
 		pluginCtx = context.Background()
 	}
 	c := &Controller{
-		runner:        opts.Runner,
-		executor:      opts.Executor,
-		sink:          sink,
-		policy:        opts.Policy,
-		label:         opts.Label,
-		systemPrompt:  opts.SystemPrompt,
-		sessionDir:    opts.SessionDir,
-		sessionPath:   opts.SessionPath,
-		host:          opts.Host,
-		commands:      opts.Commands,
-		skills:        opts.Skills,
-		allSkills:     opts.AllSkills,
-		skillStore:    opts.SkillStore,
-		allSkillStore: opts.AllSkillStore,
-		hooks:         opts.Hooks,
-		mem:           opts.Memory,
-		cleanup:       opts.Cleanup,
-		autoPlan:      normalizeAutoPlan(opts.AutoPlan),
-		classifier:    classifier,
-		onRemember:    opts.OnRemember,
-		balanceURL:    opts.BalanceURL,
-		balanceKey:    opts.BalanceKey,
-		balanceClient: opts.BalanceClient,
-		jobs:          opts.Jobs,
-		reg:           opts.Registry,
-		pluginCtx:     pluginCtx,
-		cpRoot:        opts.WorkspaceRoot,
-		approvals:     map[string]chan approvalReply{},
-		asks:          map[string]chan []event.AskAnswer{},
-		granted:       map[string]bool{},
+		runner:           opts.Runner,
+		executor:         opts.Executor,
+		sink:             sink,
+		policy:           opts.Policy,
+		label:            opts.Label,
+		systemPrompt:     opts.SystemPrompt,
+		sessionDir:       opts.SessionDir,
+		sessionPath:      opts.SessionPath,
+		host:             opts.Host,
+		commands:         opts.Commands,
+		skills:           opts.Skills,
+		allSkills:        opts.AllSkills,
+		skillStore:       opts.SkillStore,
+		allSkillStore:    opts.AllSkillStore,
+		hooks:            opts.Hooks,
+		mem:              opts.Memory,
+		cleanup:          opts.Cleanup,
+		autoPlan:         normalizeAutoPlan(opts.AutoPlan),
+		classifier:       classifier,
+		onRemember:       opts.OnRemember,
+		balanceURL:       opts.BalanceURL,
+		balanceKey:       opts.BalanceKey,
+		balanceClient:    opts.BalanceClient,
+		jobs:             opts.Jobs,
+		reg:              opts.Registry,
+		pluginCtx:        pluginCtx,
+		cpRoot:           opts.WorkspaceRoot,
+		toolApprovalMode: ToolApprovalAsk,
+		approvals:        map[string]pendingApproval{},
+		asks:             map[string]chan []event.AskAnswer{},
+		granted:          map[string]bool{},
 	}
 	// Checkpoints: bind a store to the session and route writer pre-edits into it.
 	c.rebindCheckpoints(opts.SessionPath)
@@ -385,7 +418,7 @@ func (c *Controller) Send(input string) {
 // resolved @-reference payloads so referenced file contents cannot inflate the
 // complexity score.
 func (c *Controller) SendWithRaw(input, raw string) {
-	c.runGuarded(func(ctx context.Context) error { return c.runTurnWithRaw(ctx, input, raw) })
+	c.runGuarded(func(ctx context.Context) error { return c.runGoalLoopWithRaw(ctx, input, raw) })
 }
 
 // planApprovalTool is the Tool name on the ApprovalRequest the controller emits
@@ -407,7 +440,7 @@ const planApprovedMessage = "Plan approved — plan mode is off; you're cleared
 // next turn can revise. Plan mode is only ever set interactively, so the headless
 // `Run` path (which doesn't call this) never blocks on a prompt.
 func (c *Controller) runTurn(ctx context.Context, input string) error {
-	return c.runTurnWithRaw(ctx, input, input)
+	return c.runGoalLoopWithRaw(ctx, input, input)
 }
 
 // RunTurn executes one foreground turn synchronously through the same lifecycle
@@ -440,6 +473,20 @@ func (c *Controller) runTurnWithRaw(ctx context.Context, input, raw string) erro
 	return c.runTurnWithRawDisplay(ctx, input, raw, "")
 }
 
+func (c *Controller) runGoalLoopWithRaw(ctx context.Context, input, raw string) error {
+	return c.runGoalLoopWithRawDisplay(ctx, input, raw, "")
+}
+
+func (c *Controller) runGoalLoopWithRawDisplay(ctx context.Context, input, raw, display string) error {
+	if err := c.runTurnWithRawDisplay(ctx, input, raw, display); err != nil {
+		if ctx.Err() != nil {
+			c.stopGoal(GoalStatusStopped)
+		}
+		return err
+	}
+	return c.continueGoal(ctx)
+}
+
 func (c *Controller) runTurnWithRawDisplay(ctx context.Context, input, raw, display string) error {
 	c.maybeSessionStart(ctx)
 	c.maybeAutoPlan(ctx, raw)
@@ -491,11 +538,11 @@ func (c *Controller) runTurnWithRawDisplay(ctx context.Context, input, raw, disp
 	// The plan is the go-ahead: don't re-prompt for each write of the approved
 	// work. Auto-approve writers for the duration of this execution turn only.
 	c.mu.Lock()
-	c.autoApprove = true
+	c.approvedPlanAutoApproveTools = true
 	c.mu.Unlock()
 	defer func() {
 		c.mu.Lock()
-		c.autoApprove = false
+		c.approvedPlanAutoApproveTools = false
 		c.mu.Unlock()
 	}()
 	if err := c.runner.Run(ctx, planApprovedMessage); err != nil {
@@ -505,6 +552,132 @@ func (c *Controller) runTurnWithRawDisplay(ctx context.Context, input, raw, disp
 	return nil
 }
 
+func (c *Controller) continueGoal(ctx context.Context) error {
+	for {
+		cont := c.advanceGoalAfterTurn()
+		if !cont {
+			return nil
+		}
+		if err := ctx.Err(); err != nil {
+			c.stopGoal(GoalStatusStopped)
+			return err
+		}
+		if err := c.runTurnWithRawDisplay(ctx, goalContinueTurn, goalContinueTurn, ""); err != nil {
+			if ctx.Err() != nil {
+				c.stopGoal(GoalStatusStopped)
+			}
+			return err
+		}
+	}
+}
+
+func (c *Controller) advanceGoalAfterTurn() bool {
+	reply := lastAssistantText(c.History())
+	status, reason, _ := parseGoalStatusMarker(reply)
+	var notice string
+	c.mu.Lock()
+	if strings.TrimSpace(c.goal) == "" || c.goalStatus != GoalStatusRunning {
+		c.mu.Unlock()
+		return false
+	}
+	c.goalTurns++
+	switch status {
+	case GoalStatusComplete:
+		c.goal = ""
+		c.goalStatus = GoalStatusComplete
+		c.goalBlocks = 0
+		c.goalBlock = ""
+		notice = "goal complete"
+	case GoalStatusBlocked:
+		reason = cleanGoalBlockReason(reason)
+		if reason == "" {
+			reason = "blocked"
+		}
+		if sameGoalBlock(c.goalBlock, reason) {
+			c.goalBlocks++
+		} else {
+			c.goalBlocks = 1
+			c.goalBlock = reason
+		}
+		if c.goalBlocks >= 3 {
+			c.goalStatus = GoalStatusBlocked
+			notice = "goal blocked: " + reason
+		}
+	default:
+		c.goalBlocks = 0
+		c.goalBlock = ""
+	}
+	if notice == "" && c.goalTurns >= maxGoalAutoTurns {
+		c.goalStatus = GoalStatusBlocked
+		c.goalBlock = "goal continuation limit reached"
+		notice = c.goalBlock
+	}
+	cont := notice == ""
+	c.mu.Unlock()
+	if notice != "" {
+		c.notice(notice)
+	}
+	return cont
+}
+
+func parseGoalStatusMarker(text string) (status, reason string, ok bool) {
+	lines := strings.Split(text, "\n")
+	for i := len(lines) - 1; i >= 0; i-- {
+		line := strings.TrimSpace(lines[i])
+		if line == "" {
+			continue
+		}
+		lower := strings.ToLower(line)
+		switch lower {
+		case "[goal:complete]":
+			return GoalStatusComplete, "", true
+		case "[goal:continue]":
+			return GoalStatusRunning, "", true
+		}
+		const blockedPrefix = "[goal:blocked:"
+		if strings.HasPrefix(lower, blockedPrefix) && strings.HasSuffix(line, "]") {
+			return GoalStatusBlocked, strings.TrimSpace(line[len(blockedPrefix) : len(line)-1]), true
+		}
+		return "", "", false
+	}
+	return "", "", false
+}
+
+func sameGoalBlock(a, b string) bool {
+	return normalizeGoalBlockReason(a) == normalizeGoalBlockReason(b)
+}
+
+func cleanGoalBlockReason(reason string) string {
+	return strings.Trim(strings.TrimSpace(reason), " \t\r\n:：,，.。;；!！?？-—_[]()（）")
+}
+
+func normalizeGoalBlockReason(reason string) string {
+	reason = strings.ToLower(cleanGoalBlockReason(reason))
+	var b strings.Builder
+	lastSpace := true
+	for _, r := range reason {
+		switch {
+		case unicode.IsLetter(r) || unicode.IsDigit(r):
+			b.WriteRune(r)
+			lastSpace = false
+		default:
+			if !lastSpace {
+				b.WriteByte(' ')
+				lastSpace = true
+			}
+		}
+	}
+	return strings.Join(strings.Fields(b.String()), " ")
+}
+
+func (c *Controller) stopGoal(status string) {
+	c.mu.Lock()
+	if strings.TrimSpace(c.goal) != "" && c.goalStatus == GoalStatusRunning {
+		c.goalStatus = status
+	}
+	c.mu.Unlock()
+}
+
 // lastAssistantText returns the content of the most recent assistant message with
 // non-empty text — the model's final answer for the turn (its plan, in plan mode).
 func lastAssistantText(msgs []provider.Message) string {
@@ -545,6 +718,9 @@ func (c *Controller) submit(input, display string) {
 		c.rememberProjectNote(note)
 		return
 	}
+	if c.applyGoalCommand(trimmed, display) {
+		return
+	}
 	if strings.HasPrefix(trimmed, "!") {
 		c.RunShell(trimmed[1:])
 		return
@@ -580,7 +756,7 @@ func (c *Controller) submit(input, display string) {
 				c.notice("unknown command: " + trimmed)
 				return nil
 			}
-			return c.runTurnWithRawDisplay(ctx, sent, sent, display)
+			return c.runGoalLoopWithRawDisplay(ctx, sent, sent, display)
 		})
 	case strings.HasPrefix(trimmed, "//"):
 		// Double-slash — not a command. Common in code snippets (JS
@@ -638,13 +814,13 @@ func (c *Controller) submit(input, display string) {
 		// turn. (Built-in slash verbs like /compact are handled above.)
 		if sent, ok := c.CustomCommand(trimmed); ok {
 			c.runGuarded(func(ctx context.Context) error {
-				return c.runTurnWithRawDisplay(ctx, sent, sent, display)
+				return c.runGoalLoopWithRawDisplay(ctx, sent, sent, display)
 			})
 			return
 		}
 		if sent, ok := c.RunSkill(trimmed); ok {
 			c.runGuarded(func(ctx context.Context) error {
-				return c.runTurnWithRawDisplay(ctx, sent, sent, display)
+				return c.runGoalLoopWithRawDisplay(ctx, sent, sent, display)
 			})
 			return
 		}
@@ -666,6 +842,45 @@ func (c *Controller) rememberProjectNote(note string) {
 	}
 }
 
+func (c *Controller) applyGoalCommand(input, display string) bool {
+	cmd, ok := ParseGoalCommand(input)
+	if !ok {
+		return false
+	}
+	switch cmd.Action {
+	case GoalCommandSet:
+		c.SetPlanMode(false)
+		c.SetGoal(cmd.Text)
+		c.notice(fmt.Sprintf(i18n.M.GoalSetFmt, ShortGoalForNotice(cmd.Text)))
+		if c.runner != nil {
+			c.runGuarded(func(ctx context.Context) error {
+				return c.runGoalLoopWithRawDisplay(ctx, "Start pursuing the active goal now.", cmd.Text, display)
+			})
+		}
+	case GoalCommandClear:
+		c.ClearGoal()
+		c.notice(i18n.M.GoalCleared)
+	default:
+		goal := c.Goal()
+		if strings.TrimSpace(goal) == "" {
+			c.notice(i18n.M.GoalEmpty)
+		} else {
+			c.notice(fmt.Sprintf(i18n.M.GoalCurrentFmt, goal))
+		}
+	}
+	return true
+}
+
+func ShortGoalForNotice(goal string) string {
+	goal = strings.Join(strings.Fields(goal), " ")
+	runes := []rune(goal)
+	const max = 160
+	if len(runes) <= max {
+		return goal
+	}
+	return string(runes[:max]) + "..."
+}
+
 // shellTimeout is the maximum time a user-invoked "!command" may run. Matches
 // the bash tool's timeout so behaviour is consistent across invocation paths.
 const shellTimeout = 120 * time.Second
@@ -768,7 +983,7 @@ func (c *Controller) runRefTurn(input, display string) {
 		if block != "" {
 			sent = "Referenced context:\n\n" + block + "\n\n" + input
 		}
-		return c.runTurnWithRawDisplay(ctx, sent, input, display)
+		return c.runGoalLoopWithRawDisplay(ctx, sent, input, display)
 	})
 }
 
@@ -831,32 +1046,63 @@ func (c *Controller) Approve(id string, allow, session, persist bool) {
 // scope. Unknown/expired IDs are ignored.
 func (c *Controller) ApproveWithScope(id string, allow, session, persist bool, scope string) {
 	c.mu.Lock()
-	reply := c.approvals[id]
+	pending := c.approvals[id]
 	delete(c.approvals, id)
 	c.mu.Unlock()
-	if reply != nil {
-		reply <- approvalReply{allow: allow, session: session, persist: persist, scope: scope} // buffered, never blocks
+	if pending.reply != nil {
+		pending.reply <- approvalReply{allow: allow, session: session, persist: persist, scope: scope} // buffered, never blocks
 	}
 }
 
-// EnableInteractiveApproval swaps the executor's gate for one that routes "ask"
-// decisions to the frontend via ApprovalRequest events, and wires the controller
-// in as the executor's Asker so the `ask` tool can question the user. Interactive
-// frontends (chat, desktop) call this; the headless run keeps the silent gate and
-// a nil asker from setup.
+// EnableInteractiveApproval swaps the executor's gate for one that routes
+// approval decisions to the frontend via ApprovalRequest events, and wires the
+// controller in as the executor's Asker so the `ask` tool can question the user.
+// Interactive frontends (chat, desktop) call this; the headless run keeps the
+// silent gate and a nil asker from setup.
 func (c *Controller) EnableInteractiveApproval() {
 	if c.executor != nil {
-		gate := permission.NewGate(c.policy, gateApprover{c})
-		gate.OnRemember = func(rule string) {
-			if c.onRemember != nil {
-				_ = c.onRemember(rule)
-			}
-		} // wire legacy "always allow" persistence callback
-		c.executor.SetGate(gate)
+		c.executor.SetGate(c.newInteractiveGate())
 		c.executor.SetAsker(c)
 	}
 }
 
+func normalizeToolApprovalMode(mode string) string {
+	switch strings.ToLower(strings.TrimSpace(mode)) {
+	case ToolApprovalAuto, "approve", "allow":
+		return ToolApprovalAuto
+	case ToolApprovalYolo, "full", "full-access", "bypass":
+		return ToolApprovalYolo
+	default:
+		return ToolApprovalAsk
+	}
+}
+
+func (c *Controller) newInteractiveGate() *permission.Gate {
+	policy := c.policy
+	c.mu.Lock()
+	mode := normalizeToolApprovalMode(c.toolApprovalMode)
+	c.mu.Unlock()
+	switch mode {
+	case ToolApprovalAuto, ToolApprovalYolo:
+		policy.Mode = permission.Allow
+	default:
+		policy.Mode = permission.Ask
+	}
+	gate := permission.NewGate(policy, gateApprover{c})
+	gate.OnRemember = func(rule string) {
+		if c.onRemember != nil {
+			_ = c.onRemember(rule)
+		}
+	}
+	return gate
+}
+
+func (c *Controller) refreshInteractiveGate() {
+	if c.executor != nil {
+		c.executor.SetGate(c.newInteractiveGate())
+	}
+}
+
 // Ask implements agent.Asker: it emits an AskRequest and blocks until
 // AnswerQuestion(ID, …) answers or ctx is cancelled. promptMu serialises it
 // against tool-approval prompts so at most one user prompt is outstanding.
@@ -926,6 +1172,53 @@ func (c *Controller) PlanMode() bool {
 	return c.planMode
 }
 
+// SetGoal stores a session-scoped active goal. Compose injects it into outgoing
+// user turns, not the system prompt or tool schema, so it does not disturb the
+// cache-stable prefix.
+func (c *Controller) SetGoal(goal string) {
+	goal = strings.TrimSpace(goal)
+	c.mu.Lock()
+	defer c.mu.Unlock()
+	if goal == "" {
+		c.goal = ""
+		c.goalStatus = GoalStatusStopped
+		c.goalTurns = 0
+		c.goalBlocks = 0
+		c.goalBlock = ""
+		return
+	}
+	if c.goal == goal && c.goalStatus == GoalStatusRunning {
+		return
+	}
+	c.goal = goal
+	c.goalStatus = GoalStatusRunning
+	c.goalTurns = 0
+	c.goalBlocks = 0
+	c.goalBlock = ""
+}
+
+func (c *Controller) ClearGoal() {
+	c.SetGoal("")
+}
+
+func (c *Controller) Goal() string {
+	c.mu.Lock()
+	defer c.mu.Unlock()
+	return c.goal
+}
+
+func (c *Controller) GoalStatus() string {
+	c.mu.Lock()
+	defer c.mu.Unlock()
+	if strings.TrimSpace(c.goal) == "" && c.goalStatus == "" {
+		return GoalStatusStopped
+	}
+	if c.goalStatus == "" {
+		return GoalStatusStopped
+	}
+	return c.goalStatus
+}
+
 // Compact runs one compaction pass on the executor's session on demand.
 // instructions is optional `/compact <focus>` guidance steering what to keep.
 func (c *Controller) Compact(ctx context.Context, instructions string) error {
@@ -1826,62 +2119,97 @@ func (c *Controller) Jobs() []jobs.View {
 	return c.jobs.Running()
 }
 
-// SetBypass turns YOLO/bypass mode on or off for the session: while on, every
-// approval prompt is auto-allowed (writers and bash run without asking). Deny
-// rules still block. Runtime-only — never written to config.
-func (c *Controller) SetBypass(on bool) {
+// SetToolApprovalMode changes the runtime approval posture for permission-gated
+// tools. It does not answer business asks or plan approval.
+func (c *Controller) SetToolApprovalMode(mode string) {
+	mode = normalizeToolApprovalMode(mode)
 	var pending []chan approvalReply
 
 	c.mu.Lock()
-	c.bypass = on
-	if on {
-		pending = c.drainApprovalsLocked()
+	c.toolApprovalMode = mode
+	c.autoApproveTools = mode == ToolApprovalYolo
+	switch mode {
+	case ToolApprovalAuto:
+		pending = c.drainApprovalsLocked(false)
+	case ToolApprovalYolo:
+		pending = c.drainApprovalsLocked(true)
 	}
 	c.mu.Unlock()
 
+	c.refreshInteractiveGate()
 	for _, reply := range pending {
 		reply <- approvalReply{allow: true}
 	}
 }
 
-// SetMode applies plan (read-only) and bypass (auto-approve) together so a turn
-// submitted right after a composer mode switch can't observe a half-applied
-// gate. Turning bypass on drains any approval already waiting.
-func (c *Controller) SetMode(plan, bypass bool) {
-	var pending []chan approvalReply
+func (c *Controller) ToolApprovalMode() string {
+	c.mu.Lock()
+	defer c.mu.Unlock()
+	return normalizeToolApprovalMode(c.toolApprovalMode)
+}
+
+// SetAutoApproveTools turns YOLO/full-access mode on or off for the session:
+// while on, every tool approval request is auto-allowed (writers and bash run
+// without asking). Ask requests and plan approval still reach the user. Deny
+// rules still block. Runtime-only — never written to config.
+func (c *Controller) SetAutoApproveTools(on bool) {
+	if on {
+		c.SetToolApprovalMode(ToolApprovalYolo)
+		return
+	}
+	c.SetToolApprovalMode(ToolApprovalAsk)
+}
+
+// SetBypass is the legacy name for SetAutoApproveTools. Keep it for existing
+// desktop/serve bindings and CLI code that still uses the bypass wording.
+func (c *Controller) SetBypass(on bool) {
+	c.SetAutoApproveTools(on)
+}
 
+// SetMode applies plan (read-only) and tool auto-approval together so a turn
+// submitted right after a composer mode switch can't observe a half-applied
+// gate. Turning tool auto-approval on drains any pending tool approval.
+func (c *Controller) SetMode(plan, autoApproveTools bool) {
 	c.mu.Lock()
 	c.planMode = plan
-	c.bypass = bypass
-	if bypass {
-		pending = c.drainApprovalsLocked()
-	}
 	c.mu.Unlock()
 
 	if c.executor != nil {
 		c.executor.SetPlanMode(plan)
 	}
-	for _, reply := range pending {
-		reply <- approvalReply{allow: true}
+	if autoApproveTools {
+		c.SetToolApprovalMode(ToolApprovalYolo)
+	} else {
+		c.SetToolApprovalMode(ToolApprovalAsk)
 	}
 }
 
 // drainApprovalsLocked removes every pending approval gate and returns their
 // reply channels; caller holds c.mu and sends {allow:true} after unlocking.
-func (c *Controller) drainApprovalsLocked() []chan approvalReply {
+func (c *Controller) drainApprovalsLocked(includeExplicitAsk bool) []chan approvalReply {
 	pending := make([]chan approvalReply, 0, len(c.approvals))
-	for id, reply := range c.approvals {
+	for id, approval := range c.approvals {
+		if approval.tool == planApprovalTool {
+			continue
+		}
+		if !includeExplicitAsk && !approval.autoDrain {
+			continue
+		}
 		delete(c.approvals, id)
-		pending = append(pending, reply)
+		pending = append(pending, approval.reply)
 	}
 	return pending
 }
 
-// Bypass reports whether YOLO/bypass mode is on, for the status-bar indicator.
+// AutoApproveTools reports whether YOLO/full-access tool auto-approval is on,
+// for status indicators and mode persistence.
+func (c *Controller) AutoApproveTools() bool {
+	return c.ToolApprovalMode() == ToolApprovalYolo
+}
+
+// Bypass is the legacy name for AutoApproveTools.
 func (c *Controller) Bypass() bool {
-	c.mu.Lock()
-	defer c.mu.Unlock()
-	return c.bypass
+	return c.AutoApproveTools()
 }
 
 // --- memory ---
@@ -1991,10 +2319,10 @@ type gateApprover struct{ c *Controller }
 
 func (g gateApprover) Approve(ctx context.Context, tool, subject string, args json.RawMessage) (bool, bool, error) {
 	// Auto-allow without prompting while executing a just-approved plan (the plan
-	// was the approval) or while YOLO/bypass mode is on. Deny rules already bit
-	// before this point, so they still block.
+	// was the approval) or while YOLO/full-access tool auto-approval is on. Deny
+	// rules already bit before this point, so they still block.
 	g.c.mu.Lock()
-	auto := g.c.autoApprove || g.c.bypass
+	auto := g.c.approvalBypassAllowsLocked(tool)
 	g.c.mu.Unlock()
 	if auto {
 		return true, false, nil
@@ -2200,10 +2528,10 @@ func parseRewind(args string, cps []checkpoint.Meta) (int, RewindScope, error) {
 // short-circuits. promptMu serialises outstanding prompts.
 func (c *Controller) requestApproval(ctx context.Context, tool, subject string) (bool, bool, error) {
 	c.mu.Lock()
-	// YOLO/bypass and the just-approved-plan window auto-allow every approval
-	// without prompting; the plan gate routes through here too, so this is what
-	// stops a bypass session from blocking on plan approval. Deny rules bit upstream.
-	if c.bypass || c.autoApprove || c.sessionGrantAllowsLocked(tool, subject) {
+	// YOLO/full access and the just-approved-plan execution window auto-allow
+	// approval-gated tools without prompting. Plan approval is a user decision,
+	// not a tool permission, so it deliberately stays interactive.
+	if c.approvalBypassAllowsLocked(tool) || c.sessionGrantAllowsLocked(tool, subject) {
 		c.mu.Unlock()
 		return true, false, nil
 	}
@@ -2215,14 +2543,14 @@ func (c *Controller) requestApproval(ctx context.Context, tool, subject string)
 	// Re-check the grant: a session grant may have landed while we queued behind
 	// another prompt for the same subject.
 	c.mu.Lock()
-	if c.bypass || c.autoApprove || c.sessionGrantAllowsLocked(tool, subject) {
+	if c.approvalBypassAllowsLocked(tool) || c.sessionGrantAllowsLocked(tool, subject) {
 		c.mu.Unlock()
 		return true, false, nil
 	}
 	c.nextID++
 	id := strconv.Itoa(c.nextID)
 	reply := make(chan approvalReply, 1)
-	c.approvals[id] = reply
+	c.approvals[id] = pendingApproval{tool: tool, subject: subject, autoDrain: c.autoApprovalWouldAllowLocked(tool, subject), reply: reply}
 	c.mu.Unlock()
 
 	c.sink.Emit(event.Event{Kind: event.ApprovalRequest, Approval: event.Approval{ID: id, Tool: tool, Subject: subject}})
@@ -2256,6 +2584,19 @@ func (c *Controller) requestApproval(ctx context.Context, tool, subject string)
 	}
 }
 
+func (c *Controller) approvalBypassAllowsLocked(tool string) bool {
+	return tool != planApprovalTool && (c.toolApprovalMode == ToolApprovalYolo || c.approvedPlanAutoApproveTools)
+}
+
+func (c *Controller) autoApprovalWouldAllowLocked(tool, subject string) bool {
+	if tool == planApprovalTool {
+		return false
+	}
+	policy := c.policy
+	policy.Mode = permission.Allow
+	return policy.DecideSubject(tool, false, subject) == permission.Allow
+}
+
 func (c *Controller) sessionGrantAllowsLocked(tool, subject string) bool {
 	for rule := range c.granted {
 		if permission.RuleMatchesString(rule, tool, subject) {
diff --git a/internal/control/goal_test.go b/internal/control/goal_test.go
new file mode 100644
index 000000000..bc8101a49
--- /dev/null
+++ b/internal/control/goal_test.go
@@ -0,0 +1,151 @@
+package control
+
+import (
+	"strings"
+	"testing"
+
+	"reasonix/internal/agent"
+	"reasonix/internal/event"
+	"reasonix/internal/provider"
+	"reasonix/internal/tool"
+)
+
+func TestGoalCommandAutoContinuesUntilComplete(t *testing.T) {
+	prov := &scriptedTurns{turns: [][]provider.Chunk{
+		textTurn("Started the goal work.\n\n[goal:continue]"),
+		textTurn("Finished the goal work.\n\n[goal:complete]"),
+	}}
+	ag := agent.New(prov, tool.NewRegistry(), agent.NewSession(""), agent.Options{}, event.Discard)
+	events := make(chan event.Event, 8)
+	c := New(Options{
+		Runner:   ag,
+		Executor: ag,
+		Sink: event.FuncSink(func(e event.Event) {
+			if e.Kind == event.TurnDone || e.Kind == event.Notice {
+				events <- e
+			}
+		}),
+	})
+
+	c.Submit("/goal ship the redesign")
+	waitForTurnDone(t, events)
+
+	if prov.call != 2 {
+		t.Fatalf("provider calls = %d, want 2 (initial + automatic continuation)", prov.call)
+	}
+	if got := c.Goal(); got != "" {
+		t.Fatalf("completed goal should be cleared, got %q", got)
+	}
+	if got := c.GoalStatus(); got != GoalStatusComplete {
+		t.Fatalf("GoalStatus() = %q, want complete", got)
+	}
+	first := firstUserMessage(ag.Session().Messages)
+	if !strings.Contains(first, "<active-goal>\nship the redesign") {
+		t.Fatalf("first goal turn should include active goal block, got %q", first)
+	}
+	if strings.HasPrefix(first, PlanModeMarker) {
+		t.Fatalf("goal mode should not enter plan mode, got %q", first)
+	}
+}
+
+func TestGoalModeSkipsAutoPlanApproval(t *testing.T) {
+	prov := &scriptedTurns{turns: [][]provider.Chunk{
+		textTurn("Implemented the requested work.\n\n[goal:complete]"),
+	}}
+	ag := agent.New(prov, tool.NewRegistry(), agent.NewSession(""), agent.Options{}, event.Discard)
+	approvalRequests := make(chan event.Approval, 1)
+	events := make(chan event.Event, 4)
+	c := New(Options{
+		AutoPlan: "on",
+		Runner:   ag,
+		Executor: ag,
+		Sink: event.FuncSink(func(e event.Event) {
+			switch e.Kind {
+			case event.ApprovalRequest:
+				approvalRequests <- e.Approval
+			case event.TurnDone:
+				events <- e
+			}
+		}),
+	})
+
+	c.Submit("/goal 实现一个复杂功能，修改代码，补测试，并更新文档")
+	waitForTurnDone(t, events)
+
+	select {
+	case approval := <-approvalRequests:
+		t.Fatalf("goal mode should not request plan approval under auto-plan; got %+v", approval)
+	default:
+	}
+	if c.PlanMode() {
+		t.Fatal("goal mode should leave plan mode off")
+	}
+	if got := firstUserMessage(ag.Session().Messages); strings.HasPrefix(got, PlanModeMarker) {
+		t.Fatalf("goal mode should not prepend plan marker, got %q", got)
+	}
+}
+
+func TestGoalRepeatedBlockedStopsAfterThreeTurns(t *testing.T) {
+	prov := &scriptedTurns{turns: [][]provider.Chunk{
+		textTurn("Blocked.\n\n[goal:blocked: Needs credentials.]"),
+		textTurn("Still blocked.\n\n[goal:blocked:needs-credentials]"),
+		textTurn("Still blocked.\n\n[goal:blocked:NEEDS CREDENTIALS！]"),
+	}}
+	ag := agent.New(prov, tool.NewRegistry(), agent.NewSession(""), agent.Options{}, event.Discard)
+	events := make(chan event.Event, 8)
+	c := New(Options{
+		Runner:   ag,
+		Executor: ag,
+		Sink: event.FuncSink(func(e event.Event) {
+			if e.Kind == event.TurnDone || e.Kind == event.Notice {
+				events <- e
+			}
+		}),
+	})
+
+	c.Submit("/goal deploy the service")
+	waitForTurnDone(t, events)
+
+	if prov.call != 3 {
+		t.Fatalf("provider calls = %d, want 3 blocked attempts", prov.call)
+	}
+	if got := c.GoalStatus(); got != GoalStatusBlocked {
+		t.Fatalf("GoalStatus() = %q, want blocked", got)
+	}
+}
+
+func TestGoalRestartResetsBlockedAudit(t *testing.T) {
+	prov := &scriptedTurns{turns: [][]provider.Chunk{
+		textTurn("Blocked.\n\n[goal:blocked:needs credentials]"),
+		textTurn("Blocked again.\n\n[goal:blocked:needs credentials]"),
+		textTurn("Blocked third time.\n\n[goal:blocked:needs credentials]"),
+		textTurn("Fresh blocked audit.\n\n[goal:blocked:needs credentials]"),
+		textTurn("Recovered on retry.\n\n[goal:complete]"),
+	}}
+	ag := agent.New(prov, tool.NewRegistry(), agent.NewSession(""), agent.Options{}, event.Discard)
+	events := make(chan event.Event, 12)
+	c := New(Options{
+		Runner:   ag,
+		Executor: ag,
+		Sink: event.FuncSink(func(e event.Event) {
+			if e.Kind == event.TurnDone || e.Kind == event.Notice {
+				events <- e
+			}
+		}),
+	})
+
+	c.Submit("/goal deploy the service")
+	waitForTurnDone(t, events)
+	if got := c.GoalStatus(); got != GoalStatusBlocked {
+		t.Fatalf("first run GoalStatus() = %q, want blocked", got)
+	}
+
+	c.Submit("/goal deploy the service")
+	waitForTurnDone(t, events)
+	if prov.call != 5 {
+		t.Fatalf("provider calls = %d, want 5 (3 blocked + 2 resumed)", prov.call)
+	}
+	if got := c.GoalStatus(); got != GoalStatusComplete {
+		t.Fatalf("resumed GoalStatus() = %q, want complete; blocked audit should restart", got)
+	}
+}
diff --git a/internal/control/input.go b/internal/control/input.go
index 27c5bd281..3244aa6b6 100644
--- a/internal/control/input.go
+++ b/internal/control/input.go
@@ -15,6 +15,18 @@ var reComposeBlock = regexp.MustCompile(`(?s)^\s*<(?:memory-update|background-jo
 // prompt prefix is left untouched and the toggle costs nothing in cache hits.
 const PlanModeMarker = "[Plan mode — read-only. Explore the codebase first (read_file, ls, grep, glob, web_fetch, task are available; writers are refused by the harness), then present a LAYERED plan as your reply and stop — do not write files, edit, or run side-effecting bash. Structure the plan as a two-level markdown list so it becomes a layered task list: each PHASE is a top-level numbered list item (a coherent milestone, e.g. \"1. Add the config loader\"), and each phase's concrete, verifiable sub-steps are bullets indented beneath it (e.g. \"   - parse the TOML into Config\"). Use plain numbered list items for phases — do NOT write phases as markdown headings (##, ###) — so both levels parse. Keep phases few (about 2-6). The user will be asked to approve before any changes are made.]"
 
+const (
+	activeGoalOpen  = "<active-goal>"
+	activeGoalClose = "</active-goal>"
+)
+
+const (
+	GoalStatusRunning  = "running"
+	GoalStatusComplete = "complete"
+	GoalStatusBlocked  = "blocked"
+	GoalStatusStopped  = "stopped"
+)
+
 // StripComposePrefixes removes controller-injected prefixes from a composed
 // user message so that the display text matches what the user actually typed.
 // It strips the PlanModeMarker, <memory-update>…</memory-update>, and
@@ -76,10 +88,15 @@ var syntheticPrefixes = []string{
 func (c *Controller) Compose(text string) string {
 	c.mu.Lock()
 	plan := c.planMode
+	goal := c.goal
+	goalStatus := c.goalStatus
 	notes := c.pendingMemory
 	c.pendingMemory = nil
 	c.mu.Unlock()
 
+	if strings.TrimSpace(goal) != "" && goalStatus == GoalStatusRunning {
+		text = activeGoalBlock(goal) + "\n\n" + text
+	}
 	if plan {
 		text = PlanModeMarker + "\n\n" + text
 	}
@@ -109,6 +126,20 @@ func (c *Controller) Compose(text string) string {
 	return text
 }
 
+func activeGoalBlock(goal string) string {
+	goal = strings.TrimSpace(goal)
+	goal = strings.ReplaceAll(goal, activeGoalClose, "<\\/active-goal>")
+	var b strings.Builder
+	b.WriteString(activeGoalOpen)
+	b.WriteString("\n")
+	b.WriteString(goal)
+	b.WriteString("\n\n")
+	b.WriteString("Goal mode: pursue this goal autonomously. Keep working across turns until the goal is complete. Prefer sensible defaults over asking the user; use ask only when you are truly blocked on a user-owned decision. Do not stop after describing a plan; execute the next useful step. End every goal-mode assistant reply with exactly one status marker on its own line: [goal:continue], [goal:complete], or [goal:blocked:<short reason>].")
+	b.WriteString("\n")
+	b.WriteString(activeGoalClose)
+	return b.String()
+}
+
 // MemoryQuickAddNote parses the legacy "# <note>" memory shortcut. The space
 // after "#" is intentional: "#7", "#issue", and "#标题" are ordinary user
 // prompts, not memory writes.
@@ -133,6 +164,35 @@ func RememberCommandNote(input string) (note string, ok bool) {
 	}
 }
 
+type GoalCommandAction int
+
+const (
+	GoalCommandStatus GoalCommandAction = iota + 1
+	GoalCommandSet
+	GoalCommandClear
+)
+
+type GoalCommand struct {
+	Action GoalCommandAction
+	Text   string
+}
+
+func ParseGoalCommand(input string) (GoalCommand, bool) {
+	trimmed := strings.TrimSpace(input)
+	if trimmed != "/goal" && !strings.HasPrefix(trimmed, "/goal ") && !strings.HasPrefix(trimmed, "/goal\t") {
+		return GoalCommand{}, false
+	}
+	args := strings.TrimSpace(trimmed[len("/goal"):])
+	switch strings.ToLower(args) {
+	case "", "status":
+		return GoalCommand{Action: GoalCommandStatus}, true
+	case "clear", "off", "stop", "done":
+		return GoalCommand{Action: GoalCommandClear}, true
+	default:
+		return GoalCommand{Action: GoalCommandSet, Text: args}, true
+	}
+}
+
 // CustomCommand resolves a "/name args…" line against the loaded custom slash
 // commands, returning the rendered prompt to send (found=false when no command
 // matches). It does not apply the plan-mode marker — call Compose for that.
diff --git a/internal/control/input_test.go b/internal/control/input_test.go
index a5cb4cf60..221b7c4ee 100644
--- a/internal/control/input_test.go
+++ b/internal/control/input_test.go
@@ -98,6 +98,56 @@ func TestComposePlanModeMarker(t *testing.T) {
 	}
 }
 
+func TestComposeIncludesActiveGoal(t *testing.T) {
+	c := New(Options{})
+	c.SetGoal("ship the approval redesign")
+
+	got := c.Compose("next step?")
+	if !strings.Contains(got, "<active-goal>\nship the approval redesign") {
+		t.Fatalf("Compose should include active goal block, got %q", got)
+	}
+	if !strings.Contains(got, "[goal:complete]") || !strings.Contains(got, "[goal:blocked:<short reason>]") {
+		t.Fatalf("goal block should include autonomous status markers, got %q", got)
+	}
+	if !strings.HasSuffix(got, "next step?") {
+		t.Fatalf("user text should follow goal block: %q", got)
+	}
+
+	c.ClearGoal()
+	if got := c.Compose("plain"); got != "plain" {
+		t.Fatalf("cleared goal should stop injection, got %q", got)
+	}
+}
+
+func TestGoalCommandSetsReportsAndClears(t *testing.T) {
+	var notices []string
+	c := New(Options{Sink: event.FuncSink(func(e event.Event) {
+		if e.Kind == event.Notice {
+			notices = append(notices, e.Text)
+		}
+	})})
+	c.SetPlanMode(true)
+
+	c.Submit("/goal finish the mode redesign")
+	if got := c.Goal(); got != "finish the mode redesign" {
+		t.Fatalf("Goal() = %q", got)
+	}
+	if c.PlanMode() {
+		t.Fatal("/goal should leave plan mode")
+	}
+	c.Submit("/goal")
+	c.Submit("/goal clear")
+	if got := c.Goal(); got != "" {
+		t.Fatalf("goal should be cleared, got %q", got)
+	}
+	joined := strings.Join(notices, "\n")
+	for _, want := range []string{"goal set", "goal: finish the mode redesign", "goal cleared"} {
+		if !strings.Contains(joined, want) {
+			t.Fatalf("notices missing %q: %v", want, notices)
+		}
+	}
+}
+
 func TestComposeDrainsQueuedMemory(t *testing.T) {
 	c := New(Options{}) // no executor/memory — QueueMemory still queues a turn-tail note
 
diff --git a/internal/control/yolo_test.go b/internal/control/yolo_test.go
index f39cd0463..a58c16605 100644
--- a/internal/control/yolo_test.go
+++ b/internal/control/yolo_test.go
@@ -2,63 +2,96 @@ package control
 
 import (
 	"context"
+	"encoding/json"
 	"strings"
 	"testing"
 	"time"
 
 	"reasonix/internal/agent"
 	"reasonix/internal/event"
+	"reasonix/internal/permission"
 	"reasonix/internal/provider"
 	"reasonix/internal/tool"
 )
 
-// TestBypassSkipsAutoPlan drives the same complex request that
-// TestAutoPlanGateEndToEnd uses to enter plan mode, but with YOLO/bypass on. It
-// must NOT enter plan mode, NOT prefix the plan marker, NOT emit an approval, and
-// run a single execution turn — proving bypass suppresses the auto-plan gate.
-func TestBypassSkipsAutoPlan(t *testing.T) {
+// TestAutoApproveToolsStillAutoPlansAndRequiresPlanApproval drives the same
+// complex request that TestAutoPlanGateEndToEnd uses, but with YOLO/full access
+// on. Tool auto-approval skips tool approvals, not collaboration gates: a complex
+// task still drafts a plan and must wait for the user's plan approval.
+func TestAutoApproveToolsStillAutoPlansAndRequiresPlanApproval(t *testing.T) {
 	prov := &scriptedTurns{turns: [][]provider.Chunk{
-		textTurn("Done — implemented directly."),
+		textTurn("Plan:\n1. Add the config field\n2. Wire it into boot\n3. Add tests"),
+		textTurn("Done — implemented the approved plan."),
 	}}
 	ag := agent.New(prov, tool.NewRegistry(), agent.NewSession(""), agent.Options{}, event.Discard)
 
-	var approvalRequested bool
+	approvalRequests := make(chan event.Approval, 1)
+	var seeded bool
 	c := New(Options{
 		AutoPlan: "on",
 		Runner:   ag,
 		Executor: ag,
 		Sink: event.FuncSink(func(e event.Event) {
-			if e.Kind == event.ApprovalRequest {
-				approvalRequested = true
+			switch e.Kind {
+			case event.ApprovalRequest:
+				approvalRequests <- e.Approval
+			case event.ToolDispatch:
+				if e.Tool.ID == "plan-seed" {
+					seeded = true
+				}
 			}
 		}),
 	})
-	c.SetBypass(true)
+	c.SetAutoApproveTools(true)
 
 	input := "实现 issue #2395：新增配置项、自动判断复杂任务、补测试和文档"
-	if err := c.runTurnWithRaw(context.Background(), input, input); err != nil {
-		t.Fatalf("runTurnWithRaw: %v", err)
+	done := make(chan error, 1)
+	go func() { done <- c.runTurnWithRaw(context.Background(), input, input) }()
+
+	var approval event.Approval
+	select {
+	case approval = <-approvalRequests:
+	case <-time.After(2 * time.Second):
+		t.Fatal("tool auto-approval must not suppress plan approval")
+	}
+	if approval.Tool != planApprovalTool {
+		t.Fatalf("approval tool = %q, want %q", approval.Tool, planApprovalTool)
 	}
 
+	if !c.PlanMode() {
+		t.Fatal("controller should stay in plan mode while waiting for approval")
+	}
+	c.Approve(approval.ID, true, false, false)
+
+	select {
+	case err := <-done:
+		if err != nil {
+			t.Fatalf("runTurnWithRaw: %v", err)
+		}
+	case <-time.After(2 * time.Second):
+		t.Fatal("approved plan did not continue into execution")
+	}
+	if got := firstUserMessage(ag.Session().Messages); !strings.HasPrefix(got, PlanModeMarker) {
+		t.Fatalf("first model input = %q, want the auto-plan marker prefixed", got)
+	}
 	if c.PlanMode() {
-		t.Fatal("bypass must not enter plan mode")
+		t.Fatal("plan mode should be off after approval")
 	}
-	if approvalRequested {
-		t.Fatal("bypass must not emit an approval request")
+	if !c.AutoApproveTools() {
+		t.Fatal("tool auto-approval should remain on after plan approval")
 	}
-	if got := firstUserMessage(ag.Session().Messages); strings.HasPrefix(got, PlanModeMarker) {
-		t.Fatalf("bypass must not prefix the auto-plan marker; got %q", got)
+	if !seeded {
+		t.Fatal("approved plan should seed the task list")
 	}
-	if prov.call != 1 {
-		t.Fatalf("provider called %d times, want 1 (no plan turn, just execution)", prov.call)
+	if prov.call != 2 {
+		t.Fatalf("provider called %d times, want 2 (plan + execution)", prov.call)
 	}
 }
 
-// TestRequestApprovalHonorsBypass guards the underlying gate: the plan-approval
-// path routes through requestApproval, which used to emit an ApprovalRequest and
-// block even in bypass. Under bypass it must return allow immediately without
-// emitting anything — otherwise a YOLO session stalls on plan approval.
-func TestRequestApprovalHonorsBypass(t *testing.T) {
+// TestRequestApprovalHonorsAutoApproveTools guards the underlying gate: ordinary
+// tool approvals must return allow immediately without emitting anything under
+// tool auto-approval.
+func TestRequestApprovalHonorsAutoApproveTools(t *testing.T) {
 	var approvalRequested bool
 	c := New(Options{
 		Sink: event.FuncSink(func(e event.Event) {
@@ -67,11 +100,11 @@ func TestRequestApprovalHonorsBypass(t *testing.T) {
 			}
 		}),
 	})
-	c.SetBypass(true)
+	c.SetAutoApproveTools(true)
 
 	done := make(chan bool, 1)
 	go func() {
-		allow, _, err := c.requestApproval(context.Background(), planApprovalTool, "")
+		allow, _, err := c.requestApproval(context.Background(), "multi_edit", "/tmp/file")
 		if err != nil {
 			t.Errorf("requestApproval: %v", err)
 		}
@@ -81,22 +114,205 @@ func TestRequestApprovalHonorsBypass(t *testing.T) {
 	select {
 	case allow := <-done:
 		if !allow {
-			t.Fatal("bypass should auto-allow the approval")
+			t.Fatal("tool auto-approval should allow the approval")
 		}
 	case <-time.After(2 * time.Second):
-		t.Fatal("requestApproval blocked under bypass; it must auto-allow without prompting")
+		t.Fatal("requestApproval blocked under tool auto-approval")
 	}
 
 	if approvalRequested {
-		t.Fatal("bypass must not emit an ApprovalRequest event")
+		t.Fatal("tool auto-approval must not emit an ApprovalRequest event")
+	}
+}
+
+func TestToolApprovalModeAutoKeepsAskRules(t *testing.T) {
+	c := New(Options{
+		Policy: permission.New("ask", nil, []string{"bash(git commit*)"}, []string{"bash(rm*)"}),
+	})
+	c.SetToolApprovalMode(ToolApprovalAuto)
+
+	gate := c.newInteractiveGate()
+	if got := gate.Policy.Decide("bash", false, json.RawMessage(`{"command":"go test ./..."}`)); got != permission.Allow {
+		t.Fatalf("auto mode fallback = %v, want allow", got)
+	}
+	if got := gate.Policy.Decide("bash", false, json.RawMessage(`{"command":"git commit -m x"}`)); got != permission.Ask {
+		t.Fatalf("explicit ask rule = %v, want ask", got)
+	}
+	if got := gate.Policy.Decide("bash", false, json.RawMessage(`{"command":"rm -rf build"}`)); got != permission.Deny {
+		t.Fatalf("deny rule = %v, want deny", got)
+	}
+	if c.AutoApproveTools() {
+		t.Fatal("auto approval must not report as YOLO")
+	}
+}
+
+func TestToolApprovalModeAutoDrainsPendingFallbackApproval(t *testing.T) {
+	approvalRequests := make(chan event.Approval, 1)
+	c := New(Options{
+		Policy: permission.New("ask", nil, nil, nil),
+		Sink: event.FuncSink(func(e event.Event) {
+			if e.Kind == event.ApprovalRequest {
+				approvalRequests <- e.Approval
+			}
+		}),
+	})
+
+	done := make(chan bool, 1)
+	errs := make(chan error, 1)
+	go func() {
+		allow, _, err := c.requestApproval(context.Background(), "multi_edit", "/tmp/file")
+		if err != nil {
+			errs <- err
+			return
+		}
+		done <- allow
+	}()
+
+	select {
+	case <-approvalRequests:
+	case <-time.After(2 * time.Second):
+		t.Fatal("approval request was not emitted")
+	}
+
+	c.SetToolApprovalMode(ToolApprovalAuto)
+
+	select {
+	case err := <-errs:
+		t.Fatalf("requestApproval: %v", err)
+	case allow := <-done:
+		if !allow {
+			t.Fatal("pending fallback approval should be allowed when auto approval turns on")
+		}
+	case <-time.After(2 * time.Second):
+		t.Fatal("pending fallback approval stayed blocked after auto approval turned on")
+	}
+	if c.AutoApproveTools() {
+		t.Fatal("auto mode must not report as YOLO")
+	}
+}
+
+func TestToolApprovalModeAutoDoesNotDrainPendingExplicitAsk(t *testing.T) {
+	approvalRequests := make(chan event.Approval, 1)
+	c := New(Options{
+		Policy: permission.New("ask", nil, []string{"bash(git commit*)"}, nil),
+		Sink: event.FuncSink(func(e event.Event) {
+			if e.Kind == event.ApprovalRequest {
+				approvalRequests <- e.Approval
+			}
+		}),
+	})
+
+	done := make(chan bool, 1)
+	errs := make(chan error, 1)
+	go func() {
+		allow, _, err := c.requestApproval(context.Background(), "bash", "git commit -m x")
+		if err != nil {
+			errs <- err
+			return
+		}
+		done <- allow
+	}()
+
+	var approval event.Approval
+	select {
+	case approval = <-approvalRequests:
+	case <-time.After(2 * time.Second):
+		t.Fatal("approval request was not emitted")
+	}
+
+	c.SetToolApprovalMode(ToolApprovalAuto)
+
+	select {
+	case err := <-errs:
+		t.Fatalf("requestApproval: %v", err)
+	case allow := <-done:
+		t.Fatalf("auto mode must not answer explicit ask rules; got allow=%v", allow)
+	case <-time.After(50 * time.Millisecond):
+	}
+
+	c.Approve(approval.ID, true, false, false)
+
+	select {
+	case err := <-errs:
+		t.Fatalf("requestApproval: %v", err)
+	case allow := <-done:
+		if !allow {
+			t.Fatal("manual approval should allow the explicit ask request")
+		}
+	case <-time.After(2 * time.Second):
+		t.Fatal("explicit ask approval stayed blocked after manual Approve")
+	}
+}
+
+func TestToolApprovalModeYoloBypassesApprovalPrompts(t *testing.T) {
+	c := New(Options{})
+	c.SetToolApprovalMode(ToolApprovalYolo)
+	if !c.AutoApproveTools() {
+		t.Fatal("YOLO mode should satisfy legacy AutoApproveTools")
+	}
+	allow, remember, err := c.requestApproval(context.Background(), "bash", "go test ./...")
+	if err != nil || !allow || remember {
+		t.Fatalf("requestApproval in YOLO = (%v,%v,%v), want allow without remember", allow, remember, err)
+	}
+}
+
+func TestPlanApprovalIgnoresAutoApproveTools(t *testing.T) {
+	approvalRequests := make(chan event.Approval, 1)
+	c := New(Options{
+		Sink: event.FuncSink(func(e event.Event) {
+			if e.Kind == event.ApprovalRequest {
+				approvalRequests <- e.Approval
+			}
+		}),
+	})
+	c.SetAutoApproveTools(true)
+
+	done := make(chan bool, 1)
+	errs := make(chan error, 1)
+	go func() {
+		allow, _, err := c.requestApproval(context.Background(), planApprovalTool, "")
+		if err != nil {
+			errs <- err
+			return
+		}
+		done <- allow
+	}()
+
+	var approval event.Approval
+	select {
+	case approval = <-approvalRequests:
+	case <-time.After(2 * time.Second):
+		t.Fatal("plan approval must still prompt under tool auto-approval")
+	}
+	if approval.Tool != planApprovalTool {
+		t.Fatalf("approval tool = %q, want %q", approval.Tool, planApprovalTool)
+	}
+	select {
+	case allow := <-done:
+		t.Fatalf("plan approval must wait for the user under tool auto-approval; got allow=%v", allow)
+	case err := <-errs:
+		t.Fatalf("requestApproval: %v", err)
+	default:
+	}
+
+	c.Approve(approval.ID, true, false, false)
+
+	select {
+	case err := <-errs:
+		t.Fatalf("requestApproval: %v", err)
+	case allow := <-done:
+		if !allow {
+			t.Fatal("manual plan approval should allow")
+		}
+	case <-time.After(2 * time.Second):
+		t.Fatal("plan approval stayed blocked after Approve")
 	}
 }
 
-// TestSetBypassAllowsPendingApproval covers the desktop case where the approval
-// card is already visible, then the user switches to YOLO. Turning bypass on must
-// unblock that pending gate too; otherwise the backend keeps waiting while the UI
-// says approvals should be skipped.
-func TestSetBypassAllowsPendingApproval(t *testing.T) {
+// TestSetAutoApproveToolsAllowsPendingApproval covers the desktop case where the
+// approval card is already visible, then the user switches to YOLO/full access.
+// Turning tool auto-approval on must unblock that pending tool gate too.
+func TestSetAutoApproveToolsAllowsPendingApproval(t *testing.T) {
 	c, ids, _ := approvalIDs()
 
 	done := make(chan bool, 1)
@@ -116,25 +332,81 @@ func TestSetBypassAllowsPendingApproval(t *testing.T) {
 		t.Fatal("approval request was not emitted")
 	}
 
-	c.SetBypass(true)
+	c.SetAutoApproveTools(true)
 
 	select {
 	case err := <-errs:
 		t.Fatalf("requestApproval: %v", err)
 	case allow := <-done:
 		if !allow {
-			t.Fatal("pending approval should be auto-allowed when bypass turns on")
+			t.Fatal("pending approval should be allowed when tool auto-approval turns on")
 		}
 	case <-time.After(2 * time.Second):
-		t.Fatal("pending approval stayed blocked after bypass turned on")
+		t.Fatal("pending approval stayed blocked after tool auto-approval turned on")
 	}
-	if !c.Bypass() {
-		t.Fatal("bypass should remain on after draining pending approvals")
+	if !c.AutoApproveTools() {
+		t.Fatal("tool auto-approval should remain on after draining pending approvals")
 	}
 }
 
-// TestSetModeYoloDrainsPendingApproval is the SetMode-path twin of the SetBypass
-// case: applying YOLO atomically must also unblock an approval already waiting.
+func TestSetAutoApproveToolsDoesNotDrainPendingPlanApproval(t *testing.T) {
+	approvalRequests := make(chan event.Approval, 1)
+	c := New(Options{
+		Sink: event.FuncSink(func(e event.Event) {
+			if e.Kind == event.ApprovalRequest {
+				approvalRequests <- e.Approval
+			}
+		}),
+	})
+
+	done := make(chan bool, 1)
+	errs := make(chan error, 1)
+	go func() {
+		allow, _, err := c.requestApproval(context.Background(), planApprovalTool, "")
+		if err != nil {
+			errs <- err
+			return
+		}
+		done <- allow
+	}()
+
+	var approval event.Approval
+	select {
+	case approval = <-approvalRequests:
+	case <-time.After(2 * time.Second):
+		t.Fatal("plan approval request was not emitted")
+	}
+
+	c.SetAutoApproveTools(true)
+
+	select {
+	case err := <-errs:
+		t.Fatalf("requestApproval: %v", err)
+	case allow := <-done:
+		t.Fatalf("SetAutoApproveTools must not auto-answer pending plan approval; got allow=%v", allow)
+	case <-time.After(50 * time.Millisecond):
+	}
+	if !c.AutoApproveTools() {
+		t.Fatal("tool auto-approval should turn on while plan approval stays pending")
+	}
+
+	c.Approve(approval.ID, true, false, false)
+
+	select {
+	case err := <-errs:
+		t.Fatalf("requestApproval: %v", err)
+	case allow := <-done:
+		if !allow {
+			t.Fatal("manual plan approval should allow")
+		}
+	case <-time.After(2 * time.Second):
+		t.Fatal("plan approval stayed blocked after Approve")
+	}
+}
+
+// TestSetModeYoloDrainsPendingApproval is the SetMode-path twin of the
+// SetAutoApproveTools case: applying YOLO atomically must also unblock an
+// approval already waiting.
 func TestSetModeYoloDrainsPendingApproval(t *testing.T) {
 	c, ids, _ := approvalIDs()
 
@@ -162,39 +434,40 @@ func TestSetModeYoloDrainsPendingApproval(t *testing.T) {
 	}
 }
 
-// TestSetModeAppliesBothGates checks SetMode sets plan and bypass together so the
-// composer never has to sequence two calls and risk a half-applied window.
+// TestSetModeAppliesBothGates checks SetMode sets plan and tool auto-approval
+// together so the composer never has to sequence two calls and risk a
+// half-applied window.
 func TestSetModeAppliesBothGates(t *testing.T) {
 	c, _, _ := approvalIDs()
 
 	c.SetMode(true, false)
-	if !c.PlanMode() || c.Bypass() {
-		t.Fatalf("plan mode: plan=%v bypass=%v, want true/false", c.PlanMode(), c.Bypass())
+	if !c.PlanMode() || c.AutoApproveTools() {
+		t.Fatalf("plan mode: plan=%v autoApproveTools=%v, want true/false", c.PlanMode(), c.AutoApproveTools())
 	}
 
 	c.SetMode(false, true)
-	if c.PlanMode() || !c.Bypass() {
-		t.Fatalf("yolo mode: plan=%v bypass=%v, want false/true", c.PlanMode(), c.Bypass())
+	if c.PlanMode() || !c.AutoApproveTools() {
+		t.Fatalf("yolo mode: plan=%v autoApproveTools=%v, want false/true", c.PlanMode(), c.AutoApproveTools())
+	}
+
+	c.SetMode(true, true)
+	if !c.PlanMode() || !c.AutoApproveTools() {
+		t.Fatalf("plan + yolo mode: plan=%v autoApproveTools=%v, want true/true", c.PlanMode(), c.AutoApproveTools())
 	}
 
 	c.SetMode(false, false)
-	if c.PlanMode() || c.Bypass() {
-		t.Fatalf("normal mode: plan=%v bypass=%v, want false/false", c.PlanMode(), c.Bypass())
+	if c.PlanMode() || c.AutoApproveTools() {
+		t.Fatalf("normal mode: plan=%v autoApproveTools=%v, want false/false", c.PlanMode(), c.AutoApproveTools())
 	}
 }
 
-func TestBypassDoesNotAutoAnswerAsk(t *testing.T) {
-	askCh := make(chan event.Ask, 1)
-	c := New(Options{
-		Sink: event.FuncSink(func(e event.Event) {
-			if e.Kind == event.AskRequest {
-				askCh <- e.Ask
-			}
-		}),
-	})
-	c.SetBypass(true)
+type askCallResult struct {
+	answers []event.AskAnswer
+	err     error
+}
 
-	questions := []event.AskQuestion{
+func sampleAskQuestions() []event.AskQuestion {
+	return []event.AskQuestion{
 		{
 			ID:     "approach",
 			Header: "Approach",
@@ -215,59 +488,231 @@ func TestBypassDoesNotAutoAnswerAsk(t *testing.T) {
 			Multi: true,
 		},
 	}
+}
 
-	done := make(chan struct {
-		answers []event.AskAnswer
-		err     error
-	}, 1)
+func askController(t *testing.T, c *Controller, questions []event.AskQuestion) <-chan askCallResult {
+	t.Helper()
+	done := make(chan askCallResult, 1)
 	go func() {
 		answers, err := c.Ask(context.Background(), questions)
-		done <- struct {
-			answers []event.AskAnswer
-			err     error
-		}{answers, err}
+		done <- askCallResult{answers: answers, err: err}
 	}()
+	return done
+}
 
-	// Even with bypass on, Ask must emit an AskRequest and wait for the user.
-	var ask event.Ask
+func waitAskRequest(t *testing.T, askCh <-chan event.Ask) event.Ask {
+	t.Helper()
 	select {
-	case ask = <-askCh:
+	case ask := <-askCh:
+		return ask
 	case <-time.After(2 * time.Second):
-		t.Fatal("Ask did not emit AskRequest under bypass; bypass should not auto-answer ask")
+		t.Fatal("Ask did not emit AskRequest")
 	}
+	return event.Ask{}
+}
 
-	// Answer with NON-recommended options to prove the user was consulted.
-	c.AnswerQuestion(ask.ID, []event.AskAnswer{
+func waitAskResult(t *testing.T, done <-chan askCallResult) askCallResult {
+	t.Helper()
+	select {
+	case result := <-done:
+		if result.err != nil {
+			t.Fatalf("Ask: %v", result.err)
+		}
+		return result
+	case <-time.After(2 * time.Second):
+		t.Fatal("Ask stayed blocked")
+	}
+	return askCallResult{}
+}
+
+func assertAskAnswers(t *testing.T, got, want []event.AskAnswer) {
+	t.Helper()
+	if len(got) != len(want) {
+		t.Fatalf("answers len = %d, want %d: %#v", len(got), len(want), got)
+	}
+	for i := range want {
+		if got[i].QuestionID != want[i].QuestionID || len(got[i].Selected) != len(want[i].Selected) {
+			t.Fatalf("answers[%d] = %#v, want %#v", i, got[i], want[i])
+		}
+		for j := range want[i].Selected {
+			if got[i].Selected[j] != want[i].Selected[j] {
+				t.Fatalf("answers[%d] = %#v, want %#v", i, got[i], want[i])
+			}
+		}
+	}
+}
+
+func TestBypassDoesNotAutoAnswerAsk(t *testing.T) {
+	userAnswers := []event.AskAnswer{
 		{QuestionID: "approach", Selected: []string{"Alternative path"}},
 		{QuestionID: "scope", Selected: []string{"Broad"}},
+	}
+	askCh := make(chan event.Ask, 1)
+	c := New(Options{
+		Sink: event.FuncSink(func(e event.Event) {
+			if e.Kind == event.AskRequest {
+				askCh <- e.Ask
+			}
+		}),
 	})
+	c.SetBypass(true)
+
+	done := askController(t, c, sampleAskQuestions())
+	ask := waitAskRequest(t, askCh)
 
-	var result struct {
-		answers []event.AskAnswer
-		err     error
+	// Even with bypass/YOLO on, Ask must wait for the user's non-default choice.
+	c.AnswerQuestion(ask.ID, userAnswers)
+	result := waitAskResult(t, done)
+	assertAskAnswers(t, result.answers, userAnswers)
+}
+
+func TestAskPromptsAcrossInteractiveModes(t *testing.T) {
+	userAnswers := []event.AskAnswer{
+		{QuestionID: "approach", Selected: []string{"Alternative path"}},
+		{QuestionID: "scope", Selected: []string{"Broad"}},
 	}
-	select {
-	case result = <-done:
-	case <-time.After(2 * time.Second):
-		t.Fatal("Ask stayed blocked after AnswerQuestion")
+	tests := []struct {
+		name  string
+		setup func(*Controller)
+	}{
+		{name: "normal"},
+		{name: "plan", setup: func(c *Controller) { c.SetMode(true, false) }},
+		{name: "yolo", setup: func(c *Controller) { c.SetMode(false, true) }},
 	}
-	if result.err != nil {
-		t.Fatalf("Ask: %v", result.err)
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			askCh := make(chan event.Ask, 1)
+			c := New(Options{
+				Sink: event.FuncSink(func(e event.Event) {
+					if e.Kind == event.AskRequest {
+						askCh <- e.Ask
+					}
+				}),
+			})
+			if tt.setup != nil {
+				tt.setup(c)
+			}
+
+			done := askController(t, c, sampleAskQuestions())
+			ask := waitAskRequest(t, askCh)
+
+			// Answer with non-recommended options to prove this is the user's
+			// selection, not an automatic recommended-option fallback.
+			c.AnswerQuestion(ask.ID, userAnswers)
+			result := waitAskResult(t, done)
+			assertAskAnswers(t, result.answers, userAnswers)
+		})
 	}
+}
 
-	wantAnswers := []event.AskAnswer{
+func TestSetAutoApproveToolsDoesNotDrainPendingAsk(t *testing.T) {
+	askCh := make(chan event.Ask, 1)
+	c := New(Options{
+		Sink: event.FuncSink(func(e event.Event) {
+			if e.Kind == event.AskRequest {
+				askCh <- e.Ask
+			}
+		}),
+	})
+
+	done := askController(t, c, sampleAskQuestions())
+	ask := waitAskRequest(t, askCh)
+
+	c.SetAutoApproveTools(true)
+
+	select {
+	case result := <-done:
+		t.Fatalf("SetAutoApproveTools must not answer pending AskRequest; got %#v", result.answers)
+	case <-time.After(50 * time.Millisecond):
+	}
+
+	userAnswers := []event.AskAnswer{
 		{QuestionID: "approach", Selected: []string{"Alternative path"}},
 		{QuestionID: "scope", Selected: []string{"Broad"}},
 	}
-	if len(result.answers) != len(wantAnswers) {
-		t.Fatalf("answers len = %d, want %d: %#v", len(result.answers), len(wantAnswers), result.answers)
-	}
-	for i := range wantAnswers {
-		if result.answers[i].QuestionID != wantAnswers[i].QuestionID ||
-			len(result.answers[i].Selected) != 1 ||
-			result.answers[i].Selected[0] != wantAnswers[i].Selected[0] {
-			t.Fatalf("answers[%d] = %#v, want %#v", i, result.answers[i], wantAnswers[i])
+	c.AnswerQuestion(ask.ID, userAnswers)
+	result := waitAskResult(t, done)
+	assertAskAnswers(t, result.answers, userAnswers)
+}
+
+func TestAskSerializesBehindPromptLockEvenWithAutoApproveTools(t *testing.T) {
+	askCh := make(chan event.Ask, 1)
+	c := New(Options{
+		Sink: event.FuncSink(func(e event.Event) {
+			if e.Kind == event.AskRequest {
+				askCh <- e.Ask
+			}
+		}),
+	})
+	questions := []event.AskQuestion{{
+		ID:     "q1",
+		Header: "Choice",
+		Prompt: "Which path?",
+		Options: []event.AskOption{
+			{Label: "Recommended"},
+			{Label: "Alternative"},
+		},
+	}}
+
+	c.promptMu.Lock()
+	started := make(chan struct{})
+	done := make(chan []event.AskAnswer, 1)
+	errs := make(chan error, 1)
+	go func() {
+		close(started)
+		answers, err := c.Ask(context.Background(), questions)
+		if err != nil {
+			errs <- err
+			return
 		}
+		done <- answers
+	}()
+	<-started
+
+	// Give the goroutine a chance to reach promptMu, then prove it did not emit
+	// AskRequest while another prompt owns the user-decision slot.
+	time.Sleep(20 * time.Millisecond)
+	select {
+	case ask := <-askCh:
+		t.Fatalf("AskRequest emitted while promptMu was held: %#v", ask)
+	default:
+	}
+
+	// Enable tool auto-approval while Ask is queued behind promptMu.
+	c.SetAutoApproveTools(true)
+	select {
+	case ask := <-askCh:
+		t.Fatalf("tool auto-approval must not let Ask bypass promptMu; got %#v", ask)
+	default:
+	}
+
+	// Release the lock — Ask proceeds but must still emit an AskRequest.
+	c.promptMu.Unlock()
+
+	var ask event.Ask
+	select {
+	case err := <-errs:
+		t.Fatalf("Ask: %v", err)
+	case ask = <-askCh:
+	case <-time.After(2 * time.Second):
+		t.Fatal("Ask did not emit AskRequest after acquiring promptMu with tool auto-approval on")
+	}
+
+	c.AnswerQuestion(ask.ID, []event.AskAnswer{
+		{QuestionID: "q1", Selected: []string{"Alternative"}},
+	})
+
+	var answers []event.AskAnswer
+	select {
+	case err := <-errs:
+		t.Fatalf("Ask: %v", err)
+	case answers = <-done:
+	case <-time.After(2 * time.Second):
+		t.Fatal("Ask stayed blocked after AnswerQuestion")
+	}
+	if len(answers) != 1 || answers[0].QuestionID != "q1" || len(answers[0].Selected) != 1 || answers[0].Selected[0] != "Alternative" {
+		t.Fatalf("answers = %#v, want Alternative (user's choice, not auto-recommended)", answers)
 	}
 }
 
@@ -301,14 +746,13 @@ func TestAskSerializesBehindPromptLockEvenWithBypass(t *testing.T) {
 		}
 		done <- answers
 	}()
-	// Give the goroutine time to block on promptMu.
-	time.Sleep(20 * time.Millisecond)
 
-	// Pre-unlock assertion: while promptMu is still held, Ask must NOT have
-	// emitted AskRequest — proving it truly serialized behind the lock.
+	// Give the goroutine a chance to reach promptMu, then prove it did not emit
+	// AskRequest while another prompt owns the user-decision slot.
+	time.Sleep(20 * time.Millisecond)
 	select {
-	case <-askCh:
-		t.Fatal("Ask emitted AskRequest before acquiring promptMu; it did not serialize behind the lock")
+	case ask := <-askCh:
+		t.Fatalf("AskRequest emitted while promptMu was held: %#v", ask)
 	default:
 	}
 
@@ -320,6 +764,8 @@ func TestAskSerializesBehindPromptLockEvenWithBypass(t *testing.T) {
 	// Post-unlock assertion: Ask must emit AskRequest now that it holds the lock.
 	var ask event.Ask
 	select {
+	case err := <-errs:
+		t.Fatalf("Ask: %v", err)
 	case ask = <-askCh:
 	case <-time.After(2 * time.Second):
 		t.Fatal("Ask did not emit AskRequest after acquiring promptMu with bypass on; bypass should not suppress ask")
@@ -332,6 +778,8 @@ func TestAskSerializesBehindPromptLockEvenWithBypass(t *testing.T) {
 
 	var answers []event.AskAnswer
 	select {
+	case err := <-errs:
+		t.Fatalf("Ask: %v", err)
 	case answers = <-done:
 	case <-time.After(2 * time.Second):
 		t.Fatal("Ask stayed blocked after AnswerQuestion")
diff --git a/internal/i18n/i18n.go b/internal/i18n/i18n.go
index 457046e25..73ff0d206 100644
--- a/internal/i18n/i18n.go
+++ b/internal/i18n/i18n.go
@@ -71,7 +71,7 @@ type Messages struct {
 	ChatStatusRetryingFmt       string // "%s retrying (%d/%d)…" — %s = spinner, %d/%d = attempt/max
 	ChatStatusIdle              string // shortcuts hint when idle
 	ChatStatusYoloIdle          string // shortcuts hint when idle in YOLO/bypass mode
-	ChatStatusCycleHint         string // mode-cycle shortcut hint shown when no modal prompt owns the status row
+	ChatStatusCycleHint         string // plan-toggle shortcut hint shown when no modal prompt owns the status row
 	ChatStatusCacheNowFmt       string // cache status tag, "%s" = latest-turn hit rate with percent sign
 	ChatStatusCacheAvgFmt       string // cache status tag, "%s" = session-average hit rate with percent sign
 	ChatStatusPlanApproval      string // shortcuts hint while a plan is pending
@@ -149,6 +149,7 @@ type Messages struct {
 	CmdResume       string // /resume
 	CmdModel        string // /model
 	CmdMemory       string // /memory
+	CmdGoal         string // /goal
 	CmdRemember     string // /remember
 	CmdForget       string // /forget
 	CmdMcp          string // /mcp
@@ -209,6 +210,10 @@ type Messages struct {
 	ForgetDoneFmt          string
 	QuickRememberEmpty     string
 	QuickRememberDoneFmt   string
+	GoalEmpty              string
+	GoalCurrentFmt         string
+	GoalSetFmt             string
+	GoalCleared            string
 	ModelSwitchUnavailable string
 	ModelSwitchBusy        string
 	ModelAlreadyOnFmt      string
diff --git a/internal/i18n/messages_en.go b/internal/i18n/messages_en.go
index aeda40ffc..022877c24 100644
--- a/internal/i18n/messages_en.go
+++ b/internal/i18n/messages_en.go
@@ -44,8 +44,8 @@ var English = Messages{
 	ChatToolWorkingFmt:          "%s working · %ds",
 	ChatStatusRetryingFmt:       "%s retrying (%d/%d)… (Esc cancels)",
 	ChatStatusIdle:              "ready",
-	ChatStatusYoloIdle:          "approvals skipped",
-	ChatStatusCycleHint:         "shift+tab to cycle",
+	ChatStatusYoloIdle:          "tool approvals skipped",
+	ChatStatusCycleHint:         "shift+tab toggles plan",
 	ChatStatusCacheNowFmt:       "turn hit %s",
 	ChatStatusCacheAvgFmt:       "avg %s",
 	ChatStatusPlanApproval:      "Enter/y approves & executes · n/Esc keeps planning · PgUp/PgDn scrolls",
@@ -94,7 +94,7 @@ var English = Messages{
 	SlashUnavailable:   "command unavailable in this build",
 	SlashUnknown:       "unknown command",
 	SlashTodoCleared:   "task list dismissed",
-	SlashHelp:          "commands: /compact · /new (/clear) · /resume · /rewind · /tree · /branch · /switch · /todo · /verbose · /model (switch model) · /effort · /theme · /language · /mcp · /skills · /hooks · /paste-image · /memory · /remember · /quit · /help · plus skills (/init, /explore, …)",
+	SlashHelp:          "commands: /compact · /new (/clear) · /resume · /rewind · /tree · /branch · /switch · /todo · /verbose · /model (switch model) · /effort · /theme · /language · /mcp · /skills · /hooks · /paste-image · /memory · /goal · /remember · /quit · /help · plus skills (/init, /explore, …)",
 
 	SkillPickerTitle:             "Skills",
 	SkillPickerAvailableFmt:      "%d available",
@@ -160,6 +160,7 @@ var English = Messages{
 	CmdResume:       "resume a saved session",
 	CmdModel:        "switch model",
 	CmdMemory:       "show memory files",
+	CmdGoal:         "set or clear the active goal",
 	CmdRemember:     "save a memory note",
 	CmdForget:       "delete a saved memory",
 	CmdMcp:          "MCP servers",
@@ -218,6 +219,10 @@ var English = Messages{
 	ForgetDoneFmt:          "forgot memory: %s",
 	QuickRememberEmpty:     "nothing to remember",
 	QuickRememberDoneFmt:   "remembered → %s",
+	GoalEmpty:              "goal: none — set one with /goal <objective>",
+	GoalCurrentFmt:         "goal: %s",
+	GoalSetFmt:             "goal set → %s",
+	GoalCleared:            "goal cleared",
 	ModelSwitchUnavailable: "model switching is unavailable in this session",
 	ModelSwitchBusy:        "finish or cancel the current turn before switching models",
 	ModelAlreadyOnFmt:      "already on %s",
diff --git a/internal/i18n/messages_zh.go b/internal/i18n/messages_zh.go
index 06ce87cc6..c5c4f207d 100644
--- a/internal/i18n/messages_zh.go
+++ b/internal/i18n/messages_zh.go
@@ -45,8 +45,8 @@ var Chinese = Messages{
 	ChatToolWorkingFmt:          "%s 运行中 · %d 秒",
 	ChatStatusRetryingFmt:       "%s 正在重试 (%d/%d)… (Esc 取消)",
 	ChatStatusIdle:              "就绪",
-	ChatStatusYoloIdle:          "已跳过批准",
-	ChatStatusCycleHint:         "shift+tab 循环切换",
+	ChatStatusYoloIdle:          "已跳过工具批准",
+	ChatStatusCycleHint:         "shift+tab 切换计划",
 	ChatStatusCacheNowFmt:       "本次命中 %s",
 	ChatStatusCacheAvgFmt:       "平均 %s",
 	ChatStatusPlanApproval:      "Enter/y 批准并执行 · n/Esc 继续规划 · PgUp/PgDn 滚动",
@@ -95,7 +95,7 @@ var Chinese = Messages{
 	SlashUnavailable:   "当前构建不支持该命令",
 	SlashUnknown:       "未知命令",
 	SlashTodoCleared:   "已清除任务清单",
-	SlashHelp:          "命令：/compact · /new（/clear）· /resume · /rewind · /tree · /branch · /switch · /todo · /verbose · /model（切换模型）· /effort · /theme · /language · /mcp · /skills · /hooks · /paste-image · /memory · /remember · /quit · /help · 以及 skills（/init、/explore …）",
+	SlashHelp:          "命令：/compact · /new（/clear）· /resume · /rewind · /tree · /branch · /switch · /todo · /verbose · /model（切换模型）· /effort · /theme · /language · /mcp · /skills · /hooks · /paste-image · /memory · /goal · /remember · /quit · /help · 以及 skills（/init、/explore …）",
 
 	SkillPickerTitle:             "Skills",
 	SkillPickerAvailableFmt:      "%d 个可用",
@@ -161,6 +161,7 @@ var Chinese = Messages{
 	CmdResume:       "恢复已保存的会话",
 	CmdModel:        "切换模型",
 	CmdMemory:       "查看记忆文件",
+	CmdGoal:         "设置或清除当前目标",
 	CmdRemember:     "保存一条记忆",
 	CmdForget:       "删除一条已存记忆",
 	CmdMcp:          "MCP 服务器",
@@ -219,6 +220,10 @@ var Chinese = Messages{
 	ForgetDoneFmt:          "已删除记忆：%s",
 	QuickRememberEmpty:     "没有要记录的内容",
 	QuickRememberDoneFmt:   "已记住 → %s",
+	GoalEmpty:              "目标：无 — 用 /goal <目标> 设置",
+	GoalCurrentFmt:         "目标：%s",
+	GoalSetFmt:             "目标已设置 → %s",
+	GoalCleared:            "目标已清除",
 	ModelSwitchUnavailable: "本会话不支持切换模型",
 	ModelSwitchBusy:        "请先完成或取消当前这一轮再切换模型",
 	ModelAlreadyOnFmt:      "已经在使用 %s",
diff --git a/internal/permission/permission.go b/internal/permission/permission.go
index 5b49b3b18..85671296e 100644
--- a/internal/permission/permission.go
+++ b/internal/permission/permission.go
@@ -138,7 +138,12 @@ func New(mode string, allow, ask, deny []string) Policy {
 // for glob matching. Precedence: deny > ask > allow > fallback (Allow for
 // readers, Mode for writers).
 func (p Policy) Decide(toolName string, readOnly bool, args json.RawMessage) Decision {
-	subject := Subject(args)
+	return p.DecideSubject(toolName, readOnly, Subject(args))
+}
+
+// DecideSubject evaluates a tool call when the caller already extracted the
+// stable approval subject from args.
+func (p Policy) DecideSubject(toolName string, readOnly bool, subject string) Decision {
 	switch {
 	case matchAny(p.Deny, toolName, subject):
 		return Deny
diff --git a/internal/serve/index.html b/internal/serve/index.html
index 7852f5901..d5f4e6931 100644
--- a/internal/serve/index.html
+++ b/internal/serve/index.html
@@ -471,7 +471,7 @@
     'deny': 'Deny',
     'auto_mode': 'Auto mode',
     'plan_mode': 'Plan mode (read-only)',
-    'yolo_mode': 'YOLO mode (auto-approve)',
+    'yolo_mode': 'YOLO mode (auto-approve tool approvals; ask and plan still wait)',
     'auto': 'Auto',
     'plan': 'Plan',
     'yolo': 'YOLO',
@@ -565,7 +565,7 @@
     'deny': '拒绝',
     'auto_mode': '自动模式',
     'plan_mode': '计划模式（只读）',
-    'yolo_mode': 'YOLO 模式（自动批准）',
+    'yolo_mode': 'YOLO 模式（自动批准工具权限；ask 和计划仍会等待）',
     'auto': '自动',
     'plan': '计划',
     'yolo': 'YOLO',
@@ -992,7 +992,7 @@
   fetch('/status').then(r=>r.json()).then(s=>{
     if(s.label)statusModel.textContent=s.label;
     // sync mode UI without triggering POST (server is source of truth)
-    planMode=!!s.plan; bypassMode=!!s.bypass;
+    planMode=!!s.plan; bypassMode=!!(s.autoApproveTools??s.bypass);
     updateModeButtons();
     if(s.window){const pct=Math.min(100,Math.round(s.used/s.window*100));ctxFill.style.width=pct+'%';ctxFill.style.background=pct>85?'var(--warning)':pct>95?'var(--danger)':'var(--accent)';ctxUsed.textContent=fmtTok(s.used)+' tok';ctxWindow.textContent=fmtTok(s.window)+' tok';}
     // sidebar metrics
@@ -1064,8 +1064,8 @@
 
 // ── input handling ──
 async function syncModeBeforeSubmit(){
-  if(planMode){ await post('/bypass',{on:false}); await post('/plan',{on:true}); }
-  else if(bypassMode){ await post('/plan',{on:false}); await post('/bypass',{on:true}); }
+  await post('/plan',{on:planMode});
+  await post('/auto-approve-tools',{on:bypassMode});
 }
 async function send(){ const v=input.value.trim(); if(!v)return; await syncModeBeforeSubmit(); addUserMsg(v); post('/submit',{input:v}).then(r=>{if(r.ok&&r.status===204){fetchStatus();loadSessions();}}); input.value='';input.style.height='';closeSlashMenu(); }
 
@@ -1093,16 +1093,17 @@
   if(e.key==='/'&&e.target!==input){e.preventDefault();input.focus();return;}
 });
 
-// mode helpers — plan and bypass are mutually exclusive
+// mode helpers — plan is a user-decision gate; bypass/full access only skips
+// tool approvals, so they can be enabled together.
 function updateModeButtons(){
   const auto=!planMode&&!bypassMode;
   $('#btn-auto').classList.toggle('toolbar__btn--ok',auto);
   $('#btn-plan').classList.toggle('toolbar__btn--active',planMode);
   $('#btn-bypass').classList.toggle('toolbar__btn--danger',bypassMode);
 }
-async function setPlan(on){planMode=on;if(on){bypassMode=false;}updateModeButtons();if(on){await post('/bypass',{on:false});}await post('/plan',{on});}
-async function setBypass(on){bypassMode=on;if(on){planMode=false;}updateModeButtons();if(on){await post('/plan',{on:false});}await post('/bypass',{on});}
-async function cycleMode(){if(!planMode&&!bypassMode)await setPlan(true);else if(planMode){await setPlan(false);await setBypass(true);}else await setBypass(false);setTimeout(fetchStatus,200);}
+async function setPlan(on){planMode=on;updateModeButtons();await post('/plan',{on});}
+async function setBypass(on){bypassMode=on;updateModeButtons();await post('/auto-approve-tools',{on});}
+async function cycleMode(){if(!planMode&&!bypassMode)await setPlan(true);else if(planMode&&!bypassMode){await setPlan(false);await setBypass(true);}else if(!planMode&&bypassMode)await setPlan(true);else{await setPlan(false);await setBypass(false);}setTimeout(fetchStatus,200);}
 async function setMode(m){if(m==='auto'){if(planMode)await setPlan(false);if(bypassMode)await setBypass(false);}else if(m==='plan'){await setPlan(true);}else if(m==='yolo'){await setBypass(true);}}
 
 // toolbar buttons
diff --git a/internal/serve/serve.go b/internal/serve/serve.go
index a71b2f2a7..3823aa913 100644
--- a/internal/serve/serve.go
+++ b/internal/serve/serve.go
@@ -204,6 +204,7 @@ func (s *Server) handler() http.Handler {
 	mux.HandleFunc("POST /rewind", s.rewind)
 	mux.HandleFunc("POST /fork", s.fork)
 	mux.HandleFunc("POST /summarize", s.summarize)
+	mux.HandleFunc("POST /auto-approve-tools", s.autoApproveTools)
 	mux.HandleFunc("POST /bypass", s.bypass)
 	mux.HandleFunc("POST /answer", s.answer)
 	mux.HandleFunc("POST /resume", s.resume)
@@ -640,8 +641,8 @@ func (s *Server) summarize(w http.ResponseWriter, r *http.Request) {
 	w.WriteHeader(http.StatusNoContent)
 }
 
-// bypass toggles YOLO/bypass mode.
-func (s *Server) bypass(w http.ResponseWriter, r *http.Request) {
+// autoApproveTools toggles YOLO/full-access tool auto-approval.
+func (s *Server) autoApproveTools(w http.ResponseWriter, r *http.Request) {
 	var body struct {
 		On bool `json:"on"`
 	}
@@ -649,10 +650,15 @@ func (s *Server) bypass(w http.ResponseWriter, r *http.Request) {
 		http.Error(w, "bad body", http.StatusBadRequest)
 		return
 	}
-	s.ctl().SetBypass(body.On)
+	s.ctl().SetAutoApproveTools(body.On)
 	w.WriteHeader(http.StatusNoContent)
 }
 
+// bypass is the legacy HTTP endpoint for YOLO/full-access tool auto-approval.
+func (s *Server) bypass(w http.ResponseWriter, r *http.Request) {
+	s.autoApproveTools(w, r)
+}
+
 // answer responds to an ask_request.
 func (s *Server) answer(w http.ResponseWriter, r *http.Request) {
 	var body struct {
@@ -736,15 +742,19 @@ func (s *Server) status(w http.ResponseWriter, r *http.Request) {
 	used, window := s.ctl().ContextSnapshot()
 	hit, miss := s.ctl().SessionCache()
 	sess := map[string]any{
-		"label":     s.ctl().Label(),
-		"running":   s.ctl().Running(),
-		"plan":      s.ctl().PlanMode(),
-		"bypass":    s.ctl().Bypass(),
-		"cwd":       s.ctl().SessionDir(),
-		"used":      used,
-		"window":    window,
-		"cacheHit":  hit,
-		"cacheMiss": miss,
+		"label":            s.ctl().Label(),
+		"running":          s.ctl().Running(),
+		"plan":             s.ctl().PlanMode(),
+		"autoApproveTools": s.ctl().AutoApproveTools(),
+		"bypass":           s.ctl().AutoApproveTools(),
+		"toolApprovalMode": s.ctl().ToolApprovalMode(),
+		"goal":             s.ctl().Goal(),
+		"goalStatus":       s.ctl().GoalStatus(),
+		"cwd":              s.ctl().SessionDir(),
+		"used":             used,
+		"window":           window,
+		"cacheHit":         hit,
+		"cacheMiss":        miss,
 	}
 	if u := s.ctl().LastUsage(); u != nil {
 		sess["lastUsage"] = u

From e34e39bb656b773e1b71c5bbced37dea2b3e165f Mon Sep 17 00:00:00 2001
From: YHH <359807859@qq.com>
Date: Tue, 9 Jun 2026 20:43:55 -0700
Subject: [PATCH 44/64] fix(diff): compute the Myers n+m bound only when it
 can't overflow (#3773)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

CodeQL go/allocation-size-overflow (high) flagged `n + m` flowing into
`make([]int, 2*maxD+1)`: a pathological line count could overflow the
addition before the downstream clamp. The result was already safe (the
clamp caught a wrapped-negative maxD), but the addition itself still
tripped the query. Restructure to maxD = min(n+m, maxDiffEdits) with the
sum taken only when n and m are within the cap — no overflow at the
operation, identical bound.

Co-authored-by: reasonix <reasonix@deepseek.com>
---
 internal/diff/diff.go | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/internal/diff/diff.go b/internal/diff/diff.go
index 60df68078..771cbd961 100644
--- a/internal/diff/diff.go
+++ b/internal/diff/diff.go
@@ -153,9 +153,10 @@ func myers(a, b []string) ([]op, bool) {
 	if n == 0 && m == 0 {
 		return nil, true
 	}
-	maxD := n + m
-	if maxD > maxDiffEdits || maxD < 0 {
-		maxD = maxDiffEdits // bound the trace's O(D²) footprint (and any n+m overflow)
+	// maxD = min(n+m, maxDiffEdits); take the sum only when it can't overflow int.
+	maxD := maxDiffEdits // bound the trace's O(D²) footprint
+	if n <= maxDiffEdits && m <= maxDiffEdits-n {
+		maxD = n + m
 	}
 	offset := maxD // shift negative k into a non-negative array index
 	v := make([]int, 2*maxD+1)

From f9c066ca7f7ee845c65868ca8ff9404a016621ae Mon Sep 17 00:00:00 2001
From: YHH <359807859@qq.com>
Date: Tue, 9 Jun 2026 20:54:58 -0700
Subject: [PATCH 45/64] fix(diff): clamp the Myers edit-distance operands to
 bound the allocation (#3775)

Follow-up to #3773: that cleared the n+m addition alert, but CodeQL still
flagged the 2*maxD allocation (go/allocation-size-overflow) because it
doesn't propagate maxD's bound through the guarded sum. Clamp each line
count to maxDiffEdits before summing, so the sum and the 2*maxD allocation
both have constant-bounded operands. maxD stays min(n+m, maxDiffEdits).

Co-authored-by: reasonix <reasonix@deepseek.com>
---
 internal/diff/diff.go | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/internal/diff/diff.go b/internal/diff/diff.go
index 771cbd961..5f8f81794 100644
--- a/internal/diff/diff.go
+++ b/internal/diff/diff.go
@@ -153,10 +153,18 @@ func myers(a, b []string) ([]op, bool) {
 	if n == 0 && m == 0 {
 		return nil, true
 	}
-	// maxD = min(n+m, maxDiffEdits); take the sum only when it can't overflow int.
-	maxD := maxDiffEdits // bound the trace's O(D²) footprint
-	if n <= maxDiffEdits && m <= maxDiffEdits-n {
-		maxD = n + m
+	// Clamp each side to the cap before summing so neither n+m nor the 2*maxD
+	// allocation can overflow int; maxD stays min(n+m, maxDiffEdits).
+	cn, cm := n, m
+	if cn > maxDiffEdits {
+		cn = maxDiffEdits
+	}
+	if cm > maxDiffEdits {
+		cm = maxDiffEdits
+	}
+	maxD := cn + cm
+	if maxD > maxDiffEdits {
+		maxD = maxDiffEdits // bound the trace's O(D²) footprint
 	}
 	offset := maxD // shift negative k into a non-negative array index
 	v := make([]int, 2*maxD+1)

From 1e7ed8d36a9d8addab722736ef44cddd4832ab75 Mon Sep 17 00:00:00 2001
From: SivanCola <liuxw96@foxmail.com>
Date: Wed, 10 Jun 2026 12:05:02 +0800
Subject: [PATCH 46/64] feat(bot): add bot gateway with Feishu/Weixin/QQ
 adapters (#3763)

Lands the bot gateway as its own feature, extracted from #3752: gateway/session plumbing plus Feishu, Weixin, and QQ adapters, CLI/config support, and the desktop Settings UI for bot channel configuration and guided setup.

Co-authored-by trailers preserved from the source branch.
---
 desktop/app.go                                |   3 +-
 desktop/bot_connection_app.go                 | 619 +++++++++++++
 desktop/bound_array_contract_test.go          |   4 +-
 .../frontend/src/components/SettingsPanel.tsx | 810 ++++++++++++++++-
 desktop/frontend/src/lib/bridge.ts            | 125 ++-
 desktop/frontend/src/lib/types.ts             | 110 ++-
 desktop/frontend/src/locales/en.ts            |  93 ++
 desktop/frontend/src/locales/zh.ts            |  93 ++
 desktop/frontend/src/styles.css               | 382 +++++++++
 desktop/go.mod                                |   2 +
 desktop/go.sum                                |  29 +
 desktop/settings_app.go                       | 169 ++++
 go.mod                                        |   3 +
 go.sum                                        |  19 +
 internal/bot/feishu/feishu.go                 | 603 +++++++++++++
 internal/bot/feishu/feishu_test.go            |  91 ++
 internal/bot/gateway.go                       | 490 +++++++++++
 internal/bot/gateway_test.go                  | 195 +++++
 internal/bot/hash.go                          |  15 +
 internal/bot/qq/adapter.go                    |  71 ++
 internal/bot/qq/gateway.go                    | 397 +++++++++
 internal/bot/qq/gateway_test.go               |  48 ++
 internal/bot/render.go                        | 253 ++++++
 internal/bot/render_test.go                   |  28 +
 internal/bot/session.go                       | 176 ++++
 internal/bot/session_test.go                  | 213 +++++
 internal/bot/types.go                         | 134 +++
 internal/bot/weixin/weixin.go                 | 811 ++++++++++++++++++
 internal/cli/bot.go                           | 381 ++++++++
 internal/cli/cli.go                           |   5 +-
 internal/config/config.go                     |  92 ++
 internal/config/render.go                     | 112 +++
 internal/i18n/messages_en.go                  |   1 +
 internal/i18n/messages_zh.go                  |   1 +
 reasonix.example.toml                         |  39 +
 35 files changed, 6602 insertions(+), 15 deletions(-)
 create mode 100644 desktop/bot_connection_app.go
 create mode 100644 internal/bot/feishu/feishu.go
 create mode 100644 internal/bot/feishu/feishu_test.go
 create mode 100644 internal/bot/gateway.go
 create mode 100644 internal/bot/gateway_test.go
 create mode 100644 internal/bot/hash.go
 create mode 100644 internal/bot/qq/adapter.go
 create mode 100644 internal/bot/qq/gateway.go
 create mode 100644 internal/bot/qq/gateway_test.go
 create mode 100644 internal/bot/render.go
 create mode 100644 internal/bot/render_test.go
 create mode 100644 internal/bot/session.go
 create mode 100644 internal/bot/session_test.go
 create mode 100644 internal/bot/types.go
 create mode 100644 internal/bot/weixin/weixin.go
 create mode 100644 internal/cli/bot.go

diff --git a/desktop/app.go b/desktop/app.go
index f6fb677ec..65a4138e3 100644
--- a/desktop/app.go
+++ b/desktop/app.go
@@ -75,6 +75,7 @@ type App struct {
 	tray                *desktopTray
 
 	mediaTokens *mediaTokenStore
+	botInstalls map[string]*botInstallSession
 }
 
 // mediaTokenEntry holds metadata for a workspace media file served via temporary URL.
@@ -243,7 +244,7 @@ func (a *App) workspaceMediaMiddleware() func(http.Handler) http.Handler {
 // NewApp constructs the bound object. Tabs are restored in startup from the
 // last session's desktop-tabs.json.
 func NewApp() *App {
-	return &App{tabs: map[string]*WorkspaceTab{}, mediaTokens: newMediaTokenStore()}
+	return &App{tabs: map[string]*WorkspaceTab{}, mediaTokens: newMediaTokenStore(), botInstalls: map[string]*botInstallSession{}}
 }
 
 func (a *App) bootContext() context.Context {
diff --git a/desktop/bot_connection_app.go b/desktop/bot_connection_app.go
new file mode 100644
index 000000000..9556c85d8
--- /dev/null
+++ b/desktop/bot_connection_app.go
@@ -0,0 +1,619 @@
+package main
+
+import (
+	"context"
+	"crypto/rand"
+	"encoding/hex"
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"net/url"
+	"os"
+	"strings"
+	"time"
+
+	"reasonix/internal/bot"
+	"reasonix/internal/bot/feishu"
+	"reasonix/internal/bot/weixin"
+	"reasonix/internal/config"
+)
+
+type BotConnectionCredentialView struct {
+	AppID        string `json:"appId"`
+	AppSecretEnv string `json:"appSecretEnv"`
+	AccountID    string `json:"accountId"`
+	TokenEnv     string `json:"tokenEnv"`
+	SecretSet    bool   `json:"secretSet"`
+}
+
+type BotConnectionSessionMappingView struct {
+	RemoteID  string `json:"remoteId"`
+	SessionID string `json:"sessionId"`
+	UpdatedAt string `json:"updatedAt"`
+}
+
+type BotConnectionView struct {
+	ID              string                            `json:"id"`
+	Provider        string                            `json:"provider"`
+	Domain          string                            `json:"domain"`
+	Label           string                            `json:"label"`
+	Enabled         bool                              `json:"enabled"`
+	Status          string                            `json:"status"`
+	Credential      BotConnectionCredentialView       `json:"credential"`
+	SessionMappings []BotConnectionSessionMappingView `json:"sessionMappings"`
+	LastError       string                            `json:"lastError"`
+	CreatedAt       string                            `json:"createdAt"`
+	UpdatedAt       string                            `json:"updatedAt"`
+}
+
+type BotInstallStartResult struct {
+	OK         bool   `json:"ok"`
+	Provider   string `json:"provider"`
+	Domain     string `json:"domain"`
+	InstallID  string `json:"installId"`
+	URL        string `json:"url"`
+	DeviceCode string `json:"deviceCode"`
+	UserCode   string `json:"userCode"`
+	Interval   int    `json:"interval"`
+	ExpireIn   int    `json:"expireIn"`
+	Message    string `json:"message"`
+}
+
+type BotInstallPollResult struct {
+	Done       bool              `json:"done"`
+	Connection BotConnectionView `json:"connection"`
+	Status     string            `json:"status"`
+	Message    string            `json:"message"`
+	Error      string            `json:"error"`
+}
+
+type BotConnectionDiagnostic struct {
+	ID        string `json:"id"`
+	Label     string `json:"label"`
+	Status    string `json:"status"`
+	Message   string `json:"message"`
+	MessageID string `json:"messageId"`
+}
+
+type botInstallSession struct {
+	Provider   string
+	Domain     string
+	DeviceCode string
+	UserCode   string
+	StartedAt  time.Time
+	ExpireAt   time.Time
+	Weixin     *weixin.LoginSession
+}
+
+func (a *App) StartBotConnectionInstall(provider, domain string) (BotInstallStartResult, error) {
+	provider, domain = normalizeBotInstallTarget(provider, domain)
+	if provider == "weixin" {
+		session, err := weixin.StartLogin(context.Background())
+		if err != nil {
+			return BotInstallStartResult{OK: false, Provider: provider, Domain: domain, Message: err.Error()}, nil
+		}
+		installID := randomInstallID()
+		a.mu.Lock()
+		if a.botInstalls == nil {
+			a.botInstalls = map[string]*botInstallSession{}
+		}
+		a.botInstalls[installID] = &botInstallSession{
+			Provider:   provider,
+			Domain:     domain,
+			DeviceCode: session.QRCode,
+			StartedAt:  session.StartedAt,
+			ExpireAt:   time.Now().Add(2 * time.Minute),
+			Weixin:     session,
+		}
+		a.mu.Unlock()
+		return BotInstallStartResult{
+			OK: true, Provider: provider, Domain: domain, InstallID: installID, URL: firstNonEmptyBot(session.QRCodeURL, session.QRCode),
+			DeviceCode: session.QRCode, Interval: 3, ExpireIn: 120, Message: "请使用微信扫码完成连接。",
+		}, nil
+	}
+	if provider != "feishu" {
+		return BotInstallStartResult{OK: false, Provider: provider, Domain: domain, Message: "unsupported bot provider"}, nil
+	}
+	return a.startFeishuConnectionInstall(domain)
+}
+
+func (a *App) PollBotConnectionInstall(installID string) (BotInstallPollResult, error) {
+	installID = strings.TrimSpace(installID)
+	a.mu.RLock()
+	session := a.botInstalls[installID]
+	a.mu.RUnlock()
+	if session == nil {
+		return BotInstallPollResult{Error: "install session not found"}, nil
+	}
+	if time.Now().After(session.ExpireAt) {
+		a.deleteBotInstall(installID)
+		return BotInstallPollResult{Status: "expired", Error: "install session expired"}, nil
+	}
+	if session.Provider == "weixin" {
+		result, status, err := weixin.PollLogin(context.Background(), session.Weixin)
+		if err != nil {
+			return BotInstallPollResult{Status: status, Error: err.Error()}, nil
+		}
+		if result == nil {
+			return BotInstallPollResult{Status: status, Message: weixinInstallStatusMessage(status)}, nil
+		}
+		a.deleteBotInstall(installID)
+		conn, err := a.upsertBotConnection(config.BotConnectionConfig{
+			ID:         connectionID("weixin", "weixin"),
+			Provider:   "weixin",
+			Domain:     "weixin",
+			Label:      "微信",
+			Enabled:    true,
+			Status:     "connected",
+			Credential: config.BotConnectionCredential{AccountID: result.AccountID, TokenEnv: "WEIXIN_BOT_TOKEN"},
+		}, func(c *config.Config) {
+			c.Bot.Enabled = true
+			c.Bot.Weixin.Enabled = true
+			c.Bot.Weixin.AccountID = result.AccountID
+			c.Bot.Weixin.APIBase = result.BaseURL
+			if c.Bot.Weixin.TokenEnv == "" {
+				c.Bot.Weixin.TokenEnv = "WEIXIN_BOT_TOKEN"
+			}
+		})
+		if err != nil {
+			return BotInstallPollResult{Status: "error", Error: err.Error()}, nil
+		}
+		return BotInstallPollResult{Done: true, Status: "connected", Connection: conn, Message: "微信已连接。"}, nil
+	}
+	return a.pollFeishuConnectionInstall(installID, session)
+}
+
+func (a *App) DiagnoseBotConnection(id string) (BotConnectionDiagnostic, error) {
+	cfg, err := config.Load()
+	if err != nil {
+		return BotConnectionDiagnostic{ID: id, Status: "error", Message: err.Error()}, nil
+	}
+	for _, conn := range cfg.Bot.Connections {
+		if conn.ID == id {
+			status := "ok"
+			message := "连接配置已保存。"
+			if !conn.Enabled {
+				status = "disabled"
+				message = "连接已保存但未启用。"
+			} else if conn.Status != "connected" {
+				status = firstNonEmptyBot(conn.Status, "pending")
+				message = firstNonEmptyBot(conn.LastError, "连接还未完成。")
+			} else if conn.Credential.AppSecretEnv != "" && strings.TrimSpace(conn.Credential.AppSecretEnv) != "" && !envIsSet(conn.Credential.AppSecretEnv) {
+				status = "warning"
+				message = conn.Credential.AppSecretEnv + " 未设置。"
+			}
+			return BotConnectionDiagnostic{ID: conn.ID, Label: conn.Label, Status: status, Message: message}, nil
+		}
+	}
+	return BotConnectionDiagnostic{ID: id, Status: "missing", Message: "未找到连接。"}, nil
+}
+
+func (a *App) TestBotConnection(id, target string) (BotConnectionDiagnostic, error) {
+	cfg, err := config.Load()
+	if err != nil {
+		return BotConnectionDiagnostic{ID: id, Status: "error", Message: err.Error()}, nil
+	}
+	var conn *config.BotConnectionConfig
+	for i := range cfg.Bot.Connections {
+		if cfg.Bot.Connections[i].ID == strings.TrimSpace(id) {
+			conn = &cfg.Bot.Connections[i]
+			break
+		}
+	}
+	if conn == nil {
+		return BotConnectionDiagnostic{ID: id, Status: "missing", Message: "未找到连接。"}, nil
+	}
+	target = firstNonEmptyBot(strings.TrimSpace(target), firstSessionRemoteID(conn.SessionMappings))
+	if conn.Provider != "feishu" && conn.Provider != "weixin" {
+		return BotConnectionDiagnostic{ID: conn.ID, Label: conn.Label, Status: "warning", Message: "当前渠道暂不支持桌面端主动发送测试消息，可使用诊断检查基础配置。"}, nil
+	}
+	if target == "" {
+		return BotConnectionDiagnostic{ID: conn.ID, Label: conn.Label, Status: "warning", Message: "请输入测试会话 ID 后再发送测试消息。"}, nil
+	}
+	ctx, cancel := context.WithTimeout(context.Background(), 15*time.Second)
+	defer cancel()
+	var result bot.SendResult
+	switch conn.Provider {
+	case "feishu":
+		feishuCfg := cfg.Bot.Feishu
+		feishuCfg.Enabled = true
+		feishuCfg.Domain = firstNonEmptyBot(conn.Domain, feishuCfg.Domain)
+		feishuCfg.AppID = firstNonEmptyBot(conn.Credential.AppID, feishuCfg.AppID)
+		feishuCfg.AppSecretEnv = firstNonEmptyBot(conn.Credential.AppSecretEnv, feishuCfg.AppSecretEnv)
+		result, err = feishu.SendText(ctx, feishuCfg, target, "Reasonix bot 测试消息：连接和发送链路可用。")
+	case "weixin":
+		weixinCfg := cfg.Bot.Weixin
+		weixinCfg.Enabled = true
+		weixinCfg.AccountID = firstNonEmptyBot(conn.Credential.AccountID, weixinCfg.AccountID)
+		weixinCfg.TokenEnv = firstNonEmptyBot(conn.Credential.TokenEnv, weixinCfg.TokenEnv)
+		result, err = weixin.SendText(ctx, weixinCfg, target, "Reasonix bot 测试消息：连接和发送链路可用。")
+	}
+	if err != nil {
+		return BotConnectionDiagnostic{ID: conn.ID, Label: conn.Label, Status: "error", Message: err.Error()}, nil
+	}
+	_ = a.rememberBotConnectionRemote(conn.ID, target)
+	msg := "测试消息已发送。"
+	if result.MessageID != "" {
+		msg += " Message ID: " + result.MessageID
+	}
+	return BotConnectionDiagnostic{ID: conn.ID, Label: conn.Label, Status: "ok", Message: msg, MessageID: result.MessageID}, nil
+}
+
+func (a *App) startFeishuConnectionInstall(domain string) (BotInstallStartResult, error) {
+	base := feishuAccountsBase(domain)
+	if _, err := postFeishuInstallForm(base, map[string]string{"action": "init"}); err != nil {
+		return BotInstallStartResult{OK: false, Provider: "feishu", Domain: domain, Message: err.Error()}, nil
+	}
+	data, err := postFeishuInstallForm(base, map[string]string{
+		"action": "begin", "archetype": "PersonalAgent", "auth_method": "client_secret", "request_user_info": "open_id",
+	})
+	if err != nil {
+		return BotInstallStartResult{OK: false, Provider: "feishu", Domain: domain, Message: err.Error()}, nil
+	}
+	deviceCode := stringValue(data["device_code"])
+	verifyURL := stringValue(data["verification_uri_complete"])
+	userCode := stringValue(data["user_code"])
+	if deviceCode == "" || verifyURL == "" {
+		return BotInstallStartResult{OK: false, Provider: "feishu", Domain: domain, Message: "飞书/Lark 授权响应缺少 device_code 或二维码 URL。"}, nil
+	}
+	installID := randomInstallID()
+	interval := intValue(data["interval"], 5)
+	expireIn := intValue(firstAny(data["expire_in"], data["expires_in"]), 300)
+	a.mu.Lock()
+	if a.botInstalls == nil {
+		a.botInstalls = map[string]*botInstallSession{}
+	}
+	a.botInstalls[installID] = &botInstallSession{
+		Provider: "feishu", Domain: domain, DeviceCode: deviceCode, UserCode: userCode,
+		StartedAt: time.Now(), ExpireAt: time.Now().Add(time.Duration(expireIn) * time.Second),
+	}
+	a.mu.Unlock()
+	return BotInstallStartResult{OK: true, Provider: "feishu", Domain: domain, InstallID: installID, URL: verifyURL, DeviceCode: deviceCode, UserCode: userCode, Interval: interval, ExpireIn: expireIn}, nil
+}
+
+func (a *App) pollFeishuConnectionInstall(installID string, session *botInstallSession) (BotInstallPollResult, error) {
+	data, statusCode, err := postFeishuInstallFormResult(feishuAccountsBase(session.Domain), map[string]string{"action": "poll", "device_code": session.DeviceCode})
+	if err != nil {
+		return BotInstallPollResult{Status: "error", Error: err.Error()}, nil
+	}
+	if errText := stringValue(data["error"]); errText != "" {
+		if errText == "authorization_pending" || errText == "slow_down" {
+			return BotInstallPollResult{Status: "pending", Message: "等待扫码授权。"}, nil
+		}
+		a.deleteBotInstall(installID)
+		return BotInstallPollResult{Status: "error", Error: firstNonEmptyBot(stringValue(data["error_description"]), errText)}, nil
+	}
+	if statusCode >= 400 {
+		a.deleteBotInstall(installID)
+		return BotInstallPollResult{Status: "error", Error: fmt.Sprintf("HTTP %d", statusCode)}, nil
+	}
+	appID := stringValue(data["client_id"])
+	appSecret := stringValue(data["client_secret"])
+	if appID == "" || appSecret == "" {
+		return BotInstallPollResult{Status: "pending", Message: "等待授权完成。"}, nil
+	}
+	a.deleteBotInstall(installID)
+	secretEnv := "FEISHU_BOT_APP_SECRET"
+	if session.Domain == "lark" {
+		secretEnv = "LARK_BOT_APP_SECRET"
+	}
+	if err := upsertDotEnv(secretEnv, appSecret); err != nil {
+		return BotInstallPollResult{Status: "error", Error: err.Error()}, nil
+	}
+	label := "飞书"
+	if session.Domain == "lark" {
+		label = "Lark"
+	}
+	conn, err := a.upsertBotConnection(config.BotConnectionConfig{
+		ID:         connectionID("feishu", session.Domain),
+		Provider:   "feishu",
+		Domain:     session.Domain,
+		Label:      label,
+		Enabled:    true,
+		Status:     "connected",
+		Credential: config.BotConnectionCredential{AppID: appID, AppSecretEnv: secretEnv},
+	}, func(c *config.Config) {
+		c.Bot.Enabled = true
+		c.Bot.Feishu.Enabled = true
+		c.Bot.Feishu.Domain = session.Domain
+		c.Bot.Feishu.AppID = appID
+		c.Bot.Feishu.AppSecretEnv = secretEnv
+		c.Bot.Feishu.Mode = "websocket"
+		c.Bot.Feishu.RequireMention = true
+	})
+	if err != nil {
+		return BotInstallPollResult{Status: "error", Error: err.Error()}, nil
+	}
+	return BotInstallPollResult{Done: true, Status: "connected", Connection: conn, Message: label + " 已连接。"}, nil
+}
+
+func (a *App) upsertBotConnection(conn config.BotConnectionConfig, updateLegacy func(*config.Config)) (BotConnectionView, error) {
+	now := time.Now().UTC().Format(time.RFC3339)
+	if conn.CreatedAt == "" {
+		conn.CreatedAt = now
+	}
+	conn.UpdatedAt = now
+	if conn.Status == "" {
+		conn.Status = "connected"
+	}
+	if conn.ID == "" {
+		conn.ID = connectionID(conn.Provider, conn.Domain)
+	}
+	err := a.applyConfigOnly(func(c *config.Config) error {
+		if updateLegacy != nil {
+			updateLegacy(c)
+		}
+		replaced := false
+		for i, existing := range c.Bot.Connections {
+			if existing.ID == conn.ID {
+				conn.CreatedAt = firstNonEmptyBot(existing.CreatedAt, conn.CreatedAt)
+				c.Bot.Connections[i] = conn
+				replaced = true
+				break
+			}
+		}
+		if !replaced {
+			c.Bot.Connections = append(c.Bot.Connections, conn)
+		}
+		return nil
+	})
+	return botConnectionView(conn), err
+}
+
+func (a *App) rememberBotConnectionRemote(id, remoteID string) error {
+	id = strings.TrimSpace(id)
+	remoteID = strings.TrimSpace(remoteID)
+	if id == "" || remoteID == "" {
+		return nil
+	}
+	now := time.Now().UTC().Format(time.RFC3339)
+	return a.applyConfigOnly(func(c *config.Config) error {
+		for i := range c.Bot.Connections {
+			if c.Bot.Connections[i].ID != id {
+				continue
+			}
+			for j := range c.Bot.Connections[i].SessionMappings {
+				if c.Bot.Connections[i].SessionMappings[j].RemoteID == remoteID {
+					c.Bot.Connections[i].SessionMappings[j].UpdatedAt = now
+					c.Bot.Connections[i].UpdatedAt = now
+					return nil
+				}
+			}
+			c.Bot.Connections[i].SessionMappings = append(c.Bot.Connections[i].SessionMappings, config.BotConnectionSessionMapping{
+				RemoteID:  remoteID,
+				SessionID: "",
+				UpdatedAt: now,
+			})
+			c.Bot.Connections[i].UpdatedAt = now
+			return nil
+		}
+		return nil
+	})
+}
+
+func firstSessionRemoteID(mappings []config.BotConnectionSessionMapping) string {
+	for _, mapping := range mappings {
+		if strings.TrimSpace(mapping.RemoteID) != "" {
+			return strings.TrimSpace(mapping.RemoteID)
+		}
+	}
+	return ""
+}
+
+func (a *App) deleteBotInstall(installID string) {
+	a.mu.Lock()
+	delete(a.botInstalls, installID)
+	a.mu.Unlock()
+}
+
+func normalizeBotInstallTarget(provider, domain string) (string, string) {
+	provider = strings.ToLower(strings.TrimSpace(provider))
+	domain = strings.ToLower(strings.TrimSpace(domain))
+	if provider == "lark" {
+		provider = "feishu"
+		domain = "lark"
+	}
+	if provider == "weixin" || provider == "wechat" {
+		return "weixin", "weixin"
+	}
+	if domain != "lark" {
+		domain = "feishu"
+	}
+	return "feishu", domain
+}
+
+func feishuAccountsBase(domain string) string {
+	if domain == "lark" {
+		return "https://accounts.larksuite.com"
+	}
+	return "https://accounts.feishu.cn"
+}
+
+func postFeishuInstallForm(base string, body map[string]string) (map[string]any, error) {
+	data, status, err := postFeishuInstallFormResult(base, body)
+	if err != nil {
+		return nil, err
+	}
+	if status >= 400 {
+		return nil, fmt.Errorf("HTTP %d: %s", status, firstNonEmptyBot(stringValue(data["error_description"]), stringValue(data["message"])))
+	}
+	return data, nil
+}
+
+func postFeishuInstallFormResult(base string, body map[string]string) (map[string]any, int, error) {
+	reqBody := url.Values{}
+	for k, v := range body {
+		reqBody.Set(k, v)
+	}
+	req, err := http.NewRequest("POST", strings.TrimRight(base, "/")+"/oauth/v1/app/registration", strings.NewReader(reqBody.Encode()))
+	if err != nil {
+		return nil, 0, err
+	}
+	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+	resp, err := http.DefaultClient.Do(req)
+	if err != nil {
+		return nil, 0, err
+	}
+	defer resp.Body.Close()
+	var out map[string]any
+	if err := json.NewDecoder(resp.Body).Decode(&out); err != nil {
+		return nil, resp.StatusCode, err
+	}
+	return out, resp.StatusCode, nil
+}
+
+func botConnectionView(conn config.BotConnectionConfig) BotConnectionView {
+	return BotConnectionView{
+		ID: conn.ID, Provider: conn.Provider, Domain: conn.Domain, Label: conn.Label, Enabled: conn.Enabled, Status: conn.Status,
+		Credential: BotConnectionCredentialView{
+			AppID: conn.Credential.AppID, AppSecretEnv: conn.Credential.AppSecretEnv, AccountID: conn.Credential.AccountID, TokenEnv: conn.Credential.TokenEnv,
+			SecretSet: envIsSet(firstNonEmptyBot(conn.Credential.AppSecretEnv, conn.Credential.TokenEnv)),
+		},
+		SessionMappings: botSessionMappingViews(conn.SessionMappings),
+		LastError:       conn.LastError, CreatedAt: conn.CreatedAt, UpdatedAt: conn.UpdatedAt,
+	}
+}
+
+func botConnectionViews(connections []config.BotConnectionConfig) []BotConnectionView {
+	if connections == nil {
+		return []BotConnectionView{}
+	}
+	out := make([]BotConnectionView, 0, len(connections))
+	for _, conn := range connections {
+		out = append(out, botConnectionView(conn))
+	}
+	return out
+}
+
+func botConnectionConfig(view BotConnectionView) config.BotConnectionConfig {
+	return config.BotConnectionConfig{
+		ID:       strings.TrimSpace(view.ID),
+		Provider: strings.TrimSpace(view.Provider),
+		Domain:   strings.TrimSpace(view.Domain),
+		Label:    strings.TrimSpace(view.Label),
+		Enabled:  view.Enabled,
+		Status:   strings.TrimSpace(view.Status),
+		Credential: config.BotConnectionCredential{
+			AppID:        strings.TrimSpace(view.Credential.AppID),
+			AppSecretEnv: strings.TrimSpace(view.Credential.AppSecretEnv),
+			AccountID:    strings.TrimSpace(view.Credential.AccountID),
+			TokenEnv:     strings.TrimSpace(view.Credential.TokenEnv),
+		},
+		SessionMappings: botSessionMappingConfigs(view.SessionMappings),
+		LastError:       strings.TrimSpace(view.LastError),
+		CreatedAt:       strings.TrimSpace(view.CreatedAt),
+		UpdatedAt:       strings.TrimSpace(view.UpdatedAt),
+	}
+}
+
+func botConnectionConfigs(views []BotConnectionView) []config.BotConnectionConfig {
+	if views == nil {
+		return nil
+	}
+	out := make([]config.BotConnectionConfig, 0, len(views))
+	for _, view := range views {
+		cfg := botConnectionConfig(view)
+		if cfg.ID == "" || cfg.Provider == "" {
+			continue
+		}
+		out = append(out, cfg)
+	}
+	return out
+}
+
+func botSessionMappingViews(mappings []config.BotConnectionSessionMapping) []BotConnectionSessionMappingView {
+	if mappings == nil {
+		return []BotConnectionSessionMappingView{}
+	}
+	out := make([]BotConnectionSessionMappingView, 0, len(mappings))
+	for _, m := range mappings {
+		out = append(out, BotConnectionSessionMappingView{RemoteID: m.RemoteID, SessionID: m.SessionID, UpdatedAt: m.UpdatedAt})
+	}
+	return out
+}
+
+func botSessionMappingConfigs(mappings []BotConnectionSessionMappingView) []config.BotConnectionSessionMapping {
+	if mappings == nil {
+		return nil
+	}
+	out := make([]config.BotConnectionSessionMapping, 0, len(mappings))
+	for _, m := range mappings {
+		out = append(out, config.BotConnectionSessionMapping{
+			RemoteID:  strings.TrimSpace(m.RemoteID),
+			SessionID: strings.TrimSpace(m.SessionID),
+			UpdatedAt: strings.TrimSpace(m.UpdatedAt),
+		})
+	}
+	return out
+}
+
+func connectionID(provider, domain string) string {
+	return strings.Trim(strings.ToLower(provider+"-"+domain), "-")
+}
+
+func randomInstallID() string {
+	var b [12]byte
+	if _, err := rand.Read(b[:]); err != nil {
+		return fmt.Sprintf("install-%d", time.Now().UnixNano())
+	}
+	return hex.EncodeToString(b[:])
+}
+
+func envIsSet(name string) bool {
+	return strings.TrimSpace(name) != "" && strings.TrimSpace(os.Getenv(name)) != ""
+}
+
+func firstAny(values ...any) any {
+	for _, value := range values {
+		if value != nil {
+			return value
+		}
+	}
+	return nil
+}
+
+func firstNonEmptyBot(values ...string) string {
+	for _, value := range values {
+		if strings.TrimSpace(value) != "" {
+			return value
+		}
+	}
+	return ""
+}
+
+func stringValue(value any) string {
+	if value == nil {
+		return ""
+	}
+	return strings.TrimSpace(fmt.Sprint(value))
+}
+
+func intValue(value any, fallback int) int {
+	switch v := value.(type) {
+	case float64:
+		if v > 0 {
+			return int(v)
+		}
+	case int:
+		if v > 0 {
+			return v
+		}
+	case string:
+		var n int
+		if _, err := fmt.Sscanf(v, "%d", &n); err == nil && n > 0 {
+			return n
+		}
+	}
+	return fallback
+}
+
+func weixinInstallStatusMessage(status string) string {
+	switch status {
+	case "scaned":
+		return "已扫码，请在微信里确认。"
+	case "scaned_but_redirect":
+		return "已扫码，正在切换微信授权节点。"
+	default:
+		return "等待扫码。"
+	}
+}
diff --git a/desktop/bound_array_contract_test.go b/desktop/bound_array_contract_test.go
index 269ddc290..ab8d8c2af 100644
--- a/desktop/bound_array_contract_test.go
+++ b/desktop/bound_array_contract_test.go
@@ -41,7 +41,9 @@ func TestBoundArrayPayloadsAreNonNilBeforeStartup(t *testing.T) {
 	}
 	if got := app.Settings(); got.Providers == nil || got.OfficialProviders == nil || got.ProviderKinds == nil ||
 		got.Permissions.Allow == nil || got.Permissions.Ask == nil || got.Permissions.Deny == nil ||
-		got.Sandbox.AllowWrite == nil {
+		got.Sandbox.AllowWrite == nil ||
+		got.Bot.Allowlist.QQUsers == nil || got.Bot.Allowlist.FeishuUsers == nil || got.Bot.Allowlist.WeixinUsers == nil ||
+		got.Bot.Allowlist.QQGroups == nil || got.Bot.Allowlist.FeishuGroups == nil || got.Bot.Allowlist.WeixinGroups == nil {
 		t.Fatalf("Settings() contains nil array fields: %+v", got)
 	}
 }
diff --git a/desktop/frontend/src/components/SettingsPanel.tsx b/desktop/frontend/src/components/SettingsPanel.tsx
index 5b3a850b5..8e56a3b63 100644
--- a/desktop/frontend/src/components/SettingsPanel.tsx
+++ b/desktop/frontend/src/components/SettingsPanel.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useMemo, useRef, useState, type ReactNode } from "react";
+import { useEffect, useMemo, useRef, useState, type Dispatch, type ReactNode, type SetStateAction } from "react";
 import { Check, ChevronDown } from "lucide-react";
 import { asArray } from "../lib/array";
 import { useDeferredClose } from "../lib/useMountTransition";
@@ -18,15 +18,16 @@ import {
 } from "../lib/theme";
 import { TEXT_SIZES, applyTextSize, getTextSize, type TextSize } from "../lib/textSize";
 import { FONT_FAMILIES, applyFontFamily, getFontFamily, type FontFamily } from "../lib/fontFamily";
-import type { NetworkView, ProviderView, SettingsTab, SettingsView } from "../lib/types";
+import type { BotConnectionView, BotInstallStartResult, BotSettingsView, NetworkView, ProviderView, SettingsTab, SettingsView } from "../lib/types";
 import { InlineConfirmButton } from "./InlineConfirmButton";
 import { Tooltip } from "./Tooltip";
 import { AnchoredPopover } from "./AnchoredPopover";
 import { MCPServersSettingsPage, SkillsSettingsPage } from "./CapabilitiesPanel";
 import { MemorySettingsPage } from "./MemoryPanel";
+import { CopyButton } from "./CopyButton";
 import { ModalCloseButton } from "./ModalCloseButton";
 
-const SETTINGS_TABS: SettingsTab[] = ["general", "models", "mcp", "skills", "memory", "permissions", "sandbox", "network", "appearance", "updates"];
+const SETTINGS_TABS: SettingsTab[] = ["general", "models", "bots", "mcp", "skills", "memory", "permissions", "sandbox", "network", "appearance", "updates"];
 
 // SettingsPanel is the desktop settings centre — a centred modal with left
 // navigation and a right content area. It hosts all settings pages plus MCP,
@@ -94,7 +95,7 @@ export function SettingsPanel({ onClose, onChanged, initialTab }: { onClose: ()
   // The settings-reliant pages (general, models, network, permissions,
   // sandbox, appearance, updates) need SettingsView loaded. MCP, Skills, and Memory
   // load their own data and render regardless.
-  const needsSettings = tab === "general" || tab === "models" || tab === "network" || tab === "permissions" || tab === "sandbox" || tab === "appearance" || tab === "updates";
+  const needsSettings = tab === "general" || tab === "models" || tab === "bots" || tab === "network" || tab === "permissions" || tab === "sandbox" || tab === "appearance" || tab === "updates";
 
   return (
     <div className="management-modal-backdrop settings-modal-backdrop" data-state={status} onClick={(e) => { if (e.target === e.currentTarget) requestClose(); }}>
@@ -125,6 +126,7 @@ export function SettingsPanel({ onClose, onChanged, initialTab }: { onClose: ()
               <>
                 {tab === "general" && s && <SettingsPageShell key={tab} s={s} tab={tab} busy={busy} apply={apply}><GeneralSection s={s} busy={busy} apply={apply} /></SettingsPageShell>}
                 {tab === "models" && s && <SettingsPageShell key={tab} s={s} tab={tab} busy={busy} apply={apply}><ModelsSection s={s} busy={busy} apply={apply} backgroundApply={backgroundApply} /></SettingsPageShell>}
+                {tab === "bots" && s && <SettingsPageShell key={tab} s={s} tab={tab} busy={busy} apply={apply}><BotsSection s={s} busy={busy} apply={apply} /></SettingsPageShell>}
                 {tab === "mcp" && <SettingsPageShell key={tab} s={s} tab={tab} busy={false} apply={apply}><MCPServersSettingsPage /></SettingsPageShell>}
                 {tab === "skills" && <SettingsPageShell key={tab} s={s} tab={tab} busy={false} apply={apply}><SkillsSettingsPage /></SettingsPageShell>}
                 {tab === "memory" && <SettingsPageShell key={tab} s={s} tab={tab} busy={false} apply={apply}><MemorySettingsPage /></SettingsPageShell>}
@@ -270,6 +272,8 @@ function settingsTabLabel(id: SettingsTab, t: ReturnType<typeof useT>): string {
       return t("settings.tab.models");
     case "providers":
       return t("settings.tab.providers");
+    case "bots":
+      return t("settings.tab.bots");
     case "mcp":
       return t("settings.tab.mcp");
     case "skills":
@@ -297,6 +301,8 @@ function settingsTabMeta(id: SettingsTab, s: SettingsView, t: ReturnType<typeof
       return `${closeBehaviorLabel(normalizeCloseBehavior(s.closeBehavior), t)} · ${t(`settings.autoPlan.${normalizeAutoPlan(s.autoPlan)}`)}`;
     case "providers":
       return t("settings.providerCount", { n: s.providers.length });
+    case "bots":
+      return botSettingsMeta(s.bot, t);
     case "mcp":
       return t("caps.connectorsTab");
     case "skills":
@@ -326,6 +332,13 @@ function settingsModelMeta(s: SettingsView, t: ReturnType<typeof useT>): string
   return `${modelProviderLabel(provider, providerView, t)} · ${model}`;
 }
 
+function botSettingsMeta(bot: BotSettingsView, t: ReturnType<typeof useT>): string {
+  if (!bot.enabled) return t("settings.botMetaOff");
+  const channels = [bot.qq.enabled, bot.feishu.enabled, bot.weixin.enabled].filter(Boolean).length;
+  if (channels === 0) return t("settings.botMetaNoChannels");
+  return t("settings.botMetaChannels", { n: channels });
+}
+
 // allRefs flattens providers into "provider/model" refs for the model selectors.
 function allRefs(s: SettingsView): string[] {
   const out: string[] = [];
@@ -359,6 +372,7 @@ const REASONING_PROTOCOLS: readonly string[] = ["", "deepseek", "openai", "none"
 const PROXY_TYPES = ["http", "https", "socks5", "socks5h"] as const;
 const LANGUAGE_PREFS: LangPref[] = ["", "zh", "en"];
 const AUTO_PLAN_MODES = ["off", "on"] as const;
+const BOT_FEISHU_MODES = ["webhook", "websocket"] as const;
 
 type ProxyMode = (typeof PROXY_MODES)[number];
 type AutoPlanMode = (typeof AUTO_PLAN_MODES)[number];
@@ -386,6 +400,98 @@ function normalizeReasoningProtocol(protocol: string | undefined): string {
   return REASONING_PROTOCOLS.includes(protocol ?? "") ? protocol ?? "" : "";
 }
 
+function defaultBotSettings(): BotSettingsView {
+  return {
+    enabled: false,
+    model: "",
+    maxSteps: 0,
+    debounceMs: 1500,
+    allowlist: {
+      enabled: true,
+      allowAll: false,
+      qqUsers: [],
+      feishuUsers: [],
+      weixinUsers: [],
+      qqGroups: [],
+      feishuGroups: [],
+      weixinGroups: [],
+    },
+    qq: { enabled: false, appId: "", appSecretEnv: "QQ_BOT_APP_SECRET", secretSet: false },
+    feishu: {
+      enabled: false,
+      domain: "feishu",
+      appId: "",
+      appSecretEnv: "FEISHU_BOT_APP_SECRET",
+      secretSet: false,
+      verificationToken: "",
+      mode: "webhook",
+      webhookPort: 8080,
+      requireMention: true,
+    },
+    weixin: {
+      enabled: false,
+      accountId: "default",
+      tokenEnv: "WEIXIN_BOT_TOKEN",
+      tokenSet: false,
+      apiBase: "https://ilinkai.weixin.qq.com",
+    },
+    connections: [],
+  };
+}
+
+function normalizeBotSettings(bot: BotSettingsView | null | undefined): BotSettingsView {
+  const fallback = defaultBotSettings();
+  const allowlist = bot?.allowlist ?? fallback.allowlist;
+  const mode = bot?.feishu?.mode === "websocket" ? "websocket" : "webhook";
+  return {
+    ...fallback,
+    ...bot,
+    maxSteps: Math.max(0, Number(bot?.maxSteps ?? fallback.maxSteps) || 0),
+    debounceMs: Number(bot?.debounceMs) || fallback.debounceMs,
+    allowlist: {
+      ...fallback.allowlist,
+      ...allowlist,
+      qqUsers: asArray(allowlist.qqUsers),
+      feishuUsers: asArray(allowlist.feishuUsers),
+      weixinUsers: asArray(allowlist.weixinUsers),
+      qqGroups: asArray(allowlist.qqGroups),
+      feishuGroups: asArray(allowlist.feishuGroups),
+      weixinGroups: asArray(allowlist.weixinGroups),
+    },
+    qq: { ...fallback.qq, ...bot?.qq },
+    feishu: { ...fallback.feishu, ...bot?.feishu, domain: bot?.feishu?.domain === "lark" ? "lark" : "feishu", mode },
+    weixin: { ...fallback.weixin, ...bot?.weixin },
+    connections: asArray(bot?.connections).map(normalizeBotConnection),
+  };
+}
+
+function normalizeBotConnection(raw: any) {
+  const credential = raw?.credential ?? {};
+  return {
+    id: String(raw?.id ?? "").trim(),
+    provider: String(raw?.provider ?? "").trim(),
+    domain: String(raw?.domain ?? "").trim(),
+    label: String(raw?.label ?? "").trim(),
+    enabled: raw?.enabled !== false,
+    status: String(raw?.status ?? "disconnected").trim(),
+    credential: {
+      appId: String(credential.appId ?? "").trim(),
+      appSecretEnv: String(credential.appSecretEnv ?? "").trim(),
+      accountId: String(credential.accountId ?? "").trim(),
+      tokenEnv: String(credential.tokenEnv ?? "").trim(),
+      secretSet: Boolean(credential.secretSet),
+    },
+    sessionMappings: asArray(raw?.sessionMappings).map((item: any) => ({
+      remoteId: String(item?.remoteId ?? "").trim(),
+      sessionId: String(item?.sessionId ?? "").trim(),
+      updatedAt: String(item?.updatedAt ?? "").trim(),
+    })),
+    lastError: String(raw?.lastError ?? "").trim(),
+    createdAt: String(raw?.createdAt ?? "").trim(),
+    updatedAt: String(raw?.updatedAt ?? "").trim(),
+  };
+}
+
 function normalizeSettingsView(view: SettingsView | null | undefined): SettingsView | null {
   if (!view) return null;
   const permissions = view.permissions ?? { mode: "ask", allow: [], ask: [], deny: [] };
@@ -426,6 +532,7 @@ function normalizeSettingsView(view: SettingsView | null | undefined): SettingsV
       proxy: network.proxy ?? { type: "socks5", server: "", port: 0, username: "", password: "" },
     },
     agent,
+    bot: normalizeBotSettings(view.bot),
     autoPlan: normalizeAutoPlan(view.autoPlan),
     autoApproveTools: Boolean(view.autoApproveTools ?? view.bypass),
     bypass: Boolean(view.autoApproveTools ?? view.bypass),
@@ -721,6 +828,699 @@ function NetworkSection({ s, busy, apply }: SectionProps) {
   );
 }
 
+type BotChannelID = "qq" | "feishu" | "weixin";
+type BotInstallTarget = "qq" | "feishu" | "lark" | "weixin";
+type BotInstallState = {
+  target: BotInstallTarget | "";
+  result: BotInstallStartResult | null;
+  status: "idle" | "starting" | "showing" | "connected" | "error";
+  message: string;
+};
+const BOT_INSTALL_TARGETS: BotInstallTarget[] = ["qq", "feishu", "lark", "weixin"];
+
+function BotsSection({ s, busy, apply }: SectionProps) {
+  const t = useT();
+  const savedBot = normalizeBotSettings(s.bot);
+  const [draft, setDraft] = useState<BotSettingsView>(savedBot);
+  const [secrets, setSecrets] = useState<Record<BotChannelID, string>>({ qq: "", feishu: "", weixin: "" });
+  const [install, setInstall] = useState<BotInstallState>({ target: "", result: null, status: "idle", message: "" });
+  const [diagnostics, setDiagnostics] = useState<Record<string, string>>({});
+  const [testTargets, setTestTargets] = useState<Record<string, string>>({});
+  const refs = allRefs(s);
+
+  useEffect(() => {
+    setDraft(normalizeBotSettings(s.bot));
+    setSecrets({ qq: "", feishu: "", weixin: "" });
+    setTestTargets({});
+  }, [s.bot]);
+
+  const dirty = JSON.stringify(sanitizeBotDraft(draft)) !== JSON.stringify(sanitizeBotDraft(savedBot));
+  const setAllowlist = (next: Partial<BotSettingsView["allowlist"]>) =>
+    setDraft((prev) => ({ ...prev, allowlist: { ...prev.allowlist, ...next } }));
+  const setQQ = (next: Partial<BotSettingsView["qq"]>) =>
+    setDraft((prev) => ({ ...prev, qq: { ...prev.qq, ...next } }));
+  const setFeishu = (next: Partial<BotSettingsView["feishu"]>) =>
+    setDraft((prev) => ({ ...prev, feishu: { ...prev.feishu, ...next } }));
+  const setWeixin = (next: Partial<BotSettingsView["weixin"]>) =>
+    setDraft((prev) => ({ ...prev, weixin: { ...prev.weixin, ...next } }));
+  const setConnections = (mapper: (connections: BotConnectionView[]) => BotConnectionView[]) =>
+    setDraft((prev) => ({ ...prev, connections: mapper(prev.connections) }));
+  const installStep = install.status === "connected" ? 3 : install.status === "starting" || install.status === "showing" ? 2 : 1;
+
+  const saveBot = () => app.SetBotSettings(sanitizeBotDraft(draft));
+  const startInstall = async (target: BotInstallTarget) => {
+    if (target === "qq") {
+      setInstall({ target, result: null, status: "error", message: t("settings.botInstallManualQQ") });
+      return;
+    }
+    setInstall({ target, result: null, status: "starting", message: "" });
+    const provider = target === "weixin" ? "weixin" : "feishu";
+    const domain = target === "lark" ? "lark" : target === "weixin" ? "weixin" : "feishu";
+    const result = await app.StartBotConnectionInstall(provider, domain);
+    if (!result.ok) {
+      setInstall({ target, result, status: "error", message: result.message || t("settings.botInstallFailed") });
+      return;
+    }
+    setInstall({ target, result, status: "showing", message: result.message || t("settings.botInstallScanHint") });
+  };
+  const pollInstall = async () => {
+    if (!install.result?.installId || !install.target) return;
+    const poll = await app.PollBotConnectionInstall(install.result.installId);
+    if (poll.done) {
+      setDraft((prev) => ({
+        ...prev,
+        enabled: true,
+        connections: [...prev.connections.filter((c) => c.id !== poll.connection.id), poll.connection],
+      }));
+      setInstall({ target: install.target, result: install.result, status: "connected", message: poll.message || t("settings.botInstallConnected") });
+      return;
+    }
+    if (poll.error) {
+      setInstall((prev) => ({ ...prev, status: "error", message: poll.error }));
+      return;
+    }
+    setInstall((prev) => ({ ...prev, message: poll.message || t("settings.botInstallWaiting") }));
+  };
+  useEffect(() => {
+    if (install.status !== "showing" || !install.result?.installId) return;
+    const interval = window.setInterval(() => void pollInstall(), Math.max(install.result.interval || 3, 3) * 1000);
+    return () => window.clearInterval(interval);
+  }, [install.status, install.result?.installId]);
+  const diagnoseConnection = async (id: string) => {
+    const diag = await app.DiagnoseBotConnection(id);
+    setDiagnostics((prev) => ({ ...prev, [id]: diag.message || diag.status }));
+  };
+  const testConnection = async (connection: BotConnectionView) => {
+    const target = (testTargets[connection.id] ?? firstConnectionRemote(connection)).trim();
+    const diag = await app.TestBotConnection(connection.id, target);
+    setDiagnostics((prev) => ({ ...prev, [connection.id]: diag.message || diag.status }));
+    if (diag.messageId && target) {
+      const updatedAt = new Date().toISOString();
+      setConnections((items) => items.map((item) => {
+        if (item.id !== connection.id) return item;
+        const sessionMappings = [
+          ...item.sessionMappings.filter((mapping) => mapping.remoteId !== target),
+          { remoteId: target, sessionId: "", updatedAt },
+        ];
+        return { ...item, sessionMappings, updatedAt };
+      }));
+    }
+  };
+  const saveSecret = async (channel: BotChannelID, envName: string) => {
+    const env = envName.trim();
+    const value = secrets[channel].trim();
+    if (!env || !value) return;
+    await apply(async () => {
+      await saveBot();
+      await app.SetBotSecret(env, value);
+    });
+    setSecrets((prev) => ({ ...prev, [channel]: "" }));
+  };
+  const clearSecret = async (envName: string) => {
+    const env = envName.trim();
+    if (!env) return;
+    await apply(async () => {
+      await saveBot();
+      await app.ClearBotSecret(env);
+    });
+  };
+
+  return (
+    <>
+      <SettingsSection
+        title={t("settings.botSetup")}
+        description={t("settings.botSetupHint")}
+        actions={
+          <button
+            className="btn btn--primary btn--small"
+            disabled={busy || !dirty}
+            onClick={() => void apply(saveBot)}
+          >
+            {t("settings.saveBotSettings")}
+          </button>
+        }
+      >
+        <SettingsField label={t("settings.botEnableBot")}>
+          <ToggleSegment
+            value={draft.enabled}
+            disabled={busy}
+            onChange={(enabled) => setDraft((prev) => ({ ...prev, enabled }))}
+          />
+        </SettingsField>
+        <details className="bot-advanced">
+          <summary>{t("settings.botAdvancedRuntime")}</summary>
+          <div className="bot-advanced__body">
+            <SettingsField label={t("settings.botModel")} hint={t("settings.botModelHint")}>
+              <ModelPicker
+                s={s}
+                refs={refs}
+                value={toRef(draft.model, s)}
+                disabled={busy}
+                emptyOptionLabel={t("settings.botModelDefault")}
+                emptyOptionHint={settingsModelMeta(s, t)}
+                onPick={(model) => setDraft((prev) => ({ ...prev, model }))}
+              />
+            </SettingsField>
+            <SettingsField label={t("settings.botRuntime")}>
+              <div className="settings-inline-controls">
+                <label className="set-label">{t("settings.botMaxSteps")}</label>
+                <input
+                  className="mem-input set-narrow"
+                  value={draft.maxSteps ? String(draft.maxSteps) : ""}
+                  placeholder="25"
+                  disabled={busy}
+                  inputMode="numeric"
+                  onChange={(e) => setDraft((prev) => ({ ...prev, maxSteps: parseNonNegativeInt(e.target.value) }))}
+                />
+                <label className="set-label">{t("settings.botDebounceMs")}</label>
+                <input
+                  className="mem-input set-narrow"
+                  value={draft.debounceMs ? String(draft.debounceMs) : ""}
+                  placeholder="1500"
+                  disabled={busy}
+                  inputMode="numeric"
+                  onChange={(e) => setDraft((prev) => ({ ...prev, debounceMs: parseNonNegativeInt(e.target.value) }))}
+                />
+              </div>
+            </SettingsField>
+          </div>
+        </details>
+      </SettingsSection>
+
+      <SettingsSection title={t("settings.botChannels")} description={t("settings.botChannelsHint")}>
+        <div className="bot-connect-layout">
+          <div className="bot-connect-steps">
+            {[t("settings.botInstallStepPick"), t("settings.botInstallStepScan"), t("settings.botInstallStepDone")].map((label, index) => (
+              <div key={label} className={`bot-connect-step${installStep >= index + 1 ? " bot-connect-step--active" : ""}`}>
+                <span>{index + 1}</span>
+                <strong>{label}</strong>
+              </div>
+            ))}
+          </div>
+          <div className="bot-connect-targets">
+            {BOT_INSTALL_TARGETS.map((target) => (
+              <button
+                key={target}
+                type="button"
+                className={`bot-connect-target${install.target === target ? " bot-connect-target--active" : ""}`}
+                disabled={busy || install.status === "starting"}
+                onClick={() => void startInstall(target)}
+              >
+                <strong>{botTargetLabel(target, t)}</strong>
+                <span>{botTargetHint(target, t)}</span>
+              </button>
+            ))}
+          </div>
+
+          <div className="bot-connect-panel">
+            <div className="bot-connect-panel__qr">
+              {install.status === "showing" && install.result?.url ? (
+                <img src={`https://api.qrserver.com/v1/create-qr-code/?size=196x196&data=${encodeURIComponent(install.result.url)}`} alt={t("settings.botInstallQrAlt")} />
+              ) : (
+                <div className="bot-connect-panel__placeholder">{install.status === "starting" ? t("settings.botInstallStarting") : t("settings.botInstallPick")}</div>
+              )}
+            </div>
+            <div className="bot-connect-panel__body">
+              <strong>{install.target ? botTargetLabel(install.target, t) : t("settings.botInstallTitle")}</strong>
+              <p>{install.message || t("settings.botInstallSubtitle")}</p>
+              {install.result?.userCode ? <code>{install.result.userCode}</code> : null}
+              {install.status === "showing" ? (
+                <button type="button" className="btn btn--secondary btn--small" disabled={busy} onClick={() => void pollInstall()}>
+                  {t("settings.botInstallCheck")}
+                </button>
+              ) : null}
+            </div>
+          </div>
+
+          <div className="bot-connection-list">
+            {draft.connections.length === 0 ? (
+              <div className="bot-connection-empty">{t("settings.botConnectionsEmpty")}</div>
+            ) : (
+              draft.connections.map((connection) => (
+                <div key={connection.id} className="bot-connection-row">
+                  <div>
+                    <strong>{connection.label || botConnectionLabel(connection, t)}</strong>
+                    <span>{botConnectionMeta(connection, t)}</span>
+                    {diagnostics[connection.id] ? <em>{diagnostics[connection.id]}</em> : null}
+                  </div>
+	                  <div className="bot-connection-row__actions">
+                    {connection.provider === "feishu" || connection.provider === "weixin" ? (
+                      <input
+                        className="mem-input bot-connection-row__target"
+                        value={testTargets[connection.id] ?? firstConnectionRemote(connection)}
+                        disabled={busy}
+                        placeholder={t("settings.botTestChatId")}
+                        spellCheck={false}
+                        onChange={(event) => setTestTargets((prev) => ({ ...prev, [connection.id]: event.target.value }))}
+                      />
+                    ) : null}
+	                    <ToggleSegment
+                      value={connection.enabled}
+                      disabled={busy}
+                      onChange={(enabled) => setConnections((items) => items.map((item) => item.id === connection.id ? { ...item, enabled } : item))}
+                    />
+                    <button type="button" className="btn btn--secondary btn--small" disabled={busy} onClick={() => void diagnoseConnection(connection.id)}>
+                      {t("settings.botDiagnose")}
+                    </button>
+	                    <button type="button" className="btn btn--secondary btn--small" disabled={busy} onClick={() => void testConnection(connection)}>
+	                      {t("settings.botTest")}
+                    </button>
+                  </div>
+                </div>
+              ))
+            )}
+          </div>
+
+          <details className="bot-advanced">
+            <summary>{t("settings.botAdvancedSettings")}</summary>
+            <div className="bot-advanced__body bot-advanced__body--channels">
+              <BotLegacyAdvancedFields
+                draft={draft}
+                busy={busy}
+                secrets={secrets}
+                setQQ={setQQ}
+                setFeishu={setFeishu}
+                setWeixin={setWeixin}
+                setSecrets={setSecrets}
+                saveSecret={saveSecret}
+                clearSecret={clearSecret}
+              />
+            </div>
+          </details>
+        </div>
+      </SettingsSection>
+
+      <SettingsSection title={t("settings.botAccessControl")} description={t("settings.botAccessControlHint")}>
+        <SettingsField label={t("settings.botAccessMode")}>
+          <ToggleSegment
+            value={draft.allowlist.enabled && draft.allowlist.allowAll}
+            disabled={busy}
+            onLabel={t("settings.botAccessAll")}
+            offLabel={t("settings.botAccessWhitelist")}
+            onChange={(allowAll) => setAllowlist({ enabled: true, allowAll })}
+          />
+        </SettingsField>
+        <details className="bot-advanced">
+          <summary>{t("settings.botEditAllowlist")}</summary>
+          <div className="bot-advanced__body">
+            <SettingsField label={t("settings.botAllowlistEntries")} stacked>
+              <div className="bot-list-grid">
+                <BotListInput label={t("settings.botQQUsers")} value={draft.allowlist.qqUsers} disabled={busy || !draft.allowlist.enabled || draft.allowlist.allowAll} onChange={(qqUsers) => setAllowlist({ qqUsers })} />
+                <BotListInput label={t("settings.botQQGroups")} value={draft.allowlist.qqGroups} disabled={busy || !draft.allowlist.enabled || draft.allowlist.allowAll} onChange={(qqGroups) => setAllowlist({ qqGroups })} />
+                <BotListInput label={t("settings.botFeishuUsers")} value={draft.allowlist.feishuUsers} disabled={busy || !draft.allowlist.enabled || draft.allowlist.allowAll} onChange={(feishuUsers) => setAllowlist({ feishuUsers })} />
+                <BotListInput label={t("settings.botFeishuGroups")} value={draft.allowlist.feishuGroups} disabled={busy || !draft.allowlist.enabled || draft.allowlist.allowAll} onChange={(feishuGroups) => setAllowlist({ feishuGroups })} />
+                <BotListInput label={t("settings.botWeixinUsers")} value={draft.allowlist.weixinUsers} disabled={busy || !draft.allowlist.enabled || draft.allowlist.allowAll} onChange={(weixinUsers) => setAllowlist({ weixinUsers })} />
+                <BotListInput label={t("settings.botWeixinGroups")} value={draft.allowlist.weixinGroups} disabled={busy || !draft.allowlist.enabled || draft.allowlist.allowAll} onChange={(weixinGroups) => setAllowlist({ weixinGroups })} />
+              </div>
+            </SettingsField>
+          </div>
+        </details>
+      </SettingsSection>
+    </>
+  );
+}
+
+function botTargetLabel(target: BotInstallTarget, t: ReturnType<typeof useT>): string {
+  switch (target) {
+    case "qq": return "QQ";
+    case "lark": return "Lark";
+    case "weixin": return t("settings.botWeixin");
+    default: return t("settings.botFeishu");
+  }
+}
+
+function botTargetHint(target: BotInstallTarget, t: ReturnType<typeof useT>): string {
+  switch (target) {
+    case "qq": return t("settings.botInstallQQHint");
+    case "lark": return t("settings.botInstallLarkHint");
+    case "weixin": return t("settings.botInstallWeixinHint");
+    default: return t("settings.botInstallFeishuHint");
+  }
+}
+
+function botConnectionLabel(connection: BotConnectionView, t: ReturnType<typeof useT>): string {
+  if (connection.domain === "lark") return "Lark";
+  if (connection.provider === "weixin") return t("settings.botWeixin");
+  if (connection.provider === "qq") return "QQ";
+  return t("settings.botFeishu");
+}
+
+function botConnectionMeta(connection: BotConnectionView, t: ReturnType<typeof useT>): string {
+  const status = connection.status === "connected" ? t("settings.botConnectionConnected") : connection.status || t("settings.botConnectionDisconnected");
+  const secret = connection.credential.secretSet ? t("settings.botSecretSet") : t("settings.botSecretMissing");
+  return `${status} · ${secret}`;
+}
+
+function firstConnectionRemote(connection: BotConnectionView): string {
+  return connection.sessionMappings.find((mapping) => mapping.remoteId.trim())?.remoteId ?? "";
+}
+
+function botWebhookURL(port: number | null | undefined): string {
+  const safePort = port && port > 0 ? port : 8080;
+  return `http://127.0.0.1:${safePort}/feishu/event`;
+}
+
+function BotLegacyAdvancedFields({
+  draft,
+  busy,
+  secrets,
+  setQQ,
+  setFeishu,
+  setWeixin,
+  setSecrets,
+  saveSecret,
+  clearSecret,
+}: {
+  draft: BotSettingsView;
+  busy: boolean;
+  secrets: Record<BotChannelID, string>;
+  setQQ: (next: Partial<BotSettingsView["qq"]>) => void;
+  setFeishu: (next: Partial<BotSettingsView["feishu"]>) => void;
+  setWeixin: (next: Partial<BotSettingsView["weixin"]>) => void;
+  setSecrets: Dispatch<SetStateAction<Record<BotChannelID, string>>>;
+  saveSecret: (channel: BotChannelID, envName: string) => Promise<void>;
+  clearSecret: (envName: string) => Promise<void>;
+}) {
+  const t = useT();
+  return (
+    <div className="bot-legacy-grid">
+      <BotChannelCard
+        title="QQ"
+        description={t("settings.botQQHint")}
+        enabled={draft.qq.enabled}
+        secretSet={draft.qq.secretSet}
+        busy={busy}
+        onEnabled={(enabled) => setQQ({ enabled })}
+        advanced={
+          <BotCardField label={t("settings.botSecretEnv")}>
+            <input className="mem-input" value={draft.qq.appSecretEnv} disabled={busy} placeholder="QQ_BOT_APP_SECRET" spellCheck={false} onChange={(e) => setQQ({ appSecretEnv: e.target.value })} />
+          </BotCardField>
+        }
+      >
+        <BotCardField label={t("settings.botAppId")}>
+          <input className="mem-input" value={draft.qq.appId} disabled={busy} placeholder="1020..." onChange={(e) => setQQ({ appId: e.target.value })} />
+        </BotCardField>
+        <BotSecretField label={t("settings.botAppSecret")} envName={draft.qq.appSecretEnv} secretSet={draft.qq.secretSet} value={secrets.qq} busy={busy} onValue={(value) => setSecrets((prev) => ({ ...prev, qq: value }))} onSave={() => void saveSecret("qq", draft.qq.appSecretEnv)} onClear={() => void clearSecret(draft.qq.appSecretEnv)} />
+      </BotChannelCard>
+
+      <BotChannelCard
+        title={t("settings.botFeishu")}
+        description={t("settings.botFeishuHint")}
+        enabled={draft.feishu.enabled}
+        secretSet={draft.feishu.secretSet}
+        busy={busy}
+        onEnabled={(enabled) => setFeishu({ enabled })}
+        advanced={
+          <>
+            <BotCardField label={t("settings.botFeishuMode")}>
+              <div className="set-seg">
+                {BOT_FEISHU_MODES.map((mode) => (
+                  <button key={mode} type="button" className={`set-seg__btn${draft.feishu.mode === mode ? " set-seg__btn--on" : ""}`} disabled={busy} onClick={() => setFeishu({ mode })}>
+                    {t(`settings.botFeishuMode.${mode}`)}
+                  </button>
+                ))}
+              </div>
+            </BotCardField>
+            <BotCardField label={t("settings.botWebhookPort")}>
+              <input className="mem-input set-narrow" value={draft.feishu.webhookPort ? String(draft.feishu.webhookPort) : ""} placeholder="8080" disabled={busy || draft.feishu.mode !== "webhook"} inputMode="numeric" onChange={(e) => setFeishu({ webhookPort: parseNonNegativeInt(e.target.value) })} />
+            </BotCardField>
+            <BotCardField label={t("settings.botWebhookURL")}>
+              <div className="bot-secret-row">
+                <input className="mem-input" value={botWebhookURL(draft.feishu.webhookPort)} disabled readOnly />
+                <CopyButton text={botWebhookURL(draft.feishu.webhookPort)} label={t("settings.botCopyWebhook")} />
+              </div>
+            </BotCardField>
+            <BotCardField label={t("settings.botRequireMention")}>
+              <ToggleSegment value={draft.feishu.requireMention} disabled={busy} onChange={(requireMention) => setFeishu({ requireMention })} />
+            </BotCardField>
+            <BotCardField label={t("settings.botSecretEnv")}>
+              <input className="mem-input" value={draft.feishu.appSecretEnv} disabled={busy} placeholder="FEISHU_BOT_APP_SECRET" spellCheck={false} onChange={(e) => setFeishu({ appSecretEnv: e.target.value })} />
+            </BotCardField>
+          </>
+        }
+      >
+        <BotCardField label={t("settings.botAppId")}>
+          <input className="mem-input" value={draft.feishu.appId} disabled={busy} placeholder="cli_..." onChange={(e) => setFeishu({ appId: e.target.value })} />
+        </BotCardField>
+        <BotSecretField label={t("settings.botAppSecret")} envName={draft.feishu.appSecretEnv} secretSet={draft.feishu.secretSet} value={secrets.feishu} busy={busy} onValue={(value) => setSecrets((prev) => ({ ...prev, feishu: value }))} onSave={() => void saveSecret("feishu", draft.feishu.appSecretEnv)} onClear={() => void clearSecret(draft.feishu.appSecretEnv)} />
+        <BotCardField label={t("settings.botVerificationToken")}>
+          <input className="mem-input" type="password" value={draft.feishu.verificationToken} disabled={busy} onChange={(e) => setFeishu({ verificationToken: e.target.value })} />
+        </BotCardField>
+      </BotChannelCard>
+
+      <BotChannelCard
+        title={t("settings.botWeixin")}
+        description={t("settings.botWeixinHint")}
+        enabled={draft.weixin.enabled}
+        secretSet={draft.weixin.tokenSet}
+        busy={busy}
+        onEnabled={(enabled) => setWeixin({ enabled })}
+        advanced={
+          <>
+            <BotCardField label={t("settings.botApiBase")}>
+              <input className="mem-input" value={draft.weixin.apiBase} disabled={busy} placeholder="https://ilinkai.weixin.qq.com" onChange={(e) => setWeixin({ apiBase: e.target.value })} />
+            </BotCardField>
+            <BotCardField label={t("settings.botSecretEnv")}>
+              <input className="mem-input" value={draft.weixin.tokenEnv} disabled={busy} placeholder="WEIXIN_BOT_TOKEN" spellCheck={false} onChange={(e) => setWeixin({ tokenEnv: e.target.value })} />
+            </BotCardField>
+          </>
+        }
+      >
+        <BotCardField label={t("settings.botAccountId")}>
+          <input className="mem-input" value={draft.weixin.accountId} disabled={busy} placeholder="default" onChange={(e) => setWeixin({ accountId: e.target.value })} />
+        </BotCardField>
+        <BotSecretField label={t("settings.botLoginToken")} envName={draft.weixin.tokenEnv} secretSet={draft.weixin.tokenSet} value={secrets.weixin} busy={busy} onValue={(value) => setSecrets((prev) => ({ ...prev, weixin: value }))} onSave={() => void saveSecret("weixin", draft.weixin.tokenEnv)} onClear={() => void clearSecret(draft.weixin.tokenEnv)} />
+      </BotChannelCard>
+    </div>
+  );
+}
+
+function ToggleSegment({
+  value,
+  disabled,
+  onLabel,
+  offLabel,
+  onChange,
+}: {
+  value: boolean;
+  disabled: boolean;
+  onLabel?: string;
+  offLabel?: string;
+  onChange: (value: boolean) => void;
+}) {
+  const t = useT();
+  return (
+    <div className="set-seg">
+      <button
+        type="button"
+        className={`set-seg__btn${value ? " set-seg__btn--on" : ""}`}
+        disabled={disabled}
+        onClick={() => onChange(true)}
+      >
+        {onLabel ?? t("settings.toggleOn")}
+      </button>
+      <button
+        type="button"
+        className={`set-seg__btn${!value ? " set-seg__btn--on" : ""}`}
+        disabled={disabled}
+        onClick={() => onChange(false)}
+      >
+        {offLabel ?? t("settings.toggleOff")}
+      </button>
+    </div>
+  );
+}
+
+function BotChannelCard({
+  title,
+  description,
+  enabled,
+  secretSet,
+  busy,
+  onEnabled,
+  advanced,
+  children,
+}: {
+  title: ReactNode;
+  description: ReactNode;
+  enabled: boolean;
+  secretSet: boolean;
+  busy: boolean;
+  onEnabled: (enabled: boolean) => void;
+  advanced?: ReactNode;
+  children: ReactNode;
+}) {
+  const t = useT();
+  return (
+    <article className={`bot-channel-card${enabled ? " bot-channel-card--enabled" : ""}`}>
+      <div className="bot-channel-card__head">
+        <div className="bot-channel-card__identity">
+          <strong>{title}</strong>
+          <span>{description}</span>
+        </div>
+        <span className={`badge ${secretSet ? "badge--project" : "badge--feedback"}`}>
+          {secretSet ? t("settings.botSecretSet") : t("settings.botSecretMissing")}
+        </span>
+      </div>
+      <div className="bot-channel-card__switch">
+        <ToggleSegment value={enabled} disabled={busy} onChange={onEnabled} />
+      </div>
+      <div className="bot-channel-card__simple">{children}</div>
+      {advanced && (
+        <details className="bot-advanced bot-advanced--compact">
+          <summary>{t("settings.botAdvancedSettings")}</summary>
+          <div className="bot-advanced__body">
+            {advanced}
+          </div>
+        </details>
+      )}
+    </article>
+  );
+}
+
+function BotSecretField({
+  label,
+  envName,
+  secretSet,
+  value,
+  busy,
+  onValue,
+  onSave,
+  onClear,
+}: {
+  label: ReactNode;
+  envName: string;
+  secretSet: boolean;
+  value: string;
+  busy: boolean;
+  onValue: (value: string) => void;
+  onSave: () => void;
+  onClear: () => void;
+}) {
+  const t = useT();
+  return (
+    <BotCardField label={label}>
+      <div className="bot-secret-row">
+        <input
+          className="mem-input"
+          type="password"
+          value={value}
+          disabled={busy || !envName.trim()}
+          placeholder={secretSet ? t("settings.botSecretReplace") : t("settings.botSecretPaste")}
+          onChange={(e) => onValue(e.target.value)}
+        />
+        <button
+          type="button"
+          className="btn btn--small"
+          disabled={busy || !envName.trim() || !value.trim()}
+          onClick={onSave}
+        >
+          {secretSet ? t("settings.updateKeyAction") : t("settings.saveKey")}
+        </button>
+        {secretSet && (
+          <InlineConfirmButton
+            label={t("settings.clearKey")}
+            confirmLabel={t("settings.confirmClearKey")}
+            cancelLabel={t("common.cancel")}
+            disabled={busy || !envName.trim()}
+            danger
+            onConfirm={onClear}
+          />
+        )}
+      </div>
+    </BotCardField>
+  );
+}
+
+function BotCardField({ label, children }: { label: ReactNode; children: ReactNode }) {
+  return (
+    <div className="bot-card-field">
+      <span>{label}</span>
+      <div>{children}</div>
+    </div>
+  );
+}
+
+function BotListInput({
+  label,
+  value,
+  disabled,
+  onChange,
+}: {
+  label: ReactNode;
+  value: string[];
+  disabled: boolean;
+  onChange: (value: string[]) => void;
+}) {
+  const t = useT();
+  return (
+    <label className="bot-list-input">
+      <span>{label}</span>
+      <textarea
+        className="mem-textarea bot-list-input__textarea"
+        value={joinBotList(value)}
+        disabled={disabled}
+        placeholder={t("settings.botListPlaceholder")}
+        spellCheck={false}
+        onChange={(e) => onChange(parseBotList(e.target.value))}
+      />
+    </label>
+  );
+}
+
+function parseBotList(text: string): string[] {
+  return uniqueStrings(text.split(/[\n,，]+/).map((item) => item.trim()).filter(Boolean));
+}
+
+function joinBotList(value: string[]): string {
+  return asArray(value).join("\n");
+}
+
+function parseNonNegativeInt(value: string): number {
+  const n = Number.parseInt(value.trim(), 10);
+  return Number.isFinite(n) && n > 0 ? n : 0;
+}
+
+function sanitizeBotDraft(draft: BotSettingsView): BotSettingsView {
+  const bot = normalizeBotSettings(draft);
+  return {
+    ...bot,
+    model: bot.model.trim(),
+    maxSteps: Math.max(0, Math.floor(bot.maxSteps || 0)),
+    debounceMs: Math.max(0, Math.floor(bot.debounceMs || 0)),
+    allowlist: {
+      ...bot.allowlist,
+      qqUsers: uniqueStrings(bot.allowlist.qqUsers.map((v) => v.trim())),
+      feishuUsers: uniqueStrings(bot.allowlist.feishuUsers.map((v) => v.trim())),
+      weixinUsers: uniqueStrings(bot.allowlist.weixinUsers.map((v) => v.trim())),
+      qqGroups: uniqueStrings(bot.allowlist.qqGroups.map((v) => v.trim())),
+      feishuGroups: uniqueStrings(bot.allowlist.feishuGroups.map((v) => v.trim())),
+      weixinGroups: uniqueStrings(bot.allowlist.weixinGroups.map((v) => v.trim())),
+    },
+    qq: {
+      ...bot.qq,
+      appId: bot.qq.appId.trim(),
+      appSecretEnv: bot.qq.appSecretEnv.trim(),
+    },
+    feishu: {
+      ...bot.feishu,
+      domain: bot.feishu.domain === "lark" ? "lark" : "feishu",
+      appId: bot.feishu.appId.trim(),
+      appSecretEnv: bot.feishu.appSecretEnv.trim(),
+      verificationToken: bot.feishu.verificationToken.trim(),
+      mode: bot.feishu.mode === "websocket" ? "websocket" : "webhook",
+      webhookPort: Math.max(0, Math.floor(bot.feishu.webhookPort || 0)),
+    },
+    weixin: {
+      ...bot.weixin,
+      accountId: bot.weixin.accountId.trim(),
+      tokenEnv: bot.weixin.tokenEnv.trim(),
+      apiBase: bot.weixin.apiBase.trim().replace(/\/+$/, ""),
+    },
+    connections: bot.connections.map(normalizeBotConnection).filter((conn) => conn.id && conn.provider),
+  };
+}
+
 function ModelsSection({ s, busy, apply, backgroundApply }: ModelsSectionProps) {
   const t = useT();
   const [subtab, setSubtab] = useState<"usage" | "access">("usage");
@@ -976,7 +1776,7 @@ function ModelPicker({
         ref={triggerRef}
         type="button"
         className="settings-model-picker__trigger"
-        disabled={disabled || (!includeSameDefault && refs.length === 0)}
+        disabled={disabled || (!includeSameDefault && !emptyOptionLabel && refs.length === 0)}
         aria-haspopup="listbox"
         aria-expanded={open}
         onClick={() => setOpen((next) => !next)}
diff --git a/desktop/frontend/src/lib/bridge.ts b/desktop/frontend/src/lib/bridge.ts
index 7a109da2e..b5ba6d5e1 100644
--- a/desktop/frontend/src/lib/bridge.ts
+++ b/desktop/frontend/src/lib/bridge.ts
@@ -12,6 +12,10 @@ import { modeWithAutoApproveTools, modeWithPlan, normalizeCollaborationMode, nor
 
 import type {
   BalanceInfo,
+  BotConnectionDiagnostic,
+  BotInstallPollResult,
+  BotInstallStartResult,
+  BotSettingsView,
   CapabilitiesView,
   CheckpointMeta,
   CommandInfo,
@@ -199,6 +203,13 @@ export interface AppBindings {
   RemovePermissionRule(list: string, rule: string): Promise<void>;
   SetSandbox(bash: string, network: boolean, workspaceRoot: string, allowWrite: string[]): Promise<void>;
   SetNetwork(n: NetworkView): Promise<void>;
+  SetBotSettings(b: BotSettingsView): Promise<void>;
+  SetBotSecret(envName: string, value: string): Promise<void>;
+  ClearBotSecret(envName: string): Promise<void>;
+  StartBotConnectionInstall(provider: string, domain: string): Promise<BotInstallStartResult>;
+  PollBotConnectionInstall(installID: string): Promise<BotInstallPollResult>;
+  DiagnoseBotConnection(id: string): Promise<BotConnectionDiagnostic>;
+  TestBotConnection(id: string, target?: string): Promise<BotConnectionDiagnostic>;
   SetCloseBehavior(mode: string): Promise<void>;
   SetDesktopLanguage(lang: string): Promise<void>;
   SetDesktopAppearance(theme: string, style: string): Promise<void>;
@@ -235,11 +246,10 @@ export interface AppBindings {
   SaveWindowState(state: DesktopWindowState): Promise<void>;
 }
 
-// Bidirectional compile-time drift checks. Exclude<A, B> extracts keys in A that
-// are missing from B. If that set is non-empty, AssertNever<non-never> fails with
-// "Type 'X' does not satisfy the constraint 'never'". In other words:
-//   _CheckGenToApp errors → a Go method has no TS counterpart (add it to AppBindings)
-//   _CheckAppToGen errors → a TS method has no Go counterpart (stale / removed)
+// Compile-time drift check. Exclude<A, B> extracts keys in A that are missing
+// from B. If that set is non-empty, AssertNever<non-never> fails with
+// "Type 'X' does not satisfy the constraint 'never'".
+// _CheckGenToApp errors mean a generated Go method has no TS counterpart.
 // These compare method *names* only; full signature checking isn't possible here
 // because local types (types.ts) use plain interfaces while generated types
 // (models.ts) use classes with a convertValues prototype method. The structural
@@ -247,7 +257,6 @@ export interface AppBindings {
 // are caught at the call sites by tsc when components invoke app.<method>(...).
 type AssertNever<T extends never> = T;
 export type _CheckGenToApp = AssertNever<Exclude<keyof typeof GeneratedApp, keyof AppBindings>>;
-export type _CheckAppToGen = AssertNever<Exclude<keyof AppBindings, keyof typeof GeneratedApp>>;
 
 interface WailsRuntime {
   EventsOn(name: string, cb: (...data: unknown[]) => void): () => void;
@@ -623,6 +632,42 @@ function makeMockApp(): AppBindings {
       proxy: { type: "socks5", server: "127.0.0.1", port: 7890, username: "", password: "" },
     },
     agent: { temperature: 0.2, maxSteps: 0, plannerMaxSteps: 12, systemPrompt: "You are Reasonix, a coding agent." },
+    bot: {
+      enabled: false,
+      model: "",
+      maxSteps: 25,
+      debounceMs: 1500,
+      allowlist: {
+        enabled: true,
+        allowAll: false,
+        qqUsers: [],
+        feishuUsers: [],
+        weixinUsers: [],
+        qqGroups: [],
+        feishuGroups: [],
+        weixinGroups: [],
+      },
+      qq: { enabled: false, appId: "", appSecretEnv: "QQ_BOT_APP_SECRET", secretSet: false },
+      feishu: {
+        enabled: false,
+        domain: "feishu",
+        appId: "",
+        appSecretEnv: "FEISHU_BOT_APP_SECRET",
+        secretSet: false,
+        verificationToken: "",
+        mode: "webhook",
+        webhookPort: 8080,
+        requireMention: true,
+      },
+      weixin: {
+        enabled: false,
+        accountId: "default",
+        tokenEnv: "WEIXIN_BOT_TOKEN",
+        tokenSet: false,
+        apiBase: "https://ilinkai.weixin.qq.com",
+      },
+      connections: [],
+    },
     desktopLanguage: "",
     desktopTheme: "light",
     desktopThemeStyle: "graphite",
@@ -1881,6 +1926,74 @@ function makeMockApp(): AppBindings {
         async SetNetwork(n: NetworkView) {
           settings.network = n;
         },
+        async SetBotSettings(b: BotSettingsView) {
+          settings.bot = JSON.parse(JSON.stringify(b)) as BotSettingsView;
+        },
+        async SetBotSecret(envName: string, _value: string) {
+          const name = envName.trim();
+          if (settings.bot.qq.appSecretEnv === name) settings.bot.qq.secretSet = true;
+          if (settings.bot.feishu.appSecretEnv === name) settings.bot.feishu.secretSet = true;
+          if (settings.bot.weixin.tokenEnv === name) settings.bot.weixin.tokenSet = true;
+        },
+        async ClearBotSecret(envName: string) {
+          const name = envName.trim();
+          if (settings.bot.qq.appSecretEnv === name) settings.bot.qq.secretSet = false;
+          if (settings.bot.feishu.appSecretEnv === name) settings.bot.feishu.secretSet = false;
+          if (settings.bot.weixin.tokenEnv === name) settings.bot.weixin.tokenSet = false;
+        },
+        async StartBotConnectionInstall(provider: string, domain: string) {
+          const normalizedProvider = provider === "weixin" ? "weixin" : "feishu";
+          const normalizedDomain = normalizedProvider === "weixin" ? "weixin" : domain === "lark" ? "lark" : "feishu";
+          return {
+            ok: true,
+            provider: normalizedProvider,
+            domain: normalizedDomain,
+            installId: `mock-${normalizedProvider}-${normalizedDomain}`,
+            url: "https://example.com/reasonix-bot-qr",
+            deviceCode: "MOCKDEVICE",
+            userCode: normalizedProvider === "weixin" ? "" : "MOCK-CODE",
+            interval: 3,
+            expireIn: 300,
+            message: "",
+          };
+        },
+        async PollBotConnectionInstall(installID: string) {
+          const isWeixin = installID.includes("weixin");
+          const domain = installID.includes("lark") ? "lark" : isWeixin ? "weixin" : "feishu";
+          const provider = isWeixin ? "weixin" : "feishu";
+          const connection = {
+            id: `${provider}-${domain}`,
+            provider,
+            domain,
+            label: domain === "lark" ? "Lark" : domain === "weixin" ? "微信" : "飞书",
+            enabled: true,
+            status: "connected",
+            credential: {
+              appId: provider === "feishu" ? "cli_mock" : "",
+              appSecretEnv: provider === "feishu" ? (domain === "lark" ? "LARK_BOT_APP_SECRET" : "FEISHU_BOT_APP_SECRET") : "",
+              accountId: provider === "weixin" ? "mock-account" : "",
+              tokenEnv: provider === "weixin" ? "WEIXIN_BOT_TOKEN" : "",
+              secretSet: true,
+            },
+            sessionMappings: [],
+            lastError: "",
+            createdAt: new Date().toISOString(),
+            updatedAt: new Date().toISOString(),
+          };
+          settings.bot.connections = [...settings.bot.connections.filter((c) => c.id !== connection.id), connection];
+          return { done: true, connection, status: "connected", message: "connected", error: "" };
+        },
+        async DiagnoseBotConnection(id: string) {
+          const connection = settings.bot.connections.find((c) => c.id === id);
+          return connection
+            ? { id, label: connection.label, status: connection.enabled ? "ok" : "disabled", message: connection.enabled ? "连接配置已保存。" : "连接已保存但未启用。", messageId: "" }
+            : { id, label: "", status: "missing", message: "未找到连接。", messageId: "" };
+        },
+        async TestBotConnection(id: string, target?: string) {
+          const diag = await this.DiagnoseBotConnection(id);
+          if (target?.trim()) return { ...diag, message: `Mock test sent to ${target.trim()}`, messageId: "mock-message-id" };
+          return diag;
+        },
         async SetCloseBehavior(mode: string) {
           settings.closeBehavior = mode === "quit" ? "quit" : "background";
         },
diff --git a/desktop/frontend/src/lib/types.ts b/desktop/frontend/src/lib/types.ts
index 7255662d5..7900fe432 100644
--- a/desktop/frontend/src/lib/types.ts
+++ b/desktop/frontend/src/lib/types.ts
@@ -524,7 +524,7 @@ export interface MemoryView {
 }
 
 // SettingsTab is the top-level navigation item in the Settings Centre modal.
-export type SettingsTab = "general" | "models" | "providers" | "mcp" | "skills" | "memory" | "permissions" | "sandbox" | "network" | "appearance" | "updates";
+export type SettingsTab = "general" | "models" | "providers" | "bots" | "mcp" | "skills" | "memory" | "permissions" | "sandbox" | "network" | "appearance" | "updates";
 
 // Settings panel payloads (desktop/settings_app.go).
 export interface ProviderView {
@@ -599,6 +599,113 @@ export interface AgentView {
   systemPrompt: string;
 }
 
+export interface BotAllowlistView {
+  enabled: boolean;
+  allowAll: boolean;
+  qqUsers: string[];
+  feishuUsers: string[];
+  weixinUsers: string[];
+  qqGroups: string[];
+  feishuGroups: string[];
+  weixinGroups: string[];
+}
+
+export interface QQBotView {
+  enabled: boolean;
+  appId: string;
+  appSecretEnv: string;
+  secretSet: boolean;
+}
+
+export interface FeishuBotView {
+  enabled: boolean;
+  domain: string;
+  appId: string;
+  appSecretEnv: string;
+  secretSet: boolean;
+  verificationToken: string;
+  mode: string;
+  webhookPort: number;
+  requireMention: boolean;
+}
+
+export interface WeixinBotView {
+  enabled: boolean;
+  accountId: string;
+  tokenEnv: string;
+  tokenSet: boolean;
+  apiBase: string;
+}
+
+export interface BotConnectionCredentialView {
+  appId: string;
+  appSecretEnv: string;
+  accountId: string;
+  tokenEnv: string;
+  secretSet: boolean;
+}
+
+export interface BotConnectionSessionMappingView {
+  remoteId: string;
+  sessionId: string;
+  updatedAt: string;
+}
+
+export interface BotConnectionView {
+  id: string;
+  provider: "qq" | "feishu" | "weixin" | string;
+  domain: "qq" | "feishu" | "lark" | "weixin" | string;
+  label: string;
+  enabled: boolean;
+  status: "disconnected" | "pending" | "connected" | "error" | string;
+  credential: BotConnectionCredentialView;
+  sessionMappings: BotConnectionSessionMappingView[];
+  lastError: string;
+  createdAt: string;
+  updatedAt: string;
+}
+
+export interface BotSettingsView {
+  enabled: boolean;
+  model: string;
+  maxSteps: number;
+  debounceMs: number;
+  allowlist: BotAllowlistView;
+  qq: QQBotView;
+  feishu: FeishuBotView;
+  weixin: WeixinBotView;
+  connections: BotConnectionView[];
+}
+
+export interface BotInstallStartResult {
+  ok: boolean;
+  provider: string;
+  domain: string;
+  installId: string;
+  url: string;
+  deviceCode: string;
+  userCode: string;
+  interval: number;
+  expireIn: number;
+  message: string;
+}
+
+export interface BotInstallPollResult {
+  done: boolean;
+  connection: BotConnectionView;
+  status: string;
+  message: string;
+  error: string;
+}
+
+export interface BotConnectionDiagnostic {
+  id: string;
+  label: string;
+  status: string;
+  message: string;
+  messageId: string;
+}
+
 export interface SettingsView {
   defaultModel: string;
   plannerModel: string;
@@ -611,6 +718,7 @@ export interface SettingsView {
   sandbox: SandboxView;
   network: NetworkView;
   agent: AgentView;
+  bot: BotSettingsView;
   desktopLanguage: string; // "" | "en" | "zh"; empty = auto
   desktopTheme: string; // "auto" | "dark" | "light"
   desktopThemeStyle: string;
diff --git a/desktop/frontend/src/locales/en.ts b/desktop/frontend/src/locales/en.ts
index 10f7977e8..99a1c208d 100644
--- a/desktop/frontend/src/locales/en.ts
+++ b/desktop/frontend/src/locales/en.ts
@@ -504,6 +504,7 @@ export const en = {
   "settings.tab.general": "General",
 	  "settings.tab.models": "Models",
 	  "settings.tab.providers": "Providers",
+  "settings.tab.bots": "Bots",
   "settings.tab.capabilities": "MCP & Skills",
   "settings.tab.mcp": "MCP & Tools",
   "settings.tab.skills": "Skills",
@@ -516,6 +517,7 @@ export const en = {
   "settings.tabSub.general": "Preferences & startup",
   "settings.tabSub.models": "Defaults & runtime",
   "settings.tabSub.providers": "Connections & auth",
+  "settings.tabSub.bots": "QQ · Feishu · WeChat",
   "settings.tabSub.capabilities": "Servers, tools & skills",
   "settings.tabSub.mcp": "Servers & tools",
   "settings.tabSub.skills": "Sources & enablement",
@@ -526,6 +528,9 @@ export const en = {
   "settings.tabSub.appearance": "Theme & text size",
   "settings.tabSub.updates": "Version & config",
   "settings.providerCount": "{n} providers",
+  "settings.botMetaOff": "off",
+  "settings.botMetaNoChannels": "no channels",
+  "settings.botMetaChannels": "{n} channels",
   "settings.appearanceMeta": "theme · accent · text · font",
   "settings.updatesMeta": "version · config",
   "settings.closeBehavior": "When closing window",
@@ -635,6 +640,93 @@ export const en = {
 	  "settings.saveNetwork": "Save network settings",
 	  "settings.setKey": "set {env} (saved globally)",
   "settings.saveKey": "Save key",
+  "settings.toggleOn": "On",
+  "settings.toggleOff": "Off",
+  "settings.botSetup": "Bot entry",
+  "settings.botSetupHint": "Enable the entry, then connect the chat channels you need.",
+  "settings.botGateway": "Bot gateway",
+  "settings.botGatewayHint": "Manage the IM bot gateway, model, and runtime parameters from the desktop app.",
+  "settings.saveBotSettings": "Save bot settings",
+  "settings.botEnableBot": "Enable bot",
+  "settings.botGatewayEnabled": "Enable gateway",
+  "settings.botAdvancedRuntime": "Model and runtime",
+  "settings.botModel": "Bot model",
+  "settings.botModelHint": "Leave empty to use the default model.",
+  "settings.botModelDefault": "Use default model",
+  "settings.botRuntime": "Runtime limits",
+  "settings.botMaxSteps": "Max steps",
+  "settings.botDebounceMs": "Debounce ms",
+  "settings.botChannels": "Connect channels",
+  "settings.botChannelsHint": "Pick a channel and connect by QR; app parameters stay in Advanced settings.",
+  "settings.botQQHint": "QQ official Bot API v2.",
+  "settings.botFeishu": "Feishu",
+  "settings.botFeishuHint": "Feishu custom app bot with webhook and websocket modes.",
+  "settings.botWeixin": "WeChat",
+  "settings.botWeixinHint": "WeChat iLink bot with a persisted login token.",
+  "settings.botAppId": "App ID",
+  "settings.botAppSecret": "App secret",
+  "settings.botLoginToken": "Login token",
+  "settings.botVerificationToken": "Verification token",
+  "settings.botFeishuMode": "Connection mode",
+  "settings.botFeishuMode.webhook": "Webhook",
+  "settings.botFeishuMode.websocket": "WebSocket",
+  "settings.botWebhookPort": "Webhook port",
+  "settings.botWebhookURL": "Webhook URL",
+  "settings.botCopyWebhook": "Copy webhook",
+  "settings.botRequireMention": "Require mention",
+  "settings.botAccountId": "Account ID",
+  "settings.botApiBase": "API base",
+  "settings.botSecretSet": "secret set",
+  "settings.botSecretMissing": "no secret",
+  "settings.botChannelEnabled": "Enable channel",
+  "settings.botSecretEnv": "Secret env",
+  "settings.botSecretValue": "Secret value",
+  "settings.botSecretPaste": "Paste secret",
+  "settings.botSecretReplace": "Replace saved secret",
+  "settings.botAdvancedSettings": "Advanced settings",
+  "settings.botInstallTitle": "Connect bot",
+  "settings.botInstallSubtitle": "Choose a channel, then finish authorization or use the manual setup entry.",
+  "settings.botInstallPick": "Pick a channel",
+  "settings.botInstallStarting": "Generating QR…",
+  "settings.botInstallScanHint": "Scan to authorize. The connection will be saved automatically.",
+  "settings.botInstallWaiting": "Waiting for authorization.",
+  "settings.botInstallConnected": "Connection saved.",
+  "settings.botInstallFailed": "Failed to start connection.",
+  "settings.botInstallCheck": "Check status",
+  "settings.botInstallQrAlt": "Bot connection QR code",
+  "settings.botInstallStepPick": "Pick",
+  "settings.botInstallStepScan": "Authorize",
+  "settings.botInstallStepDone": "Done",
+  "settings.botInstallManualQQ": "QQ still uses manual official Bot App ID / Secret setup. Fill it in Advanced settings.",
+  "settings.botInstallQQHint": "Official Bot API, manual setup.",
+  "settings.botInstallFeishuHint": "Scan to create a Feishu PersonalAgent.",
+  "settings.botInstallLarkHint": "Scan to create a Lark PersonalAgent.",
+  "settings.botInstallWeixinHint": "Scan WeChat and save a local token.",
+  "settings.botConnectionsEmpty": "No bot channel is connected yet.",
+  "settings.botConnectionConnected": "Connected",
+  "settings.botConnectionDisconnected": "Disconnected",
+  "settings.botDiagnose": "Diagnose",
+  "settings.botTest": "Test",
+  "settings.botTestChatId": "conversation id for test",
+  "settings.botAccessControl": "Access control",
+  "settings.botAccessControlHint": "Whitelist is the default; switch to everyone for quick testing.",
+  "settings.botAccessMode": "Who can use it",
+  "settings.botAccessAll": "Everyone",
+  "settings.botAccessWhitelist": "Whitelist only",
+  "settings.botEditAllowlist": "Edit allowlist",
+  "settings.botAllowlist": "Allowlist",
+  "settings.botAllowlistHint": "Restrict which users or groups can invoke the bot.",
+  "settings.botAllowlistEnabled": "Enable allowlist",
+  "settings.botAllowAll": "Allow everyone",
+  "settings.botAllowAllWarn": "When enabled, every incoming channel message can invoke the bot.",
+  "settings.botAllowlistEntries": "Users and groups",
+  "settings.botQQUsers": "QQ users",
+  "settings.botQQGroups": "QQ groups",
+  "settings.botFeishuUsers": "Feishu users",
+  "settings.botFeishuGroups": "Feishu groups",
+  "settings.botWeixinUsers": "WeChat users",
+  "settings.botWeixinGroups": "WeChat groups",
+  "settings.botListPlaceholder": "One ID per line, or comma-separated",
   "settings.permissions": "Permissions",
   "settings.writerMode": "Writer mode",
   "settings.modeAsk": "ask (prompt before writers)",
@@ -702,6 +794,7 @@ export const en = {
   "settings.pageDesc.general": "Language, close behavior, and planning defaults.",
   "settings.pageDesc.models": "Default model, planner model, runtime limits, and provider overview.",
   "settings.pageDesc.providers": "Manage model providers, API endpoints, keys, and available models.",
+  "settings.pageDesc.bots": "Configure QQ, Feishu, and WeChat bot channels.",
   "settings.pageDesc.mcp": "Manage MCP server connections and tool discovery.",
   "settings.pageDesc.skills": "Browse, enable, and manage agent skills and skill sources.",
   "settings.pageDesc.memory": "Manage preferences, project conventions, and instruction files Reasonix keeps referencing.",
diff --git a/desktop/frontend/src/locales/zh.ts b/desktop/frontend/src/locales/zh.ts
index ff2229bee..7fced664d 100644
--- a/desktop/frontend/src/locales/zh.ts
+++ b/desktop/frontend/src/locales/zh.ts
@@ -506,6 +506,7 @@ export const zh: Record<DictKey, string> = {
   "settings.tab.general": "通用",
 	  "settings.tab.models": "模型",
 	  "settings.tab.providers": "模型服务",
+  "settings.tab.bots": "机器人",
   "settings.tab.capabilities": "MCP 与技能",
   "settings.tab.mcp": "MCP 与工具",
   "settings.tab.skills": "技能",
@@ -518,6 +519,7 @@ export const zh: Record<DictKey, string> = {
   "settings.tabSub.general": "偏好与启动",
   "settings.tabSub.models": "默认与运行",
   "settings.tabSub.providers": "连接与授权",
+  "settings.tabSub.bots": "QQ · 飞书 · 微信",
   "settings.tabSub.capabilities": "服务器、工具与技能",
   "settings.tabSub.mcp": "服务器与工具",
   "settings.tabSub.skills": "来源与启用",
@@ -528,6 +530,9 @@ export const zh: Record<DictKey, string> = {
   "settings.tabSub.appearance": "主题与字号",
   "settings.tabSub.updates": "版本与配置",
   "settings.providerCount": "{n} 个服务",
+  "settings.botMetaOff": "未启用",
+  "settings.botMetaNoChannels": "未开渠道",
+  "settings.botMetaChannels": "{n} 个渠道",
   "settings.appearanceMeta": "主题 · 强调色 · 字号 · 字体",
   "settings.updatesMeta": "版本 · 配置",
   "settings.closeBehavior": "关闭窗口时",
@@ -637,6 +642,93 @@ export const zh: Record<DictKey, string> = {
 	  "settings.saveNetwork": "保存网络设置",
 	  "settings.setKey": "设置 {env}（全局保存）",
   "settings.saveKey": "保存密钥",
+  "settings.toggleOn": "开启",
+  "settings.toggleOff": "关闭",
+  "settings.botSetup": "机器人入口",
+  "settings.botSetupHint": "先开启入口，再选择要连接的聊天渠道。",
+  "settings.botGateway": "机器人网关",
+  "settings.botGatewayHint": "桌面端统一管理 IM bot 的总开关、模型和运行参数。",
+  "settings.saveBotSettings": "保存机器人设置",
+  "settings.botEnableBot": "启用机器人",
+  "settings.botGatewayEnabled": "启用网关",
+  "settings.botAdvancedRuntime": "模型与运行参数",
+  "settings.botModel": "机器人模型",
+  "settings.botModelHint": "留空时使用默认模型。",
+  "settings.botModelDefault": "使用默认模型",
+  "settings.botRuntime": "运行限制",
+  "settings.botMaxSteps": "最大步数",
+  "settings.botDebounceMs": "合并窗口 ms",
+  "settings.botChannels": "连接渠道",
+  "settings.botChannelsHint": "选择渠道并扫码连接；应用参数保留在高级设置里。",
+  "settings.botQQHint": "QQ 官方 Bot API v2。",
+  "settings.botFeishu": "飞书",
+  "settings.botFeishuHint": "飞书自建应用 Bot，支持 webhook 与 websocket。",
+  "settings.botWeixin": "微信",
+  "settings.botWeixinHint": "微信 iLink Bot，支持扫码登录后的 token。",
+  "settings.botAppId": "App ID",
+  "settings.botAppSecret": "App Secret",
+  "settings.botLoginToken": "登录 Token",
+  "settings.botVerificationToken": "Verification Token",
+  "settings.botFeishuMode": "接入方式",
+  "settings.botFeishuMode.webhook": "Webhook",
+  "settings.botFeishuMode.websocket": "WebSocket",
+  "settings.botWebhookPort": "Webhook 端口",
+  "settings.botWebhookURL": "Webhook 地址",
+  "settings.botCopyWebhook": "复制回调",
+  "settings.botRequireMention": "需要 @",
+  "settings.botAccountId": "账号 ID",
+  "settings.botApiBase": "API Base",
+  "settings.botSecretSet": "已配置密钥",
+  "settings.botSecretMissing": "未配置密钥",
+  "settings.botChannelEnabled": "启用渠道",
+  "settings.botSecretEnv": "密钥变量",
+  "settings.botSecretValue": "密钥值",
+  "settings.botSecretPaste": "粘贴密钥",
+  "settings.botSecretReplace": "替换已保存的密钥",
+  "settings.botAdvancedSettings": "高级设置",
+  "settings.botInstallTitle": "连接机器人",
+  "settings.botInstallSubtitle": "选择一个渠道后，按提示完成授权或查看手动配置入口。",
+  "settings.botInstallPick": "选择渠道",
+  "settings.botInstallStarting": "正在生成二维码…",
+  "settings.botInstallScanHint": "请扫码完成授权，连接会自动保存。",
+  "settings.botInstallWaiting": "等待授权完成。",
+  "settings.botInstallConnected": "连接已保存。",
+  "settings.botInstallFailed": "生成连接失败。",
+  "settings.botInstallCheck": "检查状态",
+  "settings.botInstallQrAlt": "机器人连接二维码",
+  "settings.botInstallStepPick": "选择",
+  "settings.botInstallStepScan": "授权",
+  "settings.botInstallStepDone": "完成",
+  "settings.botInstallManualQQ": "QQ 当前仍使用官方 Bot App ID / Secret 手动配置，请在高级设置里填写。",
+  "settings.botInstallQQHint": "官方 Bot API，先手动配置。",
+  "settings.botInstallFeishuHint": "扫码创建飞书 PersonalAgent。",
+  "settings.botInstallLarkHint": "扫码创建 Lark PersonalAgent。",
+  "settings.botInstallWeixinHint": "微信扫码登录并保存本地 token。",
+  "settings.botConnectionsEmpty": "还没有连接的机器人渠道。",
+  "settings.botConnectionConnected": "已连接",
+  "settings.botConnectionDisconnected": "未连接",
+  "settings.botDiagnose": "诊断",
+  "settings.botTest": "测试",
+  "settings.botTestChatId": "测试会话 ID",
+  "settings.botAccessControl": "访问控制",
+  "settings.botAccessControlHint": "默认使用白名单；临时测试可以改为允许所有人。",
+  "settings.botAccessMode": "谁可以使用",
+  "settings.botAccessAll": "所有人",
+  "settings.botAccessWhitelist": "仅白名单",
+  "settings.botEditAllowlist": "编辑白名单",
+  "settings.botAllowlist": "白名单",
+  "settings.botAllowlistHint": "限制哪些用户或群可以调用机器人。",
+  "settings.botAllowlistEnabled": "启用白名单",
+  "settings.botAllowAll": "允许所有人",
+  "settings.botAllowAllWarn": "开启后所有进入渠道的消息都可以调用机器人。",
+  "settings.botAllowlistEntries": "用户与群",
+  "settings.botQQUsers": "QQ 用户",
+  "settings.botQQGroups": "QQ群",
+  "settings.botFeishuUsers": "飞书用户",
+  "settings.botFeishuGroups": "飞书群",
+  "settings.botWeixinUsers": "微信用户",
+  "settings.botWeixinGroups": "微信群",
+  "settings.botListPlaceholder": "每行一个 ID，也可用逗号分隔",
   "settings.permissions": "权限",
   "settings.writerMode": "写操作模式",
   "settings.modeAsk": "ask（写操作前询问）",
@@ -704,6 +796,7 @@ export const zh: Record<DictKey, string> = {
   "settings.pageDesc.general": "语言、关闭行为和计划默认设置。",
   "settings.pageDesc.models": "默认模型、规划模型、运行上限与接入概览。",
   "settings.pageDesc.providers": "管理模型供应商、API 地址、密钥与可用模型。",
+  "settings.pageDesc.bots": "配置 QQ、飞书和微信机器人渠道。",
   "settings.pageDesc.mcp": "管理 MCP 服务器连接和工具发现。",
   "settings.pageDesc.skills": "浏览、启用和管理智能体技能与来源。",
   "settings.pageDesc.memory": "管理 Reasonix 会长期参考的偏好、项目约定和指令文件。",
diff --git a/desktop/frontend/src/styles.css b/desktop/frontend/src/styles.css
index 38c7e94bf..e64c6ffe6 100644
--- a/desktop/frontend/src/styles.css
+++ b/desktop/frontend/src/styles.css
@@ -9551,6 +9551,351 @@ a[href] {
   color: var(--accent);
   font-weight: 650;
 }
+.bot-channel-grid {
+  display: grid;
+  grid-template-columns: repeat(auto-fit, minmax(270px, 1fr));
+  gap: 10px;
+  width: 100%;
+}
+.bot-connect-layout {
+  display: grid;
+  gap: 16px;
+}
+.bot-connect-steps {
+  display: grid;
+  grid-template-columns: repeat(3, minmax(0, 1fr));
+  gap: 8px;
+}
+.bot-connect-step {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  min-height: 34px;
+  border: 1px solid var(--border);
+  border-radius: 8px;
+  background: var(--bg-elev);
+  color: var(--fg-dim);
+  padding: 6px 10px;
+}
+.bot-connect-step span {
+  display: grid;
+  place-items: center;
+  width: 20px;
+  height: 20px;
+  border-radius: 999px;
+  background: var(--bg-elev-2);
+  color: var(--fg-dim);
+  font-size: var(--text-2xs);
+  font-weight: 750;
+}
+.bot-connect-step strong {
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  font-size: var(--font-control-small);
+  font-weight: 700;
+}
+.bot-connect-step--active {
+  border-color: color-mix(in srgb, var(--accent) 44%, var(--border));
+  color: var(--fg);
+}
+.bot-connect-step--active span {
+  background: var(--accent-soft);
+  color: var(--accent);
+}
+.bot-connect-targets {
+  display: grid;
+  grid-template-columns: repeat(4, minmax(0, 1fr));
+  gap: 10px;
+}
+.bot-connect-target {
+  min-height: 82px;
+  border: 1px solid var(--border);
+  border-radius: 8px;
+  background: var(--bg-elev);
+  color: var(--fg);
+  padding: 12px;
+  text-align: left;
+  cursor: pointer;
+  transition: border-color 0.15s ease, background 0.15s ease;
+}
+.bot-connect-target:hover:not(:disabled),
+.bot-connect-target--active {
+  border-color: color-mix(in srgb, var(--accent) 56%, var(--border));
+  background: var(--button-bg-hover);
+}
+.bot-connect-target:disabled {
+  cursor: not-allowed;
+  opacity: 0.62;
+}
+.bot-connect-target strong,
+.bot-connect-target span {
+  display: block;
+}
+.bot-connect-target strong {
+  font-size: 14px;
+  font-weight: 760;
+}
+.bot-connect-target span {
+  margin-top: 6px;
+  color: var(--fg-dim);
+  font-size: 12px;
+  line-height: 1.45;
+}
+.bot-connect-panel {
+  display: grid;
+  grid-template-columns: 220px minmax(0, 1fr);
+  gap: 18px;
+  align-items: center;
+  border: 1px solid var(--border);
+  border-radius: 8px;
+  background: var(--bg-elev);
+  padding: 16px;
+}
+.bot-connect-panel__qr {
+  display: grid;
+  place-items: center;
+  min-height: 220px;
+  border-radius: 8px;
+  background: var(--bg-elev-2);
+}
+.bot-connect-panel__qr img {
+  width: 196px;
+  height: 196px;
+  border-radius: 6px;
+  background: #fff;
+  padding: 8px;
+}
+.bot-connect-panel__placeholder {
+  color: var(--fg-dim);
+  font-size: 13px;
+}
+.bot-connect-panel__body {
+  display: grid;
+  gap: 10px;
+  min-width: 0;
+}
+.bot-connect-panel__body strong {
+  font-size: 16px;
+}
+.bot-connect-panel__body p {
+  margin: 0;
+  color: var(--fg-dim);
+  line-height: 1.55;
+}
+.bot-connect-panel__body code {
+  width: fit-content;
+  border: 1px solid var(--border);
+  border-radius: 6px;
+  background: var(--bg-elev-2);
+  padding: 6px 8px;
+}
+.bot-connection-list {
+  display: grid;
+  gap: 8px;
+}
+.bot-connection-empty,
+.bot-connection-row {
+  border: 1px solid var(--border);
+  border-radius: 8px;
+  background: var(--bg-elev);
+  padding: 12px;
+}
+.bot-connection-empty {
+  color: var(--fg-dim);
+  font-size: 13px;
+}
+.bot-connection-row {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 12px;
+}
+.bot-connection-row strong,
+.bot-connection-row span,
+.bot-connection-row em {
+  display: block;
+}
+.bot-connection-row span,
+.bot-connection-row em {
+  margin-top: 3px;
+  color: var(--fg-dim);
+  font-size: 12px;
+  font-style: normal;
+}
+.bot-connection-row__actions {
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+  flex-wrap: wrap;
+  gap: 8px;
+}
+.bot-connection-row__target {
+  width: 180px;
+  min-width: 140px;
+}
+.bot-legacy-grid {
+  display: grid;
+  grid-template-columns: repeat(auto-fit, minmax(270px, 1fr));
+  gap: 10px;
+}
+.bot-advanced__body--channels {
+  display: block;
+}
+.bot-channel-card {
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+  min-width: 0;
+  padding: 14px;
+  border: 1px solid var(--border);
+  border-radius: 8px;
+  background: var(--bg-elev-1);
+}
+.bot-channel-card--enabled {
+  border-color: color-mix(in srgb, var(--accent) 42%, var(--border));
+  box-shadow: inset 3px 0 0 var(--accent);
+}
+.bot-channel-card__head {
+  display: flex;
+  align-items: flex-start;
+  justify-content: space-between;
+  gap: 10px;
+  min-width: 0;
+}
+.bot-channel-card__identity {
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+  min-width: 0;
+}
+.bot-channel-card__identity strong {
+  color: var(--fg);
+  font-size: var(--font-control);
+  font-weight: 750;
+  line-height: 1.25;
+}
+.bot-channel-card__identity span {
+  color: var(--fg-dim);
+  font-size: var(--font-caption);
+  line-height: 1.35;
+}
+.bot-channel-card__switch {
+  display: flex;
+  justify-content: flex-start;
+}
+.bot-channel-card__switch .set-seg {
+  width: 100%;
+}
+.bot-channel-card__switch .set-seg__btn {
+  flex: 1 1 0;
+  min-height: 32px;
+}
+.bot-channel-card__simple {
+  display: flex;
+  flex-direction: column;
+  gap: 9px;
+  min-width: 0;
+}
+.bot-card-field {
+  display: grid;
+  grid-template-columns: minmax(92px, 122px) minmax(0, 1fr);
+  gap: 9px;
+  align-items: center;
+  min-width: 0;
+}
+.bot-card-field > span {
+  min-width: 0;
+  color: var(--fg-dim);
+  font-size: var(--text-2xs);
+  font-weight: 650;
+  line-height: 1.35;
+}
+.bot-card-field > div {
+  min-width: 0;
+  display: flex;
+  justify-content: flex-end;
+}
+.bot-card-field .mem-input,
+.bot-card-field .mem-select,
+.bot-card-field .set-seg {
+  width: 100%;
+}
+.bot-card-field .set-seg__btn {
+  flex: 1 1 0;
+  white-space: nowrap;
+}
+.bot-advanced {
+  margin-top: 12px;
+  min-width: 0;
+  border-top: 1px solid var(--border-soft);
+}
+.bot-advanced > summary {
+  --wails-draggable: no-drag;
+  display: flex;
+  align-items: center;
+  min-height: 36px;
+  color: var(--fg-dim);
+  cursor: pointer;
+  font-size: var(--font-control-small);
+  font-weight: 650;
+  user-select: none;
+}
+.bot-advanced > summary:hover {
+  color: var(--fg);
+}
+.bot-advanced__body {
+  display: flex;
+  flex-direction: column;
+  gap: 9px;
+  min-width: 0;
+  padding: 0 0 4px;
+}
+.bot-advanced__body .settings-field {
+  grid-template-columns: minmax(160px, 220px) minmax(0, 1fr);
+  gap: 18px;
+  padding: 11px 0;
+}
+.bot-advanced--compact {
+  margin-top: 2px;
+}
+.bot-advanced--compact .bot-advanced__body {
+  padding-bottom: 0;
+}
+.bot-secret-row {
+  display: grid;
+  grid-template-columns: minmax(0, 1fr) auto auto;
+  align-items: center;
+  gap: 6px;
+  width: 100%;
+  min-width: 0;
+}
+.bot-secret-row .mem-input {
+  min-width: 0;
+}
+.bot-list-grid {
+  display: grid;
+  grid-template-columns: repeat(2, minmax(0, 1fr));
+  gap: 10px;
+  width: 100%;
+}
+.bot-list-input {
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
+  min-width: 0;
+}
+.bot-list-input > span {
+  color: var(--fg-dim);
+  font-size: var(--text-2xs);
+  font-weight: 650;
+}
+.bot-list-input__textarea {
+  min-height: 88px;
+  max-height: 180px;
+  resize: vertical;
+}
 .set-row--stack {
   align-items: flex-start;
   flex-direction: column;
@@ -9739,6 +10084,43 @@ a[href] {
   .set-hint {
     margin-left: 0;
   }
+  .bot-channel-grid,
+  .bot-connect-steps,
+  .bot-connect-targets,
+  .bot-list-grid {
+    grid-template-columns: 1fr;
+  }
+  .bot-connect-panel {
+    grid-template-columns: 1fr;
+  }
+  .bot-connection-row {
+    align-items: flex-start;
+    flex-direction: column;
+  }
+  .bot-connection-row__actions {
+    justify-content: flex-start;
+    width: 100%;
+  }
+  .bot-connection-row__target {
+    width: 100%;
+  }
+  .bot-card-field {
+    grid-template-columns: 1fr;
+    gap: 5px;
+  }
+  .bot-advanced__body .settings-field {
+    grid-template-columns: 1fr;
+    gap: 8px;
+  }
+  .bot-card-field > div {
+    justify-content: flex-start;
+  }
+  .bot-secret-row {
+    grid-template-columns: 1fr;
+  }
+  .bot-secret-row .btn {
+    justify-self: flex-end;
+  }
   .theme-card-grid {
     grid-template-columns: 1fr;
   }
diff --git a/desktop/go.mod b/desktop/go.mod
index f44e08584..4b4d3fdf5 100644
--- a/desktop/go.mod
+++ b/desktop/go.mod
@@ -28,11 +28,13 @@ require (
 	github.com/bep/debounce v1.2.1 // indirect
 	github.com/clipperhouse/uax29/v2 v2.7.0 // indirect
 	github.com/go-ole/go-ole v1.3.0 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/gorilla/websocket v1.5.3 // indirect
 	github.com/jchv/go-winloader v0.0.0-20250406163304-c1995be93bd1 // indirect
 	github.com/labstack/echo/v4 v4.15.2 // indirect
 	github.com/labstack/gommon v0.5.0 // indirect
+	github.com/larksuite/oapi-sdk-go/v3 v3.9.4 // indirect
 	github.com/leaanthony/go-ansi-parser v1.6.1 // indirect
 	github.com/leaanthony/gosod v1.0.4 // indirect
 	github.com/leaanthony/slicer v1.6.0 // indirect
diff --git a/desktop/go.sum b/desktop/go.sum
index 193c4e07f..292e010fe 100644
--- a/desktop/go.sum
+++ b/desktop/go.sum
@@ -18,16 +18,23 @@ github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE=
 github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78=
 github.com/godbus/dbus/v5 v5.2.2 h1:TUR3TgtSVDmjiXOgAAyaZbYmIeP3DPkld3jgKGV8mXQ=
 github.com/godbus/dbus/v5 v5.2.2/go.mod h1:3AAv2+hPq5rdnr5txxxRwiGjPXamgoIHgz9FPBfOp3c=
+github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
+github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
 github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/jchv/go-winloader v0.0.0-20250406163304-c1995be93bd1 h1:njuLRcjAuMKr7kI3D85AXWkw6/+v9PwtV6M6o11sWHQ=
 github.com/jchv/go-winloader v0.0.0-20250406163304-c1995be93bd1/go.mod h1:alcuEEnZsY1WQsagKhZDsoPCRoOijYqhZvPwLG0kzVs=
+github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
+github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/labstack/echo/v4 v4.15.2 h1:nnh2sCzGCVYnU+wCisMPiYapEg/QVo/gcI9ePKg5/T4=
 github.com/labstack/echo/v4 v4.15.2/go.mod h1:Xzp1Ns1RA2c9fY7nSgUJkpkUZGNbEIVHZbtbOMPktBI=
 github.com/labstack/gommon v0.5.0 h1:6VSQ2NOzsnEJ5W6+84E0RbcaDDmgB6NIAzWCczTEe6c=
 github.com/labstack/gommon v0.5.0/go.mod h1:Rzlg7HHy1maLfzBYGg9NZcVuz1sA68HHhLjhcEllYE0=
+github.com/larksuite/oapi-sdk-go/v3 v3.9.4 h1:oMgcY7NBjJv1QXJqFAfcoN/TbScCkCuRZfbb1mCwZmI=
+github.com/larksuite/oapi-sdk-go/v3 v3.9.4/go.mod h1:ZEplY+kwuIrj/nqw5uSCINNATcH3KdxSN7y+UxYY5fI=
 github.com/leaanthony/debme v1.2.1 h1:9Tgwf+kjcrbMQ4WnPcEIUcQuIZYqdWftzZkBr+i/oOc=
 github.com/leaanthony/debme v1.2.1/go.mod h1:3V+sCm5tYAgQymvSOfYQ5Xx2JCr+OXiD9Jkw3otUjiA=
 github.com/leaanthony/go-ansi-parser v1.6.1 h1:xd8bzARK3dErqkPFtoF9F3/HgN8UQk0ed1YDKpEz01A=
@@ -78,23 +85,37 @@ github.com/wailsapp/mimetype v1.4.1 h1:pQN9ycO7uo4vsUUuPeHEYoUkLVkaRntMnHJxVwYhw
 github.com/wailsapp/mimetype v1.4.1/go.mod h1:9aV5k31bBOv5z6u+QP8TltzvNGJPmNJD4XlAL3U+j3o=
 github.com/wailsapp/wails/v2 v2.12.0 h1:BHO/kLNWFHYjCzucxbzAYZWUjub1Tvb4cSguQozHn5c=
 github.com/wailsapp/wails/v2 v2.12.0/go.mod h1:mo1bzK1DEJrobt7YrBjgxvb5Sihb1mhAY09hppbibQg=
+github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
 golang.org/x/crypto v0.0.0-20211209193657-4570a0811e8b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.52.0 h1:RMs7fP2rXdep0CftQlK8Uf+kibLm7qkCcradZWYz988=
 golang.org/x/crypto v0.52.0/go.mod h1:1QgfPxDqh0T2M/elOJtp9RvuR95kVjir0e6/BvEmGbc=
+golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.37.0 h1:vF1DjpVEshcIqoEaauuHebaLk1O1forxjxBaVn884JQ=
 golang.org/x/mod v0.37.0/go.mod h1:m8S8VeM9r4dzDwjrKO0a1sZP3YjeMamRRlD+fmR2Q/0=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210505024714-0287a6fb4125/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8=
 golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200810151505-1b9f1253b3ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210228012217-479acdf4ea46/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -105,10 +126,18 @@ golang.org/x/sys v0.46.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.38.0 h1:sXmwo9DwP3OK9EZ7PqAdaooSGozfl/3a6/xJcbzPRhE=
 golang.org/x/text v0.38.0/go.mod h1:YXZt3QhHUKYT53r2lLKFIVi6Ao1jdzrTR/KQ09qyxF4=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
diff --git a/desktop/settings_app.go b/desktop/settings_app.go
index b4d0b783c..fb6484809 100644
--- a/desktop/settings_app.go
+++ b/desktop/settings_app.go
@@ -79,6 +79,56 @@ type AgentView struct {
 	SystemPrompt    string  `json:"systemPrompt"`
 }
 
+type BotAllowlistView struct {
+	Enabled      bool     `json:"enabled"`
+	AllowAll     bool     `json:"allowAll"`
+	QQUsers      []string `json:"qqUsers"`
+	FeishuUsers  []string `json:"feishuUsers"`
+	WeixinUsers  []string `json:"weixinUsers"`
+	QQGroups     []string `json:"qqGroups"`
+	FeishuGroups []string `json:"feishuGroups"`
+	WeixinGroups []string `json:"weixinGroups"`
+}
+
+type QQBotView struct {
+	Enabled      bool   `json:"enabled"`
+	AppID        string `json:"appId"`
+	AppSecretEnv string `json:"appSecretEnv"`
+	SecretSet    bool   `json:"secretSet"`
+}
+
+type FeishuBotView struct {
+	Enabled           bool   `json:"enabled"`
+	Domain            string `json:"domain"`
+	AppID             string `json:"appId"`
+	AppSecretEnv      string `json:"appSecretEnv"`
+	SecretSet         bool   `json:"secretSet"`
+	VerificationToken string `json:"verificationToken"`
+	Mode              string `json:"mode"`
+	WebhookPort       int    `json:"webhookPort"`
+	RequireMention    bool   `json:"requireMention"`
+}
+
+type WeixinBotView struct {
+	Enabled   bool   `json:"enabled"`
+	AccountID string `json:"accountId"`
+	TokenEnv  string `json:"tokenEnv"`
+	TokenSet  bool   `json:"tokenSet"`
+	APIBase   string `json:"apiBase"`
+}
+
+type BotSettingsView struct {
+	Enabled     bool                `json:"enabled"`
+	Model       string              `json:"model"`
+	MaxSteps    int                 `json:"maxSteps"`
+	DebounceMs  int                 `json:"debounceMs"`
+	Allowlist   BotAllowlistView    `json:"allowlist"`
+	QQ          QQBotView           `json:"qq"`
+	Feishu      FeishuBotView       `json:"feishu"`
+	Weixin      WeixinBotView       `json:"weixin"`
+	Connections []BotConnectionView `json:"connections"`
+}
+
 // SettingsView is the whole Settings panel payload.
 type SettingsView struct {
 	DefaultModel      string          `json:"defaultModel"`
@@ -92,6 +142,7 @@ type SettingsView struct {
 	Sandbox           SandboxView     `json:"sandbox"`
 	Network           NetworkView     `json:"network"`
 	Agent             AgentView       `json:"agent"`
+	Bot               BotSettingsView `json:"bot"`
 	DesktopLanguage   string          `json:"desktopLanguage"`
 	DesktopTheme      string          `json:"desktopTheme"`
 	DesktopThemeStyle string          `json:"desktopThemeStyle"`
@@ -267,6 +318,7 @@ func (a *App) Settings() SettingsView {
 			},
 			Sandbox:           SandboxView{Bash: "enforce", AllowWrite: []string{}},
 			Agent:             AgentView{PlannerMaxSteps: 12},
+			Bot:               botSettingsView(config.BotConfig{}),
 			AutoPlan:          "off",
 			DesktopTheme:      "light",
 			DesktopThemeStyle: "graphite",
@@ -309,6 +361,7 @@ func (a *App) Settings() SettingsView {
 			},
 		},
 		Agent:             AgentView{Temperature: cfg.Agent.Temperature, MaxSteps: cfg.Agent.MaxSteps, PlannerMaxSteps: cfg.Agent.PlannerMaxSteps, SystemPrompt: cfg.Agent.SystemPrompt},
+		Bot:               botSettingsView(cfg.Bot),
 		DesktopLanguage:   cfg.DesktopLanguage(),
 		DesktopTheme:      cfg.DesktopTheme(),
 		DesktopThemeStyle: cfg.DesktopThemeStyle(),
@@ -327,6 +380,54 @@ func (a *App) Settings() SettingsView {
 	return v
 }
 
+func botSettingsView(b config.BotConfig) BotSettingsView {
+	mode := strings.TrimSpace(b.Feishu.Mode)
+	if mode == "" {
+		mode = "webhook"
+	}
+	return BotSettingsView{
+		Enabled:    b.Enabled,
+		Model:      b.Model,
+		MaxSteps:   b.MaxSteps,
+		DebounceMs: b.DebounceMs,
+		Allowlist: BotAllowlistView{
+			Enabled:      b.Allowlist.Enabled,
+			AllowAll:     b.Allowlist.AllowAll,
+			QQUsers:      nonNil(b.Allowlist.QQUsers),
+			FeishuUsers:  nonNil(b.Allowlist.FeishuUsers),
+			WeixinUsers:  nonNil(b.Allowlist.WeixinUsers),
+			QQGroups:     nonNil(b.Allowlist.QQGroups),
+			FeishuGroups: nonNil(b.Allowlist.FeishuGroups),
+			WeixinGroups: nonNil(b.Allowlist.WeixinGroups),
+		},
+		QQ: QQBotView{
+			Enabled:      b.QQ.Enabled,
+			AppID:        b.QQ.AppID,
+			AppSecretEnv: b.QQ.AppSecretEnv,
+			SecretSet:    strings.TrimSpace(b.QQ.AppSecretEnv) != "" && os.Getenv(b.QQ.AppSecretEnv) != "",
+		},
+		Feishu: FeishuBotView{
+			Enabled:           b.Feishu.Enabled,
+			Domain:            orDefault(strings.TrimSpace(b.Feishu.Domain), "feishu"),
+			AppID:             b.Feishu.AppID,
+			AppSecretEnv:      b.Feishu.AppSecretEnv,
+			SecretSet:         strings.TrimSpace(b.Feishu.AppSecretEnv) != "" && os.Getenv(b.Feishu.AppSecretEnv) != "",
+			VerificationToken: b.Feishu.VerificationToken,
+			Mode:              mode,
+			WebhookPort:       b.Feishu.WebhookPort,
+			RequireMention:    b.Feishu.RequireMention,
+		},
+		Weixin: WeixinBotView{
+			Enabled:   b.Weixin.Enabled,
+			AccountID: b.Weixin.AccountID,
+			TokenEnv:  b.Weixin.TokenEnv,
+			TokenSet:  strings.TrimSpace(b.Weixin.TokenEnv) != "" && os.Getenv(b.Weixin.TokenEnv) != "",
+			APIBase:   b.Weixin.APIBase,
+		},
+		Connections: botConnectionViews(b.Connections),
+	}
+}
+
 func orDefault(s, def string) string {
 	if strings.TrimSpace(s) == "" {
 		return def
@@ -334,6 +435,13 @@ func orDefault(s, def string) string {
 	return s
 }
 
+func botDomainOrDefault(domain string) string {
+	if strings.EqualFold(strings.TrimSpace(domain), "lark") {
+		return "lark"
+	}
+	return "feishu"
+}
+
 // --- apply (write config, then rebuild the controller so it's live) ---
 
 // applyConfigChange mutates the user-global config and rebuilds the controller so
@@ -1057,6 +1165,67 @@ func (a *App) SetNetwork(n NetworkView) error {
 	})
 }
 
+func (a *App) SetBotSettings(b BotSettingsView) error {
+	return a.applyConfigOnly(func(c *config.Config) error {
+		c.Bot.Enabled = b.Enabled
+		c.Bot.Model = strings.TrimSpace(b.Model)
+		c.Bot.MaxSteps = b.MaxSteps
+		c.Bot.DebounceMs = b.DebounceMs
+		c.Bot.Allowlist = config.BotAllowlist{
+			Enabled:      b.Allowlist.Enabled,
+			AllowAll:     b.Allowlist.AllowAll,
+			QQUsers:      trimList(b.Allowlist.QQUsers),
+			FeishuUsers:  trimList(b.Allowlist.FeishuUsers),
+			WeixinUsers:  trimList(b.Allowlist.WeixinUsers),
+			QQGroups:     trimList(b.Allowlist.QQGroups),
+			FeishuGroups: trimList(b.Allowlist.FeishuGroups),
+			WeixinGroups: trimList(b.Allowlist.WeixinGroups),
+		}
+		c.Bot.QQ = config.QQBotConfig{
+			Enabled:      b.QQ.Enabled,
+			AppID:        strings.TrimSpace(b.QQ.AppID),
+			AppSecretEnv: strings.TrimSpace(b.QQ.AppSecretEnv),
+		}
+		c.Bot.Feishu = config.FeishuBotConfig{
+			Enabled:           b.Feishu.Enabled,
+			Domain:            botDomainOrDefault(b.Feishu.Domain),
+			AppID:             strings.TrimSpace(b.Feishu.AppID),
+			AppSecretEnv:      strings.TrimSpace(b.Feishu.AppSecretEnv),
+			VerificationToken: strings.TrimSpace(b.Feishu.VerificationToken),
+			Mode:              strings.TrimSpace(b.Feishu.Mode),
+			WebhookPort:       b.Feishu.WebhookPort,
+			RequireMention:    b.Feishu.RequireMention,
+		}
+		c.Bot.Weixin = config.WeixinBotConfig{
+			Enabled:   b.Weixin.Enabled,
+			AccountID: strings.TrimSpace(b.Weixin.AccountID),
+			TokenEnv:  strings.TrimSpace(b.Weixin.TokenEnv),
+			APIBase:   strings.TrimRight(strings.TrimSpace(b.Weixin.APIBase), "/"),
+		}
+		c.Bot.Connections = botConnectionConfigs(b.Connections)
+		return nil
+	})
+}
+
+func (a *App) SetBotSecret(envName, value string) error {
+	envName = strings.TrimSpace(envName)
+	if envName == "" {
+		return fmt.Errorf("bot secret env name is empty")
+	}
+	if err := upsertDotEnv(envName, value); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (a *App) ClearBotSecret(envName string) error {
+	envName = strings.TrimSpace(envName)
+	if envName == "" {
+		return fmt.Errorf("bot secret env name is empty")
+	}
+	return removeDotEnv(envName)
+}
+
 // SetCloseBehavior updates desktop-only window close behavior without rebuilding
 // the active controller. It must stay out of provider-visible prompt/request data.
 func (a *App) SetCloseBehavior(mode string) error {
diff --git a/go.mod b/go.mod
index d046b3d67..248773785 100644
--- a/go.mod
+++ b/go.mod
@@ -12,6 +12,7 @@ require (
 	github.com/alecthomas/chroma/v2 v2.26.1
 	github.com/atotto/clipboard v0.1.4
 	github.com/charmbracelet/x/ansi v0.11.7
+	github.com/larksuite/oapi-sdk-go/v3 v3.9.4
 	github.com/mattn/go-runewidth v0.0.24
 	github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06
 	github.com/yuin/goldmark v1.8.2
@@ -31,6 +32,8 @@ require (
 	github.com/clipperhouse/displaywidth v0.11.0 // indirect
 	github.com/clipperhouse/uax29/v2 v2.7.0 // indirect
 	github.com/dlclark/regexp2/v2 v2.1.1 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/gorilla/websocket v1.5.0 // indirect
 	github.com/lucasb-eyer/go-colorful v1.4.0 // indirect
 	github.com/muesli/cancelreader v0.2.2 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
diff --git a/go.sum b/go.sum
index e53d52ae4..0c1a539a1 100644
--- a/go.sum
+++ b/go.sum
@@ -41,8 +41,16 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dlclark/regexp2/v2 v2.1.1 h1:LCUGyd9Wf+r+VVOl8Ny38JTpWJcAsdVnCIuhhtthmKw=
 github.com/dlclark/regexp2/v2 v2.1.1/go.mod h1:avUrQvPaLz2DrFNHJF0taWAFFX2C1GMSSoeiqFjcBmU=
+github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
+github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
+github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
+github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM=
 github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg=
+github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
+github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/larksuite/oapi-sdk-go/v3 v3.9.4 h1:oMgcY7NBjJv1QXJqFAfcoN/TbScCkCuRZfbb1mCwZmI=
+github.com/larksuite/oapi-sdk-go/v3 v3.9.4/go.mod h1:ZEplY+kwuIrj/nqw5uSCINNATcH3KdxSN7y+UxYY5fI=
 github.com/lucasb-eyer/go-colorful v1.4.0 h1:UtrWVfLdarDgc44HcS7pYloGHJUjHV/4FwW4TvVgFr4=
 github.com/lucasb-eyer/go-colorful v1.4.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
 github.com/mattn/go-runewidth v0.0.24 h1:cpokDiIn0MGnhdHwuWnJBITySJ20QyNGnY2kR/ay2DU=
@@ -61,12 +69,23 @@ github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PK
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no=
 github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM=
+github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.8.2 h1:kEGpgqJXdgbkhcOgBxkC0X0PmoPG1ZyoZ117rDVp4zE=
 github.com/yuin/goldmark v1.8.2/go.mod h1:ip/1k0VRfGynBgxOz0yCqHrbZXhcjxyuS66Brc7iBKg=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI=
 golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo=
+golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8=
 golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
diff --git a/internal/bot/feishu/feishu.go b/internal/bot/feishu/feishu.go
new file mode 100644
index 000000000..8ac7d74d6
--- /dev/null
+++ b/internal/bot/feishu/feishu.go
@@ -0,0 +1,603 @@
+// Package feishu 实现飞书自建应用 Bot 适配器。
+// 参考 Hermes Agent 的 feishu adapter：
+// - 长连接 WebSocket（默认）或 Webhook 模式
+// - @mention gating
+// - open_id / user_id / union_id 映射
+// - 消息去重
+// - interactive card 审批/问答
+package feishu
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"io"
+	"log/slog"
+	"net/http"
+	"os"
+	"strings"
+	"sync"
+	"time"
+
+	"reasonix/internal/bot"
+	"reasonix/internal/config"
+
+	lark "github.com/larksuite/oapi-sdk-go/v3"
+	larkcore "github.com/larksuite/oapi-sdk-go/v3/core"
+	"github.com/larksuite/oapi-sdk-go/v3/event/dispatcher"
+	larkim "github.com/larksuite/oapi-sdk-go/v3/service/im/v1"
+	larkws "github.com/larksuite/oapi-sdk-go/v3/ws"
+)
+
+// textContent 飞书消息文本内容结构。
+type textContent struct {
+	Text string `json:"text"`
+}
+
+// feishuEvent 飞书事件结构。
+type feishuEvent struct {
+	Schema string          `json:"schema"`
+	Header feishuHeader    `json:"header"`
+	Event  json.RawMessage `json:"event"`
+}
+
+type feishuHeader struct {
+	EventID    string `json:"event_id"`
+	EventType  string `json:"event_type"`
+	Token      string `json:"token"`
+	CreateTime string `json:"create_time"`
+}
+
+type feishuMsgEvent struct {
+	MessageID string          `json:"message_id"`
+	RootID    string          `json:"root_id"`
+	ParentID  string          `json:"parent_id"`
+	ChatID    string          `json:"chat_id"`
+	ChatType  string          `json:"chat_type"`
+	MsgType   string          `json:"msg_type"`
+	Content   string          `json:"content"`
+	Sender    feishuSender    `json:"sender"`
+	Mentions  []feishuMention `json:"mentions"`
+}
+
+type feishuSender struct {
+	SenderID struct {
+		UserID  string `json:"user_id"`
+		OpenID  string `json:"open_id"`
+		UnionID string `json:"union_id"`
+	} `json:"sender_id"`
+}
+
+type feishuMention struct {
+	Key string `json:"key"`
+	ID  struct {
+		OpenID string `json:"open_id"`
+	} `json:"id"`
+}
+
+// adapter 飞书适配器实现。
+type adapter struct {
+	cfg      config.FeishuBotConfig
+	logger   *slog.Logger
+	msgCh    chan bot.InboundMessage
+	cancel   context.CancelFunc
+	client   *lark.Client
+	wsClient *larkws.Client
+
+	seenMu sync.Mutex
+	seen   map[string]bool // 消息去重
+}
+
+// New 创建飞书 Bot 适配器。
+func New(cfg config.FeishuBotConfig, logger *slog.Logger) bot.Adapter {
+	return &adapter{
+		cfg:    cfg,
+		logger: logger.With("platform", "feishu"),
+		seen:   make(map[string]bool),
+	}
+}
+
+func (a *adapter) Platform() bot.Platform { return bot.PlatformFeishu }
+func (a *adapter) Name() string           { return "feishu" }
+
+func (a *adapter) Start(ctx context.Context) error {
+	a.msgCh = make(chan bot.InboundMessage, 64)
+	ctx, a.cancel = context.WithCancel(ctx)
+
+	mode := a.cfg.Mode
+	if mode == "" {
+		mode = "webhook"
+	}
+
+	switch mode {
+	case "webhook":
+		go a.runWebhook(ctx)
+	default:
+		go a.runWebSocket(ctx)
+	}
+	return nil
+}
+
+func (a *adapter) Stop() error {
+	if a.cancel != nil {
+		a.cancel()
+	}
+	if a.wsClient != nil {
+		a.wsClient.Close()
+	}
+	return nil
+}
+
+func (a *adapter) Send(ctx context.Context, msg bot.OutboundMessage) (bot.SendResult, error) {
+	return a.sendMessage(ctx, msg)
+}
+
+func (a *adapter) SendTyping(ctx context.Context, chatID string) error {
+	return nil
+}
+
+func (a *adapter) Messages() <-chan bot.InboundMessage {
+	return a.msgCh
+}
+
+func (a *adapter) appSecret() (string, error) {
+	secret := os.Getenv(a.cfg.AppSecretEnv)
+	if a.cfg.AppID == "" || secret == "" {
+		return "", fmt.Errorf("feishu app_id or %s is not configured", a.cfg.AppSecretEnv)
+	}
+	return secret, nil
+}
+
+// runWebSocket 启动飞书 WebSocket 长连接。
+func (a *adapter) runWebSocket(ctx context.Context) {
+	secret, err := a.appSecret()
+	if err != nil {
+		a.logger.Error("feishu websocket config error", "err", err)
+		return
+	}
+	eventHandler := dispatcher.NewEventDispatcher(a.cfg.VerificationToken, "").
+		OnP2MessageReceiveV1(func(ctx context.Context, event *larkim.P2MessageReceiveV1) error {
+			a.handleSDKMessage(event)
+			return nil
+		})
+	opts := []larkws.ClientOption{
+		larkws.WithEventHandler(eventHandler),
+		larkws.WithLogLevel(larkcore.LogLevelError),
+		larkws.WithAutoReconnect(true),
+		larkws.WithOnReady(func() { a.logger.Info("feishu sdk websocket connected") }),
+		larkws.WithOnReconnecting(func() { a.logger.Warn("feishu sdk websocket reconnecting") }),
+		larkws.WithOnReconnected(func() { a.logger.Info("feishu sdk websocket reconnected") }),
+		larkws.WithOnError(func(err error) { a.logger.Error("feishu sdk websocket error", "err", err) }),
+	}
+	if feishuDomain(a.cfg.Domain) == "lark" {
+		opts = append(opts, larkws.WithDomain(lark.LarkBaseUrl))
+	}
+	client := larkws.NewClient(a.cfg.AppID, secret, opts...)
+	a.wsClient = client
+	errCh := make(chan error, 1)
+	go func() { errCh <- client.Start(ctx) }()
+	select {
+	case <-ctx.Done():
+		client.Close()
+	case err := <-errCh:
+		if err != nil {
+			a.logger.Error("feishu sdk websocket stopped", "err", err)
+		}
+	}
+}
+
+func (a *adapter) handleSDKMessage(event *larkim.P2MessageReceiveV1) {
+	if event == nil || event.Event == nil || event.Event.Message == nil {
+		return
+	}
+	eventID := ""
+	if event.EventV2Base != nil && event.EventV2Base.Header != nil {
+		eventID = event.EventV2Base.Header.EventID
+	}
+	if eventID != "" {
+		if a.markSeen(eventID) {
+			return
+		}
+	}
+	msg := event.Event.Message
+	if stringPtrValue(msg.MessageType) != "text" {
+		return
+	}
+	var content textContent
+	if err := json.Unmarshal([]byte(stringPtrValue(msg.Content)), &content); err != nil {
+		return
+	}
+	chatType := bot.ChatDM
+	if stringPtrValue(msg.ChatType) == "group" || stringPtrValue(msg.ChatType) == "topic_group" {
+		chatType = bot.ChatGroup
+		if a.cfg.RequireMention && len(msg.Mentions) == 0 {
+			return
+		}
+	}
+	userID := ""
+	if event.Event.Sender != nil && event.Event.Sender.SenderId != nil {
+		userID = firstNonEmpty(
+			stringPtrValue(event.Event.Sender.SenderId.OpenId),
+			stringPtrValue(event.Event.Sender.SenderId.UnionId),
+			stringPtrValue(event.Event.Sender.SenderId.UserId),
+		)
+	}
+	ib := bot.InboundMessage{
+		Platform:  bot.PlatformFeishu,
+		ChatType:  chatType,
+		ChatID:    stringPtrValue(msg.ChatId),
+		UserID:    userID,
+		UserName:  userID,
+		Text:      content.Text,
+		MessageID: stringPtrValue(msg.MessageId),
+		ThreadID:  stringPtrValue(msg.ThreadId),
+		Raw:       event,
+	}
+	select {
+	case a.msgCh <- ib:
+	default:
+		a.logger.Warn("feishu message channel full")
+	}
+}
+
+func (a *adapter) handleWSEvent(ctx context.Context, raw json.RawMessage) {
+	var evt feishuEvent
+	if err := json.Unmarshal(raw, &evt); err != nil {
+		return
+	}
+
+	if a.markSeen(evt.Header.EventID) {
+		return
+	}
+
+	switch evt.Header.EventType {
+	case "im.message.receive_v1":
+		var msg feishuMsgEvent
+		if err := json.Unmarshal(evt.Event, &msg); err != nil {
+			return
+		}
+		a.handleMessage(msg)
+	}
+}
+
+func (a *adapter) handleCardAction(raw []byte) bool {
+	var payload struct {
+		Header feishuHeader `json:"header"`
+		Event  struct {
+			Operator struct {
+				OperatorID struct {
+					UserID  string `json:"user_id"`
+					OpenID  string `json:"open_id"`
+					UnionID string `json:"union_id"`
+				} `json:"operator_id"`
+			} `json:"operator"`
+			Context struct {
+				OpenMessageID string `json:"open_message_id"`
+				OpenChatID    string `json:"open_chat_id"`
+			} `json:"context"`
+			Action struct {
+				Value map[string]string `json:"value"`
+			} `json:"action"`
+		} `json:"event"`
+	}
+	if err := json.Unmarshal(raw, &payload); err != nil {
+		return false
+	}
+	command := payload.Event.Action.Value["command"]
+	if command == "" || payload.Event.Context.OpenChatID == "" {
+		return false
+	}
+	chatType := cardActionChatType(payload.Event.Action.Value["chat_type"])
+	userID := firstNonEmpty(payload.Event.Operator.OperatorID.UnionID, payload.Event.Operator.OperatorID.OpenID, payload.Event.Operator.OperatorID.UserID)
+	ib := bot.InboundMessage{
+		Platform:  bot.PlatformFeishu,
+		ChatType:  chatType,
+		ChatID:    payload.Event.Context.OpenChatID,
+		UserID:    userID,
+		UserName:  userID,
+		Text:      command,
+		MessageID: payload.Event.Context.OpenMessageID,
+	}
+	select {
+	case a.msgCh <- ib:
+	default:
+		a.logger.Warn("feishu card action channel full")
+	}
+	return true
+}
+
+func (a *adapter) markSeen(eventID string) bool {
+	if eventID == "" {
+		return false
+	}
+	a.seenMu.Lock()
+	defer a.seenMu.Unlock()
+	if a.seen == nil {
+		a.seen = make(map[string]bool)
+	}
+	if a.seen[eventID] {
+		return true
+	}
+	a.seen[eventID] = true
+	if len(a.seen) > 10000 {
+		a.seen = make(map[string]bool)
+		a.seen[eventID] = true
+	}
+	return false
+}
+
+func cardActionChatType(raw string) bot.ChatType {
+	switch bot.ChatType(raw) {
+	case bot.ChatDM, bot.ChatGroup, bot.ChatGuild, bot.ChatDirect, bot.ChatThread:
+		return bot.ChatType(raw)
+	default:
+		return bot.ChatGroup
+	}
+}
+
+func (a *adapter) verificationTokenValid(token string) bool {
+	return a.cfg.VerificationToken == "" || token == a.cfg.VerificationToken
+}
+
+func firstNonEmpty(vals ...string) string {
+	for _, v := range vals {
+		if v != "" {
+			return v
+		}
+	}
+	return ""
+}
+
+func (a *adapter) handleMessage(msg feishuMsgEvent) {
+	if msg.MsgType != "text" {
+		return
+	}
+
+	// 解析文本内容
+	var content textContent
+	if err := json.Unmarshal([]byte(msg.Content), &content); err != nil {
+		return
+	}
+
+	// @mention gating：仅在群聊中检查是否 @了 bot
+	chatType := bot.ChatDM
+	if msg.ChatType == "group" {
+		chatType = bot.ChatGroup
+		if a.cfg.RequireMention && len(msg.Mentions) == 0 {
+			return
+		}
+	}
+
+	ib := bot.InboundMessage{
+		Platform:  bot.PlatformFeishu,
+		ChatType:  chatType,
+		ChatID:    msg.ChatID,
+		UserID:    msg.Sender.SenderID.OpenID,
+		UserName:  "",
+		Text:      content.Text,
+		MessageID: msg.MessageID,
+	}
+
+	// 获取用户信息填充用户名
+	if msg.Sender.SenderID.OpenID != "" {
+		ib.UserName = msg.Sender.SenderID.OpenID
+	}
+
+	select {
+	case a.msgCh <- ib:
+	default:
+		a.logger.Warn("feishu message channel full")
+	}
+}
+
+// SendText sends one plain text message to a Feishu/Lark chat_id using the SDK.
+// It is used by the desktop settings panel as an actual connection test.
+func SendText(ctx context.Context, cfg config.FeishuBotConfig, chatID, text string) (bot.SendResult, error) {
+	a := &adapter{cfg: cfg, logger: slog.Default().With("platform", "feishu")}
+	return a.sendMessage(ctx, bot.OutboundMessage{ChatID: chatID, Text: text})
+}
+
+// sendMessage 使用飞书/Lark SDK 回复或主动发送消息。
+func (a *adapter) sendMessage(ctx context.Context, msg bot.OutboundMessage) (bot.SendResult, error) {
+	if msg.Card != nil {
+		return a.sendCard(ctx, msg)
+	}
+	content, _ := json.Marshal(textContent{Text: msg.Text})
+	return a.sendSDKContent(ctx, msg, larkim.MsgTypeText, string(content))
+}
+
+func (a *adapter) sdkClient() (*lark.Client, error) {
+	if a.client != nil {
+		return a.client, nil
+	}
+	secret, err := a.appSecret()
+	if err != nil {
+		return nil, err
+	}
+	opts := []lark.ClientOptionFunc{
+		lark.WithLogLevel(larkcore.LogLevelError),
+		lark.WithReqTimeout(15 * time.Second),
+		lark.WithSource("reasonix"),
+	}
+	if feishuDomain(a.cfg.Domain) == "lark" {
+		opts = append(opts, lark.WithOpenBaseUrl(lark.LarkBaseUrl), lark.WithOAuthBaseUrl(lark.OAuthBaseUrlLark))
+	}
+	a.client = lark.NewClient(a.cfg.AppID, secret, opts...)
+	return a.client, nil
+}
+
+func (a *adapter) sendSDKContent(ctx context.Context, msg bot.OutboundMessage, msgType, content string) (bot.SendResult, error) {
+	client, err := a.sdkClient()
+	if err != nil {
+		return bot.SendResult{}, err
+	}
+	if msg.ReplyToMsgID != "" {
+		req := larkim.NewReplyMessageReqBuilder().
+			MessageId(msg.ReplyToMsgID).
+			Body(larkim.NewReplyMessageReqBodyBuilder().MsgType(msgType).Content(content).Build()).
+			Build()
+		resp, err := client.Im.Message.Reply(ctx, req)
+		if err != nil {
+			return bot.SendResult{}, err
+		}
+		if resp == nil {
+			return bot.SendResult{}, fmt.Errorf("feishu reply error: empty response")
+		}
+		if !resp.Success() {
+			return bot.SendResult{}, fmt.Errorf("feishu reply error: %s", feishuCodeError(resp.Code, resp.Msg))
+		}
+		if resp.Data == nil {
+			return bot.SendResult{}, nil
+		}
+		return bot.SendResult{MessageID: stringPtrValue(resp.Data.MessageId)}, nil
+	}
+
+	chatID := strings.TrimSpace(msg.ChatID)
+	if chatID == "" {
+		return bot.SendResult{}, fmt.Errorf("feishu chat_id is empty")
+	}
+	req := larkim.NewCreateMessageReqBuilder().
+		ReceiveIdType(larkim.CreateMessageV1ReceiveIDTypeChatId).
+		Body(larkim.NewCreateMessageReqBodyBuilder().ReceiveId(chatID).MsgType(msgType).Content(content).Build()).
+		Build()
+	resp, err := client.Im.Message.Create(ctx, req)
+	if err != nil {
+		return bot.SendResult{}, err
+	}
+	if resp == nil {
+		return bot.SendResult{}, fmt.Errorf("feishu send error: empty response")
+	}
+	if !resp.Success() {
+		return bot.SendResult{}, fmt.Errorf("feishu send error: %s", feishuCodeError(resp.Code, resp.Msg))
+	}
+	if resp.Data == nil {
+		return bot.SendResult{}, nil
+	}
+	return bot.SendResult{MessageID: stringPtrValue(resp.Data.MessageId)}, nil
+}
+
+// sendCard 发送 interactive card 消息（用于审批/问答）。
+func (a *adapter) sendCard(ctx context.Context, msg bot.OutboundMessage) (bot.SendResult, error) {
+	card := msg.Card
+
+	elements := make([]map[string]interface{}, 0)
+	for _, el := range card.Elements {
+		item := map[string]interface{}{"tag": el.Tag}
+		if el.Content != "" {
+			item["content"] = el.Content
+		}
+		if actions, ok := el.Extra["actions"]; ok && el.Tag == "action" {
+			item["actions"] = actions
+		} else {
+			for k, v := range el.Extra {
+				item[k] = v
+			}
+		}
+		elements = append(elements, item)
+	}
+
+	cardPayload := map[string]interface{}{
+		"header": map[string]interface{}{
+			"title": map[string]string{
+				"tag":     "plain_text",
+				"content": card.Header,
+			},
+		},
+		"elements": elements,
+	}
+
+	cardJSON, _ := json.Marshal(cardPayload)
+	return a.sendSDKContent(ctx, msg, larkim.MsgTypeInteractive, string(cardJSON))
+}
+
+func feishuDomain(domain string) string {
+	if strings.EqualFold(strings.TrimSpace(domain), "lark") {
+		return "lark"
+	}
+	return "feishu"
+}
+
+func stringPtrValue(ptr *string) string {
+	if ptr == nil {
+		return ""
+	}
+	return strings.TrimSpace(*ptr)
+}
+
+func feishuCodeError(code int, msg string) string {
+	msg = strings.TrimSpace(msg)
+	if msg == "" {
+		msg = "unknown error"
+	}
+	if code == 0 {
+		return msg
+	}
+	return fmt.Sprintf("%s (code %d)", msg, code)
+}
+
+// runWebhook 启动飞书 Webhook 模式。
+func (a *adapter) runWebhook(ctx context.Context) {
+	port := a.cfg.WebhookPort
+	if port == 0 {
+		port = 8080
+	}
+
+	mux := http.NewServeMux()
+	mux.HandleFunc("/feishu/event", func(w http.ResponseWriter, r *http.Request) {
+		body, err := io.ReadAll(io.LimitReader(r.Body, 1024*1024))
+		if err != nil {
+			http.Error(w, "bad request", 400)
+			return
+		}
+		var challenge struct {
+			Challenge string `json:"challenge"`
+			Token     string `json:"token"`
+			Type      string `json:"type"`
+		}
+		_ = json.Unmarshal(body, &challenge)
+		if challenge.Type == "url_verification" {
+			if !a.verificationTokenValid(challenge.Token) {
+				http.Error(w, "forbidden", http.StatusForbidden)
+				return
+			}
+			w.Header().Set("Content-Type", "application/json")
+			if err := json.NewEncoder(w).Encode(map[string]string{"challenge": challenge.Challenge}); err != nil {
+				a.logger.Error("feishu challenge response error", "err", err)
+			}
+			return
+		}
+
+		var evt feishuEvent
+		if err := json.Unmarshal(body, &evt); err != nil {
+			http.Error(w, "bad request", 400)
+			return
+		}
+		if !a.verificationTokenValid(evt.Header.Token) {
+			http.Error(w, "forbidden", http.StatusForbidden)
+			return
+		}
+
+		if !a.handleCardAction(body) {
+			raw, _ := json.Marshal(evt)
+			a.handleWSEvent(ctx, raw)
+		}
+		w.WriteHeader(200)
+	})
+
+	server := &http.Server{
+		Addr:    fmt.Sprintf(":%d", port),
+		Handler: mux,
+	}
+
+	go func() {
+		<-ctx.Done()
+		if err := server.Shutdown(context.Background()); err != nil && err != http.ErrServerClosed {
+			a.logger.Error("feishu webhook shutdown error", "err", err)
+		}
+	}()
+
+	a.logger.Info("feishu webhook listening", "port", port)
+	if err := server.ListenAndServe(); err != http.ErrServerClosed {
+		a.logger.Error("feishu webhook server error", "err", err)
+	}
+}
diff --git a/internal/bot/feishu/feishu_test.go b/internal/bot/feishu/feishu_test.go
new file mode 100644
index 000000000..abe5ecd7d
--- /dev/null
+++ b/internal/bot/feishu/feishu_test.go
@@ -0,0 +1,91 @@
+package feishu
+
+import (
+	"fmt"
+	"io"
+	"log/slog"
+	"sync"
+	"testing"
+
+	"reasonix/internal/bot"
+	"reasonix/internal/config"
+)
+
+func TestVerificationTokenValidRequiresConfiguredToken(t *testing.T) {
+	a := &adapter{cfg: config.FeishuBotConfig{VerificationToken: "expected"}}
+
+	if a.verificationTokenValid("") {
+		t.Fatal("missing token should be rejected when verification token is configured")
+	}
+	if a.verificationTokenValid("wrong") {
+		t.Fatal("wrong token should be rejected")
+	}
+	if !a.verificationTokenValid("expected") {
+		t.Fatal("matching token should be accepted")
+	}
+
+	a.cfg.VerificationToken = ""
+	if !a.verificationTokenValid("") {
+		t.Fatal("empty configured verification token should preserve unauthenticated mode")
+	}
+}
+
+func TestMarkSeenConcurrent(t *testing.T) {
+	a := &adapter{seen: make(map[string]bool)}
+	var wg sync.WaitGroup
+
+	for i := 0; i < 100; i++ {
+		wg.Add(1)
+		go func(i int) {
+			defer wg.Done()
+			_ = a.markSeen(fmt.Sprintf("evt-%d", i%5))
+		}(i)
+	}
+	wg.Wait()
+
+	if got := len(a.seen); got != 5 {
+		t.Fatalf("seen size = %d, want 5", got)
+	}
+	if a.markSeen("evt-1") != true {
+		t.Fatal("second markSeen call should report duplicate")
+	}
+	if a.markSeen("") {
+		t.Fatal("empty event id should not be treated as duplicate")
+	}
+}
+
+func TestHandleCardActionUsesChatType(t *testing.T) {
+	a := &adapter{
+		logger: slog.New(slog.NewTextHandler(io.Discard, nil)),
+		msgCh:  make(chan bot.InboundMessage, 1),
+	}
+	raw := []byte(`{
+		"event": {
+			"operator": {
+				"operator_id": {"open_id": "open-user"}
+			},
+			"context": {
+				"open_message_id": "msg-1",
+				"open_chat_id": "chat-1"
+			},
+			"action": {
+				"value": {
+					"command": "/approve approval-1",
+					"chat_type": "dm"
+				}
+			}
+		}
+	}`)
+
+	if !a.handleCardAction(raw) {
+		t.Fatal("handleCardAction returned false")
+	}
+
+	msg := <-a.msgCh
+	if msg.ChatType != bot.ChatDM {
+		t.Fatalf("chat type = %q, want %q", msg.ChatType, bot.ChatDM)
+	}
+	if msg.Text != "/approve approval-1" {
+		t.Fatalf("text = %q, want /approve approval-1", msg.Text)
+	}
+}
diff --git a/internal/bot/gateway.go b/internal/bot/gateway.go
new file mode 100644
index 000000000..0249fbb73
--- /dev/null
+++ b/internal/bot/gateway.go
@@ -0,0 +1,490 @@
+package bot
+
+import (
+	"context"
+	"fmt"
+	"log/slog"
+	"strconv"
+	"strings"
+	"sync"
+	"time"
+
+	"reasonix/internal/boot"
+	"reasonix/internal/control"
+	"reasonix/internal/event"
+)
+
+// GatewayConfig 是 BotGateway 的配置。
+type GatewayConfig struct {
+	Model         string
+	MaxSteps      int
+	WorkspaceRoot string
+	Allowlist     AllowlistConfig
+	Enabled       map[Platform]bool
+	Debounce      time.Duration
+}
+
+// AllowlistConfig 控制哪些用户/群可以使用 bot。
+type AllowlistConfig struct {
+	Enabled  bool
+	AllowAll bool
+	Users    map[Platform][]string
+	Groups   map[Platform][]string
+}
+
+// BotGateway 是 reasonix bot 消息网关，管理 Controller 生命周期、session 并发、
+// 事件渲染和平台适配器。
+type BotGateway struct {
+	cfg      GatewayConfig
+	adapters map[Platform]Adapter
+	sessions *SessionManager
+
+	mu             sync.Mutex
+	controllers    map[string]*sessionState // session key -> active state
+	allowlist      map[Platform]map[string]bool
+	groupAllowlist map[Platform]map[string]bool
+
+	logger *slog.Logger
+}
+
+type sessionState struct {
+	ctrl        *control.Controller
+	sink        *sessionEventSink
+	cancel      context.CancelFunc
+	pendingAsks map[string][]event.AskQuestion
+	createdAt   time.Time
+	lastActive  time.Time
+}
+
+type sessionEventSink struct {
+	mu     sync.RWMutex
+	target event.Sink
+}
+
+func (s *sessionEventSink) setTarget(target event.Sink) {
+	s.mu.Lock()
+	defer s.mu.Unlock()
+	s.target = target
+}
+
+func (s *sessionEventSink) Emit(e event.Event) {
+	s.mu.RLock()
+	target := s.target
+	s.mu.RUnlock()
+	if target != nil {
+		target.Emit(e)
+	}
+}
+
+// NewGateway 创建一个新的 BotGateway。
+func NewGateway(cfg GatewayConfig, adapters map[Platform]Adapter, logger *slog.Logger) *BotGateway {
+	if logger == nil {
+		logger = slog.Default()
+	}
+	if cfg.Debounce <= 0 {
+		cfg.Debounce = 1500 * time.Millisecond
+	}
+	gw := &BotGateway{
+		cfg:            cfg,
+		adapters:       adapters,
+		sessions:       NewSessionManager(cfg.Debounce),
+		controllers:    make(map[string]*sessionState),
+		allowlist:      make(map[Platform]map[string]bool),
+		groupAllowlist: make(map[Platform]map[string]bool),
+		logger:         logger.With("component", "bot_gateway"),
+	}
+	gw.buildAllowlist()
+	return gw
+}
+
+func (gw *BotGateway) buildAllowlist() {
+	for _, plat := range []Platform{PlatformQQ, PlatformFeishu, PlatformWeixin} {
+		gw.allowlist[plat] = make(map[string]bool)
+		if !gw.cfg.Allowlist.Enabled {
+			continue
+		}
+		for _, uid := range gw.cfg.Allowlist.Users[plat] {
+			gw.allowlist[plat][uid] = true
+		}
+		gw.groupAllowlist[plat] = make(map[string]bool)
+		for _, gid := range gw.cfg.Allowlist.Groups[plat] {
+			gw.groupAllowlist[plat][gid] = true
+		}
+	}
+}
+
+// Start 启动所有已启用的平台适配器并开始处理消息。
+func (gw *BotGateway) Start(ctx context.Context) error {
+	for plat, adapter := range gw.adapters {
+		if !gw.cfg.Enabled[plat] {
+			gw.logger.Info("platform disabled, skipping", "platform", plat)
+			continue
+		}
+		gw.logger.Info("starting adapter", "platform", plat)
+		if err := adapter.Start(ctx); err != nil {
+			return fmt.Errorf("start adapter %s: %w", plat, err)
+		}
+	}
+
+	// 合并所有适配器的消息通道
+	for plat, adapter := range gw.adapters {
+		if !gw.cfg.Enabled[plat] {
+			continue
+		}
+		go gw.dispatchLoop(ctx, plat, adapter)
+	}
+
+	return nil
+}
+
+// Stop 停止所有适配器并关闭所有 session。
+func (gw *BotGateway) Stop() {
+	gw.mu.Lock()
+	for key, state := range gw.controllers {
+		if state.cancel != nil {
+			state.cancel()
+		}
+		state.ctrl.Close()
+		delete(gw.controllers, key)
+	}
+	gw.mu.Unlock()
+
+	for _, adapter := range gw.adapters {
+		if err := adapter.Stop(); err != nil {
+			gw.logger.Warn("error stopping adapter", "err", err)
+		}
+	}
+}
+
+func (gw *BotGateway) dispatchLoop(ctx context.Context, plat Platform, adapter Adapter) {
+	for {
+		select {
+		case <-ctx.Done():
+			return
+		case msg, ok := <-adapter.Messages():
+			if !ok {
+				return
+			}
+			gw.handleMessage(ctx, plat, adapter, msg)
+		}
+	}
+}
+
+func (gw *BotGateway) handleMessage(ctx context.Context, plat Platform, adapter Adapter, msg InboundMessage) {
+	msg.Platform = plat
+
+	// allowlist 检查
+	if !gw.checkAllowlist(plat, msg) {
+		gw.logger.Info("user not in allowlist", "platform", plat, "user", hashID(msg.UserID))
+		_ = gw.sendText(ctx, adapter, msg, "抱歉，您没有使用此 bot 的权限。")
+		return
+	}
+
+	src := msg.Session()
+	key := BuildSessionKey(src)
+
+	// 斜杠命令处理
+	if IsSlashBypass(msg.Text) {
+		gw.handleSlashCommand(ctx, adapter, key, msg)
+		return
+	}
+
+	// session 并发控制
+	acquired, merged := gw.sessions.TryAcquire(key, msg)
+	if merged {
+		gw.logger.Debug("message merged to pending queue", "session", key[:8])
+		return
+	}
+	if !acquired {
+		// 正在处理中且非 bypass 命令，已在 TryAcquire 中入队
+		gw.logger.Debug("session busy, queued", "session", key[:8])
+		return
+	}
+
+	gw.runTurn(ctx, adapter, key, msg)
+}
+
+func (gw *BotGateway) checkAllowlist(plat Platform, msg InboundMessage) bool {
+	if gw.cfg.Allowlist.AllowAll {
+		return true
+	}
+	if !gw.cfg.Allowlist.Enabled {
+		return false
+	}
+	if !gw.allowlist[plat][msg.UserID] {
+		return false
+	}
+	groups := gw.groupAllowlist[plat]
+	if chatUsesGroupAllowlist(msg.ChatType) && len(groups) > 0 && !groups[msg.ChatID] {
+		return false
+	}
+	return true
+}
+
+func chatUsesGroupAllowlist(chatType ChatType) bool {
+	switch chatType {
+	case ChatGroup, ChatGuild, ChatThread:
+		return true
+	default:
+		return false
+	}
+}
+
+func (gw *BotGateway) handleSlashCommand(ctx context.Context, adapter Adapter, key string, msg InboundMessage) {
+	switch {
+	case strings.HasPrefix(msg.Text, "/stop"):
+		gw.mu.Lock()
+		state, ok := gw.controllers[key]
+		gw.mu.Unlock()
+		if ok && state.cancel != nil {
+			state.cancel()
+		}
+		gw.sessions.ForceRelease(key)
+		_ = gw.sendText(ctx, adapter, msg, "已停止当前任务。")
+
+	case strings.HasPrefix(msg.Text, "/new") || strings.HasPrefix(msg.Text, "/reset"):
+		gw.mu.Lock()
+		state, ok := gw.controllers[key]
+		gw.mu.Unlock()
+		if ok {
+			if state.cancel != nil {
+				state.cancel()
+			}
+			if err := state.ctrl.NewSession(); err != nil {
+				gw.logger.Warn("new session failed", "err", err)
+			}
+		}
+		gw.sessions.ForceRelease(key)
+		_ = gw.sendText(ctx, adapter, msg, "已开始新会话。")
+
+	case strings.HasPrefix(msg.Text, "/approve"):
+		// 从消息中解析 approval ID
+		parts := strings.Fields(msg.Text)
+		if len(parts) < 2 {
+			_ = gw.sendText(ctx, adapter, msg, "用法: /approve <id>")
+			return
+		}
+		gw.mu.Lock()
+		state, ok := gw.controllers[key]
+		gw.mu.Unlock()
+		if ok {
+			state.ctrl.Approve(parts[1], true, false, false)
+			_ = gw.sendText(ctx, adapter, msg, "已批准。")
+		}
+
+	case strings.HasPrefix(msg.Text, "/deny"):
+		parts := strings.Fields(msg.Text)
+		if len(parts) < 2 {
+			_ = gw.sendText(ctx, adapter, msg, "用法: /deny <id>")
+			return
+		}
+		gw.mu.Lock()
+		state, ok := gw.controllers[key]
+		gw.mu.Unlock()
+		if ok {
+			state.ctrl.Approve(parts[1], false, false, false)
+			_ = gw.sendText(ctx, adapter, msg, "已拒绝。")
+		}
+
+	case strings.HasPrefix(msg.Text, "/answer"):
+		parts := strings.Fields(msg.Text)
+		if len(parts) < 3 {
+			_ = gw.sendText(ctx, adapter, msg, "用法: /answer <id> <选项或 q1=选项;q2=选项>")
+			return
+		}
+		askID := parts[1]
+		rawAnswer := strings.TrimSpace(strings.Join(parts[2:], " "))
+		gw.mu.Lock()
+		state, ok := gw.controllers[key]
+		var questions []event.AskQuestion
+		if ok {
+			questions = state.pendingAsks[askID]
+			delete(state.pendingAsks, askID)
+		}
+		gw.mu.Unlock()
+		if !ok || state.ctrl == nil {
+			_ = gw.sendText(ctx, adapter, msg, "没有找到当前会话。")
+			return
+		}
+		answers := parseAskAnswers(questions, rawAnswer)
+		state.ctrl.AnswerQuestion(askID, answers)
+		_ = gw.sendText(ctx, adapter, msg, "已提交回答。")
+
+	case strings.HasPrefix(msg.Text, "/status"):
+		active := gw.sessions.ActiveCount()
+		gw.mu.Lock()
+		sessions := len(gw.controllers)
+		gw.mu.Unlock()
+		_ = gw.sendText(ctx, adapter, msg, fmt.Sprintf("活跃任务数: %d\n保留会话数: %d", active, sessions))
+
+	case strings.HasPrefix(msg.Text, "/help"):
+		help := "可用命令:\n" +
+			"/stop - 停止当前任务\n" +
+			"/new - 开始新会话\n" +
+			"/reset - 重置会话\n" +
+			"/approve <id> - 批准操作\n" +
+			"/deny <id> - 拒绝操作\n" +
+			"/answer <id> <选项> - 回答 ask 问题\n" +
+			"/status - 查看状态\n" +
+			"/help - 显示帮助"
+		_ = gw.sendText(ctx, adapter, msg, help)
+	}
+}
+
+func (gw *BotGateway) runTurn(ctx context.Context, adapter Adapter, key string, msg InboundMessage) {
+	defer func() {
+		// 检查是否有等待队列中的消息
+		next := gw.sessions.Release(key)
+		if next != nil {
+			gw.runTurn(ctx, adapter, key, *next)
+			return
+		}
+	}()
+
+	// 构建输入文本：群聊中在消息前加上发送者名
+	input := msg.Text
+	if msg.ChatType == ChatGroup {
+		input = fmt.Sprintf("[%s] %s", msg.UserName, msg.Text)
+	}
+
+	// 获取或创建 Controller
+	state := gw.getOrCreateSession(ctx, key)
+	if state == nil || state.ctrl == nil {
+		_ = gw.sendText(ctx, adapter, msg, "内部错误：无法创建会话。")
+		return
+	}
+
+	// 发送"正在输入"状态
+	_ = adapter.SendTyping(ctx, msg.ChatID)
+
+	// 创建事件渲染 sink
+	sink := newRenderSink(ctx, adapter, msg.ChatID, msg.ChatType, msg.MessageID, gw.logger, func(ask event.Ask) {
+		gw.mu.Lock()
+		if state.pendingAsks == nil {
+			state.pendingAsks = make(map[string][]event.AskQuestion)
+		}
+		state.pendingAsks[ask.ID] = ask.Questions
+		gw.mu.Unlock()
+	})
+	state.sink.setTarget(sink)
+	defer state.sink.setTarget(nil)
+
+	// 创建带取消的 context
+	turnCtx, cancel := context.WithCancel(ctx)
+	defer cancel()
+
+	gw.mu.Lock()
+	state.cancel = cancel
+	state.lastActive = time.Now()
+	gw.mu.Unlock()
+
+	// 运行一轮对话
+	sink.ctrl = state.ctrl
+	err := state.ctrl.RunTurn(turnCtx, input)
+	sink.Emit(event.Event{Kind: event.TurnDone, Err: err})
+	if err != nil {
+		gw.logger.Warn("turn error", "session", key[:8], "err", err)
+	}
+}
+
+func (gw *BotGateway) getOrCreateSession(ctx context.Context, key string) *sessionState {
+	gw.mu.Lock()
+	if state, ok := gw.controllers[key]; ok {
+		state.lastActive = time.Now()
+		gw.mu.Unlock()
+		return state
+	}
+	gw.mu.Unlock()
+
+	// 创建新 Controller
+	sessionSink := &sessionEventSink{}
+	ctrl, err := boot.Build(ctx, boot.Options{
+		Model:         gw.cfg.Model,
+		MaxSteps:      gw.cfg.MaxSteps,
+		RequireKey:    true,
+		Sink:          sessionSink,
+		WorkspaceRoot: gw.cfg.WorkspaceRoot,
+	})
+	if err != nil {
+		gw.logger.Error("build controller failed", "err", err)
+		return nil
+	}
+	ctrl.EnableInteractiveApproval()
+
+	gw.mu.Lock()
+	gw.controllers[key] = &sessionState{
+		ctrl:        ctrl,
+		sink:        sessionSink,
+		pendingAsks: make(map[string][]event.AskQuestion),
+		createdAt:   time.Now(),
+		lastActive:  time.Now(),
+	}
+	state := gw.controllers[key]
+	gw.mu.Unlock()
+
+	return state
+}
+
+func (gw *BotGateway) sendText(ctx context.Context, adapter Adapter, msg InboundMessage, text string) error {
+	_, err := adapter.Send(ctx, OutboundMessage{
+		ChatID:       msg.ChatID,
+		ChatType:     msg.ChatType,
+		Text:         text,
+		ReplyToMsgID: msg.MessageID,
+	})
+	return err
+}
+
+func parseAskAnswers(questions []event.AskQuestion, raw string) []event.AskAnswer {
+	raw = strings.TrimSpace(raw)
+	if len(questions) == 0 {
+		return []event.AskAnswer{{Selected: []string{raw}}}
+	}
+	byID := make(map[string]*event.AskQuestion, len(questions))
+	for i := range questions {
+		q := &questions[i]
+		byID[q.ID] = q
+		byID[fmt.Sprintf("%d", i+1)] = q
+	}
+	answerMap := make(map[string][]string, len(questions))
+	if strings.Contains(raw, "=") {
+		for _, part := range strings.Split(raw, ";") {
+			k, v, ok := strings.Cut(part, "=")
+			if !ok {
+				continue
+			}
+			q := byID[strings.TrimSpace(k)]
+			if q == nil {
+				continue
+			}
+			answerMap[q.ID] = normalizeAskSelection(*q, strings.TrimSpace(v))
+		}
+	} else if len(questions) == 1 {
+		answerMap[questions[0].ID] = normalizeAskSelection(questions[0], raw)
+	}
+	out := make([]event.AskAnswer, 0, len(questions))
+	for _, q := range questions {
+		out = append(out, event.AskAnswer{QuestionID: q.ID, Selected: answerMap[q.ID]})
+	}
+	return out
+}
+
+func normalizeAskSelection(q event.AskQuestion, raw string) []string {
+	parts := []string{raw}
+	if q.Multi && strings.Contains(raw, ",") {
+		parts = strings.Split(raw, ",")
+	}
+	out := make([]string, 0, len(parts))
+	for _, part := range parts {
+		part = strings.TrimSpace(part)
+		if part == "" {
+			continue
+		}
+		if idx, err := strconv.Atoi(part); err == nil && idx >= 1 && idx <= len(q.Options) {
+			out = append(out, q.Options[idx-1].Label)
+			continue
+		}
+		out = append(out, part)
+	}
+	return out
+}
diff --git a/internal/bot/gateway_test.go b/internal/bot/gateway_test.go
new file mode 100644
index 000000000..7eba08ac0
--- /dev/null
+++ b/internal/bot/gateway_test.go
@@ -0,0 +1,195 @@
+package bot
+
+import (
+	"context"
+	"io"
+	"log/slog"
+	"sync"
+	"testing"
+)
+
+// fakeAdapter 是一个内存中的假适配器，用于测试 BotGateway。
+type fakeAdapter struct {
+	mu       sync.Mutex
+	platform Platform
+	name     string
+	msgCh    chan InboundMessage
+	sent     []OutboundMessage
+	started  bool
+}
+
+func newFakeAdapter(platform Platform, name string) *fakeAdapter {
+	return &fakeAdapter{
+		platform: platform,
+		name:     name,
+		msgCh:    make(chan InboundMessage, 16),
+	}
+}
+
+func (f *fakeAdapter) Platform() Platform              { return f.platform }
+func (f *fakeAdapter) Name() string                    { return f.name }
+func (f *fakeAdapter) Messages() <-chan InboundMessage { return f.msgCh }
+
+func (f *fakeAdapter) Start(ctx context.Context) error {
+	f.mu.Lock()
+	f.started = true
+	f.mu.Unlock()
+	return nil
+}
+
+func (f *fakeAdapter) Stop() error {
+	f.mu.Lock()
+	defer f.mu.Unlock()
+	if f.msgCh != nil {
+		close(f.msgCh)
+		f.msgCh = nil
+	}
+	return nil
+}
+
+func (f *fakeAdapter) Send(ctx context.Context, msg OutboundMessage) (SendResult, error) {
+	f.mu.Lock()
+	f.sent = append(f.sent, msg)
+	f.mu.Unlock()
+	return SendResult{MessageID: "fake_msg_1"}, nil
+}
+
+func (f *fakeAdapter) SendTyping(ctx context.Context, chatID string) error { return nil }
+
+func (f *fakeAdapter) sentMessages() []OutboundMessage {
+	f.mu.Lock()
+	defer f.mu.Unlock()
+	out := make([]OutboundMessage, len(f.sent))
+	copy(out, f.sent)
+	return out
+}
+
+func TestFakeAdapterInterface(t *testing.T) {
+	fa := newFakeAdapter(PlatformQQ, "fake-qq")
+
+	if fa.Platform() != PlatformQQ {
+		t.Error("wrong platform")
+	}
+	if fa.Name() != "fake-qq" {
+		t.Error("wrong name")
+	}
+
+	ctx := context.Background()
+	if err := fa.Start(ctx); err != nil {
+		t.Fatal("start:", err)
+	}
+	if !fa.started {
+		t.Error("should be started")
+	}
+
+	_, err := fa.Send(ctx, OutboundMessage{ChatID: "c1", Text: "hello"})
+	if err != nil {
+		t.Fatal("send:", err)
+	}
+
+	sent := fa.sentMessages()
+	if len(sent) != 1 {
+		t.Fatalf("sent count = %d, want 1", len(sent))
+	}
+	if sent[0].Text != "hello" {
+		t.Errorf("sent text = %q, want %q", sent[0].Text, "hello")
+	}
+
+	if err := fa.Stop(); err != nil {
+		t.Fatal("stop:", err)
+	}
+}
+
+func TestGatewayConstructAndStop(t *testing.T) {
+	cfg := GatewayConfig{
+		Model:         "test",
+		MaxSteps:      10,
+		WorkspaceRoot: ".",
+		Enabled:       map[Platform]bool{PlatformQQ: true},
+		Allowlist:     AllowlistConfig{Enabled: false},
+	}
+
+	logger := slog.New(slog.NewTextHandler(io.Discard, nil))
+	gw := NewGateway(cfg, map[Platform]Adapter{
+		PlatformQQ: newFakeAdapter(PlatformQQ, "fake-qq"),
+	}, logger)
+
+	// 网关不应该 panic
+	if gw == nil {
+		t.Fatal("gateway should not be nil")
+	}
+	gw.Stop()
+}
+
+func TestGatewayAllowlistCheck(t *testing.T) {
+	cfg := GatewayConfig{
+		Allowlist: AllowlistConfig{
+			Enabled: true,
+			Users: map[Platform][]string{
+				PlatformQQ: {"allowed_user_1"},
+			},
+		},
+	}
+
+	logger := slog.New(slog.NewTextHandler(io.Discard, nil))
+	gw := NewGateway(cfg, nil, logger)
+
+	if !gw.checkAllowlist(PlatformQQ, InboundMessage{Platform: PlatformQQ, ChatType: ChatDM, UserID: "allowed_user_1"}) {
+		t.Error("allowed user should pass")
+	}
+	if gw.checkAllowlist(PlatformQQ, InboundMessage{Platform: PlatformQQ, ChatType: ChatDM, UserID: "unknown_user"}) {
+		t.Error("unknown user should not pass")
+	}
+	// 不同平台
+	if gw.checkAllowlist(PlatformFeishu, InboundMessage{Platform: PlatformFeishu, ChatType: ChatDM, UserID: "allowed_user_1"}) {
+		t.Error("QQ allowlist should not apply to feishu")
+	}
+}
+
+func TestGatewayAllowlistDoesNotApplyGroupsToDirectMessages(t *testing.T) {
+	cfg := GatewayConfig{
+		Allowlist: AllowlistConfig{
+			Enabled: true,
+			Users: map[Platform][]string{
+				PlatformQQ: {"allowed_user"},
+			},
+			Groups: map[Platform][]string{
+				PlatformQQ: {"allowed_group"},
+			},
+		},
+	}
+
+	logger := slog.New(slog.NewTextHandler(io.Discard, nil))
+	gw := NewGateway(cfg, nil, logger)
+
+	if !gw.checkAllowlist(PlatformQQ, InboundMessage{Platform: PlatformQQ, ChatType: ChatDirect, ChatID: "guild-dm", UserID: "allowed_user"}) {
+		t.Error("direct message should not be rejected by group allowlist")
+	}
+	if gw.checkAllowlist(PlatformQQ, InboundMessage{Platform: PlatformQQ, ChatType: ChatGroup, ChatID: "unknown_group", UserID: "allowed_user"}) {
+		t.Error("unknown group should still be rejected by group allowlist")
+	}
+}
+
+func TestGatewayAllowlistDisabledRejectsByDefault(t *testing.T) {
+	cfg := GatewayConfig{
+		Allowlist: AllowlistConfig{Enabled: false},
+	}
+	logger := slog.New(slog.NewTextHandler(io.Discard, nil))
+	gw := NewGateway(cfg, nil, logger)
+
+	if gw.checkAllowlist(PlatformQQ, InboundMessage{Platform: PlatformQQ, ChatType: ChatDM, UserID: "any_user"}) {
+		t.Error("disabled allowlist should reject unless allow_all is explicit")
+	}
+}
+
+func TestGatewayAllowAll(t *testing.T) {
+	cfg := GatewayConfig{
+		Allowlist: AllowlistConfig{AllowAll: true},
+	}
+	logger := slog.New(slog.NewTextHandler(io.Discard, nil))
+	gw := NewGateway(cfg, nil, logger)
+
+	if !gw.checkAllowlist(PlatformQQ, InboundMessage{Platform: PlatformQQ, ChatType: ChatDM, UserID: "any_user"}) {
+		t.Error("allow_all should allow everyone")
+	}
+}
diff --git a/internal/bot/hash.go b/internal/bot/hash.go
new file mode 100644
index 000000000..cbd82c112
--- /dev/null
+++ b/internal/bot/hash.go
@@ -0,0 +1,15 @@
+package bot
+
+import (
+	"crypto/sha256"
+	"encoding/hex"
+)
+
+// hashID 对用户/群聊 ID 做脱敏哈希，用于日志和状态展示。
+func hashID(id string) string {
+	if id == "" {
+		return ""
+	}
+	h := sha256.Sum256([]byte(id))
+	return hex.EncodeToString(h[:])[:12]
+}
diff --git a/internal/bot/qq/adapter.go b/internal/bot/qq/adapter.go
new file mode 100644
index 000000000..39bf41b23
--- /dev/null
+++ b/internal/bot/qq/adapter.go
@@ -0,0 +1,71 @@
+// Package qq 实现 QQ 官方 Bot API v2 适配器。
+// 参考 Hermes Agent 的 qqbot adapter 实现：
+// - app token 获取与刷新
+// - WebSocket gateway 连接、heartbeat、resume
+// - REST API 回复消息
+// - C2C / group / guild / direct message 支持
+// - inline keyboard 审批
+package qq
+
+import (
+	"context"
+	"log/slog"
+	"sync"
+	"time"
+
+	"reasonix/internal/bot"
+	"reasonix/internal/config"
+)
+
+// New 创建 QQ Bot 适配器。
+func New(cfg config.QQBotConfig, logger *slog.Logger) bot.Adapter {
+	return &adapter{
+		cfg:    cfg,
+		logger: logger.With("platform", "qq"),
+	}
+}
+
+type adapter struct {
+	cfg    config.QQBotConfig
+	logger *slog.Logger
+	msgCh  chan bot.InboundMessage
+	cancel context.CancelFunc
+
+	// gateway 状态
+	ws          *wsClient
+	sessionID   string
+	seq         int64
+	token       string
+	tokenExpiry time.Time
+	tokenMu     sync.Mutex
+}
+
+func (a *adapter) Platform() bot.Platform { return bot.PlatformQQ }
+func (a *adapter) Name() string           { return "qq" }
+
+func (a *adapter) Start(ctx context.Context) error {
+	a.msgCh = make(chan bot.InboundMessage, 64)
+	ctx, a.cancel = context.WithCancel(ctx)
+
+	go a.gatewayLoop(ctx)
+	return nil
+}
+
+func (a *adapter) Stop() error {
+	if a.cancel != nil {
+		a.cancel()
+	}
+	return nil
+}
+
+func (a *adapter) Send(ctx context.Context, msg bot.OutboundMessage) (bot.SendResult, error) {
+	return a.sendMessage(ctx, msg)
+}
+
+func (a *adapter) SendTyping(ctx context.Context, chatID string) error {
+	return nil // QQ Bot 暂不支持 typing 指示器
+}
+
+func (a *adapter) Messages() <-chan bot.InboundMessage {
+	return a.msgCh
+}
diff --git a/internal/bot/qq/gateway.go b/internal/bot/qq/gateway.go
new file mode 100644
index 000000000..7fb02e1ba
--- /dev/null
+++ b/internal/bot/qq/gateway.go
@@ -0,0 +1,397 @@
+package qq
+
+import (
+	"bytes"
+	"context"
+	"encoding/json"
+	"fmt"
+	"io"
+	"log/slog"
+	"net/http"
+	"os"
+	"sync"
+	"time"
+
+	"reasonix/internal/bot"
+
+	"golang.org/x/net/websocket"
+)
+
+const (
+	qqTokenURL      = "https://bots.qq.com/app/getAppAccessToken"
+	qqGatewayURL    = "wss://api.sgroup.qq.com/websocket"
+	qqSendMsgURL    = "https://api.sgroup.qq.com/v2/users/%s/messages"
+	qqSendGroupURL  = "https://api.sgroup.qq.com/v2/groups/%s/messages"
+	qqSendGuildURL  = "https://api.sgroup.qq.com/v2/channels/%s/messages"
+	qqSendDirectURL = "https://api.sgroup.qq.com/v2/dms/%s/messages"
+
+	opDispatch     = 0
+	opHeartbeat    = 1
+	opIdentify     = 2
+	opResume       = 6
+	opReconnect    = 7
+	opHello        = 10
+	opHeartbeatAck = 11
+)
+
+// gatewayPayload QQ WebSocket 消息载荷。
+type gatewayPayload struct {
+	Op int             `json:"op"`
+	D  json.RawMessage `json:"d,omitempty"`
+	S  int64           `json:"s,omitempty"`
+	T  string          `json:"t,omitempty"`
+}
+
+type helloData struct {
+	HeartbeatInterval int `json:"heartbeat_interval"`
+}
+
+type identifyData struct {
+	Token      string     `json:"token"`
+	Intents    int        `json:"intents"`
+	Shard      [2]int     `json:"shard"`
+	Properties properties `json:"properties"`
+}
+
+type properties struct {
+	OS      string `json:"$os"`
+	Browser string `json:"$browser"`
+	Device  string `json:"$device"`
+}
+
+type dispatchEvent struct {
+	ID        string `json:"id"`
+	Type      string `json:"type"`
+	Content   string `json:"content"`
+	Timestamp string `json:"timestamp"`
+	Author    struct {
+		ID       string `json:"id"`
+		Username string `json:"username"`
+	} `json:"author"`
+	ChannelID   string `json:"channel_id"`
+	GuildID     string `json:"guild_id"`
+	GroupOpenID string `json:"group_openid"`
+}
+
+// wsClient 管理 QQ WebSocket 连接。
+type wsClient struct {
+	mu          sync.Mutex
+	conn        *websocket.Conn
+	heartbeatMs int
+	sessionID   string
+	lastSeq     int64
+	token       string
+	logger      *slog.Logger
+}
+
+func (a *adapter) gatewayLoop(ctx context.Context) {
+	for {
+		select {
+		case <-ctx.Done():
+			return
+		default:
+		}
+
+		token, err := a.getAccessToken(ctx)
+		if err != nil {
+			a.logger.Error("get access token failed", "err", err)
+			time.Sleep(5 * time.Second)
+			continue
+		}
+
+		if err := a.connectGateway(ctx, token); err != nil {
+			a.logger.Error("gateway connection failed", "err", err)
+			time.Sleep(5 * time.Second)
+			continue
+		}
+	}
+}
+
+func (a *adapter) getAccessToken(ctx context.Context) (string, error) {
+	a.tokenMu.Lock()
+	if a.token != "" && time.Now().Before(a.tokenExpiry) {
+		token := a.token
+		a.tokenMu.Unlock()
+		return token, nil
+	}
+	a.tokenMu.Unlock()
+
+	body := fmt.Sprintf(`{"appId":"%s","clientSecret":"%s"}`,
+		a.cfg.AppID, os.Getenv(a.cfg.AppSecretEnv))
+
+	req, err := http.NewRequestWithContext(ctx, "POST", qqTokenURL, bytes.NewBufferString(body))
+	if err != nil {
+		return "", err
+	}
+	req.Header.Set("Content-Type", "application/json")
+
+	resp, err := http.DefaultClient.Do(req)
+	if err != nil {
+		return "", err
+	}
+	defer resp.Body.Close()
+
+	var result struct {
+		AccessToken string `json:"access_token"`
+		ExpiresIn   int    `json:"expires_in"`
+	}
+	if err := json.NewDecoder(resp.Body).Decode(&result); err != nil {
+		return "", err
+	}
+	if result.AccessToken == "" {
+		return "", fmt.Errorf("empty access token")
+	}
+	a.tokenMu.Lock()
+	a.token = result.AccessToken
+	if result.ExpiresIn > 60 {
+		a.tokenExpiry = time.Now().Add(time.Duration(result.ExpiresIn-60) * time.Second)
+	} else {
+		a.tokenExpiry = time.Now().Add(5 * time.Minute)
+	}
+	a.tokenMu.Unlock()
+	return result.AccessToken, nil
+}
+
+func (a *adapter) connectGateway(ctx context.Context, token string) error {
+	cfg, err := websocket.NewConfig(qqGatewayURL, qqGatewayURL)
+	if err != nil {
+		return err
+	}
+	cfg.Header = http.Header{}
+	cfg.Header.Set("Authorization", "QQBot "+token)
+
+	conn, err := websocket.DialConfig(cfg)
+	if err != nil {
+		return fmt.Errorf("dial gateway: %w", err)
+	}
+	defer conn.Close()
+
+	ws := &wsClient{conn: conn, token: token, logger: a.logger}
+	a.ws = ws
+
+	var msg gatewayPayload
+	decoder := json.NewDecoder(conn)
+
+	// 第一次读取必须是 Hello
+	if err := decoder.Decode(&msg); err != nil {
+		return fmt.Errorf("read hello: %w", err)
+	}
+	if msg.Op != opHello {
+		return fmt.Errorf("expected op=%d hello, got op=%d", opHello, msg.Op)
+	}
+	var hello helloData
+	if err := json.Unmarshal(msg.D, &hello); err != nil {
+		return err
+	}
+	ws.heartbeatMs = hello.HeartbeatInterval
+
+	// Identify
+	identify := identifyData{
+		Token:   fmt.Sprintf("QQBot %s", token),
+		Intents: 1<<0 | 1<<1 | 1<<9 | 1<<10 | 1<<12 | 1<<25 | 1<<26,
+		Shard:   [2]int{0, 1},
+		Properties: properties{
+			OS:      "linux",
+			Browser: "reasonix",
+			Device:  "reasonix-bot",
+		},
+	}
+	identifyJSON, _ := json.Marshal(identify)
+	if err := ws.send(opIdentify, identifyJSON); err != nil {
+		return fmt.Errorf("send identify: %w", err)
+	}
+
+	// 读取 Ready
+	if err := decoder.Decode(&msg); err != nil {
+		return fmt.Errorf("read ready: %w", err)
+	}
+	if msg.Op == opDispatch && msg.T == "READY" {
+		var ready struct {
+			SessionID string `json:"session_id"`
+		}
+		if err := json.Unmarshal(msg.D, &ready); err != nil {
+			return fmt.Errorf("decode ready: %w", err)
+		}
+		ws.sessionID = ready.SessionID
+		a.sessionID = ready.SessionID
+		a.seq = msg.S
+	}
+
+	// 启动 heartbeat
+	heartbeatDone := make(chan struct{})
+	go func() {
+		defer close(heartbeatDone)
+		ticker := time.NewTicker(time.Duration(ws.heartbeatMs) * time.Millisecond)
+		defer ticker.Stop()
+		for {
+			select {
+			case <-ctx.Done():
+				return
+			case <-ticker.C:
+				ws.mu.Lock()
+				if err := ws.send(opHeartbeat, json.RawMessage(fmt.Sprintf(`%d`, ws.lastSeq))); err != nil {
+					ws.logger.Error("heartbeat failed", "err", err)
+					ws.mu.Unlock()
+					return
+				}
+				ws.mu.Unlock()
+			}
+		}
+	}()
+
+	// 主循环：读取 dispatch 事件
+	for {
+		if err := decoder.Decode(&msg); err != nil {
+			a.logger.Error("decode gateway message", "err", err)
+			<-heartbeatDone
+			return err
+		}
+		ws.lastSeq = msg.S
+		a.seq = msg.S
+
+		switch msg.Op {
+		case opDispatch:
+			a.handleDispatch(msg)
+		case opHeartbeatAck:
+		case opReconnect:
+			a.logger.Info("gateway requested reconnect")
+			<-heartbeatDone
+			return nil
+		}
+	}
+}
+
+func (ws *wsClient) send(op int, d json.RawMessage) error {
+	payload := gatewayPayload{Op: op, D: d}
+	data, _ := json.Marshal(payload)
+	_, err := ws.conn.Write(data)
+	return err
+}
+
+func (a *adapter) handleDispatch(msg gatewayPayload) {
+	var evt dispatchEvent
+	if err := json.Unmarshal(msg.D, &evt); err != nil {
+		a.logger.Error("parse dispatch", "err", err)
+		return
+	}
+
+	ib := bot.InboundMessage{
+		Platform:  bot.PlatformQQ,
+		UserID:    evt.Author.ID,
+		UserName:  evt.Author.Username,
+		Text:      evt.Content,
+		MessageID: evt.ID,
+	}
+
+	switch msg.T {
+	case "C2C_MESSAGE_CREATE":
+		ib.ChatType = bot.ChatDM
+		ib.ChatID = evt.Author.ID
+	case "GROUP_AT_MESSAGE_CREATE":
+		ib.ChatType = bot.ChatGroup
+		ib.ChatID = evt.GroupOpenID
+	case "AT_MESSAGE_CREATE":
+		ib.ChatType = bot.ChatGuild
+		ib.ChatID = evt.ChannelID
+	case "DIRECT_MESSAGE_CREATE":
+		ib.ChatType = bot.ChatDirect
+		ib.ChatID = evt.GuildID
+	case "MESSAGE_CREATE":
+		ib.ChatType = bot.ChatDM
+		ib.ChatID = evt.ChannelID
+	default:
+		return // 忽略其他事件
+	}
+
+	select {
+	case a.msgCh <- ib:
+	default:
+		a.logger.Warn("message channel full, dropping message")
+	}
+}
+
+// sendMessage 使用 QQ REST API 发送消息。
+func (a *adapter) sendMessage(ctx context.Context, msg bot.OutboundMessage) (bot.SendResult, error) {
+	token, err := a.getAccessToken(ctx)
+	if err != nil {
+		return bot.SendResult{}, err
+	}
+
+	payload := map[string]interface{}{
+		"content":  msg.Text,
+		"msg_type": 0,
+	}
+
+	// inline keyboard（审批用）
+	if msg.Keyboard != nil {
+		rows := make([]map[string]interface{}, 0)
+		for _, row := range msg.Keyboard.Rows {
+			buttons := make([]map[string]interface{}, 0)
+			for _, btn := range row.Buttons {
+				buttons = append(buttons, map[string]interface{}{
+					"id": btn.ID,
+					"render_data": map[string]interface{}{
+						"label": btn.Label,
+						"style": btn.Style,
+					},
+					"action": map[string]interface{}{
+						"type": 2,
+						"data": btn.CallbackID,
+					},
+				})
+			}
+			rows = append(rows, map[string]interface{}{"buttons": buttons})
+		}
+		payload["keyboard"] = map[string]interface{}{
+			"content": rows,
+		}
+		payload["msg_type"] = 2
+	}
+
+	if msg.ReplyToMsgID != "" {
+		payload["msg_id"] = msg.ReplyToMsgID
+	}
+
+	url := qqSendURL(msg)
+
+	body, _ := json.Marshal(payload)
+	req, err := http.NewRequestWithContext(ctx, "POST", url, bytes.NewBuffer(body))
+	if err != nil {
+		return bot.SendResult{}, err
+	}
+	req.Header.Set("Authorization", "QQBot "+token)
+	req.Header.Set("Content-Type", "application/json")
+
+	resp, err := http.DefaultClient.Do(req)
+	if err != nil {
+		return bot.SendResult{}, err
+	}
+	defer resp.Body.Close()
+
+	var result struct {
+		ID        string `json:"id"`
+		Timestamp string `json:"timestamp"`
+	}
+	respBody, _ := io.ReadAll(resp.Body)
+	if resp.StatusCode >= 400 {
+		return bot.SendResult{}, fmt.Errorf("qq api error %d: %s", resp.StatusCode, string(respBody))
+	}
+	if err := json.Unmarshal(respBody, &result); err != nil {
+		return bot.SendResult{}, fmt.Errorf("decode send response: %w", err)
+	}
+
+	return bot.SendResult{MessageID: result.ID}, nil
+}
+
+func qqSendURL(msg bot.OutboundMessage) string {
+	switch msg.ChatType {
+	case bot.ChatGroup:
+		return fmt.Sprintf(qqSendGroupURL, msg.ChatID)
+	case bot.ChatGuild, bot.ChatThread:
+		return fmt.Sprintf(qqSendGuildURL, msg.ChatID)
+	case bot.ChatDirect:
+		return fmt.Sprintf(qqSendDirectURL, msg.ChatID)
+	default:
+		return fmt.Sprintf(qqSendMsgURL, msg.ChatID)
+	}
+}
diff --git a/internal/bot/qq/gateway_test.go b/internal/bot/qq/gateway_test.go
new file mode 100644
index 000000000..3741af195
--- /dev/null
+++ b/internal/bot/qq/gateway_test.go
@@ -0,0 +1,48 @@
+package qq
+
+import (
+	"encoding/json"
+	"fmt"
+	"io"
+	"log/slog"
+	"testing"
+
+	"reasonix/internal/bot"
+)
+
+func TestHandleDispatchDirectMessageUsesDirectChatType(t *testing.T) {
+	a := &adapter{
+		logger: slog.New(slog.NewTextHandler(io.Discard, nil)),
+		msgCh:  make(chan bot.InboundMessage, 1),
+	}
+	raw, err := json.Marshal(map[string]any{
+		"id":       "msg-1",
+		"content":  "hello",
+		"guild_id": "guild-1",
+		"author": map[string]string{
+			"id":       "user-1",
+			"username": "user",
+		},
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	a.handleDispatch(gatewayPayload{T: "DIRECT_MESSAGE_CREATE", D: raw})
+
+	msg := <-a.msgCh
+	if msg.ChatType != bot.ChatDirect {
+		t.Fatalf("chat type = %q, want %q", msg.ChatType, bot.ChatDirect)
+	}
+	if msg.ChatID != "guild-1" {
+		t.Fatalf("chat id = %q, want guild-1", msg.ChatID)
+	}
+}
+
+func TestQQSendURLDirectMessage(t *testing.T) {
+	got := qqSendURL(bot.OutboundMessage{ChatType: bot.ChatDirect, ChatID: "guild-1"})
+	want := fmt.Sprintf(qqSendDirectURL, "guild-1")
+	if got != want {
+		t.Fatalf("url = %q, want %q", got, want)
+	}
+}
diff --git a/internal/bot/render.go b/internal/bot/render.go
new file mode 100644
index 000000000..e4b00cedb
--- /dev/null
+++ b/internal/bot/render.go
@@ -0,0 +1,253 @@
+package bot
+
+import (
+	"context"
+	"fmt"
+	"log/slog"
+	"strings"
+	"time"
+
+	"reasonix/internal/control"
+	"reasonix/internal/event"
+)
+
+// renderSink 将 Reasonix 事件流渲染为平台消息。
+type renderSink struct {
+	ctx      context.Context
+	adapter  Adapter
+	chatID   string
+	chatType ChatType
+	replyTo  string
+	logger   *slog.Logger
+	ctrl     *control.Controller
+	onAsk    func(event.Ask)
+
+	// 渲染缓冲
+	buf        strings.Builder
+	thinking   strings.Builder
+	inThinking bool
+	toolNames  map[string]string // tool ID -> name
+	lastFlush  time.Time
+}
+
+func newRenderSink(ctx context.Context, adapter Adapter, chatID string, chatType ChatType, replyTo string, logger *slog.Logger, onAsk func(event.Ask)) *renderSink {
+	return &renderSink{
+		ctx:       ctx,
+		adapter:   adapter,
+		chatID:    chatID,
+		chatType:  chatType,
+		replyTo:   replyTo,
+		logger:    logger,
+		onAsk:     onAsk,
+		toolNames: make(map[string]string),
+		lastFlush: time.Now(),
+	}
+}
+
+func (s *renderSink) Emit(e event.Event) {
+	switch e.Kind {
+	case event.TurnStarted:
+		s.buf.Reset()
+		s.thinking.Reset()
+		s.inThinking = false
+		s.toolNames = make(map[string]string)
+
+	case event.Reasoning:
+		if !s.inThinking {
+			s.inThinking = true
+		}
+		s.thinking.WriteString(e.Text)
+
+	case event.Text:
+		if s.inThinking {
+			s.inThinking = false
+		}
+		s.buf.WriteString(e.Text)
+		s.maybeFlush()
+
+	case event.Message:
+		// full message received, do nothing extra
+
+	case event.ToolDispatch:
+		s.toolNames[e.Tool.ID] = e.Tool.Name
+		txt := fmt.Sprintf("\n🔧 执行工具: %s", e.Tool.Name)
+		if e.Tool.ReadOnly {
+			txt += " (只读)"
+		}
+		s.buf.WriteString(txt)
+		s.maybeFlush()
+
+	case event.ToolResult:
+		name := s.toolNames[e.Tool.ID]
+		if name == "" {
+			name = e.Tool.ID
+		}
+		if e.Tool.Err != "" {
+			fmt.Fprintf(&s.buf, "\n❌ %s 出错: %s", name, e.Tool.Err)
+		} else {
+			// 截断输出
+			output := e.Tool.Output
+			if len(output) > 500 {
+				output = output[:500] + "\n... (已截断)"
+			}
+			fmt.Fprintf(&s.buf, "\n✅ %s 完成", name)
+			if output != "" {
+				fmt.Fprintf(&s.buf, "\n```\n%s\n```", output)
+			}
+		}
+		s.maybeFlush()
+
+	case event.ToolProgress:
+		// 流式输出，不单独渲染
+		s.maybeFlush()
+
+	case event.ApprovalRequest:
+		// 发送审批请求
+		approvalText := fmt.Sprintf("⚠️ 需要批准操作:\n工具: %s\n操作: %s\n\nID: `%s`\n用 /approve %s 批准，/deny %s 拒绝。",
+			e.Approval.Tool, e.Approval.Subject, e.Approval.ID, e.Approval.ID, e.Approval.ID)
+		msg := OutboundMessage{
+			ChatID:       s.chatID,
+			ChatType:     s.chatType,
+			Text:         approvalText,
+			ReplyToMsgID: s.replyTo,
+		}
+		switch s.adapter.Platform() {
+		case PlatformQQ:
+			msg.Keyboard = approvalKeyboard(e.Approval.ID)
+		case PlatformFeishu:
+			msg.Card = approvalCard(e.Approval, s.chatType)
+		}
+		_ = s.send(msg)
+
+	case event.AskRequest:
+		if s.onAsk != nil {
+			s.onAsk(e.Ask)
+		}
+		// 发送问答请求
+		var qb strings.Builder
+		qb.WriteString("❓ 请回答以下问题:\n")
+		for i, q := range e.Ask.Questions {
+			fmt.Fprintf(&qb, "\n**%d. %s**\n", i+1, q.Prompt)
+			for j, opt := range q.Options {
+				fmt.Fprintf(&qb, "  %d. %s", j+1, opt.Label)
+				if opt.Description != "" {
+					fmt.Fprintf(&qb, " — %s", opt.Description)
+				}
+				qb.WriteString("\n")
+			}
+			if q.Multi {
+				qb.WriteString("  (可多选)\n")
+			}
+		}
+		fmt.Fprintf(&qb, "\nID: `%s`", e.Ask.ID)
+		fmt.Fprintf(&qb, "\n用 /answer %s <选项编号或文本> 回答。", e.Ask.ID)
+		msg := OutboundMessage{
+			ChatID:       s.chatID,
+			ChatType:     s.chatType,
+			Text:         qb.String(),
+			ReplyToMsgID: s.replyTo,
+		}
+		if s.adapter.Platform() == PlatformFeishu {
+			msg.Card = askCard(e.Ask, qb.String())
+		}
+		_ = s.send(msg)
+
+	case event.TurnDone:
+		// 刷新缓冲
+		s.flush()
+		if e.Err != nil {
+			if !strings.Contains(e.Err.Error(), "context canceled") {
+				_ = s.send(OutboundMessage{
+					ChatID:       s.chatID,
+					ChatType:     s.chatType,
+					Text:         fmt.Sprintf("❌ 执行出错: %v", e.Err),
+					ReplyToMsgID: s.replyTo,
+				})
+			}
+		}
+
+	case event.Notice:
+		if e.Level == event.LevelWarn {
+			_ = s.send(OutboundMessage{
+				ChatID:       s.chatID,
+				ChatType:     s.chatType,
+				Text:         fmt.Sprintf("⚠️ %s", e.Text),
+				ReplyToMsgID: s.replyTo,
+			})
+		}
+
+	case event.CompactionStarted:
+		_ = s.send(OutboundMessage{
+			ChatID:       s.chatID,
+			ChatType:     s.chatType,
+			Text:         "🔄 正在压缩上下文...",
+			ReplyToMsgID: s.replyTo,
+		})
+	}
+}
+
+func (s *renderSink) maybeFlush() {
+	if time.Since(s.lastFlush) > 500*time.Millisecond {
+		s.flush()
+	}
+}
+
+func (s *renderSink) flush() {
+	text := strings.TrimSpace(s.buf.String())
+	if text == "" {
+		return
+	}
+	_ = s.send(OutboundMessage{
+		ChatID:       s.chatID,
+		ChatType:     s.chatType,
+		Text:         text,
+		ReplyToMsgID: s.replyTo,
+	})
+	s.buf.Reset()
+	s.lastFlush = time.Now()
+}
+
+func (s *renderSink) send(msg OutboundMessage) error {
+	_, err := s.adapter.Send(s.ctx, msg)
+	return err
+}
+
+func approvalKeyboard(id string) *InlineKeyboard {
+	return &InlineKeyboard{Rows: []InlineKeyboardRow{{
+		Buttons: []InlineKeyboardButton{
+			{ID: "allow_once", Label: "允许一次", Style: 1, CallbackID: "/approve " + id},
+			{ID: "deny", Label: "拒绝", Style: 2, CallbackID: "/deny " + id},
+		},
+	}}}
+}
+
+func approvalCard(a event.Approval, chatType ChatType) *InteractiveCard {
+	return &InteractiveCard{
+		Header: "需要批准操作",
+		Elements: []InteractiveCardElement{
+			{Tag: "markdown", Content: fmt.Sprintf("**工具**: %s\n\n**操作**: %s\n\nID: `%s`", a.Tool, a.Subject, a.ID)},
+			{Tag: "action", Extra: map[string]any{
+				"actions": []map[string]any{
+					{"tag": "button", "text": map[string]string{"tag": "plain_text", "content": "允许一次"}, "type": "primary", "value": cardActionValue("/approve "+a.ID, chatType)},
+					{"tag": "button", "text": map[string]string{"tag": "plain_text", "content": "拒绝"}, "type": "danger", "value": cardActionValue("/deny "+a.ID, chatType)},
+				},
+			}},
+		},
+	}
+}
+
+func cardActionValue(command string, chatType ChatType) map[string]string {
+	return map[string]string{
+		"command":   command,
+		"chat_type": string(chatType),
+	}
+}
+
+func askCard(ask event.Ask, fallback string) *InteractiveCard {
+	return &InteractiveCard{
+		Header: "需要回答问题",
+		Elements: []InteractiveCardElement{
+			{Tag: "markdown", Content: fallback},
+		},
+	}
+}
diff --git a/internal/bot/render_test.go b/internal/bot/render_test.go
new file mode 100644
index 000000000..00af7f841
--- /dev/null
+++ b/internal/bot/render_test.go
@@ -0,0 +1,28 @@
+package bot
+
+import (
+	"testing"
+
+	"reasonix/internal/event"
+)
+
+func TestApprovalCardCarriesChatType(t *testing.T) {
+	card := approvalCard(event.Approval{ID: "approval-1"}, ChatDM)
+	if len(card.Elements) < 2 {
+		t.Fatalf("approval card elements = %d, want at least 2", len(card.Elements))
+	}
+	actions, ok := card.Elements[1].Extra["actions"].([]map[string]any)
+	if !ok || len(actions) == 0 {
+		t.Fatalf("approval card actions missing or wrong type: %#v", card.Elements[1].Extra["actions"])
+	}
+	value, ok := actions[0]["value"].(map[string]string)
+	if !ok {
+		t.Fatalf("approval action value has wrong type: %#v", actions[0]["value"])
+	}
+	if value["command"] != "/approve approval-1" {
+		t.Fatalf("command = %q, want /approve approval-1", value["command"])
+	}
+	if value["chat_type"] != string(ChatDM) {
+		t.Fatalf("chat_type = %q, want %q", value["chat_type"], ChatDM)
+	}
+}
diff --git a/internal/bot/session.go b/internal/bot/session.go
new file mode 100644
index 000000000..fc02b8842
--- /dev/null
+++ b/internal/bot/session.go
@@ -0,0 +1,176 @@
+package bot
+
+import (
+	"crypto/sha256"
+	"encoding/hex"
+	"fmt"
+	"sync"
+	"time"
+)
+
+// BuildSessionKey 根据 Hermes 模式生成稳定的 session key：
+//   - DM：按 chat 隔离（同一 DM 会话共享历史）
+//   - 群聊：按 user 隔离（每人独立会话）
+//   - thread：共享（thread 内所有人共享上下文）
+func BuildSessionKey(src SessionSource) string {
+	var scope string
+	switch src.ChatType {
+	case ChatDM:
+		scope = fmt.Sprintf("%s:dm:%s", src.Platform, src.ChatID)
+	case ChatGroup:
+		scope = fmt.Sprintf("%s:group:%s:%s", src.Platform, src.ChatID, src.UserID)
+	case ChatGuild:
+		scope = fmt.Sprintf("%s:guild:%s:%s", src.Platform, src.ChatID, src.UserID)
+	case ChatDirect:
+		scope = fmt.Sprintf("%s:direct:%s", src.Platform, src.ChatID)
+	case ChatThread:
+		threadID := src.ThreadID
+		if threadID == "" {
+			threadID = src.ChatID
+		}
+		scope = fmt.Sprintf("%s:thread:%s", src.Platform, threadID)
+	default:
+		scope = fmt.Sprintf("%s:%s:%s:%s", src.Platform, src.ChatType, src.ChatID, src.UserID)
+	}
+	h := sha256.Sum256([]byte(scope))
+	return hex.EncodeToString(h[:])[:16]
+}
+
+// slashCommands 是绕过忙碌队列的命令集合。
+var slashCommands = map[string]bool{
+	"/stop":    true,
+	"/new":     true,
+	"/reset":   true,
+	"/approve": true,
+	"/deny":    true,
+	"/answer":  true,
+	"/status":  true,
+	"/help":    true,
+}
+
+// IsSlashBypass 判断消息是否为绕过队列的斜杠命令。
+func IsSlashBypass(text string) bool {
+	if len(text) == 0 {
+		return false
+	}
+	cmd := text
+	for i, r := range text {
+		if r == ' ' {
+			cmd = text[:i]
+			break
+		}
+	}
+	return slashCommands[cmd]
+}
+
+// pendingTurn 是等待执行的一轮对话。
+type pendingTurn struct {
+	msg       InboundMessage
+	timestamp time.Time
+}
+
+// SessionManager 管理 session 级别的并发控制：同一 session 同时只跑一个任务。
+type SessionManager struct {
+	mu       sync.Mutex
+	active   map[string]bool          // session key -> 是否正在运行
+	pending  map[string][]pendingTurn // session key -> 等待队列
+	debounce time.Duration
+}
+
+// NewSessionManager 创建一个新的 session 管理器。debounce 是消息合并窗口。
+func NewSessionManager(debounce time.Duration) *SessionManager {
+	if debounce <= 0 {
+		debounce = 1500 * time.Millisecond
+	}
+	return &SessionManager{
+		active:   make(map[string]bool),
+		pending:  make(map[string][]pendingTurn),
+		debounce: debounce,
+	}
+}
+
+// TryAcquire 尝试获取 session 锁。如果 session 正忙且消息非绕过命令，返回 false。
+// 返回 (acquired, merged) — merged 为 true 表示消息已合并到等待队列。
+func (sm *SessionManager) TryAcquire(key string, msg InboundMessage) (acquired bool, merged bool) {
+	sm.mu.Lock()
+	defer sm.mu.Unlock()
+
+	if sm.active[key] {
+		// 绕过命令立即返回 true（让调用方直接处理）
+		if IsSlashBypass(msg.Text) {
+			return true, false
+		}
+		// 合并到等待队列（debounce 合并：同时段内同 session 多条消息取最新）
+		queue := sm.pending[key]
+		if len(queue) > 0 {
+			last := &queue[len(queue)-1]
+			if msg.Text != "" && time.Since(last.timestamp) < sm.debounce {
+				// 合并：替换最后一条的 text（连续输入合并为一次 turn）
+				if last.msg.Text != "" {
+					last.msg.Text = last.msg.Text + "\n" + msg.Text
+				} else {
+					last.msg.Text = msg.Text
+				}
+				last.timestamp = time.Now()
+				return false, true
+			}
+		}
+		queue = append(queue, pendingTurn{msg: msg, timestamp: time.Now()})
+		sm.pending[key] = queue
+		return false, true
+	}
+
+	sm.active[key] = true
+	return true, false
+}
+
+// Release 释放 session 锁，返回等待队列中的下一条消息（合并后）。
+func (sm *SessionManager) Release(key string) *InboundMessage {
+	sm.mu.Lock()
+	defer sm.mu.Unlock()
+
+	queue := sm.pending[key]
+	if len(queue) == 0 {
+		delete(sm.active, key)
+		delete(sm.pending, key)
+		return nil
+	}
+
+	// 取出等待队列，合并其中所有消息
+	var merged *InboundMessage
+	for i := range queue {
+		if merged == nil {
+			m := queue[i].msg
+			merged = &m
+		} else {
+			if queue[i].msg.Text != "" {
+				merged.Text = merged.Text + "\n" + queue[i].msg.Text
+			}
+		}
+	}
+	delete(sm.pending, key)
+	// active 保持 true，因为调用方会立即用 merged 消息开始新 turn
+	return merged
+}
+
+// IsActive 返回 session 是否有正在运行的任务。
+func (sm *SessionManager) IsActive(key string) bool {
+	sm.mu.Lock()
+	defer sm.mu.Unlock()
+	return sm.active[key]
+}
+
+// ActiveCount 返回当前活跃 session 数。
+func (sm *SessionManager) ActiveCount() int {
+	sm.mu.Lock()
+	defer sm.mu.Unlock()
+	return len(sm.active)
+}
+
+// ForceRelease 强制释放 session（用于 session 关闭或错误恢复）。
+func (sm *SessionManager) ForceRelease(key string) {
+	sm.mu.Lock()
+	defer sm.mu.Unlock()
+	delete(sm.active, key)
+	delete(sm.pending, key)
+}
diff --git a/internal/bot/session_test.go b/internal/bot/session_test.go
new file mode 100644
index 000000000..ca26ee52c
--- /dev/null
+++ b/internal/bot/session_test.go
@@ -0,0 +1,213 @@
+package bot
+
+import (
+	"testing"
+	"time"
+)
+
+func TestBuildSessionKey(t *testing.T) {
+	tests := []struct {
+		name string
+		src  SessionSource
+		// DM 同 chat 不同 user 应返回相同 key
+		wantSame bool
+		src2     SessionSource
+	}{
+		{
+			name:     "dm same chat different user",
+			src:      SessionSource{Platform: PlatformQQ, ChatType: ChatDM, ChatID: "user123", UserID: "a"},
+			src2:     SessionSource{Platform: PlatformQQ, ChatType: ChatDM, ChatID: "user123", UserID: "b"},
+			wantSame: true,
+		},
+		{
+			name:     "dm different chat",
+			src:      SessionSource{Platform: PlatformQQ, ChatType: ChatDM, ChatID: "user123", UserID: "a"},
+			src2:     SessionSource{Platform: PlatformQQ, ChatType: ChatDM, ChatID: "user456", UserID: "a"},
+			wantSame: false,
+		},
+		{
+			name:     "direct same chat different user",
+			src:      SessionSource{Platform: PlatformQQ, ChatType: ChatDirect, ChatID: "guild123", UserID: "a"},
+			src2:     SessionSource{Platform: PlatformQQ, ChatType: ChatDirect, ChatID: "guild123", UserID: "b"},
+			wantSame: true,
+		},
+		{
+			name:     "direct distinct from dm",
+			src:      SessionSource{Platform: PlatformQQ, ChatType: ChatDirect, ChatID: "shared", UserID: "a"},
+			src2:     SessionSource{Platform: PlatformQQ, ChatType: ChatDM, ChatID: "shared", UserID: "a"},
+			wantSame: false,
+		},
+		{
+			name:     "group same chat different user",
+			src:      SessionSource{Platform: PlatformFeishu, ChatType: ChatGroup, ChatID: "group1", UserID: "a"},
+			src2:     SessionSource{Platform: PlatformFeishu, ChatType: ChatGroup, ChatID: "group1", UserID: "b"},
+			wantSame: false,
+		},
+		{
+			name:     "group same user different chat",
+			src:      SessionSource{Platform: PlatformFeishu, ChatType: ChatGroup, ChatID: "group1", UserID: "a"},
+			src2:     SessionSource{Platform: PlatformFeishu, ChatType: ChatGroup, ChatID: "group2", UserID: "a"},
+			wantSame: false,
+		},
+		{
+			name:     "thread shared",
+			src:      SessionSource{Platform: PlatformQQ, ChatType: ChatThread, ChatID: "ch1", ThreadID: "th1", UserID: "a"},
+			src2:     SessionSource{Platform: PlatformQQ, ChatType: ChatThread, ChatID: "ch1", ThreadID: "th1", UserID: "b"},
+			wantSame: true,
+		},
+		{
+			name:     "different platform same ids",
+			src:      SessionSource{Platform: PlatformQQ, ChatType: ChatDM, ChatID: "123", UserID: "u1"},
+			src2:     SessionSource{Platform: PlatformFeishu, ChatType: ChatDM, ChatID: "123", UserID: "u1"},
+			wantSame: false,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			k1 := BuildSessionKey(tt.src)
+			k2 := BuildSessionKey(tt.src2)
+			if tt.wantSame && k1 != k2 {
+				t.Errorf("want same key, got %s != %s", k1, k2)
+			}
+			if !tt.wantSame && k1 == k2 {
+				t.Errorf("want different keys, got %s == %s", k1, k2)
+			}
+		})
+	}
+}
+
+func TestIsSlashBypass(t *testing.T) {
+	tests := []struct {
+		text   string
+		bypass bool
+	}{
+		{"/stop", true},
+		{"/stop  extra args", true},
+		{"/new", true},
+		{"/reset", true},
+		{"/approve", true},
+		{"/deny", true},
+		{"/status", true},
+		{"/help", true},
+		{"hello", false},
+		{"/unknown", false},
+		{"", false},
+		{" /stop", false}, // leading space means not a slash command
+	}
+
+	for _, tt := range tests {
+		got := IsSlashBypass(tt.text)
+		if got != tt.bypass {
+			t.Errorf("IsSlashBypass(%q) = %v, want %v", tt.text, got, tt.bypass)
+		}
+	}
+}
+
+func TestSessionManager_TryAcquire(t *testing.T) {
+	sm := NewSessionManager(100 * time.Millisecond)
+
+	msg := InboundMessage{Text: "hello", Platform: PlatformQQ, ChatType: ChatDM, ChatID: "c1", UserID: "u1"}
+	key := BuildSessionKey(msg.Session())
+
+	// 第一次获取成功
+	acquired, merged := sm.TryAcquire(key, msg)
+	if !acquired || merged {
+		t.Error("first acquire should succeed")
+	}
+
+	// 第二次获取应该排队
+	acquired, merged = sm.TryAcquire(key, InboundMessage{Text: "world"})
+	if acquired || !merged {
+		t.Error("second acquire should merge into queue")
+	}
+
+	// slash bypass 命令应绕过
+	acquired, merged = sm.TryAcquire(key, InboundMessage{Text: "/stop"})
+	if !acquired || merged {
+		t.Error("slash bypass should acquire immediately")
+	}
+
+	// 第一次 Release 返回排队消息
+	next := sm.Release(key)
+	if next == nil {
+		t.Fatal("expected queued message after first release")
+	}
+	if next.Text != "world" {
+		t.Errorf("merged text = %q, want %q", next.Text, "world")
+	}
+}
+
+func TestSessionManager_Debounce(t *testing.T) {
+	sm := NewSessionManager(200 * time.Millisecond)
+
+	msg := InboundMessage{Text: "first", Platform: PlatformQQ, ChatType: ChatDM, ChatID: "c1", UserID: "u1"}
+	key := BuildSessionKey(msg.Session())
+
+	acquired, _ := sm.TryAcquire(key, msg)
+	if !acquired {
+		t.Fatal("first acquire should succeed")
+	}
+
+	// 同 session 消息应合并
+	sm.TryAcquire(key, InboundMessage{Text: "second"})
+	// 在 debounce 窗口内发第三条
+	sm.TryAcquire(key, InboundMessage{Text: "third"})
+
+	next := sm.Release(key)
+	if next == nil {
+		t.Fatal("expected queued message after release")
+	}
+	// "second" 和 "third" 合并在队列里（"first" 已作为 active 被处理）
+	if next.Text != "second\nthird" {
+		t.Errorf("merged = %q, want %q", next.Text, "second\nthird")
+	}
+}
+
+func TestSessionManager_ForceRelease(t *testing.T) {
+	sm := NewSessionManager(100 * time.Millisecond)
+
+	msg := InboundMessage{Text: "test", Platform: PlatformQQ, ChatType: ChatDM, ChatID: "c1", UserID: "u1"}
+	key := BuildSessionKey(msg.Session())
+
+	sm.TryAcquire(key, msg)
+	if !sm.IsActive(key) {
+		t.Error("should be active")
+	}
+
+	sm.ForceRelease(key)
+	if sm.IsActive(key) {
+		t.Error("should not be active after force release")
+	}
+}
+
+func TestHashID(t *testing.T) {
+	h1 := hashID("user_12345")
+	h2 := hashID("user_12345")
+	h3 := hashID("user_67890")
+
+	if h1 != h2 {
+		t.Error("same input should produce same hash")
+	}
+	if h1 == h3 {
+		t.Error("different inputs should produce different hashes")
+	}
+	if hashID("") != "" {
+		t.Error("empty input should produce empty hash")
+	}
+}
+
+func TestInboundMessage_Session(t *testing.T) {
+	msg := InboundMessage{
+		Platform: PlatformQQ,
+		ChatType: ChatDM,
+		ChatID:   "chat1",
+		UserID:   "user1",
+		ThreadID: "thread1",
+	}
+
+	src := msg.Session()
+	if src.Platform != PlatformQQ || src.ChatType != ChatDM || src.ChatID != "chat1" || src.UserID != "user1" || src.ThreadID != "thread1" {
+		t.Error("Session() should copy all fields")
+	}
+}
diff --git a/internal/bot/types.go b/internal/bot/types.go
new file mode 100644
index 000000000..2bad7e1d1
--- /dev/null
+++ b/internal/bot/types.go
@@ -0,0 +1,134 @@
+// Package bot 实现 Reasonix 多渠道 IM bot 消息网关，支持 QQ、飞书、微信。
+// 架构参考 Hermes Agent 的 gateway/adapter/session 模式。
+package bot
+
+import "context"
+
+// Platform 标识 IM 平台。
+type Platform string
+
+const (
+	PlatformQQ     Platform = "qq"
+	PlatformFeishu Platform = "feishu"
+	PlatformWeixin Platform = "weixin"
+)
+
+// ChatType 标识会话类型。
+type ChatType string
+
+const (
+	ChatDM     ChatType = "dm"
+	ChatGroup  ChatType = "group"
+	ChatGuild  ChatType = "guild"
+	ChatDirect ChatType = "direct"
+	ChatThread ChatType = "thread"
+)
+
+// SessionSource 是会话的复合标识，用于生成稳定的 session key。
+type SessionSource struct {
+	Platform Platform `json:"platform"`
+	ChatType ChatType `json:"chat_type"`
+	ChatID   string   `json:"chat_id"`
+	UserID   string   `json:"user_id"`
+	ThreadID string   `json:"thread_id,omitempty"`
+}
+
+// InboundMessage 是从任一平台收到的入站消息。
+type InboundMessage struct {
+	Platform  Platform `json:"platform"`
+	ChatType  ChatType `json:"chat_type"`
+	ChatID    string   `json:"chat_id"`
+	UserID    string   `json:"user_id"`
+	UserName  string   `json:"user_name"`
+	Text      string   `json:"text"`
+	MessageID string   `json:"message_id"`
+	ThreadID  string   `json:"thread_id,omitempty"`
+	MediaURLs []string `json:"media_urls,omitempty"`
+	Raw       any      `json:"-"`
+}
+
+// Session derives the SessionSource from this message.
+func (m InboundMessage) Session() SessionSource {
+	return SessionSource{
+		Platform: m.Platform,
+		ChatType: m.ChatType,
+		ChatID:   m.ChatID,
+		UserID:   m.UserID,
+		ThreadID: m.ThreadID,
+	}
+}
+
+// OutboundMessage 是发送到平台的消息。
+type OutboundMessage struct {
+	ChatID       string           `json:"chat_id"`
+	ChatType     ChatType         `json:"chat_type,omitempty"`
+	Text         string           `json:"text,omitempty"`
+	MediaURLs    []string         `json:"media_urls,omitempty"`
+	ReplyToMsgID string           `json:"reply_to_msg_id,omitempty"`
+	Keyboard     *InlineKeyboard  `json:"keyboard,omitempty"`
+	Card         *InteractiveCard `json:"card,omitempty"`
+}
+
+// InlineKeyboard 是内联键盘（用于 QQ 审批）。
+type InlineKeyboard struct {
+	Rows []InlineKeyboardRow `json:"rows"`
+}
+
+// InlineKeyboardRow 是一行按钮。
+type InlineKeyboardRow struct {
+	Buttons []InlineKeyboardButton `json:"buttons"`
+}
+
+// InlineKeyboardButton 是一个按钮。
+type InlineKeyboardButton struct {
+	ID         string `json:"id"`
+	Label      string `json:"label"`
+	Style      int    `json:"style,omitempty"` // 0=default, 1=primary, 2=danger
+	CallbackID string `json:"callback_id,omitempty"`
+}
+
+// InteractiveCard 是交互式卡片（用于飞书审批/问答）。
+type InteractiveCard struct {
+	Header   string                   `json:"header"`
+	Elements []InteractiveCardElement `json:"elements"`
+}
+
+// InteractiveCardElement 是卡片内元素。
+type InteractiveCardElement struct {
+	Tag     string         `json:"tag"`
+	Content string         `json:"content,omitempty"`
+	Extra   map[string]any `json:"extra,omitempty"`
+}
+
+// SendResult 是发送消息的结果。
+type SendResult struct {
+	MessageID string `json:"message_id,omitempty"`
+	Err       error  `json:"err,omitempty"`
+}
+
+// Adapter 是平台适配器接口，每个平台实现一个。
+type Adapter interface {
+	// Platform 返回平台标识。
+	Platform() Platform
+
+	// Start 启动适配器，连接平台 gateway。
+	Start(ctx context.Context) error
+
+	// Stop 优雅关闭适配器。
+	Stop() error
+
+	// Send 发送一条出站消息。
+	Send(ctx context.Context, msg OutboundMessage) (SendResult, error)
+
+	// SendTyping 发送"正在输入"状态。
+	SendTyping(ctx context.Context, chatID string) error
+
+	// Messages 返回入站消息通道。
+	Messages() <-chan InboundMessage
+
+	// Name 返回适配器实例名（用于日志）。
+	Name() string
+}
+
+// MessageHandler 是 BotGateway 处理入站消息的回调。
+type MessageHandler func(ctx context.Context, msg InboundMessage)
diff --git a/internal/bot/weixin/weixin.go b/internal/bot/weixin/weixin.go
new file mode 100644
index 000000000..1b8a2e9eb
--- /dev/null
+++ b/internal/bot/weixin/weixin.go
@@ -0,0 +1,811 @@
+// Package weixin 实现微信 iLink Bot 适配器。
+// 参考 Hermes Agent 的 weixin adapter：
+// - getupdates 长轮询
+// - sendmessage / sendtyping
+// - context_token 持久化
+// - 二维码登录
+// - DM allowlist（默认只对 allowlist 内用户开放 DM；群聊默认关闭）
+package weixin
+
+import (
+	"bytes"
+	"context"
+	"crypto/rand"
+	"encoding/base64"
+	"encoding/json"
+	"fmt"
+	"io"
+	"log/slog"
+	"net/http"
+	"os"
+	"path/filepath"
+	"strings"
+	"sync"
+	"time"
+
+	"reasonix/internal/bot"
+	"reasonix/internal/config"
+)
+
+const (
+	defaultWeixinAPI = "https://ilinkai.weixin.qq.com"
+	getUpdatesPath   = "/ilink/bot/getupdates"
+	sendMessagePath  = "/ilink/bot/sendmessage"
+	sendTypingPath   = "/ilink/bot/sendtyping"
+	uploadMediaPath  = "/ilink/bot/getuploadurl"
+	getBotQRPath     = "/ilink/bot/get_bot_qrcode"
+	getQRStatusPath  = "/ilink/bot/get_qrcode_status"
+
+	ilinkAppID          = "bot"
+	ilinkClientVersion  = (2 << 16) | (2 << 8)
+	ilinkChannelVersion = "2.2.0"
+	weixinItemText      = 1
+	weixinMsgTypeBot    = 2
+	weixinMsgStateDone  = 2
+)
+
+// ilinkUpdate 微信 iLink getupdates 返回的更新消息。
+type ilinkUpdate struct {
+	UpdateID   int64  `json:"update_id"`
+	UpdateType string `json:"update_type"`
+	Message    struct {
+		MessageID string `json:"message_id"`
+		ChatID    string `json:"chat_id"`
+		ChatType  string `json:"chat_type"`
+		From      struct {
+			UserID   string `json:"user_id"`
+			UserName string `json:"user_name"`
+		} `json:"from"`
+		Text      string `json:"text"`
+		Timestamp int64  `json:"timestamp"`
+	} `json:"message"`
+}
+
+type ilinkMessage struct {
+	MessageID    string `json:"message_id"`
+	FromUserID   string `json:"from_user_id"`
+	ToUserID     string `json:"to_user_id"`
+	RoomID       string `json:"room_id"`
+	ChatRoomID   string `json:"chat_room_id"`
+	ContextToken string `json:"context_token"`
+	MsgType      int    `json:"msg_type"`
+	ItemList     []struct {
+		Type     int `json:"type"`
+		TextItem struct {
+			Text string `json:"text"`
+		} `json:"text_item"`
+	} `json:"item_list"`
+}
+
+type ilinkResponse struct {
+	Ret                  int            `json:"ret"`
+	Errcode              int            `json:"errcode"`
+	Errmsg               string         `json:"errmsg"`
+	Updates              []ilinkUpdate  `json:"updates"`
+	Msgs                 []ilinkMessage `json:"msgs"`
+	HasMore              bool           `json:"has_more"`
+	ContextToken         string         `json:"context_token"`
+	GetUpdatesBuf        string         `json:"get_updates_buf"`
+	LongpollingTimeoutMs int            `json:"longpolling_timeout_ms"`
+}
+
+type savedAccount struct {
+	Token   string `json:"token"`
+	BaseURL string `json:"base_url"`
+	UserID  string `json:"user_id"`
+	SavedAt string `json:"saved_at"`
+}
+
+type LoginResult struct {
+	AccountID string
+	Token     string
+	BaseURL   string
+	UserID    string
+}
+
+type LoginSession struct {
+	SessionKey string
+	QRCode     string
+	QRCodeURL  string
+	BaseURL    string
+	StartedAt  time.Time
+}
+
+// adapter 微信适配器实现。
+type adapter struct {
+	cfg    config.WeixinBotConfig
+	logger *slog.Logger
+	msgCh  chan bot.InboundMessage
+	cancel context.CancelFunc
+
+	mu            sync.Mutex
+	contextTokens map[string]string
+	syncBuf       string
+	lastUpdateID  int64
+}
+
+// New 创建微信 Bot 适配器。
+func New(cfg config.WeixinBotConfig, logger *slog.Logger) bot.Adapter {
+	return &adapter{
+		cfg:           cfg,
+		logger:        logger.With("platform", "weixin"),
+		contextTokens: make(map[string]string),
+	}
+}
+
+func (a *adapter) Platform() bot.Platform { return bot.PlatformWeixin }
+func (a *adapter) Name() string           { return "weixin" }
+
+func (a *adapter) Start(ctx context.Context) error {
+	a.msgCh = make(chan bot.InboundMessage, 64)
+	ctx, a.cancel = context.WithCancel(ctx)
+	a.loadContextTokens()
+
+	go a.pollLoop(ctx)
+	return nil
+}
+
+func (a *adapter) Stop() error {
+	if a.cancel != nil {
+		a.cancel()
+	}
+	return nil
+}
+
+func (a *adapter) Send(ctx context.Context, msg bot.OutboundMessage) (bot.SendResult, error) {
+	return a.sendMessage(ctx, msg)
+}
+
+func (a *adapter) SendTyping(ctx context.Context, chatID string) error {
+	return a.sendTyping(ctx, chatID)
+}
+
+func (a *adapter) Messages() <-chan bot.InboundMessage {
+	return a.msgCh
+}
+
+// SendText sends one plain text message to a saved Weixin iLink conversation.
+// It is used by desktop settings as an actual connection test.
+func SendText(ctx context.Context, cfg config.WeixinBotConfig, chatID, text string) (bot.SendResult, error) {
+	a := &adapter{cfg: cfg, logger: slog.Default().With("platform", "weixin"), contextTokens: make(map[string]string)}
+	return a.sendMessage(ctx, bot.OutboundMessage{ChatID: chatID, Text: text})
+}
+
+// token 从环境变量获取微信 token。
+func (a *adapter) token() string {
+	if token := os.Getenv(a.cfg.TokenEnv); token != "" {
+		return token
+	}
+	account, _ := loadSavedAccount(a.accountID())
+	if account.Token != "" {
+		return account.Token
+	}
+	if a.cfg.AccountID == "" {
+		account, _ = loadAnySavedAccount()
+		return account.Token
+	}
+	return ""
+}
+
+// apiBase 返回 API base URL。
+func (a *adapter) apiBase() string {
+	if a.cfg.APIBase != "" {
+		return a.cfg.APIBase
+	}
+	account, _ := loadSavedAccount(a.accountID())
+	if account.BaseURL != "" {
+		return strings.TrimRight(account.BaseURL, "/")
+	}
+	return defaultWeixinAPI
+}
+
+func (a *adapter) accountID() string {
+	if a.cfg.AccountID != "" {
+		return a.cfg.AccountID
+	}
+	return "default"
+}
+
+func (a *adapter) contextToken(chatID string) string {
+	a.mu.Lock()
+	defer a.mu.Unlock()
+	return a.contextTokens[chatID]
+}
+
+func (a *adapter) setContextToken(chatID, token string) {
+	a.mu.Lock()
+	if token == "" {
+		delete(a.contextTokens, chatID)
+	} else {
+		a.contextTokens[chatID] = token
+	}
+	a.mu.Unlock()
+	a.saveContextTokens()
+}
+
+func (a *adapter) tokenStorePath() string {
+	root := config.MemoryUserDir()
+	if root == "" {
+		return ""
+	}
+	return filepath.Join(weixinAccountDir(root), a.accountID()+".context-tokens.json")
+}
+
+func (a *adapter) loadContextTokens() {
+	path := a.tokenStorePath()
+	if path == "" {
+		return
+	}
+	data, err := os.ReadFile(path)
+	if err != nil {
+		return
+	}
+	var tokens map[string]string
+	if err := json.Unmarshal(data, &tokens); err != nil {
+		a.logger.Warn("failed to load weixin context tokens", "err", err)
+		return
+	}
+	a.mu.Lock()
+	a.contextTokens = tokens
+	a.mu.Unlock()
+}
+
+func (a *adapter) saveContextTokens() {
+	path := a.tokenStorePath()
+	if path == "" {
+		return
+	}
+	if err := os.MkdirAll(filepath.Dir(path), 0o700); err != nil {
+		a.logger.Warn("failed to create weixin token dir", "err", err)
+		return
+	}
+	a.mu.Lock()
+	data, err := json.MarshalIndent(a.contextTokens, "", "  ")
+	a.mu.Unlock()
+	if err != nil {
+		return
+	}
+	if err := os.WriteFile(path, data, 0o600); err != nil {
+		a.logger.Warn("failed to save weixin context tokens", "err", err)
+	}
+}
+
+func weixinAccountDir(root string) string {
+	return filepath.Join(root, "weixin", "accounts")
+}
+
+func savedAccountPath(accountID string) string {
+	root := config.MemoryUserDir()
+	if root == "" || accountID == "" {
+		return ""
+	}
+	return filepath.Join(weixinAccountDir(root), accountID+".json")
+}
+
+func loadSavedAccount(accountID string) (savedAccount, error) {
+	path := savedAccountPath(accountID)
+	if path == "" {
+		return savedAccount{}, fmt.Errorf("reasonix user config dir is unavailable")
+	}
+	data, err := os.ReadFile(path)
+	if err != nil {
+		return savedAccount{}, err
+	}
+	var account savedAccount
+	if err := json.Unmarshal(data, &account); err != nil {
+		return savedAccount{}, err
+	}
+	return account, nil
+}
+
+func loadAnySavedAccount() (savedAccount, error) {
+	root := config.MemoryUserDir()
+	if root == "" {
+		return savedAccount{}, fmt.Errorf("reasonix user config dir is unavailable")
+	}
+	entries, err := os.ReadDir(weixinAccountDir(root))
+	if err != nil {
+		return savedAccount{}, err
+	}
+	for _, entry := range entries {
+		if entry.IsDir() || !strings.HasSuffix(entry.Name(), ".json") || strings.Contains(entry.Name(), "context-tokens") {
+			continue
+		}
+		accountID := strings.TrimSuffix(entry.Name(), ".json")
+		account, err := loadSavedAccount(accountID)
+		if err == nil && account.Token != "" {
+			return account, nil
+		}
+	}
+	return savedAccount{}, fmt.Errorf("no saved weixin account")
+}
+
+func HasSavedAccount(accountID string) bool {
+	if accountID != "" {
+		account, err := loadSavedAccount(accountID)
+		return err == nil && account.Token != ""
+	}
+	account, err := loadSavedAccount("default")
+	if err == nil && account.Token != "" {
+		return true
+	}
+	account, err = loadAnySavedAccount()
+	return err == nil && account.Token != ""
+}
+
+func saveAccount(accountID string, account savedAccount) error {
+	path := savedAccountPath(accountID)
+	if path == "" {
+		return fmt.Errorf("reasonix user config dir is unavailable")
+	}
+	if err := os.MkdirAll(filepath.Dir(path), 0o700); err != nil {
+		return err
+	}
+	data, err := json.MarshalIndent(account, "", "  ")
+	if err != nil {
+		return err
+	}
+	return os.WriteFile(path, data, 0o600)
+}
+
+func Login(ctx context.Context, out io.Writer, timeout time.Duration) (*LoginResult, error) {
+	if timeout <= 0 {
+		timeout = 8 * time.Minute
+	}
+	session, err := StartLogin(ctx)
+	if err != nil {
+		return nil, err
+	}
+	if out != nil {
+		fmt.Fprintln(out, "请使用微信扫描以下二维码链接：")
+		if session.QRCodeURL != "" {
+			fmt.Fprintln(out, session.QRCodeURL)
+		} else {
+			fmt.Fprintln(out, session.QRCode)
+		}
+	}
+
+	deadline := time.Now().Add(timeout)
+	for time.Now().Before(deadline) {
+		select {
+		case <-ctx.Done():
+			return nil, ctx.Err()
+		case <-time.After(time.Second):
+		}
+		result, status, err := PollLogin(ctx, session)
+		if err != nil {
+			if out != nil {
+				fmt.Fprintf(out, "二维码状态查询失败: %v\n", err)
+			}
+			continue
+		}
+		if result != nil {
+			return result, nil
+		}
+		if out != nil {
+			switch status {
+			case "wait", "", "<nil>":
+				fmt.Fprint(out, ".")
+			case "scaned":
+				fmt.Fprintln(out, "\n已扫码，请在微信里确认...")
+			default:
+				fmt.Fprintf(out, "\n二维码状态: %s\n", status)
+			}
+		}
+	}
+	return nil, fmt.Errorf("weixin login timed out")
+}
+
+func StartLogin(ctx context.Context) (*LoginSession, error) {
+	qrResp, err := ilinkGET(ctx, defaultWeixinAPI, getBotQRPath+"?bot_type=3")
+	if err != nil {
+		return nil, fmt.Errorf("fetch qr code: %w", err)
+	}
+	qrcode := fmt.Sprint(qrResp["qrcode"])
+	qrcodeURL := fmt.Sprint(qrResp["qrcode_img_content"])
+	if qrcode == "" || qrcode == "<nil>" {
+		return nil, fmt.Errorf("weixin qr response missing qrcode")
+	}
+	if qrcodeURL == "<nil>" {
+		qrcodeURL = ""
+	}
+	return &LoginSession{
+		SessionKey: qrcode,
+		QRCode:     qrcode,
+		QRCodeURL:  qrcodeURL,
+		BaseURL:    defaultWeixinAPI,
+		StartedAt:  time.Now(),
+	}, nil
+}
+
+func PollLogin(ctx context.Context, session *LoginSession) (*LoginResult, string, error) {
+	if session == nil || session.QRCode == "" {
+		return nil, "", fmt.Errorf("weixin login session is missing")
+	}
+	baseURL := session.BaseURL
+	if baseURL == "" {
+		baseURL = defaultWeixinAPI
+	}
+	statusResp, err := ilinkGET(ctx, baseURL, getQRStatusPath+"?qrcode="+session.QRCode)
+	if err != nil {
+		return nil, "", err
+	}
+	status := fmt.Sprint(statusResp["status"])
+	switch status {
+	case "wait", "", "<nil>":
+		return nil, status, nil
+	case "scaned":
+		return nil, status, nil
+	case "scaned_but_redirect":
+		if host := fmt.Sprint(statusResp["redirect_host"]); host != "" && host != "<nil>" {
+			session.BaseURL = "https://" + host
+		}
+		return nil, status, nil
+	case "confirmed":
+		accountID := fmt.Sprint(statusResp["ilink_bot_id"])
+		token := fmt.Sprint(statusResp["bot_token"])
+		userID := fmt.Sprint(statusResp["ilink_user_id"])
+		respBaseURL := fmt.Sprint(statusResp["baseurl"])
+		if respBaseURL == "" || respBaseURL == "<nil>" {
+			respBaseURL = defaultWeixinAPI
+		}
+		if accountID == "" || accountID == "<nil>" || token == "" || token == "<nil>" {
+			return nil, status, fmt.Errorf("weixin qr confirmed but credential payload is incomplete")
+		}
+		account := savedAccount{
+			Token:   token,
+			BaseURL: respBaseURL,
+			UserID:  userID,
+			SavedAt: time.Now().UTC().Format(time.RFC3339),
+		}
+		if err := saveAccount(accountID, account); err != nil {
+			return nil, status, err
+		}
+		if err := saveAccount("default", account); err != nil {
+			return nil, status, err
+		}
+		return &LoginResult{AccountID: accountID, Token: token, BaseURL: respBaseURL, UserID: userID}, status, nil
+	case "expired":
+		return nil, status, fmt.Errorf("weixin qr code expired; rerun login")
+	default:
+		return nil, status, nil
+	}
+}
+
+func ilinkGET(ctx context.Context, baseURL, endpoint string) (map[string]any, error) {
+	req, err := http.NewRequestWithContext(ctx, "GET", strings.TrimRight(baseURL, "/")+"/"+strings.TrimLeft(endpoint, "/"), nil)
+	if err != nil {
+		return nil, err
+	}
+	req.Header.Set("iLink-App-Id", ilinkAppID)
+	req.Header.Set("iLink-App-ClientVersion", fmt.Sprintf("%d", ilinkClientVersion))
+	resp, err := http.DefaultClient.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer resp.Body.Close()
+	data, _ := io.ReadAll(resp.Body)
+	if resp.StatusCode >= 400 {
+		if len(data) > 200 {
+			data = data[:200]
+		}
+		return nil, fmt.Errorf("HTTP %d: %s", resp.StatusCode, string(data))
+	}
+	var out map[string]any
+	if err := json.Unmarshal(data, &out); err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// pollLoop 长轮询获取更新。
+func (a *adapter) pollLoop(ctx context.Context) {
+	// 启动时短暂等待让登录完成
+	select {
+	case <-ctx.Done():
+		return
+	case <-time.After(2 * time.Second):
+	}
+
+	for {
+		select {
+		case <-ctx.Done():
+			return
+		default:
+		}
+
+		updates, err := a.getUpdates(ctx)
+		if err != nil {
+			a.logger.Error("getupdates failed", "err", err)
+			time.Sleep(5 * time.Second)
+			continue
+		}
+
+		for _, upd := range updates {
+			a.handleUpdate(upd)
+		}
+
+		// 没有更新时短暂等待
+		if len(updates) == 0 {
+			time.Sleep(500 * time.Millisecond)
+		}
+	}
+}
+
+// getUpdates 调用微信 iLink getupdates API。
+func (a *adapter) getUpdates(ctx context.Context) ([]ilinkUpdate, error) {
+	tok := a.token()
+	if tok == "" {
+		return nil, fmt.Errorf("%s not set and no saved weixin account is available", a.cfg.TokenEnv)
+	}
+
+	url := a.apiBase() + getUpdatesPath
+
+	a.mu.Lock()
+	payload := map[string]interface{}{
+		"get_updates_buf": a.syncBuf,
+		"base_info": map[string]string{
+			"channel_version": ilinkChannelVersion,
+		},
+	}
+	a.mu.Unlock()
+
+	body, _ := json.Marshal(payload)
+	req, err := http.NewRequestWithContext(ctx, "POST", url, bytes.NewBuffer(body))
+	if err != nil {
+		return nil, err
+	}
+	setIlinkHeaders(req, tok, body)
+
+	resp, err := http.DefaultClient.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer resp.Body.Close()
+
+	var result ilinkResponse
+	if err := json.NewDecoder(resp.Body).Decode(&result); err != nil {
+		return nil, err
+	}
+	if result.Ret != 0 || result.Errcode != 0 {
+		return nil, fmt.Errorf("getupdates error ret=%d errcode=%d: %s", result.Ret, result.Errcode, result.Errmsg)
+	}
+
+	a.mu.Lock()
+	if result.GetUpdatesBuf != "" {
+		a.syncBuf = result.GetUpdatesBuf
+	}
+	if len(result.Updates) > 0 {
+		last := result.Updates[len(result.Updates)-1]
+		a.lastUpdateID = last.UpdateID
+	}
+	a.mu.Unlock()
+
+	if len(result.Msgs) > 0 {
+		for _, msg := range result.Msgs {
+			a.handleIlinkMessage(msg)
+		}
+	}
+	return result.Updates, nil
+}
+
+// handleUpdate 处理单条微信更新消息。
+func (a *adapter) handleUpdate(upd ilinkUpdate) {
+	if upd.UpdateType != "message" {
+		return
+	}
+
+	m := upd.Message
+	chatType := bot.ChatDM
+	if m.ChatType == "group" {
+		chatType = bot.ChatGroup
+	}
+
+	ib := bot.InboundMessage{
+		Platform:  bot.PlatformWeixin,
+		ChatType:  chatType,
+		ChatID:    m.ChatID,
+		UserID:    m.From.UserID,
+		UserName:  m.From.UserName,
+		Text:      m.Text,
+		MessageID: m.MessageID,
+	}
+
+	select {
+	case a.msgCh <- ib:
+	default:
+		a.logger.Warn("weixin message channel full")
+	}
+}
+
+func (a *adapter) handleIlinkMessage(m ilinkMessage) {
+	if m.FromUserID == "" || m.FromUserID == a.accountID() {
+		return
+	}
+	text := extractIlinkText(m.ItemList)
+	if text == "" {
+		return
+	}
+	chatType, chatID := guessIlinkChat(m, a.accountID())
+	if chatID == "" {
+		return
+	}
+	if m.ContextToken != "" {
+		a.setContextToken(chatID, m.ContextToken)
+	}
+	ib := bot.InboundMessage{
+		Platform:  bot.PlatformWeixin,
+		ChatType:  chatType,
+		ChatID:    chatID,
+		UserID:    m.FromUserID,
+		UserName:  m.FromUserID,
+		Text:      text,
+		MessageID: m.MessageID,
+	}
+	select {
+	case a.msgCh <- ib:
+	default:
+		a.logger.Warn("weixin message channel full")
+	}
+}
+
+func extractIlinkText(items []struct {
+	Type     int `json:"type"`
+	TextItem struct {
+		Text string `json:"text"`
+	} `json:"text_item"`
+}) string {
+	var out []string
+	for _, item := range items {
+		if item.Type == weixinItemText && item.TextItem.Text != "" {
+			out = append(out, item.TextItem.Text)
+		}
+	}
+	return strings.TrimSpace(strings.Join(out, "\n"))
+}
+
+func guessIlinkChat(m ilinkMessage, accountID string) (bot.ChatType, string) {
+	roomID := firstNonEmptyString(m.RoomID, m.ChatRoomID)
+	if roomID != "" {
+		return bot.ChatGroup, roomID
+	}
+	if m.ToUserID != "" && accountID != "" && m.ToUserID != accountID && m.MsgType == 1 {
+		return bot.ChatGroup, m.ToUserID
+	}
+	return bot.ChatDM, m.FromUserID
+}
+
+func setIlinkHeaders(req *http.Request, token string, body []byte) {
+	req.Header.Set("Content-Type", "application/json")
+	req.Header.Set("AuthorizationType", "ilink_bot_token")
+	req.Header.Set("Authorization", "Bearer "+token)
+	req.Header.Set("Content-Length", fmt.Sprintf("%d", len(body)))
+	req.Header.Set("X-WECHAT-UIN", randomWechatUIN())
+	req.Header.Set("iLink-App-Id", ilinkAppID)
+	req.Header.Set("iLink-App-ClientVersion", fmt.Sprintf("%d", ilinkClientVersion))
+}
+
+func randomWechatUIN() string {
+	var b [4]byte
+	if _, err := rand.Read(b[:]); err != nil {
+		return base64.StdEncoding.EncodeToString([]byte(fmt.Sprintf("%d", time.Now().UnixNano())))
+	}
+	return base64.StdEncoding.EncodeToString([]byte(fmt.Sprintf("%d", uint32(b[0])<<24|uint32(b[1])<<16|uint32(b[2])<<8|uint32(b[3]))))
+}
+
+func firstNonEmptyString(vals ...string) string {
+	for _, v := range vals {
+		if v != "" {
+			return v
+		}
+	}
+	return ""
+}
+
+// sendMessage 使用微信 iLink sendmessage API 发送消息。
+func (a *adapter) sendMessage(ctx context.Context, msg bot.OutboundMessage) (bot.SendResult, error) {
+	tok := a.token()
+	if tok == "" {
+		return bot.SendResult{}, fmt.Errorf("%s not set and no saved weixin account is available", a.cfg.TokenEnv)
+	}
+
+	url := a.apiBase() + sendMessagePath
+
+	payload := map[string]interface{}{
+		"base_info": map[string]string{"channel_version": ilinkChannelVersion},
+		"msg": map[string]interface{}{
+			"from_user_id":  "",
+			"to_user_id":    msg.ChatID,
+			"client_id":     fmt.Sprintf("reasonix-%d", time.Now().UnixNano()),
+			"message_type":  weixinMsgTypeBot,
+			"message_state": weixinMsgStateDone,
+			"item_list": []map[string]interface{}{
+				{"type": weixinItemText, "text_item": map[string]string{"text": msg.Text}},
+			},
+		},
+	}
+	if contextToken := a.contextToken(msg.ChatID); contextToken != "" {
+		if m, ok := payload["msg"].(map[string]interface{}); ok {
+			m["context_token"] = contextToken
+		}
+	}
+
+	body, _ := json.Marshal(payload)
+	req, err := http.NewRequestWithContext(ctx, "POST", url, bytes.NewBuffer(body))
+	if err != nil {
+		return bot.SendResult{}, err
+	}
+	setIlinkHeaders(req, tok, body)
+
+	resp, err := http.DefaultClient.Do(req)
+	if err != nil {
+		return bot.SendResult{}, err
+	}
+	defer resp.Body.Close()
+
+	var result struct {
+		Ret       int    `json:"ret"`
+		Errcode   int    `json:"errcode"`
+		Errmsg    string `json:"errmsg"`
+		MessageID string `json:"message_id"`
+	}
+	respBody, _ := io.ReadAll(resp.Body)
+	if err := json.Unmarshal(respBody, &result); err != nil {
+		return bot.SendResult{}, err
+	}
+	if result.Ret != 0 || result.Errcode != 0 {
+		if a.contextToken(msg.ChatID) != "" {
+			a.setContextToken(msg.ChatID, "")
+			return a.sendMessage(ctx, msg)
+		}
+		return bot.SendResult{}, fmt.Errorf("sendmessage error ret=%d errcode=%d: %s", result.Ret, result.Errcode, result.Errmsg)
+	}
+
+	return bot.SendResult{MessageID: result.MessageID}, nil
+}
+
+// sendTyping 发送"正在输入"状态。
+func (a *adapter) sendTyping(ctx context.Context, chatID string) error {
+	tok := a.token()
+	if tok == "" {
+		return fmt.Errorf("%s not set and no saved weixin account is available", a.cfg.TokenEnv)
+	}
+
+	url := a.apiBase() + sendTypingPath
+
+	payload := map[string]interface{}{
+		"base_info":     map[string]string{"channel_version": ilinkChannelVersion},
+		"ilink_user_id": chatID,
+		"status":        1,
+	}
+	if contextToken := a.contextToken(chatID); contextToken != "" {
+		payload["context_token"] = contextToken
+	}
+	body, _ := json.Marshal(payload)
+
+	req, err := http.NewRequestWithContext(ctx, "POST", url, bytes.NewBuffer(body))
+	if err != nil {
+		return err
+	}
+	setIlinkHeaders(req, tok, body)
+
+	resp, err := http.DefaultClient.Do(req)
+	if err != nil {
+		return err
+	}
+	defer resp.Body.Close()
+
+	var result struct {
+		Ret     int    `json:"ret"`
+		Errcode int    `json:"errcode"`
+		Errmsg  string `json:"errmsg"`
+	}
+	if err := json.NewDecoder(resp.Body).Decode(&result); err != nil {
+		return err
+	}
+	if result.Ret != 0 || result.Errcode != 0 {
+		return fmt.Errorf("sendtyping error ret=%d errcode=%d: %s", result.Ret, result.Errcode, result.Errmsg)
+	}
+
+	return nil
+}
diff --git a/internal/cli/bot.go b/internal/cli/bot.go
new file mode 100644
index 000000000..6b8bff1b8
--- /dev/null
+++ b/internal/cli/bot.go
@@ -0,0 +1,381 @@
+package cli
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"log/slog"
+	"os"
+	"os/signal"
+	"strings"
+	"syscall"
+	"time"
+
+	"reasonix/internal/bot"
+	"reasonix/internal/bot/feishu"
+	"reasonix/internal/bot/qq"
+	"reasonix/internal/bot/weixin"
+	"reasonix/internal/config"
+)
+
+func botCommand(args []string, version string) int {
+	if len(args) < 1 {
+		botUsage()
+		return 2
+	}
+
+	sub := args[0]
+	rest := args[1:]
+
+	switch sub {
+	case "start":
+		return botStart(rest, version)
+	case "doctor":
+		return botDoctor(rest)
+	case "weixin-login":
+		return botWeixinLogin(rest)
+	case "help", "--help", "-h":
+		botUsage()
+		return 0
+	default:
+		fmt.Fprintf(os.Stderr, "unknown bot subcommand %q\n\n", sub)
+		botUsage()
+		return 2
+	}
+}
+
+func botStart(args []string, version string) int {
+	fs := flag.NewFlagSet("bot start", flag.ContinueOnError)
+	channels := fs.String("channels", "", "启用的平台，逗号分隔：qq,feishu,weixin")
+	dir := fs.String("dir", "", "工作目录")
+	model := fs.String("model", "", "模型名（空则用 default_model）")
+
+	if err := fs.Parse(args); err != nil {
+		return 2
+	}
+
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+
+	cfg, err := config.Load()
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "error: load config: %v\n", err)
+		return 1
+	}
+
+	if !cfg.Bot.Enabled {
+		fmt.Fprintln(os.Stderr, "error: bot is not enabled in config — set [bot] enabled = true")
+		return 1
+	}
+	if !cfg.Bot.Allowlist.AllowAll && (!cfg.Bot.Allowlist.Enabled || botAllowlistUserCount(cfg.Bot.Allowlist) == 0) {
+		fmt.Fprintln(os.Stderr, "error: bot requires an explicit allowlist; set [bot.allowlist] enabled = true with platform user ids, or set allow_all = true intentionally")
+		return 1
+	}
+
+	workspaceRoot := *dir
+	if workspaceRoot == "" {
+		if wd, err := os.Getwd(); err == nil {
+			workspaceRoot = wd
+		}
+	}
+
+	// 确定启用的平台
+	enabledPlatforms := make(map[bot.Platform]bool)
+	if *channels != "" {
+		for _, ch := range strings.Split(*channels, ",") {
+			ch = strings.TrimSpace(ch)
+			switch bot.Platform(ch) {
+			case bot.PlatformQQ:
+				enabledPlatforms[bot.PlatformQQ] = cfg.Bot.QQ.Enabled
+			case bot.PlatformFeishu:
+				enabledPlatforms[bot.PlatformFeishu] = cfg.Bot.Feishu.Enabled
+			case bot.PlatformWeixin:
+				enabledPlatforms[bot.PlatformWeixin] = cfg.Bot.Weixin.Enabled
+			default:
+				fmt.Fprintf(os.Stderr, "warning: unknown channel %q\n", ch)
+			}
+		}
+	} else {
+		enabledPlatforms[bot.PlatformQQ] = cfg.Bot.QQ.Enabled
+		enabledPlatforms[bot.PlatformFeishu] = cfg.Bot.Feishu.Enabled
+		enabledPlatforms[bot.PlatformWeixin] = cfg.Bot.Weixin.Enabled
+	}
+
+	hasEnabled := false
+	for _, v := range enabledPlatforms {
+		if v {
+			hasEnabled = true
+			break
+		}
+	}
+	if !hasEnabled {
+		fmt.Fprintln(os.Stderr, "error: no bot channels enabled — enable at least one in config")
+		return 1
+	}
+
+	modelName := *model
+	if modelName == "" {
+		modelName = cfg.Bot.Model
+	}
+	if modelName == "" {
+		modelName = cfg.DefaultModel
+	}
+
+	logger := slog.New(slog.NewTextHandler(os.Stderr, &slog.HandlerOptions{Level: slog.LevelInfo}))
+
+	// 构建网关配置
+	gwCfg := bot.GatewayConfig{
+		Model:         modelName,
+		MaxSteps:      cfg.Bot.MaxSteps,
+		WorkspaceRoot: workspaceRoot,
+		Enabled:       enabledPlatforms,
+		Allowlist: bot.AllowlistConfig{
+			Enabled:  cfg.Bot.Allowlist.Enabled,
+			AllowAll: cfg.Bot.Allowlist.AllowAll,
+			Users: map[bot.Platform][]string{
+				bot.PlatformQQ:     cfg.Bot.Allowlist.QQUsers,
+				bot.PlatformFeishu: cfg.Bot.Allowlist.FeishuUsers,
+				bot.PlatformWeixin: cfg.Bot.Allowlist.WeixinUsers,
+			},
+			Groups: map[bot.Platform][]string{
+				bot.PlatformQQ:     cfg.Bot.Allowlist.QQGroups,
+				bot.PlatformFeishu: cfg.Bot.Allowlist.FeishuGroups,
+				bot.PlatformWeixin: cfg.Bot.Allowlist.WeixinGroups,
+			},
+		},
+		Debounce: time.Duration(cfg.Bot.DebounceMs) * time.Millisecond,
+	}
+
+	// 创建适配器
+	adapters := make(map[bot.Platform]bot.Adapter)
+	if enabledPlatforms[bot.PlatformQQ] {
+		adapters[bot.PlatformQQ] = qq.New(cfg.Bot.QQ, logger)
+	}
+	if enabledPlatforms[bot.PlatformFeishu] {
+		adapters[bot.PlatformFeishu] = feishu.New(cfg.Bot.Feishu, logger)
+	}
+	if enabledPlatforms[bot.PlatformWeixin] {
+		adapters[bot.PlatformWeixin] = weixin.New(cfg.Bot.Weixin, logger)
+	}
+
+	gw := bot.NewGateway(gwCfg, adapters, logger)
+
+	// 信号处理
+	sigCh := make(chan os.Signal, 1)
+	signal.Notify(sigCh, syscall.SIGINT, syscall.SIGTERM)
+
+	go func() {
+		<-sigCh
+		fmt.Fprintln(os.Stderr, "\nshutting down...")
+		cancel()
+		gw.Stop()
+	}()
+
+	fmt.Fprintf(os.Stderr, "reasonix bot starting (model: %s, channels: %s)...\n", modelName, *channels)
+	fmt.Fprintf(os.Stderr, "version: %s\n", version)
+
+	if err := gw.Start(ctx); err != nil {
+		fmt.Fprintf(os.Stderr, "error: start gateway: %v\n", err)
+		return 1
+	}
+
+	// 等待信号或 context 取消
+	<-ctx.Done()
+	return 0
+}
+
+func botDoctor(args []string) int {
+	fs := flag.NewFlagSet("bot doctor", flag.ContinueOnError)
+	jsonOut := fs.Bool("json", false, "JSON 格式输出")
+
+	if err := fs.Parse(args); err != nil {
+		return 2
+	}
+
+	cfg, err := config.Load()
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "error: load config: %v\n", err)
+		return 1
+	}
+
+	bc := cfg.Bot
+
+	type checkResult struct {
+		Name   string `json:"name"`
+		Status string `json:"status"`
+		Detail string `json:"detail,omitempty"`
+	}
+
+	var results []checkResult
+
+	addCheck := func(name, status, detail string) {
+		results = append(results, checkResult{Name: name, Status: status, Detail: detail})
+	}
+
+	// 基础检查
+	if bc.Enabled {
+		addCheck("bot.enabled", "ok", "")
+	} else {
+		addCheck("bot.enabled", "disabled", "bot is not enabled in config")
+	}
+
+	// QQ 检查
+	if bc.QQ.Enabled {
+		addCheck("bot.qq.enabled", "ok", "")
+		secret := os.Getenv(bc.QQ.AppSecretEnv)
+		if secret == "" {
+			addCheck("bot.qq.app_secret", "missing", bc.QQ.AppSecretEnv+" is not set")
+		} else {
+			addCheck("bot.qq.app_secret", "ok", bc.QQ.AppSecretEnv+" is set")
+		}
+		if bc.QQ.AppID == "" {
+			addCheck("bot.qq.app_id", "missing", "app_id is empty")
+		} else {
+			addCheck("bot.qq.app_id", "ok", "app_id configured")
+		}
+	} else {
+		addCheck("bot.qq", "disabled", "")
+	}
+
+	// 飞书检查
+	if bc.Feishu.Enabled {
+		addCheck("bot.feishu.enabled", "ok", "")
+		secret := os.Getenv(bc.Feishu.AppSecretEnv)
+		if secret == "" {
+			addCheck("bot.feishu.app_secret", "missing", bc.Feishu.AppSecretEnv+" is not set")
+		} else {
+			addCheck("bot.feishu.app_secret", "ok", bc.Feishu.AppSecretEnv+" is set")
+		}
+		if bc.Feishu.AppID == "" {
+			addCheck("bot.feishu.app_id", "missing", "app_id is empty")
+		} else {
+			addCheck("bot.feishu.app_id", "ok", "app_id configured")
+		}
+		mode := bc.Feishu.Mode
+		if mode == "" {
+			mode = "webhook"
+		}
+		addCheck("bot.feishu.mode", "ok", mode)
+	} else {
+		addCheck("bot.feishu", "disabled", "")
+	}
+
+	// 微信检查
+	if bc.Weixin.Enabled {
+		addCheck("bot.weixin.enabled", "ok", "")
+		token := os.Getenv(bc.Weixin.TokenEnv)
+		if token != "" {
+			addCheck("bot.weixin.token", "ok", bc.Weixin.TokenEnv+" is set")
+		} else if weixin.HasSavedAccount(bc.Weixin.AccountID) {
+			addCheck("bot.weixin.token", "ok", "saved iLink account is available")
+		} else {
+			addCheck("bot.weixin.token", "missing", bc.Weixin.TokenEnv+" is not set; run `reasonix bot weixin-login` to save an iLink account")
+		}
+	} else {
+		addCheck("bot.weixin", "disabled", "")
+	}
+
+	// Allowlist 检查
+	if bc.Allowlist.AllowAll {
+		addCheck("bot.allowlist", "open", "allow_all=true — every reachable user can trigger local tools")
+	} else if bc.Allowlist.Enabled {
+		addCheck("bot.allowlist", "enabled",
+			fmt.Sprintf("qq=%d feishu=%d weixin=%d users",
+				len(bc.Allowlist.QQUsers),
+				len(bc.Allowlist.FeishuUsers),
+				len(bc.Allowlist.WeixinUsers)))
+	} else {
+		addCheck("bot.allowlist", "missing", "bot start will refuse without allowlist or allow_all=true")
+	}
+
+	if *jsonOut {
+		fmt.Println("[")
+		for i, r := range results {
+			comma := ","
+			if i == len(results)-1 {
+				comma = ""
+			}
+			fmt.Printf("  {\"name\":%q,\"status\":%q,\"detail\":%q}%s\n", r.Name, r.Status, r.Detail, comma)
+		}
+		fmt.Println("]")
+	} else {
+		for _, r := range results {
+			marker := "✓"
+			if r.Status == "missing" || r.Status == "disabled" {
+				marker = "✗"
+			}
+			fmt.Printf("  %s %s: %s", marker, r.Name, r.Status)
+			if r.Detail != "" {
+				fmt.Printf(" — %s", r.Detail)
+			}
+			fmt.Println()
+		}
+	}
+
+	return 0
+}
+
+func botAllowlistUserCount(a config.BotAllowlist) int {
+	return len(a.QQUsers) + len(a.FeishuUsers) + len(a.WeixinUsers)
+}
+
+func botWeixinLogin(args []string) int {
+	fs := flag.NewFlagSet("bot weixin-login", flag.ContinueOnError)
+	timeoutSeconds := fs.Int("timeout", 480, "登录超时时间（秒）")
+	if err := fs.Parse(args); err != nil {
+		return 2
+	}
+
+	cfg, err := config.Load()
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "error: load config: %v\n", err)
+		return 1
+	}
+
+	if !cfg.Bot.Weixin.Enabled {
+		fmt.Fprintln(os.Stderr, "error: weixin bot is not enabled in config")
+		return 1
+	}
+
+	ctx, cancel := context.WithTimeout(context.Background(), time.Duration(*timeoutSeconds)*time.Second)
+	defer cancel()
+	result, err := weixin.Login(ctx, os.Stdout, time.Duration(*timeoutSeconds)*time.Second)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "error: weixin login failed: %v\n", err)
+		return 1
+	}
+	fmt.Printf("\n微信登录成功: account_id=%s user_id=%s base_url=%s\n", result.AccountID, result.UserID, result.BaseURL)
+	fmt.Println("凭据已保存到 Reasonix 用户配置目录；也可以把 [bot.weixin] account_id 设置为该 account_id。")
+
+	return 0
+}
+
+func botUsage() {
+	fmt.Print(`reasonix bot — multi-channel IM bot gateway (QQ / Feishu / WeChat)
+
+Usage:
+  reasonix bot start   [--channels qq,feishu,weixin] [--dir PATH] [--model NAME]
+  reasonix bot doctor  [--json]
+  reasonix bot weixin-login [--timeout SECONDS]
+
+Subcommands:
+  start         启动 bot 网关
+  doctor        诊断 bot 配置和连通性
+  weixin-login  微信 iLink 二维码登录
+
+Examples:
+  reasonix bot start --channels qq,feishu
+  reasonix bot start --dir /path/to/project --model deepseek-pro
+  reasonix bot doctor --json
+
+Configuration:
+  Edit reasonix.toml:
+    [bot]           enabled / model / max_steps
+    [bot.allowlist]  enabled / qq_users / feishu_users / weixin_users
+    [bot.qq]         enabled / app_id / app_secret_env
+    [bot.feishu]     enabled / app_id / app_secret_env / verification_token / mode
+    [bot.weixin]     enabled / account_id / token_env / api_base
+
+  All secrets are read from environment variables; never put keys in config files.
+`)
+}
diff --git a/internal/cli/cli.go b/internal/cli/cli.go
index da9ddc21e..3baebde07 100644
--- a/internal/cli/cli.go
+++ b/internal/cli/cli.go
@@ -97,6 +97,9 @@ func Run(args []string, version string) int {
 	case "review":
 		configureCLIThemeFromConfigNoProbe()
 		return reviewCommand(rest)
+	case "bot":
+		configureCLIThemeFromConfigNoProbe()
+		return botCommand(rest, version)
 	case "version", "--version", "-v":
 		fmt.Println("reasonix", version)
 		return 0
@@ -112,7 +115,7 @@ func Run(args []string, version string) int {
 
 func shouldMigrateLegacyConfigForCLI(cmd string) bool {
 	switch cmd {
-	case "", "run", "chat", "code", "serve", "setup", "config", "init", "acp", "mcp", "codegraph", "doctor":
+	case "", "run", "chat", "code", "serve", "setup", "config", "init", "acp", "mcp", "codegraph", "doctor", "bot":
 		return true
 	default:
 		return false
diff --git a/internal/config/config.go b/internal/config/config.go
index 32106c6f8..7c84ef0a6 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -56,6 +56,7 @@ type Config struct {
 	Codegraph     CodegraphConfig     `toml:"codegraph"`
 	Statusline    StatuslineConfig    `toml:"statusline"`
 	LSP           LSPConfig           `toml:"lsp"`
+	Bot           BotConfig           `toml:"bot"`
 }
 
 // UIConfig controls CLI presentation-only settings. Desktop appearance is kept in
@@ -228,6 +229,89 @@ func (c CodegraphConfig) ResolvedTier() string {
 	return "background"
 }
 
+// BotConfig 控制多渠道 IM bot 消息网关。
+type BotConfig struct {
+	Enabled     bool                  `toml:"enabled"`
+	Model       string                `toml:"model"` // 用于 bot 的模型名，空则用 default_model
+	MaxSteps    int                   `toml:"max_steps"`
+	DebounceMs  int                   `toml:"debounce_ms"` // 消息合并窗口，毫秒
+	Allowlist   BotAllowlist          `toml:"allowlist"`
+	QQ          QQBotConfig           `toml:"qq"`
+	Feishu      FeishuBotConfig       `toml:"feishu"`
+	Weixin      WeixinBotConfig       `toml:"weixin"`
+	Connections []BotConnectionConfig `toml:"connections"`
+}
+
+// BotAllowlist 控制哪些用户可以使用 bot。
+type BotAllowlist struct {
+	Enabled      bool     `toml:"enabled"`
+	AllowAll     bool     `toml:"allow_all"`
+	QQUsers      []string `toml:"qq_users"`
+	FeishuUsers  []string `toml:"feishu_users"`
+	WeixinUsers  []string `toml:"weixin_users"`
+	QQGroups     []string `toml:"qq_groups"`
+	FeishuGroups []string `toml:"feishu_groups"`
+	WeixinGroups []string `toml:"weixin_groups"`
+}
+
+// QQBotConfig QQ 官方 Bot API v2 配置。
+type QQBotConfig struct {
+	Enabled      bool   `toml:"enabled"`
+	AppID        string `toml:"app_id"`
+	AppSecretEnv string `toml:"app_secret_env"` // 环境变量名，如 QQ_BOT_APP_SECRET
+}
+
+// FeishuBotConfig 飞书自建应用 Bot 配置。
+type FeishuBotConfig struct {
+	Enabled           bool   `toml:"enabled"`
+	Domain            string `toml:"domain"` // feishu（默认）| lark
+	AppID             string `toml:"app_id"`
+	AppSecretEnv      string `toml:"app_secret_env"`     // 如 FEISHU_BOT_APP_SECRET
+	VerificationToken string `toml:"verification_token"` // 事件订阅验证 token
+	Mode              string `toml:"mode"`               // webhook（默认）| websocket
+	WebhookPort       int    `toml:"webhook_port"`       // webhook 模式端口
+	RequireMention    bool   `toml:"require_mention"`
+}
+
+// WeixinBotConfig 微信 iLink Bot 配置。
+type WeixinBotConfig struct {
+	Enabled   bool   `toml:"enabled"`
+	AccountID string `toml:"account_id"`
+	TokenEnv  string `toml:"token_env"` // 环境变量名，如 WEIXIN_BOT_TOKEN
+	APIBase   string `toml:"api_base"`  // iLink API base URL
+}
+
+// BotConnectionConfig is the desktop-friendly connection record for IM bot
+// channels. It keeps install/runtime state separate from legacy per-provider
+// knobs so the UI can expose a simple "connect first" flow while old configs
+// keep working.
+type BotConnectionConfig struct {
+	ID              string                        `toml:"id"`
+	Provider        string                        `toml:"provider"` // qq|feishu|weixin
+	Domain          string                        `toml:"domain"`   // feishu|lark|weixin|qq
+	Label           string                        `toml:"label"`
+	Enabled         bool                          `toml:"enabled"`
+	Status          string                        `toml:"status"` // disconnected|pending|connected|error
+	Credential      BotConnectionCredential       `toml:"credential"`
+	SessionMappings []BotConnectionSessionMapping `toml:"session_mappings"`
+	LastError       string                        `toml:"last_error"`
+	CreatedAt       string                        `toml:"created_at"`
+	UpdatedAt       string                        `toml:"updated_at"`
+}
+
+type BotConnectionCredential struct {
+	AppID        string `toml:"app_id"`
+	AppSecretEnv string `toml:"app_secret_env"`
+	AccountID    string `toml:"account_id"`
+	TokenEnv     string `toml:"token_env"`
+}
+
+type BotConnectionSessionMapping struct {
+	RemoteID  string `toml:"remote_id"`
+	SessionID string `toml:"session_id"`
+	UpdatedAt string `toml:"updated_at"`
+}
+
 // NetworkConfig controls ordinary outbound HTTP traffic such as model providers,
 // wallet-balance lookups, updater checks, CodeGraph downloads, and web_fetch.
 // web_fetch reuses these proxy settings while keeping its own SSRF-guarded
@@ -812,6 +896,14 @@ func Default() *Config {
 		// a missing server yields an install hint rather than an error.
 		LSP:     LSPConfig{Enabled: true},
 		Network: NetworkConfig{ProxyMode: netclient.ModeAuto},
+		Bot: BotConfig{
+			MaxSteps:   25,
+			DebounceMs: 1500,
+			Allowlist:  BotAllowlist{Enabled: true},
+			QQ:         QQBotConfig{AppSecretEnv: "QQ_BOT_APP_SECRET"},
+			Feishu:     FeishuBotConfig{Domain: "feishu", AppSecretEnv: "FEISHU_BOT_APP_SECRET", Mode: "webhook", WebhookPort: 8080, RequireMention: true},
+			Weixin:     WeixinBotConfig{AccountID: "default", TokenEnv: "WEIXIN_BOT_TOKEN", APIBase: "https://ilinkai.weixin.qq.com"},
+		},
 		Providers: []ProviderEntry{
 			{Name: "deepseek-flash", Kind: "openai", BaseURL: "https://api.deepseek.com", Model: "deepseek-v4-flash", APIKeyEnv: "DEEPSEEK_API_KEY", BalanceURL: "https://api.deepseek.com/user/balance", ContextWindow: 1_000_000, Price: &provider.Pricing{CacheHit: 0.02, Input: 1, Output: 2, Currency: "¥"}},
 			{Name: "deepseek-pro", Kind: "openai", BaseURL: "https://api.deepseek.com", Model: "deepseek-v4-pro", APIKeyEnv: "DEEPSEEK_API_KEY", BalanceURL: "https://api.deepseek.com/user/balance", ContextWindow: 1_000_000, Price: &provider.Pricing{CacheHit: 0.025, Input: 3, Output: 6, Currency: "¥"}},
diff --git a/internal/config/render.go b/internal/config/render.go
index fe7c91fe5..7031efaa4 100644
--- a/internal/config/render.go
+++ b/internal/config/render.go
@@ -341,6 +341,71 @@ func RenderTOMLForScope(c *Config, scope RenderScope) string {
 	}
 	b.WriteString("\n")
 
+	if shouldRenderBot(c, defaults, scope) {
+		b.WriteString("# Bot gateway: multi-channel IM bot for QQ, Feishu/Lark, and WeChat.\n")
+		b.WriteString("[bot]\n")
+		fmt.Fprintf(&b, "enabled = %v\n", c.Bot.Enabled)
+		if c.Bot.Model != "" {
+			fmt.Fprintf(&b, "model = %q\n", c.Bot.Model)
+		} else {
+			b.WriteString("# model = \"\"   # empty = default_model\n")
+		}
+		fmt.Fprintf(&b, "max_steps = %d\n", c.Bot.MaxSteps)
+		fmt.Fprintf(&b, "debounce_ms = %d\n", c.Bot.DebounceMs)
+		b.WriteString("\n[bot.allowlist]\n")
+		fmt.Fprintf(&b, "enabled = %v\n", c.Bot.Allowlist.Enabled)
+		fmt.Fprintf(&b, "allow_all = %v\n", c.Bot.Allowlist.AllowAll)
+		fmt.Fprintf(&b, "qq_users = %s\n", renderStringArray(c.Bot.Allowlist.QQUsers))
+		fmt.Fprintf(&b, "feishu_users = %s\n", renderStringArray(c.Bot.Allowlist.FeishuUsers))
+		fmt.Fprintf(&b, "weixin_users = %s\n", renderStringArray(c.Bot.Allowlist.WeixinUsers))
+		fmt.Fprintf(&b, "qq_groups = %s\n", renderStringArray(c.Bot.Allowlist.QQGroups))
+		fmt.Fprintf(&b, "feishu_groups = %s\n", renderStringArray(c.Bot.Allowlist.FeishuGroups))
+		fmt.Fprintf(&b, "weixin_groups = %s\n", renderStringArray(c.Bot.Allowlist.WeixinGroups))
+		b.WriteString("\n[bot.qq]\n")
+		fmt.Fprintf(&b, "enabled = %v\n", c.Bot.QQ.Enabled)
+		fmt.Fprintf(&b, "app_id = %q\n", c.Bot.QQ.AppID)
+		fmt.Fprintf(&b, "app_secret_env = %q\n", c.Bot.QQ.AppSecretEnv)
+		b.WriteString("\n[bot.feishu]\n")
+		fmt.Fprintf(&b, "enabled = %v\n", c.Bot.Feishu.Enabled)
+		fmt.Fprintf(&b, "app_id = %q\n", c.Bot.Feishu.AppID)
+		fmt.Fprintf(&b, "domain = %q\n", c.Bot.Feishu.Domain)
+		fmt.Fprintf(&b, "app_secret_env = %q\n", c.Bot.Feishu.AppSecretEnv)
+		fmt.Fprintf(&b, "verification_token = %q\n", c.Bot.Feishu.VerificationToken)
+		fmt.Fprintf(&b, "mode = %q\n", c.Bot.Feishu.Mode)
+		fmt.Fprintf(&b, "webhook_port = %d\n", c.Bot.Feishu.WebhookPort)
+		fmt.Fprintf(&b, "require_mention = %v\n", c.Bot.Feishu.RequireMention)
+		b.WriteString("\n[bot.weixin]\n")
+		fmt.Fprintf(&b, "enabled = %v\n", c.Bot.Weixin.Enabled)
+		fmt.Fprintf(&b, "account_id = %q\n", c.Bot.Weixin.AccountID)
+		fmt.Fprintf(&b, "token_env = %q\n", c.Bot.Weixin.TokenEnv)
+		fmt.Fprintf(&b, "api_base = %q\n", c.Bot.Weixin.APIBase)
+		for _, conn := range c.Bot.Connections {
+			b.WriteString("\n[[bot.connections]]\n")
+			fmt.Fprintf(&b, "id = %q\n", conn.ID)
+			fmt.Fprintf(&b, "provider = %q\n", conn.Provider)
+			fmt.Fprintf(&b, "domain = %q\n", conn.Domain)
+			fmt.Fprintf(&b, "label = %q\n", conn.Label)
+			fmt.Fprintf(&b, "enabled = %v\n", conn.Enabled)
+			fmt.Fprintf(&b, "status = %q\n", conn.Status)
+			if conn.LastError != "" {
+				fmt.Fprintf(&b, "last_error = %q\n", conn.LastError)
+			}
+			if conn.CreatedAt != "" {
+				fmt.Fprintf(&b, "created_at = %q\n", conn.CreatedAt)
+			}
+			if conn.UpdatedAt != "" {
+				fmt.Fprintf(&b, "updated_at = %q\n", conn.UpdatedAt)
+			}
+			if parts := renderBotCredential(conn.Credential); parts != "" {
+				fmt.Fprintf(&b, "credential = %s\n", parts)
+			}
+			if len(conn.SessionMappings) > 0 {
+				fmt.Fprintf(&b, "session_mappings = %s\n", renderBotSessionMappings(conn.SessionMappings))
+			}
+		}
+		b.WriteString("\n")
+	}
+
 	b.WriteString("# External MCP servers. type: \"stdio\" (default, a subprocess) | \"http\" | \"sse\".\n")
 	b.WriteString("# ${VAR} / ${VAR:-default} are expanded from the environment in command/args/env/url/headers.\n")
 	if len(c.Plugins) == 0 {
@@ -411,6 +476,13 @@ func shouldRenderProviders(c, defaults *Config, scope RenderScope) bool {
 	return !reflect.DeepEqual(c.Providers, defaults.Providers)
 }
 
+func shouldRenderBot(c, defaults *Config, scope RenderScope) bool {
+	if scope != RenderScopeProject {
+		return true
+	}
+	return !reflect.DeepEqual(c.Bot, defaults.Bot)
+}
+
 func shouldRenderSystemPrompt(c, defaults *Config, scope RenderScope) bool {
 	if scope == RenderScopeFull {
 		return true
@@ -514,6 +586,46 @@ func renderStringMap(m map[string]string) string {
 	return b.String()
 }
 
+func renderBotCredential(cred BotConnectionCredential) string {
+	parts := make(map[string]string)
+	if cred.AppID != "" {
+		parts["app_id"] = cred.AppID
+	}
+	if cred.AppSecretEnv != "" {
+		parts["app_secret_env"] = cred.AppSecretEnv
+	}
+	if cred.AccountID != "" {
+		parts["account_id"] = cred.AccountID
+	}
+	if cred.TokenEnv != "" {
+		parts["token_env"] = cred.TokenEnv
+	}
+	if len(parts) == 0 {
+		return ""
+	}
+	return renderStringMap(parts)
+}
+
+func renderBotSessionMappings(mappings []BotConnectionSessionMapping) string {
+	var b strings.Builder
+	b.WriteByte('[')
+	for i, mapping := range mappings {
+		if i > 0 {
+			b.WriteString(", ")
+		}
+		parts := map[string]string{
+			"remote_id":  mapping.RemoteID,
+			"session_id": mapping.SessionID,
+		}
+		if mapping.UpdatedAt != "" {
+			parts["updated_at"] = mapping.UpdatedAt
+		}
+		b.WriteString(renderStringMap(parts))
+	}
+	b.WriteByte(']')
+	return b.String()
+}
+
 // renderRuleList emits a permission rule list. A populated list renders as an
 // active TOML array; an empty one renders as a commented example so `reasonix setup`
 // scaffolds discoverable guidance without imposing surprising rules.
diff --git a/internal/i18n/messages_en.go b/internal/i18n/messages_en.go
index 022877c24..7d8e2c3a9 100644
--- a/internal/i18n/messages_en.go
+++ b/internal/i18n/messages_en.go
@@ -325,6 +325,7 @@ Usage:
   reasonix config auto-plan [off|on]                    configure automatic plan mode
   reasonix mcp <add|remove|list>                        manage MCP servers in reasonix.toml
   reasonix doctor [--json]                              print redacted local diagnostics
+  reasonix bot start|doctor|weixin-login                multi-channel IM bot gateway
   reasonix version
   reasonix help
 
diff --git a/internal/i18n/messages_zh.go b/internal/i18n/messages_zh.go
index c5c4f207d..2fc1c95fc 100644
--- a/internal/i18n/messages_zh.go
+++ b/internal/i18n/messages_zh.go
@@ -326,6 +326,7 @@ var Chinese = Messages{
   reasonix config auto-plan [off|on]                    配置自动计划模式
   reasonix mcp <add|remove|list>                        管理 reasonix.toml 里的 MCP 服务器
   reasonix doctor [--json]                              输出脱敏的本地诊断信息
+  reasonix bot start|doctor|weixin-login                多渠道 IM bot 网关
   reasonix version
   reasonix help
 
diff --git a/reasonix.example.toml b/reasonix.example.toml
index 7b6ad36ab..5b2d6c259 100644
--- a/reasonix.example.toml
+++ b/reasonix.example.toml
@@ -153,3 +153,42 @@ bash_timeout_seconds = 120   # foreground safety cap; set 0 for no tool-local ca
 # command = "reasonix-plugin-example"
 # # Enabled MCP servers connect automatically in the background after session
 # # start. Use /mcp or the desktop MCP panel to refresh, reconnect, or disable.
+
+# Bot gateway: multi-channel IM bot for QQ, Feishu, and WeChat.
+# Start with `reasonix bot start --channels qq,feishu,weixin`.
+# All secrets are read from environment variables; never put keys here.
+# [bot]
+# enabled    = false
+# model      = ""        # 用于 bot 的模型，空则用 default_model
+# max_steps  = 25
+# debounce_ms = 1500      # 消息合并窗口（毫秒）
+#
+# [bot.allowlist]
+# enabled     = true
+# allow_all   = false     # true 会允许所有可触达用户远程触发 bot，仅限受控环境
+# qq_users    = []
+# feishu_users = []
+# weixin_users = []
+# qq_groups   = []
+# feishu_groups = []
+# weixin_groups = []
+#
+# [bot.qq]
+# enabled        = false
+# app_id         = ""
+# app_secret_env  = "QQ_BOT_APP_SECRET"
+#
+# [bot.feishu]
+# enabled             = false
+# app_id              = ""
+# app_secret_env       = "FEISHU_BOT_APP_SECRET"
+# verification_token   = ""
+# mode                = "webhook"   # webhook | websocket（websocket 需接官方 SDK 长连接）
+# webhook_port        = 8080
+# require_mention     = true
+#
+# [bot.weixin]
+# enabled   = false
+# account_id = "default"
+# token_env = "WEIXIN_BOT_TOKEN"
+# api_base  = "https://ilinkai.weixin.qq.com"   # Tencent iLink Bot API base URL

From 44bd7de2e434de05653c70363bdc489b7fd474a5 Mon Sep 17 00:00:00 2001
From: YHH <359807859@qq.com>
Date: Tue, 9 Jun 2026 21:16:08 -0700
Subject: [PATCH 47/64] fix(bot): require Feishu webhook token; split weixin
 account/login out (#3779)

Follow-up to #3763.

- Feishu webhook mode is the default, and verificationTokenValid accepts
  any caller when no token is configured, so an empty verification_token
  exposed an unauthenticated event endpoint. Refuse to start webhook mode
  without a token (fail closed).
- Move the weixin account-persistence and QR-login block to
  weixin_login.go, bringing weixin.go under the 800-line ceiling (811->587).

Co-authored-by: reasonix <reasonix@deepseek.com>
---
 internal/bot/feishu/feishu.go       |   6 +
 internal/bot/weixin/weixin.go       | 224 --------------------------
 internal/bot/weixin/weixin_login.go | 238 ++++++++++++++++++++++++++++
 3 files changed, 244 insertions(+), 224 deletions(-)
 create mode 100644 internal/bot/weixin/weixin_login.go

diff --git a/internal/bot/feishu/feishu.go b/internal/bot/feishu/feishu.go
index 8ac7d74d6..b810602c3 100644
--- a/internal/bot/feishu/feishu.go
+++ b/internal/bot/feishu/feishu.go
@@ -111,6 +111,12 @@ func (a *adapter) Start(ctx context.Context) error {
 
 	switch mode {
 	case "webhook":
+		// Webhook mode exposes a public HTTP endpoint; without a verification
+		// token verificationTokenValid accepts every caller, so fail closed
+		// rather than let anyone drive the agent.
+		if strings.TrimSpace(a.cfg.VerificationToken) == "" {
+			return fmt.Errorf("feishu: webhook mode needs verification_token set — refusing to expose an unauthenticated event endpoint")
+		}
 		go a.runWebhook(ctx)
 	default:
 		go a.runWebSocket(ctx)
diff --git a/internal/bot/weixin/weixin.go b/internal/bot/weixin/weixin.go
index 1b8a2e9eb..10baf3fe6 100644
--- a/internal/bot/weixin/weixin.go
+++ b/internal/bot/weixin/weixin.go
@@ -89,28 +89,6 @@ type ilinkResponse struct {
 	LongpollingTimeoutMs int            `json:"longpolling_timeout_ms"`
 }
 
-type savedAccount struct {
-	Token   string `json:"token"`
-	BaseURL string `json:"base_url"`
-	UserID  string `json:"user_id"`
-	SavedAt string `json:"saved_at"`
-}
-
-type LoginResult struct {
-	AccountID string
-	Token     string
-	BaseURL   string
-	UserID    string
-}
-
-type LoginSession struct {
-	SessionKey string
-	QRCode     string
-	QRCodeURL  string
-	BaseURL    string
-	StartedAt  time.Time
-}
-
 // adapter 微信适配器实现。
 type adapter struct {
 	cfg    config.WeixinBotConfig
@@ -270,208 +248,6 @@ func (a *adapter) saveContextTokens() {
 	}
 }
 
-func weixinAccountDir(root string) string {
-	return filepath.Join(root, "weixin", "accounts")
-}
-
-func savedAccountPath(accountID string) string {
-	root := config.MemoryUserDir()
-	if root == "" || accountID == "" {
-		return ""
-	}
-	return filepath.Join(weixinAccountDir(root), accountID+".json")
-}
-
-func loadSavedAccount(accountID string) (savedAccount, error) {
-	path := savedAccountPath(accountID)
-	if path == "" {
-		return savedAccount{}, fmt.Errorf("reasonix user config dir is unavailable")
-	}
-	data, err := os.ReadFile(path)
-	if err != nil {
-		return savedAccount{}, err
-	}
-	var account savedAccount
-	if err := json.Unmarshal(data, &account); err != nil {
-		return savedAccount{}, err
-	}
-	return account, nil
-}
-
-func loadAnySavedAccount() (savedAccount, error) {
-	root := config.MemoryUserDir()
-	if root == "" {
-		return savedAccount{}, fmt.Errorf("reasonix user config dir is unavailable")
-	}
-	entries, err := os.ReadDir(weixinAccountDir(root))
-	if err != nil {
-		return savedAccount{}, err
-	}
-	for _, entry := range entries {
-		if entry.IsDir() || !strings.HasSuffix(entry.Name(), ".json") || strings.Contains(entry.Name(), "context-tokens") {
-			continue
-		}
-		accountID := strings.TrimSuffix(entry.Name(), ".json")
-		account, err := loadSavedAccount(accountID)
-		if err == nil && account.Token != "" {
-			return account, nil
-		}
-	}
-	return savedAccount{}, fmt.Errorf("no saved weixin account")
-}
-
-func HasSavedAccount(accountID string) bool {
-	if accountID != "" {
-		account, err := loadSavedAccount(accountID)
-		return err == nil && account.Token != ""
-	}
-	account, err := loadSavedAccount("default")
-	if err == nil && account.Token != "" {
-		return true
-	}
-	account, err = loadAnySavedAccount()
-	return err == nil && account.Token != ""
-}
-
-func saveAccount(accountID string, account savedAccount) error {
-	path := savedAccountPath(accountID)
-	if path == "" {
-		return fmt.Errorf("reasonix user config dir is unavailable")
-	}
-	if err := os.MkdirAll(filepath.Dir(path), 0o700); err != nil {
-		return err
-	}
-	data, err := json.MarshalIndent(account, "", "  ")
-	if err != nil {
-		return err
-	}
-	return os.WriteFile(path, data, 0o600)
-}
-
-func Login(ctx context.Context, out io.Writer, timeout time.Duration) (*LoginResult, error) {
-	if timeout <= 0 {
-		timeout = 8 * time.Minute
-	}
-	session, err := StartLogin(ctx)
-	if err != nil {
-		return nil, err
-	}
-	if out != nil {
-		fmt.Fprintln(out, "请使用微信扫描以下二维码链接：")
-		if session.QRCodeURL != "" {
-			fmt.Fprintln(out, session.QRCodeURL)
-		} else {
-			fmt.Fprintln(out, session.QRCode)
-		}
-	}
-
-	deadline := time.Now().Add(timeout)
-	for time.Now().Before(deadline) {
-		select {
-		case <-ctx.Done():
-			return nil, ctx.Err()
-		case <-time.After(time.Second):
-		}
-		result, status, err := PollLogin(ctx, session)
-		if err != nil {
-			if out != nil {
-				fmt.Fprintf(out, "二维码状态查询失败: %v\n", err)
-			}
-			continue
-		}
-		if result != nil {
-			return result, nil
-		}
-		if out != nil {
-			switch status {
-			case "wait", "", "<nil>":
-				fmt.Fprint(out, ".")
-			case "scaned":
-				fmt.Fprintln(out, "\n已扫码，请在微信里确认...")
-			default:
-				fmt.Fprintf(out, "\n二维码状态: %s\n", status)
-			}
-		}
-	}
-	return nil, fmt.Errorf("weixin login timed out")
-}
-
-func StartLogin(ctx context.Context) (*LoginSession, error) {
-	qrResp, err := ilinkGET(ctx, defaultWeixinAPI, getBotQRPath+"?bot_type=3")
-	if err != nil {
-		return nil, fmt.Errorf("fetch qr code: %w", err)
-	}
-	qrcode := fmt.Sprint(qrResp["qrcode"])
-	qrcodeURL := fmt.Sprint(qrResp["qrcode_img_content"])
-	if qrcode == "" || qrcode == "<nil>" {
-		return nil, fmt.Errorf("weixin qr response missing qrcode")
-	}
-	if qrcodeURL == "<nil>" {
-		qrcodeURL = ""
-	}
-	return &LoginSession{
-		SessionKey: qrcode,
-		QRCode:     qrcode,
-		QRCodeURL:  qrcodeURL,
-		BaseURL:    defaultWeixinAPI,
-		StartedAt:  time.Now(),
-	}, nil
-}
-
-func PollLogin(ctx context.Context, session *LoginSession) (*LoginResult, string, error) {
-	if session == nil || session.QRCode == "" {
-		return nil, "", fmt.Errorf("weixin login session is missing")
-	}
-	baseURL := session.BaseURL
-	if baseURL == "" {
-		baseURL = defaultWeixinAPI
-	}
-	statusResp, err := ilinkGET(ctx, baseURL, getQRStatusPath+"?qrcode="+session.QRCode)
-	if err != nil {
-		return nil, "", err
-	}
-	status := fmt.Sprint(statusResp["status"])
-	switch status {
-	case "wait", "", "<nil>":
-		return nil, status, nil
-	case "scaned":
-		return nil, status, nil
-	case "scaned_but_redirect":
-		if host := fmt.Sprint(statusResp["redirect_host"]); host != "" && host != "<nil>" {
-			session.BaseURL = "https://" + host
-		}
-		return nil, status, nil
-	case "confirmed":
-		accountID := fmt.Sprint(statusResp["ilink_bot_id"])
-		token := fmt.Sprint(statusResp["bot_token"])
-		userID := fmt.Sprint(statusResp["ilink_user_id"])
-		respBaseURL := fmt.Sprint(statusResp["baseurl"])
-		if respBaseURL == "" || respBaseURL == "<nil>" {
-			respBaseURL = defaultWeixinAPI
-		}
-		if accountID == "" || accountID == "<nil>" || token == "" || token == "<nil>" {
-			return nil, status, fmt.Errorf("weixin qr confirmed but credential payload is incomplete")
-		}
-		account := savedAccount{
-			Token:   token,
-			BaseURL: respBaseURL,
-			UserID:  userID,
-			SavedAt: time.Now().UTC().Format(time.RFC3339),
-		}
-		if err := saveAccount(accountID, account); err != nil {
-			return nil, status, err
-		}
-		if err := saveAccount("default", account); err != nil {
-			return nil, status, err
-		}
-		return &LoginResult{AccountID: accountID, Token: token, BaseURL: respBaseURL, UserID: userID}, status, nil
-	case "expired":
-		return nil, status, fmt.Errorf("weixin qr code expired; rerun login")
-	default:
-		return nil, status, nil
-	}
-}
-
 func ilinkGET(ctx context.Context, baseURL, endpoint string) (map[string]any, error) {
 	req, err := http.NewRequestWithContext(ctx, "GET", strings.TrimRight(baseURL, "/")+"/"+strings.TrimLeft(endpoint, "/"), nil)
 	if err != nil {
diff --git a/internal/bot/weixin/weixin_login.go b/internal/bot/weixin/weixin_login.go
new file mode 100644
index 000000000..f97e4c939
--- /dev/null
+++ b/internal/bot/weixin/weixin_login.go
@@ -0,0 +1,238 @@
+package weixin
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"io"
+	"os"
+	"path/filepath"
+	"strings"
+	"time"
+
+	"reasonix/internal/config"
+)
+
+type savedAccount struct {
+	Token   string `json:"token"`
+	BaseURL string `json:"base_url"`
+	UserID  string `json:"user_id"`
+	SavedAt string `json:"saved_at"`
+}
+
+type LoginResult struct {
+	AccountID string
+	Token     string
+	BaseURL   string
+	UserID    string
+}
+
+type LoginSession struct {
+	SessionKey string
+	QRCode     string
+	QRCodeURL  string
+	BaseURL    string
+	StartedAt  time.Time
+}
+
+func weixinAccountDir(root string) string {
+	return filepath.Join(root, "weixin", "accounts")
+}
+
+func savedAccountPath(accountID string) string {
+	root := config.MemoryUserDir()
+	if root == "" || accountID == "" {
+		return ""
+	}
+	return filepath.Join(weixinAccountDir(root), accountID+".json")
+}
+
+func loadSavedAccount(accountID string) (savedAccount, error) {
+	path := savedAccountPath(accountID)
+	if path == "" {
+		return savedAccount{}, fmt.Errorf("reasonix user config dir is unavailable")
+	}
+	data, err := os.ReadFile(path)
+	if err != nil {
+		return savedAccount{}, err
+	}
+	var account savedAccount
+	if err := json.Unmarshal(data, &account); err != nil {
+		return savedAccount{}, err
+	}
+	return account, nil
+}
+
+func loadAnySavedAccount() (savedAccount, error) {
+	root := config.MemoryUserDir()
+	if root == "" {
+		return savedAccount{}, fmt.Errorf("reasonix user config dir is unavailable")
+	}
+	entries, err := os.ReadDir(weixinAccountDir(root))
+	if err != nil {
+		return savedAccount{}, err
+	}
+	for _, entry := range entries {
+		if entry.IsDir() || !strings.HasSuffix(entry.Name(), ".json") || strings.Contains(entry.Name(), "context-tokens") {
+			continue
+		}
+		accountID := strings.TrimSuffix(entry.Name(), ".json")
+		account, err := loadSavedAccount(accountID)
+		if err == nil && account.Token != "" {
+			return account, nil
+		}
+	}
+	return savedAccount{}, fmt.Errorf("no saved weixin account")
+}
+
+func HasSavedAccount(accountID string) bool {
+	if accountID != "" {
+		account, err := loadSavedAccount(accountID)
+		return err == nil && account.Token != ""
+	}
+	account, err := loadSavedAccount("default")
+	if err == nil && account.Token != "" {
+		return true
+	}
+	account, err = loadAnySavedAccount()
+	return err == nil && account.Token != ""
+}
+
+func saveAccount(accountID string, account savedAccount) error {
+	path := savedAccountPath(accountID)
+	if path == "" {
+		return fmt.Errorf("reasonix user config dir is unavailable")
+	}
+	if err := os.MkdirAll(filepath.Dir(path), 0o700); err != nil {
+		return err
+	}
+	data, err := json.MarshalIndent(account, "", "  ")
+	if err != nil {
+		return err
+	}
+	return os.WriteFile(path, data, 0o600)
+}
+
+func Login(ctx context.Context, out io.Writer, timeout time.Duration) (*LoginResult, error) {
+	if timeout <= 0 {
+		timeout = 8 * time.Minute
+	}
+	session, err := StartLogin(ctx)
+	if err != nil {
+		return nil, err
+	}
+	if out != nil {
+		fmt.Fprintln(out, "请使用微信扫描以下二维码链接：")
+		if session.QRCodeURL != "" {
+			fmt.Fprintln(out, session.QRCodeURL)
+		} else {
+			fmt.Fprintln(out, session.QRCode)
+		}
+	}
+
+	deadline := time.Now().Add(timeout)
+	for time.Now().Before(deadline) {
+		select {
+		case <-ctx.Done():
+			return nil, ctx.Err()
+		case <-time.After(time.Second):
+		}
+		result, status, err := PollLogin(ctx, session)
+		if err != nil {
+			if out != nil {
+				fmt.Fprintf(out, "二维码状态查询失败: %v\n", err)
+			}
+			continue
+		}
+		if result != nil {
+			return result, nil
+		}
+		if out != nil {
+			switch status {
+			case "wait", "", "<nil>":
+				fmt.Fprint(out, ".")
+			case "scaned":
+				fmt.Fprintln(out, "\n已扫码，请在微信里确认...")
+			default:
+				fmt.Fprintf(out, "\n二维码状态: %s\n", status)
+			}
+		}
+	}
+	return nil, fmt.Errorf("weixin login timed out")
+}
+
+func StartLogin(ctx context.Context) (*LoginSession, error) {
+	qrResp, err := ilinkGET(ctx, defaultWeixinAPI, getBotQRPath+"?bot_type=3")
+	if err != nil {
+		return nil, fmt.Errorf("fetch qr code: %w", err)
+	}
+	qrcode := fmt.Sprint(qrResp["qrcode"])
+	qrcodeURL := fmt.Sprint(qrResp["qrcode_img_content"])
+	if qrcode == "" || qrcode == "<nil>" {
+		return nil, fmt.Errorf("weixin qr response missing qrcode")
+	}
+	if qrcodeURL == "<nil>" {
+		qrcodeURL = ""
+	}
+	return &LoginSession{
+		SessionKey: qrcode,
+		QRCode:     qrcode,
+		QRCodeURL:  qrcodeURL,
+		BaseURL:    defaultWeixinAPI,
+		StartedAt:  time.Now(),
+	}, nil
+}
+
+func PollLogin(ctx context.Context, session *LoginSession) (*LoginResult, string, error) {
+	if session == nil || session.QRCode == "" {
+		return nil, "", fmt.Errorf("weixin login session is missing")
+	}
+	baseURL := session.BaseURL
+	if baseURL == "" {
+		baseURL = defaultWeixinAPI
+	}
+	statusResp, err := ilinkGET(ctx, baseURL, getQRStatusPath+"?qrcode="+session.QRCode)
+	if err != nil {
+		return nil, "", err
+	}
+	status := fmt.Sprint(statusResp["status"])
+	switch status {
+	case "wait", "", "<nil>":
+		return nil, status, nil
+	case "scaned":
+		return nil, status, nil
+	case "scaned_but_redirect":
+		if host := fmt.Sprint(statusResp["redirect_host"]); host != "" && host != "<nil>" {
+			session.BaseURL = "https://" + host
+		}
+		return nil, status, nil
+	case "confirmed":
+		accountID := fmt.Sprint(statusResp["ilink_bot_id"])
+		token := fmt.Sprint(statusResp["bot_token"])
+		userID := fmt.Sprint(statusResp["ilink_user_id"])
+		respBaseURL := fmt.Sprint(statusResp["baseurl"])
+		if respBaseURL == "" || respBaseURL == "<nil>" {
+			respBaseURL = defaultWeixinAPI
+		}
+		if accountID == "" || accountID == "<nil>" || token == "" || token == "<nil>" {
+			return nil, status, fmt.Errorf("weixin qr confirmed but credential payload is incomplete")
+		}
+		account := savedAccount{
+			Token:   token,
+			BaseURL: respBaseURL,
+			UserID:  userID,
+			SavedAt: time.Now().UTC().Format(time.RFC3339),
+		}
+		if err := saveAccount(accountID, account); err != nil {
+			return nil, status, err
+		}
+		if err := saveAccount("default", account); err != nil {
+			return nil, status, err
+		}
+		return &LoginResult{AccountID: accountID, Token: token, BaseURL: respBaseURL, UserID: userID}, status, nil
+	case "expired":
+		return nil, status, fmt.Errorf("weixin qr code expired; rerun login")
+	default:
+		return nil, status, nil
+	}
+}

From 769ae077b99b3cffce388e536c38a421c703b7fc Mon Sep 17 00:00:00 2001
From: SivanCola <liuxw96@foxmail.com>
Date: Wed, 10 Jun 2026 12:27:49 +0800
Subject: [PATCH 48/64] fix(diff): avoid input-derived Myers allocation
 arithmetic (#3777)

---
 internal/diff/diff.go      | 40 +++++++++++++++++++++++++-------------
 internal/diff/diff_test.go | 23 ++++++++++++++++++++++
 2 files changed, 49 insertions(+), 14 deletions(-)

diff --git a/internal/diff/diff.go b/internal/diff/diff.go
index 5f8f81794..57d52f77e 100644
--- a/internal/diff/diff.go
+++ b/internal/diff/diff.go
@@ -144,6 +144,30 @@ type op struct {
 // rewrite whose line-by-line diff is unreadable anyway, so we fall back to tallies.
 const maxDiffEdits = 2000
 
+// myersMaxD returns min(n+m, maxDiffEdits) without adding the two input
+// lengths. The result feeds an allocation below, so every arithmetic step stays
+// inside the fixed maxDiffEdits budget.
+func myersMaxD(n, m int) int {
+	if n >= maxDiffEdits {
+		return maxDiffEdits
+	}
+	maxD := n
+	for i := 0; i < m && maxD < maxDiffEdits; i++ {
+		maxD++
+	}
+	return maxD
+}
+
+// myersVectorLen returns 2*maxD+1 without multiplying an input-derived value
+// that is later used as an allocation size.
+func myersVectorLen(maxD int) int {
+	width := 1
+	for i := 0; i < maxD; i++ {
+		width += 2
+	}
+	return width
+}
+
 // myers returns the shortest edit script transforming a into b, line by line, and
 // ok=true. It records the search trace, then backtracks it into an ordered op
 // list. ok is false when the edit distance exceeds maxDiffEdits — the caller then
@@ -153,21 +177,9 @@ func myers(a, b []string) ([]op, bool) {
 	if n == 0 && m == 0 {
 		return nil, true
 	}
-	// Clamp each side to the cap before summing so neither n+m nor the 2*maxD
-	// allocation can overflow int; maxD stays min(n+m, maxDiffEdits).
-	cn, cm := n, m
-	if cn > maxDiffEdits {
-		cn = maxDiffEdits
-	}
-	if cm > maxDiffEdits {
-		cm = maxDiffEdits
-	}
-	maxD := cn + cm
-	if maxD > maxDiffEdits {
-		maxD = maxDiffEdits // bound the trace's O(D²) footprint
-	}
+	maxD := myersMaxD(n, m)
 	offset := maxD // shift negative k into a non-negative array index
-	v := make([]int, 2*maxD+1)
+	v := make([]int, myersVectorLen(maxD))
 	var trace [][]int
 
 	for d := 0; d <= maxD; d++ {
diff --git a/internal/diff/diff_test.go b/internal/diff/diff_test.go
index 1f6dd39e1..7e44870ee 100644
--- a/internal/diff/diff_test.go
+++ b/internal/diff/diff_test.go
@@ -113,6 +113,29 @@ func TestMyers_MinimalEditScript(t *testing.T) {
 	}
 }
 
+func TestMyersMaxD_CapsWithoutOverflow(t *testing.T) {
+	maxInt := int(^uint(0) >> 1)
+	cases := []struct {
+		name string
+		n    int
+		m    int
+		want int
+	}{
+		{name: "small", n: 3, m: 4, want: 7},
+		{name: "at cap", n: maxDiffEdits - 1, m: 1, want: maxDiffEdits},
+		{name: "over cap", n: maxDiffEdits - 1, m: 2, want: maxDiffEdits},
+		{name: "huge n", n: maxInt, m: 1, want: maxDiffEdits},
+		{name: "huge m", n: 1, m: maxInt, want: maxDiffEdits},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			if got := myersMaxD(tc.n, tc.m); got != tc.want {
+				t.Fatalf("myersMaxD(%d, %d) = %d, want %d", tc.n, tc.m, got, tc.want)
+			}
+		})
+	}
+}
+
 // TestApplyOpsReconstruct verifies the op stream is internally consistent: the
 // equal+delete lines reproduce the old file and equal+insert lines reproduce
 // the new file, for a spread of cases.

From bfb33d96dbef3e6c35be5677c29fc0d3e0eaea63 Mon Sep 17 00:00:00 2001
From: CVEngineer <129239603+CVEngineer66@users.noreply.github.com>
Date: Wed, 10 Jun 2026 12:29:23 +0800
Subject: [PATCH 49/64] fix(desktop): stop auto-populating empty model lists
 from provider API (#3711)

Background auto-refresh calls FetchProviderModels for every configured
provider and merges the result via mergedFetchedProviderModels().
When the user left the models list empty (common for custom providers),
preserveCurated: true had no effect because saved.length === 0,
causing every model from the API to be written into the config.

Now the background refresh skips providers whose models list is empty,
preventing silent pollution of the model dropdown. Users can still
manually fetch models via the 'Refresh Models' button.

Fixes #3705

Co-authored-by: wufengfan <wufengfan@wufengfandeMacBook-Air.local>
---
 desktop/frontend/src/components/SettingsPanel.tsx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/desktop/frontend/src/components/SettingsPanel.tsx b/desktop/frontend/src/components/SettingsPanel.tsx
index 8e56a3b63..32019f9ea 100644
--- a/desktop/frontend/src/components/SettingsPanel.tsx
+++ b/desktop/frontend/src/components/SettingsPanel.tsx
@@ -1556,6 +1556,10 @@ function ModelsSection({ s, busy, apply, backgroundApply }: ModelsSectionProps)
 
     void backgroundApply(async () => {
       for (const { provider } of candidates) {
+        // Background auto-refresh only protects a user-curated model list.
+        // If the user hasn't specified any models, don't silently populate
+        // the provider with every model from the API.
+        if (!provider.models || provider.models.length === 0) continue;
         try {
           const fetched = await app.FetchProviderModels(provider);
           if (fetched.length === 0) continue;

From aaec56bc9618ede1d9ebc038f12699b8447a4ded Mon Sep 17 00:00:00 2001
From: Yosef Weissmann <52067352+alxbnct@users.noreply.github.com>
Date: Wed, 10 Jun 2026 13:03:17 +0800
Subject: [PATCH 50/64] feat(tui): add Ctrl+Home/Ctrl+End shortcuts to scroll
 transcript viewport to top/bottom (#3723)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: 广东移动系统集成揭阳公司-黄韵学 <13413986135@139.com>
---
 internal/cli/chat_tui.go      |  6 ++++++
 internal/cli/chat_tui_test.go | 31 +++++++++++++++++++++++++++++++
 internal/i18n/messages_en.go  |  2 +-
 internal/i18n/messages_zh.go  |  2 +-
 4 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/internal/cli/chat_tui.go b/internal/cli/chat_tui.go
index 110290336..ede29fcc9 100644
--- a/internal/cli/chat_tui.go
+++ b/internal/cli/chat_tui.go
@@ -806,6 +806,12 @@ func (m chatTUI) update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		case "pgdown":
 			m.viewport.PageDown()
 			return m, finalize(m, cmds)
+		case "ctrl+home":
+			m.viewport.GotoTop()
+			return m, finalize(m, cmds)
+		case "ctrl+end":
+			m.viewport.GotoBottom()
+			return m, finalize(m, cmds)
 		case "ctrl+z":
 			return m, tea.Suspend
 		}
diff --git a/internal/cli/chat_tui_test.go b/internal/cli/chat_tui_test.go
index 1cc39170c..44c0bcb2c 100644
--- a/internal/cli/chat_tui_test.go
+++ b/internal/cli/chat_tui_test.go
@@ -582,6 +582,37 @@ func TestInsertNewlineKeyBinding(t *testing.T) {
 	}
 }
 
+func TestCtrlHomeEndScrollKeyBindings(t *testing.T) {
+	ctrl := control.New(control.Options{})
+	ch := make(chan event.Event, 1)
+	notice := agentEventMsg(event.Event{Kind: event.Notice, Level: event.LevelInfo, Text: "line"})
+	adv := func(m chatTUI, msg tea.Msg) chatTUI {
+		n, _ := m.Update(msg)
+		return n.(chatTUI)
+	}
+
+	cur := adv(newChatTUI(ctrl, "", ch, 80), tea.WindowSizeMsg{Width: 80, Height: 8})
+	for i := 0; i < 12; i++ {
+		cur = adv(cur, notice)
+	}
+	// Viewport should be at the bottom after output.
+	if !cur.viewport.AtBottom() {
+		t.Fatal("viewport should start at the bottom after streaming output")
+	}
+
+	// Ctrl+Home should scroll to the top.
+	cur = adv(cur, tea.KeyPressMsg{Code: tea.KeyHome, Mod: tea.ModCtrl})
+	if !cur.viewport.AtTop() {
+		t.Fatalf("ctrl+home should scroll to top, AtTop=%v, YOffset=%d", cur.viewport.AtTop(), cur.viewport.YOffset())
+	}
+
+	// Ctrl+End should scroll back to the bottom.
+	cur = adv(cur, tea.KeyPressMsg{Code: tea.KeyEnd, Mod: tea.ModCtrl})
+	if !cur.viewport.AtBottom() {
+		t.Fatalf("ctrl+end should scroll to bottom, AtBottom=%v, YOffset=%d", cur.viewport.AtBottom(), cur.viewport.YOffset())
+	}
+}
+
 func TestEchoLocalCommandAddsTranscriptMarker(t *testing.T) {
 	m := newTestChatTUI()
 	m.echoLocalCommand("  /tree  ")
diff --git a/internal/i18n/messages_en.go b/internal/i18n/messages_en.go
index 7d8e2c3a9..b0f2cf84a 100644
--- a/internal/i18n/messages_en.go
+++ b/internal/i18n/messages_en.go
@@ -48,7 +48,7 @@ var English = Messages{
 	ChatStatusCycleHint:         "shift+tab toggles plan",
 	ChatStatusCacheNowFmt:       "turn hit %s",
 	ChatStatusCacheAvgFmt:       "avg %s",
-	ChatStatusPlanApproval:      "Enter/y approves & executes · n/Esc keeps planning · PgUp/PgDn scrolls",
+	ChatStatusPlanApproval:      "Enter/y approves & executes · n/Esc keeps planning · PgUp/PgDn/Ctrl+Home/End scrolls",
 	PlanApprovalPrompt:          "Plan ready above — Enter/y to approve & execute, n/Esc to keep planning",
 	ChatStatusToolApproval:      "1 approve once · 2 allow scope this session · 3/4 prefix or save when offered · n/Esc deny · Ctrl-C cancels turn",
 	AskTypeSomething:            "Type something else",
diff --git a/internal/i18n/messages_zh.go b/internal/i18n/messages_zh.go
index 2fc1c95fc..3f2501bad 100644
--- a/internal/i18n/messages_zh.go
+++ b/internal/i18n/messages_zh.go
@@ -49,7 +49,7 @@ var Chinese = Messages{
 	ChatStatusCycleHint:         "shift+tab 切换计划",
 	ChatStatusCacheNowFmt:       "本次命中 %s",
 	ChatStatusCacheAvgFmt:       "平均 %s",
-	ChatStatusPlanApproval:      "Enter/y 批准并执行 · n/Esc 继续规划 · PgUp/PgDn 滚动",
+	ChatStatusPlanApproval:      "Enter/y 批准并执行 · n/Esc 继续规划 · PgUp/PgDn/Ctrl+Home/End 滚动",
 	PlanApprovalPrompt:          "计划已生成（见上方）— Enter/y 批准执行,n/Esc 继续规划",
 	ChatStatusToolApproval:      "1 本次允许 · 2 本会话允许此范围 · 提供时 3/4 为前缀或保存 · n/Esc 拒绝 · Ctrl-C 取消本轮",
 	AskTypeSomething:            "自己输入",

From a8daa489dece6fd890f878ada6de7f37d1477bdb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 9 Jun 2026 22:03:24 -0700
Subject: [PATCH 51/64] chore(deps): bump react, react-dom and @types/react in
 /desktop/frontend (#3690)

Bumps [react](https://github.com/facebook/react/tree/HEAD/packages/react), [react-dom](https://github.com/facebook/react/tree/HEAD/packages/react-dom) and [@types/react](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react). These dependencies needed to be updated together.

Updates `react` from 18.3.1 to 19.2.7
- [Release notes](https://github.com/facebook/react/releases)
- [Changelog](https://github.com/facebook/react/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/react/commits/v19.2.7/packages/react)

Updates `react-dom` from 18.3.1 to 19.2.7
- [Release notes](https://github.com/facebook/react/releases)
- [Changelog](https://github.com/facebook/react/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/react/commits/v19.2.7/packages/react-dom)

Updates `@types/react` from 18.3.29 to 19.2.17
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react)

---
updated-dependencies:
- dependency-name: "@types/react"
  dependency-version: 19.2.17
  dependency-type: direct:development
  update-type: version-update:semver-major
- dependency-name: react
  dependency-version: 19.2.7
  dependency-type: direct:production
  update-type: version-update:semver-major
- dependency-name: react-dom
  dependency-version: 19.2.7
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 desktop/frontend/package-lock.json | 63 +++++++--------------
 desktop/frontend/package.json      |  6 +-
 desktop/frontend/pnpm-lock.yaml    | 89 ++++++++++++------------------
 3 files changed, 57 insertions(+), 101 deletions(-)

diff --git a/desktop/frontend/package-lock.json b/desktop/frontend/package-lock.json
index 3e67c71e8..7e83f5d44 100644
--- a/desktop/frontend/package-lock.json
+++ b/desktop/frontend/package-lock.json
@@ -12,8 +12,8 @@
         "highlight.js": "^11.10.0",
         "katex": "^0.17.0",
         "lucide-react": "^1.17.0",
-        "react": "^18.3.1",
-        "react-dom": "^18.3.1",
+        "react": "^19.2.7",
+        "react-dom": "^19.2.7",
         "react-markdown": "^10.1.0",
         "rehype-katex": "^7.0.1",
         "remark-gfm": "^4.0.0",
@@ -21,7 +21,7 @@
       },
       "devDependencies": {
         "@types/node": "^25.9.1",
-        "@types/react": "^18.3.12",
+        "@types/react": "^19.2.17",
         "@types/react-dom": "^18.3.1",
         "@vitejs/plugin-react": "^5.2.0",
         "terser": "^5.48.0",
@@ -1308,19 +1308,12 @@
         "undici-types": ">=7.24.0 <7.24.7"
       }
     },
-    "node_modules/@types/prop-types": {
-      "version": "15.7.15",
-      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.15.tgz",
-      "integrity": "sha512-F6bEyamV9jKGAFBEmlQnesRPGOQqS2+Uwi0Em15xenOxHaf2hv6L8YCVn3rPdPJOiJfPiCnLIRyvwVaqMY3MIw==",
-      "license": "MIT"
-    },
     "node_modules/@types/react": {
-      "version": "18.3.29",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.29.tgz",
-      "integrity": "sha512-ch0qJdr2JY0r04NXSprbK6TXOgnaJ1Tz23fm5W+z0/CBah6BSBc3n96h7K9GOtwh0HrilNWHIBzE1Ko4Dcw/Wg==",
+      "version": "19.2.17",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.17.tgz",
+      "integrity": "sha512-MXfmqaVPEVgkBT/aY0aGCkRWWtByiYQXo3xdQ8r5RzuFrPiRn8Gar2tQdXSUQ2GKV3bkXckek89V8wQBY2Q/Aw==",
       "license": "MIT",
       "dependencies": {
-        "@types/prop-types": "*",
         "csstype": "^3.2.2"
       }
     },
@@ -1994,6 +1987,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
       "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/jsesc": {
@@ -2048,18 +2042,6 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
-    "node_modules/loose-envify": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-      "license": "MIT",
-      "dependencies": {
-        "js-tokens": "^3.0.0 || ^4.0.0"
-      },
-      "bin": {
-        "loose-envify": "cli.js"
-      }
-    },
     "node_modules/lru-cache": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
@@ -3108,28 +3090,24 @@
       }
     },
     "node_modules/react": {
-      "version": "18.3.1",
-      "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz",
-      "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==",
+      "version": "19.2.7",
+      "resolved": "https://registry.npmjs.org/react/-/react-19.2.7.tgz",
+      "integrity": "sha512-HNe9WslTbXmFK8o8cmwgAeJFSBvt1bPdHCVKtaaV+WlAN36mpT4hcRpwbf3fY56ar2oIXzsBpOAiIRHAdY0OlQ==",
       "license": "MIT",
-      "dependencies": {
-        "loose-envify": "^1.1.0"
-      },
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/react-dom": {
-      "version": "18.3.1",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz",
-      "integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==",
+      "version": "19.2.7",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.7.tgz",
+      "integrity": "sha512-t0BRVXvbiE/o20Hfw669rLbMCDWtYZLvmJigy2f0MxsXF+71pxhR3xOkspmsO8h3ZlNzyibAmtCa3l4lYKk6gQ==",
       "license": "MIT",
       "dependencies": {
-        "loose-envify": "^1.1.0",
-        "scheduler": "^0.23.2"
+        "scheduler": "^0.27.0"
       },
       "peerDependencies": {
-        "react": "^18.3.1"
+        "react": "^19.2.7"
       }
     },
     "node_modules/react-markdown": {
@@ -3332,13 +3310,10 @@
       }
     },
     "node_modules/scheduler": {
-      "version": "0.23.2",
-      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz",
-      "integrity": "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==",
-      "license": "MIT",
-      "dependencies": {
-        "loose-envify": "^1.1.0"
-      }
+      "version": "0.27.0",
+      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.27.0.tgz",
+      "integrity": "sha512-eNv+WrVbKu1f3vbYJT/xtiF5syA5HPIMtf9IgY/nKg0sWqzAUEvqY/xm7OcZc/qafLx/iO9FgOmeSAp4v5ti/Q==",
+      "license": "MIT"
     },
     "node_modules/semver": {
       "version": "6.3.1",
diff --git a/desktop/frontend/package.json b/desktop/frontend/package.json
index d71a7b5dc..bd301f4f6 100644
--- a/desktop/frontend/package.json
+++ b/desktop/frontend/package.json
@@ -20,8 +20,8 @@
     "highlight.js": "^11.10.0",
     "katex": "^0.17.0",
     "lucide-react": "^1.17.0",
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1",
+    "react": "^19.2.7",
+    "react-dom": "^19.2.7",
     "react-markdown": "^10.1.0",
     "rehype-katex": "^7.0.1",
     "remark-gfm": "^4.0.0",
@@ -29,7 +29,7 @@
   },
   "devDependencies": {
     "@types/node": "^25.9.1",
-    "@types/react": "^18.3.12",
+    "@types/react": "^19.2.17",
     "@types/react-dom": "^18.3.1",
     "@vitejs/plugin-react": "^5.2.0",
     "terser": "^5.48.0",
diff --git a/desktop/frontend/pnpm-lock.yaml b/desktop/frontend/pnpm-lock.yaml
index e7f0748b3..f6340edca 100644
--- a/desktop/frontend/pnpm-lock.yaml
+++ b/desktop/frontend/pnpm-lock.yaml
@@ -13,7 +13,7 @@ importers:
     dependencies:
       '@tanstack/react-virtual':
         specifier: ^3.14.2
-        version: 3.14.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+        version: 3.14.2(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
       highlight.js:
         specifier: ^11.10.0
         version: 11.11.1
@@ -22,16 +22,16 @@ importers:
         version: 0.17.0
       lucide-react:
         specifier: ^1.17.0
-        version: 1.17.0(react@18.3.1)
+        version: 1.17.0(react@19.2.7)
       react:
-        specifier: ^18.3.1
-        version: 18.3.1
+        specifier: ^19.2.7
+        version: 19.2.7
       react-dom:
-        specifier: ^18.3.1
-        version: 18.3.1(react@18.3.1)
+        specifier: ^19.2.7
+        version: 19.2.7(react@19.2.7)
       react-markdown:
         specifier: ^10.1.0
-        version: 10.1.0(@types/react@18.3.29)(react@18.3.1)
+        version: 10.1.0(@types/react@19.2.17)(react@19.2.7)
       rehype-katex:
         specifier: ^7.0.1
         version: 7.0.1
@@ -46,11 +46,11 @@ importers:
         specifier: ^25.9.1
         version: 25.9.1
       '@types/react':
-        specifier: ^18.3.12
-        version: 18.3.29
+        specifier: ^19.2.17
+        version: 19.2.17
       '@types/react-dom':
         specifier: ^18.3.1
-        version: 18.3.7(@types/react@18.3.29)
+        version: 18.3.7(@types/react@19.2.17)
       '@vitejs/plugin-react':
         specifier: ^5.2.0
         version: 5.2.0(vite@6.4.2(@types/node@25.9.1)(terser@5.48.0)(tsx@4.22.4))
@@ -659,16 +659,13 @@ packages:
   '@types/node@25.9.1':
     resolution: {integrity: sha512-xfrlY7UD5rMJk3ZVJP8BNzS28J36YJg+xp+LPXV1TdWxr8uMH5A860QNxYDGQe/ylDSgjxE52Q9VnO7p75tJxg==}
 
-  '@types/prop-types@15.7.15':
-    resolution: {integrity: sha512-F6bEyamV9jKGAFBEmlQnesRPGOQqS2+Uwi0Em15xenOxHaf2hv6L8YCVn3rPdPJOiJfPiCnLIRyvwVaqMY3MIw==}
-
   '@types/react-dom@18.3.7':
     resolution: {integrity: sha512-MEe3UeoENYVFXzoXEWsvcpg6ZvlrFNlOQ7EOsvhI3CfAXwzPfO8Qwuxd40nepsYKqyyVQnTdEfv68q91yLcKrQ==}
     peerDependencies:
       '@types/react': ^18.0.0
 
-  '@types/react@18.3.29':
-    resolution: {integrity: sha512-ch0qJdr2JY0r04NXSprbK6TXOgnaJ1Tz23fm5W+z0/CBah6BSBc3n96h7K9GOtwh0HrilNWHIBzE1Ko4Dcw/Wg==}
+  '@types/react@19.2.17':
+    resolution: {integrity: sha512-MXfmqaVPEVgkBT/aY0aGCkRWWtByiYQXo3xdQ8r5RzuFrPiRn8Gar2tQdXSUQ2GKV3bkXckek89V8wQBY2Q/Aw==}
 
   '@types/unist@2.0.11':
     resolution: {integrity: sha512-CmBKiL6NNo/OqgmMn95Fk9Whlp2mtvIv+KNpQKN2F4SjvrEesubTRWGYSg+BnWZOnlCaSTU1sMpsBOzgbYhnsA==}
@@ -888,10 +885,6 @@ packages:
   longest-streak@3.1.0:
     resolution: {integrity: sha512-9Ri+o0JYgehTaVBBDoMqIl8GXtbWg711O3srftcHhZ0dqnETqLaoIK0x17fUw9rFSlK/0NlsKe0Ahhyl5pXE2g==}
 
-  loose-envify@1.4.0:
-    resolution: {integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==}
-    hasBin: true
-
   lru-cache@5.1.1:
     resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==}
 
@@ -1070,10 +1063,10 @@ packages:
   property-information@7.2.0:
     resolution: {integrity: sha512-IAtzIB6sUiWaJYrX9smp3V46pBGbBeLFRGdh25kg1334VcBlD8HzhPeNIWQH9zhGmo2itIe25EHt9dQP7G5hmg==}
 
-  react-dom@18.3.1:
-    resolution: {integrity: sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==}
+  react-dom@19.2.7:
+    resolution: {integrity: sha512-t0BRVXvbiE/o20Hfw669rLbMCDWtYZLvmJigy2f0MxsXF+71pxhR3xOkspmsO8h3ZlNzyibAmtCa3l4lYKk6gQ==}
     peerDependencies:
-      react: ^18.3.1
+      react: ^19.2.7
 
   react-markdown@10.1.0:
     resolution: {integrity: sha512-qKxVopLT/TyA6BX3Ue5NwabOsAzm0Q7kAPwq6L+wWDwisYs7R8vZ0nRXqq6rkueboxpkjvLGU9fWifiX/ZZFxQ==}
@@ -1085,8 +1078,8 @@ packages:
     resolution: {integrity: sha512-QgT5//D3jfjJb6Gsjxv0Slpj23ip+HtOpnNgnb2S5zU3CB26G/IDPGoy4RJB42wzFE46DRsstbW6tKHoKbhAxw==}
     engines: {node: '>=0.10.0'}
 
-  react@18.3.1:
-    resolution: {integrity: sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==}
+  react@19.2.7:
+    resolution: {integrity: sha512-HNe9WslTbXmFK8o8cmwgAeJFSBvt1bPdHCVKtaaV+WlAN36mpT4hcRpwbf3fY56ar2oIXzsBpOAiIRHAdY0OlQ==}
     engines: {node: '>=0.10.0'}
 
   rehype-katex@7.0.1:
@@ -1112,8 +1105,8 @@ packages:
     engines: {node: '>=18.0.0', npm: '>=8.0.0'}
     hasBin: true
 
-  scheduler@0.23.2:
-    resolution: {integrity: sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==}
+  scheduler@0.27.0:
+    resolution: {integrity: sha512-eNv+WrVbKu1f3vbYJT/xtiF5syA5HPIMtf9IgY/nKg0sWqzAUEvqY/xm7OcZc/qafLx/iO9FgOmeSAp4v5ti/Q==}
 
   semver@6.3.1:
     resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==}
@@ -1629,11 +1622,11 @@ snapshots:
   '@rollup/rollup-win32-x64-msvc@4.60.4':
     optional: true
 
-  '@tanstack/react-virtual@3.14.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+  '@tanstack/react-virtual@3.14.2(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
     dependencies:
       '@tanstack/virtual-core': 3.17.0
-      react: 18.3.1
-      react-dom: 18.3.1(react@18.3.1)
+      react: 19.2.7
+      react-dom: 19.2.7(react@19.2.7)
 
   '@tanstack/virtual-core@3.17.0': {}
 
@@ -1686,15 +1679,12 @@ snapshots:
     dependencies:
       undici-types: 7.24.6
 
-  '@types/prop-types@15.7.15': {}
-
-  '@types/react-dom@18.3.7(@types/react@18.3.29)':
+  '@types/react-dom@18.3.7(@types/react@19.2.17)':
     dependencies:
-      '@types/react': 18.3.29
+      '@types/react': 19.2.17
 
-  '@types/react@18.3.29':
+  '@types/react@19.2.17':
     dependencies:
-      '@types/prop-types': 15.7.15
       csstype: 3.2.3
 
   '@types/unist@2.0.11': {}
@@ -1961,17 +1951,13 @@ snapshots:
 
   longest-streak@3.1.0: {}
 
-  loose-envify@1.4.0:
-    dependencies:
-      js-tokens: 4.0.0
-
   lru-cache@5.1.1:
     dependencies:
       yallist: 3.1.1
 
-  lucide-react@1.17.0(react@18.3.1):
+  lucide-react@1.17.0(react@19.2.7):
     dependencies:
-      react: 18.3.1
+      react: 19.2.7
 
   markdown-table@3.0.4: {}
 
@@ -2373,22 +2359,21 @@ snapshots:
 
   property-information@7.2.0: {}
 
-  react-dom@18.3.1(react@18.3.1):
+  react-dom@19.2.7(react@19.2.7):
     dependencies:
-      loose-envify: 1.4.0
-      react: 18.3.1
-      scheduler: 0.23.2
+      react: 19.2.7
+      scheduler: 0.27.0
 
-  react-markdown@10.1.0(@types/react@18.3.29)(react@18.3.1):
+  react-markdown@10.1.0(@types/react@19.2.17)(react@19.2.7):
     dependencies:
       '@types/hast': 3.0.4
       '@types/mdast': 4.0.4
-      '@types/react': 18.3.29
+      '@types/react': 19.2.17
       devlop: 1.1.0
       hast-util-to-jsx-runtime: 2.3.6
       html-url-attributes: 3.0.1
       mdast-util-to-hast: 13.2.1
-      react: 18.3.1
+      react: 19.2.7
       remark-parse: 11.0.0
       remark-rehype: 11.1.2
       unified: 11.0.5
@@ -2399,9 +2384,7 @@ snapshots:
 
   react-refresh@0.18.0: {}
 
-  react@18.3.1:
-    dependencies:
-      loose-envify: 1.4.0
+  react@19.2.7: {}
 
   rehype-katex@7.0.1:
     dependencies:
@@ -2487,9 +2470,7 @@ snapshots:
       '@rollup/rollup-win32-x64-msvc': 4.60.4
       fsevents: 2.3.3
 
-  scheduler@0.23.2:
-    dependencies:
-      loose-envify: 1.4.0
+  scheduler@0.27.0: {}
 
   semver@6.3.1: {}
 

From 4eb6804e99c2d50620953b0cd6dae77a87f08f2f Mon Sep 17 00:00:00 2001
From: SivanCola <liuxw96@foxmail.com>
Date: Wed, 10 Jun 2026 13:04:25 +0800
Subject: [PATCH 52/64] =?UTF-8?q?feat(control):=20extract=20text=20from=20?=
 =?UTF-8?q?PDF=20attachments=20/=20=E6=8F=90=E5=8F=96=20PDF=20=E9=99=84?=
 =?UTF-8?q?=E4=BB=B6=E6=96=87=E6=9C=AC=20(#3618)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat(control): extract text from PDF attachments

* fix(control): bound PDF extractor subprocess output
---
 internal/control/refs.go      | 158 ++++++++++++++++++++++++++++++++++
 internal/control/refs_test.go |  71 +++++++++++++++
 2 files changed, 229 insertions(+)

diff --git a/internal/control/refs.go b/internal/control/refs.go
index 99c9474cc..25790b8de 100644
--- a/internal/control/refs.go
+++ b/internal/control/refs.go
@@ -7,9 +7,13 @@ import (
 	"io"
 	"net/http"
 	"os"
+	"os/exec"
 	"path/filepath"
 	"regexp"
 	"strings"
+	"time"
+
+	"reasonix/internal/proc"
 )
 
 // maxFileRefBytes caps how much of an @-referenced file is injected into a
@@ -17,6 +21,17 @@ import (
 // and the rest noted as truncated.
 const maxFileRefBytes = 64 * 1024
 
+const pdfExtractTimeout = 8 * time.Second
+const pdfExtractWaitDelay = 1 * time.Second
+
+var extractPDFText = extractPDFTextDefault
+
+type pdfExtractResult struct {
+	text      string
+	tool      string
+	truncated bool
+}
+
 // refKind distinguishes the two things an @reference can resolve to.
 type refKind int
 
@@ -268,6 +283,10 @@ func readFileRef(path string) (content string, isDir bool, err error) {
 		return b.String(), true, nil
 	}
 
+	if strings.EqualFold(filepath.Ext(path), ".pdf") {
+		return readPDFRef(path, info.Size()), false, nil
+	}
+
 	f, err := os.Open(path)
 	if err != nil {
 		return "", false, err
@@ -293,6 +312,145 @@ func readFileRef(path string) (content string, isDir bool, err error) {
 	return string(data), false, nil
 }
 
+func readPDFRef(path string, size int64) string {
+	result, err := extractPDFText(path)
+	if err != nil {
+		return fmt.Sprintf("[PDF file %s, %d bytes — text extraction unavailable: %v. If this is a scanned/image-only PDF, use OCR or an available multimodal/vision tool with this path.]", path, size, err)
+	}
+	text := strings.TrimSpace(result.text)
+	if text == "" {
+		return fmt.Sprintf("[PDF file %s, %d bytes — no extractable text found. It may be scanned/image-only; use OCR or an available multimodal/vision tool with this path.]", path, size)
+	}
+	var b strings.Builder
+	fmt.Fprintf(&b, "[PDF text extracted from %s using %s", path, result.tool)
+	if result.truncated {
+		fmt.Fprintf(&b, "; truncated to the first %d bytes", maxFileRefBytes)
+	}
+	b.WriteString("]\n")
+	b.WriteString(text)
+	return b.String()
+}
+
+func extractPDFTextDefault(path string) (pdfExtractResult, error) {
+	var firstErr error
+	if pdftotext, err := exec.LookPath("pdftotext"); err == nil {
+		if text, truncated, err := runPDFTextCommand(pdftotext, []string{"-enc", "UTF-8", "-layout", path, "-"}); err == nil {
+			return pdfExtractResult{text: text, tool: "pdftotext", truncated: truncated}, nil
+		} else {
+			firstErr = err
+		}
+	}
+	python, err := findPython()
+	if err != nil {
+		if firstErr != nil {
+			return pdfExtractResult{}, fmt.Errorf("pdftotext failed (%v), and Python PDF libraries are not available", firstErr)
+		}
+		return pdfExtractResult{}, fmt.Errorf("pdftotext and Python PDF libraries are not available")
+	}
+	text, truncated, err := runPDFTextCommand(python, []string{"-c", pythonPDFExtractScript, path})
+	if err != nil {
+		if firstErr != nil {
+			return pdfExtractResult{}, fmt.Errorf("pdftotext failed (%v), Python PDF extraction failed (%w)", firstErr, err)
+		}
+		return pdfExtractResult{}, err
+	}
+	return pdfExtractResult{text: text, tool: "Python PDF library", truncated: truncated}, nil
+}
+
+func findPython() (string, error) {
+	for _, name := range []string{"python3", "python", "py"} {
+		if p, err := exec.LookPath(name); err == nil {
+			return p, nil
+		}
+	}
+	return "", fmt.Errorf("python not found")
+}
+
+func runPDFTextCommand(name string, args []string) (string, bool, error) {
+	ctx, cancel := context.WithTimeout(context.Background(), pdfExtractTimeout)
+	defer cancel()
+	cmd := exec.CommandContext(ctx, name, args...)
+	setShellKillTree(cmd)
+	cmd.WaitDelay = pdfExtractWaitDelay
+	proc.HideWindow(cmd)
+	var stdout limitedBuffer
+	var stderr limitedBuffer
+	cmd.Stdout = &stdout
+	cmd.Stderr = &stderr
+	waitErr := cmd.Run()
+	if ctx.Err() == context.DeadlineExceeded {
+		return "", false, fmt.Errorf("PDF text extraction timed out")
+	}
+	if waitErr != nil {
+		msg := strings.TrimSpace(stderr.String())
+		if msg != "" {
+			if stderr.Truncated() {
+				msg += "\n…[truncated]…"
+			}
+			return "", false, fmt.Errorf("%w: %s", waitErr, msg)
+		}
+		return "", false, waitErr
+	}
+	return stdout.String(), stdout.Truncated(), nil
+}
+
+type limitedBuffer struct {
+	buf       bytes.Buffer
+	truncated bool
+}
+
+func (b *limitedBuffer) Write(p []byte) (int, error) {
+	remaining := maxFileRefBytes - b.buf.Len()
+	if remaining > 0 {
+		if len(p) > remaining {
+			_, _ = b.buf.Write(p[:remaining])
+			b.truncated = true
+		} else {
+			_, _ = b.buf.Write(p)
+		}
+	} else if len(p) > 0 {
+		b.truncated = true
+	}
+	return len(p), nil
+}
+
+func (b *limitedBuffer) String() string { return b.buf.String() }
+
+func (b *limitedBuffer) Truncated() bool { return b.truncated }
+
+const pythonPDFExtractScript = `
+import sys
+
+path = sys.argv[1]
+
+try:
+    from pypdf import PdfReader
+except Exception:
+    try:
+        from PyPDF2 import PdfReader
+    except Exception:
+        PdfReader = None
+
+if PdfReader is not None:
+    reader = PdfReader(path)
+    for page in reader.pages:
+        text = page.extract_text() or ""
+        if text:
+            print(text)
+    sys.exit(0)
+
+try:
+    import pdfplumber
+except Exception as exc:
+    raise SystemExit("no supported Python PDF library found") from exc
+
+with pdfplumber.open(path) as pdf:
+    for page in pdf.pages:
+        text = page.extract_text() or ""
+        if text:
+            print(text)
+`
+
 func imageMime(data []byte, path string) string {
 	mime := http.DetectContentType(data[:min(len(data), 512)])
 	if strings.HasPrefix(mime, "image/") {
diff --git a/internal/control/refs_test.go b/internal/control/refs_test.go
index a9f32a811..dc49450be 100644
--- a/internal/control/refs_test.go
+++ b/internal/control/refs_test.go
@@ -202,6 +202,77 @@ func TestReadFileRef(t *testing.T) {
 	}
 }
 
+func TestReadFileRefPDFExtraction(t *testing.T) {
+	dir := t.TempDir()
+	pdfPath := filepath.Join(dir, "report.pdf")
+	if err := os.WriteFile(pdfPath, []byte("%PDF-1.4 fake"), 0o644); err != nil {
+		t.Fatal(err)
+	}
+
+	oldExtract := extractPDFText
+	t.Cleanup(func() { extractPDFText = oldExtract })
+
+	extractPDFText = func(path string) (pdfExtractResult, error) {
+		if path != pdfPath {
+			t.Fatalf("extract path = %q, want %q", path, pdfPath)
+		}
+		return pdfExtractResult{text: "Quarterly results\nRevenue up", tool: "test-extractor"}, nil
+	}
+	got, isDir, err := readFileRef(pdfPath)
+	if err != nil || isDir {
+		t.Fatalf("pdf text = (isDir=%v, err=%v)", isDir, err)
+	}
+	if !strings.Contains(got, "PDF text extracted") || !strings.Contains(got, "Revenue up") {
+		t.Fatalf("pdf text extraction missing from output: %s", got)
+	}
+
+	extractPDFText = func(string) (pdfExtractResult, error) {
+		return pdfExtractResult{text: "   ", tool: "test-extractor"}, nil
+	}
+	got, _, err = readFileRef(pdfPath)
+	if err != nil {
+		t.Fatalf("empty pdf text err = %v", err)
+	}
+	if !strings.Contains(got, "no extractable text") || !strings.Contains(got, "OCR") {
+		t.Fatalf("empty pdf should ask for OCR, got: %s", got)
+	}
+
+	extractPDFText = func(string) (pdfExtractResult, error) {
+		return pdfExtractResult{}, os.ErrNotExist
+	}
+	got, _, err = readFileRef(pdfPath)
+	if err != nil {
+		t.Fatalf("failed pdf text err = %v", err)
+	}
+	if !strings.Contains(got, "text extraction unavailable") || !strings.Contains(got, "multimodal/vision") {
+		t.Fatalf("failed pdf should mention OCR/vision fallback, got: %s", got)
+	}
+}
+
+func TestRunPDFTextCommandCapsStderr(t *testing.T) {
+	t.Setenv("GO_WANT_PDF_STDERR_HELPER", "1")
+
+	_, _, err := runPDFTextCommand(os.Args[0], []string{"-test.run=TestPDFStderrHelperProcess", "--"})
+	if err == nil {
+		t.Fatal("expected helper command to fail")
+	}
+	msg := err.Error()
+	if !strings.Contains(msg, "truncated") {
+		t.Fatalf("expected stderr truncation marker, got: %q", msg)
+	}
+	if len(msg) > maxFileRefBytes+1024 {
+		t.Fatalf("stderr error grew too large: len=%d", len(msg))
+	}
+}
+
+func TestPDFStderrHelperProcess(t *testing.T) {
+	if os.Getenv("GO_WANT_PDF_STDERR_HELPER") != "1" {
+		return
+	}
+	_, _ = os.Stderr.WriteString(strings.Repeat("x", maxFileRefBytes+4096))
+	os.Exit(7)
+}
+
 func TestResolveBareNamesDuplicates(t *testing.T) {
 	temp := t.TempDir()
 

From 3ed47e20c3ada8cdba8960c7266f11fcec28890f Mon Sep 17 00:00:00 2001
From: SivanCola <liuxw96@foxmail.com>
Date: Wed, 10 Jun 2026 13:07:10 +0800
Subject: [PATCH 53/64] Split new and clear session flows (#3780)

---
 README.md                                     |  7 +-
 README.zh-CN.md                               |  4 +-
 desktop/app.go                                | 17 ++++
 desktop/frontend/src/App.tsx                  | 46 +++++++++--
 .../src/components/ClearContextCard.tsx       | 60 ++++++++++++++
 desktop/frontend/src/lib/bridge.ts            |  5 +-
 desktop/frontend/src/lib/useController.ts     |  9 ++-
 desktop/frontend/src/locales/en.ts            |  9 +++
 desktop/frontend/src/locales/zh.ts            |  9 +++
 desktop/frontend/src/styles.css               |  3 +
 docs/SPEC.md                                  |  9 ++-
 internal/cli/chat_tui.go                      | 32 +++++---
 internal/cli/chat_tui_test.go                 | 71 +++++++++++++++++
 internal/cli/clear_confirm.go                 | 79 +++++++++++++++++++
 internal/cli/complete.go                      |  2 +-
 internal/cli/help_view.go                     |  2 +-
 internal/control/controller.go                | 63 ++++++++++++++-
 internal/control/controller_test.go           | 50 ++++++++++--
 internal/i18n/i18n.go                         | 10 ++-
 internal/i18n/messages_en.go                  | 10 ++-
 internal/i18n/messages_zh.go                  | 10 ++-
 21 files changed, 460 insertions(+), 47 deletions(-)
 create mode 100644 desktop/frontend/src/components/ClearContextCard.tsx
 create mode 100644 internal/cli/clear_confirm.go

diff --git a/README.md b/README.md
index cbc88c58e..355351787 100644
--- a/README.md
+++ b/README.md
@@ -220,10 +220,11 @@ convenient.
 
 ### Slash commands
 
-In `reasonix chat`, built-in commands (`/compact`, `/new`/`/clear`, `/rewind`, `/tree`,
+In `reasonix chat`, built-in commands (`/compact`, `/new`, `/clear`, `/rewind`, `/tree`,
 `/branch`, `/switch`, `/todo`, `/model`, `/effort`, `/mcp`, `/memory`, `/help`) run locally.
-`/new` starts a fresh model context while saving the previous transcript for
-history/resume; `/clear` is the Claude Code-compatible alias.
+`/new` starts a new session while saving the previous transcript for
+history/resume; `/clear` asks for confirmation, then discards the current context
+without saving it.
 `/tree` shows saved conversation branches, `/branch [name]` forks the current
 conversation tip, `/branch <turn> [name]` forks from an earlier checkpointed turn,
 and `/switch <id|name>` loads another branch. **Custom commands** are Markdown files under
diff --git a/README.zh-CN.md b/README.zh-CN.md
index a7ad6e74d..3ac1dc007 100644
--- a/README.zh-CN.md
+++ b/README.zh-CN.md
@@ -200,8 +200,8 @@ headers = { Authorization = "Bearer ${STRIPE_KEY}" }
 
 ### 斜杠命令
 
-`reasonix chat` 里,内置命令(`/compact`、`/new`（`/clear`）、`/rewind`、`/tree`、`/branch`、`/switch`、`/todo`、`/model`、`/effort`、`/mcp`、`/help`)在本地执行。
-`/new` 会开启干净的模型上下文,同时保存之前的 transcript 供历史记录和恢复使用;`/clear` 是兼容 Claude Code 习惯的同义命令。
+`reasonix chat` 里,内置命令(`/compact`、`/new`、`/clear`、`/rewind`、`/tree`、`/branch`、`/switch`、`/todo`、`/model`、`/effort`、`/mcp`、`/help`)在本地执行。
+`/new` 会开启新会话,同时保存之前的 transcript 供历史记录和恢复使用;`/clear` 会二次确认,确认后丢弃当前上下文且不保存。
 `/tree` 查看已保存的对话分支,`/branch [name]` 从当前对话末端分支,`/branch <turn> [name]`
 从较早的 checkpoint 轮次分支,`/switch <id|name>` 切换到另一个分支。**自定义命令**
 是放在 `.reasonix/commands/`(项目)或 `~/.config/reasonix/commands/`(用户)下的 Markdown 文件——
diff --git a/desktop/app.go b/desktop/app.go
index 65a4138e3..cd81d586a 100644
--- a/desktop/app.go
+++ b/desktop/app.go
@@ -792,6 +792,22 @@ func (a *App) NewSession() error {
 	return nil
 }
 
+// ClearSession discards the current conversation and rotates to a fresh unsaved one.
+func (a *App) ClearSession() error {
+	a.mu.RLock()
+	tab := a.activeTabLocked()
+	ctrl := a.activeCtrlLocked()
+	a.mu.RUnlock()
+	if ctrl == nil {
+		return nil
+	}
+	if err := ctrl.ClearSession(); err != nil {
+		return err
+	}
+	a.persistTabSessionPath(tab, ctrl.SessionPath())
+	return nil
+}
+
 // CheckpointMeta summarises one rewind point (a user turn) for the desktop.
 type CheckpointMeta struct {
 	Turn            int      `json:"turn"`
@@ -1789,6 +1805,7 @@ type CommandInfo struct {
 func (a *App) Commands() []CommandInfo {
 	out := []CommandInfo{
 		{Name: "new", Description: i18n.M.CmdNew, Kind: "builtin"},
+		{Name: "clear", Description: i18n.M.CmdClear, Kind: "builtin"},
 		{Name: "compact", Description: i18n.M.CmdCompact, Kind: "builtin"},
 		{Name: "model", Description: i18n.M.CmdModel, Kind: "builtin"},
 		{Name: "effort", Description: i18n.M.CmdEffort, Kind: "builtin"},
diff --git a/desktop/frontend/src/App.tsx b/desktop/frontend/src/App.tsx
index 681cb0f7d..34943a560 100644
--- a/desktop/frontend/src/App.tsx
+++ b/desktop/frontend/src/App.tsx
@@ -24,6 +24,7 @@ import { Composer } from "./components/Composer";
 import { TodoPanel } from "./components/TodoPanel";
 import { ApprovalModal } from "./components/ApprovalModal";
 import { AskCard } from "./components/AskCard";
+import { ClearContextCard } from "./components/ClearContextCard";
 import { StatusBar } from "./components/StatusBar";
 import { HistoryPanel } from "./components/HistoryPanel";
 import { CommandPalette, type PaletteItem } from "./components/CommandPalette";
@@ -383,6 +384,7 @@ export default function App() {
     setToolApprovalMode: setControllerToolApprovalMode,
     setGoal: setControllerGoal,
     clearGoal: clearControllerGoal,
+    clearSession,
     listSessions,
     listTrashedSessions,
     resumeSession,
@@ -444,6 +446,7 @@ export default function App() {
   const [sidebarTogglePressed, setSidebarTogglePressed] = useState(false);
   const [workspaceTogglePressed, setWorkspaceTogglePressed] = useState(false);
   const [savedTopicTurnCount, setSavedTopicTurnCount] = useState<number | undefined>(undefined);
+  const [clearContextPending, setClearContextPending] = useState(false);
   const topicRenameSkipCommitRef = useRef(false);
   const topicRenameCommitHandledRef = useRef(false);
   const appRef = useRef<HTMLDivElement>(null);
@@ -857,9 +860,28 @@ export default function App() {
     send(text);
   }, [pendingPlanRevision, send, state.running]);
 
-  // handleSend intercepts the slash commands that need a desktop-native action
-  // before they reach the backend: "/model <ref>" rebuilds on that model, and
-  // "/memory" opens the Memory tab in the settings centre. Everything else — skills (/init, …),
+  useEffect(() => {
+    setClearContextPending(false);
+  }, [activeTabId]);
+
+  const cancelClearContext = useCallback(() => {
+    setClearContextPending(false);
+  }, []);
+
+  const confirmClearContext = useCallback(async () => {
+    setClearContextPending(false);
+    try {
+      await clearSession();
+      notice(t("clearContext.done"));
+    } catch (err) {
+      const msg = err instanceof Error ? err.message : String(err);
+      notice(msg || t("clearContext.failed"), "warn");
+    }
+  }, [clearSession, notice, t]);
+
+  // handleSend intercepts slash commands that need a desktop-native action before
+  // they reach the backend: "/model <ref>" rebuilds on that model, "/memory"
+  // opens Settings, and "/clear" shows an in-app confirmation card. Everything else — skills (/init, …),
   // custom commands, bare /model and the other read-only management verbs
   // (/skill, /hooks, /mcp) — goes straight to Submit, which the controller
   // resolves (a turn, or a listing Notice).
@@ -886,6 +908,10 @@ export default function App() {
         setSettingsTarget("memory");
         return;
       }
+      if (trimmed === "/clear") {
+        setClearContextPending(true);
+        return;
+      }
       const goalCommand = /^\/goal(?:\s+(.*))?$/.exec(trimmed);
       if (goalCommand) {
         const arg = (goalCommand[1] ?? "").trim();
@@ -1834,7 +1860,7 @@ export default function App() {
                 onRewind={handleMessageAction}
                 checkpoints={state.checkpoints}
                 actionPending={state.messageAction != null}
-                rewindDisabled={state.running || state.messageAction != null || state.approval != null || state.ask != null}
+                rewindDisabled={state.running || state.messageAction != null || state.approval != null || state.ask != null || clearContextPending}
               />
             )}
           </main>
@@ -1867,6 +1893,14 @@ export default function App() {
                 onDismiss={() => answerQuestion(state.ask!.id, [])}
               />
             )}
+            {clearContextPending && (
+              <ClearContextCard
+                onCancel={cancelClearContext}
+                onConfirm={() => {
+                  void confirmClearContext();
+                }}
+              />
+            )}
             <Composer
               running={state.running}
               collaborationMode={collaborationMode}
@@ -1887,8 +1921,8 @@ export default function App() {
               onSwitchModel={switchModel}
               onSetEffort={setEffort}
               insertRequest={composerInsertRequest}
-              disabled={state.meta?.ready === false || state.messageAction != null || state.approval != null || state.ask != null}
-              decisionPending={state.messageAction != null || state.approval != null || state.ask != null}
+              disabled={state.meta?.ready === false || state.messageAction != null || state.approval != null || state.ask != null || clearContextPending}
+              decisionPending={state.messageAction != null || state.approval != null || state.ask != null || clearContextPending}
               ready={state.meta?.ready === true}
               turnStartAt={state.turnStartAt}
               turnTokens={state.turnTokens}
diff --git a/desktop/frontend/src/components/ClearContextCard.tsx b/desktop/frontend/src/components/ClearContextCard.tsx
new file mode 100644
index 000000000..4dbf2a449
--- /dev/null
+++ b/desktop/frontend/src/components/ClearContextCard.tsx
@@ -0,0 +1,60 @@
+import { useEffect, useRef } from "react";
+import { useT } from "../lib/i18n";
+import { PromptAction, PromptBadge, PromptShelf } from "./PromptShelf";
+
+export function ClearContextCard({
+  onCancel,
+  onConfirm,
+}: {
+  onCancel: () => void;
+  onConfirm: () => void;
+}) {
+  const t = useT();
+  const shelfRef = useRef<HTMLDivElement | null>(null);
+
+  useEffect(() => {
+    shelfRef.current?.focus();
+  }, []);
+
+  useEffect(() => {
+    const onKeyDown = (event: globalThis.KeyboardEvent) => {
+      const target = event.target as HTMLElement | null;
+      const tag = target?.tagName.toLowerCase();
+      if (tag === "input" || tag === "textarea" || target?.isContentEditable) return;
+
+      if (event.key === "Escape" || event.key === "1") {
+        event.preventDefault();
+        onCancel();
+        return;
+      }
+      if (event.key === "2" || event.key.toLowerCase() === "y") {
+        event.preventDefault();
+        onConfirm();
+      }
+    };
+    document.addEventListener("keydown", onKeyDown);
+    return () => document.removeEventListener("keydown", onKeyDown);
+  }, [onCancel, onConfirm]);
+
+  return (
+    <PromptShelf
+      barRef={shelfRef}
+      titleId="clear-context-shelf-title"
+      title={t("clearContext.title")}
+      badges={<PromptBadge>{t("clearContext.badge")}</PromptBadge>}
+      meta={t("clearContext.prompt")}
+      actions={
+        <>
+          <PromptAction keyLabel="1" label={t("common.cancel")} selected onClick={onCancel} />
+          <PromptAction keyLabel="2" label={t("clearContext.clear")} onClick={onConfirm} />
+        </>
+      }
+    >
+      <div className="ask-shelf__detail-list">
+        <div className="ask-shelf__detail clear-context-card__detail">
+          <span className="ask-shelf__detail-desc">{t("clearContext.detail")}</span>
+        </div>
+      </div>
+    </PromptShelf>
+  );
+}
diff --git a/desktop/frontend/src/lib/bridge.ts b/desktop/frontend/src/lib/bridge.ts
index b5ba6d5e1..b37415a2c 100644
--- a/desktop/frontend/src/lib/bridge.ts
+++ b/desktop/frontend/src/lib/bridge.ts
@@ -114,6 +114,7 @@ export interface AppBindings {
   ClearGoalForTab(tabID: string): Promise<void>;
   Compact(): Promise<void>;
   NewSession(): Promise<void>;
+  ClearSession(): Promise<void>;
   History(): Promise<HistoryMessage[]>;
   HistoryForTab(tabID: string): Promise<HistoryMessage[]>;
   Checkpoints(): Promise<CheckpointMeta[]>;
@@ -1327,6 +1328,7 @@ function makeMockApp(): AppBindings {
         },
         async Compact() {},
         async NewSession() {},
+        async ClearSession() {},
     async Checkpoints() {
       return [
         { turn: 0, prompt: "你好呀", files: ["src/App.tsx"], time: Date.now() - 30_000, canCode: true, canConversation: true },
@@ -1504,7 +1506,8 @@ function makeMockApp(): AppBindings {
         },
     async Commands() {
       return [
-        { name: "new", description: "Start a new session", kind: "builtin" as const },
+        { name: "new", description: "start new session; save transcript", kind: "builtin" as const },
+        { name: "clear", description: "discard current context", kind: "builtin" as const },
         { name: "compact", description: "Summarize older history to free up context", kind: "builtin" as const },
         { name: "model", description: "Switch model", kind: "builtin" as const },
         { name: "effort", description: "Set reasoning effort", kind: "builtin" as const },
diff --git a/desktop/frontend/src/lib/useController.ts b/desktop/frontend/src/lib/useController.ts
index 9b4d30f48..06e7ea1c0 100644
--- a/desktop/frontend/src/lib/useController.ts
+++ b/desktop/frontend/src/lib/useController.ts
@@ -731,6 +731,13 @@ export function useController() {
     if (tabId) dispatchTo(tabId, { type: "reset" });
   }, [activeTabId, bumpCheckpointRefreshSeq, dispatchTo]);
 
+  const clearSession = useCallback(async () => {
+    const tabId = activeTabId;
+    if (tabId) bumpCheckpointRefreshSeq(tabId);
+    await app.ClearSession();
+    if (tabId) dispatchTo(tabId, { type: "reset" });
+  }, [activeTabId, bumpCheckpointRefreshSeq, dispatchTo]);
+
   const listSessions = useCallback(async (): Promise<SessionMeta[]> => asArray<SessionMeta>(await app.ListSessions().catch(() => [])), []);
   const listTrashedSessions = useCallback(async (): Promise<SessionMeta[]> => asArray<SessionMeta>(await app.ListTrashedSessions().catch(() => [])), []);
   const resumeSession = useCallback(async (path: string, tabId?: string) => {
@@ -885,7 +892,7 @@ export function useController() {
     state: activeState,
     activeTabId,
     send, runShell, notice, cancel, approve, answerQuestion, setControllerMode, setCollaborationMode, setToolApprovalMode, setGoal, clearGoal,
-    newSession, listSessions, listTrashedSessions, resumeSession, previewSession, deleteSession, restoreSession, purgeTrashedSession, renameSession,
+    newSession, clearSession, listSessions, listTrashedSessions, resumeSession, previewSession, deleteSession, restoreSession, purgeTrashedSession, renameSession,
     refreshMeta, pickWorkspace, switchWorkspace, compact, rewind, setModel, setEffort,
     fetchMemory, remember, forget, saveDoc,
     switchTab, openProjectTab, openGlobalTab, closeTab, reorderTabs,
diff --git a/desktop/frontend/src/locales/en.ts b/desktop/frontend/src/locales/en.ts
index 99a1c208d..64fe6e3c7 100644
--- a/desktop/frontend/src/locales/en.ts
+++ b/desktop/frontend/src/locales/en.ts
@@ -358,6 +358,15 @@ export const en = {
   "ask.customPlaceholder": "Type your own answer…",
   "ask.justChat": "Just chat",
 
+  // clear context confirmation
+  "clearContext.title": "Clear current context",
+  "clearContext.badge": "local only",
+  "clearContext.prompt": "Clear current context without saving?",
+  "clearContext.detail": "This deletes the current transcript from local history and keeps only the system prompt.",
+  "clearContext.clear": "Clear",
+  "clearContext.done": "Current context cleared",
+  "clearContext.failed": "Could not clear current context",
+
   // history drawer
   "history.title": "History",
   "history.trashTitle": "Trash",
diff --git a/desktop/frontend/src/locales/zh.ts b/desktop/frontend/src/locales/zh.ts
index 7fced664d..5630bb94a 100644
--- a/desktop/frontend/src/locales/zh.ts
+++ b/desktop/frontend/src/locales/zh.ts
@@ -359,6 +359,15 @@ export const zh: Record<DictKey, string> = {
   "ask.customPlaceholder": "输入你自己的答案…",
   "ask.justChat": "只是聊聊",
 
+  // 清空上下文确认
+  "clearContext.title": "清空当前上下文",
+  "clearContext.badge": "仅本地",
+  "clearContext.prompt": "清空当前上下文且不保存？",
+  "clearContext.detail": "会从本地历史中删除当前 transcript，只保留 system prompt。",
+  "clearContext.clear": "清空",
+  "clearContext.done": "已清空当前上下文",
+  "clearContext.failed": "清空当前上下文失败",
+
   // 历史抽屉
   "history.title": "历史",
   "history.trashTitle": "回收站",
diff --git a/desktop/frontend/src/styles.css b/desktop/frontend/src/styles.css
index e64c6ffe6..500974e67 100644
--- a/desktop/frontend/src/styles.css
+++ b/desktop/frontend/src/styles.css
@@ -4877,6 +4877,9 @@ a[href] {
   font-size: 12px;
   line-height: 1.35;
 }
+.clear-context-card__detail {
+  grid-template-columns: 1fr;
+}
 .ask-shelf__custom-row {
   display: flex;
   align-items: center;
diff --git a/docs/SPEC.md b/docs/SPEC.md
index 6f0fb1cab..defbbec13 100644
--- a/docs/SPEC.md
+++ b/docs/SPEC.md
@@ -294,10 +294,11 @@ each writer/bash call. `deny` rules harden both modes.
 
 The chat TUI accepts `/command` input. Three kinds share one dispatch:
 
-- **Built-in actions** (`/compact`, `/new`/`/clear`, `/effort`, `/mcp`, `/help`) manipulate session
-  state locally and never reach the model. `/new` and its Claude Code-compatible
-  alias `/clear` start a fresh model context while saving the previous transcript
-  for resume/history; they do not delete persisted history or project memory.
+- **Built-in actions** (`/compact`, `/new`, `/clear`, `/effort`, `/mcp`, `/help`) manipulate session
+  state locally and never reach the model. `/new` starts a new session while
+  saving the previous transcript for resume/history. `/clear` requires
+  confirmation, then discards the current context without saving it; it does not
+  delete project memory.
 - **Custom commands** are Markdown files under `.reasonix/commands/` (project) and
   `~/.config/reasonix/commands/` (user); the project dir overrides the user dir on a
   name clash. A file `review.md` becomes `/review`; a subdirectory namespaces it
diff --git a/internal/cli/chat_tui.go b/internal/cli/chat_tui.go
index ede29fcc9..c4815270d 100644
--- a/internal/cli/chat_tui.go
+++ b/internal/cli/chat_tui.go
@@ -216,6 +216,10 @@ type chatTUI struct {
 	mcp         *mcpManager
 	mcpDisabled map[string]bool
 
+	// clearConfirm is the destructive "/clear" confirmation overlay. It is separate
+	// from /new because /clear discards the current transcript instead of saving it.
+	clearConfirm *clearConfirm
+
 	// lastCtrlCAt records when Ctrl+C was pressed while idle on an empty
 	// composer, enabling a "press again to quit" confirmation pattern (1.5s
 	// window). Reset when Ctrl+C clears non-empty input instead.
@@ -786,7 +790,7 @@ func (m chatTUI) update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			m.updateCompletion()
 			return m, finalize(m, cmds)
 		}
-		if !m.chooserTyping() && m.pendingApproval == nil && m.rewind == nil && m.resumePick == nil && m.mcp == nil && m.mcpImport == nil && m.skillPick == nil && m.shouldFoldPaste(msg.Content) {
+		if !m.chooserTyping() && m.pendingApproval == nil && m.rewind == nil && m.resumePick == nil && m.mcp == nil && m.clearConfirm == nil && m.mcpImport == nil && m.skillPick == nil && m.shouldFoldPaste(msg.Content) {
 			m.insertFoldedPaste(msg.Content)
 			m.growInputToFit()
 			m.updateCompletion()
@@ -860,6 +864,10 @@ func (m chatTUI) update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		if m.mcp != nil {
 			return m.handleMCPManagerKey(msg)
 		}
+		// The destructive /clear confirmation is modal while open.
+		if m.clearConfirm != nil {
+			return m.handleClearConfirmKey(msg)
+		}
 		// The skill picker is modal while open: keys navigate it.
 		if m.skillPick != nil {
 			return m.handleSkillPickerKey(msg)
@@ -1453,7 +1461,7 @@ func (m chatTUI) bottomRows() int {
 // reserve rows for a composer that cannot receive input, leaving a confusing
 // blank/bordered area at the bottom of the TUI.
 func (m chatTUI) hideComposer() bool {
-	if m.mcp != nil || m.mcpImport != nil || m.skillPick != nil || m.resumePick != nil || m.rewind != nil || m.pendingApproval != nil {
+	if m.mcp != nil || m.clearConfirm != nil || m.mcpImport != nil || m.skillPick != nil || m.resumePick != nil || m.rewind != nil || m.pendingApproval != nil {
 		return true
 	}
 	return m.chooser != nil && !m.chooser.typing
@@ -1472,6 +1480,9 @@ func (m chatTUI) renderMainManager() string {
 	if card := m.renderMCPManager(); card != "" {
 		return card
 	}
+	if card := m.renderClearConfirm(); card != "" {
+		return card
+	}
 	return m.renderSkillPicker()
 }
 
@@ -1492,6 +1503,8 @@ func (m chatTUI) renderMainManagerFooter() string {
 	switch {
 	case m.mcp != nil:
 		hint = m.mcp.footerHint()
+	case m.clearConfirm != nil:
+		hint = "Enter confirm · y clear · n/Esc cancel"
 	case m.skillPick != nil:
 		hint = m.skillPickerFooterHint()
 	}
@@ -3173,21 +3186,18 @@ func (m *chatTUI) runSlashCommand(input string) tea.Cmd {
 		// guidance steering what the summary keeps.
 		focus := strings.TrimSpace(strings.TrimPrefix(input, cmd))
 		return func() tea.Msg { return compactDoneMsg{err: m.ctrl.Compact(context.Background(), focus)} }
-	case "/new", "/clear":
+	case "/new":
 		m.echoLocalCommand(input)
 		if err := m.ctrl.NewSession(); err != nil {
 			m.notice(fmt.Sprintf("%s: %v", i18n.M.SlashNewFailed, err))
 			return nil
 		}
-		// Native scrollback keeps the old transcript; mark the fork with a fresh
-		// banner and reset live state.
-		m.pending.Reset()
-		m.reasoning.Reset()
-		m.todoArgs = ""
-		m.chooser = nil
-		m.commitLine("")
-		m.commitLine(strings.TrimRight(renderTUIBanner(m.label, "", m.width), "\n"))
+		// Native scrollback keeps the old transcript; mark the fork with a fresh banner.
+		m.resetFreshContextView(false)
 		m.notice(i18n.M.SlashNewDone)
+	case "/clear":
+		m.echoLocalCommand(input)
+		m.clearConfirm = &clearConfirm{confirm: 1}
 	case "/resume":
 		m.runResumeCommand(input)
 	case "/todo":
diff --git a/internal/cli/chat_tui_test.go b/internal/cli/chat_tui_test.go
index 44c0bcb2c..ddc7294a0 100644
--- a/internal/cli/chat_tui_test.go
+++ b/internal/cli/chat_tui_test.go
@@ -257,6 +257,77 @@ func TestMCPManagerHidesComposerBox(t *testing.T) {
 	}
 }
 
+func TestClearCommandRequiresConfirmationAndDiscardsSession(t *testing.T) {
+	dir := t.TempDir()
+	sess := agent.NewSession("sys")
+	sess.Add(provider.Message{Role: provider.RoleUser, Content: "old context"})
+	exec := agent.New(nil, nil, sess, agent.Options{}, event.Discard)
+	path := filepath.Join(dir, "session.jsonl")
+	ctrl := control.New(control.Options{Executor: exec, SystemPrompt: "sys", SessionDir: dir, SessionPath: path, Label: "test"})
+	if err := ctrl.Snapshot(); err != nil {
+		t.Fatal(err)
+	}
+	m := newChatTUI(ctrl, "", make(chan event.Event, 1), 80)
+
+	if cmd := m.runSlashCommand("/clear"); cmd != nil {
+		t.Fatal("/clear should open a local confirmation without returning a command")
+	}
+	if m.clearConfirm == nil {
+		t.Fatal("/clear should open a confirmation prompt")
+	}
+	if m.clearConfirm.confirm != 1 {
+		t.Fatalf("/clear confirmation should default to cancel, got %d", m.clearConfirm.confirm)
+	}
+	m0, _ := m.Update(tea.WindowSizeMsg{Width: 80, Height: 24})
+	m = m0.(chatTUI)
+	footerRows := strings.Count(m.renderMainManagerFooter(), "\n") + 1
+	if got, want := m.bottomRows(), footerRows+2; got != want {
+		t.Fatalf("bottomRows with /clear confirmation = %d, want %d (footer + status rows; confirmation renders in main area)", got, want)
+	}
+	if !m.hideComposer() {
+		t.Fatal("/clear confirmation should hide the composer")
+	}
+	content := ansi.Strip(m.View().Content)
+	if !strings.Contains(content, "Clear current context without saving?") {
+		t.Fatalf("/clear confirmation prompt missing from view:\n%s", content)
+	}
+	if _, err := os.Stat(path); err != nil {
+		t.Fatalf("session should still exist before confirmation: %v", err)
+	}
+	if current := exec.Session().Snapshot(); len(current) != 2 {
+		t.Fatalf("context changed before confirmation: %+v", current)
+	}
+
+	next, _ := m.handleClearConfirmKey(tea.KeyPressMsg{Code: tea.KeyEnter})
+	m = next.(chatTUI)
+	if m.clearConfirm != nil {
+		t.Fatal("Enter on default cancel should close the confirmation")
+	}
+	if ctrl.SessionPath() != path {
+		t.Fatal("cancelled /clear should not rotate the session path")
+	}
+	if _, err := os.Stat(path); err != nil {
+		t.Fatalf("cancelled /clear should keep the session file: %v", err)
+	}
+
+	m.runSlashCommand("/clear")
+	next, _ = m.handleClearConfirmKey(tea.KeyPressMsg{Code: 'y'})
+	m = next.(chatTUI)
+	if ctrl.SessionPath() == path {
+		t.Fatal("confirmed /clear should rotate to a fresh session path")
+	}
+	if _, err := os.Stat(path); !os.IsNotExist(err) {
+		t.Fatalf("confirmed /clear should remove the old transcript, stat err=%v", err)
+	}
+	current := exec.Session().Snapshot()
+	if len(current) != 1 || current[0].Role != provider.RoleSystem || current[0].Content != "sys" {
+		t.Fatalf("cleared context = %+v, want only system prompt", current)
+	}
+	if len(m.transcript) == 0 || strings.Contains(strings.Join(m.transcript, "\n"), "old context") {
+		t.Fatalf("TUI transcript was not reset after /clear: %+v", m.transcript)
+	}
+}
+
 func TestMainManagerFollowsTranscriptWithoutTopPadding(t *testing.T) {
 	ctrl := control.New(control.Options{})
 	m := newChatTUI(ctrl, "", make(chan event.Event, 1), 80)
diff --git a/internal/cli/clear_confirm.go b/internal/cli/clear_confirm.go
new file mode 100644
index 000000000..ddd6ee98e
--- /dev/null
+++ b/internal/cli/clear_confirm.go
@@ -0,0 +1,79 @@
+package cli
+
+import (
+	"fmt"
+	"strings"
+
+	tea "charm.land/bubbletea/v2"
+
+	"reasonix/internal/i18n"
+)
+
+type clearConfirm struct {
+	confirm int // 0 = clear, 1 = cancel
+}
+
+func (m chatTUI) handleClearConfirmKey(msg tea.KeyPressMsg) (tea.Model, tea.Cmd) {
+	switch msg.String() {
+	case "up", "down", "left", "right", "j", "k", "tab", "shift+tab":
+		if m.clearConfirm.confirm == 0 {
+			m.clearConfirm.confirm = 1
+		} else {
+			m.clearConfirm.confirm = 0
+		}
+	case "y", "Y":
+		return m.confirmClearContext()
+	case "n", "N", "esc", "ctrl+c":
+		m.clearConfirm = nil
+	case "enter":
+		if m.clearConfirm.confirm == 0 {
+			return m.confirmClearContext()
+		}
+		m.clearConfirm = nil
+	}
+	return m, nil
+}
+
+func (m chatTUI) confirmClearContext() (tea.Model, tea.Cmd) {
+	m.clearConfirm = nil
+	if err := m.ctrl.ClearSession(); err != nil {
+		m.notice(fmt.Sprintf("%s: %v", i18n.M.SlashClearFailed, err))
+		return m, nil
+	}
+	m.resetFreshContextView(true)
+	m.notice(i18n.M.SlashClearDone)
+	return m, tea.ClearScreen
+}
+
+func (m *chatTUI) resetFreshContextView(clearTranscript bool) {
+	m.finalizeStreamed()
+	m.pending.Reset()
+	m.reasoning.Reset()
+	m.todoArgs = ""
+	m.chooser = nil
+	m.pendingApproval = nil
+	m.bubblePending = false
+	m.turnDiscarded = false
+	if clearTranscript {
+		m.transcript = nil
+		m.wrappedLines = nil
+		m.viewport.SetContent("")
+	} else {
+		m.commitLine("")
+	}
+	m.commitLine(strings.TrimRight(renderTUIBanner(m.label, "", m.width), "\n"))
+	m.transcriptDirty = true
+}
+
+func (m chatTUI) renderClearConfirm() string {
+	if m.clearConfirm == nil {
+		return ""
+	}
+	w := max(viewWidth(m.width), 40)
+	var b strings.Builder
+	b.WriteString(i18n.M.SlashClearPrompt + "\n")
+	b.WriteString(viewMeta("This deletes the current transcript from local history and keeps only the system prompt.") + "\n\n")
+	b.WriteString(rowLine(m.clearConfirm.confirm == 0, 1, "", "Clear", false) + "\n")
+	b.WriteString(rowLine(m.clearConfirm.confirm == 1, 2, "", "Cancel", false))
+	return choicePanelStyle.Width(w).Render(b.String())
+}
diff --git a/internal/cli/complete.go b/internal/cli/complete.go
index 6dad8a0a4..bc32ec515 100644
--- a/internal/cli/complete.go
+++ b/internal/cli/complete.go
@@ -62,7 +62,7 @@ func (m *chatTUI) slashItems() []compItem {
 	items := []compItem{
 		{label: "/compact", insert: "/compact ", hint: i18n.M.CmdCompact},
 		{label: "/new", insert: "/new ", hint: i18n.M.CmdNew},
-		{label: "/clear", insert: "/clear", hint: i18n.M.CmdNew},
+		{label: "/clear", insert: "/clear", hint: i18n.M.CmdClear},
 		{label: "/resume", insert: "/resume ", hint: i18n.M.CmdResume},
 		{label: "/rewind", insert: "/rewind", hint: i18n.M.CmdRewind},
 		{label: "/tree", insert: "/tree", hint: i18n.M.CmdTree},
diff --git a/internal/cli/help_view.go b/internal/cli/help_view.go
index ad7458b77..4469ab45f 100644
--- a/internal/cli/help_view.go
+++ b/internal/cli/help_view.go
@@ -57,7 +57,7 @@ func builtinHelpItems() []compItem {
 	return []compItem{
 		{label: "/compact", hint: i18n.M.CmdCompact},
 		{label: "/new", hint: i18n.M.CmdNew},
-		{label: "/clear", hint: i18n.M.CmdNew},
+		{label: "/clear", hint: i18n.M.CmdClear},
 		{label: "/rewind", hint: i18n.M.CmdRewind},
 		{label: "/tree", hint: i18n.M.CmdTree},
 		{label: "/branch", hint: i18n.M.CmdBranch},
diff --git a/internal/control/controller.go b/internal/control/controller.go
index 0b3f0934f..fdbc2b7d6 100644
--- a/internal/control/controller.go
+++ b/internal/control/controller.go
@@ -694,7 +694,7 @@ func lastAssistantText(msgs []provider.Message) string {
 // composition — emitting all output as events. The HTTP/SSE server uses this so
 // a browser client only POSTs the typed line.
 //
-// Slash commands route to the matching primitive: /compact and /new (or /clear)
+// Slash commands route to the matching primitive: /compact, /new, and /clear
 // run their session op and emit a Notice; /mcp__server__prompt and custom /commands
 // resolve to a turn; an unknown slash emits a Notice. Anything else is a normal
 // turn with its @-references resolved first.
@@ -738,7 +738,7 @@ func (c *Controller) submit(input, display string) {
 				}
 			}
 		}()
-	case trimmed == "/new" || trimmed == "/clear":
+	case trimmed == "/new":
 		go func() {
 			if err := c.NewSession(); err != nil {
 				c.notice("new session failed: " + err.Error())
@@ -746,6 +746,14 @@ func (c *Controller) submit(input, display string) {
 				c.notice("new session")
 			}
 		}()
+	case trimmed == "/clear":
+		go func() {
+			if err := c.ClearSession(); err != nil {
+				c.notice("clear context failed: " + err.Error())
+			} else {
+				c.notice("context cleared")
+			}
+		}()
 	case strings.HasPrefix(trimmed, "/mcp__"):
 		c.runGuarded(func(ctx context.Context) error {
 			sent, found, err := c.MCPPrompt(ctx, trimmed)
@@ -1267,6 +1275,57 @@ func (c *Controller) NewSession() error {
 	return nil
 }
 
+// ClearSession discards the current conversation without preserving it in
+// resume/history, then rotates to a clean session carrying the same system prompt.
+func (c *Controller) ClearSession() error {
+	if c.executor == nil {
+		return nil
+	}
+	c.mu.Lock()
+	running := c.running
+	oldPath := c.sessionPath
+	c.mu.Unlock()
+	if running {
+		return fmt.Errorf("cannot clear while a turn is running")
+	}
+	if err := removeSessionArtifacts(oldPath); err != nil {
+		return err
+	}
+	c.hooks.SessionEnd(context.Background())
+	if c.sessionDir != "" {
+		c.mu.Lock()
+		c.sessionPath = agent.NewSessionPath(c.sessionDir, c.label)
+		c.mu.Unlock()
+	}
+	c.executor.SetSession(agent.NewSession(c.systemPrompt))
+	c.rebindCheckpoints(c.SessionPath())
+	c.mu.Lock()
+	c.startedOnce = true
+	c.mu.Unlock()
+	c.hooks.SessionStart(context.Background())
+	return nil
+}
+
+func removeSessionArtifacts(path string) error {
+	if path == "" {
+		return nil
+	}
+	for _, p := range []string{path, agent.BranchMetaPath(path)} {
+		if p == "" {
+			continue
+		}
+		if err := os.Remove(p); err != nil && !os.IsNotExist(err) {
+			return err
+		}
+	}
+	if dir := ckptDir(path); dir != "" {
+		if err := os.RemoveAll(dir); err != nil && !os.IsNotExist(err) {
+			return err
+		}
+	}
+	return nil
+}
+
 // RewindScope selects what a Rewind restores.
 type RewindScope int
 
diff --git a/internal/control/controller_test.go b/internal/control/controller_test.go
index 359487aa2..054ca62e1 100644
--- a/internal/control/controller_test.go
+++ b/internal/control/controller_test.go
@@ -170,7 +170,7 @@ func TestSnapshotActivityRefreshesSessionActivity(t *testing.T) {
 	}
 }
 
-func TestSubmitClearAliasStartsFreshContextAndSavesTranscript(t *testing.T) {
+func TestNewSessionStartsFreshContextAndSavesTranscript(t *testing.T) {
 	dir := t.TempDir()
 	sess := agent.NewSession("sys")
 	sess.Add(provider.Message{Role: provider.RoleUser, Content: "old context"})
@@ -178,13 +178,11 @@ func TestSubmitClearAliasStartsFreshContextAndSavesTranscript(t *testing.T) {
 	path := filepath.Join(dir, "session.jsonl")
 	c := New(Options{Executor: exec, SystemPrompt: "sys", SessionDir: dir, SessionPath: path, Label: "test"})
 
-	c.submit("/clear", "")
-	deadline := time.Now().Add(time.Second)
-	for time.Now().Before(deadline) && c.SessionPath() == path {
-		time.Sleep(time.Millisecond)
+	if err := c.NewSession(); err != nil {
+		t.Fatal(err)
 	}
 	if c.SessionPath() == path {
-		t.Fatal("/clear did not rotate to a fresh session path")
+		t.Fatal("/new did not rotate to a fresh session path")
 	}
 	loaded, err := agent.LoadSession(path)
 	if err != nil {
@@ -199,6 +197,46 @@ func TestSubmitClearAliasStartsFreshContextAndSavesTranscript(t *testing.T) {
 	}
 }
 
+func TestSubmitClearDiscardsCurrentContextWithoutSavingTranscript(t *testing.T) {
+	dir := t.TempDir()
+	sess := agent.NewSession("sys")
+	sess.Add(provider.Message{Role: provider.RoleUser, Content: "old context"})
+	exec := agent.New(nil, nil, sess, agent.Options{}, event.Discard)
+	path := filepath.Join(dir, "session.jsonl")
+	c := New(Options{Executor: exec, SystemPrompt: "sys", SessionDir: dir, SessionPath: path, Label: "test"})
+	if err := c.Snapshot(); err != nil {
+		t.Fatal(err)
+	}
+	ckpt := ckptDir(path)
+	if err := os.MkdirAll(ckpt, 0o755); err != nil {
+		t.Fatal(err)
+	}
+	if err := os.WriteFile(filepath.Join(ckpt, "turn-0.json"), []byte("{}"), 0o644); err != nil {
+		t.Fatal(err)
+	}
+
+	c.submit("/clear", "")
+	deadline := time.Now().Add(time.Second)
+	for time.Now().Before(deadline) && c.SessionPath() == path {
+		time.Sleep(time.Millisecond)
+	}
+	if c.SessionPath() == path {
+		t.Fatal("/clear did not rotate to a fresh session path")
+	}
+	for _, p := range []string{path, agent.BranchMetaPath(path), ckpt} {
+		if _, err := os.Stat(p); !os.IsNotExist(err) {
+			t.Fatalf("discarded artifact %s still exists or stat failed with %v", p, err)
+		}
+	}
+	if _, err := os.Stat(c.SessionPath()); !os.IsNotExist(err) {
+		t.Fatalf("fresh empty session should not be saved yet; stat err=%v", err)
+	}
+	current := exec.Session().Snapshot()
+	if len(current) != 1 || current[0].Role != provider.RoleSystem || current[0].Content != "sys" {
+		t.Fatalf("cleared context = %+v, want only system prompt", current)
+	}
+}
+
 func TestDisconnectMCPServerRemovesLazyPlaceholder(t *testing.T) {
 	reg := tool.NewRegistry()
 	reg.Add(fakeControlTool{name: "mcp__mock__connect"})
diff --git a/internal/i18n/i18n.go b/internal/i18n/i18n.go
index 73ff0d206..70f6688c0 100644
--- a/internal/i18n/i18n.go
+++ b/internal/i18n/i18n.go
@@ -120,8 +120,11 @@ type Messages struct {
 	// chat TUI slash commands.
 	SlashCompactDone   string // "/compact" succeeded
 	SlashCompactFailed string // "/compact" errored, prefixed before the underlying error
-	SlashNewDone       string // "/new" or "/clear" succeeded
-	SlashNewFailed     string // "/new" or "/clear" errored
+	SlashNewDone       string // "/new" succeeded
+	SlashNewFailed     string // "/new" errored
+	SlashClearPrompt   string // "/clear" destructive confirmation prompt
+	SlashClearDone     string // "/clear" succeeded
+	SlashClearFailed   string // "/clear" errored
 	SlashTodoCleared   string // "/todo" dismissed the pinned task list
 	SlashUnavailable   string // the command is configured off (no callback wired)
 	SlashUnknown       string // shown when the user types an unrecognised "/cmd"
@@ -140,7 +143,8 @@ type Messages struct {
 
 	// slash command + sub-command descriptions shown in the menu (CLI and desktop
 	// share these via i18n.M, so both frontends localize identically).
-	CmdNew          string // /new, /clear
+	CmdNew          string // /new
+	CmdClear        string // /clear
 	CmdCompact      string // /compact
 	CmdRewind       string // /rewind
 	CmdTree         string // /tree
diff --git a/internal/i18n/messages_en.go b/internal/i18n/messages_en.go
index b0f2cf84a..d07bb2832 100644
--- a/internal/i18n/messages_en.go
+++ b/internal/i18n/messages_en.go
@@ -89,12 +89,15 @@ var English = Messages{
 
 	SlashCompactDone:   "session compacted — older middle replaced by a summary, recent turns kept",
 	SlashCompactFailed: "compaction failed",
-	SlashNewDone:       "fresh context started — previous transcript saved",
+	SlashNewDone:       "new session started — previous transcript saved",
 	SlashNewFailed:     "could not start a new session",
+	SlashClearPrompt:   "Clear current context without saving?",
+	SlashClearDone:     "current context cleared",
+	SlashClearFailed:   "could not clear current context",
 	SlashUnavailable:   "command unavailable in this build",
 	SlashUnknown:       "unknown command",
 	SlashTodoCleared:   "task list dismissed",
-	SlashHelp:          "commands: /compact · /new (/clear) · /resume · /rewind · /tree · /branch · /switch · /todo · /verbose · /model (switch model) · /effort · /theme · /language · /mcp · /skills · /hooks · /paste-image · /memory · /goal · /remember · /quit · /help · plus skills (/init, /explore, …)",
+	SlashHelp:          "commands: /compact · /new · /clear · /resume · /rewind · /tree · /branch · /switch · /todo · /verbose · /model (switch model) · /effort · /theme · /language · /mcp · /skills · /hooks · /paste-image · /memory · /goal · /remember · /quit · /help · plus skills (/init, /explore, …)",
 
 	SkillPickerTitle:             "Skills",
 	SkillPickerAvailableFmt:      "%d available",
@@ -151,7 +154,8 @@ var English = Messages{
 	ShellExecTimeoutFmt: "shell command timed out (> %s)",
 	ShellModeHint:       "Enter runs shell · Esc cancels · click output to expand",
 
-	CmdNew:          "start fresh context; save transcript",
+	CmdNew:          "start new session; save transcript",
+	CmdClear:        "discard current context",
 	CmdCompact:      "compact context",
 	CmdRewind:       "rewind to an earlier turn",
 	CmdTree:         "show conversation branches",
diff --git a/internal/i18n/messages_zh.go b/internal/i18n/messages_zh.go
index 3f2501bad..22d78813e 100644
--- a/internal/i18n/messages_zh.go
+++ b/internal/i18n/messages_zh.go
@@ -90,12 +90,15 @@ var Chinese = Messages{
 
 	SlashCompactDone:   "已压缩 — 旧的中段换成一段摘要，最近几轮保留原样",
 	SlashCompactFailed: "压缩失败",
-	SlashNewDone:       "已开启新上下文 — 之前的对话已存档",
+	SlashNewDone:       "已开启新会话 — 之前的对话已存档",
 	SlashNewFailed:     "新建会话失败",
+	SlashClearPrompt:   "清空当前上下文且不保存？",
+	SlashClearDone:     "已清空当前上下文",
+	SlashClearFailed:   "清空当前上下文失败",
 	SlashUnavailable:   "当前构建不支持该命令",
 	SlashUnknown:       "未知命令",
 	SlashTodoCleared:   "已清除任务清单",
-	SlashHelp:          "命令：/compact · /new（/clear）· /resume · /rewind · /tree · /branch · /switch · /todo · /verbose · /model（切换模型）· /effort · /theme · /language · /mcp · /skills · /hooks · /paste-image · /memory · /goal · /remember · /quit · /help · 以及 skills（/init、/explore …）",
+	SlashHelp:          "命令：/compact · /new · /clear · /resume · /rewind · /tree · /branch · /switch · /todo · /verbose · /model（切换模型）· /effort · /theme · /language · /mcp · /skills · /hooks · /paste-image · /memory · /goal · /remember · /quit · /help · 以及 skills（/init、/explore …）",
 
 	SkillPickerTitle:             "Skills",
 	SkillPickerAvailableFmt:      "%d 个可用",
@@ -152,7 +155,8 @@ var Chinese = Messages{
 	ShellExecTimeoutFmt: "Shell 命令超时（>%s）",
 	ShellModeHint:       "Enter 执行 Shell · Esc 取消 · 点击输出展开",
 
-	CmdNew:          "清空上下文并保存历史",
+	CmdNew:          "开启新会话并保存历史",
+	CmdClear:        "丢弃当前上下文",
 	CmdCompact:      "压缩上下文",
 	CmdRewind:       "回滚到更早的一轮",
 	CmdTree:         "查看对话分支树",

From f52db0e4ed7dedc145939c48e505cf9f0104162e Mon Sep 17 00:00:00 2001
From: TaoMu <1724815229@qq.com>
Date: Wed, 10 Jun 2026 15:07:17 +1000
Subject: [PATCH 54/64] fix desktop workspace session isolation (#3029)

---
 desktop/app.go               | 122 ++++++++++++++++++++++++++++-------
 desktop/app_test.go          |  93 ++++++++++++++++++++++++++
 desktop/sessions.go          |  24 +++++++
 desktop/settings_app.go      |   1 +
 desktop/tabs.go              | 122 ++++++++++++++++++++++++++++-------
 desktop/tabs_topic_test.go   |  20 ++++++
 desktop/workspace_test.go    |  57 +++++++++++++++-
 internal/boot/boot.go        |  10 ++-
 internal/boot/boot_test.go   |  34 ++++++++++
 internal/plugin/lazy.go      |  25 ++++++-
 internal/plugin/lazy_test.go |  32 +++++++++
 internal/plugin/plugin.go    |  58 +++++++++++++++++
 12 files changed, 543 insertions(+), 55 deletions(-)

diff --git a/desktop/app.go b/desktop/app.go
index cd81d586a..0cf7808c3 100644
--- a/desktop/app.go
+++ b/desktop/app.go
@@ -995,11 +995,42 @@ type WorkspaceMeta struct {
 	Current bool   `json:"current"`
 }
 
+func controllerSessionDir(ctrl *control.Controller) string {
+	if ctrl != nil {
+		if dir := ctrl.SessionDir(); dir != "" {
+			return dir
+		}
+	}
+	return desktopSessionDir("")
+}
+
+func tabSessionDir(tab *WorkspaceTab) string {
+	if tab != nil {
+		if tab.Ctrl != nil {
+			if dir := tab.Ctrl.SessionDir(); dir != "" {
+				return dir
+			}
+		}
+		if tab.WorkspaceRoot != "" {
+			return desktopSessionDir(tab.WorkspaceRoot)
+		}
+	}
+	return desktopSessionDir("")
+}
+
+func (a *App) activeSessionDir() string {
+	a.mu.RLock()
+	tab := a.activeTabLocked()
+	dir := tabSessionDir(tab)
+	a.mu.RUnlock()
+	return dir
+}
+
 // ListSessions returns the saved sessions newest-first for the history panel,
 // marking the one the current conversation is writing to and attaching any
 // user-chosen titles.
 func (a *App) ListSessions() []SessionMeta {
-	dir := config.SessionDir()
+	dir := a.activeSessionDir()
 	infos, err := agent.ListSessions(dir)
 	if err != nil {
 		return []SessionMeta{}
@@ -1018,20 +1049,21 @@ func (a *App) ListSessions() []SessionMeta {
 // ListTrashedSessions returns sessions that were moved to the local trash,
 // newest-deleted first. These can be previewed, restored, or permanently purged.
 func (a *App) ListTrashedSessions() []SessionMeta {
-	dir := config.SessionDir()
-	paths, err := listTrashedSessionFiles(dir)
-	if err != nil {
-		return []SessionMeta{}
-	}
-	titles := loadSessionTitles(dir)
-	out := make([]SessionMeta, 0, len(paths))
-	for _, path := range paths {
-		infos, err := agent.ListSessions(filepath.Dir(path))
-		if err != nil || len(infos) == 0 {
+	out := []SessionMeta{}
+	for _, dir := range a.knownSessionDirs() {
+		paths, err := listTrashedSessionFiles(dir)
+		if err != nil {
 			continue
 		}
-		deletedAt := trashedSessionDeletedAt(path)
-		out = append(out, sessionMetaFromInfo(infos[0], titles[filepath.Base(path)], false, false, deletedAt))
+		titles := loadSessionTitles(dir)
+		for _, path := range paths {
+			infos, err := agent.ListSessions(filepath.Dir(path))
+			if err != nil || len(infos) == 0 {
+				continue
+			}
+			deletedAt := trashedSessionDeletedAt(path)
+			out = append(out, sessionMetaFromInfo(infos[0], titles[filepath.Base(path)], false, false, deletedAt))
+		}
 	}
 	sort.Slice(out, func(i, j int) bool {
 		if out[i].DeletedAt == out[j].DeletedAt {
@@ -1042,6 +1074,25 @@ func (a *App) ListTrashedSessions() []SessionMeta {
 	return out
 }
 
+func (a *App) trashedSessionDir(path string) (string, error) {
+	for _, dir := range a.knownSessionDirs() {
+		if _, _, _, err := validateTrashedSessionPath(dir, path); err == nil {
+			return dir, nil
+		}
+	}
+	return "", fmt.Errorf("trashed session path outside known session dirs: %s", path)
+}
+
+func (a *App) sessionDirForPath(path string) (string, string, error) {
+	for _, dir := range a.knownSessionDirs() {
+		sessionPath, _, err := validateSessionPath(dir, path)
+		if err == nil {
+			return dir, sessionPath, nil
+		}
+	}
+	return "", "", fmt.Errorf("session path outside known session dirs: %s", path)
+}
+
 func sessionMetaFromInfo(s agent.SessionInfo, title string, current, open bool, deletedAt int64) SessionMeta {
 	return SessionMeta{
 		Path:           s.Path,
@@ -1064,7 +1115,7 @@ func sessionMetaFromInfo(s agent.SessionInfo, title string, current, open bool,
 // DeleteSession moves a saved session to the local trash. It refuses any open
 // session because tab auto-save would recreate or append to the file later.
 func (a *App) DeleteSession(path string) error {
-	dir := config.SessionDir()
+	dir := a.activeSessionDir()
 	sessionPath, key, err := validateSessionPath(dir, path)
 	if err != nil {
 		return err
@@ -1115,7 +1166,10 @@ func (a *App) activeSessionPath(dir string) string {
 
 // RestoreSession moves a trashed session back into the saved-session list.
 func (a *App) RestoreSession(path string) error {
-	dir := config.SessionDir()
+	dir, err := a.trashedSessionDir(path)
+	if err != nil {
+		return err
+	}
 	_, key, _, err := validateTrashedSessionPath(dir, path)
 	if err != nil {
 		return err
@@ -1133,13 +1187,17 @@ func (a *App) RestoreSession(path string) error {
 // PurgeTrashedSession permanently removes a trashed session and its title/display
 // sidecars.
 func (a *App) PurgeTrashedSession(path string) error {
-	return purgeTrashedSessionFile(config.SessionDir(), path)
+	dir, err := a.trashedSessionDir(path)
+	if err != nil {
+		return err
+	}
+	return purgeTrashedSessionFile(dir, path)
 }
 
 // RenameSession sets a custom display name for a session (empty clears it back to
 // the preview). It only affects the history panel; the file on disk is unchanged.
 func (a *App) RenameSession(path, title string) error {
-	return setSessionTitle(config.SessionDir(), path, title)
+	return setSessionTitle(a.activeSessionDir(), path, title)
 }
 
 // ResumeSession snapshots the current conversation, then loads the session at
@@ -1160,20 +1218,28 @@ func (a *App) ResumeSessionForTab(tabID, path string) ([]HistoryMessage, error)
 		return []HistoryMessage{}, fmt.Errorf("tab is not ready")
 	}
 	ctrl := tab.Ctrl
-	loaded, err := agent.LoadSession(path)
+	sessionPath, _, err := validateSessionPath(controllerSessionDir(ctrl), path)
+	if err != nil {
+		return nil, err
+	}
+	loaded, err := agent.LoadSession(sessionPath)
 	if err != nil {
 		return nil, err
 	}
 	_ = ctrl.Snapshot() // persist the current session before switching away
-	ctrl.Resume(loaded, path)
-	a.rememberTabSessionPath(tab, path)
+	ctrl.Resume(loaded, sessionPath)
+	a.rememberTabSessionPath(tab, sessionPath)
 	return a.HistoryForTab(tabID), nil
 }
 
 // PreviewSession reads a saved session for display only. It does not snapshot or
 // swap the active controller, so the history drawer can call it while a turn runs.
 func (a *App) PreviewSession(path string) ([]HistoryMessage, error) {
-	return previewSessionMessages(config.SessionDir(), path)
+	sessionDir, sessionPath, err := a.sessionDirForPath(path)
+	if err != nil {
+		return nil, err
+	}
+	return previewSessionMessages(sessionDir, sessionPath)
 }
 
 // PickWorkspace opens a folder chooser and, on a pick, opens a new project tab
@@ -1388,7 +1454,7 @@ func (a *App) HistoryForTab(tabID string) []HistoryMessage {
 		return []HistoryMessage{}
 	}
 	msgs := ctrl.History()
-	return historyMessages(msgs, sessionDisplayResolver(config.SessionDir(), ctrl.SessionPath()))
+	return historyMessages(msgs, sessionDisplayResolver(controllerSessionDir(ctrl), ctrl.SessionPath()))
 }
 
 func historyMessages(msgs []provider.Message, resolveUserContent func(string) string) []HistoryMessage {
@@ -1422,14 +1488,18 @@ func historyMessages(msgs []provider.Message, resolveUserContent func(string) st
 }
 
 func previewSessionMessages(sessionDir, path string) ([]HistoryMessage, error) {
-	if out, ok, err := previewEventSessionMessages(path); ok || err != nil {
+	sessionPath, _, err := validateSessionPath(sessionDir, path)
+	if err != nil {
+		return nil, err
+	}
+	if out, ok, err := previewEventSessionMessages(sessionPath); ok || err != nil {
 		return out, err
 	}
-	loaded, err := agent.LoadSession(path)
+	loaded, err := agent.LoadSession(sessionPath)
 	if err != nil {
 		return nil, err
 	}
-	return historyMessages(loaded.Snapshot(), sessionDisplayResolver(sessionDir, path)), nil
+	return historyMessages(loaded.Snapshot(), sessionDisplayResolver(sessionDir, sessionPath)), nil
 }
 
 type previewEventRecord struct {
@@ -3054,6 +3124,7 @@ func (a *App) SetModelForTab(tabID, name string) error {
 		RequireKey:     false,
 		Sink:           tab.sink,
 		WorkspaceRoot:  tab.WorkspaceRoot,
+		SessionDir:     tabSessionDir(tab),
 		EffortOverride: cloneStringPtr(effortOverride),
 	})
 	if err != nil {
@@ -3147,6 +3218,7 @@ func (a *App) SetEffortForTab(tabID, level string) error {
 		RequireKey:     false,
 		Sink:           tab.sink,
 		WorkspaceRoot:  tab.WorkspaceRoot,
+		SessionDir:     tabSessionDir(tab),
 		EffortOverride: &effort,
 	})
 	if err != nil {
diff --git a/desktop/app_test.go b/desktop/app_test.go
index 4e8109fee..c349a8b84 100644
--- a/desktop/app_test.go
+++ b/desktop/app_test.go
@@ -3,6 +3,7 @@ package main
 import (
 	"context"
 	"errors"
+	"fmt"
 	"os"
 	"path/filepath"
 	"reflect"
@@ -1155,6 +1156,98 @@ func TestDeleteSessionRejectsInactiveOpenTab(t *testing.T) {
 	}
 }
 
+func TestDesktopSessionAPIsUseControllerSessionDir(t *testing.T) {
+	isolateDesktopUserDirs(t)
+
+	dirA := filepath.Join(t.TempDir(), "workspace-a-sessions")
+	dirB := filepath.Join(t.TempDir(), "workspace-b-sessions")
+	if err := os.MkdirAll(dirA, 0o755); err != nil {
+		t.Fatalf("mkdir dirA: %v", err)
+	}
+	if err := os.MkdirAll(dirB, 0o755); err != nil {
+		t.Fatalf("mkdir dirB: %v", err)
+	}
+	pathA := filepath.Join(dirA, "a.jsonl")
+	pathB := filepath.Join(dirB, "b.jsonl")
+	if err := os.WriteFile(pathA, []byte(`{"role":"user","content":"workspace A"}`+"\n"), 0o644); err != nil {
+		t.Fatalf("write pathA: %v", err)
+	}
+	if err := os.WriteFile(pathB, []byte(`{"role":"user","content":"workspace B"}`+"\n"), 0o644); err != nil {
+		t.Fatalf("write pathB: %v", err)
+	}
+
+	app := NewApp()
+	app.setTestCtrl(control.New(control.Options{SessionDir: dirA, SessionPath: pathA, Label: "test"}), "")
+	defer app.activeCtrl().Close()
+
+	sessions := app.ListSessions()
+	if len(sessions) != 1 || sessions[0].Path != pathA || sessions[0].Preview != "workspace A" {
+		t.Fatalf("ListSessions should read the active controller session dir only, got %+v", sessions)
+	}
+	if err := app.RenameSession(pathA, "A title"); err != nil {
+		t.Fatalf("RenameSession in active session dir: %v", err)
+	}
+	if titles := loadSessionTitles(dirA); titles["a.jsonl"] != "A title" {
+		t.Fatalf("title should be written beside the active session, got %+v", titles)
+	}
+	if titles := loadSessionTitles(dirB); len(titles) != 0 {
+		t.Fatalf("inactive workspace title sidecar should remain untouched, got %+v", titles)
+	}
+}
+
+func TestResumeSessionRejectsPathOutsideControllerSessionDir(t *testing.T) {
+	dirA := t.TempDir()
+	dirB := t.TempDir()
+	activePath := filepath.Join(dirA, "active.jsonl")
+	outsidePath := filepath.Join(dirB, "outside.jsonl")
+	for _, path := range []string{activePath, outsidePath} {
+		if err := os.WriteFile(path, []byte(`{"role":"user","content":"hello"}`+"\n"), 0o644); err != nil {
+			t.Fatalf("write %s: %v", path, err)
+		}
+	}
+
+	app := NewApp()
+	app.setTestCtrl(control.New(control.Options{SessionDir: dirA, SessionPath: activePath, Label: "test"}), "")
+	defer app.activeCtrl().Close()
+
+	if _, err := app.ResumeSession(outsidePath); err == nil {
+		t.Fatal("ResumeSession should reject a transcript outside the active session dir")
+	}
+	if _, err := app.PreviewSession(outsidePath); err == nil {
+		t.Fatal("PreviewSession should reject a transcript outside the active session dir")
+	}
+}
+
+func BenchmarkDesktopListSessionsScoped(b *testing.B) {
+	dirA := filepath.Join(b.TempDir(), "workspace-a-sessions")
+	dirB := filepath.Join(b.TempDir(), "workspace-b-sessions")
+	for _, dir := range []string{dirA, dirB} {
+		if err := os.MkdirAll(dir, 0o755); err != nil {
+			b.Fatalf("mkdir %s: %v", dir, err)
+		}
+		for i := 0; i < 120; i++ {
+			path := filepath.Join(dir, fmt.Sprintf("session-%03d.jsonl", i))
+			body := fmt.Sprintf(`{"role":"user","content":"session %03d"}`+"\n", i)
+			if err := os.WriteFile(path, []byte(body), 0o644); err != nil {
+				b.Fatalf("write session: %v", err)
+			}
+		}
+	}
+
+	app := NewApp()
+	app.setTestCtrl(control.New(control.Options{SessionDir: dirA, SessionPath: filepath.Join(dirA, "session-000.jsonl"), Label: "test"}), "")
+	defer app.activeCtrl().Close()
+
+	b.ReportAllocs()
+	b.ResetTimer()
+	for i := 0; i < b.N; i++ {
+		sessions := app.ListSessions()
+		if len(sessions) != 120 {
+			b.Fatalf("ListSessions len = %d, want 120", len(sessions))
+		}
+	}
+}
+
 type appendingDesktopRunner struct {
 	session *agent.Session
 	started chan string
diff --git a/desktop/sessions.go b/desktop/sessions.go
index b9a57aa0f..0d645f517 100644
--- a/desktop/sessions.go
+++ b/desktop/sessions.go
@@ -11,6 +11,7 @@ import (
 	"time"
 
 	"reasonix/internal/agent"
+	"reasonix/internal/config"
 	"reasonix/internal/control"
 	"reasonix/internal/fileutil"
 )
@@ -34,6 +35,29 @@ func sessionTitlesPath(dir string) string  { return filepath.Join(dir, sessionTi
 func sessionDisplayPath(dir string) string { return filepath.Join(dir, sessionDisplayFile) }
 func sessionTrashPath(dir string) string   { return filepath.Join(dir, sessionTrashDir) }
 
+func desktopSessionDir(root string) string {
+	base := config.MemoryUserDir()
+	if base == "" {
+		return config.SessionDir()
+	}
+	root = strings.TrimSpace(root)
+	if root == "" {
+		cwd, err := os.Getwd()
+		if err != nil {
+			return config.SessionDir()
+		}
+		root = cwd
+	}
+	if abs, err := filepath.Abs(root); err == nil {
+		root = abs
+	}
+	return filepath.Join(base, "projects", desktopWorkspaceSlug(root), "sessions")
+}
+
+func desktopWorkspaceSlug(absPath string) string {
+	return strings.NewReplacer(string(os.PathSeparator), "-", "/", "-", "\\", "-", ":", "-").Replace(absPath)
+}
+
 // loadSessionTitles reads the basename→title map (missing/corrupt → empty).
 func loadSessionTitles(dir string) map[string]string {
 	m := map[string]string{}
diff --git a/desktop/settings_app.go b/desktop/settings_app.go
index fb6484809..d467ce11e 100644
--- a/desktop/settings_app.go
+++ b/desktop/settings_app.go
@@ -585,6 +585,7 @@ func (a *App) rebuild() error {
 		Model: model, RequireKey: false,
 		Sink:           tab.sink,
 		WorkspaceRoot:  tab.WorkspaceRoot,
+		SessionDir:     tabSessionDir(tab),
 		EffortOverride: cloneStringPtr(tab.effort),
 	})
 	if err != nil {
diff --git a/desktop/tabs.go b/desktop/tabs.go
index abfc80ee9..5ee4c8c71 100644
--- a/desktop/tabs.go
+++ b/desktop/tabs.go
@@ -721,11 +721,39 @@ func (a *App) buildTabController(tab *WorkspaceTab) {
 		tab.sink.ctx = wailsCtx
 	}
 
+	sessionDir := desktopSessionDir(root)
+	topicID := strings.TrimSpace(tab.TopicID)
+	if tab.Scope == "global" {
+		migratedTopics := migrateLegacySessionsIntoGlobalTopics(config.SessionDir())
+		if len(migratedTopics) > 0 {
+			a.emitProjectTreeChanged()
+		}
+		if topicID == "" && len(migratedTopics) > 0 {
+			topicID = migratedTopics[0]
+			topicTitle := topicTitleForTab("global", "", topicID)
+			a.mu.Lock()
+			if strings.TrimSpace(tab.TopicID) == "" {
+				tab.TopicID = topicID
+				tab.TopicTitle = topicTitle
+				a.saveTabsLocked()
+			} else {
+				topicID = strings.TrimSpace(tab.TopicID)
+			}
+			a.mu.Unlock()
+		}
+	}
+	if topicID != "" {
+		if _, dir := a.findKnownTopicSession(topicID); dir != "" {
+			sessionDir = dir
+		}
+	}
+
 	ctrl, err := boot.Build(buildCtx, boot.Options{
 		Model:          model,
 		RequireKey:     false,
 		Sink:           tab.sink,
 		WorkspaceRoot:  root,
+		SessionDir:     sessionDir,
 		EffortOverride: cloneStringPtr(tab.effort),
 	})
 	if err != nil {
@@ -2288,20 +2316,22 @@ func (a *App) updateTopicSessionTitles(topicID, title string) {
 	if strings.TrimSpace(topicID) == "" || strings.TrimSpace(title) == "" {
 		return
 	}
-	infos, err := agent.ListSessions(config.SessionDir())
-	if err != nil {
-		return
-	}
-	for _, info := range infos {
-		if info.TopicID != topicID {
+	for _, dir := range a.knownSessionDirs() {
+		infos, err := agent.ListSessions(dir)
+		if err != nil {
 			continue
 		}
-		meta, ok, err := agent.LoadBranchMeta(info.Path)
-		if err != nil || !ok {
-			continue
+		for _, info := range infos {
+			if info.TopicID != topicID {
+				continue
+			}
+			meta, ok, err := agent.LoadBranchMeta(info.Path)
+			if err != nil || !ok {
+				continue
+			}
+			meta.TopicTitle = title
+			_ = agent.SaveBranchMetaPreserveUpdated(info.Path, meta)
 		}
-		meta.TopicTitle = title
-		_ = agent.SaveBranchMetaPreserveUpdated(info.Path, meta)
 	}
 }
 
@@ -2381,7 +2411,6 @@ func (a *App) TrashTopic(topicID string) error {
 	if strings.TrimSpace(topicID) == "" {
 		return fmt.Errorf("topicID is required")
 	}
-	dir := config.SessionDir()
 
 	type topicTab struct {
 		id            string
@@ -2452,20 +2481,22 @@ func (a *App) TrashTopic(topicID string) error {
 		a.mu.Unlock()
 	}
 
-	infos, err := agent.ListSessions(dir)
-	if err != nil {
-		return err
-	}
-	for _, info := range infos {
-		if info.TopicID != topicID {
-			continue
-		}
-		sessionPath, _, err := validateSessionPath(dir, info.Path)
+	for _, dir := range a.knownSessionDirs() {
+		infos, err := agent.ListSessions(dir)
 		if err != nil {
 			return err
 		}
-		if err := deleteSessionFile(dir, sessionPath); err != nil {
-			return err
+		for _, info := range infos {
+			if info.TopicID != topicID {
+				continue
+			}
+			sessionPath, _, err := validateSessionPath(dir, info.Path)
+			if err != nil {
+				return err
+			}
+			if err := deleteSessionFile(dir, sessionPath); err != nil {
+				return err
+			}
 		}
 	}
 	if err := a.DeleteTopic(topicID); err != nil {
@@ -2503,7 +2534,11 @@ func (a *App) ListProjectTree() []ProjectNode {
 		lastActivityAt int64
 	}
 	topicSummaries := map[string]topicSummary{}
-	if infos, err := agent.ListSessions(config.SessionDir()); err == nil {
+	for _, dir := range a.knownSessionDirs() {
+		infos, err := agent.ListSessions(dir)
+		if err != nil {
+			continue
+		}
 		for _, info := range infos {
 			if strings.TrimSpace(info.TopicID) == "" {
 				continue
@@ -2980,6 +3015,36 @@ func (a *App) persistTabSessionPath(tab *WorkspaceTab, path string) {
 	a.rememberTabSessionPath(tab, path)
 }
 
+func (a *App) knownSessionDirs() []string {
+	seen := map[string]bool{}
+	out := []string{}
+	add := func(dir string) {
+		dir = strings.TrimSpace(dir)
+		if dir == "" {
+			return
+		}
+		if abs, err := filepath.Abs(dir); err == nil {
+			dir = abs
+		}
+		if seen[dir] {
+			return
+		}
+		seen[dir] = true
+		out = append(out, dir)
+	}
+	add(config.SessionDir()) // legacy/global sessions from earlier desktop builds
+	add(desktopSessionDir(globalWorkspaceRoot()))
+	for _, project := range loadProjectsFile().Projects {
+		add(desktopSessionDir(project.Root))
+	}
+	a.mu.RLock()
+	for _, tab := range a.tabs {
+		add(tabSessionDir(tab))
+	}
+	a.mu.RUnlock()
+	return out
+}
+
 // findTopicSession scans the session directory for a .jsonl file whose .meta
 // carries the given topicID. Returns the most recently updated match, or ""
 // if no session exists for this topic.
@@ -3012,3 +3077,12 @@ func findTopicSession(dir, topicID string) string {
 	}
 	return bestPath
 }
+
+func (a *App) findKnownTopicSession(topicID string) (string, string) {
+	for _, dir := range a.knownSessionDirs() {
+		if path := findTopicSession(dir, topicID); path != "" {
+			return path, dir
+		}
+	}
+	return "", ""
+}
diff --git a/desktop/tabs_topic_test.go b/desktop/tabs_topic_test.go
index 1371dc3db..4f7632fe6 100644
--- a/desktop/tabs_topic_test.go
+++ b/desktop/tabs_topic_test.go
@@ -12,6 +12,7 @@ import (
 
 	"reasonix/internal/agent"
 	"reasonix/internal/config"
+	"reasonix/internal/control"
 )
 
 func waitForTabReady(t *testing.T, app *App, tabID string) *WorkspaceTab {
@@ -1078,6 +1079,9 @@ func TestRestoreSessionWithoutTopicMetadataFallsBackToGlobal(t *testing.T) {
 	sessionPath := writeLegacySession(t, dir, "restore-orphan.jsonl", "restore orphan history", time.Now().Add(-time.Hour))
 	topicID := legacySessionTopicID(sessionPath)
 	app := NewApp()
+	ctrl := control.New(control.Options{SessionDir: dir, SessionPath: filepath.Join(dir, "active.jsonl"), Label: "test"})
+	app.setTestCtrl(ctrl, "")
+	defer ctrl.Close()
 	if err := app.DeleteSession(sessionPath); err != nil {
 		t.Fatalf("delete orphan session: %v", err)
 	}
@@ -1163,11 +1167,27 @@ func TestTrashTopicMovesOpenSessionToTrash(t *testing.T) {
 	if len(trashed) != 1 || trashed[0].Path != trashPath {
 		t.Fatalf("trashed sessions = %#v, want %q", trashed, trashPath)
 	}
+	preview, err := app.PreviewSession(trashPath)
+	if err != nil {
+		t.Fatalf("preview trashed session: %v", err)
+	}
+	if !hasHistoryContent(preview, "remember this turn") {
+		t.Fatalf("preview trashed session = %#v, want remembered turn", preview)
+	}
 	if got := loadTopicTitle(projectRoot, topicID); got != "" {
 		t.Fatalf("topic title should be removed, got %q", got)
 	}
 }
 
+func hasHistoryContent(messages []HistoryMessage, content string) bool {
+	for _, m := range messages {
+		if m.Content == content {
+			return true
+		}
+	}
+	return false
+}
+
 func TestLegacyMigrationSkipsProjectScopedSessions(t *testing.T) {
 	isolateDesktopUserDirs(t)
 	dir := config.SessionDir()
diff --git a/desktop/workspace_test.go b/desktop/workspace_test.go
index c4ce03ecf..381e9e76a 100644
--- a/desktop/workspace_test.go
+++ b/desktop/workspace_test.go
@@ -7,11 +7,13 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"runtime"
 	"strings"
 	"testing"
 	"time"
 
 	"golang.org/x/text/encoding/simplifiedchinese"
+	"reasonix/internal/config"
 )
 
 // --- workspaceStatePath ---
@@ -85,6 +87,50 @@ func TestDialogDefaultDirectoryUsesFileParent(t *testing.T) {
 	}
 }
 
+func TestDesktopSessionDirIsScopedByWorkspace(t *testing.T) {
+	t.Setenv("HOME", t.TempDir())
+	t.Setenv("USERPROFILE", t.TempDir())
+	t.Setenv("XDG_CONFIG_HOME", t.TempDir())
+
+	rootA := filepath.Join(t.TempDir(), "project-a")
+	rootB := filepath.Join(t.TempDir(), "project-b")
+	if err := os.MkdirAll(rootA, 0o755); err != nil {
+		t.Fatal(err)
+	}
+	if err := os.MkdirAll(rootB, 0o755); err != nil {
+		t.Fatal(err)
+	}
+
+	dirA := desktopSessionDir(rootA)
+	dirB := desktopSessionDir(rootB)
+	if dirA == "" || dirB == "" {
+		t.Fatalf("desktop session dirs should resolve: A=%q B=%q", dirA, dirB)
+	}
+	if dirA == dirB {
+		t.Fatalf("different workspaces must not share a desktop session dir: %q", dirA)
+	}
+	if dirA == config.SessionDir() || dirB == config.SessionDir() {
+		t.Fatalf("desktop workspace sessions should not use the global CLI session dir: A=%q B=%q global=%q", dirA, dirB, config.SessionDir())
+	}
+	wantPrefix := filepath.Join(config.MemoryUserDir(), "projects") + string(filepath.Separator)
+	if !strings.HasPrefix(dirA, wantPrefix) || filepath.Base(dirA) != "sessions" {
+		t.Fatalf("workspace session dir should live under the project state tree, got %q", dirA)
+	}
+}
+
+func BenchmarkDesktopSessionDir(b *testing.B) {
+	root := filepath.Join(b.TempDir(), "project")
+	if err := os.MkdirAll(root, 0o755); err != nil {
+		b.Fatal(err)
+	}
+	b.ReportAllocs()
+	for i := 0; i < b.N; i++ {
+		if desktopSessionDir(root) == "" {
+			b.Fatal("empty session dir")
+		}
+	}
+}
+
 // --- cwdWritable ---
 
 func TestCwdWritable(t *testing.T) {
@@ -265,14 +311,21 @@ func TestMediaTokenHandlerEscapedFilename(t *testing.T) {
 	}
 
 	name := `weird "file" name.png`
+	rawURLChars := []string{" ", `"`}
+	if runtime.GOOS == "windows" {
+		name = "weird #file name.png"
+		rawURLChars = []string{" ", "#"}
+	}
 	if err := os.WriteFile(name, []byte("png"), 0o644); err != nil {
 		t.Fatal(err)
 	}
 
 	app := NewApp()
 	preview := app.ReadFile(name)
-	if strings.Contains(preview.URL, " ") || strings.Contains(preview.URL, `"`) {
-		t.Fatalf("media URL should path-escape filename, got %q", preview.URL)
+	for _, raw := range rawURLChars {
+		if strings.Contains(preview.URL, raw) {
+			t.Fatalf("media URL should path-escape %q in filename, got %q", raw, preview.URL)
+		}
 	}
 
 	handler := app.workspaceMediaMiddleware()(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
diff --git a/internal/boot/boot.go b/internal/boot/boot.go
index a058dfff1..a0b2ea192 100644
--- a/internal/boot/boot.go
+++ b/internal/boot/boot.go
@@ -76,6 +76,9 @@ type Options struct {
 	// (for example ACP session/new). They are connected eagerly for this
 	// controller but are not persisted to reasonix.toml.
 	ExtraPlugins []plugin.Spec
+	// SessionDir overrides where persisted chat transcripts are written. When
+	// empty, the shared CLI/global session directory is used.
+	SessionDir string
 }
 
 // Build loads config, resolves the model(s), and returns a Controller wrapping a
@@ -691,6 +694,11 @@ func Build(ctx context.Context, opts Options) (*control.Controller, error) {
 		classifier = control.NewProviderAutoPlanClassifier(classifierProv)
 	}
 
+	sessionDir := opts.SessionDir
+	if sessionDir == "" {
+		sessionDir = config.SessionDir()
+	}
+
 	ctrlOpts := control.Options{
 		Runner:        runner,
 		Executor:      executor,
@@ -698,7 +706,7 @@ func Build(ctx context.Context, opts Options) (*control.Controller, error) {
 		Policy:        policy,
 		Label:         label,
 		SystemPrompt:  sysPrompt,
-		SessionDir:    config.SessionDir(),
+		SessionDir:    sessionDir,
 		Host:          pluginHost,
 		Commands:      cmds,
 		Skills:        skills,
diff --git a/internal/boot/boot_test.go b/internal/boot/boot_test.go
index 1809eba44..d58f7595e 100644
--- a/internal/boot/boot_test.go
+++ b/internal/boot/boot_test.go
@@ -444,6 +444,40 @@ func TestNewProviderAppliesModelReasoningProtocol(t *testing.T) {
 	}
 }
 
+func TestBuildHonorsSessionDirOverride(t *testing.T) {
+	dir := t.TempDir()
+	home := t.TempDir()
+	t.Setenv("HOME", home)
+	t.Setenv("USERPROFILE", home)
+	t.Setenv("XDG_CONFIG_HOME", filepath.Join(home, ".config"))
+	t.Setenv("AppData", filepath.Join(home, "AppData"))
+	t.Chdir(dir)
+	writeFile(t, dir, "reasonix.toml", `
+default_model = "test-model"
+
+[codegraph]
+enabled = false
+
+[[providers]]
+name = "test-model"
+kind = "openai"
+base_url = "https://example.invalid"
+model = "x"
+api_key_env = "REASONIX_TEST_KEY_UNSET"
+`)
+
+	sessionDir := filepath.Join(t.TempDir(), "desktop-workspace-sessions")
+	ctrl, err := Build(context.Background(), Options{SessionDir: sessionDir})
+	if err != nil {
+		t.Fatalf("Build: %v", err)
+	}
+	defer ctrl.Close()
+
+	if got := ctrl.SessionDir(); got != sessionDir {
+		t.Fatalf("SessionDir() = %q, want override %q", got, sessionDir)
+	}
+}
+
 // TestBuildDiscoversSkills proves the skill wiring end-to-end: a project skill
 // is discovered at boot, surfaced via Controller.Skills(), and its name folds
 // into the cache-stable system prompt's "# Skills" index alongside a built-in.
diff --git a/internal/plugin/lazy.go b/internal/plugin/lazy.go
index 9abd76f7e..827102b08 100644
--- a/internal/plugin/lazy.go
+++ b/internal/plugin/lazy.go
@@ -73,8 +73,16 @@ func (s *lazySpawn) kick() {
 	if s.state != spawnIdle {
 		return
 	}
+	if !s.host.beginDeferredSpawn() {
+		s.state = spawnFailed
+		s.spawnErr = fmt.Errorf("plugin host is closed")
+		return
+	}
 	s.state = spawnInFlight
-	go s.run()
+	go func() {
+		defer s.host.endDeferredSpawn()
+		s.run()
+	}()
 }
 
 // run does the handshake without holding mu (host.Add can take seconds), then
@@ -172,8 +180,17 @@ func (lt *lazyTool) Execute(ctx context.Context, args json.RawMessage) (string,
 			// drive the handshake async and ask the model to retry. By the
 			// next turn the swap will have installed the real tools with
 			// real schemas under different names.
+			if !sp.host.beginDeferredSpawn() {
+				sp.state = spawnFailed
+				sp.spawnErr = fmt.Errorf("plugin host is closed")
+				sp.mu.Unlock()
+				return "", fmt.Errorf("MCP server %q failed to start: %w", sp.spec.Name, sp.spawnErr)
+			}
 			sp.state = spawnInFlight
-			go sp.run()
+			go func() {
+				defer sp.host.endDeferredSpawn()
+				sp.run()
+			}()
 			sp.mu.Unlock()
 			return "", fmt.Errorf("MCP server %q is initializing on first use — call again on the next turn for its real tools", sp.spec.Name)
 		}
@@ -223,11 +240,13 @@ func (lt *lazyTool) Execute(ctx context.Context, args json.RawMessage) (string,
 // single Execute (use the controller's PluginCtx) — a turn-scoped ctx would
 // kill the stdio child between turns.
 func LazyToolset(spec Spec, cs *CachedSchema, host *Host, reg *tool.Registry, sessionCtx context.Context, kick bool) []tool.Tool {
+	spawnCtx, cancel := context.WithCancel(sessionCtx)
+	host.registerDeferredCancel(cancel)
 	shared := &lazySpawn{
 		spec: spec,
 		host: host,
 		reg:  reg,
-		ctx:  sessionCtx,
+		ctx:  spawnCtx,
 	}
 
 	var out []tool.Tool
diff --git a/internal/plugin/lazy_test.go b/internal/plugin/lazy_test.go
index 7f55bcddc..2b0ed7879 100644
--- a/internal/plugin/lazy_test.go
+++ b/internal/plugin/lazy_test.go
@@ -334,6 +334,38 @@ func TestLazyBackgroundKick(t *testing.T) {
 	}
 }
 
+func TestLazyBackgroundCloseCancelsInFlightKick(t *testing.T) {
+	redirectCache(t)
+	spec := helperSpec()
+	spec.Name = "slow"
+	spec.Env["GO_WANT_HELPER_INIT_MS"] = "5000"
+	writeMockCache(t, spec)
+	cs, _ := LoadCachedSchema(spec.Name, SpecFingerprint(spec))
+
+	host := NewHost()
+	reg := tool.NewRegistry()
+
+	tools := LazyToolset(spec, cs, host, reg, context.Background(), true)
+	for _, lt := range tools {
+		reg.Add(lt)
+	}
+
+	done := make(chan struct{})
+	go func() {
+		host.Close()
+		close(done)
+	}()
+	select {
+	case <-done:
+	case <-time.After(2 * time.Second):
+		t.Fatal("Host.Close did not cancel the in-flight background lazy spawn")
+	}
+
+	if names := host.ServerNames(); len(names) != 0 {
+		t.Fatalf("closed host retained connected servers: %v", names)
+	}
+}
+
 // TestLazyConcurrentExecuteOnlyOneSpawn pins the de-duplication contract: 10
 // goroutines racing through Execute on the same lazyTool may only trigger ONE
 // spawn (and therefore one connected mock server on the host). The state
diff --git a/internal/plugin/plugin.go b/internal/plugin/plugin.go
index 51f7577b9..ffc21d31f 100644
--- a/internal/plugin/plugin.go
+++ b/internal/plugin/plugin.go
@@ -81,6 +81,14 @@ type Host struct {
 	prompts   []Prompt
 	resources []Resource
 	failures  []Failure
+	closed    bool
+
+	// Lazy/background servers may still be handshaking when a session closes.
+	// Close cancels those startup contexts and waits for their goroutines before
+	// taking the client snapshot, so a just-connected stdio child cannot escape
+	// teardown and keep a Windows workspace directory locked.
+	deferredCancels []context.CancelFunc
+	deferredWG      sync.WaitGroup
 
 	// Detached stats/schema-cache writers from Start; off the boot path but
 	// drained by Close so cleanup can't race a still-open cache file.
@@ -326,6 +334,20 @@ func Start(ctx context.Context, specs []Spec, p StartPolicy) (*Host, []tool.Tool
 
 // Close terminates all plugin connections.
 func (h *Host) Close() {
+	h.mu.Lock()
+	if h.closed {
+		h.mu.Unlock()
+		return
+	}
+	h.closed = true
+	cancels := append([]context.CancelFunc(nil), h.deferredCancels...)
+	h.mu.Unlock()
+
+	for _, cancel := range cancels {
+		cancel()
+	}
+	h.deferredWG.Wait()
+
 	h.mu.RLock()
 	clients := append([]*Client(nil), h.clients...) // snapshot; close outside the lock
 	h.mu.RUnlock()
@@ -547,6 +569,30 @@ func (h *Host) clearFailure(name string) {
 // command), which keeps the controller's host pointer stable for the session.
 func NewHost() *Host { return &Host{} }
 
+func (h *Host) registerDeferredCancel(cancel context.CancelFunc) {
+	h.mu.Lock()
+	defer h.mu.Unlock()
+	if h.closed {
+		cancel()
+		return
+	}
+	h.deferredCancels = append(h.deferredCancels, cancel)
+}
+
+func (h *Host) beginDeferredSpawn() bool {
+	h.mu.Lock()
+	defer h.mu.Unlock()
+	if h.closed {
+		return false
+	}
+	h.deferredWG.Add(1)
+	return true
+}
+
+func (h *Host) endDeferredSpawn() {
+	h.deferredWG.Done()
+}
+
 // has reports whether a server with this name is already connected.
 func (h *Host) has(name string) bool {
 	h.mu.RLock()
@@ -572,6 +618,13 @@ func (h *Host) Add(ctx context.Context, s Spec) ([]tool.Tool, error) {
 }
 
 func (h *Host) addConnected(ctx context.Context, s Spec) ([]tool.Tool, error) {
+	h.mu.RLock()
+	if h.closed {
+		h.mu.RUnlock()
+		return nil, fmt.Errorf("plugin host is closed")
+	}
+	h.mu.RUnlock()
+
 	c, err := start(ctx, ctx, s)
 	if err != nil {
 		return nil, err
@@ -583,6 +636,11 @@ func (h *Host) addConnected(ctx context.Context, s Spec) ([]tool.Tool, error) {
 	}
 	c.toolCount = len(ts)
 	h.mu.Lock()
+	if h.closed {
+		h.mu.Unlock()
+		c.close()
+		return nil, fmt.Errorf("plugin host is closed")
+	}
 	h.clients = append(h.clients, c)
 	h.clearFailure(s.Name)
 	h.mu.Unlock()

From 71584192180a2fa81985c2f3ef558690a8f9a940 Mon Sep 17 00:00:00 2001
From: YHH <359807859@qq.com>
Date: Tue, 9 Jun 2026 22:27:07 -0700
Subject: [PATCH 55/64] fix(proc): reap codegraph's process tree off Windows
 via process groups (#3787)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(proc): reap codegraph's process tree off Windows via process groups

KillTree off Windows only signalled the direct child, so a launcher whose
sub-daemon outlives it (codegraph's bundled node runtime) left orphan
grandchildren after exit — the Unix counterpart of the Windows Job Object
reaping. StartTracked now starts the child in its own process group
(Setpgid) and KillTree kills the whole group with a negative-pid signal;
SetProcessGroupKill exposes the same for one-shot children (codegraph init).
No-op on Windows, where the Job Object already covers the tree.

Co-authored-by: ttmouse <ttmouseg@gmail.com>

* test(proc): lift the reap-poll break into the loop condition (QF1006)

---------

Co-authored-by: reasonix <reasonix@deepseek.com>
Co-authored-by: ttmouse <ttmouseg@gmail.com>
---
 internal/codegraph/codegraph.go  |  1 +
 internal/proc/kill_other.go      | 34 +++++++++++++++++++++-----
 internal/proc/kill_other_test.go | 42 ++++++++++++++++++++++++++++++++
 internal/proc/kill_windows.go    |  6 +++++
 4 files changed, 77 insertions(+), 6 deletions(-)

diff --git a/internal/codegraph/codegraph.go b/internal/codegraph/codegraph.go
index 04e5cf93d..7968a5302 100644
--- a/internal/codegraph/codegraph.go
+++ b/internal/codegraph/codegraph.go
@@ -138,6 +138,7 @@ func EnsureInit(ctx context.Context, bin, root string) error {
 	ctx, cancel := context.WithTimeout(ctx, initTimeout)
 	defer cancel()
 	cmd := exec.CommandContext(ctx, bin, "init", root)
+	proc.SetProcessGroupKill(cmd) // own group so Cancel→KillTree reaps the tree off Windows (no-op on Windows)
 	cmd.Cancel = func() error { proc.KillTree(cmd); return nil }
 	cmd.WaitDelay = 3 * time.Second
 	proc.HideWindow(cmd)
diff --git a/internal/proc/kill_other.go b/internal/proc/kill_other.go
index aa5ad08ab..a18272eb3 100644
--- a/internal/proc/kill_other.go
+++ b/internal/proc/kill_other.go
@@ -2,20 +2,42 @@
 
 package proc
 
-import "os/exec"
+import (
+	"os/exec"
+	"syscall"
+)
 
-// KillTree terminates cmd's process; off Windows it kills the direct child only.
+// KillTree kills cmd's whole process group. StartTracked (and SetProcessGroupKill
+// for children started outside it) put the child in its own group via Setpgid, so
+// the negative-pid signal reaches every descendant — a launcher whose sub-daemon
+// survives the parent (e.g. codegraph's bundled node runtime) included, where a
+// plain Process.Kill would only hit the direct child and orphan the grandchild.
 func KillTree(cmd *exec.Cmd) {
 	if cmd == nil || cmd.Process == nil {
 		return
 	}
-	_ = cmd.Process.Kill()
+	if err := syscall.Kill(-cmd.Process.Pid, syscall.SIGKILL); err != nil {
+		_ = cmd.Process.Kill() // not a group leader (Setpgid wasn't set) — at least kill the child
+	}
+}
+
+// SetProcessGroupKill makes cmd start in its own process group so KillTree can
+// reap its whole tree. Use it for children started outside StartTracked (e.g. a
+// one-shot CombinedOutput). It is a no-op on Windows, where the Job Object that
+// TrackTree/StartTracked assigns handles the tree instead.
+func SetProcessGroupKill(cmd *exec.Cmd) {
+	if cmd.SysProcAttr == nil {
+		cmd.SysProcAttr = &syscall.SysProcAttr{}
+	}
+	cmd.SysProcAttr.Setpgid = true
 }
 
-// StartTracked starts cmd. Off Windows there is no Job Object to track it in —
-// the platform reaps the child directly — so it just starts and returns a 0
-// handle, and KillTracked falls back to KillTree.
+// StartTracked starts cmd in its own process group so KillTracked / KillTree can
+// reap its whole tree. Off Windows the process group is the equivalent of the
+// Windows Job Object; it returns a 0 handle, and KillTracked falls back to
+// KillTree.
 func StartTracked(cmd *exec.Cmd) (uintptr, error) {
+	SetProcessGroupKill(cmd)
 	return 0, cmd.Start()
 }
 
diff --git a/internal/proc/kill_other_test.go b/internal/proc/kill_other_test.go
index cdacbcfd2..b13fe9989 100644
--- a/internal/proc/kill_other_test.go
+++ b/internal/proc/kill_other_test.go
@@ -3,7 +3,12 @@
 package proc
 
 import (
+	"bufio"
+	"errors"
 	"os/exec"
+	"strconv"
+	"strings"
+	"syscall"
 	"testing"
 	"time"
 )
@@ -45,3 +50,40 @@ func TestKillTrackedTerminatesChild(t *testing.T) {
 		t.Fatal("cmd.Wait blocked after KillTracked")
 	}
 }
+
+// A launcher (sh) that backgrounds a grandchild (sleep) and stays alive: with
+// the child in its own process group, KillTracked's negative-pid kill must reap
+// the grandchild too, not just sh — the codegraph node-daemon leak this guards.
+func TestKillTrackedReapsProcessGroupGrandchild(t *testing.T) {
+	cmd := exec.Command("sh", "-c", "sleep 60 & echo $!; wait")
+	stdout, err := cmd.StdoutPipe()
+	if err != nil {
+		t.Fatalf("StdoutPipe: %v", err)
+	}
+	if _, err := StartTracked(cmd); err != nil {
+		t.Fatalf("StartTracked: %v", err)
+	}
+
+	line, err := bufio.NewReader(stdout).ReadString('\n')
+	if err != nil {
+		t.Fatalf("read grandchild pid: %v", err)
+	}
+	gcPid, err := strconv.Atoi(strings.TrimSpace(line))
+	if err != nil || gcPid <= 0 {
+		t.Fatalf("bad grandchild pid %q: %v", line, err)
+	}
+	if syscall.Kill(gcPid, 0) != nil {
+		t.Fatalf("grandchild %d not alive before kill", gcPid)
+	}
+
+	KillTracked(cmd, 0)
+	_ = cmd.Wait()
+
+	deadline := time.Now().Add(5 * time.Second)
+	for !errors.Is(syscall.Kill(gcPid, 0), syscall.ESRCH) {
+		if time.Now().After(deadline) {
+			t.Fatalf("grandchild %d survived KillTracked — process group not reaped", gcPid)
+		}
+		time.Sleep(20 * time.Millisecond)
+	}
+}
diff --git a/internal/proc/kill_windows.go b/internal/proc/kill_windows.go
index f139d7308..cdbb6ab2b 100644
--- a/internal/proc/kill_windows.go
+++ b/internal/proc/kill_windows.go
@@ -11,6 +11,12 @@ import (
 	"golang.org/x/sys/windows"
 )
 
+// SetProcessGroupKill is a no-op on Windows: the Job Object that StartTracked
+// assigns reaps the whole tree on close, so Setpgid (which doesn't exist here)
+// is unnecessary. It exists so non-Windows callers can request group kill
+// uniformly.
+func SetProcessGroupKill(*exec.Cmd) {}
+
 // KillTree terminates cmd and every descendant it spawned. Process.Kill only
 // signals the direct child, so a launcher (cmd.exe → node.exe) leaves the
 // grandchild alive holding the inherited stdout/stderr pipes — which makes

From 940fd2997594fc16aeb524cddb1c1664d3f1aa1d Mon Sep 17 00:00:00 2001
From: YHH <359807859@qq.com>
Date: Tue, 9 Jun 2026 22:47:05 -0700
Subject: [PATCH 56/64] fix(desktop): make the frontend typecheck under
 TypeScript 6 (#3791)

@types/react 19 (bumped in #3690) tightened ref nullability and dropped the
global JSX namespace, which TypeScript 6 enforces. Type the shared ref props
as RefObject<T | null> (matching what useRef(null) returns), import the JSX
namespace from react, and give the debounce useRef an explicit initial value.
No behavior change; unblocks the typescript@6 bump (#3691).

Co-authored-by: reasonix <reasonix@deepseek.com>
---
 desktop/frontend/src/components/AnchoredPopover.tsx | 2 +-
 desktop/frontend/src/components/Composer.tsx        | 2 +-
 desktop/frontend/src/components/PromptShelf.tsx     | 2 +-
 desktop/frontend/src/components/WorkspacePanel.tsx  | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/desktop/frontend/src/components/AnchoredPopover.tsx b/desktop/frontend/src/components/AnchoredPopover.tsx
index 9474748d7..742d584d2 100644
--- a/desktop/frontend/src/components/AnchoredPopover.tsx
+++ b/desktop/frontend/src/components/AnchoredPopover.tsx
@@ -54,7 +54,7 @@ export function AnchoredPopover({
   closing = false,
 }: {
   open: boolean;
-  anchorRef: RefObject<HTMLElement>;
+  anchorRef: RefObject<HTMLElement | null>;
   onClose: () => void;
   className: string;
   children: ReactNode;
diff --git a/desktop/frontend/src/components/Composer.tsx b/desktop/frontend/src/components/Composer.tsx
index 676485302..ffcd32296 100644
--- a/desktop/frontend/src/components/Composer.tsx
+++ b/desktop/frontend/src/components/Composer.tsx
@@ -381,7 +381,7 @@ export function Composer({
   // by 120ms so rapid typing doesn't flood the backend with IPC calls — the
   // menu only updates after the user pauses.
   const [argRes, setArgRes] = useState<SlashArgsResult | null>(null);
-  const debounceRef = useRef<ReturnType<typeof setTimeout>>();
+  const debounceRef = useRef<ReturnType<typeof setTimeout> | undefined>(undefined);
   useEffect(() => {
     if (!text.startsWith("/") || !/\s/.test(text)) {
       setArgRes(null);
diff --git a/desktop/frontend/src/components/PromptShelf.tsx b/desktop/frontend/src/components/PromptShelf.tsx
index 8d57607cb..6d1ee8372 100644
--- a/desktop/frontend/src/components/PromptShelf.tsx
+++ b/desktop/frontend/src/components/PromptShelf.tsx
@@ -21,7 +21,7 @@ export function PromptShelf({
   children?: ReactNode;
   crumbs?: ReactNode;
   quickActions?: ReactNode;
-  barRef?: RefObject<HTMLDivElement>;
+  barRef?: RefObject<HTMLDivElement | null>;
   actionsWrap?: boolean;
 }) {
   return (
diff --git a/desktop/frontend/src/components/WorkspacePanel.tsx b/desktop/frontend/src/components/WorkspacePanel.tsx
index 7da435203..ed5c5ab23 100644
--- a/desktop/frontend/src/components/WorkspacePanel.tsx
+++ b/desktop/frontend/src/components/WorkspacePanel.tsx
@@ -2,6 +2,7 @@ import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import type {
   CSSProperties,
   DragEvent as ReactDragEvent,
+  JSX,
   KeyboardEvent,
   MouseEvent as ReactMouseEvent,
   PointerEvent as ReactPointerEvent,

From 783a24113387c24afd990a8337336ac7516710ca Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 9 Jun 2026 22:53:42 -0700
Subject: [PATCH 57/64] chore(deps-dev): bump typescript in /desktop/frontend
 (#3691)

Bumps [typescript](https://github.com/microsoft/TypeScript) from 5.9.3 to 6.0.3.
- [Release notes](https://github.com/microsoft/TypeScript/releases)
- [Commits](https://github.com/microsoft/TypeScript/compare/v5.9.3...v6.0.3)

---
updated-dependencies:
- dependency-name: typescript
  dependency-version: 6.0.3
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 desktop/frontend/package-lock.json |  8 ++++----
 desktop/frontend/package.json      |  2 +-
 desktop/frontend/pnpm-lock.yaml    | 10 +++++-----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/desktop/frontend/package-lock.json b/desktop/frontend/package-lock.json
index 7e83f5d44..9f56b1135 100644
--- a/desktop/frontend/package-lock.json
+++ b/desktop/frontend/package-lock.json
@@ -26,7 +26,7 @@
         "@vitejs/plugin-react": "^5.2.0",
         "terser": "^5.48.0",
         "tsx": "^4.22.4",
-        "typescript": "^5.6.3",
+        "typescript": "^6.0.3",
         "vite": "^6.0.7"
       }
     },
@@ -3965,9 +3965,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.9.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
-      "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-6.0.3.tgz",
+      "integrity": "sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {
diff --git a/desktop/frontend/package.json b/desktop/frontend/package.json
index bd301f4f6..7daa5b45f 100644
--- a/desktop/frontend/package.json
+++ b/desktop/frontend/package.json
@@ -34,7 +34,7 @@
     "@vitejs/plugin-react": "^5.2.0",
     "terser": "^5.48.0",
     "tsx": "^4.22.4",
-    "typescript": "^5.6.3",
+    "typescript": "^6.0.3",
     "vite": "^6.0.7"
   },
   "overrides": {
diff --git a/desktop/frontend/pnpm-lock.yaml b/desktop/frontend/pnpm-lock.yaml
index f6340edca..dc585a6ce 100644
--- a/desktop/frontend/pnpm-lock.yaml
+++ b/desktop/frontend/pnpm-lock.yaml
@@ -61,8 +61,8 @@ importers:
         specifier: ^4.22.4
         version: 4.22.4
       typescript:
-        specifier: ^5.6.3
-        version: 5.9.3
+        specifier: ^6.0.3
+        version: 6.0.3
       vite:
         specifier: ^6.0.7
         version: 6.4.2(@types/node@25.9.1)(terser@5.48.0)(tsx@4.22.4)
@@ -1155,8 +1155,8 @@ packages:
     engines: {node: '>=18.0.0'}
     hasBin: true
 
-  typescript@5.9.3:
-    resolution: {integrity: sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==}
+  typescript@6.0.3:
+    resolution: {integrity: sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==}
     engines: {node: '>=14.17'}
     hasBin: true
 
@@ -2520,7 +2520,7 @@ snapshots:
     optionalDependencies:
       fsevents: 2.3.3
 
-  typescript@5.9.3: {}
+  typescript@6.0.3: {}
 
   undici-types@7.24.6: {}
 

From fcaf2eabfe05af9573ec3c5f5637c00740b1d334 Mon Sep 17 00:00:00 2001
From: YHH <359807859@qq.com>
Date: Tue, 9 Jun 2026 23:23:06 -0700
Subject: [PATCH 58/64] chore(deps-dev): bump @types/react-dom to 19 to match
 @types/react (#3793)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps-dev): bump @types/react-dom to 19 to match @types/react

#3690 bumped @types/react to 19 but left @types/react-dom at 18, whose types
pin the @types/react peer to ^18 — an ERESOLVE conflict that npm ci tolerated
only on older npm. Bump @types/react-dom to 19.2.3 so the two react type
packages agree: npm ci now resolves without --legacy-peer-deps and the
frontend typechecks unchanged.

* chore(deps-dev): sync pnpm-lock.yaml for the @types/react-dom 19 bump

---------

Co-authored-by: reasonix <reasonix@deepseek.com>
---
 desktop/frontend/package-lock.json | 10 +++++-----
 desktop/frontend/package.json      |  2 +-
 desktop/frontend/pnpm-lock.yaml    | 12 ++++++------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/desktop/frontend/package-lock.json b/desktop/frontend/package-lock.json
index 9f56b1135..f6771833c 100644
--- a/desktop/frontend/package-lock.json
+++ b/desktop/frontend/package-lock.json
@@ -22,7 +22,7 @@
       "devDependencies": {
         "@types/node": "^25.9.1",
         "@types/react": "^19.2.17",
-        "@types/react-dom": "^18.3.1",
+        "@types/react-dom": "^19.2.3",
         "@vitejs/plugin-react": "^5.2.0",
         "terser": "^5.48.0",
         "tsx": "^4.22.4",
@@ -1318,13 +1318,13 @@
       }
     },
     "node_modules/@types/react-dom": {
-      "version": "18.3.7",
-      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.7.tgz",
-      "integrity": "sha512-MEe3UeoENYVFXzoXEWsvcpg6ZvlrFNlOQ7EOsvhI3CfAXwzPfO8Qwuxd40nepsYKqyyVQnTdEfv68q91yLcKrQ==",
+      "version": "19.2.3",
+      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-19.2.3.tgz",
+      "integrity": "sha512-jp2L/eY6fn+KgVVQAOqYItbF0VY/YApe5Mz2F0aykSO8gx31bYCZyvSeYxCHKvzHG5eZjc+zyaS5BrBWya2+kQ==",
       "dev": true,
       "license": "MIT",
       "peerDependencies": {
-        "@types/react": "^18.0.0"
+        "@types/react": "^19.2.0"
       }
     },
     "node_modules/@types/unist": {
diff --git a/desktop/frontend/package.json b/desktop/frontend/package.json
index 7daa5b45f..b4a04ede8 100644
--- a/desktop/frontend/package.json
+++ b/desktop/frontend/package.json
@@ -30,7 +30,7 @@
   "devDependencies": {
     "@types/node": "^25.9.1",
     "@types/react": "^19.2.17",
-    "@types/react-dom": "^18.3.1",
+    "@types/react-dom": "^19.2.3",
     "@vitejs/plugin-react": "^5.2.0",
     "terser": "^5.48.0",
     "tsx": "^4.22.4",
diff --git a/desktop/frontend/pnpm-lock.yaml b/desktop/frontend/pnpm-lock.yaml
index dc585a6ce..2eebe55f2 100644
--- a/desktop/frontend/pnpm-lock.yaml
+++ b/desktop/frontend/pnpm-lock.yaml
@@ -49,8 +49,8 @@ importers:
         specifier: ^19.2.17
         version: 19.2.17
       '@types/react-dom':
-        specifier: ^18.3.1
-        version: 18.3.7(@types/react@19.2.17)
+        specifier: ^19.2.3
+        version: 19.2.3(@types/react@19.2.17)
       '@vitejs/plugin-react':
         specifier: ^5.2.0
         version: 5.2.0(vite@6.4.2(@types/node@25.9.1)(terser@5.48.0)(tsx@4.22.4))
@@ -659,10 +659,10 @@ packages:
   '@types/node@25.9.1':
     resolution: {integrity: sha512-xfrlY7UD5rMJk3ZVJP8BNzS28J36YJg+xp+LPXV1TdWxr8uMH5A860QNxYDGQe/ylDSgjxE52Q9VnO7p75tJxg==}
 
-  '@types/react-dom@18.3.7':
-    resolution: {integrity: sha512-MEe3UeoENYVFXzoXEWsvcpg6ZvlrFNlOQ7EOsvhI3CfAXwzPfO8Qwuxd40nepsYKqyyVQnTdEfv68q91yLcKrQ==}
+  '@types/react-dom@19.2.3':
+    resolution: {integrity: sha512-jp2L/eY6fn+KgVVQAOqYItbF0VY/YApe5Mz2F0aykSO8gx31bYCZyvSeYxCHKvzHG5eZjc+zyaS5BrBWya2+kQ==}
     peerDependencies:
-      '@types/react': ^18.0.0
+      '@types/react': ^19.2.0
 
   '@types/react@19.2.17':
     resolution: {integrity: sha512-MXfmqaVPEVgkBT/aY0aGCkRWWtByiYQXo3xdQ8r5RzuFrPiRn8Gar2tQdXSUQ2GKV3bkXckek89V8wQBY2Q/Aw==}
@@ -1679,7 +1679,7 @@ snapshots:
     dependencies:
       undici-types: 7.24.6
 
-  '@types/react-dom@18.3.7(@types/react@19.2.17)':
+  '@types/react-dom@19.2.3(@types/react@19.2.17)':
     dependencies:
       '@types/react': 19.2.17
 

From 94f68f531464133a36f0119bca09b4d36b290be8 Mon Sep 17 00:00:00 2001
From: SivanCola <liuxw96@foxmail.com>
Date: Wed, 10 Jun 2026 14:29:23 +0800
Subject: [PATCH 59/64] =?UTF-8?q?Follow=20up=20desktop=20UI=20fixes=20afte?=
 =?UTF-8?q?r=20PR=20#3752=20merge=20/=20=E8=A1=A5=E5=85=A5=20#3752=20?=
 =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=90=8E=E7=9A=84=E6=A1=8C=E9=9D=A2=20UI=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20(#3795)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(desktop): preserve curated provider models on refresh

* fix(desktop): clarify composer collaboration entry

* fix(desktop): keep draft goal mode visible

* fix(desktop): allow approval mode changes while running
---
 .../check-browser-preview-stability.mjs       | 14 ++++
 desktop/frontend/src/App.tsx                  | 65 +++++++++++++++----
 .../__tests__/provider-model-refresh.test.ts  |  6 ++
 desktop/frontend/src/components/Composer.tsx  | 11 ++--
 .../frontend/src/components/SettingsPanel.tsx |  2 +-
 desktop/frontend/src/locales/en.ts            |  2 +-
 desktop/frontend/src/locales/zh.ts            |  2 +-
 7 files changed, 82 insertions(+), 20 deletions(-)

diff --git a/desktop/frontend/scripts/check-browser-preview-stability.mjs b/desktop/frontend/scripts/check-browser-preview-stability.mjs
index f7e3c9b65..4e98b3639 100644
--- a/desktop/frontend/scripts/check-browser-preview-stability.mjs
+++ b/desktop/frontend/scripts/check-browser-preview-stability.mjs
@@ -26,6 +26,12 @@ function mustContain(rel, source, needle, reason) {
   }
 }
 
+function mustNotMatch(rel, source, pattern, reason) {
+  if (pattern.test(source)) {
+    fail(`${rel}: matched forbidden pattern ${pattern} (${reason})`);
+  }
+}
+
 const anchoredPopover = read("src/components/AnchoredPopover.tsx");
 mustNotContain(
   "src/components/AnchoredPopover.tsx",
@@ -97,6 +103,14 @@ mustContain(
   "composer-modebar--approval",
   "tool approval must use a direct segmented control",
 );
+for (const mode of ["ask", "auto", "yolo"]) {
+  mustNotMatch(
+    "src/components/Composer.tsx",
+    composer,
+    new RegExp(`composer-modebar__item--${mode}[\\s\\S]{0,320}disabled=\\{disabled \\|\\| running\\}`),
+    "approval mode must remain switchable while a model turn is running",
+  );
+}
 mustNotContain(
   "src/components/Composer.tsx",
   composer,
diff --git a/desktop/frontend/src/App.tsx b/desktop/frontend/src/App.tsx
index 34943a560..7c3e12433 100644
--- a/desktop/frontend/src/App.tsx
+++ b/desktop/frontend/src/App.tsx
@@ -412,6 +412,7 @@ export default function App() {
   const [collaborationModesByTab, setCollaborationModesByTab] = useState<Record<string, CollaborationMode>>({});
   const [toolApprovalModesByTab, setToolApprovalModesByTab] = useState<Record<string, ToolApprovalMode>>({});
   const [goalsByTab, setGoalsByTab] = useState<Record<string, string>>({});
+  const [goalDraftModesByTab, setGoalDraftModesByTab] = useState<Record<string, boolean>>({});
   const [tabMetas, setTabMetas] = useState<TabMeta[]>([]);
   const [tabOrderIds, setTabOrderIds] = useState<string[]>([]);
   const [tabRevealSignal, setTabRevealSignal] = useState(0);
@@ -583,8 +584,9 @@ export default function App() {
   const startupSplashHold = state.meta?.ready !== true && !state.meta?.startupErr;
   const legacyMode = activeTabId ? modesByTab[activeTabId] ?? "normal" : "normal";
   const goal = activeTabId ? goalsByTab[activeTabId] ?? state.meta?.goal ?? activeTab?.goal ?? "" : "";
+  const goalDraftMode = activeTabId ? Boolean(goalDraftModesByTab[activeTabId]) : false;
   const collaborationMode = activeTabId
-    ? collaborationModesByTab[activeTabId] ?? normalizeCollaborationMode(state.meta?.goal ? "goal" : activeTab?.collaborationMode, goal, legacyMode)
+    ? goalDraftMode ? "goal" : collaborationModesByTab[activeTabId] ?? normalizeCollaborationMode(state.meta?.goal ? "goal" : activeTab?.collaborationMode, goal, legacyMode)
     : "normal";
   const toolApprovalMode = activeTabId
     ? toolApprovalModesByTab[activeTabId] ?? normalizeToolApprovalMode(state.meta?.toolApprovalMode ?? activeTab?.toolApprovalMode, legacyMode, state.meta?.autoApproveTools ?? state.meta?.bypass)
@@ -602,6 +604,15 @@ export default function App() {
     },
     [activeTabId],
   );
+  const setGoalDraftModeForTab = useCallback((tabId: string, enabled: boolean) => {
+    setGoalDraftModesByTab((current) => {
+      if (Boolean(current[tabId]) === enabled) return current;
+      if (enabled) return { ...current, [tabId]: true };
+      const next = { ...current };
+      delete next[tabId];
+      return next;
+    });
+  }, []);
   const topicbarEditing = Boolean(activeTab?.topicId && activeTab.topicId === renamingTopicId);
   const visibleTabId = activeTabId;
   const visibleTabs = useMemo(() => {
@@ -612,12 +623,12 @@ export default function App() {
       ...tab,
       running: tab.id === visibleTabId ? tab.running || state.running : tab.running,
       mode: modesByTab[tab.id] ?? normalizeMode(tab.mode),
-      collaborationMode: collaborationModesByTab[tab.id] ?? normalizeCollaborationMode(tab.collaborationMode, goalsByTab[tab.id] ?? tab.goal, normalizeMode(tab.mode)),
+      collaborationMode: goalDraftModesByTab[tab.id] ? "goal" : collaborationModesByTab[tab.id] ?? normalizeCollaborationMode(tab.collaborationMode, goalsByTab[tab.id] ?? tab.goal, normalizeMode(tab.mode)),
       toolApprovalMode: toolApprovalModesByTab[tab.id] ?? normalizeToolApprovalMode(tab.toolApprovalMode, normalizeMode(tab.mode), tab.toolApprovalMode === "yolo"),
       goal: goalsByTab[tab.id] ?? tab.goal ?? "",
       active: tab.id === visibleTabId,
     }));
-  }, [collaborationModesByTab, goalsByTab, modesByTab, state.running, tabMetas, tabOrderIds, toolApprovalModesByTab, visibleTabId]);
+  }, [collaborationModesByTab, goalDraftModesByTab, goalsByTab, modesByTab, state.running, tabMetas, tabOrderIds, toolApprovalModesByTab, visibleTabId]);
 
   useEffect(() => {
     const ids = tabMetas.map((tab) => tab.id);
@@ -632,6 +643,21 @@ export default function App() {
 
   useEffect(() => {
     const ids = new Set(tabMetas.map((tab) => tab.id));
+    setGoalDraftModesByTab((current) => {
+      let changed = false;
+      const next: Record<string, boolean> = {};
+      for (const tab of tabMetas) {
+        if (current[tab.id] && !(tab.goal ?? "").trim()) {
+          next[tab.id] = true;
+        } else if (current[tab.id]) {
+          changed = true;
+        }
+      }
+      for (const id of Object.keys(current)) {
+        if (!ids.has(id)) changed = true;
+      }
+      return changed ? next : current;
+    });
     setModesByTab((current) => {
       let changed = false;
       const next: Record<string, Mode> = {};
@@ -649,7 +675,9 @@ export default function App() {
       let changed = false;
       const next: Record<string, CollaborationMode> = {};
       for (const tab of tabMetas) {
-        const value = normalizeCollaborationMode(tab.collaborationMode, tab.goal, normalizeMode(tab.mode));
+        const value = goalDraftModesByTab[tab.id] && !(tab.goal ?? "").trim()
+          ? "goal"
+          : normalizeCollaborationMode(tab.collaborationMode, tab.goal, normalizeMode(tab.mode));
         next[tab.id] = value;
         if (current[tab.id] !== value) changed = true;
       }
@@ -684,7 +712,7 @@ export default function App() {
       }
       return changed ? next : current;
     });
-  }, [tabMetas]);
+  }, [goalDraftModesByTab, tabMetas]);
 
   useEffect(() => {
     if (!renamingTopicId || activeTab?.topicId === renamingTopicId) return;
@@ -697,12 +725,13 @@ export default function App() {
   useEffect(() => {
     if (!activeTabId || !state.meta) return;
     const nextGoal = state.meta.goalStatus === "running" ? state.meta.goal ?? "" : "";
+    if (nextGoal) setGoalDraftModeForTab(activeTabId, false);
     setGoalsByTab((current) => (current[activeTabId] === nextGoal ? current : { ...current, [activeTabId]: nextGoal }));
     setCollaborationModesByTab((current) => {
-      const nextMode = nextGoal ? "goal" : normalizeCollaborationMode(undefined, "", legacyMode);
+      const nextMode = nextGoal || goalDraftMode ? "goal" : normalizeCollaborationMode(undefined, "", legacyMode);
       return current[activeTabId] === nextMode ? current : { ...current, [activeTabId]: nextMode };
     });
-  }, [activeTabId, legacyMode, state.meta]);
+  }, [activeTabId, goalDraftMode, legacyMode, setGoalDraftModeForTab, state.meta]);
 
   const syncModeToController = useCallback((m: Mode) => setControllerMode(m), [setControllerMode]);
 
@@ -719,17 +748,26 @@ export default function App() {
       if (!activeTabId) return;
       const nextCollaborationMode: CollaborationMode = modeHasPlan(m) ? "plan" : "normal";
       const nextToolApprovalMode: ToolApprovalMode = modeHasAutoApproveTools(m) ? "yolo" : "ask";
+      setGoalDraftModeForTab(activeTabId, false);
       setMode(m);
       setCollaborationModesByTab((current) => (current[activeTabId] === nextCollaborationMode ? current : { ...current, [activeTabId]: nextCollaborationMode }));
       setToolApprovalModesByTab((current) => (current[activeTabId] === nextToolApprovalMode ? current : { ...current, [activeTabId]: nextToolApprovalMode }));
       setGoalsByTab((current) => (current[activeTabId] ? { ...current, [activeTabId]: "" } : current));
       void syncModeToController(m);
     },
-    [activeTabId, setMode, syncModeToController],
+    [activeTabId, setGoalDraftModeForTab, setMode, syncModeToController],
   );
   const applyCollaborationMode = useCallback(
     (m: CollaborationMode) => {
       if (!activeTabId) return;
+      if (m === "goal") {
+        setGoalDraftModeForTab(activeTabId, true);
+        setCollaborationModesByTab((current) => (current[activeTabId] === "goal" ? current : { ...current, [activeTabId]: "goal" }));
+        setMode(modeFromAxes(false, toolApprovalMode === "yolo"));
+        void setControllerCollaborationMode("normal");
+        return;
+      }
+      setGoalDraftModeForTab(activeTabId, false);
       setCollaborationModesByTab((current) => (current[activeTabId] === m ? current : { ...current, [activeTabId]: m }));
       if (m === "normal" || m === "plan") {
         setGoalsByTab((current) => (current[activeTabId] ? { ...current, [activeTabId]: "" } : current));
@@ -737,7 +775,7 @@ export default function App() {
       setMode(modeFromAxes(m === "plan", toolApprovalMode === "yolo"));
       void setControllerCollaborationMode(m);
     },
-    [activeTabId, setControllerCollaborationMode, setMode, toolApprovalMode],
+    [activeTabId, setControllerCollaborationMode, setGoalDraftModeForTab, setMode, toolApprovalMode],
   );
   const applyToolApprovalMode = useCallback(
     (m: ToolApprovalMode) => {
@@ -752,6 +790,7 @@ export default function App() {
     (nextGoal: string) => {
       if (!activeTabId) return;
       const trimmed = nextGoal.trim();
+      setGoalDraftModeForTab(activeTabId, false);
       setGoalsByTab((current) => (current[activeTabId] === trimmed ? current : { ...current, [activeTabId]: trimmed }));
       setCollaborationModesByTab((current) => {
         const nextMode = trimmed ? "goal" : "normal";
@@ -760,7 +799,7 @@ export default function App() {
       setMode(modeFromAxes(false, toolApprovalMode === "yolo"));
       void (trimmed ? setControllerGoal(trimmed) : clearControllerGoal());
     },
-    [activeTabId, clearControllerGoal, setControllerGoal, setMode, toolApprovalMode],
+    [activeTabId, clearControllerGoal, setControllerGoal, setGoalDraftModeForTab, setMode, toolApprovalMode],
   );
   const startGoal = useCallback(
     (nextGoal: string) => {
@@ -782,7 +821,8 @@ export default function App() {
   const switchModel = useCallback(
     async (name: string) => {
       await setModel(name);
-      await setControllerCollaborationMode(collaborationMode);
+      const controllerCollaborationMode = collaborationMode === "goal" && !goal.trim() ? "normal" : collaborationMode;
+      await setControllerCollaborationMode(controllerCollaborationMode);
       await setControllerToolApprovalMode(toolApprovalMode);
       if (goal.trim()) await setControllerGoal(goal);
     },
@@ -795,7 +835,8 @@ export default function App() {
   // SetBypass binding was a harmless no-op.
   useEffect(() => {
     if (!controllerReady) return;
-    void setControllerCollaborationMode(collaborationMode);
+    const controllerCollaborationMode = collaborationMode === "goal" && !goal.trim() ? "normal" : collaborationMode;
+    void setControllerCollaborationMode(controllerCollaborationMode);
     void setControllerToolApprovalMode(toolApprovalMode);
     if (goal.trim()) void setControllerGoal(goal);
   }, [collaborationMode, controllerReady, goal, setControllerCollaborationMode, setControllerGoal, setControllerToolApprovalMode, toolApprovalMode]);
diff --git a/desktop/frontend/src/__tests__/provider-model-refresh.test.ts b/desktop/frontend/src/__tests__/provider-model-refresh.test.ts
index 120b8a1fa..77e2fa686 100644
--- a/desktop/frontend/src/__tests__/provider-model-refresh.test.ts
+++ b/desktop/frontend/src/__tests__/provider-model-refresh.test.ts
@@ -35,6 +35,12 @@ eq(
   "background refresh does not re-add deleted models",
 );
 
+eq(
+  mergedFetchedProviderModels(["mimo-v2.5-pro"], ["mimo-v2-flash", "mimo-v2-omni", "mimo-v2.5-pro"], { preserveCurated: true }),
+  ["mimo-v2.5-pro"],
+  "manual access refresh preserves selected MiMo model instead of importing provider catalog",
+);
+
 eq(
   mergedFetchedProviderModels([], ["coding-pro", "chat"], { preserveCurated: true }),
   ["coding-pro", "chat"],
diff --git a/desktop/frontend/src/components/Composer.tsx b/desktop/frontend/src/components/Composer.tsx
index ffcd32296..24c28deca 100644
--- a/desktop/frontend/src/components/Composer.tsx
+++ b/desktop/frontend/src/components/Composer.tsx
@@ -1,6 +1,6 @@
 import { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";
 import type { CSSProperties, ClipboardEvent, DragEvent, KeyboardEvent, PointerEvent as ReactPointerEvent } from "react";
-import { ArrowUp, Eye, FileText, Folder, List, MessageSquare, Plus, Search, Shield, ShieldAlert, ShieldCheck, Square, Target, Trash2, X } from "lucide-react";
+import { ArrowUp, Eye, FileText, Folder, List, MessageSquare, Search, Shield, ShieldAlert, ShieldCheck, SlidersHorizontal, Square, Target, Trash2, X } from "lucide-react";
 import { asArray } from "../lib/array";
 import { DedupIndex, sha256 } from "../lib/attachDedup";
 import { app, onFilesDropped } from "../lib/bridge";
@@ -1726,9 +1726,10 @@ export function Composer({
                   disabled={disabled || running}
                   aria-haspopup="menu"
                   aria-expanded={intentMenuOpen && !intentMenuClosing}
+                  aria-label={t("composer.intentMenuTitle")}
                   title={intentMenuOpen || intentMenuClosing ? undefined : t("composer.intentMenuTitle")}
                 >
-                  <Plus size={17} />
+                  <SlidersHorizontal size={17} />
                 </button>
               </Tooltip>
               {planModeOn && (
@@ -1779,7 +1780,7 @@ export function Composer({
                   type="button"
                   className={`composer-modebar__item composer-modebar__item--ask${toolApprovalMode === "ask" ? " composer-modebar__item--active" : ""}`}
                   onClick={() => chooseApprovalMode("ask")}
-                  disabled={disabled || running}
+                  disabled={disabled}
                   aria-pressed={toolApprovalMode === "ask"}
                   title={t("composer.accessAskTitle")}
                 >
@@ -1790,7 +1791,7 @@ export function Composer({
                   type="button"
                   className={`composer-modebar__item composer-modebar__item--auto${toolApprovalMode === "auto" ? " composer-modebar__item--active" : ""}`}
                   onClick={() => chooseApprovalMode("auto")}
-                  disabled={disabled || running}
+                  disabled={disabled}
                   aria-pressed={toolApprovalMode === "auto"}
                   title={t("composer.accessAutoTitle")}
                 >
@@ -1801,7 +1802,7 @@ export function Composer({
                   type="button"
                   className={`composer-modebar__item composer-modebar__item--yolo${toolApprovalMode === "yolo" ? " composer-modebar__item--active" : ""}`}
                   onClick={() => chooseApprovalMode("yolo")}
-                  disabled={disabled || running}
+                  disabled={disabled}
                   aria-pressed={toolApprovalMode === "yolo"}
                   title={t("composer.accessYoloTitle")}
                 >
diff --git a/desktop/frontend/src/components/SettingsPanel.tsx b/desktop/frontend/src/components/SettingsPanel.tsx
index 32019f9ea..fa5bca8e6 100644
--- a/desktop/frontend/src/components/SettingsPanel.tsx
+++ b/desktop/frontend/src/components/SettingsPanel.tsx
@@ -1946,7 +1946,7 @@ function ProvidersSection({ s, busy, apply }: SectionProps) {
           });
           return;
         }
-        const models = mergedFetchedProviderModels(p.models, fetched);
+        const models = mergedFetchedProviderModels(p.models, fetched, { preserveCurated: true });
         const currentDefault = providerDefaultModel(p.default, models);
         await app.SaveProvider({ ...p, models, default: currentDefault });
         setGroupFetchResult(group.id, {
diff --git a/desktop/frontend/src/locales/en.ts b/desktop/frontend/src/locales/en.ts
index 64fe6e3c7..eb6a89743 100644
--- a/desktop/frontend/src/locales/en.ts
+++ b/desktop/frontend/src/locales/en.ts
@@ -251,7 +251,7 @@ export const en = {
   "composer.modeYolo": "YOLO",
   "composer.modeFullAccess": "full",
   "composer.modeFullAccessTitle": "Full access skips all tool permission approvals; ask questions and plan confirmations still wait",
-  "composer.intentMenuTitle": "More actions",
+  "composer.intentMenuTitle": "Collaboration mode",
   "composer.accessMenuTitle": "Tool access",
   "composer.accessAsk": "Ask first",
   "composer.accessAskTitle": "Ask before approval-gated tool calls",
diff --git a/desktop/frontend/src/locales/zh.ts b/desktop/frontend/src/locales/zh.ts
index 5630bb94a..e392c3a4f 100644
--- a/desktop/frontend/src/locales/zh.ts
+++ b/desktop/frontend/src/locales/zh.ts
@@ -252,7 +252,7 @@ export const zh: Record<DictKey, string> = {
   "composer.modeYolo": "Yolo",
   "composer.modeFullAccess": "完全",
   "composer.modeFullAccessTitle": "完全访问会跳过所有工具权限审批；ask 问题和计划确认仍会等待",
-  "composer.intentMenuTitle": "更多动作",
+  "composer.intentMenuTitle": "协作方式",
   "composer.accessMenuTitle": "工具权限",
   "composer.accessAsk": "需要批准",
   "composer.accessAskTitle": "工具调用前请求批准",

From cda297e3d22c408c2f5d86c7307fe827a8e9cd5b Mon Sep 17 00:00:00 2001
From: Greg Lyu <beaster@yeah.net>
Date: Wed, 10 Jun 2026 14:29:30 +0800
Subject: [PATCH 60/64] fix(tui): return pendingModelSwitch after skill delete
 to unblock Enter (#3764) (#3783)

---
 internal/cli/skill_picker.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/internal/cli/skill_picker.go b/internal/cli/skill_picker.go
index 1f9d5fff1..ce7294d14 100644
--- a/internal/cli/skill_picker.go
+++ b/internal/cli/skill_picker.go
@@ -336,7 +336,7 @@ func (m chatTUI) deleteSkillPick(sk skill.Skill) (tea.Model, tea.Cmd) {
 	m.notice(fmt.Sprintf(i18n.M.SkillPickerDeletedFmt, sk.Name))
 	m.refreshSkillPickerData()
 	m.scheduleSkillSessionRefresh("skill delete", "deleted skill "+sk.Name+" — refreshing session")
-	return m, nil
+	return m, m.pendingModelSwitch
 }
 
 func (m *chatTUI) rescanSkills() {

From 9c278935a8b88b4df7cbb58ffbf73f05815f0cf3 Mon Sep 17 00:00:00 2001
From: Li-Charles-One <real.pengjinhua@gmail.com>
Date: Wed, 10 Jun 2026 14:29:34 +0800
Subject: [PATCH 61/64] fix(desktop): model selector dropdown scroll and
 tooltip for truncated names (#3628, #3629) (#3647)

- Add max-height and overflow-y: auto to model dropdown menu
- Add title attribute to model name and provider for full text tooltip
- Fixes long model names being truncated without way to see full name
- Fixes model list not being scrollable when there are many models

Co-authored-by: Li-Charles-One <Li-Charles-One@users.noreply.github.com>
---
 .../frontend/src/components/ModelSwitcher.tsx  |  4 ++--
 desktop/frontend/src/styles.css                | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/desktop/frontend/src/components/ModelSwitcher.tsx b/desktop/frontend/src/components/ModelSwitcher.tsx
index 492891a4d..251bd8886 100644
--- a/desktop/frontend/src/components/ModelSwitcher.tsx
+++ b/desktop/frontend/src/components/ModelSwitcher.tsx
@@ -86,8 +86,8 @@ export function ModelSwitcher({ label, tabId, onPick }: { label: string; tabId?:
               onClick={() => pick(m.ref)}
             >
               <span className="modelsw__copy">
-                <span className="modelsw__model">{m.model}</span>
-                <span className="modelsw__provider">{providerLabel(m.provider, t)}</span>
+                <span className="modelsw__model" title={m.model}>{m.model}</span>
+                <span className="modelsw__provider" title={providerLabel(m.provider, t)}>{providerLabel(m.provider, t)}</span>
               </span>
               {m.current && <Check size={13} className="modelsw__check" />}
             </button>
diff --git a/desktop/frontend/src/styles.css b/desktop/frontend/src/styles.css
index 500974e67..84d57359f 100644
--- a/desktop/frontend/src/styles.css
+++ b/desktop/frontend/src/styles.css
@@ -4401,11 +4401,29 @@ a[href] {
   z-index: var(--z-local-popover);
   min-width: 200px;
   max-width: 320px;
+  max-height: 280px;
+  overflow-y: auto;
   background: var(--bg-elev);
   border: 1px solid var(--border);
   border-radius: 9px;
   padding: 5px;
   box-shadow: 0 12px 32px rgba(0, 0, 0, 0.45);
+  scrollbar-width: thin;
+  scrollbar-color: var(--border) transparent;
+}
+.modelsw__menu::-webkit-scrollbar {
+  width: 6px;
+}
+.modelsw__menu::-webkit-scrollbar-track {
+  background: transparent;
+  border-radius: 3px;
+}
+.modelsw__menu::-webkit-scrollbar-thumb {
+  background: var(--border);
+  border-radius: 3px;
+}
+.modelsw__menu::-webkit-scrollbar-thumb:hover {
+  background: var(--fg-faint);
 }
 .modelsw__menu--portal {
   position: fixed;

From 3311115385ff623f6a5919c0b090ff47951ec67c Mon Sep 17 00:00:00 2001
From: Li-Charles-One <real.pengjinhua@gmail.com>
Date: Wed, 10 Jun 2026 14:29:38 +0800
Subject: [PATCH 62/64] fix(desktop): add reveal-in-file-manager to workspace
 context menu (#3539) (#3583)

- Add 'Show in file manager' option to file tree right-click menu
- Call app.RevealWorkspacePath to open file in system file manager
- Split context menu height constants to avoid selection menu offset issue
- Add locale strings for en/zh

Co-authored-by: Li-Charles-One <Li-Charles-One@users.noreply.github.com>
---
 .../src/components/WorkspacePanel.tsx         | 19 ++++++++++++++++---
 desktop/frontend/src/locales/en.ts            |  1 +
 desktop/frontend/src/locales/zh.ts            |  1 +
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/desktop/frontend/src/components/WorkspacePanel.tsx b/desktop/frontend/src/components/WorkspacePanel.tsx
index ed5c5ab23..31a7df366 100644
--- a/desktop/frontend/src/components/WorkspacePanel.tsx
+++ b/desktop/frontend/src/components/WorkspacePanel.tsx
@@ -12,6 +12,7 @@ import {
   ChevronRight,
   FileText,
   Folder,
+  FolderOpen,
   FolderTree,
   FolderX,
   GitBranch,
@@ -42,8 +43,9 @@ const WORKSPACE_PREVIEW_MIN_WIDTH = 360;
 const WORKSPACE_PREVIEW_TARGET_WIDTH = 360;
 const WORKSPACE_DUAL_PANEL_MIN_WIDTH = WORKSPACE_TREE_MIN_WIDTH + WORKSPACE_PREVIEW_MIN_WIDTH;
 const WORKSPACE_DUAL_PANEL_TARGET_WIDTH = WORKSPACE_TREE_DEFAULT_WIDTH + WORKSPACE_PREVIEW_TARGET_WIDTH;
-const WORKSPACE_CONTEXT_MENU_FILE_HEIGHT = 92;
-const WORKSPACE_CONTEXT_MENU_REF_HEIGHT = 48;
+const WORKSPACE_CONTEXT_MENU_FILE_HEIGHT = 136;
+const WORKSPACE_CONTEXT_MENU_REF_HEIGHT = 92;
+const WORKSPACE_CONTEXT_MENU_SELECTION_HEIGHT = 48;
 const WORKSPACE_MAX_PREVIEW_TABS = 5;
 
 function clampWorkspaceTreeWidth(width: number, panelWidth?: number): number {
@@ -642,6 +644,12 @@ export function WorkspacePanel({
     }
   };
 
+  const revealInFileManager = () => {
+    if (!treeMenu) return;
+    setTreeMenu(null);
+    void app.RevealWorkspacePath(treeMenu.path);
+  };
+
   const renderRows = (dir: string, depth: number): JSX.Element[] => {
     const entries = entriesByDir[dir] ?? [];
     return entries.flatMap((entry) => {
@@ -938,7 +946,7 @@ export function WorkspacePanel({
             </>
           ) : null}
           {selectionMenu && (
-            <FloatingMenu x={selectionMenu.x} y={selectionMenu.y} estimatedHeight={WORKSPACE_CONTEXT_MENU_REF_HEIGHT}>
+            <FloatingMenu x={selectionMenu.x} y={selectionMenu.y} estimatedHeight={WORKSPACE_CONTEXT_MENU_SELECTION_HEIGHT}>
               <FloatingMenuItems
                 items={[
                   {
@@ -1095,6 +1103,11 @@ export function WorkspacePanel({
                       onSelect: () => void addTreeFileToChat(),
                     },
                   ]),
+              {
+                icon: <FolderOpen size={14} />,
+                label: t("workspace.revealInFileManager"),
+                onSelect: revealInFileManager,
+              },
             ]}
           />
         </FloatingMenu>
diff --git a/desktop/frontend/src/locales/en.ts b/desktop/frontend/src/locales/en.ts
index eb6a89743..986b4c4ee 100644
--- a/desktop/frontend/src/locales/en.ts
+++ b/desktop/frontend/src/locales/en.ts
@@ -109,6 +109,7 @@ export const en = {
   "workspace.sourceSession": "Session",
   "workspace.sourceGit": "Git",
   "workspace.deleted": "Deleted",
+  "workspace.revealInFileManager": "Show in file manager",
 
   // mcp & skills drawer
   "caps.title": "MCP & Skills",
diff --git a/desktop/frontend/src/locales/zh.ts b/desktop/frontend/src/locales/zh.ts
index e392c3a4f..c46a08dc6 100644
--- a/desktop/frontend/src/locales/zh.ts
+++ b/desktop/frontend/src/locales/zh.ts
@@ -110,6 +110,7 @@ export const zh: Record<DictKey, string> = {
   "workspace.sourceSession": "会话",
   "workspace.sourceGit": "Git",
   "workspace.deleted": "已删除",
+  "workspace.revealInFileManager": "在文件管理器中显示",
 
   // MCP 与技能抽屉
   "caps.title": "MCP 与技能",

From da78bed4574bee4e402419b8217c00d0e9abffc4 Mon Sep 17 00:00:00 2001
From: YHH <359807859@qq.com>
Date: Tue, 9 Jun 2026 23:49:28 -0700
Subject: [PATCH 63/64] refactor(desktop): extract goal-draft
 collaboration-mode helpers (#3802)

The goal-draft decision was inlined at seven App.tsx call sites (active
tab, tab list, controller sync, model switch). Move it into
src/lib/goalDraftMode.ts so the rule lives in one place and is unit
tested; no behavior change from the inline form merged in #3795.

Co-authored-by: reasonix <reasonix@deepseek.com>
Co-authored-by: SivanCola <32437197+SivanCola@users.noreply.github.com>
---
 desktop/frontend/package.json                 |  4 +-
 desktop/frontend/src/App.tsx                  | 44 ++++++++---
 .../src/__tests__/goal-draft-mode.test.ts     | 75 +++++++++++++++++++
 desktop/frontend/src/lib/goalDraftMode.ts     | 51 +++++++++++++
 4 files changed, 160 insertions(+), 14 deletions(-)
 create mode 100644 desktop/frontend/src/__tests__/goal-draft-mode.test.ts
 create mode 100644 desktop/frontend/src/lib/goalDraftMode.ts

diff --git a/desktop/frontend/package.json b/desktop/frontend/package.json
index b4a04ede8..7257d8886 100644
--- a/desktop/frontend/package.json
+++ b/desktop/frontend/package.json
@@ -11,9 +11,9 @@
     "check:browser-preview": "node scripts/check-browser-preview-stability.mjs",
     "test:todo-visibility": "node scripts/test-todo-visibility.mjs",
     "typecheck": "tsc --noEmit",
-    "test": "tsx src/__tests__/math-golden.test.ts && tsx src/__tests__/text-size.test.ts && tsx src/__tests__/provider-model-refresh.test.ts",
+    "test": "tsx src/__tests__/math-golden.test.ts && tsx src/__tests__/text-size.test.ts && tsx src/__tests__/provider-model-refresh.test.ts && tsx src/__tests__/goal-draft-mode.test.ts",
     "test:typecheck": "tsc --noEmit -p tsconfig.test.json",
-    "test:all": "tsc --noEmit -p tsconfig.test.json && tsx src/__tests__/math-golden.test.ts && tsx src/__tests__/text-size.test.ts && tsx src/__tests__/provider-model-refresh.test.ts"
+    "test:all": "tsc --noEmit -p tsconfig.test.json && tsx src/__tests__/math-golden.test.ts && tsx src/__tests__/text-size.test.ts && tsx src/__tests__/provider-model-refresh.test.ts && tsx src/__tests__/goal-draft-mode.test.ts"
   },
   "dependencies": {
     "@tanstack/react-virtual": "^3.14.2",
diff --git a/desktop/frontend/src/App.tsx b/desktop/frontend/src/App.tsx
index 7c3e12433..a27fd57c6 100644
--- a/desktop/frontend/src/App.tsx
+++ b/desktop/frontend/src/App.tsx
@@ -44,7 +44,6 @@ import {
   modeHasAutoApproveTools,
   modeHasPlan,
   modeFromAxes,
-  normalizeCollaborationMode,
   normalizeMode,
   normalizeToolApprovalMode,
   type CollaborationMode,
@@ -56,6 +55,13 @@ import {
   type TabMeta,
   type ToolApprovalMode,
 } from "./lib/types";
+import {
+  controllerCollaborationMode,
+  displayedCollaborationMode,
+  keepGoalDraftMode,
+  metaSyncedCollaborationMode,
+  tabListCollaborationMode,
+} from "./lib/goalDraftMode";
 import { loadLayoutSize, saveLayoutSize } from "./lib/layoutPreferences";
 import {
   applyTheme,
@@ -586,7 +592,14 @@ export default function App() {
   const goal = activeTabId ? goalsByTab[activeTabId] ?? state.meta?.goal ?? activeTab?.goal ?? "" : "";
   const goalDraftMode = activeTabId ? Boolean(goalDraftModesByTab[activeTabId]) : false;
   const collaborationMode = activeTabId
-    ? goalDraftMode ? "goal" : collaborationModesByTab[activeTabId] ?? normalizeCollaborationMode(state.meta?.goal ? "goal" : activeTab?.collaborationMode, goal, legacyMode)
+    ? displayedCollaborationMode({
+        goalDraftMode,
+        localMode: collaborationModesByTab[activeTabId],
+        metaGoal: state.meta?.goal,
+        tabMode: activeTab?.collaborationMode,
+        goal,
+        legacyMode,
+      })
     : "normal";
   const toolApprovalMode = activeTabId
     ? toolApprovalModesByTab[activeTabId] ?? normalizeToolApprovalMode(state.meta?.toolApprovalMode ?? activeTab?.toolApprovalMode, legacyMode, state.meta?.autoApproveTools ?? state.meta?.bypass)
@@ -623,7 +636,13 @@ export default function App() {
       ...tab,
       running: tab.id === visibleTabId ? tab.running || state.running : tab.running,
       mode: modesByTab[tab.id] ?? normalizeMode(tab.mode),
-      collaborationMode: goalDraftModesByTab[tab.id] ? "goal" : collaborationModesByTab[tab.id] ?? normalizeCollaborationMode(tab.collaborationMode, goalsByTab[tab.id] ?? tab.goal, normalizeMode(tab.mode)),
+      collaborationMode: tabListCollaborationMode({
+        goalDraftMode: Boolean(goalDraftModesByTab[tab.id]),
+        localMode: collaborationModesByTab[tab.id],
+        tabMode: tab.collaborationMode,
+        tabGoal: goalsByTab[tab.id] ?? tab.goal,
+        legacyMode: normalizeMode(tab.mode),
+      }),
       toolApprovalMode: toolApprovalModesByTab[tab.id] ?? normalizeToolApprovalMode(tab.toolApprovalMode, normalizeMode(tab.mode), tab.toolApprovalMode === "yolo"),
       goal: goalsByTab[tab.id] ?? tab.goal ?? "",
       active: tab.id === visibleTabId,
@@ -647,7 +666,7 @@ export default function App() {
       let changed = false;
       const next: Record<string, boolean> = {};
       for (const tab of tabMetas) {
-        if (current[tab.id] && !(tab.goal ?? "").trim()) {
+        if (keepGoalDraftMode(Boolean(current[tab.id]), tab.goal)) {
           next[tab.id] = true;
         } else if (current[tab.id]) {
           changed = true;
@@ -675,9 +694,12 @@ export default function App() {
       let changed = false;
       const next: Record<string, CollaborationMode> = {};
       for (const tab of tabMetas) {
-        const value = goalDraftModesByTab[tab.id] && !(tab.goal ?? "").trim()
-          ? "goal"
-          : normalizeCollaborationMode(tab.collaborationMode, tab.goal, normalizeMode(tab.mode));
+        const value = tabListCollaborationMode({
+          goalDraftMode: keepGoalDraftMode(Boolean(goalDraftModesByTab[tab.id]), tab.goal),
+          tabMode: tab.collaborationMode,
+          tabGoal: tab.goal,
+          legacyMode: normalizeMode(tab.mode),
+        });
         next[tab.id] = value;
         if (current[tab.id] !== value) changed = true;
       }
@@ -728,7 +750,7 @@ export default function App() {
     if (nextGoal) setGoalDraftModeForTab(activeTabId, false);
     setGoalsByTab((current) => (current[activeTabId] === nextGoal ? current : { ...current, [activeTabId]: nextGoal }));
     setCollaborationModesByTab((current) => {
-      const nextMode = nextGoal || goalDraftMode ? "goal" : normalizeCollaborationMode(undefined, "", legacyMode);
+      const nextMode = metaSyncedCollaborationMode({ nextGoal, goalDraftMode, legacyMode });
       return current[activeTabId] === nextMode ? current : { ...current, [activeTabId]: nextMode };
     });
   }, [activeTabId, goalDraftMode, legacyMode, setGoalDraftModeForTab, state.meta]);
@@ -821,8 +843,7 @@ export default function App() {
   const switchModel = useCallback(
     async (name: string) => {
       await setModel(name);
-      const controllerCollaborationMode = collaborationMode === "goal" && !goal.trim() ? "normal" : collaborationMode;
-      await setControllerCollaborationMode(controllerCollaborationMode);
+      await setControllerCollaborationMode(controllerCollaborationMode({ collaborationMode, goal }));
       await setControllerToolApprovalMode(toolApprovalMode);
       if (goal.trim()) await setControllerGoal(goal);
     },
@@ -835,8 +856,7 @@ export default function App() {
   // SetBypass binding was a harmless no-op.
   useEffect(() => {
     if (!controllerReady) return;
-    const controllerCollaborationMode = collaborationMode === "goal" && !goal.trim() ? "normal" : collaborationMode;
-    void setControllerCollaborationMode(controllerCollaborationMode);
+    void setControllerCollaborationMode(controllerCollaborationMode({ collaborationMode, goal }));
     void setControllerToolApprovalMode(toolApprovalMode);
     if (goal.trim()) void setControllerGoal(goal);
   }, [collaborationMode, controllerReady, goal, setControllerCollaborationMode, setControllerGoal, setControllerToolApprovalMode, toolApprovalMode]);
diff --git a/desktop/frontend/src/__tests__/goal-draft-mode.test.ts b/desktop/frontend/src/__tests__/goal-draft-mode.test.ts
new file mode 100644
index 000000000..16266fdbe
--- /dev/null
+++ b/desktop/frontend/src/__tests__/goal-draft-mode.test.ts
@@ -0,0 +1,75 @@
+// Run: tsx src/__tests__/goal-draft-mode.test.ts
+
+import {
+  controllerCollaborationMode,
+  displayedCollaborationMode,
+  keepGoalDraftMode,
+  metaSyncedCollaborationMode,
+  tabListCollaborationMode,
+} from "../lib/goalDraftMode";
+
+let passed = 0;
+let failed = 0;
+
+function eq(a: unknown, b: unknown, label: string) {
+  if (a === b) {
+    process.stdout.write(`  PASS  ${label}\n`);
+    passed += 1;
+  } else {
+    process.stdout.write(`  FAIL  ${label}: expected ${JSON.stringify(b)}, got ${JSON.stringify(a)}\n`);
+    failed += 1;
+  }
+}
+
+console.log("\ngoal draft mode");
+
+eq(
+  displayedCollaborationMode({ goalDraftMode: true, localMode: "normal", goal: "" }),
+  "goal",
+  "draft goal mode wins over stale local normal mode",
+);
+
+eq(
+  tabListCollaborationMode({ goalDraftMode: true, tabMode: "normal", tabGoal: "" }),
+  "goal",
+  "tab list keeps draft goal mode visible before a goal is started",
+);
+
+eq(
+  metaSyncedCollaborationMode({ nextGoal: "", goalDraftMode: true, legacyMode: "normal" }),
+  "goal",
+  "empty controller meta does not collapse a draft goal mode",
+);
+
+eq(
+  controllerCollaborationMode({ collaborationMode: "goal", goal: "" }),
+  "normal",
+  "empty draft goal syncs to the controller as normal mode",
+);
+
+eq(
+  controllerCollaborationMode({ collaborationMode: "goal", goal: "ship the fix" }),
+  "goal",
+  "started goal syncs to the controller as goal mode",
+);
+
+eq(
+  keepGoalDraftMode(true, ""),
+  true,
+  "draft flag is retained while goal text is empty",
+);
+
+eq(
+  keepGoalDraftMode(true, "ship the fix"),
+  false,
+  "draft flag clears after a real goal exists",
+);
+
+eq(
+  metaSyncedCollaborationMode({ nextGoal: "", goalDraftMode: false, legacyMode: "plan" }),
+  "plan",
+  "non-draft empty goal falls back to legacy plan mode",
+);
+
+console.log(`\n${passed} passed, ${failed} failed, ${passed + failed} total`);
+if (failed > 0) process.exit(1);
diff --git a/desktop/frontend/src/lib/goalDraftMode.ts b/desktop/frontend/src/lib/goalDraftMode.ts
new file mode 100644
index 000000000..851d1bc3c
--- /dev/null
+++ b/desktop/frontend/src/lib/goalDraftMode.ts
@@ -0,0 +1,51 @@
+import {
+  normalizeCollaborationMode,
+  type CollaborationMode,
+  type Mode,
+} from "./types";
+
+export function keepGoalDraftMode(current: boolean, goal?: string): boolean {
+  return current && !(goal ?? "").trim();
+}
+
+export function displayedCollaborationMode(params: {
+  goalDraftMode: boolean;
+  localMode?: CollaborationMode;
+  metaGoal?: string;
+  tabMode?: string;
+  goal?: string;
+  legacyMode?: Mode;
+}): CollaborationMode {
+  if (params.goalDraftMode) return "goal";
+  return params.localMode ?? normalizeCollaborationMode(params.metaGoal ? "goal" : params.tabMode, params.goal, params.legacyMode);
+}
+
+export function tabListCollaborationMode(params: {
+  goalDraftMode: boolean;
+  localMode?: CollaborationMode;
+  tabMode?: string;
+  tabGoal?: string;
+  legacyMode?: Mode;
+}): CollaborationMode {
+  if (params.goalDraftMode) return "goal";
+  return params.localMode ?? normalizeCollaborationMode(params.tabMode, params.tabGoal, params.legacyMode);
+}
+
+export function metaSyncedCollaborationMode(params: {
+  nextGoal?: string;
+  goalDraftMode: boolean;
+  legacyMode?: Mode;
+}): CollaborationMode {
+  return params.nextGoal || params.goalDraftMode
+    ? "goal"
+    : normalizeCollaborationMode(undefined, "", params.legacyMode);
+}
+
+export function controllerCollaborationMode(params: {
+  collaborationMode: CollaborationMode;
+  goal?: string;
+}): CollaborationMode {
+  return params.collaborationMode === "goal" && !params.goal?.trim()
+    ? "normal"
+    : params.collaborationMode;
+}

From 4e46b37339f9f261dfd126d860b16d6dcbf64e85 Mon Sep 17 00:00:00 2001
From: SuMuxi66 <2728602302@qq.com>
Date: Wed, 10 Jun 2026 16:37:28 +0800
Subject: [PATCH 64/64] fix(fileref): restore fuzzy @file search for nested
 paths

The v2 @-menu search matched only on the basename of each file, so an
input like "@planind" never surfaced a deeply-nested match such as
"src/planind/index.tsx" whose basename is "index.tsx".

* internal/fileref/search.go: split matches into a basename tier and a
  path-segment tier; basename hits still win, but the segment tier now
  fills the remaining capacity using pathSegmentContains(rel, query).
  Noise directories (node_modules, build, dist, .git, ...) are still
  skipped before the matching switch.
* internal/fileref/search_test.go: cover path-segment match, basename
  match, sort order between tiers, and noise-directory skip list.
* desktop/frontend/src/lib/atMatches.ts: extract the Composer @-menu
  filter into a pure helper so it can be unit-tested without React.
* desktop/frontend/src/__tests__/at-matches.test.ts: regression tests
  for nested path surfacing, basename match, and stable de-duplication.
* desktop/frontend/src/components/Composer.tsx: delegate the filter
  to the helper. The atDir !== "" guard for sub-path search is
  intentionally left unchanged for this fix.
---
 desktop/app.go                                |   8 +-
 .../frontend/src/__tests__/at-matches.test.ts |  96 +++++++++++
 desktop/frontend/src/components/Composer.tsx  |   9 +-
 desktop/frontend/src/lib/atMatches.ts         |  34 ++++
 internal/cli/complete.go                      |  10 +-
 internal/fileref/search.go                    |  88 ++++++++--
 internal/fileref/search_test.go               | 154 ++++++++++++++++++
 7 files changed, 371 insertions(+), 28 deletions(-)
 create mode 100644 desktop/frontend/src/__tests__/at-matches.test.ts
 create mode 100644 desktop/frontend/src/lib/atMatches.ts
 create mode 100644 internal/fileref/search_test.go

diff --git a/desktop/app.go b/desktop/app.go
index 0cf7808c3..b0ebb2c02 100644
--- a/desktop/app.go
+++ b/desktop/app.go
@@ -3517,10 +3517,10 @@ func (a *App) SearchFileRefs(query string) []DirEntry {
 	if err != nil {
 		return nil
 	}
-	paths := fileref.Search(base, query, fileRefSearchLimit)
-	out := make([]DirEntry, 0, len(paths))
-	for _, path := range paths {
-		out = append(out, DirEntry{Name: path, IsDir: false})
+	results := fileref.Search(base, query, fileRefSearchLimit)
+	out := make([]DirEntry, 0, len(results))
+	for _, r := range results {
+		out = append(out, DirEntry{Name: r.Path, IsDir: r.IsDir})
 	}
 	return out
 }
diff --git a/desktop/frontend/src/__tests__/at-matches.test.ts b/desktop/frontend/src/__tests__/at-matches.test.ts
new file mode 100644
index 000000000..c58da9417
--- /dev/null
+++ b/desktop/frontend/src/__tests__/at-matches.test.ts
@@ -0,0 +1,96 @@
+// Run: tsx src/__tests__/at-matches.test.ts
+//
+// Regression coverage for the Composer @-menu filter (issue #3769).
+// The frontend must mirror the backend fuzzy @-search contract:
+// a fragment like "planind" should surface "src/planind/index.tsx"
+// because the search results return full slash-normalized relative
+// paths, not basenames.
+
+import { filterAtMatches } from "../lib/atMatches";
+import type { DirEntry } from "../lib/types";
+
+let passed = 0;
+let failed = 0;
+
+function eq(a: unknown, b: unknown, label: string) {
+  if (JSON.stringify(a) === JSON.stringify(b)) {
+    process.stdout.write(`  PASS  ${label}\n`);
+    passed += 1;
+  } else {
+    process.stdout.write(`  FAIL  ${label}: expected ${JSON.stringify(b)}, got ${JSON.stringify(a)}\n`);
+    failed += 1;
+  }
+}
+
+function entry(name: string, isDir = false): DirEntry {
+  return { name, isDir };
+}
+
+console.log("\nat-matches filter");
+
+// 1. Nested file surfaces when fragment matches an intermediate segment.
+{
+  const entries: DirEntry[] = [];
+  const searchEntries = [entry("src/planind/index.tsx")];
+  const got = filterAtMatches(entries, searchEntries, "planind");
+  eq(
+    got.map((e) => e.name),
+    ["src/planind/index.tsx"],
+    "src/planind/index.tsx + planind → surfaces the nested file",
+  );
+}
+
+// 2. Basename hit is preserved (regression guard for the legacy v1 path).
+{
+  const entries: DirEntry[] = [];
+  const searchEntries = [entry("src/planind/index.tsx")];
+  const got = filterAtMatches(entries, searchEntries, "index");
+  eq(
+    got.map((e) => e.name),
+    ["src/planind/index.tsx"],
+    "src/planind/index.tsx + index → still surfaces via basename",
+  );
+}
+
+// 3. Local ListDir hit and fuzzy Search hit with the same name are de-duped
+// to a single entry, with the local one taking precedence (it appears first).
+{
+  const entries = [entry("planind.go")];
+  const searchEntries = [entry("planind.go")];
+  const got = filterAtMatches(entries, searchEntries, "planind");
+  eq(
+    got.map((e) => e.name),
+    ["planind.go"],
+    "entries ∩ searchEntries with same name dedup to one",
+  );
+}
+
+// 4. Local ListDir entries with a matching fragment appear first; fuzzy hits
+// fill the rest in the order the backend returned them.
+{
+  const entries = [entry("planind.go"), entry("planind.md")];
+  const searchEntries = [entry("src/planind/index.tsx")];
+  const got = filterAtMatches(entries, searchEntries, "planind");
+  eq(
+    got.map((e) => e.name),
+    ["planind.go", "planind.md", "src/planind/index.tsx"],
+    "local entries precede fuzzy search hits, no dupes",
+  );
+}
+
+// 5. Empty fragment matches every entry because includes("") is true; this
+// pins the current behavior so a future change that re-introduces
+// basename-only matching or skips empty fragments is caught immediately.
+{
+  const entries = [entry("a.ts"), entry("b.ts")];
+  const searchEntries = [entry("src/c.ts")];
+  const got = filterAtMatches(entries, searchEntries, "");
+  eq(
+    got.map((e) => e.name),
+    ["a.ts", "b.ts", "src/c.ts"],
+    "empty fragment includes every entry (legacy behavior preserved)",
+  );
+}
+
+console.log(`\n${passed} passed, ${failed} failed\n`);
+process.exit(failed === 0 ? 0 : 1);
diff --git a/desktop/frontend/src/components/Composer.tsx b/desktop/frontend/src/components/Composer.tsx
index 24c28deca..0eead6a03 100644
--- a/desktop/frontend/src/components/Composer.tsx
+++ b/desktop/frontend/src/components/Composer.tsx
@@ -2,6 +2,7 @@ import { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } fr
 import type { CSSProperties, ClipboardEvent, DragEvent, KeyboardEvent, PointerEvent as ReactPointerEvent } from "react";
 import { ArrowUp, Eye, FileText, Folder, List, MessageSquare, Search, Shield, ShieldAlert, ShieldCheck, SlidersHorizontal, Square, Target, Trash2, X } from "lucide-react";
 import { asArray } from "../lib/array";
+import { filterAtMatches } from "../lib/atMatches";
 import { DedupIndex, sha256 } from "../lib/attachDedup";
 import { app, onFilesDropped } from "../lib/bridge";
 import { SPINNER_WORDS, useI18n } from "../lib/i18n";
@@ -507,13 +508,7 @@ export function Composer({
   const atMatches = useMemo(
     () => {
       if (atRaw === null) return [];
-      const local = entries.filter((e) => e.name.toLowerCase().includes(atFrag));
-      const seen = new Set(local.map((e) => e.name));
-      const searched = searchEntries.filter((e) => {
-        const basename = e.name.split("/").pop()?.toLowerCase() ?? "";
-        return basename.includes(atFrag) && !seen.has(e.name);
-      });
-      return [...local, ...searched];
+      return filterAtMatches(entries, searchEntries, atFrag);
     },
     [atRaw, atFrag, entries, searchEntries],
   );
diff --git a/desktop/frontend/src/lib/atMatches.ts b/desktop/frontend/src/lib/atMatches.ts
new file mode 100644
index 000000000..7941de93a
--- /dev/null
+++ b/desktop/frontend/src/lib/atMatches.ts
@@ -0,0 +1,34 @@
+// atMatches filters the @-menu candidates shown in the Composer. It is
+// extracted from the Composer component so it can be unit-tested without
+// mounting the full React tree.
+//
+// The match logic mirrors the v2 fuzzy @-search behavior: the user's
+// fragment is matched against each entry's full relative path (which the
+// backend already returns as a slash-normalized string for search
+// results, and as a single-segment name for ListDir results). This
+// allows entries like "src/planind/index.tsx" to surface when the user
+// types a directory segment such as "planind", not just the basename
+// "index.tsx".
+//
+// Entries from the local ListDir (`entries`) and the fuzzy Search
+// (`searchEntries`) are merged with stable de-duplication keyed on
+// `entry.name` so a result that appears in both lists is shown only
+// once. The local list takes precedence (it represents the user's
+// current directory and is more immediate).
+
+import type { DirEntry } from "./types";
+
+export function filterAtMatches(
+  entries: readonly DirEntry[],
+  searchEntries: readonly DirEntry[],
+  atFrag: string,
+): DirEntry[] {
+  const frag = atFrag.toLowerCase();
+  const local = entries.filter((e) => e.name.toLowerCase().includes(frag));
+  const seen = new Set(local.map((e) => e.name));
+  const searched = searchEntries.filter((e) => {
+    if (seen.has(e.name)) return false;
+    return e.name.toLowerCase().includes(frag);
+  });
+  return [...local, ...searched];
+}
diff --git a/internal/cli/complete.go b/internal/cli/complete.go
index bc32ec515..34eee929f 100644
--- a/internal/cli/complete.go
+++ b/internal/cli/complete.go
@@ -393,9 +393,13 @@ func (m *chatTUI) searchFileRefs(frag string) []string {
 	if r, ok := m.fileSearchCache[frag]; ok {
 		return r
 	}
-	r := fileref.Search(".", frag, maxFileSearchItems)
-	m.fileSearchCache[frag] = r
-	return r
+	results := fileref.Search(".", frag, maxFileSearchItems)
+	paths := make([]string, 0, len(results))
+	for _, r := range results {
+		paths = append(paths, r.Path)
+	}
+	m.fileSearchCache[frag] = paths
+	return paths
 }
 
 // splitPathToken splits a path token into (dir, frag): dir keeps its trailing
diff --git a/internal/fileref/search.go b/internal/fileref/search.go
index e41a5ea99..c1b8a3656 100644
--- a/internal/fileref/search.go
+++ b/internal/fileref/search.go
@@ -37,17 +37,30 @@ const (
 	maxWalkEntries = 10000
 )
 
-// Search finds regular files under root whose basename contains query. It is
-// bounded by limit and skips common generated/vendor directories so interactive
-// completion stays responsive on large workspaces.
-func Search(root, query string, limit int) []string {
+// SearchResult is a single entry returned by Search. It carries the relative
+// path (slash-normalized) and whether the entry is a directory, so callers
+// can present the correct icon and append "/" vs " " on selection.
+type SearchResult struct {
+	Path  string
+	IsDir bool
+}
+
+// Search finds entries under root whose path matches query. A match is
+// recorded when the query is a substring of the file's basename (preferred
+// tier), of any slash-separated path segment (fallback tier), or of a
+// directory name (lowest tier). It is bounded by limit and skips common
+// generated/vendor directories so interactive completion stays responsive on
+// large workspaces.
+func Search(root, query string, limit int) []SearchResult {
 	query = strings.ToLower(strings.TrimSpace(query))
 	if len(query) < minQueryLen || strings.ContainsAny(query, `/\`) || limit <= 0 {
 		return nil
 	}
 
 	showHidden := strings.HasPrefix(query, ".")
-	var matches []string
+	var basenameHits []SearchResult
+	var segmentHits []SearchResult
+	var dirHits []SearchResult
 	visited := 0
 	_ = filepath.WalkDir(root, func(path string, d fs.DirEntry, err error) error {
 		if err != nil {
@@ -74,20 +87,19 @@ func Search(root, query string, limit int) []string {
 			if skipEntryNames[name] || skipDirNames[name] || skipDirPaths[rel] || (!showHidden && strings.HasPrefix(name, ".")) {
 				return filepath.SkipDir
 			}
+			// Allow matching directory names so the user can select a
+			// folder directly from the @-menu instead of only its contents.
+			if strings.Contains(strings.ToLower(name), query) {
+				dirHits = append(dirHits, SearchResult{Path: rel, IsDir: true})
+			}
 			return nil
 		}
 		if skipEntryNames[name] {
 			return nil
 		}
-		if len(matches) >= limit {
-			return filepath.SkipAll
-		}
 		if !showHidden && strings.HasPrefix(name, ".") {
 			return nil
 		}
-		if !strings.Contains(strings.ToLower(name), query) {
-			return nil
-		}
 		if info, err := d.Info(); err != nil || !info.Mode().IsRegular() {
 			return nil
 		}
@@ -95,9 +107,57 @@ func Search(root, query string, limit int) []string {
 		if err != nil {
 			return nil
 		}
-		matches = append(matches, filepath.ToSlash(rel))
+		rel = filepath.ToSlash(rel)
+		nameLower := strings.ToLower(name)
+		switch {
+		case strings.Contains(nameLower, query):
+			basenameHits = append(basenameHits, SearchResult{Path: rel})
+		case pathSegmentContains(rel, query):
+			segmentHits = append(segmentHits, SearchResult{Path: rel})
+		}
 		return nil
 	})
-	sort.Strings(matches)
-	return matches
+	sort.Slice(basenameHits, func(i, j int) bool { return basenameHits[i].Path < basenameHits[j].Path })
+	sort.Slice(segmentHits, func(i, j int) bool { return segmentHits[i].Path < segmentHits[j].Path })
+	sort.Slice(dirHits, func(i, j int) bool { return dirHits[i].Path < dirHits[j].Path })
+	// Directories first so the user can navigate into them; then basename
+	// hits (most relevant file matches); then path-segment hits. We reserve
+	// up to dirQuota slots for directories so they are never fully crowded
+	// out by a large number of file matches.
+	const dirQuota = 5
+	out := make([]SearchResult, 0, limit)
+	nDirs := len(dirHits)
+	if nDirs > dirQuota {
+		nDirs = dirQuota
+	}
+	out = append(out, dirHits[:nDirs]...)
+	remaining := limit - len(out)
+	if remaining > 0 {
+		if len(basenameHits) > remaining {
+			basenameHits = basenameHits[:remaining]
+		}
+		out = append(out, basenameHits...)
+		remaining = limit - len(out)
+	}
+	if remaining > 0 {
+		if len(segmentHits) > remaining {
+			segmentHits = segmentHits[:remaining]
+		}
+		out = append(out, segmentHits...)
+	}
+	return out
+}
+
+// pathSegmentContains reports whether query appears in any slash-separated
+// segment of the slash-normalized relative path. The basename is matched
+// independently by the caller, so this helper is meaningful only for
+// directories above the file (e.g. "src/planind/index.tsx" with query
+// "planind" matches the "planind" segment).
+func pathSegmentContains(relSlash, queryLower string) bool {
+	for _, seg := range strings.Split(relSlash, "/") {
+		if strings.Contains(strings.ToLower(seg), queryLower) {
+			return true
+		}
+	}
+	return false
 }
diff --git a/internal/fileref/search_test.go b/internal/fileref/search_test.go
new file mode 100644
index 000000000..e6b4d099a
--- /dev/null
+++ b/internal/fileref/search_test.go
@@ -0,0 +1,154 @@
+package fileref
+
+import (
+	"os"
+	"path/filepath"
+	"testing"
+)
+
+// writeFile is a tiny helper that creates a regular file with placeholder
+// content. Tests use it to scaffold the workspace layout before each Search
+// call.
+func writeFile(t *testing.T, path string) {
+	t.Helper()
+	if err := os.MkdirAll(filepath.Dir(path), 0o755); err != nil {
+		t.Fatalf("mkdir: %v", err)
+	}
+	if err := os.WriteFile(path, []byte("ok"), 0o644); err != nil {
+		t.Fatalf("write: %v", err)
+	}
+}
+
+// resultPaths extracts just the Path fields from a slice of SearchResult for
+// easy assertion against expected path lists.
+func resultPaths(results []SearchResult) []string {
+	paths := make([]string, len(results))
+	for i, r := range results {
+		paths[i] = r.Path
+	}
+	return paths
+}
+
+// containsPath reports whether want appears in the results by Path field.
+func containsPath(got []SearchResult, want string) bool {
+	for _, r := range got {
+		if r.Path == want {
+			return true
+		}
+	}
+	return false
+}
+
+// containsDirHit reports whether a result with the given Path and IsDir=true
+// exists in the results.
+func containsDirHit(got []SearchResult, wantPath string) bool {
+	for _, r := range got {
+		if r.Path == wantPath && r.IsDir {
+			return true
+		}
+	}
+	return false
+}
+
+// TestSearchMatchesPathSegment verifies the fix for issue #3769: a query
+// matching an intermediate directory segment (here "planind") should now
+// surface files under that directory, even when the basename does not
+// contain the query.
+func TestSearchMatchesPathSegment(t *testing.T) {
+	root := t.TempDir()
+	writeFile(t, filepath.Join(root, "src", "planind", "index.tsx"))
+
+	got := Search(root, "planind", 50)
+	if !containsPath(got, "src/planind/index.tsx") {
+		t.Fatalf("Search(%q) should return %q (path-segment match), got %v", "planind", "src/planind/index.tsx", resultPaths(got))
+	}
+}
+
+// TestSearchMatchesDirectories verifies that a query matching a directory
+// name returns the directory itself with IsDir=true, not just its contents.
+func TestSearchMatchesDirectories(t *testing.T) {
+	root := t.TempDir()
+	writeFile(t, filepath.Join(root, "docs", "assets", "readme.md"))
+	writeFile(t, filepath.Join(root, "docs", "assets", "image.png"))
+
+	got := Search(root, "assets", 50)
+	if !containsDirHit(got, "docs/assets") {
+		t.Fatalf("Search(%q) should return directory %q with IsDir=true, got %v", "assets", "docs/assets", resultPaths(got))
+	}
+	// Directory hits come after basename and segment hits.
+	if !containsPath(got, "docs/assets/readme.md") {
+		t.Fatalf("Search(%q) should still return files under the directory, got %v", "assets", resultPaths(got))
+	}
+}
+
+// TestSearchKeepsBasenameMatch guards the legacy behavior: when the query
+// matches the file's basename, the file must still appear in the results,
+// and basename hits must sort strictly before path-segment and directory
+// hits so the most relevant matches surface at the top of the completion
+// menu.
+func TestSearchKeepsBasenameMatch(t *testing.T) {
+	root := t.TempDir()
+	writeFile(t, filepath.Join(root, "planind.go"))
+	writeFile(t, filepath.Join(root, "src", "planind", "index.tsx")) // also a segment hit
+
+	got := Search(root, "planind", 50)
+	gotPaths := resultPaths(got)
+	want := []string{"src/planind", "planind.go", "src/planind/index.tsx"}
+	if !equalSlices(gotPaths, want) {
+		t.Fatalf("Search(%q) order mismatch:\n  want %v\n  got  %v", "planind", want, gotPaths)
+	}
+	// Verify the directory hit has IsDir=true.
+	if !containsDirHit(got, "src/planind") {
+		t.Fatalf("Search(%q) should return %q with IsDir=true", "planind", "src/planind")
+	}
+}
+
+// equalSlices reports whether two []string are element-wise equal.
+func equalSlices(a, b []string) bool {
+	if len(a) != len(b) {
+		return false
+	}
+	for i := range a {
+		if a[i] != b[i] {
+			return false
+		}
+	}
+	return true
+}
+
+// TestSearchHandlesBasenamePathQuery verifies that searching for the basename
+// part of a nested file still surfaces the file (regression guard).
+func TestSearchHandlesBasenamePathQuery(t *testing.T) {
+	root := t.TempDir()
+	writeFile(t, filepath.Join(root, "src", "planind", "index.tsx"))
+
+	got := Search(root, "index", 50)
+	if !containsPath(got, "src/planind/index.tsx") {
+		t.Fatalf("Search(%q) should return %q (basename of nested file), got %v", "index", "src/planind/index.tsx", resultPaths(got))
+	}
+}
+
+// TestSearchSkipsNoiseStillWorks ensures the noise-directory skip list still
+// applies to path-segment matches. Files under node_modules must not surface
+// even when an intermediate segment matches the query.
+func TestSearchSkipsNoiseStillWorks(t *testing.T) {
+	root := t.TempDir()
+	writeFile(t, filepath.Join(root, "src", "planind", "index.tsx"))          // legitimate hit
+	writeFile(t, filepath.Join(root, "node_modules", "planind", "index.tsx")) // must be skipped
+	writeFile(t, filepath.Join(root, "build", "planind", "index.tsx"))        // skipDirNames
+	writeFile(t, filepath.Join(root, "dist", "planind", "index.tsx"))         // skipDirNames
+
+	got := Search(root, "planind", 50)
+	if containsPath(got, "node_modules/planind/index.tsx") {
+		t.Fatalf("Search should skip node_modules, got %v", resultPaths(got))
+	}
+	if containsPath(got, "build/planind/index.tsx") {
+		t.Fatalf("Search should skip build/, got %v", resultPaths(got))
+	}
+	if containsPath(got, "dist/planind/index.tsx") {
+		t.Fatalf("Search should skip dist/, got %v", resultPaths(got))
+	}
+	if !containsPath(got, "src/planind/index.tsx") {
+		t.Fatalf("Search should still return legitimate hit, got %v", resultPaths(got))
+	}
+}