From c629fe068bd9cf656efe19251a597ee5b98e80b9 Mon Sep 17 00:00:00 2001
From: loosand <loosand@163.com>
Date: Tue, 26 May 2026 21:58:16 +0800
Subject: [PATCH 1/3] refactor(ui): migrate from Radix UI to Base UI
 (@base-ui/react)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Replace @radix-ui/react-select, dropdown-menu, scroll-area, slot with @base-ui/react equivalents
- Rewrite button.tsx: replace asChild/Slot pattern with render prop
- Rewrite confirm-action-popover.tsx using Base UI Popover (adds focus trap, Esc key, ARIA)
- Fix Select alignItemWithTrigger=false to prevent popup overlapping trigger
- Fix --radix-dropdown-menu-content-available-height → --available-height in ChatHeader
- Fix data-[state=open/checked] → data-[open]/data-[selected] in ChatComposerBar
- Add data-scroll-viewport attribute to ScrollArea.Viewport; update ChatTranscript queries
- Add components.json for shadcn/ui configuration
- Add docs/ui-code-review.md with a11y and implementation review

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 crates/agent-gui/components.json              |  17 +
 crates/agent-gui/package.json                 |   5 +-
 crates/agent-gui/pnpm-lock.yaml               | 823 ++----------------
 .../components/chat/ChatHistorySidebar.tsx    |  46 +-
 crates/agent-gui/src/components/ui/button.tsx |  28 +-
 .../components/ui/confirm-action-popover.tsx  | 111 +--
 .../src/components/ui/dropdown-menu.tsx       |  93 +-
 .../src/components/ui/scroll-area.tsx         |  21 +-
 crates/agent-gui/src/components/ui/select.tsx | 129 ++-
 .../src/pages/chat/ChatComposerBar.tsx        |   8 +-
 .../agent-gui/src/pages/chat/ChatHeader.tsx   |  48 +-
 .../src/pages/chat/ChatTranscript.tsx         |   4 +-
 .../src/pages/mcp-hub/McpRegistryBrowser.tsx  |   8 +-
 .../src/pages/settings/MemoryPanel.tsx        | 104 +--
 .../src/pages/skills-hub/SkillsHubPage.tsx    |   8 +-
 docs/ui-code-review.md                        | 201 +++++
 16 files changed, 611 insertions(+), 1043 deletions(-)
 create mode 100644 crates/agent-gui/components.json
 create mode 100644 docs/ui-code-review.md

diff --git a/crates/agent-gui/components.json b/crates/agent-gui/components.json
new file mode 100644
index 000000000..10cef78c5
--- /dev/null
+++ b/crates/agent-gui/components.json
@@ -0,0 +1,17 @@
+{
+  "$schema": "https://ui.shadcn.com/schema.json",
+  "style": "default",
+  "rsc": false,
+  "tsx": true,
+  "tailwind": {
+    "config": "tailwind.config.js",
+    "css": "src/index.css",
+    "baseColor": "slate",
+    "cssVariables": true
+  },
+  "aliases": {
+    "components": "@/components",
+    "utils": "@/lib/shared/utils",
+    "ui": "@/components/ui"
+  }
+}
diff --git a/crates/agent-gui/package.json b/crates/agent-gui/package.json
index 64e7554be..d22ff97bc 100644
--- a/crates/agent-gui/package.json
+++ b/crates/agent-gui/package.json
@@ -16,15 +16,12 @@
   },
   "dependencies": {
     "@anthropic-ai/claude-agent-sdk": "^0.2.96",
+    "@base-ui/react": "^1.5.0",
     "@git-diff-view/file": "^0.1.3",
     "@git-diff-view/react": "^0.1.3",
     "@mariozechner/pi-agent-core": "^0.65.2",
     "@mariozechner/pi-ai": "^0.65.2",
     "@openai/codex-sdk": "^0.118.0",
-    "@radix-ui/react-dropdown-menu": "^2.1.16",
-    "@radix-ui/react-scroll-area": "^1.2.10",
-    "@radix-ui/react-select": "^2.2.6",
-    "@radix-ui/react-slot": "^1.2.4",
     "@sinclair/typebox": "^0.34.49",
     "@streamdown/cjk": "^1.0.3",
     "@streamdown/code": "^1.1.1",
diff --git a/crates/agent-gui/pnpm-lock.yaml b/crates/agent-gui/pnpm-lock.yaml
index 1dd6f1f49..66b7d2c51 100644
--- a/crates/agent-gui/pnpm-lock.yaml
+++ b/crates/agent-gui/pnpm-lock.yaml
@@ -11,6 +11,9 @@ importers:
       '@anthropic-ai/claude-agent-sdk':
         specifier: ^0.2.96
         version: 0.2.96(zod@4.3.6)
+      '@base-ui/react':
+        specifier: ^1.5.0
+        version: 1.5.0(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
       '@git-diff-view/file':
         specifier: ^0.1.3
         version: 0.1.3
@@ -26,18 +29,6 @@ importers:
       '@openai/codex-sdk':
         specifier: ^0.118.0
         version: 0.118.0
-      '@radix-ui/react-dropdown-menu':
-        specifier: ^2.1.16
-        version: 2.1.16(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
-      '@radix-ui/react-scroll-area':
-        specifier: ^1.2.10
-        version: 1.2.10(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
-      '@radix-ui/react-select':
-        specifier: ^2.2.6
-        version: 2.2.6(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
-      '@radix-ui/react-slot':
-        specifier: ^1.2.4
-        version: 1.2.4(@types/react@19.2.14)(react@19.2.4)
       '@sinclair/typebox':
         specifier: ^0.34.49
         version: 0.34.49
@@ -364,6 +355,10 @@ packages:
     resolution: {integrity: sha512-05WQkdpL9COIMz4LjTxGpPNCdlpyimKppYNoJ5Di5EUObifl8t4tuLuUBBZEpoLYOmfvIWrsp9fCl0HoPRVTdA==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/runtime@7.29.7':
+    resolution: {integrity: sha512-Nq8OhGWiZIZGV6hLHoyAKLLcJihP/xFeBMGJoUrxTX2psI8dCifzLhZISFb+VWS3wFMRDmCGw5R+dOySCqPLhw==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/template@7.28.6':
     resolution: {integrity: sha512-YA6Ma2KsCdGb+WC6UpBVFJGXL58MDA6oyONbjyF/+5sBgxY/dwkhLogbMT2GXXyU84/IhRw/2D1Os1B/giz+BQ==}
     engines: {node: '>=6.9.0'}
@@ -376,6 +371,33 @@ packages:
     resolution: {integrity: sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==}
     engines: {node: '>=6.9.0'}
 
+  '@base-ui/react@1.5.0':
+    resolution: {integrity: sha512-z1gSAlced1yY+iM+mHDEtIkD8UI3Ebs52MuBPxvV6f5hRutk+xvCH/wuB7hDqDzK9JG5FoMz5nhrqtSs1wjt1A==}
+    engines: {node: '>=14.0.0'}
+    peerDependencies:
+      '@date-fns/tz': ^1.2.0
+      '@types/react': ^17 || ^18 || ^19
+      date-fns: ^4.0.0
+      react: ^17 || ^18 || ^19
+      react-dom: ^17 || ^18 || ^19
+    peerDependenciesMeta:
+      '@date-fns/tz':
+        optional: true
+      '@types/react':
+        optional: true
+      date-fns:
+        optional: true
+
+  '@base-ui/utils@0.2.9':
+    resolution: {integrity: sha512-x/PDDCYzoqPpjrdyb3VcyylTI2IjUXEtYDGi5foh7KsnmNJIIaVwA2GLgDH1dps1GgXiJbA60hM+AyuTfQzIvw==}
+    peerDependencies:
+      '@types/react': ^17 || ^18 || ^19
+      react: ^17 || ^18 || ^19
+      react-dom: ^17 || ^18 || ^19
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
   '@braintree/sanitize-url@7.1.2':
     resolution: {integrity: sha512-jigsZK+sMF/cuiB7sERuo9V7N9jx+dhmHHnQyDSVdpZwVutaBu7WvNYqMDLSgFgfB30n452TP3vjDAvFC973mA==}
 
@@ -684,332 +706,6 @@ packages:
   '@protobufjs/utf8@1.1.0':
     resolution: {integrity: sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==}
 
-  '@radix-ui/number@1.1.1':
-    resolution: {integrity: sha512-MkKCwxlXTgz6CFoJx3pCwn07GKp36+aZyu/u2Ln2VrA5DcdyCZkASEDBTd8x5whTQQL5CiYf4prXKLcgQdv29g==}
-
-  '@radix-ui/primitive@1.1.3':
-    resolution: {integrity: sha512-JTF99U/6XIjCBo0wqkU5sK10glYe27MRRsfwoiq5zzOEZLHU3A3KCMa5X/azekYRCJ0HlwI0crAXS/5dEHTzDg==}
-
-  '@radix-ui/react-arrow@1.1.7':
-    resolution: {integrity: sha512-F+M1tLhO+mlQaOWspE8Wstg+z6PwxwRd8oQ8IXceWz92kfAmalTRf0EjrouQeo7QssEPfCn05B4Ihs1K9WQ/7w==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-
-  '@radix-ui/react-collection@1.1.7':
-    resolution: {integrity: sha512-Fh9rGN0MoI4ZFUNyfFVNU4y9LUz93u9/0K+yLgA2bwRojxM8JU1DyvvMBabnZPBgMWREAJvU2jjVzq+LrFUglw==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-
-  '@radix-ui/react-compose-refs@1.1.2':
-    resolution: {integrity: sha512-z4eqJvfiNnFMHIIvXP3CY57y2WJs5g2v3X0zm9mEJkrkNv4rDxu+sg9Jh8EkXyeqBkB7SOcboo9dMVqhyrACIg==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-
-  '@radix-ui/react-context@1.1.2':
-    resolution: {integrity: sha512-jCi/QKUM2r1Ju5a3J64TH2A5SpKAgh0LpknyqdQ4m6DCV0xJ2HG1xARRwNGPQfi1SLdLWZ1OJz6F4OMBBNiGJA==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-
-  '@radix-ui/react-direction@1.1.1':
-    resolution: {integrity: sha512-1UEWRX6jnOA2y4H5WczZ44gOOjTEmlqv1uNW4GAJEO5+bauCBhv8snY65Iw5/VOS/ghKN9gr2KjnLKxrsvoMVw==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-
-  '@radix-ui/react-dismissable-layer@1.1.11':
-    resolution: {integrity: sha512-Nqcp+t5cTB8BinFkZgXiMJniQH0PsUt2k51FUhbdfeKvc4ACcG2uQniY/8+h1Yv6Kza4Q7lD7PQV0z0oicE0Mg==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-
-  '@radix-ui/react-dropdown-menu@2.1.16':
-    resolution: {integrity: sha512-1PLGQEynI/3OX/ftV54COn+3Sud/Mn8vALg2rWnBLnRaGtJDduNW/22XjlGgPdpcIbiQxjKtb7BkcjP00nqfJw==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-
-  '@radix-ui/react-focus-guards@1.1.3':
-    resolution: {integrity: sha512-0rFg/Rj2Q62NCm62jZw0QX7a3sz6QCQU0LpZdNrJX8byRGaGVTqbrW9jAoIAHyMQqsNpeZ81YgSizOt5WXq0Pw==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-
-  '@radix-ui/react-focus-scope@1.1.7':
-    resolution: {integrity: sha512-t2ODlkXBQyn7jkl6TNaw/MtVEVvIGelJDCG41Okq/KwUsJBwQ4XVZsHAVUkK4mBv3ewiAS3PGuUWuY2BoK4ZUw==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-
-  '@radix-ui/react-id@1.1.1':
-    resolution: {integrity: sha512-kGkGegYIdQsOb4XjsfM97rXsiHaBwco+hFI66oO4s9LU+PLAC5oJ7khdOVFxkhsmlbpUqDAvXw11CluXP+jkHg==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-
-  '@radix-ui/react-menu@2.1.16':
-    resolution: {integrity: sha512-72F2T+PLlphrqLcAotYPp0uJMr5SjP5SL01wfEspJbru5Zs5vQaSHb4VB3ZMJPimgHHCHG7gMOeOB9H3Hdmtxg==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-
-  '@radix-ui/react-popper@1.2.8':
-    resolution: {integrity: sha512-0NJQ4LFFUuWkE7Oxf0htBKS6zLkkjBH+hM1uk7Ng705ReR8m/uelduy1DBo0PyBXPKVnBA6YBlU94MBGXrSBCw==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-
-  '@radix-ui/react-portal@1.1.9':
-    resolution: {integrity: sha512-bpIxvq03if6UNwXZ+HTK71JLh4APvnXntDc6XOX8UVq4XQOVl7lwok0AvIl+b8zgCw3fSaVTZMpAPPagXbKmHQ==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-
-  '@radix-ui/react-presence@1.1.5':
-    resolution: {integrity: sha512-/jfEwNDdQVBCNvjkGit4h6pMOzq8bHkopq458dPt2lMjx+eBQUohZNG9A7DtO/O5ukSbxuaNGXMjHicgwy6rQQ==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-
-  '@radix-ui/react-primitive@2.1.3':
-    resolution: {integrity: sha512-m9gTwRkhy2lvCPe6QJp4d3G1TYEUHn/FzJUtq9MjH46an1wJU+GdoGC5VLof8RX8Ft/DlpshApkhswDLZzHIcQ==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-
-  '@radix-ui/react-roving-focus@1.1.11':
-    resolution: {integrity: sha512-7A6S9jSgm/S+7MdtNDSb+IU859vQqJ/QAtcYQcfFC6W8RS4IxIZDldLR0xqCFZ6DCyrQLjLPsxtTNch5jVA4lA==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-
-  '@radix-ui/react-scroll-area@1.2.10':
-    resolution: {integrity: sha512-tAXIa1g3sM5CGpVT0uIbUx/U3Gs5N8T52IICuCtObaos1S8fzsrPXG5WObkQN3S6NVl6wKgPhAIiBGbWnvc97A==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-
-  '@radix-ui/react-select@2.2.6':
-    resolution: {integrity: sha512-I30RydO+bnn2PQztvo25tswPH+wFBjehVGtmagkU78yMdwTwVf12wnAOF+AeP8S2N8xD+5UPbGhkUfPyvT+mwQ==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-
-  '@radix-ui/react-slot@1.2.3':
-    resolution: {integrity: sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-
-  '@radix-ui/react-slot@1.2.4':
-    resolution: {integrity: sha512-Jl+bCv8HxKnlTLVrcDE8zTMJ09R9/ukw4qBs/oZClOfoQk/cOTbDn+NceXfV7j09YPVQUryJPHurafcSg6EVKA==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-
-  '@radix-ui/react-use-callback-ref@1.1.1':
-    resolution: {integrity: sha512-FkBMwD+qbGQeMu1cOHnuGB6x4yzPjho8ap5WtbEJ26umhgqVXbhekKUQO+hZEL1vU92a3wHwdp0HAcqAUF5iDg==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-
-  '@radix-ui/react-use-controllable-state@1.2.2':
-    resolution: {integrity: sha512-BjasUjixPFdS+NKkypcyyN5Pmg83Olst0+c6vGov0diwTEo6mgdqVR6hxcEgFuh4QrAs7Rc+9KuGJ9TVCj0Zzg==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-
-  '@radix-ui/react-use-effect-event@0.0.2':
-    resolution: {integrity: sha512-Qp8WbZOBe+blgpuUT+lw2xheLP8q0oatc9UpmiemEICxGvFLYmHm9QowVZGHtJlGbS6A6yJ3iViad/2cVjnOiA==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-
-  '@radix-ui/react-use-escape-keydown@1.1.1':
-    resolution: {integrity: sha512-Il0+boE7w/XebUHyBjroE+DbByORGR9KKmITzbR7MyQ4akpORYP/ZmbhAr0DG7RmmBqoOnZdy2QlvajJ2QA59g==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-
-  '@radix-ui/react-use-layout-effect@1.1.1':
-    resolution: {integrity: sha512-RbJRS4UWQFkzHTTwVymMTUv8EqYhOp8dOOviLj2ugtTiXRaRQS7GLGxZTLL1jWhMeoSCf5zmcZkqTl9IiYfXcQ==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-
-  '@radix-ui/react-use-previous@1.1.1':
-    resolution: {integrity: sha512-2dHfToCj/pzca2Ck724OZ5L0EVrr3eHRNsG/b3xQJLA2hZpVCS99bLAX+hm1IHXDEnzU6by5z/5MIY794/a8NQ==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-
-  '@radix-ui/react-use-rect@1.1.1':
-    resolution: {integrity: sha512-QTYuDesS0VtuHNNvMh+CjlKJ4LJickCMUAqjlE3+j8w+RlRpwyX3apEQKGFzbZGdo7XNG1tXa+bQqIE7HIXT2w==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-
-  '@radix-ui/react-use-size@1.1.1':
-    resolution: {integrity: sha512-ewrXRDTAqAXlkl6t/fkXWNAhFX9I+CkKlw6zjEwk86RSPKwZr3xpBRso655aqYafwtnbpHLj6toFzmd6xdVptQ==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-
-  '@radix-ui/react-visually-hidden@1.2.3':
-    resolution: {integrity: sha512-pzJq12tEaaIhqjbzpCuv/OypJY/BPavOofm+dbab+MHLajy277+1lLm6JFcGgF5eskJ6mquGirhXY2GD/8u8Ug==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-
-  '@radix-ui/rect@1.1.1':
-    resolution: {integrity: sha512-HPwpGIzkl28mWyZqG52jiqDJ12waP11Pa1lGoiyUkIEuMLBP0oeK/C89esbXrxsky5we7dfd8U58nm0SgAWpVw==}
-
   '@rolldown/binding-android-arm64@1.0.0-rc.12':
     resolution: {integrity: sha512-pv1y2Fv0JybcykuiiD3qBOBdz6RteYojRFY1d+b95WVuzx211CRh+ytI/+9iVyWQ6koTh5dawe4S/yRfOFjgaA==}
     engines: {node: ^20.19.0 || >=22.12.0}
@@ -1801,10 +1497,6 @@ packages:
   argparse@2.0.1:
     resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==}
 
-  aria-hidden@1.2.6:
-    resolution: {integrity: sha512-ik3ZgC9dY/lYVVM++OISsaYDeg1tb0VtP5uL3ouh1koGOaUMDPpbFIei4JkFimWUFPn90sbMNMXQAIVOlnYKJA==}
-    engines: {node: '>=10'}
-
   ast-types@0.13.4:
     resolution: {integrity: sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w==}
     engines: {node: '>=4'}
@@ -2164,9 +1856,6 @@ packages:
     resolution: {integrity: sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==}
     engines: {node: '>=8'}
 
-  detect-node-es@1.1.0:
-    resolution: {integrity: sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ==}
-
   devlop@1.1.0:
     resolution: {integrity: sha512-RWmIqhcFf1lRYBvNmr7qTNuyCt/7/ns2jbpp1+PalgE/rDQcBT0fioSMUpJ93irlUhC5hrg4cYqe6U+0ImW0rA==}
 
@@ -2357,10 +2046,6 @@ packages:
     resolution: {integrity: sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==}
     engines: {node: '>= 0.4'}
 
-  get-nonce@1.0.1:
-    resolution: {integrity: sha512-FJhYRoDaiatfEkUK8HKlicmu/3SGFD51q3itKDGoSTysQJBnfOcxU5GxnhE1E6soB76MbT0MBtnKJuXyAx+96Q==}
-    engines: {node: '>=6'}
-
   get-proto@1.0.1:
     resolution: {integrity: sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==}
     engines: {node: '>= 0.4'}
@@ -3089,36 +2774,6 @@ packages:
     peerDependencies:
       react: ^19.2.4
 
-  react-remove-scroll-bar@2.3.8:
-    resolution: {integrity: sha512-9r+yi9+mgU33AKcj6IbT9oRCO78WriSj6t/cF8DWBZJ9aOGPOTEDvdUDz1FwKim7QXWwmHqtdHnRJfhAxEG46Q==}
-    engines: {node: '>=10'}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-
-  react-remove-scroll@2.7.2:
-    resolution: {integrity: sha512-Iqb9NjCCTt6Hf+vOdNIZGdTiH1QSqr27H/Ek9sv/a97gfueI/5h1s3yRi1nngzMUaOOToin5dI1dXKdXiF+u0Q==}
-    engines: {node: '>=10'}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-
-  react-style-singleton@2.2.3:
-    resolution: {integrity: sha512-b6jSvxvVnyptAiLjbkWLE/lOnR4lfTtDAl+eUC7RZy+QQWc6wRzIV2CE6xBuMmDxc2qIihtDCZD5NPOFl7fRBQ==}
-    engines: {node: '>=10'}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-
   react@19.2.4:
     resolution: {integrity: sha512-9nfp2hYpCwOjAN+8TZFGhtWEwgvWHXqESH8qT89AT/lWklpLON22Lc8pEtnpsZz7VmawabSU0gCjnj8aC0euHQ==}
     engines: {node: '>=0.10.0'}
@@ -3194,6 +2849,9 @@ packages:
     resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==}
     engines: {node: '>=0.10.0'}
 
+  reselect@5.2.0:
+    resolution: {integrity: sha512-AgZ3UOZm3YndfrJ4OYjgrT7bmCm/1iqkjvEfH/oYjzh6PD2qw4QuT3jjnXIrpdt4MTpMXclMT3lXbmRY+XRakw==}
+
   resolve-from@4.0.0:
     resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==}
     engines: {node: '>=4'}
@@ -3437,26 +3095,6 @@ packages:
     peerDependencies:
       browserslist: '>= 4.21.0'
 
-  use-callback-ref@1.3.3:
-    resolution: {integrity: sha512-jQL3lRnocaFtu3V00JToYz/4QkNWswxijDaCVNZRiRTO3HQDLsdu1ZtmIUvV4yPp+rvWm5j0y0TG/S61cuijTg==}
-    engines: {node: '>=10'}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-
-  use-sidecar@1.1.3:
-    resolution: {integrity: sha512-Fedw0aZvkhynoPYlA5WXrMCAMm+nSWdZt6lzJQ7Ok8S6Q+VsHmHpRWndVRJ8Be0ZbkfPc5LRYH+5XrzXcEeLRQ==}
-    engines: {node: '>=10'}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-
   use-sync-external-store@1.6.0:
     resolution: {integrity: sha512-Pp6GSwGP/NrPIrxVFAIkOQeyw8lFenOHijQWkUTrDvrF4ALqylP2C/KCkeS9dpUM3KvYRQhna5vt7IL95+ZQ9w==}
     peerDependencies:
@@ -4098,6 +3736,8 @@ snapshots:
 
   '@babel/runtime@7.28.6': {}
 
+  '@babel/runtime@7.29.7': {}
+
   '@babel/template@7.28.6':
     dependencies:
       '@babel/code-frame': 7.29.0
@@ -4121,6 +3761,29 @@ snapshots:
       '@babel/helper-string-parser': 7.27.1
       '@babel/helper-validator-identifier': 7.28.5
 
+  '@base-ui/react@1.5.0(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
+    dependencies:
+      '@babel/runtime': 7.29.7
+      '@base-ui/utils': 0.2.9(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@floating-ui/react-dom': 2.1.8(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@floating-ui/utils': 0.2.11
+      react: 19.2.4
+      react-dom: 19.2.4(react@19.2.4)
+      use-sync-external-store: 1.6.0(react@19.2.4)
+    optionalDependencies:
+      '@types/react': 19.2.14
+
+  '@base-ui/utils@0.2.9(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
+    dependencies:
+      '@babel/runtime': 7.29.7
+      '@floating-ui/utils': 0.2.11
+      react: 19.2.4
+      react-dom: 19.2.4(react@19.2.4)
+      reselect: 5.2.0
+      use-sync-external-store: 1.6.0(react@19.2.4)
+    optionalDependencies:
+      '@types/react': 19.2.14
+
   '@braintree/sanitize-url@7.1.2': {}
 
   '@chevrotain/cst-dts-gen@11.1.2':
@@ -4458,316 +4121,6 @@ snapshots:
 
   '@protobufjs/utf8@1.1.0': {}
 
-  '@radix-ui/number@1.1.1': {}
-
-  '@radix-ui/primitive@1.1.3': {}
-
-  '@radix-ui/react-arrow@1.1.7(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
-    dependencies:
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
-      react: 19.2.4
-      react-dom: 19.2.4(react@19.2.4)
-    optionalDependencies:
-      '@types/react': 19.2.14
-      '@types/react-dom': 19.2.3(@types/react@19.2.14)
-
-  '@radix-ui/react-collection@1.1.7(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
-    dependencies:
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
-      '@radix-ui/react-slot': 1.2.3(@types/react@19.2.14)(react@19.2.4)
-      react: 19.2.4
-      react-dom: 19.2.4(react@19.2.4)
-    optionalDependencies:
-      '@types/react': 19.2.14
-      '@types/react-dom': 19.2.3(@types/react@19.2.14)
-
-  '@radix-ui/react-compose-refs@1.1.2(@types/react@19.2.14)(react@19.2.4)':
-    dependencies:
-      react: 19.2.4
-    optionalDependencies:
-      '@types/react': 19.2.14
-
-  '@radix-ui/react-context@1.1.2(@types/react@19.2.14)(react@19.2.4)':
-    dependencies:
-      react: 19.2.4
-    optionalDependencies:
-      '@types/react': 19.2.14
-
-  '@radix-ui/react-direction@1.1.1(@types/react@19.2.14)(react@19.2.4)':
-    dependencies:
-      react: 19.2.4
-    optionalDependencies:
-      '@types/react': 19.2.14
-
-  '@radix-ui/react-dismissable-layer@1.1.11(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
-    dependencies:
-      '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
-      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-use-escape-keydown': 1.1.1(@types/react@19.2.14)(react@19.2.4)
-      react: 19.2.4
-      react-dom: 19.2.4(react@19.2.4)
-    optionalDependencies:
-      '@types/react': 19.2.14
-      '@types/react-dom': 19.2.3(@types/react@19.2.14)
-
-  '@radix-ui/react-dropdown-menu@2.1.16(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
-    dependencies:
-      '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-id': 1.1.1(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-menu': 2.1.16(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
-      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.14)(react@19.2.4)
-      react: 19.2.4
-      react-dom: 19.2.4(react@19.2.4)
-    optionalDependencies:
-      '@types/react': 19.2.14
-      '@types/react-dom': 19.2.3(@types/react@19.2.14)
-
-  '@radix-ui/react-focus-guards@1.1.3(@types/react@19.2.14)(react@19.2.4)':
-    dependencies:
-      react: 19.2.4
-    optionalDependencies:
-      '@types/react': 19.2.14
-
-  '@radix-ui/react-focus-scope@1.1.7(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
-    dependencies:
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
-      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.14)(react@19.2.4)
-      react: 19.2.4
-      react-dom: 19.2.4(react@19.2.4)
-    optionalDependencies:
-      '@types/react': 19.2.14
-      '@types/react-dom': 19.2.3(@types/react@19.2.14)
-
-  '@radix-ui/react-id@1.1.1(@types/react@19.2.14)(react@19.2.4)':
-    dependencies:
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.14)(react@19.2.4)
-      react: 19.2.4
-    optionalDependencies:
-      '@types/react': 19.2.14
-
-  '@radix-ui/react-menu@2.1.16(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
-    dependencies:
-      '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-collection': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-dismissable-layer': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
-      '@radix-ui/react-focus-guards': 1.1.3(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-focus-scope': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
-      '@radix-ui/react-id': 1.1.1(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-popper': 1.2.8(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
-      '@radix-ui/react-portal': 1.1.9(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
-      '@radix-ui/react-presence': 1.1.5(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
-      '@radix-ui/react-roving-focus': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
-      '@radix-ui/react-slot': 1.2.3(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.14)(react@19.2.4)
-      aria-hidden: 1.2.6
-      react: 19.2.4
-      react-dom: 19.2.4(react@19.2.4)
-      react-remove-scroll: 2.7.2(@types/react@19.2.14)(react@19.2.4)
-    optionalDependencies:
-      '@types/react': 19.2.14
-      '@types/react-dom': 19.2.3(@types/react@19.2.14)
-
-  '@radix-ui/react-popper@1.2.8(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
-    dependencies:
-      '@floating-ui/react-dom': 2.1.8(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
-      '@radix-ui/react-arrow': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
-      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-use-rect': 1.1.1(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-use-size': 1.1.1(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/rect': 1.1.1
-      react: 19.2.4
-      react-dom: 19.2.4(react@19.2.4)
-    optionalDependencies:
-      '@types/react': 19.2.14
-      '@types/react-dom': 19.2.3(@types/react@19.2.14)
-
-  '@radix-ui/react-portal@1.1.9(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
-    dependencies:
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.14)(react@19.2.4)
-      react: 19.2.4
-      react-dom: 19.2.4(react@19.2.4)
-    optionalDependencies:
-      '@types/react': 19.2.14
-      '@types/react-dom': 19.2.3(@types/react@19.2.14)
-
-  '@radix-ui/react-presence@1.1.5(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
-    dependencies:
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.14)(react@19.2.4)
-      react: 19.2.4
-      react-dom: 19.2.4(react@19.2.4)
-    optionalDependencies:
-      '@types/react': 19.2.14
-      '@types/react-dom': 19.2.3(@types/react@19.2.14)
-
-  '@radix-ui/react-primitive@2.1.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
-    dependencies:
-      '@radix-ui/react-slot': 1.2.3(@types/react@19.2.14)(react@19.2.4)
-      react: 19.2.4
-      react-dom: 19.2.4(react@19.2.4)
-    optionalDependencies:
-      '@types/react': 19.2.14
-      '@types/react-dom': 19.2.3(@types/react@19.2.14)
-
-  '@radix-ui/react-roving-focus@1.1.11(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
-    dependencies:
-      '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-collection': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-id': 1.1.1(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
-      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.14)(react@19.2.4)
-      react: 19.2.4
-      react-dom: 19.2.4(react@19.2.4)
-    optionalDependencies:
-      '@types/react': 19.2.14
-      '@types/react-dom': 19.2.3(@types/react@19.2.14)
-
-  '@radix-ui/react-scroll-area@1.2.10(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
-    dependencies:
-      '@radix-ui/number': 1.1.1
-      '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-presence': 1.1.5(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
-      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.14)(react@19.2.4)
-      react: 19.2.4
-      react-dom: 19.2.4(react@19.2.4)
-    optionalDependencies:
-      '@types/react': 19.2.14
-      '@types/react-dom': 19.2.3(@types/react@19.2.14)
-
-  '@radix-ui/react-select@2.2.6(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
-    dependencies:
-      '@radix-ui/number': 1.1.1
-      '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-collection': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-dismissable-layer': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
-      '@radix-ui/react-focus-guards': 1.1.3(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-focus-scope': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
-      '@radix-ui/react-id': 1.1.1(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-popper': 1.2.8(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
-      '@radix-ui/react-portal': 1.1.9(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
-      '@radix-ui/react-slot': 1.2.3(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-use-previous': 1.1.1(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-visually-hidden': 1.2.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
-      aria-hidden: 1.2.6
-      react: 19.2.4
-      react-dom: 19.2.4(react@19.2.4)
-      react-remove-scroll: 2.7.2(@types/react@19.2.14)(react@19.2.4)
-    optionalDependencies:
-      '@types/react': 19.2.14
-      '@types/react-dom': 19.2.3(@types/react@19.2.14)
-
-  '@radix-ui/react-slot@1.2.3(@types/react@19.2.14)(react@19.2.4)':
-    dependencies:
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.4)
-      react: 19.2.4
-    optionalDependencies:
-      '@types/react': 19.2.14
-
-  '@radix-ui/react-slot@1.2.4(@types/react@19.2.14)(react@19.2.4)':
-    dependencies:
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.4)
-      react: 19.2.4
-    optionalDependencies:
-      '@types/react': 19.2.14
-
-  '@radix-ui/react-use-callback-ref@1.1.1(@types/react@19.2.14)(react@19.2.4)':
-    dependencies:
-      react: 19.2.4
-    optionalDependencies:
-      '@types/react': 19.2.14
-
-  '@radix-ui/react-use-controllable-state@1.2.2(@types/react@19.2.14)(react@19.2.4)':
-    dependencies:
-      '@radix-ui/react-use-effect-event': 0.0.2(@types/react@19.2.14)(react@19.2.4)
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.14)(react@19.2.4)
-      react: 19.2.4
-    optionalDependencies:
-      '@types/react': 19.2.14
-
-  '@radix-ui/react-use-effect-event@0.0.2(@types/react@19.2.14)(react@19.2.4)':
-    dependencies:
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.14)(react@19.2.4)
-      react: 19.2.4
-    optionalDependencies:
-      '@types/react': 19.2.14
-
-  '@radix-ui/react-use-escape-keydown@1.1.1(@types/react@19.2.14)(react@19.2.4)':
-    dependencies:
-      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.14)(react@19.2.4)
-      react: 19.2.4
-    optionalDependencies:
-      '@types/react': 19.2.14
-
-  '@radix-ui/react-use-layout-effect@1.1.1(@types/react@19.2.14)(react@19.2.4)':
-    dependencies:
-      react: 19.2.4
-    optionalDependencies:
-      '@types/react': 19.2.14
-
-  '@radix-ui/react-use-previous@1.1.1(@types/react@19.2.14)(react@19.2.4)':
-    dependencies:
-      react: 19.2.4
-    optionalDependencies:
-      '@types/react': 19.2.14
-
-  '@radix-ui/react-use-rect@1.1.1(@types/react@19.2.14)(react@19.2.4)':
-    dependencies:
-      '@radix-ui/rect': 1.1.1
-      react: 19.2.4
-    optionalDependencies:
-      '@types/react': 19.2.14
-
-  '@radix-ui/react-use-size@1.1.1(@types/react@19.2.14)(react@19.2.4)':
-    dependencies:
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.14)(react@19.2.4)
-      react: 19.2.4
-    optionalDependencies:
-      '@types/react': 19.2.14
-
-  '@radix-ui/react-visually-hidden@1.2.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
-    dependencies:
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
-      react: 19.2.4
-      react-dom: 19.2.4(react@19.2.4)
-    optionalDependencies:
-      '@types/react': 19.2.14
-      '@types/react-dom': 19.2.3(@types/react@19.2.14)
-
-  '@radix-ui/rect@1.1.1': {}
-
   '@rolldown/binding-android-arm64@1.0.0-rc.12':
     optional: true
 
@@ -5604,10 +4957,6 @@ snapshots:
 
   argparse@2.0.1: {}
 
-  aria-hidden@1.2.6:
-    dependencies:
-      tslib: 2.8.1
-
   ast-types@0.13.4:
     dependencies:
       tslib: 2.8.1
@@ -5964,8 +5313,6 @@ snapshots:
 
   detect-libc@2.1.2: {}
 
-  detect-node-es@1.1.0: {}
-
   devlop@1.1.0:
     dependencies:
       dequal: 2.0.3
@@ -6172,8 +5519,6 @@ snapshots:
       hasown: 2.0.2
       math-intrinsics: 1.1.0
 
-  get-nonce@1.0.1: {}
-
   get-proto@1.0.1:
     dependencies:
       dunder-proto: 1.0.1
@@ -7214,33 +6559,6 @@ snapshots:
       react: 19.2.4
       scheduler: 0.27.0
 
-  react-remove-scroll-bar@2.3.8(@types/react@19.2.14)(react@19.2.4):
-    dependencies:
-      react: 19.2.4
-      react-style-singleton: 2.2.3(@types/react@19.2.14)(react@19.2.4)
-      tslib: 2.8.1
-    optionalDependencies:
-      '@types/react': 19.2.14
-
-  react-remove-scroll@2.7.2(@types/react@19.2.14)(react@19.2.4):
-    dependencies:
-      react: 19.2.4
-      react-remove-scroll-bar: 2.3.8(@types/react@19.2.14)(react@19.2.4)
-      react-style-singleton: 2.2.3(@types/react@19.2.14)(react@19.2.4)
-      tslib: 2.8.1
-      use-callback-ref: 1.3.3(@types/react@19.2.14)(react@19.2.4)
-      use-sidecar: 1.1.3(@types/react@19.2.14)(react@19.2.4)
-    optionalDependencies:
-      '@types/react': 19.2.14
-
-  react-style-singleton@2.2.3(@types/react@19.2.14)(react@19.2.4):
-    dependencies:
-      get-nonce: 1.0.1
-      react: 19.2.4
-      tslib: 2.8.1
-    optionalDependencies:
-      '@types/react': 19.2.14
-
   react@19.2.4: {}
 
   reactivity-store@0.4.0(react@19.2.4):
@@ -7358,6 +6676,8 @@ snapshots:
 
   require-from-string@2.0.2: {}
 
+  reselect@5.2.0: {}
+
   resolve-from@4.0.0: {}
 
   retry@0.13.1: {}
@@ -7662,21 +6982,6 @@ snapshots:
       escalade: 3.2.0
       picocolors: 1.1.1
 
-  use-callback-ref@1.3.3(@types/react@19.2.14)(react@19.2.4):
-    dependencies:
-      react: 19.2.4
-      tslib: 2.8.1
-    optionalDependencies:
-      '@types/react': 19.2.14
-
-  use-sidecar@1.1.3(@types/react@19.2.14)(react@19.2.4):
-    dependencies:
-      detect-node-es: 1.1.0
-      react: 19.2.4
-      tslib: 2.8.1
-    optionalDependencies:
-      '@types/react': 19.2.14
-
   use-sync-external-store@1.6.0(react@19.2.4):
     dependencies:
       react: 19.2.4
diff --git a/crates/agent-gui/src/components/chat/ChatHistorySidebar.tsx b/crates/agent-gui/src/components/chat/ChatHistorySidebar.tsx
index 524a6ec82..a636d1a75 100644
--- a/crates/agent-gui/src/components/chat/ChatHistorySidebar.tsx
+++ b/crates/agent-gui/src/components/chat/ChatHistorySidebar.tsx
@@ -277,26 +277,32 @@ const HistoryRow = memo(function HistoryRow(props: {
             ) : null}
 
             <DropdownMenu open={menuOpen} onOpenChange={setMenuOpen}>
-              <DropdownMenuTrigger asChild>
-                <Button
-                  type="button"
-                  variant="ghost"
-                  size="icon"
-                  title="更多操作"
-                  aria-label="更多操作"
-                  onPointerDown={(e) => e.stopPropagation()}
-                  onClick={(e) => e.stopPropagation()}
-                  className={cn(
-                    "h-8 w-8 shrink-0 rounded-xl text-muted-foreground opacity-0 pointer-events-none transition-[opacity,colors]",
-                    "hover:bg-muted/70 hover:text-foreground",
-                    "group-hover/item:opacity-100 group-hover/item:pointer-events-auto",
-                    "group-focus-within/item:opacity-100 group-focus-within/item:pointer-events-auto",
-                    menuOpen && "bg-muted/70 text-foreground",
-                    menuOpen && "opacity-100 pointer-events-auto",
-                  )}
-                >
-                  <MoreHorizontal className="h-4 w-4" />
-                </Button>
+              <DropdownMenuTrigger
+                render={
+                  <Button
+                    type="button"
+                    variant="ghost"
+                    size="icon"
+                    title="更多操作"
+                    aria-label="更多操作"
+                    onPointerDown={(e: React.PointerEvent<HTMLButtonElement>) =>
+                      e.stopPropagation()
+                    }
+                    onClick={(e: React.MouseEvent<HTMLButtonElement>) =>
+                      e.stopPropagation()
+                    }
+                    className={cn(
+                      "h-8 w-8 shrink-0 rounded-xl text-muted-foreground opacity-0 pointer-events-none transition-[opacity,colors]",
+                      "hover:bg-muted/70 hover:text-foreground",
+                      "group-hover/item:opacity-100 group-hover/item:pointer-events-auto",
+                      "group-focus-within/item:opacity-100 group-focus-within/item:pointer-events-auto",
+                      menuOpen && "bg-muted/70 text-foreground",
+                      menuOpen && "opacity-100 pointer-events-auto",
+                    )}
+                  />
+                }
+              >
+                <MoreHorizontal className="h-4 w-4" />
               </DropdownMenuTrigger>
               <DropdownMenuContent
                 side="right"
diff --git a/crates/agent-gui/src/components/ui/button.tsx b/crates/agent-gui/src/components/ui/button.tsx
index 6450dace2..ff52bf4b2 100644
--- a/crates/agent-gui/src/components/ui/button.tsx
+++ b/crates/agent-gui/src/components/ui/button.tsx
@@ -1,5 +1,4 @@
 import * as React from "react";
-import { Slot } from "@radix-ui/react-slot";
 import { cva, type VariantProps } from "class-variance-authority";
 
 import { cn } from "../../lib/shared/utils";
@@ -35,20 +34,31 @@ const buttonVariants = cva(
 
 type ButtonProps = React.ButtonHTMLAttributes<HTMLButtonElement> &
   VariantProps<typeof buttonVariants> & {
-    asChild?: boolean;
+    render?: React.ReactElement;
   };
 
 export const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
-  ({ className, variant, size, asChild = false, ...props }, ref) => {
-    const Comp = asChild ? Slot : "button";
+  ({ className, variant, size, render: renderProp, children, ...props }, ref) => {
+    const mergedClass = cn(buttonVariants({ variant, size }), className);
+
+    if (renderProp) {
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      const rp = renderProp as React.ReactElement<any>;
+      return React.cloneElement(rp, {
+        className: cn(mergedClass, rp.props.className),
+        ...props,
+        children: children ?? rp.props.children,
+      });
+    }
+
     return (
-      <Comp
-        className={cn(buttonVariants({ variant, size }), className)}
-        ref={ref}
-        {...props}
-      />
+      <button ref={ref} className={mergedClass} {...props}>
+        {children}
+      </button>
     );
   },
 );
 
 Button.displayName = "Button";
+
+export { buttonVariants };
diff --git a/crates/agent-gui/src/components/ui/confirm-action-popover.tsx b/crates/agent-gui/src/components/ui/confirm-action-popover.tsx
index 1ceb280a9..c30fb795d 100644
--- a/crates/agent-gui/src/components/ui/confirm-action-popover.tsx
+++ b/crates/agent-gui/src/components/ui/confirm-action-popover.tsx
@@ -1,4 +1,5 @@
-import { useEffect, useRef, useState, type ReactNode } from "react";
+import { type ReactNode } from "react";
+import { Popover } from "@base-ui/react";
 import { AlertTriangle } from "../icons";
 
 import { useLocale } from "../../i18n";
@@ -13,78 +14,52 @@ export function ConfirmActionPopover(props: {
 }) {
   const { title, description, confirmLabel, onConfirm, children } = props;
   const { t } = useLocale();
-  const [show, setShow] = useState(false);
-  const [flipUp, setFlipUp] = useState(false);
-  const ref = useRef<HTMLDivElement>(null);
-
-  useEffect(() => {
-    if (!show) return;
-
-    function handleClick(e: MouseEvent) {
-      if (ref.current && !ref.current.contains(e.target as Node)) setShow(false);
-    }
-
-    document.addEventListener("mousedown", handleClick);
-    return () => document.removeEventListener("mousedown", handleClick);
-  }, [show]);
-
-  function handleOpen() {
-    if (ref.current) {
-      const rect = ref.current.getBoundingClientRect();
-      // Popover is ~160px tall; flip upward if not enough space below
-      setFlipUp(window.innerHeight - rect.bottom < 170);
-    }
-    setShow(true);
-  }
 
   return (
-    <div className="relative" ref={ref}>
-      {children(handleOpen)}
-      {show ? (
-        <div
-          className={`absolute right-0 z-50 w-64 animate-in fade-in duration-150 ${
-            flipUp
-              ? "bottom-full mb-1.5 slide-in-from-bottom-1"
-              : "top-full mt-1.5 slide-in-from-top-1"
-          }`}
-        >
-          <div className="rounded-xl border border-border bg-popover p-3 shadow-lg">
-            <div className="flex items-start gap-2.5">
-              <div className="flex h-8 w-8 shrink-0 items-center justify-center rounded-lg bg-destructive/10">
-                <AlertTriangle className="h-4 w-4 text-destructive" />
-              </div>
-              <div className="min-w-0 flex-1">
-                <p className="text-sm font-medium">{title}</p>
-                <div className="mt-0.5 text-xs leading-relaxed text-muted-foreground">
-                  {description}
+    <Popover.Root>
+      {/* Pass no-op — Popover.Trigger merges its own click handler via render prop */}
+      <Popover.Trigger render={children(() => {}) as React.ReactElement} />
+      <Popover.Portal>
+        <Popover.Positioner side="bottom" align="end" sideOffset={6}>
+          <Popover.Popup className="z-50 w-64 rounded-xl border border-border bg-popover shadow-lg outline-none data-[open]:animate-in data-[closed]:animate-out data-[closed]:fade-out-0 data-[open]:fade-in-0 data-[closed]:zoom-out-95 data-[open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-1 data-[side=top]:slide-in-from-bottom-1">
+            <div className="p-3">
+              <div className="flex items-start gap-2.5">
+                <div className="flex h-8 w-8 shrink-0 items-center justify-center rounded-lg bg-destructive/10">
+                  <AlertTriangle className="h-4 w-4 text-destructive" />
+                </div>
+                <div className="min-w-0 flex-1">
+                  <p className="text-sm font-medium">{title}</p>
+                  <div className="mt-0.5 text-xs leading-relaxed text-muted-foreground">
+                    {description}
+                  </div>
                 </div>
               </div>
+              <div className="mt-3 flex justify-end gap-2">
+                <Popover.Close
+                  render={
+                    <Button variant="outline" size="sm" className="h-7 px-2.5 text-xs" />
+                  }
+                >
+                  {t("settings.cancel")}
+                </Popover.Close>
+                <Popover.Close
+                  render={
+                    <Button
+                      variant="destructive"
+                      size="sm"
+                      className="h-7 px-2.5 text-xs"
+                      onClick={onConfirm}
+                    />
+                  }
+                >
+                  {confirmLabel}
+                </Popover.Close>
+              </div>
             </div>
-            <div className="mt-3 flex justify-end gap-2">
-              <Button
-                variant="outline"
-                size="sm"
-                className="h-7 px-2.5 text-xs"
-                onClick={() => setShow(false)}
-              >
-                {t("settings.cancel")}
-              </Button>
-              <Button
-                variant="destructive"
-                size="sm"
-                className="h-7 px-2.5 text-xs"
-                onClick={() => {
-                  setShow(false);
-                  onConfirm();
-                }}
-              >
-                {confirmLabel}
-              </Button>
-            </div>
-          </div>
-        </div>
-      ) : null}
-    </div>
+          </Popover.Popup>
+        </Popover.Positioner>
+      </Popover.Portal>
+    </Popover.Root>
   );
 }
 
diff --git a/crates/agent-gui/src/components/ui/dropdown-menu.tsx b/crates/agent-gui/src/components/ui/dropdown-menu.tsx
index 779e5b64d..16aa9f027 100644
--- a/crates/agent-gui/src/components/ui/dropdown-menu.tsx
+++ b/crates/agent-gui/src/components/ui/dropdown-menu.tsx
@@ -1,87 +1,98 @@
 import * as React from "react";
-import * as DropdownMenuPrimitive from "@radix-ui/react-dropdown-menu";
+import { Menu } from "@base-ui/react";
 import { Check } from "../icons";
 
 import { cn } from "../../lib/shared/utils";
 
-export const DropdownMenu = DropdownMenuPrimitive.Root;
-export const DropdownMenuTrigger = DropdownMenuPrimitive.Trigger;
+export const DropdownMenu = Menu.Root;
+export const DropdownMenuTrigger = Menu.Trigger;
 
-export const DropdownMenuContent = React.forwardRef<
-  React.ElementRef<typeof DropdownMenuPrimitive.Content>,
-  React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Content>
->(({ className, sideOffset = 4, ...props }, ref) => (
-  <DropdownMenuPrimitive.Portal>
-    <DropdownMenuPrimitive.Content
-      ref={ref}
-      sideOffset={sideOffset}
-      className={cn(
-        "z-50 min-w-[12rem] overflow-hidden rounded-md border bg-popover p-1 text-popover-foreground shadow-md data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",
-        className,
-      )}
-      {...props}
-    />
-  </DropdownMenuPrimitive.Portal>
-));
-DropdownMenuContent.displayName = DropdownMenuPrimitive.Content.displayName;
+type DropdownMenuContentProps = React.ComponentPropsWithoutRef<typeof Menu.Popup> &
+  Pick<
+    React.ComponentPropsWithoutRef<typeof Menu.Positioner>,
+    "side" | "align" | "sideOffset" | "collisionPadding"
+  >;
+
+export const DropdownMenuContent = React.forwardRef<HTMLDivElement, DropdownMenuContentProps>(
+  ({ className, side, align, sideOffset = 4, collisionPadding, ...props }, ref) => (
+    <Menu.Portal>
+      <Menu.Positioner
+        side={side}
+        align={align}
+        sideOffset={sideOffset}
+        collisionPadding={collisionPadding}
+      >
+        <Menu.Popup
+          ref={ref}
+          className={cn(
+            "z-50 min-w-48 overflow-hidden rounded-md border bg-popover p-1 text-popover-foreground shadow-md data-[open]:animate-in data-[closed]:animate-out data-[closed]:fade-out-0 data-[open]:fade-in-0 data-[closed]:zoom-out-95 data-[open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",
+            className,
+          )}
+          {...props}
+        />
+      </Menu.Positioner>
+    </Menu.Portal>
+  ),
+);
+DropdownMenuContent.displayName = "DropdownMenuContent";
 
 export const DropdownMenuLabel = React.forwardRef<
-  React.ElementRef<typeof DropdownMenuPrimitive.Label>,
-  React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Label>
+  HTMLDivElement,
+  React.HTMLAttributes<HTMLDivElement>
 >(({ className, ...props }, ref) => (
-  <DropdownMenuPrimitive.Label
+  <div
     ref={ref}
     className={cn("px-2 py-1.5 text-sm font-semibold", className)}
     {...props}
   />
 ));
-DropdownMenuLabel.displayName = DropdownMenuPrimitive.Label.displayName;
+DropdownMenuLabel.displayName = "DropdownMenuLabel";
 
 export const DropdownMenuSeparator = React.forwardRef<
-  React.ElementRef<typeof DropdownMenuPrimitive.Separator>,
-  React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Separator>
+  HTMLDivElement,
+  React.ComponentPropsWithoutRef<typeof Menu.Separator>
 >(({ className, ...props }, ref) => (
-  <DropdownMenuPrimitive.Separator
+  <Menu.Separator
     ref={ref}
     className={cn("-mx-1 my-1 h-px bg-muted", className)}
     {...props}
   />
 ));
-DropdownMenuSeparator.displayName = DropdownMenuPrimitive.Separator.displayName;
+DropdownMenuSeparator.displayName = "DropdownMenuSeparator";
 
 export const DropdownMenuCheckboxItem = React.forwardRef<
-  React.ElementRef<typeof DropdownMenuPrimitive.CheckboxItem>,
-  React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.CheckboxItem>
+  HTMLDivElement,
+  React.ComponentPropsWithoutRef<typeof Menu.CheckboxItem>
 >(({ className, children, ...props }, ref) => (
-  <DropdownMenuPrimitive.CheckboxItem
+  <Menu.CheckboxItem
     ref={ref}
     className={cn(
-      "relative flex cursor-default select-none items-center rounded-xs py-1.5 pl-8 pr-2 text-sm outline-hidden transition-colors focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50",
+      "relative flex cursor-default select-none items-center rounded-xs py-1.5 pl-8 pr-2 text-sm outline-hidden transition-colors data-[highlighted]:bg-accent data-[highlighted]:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50",
       className,
     )}
     {...props}
   >
     <span className="absolute left-2 flex h-3.5 w-3.5 items-center justify-center">
-      <DropdownMenuPrimitive.ItemIndicator>
+      <Menu.CheckboxItemIndicator>
         <Check className="h-4 w-4" />
-      </DropdownMenuPrimitive.ItemIndicator>
+      </Menu.CheckboxItemIndicator>
     </span>
     {children}
-  </DropdownMenuPrimitive.CheckboxItem>
+  </Menu.CheckboxItem>
 ));
-DropdownMenuCheckboxItem.displayName = DropdownMenuPrimitive.CheckboxItem.displayName;
+DropdownMenuCheckboxItem.displayName = "DropdownMenuCheckboxItem";
 
 export const DropdownMenuItem = React.forwardRef<
-  React.ElementRef<typeof DropdownMenuPrimitive.Item>,
-  React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Item>
+  HTMLDivElement,
+  React.ComponentPropsWithoutRef<typeof Menu.Item>
 >(({ className, ...props }, ref) => (
-  <DropdownMenuPrimitive.Item
+  <Menu.Item
     ref={ref}
     className={cn(
-      "relative flex cursor-default select-none items-center rounded-xs px-2 py-1.5 text-sm outline-hidden transition-colors focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50",
+      "relative flex cursor-default select-none items-center rounded-xs px-2 py-1.5 text-sm outline-hidden transition-colors data-[highlighted]:bg-accent data-[highlighted]:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50",
       className,
     )}
     {...props}
   />
 ));
-DropdownMenuItem.displayName = DropdownMenuPrimitive.Item.displayName;
+DropdownMenuItem.displayName = "DropdownMenuItem";
diff --git a/crates/agent-gui/src/components/ui/scroll-area.tsx b/crates/agent-gui/src/components/ui/scroll-area.tsx
index 0f8686809..9f9388dd0 100644
--- a/crates/agent-gui/src/components/ui/scroll-area.tsx
+++ b/crates/agent-gui/src/components/ui/scroll-area.tsx
@@ -1,10 +1,10 @@
 import * as React from "react";
-import * as ScrollAreaPrimitive from "@radix-ui/react-scroll-area";
+import { ScrollArea as ScrollAreaPrimitive } from "@base-ui/react";
 
 import { cn } from "../../lib/shared/utils";
 
 export const ScrollArea = React.forwardRef<
-  React.ElementRef<typeof ScrollAreaPrimitive.Root>,
+  HTMLDivElement,
   React.ComponentPropsWithoutRef<typeof ScrollAreaPrimitive.Root>
 >(({ className, children, ...props }, ref) => (
   <ScrollAreaPrimitive.Root
@@ -12,18 +12,17 @@ export const ScrollArea = React.forwardRef<
     className={cn("relative overflow-hidden", className)}
     {...props}
   >
-    <ScrollAreaPrimitive.Viewport className="h-full w-full rounded-[inherit]">
-      {children}
+    <ScrollAreaPrimitive.Viewport className="h-full w-full rounded-[inherit]" data-scroll-viewport>
+      <ScrollAreaPrimitive.Content>{children}</ScrollAreaPrimitive.Content>
     </ScrollAreaPrimitive.Viewport>
     <ScrollBar />
     <ScrollAreaPrimitive.Corner />
   </ScrollAreaPrimitive.Root>
 ));
-
-ScrollArea.displayName = ScrollAreaPrimitive.Root.displayName;
+ScrollArea.displayName = "ScrollArea";
 
 const ScrollBar = React.forwardRef<
-  React.ElementRef<typeof ScrollAreaPrimitive.Scrollbar>,
+  HTMLDivElement,
   React.ComponentPropsWithoutRef<typeof ScrollAreaPrimitive.Scrollbar>
 >(({ className, orientation = "vertical", ...props }, ref) => (
   <ScrollAreaPrimitive.Scrollbar
@@ -31,9 +30,10 @@ const ScrollBar = React.forwardRef<
     orientation={orientation}
     className={cn(
       "flex touch-none select-none transition-colors",
-      orientation === "vertical" && "h-full w-2.5 border-l border-l-transparent p-[1px]",
+      orientation === "vertical" &&
+        "h-full w-2.5 border-l border-l-transparent p-px",
       orientation === "horizontal" &&
-        "h-2.5 flex-col border-t border-t-transparent p-[1px]",
+        "h-2.5 flex-col border-t border-t-transparent p-px",
       className,
     )}
     {...props}
@@ -41,5 +41,4 @@ const ScrollBar = React.forwardRef<
     <ScrollAreaPrimitive.Thumb className="relative flex-1 rounded-full bg-border" />
   </ScrollAreaPrimitive.Scrollbar>
 ));
-
-ScrollBar.displayName = ScrollAreaPrimitive.Scrollbar.displayName;
+ScrollBar.displayName = "ScrollBar";
diff --git a/crates/agent-gui/src/components/ui/select.tsx b/crates/agent-gui/src/components/ui/select.tsx
index a28267a2a..b23017ad4 100644
--- a/crates/agent-gui/src/components/ui/select.tsx
+++ b/crates/agent-gui/src/components/ui/select.tsx
@@ -1,14 +1,58 @@
 import * as React from "react";
-import * as SelectPrimitive from "@radix-ui/react-select";
+import { Select as SelectPrimitive } from "@base-ui/react";
 import { Check, ChevronDown, ChevronUp } from "../icons";
 
 import { cn } from "../../lib/shared/utils";
 
-export const Select = SelectPrimitive.Root;
-export const SelectValue = SelectPrimitive.Value;
+type SelectProps = Omit<
+  React.ComponentPropsWithoutRef<typeof SelectPrimitive.Root>,
+  "onValueChange"
+> & {
+  onValueChange?: (value: string) => void;
+};
+
+export function Select({ onValueChange, ...props }: SelectProps) {
+  return (
+    <SelectPrimitive.Root
+      onValueChange={
+        onValueChange
+          ? (value) => {
+              if (value != null) onValueChange(value as string);
+            }
+          : undefined
+      }
+      {...props}
+    />
+  );
+}
+
+type SelectValueProps = Omit<
+  React.ComponentPropsWithoutRef<typeof SelectPrimitive.Value>,
+  "children"
+> & {
+  placeholder?: React.ReactNode;
+  children?: React.ReactNode | ((value: unknown) => React.ReactNode);
+};
+
+export const SelectValue = React.forwardRef<HTMLSpanElement, SelectValueProps>(
+  ({ placeholder, children, ...props }, ref) => {
+    const rendered =
+      children !== undefined
+        ? children
+        : placeholder !== undefined
+          ? (value: unknown) => (value == null ? placeholder : undefined)
+          : undefined;
+    return (
+      <SelectPrimitive.Value ref={ref} {...props}>
+        {rendered as React.ComponentPropsWithoutRef<typeof SelectPrimitive.Value>["children"]}
+      </SelectPrimitive.Value>
+    );
+  },
+);
+SelectValue.displayName = "SelectValue";
 
 export const SelectTrigger = React.forwardRef<
-  React.ElementRef<typeof SelectPrimitive.Trigger>,
+  HTMLButtonElement,
   React.ComponentPropsWithoutRef<typeof SelectPrimitive.Trigger>
 >(({ className, children, ...props }, ref) => (
   <SelectPrimitive.Trigger
@@ -20,18 +64,18 @@ export const SelectTrigger = React.forwardRef<
     {...props}
   >
     {children}
-    <SelectPrimitive.Icon asChild>
+    <SelectPrimitive.Icon>
       <ChevronDown className="h-4 w-4 opacity-50" />
     </SelectPrimitive.Icon>
   </SelectPrimitive.Trigger>
 ));
-SelectTrigger.displayName = SelectPrimitive.Trigger.displayName;
+SelectTrigger.displayName = "SelectTrigger";
 
 const SelectScrollUpButton = React.forwardRef<
-  React.ElementRef<typeof SelectPrimitive.ScrollUpButton>,
-  React.ComponentPropsWithoutRef<typeof SelectPrimitive.ScrollUpButton>
+  HTMLDivElement,
+  React.ComponentPropsWithoutRef<typeof SelectPrimitive.ScrollUpArrow>
 >(({ className, ...props }, ref) => (
-  <SelectPrimitive.ScrollUpButton
+  <SelectPrimitive.ScrollUpArrow
     ref={ref}
     className={cn(
       "flex cursor-default items-center justify-center py-1",
@@ -40,15 +84,15 @@ const SelectScrollUpButton = React.forwardRef<
     {...props}
   >
     <ChevronUp className="h-4 w-4" />
-  </SelectPrimitive.ScrollUpButton>
+  </SelectPrimitive.ScrollUpArrow>
 ));
-SelectScrollUpButton.displayName = SelectPrimitive.ScrollUpButton.displayName;
+SelectScrollUpButton.displayName = "SelectScrollUpButton";
 
 const SelectScrollDownButton = React.forwardRef<
-  React.ElementRef<typeof SelectPrimitive.ScrollDownButton>,
-  React.ComponentPropsWithoutRef<typeof SelectPrimitive.ScrollDownButton>
+  HTMLDivElement,
+  React.ComponentPropsWithoutRef<typeof SelectPrimitive.ScrollDownArrow>
 >(({ className, ...props }, ref) => (
-  <SelectPrimitive.ScrollDownButton
+  <SelectPrimitive.ScrollDownArrow
     ref={ref}
     className={cn(
       "flex cursor-default items-center justify-center py-1",
@@ -57,51 +101,50 @@ const SelectScrollDownButton = React.forwardRef<
     {...props}
   >
     <ChevronDown className="h-4 w-4" />
-  </SelectPrimitive.ScrollDownButton>
+  </SelectPrimitive.ScrollDownArrow>
 ));
-SelectScrollDownButton.displayName =
-  SelectPrimitive.ScrollDownButton.displayName;
+SelectScrollDownButton.displayName = "SelectScrollDownButton";
 
 export const SelectContent = React.forwardRef<
-  React.ElementRef<typeof SelectPrimitive.Content>,
-  React.ComponentPropsWithoutRef<typeof SelectPrimitive.Content>
+  HTMLDivElement,
+  React.ComponentPropsWithoutRef<typeof SelectPrimitive.Popup> & {
+    position?: "popper" | "item-aligned";
+  }
 >(({ className, children, position = "popper", ...props }, ref) => (
   <SelectPrimitive.Portal>
-    <SelectPrimitive.Content
-      ref={ref}
-      className={cn(
-        "relative z-50 max-h-96 min-w-[8rem] overflow-hidden rounded-md border bg-popover text-popover-foreground shadow-md data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",
-        position === "popper" &&
-          "data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1",
-        className,
-      )}
-      position={position}
-      {...props}
-    >
-      <SelectScrollUpButton />
-      <SelectPrimitive.Viewport
+    <SelectPrimitive.Positioner sideOffset={4} alignItemWithTrigger={false}>
+      <SelectPrimitive.Popup
+        ref={ref}
         className={cn(
-          "p-1 max-h-[inherit] overflow-y-auto",
-          position === "popper" &&
-            "h-[var(--radix-select-trigger-height)] w-full min-w-[var(--radix-select-trigger-width)]",
+          "relative z-50 max-h-96 min-w-32 overflow-hidden rounded-md border bg-popover text-popover-foreground shadow-md data-[open]:animate-in data-[closed]:animate-out data-[closed]:fade-out-0 data-[open]:fade-in-0 data-[closed]:zoom-out-95 data-[open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",
+          className,
         )}
+        {...props}
       >
-        {children}
-      </SelectPrimitive.Viewport>
-      <SelectScrollDownButton />
-    </SelectPrimitive.Content>
+        <SelectScrollUpButton />
+        <SelectPrimitive.List
+          className={cn(
+            "p-1 max-h-[inherit] overflow-y-auto",
+            position === "popper" && "w-full min-w-(--anchor-width)",
+          )}
+        >
+          {children}
+        </SelectPrimitive.List>
+        <SelectScrollDownButton />
+      </SelectPrimitive.Popup>
+    </SelectPrimitive.Positioner>
   </SelectPrimitive.Portal>
 ));
-SelectContent.displayName = SelectPrimitive.Content.displayName;
+SelectContent.displayName = "SelectContent";
 
 export const SelectItem = React.forwardRef<
-  React.ElementRef<typeof SelectPrimitive.Item>,
+  HTMLDivElement,
   React.ComponentPropsWithoutRef<typeof SelectPrimitive.Item>
 >(({ className, children, ...props }, ref) => (
   <SelectPrimitive.Item
     ref={ref}
     className={cn(
-      "relative flex w-full cursor-default select-none items-center rounded-xs py-1.5 pl-2 pr-8 text-sm outline-hidden focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50",
+      "relative flex w-full cursor-default select-none items-center rounded-xs py-1.5 pl-2 pr-8 text-sm outline-hidden data-[highlighted]:bg-accent data-[highlighted]:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50",
       className,
     )}
     {...props}
@@ -114,4 +157,4 @@ export const SelectItem = React.forwardRef<
     <SelectPrimitive.ItemText>{children}</SelectPrimitive.ItemText>
   </SelectPrimitive.Item>
 ));
-SelectItem.displayName = SelectPrimitive.Item.displayName;
+SelectItem.displayName = "SelectItem";
diff --git a/crates/agent-gui/src/pages/chat/ChatComposerBar.tsx b/crates/agent-gui/src/pages/chat/ChatComposerBar.tsx
index af89653c0..d77073159 100644
--- a/crates/agent-gui/src/pages/chat/ChatComposerBar.tsx
+++ b/crates/agent-gui/src/pages/chat/ChatComposerBar.tsx
@@ -298,10 +298,10 @@ export const ChatComposerBar = memo(function ChatComposerBar(props: {
                 >
                   <SelectTrigger
                     className={cn(
-                      "composer-reasoning-trigger group/reasoning h-8 w-auto shrink-0 gap-0.5 rounded-full border pl-2 pr-1.5 text-xs font-medium shadow-none outline-hidden transition-all duration-200 ease-out disabled:opacity-45 [&>svg:last-child]:h-3 [&>svg:last-child]:w-3 [&>svg:last-child]:opacity-50 [&>svg:last-child]:transition-transform [&>svg:last-child]:duration-200 [&[data-state=open]>svg:last-child]:rotate-180",
+                      "composer-reasoning-trigger group/reasoning h-8 w-auto shrink-0 gap-0.5 rounded-full border pl-2 pr-1.5 text-xs font-medium shadow-none outline-hidden transition-all duration-200 ease-out disabled:opacity-45 [&>svg:last-child]:h-3 [&>svg:last-child]:w-3 [&>svg:last-child]:opacity-50 [&>svg:last-child]:transition-transform [&>svg:last-child]:duration-200 [&[data-open]>svg:last-child]:rotate-180",
                       chatRuntimeControls.thinkingEnabled
                         ? "border-violet-300/30 bg-violet-50/55 text-foreground hover:border-violet-300/45 hover:bg-violet-50/80 dark:border-violet-300/15 dark:bg-violet-400/[0.07] dark:text-foreground dark:hover:bg-violet-400/[0.13]"
-                        : "border-transparent bg-foreground/[0.04] text-muted-foreground hover:bg-foreground/[0.07] dark:bg-white/[0.04] dark:hover:bg-white/[0.08]",
+                        : "border-transparent bg-foreground/4 text-muted-foreground hover:bg-foreground/[0.07] dark:bg-white/[0.04] dark:hover:bg-white/[0.08]",
                     )}
                     aria-label={t("chat.runtime.reasoning")}
                   >
@@ -317,12 +317,12 @@ export const ChatComposerBar = memo(function ChatComposerBar(props: {
                       <SelectValue />
                     </span>
                   </SelectTrigger>
-                  <SelectContent className="composer-reasoning-dropdown min-w-[7.5rem] rounded-xl border border-violet-200/40 bg-popover/85 p-1 shadow-[0_14px_34px_-16px_rgba(88,28,135,0.38)] ring-1 ring-white/15 backdrop-blur-2xl backdrop-saturate-150 supports-[backdrop-filter]:bg-popover/70 dark:border-violet-300/15 dark:bg-popover/70">
+                  <SelectContent className="composer-reasoning-dropdown min-w-30 rounded-xl border border-violet-200/40 bg-popover/85 p-1 shadow-[0_14px_34px_-16px_rgba(88,28,135,0.38)] ring-1 ring-white/15 backdrop-blur-2xl backdrop-saturate-150 supports-[backdrop-filter]:bg-popover/70 dark:border-violet-300/15 dark:bg-popover/70">
                     {reasoningOptions.map((value, index) => (
                       <SelectItem
                         key={value}
                         value={value}
-                        className="composer-reasoning-item rounded-md transition-all duration-150 ease-out focus:translate-x-0.5 focus:bg-violet-50/70 focus:text-foreground data-[state=checked]:bg-violet-50/80 data-[state=checked]:font-medium dark:focus:bg-violet-400/[0.12] dark:data-[state=checked]:bg-violet-400/[0.14]"
+                        className="composer-reasoning-item rounded-md transition-all duration-150 ease-out focus:translate-x-0.5 focus:bg-violet-50/70 focus:text-foreground data-[selected]:bg-violet-50/80 data-[selected]:font-medium dark:focus:bg-violet-400/[0.12] dark:data-[selected]:bg-violet-400/[0.14]"
                         style={{ animationDelay: `${Math.min(index, 5) * 0.022}s` }}
                       >
                         {t(REASONING_I18N_KEYS[value])}
diff --git a/crates/agent-gui/src/pages/chat/ChatHeader.tsx b/crates/agent-gui/src/pages/chat/ChatHeader.tsx
index 6e7bff9fd..4d39b9de1 100644
--- a/crates/agent-gui/src/pages/chat/ChatHeader.tsx
+++ b/crates/agent-gui/src/pages/chat/ChatHeader.tsx
@@ -112,31 +112,33 @@ export const ChatHeader = memo(function ChatHeader(props: {
         ) : null}
 
         <DropdownMenu open={isModelMenuOpen} onOpenChange={setIsModelMenuOpen}>
-          <DropdownMenuTrigger asChild>
-            <Button
-              variant="ghost"
-              disabled={!hasModels}
-              className={cn(
-                "model-selector-trigger h-9 max-w-[min(20rem,calc(100vw-8.5rem))] justify-between gap-1.5 overflow-hidden rounded-lg px-3 text-base font-semibold text-foreground transition-all duration-200 ease-out hover:bg-muted/60 dark:text-white",
-                isModelMenuOpen && "bg-muted/70 shadow-sm",
-              )}
-            >
-              <span className="model-selector-current-label flex min-w-0 items-center gap-1.5 text-left">
-                {selectedOption ? (
-                  <ProviderBrandIcon
-                    type={selectedOption.providerType}
-                    className="opacity-80"
-                  />
-                ) : null}
-                <span className="min-w-0 truncate">{currentModelLabel}</span>
-              </span>
-              <ChevronDown
+          <DropdownMenuTrigger
+            render={
+              <Button
+                variant="ghost"
+                disabled={!hasModels}
                 className={cn(
-                  "h-4 w-4 shrink-0 text-muted-foreground transition-transform duration-200 ease-out dark:text-white",
-                  isModelMenuOpen && "rotate-180",
+                  "model-selector-trigger h-9 max-w-[min(20rem,calc(100vw-8.5rem))] justify-between gap-1.5 overflow-hidden rounded-lg px-3 text-base font-semibold text-foreground transition-all duration-200 ease-out hover:bg-muted/60 dark:text-white",
+                  isModelMenuOpen && "bg-muted/70 shadow-sm",
                 )}
               />
-            </Button>
+            }
+          >
+            <span className="model-selector-current-label flex min-w-0 items-center gap-1.5 text-left">
+              {selectedOption ? (
+                <ProviderBrandIcon
+                  type={selectedOption.providerType}
+                  className="opacity-80"
+                />
+              ) : null}
+              <span className="min-w-0 truncate">{currentModelLabel}</span>
+            </span>
+            <ChevronDown
+              className={cn(
+                "h-4 w-4 shrink-0 text-muted-foreground transition-transform duration-200 ease-out dark:text-white",
+                isModelMenuOpen && "rotate-180",
+              )}
+            />
           </DropdownMenuTrigger>
           <DropdownMenuContent
             align="start"
@@ -148,7 +150,7 @@ export const ChatHeader = memo(function ChatHeader(props: {
               {t("chat.selectModel")}
             </DropdownMenuLabel>
             <DropdownMenuSeparator className="my-0 bg-border/40" />
-            <div className="max-h-[min(24rem,var(--radix-dropdown-menu-content-available-height))] overflow-y-auto overscroll-contain px-1 pb-1">
+            <div className="max-h-[min(24rem,var(--available-height,24rem))] overflow-y-auto overscroll-contain px-1 pb-1">
               {(() => {
                 let animationIndex = 0;
                 return groups.map((group, groupIndex) => (
diff --git a/crates/agent-gui/src/pages/chat/ChatTranscript.tsx b/crates/agent-gui/src/pages/chat/ChatTranscript.tsx
index 34608b34a..026e78c01 100644
--- a/crates/agent-gui/src/pages/chat/ChatTranscript.tsx
+++ b/crates/agent-gui/src/pages/chat/ChatTranscript.tsx
@@ -85,11 +85,11 @@ function writeUploadedImagePreviewCache(cacheKey: string, value: string) {
 }
 
 function resolveNearestScrollViewport(element: HTMLElement | null) {
-  return element?.closest("[data-radix-scroll-area-viewport]") as HTMLDivElement | null;
+  return element?.closest("[data-scroll-viewport]") as HTMLDivElement | null;
 }
 
 function resolveScrollAreaViewport(root: HTMLDivElement | null) {
-  return root?.querySelector("[data-radix-scroll-area-viewport]") as HTMLDivElement | null;
+  return root?.querySelector("[data-scroll-viewport]") as HTMLDivElement | null;
 }
 
 async function loadUploadedImagePreview(params: {
diff --git a/crates/agent-gui/src/pages/mcp-hub/McpRegistryBrowser.tsx b/crates/agent-gui/src/pages/mcp-hub/McpRegistryBrowser.tsx
index 238bc6d0a..6e07561cb 100644
--- a/crates/agent-gui/src/pages/mcp-hub/McpRegistryBrowser.tsx
+++ b/crates/agent-gui/src/pages/mcp-hub/McpRegistryBrowser.tsx
@@ -1185,12 +1185,10 @@ function McpRegistryPreviewDrawer(props: {
               variant="outline"
               size="sm"
               className="h-9 flex-1 gap-1.5 rounded-xl border-border/50 bg-background/70"
-              asChild
+              render={<a href={primaryLink} target="_blank" rel="noreferrer" />}
             >
-              <a href={primaryLink} target="_blank" rel="noreferrer">
-                <ExternalLink className="h-3.5 w-3.5" />
-                {t("mcpHub.storeOpenExternal")}
-              </a>
+              <ExternalLink className="h-3.5 w-3.5" />
+              {t("mcpHub.storeOpenExternal")}
             </Button>
           ) : null}
           <Button
diff --git a/crates/agent-gui/src/pages/settings/MemoryPanel.tsx b/crates/agent-gui/src/pages/settings/MemoryPanel.tsx
index 815e6a94d..c111c41cf 100644
--- a/crates/agent-gui/src/pages/settings/MemoryPanel.tsx
+++ b/crates/agent-gui/src/pages/settings/MemoryPanel.tsx
@@ -1,6 +1,6 @@
 import { useEffect, useMemo, useRef, useState } from "react";
 import { createPortal } from "react-dom";
-import * as SelectPrimitive from "@radix-ui/react-select";
+import { Select as SelectPrimitive } from "@base-ui/react";
 import {
   AlertTriangle,
   Brain,
@@ -142,76 +142,82 @@ function DrawerSelect(props: {
     "group/drawer-select inline-flex h-9 w-full items-center justify-between gap-2 rounded-lg border border-foreground/[0.08] bg-white/55 px-3 text-[13px] leading-none text-foreground/90",
     "outline-none transition-[background-color,border-color,box-shadow] duration-150",
     "hover:border-foreground/[0.14] hover:bg-white/75",
-    "data-[state=open]:border-foreground/[0.2] data-[state=open]:bg-white/85 data-[state=open]:shadow-[0_1px_0_rgba(255,255,255,0.65)_inset,0_2px_8px_-4px_rgba(15,23,42,0.08)]",
+    "data-[open]:border-foreground/[0.2] data-[open]:bg-white/85 data-[open]:shadow-[0_1px_0_rgba(255,255,255,0.65)_inset,0_2px_8px_-4px_rgba(15,23,42,0.08)]",
     "data-[placeholder]:text-muted-foreground",
     "focus-visible:outline-none focus-visible:ring-0",
     "disabled:cursor-not-allowed disabled:opacity-50",
-    "dark:bg-white/[0.04] dark:hover:bg-white/[0.06] dark:data-[state=open]:bg-white/[0.08]",
+    "dark:bg-white/[0.04] dark:hover:bg-white/[0.06] dark:data-[open]:bg-white/[0.08]",
     className,
   ]
     .filter(Boolean)
     .join(" ");
 
   return (
-    <SelectPrimitive.Root value={value} onValueChange={onValueChange} disabled={disabled}>
+    <SelectPrimitive.Root
+      value={value}
+      onValueChange={(v) => { if (v != null) onValueChange(v as string); }}
+      disabled={disabled}
+    >
       <SelectPrimitive.Trigger aria-label={ariaLabel} className={triggerClass}>
         <span className="min-w-0 flex-1 truncate text-left">
-          <SelectPrimitive.Value placeholder={placeholder}>
+          <SelectPrimitive.Value>
             {selected ? selected.label : placeholder}
           </SelectPrimitive.Value>
         </span>
-        <SelectPrimitive.Icon asChild>
-          <ChevronDown className="h-3.5 w-3.5 shrink-0 text-muted-foreground/70 transition-transform duration-200 ease-out group-data-[state=open]/drawer-select:rotate-180" />
+        <SelectPrimitive.Icon>
+          <ChevronDown className="h-3.5 w-3.5 shrink-0 text-muted-foreground/70 transition-transform duration-200 ease-out group-data-[open]/drawer-select:rotate-180" />
         </SelectPrimitive.Icon>
       </SelectPrimitive.Trigger>
       <SelectPrimitive.Portal>
-        <SelectPrimitive.Content
-          position="popper"
+        <SelectPrimitive.Positioner
           side="bottom"
           align="start"
           sideOffset={6}
           collisionPadding={12}
-          className={[
-            "drawer-select-content z-[80] overflow-hidden rounded-xl border border-foreground/[0.08] bg-background/95 p-1 text-[13px] text-foreground/90",
-            "shadow-[0_24px_48px_-24px_rgba(15,23,42,0.32),0_2px_6px_-3px_rgba(15,23,42,0.18)] backdrop-blur-2xl",
-            "min-w-[var(--radix-select-trigger-width)]",
-            "data-[state=open]:animate-in data-[state=closed]:animate-out",
-            "data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0",
-            "data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95",
-            "data-[side=bottom]:slide-in-from-top-1 data-[side=top]:slide-in-from-bottom-1",
-            "origin-[var(--radix-select-content-transform-origin)]",
-            "dark:bg-background/90",
-          ].join(" ")}
+          alignItemWithTrigger={false}
         >
-          <SelectPrimitive.Viewport className="max-h-[min(320px,var(--radix-select-content-available-height))] overflow-y-auto p-0.5">
-            {options.map((option) => (
-              <SelectPrimitive.Item
-                key={option.value}
-                value={option.value}
-                className={[
-                  "relative flex w-full cursor-pointer select-none items-start gap-2 rounded-md py-1.5 pl-2.5 pr-8 leading-tight outline-none transition-colors",
-                  "hover:bg-foreground/[0.05] focus:bg-foreground/[0.06] focus:text-foreground",
-                  "data-[state=checked]:bg-primary/[0.08] data-[state=checked]:text-foreground",
-                  "data-[disabled]:pointer-events-none data-[disabled]:opacity-40",
-                ].join(" ")}
-              >
-                <span className="min-w-0 flex-1">
-                  <SelectPrimitive.ItemText>
-                    <span className="block truncate">{option.label}</span>
-                  </SelectPrimitive.ItemText>
-                  {option.description ? (
-                    <span className="mt-0.5 block truncate text-[11px] text-muted-foreground/80">
-                      {option.description}
-                    </span>
-                  ) : null}
-                </span>
-                <SelectPrimitive.ItemIndicator className="absolute right-2 top-1/2 flex h-4 w-4 -translate-y-1/2 items-center justify-center text-primary">
-                  <Check className="h-3.5 w-3.5" />
-                </SelectPrimitive.ItemIndicator>
-              </SelectPrimitive.Item>
-            ))}
-          </SelectPrimitive.Viewport>
-        </SelectPrimitive.Content>
+          <SelectPrimitive.Popup
+            className={[
+              "drawer-select-content z-[80] overflow-hidden rounded-xl border border-foreground/[0.08] bg-background/95 p-1 text-[13px] text-foreground/90",
+              "shadow-[0_24px_48px_-24px_rgba(15,23,42,0.32),0_2px_6px_-3px_rgba(15,23,42,0.18)] backdrop-blur-2xl",
+              "min-w-[var(--anchor-width)]",
+              "data-[open]:animate-in data-[closed]:animate-out",
+              "data-[closed]:fade-out-0 data-[open]:fade-in-0",
+              "data-[closed]:zoom-out-95 data-[open]:zoom-in-95",
+              "data-[side=bottom]:slide-in-from-top-1 data-[side=top]:slide-in-from-bottom-1",
+              "dark:bg-background/90",
+            ].join(" ")}
+          >
+            <SelectPrimitive.List className="max-h-[min(320px,var(--available-height))] overflow-y-auto p-0.5">
+              {options.map((option) => (
+                <SelectPrimitive.Item
+                  key={option.value}
+                  value={option.value}
+                  className={[
+                    "relative flex w-full cursor-pointer select-none items-start gap-2 rounded-md py-1.5 pl-2.5 pr-8 leading-tight outline-none transition-colors",
+                    "hover:bg-foreground/[0.05] data-[highlighted]:bg-foreground/[0.06] data-[highlighted]:text-foreground",
+                    "data-[selected]:bg-primary/[0.08] data-[selected]:text-foreground",
+                    "data-[disabled]:pointer-events-none data-[disabled]:opacity-40",
+                  ].join(" ")}
+                >
+                  <span className="min-w-0 flex-1">
+                    <SelectPrimitive.ItemText>
+                      <span className="block truncate">{option.label}</span>
+                    </SelectPrimitive.ItemText>
+                    {option.description ? (
+                      <span className="mt-0.5 block truncate text-[11px] text-muted-foreground/80">
+                        {option.description}
+                      </span>
+                    ) : null}
+                  </span>
+                  <SelectPrimitive.ItemIndicator className="absolute right-2 top-1/2 flex h-4 w-4 -translate-y-1/2 items-center justify-center text-primary">
+                    <Check className="h-3.5 w-3.5" />
+                  </SelectPrimitive.ItemIndicator>
+                </SelectPrimitive.Item>
+              ))}
+            </SelectPrimitive.List>
+          </SelectPrimitive.Popup>
+        </SelectPrimitive.Positioner>
       </SelectPrimitive.Portal>
     </SelectPrimitive.Root>
   );
diff --git a/crates/agent-gui/src/pages/skills-hub/SkillsHubPage.tsx b/crates/agent-gui/src/pages/skills-hub/SkillsHubPage.tsx
index 71624a1e9..3f462cc5b 100644
--- a/crates/agent-gui/src/pages/skills-hub/SkillsHubPage.tsx
+++ b/crates/agent-gui/src/pages/skills-hub/SkillsHubPage.tsx
@@ -1530,12 +1530,10 @@ function SkillsStorePreviewDrawer(props: {
               variant="outline"
               size="sm"
               className="h-9 flex-1 gap-1.5 rounded-xl border-border/50 bg-background/70"
-              asChild
+              render={<a href={link} target="_blank" rel="noreferrer" />}
             >
-              <a href={link} target="_blank" rel="noreferrer">
-                <ExternalLink className="h-3.5 w-3.5" />
-                {t("settings.skillsStoreOpenInClawHub")}
-              </a>
+              <ExternalLink className="h-3.5 w-3.5" />
+              {t("settings.skillsStoreOpenInClawHub")}
             </Button>
           ) : null}
           <Button
diff --git a/docs/ui-code-review.md b/docs/ui-code-review.md
new file mode 100644
index 000000000..8436a33be
--- /dev/null
+++ b/docs/ui-code-review.md
@@ -0,0 +1,201 @@
+# UI 代码审查报告
+
+> 审查范围：`crates/agent-gui/src/components/ui/` + 相关页面组件  
+> 审查日期：2026-05-26  
+> 重构基准：Base UI + shadcn/ui 模式
+
+---
+
+## 一、可访问性（A11y）
+
+### 🔴 高优先级
+
+**confirm-action-popover.tsx — 自定义 Popover 缺少焦点管理**
+
+当前实现用 CSS 定位的 `div` 模拟弹出层，存在以下问题：
+- 无焦点陷阱：键盘用户打开弹窗后，焦点不锁定在弹窗内
+- 无 `role="dialog"` 或 `role="alertdialog"` ARIA 角色
+- 无 `aria-modal="true"`
+- 按 `Esc` 不关闭弹窗
+
+**建议**：替换为 Base UI `Popover` 组件（已内置焦点管理和键盘交互）：
+```tsx
+import { Popover } from "@base-ui-components/react";
+```
+
+---
+
+**pages/chat/ChatHeader.tsx — 模型选择下拉菜单无 `aria-label`**
+
+`DropdownMenuTrigger` 的 `render` 元素（Button）未设置 `aria-label`，屏幕阅读器无法知晓其用途。
+
+**建议**：
+```tsx
+<DropdownMenuTrigger
+  render={<Button aria-label="选择模型" ... />}
+>
+```
+
+---
+
+### 🟡 中优先级
+
+**`DropdownMenuItem`、`DropdownMenuCheckboxItem` 无 `role` 声明**
+
+Base UI `Menu.Item` 已自动添加 `role="menuitem"`，但需验证在所有浏览器/AT 中行为正确。重构后应运行 VoiceOver / NVDA 测试。
+
+**NotifyToast（components/chat/NotifyToast.tsx）— 无 `role="alert"`**
+
+Toast 用于错误/警告通知，但没有 `role="alert"` 或 `aria-live="assertive"` 属性，屏幕阅读器不会主动朗读。
+
+**建议**：
+```tsx
+<div role="alert" aria-live="assertive">
+  {/* toast content */}
+</div>
+```
+
+---
+
+## 二、组件实现问题
+
+### 🔴 高优先级
+
+**select.tsx — SelectValue placeholder 实现为"赌博式"渲染**
+
+当前实现：
+```tsx
+(value: unknown) => (value == null ? placeholder : undefined)
+```
+当 value 不为 null 时返回 `undefined`，依赖 Base UI 内部回退到 ItemText 的行为。这是未文档化的行为，Base UI 版本升级可能静默破坏占位符显示。
+
+**建议**：改用 Base UI 官方推荐模式，或在 `Select.Root` 层追踪选中项 label 来渲染：
+```tsx
+// 使用 items prop 让 Select.Value 自动显示 label
+<Select.Root items={{ value1: "Label 1", value2: "Label 2" }}>
+  <Select.Value />
+```
+
+---
+
+**button.tsx — render prop 使用 `as any` 绕过类型检查**
+
+```tsx
+const rp = renderProp as React.ReactElement<any>;
+```
+类型不安全，且 Base UI 的 `mergeProps` 行为与 `React.cloneElement` 不完全一致，可能导致事件组合遗漏。
+
+**建议**：待 `@base-ui-components/react` 迁移至正式版 `@base-ui/react` 后，使用官方 `useRender` hook 替代手动 cloneElement。
+
+---
+
+### 🟡 中优先级
+
+**`@base-ui-components/react` 已弃用，应迁移至 `@base-ui/react`**
+
+```
+WARN deprecated @base-ui-components/react@1.0.0-rc.0: Package was renamed to @base-ui/react
+```
+
+两个包的 API 基本一致，但应尽快迁移：
+```bash
+pnpm remove @base-ui-components/react
+pnpm add @base-ui/react
+# 全局替换 import 路径
+```
+
+---
+
+**dropdown-menu.tsx — DropdownMenuLabel 不使用 `Menu.GroupLabel`**
+
+当前 `DropdownMenuLabel` 是裸 `div`，没有与 `Menu.Group` 关联，屏幕阅读器无法将标签与后续菜单项关联。
+
+**建议**：
+```tsx
+export const DropdownMenuGroup = Menu.Group;
+export const DropdownMenuLabel = React.forwardRef<...>(
+  (props, ref) => <Menu.GroupLabel ref={ref} {...props} />
+);
+// 使用时：
+<DropdownMenuGroup>
+  <DropdownMenuLabel>模型选择</DropdownMenuLabel>
+  <DropdownMenuItem>...</DropdownMenuItem>
+</DropdownMenuGroup>
+```
+
+---
+
+**ChatHistorySidebar.tsx — 事件组合依赖未文档化行为**
+
+```tsx
+<DropdownMenuTrigger
+  render={<Button onPointerDown={(e) => e.stopPropagation()} />}
+>
+```
+Base UI 的 `render` prop 通过 `mergeProps` 组合事件，但未明确文档化 `stopPropagation` 后 Base UI 自身的事件是否仍然触发。
+
+**建议**：通过在 wrapper 容器上使用 `stopPropagation` 替代在 Trigger 上处理：
+```tsx
+<span onPointerDown={(e) => e.stopPropagation()}>
+  <DropdownMenuTrigger ...>
+    ...
+  </DropdownMenuTrigger>
+</span>
+```
+
+---
+
+### 🟢 低优先级
+
+**scroll-area.tsx — Base UI ScrollArea.Content 的必要性待确认**
+
+```tsx
+<ScrollAreaPrimitive.Viewport>
+  <ScrollAreaPrimitive.Content>{children}</ScrollAreaPrimitive.Content>
+</ScrollAreaPrimitive.Viewport>
+```
+Base UI 文档中 `ScrollArea.Content` 是否为必须层级需要验证，可能导致额外 DOM 嵌套。
+
+---
+
+## 三、缺失的标准组件
+
+| 缺失组件 | 当前状况 | 建议 |
+|---|---|---|
+| **Dialog / Modal** | 每处自实现（HistoryShareModal 等） | 从 shadcn/ui 添加 `Dialog` 组件 |
+| **Toast** | `NotifyToast` 是自定义实现 | 使用 Base UI `Toast` 组件替代 |
+| **Tooltip** | 无 | 从 shadcn/ui 或 Base UI 添加 |
+| **Popover** | `ConfirmActionPopover` 自实现 | 替换为 Base UI `Popover` |
+
+---
+
+## 四、样式一致性
+
+**`ConfirmActionPopover` 使用 CSS 类手动处理方向**
+
+```tsx
+// 当前
+flipUp ? "bottom-full mb-2" : "top-full mt-2"
+```
+应由 Popover 库的 `side` 和 `sideOffset` 自动处理碰撞检测。
+
+**部分组件使用 `className` 字符串拼接而非 `cn()`**
+
+MemoryPanel 中的 `triggerClass` 和 item className 使用 `.join(" ")` 代替 `cn()`，无法自动处理 Tailwind 类冲突：
+```tsx
+// 当前
+className={["class-a", condition && "class-b"].filter(Boolean).join(" ")}
+// 建议
+className={cn("class-a", condition && "class-b")}
+```
+
+---
+
+## 五、重构后待验证事项
+
+- [ ] Select 打开/关闭动画（data-[open] / data-[closed] 属性验证）
+- [ ] DropdownMenu 键盘导航（↑↓ 导航、Enter 选择、Esc 关闭）
+- [ ] ScrollArea 自定义滚动条显示
+- [ ] Button render prop 在 `<a>` 链接场景下的样式渲染
+- [ ] MemoryPanel DrawerSelect 宽度跟随触发元素（`--anchor-width` CSS 变量）
+- [ ] 模型选择下拉菜单在 ChatHeader 中的交互

From 97dd3af68c8e3e62336d92a7082e1dd0c340ade7 Mon Sep 17 00:00:00 2001
From: loosand <loosand@163.com>
Date: Tue, 26 May 2026 22:51:40 +0800
Subject: [PATCH 2/3] feat(ui): fix model selection, add search, z-index fixes,
 and Biome setup
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- fix(dropdown-menu): add onSelect→onClick bridge for Base UI Menu.Item
  (Radix's onSelect was silently ignored, breaking model/history actions)
- fix(select): set alignItemWithTrigger=false and z-[9999] on Positioner
  to fix WebKit backdrop-filter compositing layer issue
- fix(scroll-area): add data-scroll-viewport attribute; update ChatTranscript
  scroll queries from [data-radix-scroll-area-viewport]
- fix(chat-composer): update data-[state=open/checked] → data-[open/selected]
  for Base UI data attributes
- refactor(confirm-action-popover): rewrite with Base UI Popover for proper
  focus trap and ARIA support
- feat(chat-header): add search/filter to model selector dropdown
- chore: add Biome linter/formatter config and update tsconfig lib to ES2022

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 crates/agent-gui/biome.json                   |   50 +
 crates/agent-gui/package.json                 |    6 +-
 crates/agent-gui/pnpm-lock.yaml               |   95 ++
 crates/agent-gui/src/components/ui/button.tsx |   11 +-
 .../components/ui/confirm-action-popover.tsx  |   13 +-
 .../src/components/ui/dropdown-menu.tsx       |   53 +-
 .../src/components/ui/scroll-area.tsx         |    8 +-
 crates/agent-gui/src/components/ui/select.tsx |   19 +-
 crates/agent-gui/src/i18n/config.ts           |  242 ++-
 .../src/pages/chat/ChatComposerBar.tsx        |   40 +-
 .../agent-gui/src/pages/chat/ChatHeader.tsx   |   91 +-
 .../src/pages/chat/ChatTranscript.tsx         |  233 ++-
 .../src/pages/settings/MemoryPanel.tsx        | 1442 +++++++++--------
 crates/agent-gui/tsconfig.json                |    2 +-
 14 files changed, 1264 insertions(+), 1041 deletions(-)
 create mode 100644 crates/agent-gui/biome.json

diff --git a/crates/agent-gui/biome.json b/crates/agent-gui/biome.json
new file mode 100644
index 000000000..874b2ef16
--- /dev/null
+++ b/crates/agent-gui/biome.json
@@ -0,0 +1,50 @@
+{
+  "$schema": "https://biomejs.dev/schemas/2.4.15/schema.json",
+  "vcs": {
+    "enabled": true,
+    "clientKind": "git",
+    "useIgnoreFile": false
+  },
+  "files": {
+    "includes": ["src/**", "!!**/dist", "!!**/node_modules"]
+  },
+  "formatter": {
+    "enabled": true,
+    "indentStyle": "space",
+    "indentWidth": 2,
+    "lineWidth": 100
+  },
+  "linter": {
+    "enabled": true,
+    "rules": {
+      "recommended": true,
+      "a11y": {
+        "useKeyWithClickEvents": "warn",
+        "noStaticElementInteractions": "warn",
+        "noLabelWithoutControl": "warn"
+      },
+      "correctness": {
+        "useExhaustiveDependencies": "warn",
+        "noUnusedImports": "error"
+      },
+      "suspicious": {
+        "noArrayIndexKey": "warn"
+      }
+    }
+  },
+  "javascript": {
+    "formatter": {
+      "quoteStyle": "double",
+      "trailingCommas": "all",
+      "semicolons": "always"
+    }
+  },
+  "assist": {
+    "enabled": true,
+    "actions": {
+      "source": {
+        "organizeImports": "on"
+      }
+    }
+  }
+}
diff --git a/crates/agent-gui/package.json b/crates/agent-gui/package.json
index d22ff97bc..d455040bc 100644
--- a/crates/agent-gui/package.json
+++ b/crates/agent-gui/package.json
@@ -12,7 +12,10 @@
     "test:frontend": "node --test test/settings/*.test.mjs test/chat/*.test.mjs test/providers/*.test.mjs test/tools/*.test.mjs test/i18n/*.test.mjs test/skills/*.test.mjs",
     "test:backend": "node --test test/backend/*.test.mjs",
     "test:release": "node --test test/backend/release-*.test.mjs",
-    "export:models": "node ./test/get-providers-get-models-example.js --save"
+    "export:models": "node ./test/get-providers-get-models-example.js --save",
+    "lint": "biome check src/",
+    "format": "biome format --write src/",
+    "lint:fix": "biome check --write src/"
   },
   "dependencies": {
     "@anthropic-ai/claude-agent-sdk": "^0.2.96",
@@ -41,6 +44,7 @@
     "yet-another-react-lightbox": "^3.31.0"
   },
   "devDependencies": {
+    "@biomejs/biome": "^2.4.15",
     "@iconify-json/logos": "^1.2.11",
     "@iconify-json/lucide": "^1.2.108",
     "@iconify-json/vscode-icons": "^1.2.50",
diff --git a/crates/agent-gui/pnpm-lock.yaml b/crates/agent-gui/pnpm-lock.yaml
index 66b7d2c51..948525951 100644
--- a/crates/agent-gui/pnpm-lock.yaml
+++ b/crates/agent-gui/pnpm-lock.yaml
@@ -81,6 +81,9 @@ importers:
         specifier: ^3.31.0
         version: 3.31.0(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
     devDependencies:
+      '@biomejs/biome':
+        specifier: ^2.4.15
+        version: 2.4.15
       '@iconify-json/logos':
         specifier: ^1.2.11
         version: 1.2.11
@@ -398,6 +401,63 @@ packages:
       '@types/react':
         optional: true
 
+  '@biomejs/biome@2.4.15':
+    resolution: {integrity: sha512-j5VH3a/h/HXTKBM50MDMxRCzkeLv9S2XJcW2WgnZT1+xyisi+0bISrXR82gCX+8S9lvK0skEvHJRN+3Ktr2hlw==}
+    engines: {node: '>=14.21.3'}
+    hasBin: true
+
+  '@biomejs/cli-darwin-arm64@2.4.15':
+    resolution: {integrity: sha512-rF3PPqLq1yoST79zaQbDjVJwsuIeci/O+9bgNmC5QpgOqz6aqYuzA4abyAGx+mgyiDXn4A049xAN8gijbuR1Qg==}
+    engines: {node: '>=14.21.3'}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@biomejs/cli-darwin-x64@2.4.15':
+    resolution: {integrity: sha512-/5KHXYMfSJs1fNXiX30xFtI8JcCFV6zaVVLxOa0M2sfqBKHkpQhRTv94yxQWxeTY2lzo2OuTlNvPC+hDQt2wcQ==}
+    engines: {node: '>=14.21.3'}
+    cpu: [x64]
+    os: [darwin]
+
+  '@biomejs/cli-linux-arm64-musl@2.4.15':
+    resolution: {integrity: sha512-ZPcxznxm0pogHBLZhYntyR3sR+MrZjqJIKEr7ZqVen0Rl+P/4upVmfYXjftizi9RoqZntg33fv/1fbdhbYXpEQ==}
+    engines: {node: '>=14.21.3'}
+    cpu: [arm64]
+    os: [linux]
+    libc: [musl]
+
+  '@biomejs/cli-linux-arm64@2.4.15':
+    resolution: {integrity: sha512-owaAMZD/T4LrD0ELNCk0Km3qrRHuM0X6EAyVE1FSqGY0rbLoiDLrO4Us2tllm6cAeB2Ioa9C2C08NZPdr8+0Ug==}
+    engines: {node: '>=14.21.3'}
+    cpu: [arm64]
+    os: [linux]
+    libc: [glibc]
+
+  '@biomejs/cli-linux-x64-musl@2.4.15':
+    resolution: {integrity: sha512-CNq/9W38SYSH023lfcQ4KKU8K0YX8T//FZUhcgtMMRABDojx5XsMV7jlweAvGSl389wJQB29Qo6Zb/a+jdvt+w==}
+    engines: {node: '>=14.21.3'}
+    cpu: [x64]
+    os: [linux]
+    libc: [musl]
+
+  '@biomejs/cli-linux-x64@2.4.15':
+    resolution: {integrity: sha512-0jj7THz12GbUOLmMibktK6DZjqz2zV64KFxyBtcFTKPiiOIY0a7vns1elpO1dERvxpsZ5ik0oFfz0oGwFde1+g==}
+    engines: {node: '>=14.21.3'}
+    cpu: [x64]
+    os: [linux]
+    libc: [glibc]
+
+  '@biomejs/cli-win32-arm64@2.4.15':
+    resolution: {integrity: sha512-ouhkYdlhp/1GghEJPdWwD/Vi3gQ1nFxuSpMolWsbq3Lsq3QUR4jl6UdhhscdCugKU5vOEuMiJhvKj66O0OCq+w==}
+    engines: {node: '>=14.21.3'}
+    cpu: [arm64]
+    os: [win32]
+
+  '@biomejs/cli-win32-x64@2.4.15':
+    resolution: {integrity: sha512-zBrGq5mx5wwpnow4+2BxUvleDM+GNd4sLbPaMapsSLQLD0NGRCquqPBTgN+7XkUteHvj7M+BstuI8tmnV7+HgQ==}
+    engines: {node: '>=14.21.3'}
+    cpu: [x64]
+    os: [win32]
+
   '@braintree/sanitize-url@7.1.2':
     resolution: {integrity: sha512-jigsZK+sMF/cuiB7sERuo9V7N9jx+dhmHHnQyDSVdpZwVutaBu7WvNYqMDLSgFgfB30n452TP3vjDAvFC973mA==}
 
@@ -3784,6 +3844,41 @@ snapshots:
     optionalDependencies:
       '@types/react': 19.2.14
 
+  '@biomejs/biome@2.4.15':
+    optionalDependencies:
+      '@biomejs/cli-darwin-arm64': 2.4.15
+      '@biomejs/cli-darwin-x64': 2.4.15
+      '@biomejs/cli-linux-arm64': 2.4.15
+      '@biomejs/cli-linux-arm64-musl': 2.4.15
+      '@biomejs/cli-linux-x64': 2.4.15
+      '@biomejs/cli-linux-x64-musl': 2.4.15
+      '@biomejs/cli-win32-arm64': 2.4.15
+      '@biomejs/cli-win32-x64': 2.4.15
+
+  '@biomejs/cli-darwin-arm64@2.4.15':
+    optional: true
+
+  '@biomejs/cli-darwin-x64@2.4.15':
+    optional: true
+
+  '@biomejs/cli-linux-arm64-musl@2.4.15':
+    optional: true
+
+  '@biomejs/cli-linux-arm64@2.4.15':
+    optional: true
+
+  '@biomejs/cli-linux-x64-musl@2.4.15':
+    optional: true
+
+  '@biomejs/cli-linux-x64@2.4.15':
+    optional: true
+
+  '@biomejs/cli-win32-arm64@2.4.15':
+    optional: true
+
+  '@biomejs/cli-win32-x64@2.4.15':
+    optional: true
+
   '@braintree/sanitize-url@7.1.2': {}
 
   '@chevrotain/cst-dts-gen@11.1.2':
diff --git a/crates/agent-gui/src/components/ui/button.tsx b/crates/agent-gui/src/components/ui/button.tsx
index ff52bf4b2..4a8514794 100644
--- a/crates/agent-gui/src/components/ui/button.tsx
+++ b/crates/agent-gui/src/components/ui/button.tsx
@@ -1,5 +1,5 @@
-import * as React from "react";
 import { cva, type VariantProps } from "class-variance-authority";
+import * as React from "react";
 
 import { cn } from "../../lib/shared/utils";
 
@@ -9,12 +9,9 @@ const buttonVariants = cva(
     variants: {
       variant: {
         default: "bg-primary text-primary-foreground hover:bg-primary/90",
-        secondary:
-          "bg-secondary text-secondary-foreground hover:bg-secondary/80",
-        destructive:
-          "bg-destructive text-destructive-foreground hover:bg-destructive/90",
-        outline:
-          "border border-input bg-background hover:bg-accent hover:text-accent-foreground",
+        secondary: "bg-secondary text-secondary-foreground hover:bg-secondary/80",
+        destructive: "bg-destructive text-destructive-foreground hover:bg-destructive/90",
+        outline: "border border-input bg-background hover:bg-accent hover:text-accent-foreground",
         ghost: "hover:bg-accent hover:text-accent-foreground",
         link: "text-primary underline-offset-4 hover:underline",
       },
diff --git a/crates/agent-gui/src/components/ui/confirm-action-popover.tsx b/crates/agent-gui/src/components/ui/confirm-action-popover.tsx
index c30fb795d..22319161b 100644
--- a/crates/agent-gui/src/components/ui/confirm-action-popover.tsx
+++ b/crates/agent-gui/src/components/ui/confirm-action-popover.tsx
@@ -1,8 +1,7 @@
-import { type ReactNode } from "react";
 import { Popover } from "@base-ui/react";
-import { AlertTriangle } from "../icons";
-
+import type { ReactNode } from "react";
 import { useLocale } from "../../i18n";
+import { AlertTriangle } from "../icons";
 import { Button } from "./button";
 
 export function ConfirmActionPopover(props: {
@@ -20,8 +19,8 @@ export function ConfirmActionPopover(props: {
       {/* Pass no-op — Popover.Trigger merges its own click handler via render prop */}
       <Popover.Trigger render={children(() => {}) as React.ReactElement} />
       <Popover.Portal>
-        <Popover.Positioner side="bottom" align="end" sideOffset={6}>
-          <Popover.Popup className="z-50 w-64 rounded-xl border border-border bg-popover shadow-lg outline-none data-[open]:animate-in data-[closed]:animate-out data-[closed]:fade-out-0 data-[open]:fade-in-0 data-[closed]:zoom-out-95 data-[open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-1 data-[side=top]:slide-in-from-bottom-1">
+        <Popover.Positioner side="bottom" align="end" sideOffset={6} className="z-[9999]">
+          <Popover.Popup className="w-64 rounded-xl border border-border bg-popover shadow-lg outline-none data-[open]:animate-in data-[closed]:animate-out data-[closed]:fade-out-0 data-[open]:fade-in-0 data-[closed]:zoom-out-95 data-[open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-1 data-[side=top]:slide-in-from-bottom-1">
             <div className="p-3">
               <div className="flex items-start gap-2.5">
                 <div className="flex h-8 w-8 shrink-0 items-center justify-center rounded-lg bg-destructive/10">
@@ -36,9 +35,7 @@ export function ConfirmActionPopover(props: {
               </div>
               <div className="mt-3 flex justify-end gap-2">
                 <Popover.Close
-                  render={
-                    <Button variant="outline" size="sm" className="h-7 px-2.5 text-xs" />
-                  }
+                  render={<Button variant="outline" size="sm" className="h-7 px-2.5 text-xs" />}
                 >
                   {t("settings.cancel")}
                 </Popover.Close>
diff --git a/crates/agent-gui/src/components/ui/dropdown-menu.tsx b/crates/agent-gui/src/components/ui/dropdown-menu.tsx
index 16aa9f027..34f558ae3 100644
--- a/crates/agent-gui/src/components/ui/dropdown-menu.tsx
+++ b/crates/agent-gui/src/components/ui/dropdown-menu.tsx
@@ -1,8 +1,7 @@
-import * as React from "react";
 import { Menu } from "@base-ui/react";
-import { Check } from "../icons";
-
+import * as React from "react";
 import { cn } from "../../lib/shared/utils";
+import { Check } from "../icons";
 
 export const DropdownMenu = Menu.Root;
 export const DropdownMenuTrigger = Menu.Trigger;
@@ -21,11 +20,12 @@ export const DropdownMenuContent = React.forwardRef<HTMLDivElement, DropdownMenu
         align={align}
         sideOffset={sideOffset}
         collisionPadding={collisionPadding}
+        className="z-[9999]"
       >
         <Menu.Popup
           ref={ref}
           className={cn(
-            "z-50 min-w-48 overflow-hidden rounded-md border bg-popover p-1 text-popover-foreground shadow-md data-[open]:animate-in data-[closed]:animate-out data-[closed]:fade-out-0 data-[open]:fade-in-0 data-[closed]:zoom-out-95 data-[open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",
+            "min-w-48 overflow-hidden rounded-md border bg-popover p-1 text-popover-foreground shadow-md data-[open]:animate-in data-[closed]:animate-out data-[closed]:fade-out-0 data-[open]:fade-in-0 data-[closed]:zoom-out-95 data-[open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",
             className,
           )}
           {...props}
@@ -40,11 +40,7 @@ export const DropdownMenuLabel = React.forwardRef<
   HTMLDivElement,
   React.HTMLAttributes<HTMLDivElement>
 >(({ className, ...props }, ref) => (
-  <div
-    ref={ref}
-    className={cn("px-2 py-1.5 text-sm font-semibold", className)}
-    {...props}
-  />
+  <div ref={ref} className={cn("px-2 py-1.5 text-sm font-semibold", className)} {...props} />
 ));
 DropdownMenuLabel.displayName = "DropdownMenuLabel";
 
@@ -52,11 +48,7 @@ export const DropdownMenuSeparator = React.forwardRef<
   HTMLDivElement,
   React.ComponentPropsWithoutRef<typeof Menu.Separator>
 >(({ className, ...props }, ref) => (
-  <Menu.Separator
-    ref={ref}
-    className={cn("-mx-1 my-1 h-px bg-muted", className)}
-    {...props}
-  />
+  <Menu.Separator ref={ref} className={cn("-mx-1 my-1 h-px bg-muted", className)} {...props} />
 ));
 DropdownMenuSeparator.displayName = "DropdownMenuSeparator";
 
@@ -82,17 +74,24 @@ export const DropdownMenuCheckboxItem = React.forwardRef<
 ));
 DropdownMenuCheckboxItem.displayName = "DropdownMenuCheckboxItem";
 
-export const DropdownMenuItem = React.forwardRef<
-  HTMLDivElement,
-  React.ComponentPropsWithoutRef<typeof Menu.Item>
->(({ className, ...props }, ref) => (
-  <Menu.Item
-    ref={ref}
-    className={cn(
-      "relative flex cursor-default select-none items-center rounded-xs px-2 py-1.5 text-sm outline-hidden transition-colors data-[highlighted]:bg-accent data-[highlighted]:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50",
-      className,
-    )}
-    {...props}
-  />
-));
+type DropdownMenuItemProps = React.ComponentPropsWithoutRef<typeof Menu.Item> & {
+  onSelect?: () => void;
+};
+
+export const DropdownMenuItem = React.forwardRef<HTMLDivElement, DropdownMenuItemProps>(
+  ({ className, onSelect, onClick, ...props }, ref) => (
+    <Menu.Item
+      ref={ref}
+      className={cn(
+        "relative flex cursor-default select-none items-center rounded-xs px-2 py-1.5 text-sm outline-hidden transition-colors data-[highlighted]:bg-accent data-[highlighted]:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50",
+        className,
+      )}
+      onClick={(e) => {
+        onSelect?.();
+        onClick?.(e);
+      }}
+      {...props}
+    />
+  ),
+);
 DropdownMenuItem.displayName = "DropdownMenuItem";
diff --git a/crates/agent-gui/src/components/ui/scroll-area.tsx b/crates/agent-gui/src/components/ui/scroll-area.tsx
index 9f9388dd0..7e4877409 100644
--- a/crates/agent-gui/src/components/ui/scroll-area.tsx
+++ b/crates/agent-gui/src/components/ui/scroll-area.tsx
@@ -1,5 +1,5 @@
-import * as React from "react";
 import { ScrollArea as ScrollAreaPrimitive } from "@base-ui/react";
+import * as React from "react";
 
 import { cn } from "../../lib/shared/utils";
 
@@ -30,10 +30,8 @@ const ScrollBar = React.forwardRef<
     orientation={orientation}
     className={cn(
       "flex touch-none select-none transition-colors",
-      orientation === "vertical" &&
-        "h-full w-2.5 border-l border-l-transparent p-px",
-      orientation === "horizontal" &&
-        "h-2.5 flex-col border-t border-t-transparent p-px",
+      orientation === "vertical" && "h-full w-2.5 border-l border-l-transparent p-px",
+      orientation === "horizontal" && "h-2.5 flex-col border-t border-t-transparent p-px",
       className,
     )}
     {...props}
diff --git a/crates/agent-gui/src/components/ui/select.tsx b/crates/agent-gui/src/components/ui/select.tsx
index b23017ad4..fe5241d09 100644
--- a/crates/agent-gui/src/components/ui/select.tsx
+++ b/crates/agent-gui/src/components/ui/select.tsx
@@ -1,8 +1,7 @@
-import * as React from "react";
 import { Select as SelectPrimitive } from "@base-ui/react";
-import { Check, ChevronDown, ChevronUp } from "../icons";
-
+import * as React from "react";
 import { cn } from "../../lib/shared/utils";
+import { Check, ChevronDown, ChevronUp } from "../icons";
 
 type SelectProps = Omit<
   React.ComponentPropsWithoutRef<typeof SelectPrimitive.Root>,
@@ -77,10 +76,7 @@ const SelectScrollUpButton = React.forwardRef<
 >(({ className, ...props }, ref) => (
   <SelectPrimitive.ScrollUpArrow
     ref={ref}
-    className={cn(
-      "flex cursor-default items-center justify-center py-1",
-      className,
-    )}
+    className={cn("flex cursor-default items-center justify-center py-1", className)}
     {...props}
   >
     <ChevronUp className="h-4 w-4" />
@@ -94,10 +90,7 @@ const SelectScrollDownButton = React.forwardRef<
 >(({ className, ...props }, ref) => (
   <SelectPrimitive.ScrollDownArrow
     ref={ref}
-    className={cn(
-      "flex cursor-default items-center justify-center py-1",
-      className,
-    )}
+    className={cn("flex cursor-default items-center justify-center py-1", className)}
     {...props}
   >
     <ChevronDown className="h-4 w-4" />
@@ -112,11 +105,11 @@ export const SelectContent = React.forwardRef<
   }
 >(({ className, children, position = "popper", ...props }, ref) => (
   <SelectPrimitive.Portal>
-    <SelectPrimitive.Positioner sideOffset={4} alignItemWithTrigger={false}>
+    <SelectPrimitive.Positioner sideOffset={4} alignItemWithTrigger={false} className="z-[9999]">
       <SelectPrimitive.Popup
         ref={ref}
         className={cn(
-          "relative z-50 max-h-96 min-w-32 overflow-hidden rounded-md border bg-popover text-popover-foreground shadow-md data-[open]:animate-in data-[closed]:animate-out data-[closed]:fade-out-0 data-[open]:fade-in-0 data-[closed]:zoom-out-95 data-[open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",
+          "max-h-96 min-w-32 overflow-hidden rounded-md border bg-popover text-popover-foreground shadow-md data-[open]:animate-in data-[closed]:animate-out data-[closed]:fade-out-0 data-[open]:fade-in-0 data-[closed]:zoom-out-95 data-[open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",
           className,
         )}
         {...props}
diff --git a/crates/agent-gui/src/i18n/config.ts b/crates/agent-gui/src/i18n/config.ts
index f1824fbae..d7274fddc 100644
--- a/crates/agent-gui/src/i18n/config.ts
+++ b/crates/agent-gui/src/i18n/config.ts
@@ -62,6 +62,8 @@ export const translations: Record<Locale, Record<string, string>> = {
     "chat.copy": "复制",
     "chat.edit": "编辑",
     "chat.selectModel": "选择模型",
+    "chat.searchModel": "搜索模型...",
+    "chat.noModelFound": "未找到匹配的模型",
     "chat.aborted": "已取消",
     "chat.contextWindow": "上下文窗口",
     "chat.usage": "用量",
@@ -165,7 +167,8 @@ export const translations: Record<Locale, Record<string, string>> = {
     "settings.memoryQuotaFull": "已满",
     "settings.memoryQuotaWarningMessage": "记忆用量已超过 80%，建议优先合并或删除低价值条目。",
     "settings.memoryQuotaNearLimitMessage": "记忆用量已超过 95%，新增记忆很快会被拒绝。",
-    "settings.memoryQuotaFullMessage": "当前 scope 已达到 500 条普通记忆上限；新增记忆会被拒绝，请先删除或合并旧条目。",
+    "settings.memoryQuotaFullMessage":
+      "当前 scope 已达到 500 条普通记忆上限；新增记忆会被拒绝，请先删除或合并旧条目。",
     "settings.memoryRefresh": "刷新",
     "settings.memoryOpenSettings": "记忆设置",
     "settings.memorySettingsTitle": "记忆设置",
@@ -217,17 +220,21 @@ export const translations: Record<Locale, Record<string, string>> = {
     "settings.memoryOrganizerNoModel": "请先在「记忆整理」中选择一个模型。",
     "settings.memoryOrganizerAlreadyRunning": "已有记忆整理正在运行，请稍后查看历史记录。",
     "settings.memoryOrganizerQueued": "记忆整理已加入队列，将在后台执行。",
-    "settings.memoryOrganizerQueuedRemote": "记忆整理已提交到桌面端后台队列；请保持桌面端运行以执行整理。",
+    "settings.memoryOrganizerQueuedRemote":
+      "记忆整理已提交到桌面端后台队列；请保持桌面端运行以执行整理。",
     "settings.memoryOrganizerHistory": "历史记录",
-    "settings.memoryOrganizerHistoryDescription": "查看每次记忆整理后的模型最终总结、统计与裁剪协议。",
+    "settings.memoryOrganizerHistoryDescription":
+      "查看每次记忆整理后的模型最终总结、统计与裁剪协议。",
     "settings.memoryOrganizerHistoryAll": "全部状态",
     "settings.memoryOrganizerHistoryEmpty": "暂无记忆整理历史。",
     "settings.memoryOrganizerHistoryPending": "整理运行中，完成后会显示模型最终总结。",
     "settings.memoryOrganizerClearHistory": "清空历史记录",
     "settings.memoryOrganizerClearHistoryConfirmTitle": "清空记忆整理历史？",
-    "settings.memoryOrganizerClearHistoryConfirmDescription": "将删除所有已结束的整理历史记录；正在排队或运行中的任务会保留，避免中断当前整理。此操作不可撤销。",
+    "settings.memoryOrganizerClearHistoryConfirmDescription":
+      "将删除所有已结束的整理历史记录；正在排队或运行中的任务会保留，避免中断当前整理。此操作不可撤销。",
     "settings.memoryOrganizerHistoryCleared": "历史记录已清空。",
-    "settings.memoryOrganizerHistoryClearedActiveRetained": "历史记录已清空；正在排队或运行中的任务已保留。",
+    "settings.memoryOrganizerHistoryClearedActiveRetained":
+      "历史记录已清空；正在排队或运行中的任务已保留。",
     "settings.memoryOrganizerStatusPending": "排队中",
     "settings.memoryOrganizerStatusRunning": "运行中",
     "settings.memoryOrganizerStatusSucceeded": "成功",
@@ -251,7 +258,8 @@ export const translations: Record<Locale, Record<string, string>> = {
     "settings.memoryOrganizerClusterSummaries": "分组总结",
     "settings.memoryOrganizerTrimmedProtocol": "裁剪后的模型协议",
     "settings.memoryOrganizerManualPreview": "手动整理预览",
-    "settings.memoryOrganizerManualPreviewDescription": "默认选中客户端判定为安全的建议，确认后才会写入记忆。",
+    "settings.memoryOrganizerManualPreviewDescription":
+      "默认选中客户端判定为安全的建议，确认后才会写入记忆。",
     "settings.memoryOrganizerApplySelected": "应用选中建议",
     "settings.memoryOrganizerApplied": "选中建议已应用。",
     "settings.memoryOrganizerPartiallyApplied": "选中建议已部分应用；请查看失败项。",
@@ -348,7 +356,8 @@ export const translations: Record<Locale, Record<string, string>> = {
     "settings.aboutUpToDate": "已是最新版本",
     "settings.aboutUpToDateDesc": "当前通道没有比本机更新的 Release。",
     "settings.aboutUpdaterNotConfigured": "更新未配置",
-    "settings.aboutUpdaterNotConfiguredDesc": "Release 构建需要注入 updater 公钥后才能检查和安装更新。",
+    "settings.aboutUpdaterNotConfiguredDesc":
+      "Release 构建需要注入 updater 公钥后才能检查和安装更新。",
     "settings.aboutUpdateError": "更新检查失败",
     "settings.aboutUpdateCheckFailed": "检查更新失败。",
     "settings.aboutUpdateInstallFailed": "安装更新失败。",
@@ -359,9 +368,11 @@ export const translations: Record<Locale, Record<string, string>> = {
     "settings.aboutChannelPrerelease": "预发布",
     "settings.aboutPrereleaseTitle": "接收预发布版本",
     "settings.aboutPrereleaseToggle": "接收预发布版本",
-    "settings.aboutPrereleaseDesc": "关闭后只会检查正式 Release；开启后会把 beta、rc 等预发布版本纳入候选。",
+    "settings.aboutPrereleaseDesc":
+      "关闭后只会检查正式 Release；开启后会把 beta、rc 等预发布版本纳入候选。",
     "settings.aboutNotesTitle": "说明",
-    "settings.aboutNotesBody": "自动更新只使用 GitHub Release 中的 Tauri updater 清单，版本号高于当前应用时才会提示安装。",
+    "settings.aboutNotesBody":
+      "自动更新只使用 GitHub Release 中的 Tauri updater 清单，版本号高于当前应用时才会提示安装。",
     "settings.aboutSecurityBody": "更新包会通过签名校验；未通过校验的包不会安装。",
 
     /* ── Settings System ── */
@@ -375,7 +386,8 @@ export const translations: Record<Locale, Record<string, string>> = {
     "settings.chinese": "简体中文",
     "settings.english": "English",
     "settings.executionMode": "执行模式",
-    "settings.executionModeDesc": "选择当前对话的运行方式。Chat 模式仅输出文本，Agent 模式允许模型调用工具执行操作。",
+    "settings.executionModeDesc":
+      "选择当前对话的运行方式。Chat 模式仅输出文本，Agent 模式允许模型调用工具执行操作。",
     "settings.chatMode": "Chat 模式",
     "settings.chatModeDesc": "纯文本对话，模型只输出文本与 Markdown",
     "settings.agentMode": "Agent 模式",
@@ -385,13 +397,15 @@ export const translations: Record<Locale, Record<string, string>> = {
       "与 Agent 模式一致，但会把当前对话的流式请求与返回逐行写入 ~/.liveagent/debug/<对话ID>.jsonl",
     "settings.workdir": "工作目录",
     "settings.workdirRequired": "必填",
-    "settings.workdirDesc": "Agent 模式下所有文件操作的根目录。仅允许在该目录及子目录内进行读写/搜索。",
+    "settings.workdirDesc":
+      "Agent 模式下所有文件操作的根目录。仅允许在该目录及子目录内进行读写/搜索。",
     "settings.workdirPlaceholder": "点击右侧按钮选择目录，或直接输入路径...",
     "settings.selectWorkdir": "选择工作目录",
     "settings.workdirWarning": "Agent 模式需要填写工作目录，否则无法执行文件工具。",
     "settings.workdirOpenFailed": "打开目录选择器失败：",
     "settings.systemTools": "自定义系统工具",
-    "settings.systemToolsDesc": "这里仅展示用户自定义的系统工具；选中的工具会在 Agent 模式下注册，供模型在对话中调用。",
+    "settings.systemToolsDesc":
+      "这里仅展示用户自定义的系统工具；选中的工具会在 Agent 模式下注册，供模型在对话中调用。",
     "settings.noSystemTools": "暂无可用的自定义系统工具",
 
     /* ── Settings Providers ── */
@@ -516,9 +530,12 @@ export const translations: Record<Locale, Record<string, string>> = {
     "settings.cronPromptModelRequired": "请选择 Auto Prompt 要使用的模型。",
     "settings.cronPromptModelEmpty": "请先在供应商配置中至少启用一个模型。",
     "settings.cronPromptRequired": "请输入要执行的 Prompt 内容。",
-    "settings.cronPromptRunHint": "Auto Prompt 会在后台独立执行，不会进入主页面最近对话，只会将最终结论写入当前任务的日志列表。",
-    "settings.cronPromptAgentModeOnlyHint": "Auto Prompt 仅在系统执行模式为 Agent 模式或 Agent dev 模式时可运行。",
-    "settings.cronPromptAgentModeRequired": "请先将 系统设置 -> 执行模式 切换为 Agent 模式或 Agent dev 模式，再运行 Auto Prompt。",
+    "settings.cronPromptRunHint":
+      "Auto Prompt 会在后台独立执行，不会进入主页面最近对话，只会将最终结论写入当前任务的日志列表。",
+    "settings.cronPromptAgentModeOnlyHint":
+      "Auto Prompt 仅在系统执行模式为 Agent 模式或 Agent dev 模式时可运行。",
+    "settings.cronPromptAgentModeRequired":
+      "请先将 系统设置 -> 执行模式 切换为 Agent 模式或 Agent dev 模式，再运行 Auto Prompt。",
     "settings.cronPromptPlaceholder": "输入要执行的 Prompt 内容...",
     "settings.cronCommandList": "脚本",
     "settings.cronCommandHint": "输入普通 Shell 脚本，可多行",
@@ -586,7 +603,8 @@ export const translations: Record<Locale, Record<string, string>> = {
     "settings.remoteGrpcPort": "gRPC 端口",
     "settings.remoteGrpcPortHint": "Gateway 上 gRPC 服务的监听端口，默认 50051",
     "settings.remoteGrpcEndpoint": "gRPC Endpoint",
-    "settings.remoteGrpcEndpointHint": "可选。Railway TCP Proxy 等场景可填写独立 gRPC 地址，留空则使用 Gateway 地址加 gRPC 端口。",
+    "settings.remoteGrpcEndpointHint":
+      "可选。Railway TCP Proxy 等场景可填写独立 gRPC 地址，留空则使用 Gateway 地址加 gRPC 端口。",
     "settings.remoteAuth": "身份认证",
     "settings.remoteToken": "访问令牌",
     "settings.remoteTokenPlaceholder": "输入与 Gateway 配置一致的 Token",
@@ -667,7 +685,8 @@ export const translations: Record<Locale, Record<string, string>> = {
     "mcpHub.storeConfigureTitle": "配置 MCP Server",
     "mcpHub.storeConfigureSubtitle": "补全 {name} 的连接信息后添加到本地 MCP Servers",
     "mcpHub.storeConfigureRequiredTitle": "必填配置",
-    "mcpHub.storeConfigureRequiredDesc": "这些值会按 Registry 提供的目标写入 Env、Header、URL 或 Args。",
+    "mcpHub.storeConfigureRequiredDesc":
+      "这些值会按 Registry 提供的目标写入 Env、Header、URL 或 Args。",
     "mcpHub.storeConfigureSubmit": "添加到本地",
     "mcpHub.storeConfigureNameRequired": "请填写 Server Name",
     "mcpHub.storeConfigureCommandRequired": "请填写启动命令",
@@ -711,9 +730,11 @@ export const translations: Record<Locale, Record<string, string>> = {
     "settings.skillsScan": "扫描",
     "settings.skillsScanning": "扫描中",
     "settings.skillsDisabledHint": "Skills 功能已关闭，开启后才会将选中的技能注入 system prompt",
-    "settings.skillsDisabledInChatMode": "Chat 模式下不启用 Skills。切换到 Agent 模式后，才会恢复扫描、选择和注入能力。",
+    "settings.skillsDisabledInChatMode":
+      "Chat 模式下不启用 Skills。切换到 Agent 模式后，才会恢复扫描、选择和注入能力。",
     "settings.skillsNotFound": "未发现任何 Skill",
-    "settings.skillsNotFoundHint": "在应用 Skills 目录中添加 skill.json、SKILL.md 或 README.md 文件",
+    "settings.skillsNotFoundHint":
+      "在应用 Skills 目录中添加 skill.json、SKILL.md 或 README.md 文件",
     "settings.skillsRescan": "重新扫描",
     "settings.skillsSearch": "搜索 Skill...",
     "settings.skillsNoMatch": "没有匹配「{filter}」的 Skill",
@@ -746,7 +767,8 @@ export const translations: Record<Locale, Record<string, string>> = {
     "settings.skillsStorePreviewDownloads": "下载",
     "settings.skillsStorePreviewStars": "星标",
     "settings.skillsStorePreviewInstalls": "安装",
-    "settings.skillsStorePreviewDetailUnavailable": "ClawHub 详情暂不可用，已显示列表中的基础信息。",
+    "settings.skillsStorePreviewDetailUnavailable":
+      "ClawHub 详情暂不可用，已显示列表中的基础信息。",
     "settings.skillsStorePreviewMetadata": "信息",
     "settings.skillsStorePreviewOwner": "作者",
     "settings.skillsStorePreviewVersion": "版本",
@@ -877,7 +899,8 @@ export const translations: Record<Locale, Record<string, string>> = {
     "chat.runtime.reasoning": "Thinking effort",
     "chat.emptyRound": "(No reply)",
     "chat.inputHint": "Type a message, @ to mention files, Enter to send, Shift+Enter for newline",
-    "chat.inputHintWithSkills": "Type a message, @ to mention files, $ to reference Skills, Enter to send, Shift+Enter for newline",
+    "chat.inputHintWithSkills":
+      "Type a message, @ to mention files, $ to reference Skills, Enter to send, Shift+Enter for newline",
     "chat.compactingContext": "Compressing context",
     "chat.compactingContextWait": "Compressing context, please wait...",
     "chat.editMessage": "Edit Message",
@@ -885,6 +908,8 @@ export const translations: Record<Locale, Record<string, string>> = {
     "chat.copy": "Copy",
     "chat.edit": "Edit",
     "chat.selectModel": "Select Model",
+    "chat.searchModel": "Search models...",
+    "chat.noModelFound": "No matching models found",
     "chat.aborted": "Cancelled",
     "chat.contextWindow": "Context Window",
     "chat.usage": "Usage",
@@ -986,9 +1011,12 @@ export const translations: Record<Locale, Record<string, string>> = {
     "settings.memoryQuotaWarning": "Near limit",
     "settings.memoryQuotaNearLimit": "Almost full",
     "settings.memoryQuotaFull": "Full",
-    "settings.memoryQuotaWarningMessage": "Memory usage is above 80%. Prefer merging or deleting low-value entries.",
-    "settings.memoryQuotaNearLimitMessage": "Memory usage is above 95%. New memories will soon be rejected.",
-    "settings.memoryQuotaFullMessage": "This scope has reached the 500 ordinary-memory limit. New memories will be rejected until old entries are deleted or merged.",
+    "settings.memoryQuotaWarningMessage":
+      "Memory usage is above 80%. Prefer merging or deleting low-value entries.",
+    "settings.memoryQuotaNearLimitMessage":
+      "Memory usage is above 95%. New memories will soon be rejected.",
+    "settings.memoryQuotaFullMessage":
+      "This scope has reached the 500 ordinary-memory limit. New memories will be rejected until old entries are deleted or merged.",
     "settings.memoryRefresh": "Refresh",
     "settings.memoryOpenSettings": "Memory settings",
     "settings.memorySettingsTitle": "Memory settings",
@@ -1002,7 +1030,8 @@ export const translations: Record<Locale, Record<string, string>> = {
     "settings.memorySettingsCapacity": "Capacity",
     "settings.memorySettingsReview": "Review",
     "settings.memorySettingsDangerZone": "Danger zone",
-    "settings.memorySettingsWipeDescription": "Wipe moves existing memories to quarantine and rebuilds an empty memory store.",
+    "settings.memorySettingsWipeDescription":
+      "Wipe moves existing memories to quarantine and rebuilds an empty memory store.",
     "settings.memoryDriverModels": "Driver models",
     "settings.memoryOrganizerModel": "Memory organization",
     "settings.memorySummaryModel": "Conversation summary",
@@ -1038,19 +1067,26 @@ export const translations: Record<Locale, Record<string, string>> = {
     "settings.memoryOrganizerNextRun": "Next automatic run:",
     "settings.memoryOrganizerRunNow": "Organize now",
     "settings.memoryOrganizerNoModel": "Choose a memory organization model first.",
-    "settings.memoryOrganizerAlreadyRunning": "Memory organization is already running. Check history again shortly.",
-    "settings.memoryOrganizerQueued": "Memory organization has been queued and will run in the background.",
-    "settings.memoryOrganizerQueuedRemote": "Memory organization has been submitted to the desktop background queue. Keep the desktop app running to execute it.",
+    "settings.memoryOrganizerAlreadyRunning":
+      "Memory organization is already running. Check history again shortly.",
+    "settings.memoryOrganizerQueued":
+      "Memory organization has been queued and will run in the background.",
+    "settings.memoryOrganizerQueuedRemote":
+      "Memory organization has been submitted to the desktop background queue. Keep the desktop app running to execute it.",
     "settings.memoryOrganizerHistory": "History",
-    "settings.memoryOrganizerHistoryDescription": "Review each memory organization run's final model summary, stats, and trimmed protocol.",
+    "settings.memoryOrganizerHistoryDescription":
+      "Review each memory organization run's final model summary, stats, and trimmed protocol.",
     "settings.memoryOrganizerHistoryAll": "All statuses",
     "settings.memoryOrganizerHistoryEmpty": "No memory organization history yet.",
-    "settings.memoryOrganizerHistoryPending": "Run in progress. The final model summary will appear after completion.",
+    "settings.memoryOrganizerHistoryPending":
+      "Run in progress. The final model summary will appear after completion.",
     "settings.memoryOrganizerClearHistory": "Clear history",
     "settings.memoryOrganizerClearHistoryConfirmTitle": "Clear memory organization history?",
-    "settings.memoryOrganizerClearHistoryConfirmDescription": "This deletes all finished memory organization history records. Pending or running tasks are retained so the current organization pass is not interrupted. This action cannot be undone.",
+    "settings.memoryOrganizerClearHistoryConfirmDescription":
+      "This deletes all finished memory organization history records. Pending or running tasks are retained so the current organization pass is not interrupted. This action cannot be undone.",
     "settings.memoryOrganizerHistoryCleared": "History has been cleared.",
-    "settings.memoryOrganizerHistoryClearedActiveRetained": "History has been cleared; pending or running tasks were retained.",
+    "settings.memoryOrganizerHistoryClearedActiveRetained":
+      "History has been cleared; pending or running tasks were retained.",
     "settings.memoryOrganizerStatusPending": "Pending",
     "settings.memoryOrganizerStatusRunning": "Running",
     "settings.memoryOrganizerStatusSucceeded": "Succeeded",
@@ -1074,11 +1110,14 @@ export const translations: Record<Locale, Record<string, string>> = {
     "settings.memoryOrganizerClusterSummaries": "Cluster summaries",
     "settings.memoryOrganizerTrimmedProtocol": "Trimmed model protocol",
     "settings.memoryOrganizerManualPreview": "Manual preview",
-    "settings.memoryOrganizerManualPreviewDescription": "Safe client-validated suggestions are selected by default and are written only after confirmation.",
+    "settings.memoryOrganizerManualPreviewDescription":
+      "Safe client-validated suggestions are selected by default and are written only after confirmation.",
     "settings.memoryOrganizerApplySelected": "Apply selected",
     "settings.memoryOrganizerApplied": "Selected suggestions have been applied.",
-    "settings.memoryOrganizerPartiallyApplied": "Selected suggestions were partially applied; review failed items.",
-    "settings.memoryOrganizerApplyFailed": "Selected suggestions could not be written; review failed items.",
+    "settings.memoryOrganizerPartiallyApplied":
+      "Selected suggestions were partially applied; review failed items.",
+    "settings.memoryOrganizerApplyFailed":
+      "Selected suggestions could not be written; review failed items.",
     "settings.memoryOrganizerSelectAtLeastOne": "Select at least one suggestion.",
     "settings.memoryOrganizerDecisionDelete": "Delete",
     "settings.memoryOrganizerDecisionUpsert": "Rewrite",
@@ -1120,7 +1159,8 @@ export const translations: Record<Locale, Record<string, string>> = {
     "settings.memoryTypeDaily": "Journal",
     "settings.memoryUnknownProject": "Project with no recorded path",
     "settings.memoryUnknownProjectId": "unknown project",
-    "settings.memoryProjectRequiresWorkdir": "Project memory requires a workspace directory in System settings.",
+    "settings.memoryProjectRequiresWorkdir":
+      "Project memory requires a workspace directory in System settings.",
     "settings.memorySearchPlaceholder": "Search memory",
     "settings.memoryNew": "New memory",
     "settings.memoryNoEntries": "No memory entries.",
@@ -1139,7 +1179,8 @@ export const translations: Record<Locale, Record<string, string>> = {
     "settings.memoryAppendBlockPlaceholder": "Append memory block",
     "settings.memoryEmptyBody": "<empty>",
     "settings.memoryWipeConfirmTitle": "Wipe all memories?",
-    "settings.memoryWipeConfirmDescription": "Existing memories will be moved to quarantine and the memory store will be rebuilt empty.",
+    "settings.memoryWipeConfirmDescription":
+      "Existing memories will be moved to quarantine and the memory store will be rebuilt empty.",
     "settings.memoryWipeAll": "Wipe all",
     "settings.memorySelectEntry": "Select a memory entry.",
 
@@ -1152,26 +1193,31 @@ export const translations: Record<Locale, Record<string, string>> = {
 
     /* ── Settings About ── */
     "settings.aboutTitle": "About LiveAgent",
-    "settings.aboutDescription": "View the current version, release notes, and desktop update status.",
+    "settings.aboutDescription":
+      "View the current version, release notes, and desktop update status.",
     "settings.aboutCurrentVersion": "Current Version",
     "settings.aboutOpenRelease": "Release",
     "settings.aboutCheckUpdate": "Check",
     "settings.aboutInstallUpdate": "Install Update",
     "settings.aboutRestartApp": "Restart App",
     "settings.aboutChecking": "Checking for updates",
-    "settings.aboutCheckingDesc": "Reading the GitHub Release manifest and filtering by the selected channel.",
+    "settings.aboutCheckingDesc":
+      "Reading the GitHub Release manifest and filtering by the selected channel.",
     "settings.aboutInstalling": "Installing update",
     "settings.aboutInstallingDesc": "Downloading and verifying the update package.",
     "settings.aboutInstalled": "Update installed",
-    "settings.aboutInstalledDesc": "The update package has been installed. Restart LiveAgent to use it.",
+    "settings.aboutInstalledDesc":
+      "The update package has been installed. Restart LiveAgent to use it.",
     "settings.aboutRestarting": "Restarting app",
     "settings.aboutRestartingDesc": "LiveAgent is quitting and opening again.",
     "settings.aboutUpdateAvailable": "New version available",
-    "settings.aboutUpdateAvailableDesc": "This version passed updater manifest validation and can be installed.",
+    "settings.aboutUpdateAvailableDesc":
+      "This version passed updater manifest validation and can be installed.",
     "settings.aboutUpToDate": "Up to date",
     "settings.aboutUpToDateDesc": "No newer Release is available in the current channel.",
     "settings.aboutUpdaterNotConfigured": "Updater not configured",
-    "settings.aboutUpdaterNotConfiguredDesc": "Release builds must embed the updater public key before updates can be checked and installed.",
+    "settings.aboutUpdaterNotConfiguredDesc":
+      "Release builds must embed the updater public key before updates can be checked and installed.",
     "settings.aboutUpdateError": "Update check failed",
     "settings.aboutUpdateCheckFailed": "Failed to check for updates.",
     "settings.aboutUpdateInstallFailed": "Failed to install update.",
@@ -1182,14 +1228,18 @@ export const translations: Record<Locale, Record<string, string>> = {
     "settings.aboutChannelPrerelease": "Pre-release",
     "settings.aboutPrereleaseTitle": "Receive Pre-releases",
     "settings.aboutPrereleaseToggle": "Receive pre-release versions",
-    "settings.aboutPrereleaseDesc": "When disabled, only stable Releases are checked. When enabled, beta, rc, and other pre-releases are eligible.",
+    "settings.aboutPrereleaseDesc":
+      "When disabled, only stable Releases are checked. When enabled, beta, rc, and other pre-releases are eligible.",
     "settings.aboutNotesTitle": "Notes",
-    "settings.aboutNotesBody": "Automatic updates use the Tauri updater manifest attached to GitHub Releases and only prompt when the release version is newer than this app.",
-    "settings.aboutSecurityBody": "Update packages are verified with signatures. Packages that fail verification are not installed.",
+    "settings.aboutNotesBody":
+      "Automatic updates use the Tauri updater manifest attached to GitHub Releases and only prompt when the release version is newer than this app.",
+    "settings.aboutSecurityBody":
+      "Update packages are verified with signatures. Packages that fail verification are not installed.",
 
     /* ── Settings System ── */
     "settings.appearance": "Appearance",
-    "settings.appearanceDesc": "Choose the color theme for the application. Your preference will be saved automatically.",
+    "settings.appearanceDesc":
+      "Choose the color theme for the application. Your preference will be saved automatically.",
     "settings.light": "Light",
     "settings.lightDesc": "Bright and clean light interface",
     "settings.dark": "Dark",
@@ -1198,7 +1248,8 @@ export const translations: Record<Locale, Record<string, string>> = {
     "settings.chinese": "简体中文",
     "settings.english": "English",
     "settings.executionMode": "Execution Mode",
-    "settings.executionModeDesc": "Choose how the current conversation runs. Chat mode outputs text only; Agent mode allows the model to call tools.",
+    "settings.executionModeDesc":
+      "Choose how the current conversation runs. Chat mode outputs text only; Agent mode allows the model to call tools.",
     "settings.chatMode": "Chat Mode",
     "settings.chatModeDesc": "Plain text conversation, model outputs text and Markdown only",
     "settings.agentMode": "Agent Mode",
@@ -1208,13 +1259,17 @@ export const translations: Record<Locale, Record<string, string>> = {
       "Same as Agent mode, but also writes each streaming request and response line-by-line to ~/.liveagent/debug/<conversationId>.jsonl",
     "settings.workdir": "Work Directory",
     "settings.workdirRequired": "Required",
-    "settings.workdirDesc": "Root directory for all file operations in Agent mode. Read/write/search is restricted to this directory and its subdirectories.",
-    "settings.workdirPlaceholder": "Click the button on the right to select a directory, or enter a path...",
+    "settings.workdirDesc":
+      "Root directory for all file operations in Agent mode. Read/write/search is restricted to this directory and its subdirectories.",
+    "settings.workdirPlaceholder":
+      "Click the button on the right to select a directory, or enter a path...",
     "settings.selectWorkdir": "Select Work Directory",
-    "settings.workdirWarning": "Agent mode requires a work directory; file tools will not work without it.",
+    "settings.workdirWarning":
+      "Agent mode requires a work directory; file tools will not work without it.",
     "settings.workdirOpenFailed": "Failed to open directory picker: ",
     "settings.systemTools": "Custom System Tools",
-    "settings.systemToolsDesc": "Only user-defined system tools are shown here. Selected tools are registered in Agent mode and can be called by the model during conversation.",
+    "settings.systemToolsDesc":
+      "Only user-defined system tools are shown here. Selected tools are registered in Agent mode and can be called by the model during conversation.",
     "settings.noSystemTools": "No custom system tools available",
 
     /* ── Settings Providers ── */
@@ -1276,8 +1331,10 @@ export const translations: Record<Locale, Record<string, string>> = {
     "settings.conversationTitleGeneration": "Conversation title generation",
     "settings.conversationTitleModel": "Title generation model",
     "settings.conversationTitleModelFollowCurrent": "Use current chat model",
-    "settings.conversationTitleModelHint": "When unselected, title generation uses the model from the current chat.",
-    "settings.customSettingsModelEmpty": "No active models are configured for the current providers.",
+    "settings.conversationTitleModelHint":
+      "When unselected, title generation uses the model from the current chat.",
+    "settings.customSettingsModelEmpty":
+      "No active models are configured for the current providers.",
 
     /* ── Settings Prompt ── */
     "settings.agentsTitle": "Prompt",
@@ -1287,7 +1344,8 @@ export const translations: Record<Locale, Record<string, string>> = {
     "settings.agentsName": "Name",
     "settings.agentsNamePlaceholder": "e.g. Code Review Assistant",
     "settings.agentsDescription": "Description",
-    "settings.agentsDescriptionPlaceholder": "Briefly describe what this global prompt template is for",
+    "settings.agentsDescriptionPlaceholder":
+      "Briefly describe what this global prompt template is for",
     "settings.agentsTags": "Tags",
     "settings.agentsTagsPlaceholder": "e.g. review, writing, global prompt",
     "settings.agentsPrompt": "Prompt",
@@ -1296,7 +1354,8 @@ export const translations: Record<Locale, Record<string, string>> = {
     "settings.agentsActive": "active",
     "settings.agentsActiveLabel": "Active",
     "settings.agentsNoTemplates": "No global prompt templates yet",
-    "settings.agentsNoTemplatesHint": "Create reusable prompt templates to quickly apply common Agent instructions in your chats",
+    "settings.agentsNoTemplatesHint":
+      "Create reusable prompt templates to quickly apply common Agent instructions in your chats",
     "settings.agentsNoDescription": "No description",
     "settings.agentsNoTags": "No tags",
     "settings.agentsShowPrompt": "View Prompt",
@@ -1309,7 +1368,7 @@ export const translations: Record<Locale, Record<string, string>> = {
     "settings.cronDesc": "Configure and manage automated scheduled tasks",
     "settings.cronAdd": "Add Task",
     "settings.cronEmpty": "No scheduled tasks",
-    "settings.cronEmptyDesc": "Click \"Add Task\" to create your first scheduled task",
+    "settings.cronEmptyDesc": 'Click "Add Task" to create your first scheduled task',
     "settings.cronCount": "tasks",
     "settings.cronTaskName": "Task Name",
     "settings.cronTaskNamePlaceholder": "Enter task name",
@@ -1325,7 +1384,8 @@ export const translations: Record<Locale, Record<string, string>> = {
     "settings.cronRemainingExecutionsUnlimitedShort": "unlimited",
     "settings.cronRemainingExecutionsUnit": "remaining",
     "settings.cronRemainingExecutionsUnitShort": "left",
-    "settings.cronRemainingExecutionsEditRequired": "Run count is exhausted. Edit this task and change the run count first.",
+    "settings.cronRemainingExecutionsEditRequired":
+      "Run count is exhausted. Edit this task and change the run count first.",
     "settings.cronTaskType": "Task Type",
     "settings.cronTypeBash": "Shell Script",
     "settings.cronTypeBashHint": "Run a multi-line script with the platform shell",
@@ -1339,9 +1399,12 @@ export const translations: Record<Locale, Record<string, string>> = {
     "settings.cronPromptModelRequired": "Select the model for this Auto Prompt task.",
     "settings.cronPromptModelEmpty": "Enable at least one model in provider settings first.",
     "settings.cronPromptRequired": "Enter the prompt content to execute.",
-    "settings.cronPromptRunHint": "Auto Prompt runs in the background, does not appear in recent conversations, and only writes the final conclusion to this task's log list.",
-    "settings.cronPromptAgentModeOnlyHint": "Auto Prompt runs only when System -> Execution Mode is Agent Mode or Agent Dev Mode.",
-    "settings.cronPromptAgentModeRequired": "Switch System -> Execution Mode to Agent Mode or Agent Dev Mode before running Auto Prompt.",
+    "settings.cronPromptRunHint":
+      "Auto Prompt runs in the background, does not appear in recent conversations, and only writes the final conclusion to this task's log list.",
+    "settings.cronPromptAgentModeOnlyHint":
+      "Auto Prompt runs only when System -> Execution Mode is Agent Mode or Agent Dev Mode.",
+    "settings.cronPromptAgentModeRequired":
+      "Switch System -> Execution Mode to Agent Mode or Agent Dev Mode before running Auto Prompt.",
     "settings.cronPromptPlaceholder": "Enter the prompt content to execute...",
     "settings.cronCommandList": "Script",
     "settings.cronCommandHint": "Enter a regular Shell script. Multiple lines are supported.",
@@ -1349,13 +1412,15 @@ export const translations: Record<Locale, Record<string, string>> = {
     "settings.cronCommandRequired": "Script is required.",
     "settings.cronHttpRequests": "HTTP Requests",
     "settings.cronRequestsCount": "requests",
-    "settings.cronHttpHeadersInvalid": "Headers must be a JSON object and values will be stringified.",
+    "settings.cronHttpHeadersInvalid":
+      "Headers must be a JSON object and values will be stringified.",
     "settings.cronHttpBodyInvalid": "Body must be valid JSON.",
     "settings.cronHttpRequestRequired": "At least one HTTP request is required.",
     "settings.cronHttpUrlRequired": "Request URL is required",
     "settings.cronHttpUrlInvalid": "Request URL is invalid",
     "settings.cronHttpBodyDisabled": "This HTTP method does not support a request body here",
-    "settings.cronPromptUnavailable": "Auto Prompt is not implemented yet. Only Bash and HTTP tasks are supported now.",
+    "settings.cronPromptUnavailable":
+      "Auto Prompt is not implemented yet. Only Bash and HTTP tasks are supported now.",
     "settings.cronView": "View",
     "settings.cronEdit": "Edit",
     "settings.cronDelete": "Delete",
@@ -1405,18 +1470,22 @@ export const translations: Record<Locale, Record<string, string>> = {
     "settings.remoteDisable": "Disable remote access",
     "settings.remoteGatewayConnection": "Gateway Connection",
     "settings.remoteGatewayUrl": "Gateway URL",
-    "settings.remoteGatewayUrlHint": "HTTPS address of the cloud Gateway for WebUI access and gRPC connection",
+    "settings.remoteGatewayUrlHint":
+      "HTTPS address of the cloud Gateway for WebUI access and gRPC connection",
     "settings.remoteGrpcPort": "gRPC Port",
     "settings.remoteGrpcPortHint": "The gRPC service port on the Gateway, default 50051",
     "settings.remoteGrpcEndpoint": "gRPC Endpoint",
-    "settings.remoteGrpcEndpointHint": "Optional. Use a separate gRPC address for Railway TCP Proxy or similar hosts. Leave empty to use the Gateway URL plus gRPC port.",
+    "settings.remoteGrpcEndpointHint":
+      "Optional. Use a separate gRPC address for Railway TCP Proxy or similar hosts. Leave empty to use the Gateway URL plus gRPC port.",
     "settings.remoteAuth": "Authentication",
     "settings.remoteToken": "Access Token",
     "settings.remoteTokenPlaceholder": "Enter the token matching Gateway config",
-    "settings.remoteTokenHint": "Must match the --token argument used when starting the Gateway, used for mutual authentication",
+    "settings.remoteTokenHint":
+      "Must match the --token argument used when starting the Gateway, used for mutual authentication",
     "settings.remoteAgentId": "Agent ID",
     "settings.remoteAgentIdPlaceholder": "e.g. macbook-pro",
-    "settings.remoteAgentIdHint": "Unique identifier for this Agent shown in WebUI. Leave empty to use hostname",
+    "settings.remoteAgentIdHint":
+      "Unique identifier for this Agent shown in WebUI. Leave empty to use hostname",
     "settings.remoteAdvanced": "Advanced Options",
     "settings.remoteAutoReconnect": "Auto Reconnect",
     "settings.remoteAutoReconnectHint": "Automatically reconnect to Gateway after connection drops",
@@ -1488,9 +1557,11 @@ export const translations: Record<Locale, Record<string, string>> = {
     "mcpHub.storeManualOnly": "Manual",
     "mcpHub.storeConfigure": "Configure",
     "mcpHub.storeConfigureTitle": "Configure MCP Server",
-    "mcpHub.storeConfigureSubtitle": "Fill in connection details for {name} and add it to local MCP Servers",
+    "mcpHub.storeConfigureSubtitle":
+      "Fill in connection details for {name} and add it to local MCP Servers",
     "mcpHub.storeConfigureRequiredTitle": "Required Config",
-    "mcpHub.storeConfigureRequiredDesc": "Values are written to Env, Header, URL, or Args according to the Registry target.",
+    "mcpHub.storeConfigureRequiredDesc":
+      "Values are written to Env, Header, URL, or Args according to the Registry target.",
     "mcpHub.storeConfigureSubmit": "Add locally",
     "mcpHub.storeConfigureNameRequired": "Server Name is required",
     "mcpHub.storeConfigureCommandRequired": "Command is required",
@@ -1515,7 +1586,8 @@ export const translations: Record<Locale, Record<string, string>> = {
     "mcpHub.storePreviewRemote": "Remote",
     "mcpHub.storePreviewLocal": "Local",
     "mcpHub.storePreviewLoadingDetail": "Loading details",
-    "mcpHub.storePreviewDetailUnavailable": "Details are unavailable. Showing the basic list information.",
+    "mcpHub.storePreviewDetailUnavailable":
+      "Details are unavailable. Showing the basic list information.",
     "mcpHub.storePreviewTags": "Tags",
     "mcpHub.storePreviewInstallPreview": "Install Preview",
     "mcpHub.storePreviewRequiredConfig": "Required Config",
@@ -1533,13 +1605,16 @@ export const translations: Record<Locale, Record<string, string>> = {
     "settings.skillsAlwaysOn": "Built-in",
     "settings.skillsScan": "Scan",
     "settings.skillsScanning": "Scanning",
-    "settings.skillsDisabledHint": "Skills is off. Enable it to inject selected skills into the system prompt.",
-    "settings.skillsDisabledInChatMode": "Skills stays disabled in Chat mode. Switch to Agent mode to scan, select, and inject skills again.",
+    "settings.skillsDisabledHint":
+      "Skills is off. Enable it to inject selected skills into the system prompt.",
+    "settings.skillsDisabledInChatMode":
+      "Skills stays disabled in Chat mode. Switch to Agent mode to scan, select, and inject skills again.",
     "settings.skillsNotFound": "No Skills found",
-    "settings.skillsNotFoundHint": "Add skill.json, SKILL.md, or README.md files to the Skills directory",
+    "settings.skillsNotFoundHint":
+      "Add skill.json, SKILL.md, or README.md files to the Skills directory",
     "settings.skillsRescan": "Rescan",
     "settings.skillsSearch": "Search Skills...",
-    "settings.skillsNoMatch": "No skills matching \"{filter}\"",
+    "settings.skillsNoMatch": 'No skills matching "{filter}"',
     "settings.skillsStoreSearch": "Search ClawHub Skills",
     "settings.skillsStoreSortMostDownloaded": "Most Downloaded",
     "settings.skillsStoreSortMostStarred": "Most Starred",
@@ -1569,7 +1644,8 @@ export const translations: Record<Locale, Record<string, string>> = {
     "settings.skillsStorePreviewDownloads": "Downloads",
     "settings.skillsStorePreviewStars": "Stars",
     "settings.skillsStorePreviewInstalls": "Installs",
-    "settings.skillsStorePreviewDetailUnavailable": "ClawHub details are unavailable. Showing the basic list information.",
+    "settings.skillsStorePreviewDetailUnavailable":
+      "ClawHub details are unavailable. Showing the basic list information.",
     "settings.skillsStorePreviewMetadata": "Details",
     "settings.skillsStorePreviewOwner": "Owner",
     "settings.skillsStorePreviewVersion": "Version",
@@ -1584,7 +1660,8 @@ export const translations: Record<Locale, Record<string, string>> = {
 
     /* ── Settings Hooks ── */
     "settings.hooksTitle": "Hooks",
-    "settings.hooksDesc": "Configure Shell script or HTTP hooks for main conversation lifecycle events.",
+    "settings.hooksDesc":
+      "Configure Shell script or HTTP hooks for main conversation lifecycle events.",
     "settings.hooksCount": "hooks",
     "settings.hooksEnabledCount": "enabled",
     "settings.hooksLifecycle": "Lifecycle",
@@ -1599,7 +1676,8 @@ export const translations: Record<Locale, Record<string, string>> = {
     "settings.hooksTypeHttp": "http",
     "settings.hooksNoDescription": "No description",
     "settings.hooksEmptyTitle": "No hooks configured for this lifecycle yet",
-    "settings.hooksEmptyDesc": "Add a hook to run Shell scripts or HTTP requests in sequence for this event.",
+    "settings.hooksEmptyDesc":
+      "Add a hook to run Shell scripts or HTTP requests in sequence for this event.",
     "settings.hooksScriptLinesCount": "script lines",
     "settings.hooksRequestsCount": "requests",
     "settings.hooksCommandList": "Script",
@@ -1617,7 +1695,8 @@ export const translations: Record<Locale, Record<string, string>> = {
     "settings.hooksHttpBodyDisabled": "This HTTP method does not support a request body here",
     "settings.hooksHttpUrlRequired": "Request URL is required",
     "settings.hooksHttpUrlInvalid": "Request URL is invalid",
-    "settings.hooksHttpHeadersInvalid": "Headers must be a JSON object and values will be stringified.",
+    "settings.hooksHttpHeadersInvalid":
+      "Headers must be a JSON object and values will be stringified.",
     "settings.hooksHttpBodyInvalid": "Body must be valid JSON.",
     "settings.hooksHttpRequestRequired": "At least one HTTP request is required.",
     "settings.hooksNameRequired": "Hook name is required.",
@@ -1626,11 +1705,14 @@ export const translations: Record<Locale, Record<string, string>> = {
     "settings.hooksEventTurnStart": "turn_start",
     "settings.hooksEventTurnStartDesc": "Fires when each model turn begins.",
     "settings.hooksEventMessageStart": "message_start",
-    "settings.hooksEventMessageStartDesc": "Fires when the current turn starts streaming a message.",
+    "settings.hooksEventMessageStartDesc":
+      "Fires when the current turn starts streaming a message.",
     "settings.hooksEventMessageUpdate": "message_update",
-    "settings.hooksEventMessageUpdateDesc": "Fires on every incremental message update in the current turn.",
+    "settings.hooksEventMessageUpdateDesc":
+      "Fires on every incremental message update in the current turn.",
     "settings.hooksEventMessageEnd": "message_end",
-    "settings.hooksEventMessageEndDesc": "Fires when the current turn finishes generating its message.",
+    "settings.hooksEventMessageEndDesc":
+      "Fires when the current turn finishes generating its message.",
     "settings.hooksEventToolExecutionStart": "tool_execution_start",
     "settings.hooksEventToolExecutionStartDesc": "Fires when a tool begins actual execution.",
     "settings.hooksEventToolExecutionUpdate": "tool_execution_update",
diff --git a/crates/agent-gui/src/pages/chat/ChatComposerBar.tsx b/crates/agent-gui/src/pages/chat/ChatComposerBar.tsx
index d77073159..96687775f 100644
--- a/crates/agent-gui/src/pages/chat/ChatComposerBar.tsx
+++ b/crates/agent-gui/src/pages/chat/ChatComposerBar.tsx
@@ -1,17 +1,19 @@
-import {
-  memo,
-  useEffect,
-  useState,
-  type MutableRefObject,
-  type ReactNode,
-} from "react";
-import { Brain, Globe2, Lightbulb, Loader2, Paperclip, Send, Square, X } from "../../components/icons";
-
+import { type MutableRefObject, memo, type ReactNode, useEffect, useState } from "react";
 import {
   MentionComposer,
   type MentionComposerHandle,
   type MentionComposerSkill,
 } from "../../components/chat/MentionComposer";
+import {
+  Brain,
+  Globe2,
+  Lightbulb,
+  Loader2,
+  Paperclip,
+  Send,
+  Square,
+  X,
+} from "../../components/icons";
 import { Button } from "../../components/ui/button";
 import {
   Select,
@@ -25,12 +27,12 @@ import {
   formatUploadedFileSize,
   type PendingUploadedFile,
 } from "../../lib/chat/messages/uploadedFiles";
-import { cn } from "../../lib/shared/utils";
 import {
-  DEFAULT_CHAT_RUNTIME_CONTROLS,
   type ChatRuntimeControls,
+  DEFAULT_CHAT_RUNTIME_CONTROLS,
   type ReasoningLevel,
 } from "../../lib/settings";
+import { cn } from "../../lib/shared/utils";
 
 const REASONING_I18N_KEYS: Record<ReasoningLevel, string> = {
   off: "settings.reasoning.off",
@@ -97,7 +99,8 @@ export const ChatComposerBar = memo(function ChatComposerBar(props: {
   } = props;
   const { t } = useLocale();
   const [composerIsEmpty, setComposerIsEmpty] = useState(true);
-  const uploadDisabled = isInputDisabled || isSending || isUploadingFiles || !isAgentMode || !workdir;
+  const uploadDisabled =
+    isInputDisabled || isSending || isUploadingFiles || !isAgentMode || !workdir;
   const controlsDisabled = isInputDisabled || isSending;
   const thinkingSupported = reasoningOptions.length > 0;
   const sendDisabled =
@@ -114,10 +117,7 @@ export const ChatComposerBar = memo(function ChatComposerBar(props: {
   const webSearchTooltip = t("chat.runtime.webSearchTooltip");
 
   useEffect(() => {
-    if (
-      reasoningOptions.length > 0 &&
-      reasoningOptions.includes(chatRuntimeControls.reasoning)
-    ) {
+    if (reasoningOptions.length > 0 && reasoningOptions.includes(chatRuntimeControls.reasoning)) {
       return;
     }
     if (
@@ -205,10 +205,10 @@ export const ChatComposerBar = memo(function ChatComposerBar(props: {
                     isUploadingFiles
                       ? t("chat.upload.uploading")
                       : !isAgentMode
-                      ? t("chat.upload.onlyInTools")
-                      : !workdir
-                        ? t("chat.upload.requireWorkdir")
-                        : t("chat.upload.selectFiles")
+                        ? t("chat.upload.onlyInTools")
+                        : !workdir
+                          ? t("chat.upload.requireWorkdir")
+                          : t("chat.upload.selectFiles")
                   }
                   className={cn(
                     "composer-toolbar-action relative inline-flex h-8 w-8 shrink-0 items-center justify-center rounded-full outline-hidden transition-colors",
diff --git a/crates/agent-gui/src/pages/chat/ChatHeader.tsx b/crates/agent-gui/src/pages/chat/ChatHeader.tsx
index 4d39b9de1..09fbccb14 100644
--- a/crates/agent-gui/src/pages/chat/ChatHeader.tsx
+++ b/crates/agent-gui/src/pages/chat/ChatHeader.tsx
@@ -1,4 +1,4 @@
-import { memo, useState, type ReactNode } from "react";
+import { memo, useEffect, useRef, type ReactNode, useState } from "react";
 import {
   Check,
   ChevronDown,
@@ -7,6 +7,7 @@ import {
   Moon,
   OpenaiChatgptIcon,
   PanelLeft,
+  Search,
   Settings,
   Sun,
 } from "../../components/icons";
@@ -21,22 +22,12 @@ import {
   DropdownMenuTrigger,
 } from "../../components/ui/dropdown-menu";
 import { useLocale } from "../../i18n";
+import { type ModelOption, parseModelValue } from "../../lib/providers/llm";
+import { type AppSettings, type ProviderId, setSelectedModel } from "../../lib/settings";
 import { cn } from "../../lib/shared/utils";
-import { parseModelValue, type ModelOption } from "../../lib/providers/llm";
-import {
-  setSelectedModel,
-  type AppSettings,
-  type ProviderId,
-} from "../../lib/settings";
 import type { SectionId } from "../settings/types";
 
-function ProviderBrandIcon({
-  type,
-  className,
-}: {
-  type: ProviderId;
-  className?: string;
-}) {
+function ProviderBrandIcon({ type, className }: { type: ProviderId; className?: string }) {
   const cls = cn("h-4 w-4 shrink-0", className);
   if (type === "claude_code") return <ClaudeIcon className={cls} />;
   if (type === "gemini") return <FileTypeGeminiIcon className={cls} />;
@@ -73,6 +64,17 @@ export const ChatHeader = memo(function ChatHeader(props: {
   } = props;
   const { t } = useLocale();
   const [isModelMenuOpen, setIsModelMenuOpen] = useState(false);
+  const [modelSearch, setModelSearch] = useState("");
+  const searchInputRef = useRef<HTMLInputElement>(null);
+
+  useEffect(() => {
+    if (isModelMenuOpen) {
+      setModelSearch("");
+      setTimeout(() => searchInputRef.current?.focus(), 0);
+    }
+  }, [isModelMenuOpen]);
+
+  const normalizedSearch = modelSearch.trim().toLowerCase();
   const groups: {
     name: string;
     providerType: ProviderId;
@@ -126,10 +128,7 @@ export const ChatHeader = memo(function ChatHeader(props: {
           >
             <span className="model-selector-current-label flex min-w-0 items-center gap-1.5 text-left">
               {selectedOption ? (
-                <ProviderBrandIcon
-                  type={selectedOption.providerType}
-                  className="opacity-80"
-                />
+                <ProviderBrandIcon type={selectedOption.providerType} className="opacity-80" />
               ) : null}
               <span className="min-w-0 truncate">{currentModelLabel}</span>
             </span>
@@ -150,22 +149,52 @@ export const ChatHeader = memo(function ChatHeader(props: {
               {t("chat.selectModel")}
             </DropdownMenuLabel>
             <DropdownMenuSeparator className="my-0 bg-border/40" />
-            <div className="max-h-[min(24rem,var(--available-height,24rem))] overflow-y-auto overscroll-contain px-1 pb-1">
+            <div className="px-2 py-1.5">
+              <div className="flex items-center gap-1.5 rounded-md border border-border/50 bg-muted/40 px-2 py-1">
+                <Search className="h-3.5 w-3.5 shrink-0 text-muted-foreground/70" />
+                <input
+                  ref={searchInputRef}
+                  value={modelSearch}
+                  onChange={(e) => setModelSearch(e.target.value)}
+                  placeholder={t("chat.searchModel")}
+                  className="min-w-0 flex-1 bg-transparent text-sm text-foreground outline-none placeholder:text-muted-foreground/60"
+                  onKeyDown={(e) => e.stopPropagation()}
+                />
+              </div>
+            </div>
+            <div className="max-h-[min(20rem,var(--available-height,20rem))] overflow-y-auto overscroll-contain px-1 pb-1">
               {(() => {
                 let animationIndex = 0;
-                return groups.map((group, groupIndex) => (
+                const filteredGroups = normalizedSearch
+                  ? groups
+                      .map((group) => ({
+                        ...group,
+                        opts: group.opts.filter(
+                          (o) =>
+                            o.model.toLowerCase().includes(normalizedSearch) ||
+                            o.providerName.toLowerCase().includes(normalizedSearch),
+                        ),
+                      }))
+                      .filter((g) => g.opts.length > 0)
+                  : groups;
+
+                if (filteredGroups.length === 0) {
+                  return (
+                    <div className="px-2 py-6 text-center text-xs text-muted-foreground">
+                      {t("chat.noModelFound")}
+                    </div>
+                  );
+                }
+
+                return filteredGroups.map((group, groupIndex) => (
                   <div key={group.name}>
-                    {groupIndex > 0 ? (
-                      <DropdownMenuSeparator className="bg-border/30" />
-                    ) : null}
+                    {groupIndex > 0 ? <DropdownMenuSeparator className="bg-border/30" /> : null}
                     <DropdownMenuLabel className="model-selector-group-label sticky top-0 z-10 flex items-center gap-1.5 bg-popover/60 px-2 py-1.5 text-[11px] font-medium uppercase tracking-wider text-muted-foreground/80 backdrop-blur-xl supports-[backdrop-filter]:bg-popover/40 dark:text-white/80">
                       <ProviderBrandIcon
                         type={group.providerType}
                         className="h-3.5 w-3.5 opacity-90"
                       />
-                      <span className="truncate normal-case tracking-normal">
-                        {group.name}
-                      </span>
+                      <span className="truncate normal-case tracking-normal">{group.name}</span>
                     </DropdownMenuLabel>
                     {group.opts.map((option) => {
                       const isSelected = option.value === selectedValue;
@@ -195,9 +224,7 @@ export const ChatHeader = memo(function ChatHeader(props: {
                             />
                             <span className="min-w-0 truncate">{option.model}</span>
                           </span>
-                          {isSelected ? (
-                            <Check className="h-4 w-4 shrink-0 text-primary" />
-                          ) : null}
+                          {isSelected ? <Check className="h-4 w-4 shrink-0 text-primary" /> : null}
                         </DropdownMenuItem>
                       );
                     })}
@@ -215,11 +242,7 @@ export const ChatHeader = memo(function ChatHeader(props: {
           variant="ghost"
           size="icon"
           onClick={onToggleTheme}
-          title={
-            settings.theme === "dark"
-              ? t("tooltip.switchToLight")
-              : t("tooltip.switchToDark")
-          }
+          title={settings.theme === "dark" ? t("tooltip.switchToLight") : t("tooltip.switchToDark")}
           className="h-8 w-8 rounded-lg text-muted-foreground hover:text-foreground"
         >
           {settings.theme === "dark" ? (
diff --git a/crates/agent-gui/src/pages/chat/ChatTranscript.tsx b/crates/agent-gui/src/pages/chat/ChatTranscript.tsx
index 026e78c01..deac608d0 100644
--- a/crates/agent-gui/src/pages/chat/ChatTranscript.tsx
+++ b/crates/agent-gui/src/pages/chat/ChatTranscript.tsx
@@ -1,5 +1,8 @@
+import { useVirtualizer } from "@tanstack/react-virtual";
+import { invoke } from "@tauri-apps/api/core";
 import {
   memo,
+  type RefObject,
   useCallback,
   useEffect,
   useLayoutEffect,
@@ -7,11 +10,9 @@ import {
   useRef,
   useState,
   useSyncExternalStore,
-  type RefObject,
 } from "react";
-import { useVirtualizer } from "@tanstack/react-virtual";
 import iconSimpleUrl from "../../../src-tauri/icons/icon-simple.png";
-import { invoke } from "@tauri-apps/api/core";
+import { ImagePreview, type ImagePreviewSlide } from "../../components/chat/ImagePreview";
 import {
   Check,
   CheckCircle2,
@@ -24,33 +25,26 @@ import {
   Settings,
   X,
 } from "../../components/icons";
-
 import { LiveMarkdown, Markdown } from "../../components/Markdown";
-import { ImagePreview, type ImagePreviewSlide } from "../../components/chat/ImagePreview";
 import { ScrollArea } from "../../components/ui/scroll-area";
 import { useLocale } from "../../i18n";
-import { normalizeLiveToolStatus, VIBING_STATUS } from "../../lib/chat/page/chatPageHelpers";
-import { UserMessageContent } from "../../lib/chat/messages/userMessageContent";
+import type {
+  HistoryMessageRef,
+  RenderSummaryCard,
+  RenderTimelineItem,
+} from "../../lib/chat/conversation/conversationState";
+import type { LiveTranscriptStore } from "../../lib/chat/conversation/liveTranscriptStore";
 import { getRoundText } from "../../lib/chat/messages/uiMessages";
 import {
   formatUploadedFileSize,
-  parsePastedTextDisplayReferences,
   type PendingUploadedFile,
+  parsePastedTextDisplayReferences,
 } from "../../lib/chat/messages/uploadedFiles";
+import { UserMessageContent } from "../../lib/chat/messages/userMessageContent";
+import { normalizeLiveToolStatus, VIBING_STATUS } from "../../lib/chat/page/chatPageHelpers";
 import { cn } from "../../lib/shared/utils";
-import type {
-  HistoryMessageRef,
-  RenderTimelineItem,
-  RenderSummaryCard,
-} from "../../lib/chat/conversation/conversationState";
-import type { LiveTranscriptStore } from "../../lib/chat/conversation/liveTranscriptStore";
 import type { SectionId } from "../settings/types";
-import {
-  AssistantAvatar,
-  AssistantBubble,
-  CompactingText,
-  VibingText,
-} from "./AssistantBubble";
+import { AssistantAvatar, AssistantBubble, CompactingText, VibingText } from "./AssistantBubble";
 
 type UploadedImagePreviewResponse = {
   mimeType: string;
@@ -92,10 +86,7 @@ function resolveScrollAreaViewport(root: HTMLDivElement | null) {
   return root?.querySelector("[data-scroll-viewport]") as HTMLDivElement | null;
 }
 
-async function loadUploadedImagePreview(params: {
-  workspaceRoot: string;
-  absolutePath: string;
-}) {
+async function loadUploadedImagePreview(params: { workspaceRoot: string; absolutePath: string }) {
   const { workspaceRoot, absolutePath } = params;
   const cacheKey = getUploadedImagePreviewCacheKey(workspaceRoot, absolutePath);
   const cached = readUploadedImagePreviewCache(cacheKey);
@@ -131,8 +122,7 @@ async function loadUploadedImagePreview(params: {
 
 function useUploadedImagePreview(absolutePath?: string, workspaceRoot?: string) {
   const normalizedPath = typeof absolutePath === "string" ? absolutePath.trim() : "";
-  const normalizedWorkspaceRoot =
-    typeof workspaceRoot === "string" ? workspaceRoot.trim() : "";
+  const normalizedWorkspaceRoot = typeof workspaceRoot === "string" ? workspaceRoot.trim() : "";
   const cacheKey =
     normalizedPath && normalizedWorkspaceRoot
       ? getUploadedImagePreviewCacheKey(normalizedWorkspaceRoot, normalizedPath)
@@ -214,9 +204,7 @@ function UserImageAttachmentCard({
       title={file.relativePath}
       className={cn(
         "group relative overflow-hidden rounded-xl border border-white/60 bg-white/50 shadow-[0_1px_3px_rgba(0,0,0,0.06),0_1px_2px_rgba(0,0,0,0.04)] backdrop-blur-xl transition-shadow hover:shadow-[0_2px_8px_rgba(0,0,0,0.1)] dark:border-white/[0.12] dark:bg-white/[0.06]",
-        compact
-          ? "min-w-0 basis-[calc(33.333%-5.33px)] grow"
-          : "w-full max-w-[280px]",
+        compact ? "min-w-0 basis-[calc(33.333%-5.33px)] grow" : "w-full max-w-[280px]",
       )}
     >
       {onRemove ? (
@@ -305,9 +293,7 @@ function UserFileAttachmentCard({
       title={file.relativePath}
       className={cn(
         "group relative flex items-center gap-2 rounded-xl border border-white/60 bg-white/50 px-2.5 py-2 text-left shadow-[0_1px_3px_rgba(0,0,0,0.06),0_1px_2px_rgba(0,0,0,0.04)] backdrop-blur-xl transition-shadow hover:shadow-[0_2px_8px_rgba(0,0,0,0.1)] dark:border-white/[0.12] dark:bg-white/[0.06]",
-        compact
-          ? "min-w-0 basis-[calc(33.333%-5.33px)] grow"
-          : "w-full",
+        compact ? "min-w-0 basis-[calc(33.333%-5.33px)] grow" : "w-full",
       )}
     >
       <div className="flex h-8 w-8 shrink-0 items-center justify-center rounded-lg bg-gradient-to-b from-black/[0.03] to-black/[0.06] dark:from-white/[0.06] dark:to-white/[0.1]">
@@ -455,9 +441,7 @@ function splitUserAttachmentsForDisplay(files: PendingUploadedFile[], text: stri
     };
   }
 
-  const pastedTextPaths = new Set(
-    pastedTextReferences.map((reference) => reference.relativePath),
-  );
+  const pastedTextPaths = new Set(pastedTextReferences.map((reference) => reference.relativePath));
   const pastedTextFiles: PendingUploadedFile[] = [];
   const visibleFiles: PendingUploadedFile[] = [];
 
@@ -567,9 +551,7 @@ const SummaryCard = memo(function SummaryCard(props: { item: RenderSummaryCard }
 
   return (
     <div className="flex justify-center px-2">
-      <div
-        className="checkpoint-card w-full max-w-3xl overflow-hidden rounded-[14px] border border-black/[0.06] bg-white/[0.72] shadow-[0_1px_3px_rgba(0,0,0,0.04),0_4px_12px_rgba(0,0,0,0.03)] backdrop-blur-xl dark:border-white/[0.1] dark:bg-white/[0.06] dark:shadow-[0_1px_3px_rgba(0,0,0,0.2),0_4px_12px_rgba(0,0,0,0.15)]"
-      >
+      <div className="checkpoint-card w-full max-w-3xl overflow-hidden rounded-[14px] border border-black/[0.06] bg-white/[0.72] shadow-[0_1px_3px_rgba(0,0,0,0.04),0_4px_12px_rgba(0,0,0,0.03)] backdrop-blur-xl dark:border-white/[0.1] dark:bg-white/[0.06] dark:shadow-[0_1px_3px_rgba(0,0,0,0.2),0_4px_12px_rgba(0,0,0,0.15)]">
         <button
           type="button"
           onClick={() => setExpanded((prev) => !prev)}
@@ -761,10 +743,7 @@ const TranscriptHistory = memo(function TranscriptHistory(props: TranscriptHisto
   const virtualRows = transcriptVirtualizer.getVirtualItems();
 
   return (
-    <div
-      className="relative"
-      style={{ height: transcriptVirtualizer.getTotalSize() }}
-    >
+    <div className="relative" style={{ height: transcriptVirtualizer.getTotalSize() }}>
       {virtualRows.map((virtualRow) => {
         const item = historyItems[virtualRow.index];
         if (!item) return null;
@@ -816,15 +795,9 @@ const TranscriptHistory = memo(function TranscriptHistory(props: TranscriptHisto
                   className={`chat-user-bubble-wrap group relative ml-auto max-w-[min(85%,calc(50em+2rem))] ${compactedClass}`}
                 >
                   <div className="chat-bubble-enter chat-user-bubble rounded-2xl rounded-br-md bg-[hsl(var(--chat-user-bg))] px-4 py-2.5 font-openai-chat text-[14.5px] leading-relaxed text-[hsl(var(--chat-user-fg))]">
-                    <UserAttachmentCards
-                      files={visibleFiles}
-                      workspaceRoot={workspaceRoot}
-                    />
+                    <UserAttachmentCards files={visibleFiles} workspaceRoot={workspaceRoot} />
                     {item.text ? (
-                      <UserMessageContent
-                        text={item.text}
-                        pastedTextFiles={pastedTextFiles}
-                      />
+                      <UserMessageContent text={item.text} pastedTextFiles={pastedTextFiles} />
                     ) : null}
                   </div>
                   <div className="mt-1 flex justify-end gap-0.5 opacity-0 transition-opacity group-hover:opacity-100">
@@ -902,9 +875,7 @@ const TranscriptHistory = memo(function TranscriptHistory(props: TranscriptHisto
   );
 });
 
-const TranscriptLiveState = memo(function TranscriptLiveState(
-  props: TranscriptLiveStateProps,
-) {
+const TranscriptLiveState = memo(function TranscriptLiveState(props: TranscriptLiveStateProps) {
   const {
     isSending,
     isAgentMode,
@@ -1026,94 +997,94 @@ export const ChatTranscript = memo(function ChatTranscript(props: ChatTranscript
     <div className="relative min-h-0 flex-1">
       <ScrollArea ref={scrollAreaRef} className="h-full">
         <div className="mx-auto w-full max-w-[768px] px-5 py-4">
-        {showNoModelsState ? (
-          <div className="flex min-h-[calc(100vh-220px)] flex-col items-center justify-center">
-            <div className="pointer-events-none absolute inset-0 flex items-center justify-center overflow-hidden">
-              <div className="hero-glow-pulse h-[360px] w-[360px] rounded-full bg-[radial-gradient(closest-side,hsl(var(--foreground)/0.08),transparent_70%)] blur-3xl" />
-            </div>
+          {showNoModelsState ? (
+            <div className="flex min-h-[calc(100vh-220px)] flex-col items-center justify-center">
+              <div className="pointer-events-none absolute inset-0 flex items-center justify-center overflow-hidden">
+                <div className="hero-glow-pulse h-[360px] w-[360px] rounded-full bg-[radial-gradient(closest-side,hsl(var(--foreground)/0.08),transparent_70%)] blur-3xl" />
+              </div>
 
-            <div className="relative flex flex-col items-center">
-              <div className="hero-entrance hero-icon-float mb-5 flex h-24 w-24 items-center justify-center">
-                <img
-                  src={iconSimpleUrl}
-                  alt=""
-                  aria-hidden="true"
-                  draggable={false}
-                  className="h-[72px] w-[72px] select-none object-contain"
-                />
+              <div className="relative flex flex-col items-center">
+                <div className="hero-entrance hero-icon-float mb-5 flex h-24 w-24 items-center justify-center">
+                  <img
+                    src={iconSimpleUrl}
+                    alt=""
+                    aria-hidden="true"
+                    draggable={false}
+                    className="h-[72px] w-[72px] select-none object-contain"
+                  />
+                </div>
+                <h2 className="hero-entrance-delay-1 mb-2 bg-gradient-to-b from-foreground to-foreground/65 bg-clip-text text-2xl font-semibold leading-tight tracking-tight text-transparent">
+                  {t("chat.welcome")}
+                </h2>
+                <p className="hero-entrance-delay-2 mb-1 text-sm text-muted-foreground">
+                  {t("chat.noModelSelected")}
+                </p>
+                <p className="hero-entrance-delay-2 mb-7 text-sm text-muted-foreground">
+                  {t("chat.configureModel")}
+                </p>
+                <button
+                  type="button"
+                  onClick={() => onOpenSettings("providers")}
+                  className="hero-entrance-delay-3 group inline-flex items-center gap-2 rounded-full border border-white/70 bg-white/65 px-5 py-2 text-sm font-medium text-foreground/85 shadow-[0_1px_2px_rgba(0,0,0,0.04),0_8px_24px_rgba(0,0,0,0.06),inset_0_1px_0_rgba(255,255,255,0.85)] backdrop-blur-xl transition-all duration-200 hover:-translate-y-[1px] hover:bg-white/80 hover:text-foreground hover:shadow-[0_2px_4px_rgba(0,0,0,0.05),0_12px_32px_rgba(0,0,0,0.08),inset_0_1px_0_rgba(255,255,255,0.9)] active:translate-y-0 active:shadow-[0_1px_2px_rgba(0,0,0,0.04)] dark:border-white/[0.1] dark:bg-white/[0.06] dark:text-foreground/90 dark:shadow-[0_1px_2px_rgba(0,0,0,0.2),0_8px_24px_rgba(0,0,0,0.25),inset_0_1px_0_rgba(255,255,255,0.06)] dark:hover:bg-white/[0.1]"
+                >
+                  <Settings className="h-3.5 w-3.5 text-foreground/55 transition-colors group-hover:text-foreground/80" />
+                  {t("chat.goToSettings")}
+                </button>
               </div>
-              <h2 className="hero-entrance-delay-1 mb-2 bg-gradient-to-b from-foreground to-foreground/65 bg-clip-text text-2xl font-semibold leading-tight tracking-tight text-transparent">
-                {t("chat.welcome")}
-              </h2>
-              <p className="hero-entrance-delay-2 mb-1 text-sm text-muted-foreground">
-                {t("chat.noModelSelected")}
-              </p>
-              <p className="hero-entrance-delay-2 mb-7 text-sm text-muted-foreground">
-                {t("chat.configureModel")}
-              </p>
-              <button
-                type="button"
-                onClick={() => onOpenSettings("providers")}
-                className="hero-entrance-delay-3 group inline-flex items-center gap-2 rounded-full border border-white/70 bg-white/65 px-5 py-2 text-sm font-medium text-foreground/85 shadow-[0_1px_2px_rgba(0,0,0,0.04),0_8px_24px_rgba(0,0,0,0.06),inset_0_1px_0_rgba(255,255,255,0.85)] backdrop-blur-xl transition-all duration-200 hover:-translate-y-[1px] hover:bg-white/80 hover:text-foreground hover:shadow-[0_2px_4px_rgba(0,0,0,0.05),0_12px_32px_rgba(0,0,0,0.08),inset_0_1px_0_rgba(255,255,255,0.9)] active:translate-y-0 active:shadow-[0_1px_2px_rgba(0,0,0,0.04)] dark:border-white/[0.1] dark:bg-white/[0.06] dark:text-foreground/90 dark:shadow-[0_1px_2px_rgba(0,0,0,0.2),0_8px_24px_rgba(0,0,0,0.25),inset_0_1px_0_rgba(255,255,255,0.06)] dark:hover:bg-white/[0.1]"
-              >
-                <Settings className="h-3.5 w-3.5 text-foreground/55 transition-colors group-hover:text-foreground/80" />
-                {t("chat.goToSettings")}
-              </button>
             </div>
-          </div>
-        ) : showStartChatState ? (
-          <div className="flex min-h-[calc(100vh-220px)] flex-col items-center justify-center">
-            <div className="pointer-events-none absolute inset-0 flex items-center justify-center overflow-hidden">
-              <div className="hero-glow-pulse h-[360px] w-[360px] rounded-full bg-[radial-gradient(closest-side,hsl(var(--foreground)/0.08),transparent_70%)] blur-3xl" />
-            </div>
-
-            <div className="relative flex flex-col items-center">
-              <div className="hero-entrance hero-icon-float mb-5 flex h-24 w-24 items-center justify-center">
-                <img
-                  src={iconSimpleUrl}
-                  alt=""
-                  aria-hidden="true"
-                  draggable={false}
-                  className="h-[72px] w-[72px] select-none object-contain"
-                />
+          ) : showStartChatState ? (
+            <div className="flex min-h-[calc(100vh-220px)] flex-col items-center justify-center">
+              <div className="pointer-events-none absolute inset-0 flex items-center justify-center overflow-hidden">
+                <div className="hero-glow-pulse h-[360px] w-[360px] rounded-full bg-[radial-gradient(closest-side,hsl(var(--foreground)/0.08),transparent_70%)] blur-3xl" />
               </div>
 
-              <h2 className="hero-entrance-delay-1 mb-2 bg-gradient-to-b from-foreground to-foreground/65 bg-clip-text text-2xl font-semibold leading-tight tracking-tight text-transparent">
-                {t("chat.startChat")}
-              </h2>
+              <div className="relative flex flex-col items-center">
+                <div className="hero-entrance hero-icon-float mb-5 flex h-24 w-24 items-center justify-center">
+                  <img
+                    src={iconSimpleUrl}
+                    alt=""
+                    aria-hidden="true"
+                    draggable={false}
+                    className="h-[72px] w-[72px] select-none object-contain"
+                  />
+                </div>
+
+                <h2 className="hero-entrance-delay-1 mb-2 bg-gradient-to-b from-foreground to-foreground/65 bg-clip-text text-2xl font-semibold leading-tight tracking-tight text-transparent">
+                  {t("chat.startChat")}
+                </h2>
 
-              <p className="hero-entrance-delay-2 max-w-[280px] text-center text-sm leading-relaxed text-muted-foreground">
-                {t("chat.startChatDesc")}
-              </p>
+                <p className="hero-entrance-delay-2 max-w-[280px] text-center text-sm leading-relaxed text-muted-foreground">
+                  {t("chat.startChatDesc")}
+                </p>
+              </div>
             </div>
-          </div>
-        ) : null}
+          ) : null}
 
-        <div className="space-y-6">
-          <TranscriptHistory
-            conversationId={conversationId}
-            workspaceRoot={workspaceRoot}
-            scrollViewport={scrollViewport}
-            historyItems={historyItems}
-            showUsage={showUsage}
-            usageContextWindow={usageContextWindow}
-            copiedMessageKey={copiedMessageKey}
-            setCopiedMessageKey={setCopiedMessageKey}
-            onResendFromEdit={onResendFromEdit}
-            isSending={isSending}
-          />
+          <div className="space-y-6">
+            <TranscriptHistory
+              conversationId={conversationId}
+              workspaceRoot={workspaceRoot}
+              scrollViewport={scrollViewport}
+              historyItems={historyItems}
+              showUsage={showUsage}
+              usageContextWindow={usageContextWindow}
+              copiedMessageKey={copiedMessageKey}
+              setCopiedMessageKey={setCopiedMessageKey}
+              onResendFromEdit={onResendFromEdit}
+              isSending={isSending}
+            />
 
-          <TranscriptLiveState
-            isSending={isSending}
-            isAgentMode={isAgentMode}
-            showUsage={showUsage}
-            usageContextWindow={usageContextWindow}
-            liveTranscriptStore={liveTranscriptStore}
-            isCompactionRunning={isCompactionRunning}
-          />
-        </div>
+            <TranscriptLiveState
+              isSending={isSending}
+              isAgentMode={isAgentMode}
+              showUsage={showUsage}
+              usageContextWindow={usageContextWindow}
+              liveTranscriptStore={liveTranscriptStore}
+              isCompactionRunning={isCompactionRunning}
+            />
+          </div>
 
-        <div ref={bottomRef} className={shouldReserveTranscriptBottomSpace ? "h-48" : "h-0"} />
+          <div ref={bottomRef} className={shouldReserveTranscriptBottomSpace ? "h-48" : "h-0"} />
         </div>
       </ScrollArea>
       {isHistorySwitching ? <HistorySwitchLoadingOverlay /> : null}
diff --git a/crates/agent-gui/src/pages/settings/MemoryPanel.tsx b/crates/agent-gui/src/pages/settings/MemoryPanel.tsx
index c111c41cf..98ce106f2 100644
--- a/crates/agent-gui/src/pages/settings/MemoryPanel.tsx
+++ b/crates/agent-gui/src/pages/settings/MemoryPanel.tsx
@@ -1,12 +1,12 @@
+import { Select as SelectPrimitive } from "@base-ui/react";
 import { useEffect, useMemo, useRef, useState } from "react";
 import { createPortal } from "react-dom";
-import { Select as SelectPrimitive } from "@base-ui/react";
 import {
   AlertTriangle,
+  BookOpen,
   Brain,
   BrushCleaning,
   Check,
-  BookOpen,
   ChevronDown,
   Folder,
   Globe2,
@@ -18,28 +18,26 @@ import {
   Trash2,
   X,
 } from "../../components/icons";
-
+import { pokeMemoryOrganizerRunner } from "../../components/memory/MemoryOrganizerRunner";
 import { Button } from "../../components/ui/button";
 import { Input } from "../../components/ui/input";
 import { useLocale } from "../../i18n";
 import { buildModelOptions } from "../../lib/chat/page/chatPageHelpers";
-import {
-  computeNextMemoryOrganizerRunAt,
-  updateMemorySettings,
-  type AppSettings,
-  type MemoryOrganizerFrequency,
-  type MemoryOrganizerMode,
-  type MemoryOrganizerScope,
-} from "../../lib/settings";
-import { parseModelValue, toModelValue } from "../../lib/providers/llm";
 import {
   formatMemoryError,
+  type MemoryListResponse,
+  type MemoryMeta,
+  type MemoryOrganizeRun,
+  type MemoryOrganizeRunStatus,
+  type MemoryPathsInfo,
+  type MemoryReadResponse,
+  type MemoryType,
   memoryAccept,
   memoryApplyBatch,
   memoryDelete,
   memoryList,
-  memoryOrganizeRunCreate,
   memoryOrganizeRunClearHistory,
+  memoryOrganizeRunCreate,
   memoryOrganizeRunList,
   memoryOrganizeRunRead,
   memoryOrganizeRunUpdate,
@@ -48,16 +46,8 @@ import {
   memoryUpdate,
   memoryWipeAll,
   memoryWrite,
-  type MemoryListResponse,
-  type MemoryMeta,
-  type MemoryOrganizeRun,
-  type MemoryOrganizeRunStatus,
-  type MemoryPathsInfo,
-  type MemoryReadResponse,
-  type MemoryType,
 } from "../../lib/memory/api";
 import {
-  ORGANIZER_PROTOCOL_VERSION,
   appliedBatchCount,
   buildManualApplyState,
   buildReviewItemsForBatch,
@@ -66,6 +56,9 @@ import {
   failedDecisionKeysFromReviewItems,
   inferOrganizerDecisionGroupIds,
   isDefaultSelectedOrganizerDecision,
+  ORGANIZER_PROTOCOL_VERSION,
+  type OrganizerReviewItem,
+  type OrganizerSafeDecision,
   organizerDecisionKey,
   protocolManualApplyState,
   protocolObject,
@@ -74,10 +67,16 @@ import {
   protocolStringArray,
   reviewItemsFromProtocol,
   successfulDecisionKeys,
-  type OrganizerReviewItem,
-  type OrganizerSafeDecision,
 } from "../../lib/memory/organizerProtocol";
-import { pokeMemoryOrganizerRunner } from "../../components/memory/MemoryOrganizerRunner";
+import { parseModelValue, toModelValue } from "../../lib/providers/llm";
+import {
+  type AppSettings,
+  computeNextMemoryOrganizerRunAt,
+  type MemoryOrganizerFrequency,
+  type MemoryOrganizerMode,
+  type MemoryOrganizerScope,
+  updateMemorySettings,
+} from "../../lib/settings";
 import { AgentActivationSwitch } from "./shared";
 
 type MemoryTab = "global" | "project" | "journal";
@@ -155,14 +154,14 @@ function DrawerSelect(props: {
   return (
     <SelectPrimitive.Root
       value={value}
-      onValueChange={(v) => { if (v != null) onValueChange(v as string); }}
+      onValueChange={(v) => {
+        if (v != null) onValueChange(v as string);
+      }}
       disabled={disabled}
     >
       <SelectPrimitive.Trigger aria-label={ariaLabel} className={triggerClass}>
         <span className="min-w-0 flex-1 truncate text-left">
-          <SelectPrimitive.Value>
-            {selected ? selected.label : placeholder}
-          </SelectPrimitive.Value>
+          <SelectPrimitive.Value>{selected ? selected.label : placeholder}</SelectPrimitive.Value>
         </span>
         <SelectPrimitive.Icon>
           <ChevronDown className="h-3.5 w-3.5 shrink-0 text-muted-foreground/70 transition-transform duration-200 ease-out group-data-[open]/drawer-select:rotate-180" />
@@ -247,15 +246,11 @@ function dailyTitle(entry: { slug: string; dateLocal?: string | null }) {
 }
 
 function entryTitle(entry: MemoryMeta) {
-  return entry.memoryType === "daily"
-    ? dailyTitle(entry)
-    : entry.description || entry.slug;
+  return entry.memoryType === "daily" ? dailyTitle(entry) : entry.description || entry.slug;
 }
 
 function selectedTitle(entry: MemoryReadResponse) {
-  return entry.memoryType === "daily"
-    ? dailyTitle(entry)
-    : entry.description || entry.slug;
+  return entry.memoryType === "daily" ? dailyTitle(entry) : entry.description || entry.slug;
 }
 
 function entryKey(entry: MemoryMeta) {
@@ -288,9 +283,7 @@ function memoryTypeLabel(
 }
 
 function memoryScopeLabel(scope: MemoryMeta["scope"], t: (key: string) => string) {
-  return scope === "project"
-    ? t("settings.memoryScopeProject")
-    : t("settings.memoryScopeGlobal");
+  return scope === "project" ? t("settings.memoryScopeProject") : t("settings.memoryScopeGlobal");
 }
 
 function organizerStatusLabel(status: MemoryOrganizeRunStatus, t: (key: string) => string) {
@@ -343,10 +336,7 @@ function isOrganizerRunActive(run: Pick<MemoryOrganizeRun, "status"> | null | un
   return run?.status === "pending" || run?.status === "running";
 }
 
-function organizerRiskLabel(
-  risk: OrganizerSafeDecision["riskLevel"],
-  t: (key: string) => string,
-) {
+function organizerRiskLabel(risk: OrganizerSafeDecision["riskLevel"], t: (key: string) => string) {
   if (risk === "high") return t("settings.memoryOrganizerRiskHigh");
   if (risk === "medium") return t("settings.memoryOrganizerRiskMedium");
   return t("settings.memoryOrganizerRiskLow");
@@ -691,7 +681,8 @@ function MemoryOrganizerHistoryModal(props: {
       const failedKeySet = new Set(failedDecisionKeys);
       const safeDecisionsForProtocol = parsedSafeDecisions.map((decision, index) => {
         const key = organizerDecisionKey(decision, index);
-        const grouped = selectedWithGroupedKeys.find((item) => item.key === key)?.decision ?? decision;
+        const grouped =
+          selectedWithGroupedKeys.find((item) => item.key === key)?.decision ?? decision;
         if (failedKeySet.has(key)) return { ...grouped, applyStatus: "failed" as const };
         if (appliedKeySet.has(key)) return { ...grouped, applyStatus: "applied" as const };
         return grouped;
@@ -757,381 +748,396 @@ function MemoryOrganizerHistoryModal(props: {
       >
         <div className="absolute inset-0 bg-black/60 backdrop-blur-sm" onClick={onClose} />
         <div className="relative z-10 flex h-[min(760px,calc(100vh-2rem))] w-full max-w-6xl flex-col overflow-hidden rounded-xl border bg-background shadow-2xl">
-        <div className="flex items-center justify-between gap-3 border-b border-border/50 px-5 py-4">
-          <div className="min-w-0">
-            <div id="memory-organizer-history-title" className="text-sm font-semibold">
-              {t("settings.memoryOrganizerHistory")}
-            </div>
-            <div className="mt-1 text-xs text-muted-foreground">
-              {t("settings.memoryOrganizerHistoryDescription")}
+          <div className="flex items-center justify-between gap-3 border-b border-border/50 px-5 py-4">
+            <div className="min-w-0">
+              <div id="memory-organizer-history-title" className="text-sm font-semibold">
+                {t("settings.memoryOrganizerHistory")}
+              </div>
+              <div className="mt-1 text-xs text-muted-foreground">
+                {t("settings.memoryOrganizerHistoryDescription")}
+              </div>
             </div>
+            <button
+              type="button"
+              onClick={onClose}
+              className="flex h-8 w-8 shrink-0 items-center justify-center rounded-full text-muted-foreground transition-colors hover:bg-muted/70 hover:text-foreground"
+              title={t("settings.memorySettingsClose")}
+              aria-label={t("settings.memorySettingsClose")}
+            >
+              <X className="h-4 w-4" />
+            </button>
           </div>
-          <button
-            type="button"
-            onClick={onClose}
-            className="flex h-8 w-8 shrink-0 items-center justify-center rounded-full text-muted-foreground transition-colors hover:bg-muted/70 hover:text-foreground"
-            title={t("settings.memorySettingsClose")}
-            aria-label={t("settings.memorySettingsClose")}
-          >
-            <X className="h-4 w-4" />
-          </button>
-        </div>
 
-        <div className="grid min-h-0 flex-1 grid-cols-[280px_minmax(0,1fr)]">
-          <aside className="flex min-h-0 flex-col border-r border-border/50">
-            <div className="space-y-2 border-b border-border/40 p-3">
-              <div className="flex items-center gap-2">
-                <div className="min-w-0 flex-1">
-                  <DrawerSelect
-                    value={statusFilter}
-                    onValueChange={(next) =>
-                      setStatusFilter(next as "all" | MemoryOrganizeRunStatus)
-                    }
-                    ariaLabel={t("settings.memoryOrganizerHistoryAll")}
-                    options={[
-                      { value: "all", label: t("settings.memoryOrganizerHistoryAll") },
-                      { value: "succeeded", label: t("settings.memoryOrganizerStatusSucceeded") },
-                      { value: "failed", label: t("settings.memoryOrganizerStatusFailed") },
-                      { value: "skipped", label: t("settings.memoryOrganizerStatusSkipped") },
-                      { value: "running", label: t("settings.memoryOrganizerStatusRunning") },
-                    ]}
-                  />
+          <div className="grid min-h-0 flex-1 grid-cols-[280px_minmax(0,1fr)]">
+            <aside className="flex min-h-0 flex-col border-r border-border/50">
+              <div className="space-y-2 border-b border-border/40 p-3">
+                <div className="flex items-center gap-2">
+                  <div className="min-w-0 flex-1">
+                    <DrawerSelect
+                      value={statusFilter}
+                      onValueChange={(next) =>
+                        setStatusFilter(next as "all" | MemoryOrganizeRunStatus)
+                      }
+                      ariaLabel={t("settings.memoryOrganizerHistoryAll")}
+                      options={[
+                        { value: "all", label: t("settings.memoryOrganizerHistoryAll") },
+                        { value: "succeeded", label: t("settings.memoryOrganizerStatusSucceeded") },
+                        { value: "failed", label: t("settings.memoryOrganizerStatusFailed") },
+                        { value: "skipped", label: t("settings.memoryOrganizerStatusSkipped") },
+                        { value: "running", label: t("settings.memoryOrganizerStatusRunning") },
+                      ]}
+                    />
+                  </div>
+                  <Button
+                    type="button"
+                    variant="outline"
+                    size="icon"
+                    className="shrink-0 text-muted-foreground hover:text-destructive"
+                    title={t("settings.memoryOrganizerClearHistory")}
+                    aria-label={t("settings.memoryOrganizerClearHistory")}
+                    onClick={() => setClearConfirmOpen(true)}
+                    disabled={loading || clearingHistory || runs.length === 0}
+                  >
+                    <BrushCleaning className="h-3.5 w-3.5" />
+                  </Button>
                 </div>
                 <Button
                   type="button"
                   variant="outline"
-                  size="icon"
-                  className="shrink-0 text-muted-foreground hover:text-destructive"
-                  title={t("settings.memoryOrganizerClearHistory")}
-                  aria-label={t("settings.memoryOrganizerClearHistory")}
-                  onClick={() => setClearConfirmOpen(true)}
-                  disabled={loading || clearingHistory || runs.length === 0}
+                  size="sm"
+                  className="w-full"
+                  onClick={() => reload()}
+                  disabled={loading}
                 >
-                  <BrushCleaning className="h-3.5 w-3.5" />
+                  <RefreshCw className={`h-3.5 w-3.5 ${loading ? "animate-spin" : ""}`} />
+                  {t("settings.memoryRefresh")}
                 </Button>
               </div>
-              <Button
-                type="button"
-                variant="outline"
-                size="sm"
-                className="w-full"
-                onClick={() => reload()}
-                disabled={loading}
-              >
-                <RefreshCw className={`h-3.5 w-3.5 ${loading ? "animate-spin" : ""}`} />
-                {t("settings.memoryRefresh")}
-              </Button>
-            </div>
-            <div className="min-h-0 flex-1 overflow-auto p-2">
-              {runs.length === 0 ? (
-                <div className="rounded-lg border border-dashed border-border/60 px-3 py-8 text-center text-xs text-muted-foreground">
-                  {t("settings.memoryOrganizerHistoryEmpty")}
+              <div className="min-h-0 flex-1 overflow-auto p-2">
+                {runs.length === 0 ? (
+                  <div className="rounded-lg border border-dashed border-border/60 px-3 py-8 text-center text-xs text-muted-foreground">
+                    {t("settings.memoryOrganizerHistoryEmpty")}
+                  </div>
+                ) : (
+                  <div className="space-y-1.5">
+                    {runs.map((run) => {
+                      const active = selectedRun?.runId === run.runId;
+                      return (
+                        <button
+                          key={run.runId}
+                          type="button"
+                          onClick={() => reload(run.runId)}
+                          className={`w-full rounded-lg border px-3 py-2.5 text-left transition-colors ${
+                            active
+                              ? "border-primary/50 bg-primary/5"
+                              : "border-border/50 bg-background/70 hover:bg-muted/35"
+                          }`}
+                        >
+                          <div className="flex items-center justify-between gap-2">
+                            <span
+                              className={`rounded border px-1.5 py-0.5 text-[10px] ${organizerStatusClass(run.status)}`}
+                            >
+                              {organizerStatusLabel(run.status, t)}
+                            </span>
+                            <span className="text-[10px] text-muted-foreground">
+                              {organizerTriggerLabel(run.trigger, t)}
+                            </span>
+                          </div>
+                          <div className="mt-1 truncate text-xs font-medium">
+                            {run.finalSummary ||
+                              run.error ||
+                              t("settings.memoryOrganizerHistoryPending")}
+                          </div>
+                          <div className="mt-1 truncate text-[11px] text-muted-foreground">
+                            {formatTime(run.startedAt || run.createdAt)} · {modelNameFromRun(run)}
+                          </div>
+                        </button>
+                      );
+                    })}
+                  </div>
+                )}
+              </div>
+            </aside>
+
+            <section className="min-h-0 overflow-auto p-5">
+              {error ? (
+                <div className="mb-4 whitespace-pre-wrap rounded-lg border border-destructive/20 bg-destructive/[0.05] px-3 py-2 text-xs text-destructive">
+                  {error}
                 </div>
-              ) : (
-                <div className="space-y-1.5">
-                  {runs.map((run) => {
-                    const active = selectedRun?.runId === run.runId;
-                    return (
-                      <button
-                        key={run.runId}
-                        type="button"
-                        onClick={() => reload(run.runId)}
-                        className={`w-full rounded-lg border px-3 py-2.5 text-left transition-colors ${
-                          active
-                            ? "border-primary/50 bg-primary/5"
-                            : "border-border/50 bg-background/70 hover:bg-muted/35"
-                        }`}
-                      >
-                        <div className="flex items-center justify-between gap-2">
-                          <span
-                            className={`rounded border px-1.5 py-0.5 text-[10px] ${organizerStatusClass(run.status)}`}
-                          >
-                            {organizerStatusLabel(run.status, t)}
-                          </span>
-                          <span className="text-[10px] text-muted-foreground">
-                            {organizerTriggerLabel(run.trigger, t)}
-                          </span>
-                        </div>
-                        <div className="mt-1 truncate text-xs font-medium">
-                          {run.finalSummary || run.error || t("settings.memoryOrganizerHistoryPending")}
-                        </div>
-                        <div className="mt-1 truncate text-[11px] text-muted-foreground">
-                          {formatTime(run.startedAt || run.createdAt)} · {modelNameFromRun(run)}
-                        </div>
-                      </button>
-                    );
-                  })}
+              ) : null}
+              {historyFeedback ? (
+                <div className="mb-4 rounded-lg border border-emerald-500/20 bg-emerald-500/[0.05] px-3 py-2 text-xs text-emerald-700 dark:text-emerald-300">
+                  {historyFeedback}
                 </div>
-              )}
-            </div>
-          </aside>
-
-          <section className="min-h-0 overflow-auto p-5">
-            {error ? (
-              <div className="mb-4 whitespace-pre-wrap rounded-lg border border-destructive/20 bg-destructive/[0.05] px-3 py-2 text-xs text-destructive">
-                {error}
-              </div>
-            ) : null}
-            {historyFeedback ? (
-              <div className="mb-4 rounded-lg border border-emerald-500/20 bg-emerald-500/[0.05] px-3 py-2 text-xs text-emerald-700 dark:text-emerald-300">
-                {historyFeedback}
-              </div>
-            ) : null}
-            {selectedRun ? (
-              <div className="space-y-4">
-                <div className="flex flex-wrap items-start justify-between gap-3">
-                  <div className="min-w-0 space-y-1">
-                    <div className="flex flex-wrap items-center gap-2">
-                      <span
-                        className={`rounded border px-2 py-1 text-xs ${organizerStatusClass(selectedRun.status)}`}
-                      >
-                        {organizerStatusLabel(selectedRun.status, t)}
+              ) : null}
+              {selectedRun ? (
+                <div className="space-y-4">
+                  <div className="flex flex-wrap items-start justify-between gap-3">
+                    <div className="min-w-0 space-y-1">
+                      <div className="flex flex-wrap items-center gap-2">
+                        <span
+                          className={`rounded border px-2 py-1 text-xs ${organizerStatusClass(selectedRun.status)}`}
+                        >
+                          {organizerStatusLabel(selectedRun.status, t)}
+                        </span>
+                        <span className="rounded border border-border/60 px-2 py-1 text-xs text-muted-foreground">
+                          {organizerTriggerLabel(selectedRun.trigger, t)}
+                        </span>
+                        <span className="rounded border border-border/60 px-2 py-1 text-xs text-muted-foreground">
+                          {selectedRun.scope} / {selectedRun.mode}
+                        </span>
+                      </div>
+                      <div className="font-mono text-[11px] text-muted-foreground">
+                        {selectedRun.runId}
+                      </div>
+                    </div>
+                    <div className="grid shrink-0 grid-cols-[auto_minmax(9rem,auto)] gap-x-2 gap-y-1 rounded-md border border-border/50 bg-background/70 px-3 py-2 text-xs text-muted-foreground">
+                      <span className="whitespace-nowrap">
+                        {t("settings.memoryOrganizerStarted")}
                       </span>
-                      <span className="rounded border border-border/60 px-2 py-1 text-xs text-muted-foreground">
-                        {organizerTriggerLabel(selectedRun.trigger, t)}
+                      <span className="whitespace-nowrap text-right font-mono text-foreground/80">
+                        {formatTime(selectedRun.startedAt || selectedRun.createdAt)}
                       </span>
-                      <span className="rounded border border-border/60 px-2 py-1 text-xs text-muted-foreground">
-                        {selectedRun.scope} / {selectedRun.mode}
+                      <span className="whitespace-nowrap">
+                        {t("settings.memoryOrganizerFinished")}
+                      </span>
+                      <span className="whitespace-nowrap text-right font-mono text-foreground/80">
+                        {selectedRun.finishedAt ? formatTime(selectedRun.finishedAt) : "-"}
                       </span>
                     </div>
-                    <div className="font-mono text-[11px] text-muted-foreground">
-                      {selectedRun.runId}
-                    </div>
-                  </div>
-                  <div className="grid shrink-0 grid-cols-[auto_minmax(9rem,auto)] gap-x-2 gap-y-1 rounded-md border border-border/50 bg-background/70 px-3 py-2 text-xs text-muted-foreground">
-                    <span className="whitespace-nowrap">{t("settings.memoryOrganizerStarted")}</span>
-                    <span className="whitespace-nowrap text-right font-mono text-foreground/80">
-                      {formatTime(selectedRun.startedAt || selectedRun.createdAt)}
-                    </span>
-                    <span className="whitespace-nowrap">{t("settings.memoryOrganizerFinished")}</span>
-                    <span className="whitespace-nowrap text-right font-mono text-foreground/80">
-                      {selectedRun.finishedAt ? formatTime(selectedRun.finishedAt) : "-"}
-                    </span>
                   </div>
-                </div>
 
-                <div className="rounded-lg border border-border/60 bg-muted/15 p-4">
-                  <div className="mb-2 text-xs font-semibold text-muted-foreground">
-                    {t("settings.memoryOrganizerFinalSummary")}
-                  </div>
-                  <div className="whitespace-pre-wrap text-sm leading-relaxed">
-                    {displayedFinalSummary(selectedRun, manualApplyDisplay) ||
-                      t("settings.memoryOrganizerHistoryPending")}
+                  <div className="rounded-lg border border-border/60 bg-muted/15 p-4">
+                    <div className="mb-2 text-xs font-semibold text-muted-foreground">
+                      {t("settings.memoryOrganizerFinalSummary")}
+                    </div>
+                    <div className="whitespace-pre-wrap text-sm leading-relaxed">
+                      {displayedFinalSummary(selectedRun, manualApplyDisplay) ||
+                        t("settings.memoryOrganizerHistoryPending")}
+                    </div>
                   </div>
-                </div>
 
-                <div className="grid gap-2 sm:grid-cols-4">
-                  {[
-                    ["settings.memoryOrganizerInputCount", selectedRun.inputCount],
-                    ["settings.memoryOrganizerClusterCount", selectedRun.clusterCount],
-                    ["settings.memoryOrganizerSafeApplied", selectedRun.safeApplied],
-                    ["settings.memoryOrganizerReviewSkipped", selectedRun.reviewSkipped],
-                    ["settings.memoryOrganizerCreatedCount", selectedRun.createdCount],
-                    ["settings.memoryOrganizerUpdatedCount", selectedRun.updatedCount],
-                    ["settings.memoryOrganizerDeletedCount", selectedRun.deletedCount],
-                    ["settings.memoryOrganizerParseFailures", selectedRun.parseFailures],
-                  ].map(([key, value]) => (
-                    <div key={key} className="rounded-lg border border-border/50 bg-background/70 p-3">
-                      <div className="text-[11px] text-muted-foreground">{t(String(key))}</div>
-                      <div className="mt-1 text-lg font-semibold">{value}</div>
-                    </div>
-                  ))}
-                </div>
+                  <div className="grid gap-2 sm:grid-cols-4">
+                    {[
+                      ["settings.memoryOrganizerInputCount", selectedRun.inputCount],
+                      ["settings.memoryOrganizerClusterCount", selectedRun.clusterCount],
+                      ["settings.memoryOrganizerSafeApplied", selectedRun.safeApplied],
+                      ["settings.memoryOrganizerReviewSkipped", selectedRun.reviewSkipped],
+                      ["settings.memoryOrganizerCreatedCount", selectedRun.createdCount],
+                      ["settings.memoryOrganizerUpdatedCount", selectedRun.updatedCount],
+                      ["settings.memoryOrganizerDeletedCount", selectedRun.deletedCount],
+                      ["settings.memoryOrganizerParseFailures", selectedRun.parseFailures],
+                    ].map(([key, value]) => (
+                      <div
+                        key={key}
+                        className="rounded-lg border border-border/50 bg-background/70 p-3"
+                      >
+                        <div className="text-[11px] text-muted-foreground">{t(String(key))}</div>
+                        <div className="mt-1 text-lg font-semibold">{value}</div>
+                      </div>
+                    ))}
+                  </div>
 
-                {safeDecisions.length > 0 ? (
-                  <div className="rounded-lg border border-border/60 p-4">
-                    <div className="flex flex-wrap items-center justify-between gap-3">
-                      <div>
-                        <div className="text-xs font-semibold text-muted-foreground">
-                          {t("settings.memoryOrganizerManualPreview")}
-                        </div>
-                        <div className="mt-1 text-xs text-muted-foreground">
-                          {manualApplyDisplay.status === "applied"
-                            ? t("settings.memoryOrganizerApplied")
-                            : manualApplyDisplay.status === "partial"
-                              ? t("settings.memoryOrganizerPartiallyApplied")
-                              : manualApplyDisplay.status === "failed"
-                                ? t("settings.memoryOrganizerApplyFailed")
-                                : t("settings.memoryOrganizerManualPreviewDescription")}
+                  {safeDecisions.length > 0 ? (
+                    <div className="rounded-lg border border-border/60 p-4">
+                      <div className="flex flex-wrap items-center justify-between gap-3">
+                        <div>
+                          <div className="text-xs font-semibold text-muted-foreground">
+                            {t("settings.memoryOrganizerManualPreview")}
+                          </div>
+                          <div className="mt-1 text-xs text-muted-foreground">
+                            {manualApplyDisplay.status === "applied"
+                              ? t("settings.memoryOrganizerApplied")
+                              : manualApplyDisplay.status === "partial"
+                                ? t("settings.memoryOrganizerPartiallyApplied")
+                                : manualApplyDisplay.status === "failed"
+                                  ? t("settings.memoryOrganizerApplyFailed")
+                                  : t("settings.memoryOrganizerManualPreviewDescription")}
+                          </div>
                         </div>
-                      </div>
-                      {canApplyManualPreview ? (
-                        <Button
-                          type="button"
-                          size="sm"
-                          onClick={applyManualPreview}
-                          disabled={applyingPreview}
-                        >
-                          <Check className="h-3.5 w-3.5" />
-                          {t("settings.memoryOrganizerApplySelected")}
-                        </Button>
-                      ) : null}
-                    </div>
-                    <div className="mt-3 space-y-2">
-                      {safeDecisions.map((decision, index) => {
-                        const key = organizerDecisionKey(decision, index);
-                        const checked =
-                          manualApplyDisplay.status && manualApplyDisplay.status !== "pending"
-                            ? manualApplyDisplay.appliedDecisionKeys.size === 0
-                              ? decision.applyStatus !== "failed"
-                              : manualApplyDisplay.appliedDecisionKeys.has(key)
-                            : selectedDecisionKeys.has(key);
-                        return (
-                          <label
-                            key={key}
-                            className="flex gap-3 rounded-md border border-border/50 bg-background/70 p-3 text-xs"
+                        {canApplyManualPreview ? (
+                          <Button
+                            type="button"
+                            size="sm"
+                            onClick={applyManualPreview}
+                            disabled={applyingPreview}
                           >
-                            <input
-                              type="checkbox"
-                              className="mt-0.5 h-4 w-4 shrink-0"
-                              checked={checked}
-                              disabled={!canApplyManualPreview || applyingPreview}
-                              onChange={() => togglePreviewDecision(key)}
-                            />
-                            <span className="min-w-0 flex-1">
-                              <span className="flex flex-wrap items-center gap-2">
-                                <span className="rounded border border-border/60 px-1.5 py-0.5 text-[10px] uppercase text-muted-foreground">
-                                  {decision.op === "delete"
-                                    ? t("settings.memoryOrganizerDecisionDelete")
-                                    : t("settings.memoryOrganizerDecisionUpsert")}
-                                </span>
-                                <span className="font-mono text-[11px]">{decision.slug}</span>
-                                {decision.scope ? (
-                                  <span className="text-[11px] text-muted-foreground">
-                                    {decision.scope}
-                                    {decision.workdirHash ? `:${decision.workdirHash}` : ""}
+                            <Check className="h-3.5 w-3.5" />
+                            {t("settings.memoryOrganizerApplySelected")}
+                          </Button>
+                        ) : null}
+                      </div>
+                      <div className="mt-3 space-y-2">
+                        {safeDecisions.map((decision, index) => {
+                          const key = organizerDecisionKey(decision, index);
+                          const checked =
+                            manualApplyDisplay.status && manualApplyDisplay.status !== "pending"
+                              ? manualApplyDisplay.appliedDecisionKeys.size === 0
+                                ? decision.applyStatus !== "failed"
+                                : manualApplyDisplay.appliedDecisionKeys.has(key)
+                              : selectedDecisionKeys.has(key);
+                          return (
+                            <label
+                              key={key}
+                              className="flex gap-3 rounded-md border border-border/50 bg-background/70 p-3 text-xs"
+                            >
+                              <input
+                                type="checkbox"
+                                className="mt-0.5 h-4 w-4 shrink-0"
+                                checked={checked}
+                                disabled={!canApplyManualPreview || applyingPreview}
+                                onChange={() => togglePreviewDecision(key)}
+                              />
+                              <span className="min-w-0 flex-1">
+                                <span className="flex flex-wrap items-center gap-2">
+                                  <span className="rounded border border-border/60 px-1.5 py-0.5 text-[10px] uppercase text-muted-foreground">
+                                    {decision.op === "delete"
+                                      ? t("settings.memoryOrganizerDecisionDelete")
+                                      : t("settings.memoryOrganizerDecisionUpsert")}
                                   </span>
-                                ) : null}
-                                <span
-                                  className={`rounded border px-1.5 py-0.5 text-[10px] ${organizerRiskClass(decision.riskLevel)}`}
-                                >
-                                  {organizerRiskLabel(decision.riskLevel, t)}
-                                </span>
-                                {decision.confidence != null ? (
-                                  <span className="rounded border border-border/60 px-1.5 py-0.5 text-[10px] text-muted-foreground">
-                                    {t("settings.memoryOrganizerConfidence")}{" "}
-                                    {decision.confidence.toFixed(2)}
+                                  <span className="font-mono text-[11px]">{decision.slug}</span>
+                                  {decision.scope ? (
+                                    <span className="text-[11px] text-muted-foreground">
+                                      {decision.scope}
+                                      {decision.workdirHash ? `:${decision.workdirHash}` : ""}
+                                    </span>
+                                  ) : null}
+                                  <span
+                                    className={`rounded border px-1.5 py-0.5 text-[10px] ${organizerRiskClass(decision.riskLevel)}`}
+                                  >
+                                    {organizerRiskLabel(decision.riskLevel, t)}
                                   </span>
-                                ) : null}
-                                {decision.requiresUserAck ? (
-                                  <span className="rounded border border-amber-500/30 bg-amber-500/[0.06] px-1.5 py-0.5 text-[10px] text-amber-700 dark:text-amber-300">
-                                    {t("settings.memoryOrganizerRequiresAck")}
+                                  {decision.confidence != null ? (
+                                    <span className="rounded border border-border/60 px-1.5 py-0.5 text-[10px] text-muted-foreground">
+                                      {t("settings.memoryOrganizerConfidence")}{" "}
+                                      {decision.confidence.toFixed(2)}
+                                    </span>
+                                  ) : null}
+                                  {decision.requiresUserAck ? (
+                                    <span className="rounded border border-amber-500/30 bg-amber-500/[0.06] px-1.5 py-0.5 text-[10px] text-amber-700 dark:text-amber-300">
+                                      {t("settings.memoryOrganizerRequiresAck")}
+                                    </span>
+                                  ) : null}
+                                  {decision.applyStatus ? (
+                                    <span
+                                      className={`rounded border px-1.5 py-0.5 text-[10px] ${organizerApplyStatusClass(decision.applyStatus)}`}
+                                    >
+                                      {organizerApplyStatusLabel(decision.applyStatus, t)}
+                                    </span>
+                                  ) : null}
+                                </span>
+                                <span className="mt-1 block break-words text-muted-foreground">
+                                  {decision.reason || decision.description || "-"}
+                                </span>
+                                {decision.applyError?.message ? (
+                                  <span className="mt-1 block break-words text-destructive">
+                                    {decision.applyError.message}
                                   </span>
                                 ) : null}
-                                {decision.applyStatus ? (
-                                  <span
-                                    className={`rounded border px-1.5 py-0.5 text-[10px] ${organizerApplyStatusClass(decision.applyStatus)}`}
-                                  >
-                                    {organizerApplyStatusLabel(decision.applyStatus, t)}
+                                {decision.sourceSlugs?.length ? (
+                                  <span className="mt-1 block break-words font-mono text-[10px] text-muted-foreground">
+                                    {t("settings.memoryOrganizerSources")}{" "}
+                                    {decision.sourceSlugs.join(", ")}
                                   </span>
                                 ) : null}
                               </span>
-                              <span className="mt-1 block break-words text-muted-foreground">
-                                {decision.reason || decision.description || "-"}
+                            </label>
+                          );
+                        })}
+                      </div>
+                    </div>
+                  ) : null}
+
+                  {rejectionBuckets.length > 0 ? (
+                    <div className="rounded-lg border border-border/60 p-4">
+                      <div className="mb-3 text-xs font-semibold text-muted-foreground">
+                        {t("settings.memoryOrganizerRejectionBuckets")}
+                      </div>
+                      <div className="grid gap-2 sm:grid-cols-2 lg:grid-cols-3">
+                        {rejectionBuckets.map(([key, count]) => (
+                          <div
+                            key={key}
+                            className="rounded-md border border-border/50 bg-background/70 px-3 py-2"
+                          >
+                            <div className="text-[11px] text-muted-foreground">{t(key)}</div>
+                            <div className="mt-1 text-sm font-semibold">{count}</div>
+                          </div>
+                        ))}
+                      </div>
+                    </div>
+                  ) : null}
+
+                  {reviewItems.length > 0 ? (
+                    <div className="rounded-lg border border-amber-500/20 bg-amber-500/[0.04] p-4">
+                      <div className="mb-2 text-xs font-semibold text-amber-700 dark:text-amber-300">
+                        {t("settings.memoryOrganizerReviewNotes")}
+                      </div>
+                      <ul className="space-y-2 text-xs text-muted-foreground">
+                        {reviewItems.map((item, index) => (
+                          <li
+                            key={`${index}:${item.phase}:${item.slug || ""}:${item.message}`}
+                            className="rounded-md border border-border/50 bg-background/70 px-3 py-2"
+                          >
+                            <div className="mb-1 flex flex-wrap items-center gap-2">
+                              <span
+                                className={`rounded border px-1.5 py-0.5 text-[10px] ${organizerReviewItemClass(item)}`}
+                              >
+                                {organizerReviewItemLabel(item, t)}
                               </span>
-                              {decision.applyError?.message ? (
-                                <span className="mt-1 block break-words text-destructive">
-                                  {decision.applyError.message}
+                              {item.code ? (
+                                <span className="font-mono text-[10px] text-muted-foreground">
+                                  {item.code}
                                 </span>
                               ) : null}
-                              {decision.sourceSlugs?.length ? (
-                                <span className="mt-1 block break-words font-mono text-[10px] text-muted-foreground">
-                                  {t("settings.memoryOrganizerSources")}{" "}
-                                  {decision.sourceSlugs.join(", ")}
+                              {item.slug ? (
+                                <span className="font-mono text-[10px] text-muted-foreground">
+                                  {item.slug}
                                 </span>
                               ) : null}
-                            </span>
-                          </label>
-                        );
-                      })}
-                    </div>
-                  </div>
-                ) : null}
-
-                {rejectionBuckets.length > 0 ? (
-                  <div className="rounded-lg border border-border/60 p-4">
-                    <div className="mb-3 text-xs font-semibold text-muted-foreground">
-                      {t("settings.memoryOrganizerRejectionBuckets")}
+                            </div>
+                            <div className="break-words">{item.message}</div>
+                          </li>
+                        ))}
+                      </ul>
                     </div>
-                    <div className="grid gap-2 sm:grid-cols-2 lg:grid-cols-3">
-                      {rejectionBuckets.map(([key, count]) => (
-                        <div key={key} className="rounded-md border border-border/50 bg-background/70 px-3 py-2">
-                          <div className="text-[11px] text-muted-foreground">{t(key)}</div>
-                          <div className="mt-1 text-sm font-semibold">{count}</div>
-                        </div>
-                      ))}
-                    </div>
-                  </div>
-                ) : null}
+                  ) : null}
 
-                {reviewItems.length > 0 ? (
-                  <div className="rounded-lg border border-amber-500/20 bg-amber-500/[0.04] p-4">
-                    <div className="mb-2 text-xs font-semibold text-amber-700 dark:text-amber-300">
-                      {t("settings.memoryOrganizerReviewNotes")}
-                    </div>
-                    <ul className="space-y-2 text-xs text-muted-foreground">
-                      {reviewItems.map((item, index) => (
-                        <li
-                          key={`${index}:${item.phase}:${item.slug || ""}:${item.message}`}
-                          className="rounded-md border border-border/50 bg-background/70 px-3 py-2"
-                        >
-                          <div className="mb-1 flex flex-wrap items-center gap-2">
-                            <span
-                              className={`rounded border px-1.5 py-0.5 text-[10px] ${organizerReviewItemClass(item)}`}
-                            >
-                              {organizerReviewItemLabel(item, t)}
-                            </span>
-                            {item.code ? (
-                              <span className="font-mono text-[10px] text-muted-foreground">
-                                {item.code}
-                              </span>
-                            ) : null}
-                            {item.slug ? (
-                              <span className="font-mono text-[10px] text-muted-foreground">
-                                {item.slug}
-                              </span>
-                            ) : null}
+                  {clusterSummaries.length > 0 ? (
+                    <div className="rounded-lg border border-border/60 p-4">
+                      <div className="mb-2 text-xs font-semibold text-muted-foreground">
+                        {t("settings.memoryOrganizerClusterSummaries")}
+                      </div>
+                      <div className="space-y-2">
+                        {clusterSummaries.map((summary, index) => (
+                          <div
+                            key={`${index}:${summary}`}
+                            className="rounded bg-muted/30 px-3 py-2 text-xs"
+                          >
+                            {summary}
                           </div>
-                          <div className="break-words">{item.message}</div>
-                        </li>
-                      ))}
-                    </ul>
-                  </div>
-                ) : null}
-
-                {clusterSummaries.length > 0 ? (
-                  <div className="rounded-lg border border-border/60 p-4">
-                    <div className="mb-2 text-xs font-semibold text-muted-foreground">
-                      {t("settings.memoryOrganizerClusterSummaries")}
-                    </div>
-                    <div className="space-y-2">
-                      {clusterSummaries.map((summary, index) => (
-                        <div key={`${index}:${summary}`} className="rounded bg-muted/30 px-3 py-2 text-xs">
-                          {summary}
-                        </div>
-                      ))}
+                        ))}
+                      </div>
                     </div>
-                  </div>
-                ) : null}
+                  ) : null}
 
-                {rawBlocks.length > 0 ? (
-                  <details className="rounded-lg border border-border/60 p-4">
-                    <summary className="cursor-pointer text-xs font-semibold text-muted-foreground">
-                      {t("settings.memoryOrganizerTrimmedProtocol")}
-                    </summary>
-                    <pre className="mt-3 max-h-80 overflow-auto whitespace-pre-wrap break-words rounded bg-muted/30 p-3 text-[11px]">
-                      {JSON.stringify(rawBlocks, null, 2)}
-                    </pre>
-                  </details>
-                ) : null}
-              </div>
-            ) : (
-              <div className="flex h-full items-center justify-center text-sm text-muted-foreground">
-                {t("settings.memoryOrganizerHistoryEmpty")}
-              </div>
-            )}
-          </section>
-        </div>
+                  {rawBlocks.length > 0 ? (
+                    <details className="rounded-lg border border-border/60 p-4">
+                      <summary className="cursor-pointer text-xs font-semibold text-muted-foreground">
+                        {t("settings.memoryOrganizerTrimmedProtocol")}
+                      </summary>
+                      <pre className="mt-3 max-h-80 overflow-auto whitespace-pre-wrap break-words rounded bg-muted/30 p-3 text-[11px]">
+                        {JSON.stringify(rawBlocks, null, 2)}
+                      </pre>
+                    </details>
+                  ) : null}
+                </div>
+              ) : (
+                <div className="flex h-full items-center justify-center text-sm text-muted-foreground">
+                  {t("settings.memoryOrganizerHistoryEmpty")}
+                </div>
+              )}
+            </section>
+          </div>
         </div>
       </div>
       {clearConfirmOpen ? (
@@ -1283,17 +1289,11 @@ function MemorySettingsDrawer(props: {
     [modelOptions, t],
   );
 
-  function renderModelSelect(
-    value: string,
-    onChange: (value: string) => void,
-    ariaLabel: string,
-  ) {
+  function renderModelSelect(value: string, onChange: (value: string) => void, ariaLabel: string) {
     return (
       <DrawerSelect
         value={value.length > 0 ? value : DRAWER_SELECT_NONE_VALUE}
-        onValueChange={(next) =>
-          onChange(next === DRAWER_SELECT_NONE_VALUE ? "" : next)
-        }
+        onValueChange={(next) => onChange(next === DRAWER_SELECT_NONE_VALUE ? "" : next)}
         options={memoryModelDrawerOptions}
         ariaLabel={ariaLabel}
         placeholder={t("settings.memoryModelNone")}
@@ -1341,9 +1341,7 @@ function MemorySettingsDrawer(props: {
     });
   }
 
-  function updateOrganizerSchedule(
-    patch: Partial<AppSettings["memory"]["organizerSchedule"]>,
-  ) {
+  function updateOrganizerSchedule(patch: Partial<AppSettings["memory"]["organizerSchedule"]>) {
     setSettings((prev) => {
       const organizerSchedule = {
         ...prev.memory.organizerSchedule,
@@ -1395,11 +1393,7 @@ function MemorySettingsDrawer(props: {
       }
       const runnerPoked = pokeMemoryOrganizerRunner();
       setOrganizerFeedback(
-        t(
-          runnerPoked
-            ? "settings.memoryOrganizerQueued"
-            : "settings.memoryOrganizerQueuedRemote",
-        ),
+        t(runnerPoked ? "settings.memoryOrganizerQueued" : "settings.memoryOrganizerQueuedRemote"),
       );
       setHistoryOpen(true);
     } catch (err) {
@@ -1548,9 +1542,7 @@ function MemorySettingsDrawer(props: {
                       <DrawerSelect
                         value={String(settings.memory.organizerSchedule.weekday ?? 1)}
                         disabled={organizerTimingDisabled}
-                        onValueChange={(next) =>
-                          updateOrganizerSchedule({ weekday: Number(next) })
-                        }
+                        onValueChange={(next) => updateOrganizerSchedule({ weekday: Number(next) })}
                         ariaLabel={t("settings.memoryOrganizerWeekday")}
                         options={MEMORY_ORGANIZER_WEEKDAYS.map((key, index) => ({
                           value: String(index),
@@ -1568,9 +1560,7 @@ function MemorySettingsDrawer(props: {
                         value={settings.memory.organizerScope}
                         onValueChange={(next) => {
                           const organizerScope = next as MemoryOrganizerScope;
-                          setSettings((prev) =>
-                            updateMemorySettings(prev, { organizerScope }),
-                          );
+                          setSettings((prev) => updateMemorySettings(prev, { organizerScope }));
                         }}
                         ariaLabel={t("settings.memoryOrganizerScope")}
                         options={MEMORY_ORGANIZER_SCOPES.map((item) => ({
@@ -1587,9 +1577,7 @@ function MemorySettingsDrawer(props: {
                         value={settings.memory.organizerMode}
                         onValueChange={(next) => {
                           const organizerMode = next as MemoryOrganizerMode;
-                          setSettings((prev) =>
-                            updateMemorySettings(prev, { organizerMode }),
-                          );
+                          setSettings((prev) => updateMemorySettings(prev, { organizerMode }));
                         }}
                         ariaLabel={t("settings.memoryOrganizerMode")}
                         options={MEMORY_ORGANIZER_MODES.map((item) => ({
@@ -1638,7 +1626,9 @@ function MemorySettingsDrawer(props: {
                   disabled={!settings.memory.organizerModel || organizerSubmitting}
                   onClick={handleRunNow}
                 >
-                  <RefreshCw className={`h-3.5 w-3.5 ${organizerSubmitting ? "animate-spin" : ""}`} />
+                  <RefreshCw
+                    className={`h-3.5 w-3.5 ${organizerSubmitting ? "animate-spin" : ""}`}
+                  />
                   {t("settings.memoryOrganizerRunNow")}
                 </Button>
               </div>
@@ -1764,10 +1754,7 @@ export function MemoryPanel(props: {
     appendBody: "",
   });
 
-  const modelOptions = useMemo(
-    () => buildMemoryModelOptions(props.settings),
-    [props.settings],
-  );
+  const modelOptions = useMemo(() => buildMemoryModelOptions(props.settings), [props.settings]);
 
   const globalEntries = useMemo(() => {
     return entries
@@ -1840,7 +1827,8 @@ export function MemoryPanel(props: {
       setEntries(list.entries);
       setQuota(list.quota);
       setPathsInfo(info);
-      const keepKey = keepEntry === undefined ? (selectedEntry ? entryKey(selectedEntry) : null) : keepEntry;
+      const keepKey =
+        keepEntry === undefined ? (selectedEntry ? entryKey(selectedEntry) : null) : keepEntry;
       if (keepKey) {
         const found =
           list.entries.find((entry) => entryKey(entry) === keepKey) ??
@@ -2086,343 +2074,369 @@ export function MemoryPanel(props: {
     <>
       <div className="settings-memory-panel flex min-h-0 flex-1 flex-col gap-4">
         <div className="settings-memory-summary-card shrink-0 rounded-xl border border-border/60 bg-card p-4">
-        <div className="flex flex-wrap items-start justify-between gap-3">
-          <div className="min-w-0 space-y-1">
-            <div className="flex items-center gap-2 text-sm font-semibold">
-              <Brain className="h-4 w-4 text-muted-foreground" />
-              {t("settings.memoryTitle")}
-            </div>
-            <div className="break-all text-xs text-muted-foreground">
-              {pathsInfo?.root ?? "~/.liveagent/memory"}
-            </div>
-          </div>
-          <div className="settings-memory-summary-actions flex flex-wrap items-center gap-2">
-            {quotaItems.map((item) => {
-              const level = quotaLevel(item);
-              const label =
-                item.scope === "global"
-                  ? t("settings.memoryQuotaGlobal")
-                  : t("settings.memoryQuotaProject");
-              return (
-                <div
-                  key={`${item.scope}:${item.workdirHash}`}
-                  className={`rounded-md border px-2.5 py-1.5 text-xs ${quotaPillClass(level)}`}
-                >
-                  {label} {item.used} / {item.limit}
-                </div>
-              );
-            })}
-            <div className={`rounded-md border px-2.5 py-1.5 text-xs ${quotaStatusClass(quotaStatus)}`}>
-              {t(quotaStatusLabelKey(quotaStatus))}
+          <div className="flex flex-wrap items-start justify-between gap-3">
+            <div className="min-w-0 space-y-1">
+              <div className="flex items-center gap-2 text-sm font-semibold">
+                <Brain className="h-4 w-4 text-muted-foreground" />
+                {t("settings.memoryTitle")}
+              </div>
+              <div className="break-all text-xs text-muted-foreground">
+                {pathsInfo?.root ?? "~/.liveagent/memory"}
+              </div>
             </div>
-            <Button variant="outline" size="sm" onClick={() => reload()} disabled={loading}>
-              <RefreshCw className={`h-3.5 w-3.5 ${loading ? "animate-spin" : ""}`} />
-              {t("settings.memoryRefresh")}
-            </Button>
-            <Button
-              variant="outline"
-              size="icon"
-              className="h-8 w-8"
-              title={t("settings.memoryOpenSettings")}
-              aria-label={t("settings.memoryOpenSettings")}
-              onClick={() => setSettingsDrawerOpen(true)}
-            >
-              <Settings2 className="h-3.5 w-3.5" />
-            </Button>
-          </div>
-        </div>
-
-        {unreviewedCount > 0 ? (
-          <div className="mt-3 rounded-lg border border-amber-500/20 bg-amber-500/[0.06] px-3 py-2 text-xs text-amber-700 dark:text-amber-300">
-            {unreviewedCount} {t("settings.memoryAwaitingReview")}
-          </div>
-        ) : null}
-        {pathsInfo?.isInCloud ? (
-          <div className="mt-3 flex items-start gap-2 rounded-lg border border-amber-500/20 bg-amber-500/[0.06] px-3 py-2 text-xs text-amber-700 dark:text-amber-300">
-            <AlertTriangle className="mt-0.5 h-3.5 w-3.5 shrink-0" />
-            {t("settings.memoryCloudWarningPrefix")}{" "}
-            {pathsInfo.cloudProvider ?? t("settings.memoryCloudSyncFolder")}
-          </div>
-        ) : null}
-        {quotaStatus === "full" || quotaStatus === "danger" ? (
-          <div className="mt-3 flex items-start gap-2 rounded-lg border border-red-500/20 bg-red-500/[0.06] px-3 py-2 text-xs text-red-700 dark:text-red-300">
-            <AlertTriangle className="mt-0.5 h-3.5 w-3.5 shrink-0" />
-            {t(
-              quotaStatus === "full"
-                ? "settings.memoryQuotaFullMessage"
-                : "settings.memoryQuotaNearLimitMessage",
-            )}
-          </div>
-        ) : quotaStatus === "warning" ? (
-          <div className="mt-3 flex items-start gap-2 rounded-lg border border-amber-500/20 bg-amber-500/[0.06] px-3 py-2 text-xs text-amber-700 dark:text-amber-300">
-            <AlertTriangle className="mt-0.5 h-3.5 w-3.5 shrink-0" />
-            {t("settings.memoryQuotaWarningMessage")}
-          </div>
-        ) : null}
-        {error ? (
-          <div className="mt-3 whitespace-pre-wrap rounded-lg border border-destructive/20 bg-destructive/[0.05] px-3 py-2 text-xs text-destructive">
-            {error}
-          </div>
-        ) : null}
-      </div>
-
-        <div className="settings-memory-layout grid min-h-0 flex-1 gap-4 lg:grid-cols-[380px_minmax(0,1fr)]">
-        <section className="settings-memory-list-section flex min-h-0 flex-col rounded-xl border border-border/60 bg-card">
-          <div className="shrink-0 space-y-3 border-b border-border/40 p-3">
-            <div className="grid grid-cols-3 gap-1 rounded-lg bg-muted/50 p-1">
-              <button
-                type="button"
-                onClick={() => setTab("global")}
-                className={`flex min-w-0 items-center justify-center gap-1.5 rounded-md px-2 py-1.5 text-xs font-medium ${tab === "global" ? "bg-background shadow-xs" : "text-muted-foreground"}`}
-              >
-                <Globe2 className="h-3.5 w-3.5 shrink-0" />
-                <span className="truncate">{t("settings.memoryCategoryGlobal")}</span>
-                <span className="shrink-0 text-[10px] text-muted-foreground">{globalEntryCount}</span>
-              </button>
-              <button
-                type="button"
-                onClick={() => setTab("project")}
-                className={`flex min-w-0 items-center justify-center gap-1.5 rounded-md px-2 py-1.5 text-xs font-medium ${tab === "project" ? "bg-background shadow-xs" : "text-muted-foreground"}`}
-              >
-                <Folder className="h-3.5 w-3.5 shrink-0" />
-                <span className="truncate">{t("settings.memoryCategoryProject")}</span>
-                <span className="shrink-0 text-[10px] text-muted-foreground">{projectEntryCount}</span>
-              </button>
-              <button
-                type="button"
-                onClick={() => setTab("journal")}
-                className={`flex min-w-0 items-center justify-center gap-1.5 rounded-md px-2 py-1.5 text-xs font-medium ${tab === "journal" ? "bg-background shadow-xs" : "text-muted-foreground"}`}
+            <div className="settings-memory-summary-actions flex flex-wrap items-center gap-2">
+              {quotaItems.map((item) => {
+                const level = quotaLevel(item);
+                const label =
+                  item.scope === "global"
+                    ? t("settings.memoryQuotaGlobal")
+                    : t("settings.memoryQuotaProject");
+                return (
+                  <div
+                    key={`${item.scope}:${item.workdirHash}`}
+                    className={`rounded-md border px-2.5 py-1.5 text-xs ${quotaPillClass(level)}`}
+                  >
+                    {label} {item.used} / {item.limit}
+                  </div>
+                );
+              })}
+              <div
+                className={`rounded-md border px-2.5 py-1.5 text-xs ${quotaStatusClass(quotaStatus)}`}
               >
-                <BookOpen className="h-3.5 w-3.5 shrink-0" />
-                <span className="truncate">{t("settings.memoryCategoryJournal")}</span>
-                <span className="shrink-0 text-[10px] text-muted-foreground">{dailyEntryCount}</span>
-              </button>
-            </div>
-            <div className="flex gap-2">
-              <div className="relative flex-1">
-                <Search className="pointer-events-none absolute left-2.5 top-2.5 h-3.5 w-3.5 text-muted-foreground" />
-                <Input
-                  value={filter}
-                  onChange={(event) => setFilter(event.target.value)}
-                  className="pl-8 text-xs"
-                  placeholder={t("settings.memorySearchPlaceholder")}
-                />
+                {t(quotaStatusLabelKey(quotaStatus))}
               </div>
+              <Button variant="outline" size="sm" onClick={() => reload()} disabled={loading}>
+                <RefreshCw className={`h-3.5 w-3.5 ${loading ? "animate-spin" : ""}`} />
+                {t("settings.memoryRefresh")}
+              </Button>
               <Button
-                size="icon"
                 variant="outline"
-                title={t("settings.memoryNew")}
-                onClick={() => setShowCreate((value) => !value)}
+                size="icon"
+                className="h-8 w-8"
+                title={t("settings.memoryOpenSettings")}
+                aria-label={t("settings.memoryOpenSettings")}
+                onClick={() => setSettingsDrawerOpen(true)}
               >
-                <Plus className="h-4 w-4" />
+                <Settings2 className="h-3.5 w-3.5" />
               </Button>
             </div>
           </div>
 
-          <div className="settings-memory-entry-list min-h-0 flex-1 overflow-auto p-2">
-            {tab === "global" ? (
-              renderFlatEntries(globalEntries, "settings.memoryNoGlobalEntries")
-            ) : tab === "journal" ? (
-              renderFlatEntries(dailyEntries, "settings.memoryNoJournalEntries")
-            ) : projectGroups.length === 0 ? (
-              <div className="rounded-lg border border-dashed border-border/60 px-4 py-8 text-center text-xs text-muted-foreground">
-                {t("settings.memoryNoProjectEntries")}
-              </div>
-            ) : (
-              <div className="space-y-2">
-                {projectGroups.map((group) => (
-                  <details key={group.key} className="group rounded-lg border border-border/50 bg-muted/15" open>
-                    <summary className="flex cursor-pointer list-none items-center gap-2 px-3 py-2.5 text-left text-xs [&::-webkit-details-marker]:hidden">
-                      <ChevronDown className="h-3.5 w-3.5 shrink-0 text-muted-foreground transition-transform group-open:rotate-0 -rotate-90" />
-                      <Folder className="h-3.5 w-3.5 shrink-0 text-muted-foreground" />
-                      <span className="min-w-0 flex-1 truncate font-medium" title={group.label}>
-                        {group.label}
-                      </span>
-                      <span className="shrink-0 rounded bg-background px-1.5 py-0.5 text-[10px] text-muted-foreground">
-                        {group.entries.length}
-                      </span>
-                    </summary>
-                    <div className="space-y-1.5 border-t border-border/40 px-2 py-2">
-                      {group.entries.map((entry) => renderEntryButton(entry, true))}
-                    </div>
-                  </details>
-                ))}
-              </div>
-            )}
-          </div>
-        </section>
-
-        <section className="settings-memory-detail-section flex min-h-0 flex-col rounded-xl border border-border/60 bg-card">
-          {showCreate ? (
-            <div className="shrink-0 border-b border-border/40 p-4">
-              <div className="mb-3 text-sm font-semibold">{t("settings.memoryNew")}</div>
-              <div className="grid gap-3 md:grid-cols-2">
-                <Input
-                  value={draft.slug}
-                  onChange={(event) => setDraft((prev) => ({ ...prev, slug: event.target.value }))}
-                  placeholder={t("settings.memorySlugPlaceholder")}
-                />
-                <select
-                  value={draft.memoryType}
-                  onChange={(event) =>
-                    setDraft((prev) => ({
-                      ...prev,
-                      memoryType: event.target.value as MemoryType,
-                    }))
-                  }
-                  className="h-9 rounded-md border border-input bg-background px-3 text-sm"
+          {unreviewedCount > 0 ? (
+            <div className="mt-3 rounded-lg border border-amber-500/20 bg-amber-500/[0.06] px-3 py-2 text-xs text-amber-700 dark:text-amber-300">
+              {unreviewedCount} {t("settings.memoryAwaitingReview")}
+            </div>
+          ) : null}
+          {pathsInfo?.isInCloud ? (
+            <div className="mt-3 flex items-start gap-2 rounded-lg border border-amber-500/20 bg-amber-500/[0.06] px-3 py-2 text-xs text-amber-700 dark:text-amber-300">
+              <AlertTriangle className="mt-0.5 h-3.5 w-3.5 shrink-0" />
+              {t("settings.memoryCloudWarningPrefix")}{" "}
+              {pathsInfo.cloudProvider ?? t("settings.memoryCloudSyncFolder")}
+            </div>
+          ) : null}
+          {quotaStatus === "full" || quotaStatus === "danger" ? (
+            <div className="mt-3 flex items-start gap-2 rounded-lg border border-red-500/20 bg-red-500/[0.06] px-3 py-2 text-xs text-red-700 dark:text-red-300">
+              <AlertTriangle className="mt-0.5 h-3.5 w-3.5 shrink-0" />
+              {t(
+                quotaStatus === "full"
+                  ? "settings.memoryQuotaFullMessage"
+                  : "settings.memoryQuotaNearLimitMessage",
+              )}
+            </div>
+          ) : quotaStatus === "warning" ? (
+            <div className="mt-3 flex items-start gap-2 rounded-lg border border-amber-500/20 bg-amber-500/[0.06] px-3 py-2 text-xs text-amber-700 dark:text-amber-300">
+              <AlertTriangle className="mt-0.5 h-3.5 w-3.5 shrink-0" />
+              {t("settings.memoryQuotaWarningMessage")}
+            </div>
+          ) : null}
+          {error ? (
+            <div className="mt-3 whitespace-pre-wrap rounded-lg border border-destructive/20 bg-destructive/[0.05] px-3 py-2 text-xs text-destructive">
+              {error}
+            </div>
+          ) : null}
+        </div>
+
+        <div className="settings-memory-layout grid min-h-0 flex-1 gap-4 lg:grid-cols-[380px_minmax(0,1fr)]">
+          <section className="settings-memory-list-section flex min-h-0 flex-col rounded-xl border border-border/60 bg-card">
+            <div className="shrink-0 space-y-3 border-b border-border/40 p-3">
+              <div className="grid grid-cols-3 gap-1 rounded-lg bg-muted/50 p-1">
+                <button
+                  type="button"
+                  onClick={() => setTab("global")}
+                  className={`flex min-w-0 items-center justify-center gap-1.5 rounded-md px-2 py-1.5 text-xs font-medium ${tab === "global" ? "bg-background shadow-xs" : "text-muted-foreground"}`}
                 >
-                  {MEMORY_TYPES.map((type) => (
-                    <option key={type} value={type}>
-                      {memoryTypeLabel(type, t)}
-                    </option>
-                  ))}
-                </select>
-                <select
-                  value={draft.scope}
-                  onChange={(event) =>
-                    setDraft((prev) => ({
-                      ...prev,
-                      scope: event.target.value as "global" | "project",
-                    }))
-                  }
-                  className="h-9 rounded-md border border-input bg-background px-3 text-sm"
+                  <Globe2 className="h-3.5 w-3.5 shrink-0" />
+                  <span className="truncate">{t("settings.memoryCategoryGlobal")}</span>
+                  <span className="shrink-0 text-[10px] text-muted-foreground">
+                    {globalEntryCount}
+                  </span>
+                </button>
+                <button
+                  type="button"
+                  onClick={() => setTab("project")}
+                  className={`flex min-w-0 items-center justify-center gap-1.5 rounded-md px-2 py-1.5 text-xs font-medium ${tab === "project" ? "bg-background shadow-xs" : "text-muted-foreground"}`}
                 >
-                  <option value="global">{t("settings.memoryScopeGlobal")}</option>
-                  <option value="project">{t("settings.memoryScopeProject")}</option>
-                </select>
-                <Input
-                  value={draft.description}
-                  onChange={(event) =>
-                    setDraft((prev) => ({ ...prev, description: event.target.value }))
-                  }
-                  placeholder={t("settings.memoryDescriptionPlaceholder")}
-                />
+                  <Folder className="h-3.5 w-3.5 shrink-0" />
+                  <span className="truncate">{t("settings.memoryCategoryProject")}</span>
+                  <span className="shrink-0 text-[10px] text-muted-foreground">
+                    {projectEntryCount}
+                  </span>
+                </button>
+                <button
+                  type="button"
+                  onClick={() => setTab("journal")}
+                  className={`flex min-w-0 items-center justify-center gap-1.5 rounded-md px-2 py-1.5 text-xs font-medium ${tab === "journal" ? "bg-background shadow-xs" : "text-muted-foreground"}`}
+                >
+                  <BookOpen className="h-3.5 w-3.5 shrink-0" />
+                  <span className="truncate">{t("settings.memoryCategoryJournal")}</span>
+                  <span className="shrink-0 text-[10px] text-muted-foreground">
+                    {dailyEntryCount}
+                  </span>
+                </button>
               </div>
-              <textarea
-                value={draft.body}
-                onChange={(event) => setDraft((prev) => ({ ...prev, body: event.target.value }))}
-                className="mt-3 min-h-28 w-full resize-y rounded-md border border-input bg-background px-3 py-2 text-sm"
-                placeholder={t("settings.memoryBodyPlaceholder")}
-              />
-              <div className="mt-3 flex justify-end gap-2">
-                <Button variant="outline" size="sm" onClick={() => setShowCreate(false)}>
-                  {t("settings.memoryCancel")}
-                </Button>
-                <Button size="sm" onClick={createEntry} disabled={saving}>
-                  {t("settings.memorySave")}
+              <div className="flex gap-2">
+                <div className="relative flex-1">
+                  <Search className="pointer-events-none absolute left-2.5 top-2.5 h-3.5 w-3.5 text-muted-foreground" />
+                  <Input
+                    value={filter}
+                    onChange={(event) => setFilter(event.target.value)}
+                    className="pl-8 text-xs"
+                    placeholder={t("settings.memorySearchPlaceholder")}
+                  />
+                </div>
+                <Button
+                  size="icon"
+                  variant="outline"
+                  title={t("settings.memoryNew")}
+                  onClick={() => setShowCreate((value) => !value)}
+                >
+                  <Plus className="h-4 w-4" />
                 </Button>
               </div>
             </div>
-          ) : null}
 
-          {selected ? (
-            <>
+            <div className="settings-memory-entry-list min-h-0 flex-1 overflow-auto p-2">
+              {tab === "global" ? (
+                renderFlatEntries(globalEntries, "settings.memoryNoGlobalEntries")
+              ) : tab === "journal" ? (
+                renderFlatEntries(dailyEntries, "settings.memoryNoJournalEntries")
+              ) : projectGroups.length === 0 ? (
+                <div className="rounded-lg border border-dashed border-border/60 px-4 py-8 text-center text-xs text-muted-foreground">
+                  {t("settings.memoryNoProjectEntries")}
+                </div>
+              ) : (
+                <div className="space-y-2">
+                  {projectGroups.map((group) => (
+                    <details
+                      key={group.key}
+                      className="group rounded-lg border border-border/50 bg-muted/15"
+                      open
+                    >
+                      <summary className="flex cursor-pointer list-none items-center gap-2 px-3 py-2.5 text-left text-xs [&::-webkit-details-marker]:hidden">
+                        <ChevronDown className="h-3.5 w-3.5 shrink-0 text-muted-foreground transition-transform group-open:rotate-0 -rotate-90" />
+                        <Folder className="h-3.5 w-3.5 shrink-0 text-muted-foreground" />
+                        <span className="min-w-0 flex-1 truncate font-medium" title={group.label}>
+                          {group.label}
+                        </span>
+                        <span className="shrink-0 rounded bg-background px-1.5 py-0.5 text-[10px] text-muted-foreground">
+                          {group.entries.length}
+                        </span>
+                      </summary>
+                      <div className="space-y-1.5 border-t border-border/40 px-2 py-2">
+                        {group.entries.map((entry) => renderEntryButton(entry, true))}
+                      </div>
+                    </details>
+                  ))}
+                </div>
+              )}
+            </div>
+          </section>
+
+          <section className="settings-memory-detail-section flex min-h-0 flex-col rounded-xl border border-border/60 bg-card">
+            {showCreate ? (
               <div className="shrink-0 border-b border-border/40 p-4">
-                <div className="flex flex-wrap items-start justify-between gap-3">
-                  <div className="min-w-0">
-                    <div className="flex flex-wrap items-center gap-2">
-                      <div className="truncate text-sm font-semibold">{selectedTitle(selected)}</div>
-                      <span className="rounded bg-muted px-1.5 py-0.5 text-[10px] text-muted-foreground">
-                        {memoryScopeLabel(selected.scope, t)}
-                      </span>
-                      <span className="rounded bg-muted px-1.5 py-0.5 text-[10px] text-muted-foreground">
-                        {memoryTypeLabel(selected.memoryType, t)}
-                      </span>
-                      {selected.meta.unreviewed ? (
-                        <span className="rounded bg-amber-500/10 px-1.5 py-0.5 text-[10px] text-amber-700 dark:text-amber-300">
-                          {t("settings.memoryUnreviewed")}
+                <div className="mb-3 text-sm font-semibold">{t("settings.memoryNew")}</div>
+                <div className="grid gap-3 md:grid-cols-2">
+                  <Input
+                    value={draft.slug}
+                    onChange={(event) =>
+                      setDraft((prev) => ({ ...prev, slug: event.target.value }))
+                    }
+                    placeholder={t("settings.memorySlugPlaceholder")}
+                  />
+                  <select
+                    value={draft.memoryType}
+                    onChange={(event) =>
+                      setDraft((prev) => ({
+                        ...prev,
+                        memoryType: event.target.value as MemoryType,
+                      }))
+                    }
+                    className="h-9 rounded-md border border-input bg-background px-3 text-sm"
+                  >
+                    {MEMORY_TYPES.map((type) => (
+                      <option key={type} value={type}>
+                        {memoryTypeLabel(type, t)}
+                      </option>
+                    ))}
+                  </select>
+                  <select
+                    value={draft.scope}
+                    onChange={(event) =>
+                      setDraft((prev) => ({
+                        ...prev,
+                        scope: event.target.value as "global" | "project",
+                      }))
+                    }
+                    className="h-9 rounded-md border border-input bg-background px-3 text-sm"
+                  >
+                    <option value="global">{t("settings.memoryScopeGlobal")}</option>
+                    <option value="project">{t("settings.memoryScopeProject")}</option>
+                  </select>
+                  <Input
+                    value={draft.description}
+                    onChange={(event) =>
+                      setDraft((prev) => ({ ...prev, description: event.target.value }))
+                    }
+                    placeholder={t("settings.memoryDescriptionPlaceholder")}
+                  />
+                </div>
+                <textarea
+                  value={draft.body}
+                  onChange={(event) => setDraft((prev) => ({ ...prev, body: event.target.value }))}
+                  className="mt-3 min-h-28 w-full resize-y rounded-md border border-input bg-background px-3 py-2 text-sm"
+                  placeholder={t("settings.memoryBodyPlaceholder")}
+                />
+                <div className="mt-3 flex justify-end gap-2">
+                  <Button variant="outline" size="sm" onClick={() => setShowCreate(false)}>
+                    {t("settings.memoryCancel")}
+                  </Button>
+                  <Button size="sm" onClick={createEntry} disabled={saving}>
+                    {t("settings.memorySave")}
+                  </Button>
+                </div>
+              </div>
+            ) : null}
+
+            {selected ? (
+              <>
+                <div className="shrink-0 border-b border-border/40 p-4">
+                  <div className="flex flex-wrap items-start justify-between gap-3">
+                    <div className="min-w-0">
+                      <div className="flex flex-wrap items-center gap-2">
+                        <div className="truncate text-sm font-semibold">
+                          {selectedTitle(selected)}
+                        </div>
+                        <span className="rounded bg-muted px-1.5 py-0.5 text-[10px] text-muted-foreground">
+                          {memoryScopeLabel(selected.scope, t)}
                         </span>
-                      ) : null}
-                    </div>
-                    <div className="mt-1 text-xs text-muted-foreground">
-                      {t("settings.memoryUpdated")} {formatTime(selected.meta.updatedAt)}
-                    </div>
-                    <div className="mt-1 truncate font-mono text-[11px] text-muted-foreground/70">
-                      id: {selected.slug}
-                    </div>
-                    {selectedEntry?.scope === "project" ? (
+                        <span className="rounded bg-muted px-1.5 py-0.5 text-[10px] text-muted-foreground">
+                          {memoryTypeLabel(selected.memoryType, t)}
+                        </span>
+                        {selected.meta.unreviewed ? (
+                          <span className="rounded bg-amber-500/10 px-1.5 py-0.5 text-[10px] text-amber-700 dark:text-amber-300">
+                            {t("settings.memoryUnreviewed")}
+                          </span>
+                        ) : null}
+                      </div>
+                      <div className="mt-1 text-xs text-muted-foreground">
+                        {t("settings.memoryUpdated")} {formatTime(selected.meta.updatedAt)}
+                      </div>
                       <div className="mt-1 truncate font-mono text-[11px] text-muted-foreground/70">
-                        {selectedEntry.workdirPath || selectedEntry.workdirHash}
+                        id: {selected.slug}
                       </div>
-                    ) : null}
-                  </div>
-                  <div className="flex items-center gap-2">
-                    {selected.meta.unreviewed && selected.memoryType !== "daily" ? (
-                      <Button variant="outline" size="sm" onClick={acceptSelected} disabled={saving}>
-                        <Check className="h-3.5 w-3.5" />
-                        {t("settings.memoryAccept")}
+                      {selectedEntry?.scope === "project" ? (
+                        <div className="mt-1 truncate font-mono text-[11px] text-muted-foreground/70">
+                          {selectedEntry.workdirPath || selectedEntry.workdirHash}
+                        </div>
+                      ) : null}
+                    </div>
+                    <div className="flex items-center gap-2">
+                      {selected.meta.unreviewed && selected.memoryType !== "daily" ? (
+                        <Button
+                          variant="outline"
+                          size="sm"
+                          onClick={acceptSelected}
+                          disabled={saving}
+                        >
+                          <Check className="h-3.5 w-3.5" />
+                          {t("settings.memoryAccept")}
+                        </Button>
+                      ) : null}
+                      <Button
+                        variant="outline"
+                        size="sm"
+                        onClick={deleteSelected}
+                        disabled={saving}
+                      >
+                        <Trash2 className="h-3.5 w-3.5" />
+                        {t("settings.memoryDelete")}
                       </Button>
-                    ) : null}
-                    <Button variant="outline" size="sm" onClick={deleteSelected} disabled={saving}>
-                      <Trash2 className="h-3.5 w-3.5" />
-                      {t("settings.memoryDelete")}
-                    </Button>
+                    </div>
                   </div>
                 </div>
-              </div>
 
-              <div className="settings-memory-detail-body min-h-0 flex-1 overflow-auto p-4">
-                {selected.memoryType === "daily" ? (
-                  <div className="space-y-3">
-                    <textarea
-                      value={editDraft.appendBody}
-                      onChange={(event) =>
-                        setEditDraft((prev) => ({ ...prev, appendBody: event.target.value }))
-                      }
-                      className="min-h-24 w-full resize-y rounded-md border border-input bg-background px-3 py-2 text-sm"
-                      placeholder={t("settings.memoryAppendBlockPlaceholder")}
-                    />
-                    <div className="rounded-lg border border-border/50 bg-muted/20 p-3">
-                      <pre className="whitespace-pre-wrap break-words text-xs leading-relaxed text-foreground">
-                        {selected.body || t("settings.memoryEmptyBody")}
-                      </pre>
+                <div className="settings-memory-detail-body min-h-0 flex-1 overflow-auto p-4">
+                  {selected.memoryType === "daily" ? (
+                    <div className="space-y-3">
+                      <textarea
+                        value={editDraft.appendBody}
+                        onChange={(event) =>
+                          setEditDraft((prev) => ({ ...prev, appendBody: event.target.value }))
+                        }
+                        className="min-h-24 w-full resize-y rounded-md border border-input bg-background px-3 py-2 text-sm"
+                        placeholder={t("settings.memoryAppendBlockPlaceholder")}
+                      />
+                      <div className="rounded-lg border border-border/50 bg-muted/20 p-3">
+                        <pre className="whitespace-pre-wrap break-words text-xs leading-relaxed text-foreground">
+                          {selected.body || t("settings.memoryEmptyBody")}
+                        </pre>
+                      </div>
                     </div>
-                  </div>
-                ) : (
-                  <div className="space-y-3">
-                    <Input
-                      value={editDraft.description}
-                      onChange={(event) =>
-                        setEditDraft((prev) => ({ ...prev, description: event.target.value }))
-                      }
-                      placeholder={t("settings.memoryDescriptionPlaceholder")}
-                    />
-                    <textarea
-                      value={editDraft.body}
-                      onChange={(event) =>
-                        setEditDraft((prev) => ({ ...prev, body: event.target.value }))
-                      }
-                      className="min-h-[360px] w-full resize-y rounded-md border border-input bg-background px-3 py-2 font-mono text-xs leading-relaxed"
-                    />
-                  </div>
-                )}
-              </div>
+                  ) : (
+                    <div className="space-y-3">
+                      <Input
+                        value={editDraft.description}
+                        onChange={(event) =>
+                          setEditDraft((prev) => ({ ...prev, description: event.target.value }))
+                        }
+                        placeholder={t("settings.memoryDescriptionPlaceholder")}
+                      />
+                      <textarea
+                        value={editDraft.body}
+                        onChange={(event) =>
+                          setEditDraft((prev) => ({ ...prev, body: event.target.value }))
+                        }
+                        className="min-h-[360px] w-full resize-y rounded-md border border-input bg-background px-3 py-2 font-mono text-xs leading-relaxed"
+                      />
+                    </div>
+                  )}
+                </div>
 
-              <div className="shrink-0 border-t border-border/40 p-4">
-                <div className="flex justify-between gap-3">
-                  <div className="flex items-center gap-2">
-                    <Button
-                      variant="outline"
-                      size="sm"
-                      onClick={() => setWipeConfirmOpen(true)}
-                      disabled={saving}
-                    >
-                      {t("settings.memoryWipeAll")}
+                <div className="shrink-0 border-t border-border/40 p-4">
+                  <div className="flex justify-between gap-3">
+                    <div className="flex items-center gap-2">
+                      <Button
+                        variant="outline"
+                        size="sm"
+                        onClick={() => setWipeConfirmOpen(true)}
+                        disabled={saving}
+                      >
+                        {t("settings.memoryWipeAll")}
+                      </Button>
+                    </div>
+                    <Button size="sm" onClick={saveSelected} disabled={saving}>
+                      {t("settings.memorySave")}
                     </Button>
                   </div>
-                  <Button size="sm" onClick={saveSelected} disabled={saving}>
-                    {t("settings.memorySave")}
-                  </Button>
                 </div>
+              </>
+            ) : (
+              <div className="flex min-h-0 flex-1 items-center justify-center p-8 text-center text-sm text-muted-foreground">
+                {t("settings.memorySelectEntry")}
               </div>
-            </>
-          ) : (
-            <div className="flex min-h-0 flex-1 items-center justify-center p-8 text-center text-sm text-muted-foreground">
-              {t("settings.memorySelectEntry")}
-            </div>
-          )}
-        </section>
+            )}
+          </section>
         </div>
       </div>
 
diff --git a/crates/agent-gui/tsconfig.json b/crates/agent-gui/tsconfig.json
index a7fc6fbf2..e5cd43d91 100644
--- a/crates/agent-gui/tsconfig.json
+++ b/crates/agent-gui/tsconfig.json
@@ -2,7 +2,7 @@
   "compilerOptions": {
     "target": "ES2020",
     "useDefineForClassFields": true,
-    "lib": ["ES2020", "DOM", "DOM.Iterable"],
+    "lib": ["ES2022", "DOM", "DOM.Iterable"],
     "module": "ESNext",
     "skipLibCheck": true,
 

From f3df568c79eb177c547a5154bb49d4a4bc4f6341 Mon Sep 17 00:00:00 2001
From: loosand <loosand@163.com>
Date: Tue, 26 May 2026 22:52:45 +0800
Subject: [PATCH 3/3] style: apply Biome auto-formatting to all TS/TSX files

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 crates/agent-gui/src/App.tsx                  |  130 +-
 crates/agent-gui/src/components/Markdown.tsx  |   20 +-
 .../src/components/WindowsTitleBar.tsx        |   38 +-
 .../components/chat/ChatHistorySidebar.tsx    |   44 +-
 .../src/components/chat/HistoryShareModal.tsx |   32 +-
 .../src/components/chat/MentionComposer.tsx   | 1210 +++++++++--------
 .../src/components/chat/NotifyToast.tsx       |    6 +-
 .../chat/SharedHistoryManagerModal.tsx        |   22 +-
 .../src/components/chat/fileTypeIcons.tsx     |   77 +-
 .../src/components/cron/CronPromptRunner.tsx  |   35 +-
 .../src/components/hub/HubChrome.tsx          |    7 +-
 crates/agent-gui/src/components/icons.tsx     |   32 +-
 .../memory/MemoryOrganizerRunner.tsx          |  215 ++-
 crates/agent-gui/src/components/ui/label.tsx  |    6 +-
 crates/agent-gui/src/i18n/LocaleContext.tsx   |    2 +-
 crates/agent-gui/src/index.css                |  521 +++++--
 .../lib/chat/compaction/contextCompaction.ts  |   96 +-
 .../chat/context/requestContextSanitizer.ts   |   51 +-
 .../src/lib/chat/conversation/chatAbort.ts    |   22 +-
 .../chat/conversation/conversationState.ts    |   55 +-
 .../conversation/run/gatewayBridgeEvents.ts   |    4 +-
 .../src/lib/chat/history/chatHistory.ts       |   46 +-
 .../src/lib/chat/history/chatHistorySync.ts   |    2 +-
 .../src/lib/chat/memory/memoryDecisionLog.ts  |    6 +-
 .../src/lib/chat/memory/memoryExtractor.ts    |   46 +-
 .../src/lib/chat/memory/memoryFrontmatter.ts  |    6 +-
 .../src/lib/chat/memory/memoryPolicy.ts       |  100 +-
 .../src/lib/chat/memory/memoryPrompt.ts       |   26 +-
 .../src/lib/chat/memory/memoryProtocol.ts     |    8 +-
 .../src/lib/chat/messages/hostedSearch.ts     |   37 +-
 .../src/lib/chat/messages/uiMessages.ts       |  444 +++---
 .../src/lib/chat/messages/uploadedFiles.ts    |    5 +-
 .../lib/chat/messages/userMessageContent.tsx  |   48 +-
 .../src/lib/chat/page/chatPageHelpers.ts      |   12 +-
 .../src/lib/chat/runner/agentRunner.ts        |  741 +++++-----
 .../src/lib/chat/runner/seedToolCalls.ts      |   19 +-
 .../src/lib/chat/subagent/subagentHistory.ts  |    9 +-
 .../lib/chat/subagent/subagentMessageBus.ts   |   13 +-
 .../chat/subagent/subagentRuntimeManager.ts   |   56 +-
 .../lib/chat/subagent/subagentScheduler.ts    |    3 +-
 crates/agent-gui/src/lib/debug/agentDebug.ts  |   13 +-
 .../src/lib/hooks/conversationHooks.ts        |    6 +-
 crates/agent-gui/src/lib/mcpRegistry/index.ts |  271 ++--
 crates/agent-gui/src/lib/memory/api.ts        |    8 +-
 .../src/lib/memory/organizerProtocol.ts       |   78 +-
 .../src/lib/providers/hostedSearchEvents.ts   |   53 +-
 crates/agent-gui/src/lib/providers/llm.ts     |  209 +--
 .../providers/nativeResponsesAttachments.ts   |   33 +-
 crates/agent-gui/src/lib/providers/proxy.ts   |    4 +-
 crates/agent-gui/src/lib/settings/index.ts    |   79 +-
 crates/agent-gui/src/lib/settings/storage.ts  |   26 +-
 crates/agent-gui/src/lib/settings/sync.ts     |   30 +-
 crates/agent-gui/src/lib/shared/utils.ts      |    2 +-
 crates/agent-gui/src/lib/skills/builtin.ts    |    4 +-
 crates/agent-gui/src/lib/skills/clawHub.ts    |   14 +-
 crates/agent-gui/src/lib/skills/index.ts      |   72 +-
 .../src/lib/tools/bashTimeoutPolicy.ts        |   10 +-
 .../src/lib/tools/builtinRegistry.ts          |   46 +-
 .../agent-gui/src/lib/tools/builtinTypes.ts   |   11 +-
 crates/agent-gui/src/lib/tools/cronTools.ts   |   98 +-
 .../src/lib/tools/customSystemTools.ts        |   13 +-
 .../lib/tools/delegate/createDelegateTools.ts |  282 ++--
 .../src/lib/tools/delegate/history.ts         |   11 +-
 .../src/lib/tools/delegate/identity.ts        |   31 +-
 .../agent-gui/src/lib/tools/delegate/input.ts |   69 +-
 .../src/lib/tools/delegate/messageTools.ts    |   25 +-
 .../src/lib/tools/delegate/prompts.ts         |   19 +-
 .../src/lib/tools/delegate/results.ts         |   12 +-
 .../src/lib/tools/delegate/schema.ts          |  147 +-
 .../src/lib/tools/delegate/toolSelection.ts   |    3 +-
 .../agent-gui/src/lib/tools/delegate/types.ts |    7 +-
 .../agent-gui/src/lib/tools/delegate/utils.ts |    4 +-
 .../src/lib/tools/delegate/worktree.ts        |   10 +-
 .../agent-gui/src/lib/tools/fileToolState.ts  |  122 +-
 crates/agent-gui/src/lib/tools/fsTools.ts     |  310 +++--
 .../src/lib/tools/mcpManagerTools.ts          |  106 +-
 crates/agent-gui/src/lib/tools/mcpTools.ts    |   23 +-
 crates/agent-gui/src/lib/tools/memoryTools.ts |   99 +-
 crates/agent-gui/src/lib/tools/pathUtils.ts   |    3 +-
 crates/agent-gui/src/lib/tools/shellTools.ts  |  214 +--
 .../src/lib/tools/skillAccessPolicy.ts        |   53 +-
 crates/agent-gui/src/lib/tools/skillTools.ts  |  119 +-
 crates/agent-gui/src/pages/ChatPage.tsx       |  678 ++++-----
 crates/agent-gui/src/pages/SettingsPage.tsx   |   23 +-
 .../src/pages/chat/AssistantBubble.tsx        |  515 ++++---
 .../agent-gui/src/pages/chat/ChatHeader.tsx   |    2 +-
 .../src/pages/chat/chatPageRuntime.ts         |    7 +-
 .../src/pages/chat/conversationTitleJob.ts    |   10 +-
 .../src/pages/chat/gatewayBridgeTypes.ts      |   10 +-
 .../pages/chat/runAgentConversationTurn.ts    |  146 +-
 .../src/pages/chat/runTextConversationTurn.ts |   58 +-
 .../src/pages/chat/silentMemoryExtraction.ts  |   59 +-
 .../src/pages/chat/useChatHistoryList.ts      |   37 +-
 .../src/pages/chat/useChatPageRuntimeStore.ts |   15 +-
 .../agent-gui/src/pages/chat/useChatSkills.ts |   84 +-
 .../chat/useConversationHistoryActions.ts     |   34 +-
 .../agent-gui/src/pages/chat/useEditResend.ts |   21 +-
 .../src/pages/chat/useGatewayBridgeBatcher.ts |    2 +-
 .../pages/chat/useGatewayBridgeListeners.ts   |   43 +-
 .../pages/chat/useLiveTranscriptController.ts |   39 +-
 .../src/pages/chat/usePendingUploads.ts       |  285 ++--
 .../src/pages/mcp-hub/McpHubPage.tsx          |   15 +-
 .../src/pages/mcp-hub/McpRegistryBrowser.tsx  |  186 +--
 .../src/pages/mcp-hub/McpServersForm.tsx      |   46 +-
 .../src/pages/settings/AboutSection.tsx       |    8 +-
 .../settings/AgentPromptTemplateModal.tsx     |    2 +-
 .../src/pages/settings/AgentsSection.tsx      |   19 +-
 .../src/pages/settings/CronSection.tsx        |   39 +-
 .../src/pages/settings/CronTaskModal.tsx      |  113 +-
 .../src/pages/settings/CronTaskViewModal.tsx  |   34 +-
 .../src/pages/settings/HookModal.tsx          |   26 +-
 .../src/pages/settings/HooksSection.tsx       |   36 +-
 .../src/pages/settings/ProvidersSection.tsx   |   29 +-
 .../src/pages/settings/RemoteSection.tsx      |   13 +-
 .../src/pages/settings/SkillsSettingsForm.tsx |   15 +-
 .../src/pages/settings/SystemSettingsForm.tsx |   24 +-
 .../agent-gui/src/pages/settings/hookUtils.ts |   14 +-
 .../agent-gui/src/pages/settings/shared.tsx   |    5 +-
 .../src/pages/settings/taskConfigUtils.ts     |    9 +-
 .../src/pages/skills-hub/SkillsHubPage.tsx    |  614 +++++----
 120 files changed, 5095 insertions(+), 5221 deletions(-)

diff --git a/crates/agent-gui/src/App.tsx b/crates/agent-gui/src/App.tsx
index d88fcd238..2302b5aab 100644
--- a/crates/agent-gui/src/App.tsx
+++ b/crates/agent-gui/src/App.tsx
@@ -1,8 +1,11 @@
-import { useCallback, useEffect, useMemo, useRef, useState, type ReactNode } from "react";
 import type { Context } from "@mariozechner/pi-ai";
 import { listen } from "@tauri-apps/api/event";
-
-import { getDefaultSettings, normalizeSettings, type AppSettings } from "./lib/settings";
+import { type ReactNode, useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { CronPromptRunner } from "./components/cron/CronPromptRunner";
+import { MemoryOrganizerRunner } from "./components/memory/MemoryOrganizerRunner";
+import { WindowsTitleBar } from "./components/WindowsTitleBar";
+import { LocaleContext, t as translate } from "./i18n";
+import { type AppSettings, getDefaultSettings, normalizeSettings } from "./lib/settings";
 import {
   loadPersistedSettingsWithDefaults,
   persistSettings,
@@ -14,10 +17,6 @@ import {
   buildGatewaySettingsSyncPayload,
   type GatewaySettingsSyncPayload,
 } from "./lib/settings/sync";
-import { LocaleContext, t as translate } from "./i18n";
-import { CronPromptRunner } from "./components/cron/CronPromptRunner";
-import { MemoryOrganizerRunner } from "./components/memory/MemoryOrganizerRunner";
-import { WindowsTitleBar } from "./components/WindowsTitleBar";
 import { ChatPage } from "./pages/ChatPage";
 import { SettingsPage } from "./pages/SettingsPage";
 import type { SectionId } from "./pages/settings/types";
@@ -140,48 +139,49 @@ export default function App() {
     };
   }, []);
 
-  const queueSettingsSave = useCallback((
-    prev: AppSettings,
-    next: AppSettings,
-    fallback: string,
-    publishSync: boolean,
-  ) => {
-    const saveSequence = ++saveSequenceRef.current;
-    setSettingsSaveState({ status: "saving" });
+  const queueSettingsSave = useCallback(
+    (prev: AppSettings, next: AppSettings, fallback: string, publishSync: boolean) => {
+      const saveSequence = ++saveSequenceRef.current;
+      setSettingsSaveState({ status: "saving" });
 
-    saveChainRef.current = saveChainRef.current
-      .catch(() => undefined)
-      .then(() => persistSettings(prev, next))
-      .then(async () => {
-        if (publishSync) {
-          await publishGatewaySettingsSync(next);
-        }
-      })
-      .then(() => {
-        if (saveSequenceRef.current === saveSequence) {
-          setSettingsSaveState({ status: "saved" });
-        }
-      })
-      .catch((error) => {
-        if (saveSequenceRef.current === saveSequence) {
-          setSettingsSaveState({
-            status: "error",
-            message: asErrorMessage(error, fallback),
-          });
-        }
-      });
-  }, []);
+      saveChainRef.current = saveChainRef.current
+        .catch(() => undefined)
+        .then(() => persistSettings(prev, next))
+        .then(async () => {
+          if (publishSync) {
+            await publishGatewaySettingsSync(next);
+          }
+        })
+        .then(() => {
+          if (saveSequenceRef.current === saveSequence) {
+            setSettingsSaveState({ status: "saved" });
+          }
+        })
+        .catch((error) => {
+          if (saveSequenceRef.current === saveSequence) {
+            setSettingsSaveState({
+              status: "error",
+              message: asErrorMessage(error, fallback),
+            });
+          }
+        });
+    },
+    [],
+  );
 
-  const setSettings = useCallback((updater: (prev: AppSettings) => AppSettings) => {
-    setSettingsState((prev) => {
-      const next = applyRuntimeSystemDefaults(
-        normalizeSettings(updater(prev)),
-        defaultWorkdirRef.current,
-      );
-      queueSettingsSave(prev, next, "保存设置失败。", hasSettingsSyncChanged(prev, next));
-      return next;
-    });
-  }, [queueSettingsSave]);
+  const setSettings = useCallback(
+    (updater: (prev: AppSettings) => AppSettings) => {
+      setSettingsState((prev) => {
+        const next = applyRuntimeSystemDefaults(
+          normalizeSettings(updater(prev)),
+          defaultWorkdirRef.current,
+        );
+        queueSettingsSave(prev, next, "保存设置失败。", hasSettingsSyncChanged(prev, next));
+        return next;
+      });
+    },
+    [queueSettingsSave],
+  );
 
   const reloadPersistedSettings = useCallback(async () => {
     await saveChainRef.current.catch(() => undefined);
@@ -198,18 +198,21 @@ export default function App() {
     }));
   }, [setSettings]);
 
-  const openSettings = useCallback((section: SectionId = "system") => {
-    setSettingsSection(section);
-    setSettingsOpen(true);
-    setOverlay("entering");
-    requestAnimationFrame(() => requestAnimationFrame(() => setOverlay("open")));
-    void reloadPersistedSettings().catch((error) => {
-      setSettingsSaveState({
-        status: "error",
-        message: asErrorMessage(error, "重新加载设置失败，当前显示的是旧配置。"),
+  const openSettings = useCallback(
+    (section: SectionId = "system") => {
+      setSettingsSection(section);
+      setSettingsOpen(true);
+      setOverlay("entering");
+      requestAnimationFrame(() => requestAnimationFrame(() => setOverlay("open")));
+      void reloadPersistedSettings().catch((error) => {
+        setSettingsSaveState({
+          status: "error",
+          message: asErrorMessage(error, "重新加载设置失败，当前显示的是旧配置。"),
+        });
       });
-    });
-  }, [reloadPersistedSettings]);
+    },
+    [reloadPersistedSettings],
+  );
 
   const closeSettings = useCallback(() => {
     setOverlay("leaving");
@@ -223,10 +226,13 @@ export default function App() {
   }, [overlay]);
 
   // 构建 locale context value，避免每次渲染重新创建
-  const localeContextValue = useMemo(() => ({
-    locale: settings.locale,
-    t: (key: string) => translate(key, settings.locale),
-  }), [settings.locale]);
+  const localeContextValue = useMemo(
+    () => ({
+      locale: settings.locale,
+      t: (key: string) => translate(key, settings.locale),
+    }),
+    [settings.locale],
+  );
 
   useEffect(() => {
     if (!settingsReady) {
diff --git a/crates/agent-gui/src/components/Markdown.tsx b/crates/agent-gui/src/components/Markdown.tsx
index 835810455..2b264d113 100644
--- a/crates/agent-gui/src/components/Markdown.tsx
+++ b/crates/agent-gui/src/components/Markdown.tsx
@@ -1,22 +1,21 @@
-import { memo, useLayoutEffect, useRef, type ComponentProps } from "react";
 import { cjk } from "@streamdown/cjk";
 import { code } from "@streamdown/code";
 import { math } from "@streamdown/math";
 import { mermaid } from "@streamdown/mermaid";
 import { openUrl } from "@tauri-apps/plugin-opener";
-import { Copy, ExternalLink, X } from "./icons";
+import { type ComponentProps, memo, useLayoutEffect, useRef } from "react";
+import remarkBreaks from "remark-breaks";
 import {
-  Streamdown,
-  defaultRemarkPlugins,
   type Components,
+  defaultRemarkPlugins,
   type ExtraProps,
   type LinkSafetyModalProps,
+  Streamdown,
   type StreamdownTranslations,
 } from "streamdown";
-import remarkBreaks from "remark-breaks";
-
-import { Button } from "./ui/button";
 import { cn } from "../lib/shared/utils";
+import { Copy, ExternalLink, X } from "./icons";
+import { Button } from "./ui/button";
 
 type MarkdownProps = {
   content: string;
@@ -165,12 +164,7 @@ const streamdownTranslations = {
   viewFullscreen: "全屏查看",
 } satisfies Partial<StreamdownTranslations>;
 
-function ExternalLinkModal({
-  isOpen,
-  onClose,
-  onConfirm,
-  url,
-}: LinkSafetyModalProps) {
+function ExternalLinkModal({ isOpen, onClose, onConfirm, url }: LinkSafetyModalProps) {
   if (!isOpen) {
     return null;
   }
diff --git a/crates/agent-gui/src/components/WindowsTitleBar.tsx b/crates/agent-gui/src/components/WindowsTitleBar.tsx
index 63d2118a9..a0c0042be 100644
--- a/crates/agent-gui/src/components/WindowsTitleBar.tsx
+++ b/crates/agent-gui/src/components/WindowsTitleBar.tsx
@@ -1,10 +1,10 @@
-import { useCallback, useEffect, useRef, useState, type MouseEvent } from "react";
 import { getCurrentWindow } from "@tauri-apps/api/window";
+import { type MouseEvent, useCallback, useEffect, useRef, useState } from "react";
 
 import iconSimpleUrl from "../../src-tauri/icons/icon-simple.png";
-import { Maximize2, Minimize2, Minus, X } from "./icons";
 import { useLocale } from "../i18n";
 import { cn } from "../lib/shared/utils";
+import { Maximize2, Minimize2, Minus, X } from "./icons";
 
 type TauriRuntimeWindow = Window & {
   __TAURI__?: unknown;
@@ -122,14 +122,17 @@ export function WindowsTitleBar() {
     };
   }, [getAppWindow, isVisible, syncMaximized]);
 
-  const startDragging = useCallback((event: MouseEvent<HTMLDivElement>) => {
-    if (event.button !== 0 || event.detail !== 1) {
-      return;
-    }
-    void getAppWindow()
-      .startDragging()
-      .catch((error) => reportWindowChromeError("drag", error));
-  }, [getAppWindow]);
+  const startDragging = useCallback(
+    (event: MouseEvent<HTMLDivElement>) => {
+      if (event.button !== 0 || event.detail !== 1) {
+        return;
+      }
+      void getAppWindow()
+        .startDragging()
+        .catch((error) => reportWindowChromeError("drag", error));
+    },
+    [getAppWindow],
+  );
 
   const toggleMaximize = useCallback(() => {
     const appWindow = getAppWindow();
@@ -140,12 +143,15 @@ export function WindowsTitleBar() {
       .catch((error) => reportWindowChromeError("toggle maximized state for", error));
   }, [getAppWindow]);
 
-  const handleTitleDoubleClick = useCallback((event: MouseEvent<HTMLDivElement>) => {
-    if (event.button !== 0) {
-      return;
-    }
-    toggleMaximize();
-  }, [toggleMaximize]);
+  const handleTitleDoubleClick = useCallback(
+    (event: MouseEvent<HTMLDivElement>) => {
+      if (event.button !== 0) {
+        return;
+      }
+      toggleMaximize();
+    },
+    [toggleMaximize],
+  );
 
   const minimizeWindow = useCallback(() => {
     void getAppWindow()
diff --git a/crates/agent-gui/src/components/chat/ChatHistorySidebar.tsx b/crates/agent-gui/src/components/chat/ChatHistorySidebar.tsx
index a636d1a75..5f6b563c8 100644
--- a/crates/agent-gui/src/components/chat/ChatHistorySidebar.tsx
+++ b/crates/agent-gui/src/components/chat/ChatHistorySidebar.tsx
@@ -1,14 +1,9 @@
-import {
-  memo,
-  useCallback,
-  useEffect,
-  useMemo,
-  useRef,
-  useState,
-} from "react";
 import { useVirtualizer } from "@tanstack/react-virtual";
+import { memo, useCallback, useEffect, useMemo, useRef, useState } from "react";
 import iconSimpleUrl from "../../../src-tauri/icons/icon-simple.png";
 import { useLocale } from "../../i18n";
+import type { ChatHistorySummary } from "../../lib/chat/history/chatHistory";
+import { cn } from "../../lib/shared/utils";
 import {
   Edit3,
   Link2,
@@ -23,9 +18,6 @@ import {
   SquarePen,
   Trash2,
 } from "../icons";
-
-import type { ChatHistorySummary } from "../../lib/chat/history/chatHistory";
-import { cn } from "../../lib/shared/utils";
 import { Button } from "../ui/button";
 import {
   DropdownMenu,
@@ -167,9 +159,7 @@ const HistoryRow = memo(function HistoryRow(props: {
         <p className="truncate text-sm leading-5 text-foreground/80">
           删除「<span className="font-medium text-foreground">{item.title}</span>」？
         </p>
-        <p className="mt-0.5 text-[11px] leading-4 text-muted-foreground">
-          此操作无法撤销
-        </p>
+        <p className="mt-0.5 text-[11px] leading-4 text-muted-foreground">此操作无法撤销</p>
         <div className="mt-2 grid grid-cols-2 gap-1.5">
           <Button
             type="button"
@@ -239,9 +229,7 @@ const HistoryRow = memo(function HistoryRow(props: {
             )}
             title={item.title}
           >
-            <span className="block truncate text-sm font-medium leading-5">
-              {item.title}
-            </span>
+            <span className="block truncate text-sm font-medium leading-5">{item.title}</span>
           </button>
 
           <div className="flex items-center gap-1.5">
@@ -288,9 +276,7 @@ const HistoryRow = memo(function HistoryRow(props: {
                     onPointerDown={(e: React.PointerEvent<HTMLButtonElement>) =>
                       e.stopPropagation()
                     }
-                    onClick={(e: React.MouseEvent<HTMLButtonElement>) =>
-                      e.stopPropagation()
-                    }
+                    onClick={(e: React.MouseEvent<HTMLButtonElement>) => e.stopPropagation()}
                     className={cn(
                       "h-8 w-8 shrink-0 rounded-xl text-muted-foreground opacity-0 pointer-events-none transition-[opacity,colors]",
                       "hover:bg-muted/70 hover:text-foreground",
@@ -363,7 +349,9 @@ function SidebarStateCard(props: {
           : "border-border/60 bg-background/70 text-muted-foreground",
       )}
     >
-      <div className={cn("font-medium", tone === "error" ? "text-destructive" : "text-foreground/85")}>
+      <div
+        className={cn("font-medium", tone === "error" ? "text-destructive" : "text-foreground/85")}
+      >
         {title}
       </div>
       {description ? <div className="mt-1 text-xs leading-5">{description}</div> : null}
@@ -420,10 +408,7 @@ export const ChatHistorySidebar = memo(function ChatHistorySidebar(props: ChatHi
     [items, sharedConversationCountProp],
   );
   const historyScrollRef = useRef<HTMLDivElement | null>(null);
-  const getHistoryItemKey = useCallback(
-    (index: number) => items[index]?.id ?? index,
-    [items],
-  );
+  const getHistoryItemKey = useCallback((index: number) => items[index]?.id ?? index, [items]);
   const historyVirtualizer = useVirtualizer({
     count: items.length,
     getScrollElement: () => historyScrollRef.current,
@@ -433,9 +418,7 @@ export const ChatHistorySidebar = memo(function ChatHistorySidebar(props: ChatHi
   });
   const virtualHistoryRows = historyVirtualizer.getVirtualItems();
   const lastVirtualHistoryIndex =
-    virtualHistoryRows.length > 0
-      ? virtualHistoryRows[virtualHistoryRows.length - 1].index
-      : -1;
+    virtualHistoryRows.length > 0 ? virtualHistoryRows[virtualHistoryRows.length - 1].index : -1;
 
   useEffect(() => {
     if (
@@ -642,10 +625,7 @@ export const ChatHistorySidebar = memo(function ChatHistorySidebar(props: ChatHi
               </p>
             </div>
           ) : (
-            <div
-              className="relative"
-              style={{ height: historyVirtualizer.getTotalSize() }}
-            >
+            <div className="relative" style={{ height: historyVirtualizer.getTotalSize() }}>
               {virtualHistoryRows.map((virtualRow) => {
                 const item = items[virtualRow.index];
                 if (!item) return null;
diff --git a/crates/agent-gui/src/components/chat/HistoryShareModal.tsx b/crates/agent-gui/src/components/chat/HistoryShareModal.tsx
index 87f035c6e..2312d7c89 100644
--- a/crates/agent-gui/src/components/chat/HistoryShareModal.tsx
+++ b/crates/agent-gui/src/components/chat/HistoryShareModal.tsx
@@ -1,22 +1,11 @@
 import { useEffect, useMemo, useState } from "react";
 import { createPortal } from "react-dom";
-import {
-  Check,
-  Copy,
-  Eye,
-  ExternalLink,
-  EyeOff,
-  Link2,
-  Loader2,
-  Share2,
-  X,
-} from "../icons";
-
 import type {
   ChatHistoryShareStatus,
   ChatHistorySummary,
 } from "../../lib/chat/history/chatHistory";
 import { cn } from "../../lib/shared/utils";
+import { Check, Copy, ExternalLink, Eye, EyeOff, Link2, Loader2, Share2, X } from "../icons";
 import { Button } from "../ui/button";
 
 type HistoryShareModalProps = {
@@ -131,11 +120,7 @@ function RedactionPicker(props: {
   );
 }
 
-function ShareSwitch(props: {
-  checked: boolean;
-  disabled: boolean;
-  onToggle: () => void;
-}) {
+function ShareSwitch(props: { checked: boolean; disabled: boolean; onToggle: () => void }) {
   const { checked, disabled, onToggle } = props;
   return (
     <button
@@ -176,7 +161,7 @@ export function HistoryShareModal({
   const [copied, setCopied] = useState(false);
   const [redactToolContent, setRedactToolContent] = useState(false);
   const publicOrigin = resolveShareOrigin(shareOrigin);
-  const token = share?.enabled === true ? share.token?.trim() ?? "" : "";
+  const token = share?.enabled === true ? (share.token?.trim() ?? "") : "";
   const shareUrl = useMemo(() => buildShareUrl(token, publicOrigin), [publicOrigin, token]);
   const isEnabled = share?.enabled === true;
   const isBusy = isLoading || isUpdating;
@@ -226,7 +211,10 @@ export function HistoryShareModal({
             </div>
             <div className="min-w-0">
               <div className="text-sm font-semibold text-foreground">分享会话</div>
-              <div className="mt-1 truncate text-xs text-muted-foreground" title={conversation.title}>
+              <div
+                className="mt-1 truncate text-xs text-muted-foreground"
+                title={conversation.title}
+              >
                 {conversation.title}
               </div>
             </div>
@@ -279,11 +267,7 @@ export function HistoryShareModal({
                       : "border-border/60 bg-background text-muted-foreground",
                   )}
                 >
-                  {redactToolContent ? (
-                    <EyeOff className="h-4 w-4" />
-                  ) : (
-                    <Eye className="h-4 w-4" />
-                  )}
+                  {redactToolContent ? <EyeOff className="h-4 w-4" /> : <Eye className="h-4 w-4" />}
                 </div>
                 <div className="min-w-0 flex-1">
                   <span className="text-sm font-medium text-foreground">工具调用脱敏</span>
diff --git a/crates/agent-gui/src/components/chat/MentionComposer.tsx b/crates/agent-gui/src/components/chat/MentionComposer.tsx
index a98909563..0ad0dcd2d 100644
--- a/crates/agent-gui/src/components/chat/MentionComposer.tsx
+++ b/crates/agent-gui/src/components/chat/MentionComposer.tsx
@@ -1,8 +1,10 @@
-import { fileIconSvg, folderIconSvg } from "../icons";
-import { getFileTypeIcon } from "./fileTypeIcons";
+import { invoke } from "@tauri-apps/api/core";
 import {
+  type ClipboardEvent,
   forwardRef,
+  type KeyboardEvent,
   memo,
+  type RefObject,
   useCallback,
   useEffect,
   useImperativeHandle,
@@ -10,13 +12,11 @@ import {
   useMemo,
   useRef,
   useState,
-  type ClipboardEvent,
-  type KeyboardEvent,
-  type RefObject,
 } from "react";
 import { createPortal } from "react-dom";
-import { invoke } from "@tauri-apps/api/core";
 import { cn } from "../../lib/shared/utils";
+import { fileIconSvg, folderIconSvg } from "../icons";
+import { getFileTypeIcon } from "./fileTypeIcons";
 
 /* ------------------------------------------------------------------ */
 /*  Types                                                              */
@@ -178,7 +178,10 @@ function serializeChildrenToSegments(
       const mentionPath = el.getAttribute(MENTION_TAG_ATTR);
       if (mentionPath) {
         const kind = el.getAttribute(MENTION_KIND_ATTR);
-        pushTextSegment(parts, formatMentionReference(mentionPath, kind === "dir" ? "dir" : "file"));
+        pushTextSegment(
+          parts,
+          formatMentionReference(mentionPath, kind === "dir" ? "dir" : "file"),
+        );
       } else if (el.hasAttribute(SKILL_MENTION_NAME_ATTR)) {
         const name = el.getAttribute(SKILL_MENTION_NAME_ATTR)?.trim() ?? "";
         const skillFile = el.getAttribute(SKILL_MENTION_FILE_ATTR)?.trim() ?? "";
@@ -355,9 +358,7 @@ function isActiveImeKeyboardEvent(event: KeyboardEvent<HTMLDivElement>) {
 function isEnterKeyboardEvent(event: KeyboardEvent<HTMLDivElement>) {
   const nativeEvent = event.nativeEvent as globalThis.KeyboardEvent;
   return (
-    event.key === "Enter" ||
-    nativeEvent.code === "Enter" ||
-    nativeEvent.code === "NumpadEnter"
+    event.key === "Enter" || nativeEvent.code === "Enter" || nativeEvent.code === "NumpadEnter"
   );
 }
 
@@ -685,7 +686,8 @@ function chipBeforeCursor(root: HTMLElement): HTMLElement | null {
         el.hasAttribute(MENTION_TAG_ATTR) ||
         el.hasAttribute(SKILL_MENTION_NAME_ATTR) ||
         el.hasAttribute(LARGE_PASTE_TAG_ATTR)
-      ) return el;
+      )
+        return el;
     }
   }
 
@@ -700,7 +702,8 @@ function chipBeforeCursor(root: HTMLElement): HTMLElement | null {
         ce.hasAttribute(MENTION_TAG_ATTR) ||
         ce.hasAttribute(SKILL_MENTION_NAME_ATTR) ||
         ce.hasAttribute(LARGE_PASTE_TAG_ATTR)
-      ) return ce;
+      )
+        return ce;
     }
   }
 
@@ -778,9 +781,7 @@ function Popup({
         {isLoading && (
           <div className="px-3 py-2 text-xs text-muted-foreground">Indexing files...</div>
         )}
-        {error && !isLoading && (
-          <div className="px-3 py-2 text-xs text-destructive">{error}</div>
-        )}
+        {error && !isLoading && <div className="px-3 py-2 text-xs text-destructive">{error}</div>}
         {suggestions.map((suggestion, i) => {
           const isSkill = suggestion.type === "skill";
           const entry = suggestion.type === "file" ? suggestion.entry : null;
@@ -794,7 +795,9 @@ function Popup({
           const subtitle = skill?.description ?? (dirPath ? `${dirPath}/` : "");
           return (
             <div
-              key={entry ? `${entry.kind}:${entry.path}` : `skill:${skill?.skillFile ?? skill?.name}`}
+              key={
+                entry ? `${entry.kind}:${entry.path}` : `skill:${skill?.skillFile ?? skill?.name}`
+              }
               ref={i === highlightIndex ? hlRef : undefined}
               className={cn(
                 "mention-popup-item group mx-1.5 flex cursor-pointer items-center gap-2.5 rounded-xl px-2.5 py-1.5 text-sm transition-all",
@@ -813,11 +816,15 @@ function Popup({
                   isSkill
                     ? "bg-violet-500/10 text-violet-700 dark:bg-violet-400/15 dark:text-violet-300"
                     : isDir
-                    ? "bg-amber-500/10 dark:bg-amber-400/15"
-                    : "bg-foreground/[0.04] dark:bg-white/[0.05]",
+                      ? "bg-amber-500/10 dark:bg-amber-400/15"
+                      : "bg-foreground/[0.04] dark:bg-white/[0.05]",
                 )}
               >
-                {Icon ? <Icon width={14} height={14} /> : <span className="text-[12px] font-semibold">$</span>}
+                {Icon ? (
+                  <Icon width={14} height={14} />
+                ) : (
+                  <span className="text-[12px] font-semibold">$</span>
+                )}
               </span>
               <span className="min-w-0 flex-1 truncate">
                 <span className="font-medium tracking-tight text-foreground/95">{title}</span>
@@ -829,10 +836,12 @@ function Popup({
                 <span className="shrink-0 text-[10px] uppercase tracking-wider text-muted-foreground/60">
                   skill
                 </span>
-              ) : isDir && (
-                <span className="shrink-0 text-[10px] uppercase tracking-wider text-muted-foreground/60">
-                  dir
-                </span>
+              ) : (
+                isDir && (
+                  <span className="shrink-0 text-[10px] uppercase tracking-wider text-muted-foreground/60">
+                    dir
+                  </span>
+                )
               )}
             </div>
           );
@@ -850,656 +859,661 @@ function Popup({
 /*  MentionComposer                                                    */
 /* ------------------------------------------------------------------ */
 
-export const MentionComposer = memo(forwardRef<MentionComposerHandle, MentionComposerProps>(function MentionComposer({
-  onSend,
-  onEmptyChange,
-  onBusyChange,
-  onPasteFiles,
-  disabled = false,
-  placeholder = "",
-  workdir,
-  enabledSkills = [],
-  className,
-}: MentionComposerProps, ref) {
-  const editorRef = useRef<HTMLDivElement>(null);
-  const wrapperRef = useRef<HTMLDivElement>(null);
-  const [isEmpty, setIsEmpty] = useState(true);
-  const lastIsEmptyRef = useRef(true);
-  const isComposingRef = useRef(false);
-  const compositionEnterKeyRef = useRef(false);
-  const lastCompositionEndAtRef = useRef(0);
-  const imeEnterSuppressUntilRef = useRef(0);
-  const busyReleaseTimerRef = useRef<number | null>(null);
-  const isBusyRef = useRef(false);
-  const largePastesRef = useRef(new Map<string, MentionComposerLargePaste>());
-  const largePasteCounterRef = useRef(0);
-
-  const setBusy = useCallback(
-    (nextBusy: boolean) => {
-      if (isBusyRef.current === nextBusy) return;
-      isBusyRef.current = nextBusy;
-      onBusyChange?.(nextBusy);
-    },
-    [onBusyChange],
-  );
+export const MentionComposer = memo(
+  forwardRef<MentionComposerHandle, MentionComposerProps>(function MentionComposer(
+    {
+      onSend,
+      onEmptyChange,
+      onBusyChange,
+      onPasteFiles,
+      disabled = false,
+      placeholder = "",
+      workdir,
+      enabledSkills = [],
+      className,
+    }: MentionComposerProps,
+    ref,
+  ) {
+    const editorRef = useRef<HTMLDivElement>(null);
+    const wrapperRef = useRef<HTMLDivElement>(null);
+    const [isEmpty, setIsEmpty] = useState(true);
+    const lastIsEmptyRef = useRef(true);
+    const isComposingRef = useRef(false);
+    const compositionEnterKeyRef = useRef(false);
+    const lastCompositionEndAtRef = useRef(0);
+    const imeEnterSuppressUntilRef = useRef(0);
+    const busyReleaseTimerRef = useRef<number | null>(null);
+    const isBusyRef = useRef(false);
+    const largePastesRef = useRef(new Map<string, MentionComposerLargePaste>());
+    const largePasteCounterRef = useRef(0);
+
+    const setBusy = useCallback(
+      (nextBusy: boolean) => {
+        if (isBusyRef.current === nextBusy) return;
+        isBusyRef.current = nextBusy;
+        onBusyChange?.(nextBusy);
+      },
+      [onBusyChange],
+    );
 
-  const scheduleBusyRelease = useCallback(() => {
-    if (busyReleaseTimerRef.current !== null) {
-      window.clearTimeout(busyReleaseTimerRef.current);
-    }
-    busyReleaseTimerRef.current = window.setTimeout(() => {
-      busyReleaseTimerRef.current = null;
-      setBusy(false);
-    }, 140);
-  }, [setBusy]);
-
-  // ---- File list ----
-  const normalizedWorkdir = workdir.trim();
-  const [mentionSessionEntries, setMentionSessionEntries] = useState<MentionFileEntry[]>([]);
-  const [mentionSessionLoading, setMentionSessionLoading] = useState(false);
-  const [mentionSessionError, setMentionSessionError] = useState<string | null>(null);
-  const mentionSessionRequestSeqRef = useRef(0);
-  const mentionActiveRef = useRef(false);
-  const mentionSessionQueryRef = useRef("");
-
-  // ---- Mention state ----
-  const [mentionCtx, setMentionCtx] = useState<MentionContext | null>(null);
-  const [highlightIdx, setHighlightIdx] = useState(0);
-
-  const resetMentionSession = useCallback(() => {
-    mentionSessionRequestSeqRef.current += 1;
-    mentionSessionQueryRef.current = "";
-    setMentionSessionEntries([]);
-    setMentionSessionLoading(false);
-    setMentionSessionError(null);
-  }, []);
-
-  const closeMentionSession = useCallback(() => {
-    mentionActiveRef.current = false;
-    setMentionCtx(null);
-    setHighlightIdx(0);
-    resetMentionSession();
-  }, [resetMentionSession]);
-
-  const startMentionSession = useCallback(
-    (ctx: MentionContext) => {
-      const requestSeq = ++mentionSessionRequestSeqRef.current;
-      mentionSessionQueryRef.current = ctx.query;
+    const scheduleBusyRelease = useCallback(() => {
+      if (busyReleaseTimerRef.current !== null) {
+        window.clearTimeout(busyReleaseTimerRef.current);
+      }
+      busyReleaseTimerRef.current = window.setTimeout(() => {
+        busyReleaseTimerRef.current = null;
+        setBusy(false);
+      }, 140);
+    }, [setBusy]);
+
+    // ---- File list ----
+    const normalizedWorkdir = workdir.trim();
+    const [mentionSessionEntries, setMentionSessionEntries] = useState<MentionFileEntry[]>([]);
+    const [mentionSessionLoading, setMentionSessionLoading] = useState(false);
+    const [mentionSessionError, setMentionSessionError] = useState<string | null>(null);
+    const mentionSessionRequestSeqRef = useRef(0);
+    const mentionActiveRef = useRef(false);
+    const mentionSessionQueryRef = useRef("");
+
+    // ---- Mention state ----
+    const [mentionCtx, setMentionCtx] = useState<MentionContext | null>(null);
+    const [highlightIdx, setHighlightIdx] = useState(0);
+
+    const resetMentionSession = useCallback(() => {
+      mentionSessionRequestSeqRef.current += 1;
+      mentionSessionQueryRef.current = "";
       setMentionSessionEntries([]);
-      setMentionSessionLoading(ctx.trigger === "file" && Boolean(normalizedWorkdir));
+      setMentionSessionLoading(false);
       setMentionSessionError(null);
+    }, []);
+
+    const closeMentionSession = useCallback(() => {
+      mentionActiveRef.current = false;
+      setMentionCtx(null);
+      setHighlightIdx(0);
+      resetMentionSession();
+    }, [resetMentionSession]);
+
+    const startMentionSession = useCallback(
+      (ctx: MentionContext) => {
+        const requestSeq = ++mentionSessionRequestSeqRef.current;
+        mentionSessionQueryRef.current = ctx.query;
+        setMentionSessionEntries([]);
+        setMentionSessionLoading(ctx.trigger === "file" && Boolean(normalizedWorkdir));
+        setMentionSessionError(null);
+
+        if (ctx.trigger === "skill") {
+          return;
+        }
+        if (!normalizedWorkdir) {
+          return;
+        }
 
-      if (ctx.trigger === "skill") {
-        return;
-      }
-      if (!normalizedWorkdir) {
-        return;
-      }
-
-      invoke<MentionListResponse>("fs_mention_list", {
-        workdir: normalizedWorkdir,
-        max_results: MENTION_INDEX_MAX_RESULTS,
-        query: ctx.query,
-      })
-        .then((resp) => {
-          if (requestSeq !== mentionSessionRequestSeqRef.current) return;
-          setMentionSessionEntries(resp.entries);
-        })
-        .catch(() => {
-          if (requestSeq !== mentionSessionRequestSeqRef.current) return;
-          setMentionSessionEntries([]);
-          setMentionSessionError("Could not index files");
+        invoke<MentionListResponse>("fs_mention_list", {
+          workdir: normalizedWorkdir,
+          max_results: MENTION_INDEX_MAX_RESULTS,
+          query: ctx.query,
         })
-        .finally(() => {
-          if (requestSeq !== mentionSessionRequestSeqRef.current) return;
-          setMentionSessionLoading(false);
-        });
-    },
-    [normalizedWorkdir],
-  );
+          .then((resp) => {
+            if (requestSeq !== mentionSessionRequestSeqRef.current) return;
+            setMentionSessionEntries(resp.entries);
+          })
+          .catch(() => {
+            if (requestSeq !== mentionSessionRequestSeqRef.current) return;
+            setMentionSessionEntries([]);
+            setMentionSessionError("Could not index files");
+          })
+          .finally(() => {
+            if (requestSeq !== mentionSessionRequestSeqRef.current) return;
+            setMentionSessionLoading(false);
+          });
+      },
+      [normalizedWorkdir],
+    );
+
+    const mentionSessionSearchIndex = useMemo<MentionSearchEntry[]>(
+      () =>
+        mentionSessionEntries.map((entry) => ({
+          entry,
+          searchPath: entry.path.toLowerCase(),
+        })),
+      [mentionSessionEntries],
+    );
+
+    useEffect(() => {
+      closeMentionSession();
+    }, [normalizedWorkdir, closeMentionSession]);
 
-  const mentionSessionSearchIndex = useMemo<MentionSearchEntry[]>(
-    () =>
-      mentionSessionEntries.map((entry) => ({
-        entry,
-        searchPath: entry.path.toLowerCase(),
-      })),
-    [mentionSessionEntries],
-  );
+    useEffect(() => {
+      return () => {
+        mentionSessionRequestSeqRef.current += 1;
+        if (busyReleaseTimerRef.current !== null) {
+          window.clearTimeout(busyReleaseTimerRef.current);
+        }
+        setBusy(false);
+      };
+    }, [setBusy]);
 
-  useEffect(() => {
-    closeMentionSession();
-  }, [normalizedWorkdir, closeMentionSession]);
+    useEffect(() => {
+      if (!disabled) return;
+      closeMentionSession();
+      setBusy(false);
+    }, [disabled, closeMentionSession, setBusy]);
 
-  useEffect(() => {
-    return () => {
-      mentionSessionRequestSeqRef.current += 1;
-      if (busyReleaseTimerRef.current !== null) {
-        window.clearTimeout(busyReleaseTimerRef.current);
+    const normalizedMentionQuery = mentionCtx ? normalizeMentionQuery(mentionCtx.query) : "";
+    const suggestions = useMemo<MentionSuggestion[]>(() => {
+      if (mentionCtx === null) {
+        return [];
       }
-      setBusy(false);
-    };
-  }, [setBusy]);
 
-  useEffect(() => {
-    if (!disabled) return;
-    closeMentionSession();
-    setBusy(false);
-  }, [disabled, closeMentionSession, setBusy]);
-
-  const normalizedMentionQuery = mentionCtx ? normalizeMentionQuery(mentionCtx.query) : "";
-  const suggestions = useMemo<MentionSuggestion[]>(() => {
-    if (mentionCtx === null) {
-      return [];
-    }
+      if (mentionCtx.trigger === "skill") {
+        const next: MentionSuggestion[] = [];
+        for (const skill of enabledSkills) {
+          const haystack = `${skill.name}\n${skill.description}\n${skill.baseDir}`.toLowerCase();
+          if (normalizedMentionQuery && !haystack.includes(normalizedMentionQuery)) {
+            continue;
+          }
+          next.push({ type: "skill", skill });
+          if (next.length >= MAX_SUGGESTIONS) {
+            break;
+          }
+        }
+        return next;
+      }
 
-    if (mentionCtx.trigger === "skill") {
       const next: MentionSuggestion[] = [];
-      for (const skill of enabledSkills) {
-        const haystack = `${skill.name}\n${skill.description}\n${skill.baseDir}`.toLowerCase();
-        if (normalizedMentionQuery && !haystack.includes(normalizedMentionQuery)) {
+      for (const item of mentionSessionSearchIndex) {
+        if (normalizedMentionQuery && !item.searchPath.includes(normalizedMentionQuery)) {
           continue;
         }
-        next.push({ type: "skill", skill });
+        next.push({ type: "file", entry: item.entry });
         if (next.length >= MAX_SUGGESTIONS) {
           break;
         }
       }
       return next;
-    }
+    }, [enabledSkills, mentionCtx, mentionSessionSearchIndex, normalizedMentionQuery]);
+
+    useEffect(() => {
+      setHighlightIdx((current) => {
+        if (suggestions.length === 0) return 0;
+        return Math.min(current, suggestions.length - 1);
+      });
+    }, [suggestions.length]);
+
+    const popupLoading = mentionSessionLoading;
+    const popupError = suggestions.length === 0 ? mentionSessionError : null;
+    const popupEmptyLabel =
+      mentionCtx?.trigger === "skill" ? "No matching enabled Skills" : "No matching files";
+    const showEmpty =
+      mentionCtx !== null && !popupLoading && !popupError && suggestions.length === 0;
+    const popupVisible =
+      mentionCtx !== null &&
+      (popupLoading || Boolean(popupError) || suggestions.length > 0 || showEmpty);
+
+    const applyEmptyState = useCallback(
+      (nextEmpty: boolean) => {
+        if (lastIsEmptyRef.current === nextEmpty) return;
+        lastIsEmptyRef.current = nextEmpty;
+        setIsEmpty(nextEmpty);
+        onEmptyChange?.(nextEmpty);
+      },
+      [onEmptyChange],
+    );
 
-    const next: MentionSuggestion[] = [];
-    for (const item of mentionSessionSearchIndex) {
-      if (normalizedMentionQuery && !item.searchPath.includes(normalizedMentionQuery)) {
-        continue;
-      }
-      next.push({ type: "file", entry: item.entry });
-      if (next.length >= MAX_SUGGESTIONS) {
-        break;
-      }
-    }
-    return next;
-  }, [enabledSkills, mentionCtx, mentionSessionSearchIndex, normalizedMentionQuery]);
+    const refreshEmptyState = useCallback(() => {
+      const el = editorRef.current;
+      if (!el) return;
+      applyEmptyState(editorTextIsEmpty(el));
+    }, [applyEmptyState]);
 
-  useEffect(() => {
-    setHighlightIdx((current) => {
-      if (suggestions.length === 0) return 0;
-      return Math.min(current, suggestions.length - 1);
-    });
-  }, [suggestions.length]);
-
-  const popupLoading = mentionSessionLoading;
-  const popupError = suggestions.length === 0 ? mentionSessionError : null;
-  const popupEmptyLabel =
-    mentionCtx?.trigger === "skill" ? "No matching enabled Skills" : "No matching files";
-  const showEmpty =
-    mentionCtx !== null &&
-    !popupLoading &&
-    !popupError &&
-    suggestions.length === 0;
-  const popupVisible =
-    mentionCtx !== null &&
-    (popupLoading || Boolean(popupError) || suggestions.length > 0 || showEmpty);
-
-  const applyEmptyState = useCallback(
-    (nextEmpty: boolean) => {
-      if (lastIsEmptyRef.current === nextEmpty) return;
-      lastIsEmptyRef.current = nextEmpty;
-      setIsEmpty(nextEmpty);
-      onEmptyChange?.(nextEmpty);
-    },
-    [onEmptyChange],
-  );
+    const buildDraft = useCallback((): MentionComposerDraft => {
+      const el = editorRef.current;
+      if (!el) {
+        return {
+          segments: [],
+          text: "",
+          textWithoutLargePastes: "",
+          largePastes: [],
+          skillMentions: [],
+          isEmpty: true,
+        };
+      }
 
-  const refreshEmptyState = useCallback(() => {
-    const el = editorRef.current;
-    if (!el) return;
-    applyEmptyState(editorTextIsEmpty(el));
-  }, [applyEmptyState]);
+      const segments = serializeChildrenToSegments(el, largePastesRef.current);
+      const largePastes: MentionComposerLargePaste[] = [];
+      const skillMentions: MentionComposerSkillMention[] = [];
+      const textParts: string[] = [];
+      const textWithoutLargePastesParts: string[] = [];
+      for (const segment of segments) {
+        if (segment.type === "text") {
+          textParts.push(segment.text);
+          textWithoutLargePastesParts.push(segment.text);
+        } else if (segment.type === "largePaste") {
+          largePastes.push(segment.paste);
+          textParts.push(segment.paste.text);
+        } else {
+          skillMentions.push(segment.skill);
+          const token = formatSkillMentionToken(segment.skill);
+          textParts.push(token);
+          textWithoutLargePastesParts.push(token);
+        }
+      }
 
-  const buildDraft = useCallback((): MentionComposerDraft => {
-    const el = editorRef.current;
-    if (!el) {
+      const text = textParts.join("").replace(/\u00A0/g, " ");
+      const textWithoutLargePastes = textWithoutLargePastesParts.join("").replace(/\u00A0/g, " ");
       return {
-        segments: [],
-        text: "",
-        textWithoutLargePastes: "",
-        largePastes: [],
-        skillMentions: [],
-        isEmpty: true,
+        segments,
+        text,
+        textWithoutLargePastes,
+        largePastes,
+        skillMentions,
+        isEmpty: editorTextIsEmpty(el),
       };
-    }
+    }, []);
 
-    const segments = serializeChildrenToSegments(el, largePastesRef.current);
-    const largePastes: MentionComposerLargePaste[] = [];
-    const skillMentions: MentionComposerSkillMention[] = [];
-    const textParts: string[] = [];
-    const textWithoutLargePastesParts: string[] = [];
-    for (const segment of segments) {
-      if (segment.type === "text") {
-        textParts.push(segment.text);
-        textWithoutLargePastesParts.push(segment.text);
-      } else if (segment.type === "largePaste") {
-        largePastes.push(segment.paste);
-        textParts.push(segment.paste.text);
-      } else {
-        skillMentions.push(segment.skill);
-        const token = formatSkillMentionToken(segment.skill);
-        textParts.push(token);
-        textWithoutLargePastesParts.push(token);
-      }
-    }
+    const createLargePaste = useCallback((text: string): MentionComposerLargePaste => {
+      const index = largePasteCounterRef.current + 1;
+      largePasteCounterRef.current = index;
+      return {
+        id: `large-paste-${Date.now()}-${crypto.randomUUID()}`,
+        label: `Pasted text ${index}`,
+        text,
+        charCount: text.length,
+        lineCount: countLargePasteLines(text),
+        preview: normalizeLargePastePreview(text),
+      };
+    }, []);
 
-    const text = textParts.join("").replace(/\u00A0/g, " ");
-    const textWithoutLargePastes = textWithoutLargePastesParts.join("").replace(/\u00A0/g, " ");
-    return {
-      segments,
-      text,
-      textWithoutLargePastes,
-      largePastes,
-      skillMentions,
-      isEmpty: editorTextIsEmpty(el),
-    };
-  }, []);
-
-  const createLargePaste = useCallback((text: string): MentionComposerLargePaste => {
-    const index = largePasteCounterRef.current + 1;
-    largePasteCounterRef.current = index;
-    return {
-      id: `large-paste-${Date.now()}-${crypto.randomUUID()}`,
-      label: `Pasted text ${index}`,
-      text,
-      charCount: text.length,
-      lineCount: countLargePasteLines(text),
-      preview: normalizeLargePastePreview(text),
-    };
-  }, []);
+    const insertLargePaste = useCallback(
+      (text: string) => {
+        const el = editorRef.current;
+        if (!el) return;
+        const paste = createLargePaste(text);
+        largePastesRef.current.set(paste.id, paste);
+        insertNodeAtCursor(el, createLargePasteChip(paste));
+        closeMentionSession();
+        refreshEmptyState();
+      },
+      [closeMentionSession, createLargePaste, refreshEmptyState],
+    );
 
-  const insertLargePaste = useCallback(
-    (text: string) => {
+    // ---- Mention detection (called after DOM updates) ----
+    const refreshMention = useCallback(() => {
       const el = editorRef.current;
       if (!el) return;
-      const paste = createLargePaste(text);
-      largePastesRef.current.set(paste.id, paste);
-      insertNodeAtCursor(el, createLargePasteChip(paste));
-      closeMentionSession();
-      refreshEmptyState();
-    },
-    [closeMentionSession, createLargePaste, refreshEmptyState],
-  );
-
-  // ---- Mention detection (called after DOM updates) ----
-  const refreshMention = useCallback(() => {
-    const el = editorRef.current;
-    if (!el) return;
-    const applyContext = (ctx: MentionContext | null) => {
-      if (ctx) {
-        if (!mentionActiveRef.current) {
-          mentionActiveRef.current = true;
-          mentionSessionQueryRef.current = ctx.query;
+      const applyContext = (ctx: MentionContext | null) => {
+        if (ctx) {
+          if (!mentionActiveRef.current) {
+            mentionActiveRef.current = true;
+            mentionSessionQueryRef.current = ctx.query;
+            setMentionCtx(ctx);
+            setHighlightIdx(0);
+            startMentionSession(ctx);
+            return;
+          }
           setMentionCtx(ctx);
-          setHighlightIdx(0);
-          startMentionSession(ctx);
-          return;
-        }
-        setMentionCtx(ctx);
-        if (ctx.query !== mentionSessionQueryRef.current) {
-          mentionSessionQueryRef.current = ctx.query;
-          setHighlightIdx(0);
-        }
-      } else if (mentionActiveRef.current) {
-        closeMentionSession();
-      }
-    };
-
-    applyContext(detectMention(el, enabledSkills.length > 0));
-    window.requestAnimationFrame(() => {
-      const nextEl = editorRef.current;
-      if (!nextEl || document.activeElement !== nextEl) return;
-      applyContext(detectMention(nextEl, enabledSkills.length > 0));
-    });
-  }, [closeMentionSession, enabledSkills.length, startMentionSession]);
-
-  useImperativeHandle(
-    ref,
-    () => ({
-      getText: () => {
-        const el = editorRef.current;
-        if (!el) return "";
-        return serializeChildren(el, largePastesRef.current).replace(/\u00A0/g, " ");
-      },
-      getDraft: buildDraft,
-      hasContent: () => !buildDraft().isEmpty,
-      setText: (text: string) => {
-        const el = editorRef.current;
-        if (!el) return;
-        el.innerHTML = "";
-        largePastesRef.current.clear();
-        if (isLargePasteText(text)) {
-          insertLargePaste(text);
-        } else {
-          el.innerText = text;
+          if (ctx.query !== mentionSessionQueryRef.current) {
+            mentionSessionQueryRef.current = ctx.query;
+            setHighlightIdx(0);
+          }
+        } else if (mentionActiveRef.current) {
           closeMentionSession();
-          refreshEmptyState();
         }
-      },
-      setDraft: (draft: MentionComposerDraft) => {
-        const el = editorRef.current;
-        if (!el) return;
-        el.innerHTML = "";
-        largePastesRef.current.clear();
+      };
 
-        if (draft.segments.length === 0 && draft.text) {
-          if (isLargePasteText(draft.text)) {
-            insertLargePaste(draft.text);
-            return;
+      applyContext(detectMention(el, enabledSkills.length > 0));
+      window.requestAnimationFrame(() => {
+        const nextEl = editorRef.current;
+        if (!nextEl || document.activeElement !== nextEl) return;
+        applyContext(detectMention(nextEl, enabledSkills.length > 0));
+      });
+    }, [closeMentionSession, enabledSkills.length, startMentionSession]);
+
+    useImperativeHandle(
+      ref,
+      () => ({
+        getText: () => {
+          const el = editorRef.current;
+          if (!el) return "";
+          return serializeChildren(el, largePastesRef.current).replace(/\u00A0/g, " ");
+        },
+        getDraft: buildDraft,
+        hasContent: () => !buildDraft().isEmpty,
+        setText: (text: string) => {
+          const el = editorRef.current;
+          if (!el) return;
+          el.innerHTML = "";
+          largePastesRef.current.clear();
+          if (isLargePasteText(text)) {
+            insertLargePaste(text);
+          } else {
+            el.innerText = text;
+            closeMentionSession();
+            refreshEmptyState();
           }
-          el.innerText = draft.text;
-        } else {
-          for (const segment of draft.segments) {
-            if (segment.type === "largePaste") {
-              largePastesRef.current.set(segment.paste.id, segment.paste);
-              el.appendChild(createLargePasteChip(segment.paste));
-            } else if (segment.type === "skillMention") {
-              el.appendChild(createSkillMentionChip(segment.skill));
-            } else if (segment.text) {
-              el.appendChild(document.createTextNode(segment.text));
+        },
+        setDraft: (draft: MentionComposerDraft) => {
+          const el = editorRef.current;
+          if (!el) return;
+          el.innerHTML = "";
+          largePastesRef.current.clear();
+
+          if (draft.segments.length === 0 && draft.text) {
+            if (isLargePasteText(draft.text)) {
+              insertLargePaste(draft.text);
+              return;
             }
+            el.innerText = draft.text;
+          } else {
+            for (const segment of draft.segments) {
+              if (segment.type === "largePaste") {
+                largePastesRef.current.set(segment.paste.id, segment.paste);
+                el.appendChild(createLargePasteChip(segment.paste));
+              } else if (segment.type === "skillMention") {
+                el.appendChild(createSkillMentionChip(segment.skill));
+              } else if (segment.text) {
+                el.appendChild(document.createTextNode(segment.text));
+              }
+            }
+            largePasteCounterRef.current = Math.max(
+              largePasteCounterRef.current,
+              largePastesRef.current.size,
+            );
           }
-          largePasteCounterRef.current = Math.max(
-            largePasteCounterRef.current,
-            largePastesRef.current.size,
-          );
-        }
 
+          closeMentionSession();
+          refreshEmptyState();
+        },
+        clear: () => {
+          const el = editorRef.current;
+          if (!el) return;
+          el.innerHTML = "";
+          largePastesRef.current.clear();
+          closeMentionSession();
+          refreshEmptyState();
+        },
+        focus: () => editorRef.current?.focus(),
+      }),
+      [buildDraft, closeMentionSession, insertLargePaste, refreshEmptyState],
+    );
+
+    // ---- Select suggestion ----
+    const selectSuggestion = useCallback(
+      (suggestion: MentionSuggestion) => {
+        if (!mentionCtx) return;
+        if (suggestion.type === "skill") {
+          insertSkillMentionChip(mentionCtx, suggestion.skill);
+        } else {
+          insertMentionChip(mentionCtx, suggestion.entry.path, suggestion.entry.kind);
+        }
         closeMentionSession();
         refreshEmptyState();
+        editorRef.current?.focus();
       },
-      clear: () => {
-        const el = editorRef.current;
-        if (!el) return;
-        el.innerHTML = "";
-        largePastesRef.current.clear();
-        closeMentionSession();
-        refreshEmptyState();
-      },
-      focus: () => editorRef.current?.focus(),
-    }),
-    [buildDraft, closeMentionSession, insertLargePaste, refreshEmptyState],
-  );
+      [closeMentionSession, mentionCtx, refreshEmptyState],
+    );
 
-  // ---- Select suggestion ----
-  const selectSuggestion = useCallback(
-    (suggestion: MentionSuggestion) => {
-      if (!mentionCtx) return;
-      if (suggestion.type === "skill") {
-        insertSkillMentionChip(mentionCtx, suggestion.skill);
-      } else {
-        insertMentionChip(mentionCtx, suggestion.entry.path, suggestion.entry.kind);
-      }
-      closeMentionSession();
+    // ---- Event handlers ----
+    const handleInput = useCallback(() => {
       refreshEmptyState();
-      editorRef.current?.focus();
-    },
-    [closeMentionSession, mentionCtx, refreshEmptyState],
-  );
-
-  // ---- Event handlers ----
-  const handleInput = useCallback(() => {
-    refreshEmptyState();
-    if (!isComposingRef.current) {
-      refreshMention();
-    }
-  }, [refreshEmptyState, refreshMention]);
-
-  const handleKeyUp = useCallback((e: KeyboardEvent<HTMLDivElement>) => {
-    if (disabled || isComposingRef.current || isImeKeyboardEvent(e)) return;
-    if (
-      e.key === "ArrowDown" ||
-      e.key === "ArrowUp" ||
-      e.key === "Tab" ||
-      e.key === "Enter" ||
-      e.key === "Escape"
-    ) {
-      return;
-    }
-    refreshMention();
-  }, [disabled, refreshMention]);
-
-  const handleKeyDown = useCallback(
-    (e: KeyboardEvent<HTMLDivElement>) => {
-      if (disabled) {
-        e.preventDefault();
-        return;
+      if (!isComposingRef.current) {
+        refreshMention();
       }
-      const isEnter = isEnterKeyboardEvent(e);
-      const isActiveCompositionKey = isComposingRef.current || isActiveImeKeyboardEvent(e);
-      const hasLegacyImeSignal = hasLegacyImeKeyboardSignal(e);
+    }, [refreshEmptyState, refreshMention]);
+
+    const handleKeyUp = useCallback(
+      (e: KeyboardEvent<HTMLDivElement>) => {
+        if (disabled || isComposingRef.current || isImeKeyboardEvent(e)) return;
+        if (
+          e.key === "ArrowDown" ||
+          e.key === "ArrowUp" ||
+          e.key === "Tab" ||
+          e.key === "Enter" ||
+          e.key === "Escape"
+        ) {
+          return;
+        }
+        refreshMention();
+      },
+      [disabled, refreshMention],
+    );
 
-      if (isActiveCompositionKey) {
-        if (isEnter && !e.shiftKey) {
-          compositionEnterKeyRef.current = true;
+    const handleKeyDown = useCallback(
+      (e: KeyboardEvent<HTMLDivElement>) => {
+        if (disabled) {
+          e.preventDefault();
+          return;
+        }
+        const isEnter = isEnterKeyboardEvent(e);
+        const isActiveCompositionKey = isComposingRef.current || isActiveImeKeyboardEvent(e);
+        const hasLegacyImeSignal = hasLegacyImeKeyboardSignal(e);
+
+        if (isActiveCompositionKey) {
+          if (isEnter && !e.shiftKey) {
+            compositionEnterKeyRef.current = true;
+            refreshEmptyState();
+            refreshMention();
+          } else {
+            compositionEnterKeyRef.current = false;
+          }
+          return;
+        }
+
+        if (isEnter && !e.shiftKey && imeEnterSuppressUntilRef.current >= performance.now()) {
+          e.preventDefault();
+          imeEnterSuppressUntilRef.current = 0;
+          compositionEnterKeyRef.current = false;
+          lastCompositionEndAtRef.current = 0;
           refreshEmptyState();
           refreshMention();
-        } else {
+          return;
+        }
+
+        const compositionEndedAgoMs = performance.now() - lastCompositionEndAtRef.current;
+        if (
+          isEnter &&
+          !e.shiftKey &&
+          lastCompositionEndAtRef.current > 0 &&
+          compositionEndedAgoMs >= 0 &&
+          compositionEndedAgoMs <= IME_COMPOSITION_END_ENTER_TAIL_MS
+        ) {
+          e.preventDefault();
+          imeEnterSuppressUntilRef.current = 0;
           compositionEnterKeyRef.current = false;
+          lastCompositionEndAtRef.current = 0;
+          refreshEmptyState();
+          refreshMention();
+          return;
         }
-        return;
-      }
 
-      if (isEnter && !e.shiftKey && imeEnterSuppressUntilRef.current >= performance.now()) {
-        e.preventDefault();
-        imeEnterSuppressUntilRef.current = 0;
-        compositionEnterKeyRef.current = false;
-        lastCompositionEndAtRef.current = 0;
-        refreshEmptyState();
-        refreshMention();
-        return;
-      }
+        // Legacy keyCode 229 is too broad in WebViews. It is still useful for
+        // ignoring non-Enter IME key noise, but should not block normal sending.
+        if (!isEnter && hasLegacyImeSignal) {
+          return;
+        }
 
-      const compositionEndedAgoMs = performance.now() - lastCompositionEndAtRef.current;
-      if (
-        isEnter &&
-        !e.shiftKey &&
-        lastCompositionEndAtRef.current > 0 &&
-        compositionEndedAgoMs >= 0 &&
-        compositionEndedAgoMs <= IME_COMPOSITION_END_ENTER_TAIL_MS
-      ) {
-        e.preventDefault();
-        imeEnterSuppressUntilRef.current = 0;
-        compositionEnterKeyRef.current = false;
-        lastCompositionEndAtRef.current = 0;
-        refreshEmptyState();
-        refreshMention();
-        return;
-      }
+        // Popup navigation
+        if (popupVisible && suggestions.length > 0) {
+          if (e.key === "ArrowDown") {
+            e.preventDefault();
+            setHighlightIdx((p) => (p + 1) % suggestions.length);
+            return;
+          }
+          if (e.key === "ArrowUp") {
+            e.preventDefault();
+            setHighlightIdx((p) => (p - 1 + suggestions.length) % suggestions.length);
+            return;
+          }
+          if (e.key === "Tab" || (e.key === "Enter" && !e.shiftKey)) {
+            e.preventDefault();
+            if (suggestions[highlightIdx]) {
+              selectSuggestion(suggestions[highlightIdx]);
+            }
+            return;
+          }
+        }
+        if (popupVisible && e.key === "Escape") {
+          e.preventDefault();
+          closeMentionSession();
+          return;
+        }
 
-      // Legacy keyCode 229 is too broad in WebViews. It is still useful for
-      // ignoring non-Enter IME key noise, but should not block normal sending.
-      if (!isEnter && hasLegacyImeSignal) {
-        return;
-      }
+        // Backspace: delete mention chip if cursor is right after one
+        if (e.key === "Backspace") {
+          const chip = chipBeforeCursor(editorRef.current!);
+          if (chip) {
+            e.preventDefault();
+            const largePasteId = chip.getAttribute(LARGE_PASTE_TAG_ATTR);
+            if (largePasteId) {
+              largePastesRef.current.delete(largePasteId);
+            }
+            chip.remove();
+            refreshEmptyState();
+            refreshMention();
+            return;
+          }
+        }
 
-      // Popup navigation
-      if (popupVisible && suggestions.length > 0) {
-        if (e.key === "ArrowDown") {
+        // Normal Enter → send
+        if (isEnter && !e.shiftKey) {
+          imeEnterSuppressUntilRef.current = 0;
+          compositionEnterKeyRef.current = false;
+          lastCompositionEndAtRef.current = 0;
           e.preventDefault();
-          setHighlightIdx((p) => (p + 1) % suggestions.length);
+          onSend();
           return;
         }
-        if (e.key === "ArrowUp") {
+
+        // Shift+Enter → line break (normalise to <br>)
+        if (isEnter && e.shiftKey) {
+          imeEnterSuppressUntilRef.current = 0;
+          compositionEnterKeyRef.current = false;
+          lastCompositionEndAtRef.current = 0;
           e.preventDefault();
-          setHighlightIdx((p) => (p - 1 + suggestions.length) % suggestions.length);
+          document.execCommand("insertLineBreak");
+          scheduleComposerSelectionScroll(editorRef.current);
+          refreshEmptyState();
+          refreshMention();
           return;
         }
-        if (e.key === "Tab" || (e.key === "Enter" && !e.shiftKey)) {
+      },
+      [
+        popupVisible,
+        suggestions,
+        highlightIdx,
+        selectSuggestion,
+        disabled,
+        closeMentionSession,
+        onSend,
+        refreshEmptyState,
+        refreshMention,
+      ],
+    );
+
+    const handlePaste = useCallback(
+      (e: ClipboardEvent<HTMLDivElement>) => {
+        if (disabled) {
           e.preventDefault();
-          if (suggestions[highlightIdx]) {
-            selectSuggestion(suggestions[highlightIdx]);
-          }
           return;
         }
-      }
-      if (popupVisible && e.key === "Escape") {
-        e.preventDefault();
-        closeMentionSession();
-        return;
-      }
-
-      // Backspace: delete mention chip if cursor is right after one
-      if (e.key === "Backspace") {
-        const chip = chipBeforeCursor(editorRef.current!);
-        if (chip) {
+        const clipboardFiles = extractClipboardFiles(e.clipboardData);
+        if (clipboardFiles.length > 0) {
           e.preventDefault();
-          const largePasteId = chip.getAttribute(LARGE_PASTE_TAG_ATTR);
-          if (largePasteId) {
-            largePastesRef.current.delete(largePasteId);
-          }
-          chip.remove();
-          refreshEmptyState();
-          refreshMention();
+          onPasteFiles?.(clipboardFiles);
           return;
         }
-      }
-
-      // Normal Enter → send
-      if (isEnter && !e.shiftKey) {
-        imeEnterSuppressUntilRef.current = 0;
-        compositionEnterKeyRef.current = false;
-        lastCompositionEndAtRef.current = 0;
         e.preventDefault();
-        onSend();
-        return;
-      }
-
-      // Shift+Enter → line break (normalise to <br>)
-      if (isEnter && e.shiftKey) {
-        imeEnterSuppressUntilRef.current = 0;
-        compositionEnterKeyRef.current = false;
-        lastCompositionEndAtRef.current = 0;
-        e.preventDefault();
-        document.execCommand("insertLineBreak");
-        scheduleComposerSelectionScroll(editorRef.current);
+        const text = e.clipboardData.getData("text/plain");
+        if (isLargePasteText(text)) {
+          insertLargePaste(text);
+          return;
+        }
+        document.execCommand("insertText", false, text);
         refreshEmptyState();
         refreshMention();
-        return;
-      }
-    },
-    [
-      popupVisible,
-      suggestions,
-      highlightIdx,
-      selectSuggestion,
-      disabled,
-      closeMentionSession,
-      onSend,
-      refreshEmptyState,
-      refreshMention,
-    ],
-  );
+      },
+      [disabled, insertLargePaste, onPasteFiles, refreshEmptyState, refreshMention],
+    );
 
-  const handlePaste = useCallback(
-    (e: ClipboardEvent<HTMLDivElement>) => {
-      if (disabled) {
-        e.preventDefault();
-        return;
-      }
-      const clipboardFiles = extractClipboardFiles(e.clipboardData);
-      if (clipboardFiles.length > 0) {
-        e.preventDefault();
-        onPasteFiles?.(clipboardFiles);
-        return;
+    const handleCompositionStart = useCallback(() => {
+      isComposingRef.current = true;
+      compositionEnterKeyRef.current = false;
+      lastCompositionEndAtRef.current = 0;
+      imeEnterSuppressUntilRef.current = 0;
+      if (busyReleaseTimerRef.current !== null) {
+        window.clearTimeout(busyReleaseTimerRef.current);
+        busyReleaseTimerRef.current = null;
       }
-      e.preventDefault();
-      const text = e.clipboardData.getData("text/plain");
-      if (isLargePasteText(text)) {
-        insertLargePaste(text);
-        return;
+      setBusy(true);
+    }, [setBusy]);
+
+    const handleCompositionEnd = useCallback(() => {
+      isComposingRef.current = false;
+      lastCompositionEndAtRef.current = performance.now();
+      if (compositionEnterKeyRef.current) {
+        imeEnterSuppressUntilRef.current = performance.now() + IME_ENTER_SUPPRESS_WINDOW_MS;
+        compositionEnterKeyRef.current = false;
       }
-      document.execCommand("insertText", false, text);
       refreshEmptyState();
       refreshMention();
-    },
-    [disabled, insertLargePaste, onPasteFiles, refreshEmptyState, refreshMention],
-  );
+      scheduleBusyRelease();
+    }, [refreshEmptyState, refreshMention, scheduleBusyRelease]);
 
-  const handleCompositionStart = useCallback(() => {
-    isComposingRef.current = true;
-    compositionEnterKeyRef.current = false;
-    lastCompositionEndAtRef.current = 0;
-    imeEnterSuppressUntilRef.current = 0;
-    if (busyReleaseTimerRef.current !== null) {
-      window.clearTimeout(busyReleaseTimerRef.current);
-      busyReleaseTimerRef.current = null;
-    }
-    setBusy(true);
-  }, [setBusy]);
-
-  const handleCompositionEnd = useCallback(() => {
-    isComposingRef.current = false;
-    lastCompositionEndAtRef.current = performance.now();
-    if (compositionEnterKeyRef.current) {
-      imeEnterSuppressUntilRef.current = performance.now() + IME_ENTER_SUPPRESS_WINDOW_MS;
+    const handleBlur = useCallback(() => {
+      isComposingRef.current = false;
       compositionEnterKeyRef.current = false;
-    }
-    refreshEmptyState();
-    refreshMention();
-    scheduleBusyRelease();
-  }, [refreshEmptyState, refreshMention, scheduleBusyRelease]);
-
-  const handleBlur = useCallback(() => {
-    isComposingRef.current = false;
-    compositionEnterKeyRef.current = false;
-    lastCompositionEndAtRef.current = 0;
-    imeEnterSuppressUntilRef.current = 0;
-    if (busyReleaseTimerRef.current !== null) {
-      window.clearTimeout(busyReleaseTimerRef.current);
-      busyReleaseTimerRef.current = null;
-    }
-    setBusy(false);
-    closeMentionSession();
-  }, [closeMentionSession, setBusy]);
-
-  return (
-    <div ref={wrapperRef} className="relative w-full min-w-0 max-w-full flex-1">
-      {popupVisible && (
-        <Popup
-          anchorRef={wrapperRef}
-          suggestions={suggestions}
-          highlightIndex={highlightIdx}
-          isLoading={popupLoading}
-          error={popupError}
-          showEmpty={showEmpty}
-          emptyLabel={popupEmptyLabel}
-          onSelect={selectSuggestion}
-        />
-      )}
-      <div
-        ref={editorRef}
-        contentEditable={!disabled}
-        suppressContentEditableWarning
-        role="textbox"
-        aria-multiline
-        aria-placeholder={placeholder}
-        aria-disabled={disabled}
-        onInput={handleInput}
-        onKeyDown={handleKeyDown}
-        onKeyUp={handleKeyUp}
-        onPaste={handlePaste}
-        onCompositionStart={handleCompositionStart}
-        onCompositionEnd={handleCompositionEnd}
-        onBlur={handleBlur}
-        className={cn(
-          "mention-composer min-h-[70px] max-h-[160px] w-full min-w-0 max-w-full overflow-y-auto whitespace-pre-wrap break-words [overflow-wrap:anywhere] outline-hidden",
-          "text-sm",
-          isEmpty && "is-empty",
-          disabled && "cursor-not-allowed opacity-60",
-          className,
+      lastCompositionEndAtRef.current = 0;
+      imeEnterSuppressUntilRef.current = 0;
+      if (busyReleaseTimerRef.current !== null) {
+        window.clearTimeout(busyReleaseTimerRef.current);
+        busyReleaseTimerRef.current = null;
+      }
+      setBusy(false);
+      closeMentionSession();
+    }, [closeMentionSession, setBusy]);
+
+    return (
+      <div ref={wrapperRef} className="relative w-full min-w-0 max-w-full flex-1">
+        {popupVisible && (
+          <Popup
+            anchorRef={wrapperRef}
+            suggestions={suggestions}
+            highlightIndex={highlightIdx}
+            isLoading={popupLoading}
+            error={popupError}
+            showEmpty={showEmpty}
+            emptyLabel={popupEmptyLabel}
+            onSelect={selectSuggestion}
+          />
         )}
-        data-placeholder={placeholder}
-      />
-    </div>
-  );
-}));
+        <div
+          ref={editorRef}
+          contentEditable={!disabled}
+          suppressContentEditableWarning
+          role="textbox"
+          aria-multiline
+          aria-placeholder={placeholder}
+          aria-disabled={disabled}
+          onInput={handleInput}
+          onKeyDown={handleKeyDown}
+          onKeyUp={handleKeyUp}
+          onPaste={handlePaste}
+          onCompositionStart={handleCompositionStart}
+          onCompositionEnd={handleCompositionEnd}
+          onBlur={handleBlur}
+          className={cn(
+            "mention-composer min-h-[70px] max-h-[160px] w-full min-w-0 max-w-full overflow-y-auto whitespace-pre-wrap break-words [overflow-wrap:anywhere] outline-hidden",
+            "text-sm",
+            isEmpty && "is-empty",
+            disabled && "cursor-not-allowed opacity-60",
+            className,
+          )}
+          data-placeholder={placeholder}
+        />
+      </div>
+    );
+  }),
+);
 
 MentionComposer.displayName = "MentionComposer";
diff --git a/crates/agent-gui/src/components/chat/NotifyToast.tsx b/crates/agent-gui/src/components/chat/NotifyToast.tsx
index 15c2d2849..75aeb6981 100644
--- a/crates/agent-gui/src/components/chat/NotifyToast.tsx
+++ b/crates/agent-gui/src/components/chat/NotifyToast.tsx
@@ -1,5 +1,5 @@
 import { memo, useEffect, useRef } from "react";
-import { AlertTriangle, XCircle, X } from "../icons";
+import { AlertTriangle, X, XCircle } from "../icons";
 
 export type NotifyItem = {
   id: string;
@@ -64,9 +64,7 @@ const ToastEntry = memo(function ToastEntry(props: {
       )}
       <p
         className={`min-w-0 flex-1 leading-relaxed ${
-          isWarning
-            ? "text-amber-800 dark:text-amber-200"
-            : "text-red-800 dark:text-red-200"
+          isWarning ? "text-amber-800 dark:text-amber-200" : "text-red-800 dark:text-red-200"
         }`}
       >
         {item.message}
diff --git a/crates/agent-gui/src/components/chat/SharedHistoryManagerModal.tsx b/crates/agent-gui/src/components/chat/SharedHistoryManagerModal.tsx
index 3d1bc3ad4..cfafc4ac1 100644
--- a/crates/agent-gui/src/components/chat/SharedHistoryManagerModal.tsx
+++ b/crates/agent-gui/src/components/chat/SharedHistoryManagerModal.tsx
@@ -1,10 +1,12 @@
 import { useMemo, useState } from "react";
 import { createPortal } from "react-dom";
+import type { ChatHistorySummary } from "../../lib/chat/history/chatHistory";
+import { cn } from "../../lib/shared/utils";
 import {
   Check,
   Copy,
-  Eye,
   ExternalLink,
+  Eye,
   EyeOff,
   Link2,
   Loader2,
@@ -12,9 +14,6 @@ import {
   Share2,
   X,
 } from "../icons";
-
-import type { ChatHistorySummary } from "../../lib/chat/history/chatHistory";
-import { cn } from "../../lib/shared/utils";
 import { Button } from "../ui/button";
 
 export type ManagedHistoryShareStatus = {
@@ -103,10 +102,7 @@ function formatConversationTime(timestamp?: number) {
   }).format(new Date(timestamp));
 }
 
-function ShareSwitch(props: {
-  disabled: boolean;
-  onDisable: () => void;
-}) {
+function ShareSwitch(props: { disabled: boolean; onDisable: () => void }) {
   const { disabled, onDisable } = props;
   return (
     <button
@@ -293,7 +289,9 @@ export function SharedHistoryManagerModal({
               <div className="text-[11px] font-medium uppercase tracking-[0.12em] text-muted-foreground">
                 已分享
               </div>
-              <div className="mt-1 text-lg font-semibold text-foreground">{conversations.length}</div>
+              <div className="mt-1 text-lg font-semibold text-foreground">
+                {conversations.length}
+              </div>
             </div>
             <div className="rounded-2xl border border-border/60 bg-muted/25 px-3 py-2">
               <div className="text-[11px] font-medium uppercase tracking-[0.12em] text-muted-foreground">
@@ -350,7 +348,7 @@ export function SharedHistoryManagerModal({
             <div className="space-y-2.5">
               {filteredConversations.map((conversation) => {
                 const status = statuses[conversation.id];
-                const token = status?.enabled === true ? status.token?.trim() ?? "" : "";
+                const token = status?.enabled === true ? (status.token?.trim() ?? "") : "";
                 const redactToolContent = isShareStatusRedacted(status);
                 const shareUrl = buildShareUrl(token, publicOrigin);
                 const isLoading = loadingIds.has(conversation.id);
@@ -388,7 +386,9 @@ export function SharedHistoryManagerModal({
                         </div>
                       </div>
                       <div className="flex shrink-0 items-center gap-2">
-                        {isLoading ? <Loader2 className="h-4 w-4 animate-spin text-sky-500" /> : null}
+                        {isLoading ? (
+                          <Loader2 className="h-4 w-4 animate-spin text-sky-500" />
+                        ) : null}
                         <ShareSwitch
                           disabled={isUpdating}
                           onDisable={() => onDisableShare(conversation)}
diff --git a/crates/agent-gui/src/components/chat/fileTypeIcons.tsx b/crates/agent-gui/src/components/chat/fileTypeIcons.tsx
index 08847be71..2b133c878 100644
--- a/crates/agent-gui/src/components/chat/fileTypeIcons.tsx
+++ b/crates/agent-gui/src/components/chat/fileTypeIcons.tsx
@@ -1,53 +1,52 @@
 import type { ComponentType, SVGProps } from "react";
-
-import FileTypeTypescript from "~icons/vscode-icons/file-type-typescript-official";
-import FileTypeReactTs from "~icons/vscode-icons/file-type-reactts";
-import FileTypeJs from "~icons/vscode-icons/file-type-js-official";
-import FileTypeReactJs from "~icons/vscode-icons/file-type-reactjs";
-import FileTypePython from "~icons/vscode-icons/file-type-python";
-import FileTypeRust from "~icons/vscode-icons/file-type-rust";
+import DefaultFile from "~icons/vscode-icons/default-file";
+import DefaultFolder from "~icons/vscode-icons/default-folder";
+import FileTypeAudio from "~icons/vscode-icons/file-type-audio";
+import FileTypeBat from "~icons/vscode-icons/file-type-bat";
+import FileTypeBinary from "~icons/vscode-icons/file-type-binary";
+import FileTypeC from "~icons/vscode-icons/file-type-c";
+import FileTypeConfig from "~icons/vscode-icons/file-type-config";
+import FileTypeCpp from "~icons/vscode-icons/file-type-cpp";
+import FileTypeCsharp from "~icons/vscode-icons/file-type-csharp";
+import FileTypeCss from "~icons/vscode-icons/file-type-css";
+import FileTypeDart from "~icons/vscode-icons/file-type-dartlang";
+import FileTypeDocker from "~icons/vscode-icons/file-type-docker";
+import FileTypeExcel from "~icons/vscode-icons/file-type-excel";
+import FileTypeFont from "~icons/vscode-icons/file-type-font";
+import FileTypeGit from "~icons/vscode-icons/file-type-git";
 import FileTypeGo from "~icons/vscode-icons/file-type-go";
-import FileTypeJava from "~icons/vscode-icons/file-type-java";
 import FileTypeHtml from "~icons/vscode-icons/file-type-html";
-import FileTypeCss from "~icons/vscode-icons/file-type-css";
+import FileTypeImage from "~icons/vscode-icons/file-type-image";
+import FileTypeJava from "~icons/vscode-icons/file-type-java";
+import FileTypeJs from "~icons/vscode-icons/file-type-js-official";
 import FileTypeJson from "~icons/vscode-icons/file-type-json";
+import FileTypeKotlin from "~icons/vscode-icons/file-type-kotlin";
+import FileTypeLicense from "~icons/vscode-icons/file-type-license";
+import FileTypeLog from "~icons/vscode-icons/file-type-log";
 import FileTypeMarkdown from "~icons/vscode-icons/file-type-markdown";
-import FileTypeYaml from "~icons/vscode-icons/file-type-yaml";
-import FileTypeToml from "~icons/vscode-icons/file-type-toml";
-import FileTypeVue from "~icons/vscode-icons/file-type-vue";
-import FileTypeSvelte from "~icons/vscode-icons/file-type-svelte";
-import FileTypeShell from "~icons/vscode-icons/file-type-shell";
-import FileTypeImage from "~icons/vscode-icons/file-type-image";
-import FileTypeSvg from "~icons/vscode-icons/file-type-svg";
 import FileTypePdf from "~icons/vscode-icons/file-type-pdf2";
-import FileTypeZip from "~icons/vscode-icons/file-type-zip";
-import FileTypeXml from "~icons/vscode-icons/file-type-xml";
-import FileTypeSql from "~icons/vscode-icons/file-type-sql";
-import FileTypeC from "~icons/vscode-icons/file-type-c";
-import FileTypeCpp from "~icons/vscode-icons/file-type-cpp";
-import FileTypeCsharp from "~icons/vscode-icons/file-type-csharp";
 import FileTypePhp from "~icons/vscode-icons/file-type-php";
+import FileTypePowerpoint from "~icons/vscode-icons/file-type-powerpoint";
+import FileTypePowershell from "~icons/vscode-icons/file-type-powershell";
+import FileTypePython from "~icons/vscode-icons/file-type-python";
+import FileTypeReactJs from "~icons/vscode-icons/file-type-reactjs";
+import FileTypeReactTs from "~icons/vscode-icons/file-type-reactts";
 import FileTypeRuby from "~icons/vscode-icons/file-type-ruby";
+import FileTypeRust from "~icons/vscode-icons/file-type-rust";
+import FileTypeShell from "~icons/vscode-icons/file-type-shell";
+import FileTypeSql from "~icons/vscode-icons/file-type-sql";
+import FileTypeSvelte from "~icons/vscode-icons/file-type-svelte";
+import FileTypeSvg from "~icons/vscode-icons/file-type-svg";
 import FileTypeSwift from "~icons/vscode-icons/file-type-swift";
-import FileTypeKotlin from "~icons/vscode-icons/file-type-kotlin";
-import FileTypeDart from "~icons/vscode-icons/file-type-dartlang";
-import FileTypeLog from "~icons/vscode-icons/file-type-log";
-import FileTypeExcel from "~icons/vscode-icons/file-type-excel";
-import FileTypeWord from "~icons/vscode-icons/file-type-word";
-import FileTypePowerpoint from "~icons/vscode-icons/file-type-powerpoint";
 import FileTypeText from "~icons/vscode-icons/file-type-text";
-import FileTypeFont from "~icons/vscode-icons/file-type-font";
+import FileTypeToml from "~icons/vscode-icons/file-type-toml";
+import FileTypeTypescript from "~icons/vscode-icons/file-type-typescript-official";
 import FileTypeVideo from "~icons/vscode-icons/file-type-video";
-import FileTypeAudio from "~icons/vscode-icons/file-type-audio";
-import FileTypeBat from "~icons/vscode-icons/file-type-bat";
-import FileTypePowershell from "~icons/vscode-icons/file-type-powershell";
-import FileTypeDocker from "~icons/vscode-icons/file-type-docker";
-import FileTypeGit from "~icons/vscode-icons/file-type-git";
-import FileTypeLicense from "~icons/vscode-icons/file-type-license";
-import FileTypeConfig from "~icons/vscode-icons/file-type-config";
-import FileTypeBinary from "~icons/vscode-icons/file-type-binary";
-import DefaultFile from "~icons/vscode-icons/default-file";
-import DefaultFolder from "~icons/vscode-icons/default-folder";
+import FileTypeVue from "~icons/vscode-icons/file-type-vue";
+import FileTypeWord from "~icons/vscode-icons/file-type-word";
+import FileTypeXml from "~icons/vscode-icons/file-type-xml";
+import FileTypeYaml from "~icons/vscode-icons/file-type-yaml";
+import FileTypeZip from "~icons/vscode-icons/file-type-zip";
 
 type IconSource = ComponentType<SVGProps<SVGSVGElement>>;
 
diff --git a/crates/agent-gui/src/components/cron/CronPromptRunner.tsx b/crates/agent-gui/src/components/cron/CronPromptRunner.tsx
index 3a61ea45a..82a2b3f03 100644
--- a/crates/agent-gui/src/components/cron/CronPromptRunner.tsx
+++ b/crates/agent-gui/src/components/cron/CronPromptRunner.tsx
@@ -1,24 +1,23 @@
-import { useEffect, useRef } from "react";
+import type { Context } from "@mariozechner/pi-ai";
 import { invoke } from "@tauri-apps/api/core";
 import { listen } from "@tauri-apps/api/event";
-import type { Context } from "@mariozechner/pi-ai";
-
-import { createStreamDebugLogger } from "../../lib/debug/agentDebug";
+import { useEffect, useRef } from "react";
 import { runAssistantWithTools } from "../../lib/chat/runner/agentRunner";
+import { createStreamDebugLogger } from "../../lib/debug/agentDebug";
 import { assistantMessageToText } from "../../lib/providers/llm";
+import {
+  type AppSettings,
+  DEFAULT_CHAT_RUNTIME_CONTROLS,
+  findProviderModelConfig,
+  isAgentDevMode,
+  isAgentExecutionMode,
+} from "../../lib/settings";
 import {
   buildSkillsSystemPrompt,
   discoverSkills,
   isAlwaysEnabledSkillName,
   type SkillSummary,
 } from "../../lib/skills";
-import {
-  DEFAULT_CHAT_RUNTIME_CONTROLS,
-  findProviderModelConfig,
-  isAgentExecutionMode,
-  isAgentDevMode,
-  type AppSettings,
-} from "../../lib/settings";
 import { buildBuiltinToolRegistry } from "../../lib/tools/builtinRegistry";
 import { createFileToolState } from "../../lib/tools/fileToolState";
 import type { SkillAccessPolicy } from "../../lib/tools/skillAccessPolicy";
@@ -274,10 +273,7 @@ function warnIfAlreadyFinishedCompletion(
   executionId: string,
 ) {
   if (result.status === "already_finished") {
-    console.warn(
-      "Cron Auto Prompt completion reached an already-finished run",
-      executionId,
-    );
+    console.warn("Cron Auto Prompt completion reached an already-finished run", executionId);
   }
 }
 
@@ -321,10 +317,7 @@ function remainingPromptRunTimeoutMs(startedAt: number) {
   return CRON_PROMPT_TIMEOUT_MS - elapsed;
 }
 
-function abortPromptExecution(
-  executionId: string,
-  reason: "local_timeout" | "server_expired",
-) {
+function abortPromptExecution(executionId: string, reason: "local_timeout" | "server_expired") {
   const normalizedExecutionId = normalizeExecutionId(executionId);
   if (!normalizedExecutionId) {
     return;
@@ -359,9 +352,7 @@ function registerLocalPromptTimeout(
   executionTimeoutHandles.set(normalizedExecutionId, timer);
 }
 
-function normalizeQueuedCompletion(
-  value: unknown,
-): CronCompletePromptRunInput | null {
+function normalizeQueuedCompletion(value: unknown): CronCompletePromptRunInput | null {
   if (!value || typeof value !== "object") {
     return null;
   }
diff --git a/crates/agent-gui/src/components/hub/HubChrome.tsx b/crates/agent-gui/src/components/hub/HubChrome.tsx
index ada50b122..2bab06207 100644
--- a/crates/agent-gui/src/components/hub/HubChrome.tsx
+++ b/crates/agent-gui/src/components/hub/HubChrome.tsx
@@ -1,9 +1,8 @@
-import { type ReactNode } from "react";
-
-import { PanelLeft } from "../icons";
-import { Button } from "../ui/button";
+import type { ReactNode } from "react";
 import { useLocale } from "../../i18n";
 import { cn } from "../../lib/shared/utils";
+import { PanelLeft } from "../icons";
+import { Button } from "../ui/button";
 
 export function HubBackdrop(props: { tone?: "amber" | "violet" | "neutral" }) {
   const { tone = "neutral" } = props;
diff --git a/crates/agent-gui/src/components/icons.tsx b/crates/agent-gui/src/components/icons.tsx
index 54ed07fec..8dcade24e 100644
--- a/crates/agent-gui/src/components/icons.tsx
+++ b/crates/agent-gui/src/components/icons.tsx
@@ -1,8 +1,6 @@
 import type { ComponentType, SVGProps } from "react";
-
-import AlertTriangleSource from "~icons/lucide/triangle-alert";
 import ClaudeSource from "~icons/logos/claude-icon";
-import FileTypeGeminiSource from "~icons/vscode-icons/file-type-gemini";
+import OpenAISource from "~icons/logos/openai-icon";
 import ArrowLeftSource from "~icons/lucide/arrow-left";
 import BanSource from "~icons/lucide/ban";
 import BookOpenSource from "~icons/lucide/book-open";
@@ -10,35 +8,38 @@ import BotSource from "~icons/lucide/bot";
 import BrainSource from "~icons/lucide/brain";
 import BrushCleaningSource from "~icons/lucide/brush-cleaning";
 import CheckSource from "~icons/lucide/check";
-import CheckCircle2Source from "~icons/lucide/circle-check";
 import ChevronDownSource from "~icons/lucide/chevron-down";
 import ChevronRightSource from "~icons/lucide/chevron-right";
 import ChevronUpSource from "~icons/lucide/chevron-up";
 import CircleSource from "~icons/lucide/circle";
+import CheckCircle2Source from "~icons/lucide/circle-check";
+import XCircleSource from "~icons/lucide/circle-x";
 import Clock3Source from "~icons/lucide/clock-3";
 import CloudSource from "~icons/lucide/cloud";
 import CopySource from "~icons/lucide/copy";
 import CpuSource from "~icons/lucide/cpu";
 import DownloadSource from "~icons/lucide/download";
-import Edit3Source from "~icons/lucide/pen-line";
+import Globe2Source from "~icons/lucide/earth";
+import MoreHorizontalSource from "~icons/lucide/ellipsis";
 import ExternalLinkSource from "~icons/lucide/external-link";
 import EyeSource from "~icons/lucide/eye";
 import EyeOffSource from "~icons/lucide/eye-off";
 import FileSource from "~icons/lucide/file";
+import fileIconSvgSource from "~icons/lucide/file?raw";
 import FilePenLineSource from "~icons/lucide/file-pen-line";
 import FileTextSource from "~icons/lucide/file-text";
 import FolderSource from "~icons/lucide/folder";
+import folderIconSvgSource from "~icons/lucide/folder?raw";
 import FolderOpenSource from "~icons/lucide/folder-open";
 import FolderTreeSource from "~icons/lucide/folder-tree";
 import GlobeSource from "~icons/lucide/globe";
-import Globe2Source from "~icons/lucide/earth";
 import HistorySource from "~icons/lucide/history";
 import ImageIconSource from "~icons/lucide/image";
 import ImageOffSource from "~icons/lucide/image-off";
 import InfoSource from "~icons/lucide/info";
 import KeySource from "~icons/lucide/key";
-import Link2Source from "~icons/lucide/link-2";
 import LightbulbSource from "~icons/lucide/lightbulb";
+import Link2Source from "~icons/lucide/link-2";
 import Loader2Source from "~icons/lucide/loader-circle";
 import LoaderCircleSource from "~icons/lucide/loader-circle";
 import LockSource from "~icons/lucide/lock";
@@ -49,11 +50,10 @@ import Minimize2Source from "~icons/lucide/minimize-2";
 import MinusSource from "~icons/lucide/minus";
 import MonitorSmartphoneSource from "~icons/lucide/monitor-smartphone";
 import MoonSource from "~icons/lucide/moon";
-import MoreHorizontalSource from "~icons/lucide/ellipsis";
-import OpenAISource from "~icons/logos/openai-icon";
 import PanelLeftSource from "~icons/lucide/panel-left";
 import PanelLeftCloseSource from "~icons/lucide/panel-left-close";
 import PaperclipSource from "~icons/lucide/paperclip";
+import Edit3Source from "~icons/lucide/pen-line";
 import PencilSource from "~icons/lucide/pencil";
 import PinSource from "~icons/lucide/pin";
 import PinOffSource from "~icons/lucide/pin-off";
@@ -76,15 +76,14 @@ import SquarePenSource from "~icons/lucide/square-pen";
 import SunSource from "~icons/lucide/sun";
 import TerminalSource from "~icons/lucide/terminal";
 import Trash2Source from "~icons/lucide/trash-2";
+import AlertTriangleSource from "~icons/lucide/triangle-alert";
 import UploadSource from "~icons/lucide/upload";
 import WifiSource from "~icons/lucide/wifi";
 import WifiOffSource from "~icons/lucide/wifi-off";
 import WrenchSource from "~icons/lucide/wrench";
 import XSource from "~icons/lucide/x";
-import XCircleSource from "~icons/lucide/circle-x";
 import ZapSource from "~icons/lucide/zap";
-import fileIconSvgSource from "~icons/lucide/file?raw";
-import folderIconSvgSource from "~icons/lucide/folder?raw";
+import FileTypeGeminiSource from "~icons/vscode-icons/file-type-gemini";
 
 type IconSource = ComponentType<SVGProps<SVGSVGElement> & { title?: string }>;
 
@@ -97,7 +96,13 @@ type IconProps = SVGProps<SVGSVGElement> & {
 export type IconComponent = ComponentType<IconProps>;
 
 function createIcon(Source: IconSource): IconComponent {
-  return function Icon({ absoluteStrokeWidth: _absoluteStrokeWidth, height, size, width, ...props }) {
+  return function Icon({
+    absoluteStrokeWidth: _absoluteStrokeWidth,
+    height,
+    size,
+    width,
+    ...props
+  }) {
     const nextProps: IconProps = { ...props };
     if (size !== undefined) {
       nextProps.width = width ?? size;
@@ -195,4 +200,5 @@ export const XCircle = createIcon(XCircleSource);
 export const Zap = createIcon(ZapSource);
 const fileIconSvg = fileIconSvgSource as unknown as string;
 const folderIconSvg = folderIconSvgSource as unknown as string;
+
 export { fileIconSvg, folderIconSvg };
diff --git a/crates/agent-gui/src/components/memory/MemoryOrganizerRunner.tsx b/crates/agent-gui/src/components/memory/MemoryOrganizerRunner.tsx
index e27147146..5a67a6294 100644
--- a/crates/agent-gui/src/components/memory/MemoryOrganizerRunner.tsx
+++ b/crates/agent-gui/src/components/memory/MemoryOrganizerRunner.tsx
@@ -1,30 +1,29 @@
-import { useEffect, useRef } from "react";
-import { Type } from "@sinclair/typebox";
 import type { Context, Tool, ToolCall, ToolResultMessage } from "@mariozechner/pi-ai";
-
-import { createStreamDebugLogger } from "../../lib/debug/agentDebug";
+import { Type } from "@sinclair/typebox";
+import { useEffect, useRef } from "react";
 import { runAssistantWithTools } from "../../lib/chat/runner/agentRunner";
-import { assistantMessageToText } from "../../lib/providers/llm";
-import {
-  DEFAULT_CHAT_RUNTIME_CONTROLS,
-  computeNextMemoryOrganizerRunAt,
-  findProviderModelConfig,
-  isAgentDevMode,
-  type AppSettings,
-  type MemoryOrganizerMode,
-} from "../../lib/settings";
+import { createStreamDebugLogger } from "../../lib/debug/agentDebug";
 import {
+  type MemoryBatchResponse,
+  type MemoryMeta,
+  type MemoryOrganizeRun,
+  type MemoryType,
   memoryApplyBatch,
   memoryList,
   memoryOrganizeDueClaim,
   memoryOrganizeDueComplete,
   memoryOrganizeRunUpdate,
   memoryRead,
-  type MemoryBatchResponse,
-  type MemoryMeta,
-  type MemoryOrganizeRun,
-  type MemoryType,
 } from "../../lib/memory/api";
+import { assistantMessageToText } from "../../lib/providers/llm";
+import {
+  type AppSettings,
+  computeNextMemoryOrganizerRunAt,
+  DEFAULT_CHAT_RUNTIME_CONTROLS,
+  findProviderModelConfig,
+  isAgentDevMode,
+  type MemoryOrganizerMode,
+} from "../../lib/settings";
 import { createMemoryTools } from "../../lib/tools/memoryTools";
 
 type MemoryOrganizerRunnerProps = {
@@ -205,9 +204,7 @@ function stringValue(value: unknown) {
 }
 
 function stringArrayValue(value: unknown) {
-  return Array.isArray(value)
-    ? value.map((item) => stringValue(item)).filter(Boolean)
-    : [];
+  return Array.isArray(value) ? value.map((item) => stringValue(item)).filter(Boolean) : [];
 }
 
 function recordValue(value: unknown): Record<string, unknown> {
@@ -265,10 +262,7 @@ function riskRank(value: OrganizerRiskLevel) {
   return 1;
 }
 
-function maxRisk(
-  current: OrganizerRiskLevel,
-  next: OrganizerRiskLevel,
-): OrganizerRiskLevel {
+function maxRisk(current: OrganizerRiskLevel, next: OrganizerRiskLevel): OrganizerRiskLevel {
   return riskRank(next) > riskRank(current) ? next : current;
 }
 
@@ -277,16 +271,19 @@ function isReviewed(entry: OrganizerEntry | undefined) {
 }
 
 const ORGANIZER_PLAN_DECISION_SCHEMA = Type.Object({
-  action: Type.Union([
-    Type.Literal("keep"),
-    Type.Literal("merge_into"),
-    Type.Literal("delete"),
-    Type.Literal("mark_review"),
-    Type.Literal("rewrite_hint"),
-  ], {
-    description:
-      "Decision action. Use merge_into to merge source_slugs into target_slug. Use rewrite_hint instead of emitting a replacement body.",
-  }),
+  action: Type.Union(
+    [
+      Type.Literal("keep"),
+      Type.Literal("merge_into"),
+      Type.Literal("delete"),
+      Type.Literal("mark_review"),
+      Type.Literal("rewrite_hint"),
+    ],
+    {
+      description:
+        "Decision action. Use merge_into to merge source_slugs into target_slug. Use rewrite_hint instead of emitting a replacement body.",
+    },
+  ),
   slug: Type.Optional(
     Type.String({
       minLength: 3,
@@ -368,8 +365,7 @@ const ORGANIZER_PLAN_TOOL: Tool = {
 
 const ORGANIZER_TOPIC_TOOL: Tool = {
   name: ORGANIZER_TOPIC_TOOL_NAME,
-  description:
-    "Submit semantic topic clusters for memory organization. Do not propose edits.",
+  description: "Submit semantic topic clusters for memory organization. Do not propose edits.",
   parameters: Type.Object({
     topic_clusters: Type.Array(
       Type.Object({
@@ -489,9 +485,7 @@ function buildStructuralClusters(entries: OrganizerEntry[]): OrganizerCluster[]
   }
   const clusters: OrganizerCluster[] = [];
   for (const [key, group] of groups) {
-    const sorted = group.sort((a, b) =>
-      a.slug.localeCompare(b.slug) || b.updatedAt - a.updatedAt,
-    );
+    const sorted = group.sort((a, b) => a.slug.localeCompare(b.slug) || b.updatedAt - a.updatedAt);
     for (let index = 0; index < sorted.length; index += ORGANIZER_CLUSTER_SIZE) {
       clusters.push({
         id: `${key}:${Math.floor(index / ORGANIZER_CLUSTER_SIZE) + 1}`,
@@ -540,15 +534,23 @@ function buildTopicClustersFromArgs(args: Record<string, unknown>, entries: Orga
   const clusters: OrganizerCluster[] = [];
   for (const item of topicClusters) {
     if (!item || typeof item !== "object" || Array.isArray(item)) continue;
-    const topic = stringValue((item as { topic?: unknown }).topic) || `topic-${clusters.length + 1}`;
+    const topic =
+      stringValue((item as { topic?: unknown }).topic) || `topic-${clusters.length + 1}`;
     const slugs = uniqueStrings(stringArrayValue((item as { slugs?: unknown }).slugs))
       .filter((slug) => bySlug.has(slug) && !used.has(slug))
       .slice(0, ORGANIZER_TOPIC_CLUSTER_SIZE);
     if (slugs.length < 2) continue;
     for (const slug of slugs) used.add(slug);
     clusters.push({
-      id: `topic:${topic.replace(/[^a-z0-9_-]+/gi, "-").replace(/^-+|-+$/g, "").slice(0, 48) || clusters.length + 1}`,
-      entries: slugs.map((slug) => bySlug.get(slug)).filter((entry): entry is OrganizerEntry => Boolean(entry)),
+      id: `topic:${
+        topic
+          .replace(/[^a-z0-9_-]+/gi, "-")
+          .replace(/^-+|-+$/g, "")
+          .slice(0, 48) || clusters.length + 1
+      }`,
+      entries: slugs
+        .map((slug) => bySlug.get(slug))
+        .filter((entry): entry is OrganizerEntry => Boolean(entry)),
     });
   }
   const leftovers = entries.filter((entry) => !used.has(entry.slug));
@@ -592,7 +594,12 @@ function buildGlobalInventory(entries: OrganizerEntry[], clusters: OrganizerClus
   }
   const inventory = entries
     .slice()
-    .sort((a, b) => a.scope.localeCompare(b.scope) || a.memoryType.localeCompare(b.memoryType) || a.slug.localeCompare(b.slug))
+    .sort(
+      (a, b) =>
+        a.scope.localeCompare(b.scope) ||
+        a.memoryType.localeCompare(b.memoryType) ||
+        a.slug.localeCompare(b.slug),
+    )
     .map((entry) => ({
       slug: entry.slug,
       cluster_id: clusterBySlug.get(entry.slug) || "",
@@ -682,7 +689,9 @@ function toolResultMessage(
   };
 }
 
-function normalizeOrganizerPlanArgs(args: Record<string, unknown>): Omit<OrganizerClusterPlan, "raw"> {
+function normalizeOrganizerPlanArgs(
+  args: Record<string, unknown>,
+): Omit<OrganizerClusterPlan, "raw"> {
   const decisions = Array.isArray(args.decisions) ? args.decisions : [];
   const normalized: OrganizerPlanDecision[] = [];
   for (const item of decisions) {
@@ -729,10 +738,7 @@ async function runOrganizerModelPrompt(params: {
   systemPrompt: string;
   workdir: string;
   tools: Context["tools"];
-  executeToolCall: (
-    toolCall: ToolCall,
-    signal?: AbortSignal,
-  ) => Promise<ToolResultMessage>;
+  executeToolCall: (toolCall: ToolCall, signal?: AbortSignal) => Promise<ToolResultMessage>;
   signal?: AbortSignal;
 }) {
   const { provider, model } = resolveOrganizerProvider(params.run, params.settings);
@@ -805,12 +811,7 @@ async function runTopicClusterPrompt(params: {
   return {
     args: submittedArgs,
     raw: clip(
-      [
-        rawText,
-        "",
-        `[${ORGANIZER_TOPIC_TOOL_NAME}]`,
-        JSON.stringify(submittedArgs, null, 2),
-      ]
+      [rawText, "", `[${ORGANIZER_TOPIC_TOOL_NAME}]`, JSON.stringify(submittedArgs, null, 2)]
         .filter((part) => part.trim().length > 0)
         .join("\n"),
       ORGANIZER_RAW_PROTOCOL_CHARS,
@@ -862,12 +863,7 @@ async function runOrganizerPlanPrompt(params: {
     summary: plan.summary,
     compression: plan.compression,
     raw: clip(
-      [
-        rawText,
-        "",
-        `[${ORGANIZER_TOOL_NAME}]`,
-        JSON.stringify(captured.args ?? plan, null, 2),
-      ]
+      [rawText, "", `[${ORGANIZER_TOOL_NAME}]`, JSON.stringify(captured.args ?? plan, null, 2)]
         .filter((part) => part.trim().length > 0)
         .join("\n"),
       ORGANIZER_RAW_PROTOCOL_CHARS,
@@ -887,10 +883,7 @@ function emptyRejectionBuckets(): OrganizerRejectionBuckets {
   };
 }
 
-function incrementBucket(
-  buckets: OrganizerRejectionBuckets,
-  key: keyof OrganizerRejectionBuckets,
-) {
+function incrementBucket(buckets: OrganizerRejectionBuckets, key: keyof OrganizerRejectionBuckets) {
   buckets[key] += 1;
 }
 
@@ -1004,10 +997,7 @@ function shouldQueueOrganizerDecision(params: {
   );
 }
 
-function addRejectionBucketForReasons(
-  buckets: OrganizerRejectionBuckets,
-  reasons: string[],
-) {
+function addRejectionBucketForReasons(buckets: OrganizerRejectionBuckets, reasons: string[]) {
   if (reasons.includes("review_required_by_llm")) {
     incrementBucket(buckets, "reviewRequiredByLlm");
   }
@@ -1139,48 +1129,48 @@ function buildSafeDecisions(results: ParsedClusterResult[], run: MemoryOrganizeR
           addRejectionBucketForReasons(rejectionBuckets, risk.reasons);
           continue;
         }
-          const description = item.descriptionHint || targetEntry.description;
-          const body = synthesizeBodyFromSources(
-            targetEntry,
-            [targetEntry, ...sourceEntries],
-            reason,
-            evidencePreserved,
+        const description = item.descriptionHint || targetEntry.description;
+        const body = synthesizeBodyFromSources(
+          targetEntry,
+          [targetEntry, ...sourceEntries],
+          reason,
+          evidencePreserved,
+        );
+        const groupId = organizerMergeGroupId(cluster.id, targetEntry.slug, [
+          targetEntry.slug,
+          ...sourceSlugs,
+        ]);
+        if (utf8ByteLength(body) > ORGANIZER_MEMORY_BODY_LIMIT_BYTES) {
+          reviewSkipped += 1;
+          incrementBucket(rejectionBuckets, "missingPayload");
+          reviewNotes.push(
+            `${cluster.id}: merge_into ${targetEntry.slug} - merged body exceeds ${ORGANIZER_MEMORY_BODY_LIMIT_BYTES} bytes; skipped automatic apply and requires a shorter manual rewrite.`,
           );
-          const groupId = organizerMergeGroupId(cluster.id, targetEntry.slug, [
-            targetEntry.slug,
-            ...sourceSlugs,
-          ]);
-          if (utf8ByteLength(body) > ORGANIZER_MEMORY_BODY_LIMIT_BYTES) {
-            reviewSkipped += 1;
-            incrementBucket(rejectionBuckets, "missingPayload");
-            reviewNotes.push(
-              `${cluster.id}: merge_into ${targetEntry.slug} - merged body exceeds ${ORGANIZER_MEMORY_BODY_LIMIT_BYTES} bytes; skipped automatic apply and requires a shorter manual rewrite.`,
-            );
-            continue;
-          }
-          decisions.push({
-            op: "upsert",
-            slug: targetEntry.slug,
-            scope: targetEntry.scope,
-            workdirHash: targetEntry.scope === "project" ? targetEntry.workdirHash : undefined,
+          continue;
+        }
+        decisions.push({
+          op: "upsert",
+          slug: targetEntry.slug,
+          scope: targetEntry.scope,
+          workdirHash: targetEntry.scope === "project" ? targetEntry.workdirHash : undefined,
           memoryType: targetEntry.memoryType as MemoryType,
           description,
           body,
           reason: reason || "memory organizer update",
           confidence,
           riskLevel: risk.risk,
-            requiresUserAck:
-              risk.risk !== "low" ||
-              sourceEntries.some(isReviewed) ||
-              isReviewed(targetEntry) ||
-              risk.reasons.includes("cross_type") ||
-              risk.reasons.includes("cross_scope"),
-            sourceSlugs: [targetEntry.slug, ...sourceSlugs],
-            evidencePreserved,
-            blockedReasons: risk.reasons,
-            groupId,
-          });
-          for (const sourceEntry of sourceEntries) {
+          requiresUserAck:
+            risk.risk !== "low" ||
+            sourceEntries.some(isReviewed) ||
+            isReviewed(targetEntry) ||
+            risk.reasons.includes("cross_type") ||
+            risk.reasons.includes("cross_scope"),
+          sourceSlugs: [targetEntry.slug, ...sourceSlugs],
+          evidencePreserved,
+          blockedReasons: risk.reasons,
+          groupId,
+        });
+        for (const sourceEntry of sourceEntries) {
           if (sourceEntry.memoryType === "daily") {
             reviewSkipped += 1;
             incrementBucket(rejectionBuckets, "unsupported");
@@ -1207,9 +1197,9 @@ function buildSafeDecisions(results: ParsedClusterResult[], run: MemoryOrganizeR
             addRejectionBucketForReasons(rejectionBuckets, deleteRisk.reasons);
             continue;
           }
-            decisions.push({
-              op: "delete",
-              slug: sourceEntry.slug,
+          decisions.push({
+            op: "delete",
+            slug: sourceEntry.slug,
             scope: sourceEntry.scope,
             workdirHash: sourceEntry.scope === "project" ? sourceEntry.workdirHash : undefined,
             reason: `merged into ${targetEntry.slug}`,
@@ -1220,11 +1210,11 @@ function buildSafeDecisions(results: ParsedClusterResult[], run: MemoryOrganizeR
               isReviewed(sourceEntry) ||
               deleteRisk.reasons.includes("cross_type") ||
               deleteRisk.reasons.includes("cross_scope"),
-              sourceSlugs: [sourceEntry.slug, targetEntry.slug],
-              evidencePreserved,
-              blockedReasons: deleteRisk.reasons,
-              groupId,
-            });
+            sourceSlugs: [sourceEntry.slug, targetEntry.slug],
+            evidencePreserved,
+            blockedReasons: deleteRisk.reasons,
+            groupId,
+          });
           mergedCount += 1;
         }
       }
@@ -1557,8 +1547,7 @@ export function MemoryOrganizerRunner({ settings, setSettings }: MemoryOrganizer
     }
 
     const onPoke = (event: Event) => {
-      const force =
-        !(event instanceof CustomEvent) || event.detail?.force !== false;
+      const force = !(event instanceof CustomEvent) || event.detail?.force !== false;
       void tick(force);
     };
     window.addEventListener(MEMORY_ORGANIZER_EVENT, onPoke);
diff --git a/crates/agent-gui/src/components/ui/label.tsx b/crates/agent-gui/src/components/ui/label.tsx
index 7485a0c15..b35f6a6d0 100644
--- a/crates/agent-gui/src/components/ui/label.tsx
+++ b/crates/agent-gui/src/components/ui/label.tsx
@@ -6,11 +6,7 @@ export const Label = React.forwardRef<
   HTMLLabelElement,
   React.LabelHTMLAttributes<HTMLLabelElement>
 >(({ className, ...props }, ref) => (
-  <label
-    ref={ref}
-    className={cn("text-sm font-medium leading-none", className)}
-    {...props}
-  />
+  <label ref={ref} className={cn("text-sm font-medium leading-none", className)} {...props} />
 ));
 
 Label.displayName = "Label";
diff --git a/crates/agent-gui/src/i18n/LocaleContext.tsx b/crates/agent-gui/src/i18n/LocaleContext.tsx
index 9f0c5079b..3163c28c9 100644
--- a/crates/agent-gui/src/i18n/LocaleContext.tsx
+++ b/crates/agent-gui/src/i18n/LocaleContext.tsx
@@ -1,5 +1,5 @@
 import { createContext, useContext } from "react";
-import { DEFAULT_LOCALE, t as translate, type Locale } from "./config";
+import { DEFAULT_LOCALE, type Locale, t as translate } from "./config";
 
 type LocaleContextValue = {
   locale: Locale;
diff --git a/crates/agent-gui/src/index.css b/crates/agent-gui/src/index.css
index 66dae57b3..c7aed1493 100644
--- a/crates/agent-gui/src/index.css
+++ b/crates/agent-gui/src/index.css
@@ -11,11 +11,7 @@
 
 @layer utilities {
   .font-openai-chat {
-    font-family:
-      "OpenAI Sans Semibold",
-      "PingFang SC",
-      "Microsoft YaHei",
-      sans-serif;
+    font-family: "OpenAI Sans Semibold", "PingFang SC", "Microsoft YaHei", sans-serif;
   }
 
   /*
@@ -310,7 +306,9 @@
   /* Code blocks — container, header, body (safe in components layer) */
   .chat-markdown [data-streamdown="code-block"] {
     @apply relative my-4 overflow-hidden rounded-xl border border-border/50 bg-muted/20;
-    box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.04), 0 1px 2px -1px rgba(0, 0, 0, 0.04);
+    box-shadow:
+      0 1px 3px 0 rgba(0, 0, 0, 0.04),
+      0 1px 2px -1px rgba(0, 0, 0, 0.04);
   }
   .chat-markdown [data-streamdown="code-block-header"] {
     @apply h-auto border-b border-border/60 bg-muted/55 px-3 py-2 text-[11px] uppercase tracking-[0.22em] text-muted-foreground;
@@ -545,7 +543,9 @@
   }
 
   @keyframes typingBounce {
-    0%, 60%, 100% {
+    0%,
+    60%,
+    100% {
       transform: translateY(0);
     }
     30% {
@@ -554,7 +554,8 @@
   }
 
   @keyframes vibingBounce {
-    0%, 100% {
+    0%,
+    100% {
       transform: translateY(0);
     }
     30% {
@@ -596,7 +597,8 @@
   }
 
   @keyframes heroFloat {
-    0%, 100% {
+    0%,
+    100% {
       transform: translateY(0);
     }
     50% {
@@ -606,11 +608,14 @@
 
   /* Glow pulse animation */
   .hero-glow-pulse {
-    animation: heroGlowPulse 5s ease-in-out infinite, heroFadeIn 1.2s ease-out both;
+    animation:
+      heroGlowPulse 5s ease-in-out infinite,
+      heroFadeIn 1.2s ease-out both;
   }
 
   @keyframes heroGlowPulse {
-    0%, 100% {
+    0%,
+    100% {
       opacity: 0.7;
       transform: scale(1);
     }
@@ -670,15 +675,33 @@
     animation: mentionItemIn 0.2s cubic-bezier(0.16, 1, 0.3, 1) both;
   }
 
-  .mention-popup-item:nth-child(1) { animation-delay: 0ms; }
-  .mention-popup-item:nth-child(2) { animation-delay: 18ms; }
-  .mention-popup-item:nth-child(3) { animation-delay: 36ms; }
-  .mention-popup-item:nth-child(4) { animation-delay: 54ms; }
-  .mention-popup-item:nth-child(5) { animation-delay: 72ms; }
-  .mention-popup-item:nth-child(6) { animation-delay: 90ms; }
-  .mention-popup-item:nth-child(7) { animation-delay: 108ms; }
-  .mention-popup-item:nth-child(8) { animation-delay: 126ms; }
-  .mention-popup-item:nth-child(n+9) { animation-delay: 140ms; }
+  .mention-popup-item:nth-child(1) {
+    animation-delay: 0ms;
+  }
+  .mention-popup-item:nth-child(2) {
+    animation-delay: 18ms;
+  }
+  .mention-popup-item:nth-child(3) {
+    animation-delay: 36ms;
+  }
+  .mention-popup-item:nth-child(4) {
+    animation-delay: 54ms;
+  }
+  .mention-popup-item:nth-child(5) {
+    animation-delay: 72ms;
+  }
+  .mention-popup-item:nth-child(6) {
+    animation-delay: 90ms;
+  }
+  .mention-popup-item:nth-child(7) {
+    animation-delay: 108ms;
+  }
+  .mention-popup-item:nth-child(8) {
+    animation-delay: 126ms;
+  }
+  .mention-popup-item:nth-child(n + 9) {
+    animation-delay: 140ms;
+  }
 
   /* Composer dropdown (MCP / Skills) animations */
   @keyframes composerDropdownIn {
@@ -738,17 +761,29 @@
   }
 
   .composer-dropdown[data-state="open"] [role="menuitemcheckbox"]:nth-child(1),
-  .composer-dropdown[data-state="open"] [role="menuitem"]:nth-child(1) { animation-delay: 0.02s; }
+  .composer-dropdown[data-state="open"] [role="menuitem"]:nth-child(1) {
+    animation-delay: 0.02s;
+  }
   .composer-dropdown[data-state="open"] [role="menuitemcheckbox"]:nth-child(2),
-  .composer-dropdown[data-state="open"] [role="menuitem"]:nth-child(2) { animation-delay: 0.04s; }
+  .composer-dropdown[data-state="open"] [role="menuitem"]:nth-child(2) {
+    animation-delay: 0.04s;
+  }
   .composer-dropdown[data-state="open"] [role="menuitemcheckbox"]:nth-child(3),
-  .composer-dropdown[data-state="open"] [role="menuitem"]:nth-child(3) { animation-delay: 0.06s; }
+  .composer-dropdown[data-state="open"] [role="menuitem"]:nth-child(3) {
+    animation-delay: 0.06s;
+  }
   .composer-dropdown[data-state="open"] [role="menuitemcheckbox"]:nth-child(4),
-  .composer-dropdown[data-state="open"] [role="menuitem"]:nth-child(4) { animation-delay: 0.08s; }
+  .composer-dropdown[data-state="open"] [role="menuitem"]:nth-child(4) {
+    animation-delay: 0.08s;
+  }
   .composer-dropdown[data-state="open"] [role="menuitemcheckbox"]:nth-child(5),
-  .composer-dropdown[data-state="open"] [role="menuitem"]:nth-child(5) { animation-delay: 0.10s; }
-  .composer-dropdown[data-state="open"] [role="menuitemcheckbox"]:nth-child(n+6),
-  .composer-dropdown[data-state="open"] [role="menuitem"]:nth-child(n+6) { animation-delay: 0.12s; }
+  .composer-dropdown[data-state="open"] [role="menuitem"]:nth-child(5) {
+    animation-delay: 0.1s;
+  }
+  .composer-dropdown[data-state="open"] [role="menuitemcheckbox"]:nth-child(n + 6),
+  .composer-dropdown[data-state="open"] [role="menuitem"]:nth-child(n + 6) {
+    animation-delay: 0.12s;
+  }
 
   /* Composer reasoning select animations */
   @keyframes composerReasoningDropdownIn {
@@ -907,7 +942,8 @@
   }
 
   @keyframes checkpointPulse {
-    0%, 100% {
+    0%,
+    100% {
       opacity: 0.6;
     }
     50% {
@@ -938,30 +974,43 @@
   }
 
   .checkpoint-shimmer {
-    background: linear-gradient(
-      90deg,
-      transparent 0%,
-      hsl(0 0% 50% / 0.06) 50%,
-      transparent 100%
-    );
+    background: linear-gradient(90deg, transparent 0%, hsl(0 0% 50% / 0.06) 50%, transparent 100%);
     background-size: 200% 100%;
     animation: checkpointShimmer 2.5s ease-in-out infinite;
   }
 
   /* Tool card animations & micro-interactions */
   @keyframes toolCardIn {
-    from { opacity: 0; transform: translateY(6px) scale(0.97); }
-    to   { opacity: 1; transform: translateY(0) scale(1); }
+    from {
+      opacity: 0;
+      transform: translateY(6px) scale(0.97);
+    }
+    to {
+      opacity: 1;
+      transform: translateY(0) scale(1);
+    }
   }
 
   @keyframes toolExpandIn {
-    from { opacity: 0; transform: translateY(-4px); }
-    to   { opacity: 1; transform: translateY(0); }
+    from {
+      opacity: 0;
+      transform: translateY(-4px);
+    }
+    to {
+      opacity: 1;
+      transform: translateY(0);
+    }
   }
 
   @keyframes toolArgPillIn {
-    from { opacity: 0; transform: scale(0.92); }
-    to   { opacity: 1; transform: scale(1); }
+    from {
+      opacity: 0;
+      transform: scale(0.92);
+    }
+    to {
+      opacity: 1;
+      transform: scale(1);
+    }
   }
 
   .tool-card-enter {
@@ -985,17 +1034,31 @@
   }
 
   /* Stagger pills */
-  .tool-arg-pill:nth-child(1) { animation-delay: 0ms; }
-  .tool-arg-pill:nth-child(2) { animation-delay: 30ms; }
-  .tool-arg-pill:nth-child(3) { animation-delay: 60ms; }
-  .tool-arg-pill:nth-child(4) { animation-delay: 90ms; }
-  .tool-arg-pill:nth-child(5) { animation-delay: 120ms; }
-  .tool-arg-pill:nth-child(n+6) { animation-delay: 150ms; }
+  .tool-arg-pill:nth-child(1) {
+    animation-delay: 0ms;
+  }
+  .tool-arg-pill:nth-child(2) {
+    animation-delay: 30ms;
+  }
+  .tool-arg-pill:nth-child(3) {
+    animation-delay: 60ms;
+  }
+  .tool-arg-pill:nth-child(4) {
+    animation-delay: 90ms;
+  }
+  .tool-arg-pill:nth-child(5) {
+    animation-delay: 120ms;
+  }
+  .tool-arg-pill:nth-child(n + 6) {
+    animation-delay: 150ms;
+  }
 
   /* Click / open spring animation */
   .tool-card-enter > summary,
   .tool-card-grouped > summary {
-    transition: transform 250ms cubic-bezier(0.34, 1.56, 0.64, 1), background-color 150ms ease;
+    transition:
+      transform 250ms cubic-bezier(0.34, 1.56, 0.64, 1),
+      background-color 150ms ease;
   }
   .tool-card-enter > summary:active,
   .tool-card-grouped > summary:active {
@@ -1007,9 +1070,15 @@
     animation: toolSummaryBounce 0.35s cubic-bezier(0.34, 1.56, 0.64, 1);
   }
   @keyframes toolSummaryBounce {
-    0%   { transform: scale(0.975); }
-    50%  { transform: scale(1.008); }
-    100% { transform: scale(1); }
+    0% {
+      transform: scale(0.975);
+    }
+    50% {
+      transform: scale(1.008);
+    }
+    100% {
+      transform: scale(1);
+    }
   }
 
   /* Focus-visible for keyboard nav */
@@ -1080,29 +1149,60 @@
   /* Hub page loading and entrance animations */
 
   @keyframes hubPageIn {
-    from { opacity: 0; transform: translateY(8px); }
-    to   { opacity: 1; transform: translateY(0); }
+    from {
+      opacity: 0;
+      transform: translateY(8px);
+    }
+    to {
+      opacity: 1;
+      transform: translateY(0);
+    }
   }
 
   @keyframes hubPanelIn {
-    from { opacity: 0; transform: translateY(14px) scale(0.985); }
-    to   { opacity: 1; transform: translateY(0) scale(1); }
+    from {
+      opacity: 0;
+      transform: translateY(14px) scale(0.985);
+    }
+    to {
+      opacity: 1;
+      transform: translateY(0) scale(1);
+    }
   }
 
   @keyframes hubChipIn {
-    from { opacity: 0; transform: translateY(6px) scale(0.94); }
-    to   { opacity: 1; transform: translateY(0) scale(1); }
+    from {
+      opacity: 0;
+      transform: translateY(6px) scale(0.94);
+    }
+    to {
+      opacity: 1;
+      transform: translateY(0) scale(1);
+    }
   }
 
   @keyframes hubLoadingProgress {
-    0%   { transform: translateX(-60%) scaleX(0.35); }
-    50%  { transform: translateX(30%) scaleX(0.85); }
-    100% { transform: translateX(145%) scaleX(0.35); }
+    0% {
+      transform: translateX(-60%) scaleX(0.35);
+    }
+    50% {
+      transform: translateX(30%) scaleX(0.85);
+    }
+    100% {
+      transform: translateX(145%) scaleX(0.35);
+    }
   }
 
   @keyframes hubStatusPulse {
-    0%, 100% { box-shadow: 0 0 0 0 currentColor; opacity: 0.65; }
-    50%      { box-shadow: 0 0 0 4px transparent; opacity: 1; }
+    0%,
+    100% {
+      box-shadow: 0 0 0 0 currentColor;
+      opacity: 0.65;
+    }
+    50% {
+      box-shadow: 0 0 0 4px transparent;
+      opacity: 1;
+    }
   }
 
   .hub-page-enter {
@@ -1129,12 +1229,24 @@
   .hub-chip-enter {
     animation: hubChipIn 320ms cubic-bezier(0.34, 1.56, 0.64, 1) both;
   }
-  .hub-chip-enter:nth-child(1)  { animation-delay: 0ms; }
-  .hub-chip-enter:nth-child(2)  { animation-delay: 40ms; }
-  .hub-chip-enter:nth-child(3)  { animation-delay: 80ms; }
-  .hub-chip-enter:nth-child(4)  { animation-delay: 120ms; }
-  .hub-chip-enter:nth-child(5)  { animation-delay: 160ms; }
-  .hub-chip-enter:nth-child(n+6) { animation-delay: 200ms; }
+  .hub-chip-enter:nth-child(1) {
+    animation-delay: 0ms;
+  }
+  .hub-chip-enter:nth-child(2) {
+    animation-delay: 40ms;
+  }
+  .hub-chip-enter:nth-child(3) {
+    animation-delay: 80ms;
+  }
+  .hub-chip-enter:nth-child(4) {
+    animation-delay: 120ms;
+  }
+  .hub-chip-enter:nth-child(5) {
+    animation-delay: 160ms;
+  }
+  .hub-chip-enter:nth-child(n + 6) {
+    animation-delay: 200ms;
+  }
 
   .hub-loading-progress {
     width: 42%;
@@ -1149,20 +1261,38 @@
   /* macOS frosted-glass loading hero — calm, monochrome, minimal */
 
   @keyframes hubFrostSpinnerFade {
-    0%   { opacity: 1; }
-    100% { opacity: 0.18; }
+    0% {
+      opacity: 1;
+    }
+    100% {
+      opacity: 0.18;
+    }
   }
 
   @keyframes hubFrostTrack {
-    0%   { transform: translateX(-105%); }
-    100% { transform: translateX(260%); }
+    0% {
+      transform: translateX(-105%);
+    }
+    100% {
+      transform: translateX(260%);
+    }
   }
 
   @keyframes hubFrostSheen {
-    0%   { transform: translateX(-60%); opacity: 0; }
-    24%  { opacity: 1; }
-    76%  { opacity: 1; }
-    100% { transform: translateX(160%); opacity: 0; }
+    0% {
+      transform: translateX(-60%);
+      opacity: 0;
+    }
+    24% {
+      opacity: 1;
+    }
+    76% {
+      opacity: 1;
+    }
+    100% {
+      transform: translateX(160%);
+      opacity: 0;
+    }
   }
 
   .hub-frost-hero {
@@ -1186,22 +1316,12 @@
     position: absolute;
     inset: 0;
     width: 50%;
-    background: linear-gradient(
-      90deg,
-      transparent,
-      hsl(0 0% 100% / 0.22),
-      transparent
-    );
+    background: linear-gradient(90deg, transparent, hsl(0 0% 100% / 0.22), transparent);
     animation: hubFrostSheen 2.6s ease-in-out infinite;
     pointer-events: none;
   }
   .dark .hub-frost-hero::after {
-    background: linear-gradient(
-      90deg,
-      transparent,
-      hsl(0 0% 100% / 0.06),
-      transparent
-    );
+    background: linear-gradient(90deg, transparent, hsl(0 0% 100% / 0.06), transparent);
   }
 
   .hub-frost-spinner {
@@ -1223,25 +1343,61 @@
     animation: hubFrostSpinnerFade 1s linear infinite;
     opacity: 0;
   }
-  .hub-frost-spinner > i:nth-child(1)  { transform: rotate(0deg);   animation-delay: -0.917s; }
-  .hub-frost-spinner > i:nth-child(2)  { transform: rotate(30deg);  animation-delay: -0.833s; }
-  .hub-frost-spinner > i:nth-child(3)  { transform: rotate(60deg);  animation-delay: -0.750s; }
-  .hub-frost-spinner > i:nth-child(4)  { transform: rotate(90deg);  animation-delay: -0.667s; }
-  .hub-frost-spinner > i:nth-child(5)  { transform: rotate(120deg); animation-delay: -0.583s; }
-  .hub-frost-spinner > i:nth-child(6)  { transform: rotate(150deg); animation-delay: -0.500s; }
-  .hub-frost-spinner > i:nth-child(7)  { transform: rotate(180deg); animation-delay: -0.417s; }
-  .hub-frost-spinner > i:nth-child(8)  { transform: rotate(210deg); animation-delay: -0.333s; }
-  .hub-frost-spinner > i:nth-child(9)  { transform: rotate(240deg); animation-delay: -0.250s; }
-  .hub-frost-spinner > i:nth-child(10) { transform: rotate(270deg); animation-delay: -0.167s; }
-  .hub-frost-spinner > i:nth-child(11) { transform: rotate(300deg); animation-delay: -0.083s; }
-  .hub-frost-spinner > i:nth-child(12) { transform: rotate(330deg); animation-delay:  0.000s; }
+  .hub-frost-spinner > i:nth-child(1) {
+    transform: rotate(0deg);
+    animation-delay: -0.917s;
+  }
+  .hub-frost-spinner > i:nth-child(2) {
+    transform: rotate(30deg);
+    animation-delay: -0.833s;
+  }
+  .hub-frost-spinner > i:nth-child(3) {
+    transform: rotate(60deg);
+    animation-delay: -0.75s;
+  }
+  .hub-frost-spinner > i:nth-child(4) {
+    transform: rotate(90deg);
+    animation-delay: -0.667s;
+  }
+  .hub-frost-spinner > i:nth-child(5) {
+    transform: rotate(120deg);
+    animation-delay: -0.583s;
+  }
+  .hub-frost-spinner > i:nth-child(6) {
+    transform: rotate(150deg);
+    animation-delay: -0.5s;
+  }
+  .hub-frost-spinner > i:nth-child(7) {
+    transform: rotate(180deg);
+    animation-delay: -0.417s;
+  }
+  .hub-frost-spinner > i:nth-child(8) {
+    transform: rotate(210deg);
+    animation-delay: -0.333s;
+  }
+  .hub-frost-spinner > i:nth-child(9) {
+    transform: rotate(240deg);
+    animation-delay: -0.25s;
+  }
+  .hub-frost-spinner > i:nth-child(10) {
+    transform: rotate(270deg);
+    animation-delay: -0.167s;
+  }
+  .hub-frost-spinner > i:nth-child(11) {
+    transform: rotate(300deg);
+    animation-delay: -0.083s;
+  }
+  .hub-frost-spinner > i:nth-child(12) {
+    transform: rotate(330deg);
+    animation-delay: 0s;
+  }
 
   .hub-frost-track {
     position: relative;
     height: 2px;
     width: 100%;
     border-radius: 9999px;
-    background: hsl(var(--muted-foreground) / 0.10);
+    background: hsl(var(--muted-foreground) / 0.1);
     overflow: hidden;
   }
   .hub-frost-track::before {
@@ -1251,12 +1407,7 @@
     left: 0;
     width: 38%;
     border-radius: inherit;
-    background: linear-gradient(
-      90deg,
-      transparent,
-      hsl(var(--foreground) / 0.5),
-      transparent
-    );
+    background: linear-gradient(90deg, transparent, hsl(var(--foreground) / 0.5), transparent);
     animation: hubFrostTrack 1.6s cubic-bezier(0.65, 0, 0.35, 1) infinite;
   }
 
@@ -1285,26 +1436,48 @@
   }
 
   @keyframes hubLoadingTrackShimmer {
-    0%   { background-position: 150% 0; }
-    100% { background-position: -50% 0; }
+    0% {
+      background-position: 150% 0;
+    }
+    100% {
+      background-position: -50% 0;
+    }
   }
 
   /* Skills loading animations */
 
   @keyframes skillsSkeletonShimmer {
-    0%   { background-position: -200% 0; }
-    100% { background-position: 200% 0; }
+    0% {
+      background-position: -200% 0;
+    }
+    100% {
+      background-position: 200% 0;
+    }
   }
 
   @keyframes skillCardIn {
-    from { opacity: 0; transform: translateY(10px) scale(0.97); }
-    to   { opacity: 1; transform: translateY(0) scale(1); }
+    from {
+      opacity: 0;
+      transform: translateY(10px) scale(0.97);
+    }
+    to {
+      opacity: 1;
+      transform: translateY(0) scale(1);
+    }
   }
 
   @keyframes skillCardCheckIn {
-    0%   { transform: scale(0); opacity: 0; }
-    60%  { transform: scale(1.15); }
-    100% { transform: scale(1); opacity: 1; }
+    0% {
+      transform: scale(0);
+      opacity: 0;
+    }
+    60% {
+      transform: scale(1.15);
+    }
+    100% {
+      transform: scale(1);
+      opacity: 1;
+    }
   }
 
   .skills-skeleton-shimmer {
@@ -1319,59 +1492,114 @@
   }
 
   @keyframes skillsSkeletonPulse {
-    0%, 100% { background-color: hsl(var(--muted-foreground) / 0.10); }
-    50%      { background-color: hsl(var(--muted-foreground) / 0.22); }
+    0%,
+    100% {
+      background-color: hsl(var(--muted-foreground) / 0.1);
+    }
+    50% {
+      background-color: hsl(var(--muted-foreground) / 0.22);
+    }
   }
 
   .skills-skeleton-pulse {
-    background-color: hsl(var(--muted-foreground) / 0.10);
+    background-color: hsl(var(--muted-foreground) / 0.1);
     animation: skillsSkeletonPulse 1.6s ease-in-out infinite;
   }
-  .skills-skeleton-pulse:nth-child(2)  { animation-delay: 80ms; }
-  .skills-skeleton-pulse:nth-child(3)  { animation-delay: 160ms; }
-  .skills-skeleton-pulse:nth-child(4)  { animation-delay: 240ms; }
-  .skills-skeleton-pulse:nth-child(5)  { animation-delay: 320ms; }
-  .skills-skeleton-pulse:nth-child(6)  { animation-delay: 400ms; }
+  .skills-skeleton-pulse:nth-child(2) {
+    animation-delay: 80ms;
+  }
+  .skills-skeleton-pulse:nth-child(3) {
+    animation-delay: 160ms;
+  }
+  .skills-skeleton-pulse:nth-child(4) {
+    animation-delay: 240ms;
+  }
+  .skills-skeleton-pulse:nth-child(5) {
+    animation-delay: 320ms;
+  }
+  .skills-skeleton-pulse:nth-child(6) {
+    animation-delay: 400ms;
+  }
 
   .skill-card-enter {
     animation: skillCardIn 0.35s cubic-bezier(0.16, 1, 0.3, 1) both;
   }
-  .skill-card-enter:nth-child(1)  { animation-delay: 0ms; }
-  .skill-card-enter:nth-child(2)  { animation-delay: 50ms; }
-  .skill-card-enter:nth-child(3)  { animation-delay: 100ms; }
-  .skill-card-enter:nth-child(4)  { animation-delay: 150ms; }
-  .skill-card-enter:nth-child(5)  { animation-delay: 200ms; }
-  .skill-card-enter:nth-child(6)  { animation-delay: 250ms; }
-  .skill-card-enter:nth-child(n+7) { animation-delay: 300ms; }
+  .skill-card-enter:nth-child(1) {
+    animation-delay: 0ms;
+  }
+  .skill-card-enter:nth-child(2) {
+    animation-delay: 50ms;
+  }
+  .skill-card-enter:nth-child(3) {
+    animation-delay: 100ms;
+  }
+  .skill-card-enter:nth-child(4) {
+    animation-delay: 150ms;
+  }
+  .skill-card-enter:nth-child(5) {
+    animation-delay: 200ms;
+  }
+  .skill-card-enter:nth-child(6) {
+    animation-delay: 250ms;
+  }
+  .skill-card-enter:nth-child(n + 7) {
+    animation-delay: 300ms;
+  }
 
   .skill-check-enter {
     animation: skillCardCheckIn 0.3s cubic-bezier(0.34, 1.56, 0.64, 1) both;
   }
 
-  .skills-scan-dot { animation: bounce 1s infinite; }
-  .skills-scan-dot:nth-child(2) { animation-delay: 150ms; }
-  .skills-scan-dot:nth-child(3) { animation-delay: 300ms; }
+  .skills-scan-dot {
+    animation: bounce 1s infinite;
+  }
+  .skills-scan-dot:nth-child(2) {
+    animation-delay: 150ms;
+  }
+  .skills-scan-dot:nth-child(3) {
+    animation-delay: 300ms;
+  }
 
   /* Skills store preview drawer animations */
 
   @keyframes skillsDrawerBackdropIn {
-    from { opacity: 0; }
-    to   { opacity: 1; }
+    from {
+      opacity: 0;
+    }
+    to {
+      opacity: 1;
+    }
   }
 
   @keyframes skillsDrawerBackdropOut {
-    from { opacity: 1; }
-    to   { opacity: 0; }
+    from {
+      opacity: 1;
+    }
+    to {
+      opacity: 0;
+    }
   }
 
   @keyframes skillsDrawerPanelIn {
-    from { opacity: 0; transform: translateX(32px); }
-    to   { opacity: 1; transform: translateX(0); }
+    from {
+      opacity: 0;
+      transform: translateX(32px);
+    }
+    to {
+      opacity: 1;
+      transform: translateX(0);
+    }
   }
 
   @keyframes skillsDrawerPanelOut {
-    from { opacity: 1; transform: translateX(0); }
-    to   { opacity: 0; transform: translateX(32px); }
+    from {
+      opacity: 1;
+      transform: translateX(0);
+    }
+    to {
+      opacity: 0;
+      transform: translateX(32px);
+    }
   }
 
   .skills-drawer-backdrop {
@@ -1410,7 +1638,9 @@
     .skills-drawer-panel-closing {
       animation: none !important;
     }
-    .hub-frost-spinner > i { opacity: 0.4; }
+    .hub-frost-spinner > i {
+      opacity: 0.4;
+    }
   }
 
   @keyframes fileDropOverlayIn {
@@ -1434,7 +1664,8 @@
   }
 
   @keyframes fileDropBorderPulse {
-    0%, 100% {
+    0%,
+    100% {
       box-shadow: 0 0 0 0 hsl(var(--foreground) / 0);
     }
     50% {
@@ -1521,7 +1752,9 @@
   border-radius: 0.25rem;
   cursor: pointer;
   color: hsl(var(--muted-foreground));
-  transition: color 0.15s, background-color 0.15s;
+  transition:
+    color 0.15s,
+    background-color 0.15s;
 }
 .chat-markdown [data-streamdown="code-block-copy-button"]:hover,
 .chat-markdown [data-streamdown="code-block-download-button"]:hover {
diff --git a/crates/agent-gui/src/lib/chat/compaction/contextCompaction.ts b/crates/agent-gui/src/lib/chat/compaction/contextCompaction.ts
index d7f060570..6fd897d19 100644
--- a/crates/agent-gui/src/lib/chat/compaction/contextCompaction.ts
+++ b/crates/agent-gui/src/lib/chat/compaction/contextCompaction.ts
@@ -8,23 +8,20 @@ import type {
 } from "@mariozechner/pi-ai";
 
 import type { StreamDebugLogger } from "../../debug/agentDebug";
-import {
-  assistantMessageToText,
-  completeAssistantMessage,
-} from "../../providers/llm";
+import { assistantMessageToText, completeAssistantMessage } from "../../providers/llm";
 import type {
   CodexRequestFormat,
   ProviderId,
   ProviderModelConfig,
   ReasoningLevel,
 } from "../../settings";
+import { sanitizeMessageForModelContext } from "../context/requestContextSanitizer";
 import {
   applyCompactionCheckpoint,
+  type ConversationViewState,
   getActiveSegment,
   replaceActiveSegmentMessages,
-  type ConversationViewState,
 } from "../conversation/conversationState";
-import { sanitizeMessageForModelContext } from "../context/requestContextSanitizer";
 
 const CLAUDE_OPTIMIZATION_FACTOR = 1.5;
 const CLAUDE_PROTECTION_FACTOR = 1.2;
@@ -175,7 +172,7 @@ export type CompactionStatus =
       trigger: "pre-send" | "mid-stream" | "post-tool";
       newSegmentIndex: number;
       completedAt: number;
-    } 
+    }
   | {
       phase: "failed";
       trigger: "pre-send" | "mid-stream" | "post-tool";
@@ -252,13 +249,11 @@ type CompactionReason = {
 type CompactionPayload = {
   compaction_reason: CompactionReason;
   system_prompt: string;
-  previous_summary:
-    | {
-        id: string;
-        content: string;
-        summaryMeta: unknown;
-      }
-    | null;
+  previous_summary: {
+    id: string;
+    content: string;
+    summaryMeta: unknown;
+  } | null;
   active_segment_messages: SerializedCompactionMessage[];
   next_user_message?: string;
 };
@@ -404,9 +399,7 @@ function serializeMessageForCompaction(
       text: text || undefined,
       toolCalls: toolCalls.length > 0 ? toolCalls : undefined,
       usageTotalTokens:
-        typeof message.usage?.totalTokens === "number"
-          ? message.usage.totalTokens
-          : undefined,
+        typeof message.usage?.totalTokens === "number" ? message.usage.totalTokens : undefined,
     };
   }
 
@@ -504,12 +497,23 @@ function getObservedConversationTokens(params: {
 }
 
 const SUMMARY_TAGS = [
-  "task", "constraints", "state", "artifacts", "decisions",
-  "dead_ends", "knowledge", "open_loops", "next_steps", "breadcrumbs",
+  "task",
+  "constraints",
+  "state",
+  "artifacts",
+  "decisions",
+  "dead_ends",
+  "knowledge",
+  "open_loops",
+  "next_steps",
+  "breadcrumbs",
 ] as const;
 
 const REQUIRED_SUMMARY_TAGS: ReadonlyArray<(typeof SUMMARY_TAGS)[number]> = [
-  "task", "state", "next_steps", "artifacts",
+  "task",
+  "state",
+  "next_steps",
+  "artifacts",
 ];
 
 type CompactionSummaryParsed = Record<(typeof SUMMARY_TAGS)[number], string>;
@@ -553,11 +557,7 @@ function pushVerificationSignal(
   out.push(truncated);
 }
 
-function extractVerificationSignalsFromText(
-  text: string,
-  out: string[],
-  seen: Set<string>,
-) {
+function extractVerificationSignalsFromText(text: string, out: string[], seen: Set<string>) {
   if (!text.trim()) return;
 
   for (const match of text.matchAll(COMMAND_SIGNAL_RE)) {
@@ -631,11 +631,7 @@ function formatSummaryForContext(s: CompactionSummaryParsed): string {
   return sections.join("\n\n");
 }
 
-function validateCompactionSummary(
-  raw: string,
-  sourceTokens: number,
-  payload: CompactionPayload,
-) {
+function validateCompactionSummary(raw: string, sourceTokens: number, payload: CompactionPayload) {
   const parsed = parseCompactionSummaryXml(raw);
   const errors: string[] = [];
 
@@ -644,15 +640,11 @@ function validateCompactionSummary(
   }
 
   if (parsed.artifacts) {
-    const artifactLines = parsed.artifacts
-      .split("\n")
-      .filter((l) => l.trim().startsWith("-"));
+    const artifactLines = parsed.artifacts.split("\n").filter((l) => l.trim().startsWith("-"));
     if (artifactLines.length === 0) {
       errors.push("no artifact entries found (expected bullet lines starting with -)");
     } else {
-      const malformed = artifactLines.filter(
-        (l) => !ARTIFACT_LINE_RE.test(l.trim()),
-      );
+      const malformed = artifactLines.filter((l) => !ARTIFACT_LINE_RE.test(l.trim()));
       if (malformed.length === artifactLines.length) {
         errors.push("no valid artifact lines (expected: - [kind] ref | status)");
       }
@@ -701,10 +693,7 @@ export function noteCompactionRound(state: CompactionThrottleState, rounds = 1)
   }
 }
 
-export function noteCompactionApplied(
-  state: CompactionThrottleState,
-  params?: { now?: number },
-) {
+export function noteCompactionApplied(state: CompactionThrottleState, params?: { now?: number }) {
   const now = params?.now ?? Date.now();
   if (now - state.lastCompactionTime > RECENT_COMPACTION_WINDOW_MS) {
     state.recentCompactionCount = 0;
@@ -715,9 +704,7 @@ export function noteCompactionApplied(
   state.roundsSinceLastCompaction = 0;
   state.recentCompactionCount += 1;
   state.totalSessionCompactions += 1;
-  state.consecutiveCompactions = isConsecutive
-    ? state.consecutiveCompactions + 1
-    : 1;
+  state.consecutiveCompactions = isConsecutive ? state.consecutiveCompactions + 1 : 1;
 }
 
 function cleanupThrottleWindow(state: CompactionThrottleState, now: number) {
@@ -744,9 +731,7 @@ function resolveCompactionThreshold(params: {
   }
 
   const factor =
-    params.trigger === "optimization"
-      ? CLAUDE_OPTIMIZATION_FACTOR
-      : CLAUDE_PROTECTION_FACTOR;
+    params.trigger === "optimization" ? CLAUDE_OPTIMIZATION_FACTOR : CLAUDE_PROTECTION_FACTOR;
   const effectiveFactor =
     params.trigger === "protection" &&
     params.throttleState &&
@@ -1118,9 +1103,7 @@ function trimCompactionPayloadEnvelope(payload: CompactionPayload): CompactionPa
 function aggressivelyTrimCompactionPayloadMessages(payload: CompactionPayload): CompactionPayload {
   return markReducedCompactionPayload({
     ...payload,
-    active_segment_messages: payload.active_segment_messages.map(
-      aggressivelyTrimSerializedMessage,
-    ),
+    active_segment_messages: payload.active_segment_messages.map(aggressivelyTrimSerializedMessage),
   });
 }
 
@@ -1135,8 +1118,7 @@ function resolveCompactionPayloadBudget(modelConfig?: ProviderModelConfig) {
     512,
     Math.floor(maxOutputToken * COMPACTION_OUTPUT_RESERVE_FACTOR),
   );
-  const availableTokens =
-    contextWindow - outputReserve - COMPACTION_PROMPT_TOKEN_BUDGET;
+  const availableTokens = contextWindow - outputReserve - COMPACTION_PROMPT_TOKEN_BUDGET;
   if (availableTokens <= 0) {
     return COMPACTION_PAYLOAD_TOKEN_CAP;
   }
@@ -1235,8 +1217,7 @@ function buildCompactionAssistantMessage(
     stopReason: "stop",
     content: [{ type: "text", text: assistantMessageToText(summaryAssistant).trim() }],
     responseId:
-      summaryAssistant.responseId ||
-      `liveagent-compaction-${Date.now()}-${crypto.randomUUID()}`,
+      summaryAssistant.responseId || `liveagent-compaction-${Date.now()}-${crypto.randomUUID()}`,
   } as AssistantMessage & { promptVersion: string };
 }
 
@@ -1571,10 +1552,7 @@ export function pruneConversationState(
     0,
     Math.floor(params?.protectedToolTokens ?? PRUNE_PROTECT_TOKENS),
   );
-  const protectedRecentUserTurns = Math.max(
-    1,
-    Math.floor(params?.protectedRecentUserTurns ?? 2),
-  );
+  const protectedRecentUserTurns = Math.max(1, Math.floor(params?.protectedRecentUserTurns ?? 2));
 
   const nextMessages = activeSegment.messages.slice();
   let userTurnsSeen = 0;
@@ -1754,7 +1732,9 @@ export async function runMidTurnCompaction(params: {
     throw error;
   }
   const checkpointState = applyCompactionCheckpoint(params.state, compactionMessage);
-  const resumeMessage = createSyntheticContinueUserMessage((compactionMessage.timestamp ?? Date.now()) + 1);
+  const resumeMessage = createSyntheticContinueUserMessage(
+    (compactionMessage.timestamp ?? Date.now()) + 1,
+  );
 
   return {
     applied: true,
diff --git a/crates/agent-gui/src/lib/chat/context/requestContextSanitizer.ts b/crates/agent-gui/src/lib/chat/context/requestContextSanitizer.ts
index 8c33b49a2..10ec8e1cd 100644
--- a/crates/agent-gui/src/lib/chat/context/requestContextSanitizer.ts
+++ b/crates/agent-gui/src/lib/chat/context/requestContextSanitizer.ts
@@ -1,10 +1,9 @@
 import type { Context, Message, TextContent, ToolResultMessage } from "@mariozechner/pi-ai";
-
+import type { DisplayImageItemDetails, DisplayImageResultDetails } from "../../tools/builtinTypes";
 import {
   hostedSearchBlockToContextText,
   normalizeHostedSearchBlock,
 } from "../messages/hostedSearch";
-import type { DisplayImageItemDetails, DisplayImageResultDetails } from "../../tools/builtinTypes";
 
 function isRecord(value: unknown): value is Record<string, unknown> {
   return Boolean(value) && typeof value === "object";
@@ -12,15 +11,29 @@ function isRecord(value: unknown): value is Record<string, unknown> {
 
 function normalizeDisplayImageItem(value: unknown): DisplayImageItemDetails | null {
   if (!isRecord(value)) return null;
-  const { root, path, sourceType, renderMode, sourceUrl, mimeType, sizeBytes, mtimeMs, contentHash } = value;
+  const {
+    root,
+    path,
+    sourceType,
+    renderMode,
+    sourceUrl,
+    mimeType,
+    sizeBytes,
+    mtimeMs,
+    contentHash,
+  } = value;
   if (typeof path !== "string") {
     return null;
   }
   return {
     ...(typeof root === "string" ? { root: root as DisplayImageItemDetails["root"] } : {}),
     path,
-    ...(typeof sourceType === "string" ? { sourceType: sourceType as DisplayImageItemDetails["sourceType"] } : {}),
-    ...(typeof renderMode === "string" ? { renderMode: renderMode as DisplayImageItemDetails["renderMode"] } : {}),
+    ...(typeof sourceType === "string"
+      ? { sourceType: sourceType as DisplayImageItemDetails["sourceType"] }
+      : {}),
+    ...(typeof renderMode === "string"
+      ? { renderMode: renderMode as DisplayImageItemDetails["renderMode"] }
+      : {}),
     ...(typeof sourceUrl === "string" ? { sourceUrl } : {}),
     ...(typeof mimeType === "string" ? { mimeType } : {}),
     ...(typeof sizeBytes === "number" ? { sizeBytes } : {}),
@@ -39,7 +52,9 @@ function getDisplayImageItems(details: unknown): DisplayImageItemDetails[] {
   });
 }
 
-function isDisplayImageToolResult(message: Message): message is ToolResultMessage<DisplayImageResultDetails> {
+function isDisplayImageToolResult(
+  message: Message,
+): message is ToolResultMessage<DisplayImageResultDetails> {
   return (
     message.role === "toolResult" &&
     !message.isError &&
@@ -66,22 +81,18 @@ function buildDisplayImageContextText(message: ToolResultMessage<DisplayImageRes
 
   const noun = images.length === 1 ? "image" : "images";
   const formatPath = (image: DisplayImageItemDetails) =>
-    image.root && image.root !== "workspace"
-      ? `root=${image.root} path=${image.path}`
-      : image.path;
+    image.root && image.root !== "workspace" ? `root=${image.root} path=${image.path}` : image.path;
   return [
     `Displayed ${images.length} ${noun} in the chat UI successfully.`,
-    ...images.map(
-      (image, index) => {
-        const facts = [
-          image.sourceType ? `sourceType=${image.sourceType}` : null,
-          image.renderMode ? `renderMode=${image.renderMode}` : null,
-          image.mimeType ? `mime=${image.mimeType}` : null,
-          typeof image.sizeBytes === "number" ? `sizeBytes=${image.sizeBytes}` : null,
-        ].filter(Boolean);
-        return `${index + 1}. ${formatPath(image)}${facts.length > 0 ? ` (${facts.join(", ")})` : ""}`;
-      },
-    ),
+    ...images.map((image, index) => {
+      const facts = [
+        image.sourceType ? `sourceType=${image.sourceType}` : null,
+        image.renderMode ? `renderMode=${image.renderMode}` : null,
+        image.mimeType ? `mime=${image.mimeType}` : null,
+        typeof image.sizeBytes === "number" ? `sizeBytes=${image.sizeBytes}` : null,
+      ].filter(Boolean);
+      return `${index + 1}. ${formatPath(image)}${facts.length > 0 ? ` (${facts.join(", ")})` : ""}`;
+    }),
     "Inline image bytes are omitted from model context because Image is a display-only UI tool.",
   ].join("\n");
 }
diff --git a/crates/agent-gui/src/lib/chat/conversation/chatAbort.ts b/crates/agent-gui/src/lib/chat/conversation/chatAbort.ts
index 696993e8a..f5d991929 100644
--- a/crates/agent-gui/src/lib/chat/conversation/chatAbort.ts
+++ b/crates/agent-gui/src/lib/chat/conversation/chatAbort.ts
@@ -1,9 +1,4 @@
-import type {
-  AssistantMessage,
-  Message,
-  Model,
-  Usage,
-} from "@mariozechner/pi-ai";
+import type { AssistantMessage, Message, Model, Usage } from "@mariozechner/pi-ai";
 
 import type { ExecutionMode } from "../../settings";
 import {
@@ -104,11 +99,7 @@ function buildAssistantMessage(params: {
 export function isAbortedAssistantMessage(
   message: Message | AssistantMessage | null | undefined,
 ): message is AssistantMessage {
-  return Boolean(
-    message &&
-      message.role === "assistant" &&
-      message.stopReason === "aborted",
-  );
+  return Boolean(message && message.role === "assistant" && message.stopReason === "aborted");
 }
 
 export function buildAbortedMessagesFromSnapshot(params: {
@@ -170,9 +161,7 @@ function extractAssistantText(message: AssistantMessage) {
   return text.trim();
 }
 
-function toPersistableAbortedAssistant(
-  message: AssistantMessage,
-): AssistantMessage | null {
+function toPersistableAbortedAssistant(message: AssistantMessage): AssistantMessage | null {
   const text = extractAssistantText(message);
   const hostedSearchBlocks = (message.content as unknown[]).filter(
     (block): block is AssistantMessage["content"][number] =>
@@ -185,10 +174,7 @@ function toPersistableAbortedAssistant(
   }
   return {
     ...message,
-    content: [
-      ...(text ? [{ type: "text" as const, text }] : []),
-      ...hostedSearchBlocks,
-    ],
+    content: [...(text ? [{ type: "text" as const, text }] : []), ...hostedSearchBlocks],
     errorMessage: undefined,
   };
 }
diff --git a/crates/agent-gui/src/lib/chat/conversation/conversationState.ts b/crates/agent-gui/src/lib/chat/conversation/conversationState.ts
index a6a6ac853..6e91427b4 100644
--- a/crates/agent-gui/src/lib/chat/conversation/conversationState.ts
+++ b/crates/agent-gui/src/lib/chat/conversation/conversationState.ts
@@ -1,23 +1,20 @@
 import type { AssistantMessage, Context, Message } from "@mariozechner/pi-ai";
 
 import { assistantMessageToText } from "../../providers/llm";
-import { normalizeConversationSystemPrompt } from "../context/systemPrompt";
 import {
   sanitizeMessagesForContinuation,
   sanitizeMessagesForModelContext,
 } from "../context/requestContextSanitizer";
+import { normalizeConversationSystemPrompt } from "../context/systemPrompt";
 import { buildUiMessages, type UiRound } from "../messages/uiMessages";
 import {
-  stripUploadedFilesMessageMetadata,
   type PendingUploadedFile,
+  stripUploadedFilesMessageMetadata,
 } from "../messages/uploadedFiles";
 
 const INTERNAL_RESUME_MESSAGE_TEXT =
   "Continue if you have next steps, or stop and ask for clarification if you are unsure how to proceed.";
-const SILENT_MEMORY_EXTRACTION_FINAL_TEXTS = new Set([
-  "记忆整理完成。",
-  "本轮无需更新记忆。",
-]);
+const SILENT_MEMORY_EXTRACTION_FINAL_TEXTS = new Set(["记忆整理完成。", "本轮无需更新记忆。"]);
 
 export type StoredSummaryMessage = {
   role: "summary";
@@ -106,10 +103,7 @@ export type RenderAssistantGroup = {
   isFromCompactedSegment: boolean;
 };
 
-export type RenderTimelineItem =
-  | RenderSummaryCard
-  | RenderUserMessage
-  | RenderAssistantGroup;
+export type RenderTimelineItem = RenderSummaryCard | RenderUserMessage | RenderAssistantGroup;
 
 export type ConversationViewState = {
   meta: StoredChatContextMeta;
@@ -147,15 +141,11 @@ function getMessageTimestamp(message: Message | undefined) {
   return typeof message.timestamp === "number" ? message.timestamp : Date.now();
 }
 
-function isMemoryManagerToolUseAssistantMessage(
-  message: Message,
-): message is AssistantMessage {
+function isMemoryManagerToolUseAssistantMessage(message: Message): message is AssistantMessage {
   return (
     message.role === "assistant" &&
     message.content.length > 0 &&
-    message.content.every(
-      (block) => block.type === "toolCall" && block.name === "MemoryManager",
-    )
+    message.content.every((block) => block.type === "toolCall" && block.name === "MemoryManager")
   );
 }
 
@@ -519,9 +509,7 @@ function buildUpdatedTimelineForActiveSegment(params: {
     .filter((item) => item.segmentIndex < activeSegmentIndex)
     .map(markTimelineItemCompacted);
   const activeSegment = segments[activeSegmentIndex];
-  const activeItems = activeSegment
-    ? buildTimelineItemsForSegment(activeSegment, false)
-    : [];
+  const activeItems = activeSegment ? buildTimelineItemsForSegment(activeSegment, false) : [];
   return [...preserved, ...activeItems];
 }
 
@@ -534,7 +522,9 @@ function rebuildTimelineFromSegment(params: {
   const { previousItems, segments, activeSegmentIndex, startSegmentIndex } = params;
   const preserved = previousItems
     .filter((item) => item.segmentIndex < startSegmentIndex)
-    .map((item) => (item.segmentIndex < activeSegmentIndex ? markTimelineItemCompacted(item) : item));
+    .map((item) =>
+      item.segmentIndex < activeSegmentIndex ? markTimelineItemCompacted(item) : item,
+    );
   const rebuilt = segments
     .filter((segment) => segment.segmentIndex >= startSegmentIndex)
     .flatMap((segment) =>
@@ -642,7 +632,11 @@ export function appendMessagesToConversation(
 
   for (const message of incomingMessages) {
     if (isCompactionAssistantMessage(message)) {
-      const checkpoint = appendCompactionCheckpointToSegments(segments, activeSegmentIndex, message);
+      const checkpoint = appendCompactionCheckpointToSegments(
+        segments,
+        activeSegmentIndex,
+        message,
+      );
       if (checkpoint.appended) {
         activeSegmentIndex = checkpoint.activeSegmentIndex;
         changedSegmentIndexes.add(activeSegmentIndex);
@@ -720,10 +714,7 @@ export function appendRenderOnlyMessagesToConversation(
       const roundOffset = getLastRoundNumber(lastItem.rounds);
       historyRenderItems[lastIndex] = {
         ...lastItem,
-        rounds: [
-          ...lastItem.rounds,
-          ...shiftUiRounds(sourceRounds, roundOffset),
-        ],
+        rounds: [...lastItem.rounds, ...shiftUiRounds(sourceRounds, roundOffset)],
         timestamp,
       };
       continue;
@@ -752,19 +743,15 @@ export function truncateConversationFromMessage(
   const targetSegment = state.segments[ref.segmentIndex];
   if (!targetSegment) return state;
 
-  const segments = state.segments
-    .slice(0, ref.segmentIndex + 1)
-    .map((segment) => ({
-      ...segment,
-      messages: segment.messages.slice(),
-    }));
+  const segments = state.segments.slice(0, ref.segmentIndex + 1).map((segment) => ({
+    ...segment,
+    messages: segment.messages.slice(),
+  }));
   const target = segments[ref.segmentIndex];
   const cutoff = Math.max(0, Math.min(ref.messageIndex, target.messages.length));
   target.messages = target.messages.slice(0, cutoff);
   target.updatedAt =
-    cutoff > 0
-      ? getMessageTimestamp(target.messages[cutoff - 1])
-      : target.createdAt;
+    cutoff > 0 ? getMessageTimestamp(target.messages[cutoff - 1]) : target.createdAt;
   const normalizedSegments = segments.map((segment, index) =>
     index === ref.segmentIndex ? normalizeSegment(segment, index) : segment,
   );
diff --git a/crates/agent-gui/src/lib/chat/conversation/run/gatewayBridgeEvents.ts b/crates/agent-gui/src/lib/chat/conversation/run/gatewayBridgeEvents.ts
index 25586e80b..2d442e406 100644
--- a/crates/agent-gui/src/lib/chat/conversation/run/gatewayBridgeEvents.ts
+++ b/crates/agent-gui/src/lib/chat/conversation/run/gatewayBridgeEvents.ts
@@ -110,9 +110,7 @@ export function createGatewayBridgeEventController(
         type: "error",
         message,
         conversation_id:
-          conversationIdOverride ??
-          params.resolveErrorConversationId?.() ??
-          params.conversationId,
+          conversationIdOverride ?? params.resolveErrorConversationId?.() ?? params.conversationId,
       });
     },
     close() {
diff --git a/crates/agent-gui/src/lib/chat/history/chatHistory.ts b/crates/agent-gui/src/lib/chat/history/chatHistory.ts
index c25a6fc34..a5e92ca7d 100644
--- a/crates/agent-gui/src/lib/chat/history/chatHistory.ts
+++ b/crates/agent-gui/src/lib/chat/history/chatHistory.ts
@@ -1,14 +1,13 @@
-import { invoke } from "@tauri-apps/api/core";
 import type { Message } from "@mariozechner/pi-ai";
-
+import { invoke } from "@tauri-apps/api/core";
+import { normalizeConversationSystemPrompt } from "../context/systemPrompt";
 import {
-  normalizeConversationState,
   type ConversationViewState,
+  normalizeConversationState,
   type StoredChatContextMeta,
   type StoredContextSegment,
   type StoredSummaryMessage,
 } from "../conversation/conversationState";
-import { normalizeConversationSystemPrompt } from "../context/systemPrompt";
 
 export type ChatHistorySummary = {
   id: string;
@@ -138,10 +137,8 @@ function parseStoredChatContextMeta(
     tools: Array.isArray(parsed.tools) ? parsed.tools : undefined,
     activeSegmentIndex:
       typeof parsed.activeSegmentIndex === "number" ? parsed.activeSegmentIndex : 0,
-    totalSegmentCount:
-      typeof parsed.totalSegmentCount === "number" ? parsed.totalSegmentCount : 1,
-    totalMessageCount:
-      typeof parsed.totalMessageCount === "number" ? parsed.totalMessageCount : 0,
+    totalSegmentCount: typeof parsed.totalSegmentCount === "number" ? parsed.totalSegmentCount : 1,
+    totalMessageCount: typeof parsed.totalMessageCount === "number" ? parsed.totalMessageCount : 0,
   };
 }
 
@@ -204,10 +201,7 @@ export async function getChatHistory(id: string, fallbackSystemPrompt?: string)
   return normalizeWireRecord(record, fallbackSystemPrompt);
 }
 
-export async function getChatHistoryActiveSegment(
-  id: string,
-  fallbackSystemPrompt?: string,
-) {
+export async function getChatHistoryActiveSegment(id: string, fallbackSystemPrompt?: string) {
   const record = await invoke<ChatHistoryActiveSegmentWireRecord>(
     "chat_history_get_active_segment",
     { id },
@@ -233,19 +227,14 @@ export async function getChatHistoryActiveSegment(
   } satisfies ChatHistoryActiveSegmentRecord;
 }
 
-function enqueueConversationWrite<T>(
-  conversationId: string,
-  task: () => Promise<T>,
-): Promise<T> {
+function enqueueConversationWrite<T>(conversationId: string, task: () => Promise<T>): Promise<T> {
   const key = conversationId.trim();
   if (!key) {
     return task();
   }
 
   const previous = conversationWriteQueues.get(key) ?? Promise.resolve();
-  const next = previous
-    .catch(() => undefined)
-    .then(task);
+  const next = previous.catch(() => undefined).then(task);
   const tail = next.then(
     () => undefined,
     () => undefined,
@@ -269,17 +258,8 @@ function buildChatHistoryConversationInput(params: {
   updatedAt: number;
   state: ConversationViewState;
 }): ChatHistoryConversationInput {
-  const {
-    conversationId,
-    providerId,
-    model,
-    sessionId,
-    cwd,
-    title,
-    createdAt,
-    updatedAt,
-    state,
-  } = params;
+  const { conversationId, providerId, model, sessionId, cwd, title, createdAt, updatedAt, state } =
+    params;
 
   return {
     id: conversationId,
@@ -440,11 +420,7 @@ export async function persistConversationState(params: PersistConversationStateP
     nextState.segments.length === previousState.segments.length + 1;
   if (
     appendShape &&
-    segmentPrefixMatches(
-      previousState.segments,
-      nextState.segments,
-      previousState.segments.length,
-    )
+    segmentPrefixMatches(previousState.segments, nextState.segments, previousState.segments.length)
   ) {
     const appendedSegment = nextState.segments[nextState.activeSegmentIndex];
     if (appendedSegment) {
diff --git a/crates/agent-gui/src/lib/chat/history/chatHistorySync.ts b/crates/agent-gui/src/lib/chat/history/chatHistorySync.ts
index dcbe182dd..8fe774d70 100644
--- a/crates/agent-gui/src/lib/chat/history/chatHistorySync.ts
+++ b/crates/agent-gui/src/lib/chat/history/chatHistorySync.ts
@@ -1,5 +1,5 @@
-import type { ChatHistorySummary } from "./chatHistory";
 import { mergeHistoryItem } from "../page/chatPageHelpers";
+import type { ChatHistorySummary } from "./chatHistory";
 
 export const CHAT_HISTORY_SYNC_EVENT = "chat-history:changed";
 
diff --git a/crates/agent-gui/src/lib/chat/memory/memoryDecisionLog.ts b/crates/agent-gui/src/lib/chat/memory/memoryDecisionLog.ts
index f1ee09574..733552735 100644
--- a/crates/agent-gui/src/lib/chat/memory/memoryDecisionLog.ts
+++ b/crates/agent-gui/src/lib/chat/memory/memoryDecisionLog.ts
@@ -11,10 +11,10 @@
  */
 
 import type {
-  SilentMemoryParseResult,
   SilentMemoryBlockIdentifyItem,
   SilentMemoryBlockMatchItem,
   SilentMemoryBlockPlanItem,
+  SilentMemoryParseResult,
 } from "./memoryProtocol";
 
 export type SilentMemoryDecisionStatus = "parsed" | "parse-failed" | "skipped";
@@ -143,9 +143,7 @@ export function resetSilentMemoryDecisionLog(): void {
   globalLog.length = 0;
 }
 
-export function subscribeSilentMemoryDecisions(
-  listener: SilentMemoryDecisionListener,
-): () => void {
+export function subscribeSilentMemoryDecisions(listener: SilentMemoryDecisionListener): () => void {
   listeners.add(listener);
   return () => listeners.delete(listener);
 }
diff --git a/crates/agent-gui/src/lib/chat/memory/memoryExtractor.ts b/crates/agent-gui/src/lib/chat/memory/memoryExtractor.ts
index a1e327a09..34e6ce4ca 100644
--- a/crates/agent-gui/src/lib/chat/memory/memoryExtractor.ts
+++ b/crates/agent-gui/src/lib/chat/memory/memoryExtractor.ts
@@ -1,7 +1,6 @@
 import type { Message } from "@mariozechner/pi-ai";
-
-import { assistantMessageToText } from "../../providers/llm";
 import { memoryApplyBatch, memoryTodayLocalDate } from "../../memory/api";
+import { assistantMessageToText } from "../../providers/llm";
 import type { ConversationViewState } from "../conversation/conversationState";
 
 const EXTRACTOR_THROTTLE_MS = 5 * 60_000;
@@ -94,7 +93,7 @@ function extractIdentity(text: string): ExtractedDecision[] {
   const out: ExtractedDecision[] = [];
   const nameMatch =
     text.match(/(?:我叫|我的名字是|请叫我)\s*([A-Za-z0-9_\-\u4e00-\u9fa5]{1,40})/) ??
-    text.match(/my name is\s+([A-Za-z0-9_\-]{1,40})/i);
+    text.match(/my name is\s+([A-Za-z0-9_-]{1,40})/i);
   const profileMatch =
     text.match(/我叫\s*[^，,。.\n]+[，,]\s*(?:是|我是)?(?:一个|一名)?([^。.\n]{2,80})/) ??
     text.match(/我是(?:一个|一名)?([^。.\n]{2,80})/);
@@ -138,18 +137,24 @@ function extractExplicitRemember(text: string): ExtractedDecision[] {
     const fact = match[1].trim();
     if (/^(?:了|什么|哪些|啥|吗|么)/.test(fact)) return [];
     if (/[?？]$/.test(fact)) return [];
-    const looksLikePreference = /以后|默认|偏好|喜欢|不要|必须|回答|使用|prefer|always|never/i.test(fact);
+    const looksLikePreference = /以后|默认|偏好|喜欢|不要|必须|回答|使用|prefer|always|never/i.test(
+      fact,
+    );
     const slug = slugify(fact, `user-note-${index + 1}`);
-    return [{
-      op: "upsert",
-      slug: looksLikePreference ? `feedback-${slug}`.slice(0, 64) : `reference-${slug}`.slice(0, 64),
-      scope: looksLikePreference ? "global" : "project",
-      memoryType: looksLikePreference ? "feedback" : "reference",
-      description: fact.slice(0, 120),
-      body: looksLikePreference
-        ? `${fact}\n\n**Why:** 用户明确要求记住这条偏好或约束。\n**How to apply:** 未来相关任务中优先参考，但以当前用户消息为准。`
-        : fact,
-    } satisfies ExtractedDecision];
+    return [
+      {
+        op: "upsert",
+        slug: looksLikePreference
+          ? `feedback-${slug}`.slice(0, 64)
+          : `reference-${slug}`.slice(0, 64),
+        scope: looksLikePreference ? "global" : "project",
+        memoryType: looksLikePreference ? "feedback" : "reference",
+        description: fact.slice(0, 120),
+        body: looksLikePreference
+          ? `${fact}\n\n**Why:** 用户明确要求记住这条偏好或约束。\n**How to apply:** 未来相关任务中优先参考，但以当前用户消息为准。`
+          : fact,
+      } satisfies ExtractedDecision,
+    ];
   });
 }
 
@@ -196,7 +201,9 @@ function latestCompletedTurn(messages: Message[]): LatestTurn | null {
 }
 
 function isMemoryIntrospection(text: string) {
-  return /(?:今天|当前|现在)?.{0,12}(?:记忆|memory).{0,12}(?:哪些|什么|啥|优先级|权重|读取|展示|查看|回顾)/i.test(text);
+  return /(?:今天|当前|现在)?.{0,12}(?:记忆|memory).{0,12}(?:哪些|什么|啥|优先级|权重|读取|展示|查看|回顾)/i.test(
+    text,
+  );
 }
 
 function shouldWriteDaily(userText: string, assistantText: string) {
@@ -214,7 +221,8 @@ function buildDailyAppend(params: {
 }) {
   const project = params.workdir?.split(/[\\/]/).filter(Boolean).pop() || "workspace";
   const time = new Date().toLocaleTimeString([], { hour: "2-digit", minute: "2-digit" });
-  const userSummary = params.userText.split(/\n+/).find(Boolean)?.slice(0, 160) || "用户推进了一轮任务";
+  const userSummary =
+    params.userText.split(/\n+/).find(Boolean)?.slice(0, 160) || "用户推进了一轮任务";
   const assistantSummary =
     params.assistantText.split(/\n+/).find(Boolean)?.slice(0, 160) || "助手完成了本轮处理";
   return {
@@ -273,11 +281,7 @@ export async function runMemoryExtractor(params: {
   const messageCount = countRuntimeMessages(params.state);
   const previous = extractorStateByConversation.get(params.conversationId);
   const now = Date.now();
-  if (
-    previous &&
-    previous.lastMessageCount === messageCount &&
-    previous.pending !== true
-  ) {
+  if (previous && previous.lastMessageCount === messageCount && previous.pending !== true) {
     return;
   }
   if (previous && now - previous.lastRunAt < EXTRACTOR_THROTTLE_MS) {
diff --git a/crates/agent-gui/src/lib/chat/memory/memoryFrontmatter.ts b/crates/agent-gui/src/lib/chat/memory/memoryFrontmatter.ts
index 9bc271ddc..40ab7b60b 100644
--- a/crates/agent-gui/src/lib/chat/memory/memoryFrontmatter.ts
+++ b/crates/agent-gui/src/lib/chat/memory/memoryFrontmatter.ts
@@ -100,11 +100,7 @@ function parseBoolean(value: string): boolean {
   return lowered === "true" || lowered === "yes" || lowered === "1";
 }
 
-function applyKeyValue(
-  out: MemoryEvidenceFrontmatter,
-  key: string,
-  rawValue: string,
-): void {
+function applyKeyValue(out: MemoryEvidenceFrontmatter, key: string, rawValue: string): void {
   const value = rawValue.trim();
   switch (key) {
     case "confidence":
diff --git a/crates/agent-gui/src/lib/chat/memory/memoryPolicy.ts b/crates/agent-gui/src/lib/chat/memory/memoryPolicy.ts
index e3b745aec..64f7bd4ae 100644
--- a/crates/agent-gui/src/lib/chat/memory/memoryPolicy.ts
+++ b/crates/agent-gui/src/lib/chat/memory/memoryPolicy.ts
@@ -20,16 +20,16 @@ export const MEMORY_PRECEDENCE_CHAIN =
 // specific evidence and should not pollute that scope. The model can see all
 // tool calls/results in the turn it is extracting from, so it can self-verify.
 export const PROJECT_MEMORY_WRITE_EVIDENCE_GATE = [
-  "Project-scope gate (HARD precondition for scope=\"project\" write/update):",
+  'Project-scope gate (HARD precondition for scope="project" write/update):',
   "- A workspace mutation must have happened in this turn. Qualifying signals:",
   "  - a successful Write/Edit tool call on a file path inside the configured workspace directory;",
   "  - a successful Bash tool call that demonstrably modified workspace state — mv/cp/rm, sed -i, redirection (`>` / `>>`), patch/apply, package install or lockfile change, git commit/checkout/branch/stash, build/codegen producing files inside the workspace, or other in-place edits;",
   "  - a successful mutating MCP tool call targeting a file inside the workspace (e.g. design/file editors that write to workspace paths).",
   "- Read-only activity does NOT satisfy the gate, no matter how workspace-specific the discussion sounds. Non-qualifying: Read/Glob/Grep, search, planning, Q&A, reasoning, file inspection, summarizing, listing files, running test/lint/typecheck/git-status WITHOUT producing or modifying workspace files, or MemoryManager calls themselves.",
-  "- When no qualifying mutation occurred this turn, do NOT classify the candidate as scope=\"project\". Re-route instead: portable preference → type=\"feedback\" scope=\"global\"; identity/role → type=\"user\" scope=\"global\"; external pointer → type=\"reference\" scope=\"global\"; otherwise SKIP.",
-  "- Override exception: the latest USER message contains an explicit project-pin instruction (e.g. \"记住本项目...\", \"在这个项目里以后...\", \"for this repo always...\", \"remember for this workspace\") AND names a fact that is genuinely workspace-specific (not a portable preference). The explicit pin alone satisfies the gate; record it as source_quote and set reasoning=\"explicit user pin for this project\".",
-  "- action=\"delete\" on an existing scope=\"project\" entry is exempt when the user explicitly asks to forget it.",
-  "- For any write/update on scope=\"project\", the reasoning field MUST cite the qualifying evidence in one short clause (e.g. \"edited src/foo.ts this turn\" or \"explicit user pin: \\\"记住本项目用 pnpm\\\"\"). A project-scope plan item without such evidence in reasoning is invalid and must be rewritten as global or SKIP.",
+  '- When no qualifying mutation occurred this turn, do NOT classify the candidate as scope="project". Re-route instead: portable preference → type="feedback" scope="global"; identity/role → type="user" scope="global"; external pointer → type="reference" scope="global"; otherwise SKIP.',
+  '- Override exception: the latest USER message contains an explicit project-pin instruction (e.g. "记住本项目...", "在这个项目里以后...", "for this repo always...", "remember for this workspace") AND names a fact that is genuinely workspace-specific (not a portable preference). The explicit pin alone satisfies the gate; record it as source_quote and set reasoning="explicit user pin for this project".',
+  '- action="delete" on an existing scope="project" entry is exempt when the user explicitly asks to forget it.',
+  '- For any write/update on scope="project", the reasoning field MUST cite the qualifying evidence in one short clause (e.g. "edited src/foo.ts this turn" or "explicit user pin: \\"记住本项目用 pnpm\\""). A project-scope plan item without such evidence in reasoning is invalid and must be rewritten as global or SKIP.',
 ].join("\n");
 
 export const MEMORY_SKIP_LIST_ITEMS = [
@@ -37,7 +37,7 @@ export const MEMORY_SKIP_LIST_ITEMS = [
   "secrets, credentials, raw code history, or large logs",
   "memory introspection requests such as asking what you remember, memory weights, priority, or today's memory contents",
   "daily notes that would only restate a preference and conflict with reviewed user/feedback memory",
-  "scope=\"project\" candidates whose turn produced no qualifying workspace mutation and no explicit user project-pin instruction (see Project-scope gate)",
+  'scope="project" candidates whose turn produced no qualifying workspace mutation and no explicit user project-pin instruction (see Project-scope gate)',
 ] as const;
 
 export const MEMORY_CONFLICT_ARBITRATION_LINES = [
@@ -65,7 +65,7 @@ export const MEMORY_CONFIDENCE_TONE_LINES = [
 export const MEMORY_SELF_REVIEW_RULES = [
   "- Self-review of (unreviewed) entries:",
   "  - Use unreviewed entries directly as active working memory when relevant, while allowing immediate correction by the current user.",
-  "  - Promote via MemoryManager(action=\"accept\", slug=...) when the current user message confirms, restates, corrects-then-confirms, or clearly relies on the entry's claim.",
+  '  - Promote via MemoryManager(action="accept", slug=...) when the current user message confirms, restates, corrects-then-confirms, or clearly relies on the entry\'s claim.',
   "  - If the user corrects an unreviewed entry, update the same slug with the corrected fact and current source_quote; then accept it when the corrected fact is now explicit and stable.",
   "  - Delete an unreviewed entry when the current user message refutes it and there is no durable corrected replacement.",
   "  - Do NOT accept from silence, lack of objection, assistant text, or your own reasoning alone.",
@@ -111,7 +111,8 @@ export const MEMORY_MANAGER_ACTION_DESCRIPTION_RO =
 
 export const MEMORY_MANAGER_FIELD_DESCRIPTIONS = {
   slug: `${MEMORY_SLUG_POLICY} Use daily-YYYY-MM-DD only for daily journal entries.`,
-  scope: "Memory scope. auto searches project first and then global. write/delete require global or project. scope=\"project\" is gated: only allowed when this turn produced a workspace mutation (Write/Edit/Bash-mutation/mutating MCP on a workspace file) OR the user explicitly pinned the fact to this project; otherwise prefer scope=\"global\". delete is exempt when the user asks to forget. The qualifying evidence must appear in the reasoning field.",
+  scope:
+    'Memory scope. auto searches project first and then global. write/delete require global or project. scope="project" is gated: only allowed when this turn produced a workspace mutation (Write/Edit/Bash-mutation/mutating MCP on a workspace file) OR the user explicitly pinned the fact to this project; otherwise prefer scope="global". delete is exempt when the user asks to forget. The qualifying evidence must appear in the reasoning field.',
   type: "Ordinary memory type for write/update, or a filter for list/search. Daily is intentionally not exposed as a writable memory type.",
   filterType:
     "Optional durable-memory type filter for list/search. Use filter_type=daily with include_history=false when checking daily journals before a date-bound chat-history fallback.",
@@ -131,8 +132,7 @@ export const MEMORY_MANAGER_FIELD_DESCRIPTIONS = {
     "For action=search chat-history filtering. message uses message timestamps when available, updated uses segment update timestamps, and conversation uses conversation update timestamps. Defaults to message.",
   description: `Short one-line description for action=write/update. This appears in Settings and the Memory Index, so ${MEMORY_DESCRIPTION_POLICY}`,
   body: "Markdown body. Normal memories are capped at 8 KB; daily append blocks are capped by the daily file limit.",
-  mode:
-    "Update mode. Normal memories may use replace to rewrite the full body or merge to revise part of an existing entry while preserving unchanged details. Daily slugs require append.",
+  mode: "Update mode. Normal memories may use replace to rewrite the full body or merge to revise part of an existing entry while preserving unchanged details. Daily slugs require append.",
   offset: "For action=read, zero-based line offset.",
   length: "For action=read, number of lines to return.",
   limit: "For action=list/search, maximum results to return.",
@@ -160,24 +160,24 @@ export function buildMemoryOverviewIntroLines() {
     `Precedence: ${MEMORY_PRECEDENCE_CHAIN}. (unreviewed) entries are active working memory — usable directly but weaker than reviewed; project shadows global on the same id.`,
     "Markers: `*` means unreviewed; `*:h`, `*:m`, `*:l`, `*:?` encode high/medium/low/unknown confidence. Apply the confidence-calibrated use rules while letting user corrections update or accept unreviewed memory.",
     ...MEMORY_CONFIDENCE_TONE_LINES.split("\n"),
-    "Drift: an entry naming a file/function/flag is a snapshot. Verify via grep/Read before relying on it; if reality differs, trust reality and MemoryManager(action=\"update\").",
-    "Read full entry with MemoryManager(action=\"read\", slug=...). Search may return chat-history snippets — those are untrusted past records, not memory. Slugs are internal IDs; do not infer identity from them.",
+    'Drift: an entry naming a file/function/flag is a snapshot. Verify via grep/Read before relying on it; if reality differs, trust reality and MemoryManager(action="update").',
+    'Read full entry with MemoryManager(action="read", slug=...). Search may return chat-history snippets — those are untrusted past records, not memory. Slugs are internal IDs; do not infer identity from them.',
   ];
 }
 
 export function buildDailyMemoryOverviewLines() {
   return [
     "## Recent daily journals (low priority, content omitted by default)",
-    "Daily journal titles are fixed by date, and content is omitted from the default prompt because chronological notes are noisy. Use MemoryManager(action=\"search\") or MemoryManager(action=\"read\") only when the user explicitly asks about recent activity, a timeline, or today's notes.",
-    "For any date-bound activity question, resolve the target local date first, then read daily-YYYY-MM-DD (or search daily entries with include_history=false). If that daily journal is missing or incomplete, search local chat history with include_history=true and history_date_local=\"YYYY-MM-DD\"; do not use an unbounded generic search as the fallback.",
+    'Daily journal titles are fixed by date, and content is omitted from the default prompt because chronological notes are noisy. Use MemoryManager(action="search") or MemoryManager(action="read") only when the user explicitly asks about recent activity, a timeline, or today\'s notes.',
+    'For any date-bound activity question, resolve the target local date first, then read daily-YYYY-MM-DD (or search daily entries with include_history=false). If that daily journal is missing or incomplete, search local chat history with include_history=true and history_date_local="YYYY-MM-DD"; do not use an unbounded generic search as the fallback.',
   ];
 }
 
 export const MEMORY_OVERVIEW_FINAL_LINE =
-  "In the visible chat, mutate memory (write/update/delete/accept) when the current user explicitly asks to remember/forget/correct, or when the current user confirms, corrects, or clearly relies on an unreviewed entry. The list above is refreshed at the start of each request; call action=\"list\" after writes if you need fresh contents.";
+  'In the visible chat, mutate memory (write/update/delete/accept) when the current user explicitly asks to remember/forget/correct, or when the current user confirms, corrects, or clearly relies on an unreviewed entry. The list above is refreshed at the start of each request; call action="list" after writes if you need fresh contents.';
 
 export const MEMORY_PROMPT_TRUNCATION_SUFFIX =
-  "... (truncated; use MemoryManager(action=\"search\") for older entries)";
+  '... (truncated; use MemoryManager(action="search") for older entries)';
 
 export function buildMemoryToolsSuffixSection() {
   return [
@@ -185,10 +185,10 @@ export function buildMemoryToolsSuffixSection() {
     "- MemoryManager actions: list | read | search | write | update | delete | accept. See Memory Index for precedence/drift/slug rules.",
     `- ${MEMORY_DATE_BOUND_FALLBACK_POLICY}`,
     "- Before write/update: search/list/read first when the turn may duplicate or correct existing memory; prefer updating an existing slug.",
-    "- For partial corrections to a compound memory, read the existing entry and use update mode=\"merge\" so unchanged details survive; use mode=\"replace\" only when intentionally rewriting the whole entry.",
+    '- For partial corrections to a compound memory, read the existing entry and use update mode="merge" so unchanged details survive; use mode="replace" only when intentionally rewriting the whole entry.',
     "- Include confidence + source_quote + reasoning on write/update. high requires an explicit signal word AND source_quote ≥5 chars (else auto-downgraded).",
     "- Do not store: secrets/credentials, raw code or large logs, facts derivable from the workspace, or memory-introspection answers.",
-    "- scope=\"project\" gate: only write/update project-scope memory when (a) this turn produced a successful workspace mutation — a Write/Edit on a workspace file, a Bash command that modified workspace state, or a mutating MCP call on workspace files — OR (b) the user explicitly pinned the fact to this project (e.g. \"记住本项目...\", \"for this repo always...\"). Read-only chatter about the workspace is NOT enough. Otherwise route to scope=\"global\" or skip. action=\"delete\" on existing project memory is exempt when the user asks to forget. Cite the qualifying evidence (the tool call or the explicit pin quote) in reasoning.",
+    '- scope="project" gate: only write/update project-scope memory when (a) this turn produced a successful workspace mutation — a Write/Edit on a workspace file, a Bash command that modified workspace state, or a mutating MCP call on workspace files — OR (b) the user explicitly pinned the fact to this project (e.g. "记住本项目...", "for this repo always..."). Read-only chatter about the workspace is NOT enough. Otherwise route to scope="global" or skip. action="delete" on existing project memory is exempt when the user asks to forget. Cite the qualifying evidence (the tool call or the explicit pin quote) in reasoning.',
     MEMORY_SELF_REVIEW_RULES,
     MEMORY_CONFLICT_ARBITRATION_LINES,
   ].join("\n");
@@ -334,7 +334,7 @@ export function buildSilentMemoryExtractionPrompt(params: {
   const trimmedWorkdir = params.workdir?.trim() ?? "";
   const projectScopeRule = trimmedWorkdir
     ? `- Workspace for this turn: ${trimmedWorkdir}. Use scope="project" ONLY when the Project-scope gate is satisfied (workspace mutation this turn OR explicit user project-pin). The fact must also be genuinely tied to this workspace and not a portable cross-project preference.`
-    : "- Do not use scope=\"project\" because no workspace directory is configured for this turn. Route any workspace-flavored facts to the closest global type or SKIP.";
+    : '- Do not use scope="project" because no workspace directory is configured for this turn. Route any workspace-flavored facts to the closest global type or SKIP.';
 
   const reviewerMode = params.reviewerMode ?? DEFAULT_MEMORY_REVIEWER_MODE;
 
@@ -350,11 +350,11 @@ export function buildSilentMemoryExtractionPrompt(params: {
     PROJECT_MEMORY_WRITE_EVIDENCE_GATE,
     "",
     "Classification decision tree (apply per candidate, top-down, first match wins):",
-    "  1. Is the fact tied to this workspace AND is the Project-scope gate satisfied for this turn (workspace mutation occurred, or the latest user message is an explicit project-pin)? → type=\"project\", scope=\"project\".",
-    "     - If the fact looks workspace-specific but the gate is NOT satisfied, DO NOT pick this branch; fall through. Most often it should become type=\"feedback\" scope=\"global\" (when it is a preference/workflow rule that just happens to be voiced in this repo), or be SKIPped if it is just workspace trivia the assistant could re-derive by reading files.",
-    "  2. Is it a preference or correction about HOW the assistant should work (style, defaults, workflow)? → type=\"feedback\", scope=\"global\".",
-    "  3. Is it about WHO the user is (identity, role, skills, sustained preferences across projects)? → type=\"user\", scope=\"global\".",
-    "  4. Is it an external pointer/reference (URL, system, contact, dashboard, doc location)? → type=\"reference\", scope=\"global\".",
+    '  1. Is the fact tied to this workspace AND is the Project-scope gate satisfied for this turn (workspace mutation occurred, or the latest user message is an explicit project-pin)? → type="project", scope="project".',
+    '     - If the fact looks workspace-specific but the gate is NOT satisfied, DO NOT pick this branch; fall through. Most often it should become type="feedback" scope="global" (when it is a preference/workflow rule that just happens to be voiced in this repo), or be SKIPped if it is just workspace trivia the assistant could re-derive by reading files.',
+    '  2. Is it a preference or correction about HOW the assistant should work (style, defaults, workflow)? → type="feedback", scope="global".',
+    '  3. Is it about WHO the user is (identity, role, skills, sustained preferences across projects)? → type="user", scope="global".',
+    '  4. Is it an external pointer/reference (URL, system, contact, dashboard, doc location)? → type="reference", scope="global".',
     "  5. Otherwise → SKIP (this candidate is not a stable memory).",
     "Apply the tree once; if two branches both seem to fit, prefer the earlier (more specific) branch — but step 1 only matches when the gate is satisfied.",
     "",
@@ -367,15 +367,15 @@ export function buildSilentMemoryExtractionPrompt(params: {
     "Step 2 - match before mutating:",
     "- The <existing-candidates> block above is the authoritative recent memory snapshot; treat it as your match input and avoid an extra list/search call when a candidate is already shown there.",
     "- Some <existing-candidates> are marked unreviewed — they were written by an earlier extractor pass and are active working memory that still needs review. If a new candidate covers the same atomic fact, prefer UPDATE on the existing unreviewed slug instead of creating a NEW slug.",
-    "- If the latest USER message strengthens or weakens an existing memory's evidence, use block-3 action=\"update\" mode=\"merge\" with confidence/source_quote/reasoning. This may be an evidence-only update with no body when the fact text itself should stay unchanged.",
-    "- If the latest USER message confirms, restates, relies on, or corrects an unreviewed entry, plan review work on that same slug: clear confirmation/restatement/reliance → action=\"accept\"; correction with durable replacement → action=\"update\" mode=\"merge\" followed by action=\"accept\" when the corrected fact is explicit and stable; contradiction with no replacement → action=\"delete\".",
+    '- If the latest USER message strengthens or weakens an existing memory\'s evidence, use block-3 action="update" mode="merge" with confidence/source_quote/reasoning. This may be an evidence-only update with no body when the fact text itself should stay unchanged.',
+    '- If the latest USER message confirms, restates, relies on, or corrects an unreviewed entry, plan review work on that same slug: clear confirmation/restatement/reliance → action="accept"; correction with durable replacement → action="update" mode="merge" followed by action="accept" when the corrected fact is explicit and stable; contradiction with no replacement → action="delete".',
     "- If the latest USER message answers a natural confirmation question about a low-confidence unreviewed entry, update that same slug when evidence changes: explicit confirmation or correction with a clear quote → high; natural restatement without an explicit signal → medium; contradiction → update/delete the entry instead of raising confidence.",
     "- Never raise confidence from assistant text, lack of user objection, or your own inference. Confidence changes require a current user quote or a verified tool result directly about the remembered fact.",
-    "- The <already-written-this-turn> block above lists slugs already mutated by an earlier silent pass in this turn; any candidate matching one of those slugs MUST have block-2 decision=\"DUPLICATE\".",
-    "- The <recent-rejections> block above lists slugs the user recently rejected or deleted for the current scope; any candidate referring to the same atomic fact MUST have block-2 decision=\"SKIP\" UNLESS the current turn contains a stronger signal word and block-3 also provides an override_reject reason.",
-    "- If a candidate may duplicate, correct, or conflict with an existing memory that is NOT in <existing-candidates>, call MemoryManager(action=\"search\") or action=\"list\" first.",
-    "- Call MemoryManager(action=\"read\") before UPDATE or CONFLICT when the existing entry body is needed to avoid losing prior nuance.",
-    "- If the latest turn corrects only one field inside a compound memory (for example a date, quantity, destination leg, or contact detail), use block-3 action=\"update\" mode=\"merge\" so unchanged details from the existing body are preserved.",
+    '- The <already-written-this-turn> block above lists slugs already mutated by an earlier silent pass in this turn; any candidate matching one of those slugs MUST have block-2 decision="DUPLICATE".',
+    '- The <recent-rejections> block above lists slugs the user recently rejected or deleted for the current scope; any candidate referring to the same atomic fact MUST have block-2 decision="SKIP" UNLESS the current turn contains a stronger signal word and block-3 also provides an override_reject reason.',
+    '- If a candidate may duplicate, correct, or conflict with an existing memory that is NOT in <existing-candidates>, call MemoryManager(action="search") or action="list" first.',
+    '- Call MemoryManager(action="read") before UPDATE or CONFLICT when the existing entry body is needed to avoid losing prior nuance.',
+    '- If the latest turn corrects only one field inside a compound memory (for example a date, quantity, destination leg, or contact detail), use block-3 action="update" mode="merge" so unchanged details from the existing body are preserved.',
     "- Prefer updating an existing semantic slug over creating a new duplicate slug.",
     "- Pending/unreviewed entries are usable working memory; avoid using them to override reviewed user/feedback memory.",
     "- Do NOT call MemoryManager mutation actions (write, update, delete, accept) from this silent pass. LiveAgent will apply your validated block-3 plan after parsing all four blocks, including accept plans when the current user gives enough review evidence.",
@@ -384,41 +384,39 @@ export function buildSilentMemoryExtractionPrompt(params: {
     MEMORY_WRITE_EVIDENCE_POLICY,
     MEMORY_CONFIDENCE_RUBRIC,
     "- confidence=high requires source_quote of ≥5 characters. LiveAgent auto-downgrades high→medium when the quote is shorter, and medium→low when the quote is empty; the frontmatter records auto_downgraded: true so your self-rating remains auditable.",
-    "- Updating confidence does NOT automatically mark an unreviewed memory as reviewed. Emit a separate action=\"accept\" plan item only when the current user confirms, corrects-then-confirms, restates, or clearly relies on that memory.",
+    '- Updating confidence does NOT automatically mark an unreviewed memory as reviewed. Emit a separate action="accept" plan item only when the current user confirms, corrects-then-confirms, restates, or clearly relies on that memory.',
     "",
     "Plan a memory mutation only when it is genuinely useful for future sessions:",
-    "- Write or update cross-project identity, stable user preferences, and explicit corrections as scope=\"global\" with type=\"user\" or type=\"feedback\".",
+    '- Write or update cross-project identity, stable user preferences, and explicit corrections as scope="global" with type="user" or type="feedback".',
     projectScopeRule,
-    "- Before emitting any scope=\"project\" item in block-3, audit this turn's tool calls. If you cannot name a successful Write/Edit/Bash-mutation/MCP-mutation that landed inside the workspace AND the user did not pin the fact to this project, rewrite the item as scope=\"global\" (best-fit type) or remove it.",
-    "- Use type=\"reference\" only for durable factual reference notes that are not preferences.",
+    '- Before emitting any scope="project" item in block-3, audit this turn\'s tool calls. If you cannot name a successful Write/Edit/Bash-mutation/MCP-mutation that landed inside the workspace AND the user did not pin the fact to this project, rewrite the item as scope="global" (best-fit type) or remove it.',
+    '- Use type="reference" only for durable factual reference notes that are not preferences.',
     "- If the user explicitly asks to forget something, delete the matching memory when you can identify it confidently.",
     `- For meaningful task progress, completed work, decisions, debugging findings, or validation results, append a concise daily journal entry with action="update", slug="daily-${params.localDate}", mode="append", and a short Markdown body. Daily titles are date-based and must not be generated or edited.`,
     "",
     "Skip memory updates for:",
-    ...MEMORY_SKIP_LIST_ITEMS.map(
-      (item, i, arr) => `- ${item}${i === arr.length - 1 ? "." : ";"}`,
-    ),
+    ...MEMORY_SKIP_LIST_ITEMS.map((item, i, arr) => `- ${item}${i === arr.length - 1 ? "." : ";"}`),
     "",
     "Counter-examples (DO save even though they look workspace-derivable):",
-    "- 用户身份/角色 (\"我是数据科学家\") — explicit identity outranks git blame inferences.",
-    "- 跨项目偏好 (\"在 Go 项目里我习惯用 Docker\") — workspace only reflects one project; the preference is reusable.",
-    "- 选型动机 (\"我们用 X 是因为 Y\") — workspace shows the choice, not the reasoning.",
-    "- Workflow corrections (\"以后跑测试前先 lint\") — process rules are durable feedback even when tooling configs already encode them.",
+    '- 用户身份/角色 ("我是数据科学家") — explicit identity outranks git blame inferences.',
+    '- 跨项目偏好 ("在 Go 项目里我习惯用 Docker") — workspace only reflects one project; the preference is reusable.',
+    '- 选型动机 ("我们用 X 是因为 Y") — workspace shows the choice, not the reasoning.',
+    '- Workflow corrections ("以后跑测试前先 lint") — process rules are durable feedback even when tooling configs already encode them.',
     "",
     "Project-scope counter-examples (do NOT classify as project memory):",
-    "- 仅讨论/阅读项目代码而本轮没有 Write/Edit/Bash-mutation (\"帮我看下 src/foo.ts 的逻辑\", \"这个项目用什么打包?\") — gate fails. If durable, save as feedback/user/global; otherwise SKIP.",
-    "- 项目结构问答 (\"这个仓库是 monorepo 吗?\") — anyone can grep this; SKIP unless paired with a non-obvious preference.",
+    '- 仅讨论/阅读项目代码而本轮没有 Write/Edit/Bash-mutation ("帮我看下 src/foo.ts 的逻辑", "这个项目用什么打包?") — gate fails. If durable, save as feedback/user/global; otherwise SKIP.',
+    '- 项目结构问答 ("这个仓库是 monorepo 吗?") — anyone can grep this; SKIP unless paired with a non-obvious preference.',
     "- 主聊只跑只读命令 (Read/Glob/Grep/MemoryManager-search 或 `git status` 仅查看) — gate fails even if the conversation was about the workspace.",
-    "- 助手计划但未落地的修改 (\"我建议把 X 重构成 Y\", 但本轮没有真正 Edit) — gate fails until an actual mutation is performed.",
+    '- 助手计划但未落地的修改 ("我建议把 X 重构成 Y", 但本轮没有真正 Edit) — gate fails until an actual mutation is performed.',
     "",
     "Project-scope examples that DO satisfy the gate:",
-    "- 本轮 Edit 了 crates/foo/src/bar.rs 后用户说 \"以后这种字段都加 #[serde(default)]\" → scope=\"project\" type=\"project\"; reasoning cites the Edit.",
-    "- 本轮 Bash 跑了 `pnpm add lodash` 后用户说 \"本项目默认用 pnpm 不要混 npm\" → scope=\"project\"; reasoning cites the install + explicit pin.",
-    "- 用户显式说 \"记住本项目 API 路由放在 routes/v2/ 下\" — explicit project-pin satisfies the gate without a tool call; reasoning=\"explicit user pin for this project\".",
+    '- 本轮 Edit 了 crates/foo/src/bar.rs 后用户说 "以后这种字段都加 #[serde(default)]" → scope="project" type="project"; reasoning cites the Edit.',
+    '- 本轮 Bash 跑了 `pnpm add lodash` 后用户说 "本项目默认用 pnpm 不要混 npm" → scope="project"; reasoning cites the install + explicit pin.',
+    '- 用户显式说 "记住本项目 API 路由放在 routes/v2/ 下" — explicit project-pin satisfies the gate without a tool call; reasoning="explicit user pin for this project".',
     "",
     "Skip with caution (these often look durable but rarely are):",
-    "- \"今天我用了 vim\" / \"just for now\" / \"试试\" — transient experiments; require an explicit signal word before promoting.",
-    "- 简单事实陈述 (\"项目用 Python 3.11\") that any reader could grep in a few seconds — only save if paired with a preference or motive.",
+    '- "今天我用了 vim" / "just for now" / "试试" — transient experiments; require an explicit signal word before promoting.',
+    '- 简单事实陈述 ("项目用 Python 3.11") that any reader could grep in a few seconds — only save if paired with a preference or motive.',
     "",
     "Conflict policy:",
     MEMORY_CONFLICT_ARBITRATION_LINES,
@@ -448,7 +446,7 @@ export function buildSilentMemoryExtractionPrompt(params: {
     "```json silent-memory-block-3-plan",
     '{ "items": [ { "action": "write|update|accept|delete|append-daily", "slug": "...", "scope": "global|project", "type": "user|feedback|project|reference", "description": "...", "body": "...", "mode": "merge|replace|append", "confidence": "high|medium|low", "source_quote": "...", "reasoning": "...", "supersedes": null, "conflicts_with": null, "override_reject": null } ] }',
     "```",
-    "For confidence-only updates, omit body/description and provide action=\"update\", mode=\"merge\", confidence, source_quote, and reasoning. For pure review promotion, provide action=\"accept\", slug, and scope only.",
+    'For confidence-only updates, omit body/description and provide action="update", mode="merge", confidence, source_quote, and reasoning. For pure review promotion, provide action="accept", slug, and scope only.',
     "",
     "```text silent-memory-block-4-emit",
     "<output only the sentinel reply line below; LiveAgent applies the validated block-3 plan>",
diff --git a/crates/agent-gui/src/lib/chat/memory/memoryPrompt.ts b/crates/agent-gui/src/lib/chat/memory/memoryPrompt.ts
index fc765eaeb..a0f45887b 100644
--- a/crates/agent-gui/src/lib/chat/memory/memoryPrompt.ts
+++ b/crates/agent-gui/src/lib/chat/memory/memoryPrompt.ts
@@ -1,7 +1,7 @@
 import {
-  memoryIndexOverview,
   type MemoryOverviewEntry,
   type MemoryOverviewResponse,
+  memoryIndexOverview,
 } from "../../memory/api";
 import {
   buildDailyMemoryOverviewLines,
@@ -62,9 +62,10 @@ function lineFor(entry: MemoryOverviewEntry, nowMs: number = Date.now()): string
   // entries never carry the marker because their content is append-only. For
   // unreviewed entries, append confidence as h/m/l/? so the model can calibrate
   // how directly to use the working memory while staying open to correction.
-  const unreviewedFlag = entry.unreviewed && entry.memoryType !== "daily"
-    ? `*:${confidenceInitial(entry.confidence)}`
-    : "";
+  const unreviewedFlag =
+    entry.unreviewed && entry.memoryType !== "daily"
+      ? `*:${confidenceInitial(entry.confidence)}`
+      : "";
   const initial = typeInitial(entry.memoryType);
   const days = daysAgo(entry.updatedAt, nowMs);
   return `- ${label || "<no description>"} [${entry.slug}|${initial}${unreviewedFlag}|${days}d]`;
@@ -112,7 +113,11 @@ export function formatMemoryOverview(overview: MemoryOverviewResponse, workdir?:
   const unreviewedUserMemory = overview.user.filter((entry) => entry.unreviewed);
 
   appendSection(lines, "## User memory (cross-project identity & preferences)", reviewedUser);
-  appendSection(lines, "## Unreviewed user memory (usable; auto-review via dialogue)", unreviewedUserMemory);
+  appendSection(
+    lines,
+    "## Unreviewed user memory (usable; auto-review via dialogue)",
+    unreviewedUserMemory,
+  );
   appendSection(
     lines,
     `## Project memory${workdir ? ` (workdir: ${workdir})` : ""}`,
@@ -120,17 +125,10 @@ export function formatMemoryOverview(overview: MemoryOverviewResponse, workdir?:
   );
   appendSection(lines, "## Global memory (cross-project facts & references)", overview.global);
   if (overview.recentDays.length > 0) {
-    lines.push(
-      "",
-      ...buildDailyMemoryOverviewLines(),
-      ...overview.recentDays.map(recentDayLine),
-    );
+    lines.push("", ...buildDailyMemoryOverviewLines(), ...overview.recentDays.map(recentDayLine));
   }
 
-  lines.push(
-    "",
-    MEMORY_OVERVIEW_FINAL_LINE,
-  );
+  lines.push("", MEMORY_OVERVIEW_FINAL_LINE);
 
   const text = lines.join("\n").trim();
   if (text.length <= MAX_MEMORY_PROMPT_CHARS) return text;
diff --git a/crates/agent-gui/src/lib/chat/memory/memoryProtocol.ts b/crates/agent-gui/src/lib/chat/memory/memoryProtocol.ts
index 21fa65268..c3177a64b 100644
--- a/crates/agent-gui/src/lib/chat/memory/memoryProtocol.ts
+++ b/crates/agent-gui/src/lib/chat/memory/memoryProtocol.ts
@@ -157,7 +157,9 @@ function validatePlanItems(items: readonly SilentMemoryBlockPlanItem[]): string
         return `block-3 item ${index} append update must target a daily slug`;
       }
       const hasEvidence =
-        stringField(item.confidence) || stringField(item.source_quote) || stringField(item.reasoning);
+        stringField(item.confidence) ||
+        stringField(item.source_quote) ||
+        stringField(item.reasoning);
       if (!stringField(item.body) && !stringField(item.description) && !hasEvidence) {
         return `block-3 item ${index} update needs body, description, or evidence fields`;
       }
@@ -261,9 +263,7 @@ export function parseSilentMemoryProtocol(text: string): SilentMemoryParseResult
     );
   });
   const actionableSlugs = new Set(
-    decisionsRequiringPlan
-      .map((item) => stringField(item.slug))
-      .filter((slug) => slug.length > 0),
+    decisionsRequiringPlan.map((item) => stringField(item.slug)).filter((slug) => slug.length > 0),
   );
   const planCount = blocks.plan.items.length;
   if (planCount < decisionsRequiringPlan.length) {
diff --git a/crates/agent-gui/src/lib/chat/messages/hostedSearch.ts b/crates/agent-gui/src/lib/chat/messages/hostedSearch.ts
index 333ff8ca6..687199865 100644
--- a/crates/agent-gui/src/lib/chat/messages/hostedSearch.ts
+++ b/crates/agent-gui/src/lib/chat/messages/hostedSearch.ts
@@ -63,9 +63,8 @@ function normalizeSource(value: unknown): HostedSearchSource | null {
   const title = normalizeText(value.title ?? value.name);
   const snippet = normalizeText(value.snippet ?? value.description);
   const citedText = normalizeText(value.citedText ?? value.cited_text);
-  const sourceType = value.sourceType === "citation" || value.type === "url_citation"
-    ? "citation"
-    : "source";
+  const sourceType =
+    value.sourceType === "citation" || value.type === "url_citation" ? "citation" : "source";
 
   return {
     url: rawUrl,
@@ -174,9 +173,7 @@ export function enrichHostedSearchBlockWithText(
 }
 
 export function normalizeHostedSearchStatus(value: unknown): HostedSearchStatus {
-  return value === "completed" || value === "failed" || value === "searching"
-    ? value
-    : "searching";
+  return value === "completed" || value === "failed" || value === "searching" ? value : "searching";
 }
 
 export function normalizeHostedSearchBlock(value: unknown): HostedSearchBlock | null {
@@ -187,9 +184,10 @@ export function normalizeHostedSearchBlock(value: unknown): HostedSearchBlock |
   const provider = normalizeText(value.provider);
   const queries = uniqueTexts(Array.isArray(value.queries) ? value.queries : [value.query]);
   const sources = normalizeSources(Array.isArray(value.sources) ? value.sources : []);
-  const updatedAt = typeof value.updatedAt === "number" && Number.isFinite(value.updatedAt)
-    ? value.updatedAt
-    : undefined;
+  const updatedAt =
+    typeof value.updatedAt === "number" && Number.isFinite(value.updatedAt)
+      ? value.updatedAt
+      : undefined;
   return {
     type: "hostedSearch",
     id,
@@ -219,9 +217,7 @@ export function mergeHostedSearchBlocks(
 ): HostedSearchBlock {
   if (!previous) return incoming;
   const status =
-    statusRank(incoming.status) >= statusRank(previous.status)
-      ? incoming.status
-      : previous.status;
+    statusRank(incoming.status) >= statusRank(previous.status) ? incoming.status : previous.status;
   return {
     type: "hostedSearch",
     id: incoming.id || previous.id,
@@ -331,7 +327,10 @@ function findHostedSearchTextSplitIndex(text: string, block: HostedSearchBlock)
       const index = lowerText.indexOf(lowerCandidate, fromIndex);
       if (index < 0) break;
       const sentence = sentenceAround(text, index);
-      const hasSearchAction = /联网|搜索|搜寻|检索|查询|查找|查阅|搜索中|search|searching|searched|lookup|look up/i.test(sentence);
+      const hasSearchAction =
+        /联网|搜索|搜寻|检索|查询|查找|查阅|搜索中|search|searching|searched|lookup|look up/i.test(
+          sentence,
+        );
       const end = sentenceEndAfter(text, index + candidate.length);
       const score = index - (hasSearchAction ? 100_000 : 0) - candidate.length;
       if (!best || score < best.score) {
@@ -416,10 +415,7 @@ export function resolveHostedSearchTextBoundary(text: string, offset: number) {
   return text.length;
 }
 
-function insertHostedSearchesByTextOffset(
-  content: unknown[],
-  orderedContent: unknown[],
-) {
+function insertHostedSearchesByTextOffset(content: unknown[], orderedContent: unknown[]) {
   const fullText = content
     .filter(isTextContentBlock)
     .map((block) => block.text)
@@ -442,9 +438,7 @@ function insertHostedSearchesByTextOffset(
 
   if (placements.length === 0) return content;
 
-  const pending = placements
-    .slice()
-    .sort((a, b) => a.offset - b.offset || a.order - b.order);
+  const pending = placements.slice().sort((a, b) => a.offset - b.offset || a.order - b.order);
   const out: unknown[] = [];
   let textOffset = 0;
 
@@ -505,7 +499,8 @@ export function applyHostedSearchOrderToAssistant<TMessage extends { content: un
       continue;
     }
 
-    const hostedSearch = hostedSearchById.get(block.item.id) ?? normalizeHostedSearchBlock(block.item);
+    const hostedSearch =
+      hostedSearchById.get(block.item.id) ?? normalizeHostedSearchBlock(block.item);
     if (!hostedSearch || usedHostedSearchIds.has(hostedSearch.id)) continue;
     usedHostedSearchIds.add(hostedSearch.id);
     const previous = nextContent[nextContent.length - 1];
diff --git a/crates/agent-gui/src/lib/chat/messages/uiMessages.ts b/crates/agent-gui/src/lib/chat/messages/uiMessages.ts
index c02744fa0..480a78923 100644
--- a/crates/agent-gui/src/lib/chat/messages/uiMessages.ts
+++ b/crates/agent-gui/src/lib/chat/messages/uiMessages.ts
@@ -5,29 +5,25 @@ import type {
   ToolResultMessage,
   Usage,
 } from "@mariozechner/pi-ai";
-
-import {
-  getUserMessageAttachments,
-  getUserMessageDisplayText,
-  type PendingUploadedFile,
-} from "./uploadedFiles";
 import { assistantMessageToText } from "../../providers/llm";
-import {
-  GLOBAL_BASH_MAX_TIMEOUT_MS,
-  MIN_BASH_TIMEOUT_MS,
-} from "../../tools/bashTimeoutPolicy";
+import { GLOBAL_BASH_MAX_TIMEOUT_MS, MIN_BASH_TIMEOUT_MS } from "../../tools/bashTimeoutPolicy";
 import type {
   DelegateAgentCardResultDetails,
   DelegateAgentResultDetails,
 } from "../../tools/builtinTypes";
 import {
   enrichHostedSearchContentWithText,
+  type HostedSearchBlock,
   mergeHostedSearchBlocks,
   normalizeHostedSearchBlock,
   resolveHostedSearchTextBoundary,
   splitTextAroundHostedSearch,
-  type HostedSearchBlock,
 } from "./hostedSearch";
+import {
+  getUserMessageAttachments,
+  getUserMessageDisplayText,
+  type PendingUploadedFile,
+} from "./uploadedFiles";
 
 export type ToolTraceItem = {
   toolCall: ToolCall;
@@ -133,26 +129,21 @@ function summarizeBashTimeout(value: unknown) {
     return null;
   }
   const requested = Math.floor(value);
-  const effective = Math.min(
-    GLOBAL_BASH_MAX_TIMEOUT_MS,
-    Math.max(MIN_BASH_TIMEOUT_MS, requested),
-  );
+  const effective = Math.min(GLOBAL_BASH_MAX_TIMEOUT_MS, Math.max(MIN_BASH_TIMEOUT_MS, requested));
   return requested === effective
     ? `timeout_ms=${effective}`
     : `timeout_ms=${effective} (requested ${requested})`;
 }
 
-export function summarizeToolCall(
-  toolCall: ToolCall,
-  options?: { includeName?: boolean },
-) {
+export function summarizeToolCall(toolCall: ToolCall, options?: { includeName?: boolean }) {
   const includeName = options?.includeName ?? true;
   const args = toolCall.arguments || {};
   const name = toolCall.name;
   const path = summarizeToolArg(args.path);
-  const root = typeof args.root === "string" && args.root.trim()
-    ? `root=${summarizeToolArg(args.root)}`
-    : null;
+  const root =
+    typeof args.root === "string" && args.root.trim()
+      ? `root=${summarizeToolArg(args.root)}`
+      : null;
   const imagePaths = Array.isArray(args.paths)
     ? args.paths
         .map((value) => summarizeToolArg(value))
@@ -180,152 +171,176 @@ export function summarizeToolCall(
           imageSources.length > 0
             ? `sources=${imageSources.length}${imageSources[0] ? ` first=${imageSources[0]}` : ""}`
             : imagePaths.length > 0
-            ? `paths=${imagePaths.length}${imagePaths[0] ? ` first=${imagePaths[0]}` : ""}`
-            : imageUrls.length > 0
-              ? `urls=${imageUrls.length}${imageUrls[0] ? ` first=${imageUrls[0]}` : ""}`
-              : imageBase64s > 0
-                ? `base64s=${imageBase64s}`
-                : typeof args.source === "string" && args.source.trim()
-                  ? `source=${summarizeImageSourceArg(args.source)}`
-                  : typeof args.url === "string" && args.url.trim()
-                    ? `url=${summarizeToolArg(args.url)}`
-                    : typeof args.base64 === "string" && args.base64.trim()
-                      ? `base64Chars=${args.base64.length}`
-                      : path
-                        ? `path=${path}`
-                        : null,
+              ? `paths=${imagePaths.length}${imagePaths[0] ? ` first=${imagePaths[0]}` : ""}`
+              : imageUrls.length > 0
+                ? `urls=${imageUrls.length}${imageUrls[0] ? ` first=${imageUrls[0]}` : ""}`
+                : imageBase64s > 0
+                  ? `base64s=${imageBase64s}`
+                  : typeof args.source === "string" && args.source.trim()
+                    ? `source=${summarizeImageSourceArg(args.source)}`
+                    : typeof args.url === "string" && args.url.trim()
+                      ? `url=${summarizeToolArg(args.url)}`
+                      : typeof args.base64 === "string" && args.base64.trim()
+                        ? `base64Chars=${args.base64.length}`
+                        : path
+                          ? `path=${path}`
+                          : null,
         ]
       : name === "Read"
-      ? [
-          root,
-          path ? `path=${path}` : null,
-          typeof args.start_line === "number" ? `start=${args.start_line}` : null,
-          typeof args.limit === "number" ? `limit=${args.limit}` : null,
-          typeof args.page_start === "number" ? `pageStart=${args.page_start}` : null,
-          typeof args.page_limit === "number" ? `pageLimit=${args.page_limit}` : null,
-          typeof args.cell_start === "number" ? `cellStart=${args.cell_start}` : null,
-          typeof args.cell_limit === "number" ? `cellLimit=${args.cell_limit}` : null,
-        ]
-      : name === "SkillsManager"
-        ? [
-            typeof args.action === "string" ? `action=${args.action}` : null,
-            path ? `path=${path}` : null,
-            typeof args.offset === "number" ? `start=${args.offset + 1}` : null,
-            typeof args.length === "number" ? `limit=${args.length}` : null,
-            typeof args.source === "string" ? `source=${summarizeToolArg(args.source)}` : null,
-            typeof args.name === "string" ? `name=${summarizeToolArg(args.name)}` : null,
-            typeof args.conflict === "string" ? `conflict=${summarizeToolArg(args.conflict)}` : null,
-        ]
-      : name === "MemoryManager"
-        ? [
-            typeof args.action === "string" ? `action=${args.action}` : null,
-            typeof args.slug === "string" ? `slug=${summarizeToolArg(args.slug)}` : null,
-            typeof args.scope === "string" ? `scope=${summarizeToolArg(args.scope)}` : null,
-            typeof args.type === "string" ? `type=${summarizeToolArg(args.type)}` : null,
-            typeof args.query === "string" ? `query=${summarizeToolArg(args.query)}` : null,
-        ]
-      : name === "McpManager"
-        ? [
-            typeof args.action === "string" ? `action=${args.action}` : null,
-            typeof args.server_id === "string" ? `server=${summarizeToolArg(args.server_id)}` : null,
-            Array.isArray(args.server_ids) ? `servers=${args.server_ids.length}` : null,
-            typeof args.conflict === "string" ? `conflict=${summarizeToolArg(args.conflict)}` : null,
-            args.include_schema === true ? "includeSchema=true" : null,
-          ]
-        : name === "Agent"
-          ? [
-              typeof args.agent_id === "string" ? `agent=${summarizeToolArg(args.agent_id)}` : null,
-              typeof args.name === "string" ? `name=${summarizeToolArg(args.name)}` : null,
-              typeof args.prompt === "string"
-                ? `prompt=${summarizeToolArg(args.prompt)}`
-                : null,
-              typeof args.agent_spec === "string"
-                ? `agentSpecChars=${args.agent_spec.length}`
-                : null,
-              typeof args.mode === "string" ? `mode=${summarizeToolArg(args.mode)}` : null,
-              typeof args.concurrency === "number" ? `concurrency=${args.concurrency}` : null,
-            ]
-        : name === "SendMessage"
-          ? [
-              typeof args.to === "string" ? `to=${summarizeToolArg(args.to)}` : null,
-              typeof args.channel === "string" ? `channel=${summarizeToolArg(args.channel)}` : null,
-              typeof args.subject === "string" ? `subject=${summarizeToolArg(args.subject)}` : null,
-              typeof args.summary === "string" && typeof args.subject !== "string"
-                ? `summary=${summarizeToolArg(args.summary)}`
-                : null,
-              typeof args.message === "string" ? `messageChars=${args.message.length}` : null,
-            ]
-      : name === "Write"
         ? [
             root,
             path ? `path=${path}` : null,
-            "mode=rewrite",
-            typeof args.content === "string" ? `contentChars=${args.content.length}` : null,
+            typeof args.start_line === "number" ? `start=${args.start_line}` : null,
+            typeof args.limit === "number" ? `limit=${args.limit}` : null,
+            typeof args.page_start === "number" ? `pageStart=${args.page_start}` : null,
+            typeof args.page_limit === "number" ? `pageLimit=${args.page_limit}` : null,
+            typeof args.cell_start === "number" ? `cellStart=${args.cell_start}` : null,
+            typeof args.cell_limit === "number" ? `cellLimit=${args.cell_limit}` : null,
           ]
-        : name === "Edit"
+        : name === "SkillsManager"
           ? [
-              root,
+              typeof args.action === "string" ? `action=${args.action}` : null,
               path ? `path=${path}` : null,
-              typeof args.expected_replacements === "number"
-                ? `expected=${args.expected_replacements}`
+              typeof args.offset === "number" ? `start=${args.offset + 1}` : null,
+              typeof args.length === "number" ? `limit=${args.length}` : null,
+              typeof args.source === "string" ? `source=${summarizeToolArg(args.source)}` : null,
+              typeof args.name === "string" ? `name=${summarizeToolArg(args.name)}` : null,
+              typeof args.conflict === "string"
+                ? `conflict=${summarizeToolArg(args.conflict)}`
                 : null,
-              args.replace_all === true ? "replaceAll=true" : null,
-              typeof args.old_string === "string" ? `oldChars=${args.old_string.length}` : null,
-              typeof args.new_string === "string" ? `newChars=${args.new_string.length}` : null,
             ]
-          : name === "List"
+          : name === "MemoryManager"
             ? [
-                root,
-                path ? `path=${path}` : rootPath,
-                typeof args.depth === "number" ? `depth=${args.depth}` : null,
-                typeof args.offset === "number" ? `offset=${args.offset}` : null,
-                typeof args.max_results === "number" ? `max=${args.max_results}` : null,
+                typeof args.action === "string" ? `action=${args.action}` : null,
+                typeof args.slug === "string" ? `slug=${summarizeToolArg(args.slug)}` : null,
+                typeof args.scope === "string" ? `scope=${summarizeToolArg(args.scope)}` : null,
+                typeof args.type === "string" ? `type=${summarizeToolArg(args.type)}` : null,
+                typeof args.query === "string" ? `query=${summarizeToolArg(args.query)}` : null,
               ]
-            : name === "Glob"
+            : name === "McpManager"
               ? [
-                  root,
-                  typeof args.pattern === "string"
-                    ? `pattern=${summarizeToolArg(args.pattern)}`
+                  typeof args.action === "string" ? `action=${args.action}` : null,
+                  typeof args.server_id === "string"
+                    ? `server=${summarizeToolArg(args.server_id)}`
                     : null,
-                  path ? `path=${path}` : rootPath,
-                  typeof args.offset === "number" ? `offset=${args.offset}` : null,
-                  typeof args.max_results === "number" ? `max=${args.max_results}` : null,
+                  Array.isArray(args.server_ids) ? `servers=${args.server_ids.length}` : null,
+                  typeof args.conflict === "string"
+                    ? `conflict=${summarizeToolArg(args.conflict)}`
+                    : null,
+                  args.include_schema === true ? "includeSchema=true" : null,
                 ]
-              : name === "Grep"
+              : name === "Agent"
                 ? [
-                    root,
-                    typeof args.pattern === "string"
-                      ? `pattern=${summarizeToolArg(args.pattern)}`
-                      : null,
-                    path ? `path=${path}` : rootPath,
-                    typeof args.file_pattern === "string"
-                      ? `filePattern=${summarizeToolArg(args.file_pattern)}`
+                    typeof args.agent_id === "string"
+                      ? `agent=${summarizeToolArg(args.agent_id)}`
                       : null,
-                    typeof args.output_mode === "string"
-                      ? `mode=${args.output_mode}`
+                    typeof args.name === "string" ? `name=${summarizeToolArg(args.name)}` : null,
+                    typeof args.prompt === "string"
+                      ? `prompt=${summarizeToolArg(args.prompt)}`
                       : null,
-                    typeof args.ignore_case === "boolean"
-                      ? `ignoreCase=${args.ignore_case}`
+                    typeof args.agent_spec === "string"
+                      ? `agentSpecChars=${args.agent_spec.length}`
                       : null,
-                    typeof args.context === "number" ? `context=${args.context}` : null,
-                    typeof args.head_limit === "number" ? `head=${args.head_limit}` : null,
-                    args.multiline === true ? "multiline=true" : null,
-                    typeof args.offset === "number" ? `offset=${args.offset}` : null,
+                    typeof args.mode === "string" ? `mode=${summarizeToolArg(args.mode)}` : null,
+                    typeof args.concurrency === "number" ? `concurrency=${args.concurrency}` : null,
                   ]
-                : name === "Delete"
-                  ? [root, path ? `path=${path}` : null]
-                  : name === "Bash"
+                : name === "SendMessage"
+                  ? [
+                      typeof args.to === "string" ? `to=${summarizeToolArg(args.to)}` : null,
+                      typeof args.channel === "string"
+                        ? `channel=${summarizeToolArg(args.channel)}`
+                        : null,
+                      typeof args.subject === "string"
+                        ? `subject=${summarizeToolArg(args.subject)}`
+                        : null,
+                      typeof args.summary === "string" && typeof args.subject !== "string"
+                        ? `summary=${summarizeToolArg(args.summary)}`
+                        : null,
+                      typeof args.message === "string"
+                        ? `messageChars=${args.message.length}`
+                        : null,
+                    ]
+                  : name === "Write"
                     ? [
                         root,
-                        typeof args.cwd === "string"
-                          ? `cwd=${summarizeToolArg(args.cwd)}`
-                          : rootPath,
-                        summarizeBashTimeout(args.timeout_ms),
-                        typeof args.command === "string"
-                          ? `command=${summarizeToolArg(args.command)}`
+                        path ? `path=${path}` : null,
+                        "mode=rewrite",
+                        typeof args.content === "string"
+                          ? `contentChars=${args.content.length}`
                           : null,
                       ]
-                    : [];
+                    : name === "Edit"
+                      ? [
+                          root,
+                          path ? `path=${path}` : null,
+                          typeof args.expected_replacements === "number"
+                            ? `expected=${args.expected_replacements}`
+                            : null,
+                          args.replace_all === true ? "replaceAll=true" : null,
+                          typeof args.old_string === "string"
+                            ? `oldChars=${args.old_string.length}`
+                            : null,
+                          typeof args.new_string === "string"
+                            ? `newChars=${args.new_string.length}`
+                            : null,
+                        ]
+                      : name === "List"
+                        ? [
+                            root,
+                            path ? `path=${path}` : rootPath,
+                            typeof args.depth === "number" ? `depth=${args.depth}` : null,
+                            typeof args.offset === "number" ? `offset=${args.offset}` : null,
+                            typeof args.max_results === "number" ? `max=${args.max_results}` : null,
+                          ]
+                        : name === "Glob"
+                          ? [
+                              root,
+                              typeof args.pattern === "string"
+                                ? `pattern=${summarizeToolArg(args.pattern)}`
+                                : null,
+                              path ? `path=${path}` : rootPath,
+                              typeof args.offset === "number" ? `offset=${args.offset}` : null,
+                              typeof args.max_results === "number"
+                                ? `max=${args.max_results}`
+                                : null,
+                            ]
+                          : name === "Grep"
+                            ? [
+                                root,
+                                typeof args.pattern === "string"
+                                  ? `pattern=${summarizeToolArg(args.pattern)}`
+                                  : null,
+                                path ? `path=${path}` : rootPath,
+                                typeof args.file_pattern === "string"
+                                  ? `filePattern=${summarizeToolArg(args.file_pattern)}`
+                                  : null,
+                                typeof args.output_mode === "string"
+                                  ? `mode=${args.output_mode}`
+                                  : null,
+                                typeof args.ignore_case === "boolean"
+                                  ? `ignoreCase=${args.ignore_case}`
+                                  : null,
+                                typeof args.context === "number" ? `context=${args.context}` : null,
+                                typeof args.head_limit === "number"
+                                  ? `head=${args.head_limit}`
+                                  : null,
+                                args.multiline === true ? "multiline=true" : null,
+                                typeof args.offset === "number" ? `offset=${args.offset}` : null,
+                              ]
+                            : name === "Delete"
+                              ? [root, path ? `path=${path}` : null]
+                              : name === "Bash"
+                                ? [
+                                    root,
+                                    typeof args.cwd === "string"
+                                      ? `cwd=${summarizeToolArg(args.cwd)}`
+                                      : rootPath,
+                                    summarizeBashTimeout(args.timeout_ms),
+                                    typeof args.command === "string"
+                                      ? `command=${summarizeToolArg(args.command)}`
+                                      : null,
+                                  ]
+                                : [];
 
   const summary = parts.filter(Boolean).join(" ");
   if (!summary) return includeName ? name : "";
@@ -349,9 +364,7 @@ function summarizeImageArgValue(key: string, value: unknown) {
     return typeof value === "string" ? `base64Chars=${value.length}` : value;
   }
   if (key === "base64s" && Array.isArray(value)) {
-    return value.map((item) =>
-      typeof item === "string" ? `base64Chars=${item.length}` : item,
-    );
+    return value.map((item) => (typeof item === "string" ? `base64Chars=${item.length}` : item));
   }
   if (key === "source") {
     return summarizeImageSourceArg(value);
@@ -448,11 +461,9 @@ function summarizeAgentArgsForDisplay(args: Record<string, unknown>) {
         ? `${prompt.slice(0, 800)}...（len=${prompt.length}）`
         : prompt,
     mode: args.mode,
-    identityChars:
-      typeof args.identity === "string" ? args.identity.length : undefined,
+    identityChars: typeof args.identity === "string" ? args.identity.length : undefined,
     promptChars: typeof prompt === "string" ? prompt.length : undefined,
-    agentSpecChars:
-      typeof args.agent_spec === "string" ? args.agent_spec.length : undefined,
+    agentSpecChars: typeof args.agent_spec === "string" ? args.agent_spec.length : undefined,
     concurrency: args.concurrency,
   };
   if (args.task_intent !== undefined) summary.task_intent = args.task_intent;
@@ -468,10 +479,14 @@ function redactMcpManagerArgsForDisplay(args: Record<string, unknown>) {
     if (!value || typeof value !== "object" || Array.isArray(value)) return value;
     const server = { ...(value as Record<string, unknown>) };
     if (server.env && typeof server.env === "object" && !Array.isArray(server.env)) {
-      server.env = Object.fromEntries(Object.keys(server.env as Record<string, unknown>).map((key) => [key, "<redacted>"]));
+      server.env = Object.fromEntries(
+        Object.keys(server.env as Record<string, unknown>).map((key) => [key, "<redacted>"]),
+      );
     }
     if (server.headers && typeof server.headers === "object" && !Array.isArray(server.headers)) {
-      server.headers = Object.fromEntries(Object.keys(server.headers as Record<string, unknown>).map((key) => [key, "<redacted>"]));
+      server.headers = Object.fromEntries(
+        Object.keys(server.headers as Record<string, unknown>).map((key) => [key, "<redacted>"]),
+      );
     }
     return server;
   };
@@ -510,9 +525,7 @@ function appendTextLikeBlock(
   return [...blocks, { kind, text: delta }];
 }
 
-function rebalanceHostedSearchTextBoundaries(
-  blocks: UiRoundContentBlock[],
-): UiRoundContentBlock[] {
+function rebalanceHostedSearchTextBoundaries(blocks: UiRoundContentBlock[]): UiRoundContentBlock[] {
   const out: UiRoundContentBlock[] = [];
   for (let index = 0; index < blocks.length; index += 1) {
     const current = blocks[index];
@@ -525,10 +538,7 @@ function rebalanceHostedSearchTextBoundaries(
       const following = blocks[hostedEnd];
       if (hostedEnd > hostedStart && following?.kind === "text") {
         const combinedText = current.text + following.text;
-        const boundary = resolveHostedSearchTextBoundary(
-          combinedText,
-          current.text.length,
-        );
+        const boundary = resolveHostedSearchTextBoundary(combinedText, current.text.length);
         if (boundary > current.text.length) {
           const before = combinedText.slice(0, boundary);
           const after = combinedText.slice(boundary);
@@ -550,10 +560,7 @@ function rebalanceHostedSearchTextBoundaries(
 }
 
 function isDelegateAgentCardToolCall(toolCall: ToolCall) {
-  return (
-    toolCall.name === "Agent" &&
-    toolCall.arguments?.delegate_agent_card === true
-  );
+  return toolCall.name === "Agent" && toolCall.arguments?.delegate_agent_card === true;
 }
 
 function isParentDelegateAgentToolCall(toolCall: ToolCall) {
@@ -610,9 +617,7 @@ function normalizePlaceholderTaskIntent(
 function normalizePlaceholderApplyPolicy(
   value: unknown,
 ): DelegateAgentPlaceholder["applyPolicy"] | undefined {
-  return value === "none" || value === "explicit" || value === "auto"
-    ? value
-    : undefined;
+  return value === "none" || value === "explicit" || value === "auto" ? value : undefined;
 }
 
 function normalizePlaceholderRelativePath(value: string) {
@@ -653,18 +658,14 @@ function normalizePlaceholderPathList(value: unknown): string[] {
 }
 
 function maybePlaceholderOutputPath(value: string) {
-  const text = value
-    .trim()
-    .replace(/^[`"'“”‘’]+|[`"'“”‘’，,。.；;:：)）\]]+$/g, "");
-  if (!text || /[*?\[\]]/.test(text) || /^https?:\/\//i.test(text)) return "";
+  const text = value.trim().replace(/^[`"'“”‘’]+|[`"'“”‘’，,。.；;:：)）\]]+$/g, "");
+  if (!text || /[*?[\]]/.test(text) || /^https?:\/\//i.test(text)) return "";
   if (/\s/.test(text)) return "";
   if (!/\.[a-z0-9]{1,12}$/i.test(text)) return "";
   return normalizePlaceholderRelativePath(text);
 }
 
-function inferPlaceholderAllowedOutputPaths(params: {
-  prompt?: string;
-}): string[] {
+function inferPlaceholderAllowedOutputPaths(params: { prompt?: string }): string[] {
   const text = params.prompt ?? "";
   const out: string[] = [];
   const pushPath = (value: string) => {
@@ -724,9 +725,7 @@ function inferPlaceholderTaskIntent(params: {
 function defaultPlaceholderModeForIntent(
   intent: DelegateAgentPlaceholder["taskIntent"],
 ): DelegateAgentPlaceholder["mode"] {
-  return intent === "implementation" || intent === "document_generation"
-    ? "worktree"
-    : "readonly";
+  return intent === "implementation" || intent === "document_generation" ? "worktree" : "readonly";
 }
 
 function defaultPlaceholderApplyPolicyForTask(params: {
@@ -740,7 +739,10 @@ function defaultPlaceholderApplyPolicyForTask(params: {
 }
 
 function normalizePlaceholderSpecKey(value: string) {
-  const key = value.trim().toLowerCase().replace(/[\s-]+/g, "_");
+  const key = value
+    .trim()
+    .toLowerCase()
+    .replace(/[\s-]+/g, "_");
   if (key === "id" || key === "agent" || key === "agent_id_for_resume") return "id";
   if (key === "name" || key === "agent_name") return "name";
   if (key === "agent_id" || key === "template" || key === "template_id") return "agent_id";
@@ -771,7 +773,7 @@ function normalizePlaceholderSpecKey(value: string) {
 function unquotePlaceholderSpecValue(value: string) {
   const text = value.trim();
   if (
-    (text.startsWith("\"") && text.endsWith("\"")) ||
+    (text.startsWith('"') && text.endsWith('"')) ||
     (text.startsWith("'") && text.endsWith("'"))
   ) {
     return text.slice(1, -1);
@@ -797,11 +799,7 @@ function parsePlaceholderSpecAttributes(value: string) {
   return attrs;
 }
 
-function appendPlaceholderSpecField(
-  record: Record<string, unknown>,
-  key: string,
-  value: string,
-) {
+function appendPlaceholderSpecField(record: Record<string, unknown>, key: string, value: string) {
   const normalizedKey = normalizePlaceholderSpecKey(key);
   if (!normalizedKey) return "";
   if (normalizedKey === "allowed_output_paths") {
@@ -864,9 +862,7 @@ function parsePlaceholderSpecBlock(lines: string[]) {
     }
 
     const fieldMatch = /^([a-zA-Z_][\w\s-]{0,40})\s*:\s*(.*)$/.exec(trimmed);
-    const normalizedField = fieldMatch
-      ? normalizePlaceholderSpecKey(fieldMatch[1] ?? "")
-      : "";
+    const normalizedField = fieldMatch ? normalizePlaceholderSpecKey(fieldMatch[1] ?? "") : "";
     if (fieldMatch && normalizedField) {
       const rawValue = (fieldMatch[2] ?? "").trim();
       activeKey = normalizedField;
@@ -903,10 +899,7 @@ function shouldTreatPlaceholderTextAsAgentSpec(value: unknown) {
   const text = optionalText(value);
   if (!text) return false;
   if (/^\s*@agent\b/im.test(text)) return true;
-  return (
-    /^\s*agent\s+\d+\s*:/im.test(text) &&
-    /^\s*(name|role|prompt|task)\s*:/im.test(text)
-  );
+  return /^\s*agent\s+\d+\s*:/im.test(text) && /^\s*(name|role|prompt|task)\s*:/im.test(text);
 }
 
 function normalizePlaceholderAgent(
@@ -971,13 +964,8 @@ function normalizeDelegateAgentPlaceholders(
   const agentSpec = explicitAgentSpec ?? promptAgentSpec;
 
   if (agentSpec) {
-    const specItems = parsePlaceholderSpec(agentSpec).filter(
-      (item) => optionalText(item.prompt),
-    );
-    if (
-      specItems.length === 0 ||
-      specItems.length > DELEGATE_AGENT_PLACEHOLDER_MAX_AGENTS
-    ) {
+    const specItems = parsePlaceholderSpec(agentSpec).filter((item) => optionalText(item.prompt));
+    if (specItems.length === 0 || specItems.length > DELEGATE_AGENT_PLACEHOLDER_MAX_AGENTS) {
       return [];
     }
     return specItems
@@ -1007,9 +995,7 @@ function normalizeDelegateAgentPlaceholders(
   return single ? [single] : [];
 }
 
-export function buildDelegateAgentPlaceholderToolCalls(
-  parentToolCall: ToolCall,
-): ToolCall[] {
+export function buildDelegateAgentPlaceholderToolCalls(parentToolCall: ToolCall): ToolCall[] {
   if (!isParentDelegateAgentToolCall(parentToolCall)) return [];
   const args = asPlainObject(parentToolCall.arguments);
   const agents = normalizeDelegateAgentPlaceholders(args);
@@ -1196,12 +1182,8 @@ export function getRoundToolTrace(round: Pick<UiRound, "blocks">): ToolTraceItem
   return round.blocks.flatMap((block) => (block.kind === "tool" ? [block.item] : []));
 }
 
-export function getRoundHostedSearches(
-  round: Pick<UiRound, "blocks">,
-): HostedSearchBlock[] {
-  return round.blocks.flatMap((block) =>
-    block.kind === "hostedSearch" ? [block.item] : [],
-  );
+export function getRoundHostedSearches(round: Pick<UiRound, "blocks">): HostedSearchBlock[] {
+  return round.blocks.flatMap((block) => (block.kind === "hostedSearch" ? [block.item] : []));
 }
 
 export function hasRoundContent(round: Pick<UiRound, "blocks">) {
@@ -1213,38 +1195,41 @@ export function hasRoundContent(round: Pick<UiRound, "blocks">) {
   );
 }
 
-export function appendTextDeltaToRound<
-  TRound extends Pick<UiRound, "blocks">,
->(round: TRound, delta: string): TRound {
+export function appendTextDeltaToRound<TRound extends Pick<UiRound, "blocks">>(
+  round: TRound,
+  delta: string,
+): TRound {
   return {
     ...round,
-    blocks: rebalanceHostedSearchTextBoundaries(
-      appendTextLikeBlock(round.blocks, "text", delta),
-    ),
+    blocks: rebalanceHostedSearchTextBoundaries(appendTextLikeBlock(round.blocks, "text", delta)),
   };
 }
 
-export function appendThinkingDeltaToRound<
-  TRound extends Pick<UiRound, "blocks">,
->(round: TRound, delta: string): TRound {
+export function appendThinkingDeltaToRound<TRound extends Pick<UiRound, "blocks">>(
+  round: TRound,
+  delta: string,
+): TRound {
   return {
     ...round,
     blocks: appendTextLikeBlock(round.blocks, "thinking", delta),
   };
 }
 
-export function upsertToolCallToRound<
-  TRound extends Pick<UiRound, "blocks">,
->(round: TRound, toolCall: ToolCall): TRound {
+export function upsertToolCallToRound<TRound extends Pick<UiRound, "blocks">>(
+  round: TRound,
+  toolCall: ToolCall,
+): TRound {
   return {
     ...round,
     blocks: upsertToolBlock(round.blocks, toolCall),
   };
 }
 
-export function attachToolResultToRound<
-  TRound extends Pick<UiRound, "blocks">,
->(round: TRound, toolCall: ToolCall, toolResult: ToolResultMessage): TRound {
+export function attachToolResultToRound<TRound extends Pick<UiRound, "blocks">>(
+  round: TRound,
+  toolCall: ToolCall,
+  toolResult: ToolResultMessage,
+): TRound {
   return {
     ...round,
     blocks: upsertToolBlock(round.blocks, toolCall, toolResult),
@@ -1268,10 +1253,7 @@ function findHostedSearchGroupInsertIndex(blocks: UiRoundContentBlock[]) {
   return -1;
 }
 
-function upsertHostedSearchBlock(
-  blocks: UiRoundContentBlock[],
-  hostedSearch: HostedSearchBlock,
-) {
+function upsertHostedSearchBlock(blocks: UiRoundContentBlock[], hostedSearch: HostedSearchBlock) {
   const idx = blocks.findIndex(
     (block) => block.kind === "hostedSearch" && block.item.id === hostedSearch.id,
   );
@@ -1311,9 +1293,7 @@ function upsertHostedSearchBlock(
   return next;
 }
 
-export function upsertHostedSearchToRound<
-  TRound extends Pick<UiRound, "blocks">,
->(
+export function upsertHostedSearchToRound<TRound extends Pick<UiRound, "blocks">>(
   round: TRound,
   hostedSearch: HostedSearchBlock,
 ): TRound {
@@ -1370,11 +1350,7 @@ function buildUiRoundBlocks(
     if (block.type === "toolCall") {
       const toolResult = toolResultById.get(block.id);
       if (isParentDelegateAgentToolCall(block)) {
-        blocks = appendDelegateAgentItemBlocks(
-          blocks,
-          block,
-          toolResult,
-        );
+        blocks = appendDelegateAgentItemBlocks(blocks, block, toolResult);
         continue;
       }
       blocks = upsertToolBlock(blocks, block, toolResult);
diff --git a/crates/agent-gui/src/lib/chat/messages/uploadedFiles.ts b/crates/agent-gui/src/lib/chat/messages/uploadedFiles.ts
index be75ab84b..84c8b86b1 100644
--- a/crates/agent-gui/src/lib/chat/messages/uploadedFiles.ts
+++ b/crates/agent-gui/src/lib/chat/messages/uploadedFiles.ts
@@ -115,10 +115,7 @@ export function buildUploadedFilesInstruction(files: PendingUploadedFile[]) {
   ].join("\n");
 }
 
-export function buildUserMessageContentWithUploads(
-  userText: string,
-  files: PendingUploadedFile[],
-) {
+export function buildUserMessageContentWithUploads(userText: string, files: PendingUploadedFile[]) {
   const normalizedText = userText.trim();
   if (files.length === 0) return normalizedText;
 
diff --git a/crates/agent-gui/src/lib/chat/messages/userMessageContent.tsx b/crates/agent-gui/src/lib/chat/messages/userMessageContent.tsx
index 7015b5e4c..06219acad 100644
--- a/crates/agent-gui/src/lib/chat/messages/userMessageContent.tsx
+++ b/crates/agent-gui/src/lib/chat/messages/userMessageContent.tsx
@@ -1,9 +1,9 @@
 import { File, Folder } from "../../../components/icons";
 
 import {
-  parsePastedTextDisplayReferences,
-  type PendingUploadedFile,
   type PastedTextDisplayReference,
+  type PendingUploadedFile,
+  parsePastedTextDisplayReferences,
 } from "./uploadedFiles";
 
 export function isMentionToken(token: string) {
@@ -30,16 +30,16 @@ function isSkillMentionName(value: string) {
 
 function isCommonSkillMentionEnvVar(name: string) {
   const upper = name.toUpperCase();
-  return COMMON_SKILL_MENTION_ENV_VARS.has(upper) ||
-    (upper.endsWith(":") && COMMON_SKILL_MENTION_ENV_VARS.has(upper.slice(0, -1)));
+  return (
+    COMMON_SKILL_MENTION_ENV_VARS.has(upper) ||
+    (upper.endsWith(":") && COMMON_SKILL_MENTION_ENV_VARS.has(upper.slice(0, -1)))
+  );
 }
 
 export function isSkillMentionToken(token: string) {
   if (!token.startsWith("$")) return false;
   const name = token.slice(1);
-  return Boolean(name) &&
-    isSkillMentionName(name) &&
-    !isCommonSkillMentionEnvVar(name);
+  return Boolean(name) && isSkillMentionName(name) && !isCommonSkillMentionEnvVar(name);
 }
 
 type UserMessageSegment =
@@ -62,10 +62,7 @@ function pushTextSegment(segments: UserMessageSegment[], value: string) {
   segments.push({ type: "text", value });
 }
 
-function appendSegments(
-  segments: UserMessageSegment[],
-  incoming: UserMessageSegment[],
-) {
+function appendSegments(segments: UserMessageSegment[], incoming: UserMessageSegment[]) {
   for (const segment of incoming) {
     if (segment.type === "text") {
       pushTextSegment(segments, segment.value);
@@ -81,13 +78,8 @@ function unescapeMarkdown(value: string) {
 
 function normalizeMarkdownDestination(value: string) {
   const trimmed = value.trim();
-  const inner =
-    trimmed.startsWith("<") && trimmed.endsWith(">")
-      ? trimmed.slice(1, -1)
-      : trimmed;
-  return unescapeMarkdown(inner)
-    .replace(/%3C/gi, "<")
-    .replace(/%3E/gi, ">");
+  const inner = trimmed.startsWith("<") && trimmed.endsWith(">") ? trimmed.slice(1, -1) : trimmed;
+  return unescapeMarkdown(inner).replace(/%3C/gi, "<").replace(/%3E/gi, ">");
 }
 
 function normalizeReferencePath(value: string) {
@@ -263,13 +255,7 @@ function PastedTextChip({
   );
 }
 
-function MentionChip({
-  path,
-  isDir,
-}: {
-  path: string;
-  isDir: boolean;
-}) {
+function MentionChip({ path, isDir }: { path: string; isDir: boolean }) {
   const fileName = path.split("/").pop() || path;
   return (
     <span
@@ -310,7 +296,9 @@ export function UserMessageContent({
   pastedTextFiles?: PendingUploadedFile[];
 }) {
   const parts = tokenizeUserMessage(text, pastedTextFiles);
-  const hasChip = parts.some((part) => part.type === "mention" || part.type === "skill" || part.type === "pastedText");
+  const hasChip = parts.some(
+    (part) => part.type === "mention" || part.type === "skill" || part.type === "pastedText",
+  );
   if (!hasChip) return <>{text}</>;
 
   return (
@@ -323,13 +311,7 @@ export function UserMessageContent({
           return <SkillMentionChip key={idx} name={part.name} />;
         }
         if (part.type === "pastedText") {
-          return (
-            <PastedTextChip
-              key={idx}
-              reference={part.reference}
-              file={part.file}
-            />
-          );
+          return <PastedTextChip key={idx} reference={part.reference} file={part.file} />;
         }
         return <span key={idx}>{part.value}</span>;
       })}
diff --git a/crates/agent-gui/src/lib/chat/page/chatPageHelpers.ts b/crates/agent-gui/src/lib/chat/page/chatPageHelpers.ts
index 73a43b8f3..f150723a8 100644
--- a/crates/agent-gui/src/lib/chat/page/chatPageHelpers.ts
+++ b/crates/agent-gui/src/lib/chat/page/chatPageHelpers.ts
@@ -1,9 +1,8 @@
 import type { Context } from "@mariozechner/pi-ai";
-
+import { type ModelOption, toModelValue } from "../../providers/llm";
 import type { AppSettings } from "../../settings";
 import type { ChatHistorySummary } from "../history/chatHistory";
 import { getMessageText } from "../messages/uiMessages";
-import { toModelValue, type ModelOption } from "../../providers/llm";
 
 const FALLBACK_TITLE_MAX_CHARS = 48;
 const TITLE_LOOKAHEAD_TIMEOUT_MS = 1_200;
@@ -92,9 +91,7 @@ export function isAbortLikeError(error: unknown) {
   const message = error instanceof Error ? error.message : String(error ?? "");
   const normalized = message.trim().toLowerCase();
   return (
-    normalized.includes("已取消") ||
-    normalized.includes("abort") ||
-    normalized.includes("aborted")
+    normalized.includes("已取消") || normalized.includes("abort") || normalized.includes("aborted")
   );
 }
 
@@ -115,10 +112,7 @@ export function sortHistoryItems(items: ChatHistorySummary[]) {
   });
 }
 
-export function mergeHistoryItem(
-  items: ChatHistorySummary[],
-  nextItem: ChatHistorySummary,
-) {
+export function mergeHistoryItem(items: ChatHistorySummary[], nextItem: ChatHistorySummary) {
   const existing = items.find((item) => item.id === nextItem.id);
   const merged = existing
     ? {
diff --git a/crates/agent-gui/src/lib/chat/runner/agentRunner.ts b/crates/agent-gui/src/lib/chat/runner/agentRunner.ts
index 5d171725c..4abee108c 100644
--- a/crates/agent-gui/src/lib/chat/runner/agentRunner.ts
+++ b/crates/agent-gui/src/lib/chat/runner/agentRunner.ts
@@ -6,39 +6,26 @@ import type {
   ToolCall,
   ToolResultMessage,
 } from "@mariozechner/pi-ai";
-
+import { buildStreamRequestDebugPayload, type StreamDebugLogger } from "../../debug/agentDebug";
+import {
+  createHostedSearchEventAggregator,
+  createHostedSearchProbeId,
+  startHostedSearchFetchProbe,
+  withHostedSearchProbeHeader,
+} from "../../providers/hostedSearchEvents";
 import {
+  buildProviderAuthHeaders,
   buildProviderRequestMetadata,
   createModelFromConfig,
+  createStreamingTextReconciler,
   finalizeProviderStreamOptions,
   normalizeErrorMessage,
   resolveProviderCacheRetention,
-  toSimpleStreamReasoning,
-  streamSimpleByApi,
-  buildProviderAuthHeaders,
-  createStreamingTextReconciler,
   type StreamOptionsEx,
+  streamSimpleByApi,
+  toSimpleStreamReasoning,
 } from "../../providers/llm";
-import {
-  createHostedSearchProbeId,
-  createHostedSearchEventAggregator,
-  startHostedSearchFetchProbe,
-  withHostedSearchProbeHeader,
-} from "../../providers/hostedSearchEvents";
-import {
-  appendHostedSearchBlocksToAssistant,
-  mergeHostedSearchBlocks,
-  type HostedSearchBlock,
-  type HostedSearchOrderedBlock,
-} from "../messages/hostedSearch";
-import {
-  createDeferredProviderNativeWebSearchStatus,
-  resolveProviderNativeWebSearchStatus,
-} from "../search/providerNativeSearchStatus";
-import {
-  buildStreamRequestDebugPayload,
-  type StreamDebugLogger,
-} from "../../debug/agentDebug";
+import { prepareProxyRequest } from "../../providers/proxy";
 import type {
   CodexRequestFormat,
   ProviderId,
@@ -46,20 +33,26 @@ import type {
   ReasoningLevel,
 } from "../../settings";
 import { withPowerActivity } from "../../system/powerActivity";
-
-import { prepareProxyRequest } from "../../providers/proxy";
-import { summarizeToolCall } from "../messages/uiMessages";
-import { recoverAssistantSeedToolCalls } from "./seedToolCalls";
 import { sanitizeContextForModelRequest } from "../context/requestContextSanitizer";
 import { buildMemoryToolsSuffixSection } from "../memory/memoryPolicy";
 import {
-  createSubagentScheduler,
-  type SubagentScheduler,
-} from "../subagent/subagentScheduler";
+  appendHostedSearchBlocksToAssistant,
+  type HostedSearchBlock,
+  type HostedSearchOrderedBlock,
+  mergeHostedSearchBlocks,
+} from "../messages/hostedSearch";
+import { summarizeToolCall } from "../messages/uiMessages";
+import {
+  createDeferredProviderNativeWebSearchStatus,
+  resolveProviderNativeWebSearchStatus,
+} from "../search/providerNativeSearchStatus";
+import { createSubagentScheduler, type SubagentScheduler } from "../subagent/subagentScheduler";
+import { recoverAssistantSeedToolCalls } from "./seedToolCalls";
 
-function createLinkedAbortSignal(
-  signals: Array<AbortSignal | undefined>,
-): { signal?: AbortSignal; cleanup: () => void } {
+function createLinkedAbortSignal(signals: Array<AbortSignal | undefined>): {
+  signal?: AbortSignal;
+  cleanup: () => void;
+} {
   const activeSignals = Array.from(
     new Set(signals.filter((signal): signal is AbortSignal => Boolean(signal))),
   );
@@ -241,10 +234,14 @@ export function buildToolsSuffix(workdir: string, availableToolNames?: readonly
         );
       }
       if (hasReadFamily) {
-        lines.push("- Do not run Bash cat/ls/find/grep to read, list, or search workspace or Skill files.");
+        lines.push(
+          "- Do not run Bash cat/ls/find/grep to read, list, or search workspace or Skill files.",
+        );
       }
       if (has("Delete")) {
-        lines.push("- Do not run Bash rm, rmdir, unlink, or find -delete for workspace or Skill files.");
+        lines.push(
+          "- Do not run Bash rm, rmdir, unlink, or find -delete for workspace or Skill files.",
+        );
       }
     }
     sections.push(lines.join("\n"));
@@ -279,10 +276,10 @@ export function buildToolsSuffix(workdir: string, availableToolNames?: readonly
         "- Bash.cwd is relative to the selected Bash root.",
         '- `Bash.cwd` follows the `root` rules in **Workspace & Paths**. The canonical form for running a Skill script is `root="skills"` with `cwd="<skill-name>/scripts"` plus a relative command.',
         '- To run installed Skill scripts, use root="skills" with cwd="<skill-name>/scripts".',
-        '- The alternative form — passing an absolute path inside the command (e.g. `python ~/.liveagent/skills/<skill-name>/scripts/foo.py`) — is also accepted as long as the referenced Skill is enabled in this conversation. Both forms run the same script; prefer the canonical form for clarity, but you do not need to retry just to switch forms.',
+        "- The alternative form — passing an absolute path inside the command (e.g. `python ~/.liveagent/skills/<skill-name>/scripts/foo.py`) — is also accepted as long as the referenced Skill is enabled in this conversation. Both forms run the same script; prefer the canonical form for clarity, but you do not need to retry just to switch forms.",
         "- For endpoint tests with curl, include an explicit timeout such as `--max-time 30` so a stalled local server or upstream request cannot hold the whole turn indefinitely.",
         "- Background commands using `&` must redirect stdout and stderr to a log file before detaching, for example `nohup command > /tmp/liveagent-task.log 2>&1 < /dev/null &`; otherwise use a dedicated terminal or managed process workflow for dev servers/watchers.",
-        "- For reading, listing, or searching Skill content, always use Read/List/Glob/Grep with `root=\"skills\"` — Bash `cat`/`ls`/`find`/`grep`/`rg`/`sed`/`awk` against `~/.liveagent/skills` is still routed back to the file tools.",
+        '- For reading, listing, or searching Skill content, always use Read/List/Glob/Grep with `root="skills"` — Bash `cat`/`ls`/`find`/`grep`/`rg`/`sed`/`awk` against `~/.liveagent/skills` is still routed back to the file tools.',
         "- Do not guess `skills/` paths inside the workspace; if a Skill is needed, enable it in the chat Skills selector first.",
         "- Do not cd into ~/.liveagent/skills or workspace skills/ guesses.",
       ].join("\n"),
@@ -319,7 +316,7 @@ export function buildToolsSuffix(workdir: string, availableToolNames?: readonly
       [
         "## ManagedProcess",
         '- Use ManagedProcess(action="start") for dev servers, preview servers, watchers, or other long-running foreground commands that should continue while you run tests.',
-        '- Do not append `&` to ManagedProcess.command. It starts the process in the background, redirects stdout/stderr to a log file, and returns process_id/pid/log_path.',
+        "- Do not append `&` to ManagedProcess.command. It starts the process in the background, redirects stdout/stderr to a log file, and returns process_id/pid/log_path.",
         '- Use ManagedProcess(action="status") to inspect running processes, action="read_log" to inspect recent output, and action="stop" to terminate the process tree.',
         "- Prefer ManagedProcess over Bash for `pnpm dev`, `deno run main.ts`, `vite`, file watchers, local web servers, or commands that otherwise require `nohup` and log redirection.",
       ].join("\n"),
@@ -518,10 +515,7 @@ function getParallelToolBatchStatus(batch: ParallelToolBatch) {
   return `正在并行执行 ${batch.toolCalls.length} 个 ${batch.toolName} 调用...`;
 }
 
-function toMessageToolResult(
-  message: Message,
-  toolCall: ToolCall,
-): ToolResultMessage {
+function toMessageToolResult(message: Message, toolCall: ToolCall): ToolResultMessage {
   if (message.role === "toolResult") return message;
   return {
     role: "toolResult",
@@ -534,12 +528,10 @@ function toMessageToolResult(
   };
 }
 
-type TurnContextOverride =
-  | {
-      context: Context;
-      emittedMessages: Message[];
-    }
-  | null;
+type TurnContextOverride = {
+  context: Context;
+  emittedMessages: Message[];
+} | null;
 
 type ToolExecutionEventContext = {
   parentToolCall: ToolCall;
@@ -563,9 +555,9 @@ function getMessagesSinceBaseline(agent: Agent | null, baselineIndex: number): M
 
 function findLastAssistantMessage(messages: Message[]): AssistantMessage | null {
   return (
-    [...messages].reverse().find(
-      (message): message is AssistantMessage => message.role === "assistant",
-    ) ?? null
+    [...messages]
+      .reverse()
+      .find((message): message is AssistantMessage => message.role === "assistant") ?? null
   );
 }
 
@@ -606,13 +598,10 @@ export async function runAssistantWithTools(params: {
     runtimeContext: Context;
     emittedMessages: Message[];
     signal?: AbortSignal;
-  }) => Promise<
-    | {
-        context: Context;
-        emittedMessages: Message[];
-      }
-    | null
-  >;
+  }) => Promise<{
+    context: Context;
+    emittedMessages: Message[];
+  } | null>;
   onToolStatus?: (status: string | null) => void;
   signal?: AbortSignal;
   debugLogger?: StreamDebugLogger;
@@ -701,10 +690,7 @@ export async function runAssistantWithTools(params: {
               },
               emitToolResult: (emittedToolCall, emittedToolResult) => {
                 toolCallsById.set(emittedToolCall.id, emittedToolCall);
-                toolResultErrorFlags.set(
-                  emittedToolCall.id,
-                  Boolean(emittedToolResult.isError),
-                );
+                toolResultErrorFlags.set(emittedToolCall.id, Boolean(emittedToolResult.isError));
                 params.onToolResult?.(emittedToolCall, emittedToolResult, currentRound);
               },
               emitToolStatus: (status) => params.onToolStatus?.(status),
@@ -745,10 +731,7 @@ export async function runAssistantWithTools(params: {
       };
     };
 
-    const startParallelToolBatchIfNeeded = (
-      batchKey: string,
-      signal?: AbortSignal,
-    ) => {
+    const startParallelToolBatchIfNeeded = (batchKey: string, signal?: AbortSignal) => {
       const batch = parallelToolBatches.get(batchKey);
       if (!batch || batch.started) return batch;
 
@@ -796,13 +779,11 @@ export async function runAssistantWithTools(params: {
     let latestAgentEndMessages: Message[] = [];
     let agentTools: AgentTool<any>[] = [];
     const pendingRecoveredSeedTurnRef: {
-      current:
-        | {
-            round: number;
-            assistant: AssistantMessage;
-            toolCalls: ToolCall[];
-          }
-        | null;
+      current: {
+        round: number;
+        assistant: AssistantMessage;
+        toolCalls: ToolCall[];
+      } | null;
     } = {
       current: null,
     };
@@ -1035,343 +1016,333 @@ export async function runAssistantWithTools(params: {
       },
     }));
 
-  let streamRound = 0;
-  const streamFn = (streamModel: typeof model, streamContext: Context, options?: any) => {
-    const round = ++streamRound;
-    const stateMessages = getAgentMessages(agent);
-    const effectiveContext = sanitizeContextForModelRequest({
-      ...streamContext,
-      systemPrompt:
-        typeof currentSystemPrompt === "string"
-          ? currentSystemPrompt
-          : streamContext.systemPrompt,
-      messages: stateMessages.slice(),
-      tools:
-        streamContext.tools ??
-        ((agent?.state.tools as Context["tools"] | undefined) ?? llmTools),
-    });
-    const fallbackReasoning =
-      params.providerId === "claude_code" || params.providerId === "gemini"
-        ? toSimpleStreamReasoning(params.runtime.reasoning)
-        : streamModel.api === "openai-responses" || streamModel.api === "openai-completions"
+    let streamRound = 0;
+    const streamFn = (streamModel: typeof model, streamContext: Context, options?: any) => {
+      const round = ++streamRound;
+      const stateMessages = getAgentMessages(agent);
+      const effectiveContext = sanitizeContextForModelRequest({
+        ...streamContext,
+        systemPrompt:
+          typeof currentSystemPrompt === "string"
+            ? currentSystemPrompt
+            : streamContext.systemPrompt,
+        messages: stateMessages.slice(),
+        tools:
+          streamContext.tools ?? (agent?.state.tools as Context["tools"] | undefined) ?? llmTools,
+      });
+      const fallbackReasoning =
+        params.providerId === "claude_code" || params.providerId === "gemini"
           ? toSimpleStreamReasoning(params.runtime.reasoning)
-          : undefined;
-    const shouldProbeHostedSearch = Boolean(nativeWebSearchStatus);
-    const hostedSearchProbeId = shouldProbeHostedSearch
-      ? createHostedSearchProbeId(params.providerId)
-      : undefined;
-    let streamOptions: StreamOptionsEx = {
-      ...(options ?? {}),
-      apiKey: options?.apiKey ?? params.runtime.apiKey,
-      headers: withHostedSearchProbeHeader(
-        {
-          ...(options?.headers ?? {}),
-          ...proxyRequest.headers,
-        },
-        hostedSearchProbeId,
-      ),
-      signal: options?.signal,
-      sessionId: options?.sessionId ?? params.sessionId,
-      cacheRetention:
-        options?.cacheRetention ??
-        resolveProviderCacheRetention(
-          params.providerId,
-          params.runtime.promptCachingEnabled,
+          : streamModel.api === "openai-responses" || streamModel.api === "openai-completions"
+            ? toSimpleStreamReasoning(params.runtime.reasoning)
+            : undefined;
+      const shouldProbeHostedSearch = Boolean(nativeWebSearchStatus);
+      const hostedSearchProbeId = shouldProbeHostedSearch
+        ? createHostedSearchProbeId(params.providerId)
+        : undefined;
+      let streamOptions: StreamOptionsEx = {
+        ...(options ?? {}),
+        apiKey: options?.apiKey ?? params.runtime.apiKey,
+        headers: withHostedSearchProbeHeader(
+          {
+            ...(options?.headers ?? {}),
+            ...proxyRequest.headers,
+          },
+          hostedSearchProbeId,
         ),
-      metadata: buildProviderRequestMetadata(params.providerId, params.sessionId),
-      toolChoice:
-        options?.toolChoice ??
-        (effectiveContext.tools?.length ? "auto" : undefined),
-      reasoning: normalizeStreamReasoning(options?.reasoning) ?? fallbackReasoning,
-    };
+        signal: options?.signal,
+        sessionId: options?.sessionId ?? params.sessionId,
+        cacheRetention:
+          options?.cacheRetention ??
+          resolveProviderCacheRetention(params.providerId, params.runtime.promptCachingEnabled),
+        metadata: buildProviderRequestMetadata(params.providerId, params.sessionId),
+        toolChoice: options?.toolChoice ?? (effectiveContext.tools?.length ? "auto" : undefined),
+        reasoning: normalizeStreamReasoning(options?.reasoning) ?? fallbackReasoning,
+      };
 
-    streamOptions = finalizeProviderStreamOptions({
-      providerId: params.providerId,
-      baseUrl: params.runtime.baseUrl,
-      options: streamOptions,
-      context: effectiveContext,
-      model: streamModel,
-      workdir: params.workdir,
-      nativeWebSearch: params.nativeWebSearch,
-      debugLogger: params.debugLogger,
-      extra: {
-        round,
+      streamOptions = finalizeProviderStreamOptions({
+        providerId: params.providerId,
+        baseUrl: params.runtime.baseUrl,
+        options: streamOptions,
+        context: effectiveContext,
+        model: streamModel,
+        workdir: params.workdir,
+        nativeWebSearch: params.nativeWebSearch,
+        debugLogger: params.debugLogger,
+        extra: {
+          round,
+          sessionId: params.sessionId,
+        },
+      });
+
+      const hostedSearchAggregator = createHostedSearchEventAggregator({
+        providerId: params.providerId,
+        onHostedSearch: (hostedSearch) => {
+          if (hostedSearch.status === "searching") {
+            nativeWebSearchStatusController.schedule();
+          } else {
+            nativeWebSearchStatusController.pause();
+          }
+          upsertHostedSearchBlockForRound(round, hostedSearch);
+          upsertHostedSearchOrderedBlockForRound(round, hostedSearch);
+          params.onHostedSearch?.(hostedSearch, round);
+        },
+      });
+      const hostedSearchProbe = startHostedSearchFetchProbe({
+        providerId: params.providerId,
         sessionId: params.sessionId,
-      },
-    });
+        requestId: hostedSearchProbeId,
+        enabled: shouldProbeHostedSearch,
+        onRawEvent: hostedSearchAggregator.accept,
+      });
+      hostedSearchProbeByRound.set(round, {
+        finishProbe: hostedSearchProbe.finish,
+        completeAggregator: hostedSearchAggregator.complete,
+        failAggregator: hostedSearchAggregator.fail,
+        disposeAggregator: hostedSearchAggregator.dispose,
+      });
 
-    const hostedSearchAggregator = createHostedSearchEventAggregator({
-      providerId: params.providerId,
-      onHostedSearch: (hostedSearch) => {
-        if (hostedSearch.status === "searching") {
-          nativeWebSearchStatusController.schedule();
-        } else {
-          nativeWebSearchStatusController.pause();
-        }
-        upsertHostedSearchBlockForRound(round, hostedSearch);
-        upsertHostedSearchOrderedBlockForRound(round, hostedSearch);
-        params.onHostedSearch?.(hostedSearch, round);
+      params.debugLogger?.logRequest(
+        buildStreamRequestDebugPayload({
+          runtime: params.runtime,
+          context: effectiveContext,
+          options: streamOptions,
+          round,
+        }),
+      );
+
+      return streamSimpleByApi(streamModel, effectiveContext, streamOptions);
+    };
+
+    agent = new Agent({
+      initialState: {
+        systemPrompt: buildSystemPrompt(currentSystemPrompt, toolsSuffix),
+        model,
+        thinkingLevel,
+        tools: agentTools,
+        messages: params.context.messages.slice(),
       },
-    });
-    const hostedSearchProbe = startHostedSearchFetchProbe({
-      providerId: params.providerId,
       sessionId: params.sessionId,
-      requestId: hostedSearchProbeId,
-      enabled: shouldProbeHostedSearch,
-      onRawEvent: hostedSearchAggregator.accept,
-    });
-    hostedSearchProbeByRound.set(round, {
-      finishProbe: hostedSearchProbe.finish,
-      completeAggregator: hostedSearchAggregator.complete,
-      failAggregator: hostedSearchAggregator.fail,
-      disposeAggregator: hostedSearchAggregator.dispose,
-    });
-
-    params.debugLogger?.logRequest(
-      buildStreamRequestDebugPayload({
-        runtime: params.runtime,
-        context: effectiveContext,
-        options: streamOptions,
-        round,
+      streamFn,
+      toolExecution: "sequential",
+      afterToolCall: async ({ toolCall }) => ({
+        isError: toolResultErrorFlags.get(toolCall.id) ?? false,
       }),
-    );
-
-    return streamSimpleByApi(streamModel, effectiveContext, streamOptions);
-  };
+      beforeToolCall: async ({ assistantMessage, toolCall }) => {
+        toolCallsById.set(toolCall.id, toolCall);
+        if (toolCall.name !== "Agent") {
+          return undefined;
+        }
+        const group = findConsecutiveToolGroup(assistantMessage, toolCall.id, toolCall.name);
+        if (!group || group.length <= 1) return undefined;
 
-  agent = new Agent({
-    initialState: {
-      systemPrompt: buildSystemPrompt(currentSystemPrompt, toolsSuffix),
-      model,
-      thinkingLevel,
-      tools: agentTools,
-      messages: params.context.messages.slice(),
-    },
-    sessionId: params.sessionId,
-    streamFn,
-    toolExecution: "sequential",
-    afterToolCall: async ({ toolCall }) => ({
-      isError: toolResultErrorFlags.get(toolCall.id) ?? false,
-    }),
-    beforeToolCall: async ({ assistantMessage, toolCall }) => {
-      toolCallsById.set(toolCall.id, toolCall);
-      if (toolCall.name !== "Agent") {
+        const batchKey = buildParallelToolBatchKey(group);
+        if (!parallelToolBatches.has(batchKey)) {
+          parallelToolBatches.set(batchKey, {
+            toolName: toolCall.name,
+            toolCalls: group,
+            started: false,
+            announced: false,
+            resultPromises: new Map(),
+          });
+        }
+        for (const call of group) {
+          parallelBatchKeyByToolCallId.set(call.id, batchKey);
+        }
         return undefined;
-      }
-      const group = findConsecutiveToolGroup(
-        assistantMessage,
-        toolCall.id,
-        toolCall.name,
-      );
-      if (!group || group.length <= 1) return undefined;
+      },
+      transformContext: async (_messages, _signal) => {
+        const override = await consumePendingTurnOverride();
+        if (override) {
+          applyTurnContextOverride(override);
+        }
+        return getAgentMessages(agent).slice();
+      },
+    });
 
-      const batchKey = buildParallelToolBatchKey(group);
-      if (!parallelToolBatches.has(batchKey)) {
-        parallelToolBatches.set(batchKey, {
-          toolName: toolCall.name,
-          toolCalls: group,
-          started: false,
-          announced: false,
-          resultPromises: new Map(),
-        });
-      }
-      for (const call of group) {
-        parallelBatchKeyByToolCallId.set(call.id, batchKey);
-      }
-      return undefined;
-    },
-    transformContext: async (_messages, _signal) => {
-      const override = await consumePendingTurnOverride();
-      if (override) {
-        applyTurnContextOverride(override);
-      }
-      return getAgentMessages(agent).slice();
-    },
-  });
+    const textReconciler = createStreamingTextReconciler();
 
-  const textReconciler = createStreamingTextReconciler();
-
-  const unsubscribe = agent.subscribe((event) => {
-    switch (event.type) {
-      case "turn_start":
-        currentRound += 1;
-        params.onTurnStart?.(currentRound);
-        params.onToolStatus?.(`第 ${currentRound} 轮：模型生成中...`);
-        break;
-      case "message_update": {
-        const streamEvent = event.assistantMessageEvent;
-        if (streamEvent.type === "text_delta") {
-          nativeWebSearchStatusController.noteVisibleActivity();
-          const delta = textReconciler.appendDelta(
-            `${currentRound}:${streamEvent.contentIndex}`,
-            streamEvent.delta,
-          );
-          if (delta) {
-            appendHostedSearchOrderedTextForRound(currentRound, delta);
-            params.onTextDelta(delta, currentRound);
-          }
-        } else if (streamEvent.type === "text_end") {
-          const delta = textReconciler.reconcileFinalText(
-            `${currentRound}:${streamEvent.contentIndex}`,
-            streamEvent.content,
-          );
-          nativeWebSearchStatusController.pause();
-          if (delta) {
-            appendHostedSearchOrderedTextForRound(currentRound, delta);
-            params.onTextDelta(delta, currentRound);
-          }
-        } else if (streamEvent.type === "thinking_delta") {
-          nativeWebSearchStatusController.noteVisibleActivity();
-          params.onThinkingDelta?.(streamEvent.delta, currentRound);
-        } else if (streamEvent.type === "thinking_end") {
-          nativeWebSearchStatusController.pause();
-        } else if (streamEvent.type === "toolcall_start") {
-          nativeWebSearchStatusController.pause();
-          const block = streamEvent.partial.content[streamEvent.contentIndex];
-          if (block && block.type === "toolCall") {
-            toolCallsById.set(block.id, block);
-            params.onToolCall?.(block, currentRound);
+    const unsubscribe = agent.subscribe((event) => {
+      switch (event.type) {
+        case "turn_start":
+          currentRound += 1;
+          params.onTurnStart?.(currentRound);
+          params.onToolStatus?.(`第 ${currentRound} 轮：模型生成中...`);
+          break;
+        case "message_update": {
+          const streamEvent = event.assistantMessageEvent;
+          if (streamEvent.type === "text_delta") {
+            nativeWebSearchStatusController.noteVisibleActivity();
+            const delta = textReconciler.appendDelta(
+              `${currentRound}:${streamEvent.contentIndex}`,
+              streamEvent.delta,
+            );
+            if (delta) {
+              appendHostedSearchOrderedTextForRound(currentRound, delta);
+              params.onTextDelta(delta, currentRound);
+            }
+          } else if (streamEvent.type === "text_end") {
+            const delta = textReconciler.reconcileFinalText(
+              `${currentRound}:${streamEvent.contentIndex}`,
+              streamEvent.content,
+            );
+            nativeWebSearchStatusController.pause();
+            if (delta) {
+              appendHostedSearchOrderedTextForRound(currentRound, delta);
+              params.onTextDelta(delta, currentRound);
+            }
+          } else if (streamEvent.type === "thinking_delta") {
+            nativeWebSearchStatusController.noteVisibleActivity();
+            params.onThinkingDelta?.(streamEvent.delta, currentRound);
+          } else if (streamEvent.type === "thinking_end") {
+            nativeWebSearchStatusController.pause();
+          } else if (streamEvent.type === "toolcall_start") {
+            nativeWebSearchStatusController.pause();
+            const block = streamEvent.partial.content[streamEvent.contentIndex];
+            if (block && block.type === "toolCall") {
+              toolCallsById.set(block.id, block);
+              params.onToolCall?.(block, currentRound);
+            }
+          } else if (streamEvent.type === "toolcall_end") {
+            nativeWebSearchStatusController.pause();
+            toolCallsById.set(streamEvent.toolCall.id, streamEvent.toolCall);
+            params.onToolCall?.(streamEvent.toolCall, currentRound);
           }
-        } else if (streamEvent.type === "toolcall_end") {
-          nativeWebSearchStatusController.pause();
-          toolCallsById.set(streamEvent.toolCall.id, streamEvent.toolCall);
-          params.onToolCall?.(streamEvent.toolCall, currentRound);
+          break;
         }
-        break;
-      }
-      case "message_end":
-        if (event.message.role === "assistant") {
-          const hostedSearchFinishMode =
-            event.message.stopReason === "aborted"
-              ? "dispose"
-              : event.message.stopReason === "error"
-                ? "failed"
-                : "completed";
-          const hostedSearchBlocks = getHostedSearchBlocksForRound(currentRound);
-          const assistantWithHostedSearch = applyHostedSearchBlocksToAssistant(
-            event.message as AssistantMessage,
-            currentRound,
-            hostedSearchBlocks,
-          );
-          const normalizedSeedTurn = recoverAssistantSeedToolCalls(assistantWithHostedSearch);
-          const assistantMessage = normalizedSeedTurn?.assistant ?? assistantWithHostedSearch;
-          if (normalizedSeedTurn || assistantWithHostedSearch !== event.message) {
-            const stateMessages = getAgentMessages(agent);
-            if (stateMessages.length > 0) {
-              agent.state.messages = [...stateMessages.slice(0, -1), assistantMessage];
+        case "message_end":
+          if (event.message.role === "assistant") {
+            const hostedSearchFinishMode =
+              event.message.stopReason === "aborted"
+                ? "dispose"
+                : event.message.stopReason === "error"
+                  ? "failed"
+                  : "completed";
+            const hostedSearchBlocks = getHostedSearchBlocksForRound(currentRound);
+            const assistantWithHostedSearch = applyHostedSearchBlocksToAssistant(
+              event.message as AssistantMessage,
+              currentRound,
+              hostedSearchBlocks,
+            );
+            const normalizedSeedTurn = recoverAssistantSeedToolCalls(assistantWithHostedSearch);
+            const assistantMessage = normalizedSeedTurn?.assistant ?? assistantWithHostedSearch;
+            if (normalizedSeedTurn || assistantWithHostedSearch !== event.message) {
+              const stateMessages = getAgentMessages(agent);
+              if (stateMessages.length > 0) {
+                agent.state.messages = [...stateMessages.slice(0, -1), assistantMessage];
+              }
             }
-          }
-          if (normalizedSeedTurn && normalizedSeedTurn.toolCalls.length > 0) {
-            pendingRecoveredSeedTurnRef.current = {
+            if (normalizedSeedTurn && normalizedSeedTurn.toolCalls.length > 0) {
+              pendingRecoveredSeedTurnRef.current = {
+                round: currentRound,
+                assistant: assistantMessage,
+                toolCalls: normalizedSeedTurn.toolCalls,
+              };
+              params.debugLogger?.logResponse({
+                type: "seed_tool_call_recovery",
+                round: currentRound,
+                toolCalls: normalizedSeedTurn.toolCalls,
+              });
+            }
+            queueHostedSearchFinalization(currentRound, hostedSearchFinishMode, {
+              current: assistantMessage,
+            });
+            params.debugLogger?.logResult({
               round: currentRound,
               assistant: assistantMessage,
-              toolCalls: normalizedSeedTurn.toolCalls,
+            });
+            const toolCallCount = getAssistantToolCalls(assistantMessage).length;
+            if (toolCallCount > 0) {
+              nativeWebSearchStatusController.pause();
+              params.onToolStatus?.(`第 ${currentRound} 轮：准备执行 ${toolCallCount} 个工具...`);
+            }
+            params.onAssistantMessage?.(assistantMessage, currentRound);
+          } else if (event.message.role === "toolResult") {
+            const toolCall =
+              toolCallsById.get(event.message.toolCallId) ??
+              toSyntheticToolCall({
+                id: event.message.toolCallId,
+                name: event.message.toolName,
+              });
+            params.onToolResult?.(toolCall, event.message, currentRound);
+          }
+          break;
+        case "turn_end": {
+          const toolResults = event.toolResults.filter(
+            (message): message is ToolResultMessage => message.role === "toolResult",
+          );
+          if (
+            params.onBeforeNextTurn &&
+            event.message.role === "assistant" &&
+            event.message.stopReason === "toolUse" &&
+            toolResults.length > 0
+          ) {
+            const runtimeMessages = getAgentMessages(agent);
+            const runtimeSnapshot: Context = {
+              systemPrompt: currentSystemPrompt,
+              messages: runtimeMessages.slice(),
+              tools: llmTools,
             };
-            params.debugLogger?.logResponse({
-              type: "seed_tool_call_recovery",
+            const emittedSnapshot = getMessagesSinceBaseline(agent, emittedBaselineIndex);
+            const assistant = event.message;
+            pendingTurnOverridePromise = params.onBeforeNextTurn({
               round: currentRound,
-              toolCalls: normalizedSeedTurn.toolCalls,
+              assistant,
+              toolResults,
+              runtimeContext: runtimeSnapshot,
+              emittedMessages: emittedSnapshot,
+              signal: params.signal,
             });
           }
-          queueHostedSearchFinalization(currentRound, hostedSearchFinishMode, {
-            current: assistantMessage,
-          });
-          params.debugLogger?.logResult({
-            round: currentRound,
-            assistant: assistantMessage,
-          });
-          const toolCallCount = getAssistantToolCalls(assistantMessage).length;
-          if (toolCallCount > 0) {
-            nativeWebSearchStatusController.pause();
-            params.onToolStatus?.(`第 ${currentRound} 轮：准备执行 ${toolCallCount} 个工具...`);
-          }
-          params.onAssistantMessage?.(assistantMessage, currentRound);
-        } else if (event.message.role === "toolResult") {
+          break;
+        }
+        case "tool_execution_start": {
+          nativeWebSearchStatusController.pause();
           const toolCall =
-            toolCallsById.get(event.message.toolCallId) ??
+            toolCallsById.get(event.toolCallId) ??
             toSyntheticToolCall({
-              id: event.message.toolCallId,
-              name: event.message.toolName,
+              id: event.toolCallId,
+              name: event.toolName,
+              arguments: event.args ?? {},
             });
-          params.onToolResult?.(toolCall, event.message, currentRound);
-        }
-        break;
-      case "turn_end": {
-        const toolResults = event.toolResults.filter(
-          (message): message is ToolResultMessage => message.role === "toolResult",
-        );
-        if (
-          params.onBeforeNextTurn &&
-          event.message.role === "assistant" &&
-          event.message.stopReason === "toolUse" &&
-          toolResults.length > 0
-        ) {
-          const runtimeMessages = getAgentMessages(agent);
-          const runtimeSnapshot: Context = {
-            systemPrompt: currentSystemPrompt,
-            messages: runtimeMessages.slice(),
-            tools: llmTools,
-          };
-          const emittedSnapshot = getMessagesSinceBaseline(agent, emittedBaselineIndex);
-          const assistant = event.message;
-          pendingTurnOverridePromise = params.onBeforeNextTurn({
-            round: currentRound,
-            assistant,
-            toolResults,
-            runtimeContext: runtimeSnapshot,
-            emittedMessages: emittedSnapshot,
-            signal: params.signal,
-          });
-        }
-        break;
-      }
-      case "tool_execution_start": {
-        nativeWebSearchStatusController.pause();
-        const toolCall =
-          toolCallsById.get(event.toolCallId) ??
-          toSyntheticToolCall({
-            id: event.toolCallId,
-            name: event.toolName,
-            arguments: event.args ?? {},
-          });
-        toolCallsById.set(toolCall.id, toolCall);
-        const parallelBatch = getParallelToolBatch(
-          toolCall.id,
-          parallelBatchKeyByToolCallId,
-          parallelToolBatches,
-        );
-        if (parallelBatch && parallelBatch.toolCalls.length > 1) {
-          params.onToolStatus?.(getParallelToolBatchStatus(parallelBatch));
-        } else {
-          params.onToolStatus?.(`正在执行：${summarizeToolCall(toolCall)}`);
+          toolCallsById.set(toolCall.id, toolCall);
+          const parallelBatch = getParallelToolBatch(
+            toolCall.id,
+            parallelBatchKeyByToolCallId,
+            parallelToolBatches,
+          );
+          if (parallelBatch && parallelBatch.toolCalls.length > 1) {
+            params.onToolStatus?.(getParallelToolBatchStatus(parallelBatch));
+          } else {
+            params.onToolStatus?.(`正在执行：${summarizeToolCall(toolCall)}`);
+          }
+          params.onToolExecutionStart?.(toolCall, currentRound);
+          break;
         }
-        params.onToolExecutionStart?.(toolCall, currentRound);
-        break;
+        case "agent_end":
+          latestAgentEndMessages = event.messages as Message[];
+          {
+            const assistant = findLastAssistantMessage(latestAgentEndMessages);
+            const hostedSearchFinishMode =
+              assistant?.stopReason === "aborted"
+                ? "dispose"
+                : assistant?.stopReason === "error"
+                  ? "failed"
+                  : "completed";
+            queueAllHostedSearchFinalizations(hostedSearchFinishMode);
+          }
+          nativeWebSearchStatusController.finish();
+          params.onToolStatus?.(null);
+          break;
       }
-      case "agent_end":
-        latestAgentEndMessages = event.messages as Message[];
-        {
-          const assistant = findLastAssistantMessage(latestAgentEndMessages);
-          const hostedSearchFinishMode =
-            assistant?.stopReason === "aborted"
-              ? "dispose"
-              : assistant?.stopReason === "error"
-                ? "failed"
-                : "completed";
-          queueAllHostedSearchFinalizations(hostedSearchFinishMode);
-        }
-        nativeWebSearchStatusController.finish();
-        params.onToolStatus?.(null);
-        break;
-    }
-  });
+    });
 
-  let abortListener: (() => void) | undefined;
-  if (params.signal) {
-    const onAbort = () => agent.abort();
-    params.signal.addEventListener("abort", onAbort, { once: true });
-    abortListener = () => params.signal?.removeEventListener("abort", onAbort);
-  }
+    let abortListener: (() => void) | undefined;
+    if (params.signal) {
+      const onAbort = () => agent.abort();
+      params.signal.addEventListener("abort", onAbort, { once: true });
+      abortListener = () => params.signal?.removeEventListener("abort", onAbort);
+    }
 
     try {
       let recoveredSeedTurnCount = 0;
diff --git a/crates/agent-gui/src/lib/chat/runner/seedToolCalls.ts b/crates/agent-gui/src/lib/chat/runner/seedToolCalls.ts
index f0dc1f81b..bbbe882b3 100644
--- a/crates/agent-gui/src/lib/chat/runner/seedToolCalls.ts
+++ b/crates/agent-gui/src/lib/chat/runner/seedToolCalls.ts
@@ -1,7 +1,6 @@
 import type { AssistantMessage, ToolCall } from "@mariozechner/pi-ai";
 
-const SEED_TOOL_CALL_DISPLAY_PATTERN =
-  /<seed:tool_call>[\s\S]*?(?:<\/seed:tool_call>|$)/gi;
+const SEED_TOOL_CALL_DISPLAY_PATTERN = /<seed:tool_call>[\s\S]*?(?:<\/seed:tool_call>|$)/gi;
 const FUNCTION_PATTERN = /<function\b([^>]*)>([\s\S]*?)(?:<\/function>|$)/i;
 const PARAMETER_PATTERN =
   /<parameter\b([^>]*)>([\s\S]*?)(?:<\/parameter>|(?=<parameter\b|<\/function>|$))/gi;
@@ -38,7 +37,7 @@ function decodeXmlEntities(value: string) {
   return value
     .replace(/&lt;/g, "<")
     .replace(/&gt;/g, ">")
-    .replace(/&quot;/g, "\"")
+    .replace(/&quot;/g, '"')
     .replace(/&apos;/g, "'")
     .replace(/&amp;/g, "&");
 }
@@ -89,7 +88,7 @@ function coerceSeedParameterValue(value: string, attributes: Map<string, string>
   if (/^null$/i.test(decoded)) {
     return null;
   }
-  if (/^[\[{][\s\S]*[\]}]$/.test(decoded)) {
+  if (/^[[{][\s\S]*[\]}]$/.test(decoded)) {
     try {
       return JSON.parse(decoded);
     } catch {
@@ -169,8 +168,9 @@ function parseDsmlToolCallMarkup(markup: string): ToolCall[] {
 }
 
 function hasRecoverableToolCallMarkup(text: string) {
-  return text.includes("<seed:tool_call>") ||
-    (text.includes("DSML") && text.includes("tool_calls"));
+  return (
+    text.includes("<seed:tool_call>") || (text.includes("DSML") && text.includes("tool_calls"))
+  );
 }
 
 function recoverToolCallsFromBlockText(text: string) {
@@ -204,9 +204,7 @@ export function stripSeedToolCallMarkup(text: string) {
     return text;
   }
   return cleanRecoveredText(
-    text
-      .replace(SEED_TOOL_CALL_DISPLAY_PATTERN, "")
-      .replace(DSML_TOOL_CALL_DISPLAY_PATTERN, ""),
+    text.replace(SEED_TOOL_CALL_DISPLAY_PATTERN, "").replace(DSML_TOOL_CALL_DISPLAY_PATTERN, ""),
   );
 }
 
@@ -220,8 +218,7 @@ export function recoverAssistantSeedToolCalls(
   const nextContent: AssistantMessage["content"] = [];
   const seenComparableToolCalls = new Set(
     existingStructuredToolCalls.map(
-      (toolCall) =>
-        `${toolCall.name}:${stableStringifyComparable(toolCall.arguments ?? {})}`,
+      (toolCall) => `${toolCall.name}:${stableStringifyComparable(toolCall.arguments ?? {})}`,
     ),
   );
   let changed = false;
diff --git a/crates/agent-gui/src/lib/chat/subagent/subagentHistory.ts b/crates/agent-gui/src/lib/chat/subagent/subagentHistory.ts
index 02364bbdd..d1da08f06 100644
--- a/crates/agent-gui/src/lib/chat/subagent/subagentHistory.ts
+++ b/crates/agent-gui/src/lib/chat/subagent/subagentHistory.ts
@@ -230,10 +230,7 @@ type SubagentRunSegmentWireRecord = {
   updatedAt: number;
 };
 
-type SubagentRunUpsertWireInput = Omit<
-  SubagentRunHistoryInput,
-  "state" | "updatedAt"
-> & {
+type SubagentRunUpsertWireInput = Omit<SubagentRunHistoryInput, "state" | "updatedAt"> & {
   contextMetaJson: string;
   activeSegmentIndex: number;
   totalSegmentCount: number;
@@ -494,9 +491,7 @@ export async function pruneSubagentRunsForConversation(input: SubagentRunPruneIn
   return invoke<SubagentRunPruneResult>("subagent_run_prune", {
     input: {
       parentConversationId,
-      keepParentToolCallIds: input.keepParentToolCallIds
-        .map((id) => id.trim())
-        .filter(Boolean),
+      keepParentToolCallIds: input.keepParentToolCallIds.map((id) => id.trim()).filter(Boolean),
     },
   });
 }
diff --git a/crates/agent-gui/src/lib/chat/subagent/subagentMessageBus.ts b/crates/agent-gui/src/lib/chat/subagent/subagentMessageBus.ts
index ff83c6c93..8c5bd84f1 100644
--- a/crates/agent-gui/src/lib/chat/subagent/subagentMessageBus.ts
+++ b/crates/agent-gui/src/lib/chat/subagent/subagentMessageBus.ts
@@ -22,7 +22,7 @@ function escapeInlineCode(value: string) {
 }
 
 function escapeInlineMarkdown(value: string) {
-  return value.replace(/[`*_{}\[\]()#+\-.!|>]/g, "\\$&");
+  return value.replace(/[`*_{}[\]()#+\-.!|>]/g, "\\$&");
 }
 
 function truncateMarkdown(value: string, maxChars: number) {
@@ -106,9 +106,7 @@ export function renderSubagentMessageBusSnapshot(params: {
     return selected;
   };
 
-  const directInbox = consume(
-    messages.filter((message) => isForAgent(message, currentAgentId)),
-  );
+  const directInbox = consume(messages.filter((message) => isForAgent(message, currentAgentId)));
   const sharedDecisions = consume(
     messages.filter((message) => message.channel === "decision" && isSharedMessage(message)),
   );
@@ -130,7 +128,12 @@ export function renderSubagentMessageBusSnapshot(params: {
 
   const appendSection = (title: string, items: SubagentMessageRecord[]) => {
     if (items.length === 0) return;
-    sections.push("", `### ${title}`, "", ...items.map((message) => renderMessage(message, maxBodyChars)).flatMap((text) => [text, ""]));
+    sections.push(
+      "",
+      `### ${title}`,
+      "",
+      ...items.map((message) => renderMessage(message, maxBodyChars)).flatMap((text) => [text, ""]),
+    );
   };
 
   appendSection(
diff --git a/crates/agent-gui/src/lib/chat/subagent/subagentRuntimeManager.ts b/crates/agent-gui/src/lib/chat/subagent/subagentRuntimeManager.ts
index 1fe77944b..e981087a4 100644
--- a/crates/agent-gui/src/lib/chat/subagent/subagentRuntimeManager.ts
+++ b/crates/agent-gui/src/lib/chat/subagent/subagentRuntimeManager.ts
@@ -1,23 +1,11 @@
 import type { Tool } from "@mariozechner/pi-ai";
-
-import {
-  normalizeConversationState,
-  type ConversationViewState,
-} from "../conversation/conversationState";
-import {
-  defaultSubagentHistoryRecorder,
-  type SubagentHistoryRecorder,
-  type SubagentIdentityRecord,
-  type SubagentRunHistoryInput,
-  type SubagentRunSummary,
-} from "./subagentHistory";
+import { parseSubagentRunState } from "../../tools/delegate/history";
 import {
   createAgentTemplateLookup,
   identitiesByLogicalAgent,
   latestRunsByLogicalAgent,
   normalizeLookupKey,
 } from "../../tools/delegate/identity";
-import { parseSubagentRunState } from "../../tools/delegate/history";
 import { normalizeSubagentRunMode } from "../../tools/delegate/input";
 import { buildSubagentSystemPrompt } from "../../tools/delegate/prompts";
 import type {
@@ -27,6 +15,17 @@ import type {
   DelegateTaskIntent,
   DelegateWorktreeInfo,
 } from "../../tools/delegate/types";
+import {
+  type ConversationViewState,
+  normalizeConversationState,
+} from "../conversation/conversationState";
+import {
+  defaultSubagentHistoryRecorder,
+  type SubagentHistoryRecorder,
+  type SubagentIdentityRecord,
+  type SubagentRunHistoryInput,
+  type SubagentRunSummary,
+} from "./subagentHistory";
 
 const DEFAULT_WARMUP_LIMIT = 16;
 const DEFAULT_WARMUP_CONCURRENCY = 2;
@@ -70,12 +69,8 @@ export type SubagentRuntimeWarmupInput = {
 
 export type SubagentRuntimeManager = {
   warmupConversation: (input: SubagentRuntimeWarmupInput) => void;
-  getHydratedState: (
-    input: SubagentRuntimeStateRequest,
-  ) => ConversationViewState | null;
-  hydrateState: (
-    input: SubagentRuntimeStateRequest,
-  ) => Promise<ConversationViewState | null>;
+  getHydratedState: (input: SubagentRuntimeStateRequest) => ConversationViewState | null;
+  hydrateState: (input: SubagentRuntimeStateRequest) => Promise<ConversationViewState | null>;
   rememberRunState: (input: SubagentRuntimeRememberInput) => void;
   invalidateConversation: (parentConversationId: string) => void;
   disposeConversation: (parentConversationId: string) => void;
@@ -111,9 +106,7 @@ function taskIntentFromIdentity(value: string | undefined): DelegateTaskIntent {
 }
 
 function applyPolicyFromIdentity(value: string | undefined): DelegateApplyPolicy {
-  return value === "none" || value === "explicit" || value === "auto"
-    ? value
-    : "none";
+  return value === "none" || value === "explicit" || value === "auto" ? value : "none";
 }
 
 function buildWarmupTask(params: {
@@ -140,9 +133,11 @@ function buildWarmupTask(params: {
   };
 }
 
-function rebaseStateMeta(params: SubagentRuntimeStateRequest & {
-  state: ConversationViewState;
-}) {
+function rebaseStateMeta(
+  params: SubagentRuntimeStateRequest & {
+    state: ConversationViewState;
+  },
+) {
   return normalizeConversationState({
     meta: {
       ...params.state.meta,
@@ -174,9 +169,7 @@ async function runWithConcurrency<T>(
     }
   }
   await Promise.all(
-    new Array(Math.min(Math.max(1, concurrency), items.length))
-      .fill(0)
-      .map(() => runLoop()),
+    new Array(Math.min(Math.max(1, concurrency), items.length)).fill(0).map(() => runLoop()),
   );
 }
 
@@ -219,12 +212,7 @@ export function createSubagentRuntimeManager(
     const parentConversationId = conversationKey(input.parentConversationId);
     if (!parentConversationId) return null;
     const entry = getEntry(parentConversationId, input.runSummary.logicalAgentId);
-    if (
-      !entry ||
-      entry.status !== "ready" ||
-      entry.runId !== input.runSummary.id ||
-      !entry.state
-    ) {
+    if (!entry || entry.status !== "ready" || entry.runId !== input.runSummary.id || !entry.state) {
       return null;
     }
     entry.updatedAt = Date.now();
diff --git a/crates/agent-gui/src/lib/chat/subagent/subagentScheduler.ts b/crates/agent-gui/src/lib/chat/subagent/subagentScheduler.ts
index d59ff8887..ccf40fcd2 100644
--- a/crates/agent-gui/src/lib/chat/subagent/subagentScheduler.ts
+++ b/crates/agent-gui/src/lib/chat/subagent/subagentScheduler.ts
@@ -1,6 +1,5 @@
 export const DEFAULT_SUBAGENT_MAX_PARALLEL_RUNS = 8;
-export const DEFAULT_AGENT_TOOL_MAX_PARALLEL_CALLS =
-  DEFAULT_SUBAGENT_MAX_PARALLEL_RUNS;
+export const DEFAULT_AGENT_TOOL_MAX_PARALLEL_CALLS = DEFAULT_SUBAGENT_MAX_PARALLEL_RUNS;
 export const DEFAULT_BASH_MAX_PARALLEL_EXECUTIONS = 4;
 
 export type SubagentSchedulerLimits = {
diff --git a/crates/agent-gui/src/lib/debug/agentDebug.ts b/crates/agent-gui/src/lib/debug/agentDebug.ts
index 79a63c2af..6a12a35a4 100644
--- a/crates/agent-gui/src/lib/debug/agentDebug.ts
+++ b/crates/agent-gui/src/lib/debug/agentDebug.ts
@@ -1,12 +1,7 @@
-import { invoke } from "@tauri-apps/api/core";
 import type { Context } from "@mariozechner/pi-ai";
+import { invoke } from "@tauri-apps/api/core";
 
-import type {
-  CodexRequestFormat,
-  ExecutionMode,
-  ProviderId,
-  ReasoningLevel,
-} from "../settings";
+import type { CodexRequestFormat, ExecutionMode, ProviderId, ReasoningLevel } from "../settings";
 
 type DebugLineType = "request" | "result" | "error";
 
@@ -79,9 +74,7 @@ function sanitizeDebugValue(value: unknown, seen = new WeakSet<object>()): unkno
       typeof sourceData === "string" &&
       typeof sourceMimeType === "string";
     const isTextDocumentSource =
-      record.type === "text" &&
-      sourceMimeType === "text/plain" &&
-      typeof sourceData === "string";
+      record.type === "text" && sourceMimeType === "text/plain" && typeof sourceData === "string";
     const isInlineDataSource =
       typeof sourceData === "string" &&
       typeof inlineDataMimeType === "string" &&
diff --git a/crates/agent-gui/src/lib/hooks/conversationHooks.ts b/crates/agent-gui/src/lib/hooks/conversationHooks.ts
index 8e0f868a3..f3f9cbb63 100644
--- a/crates/agent-gui/src/lib/hooks/conversationHooks.ts
+++ b/crates/agent-gui/src/lib/hooks/conversationHooks.ts
@@ -1,10 +1,6 @@
 import { invoke } from "@tauri-apps/api/core";
 
-import type {
-  ConversationHook,
-  ConversationHookType,
-  HookLifecycleEventType,
-} from "../settings";
+import type { ConversationHook, ConversationHookType, HookLifecycleEventType } from "../settings";
 
 export type ConversationHookWarning = {
   hookName: string;
diff --git a/crates/agent-gui/src/lib/mcpRegistry/index.ts b/crates/agent-gui/src/lib/mcpRegistry/index.ts
index e0f40f3c0..60f8216c7 100644
--- a/crates/agent-gui/src/lib/mcpRegistry/index.ts
+++ b/crates/agent-gui/src/lib/mcpRegistry/index.ts
@@ -75,9 +75,7 @@ export const MCP_REGISTRY_SOURCE_OPTIONS: Array<{
 ];
 
 function asRecord(value: unknown): RawRecord {
-  return value && typeof value === "object" && !Array.isArray(value)
-    ? value as RawRecord
-    : {};
+  return value && typeof value === "object" && !Array.isArray(value) ? (value as RawRecord) : {};
 }
 
 function asArray(value: unknown): unknown[] {
@@ -104,13 +102,12 @@ function asBoolean(value: unknown): boolean {
 }
 
 function uniqueStrings(values: Array<string | undefined>) {
-  return Array.from(
-    new Set(values.map((value) => value?.trim()).filter(Boolean) as string[]),
-  );
+  return Array.from(new Set(values.map((value) => value?.trim()).filter(Boolean) as string[]));
 }
 
 function normalizeLimit(limit: unknown) {
-  const value = typeof limit === "number" && Number.isFinite(limit) ? Math.floor(limit) : DEFAULT_LIMIT;
+  const value =
+    typeof limit === "number" && Number.isFinite(limit) ? Math.floor(limit) : DEFAULT_LIMIT;
   return Math.max(1, Math.min(48, value));
 }
 
@@ -146,7 +143,7 @@ async function fetchJson(
 
 function slugifyServerId(input: string) {
   const parts = input.split("/").filter(Boolean);
-  const leaf = input.includes("/") ? parts[parts.length - 1] ?? input : input;
+  const leaf = input.includes("/") ? (parts[parts.length - 1] ?? input) : input;
   const normalized = leaf
     .trim()
     .toLowerCase()
@@ -195,11 +192,13 @@ function makeConfigInput(
 }
 
 function inputValue(input: RawRecord) {
-  return asConfigString(input.value)
-    ?? asConfigString(input.default)
-    ?? asConfigString(input.example)
-    ?? asConfigString(asArray(input.examples)[0])
-    ?? asConfigString(input.placeholder);
+  return (
+    asConfigString(input.value) ??
+    asConfigString(input.default) ??
+    asConfigString(input.example) ??
+    asConfigString(asArray(input.examples)[0]) ??
+    asConfigString(input.placeholder)
+  );
 }
 
 function recordFromInputs(
@@ -276,9 +275,16 @@ function pushTemplateRequirements(
   }
 }
 
-function makeDraft(server: McpServerConfig, requiredConfig: McpRegistryConfigInput[], warnings: string[] = []): McpRegistryInstallDraft {
-  const dedupedRequired = requiredConfig.filter((item, index, array) =>
-    array.findIndex((candidate) => candidate.name === item.name && candidate.target === item.target) === index,
+function makeDraft(
+  server: McpServerConfig,
+  requiredConfig: McpRegistryConfigInput[],
+  warnings: string[] = [],
+): McpRegistryInstallDraft {
+  const dedupedRequired = requiredConfig.filter(
+    (item, index, array) =>
+      array.findIndex(
+        (candidate) => candidate.name === item.name && candidate.target === item.target,
+      ) === index,
   );
   const status = dedupedRequired.length > 0 ? "needs_config" : "ready";
   return {
@@ -321,19 +327,25 @@ function buildRemoteDraft(
   }
 
   const headers = recordFromInputs(asArray(transport.headers), "header", requiredConfig);
-  return makeDraft({
-    id: slugifyServerId(baseName),
-    enabled: true,
-    transport: type,
-    command: "",
-    args: [],
-    url,
-    headers,
-    timeoutMs: 60_000,
-  }, requiredConfig);
-}
-
-function buildOfficialPackageDraft(baseName: string, pkg: RawRecord): McpRegistryInstallDraft | undefined {
+  return makeDraft(
+    {
+      id: slugifyServerId(baseName),
+      enabled: true,
+      transport: type,
+      command: "",
+      args: [],
+      url,
+      headers,
+      timeoutMs: 60_000,
+    },
+    requiredConfig,
+  );
+}
+
+function buildOfficialPackageDraft(
+  baseName: string,
+  pkg: RawRecord,
+): McpRegistryInstallDraft | undefined {
   const transport = asRecord(pkg.transport);
   if (transportType(transport) !== "stdio") {
     return undefined;
@@ -355,16 +367,19 @@ function buildOfficialPackageDraft(baseName: string, pkg: RawRecord): McpRegistr
     ...argsFromInputs(asArray(pkg.packageArguments), requiredConfig),
   ];
   const env = recordFromInputs(asArray(pkg.environmentVariables), "env", requiredConfig);
-  return makeDraft({
-    id: slugifyServerId(baseName),
-    enabled: true,
-    transport: "stdio",
-    command,
-    args,
-    env,
-    url: "",
-    timeoutMs: 60_000,
-  }, requiredConfig);
+  return makeDraft(
+    {
+      id: slugifyServerId(baseName),
+      enabled: true,
+      transport: "stdio",
+      command,
+      args,
+      env,
+      url: "",
+      timeoutMs: 60_000,
+    },
+    requiredConfig,
+  );
 }
 
 function pickOfficialDraft(server: RawRecord): McpRegistryInstallDraft | undefined {
@@ -404,7 +419,7 @@ function normalizeOfficialCard(raw: unknown): McpRegistryCard | null {
     id: `official:${name}:${versionLabel}`,
     sourceId: name,
     name,
-    displayName: name.includes("/") ? name.split("/").filter(Boolean).slice(-1)[0] ?? name : name,
+    displayName: name.includes("/") ? (name.split("/").filter(Boolean).slice(-1)[0] ?? name) : name,
     description: asString(server.description) ?? "",
     homepageUrl: asString(server.websiteUrl) ?? asString(server.homepage),
     repositoryUrl: asString(repository.url),
@@ -427,32 +442,31 @@ function configInputsFromJsonSchema(
   const record = asRecord(schema);
   const properties = asRecord(record.properties);
   const required = new Set(asArray(record.required).map(asString).filter(Boolean) as string[]);
-  return Object.entries(properties)
-    .map(([name, raw]) => {
-      const property = asRecord(raw);
-      const from = asRecord(property["x-from"]);
-      const headerName = asString(from.header);
-      const queryName = asString(from.query);
-      const envName = asString(from.env);
-      const argumentName = asString(from.argument) ?? asString(from.arg);
-      const target: McpRegistryConfigInput["target"] = headerName
-        ? "header"
-        : envName
-          ? "env"
-          : argumentName
-            ? "argument"
-            : fallbackTarget;
-      const targetName = headerName ?? envName ?? argumentName ?? queryName ?? name;
-      return {
-        name,
-        targetName,
-        label: asString(property.title) ?? name,
-        description: asString(property.description),
-        required: required.has(name),
-        secret: /token|secret|key|password/i.test(name),
-        target,
-      };
-    });
+  return Object.entries(properties).map(([name, raw]) => {
+    const property = asRecord(raw);
+    const from = asRecord(property["x-from"]);
+    const headerName = asString(from.header);
+    const queryName = asString(from.query);
+    const envName = asString(from.env);
+    const argumentName = asString(from.argument) ?? asString(from.arg);
+    const target: McpRegistryConfigInput["target"] = headerName
+      ? "header"
+      : envName
+        ? "env"
+        : argumentName
+          ? "argument"
+          : fallbackTarget;
+    const targetName = headerName ?? envName ?? argumentName ?? queryName ?? name;
+    return {
+      name,
+      targetName,
+      label: asString(property.title) ?? name,
+      description: asString(property.description),
+      required: required.has(name),
+      secret: /token|secret|key|password/i.test(name),
+      target,
+    };
+  });
 }
 
 function envRecordFromJsonSchema(schema: unknown) {
@@ -482,7 +496,9 @@ function envRecordFromJsonSchema(schema: unknown) {
 
   if (Object.keys(properties).length === 0) {
     for (const [name, raw] of Object.entries(record)) {
-      if (["type", "required", "properties", "value", "default", "example", "examples"].includes(name)) {
+      if (
+        ["type", "required", "properties", "value", "default", "example", "examples"].includes(name)
+      ) {
         continue;
       }
       const resolved = asConfigString(raw);
@@ -501,16 +517,19 @@ function buildManualStdioDraft(
 ): McpRegistryInstallDraft | undefined {
   const normalizedPackage = packageName.trim();
   if (!normalizedPackage) return undefined;
-  return makeDraft({
-    id: slugifyServerId(baseName),
-    enabled: false,
-    transport: "stdio",
-    command: "npx",
-    args: ["-y", normalizedPackage],
-    env,
-    url: "",
-    timeoutMs: 60_000,
-  }, requiredConfig);
+  return makeDraft(
+    {
+      id: slugifyServerId(baseName),
+      enabled: false,
+      transport: "stdio",
+      command: "npx",
+      args: ["-y", normalizedPackage],
+      env,
+      url: "",
+      timeoutMs: 60_000,
+    },
+    requiredConfig,
+  );
 }
 
 function normalizeSmitherySearchCard(raw: unknown): McpRegistryCard | null {
@@ -536,7 +555,8 @@ function normalizeSmitherySearchCard(raw: unknown): McpRegistryCard | null {
       asBoolean(item.bySmithery) ? "smithery" : undefined,
     ]),
     transportHints: asBoolean(item.remote) || asBoolean(item.isDeployed) ? ["http"] : [],
-    installUnavailableReason: asBoolean(item.remote) || asBoolean(item.isDeployed) ? undefined : "manual",
+    installUnavailableReason:
+      asBoolean(item.remote) || asBoolean(item.isDeployed) ? undefined : "manual",
     scoreLabel: useCount !== undefined ? `${useCount}` : undefined,
     detailUrl: homepageUrl,
   };
@@ -547,33 +567,41 @@ function normalizeSmitheryDetail(card: McpRegistryCard, raw: unknown): McpRegist
   const connections = asArray(item.connections);
   const httpConnection = connections
     .map(asRecord)
-    .find((connection) => asString(connection.type) === "http" && asString(connection.deploymentUrl));
+    .find(
+      (connection) => asString(connection.type) === "http" && asString(connection.deploymentUrl),
+    );
   const stdioConnection = connections
     .map(asRecord)
     .find((connection) => asString(connection.type) === "stdio");
   const deploymentUrl = asString(item.deploymentUrl) ?? asString(httpConnection?.deploymentUrl);
   const requiredConfig = configInputsFromJsonSchema(httpConnection?.configSchema);
   const httpDraft = deploymentUrl
-    ? makeDraft({
-        id: slugifyServerId(card.name),
-        enabled: true,
-        transport: "http",
-        command: "",
-        args: [],
-        url: deploymentUrl,
-        timeoutMs: 60_000,
-      }, requiredConfig)
+    ? makeDraft(
+        {
+          id: slugifyServerId(card.name),
+          enabled: true,
+          transport: "http",
+          command: "",
+          args: [],
+          url: deploymentUrl,
+          timeoutMs: 60_000,
+        },
+        requiredConfig,
+      )
     : undefined;
   const stdioDraft = stdioConnection
-    ? makeDraft({
-        id: slugifyServerId(card.name),
-        enabled: true,
-        transport: "stdio",
-        command: "npx",
-        args: ["-y", "@smithery/cli@latest", "run", card.sourceId],
-        url: "",
-        timeoutMs: 60_000,
-      }, configInputsFromJsonSchema(stdioConnection.configSchema, "config"))
+    ? makeDraft(
+        {
+          id: slugifyServerId(card.name),
+          enabled: true,
+          transport: "stdio",
+          command: "npx",
+          args: ["-y", "@smithery/cli@latest", "run", card.sourceId],
+          url: "",
+          timeoutMs: 60_000,
+        },
+        configInputsFromJsonSchema(stdioConnection.configSchema, "config"),
+      )
     : undefined;
   const installDraft = httpDraft ?? stdioDraft;
 
@@ -595,12 +623,15 @@ function normalizeGlamaCard(raw: unknown): McpRegistryCard | null {
   const name = asString(item.name) ?? asString(item.slug) ?? id;
   if (!id || !name) return null;
   const repository = asRecord(item.repository);
-  const envInputs = configInputsFromJsonSchema(item.environmentVariablesJsonSchema).map((input) => ({
-    ...input,
-    target: "env" as const,
-  }));
+  const envInputs = configInputsFromJsonSchema(item.environmentVariablesJsonSchema).map(
+    (input) => ({
+      ...input,
+      target: "env" as const,
+    }),
+  );
   const env = envRecordFromJsonSchema(item.environmentVariablesJsonSchema);
-  const packageName = asString(item.packageName) ?? asString(item.npmPackage) ?? asString(item.slug) ?? name;
+  const packageName =
+    asString(item.packageName) ?? asString(item.npmPackage) ?? asString(item.slug) ?? name;
   const manualDraft = buildManualStdioDraft(name, packageName, envInputs, env);
   const attributes = asArray(item.attributes).map(asString).filter(Boolean) as string[];
   return {
@@ -658,7 +689,9 @@ async function searchSmithery(params: SearchMcpRegistryParams): Promise<McpRegis
     totalPages !== undefined && currentPage < totalPages ? String(currentPage + 1) : undefined;
   return {
     source: "smithery",
-    items: asArray(json.servers).map(normalizeSmitherySearchCard).filter(Boolean) as McpRegistryCard[],
+    items: asArray(json.servers)
+      .map(normalizeSmitherySearchCard)
+      .filter(Boolean) as McpRegistryCard[],
     nextCursor,
     totalCount: asNumber(pagination.totalCount),
   };
@@ -679,7 +712,9 @@ async function searchGlama(params: SearchMcpRegistryParams): Promise<McpRegistry
   };
 }
 
-export async function searchMcpRegistry(params: SearchMcpRegistryParams): Promise<McpRegistrySearchResult> {
+export async function searchMcpRegistry(
+  params: SearchMcpRegistryParams,
+): Promise<McpRegistrySearchResult> {
   switch (params.source) {
     case "official":
       return searchOfficial(params);
@@ -714,7 +749,10 @@ export function withUniqueMcpServerId(
   draft: McpRegistryInstallDraft,
   existingServers: McpServerConfig[],
 ): McpRegistryInstallDraft {
-  const id = createUniqueMcpServerId(draft.server.id || draft.server.command || draft.server.url, existingServers.map((server) => server.id));
+  const id = createUniqueMcpServerId(
+    draft.server.id || draft.server.command || draft.server.url,
+    existingServers.map((server) => server.id),
+  );
   return {
     ...draft,
     server: {
@@ -751,16 +789,11 @@ function replaceUrlConfigValue(url: string, input: McpRegistryConfigInput, value
   }
 }
 
-function replaceArgumentConfigValue(
-  args: string[],
-  input: McpRegistryConfigInput,
-  value: string,
-) {
+function replaceArgumentConfigValue(args: string[], input: McpRegistryConfigInput, value: string) {
   const names = uniqueStrings([input.targetName, input.name]);
-  const placeholderIndex = args.findIndex((arg) =>
-    arg === "..." ||
-    arg.includes("...") ||
-    names.some((name) => arg.includes(`{${name}}`)),
+  const placeholderIndex = args.findIndex(
+    (arg) =>
+      arg === "..." || arg.includes("...") || names.some((name) => arg.includes(`{${name}}`)),
   );
   if (placeholderIndex < 0) {
     return [...args, value];
@@ -771,7 +804,7 @@ function replaceArgumentConfigValue(
   for (const name of names) {
     next = next.split(`{${name}}`).join(value);
   }
-  return args.map((arg, index) => index === placeholderIndex ? next : arg);
+  return args.map((arg, index) => (index === placeholderIndex ? next : arg));
 }
 
 function readConfigArg(args: string[]) {
@@ -792,7 +825,7 @@ function asRecordFromJson(value: unknown): Record<string, unknown> {
   try {
     const parsed = JSON.parse(value);
     return parsed && typeof parsed === "object" && !Array.isArray(parsed)
-      ? parsed as Record<string, unknown>
+      ? (parsed as Record<string, unknown>)
       : {};
   } catch {
     return {};
@@ -821,11 +854,7 @@ function upsertConfigArg(args: string[], config: Record<string, unknown>) {
   return [...args, "--config", serialized];
 }
 
-function replaceConfigArgValue(
-  args: string[],
-  input: McpRegistryConfigInput,
-  value: string,
-) {
+function replaceConfigArgValue(args: string[], input: McpRegistryConfigInput, value: string) {
   const targetName = input.targetName ?? input.name;
   return upsertConfigArg(args, {
     ...readConfigArg(args),
diff --git a/crates/agent-gui/src/lib/memory/api.ts b/crates/agent-gui/src/lib/memory/api.ts
index 183e94993..dc09f3be0 100644
--- a/crates/agent-gui/src/lib/memory/api.ts
+++ b/crates/agent-gui/src/lib/memory/api.ts
@@ -423,9 +423,7 @@ export async function memoryOrganizeRunRead(args: { runId: string }) {
 }
 
 export async function memoryOrganizeRunClearHistory() {
-  return invoke<MemoryOrganizeRunClearHistoryResponse>(
-    "memory_organize_run_clear_history",
-  );
+  return invoke<MemoryOrganizeRunClearHistoryResponse>("memory_organize_run_clear_history");
 }
 
 export async function memoryOrganizeDueClaim(args: {
@@ -439,7 +437,9 @@ export async function memoryOrganizeDueClaim(args: {
   return invoke<MemoryOrganizeDueClaimResponse>("memory_organize_due_claim", { args });
 }
 
-export async function memoryOrganizeDueComplete(args: Parameters<typeof memoryOrganizeRunUpdate>[0]) {
+export async function memoryOrganizeDueComplete(
+  args: Parameters<typeof memoryOrganizeRunUpdate>[0],
+) {
   return invoke<MemoryOrganizeRun | null>("memory_organize_due_complete", { args });
 }
 
diff --git a/crates/agent-gui/src/lib/memory/organizerProtocol.ts b/crates/agent-gui/src/lib/memory/organizerProtocol.ts
index 79d639126..12c67f373 100644
--- a/crates/agent-gui/src/lib/memory/organizerProtocol.ts
+++ b/crates/agent-gui/src/lib/memory/organizerProtocol.ts
@@ -187,14 +187,23 @@ export function isDefaultSelectedOrganizerDecision(decision: OrganizerSafeDecisi
   return !decision.requiresUserAck && (decision.riskLevel ?? "low") === "low";
 }
 
-export function appliedBatchCount(batch: Pick<MemoryBatchResponse, "created" | "updated" | "deleted">) {
+export function appliedBatchCount(
+  batch: Pick<MemoryBatchResponse, "created" | "updated" | "deleted">,
+) {
   return batch.created.length + batch.updated.length + batch.deleted.length;
 }
 
-export function inferOrganizerDecisionGroupIds<T extends OrganizerSafeDecision>(decisions: T[]): T[] {
+export function inferOrganizerDecisionGroupIds<T extends OrganizerSafeDecision>(
+  decisions: T[],
+): T[] {
   const grouped = decisions.map((decision) => ({ ...decision }));
   for (const target of grouped) {
-    if (target.op !== "upsert" || target.groupId || !target.sourceSlugs || target.sourceSlugs.length < 2) {
+    if (
+      target.op !== "upsert" ||
+      target.groupId ||
+      !target.sourceSlugs ||
+      target.sourceSlugs.length < 2
+    ) {
       continue;
     }
     const sourceSet = new Set(target.sourceSlugs.filter((slug) => slug && slug !== target.slug));
@@ -220,11 +229,7 @@ export function buildManualApplyState(input: {
   failedDecisionKeys: string[];
 }) {
   const status: Exclude<OrganizerManualApplyStatus, ""> =
-    input.warningCount === 0
-      ? "applied"
-      : input.appliedCount > 0
-        ? "partial"
-        : "failed";
+    input.warningCount === 0 ? "applied" : input.appliedCount > 0 ? "partial" : "failed";
   return {
     status,
     appliedAt: Date.now(),
@@ -249,13 +254,16 @@ export function buildReviewItemsForBatch(
           ? detail.decisionIndex
           : undefined;
       const fallback =
-        detailDecisionIndex !== undefined ? selectedWithKeys[detailDecisionIndex] : selectedWithKeys[index];
+        detailDecisionIndex !== undefined
+          ? selectedWithKeys[detailDecisionIndex]
+          : selectedWithKeys[index];
       return {
         ...item,
         slug: item.slug ?? fallback?.decision.slug,
         op: item.op ?? fallback?.decision.op,
         groupId: item.groupId ?? fallback?.decision.groupId,
-        decisionKey: item.decisionKey ?? decisionKeyForSlug(selectedWithKeys, item.slug) ?? fallback?.key,
+        decisionKey:
+          item.decisionKey ?? decisionKeyForSlug(selectedWithKeys, item.slug) ?? fallback?.key,
       };
     });
   }
@@ -277,7 +285,9 @@ export function reviewItemsFromProtocol(protocol: OrganizerProtocolObject): Orga
     ? protocol.reviewItems.map((item) => normalizeReviewItem(item)).filter((item) => item.message)
     : [];
   if (structured.length > 0) return structured;
-  return protocolStringArray(protocol.reviewNotes).map((note) => parseWarningString(note, "planning"));
+  return protocolStringArray(protocol.reviewNotes).map((note) =>
+    parseWarningString(note, "planning"),
+  );
 }
 
 export function deriveManualApplyDisplay(input: {
@@ -344,7 +354,9 @@ export function decisionsWithApplyStatus(
   return decisions.map((decision, index) => {
     const key = organizerDecisionKey(decision, index);
     const failed =
-      manualApplyState.failedDecisionKeys.has(key) || failedByKey.get(key) || failedBySlug.get(decision.slug);
+      manualApplyState.failedDecisionKeys.has(key) ||
+      failedByKey.get(key) ||
+      failedBySlug.get(decision.slug);
     if (failed) {
       return {
         ...decision,
@@ -370,7 +382,10 @@ function organizerGroupId(decision: OrganizerSafeDecision) {
   return `merge:${scope}:${workdir}:${decision.slug}:${sources}`;
 }
 
-function parseWarningString(input: string, fallbackPhase: OrganizerReviewItem["phase"] = "apply"): OrganizerReviewItem {
+function parseWarningString(
+  input: string,
+  fallbackPhase: OrganizerReviewItem["phase"] = "apply",
+): OrganizerReviewItem {
   const trimmed = input.trim();
   if (trimmed.startsWith("{")) {
     try {
@@ -390,15 +405,26 @@ function parseWarningString(input: string, fallbackPhase: OrganizerReviewItem["p
   };
 }
 
-function normalizeReviewItem(value: unknown, fallbackPhase: OrganizerReviewItem["phase"] = "planning"): OrganizerReviewItem {
-  const obj = value && typeof value === "object" && !Array.isArray(value) ? (value as Record<string, unknown>) : {};
-  const code = stringValue(obj.code) || stringValue(obj.error);
-  const message = stringValue(obj.message) || stringValue(obj.reason) || stringValue(obj.error) || JSON.stringify(value);
-  const suggested = obj.suggested_next_call && typeof obj.suggested_next_call === "object"
-    ? (obj.suggested_next_call as Record<string, unknown>)
-    : obj.suggestedNextCall && typeof obj.suggestedNextCall === "object"
-      ? (obj.suggestedNextCall as Record<string, unknown>)
+function normalizeReviewItem(
+  value: unknown,
+  fallbackPhase: OrganizerReviewItem["phase"] = "planning",
+): OrganizerReviewItem {
+  const obj =
+    value && typeof value === "object" && !Array.isArray(value)
+      ? (value as Record<string, unknown>)
       : {};
+  const code = stringValue(obj.code) || stringValue(obj.error);
+  const message =
+    stringValue(obj.message) ||
+    stringValue(obj.reason) ||
+    stringValue(obj.error) ||
+    JSON.stringify(value);
+  const suggested =
+    obj.suggested_next_call && typeof obj.suggested_next_call === "object"
+      ? (obj.suggested_next_call as Record<string, unknown>)
+      : obj.suggestedNextCall && typeof obj.suggestedNextCall === "object"
+        ? (obj.suggestedNextCall as Record<string, unknown>)
+        : {};
   const phase =
     obj.phase === "planning" || obj.phase === "apply" || obj.phase === "system"
       ? obj.phase
@@ -406,7 +432,10 @@ function normalizeReviewItem(value: unknown, fallbackPhase: OrganizerReviewItem[
         ? "apply"
         : fallbackPhase;
   const kind =
-    obj.kind === "review" || obj.kind === "skipped" || obj.kind === "warning" || obj.kind === "error"
+    obj.kind === "review" ||
+    obj.kind === "skipped" ||
+    obj.kind === "warning" ||
+    obj.kind === "error"
       ? obj.kind
       : code
         ? "error"
@@ -426,10 +455,7 @@ function normalizeReviewItem(value: unknown, fallbackPhase: OrganizerReviewItem[
     code: code || undefined,
     message,
     slug:
-      stringValue(obj.slug) ||
-      stringValue(suggested.slug) ||
-      slugFromText(message) ||
-      undefined,
+      stringValue(obj.slug) || stringValue(suggested.slug) || slugFromText(message) || undefined,
     op:
       obj.op === "delete" || obj.action === "delete"
         ? "delete"
diff --git a/crates/agent-gui/src/lib/providers/hostedSearchEvents.ts b/crates/agent-gui/src/lib/providers/hostedSearchEvents.ts
index 8a8508650..95a1b8f20 100644
--- a/crates/agent-gui/src/lib/providers/hostedSearchEvents.ts
+++ b/crates/agent-gui/src/lib/providers/hostedSearchEvents.ts
@@ -1,11 +1,11 @@
-import type { ProviderId } from "../settings";
 import {
-  mergeHostedSearchBlocks,
-  normalizeHostedSearchStatus,
   type HostedSearchBlock,
   type HostedSearchSource,
   type HostedSearchStatus,
+  mergeHostedSearchBlocks,
+  normalizeHostedSearchStatus,
 } from "../chat/messages/hostedSearch";
+import type { ProviderId } from "../settings";
 
 type HostedSearchUpdate = {
   id?: string;
@@ -223,13 +223,9 @@ function emitJsonCandidate(text: string, probe: FetchProbe) {
   }
 }
 
-function consumeTextBuffer(
-  buffer: string,
-  probe: FetchProbe,
-  final = false,
-): string {
+function consumeTextBuffer(buffer: string, probe: FetchProbe, final = false): string {
   const lines = buffer.split(/\r?\n/g);
-  const tail = final ? "" : lines.pop() ?? "";
+  const tail = final ? "" : (lines.pop() ?? "");
   for (const line of lines) {
     const trimmed = line.trim();
     if (!trimmed) continue;
@@ -430,14 +426,14 @@ function collectSources(value: unknown, out = new Map<string, HostedSearchSource
     const type = readString(value.type);
     const sourceType =
       type === "url_citation" ||
-      Boolean(value.cited_text || value.citedText) ||
+      value.cited_text ||
+      value.citedText ||
       existing?.sourceType === "citation"
         ? "citation"
         : "source";
     const title = readString(value.title ?? value.name) || existing?.title;
     const snippet = readString(value.snippet ?? value.description) || existing?.snippet;
-    const citedText =
-      readString(value.cited_text ?? value.citedText) || existing?.citedText;
+    const citedText = readString(value.cited_text ?? value.citedText) || existing?.citedText;
     out.set(directUrl, {
       url: directUrl,
       ...(title ? { title } : {}),
@@ -466,10 +462,7 @@ function findFirstSearchRecordId(
   }
   if (!isRecord(value)) return "";
   if (matches(value)) {
-    const id =
-      readString(value.id) ||
-      readString(value.call_id) ||
-      readString(value.tool_use_id);
+    const id = readString(value.id) || readString(value.call_id) || readString(value.tool_use_id);
     if (id) return id;
   }
   for (const child of Object.values(value)) {
@@ -510,11 +503,9 @@ function readExplicitSearchId(providerId: ProviderId, raw: unknown) {
 function readRawStatus(raw: unknown, sources: HostedSearchSource[]): HostedSearchStatus {
   const record = isRecord(raw) ? raw : {};
   const item = isRecord(record.item) ? record.item : {};
-  const statusText = [
-    readString(record.type),
-    readString(record.status),
-    readString(item.status),
-  ].join(" ").toLowerCase();
+  const statusText = [readString(record.type), readString(record.status), readString(item.status)]
+    .join(" ")
+    .toLowerCase();
 
   if (/fail|error|cancel/.test(statusText)) return "failed";
   if (/complete|completed|done|succeeded|finished/.test(statusText)) return "completed";
@@ -554,14 +545,15 @@ export function createHostedSearchEventAggregator(params: {
   const fallbackId = `hosted-search-${params.providerId}`;
   let lastId = fallbackId;
 
-  const blockSignature = (block: HostedSearchBlock) => safeStringify({
-    type: block.type,
-    id: block.id,
-    provider: block.provider,
-    status: block.status,
-    queries: block.queries,
-    sources: block.sources,
-  });
+  const blockSignature = (block: HostedSearchBlock) =>
+    safeStringify({
+      type: block.type,
+      id: block.id,
+      provider: block.provider,
+      status: block.status,
+      queries: block.queries,
+      sources: block.sources,
+    });
 
   const publish = (block: HostedSearchBlock) => {
     const signature = blockSignature(block);
@@ -573,7 +565,8 @@ export function createHostedSearchEventAggregator(params: {
   };
 
   const emit = (update: HostedSearchUpdate) => {
-    const derivedId = update.id?.trim() ||
+    const derivedId =
+      update.id?.trim() ||
       (update.queries?.length
         ? `hosted-search-${params.providerId}-${stableHash(update.queries.join("|"))}`
         : lastId);
diff --git a/crates/agent-gui/src/lib/providers/llm.ts b/crates/agent-gui/src/lib/providers/llm.ts
index 3ac7c6cb9..6151cc070 100644
--- a/crates/agent-gui/src/lib/providers/llm.ts
+++ b/crates/agent-gui/src/lib/providers/llm.ts
@@ -1,4 +1,3 @@
-import { getModel } from "@mariozechner/pi-ai";
 import type {
   AssistantMessage,
   CacheRetention,
@@ -7,60 +6,53 @@ import type {
   OpenAICompletionsCompat,
   SimpleStreamOptions,
 } from "@mariozechner/pi-ai";
+import { getModel } from "@mariozechner/pi-ai";
 import { streamAnthropic } from "@mariozechner/pi-ai/anthropic";
+import { type GoogleOptions, streamGoogle } from "@mariozechner/pi-ai/google";
 import {
-  streamOpenAICompletions,
   type OpenAICompletionsOptions,
+  streamOpenAICompletions,
 } from "@mariozechner/pi-ai/openai-completions";
 import {
-  streamOpenAIResponses,
   type OpenAIResponsesOptions,
+  streamOpenAIResponses,
 } from "@mariozechner/pi-ai/openai-responses";
 import {
-  streamGoogle,
-  type GoogleOptions,
-} from "@mariozechner/pi-ai/google";
-
-import {
-  buildStreamRequestDebugPayload,
-  type StreamDebugLogger,
-} from "../debug/agentDebug";
-import { withPowerActivity } from "../system/powerActivity";
+  appendHostedSearchBlocksToAssistant,
+  type HostedSearchBlock,
+  type HostedSearchOrderedBlock,
+  mergeHostedSearchBlocks,
+} from "../chat/messages/hostedSearch";
+import { buildStreamRequestDebugPayload, type StreamDebugLogger } from "../debug/agentDebug";
 import {
-  getProviderModelDefaults,
   type CodexRequestFormat,
+  getProviderModelDefaults,
   type ProviderId,
   type ProviderModelConfig,
   type ReasoningLevel,
 } from "../settings";
-
-import { providerSupportsNativeWebSearch } from "./nativeWebSearch";
+import { withPowerActivity } from "../system/powerActivity";
 import {
-  createHostedSearchProbeId,
   createHostedSearchEventAggregator,
+  createHostedSearchProbeId,
   startHostedSearchFetchProbe,
   withHostedSearchProbeHeader,
 } from "./hostedSearchEvents";
-import { prepareProxyRequest } from "./proxy";
 import {
   attachAnthropicMessagesNativeAttachments,
   attachGeminiGenerativeAINativeAttachments,
   attachOpenAICompletionsNativeAttachments,
   attachOpenAIResponsesNativeAttachments,
 } from "./nativeResponsesAttachments";
-import {
-  appendHostedSearchBlocksToAssistant,
-  mergeHostedSearchBlocks,
-  type HostedSearchBlock,
-  type HostedSearchOrderedBlock,
-} from "../chat/messages/hostedSearch";
+import { providerSupportsNativeWebSearch } from "./nativeWebSearch";
+import { prepareProxyRequest } from "./proxy";
 
 export { providerSupportsNativeWebSearch } from "./nativeWebSearch";
 
 export type ModelOption = {
-  value: string;         // encodes customProviderId::model
-  label: string;         // model id
-  providerName: string;  // provider display name (for grouping)
+  value: string; // encodes customProviderId::model
+  label: string; // model id
+  providerName: string; // provider display name (for grouping)
   providerType: ProviderId; // routes Claude Code, Codex, Gemini, etc.
   model: string;
 };
@@ -128,9 +120,7 @@ export function buildProviderAuthHeaders(
   providerId: ProviderId,
   apiKey: string,
 ): Record<string, string> {
-  return providerId === "gemini"
-    ? buildGeminiAuthHeaders(apiKey)
-    : buildDualAuthHeaders(apiKey);
+  return providerId === "gemini" ? buildGeminiAuthHeaders(apiKey) : buildDualAuthHeaders(apiKey);
 }
 
 function appendSystemPrompt(base: string | undefined, suffix: string) {
@@ -170,9 +160,7 @@ function isClaudeFamilyVersionAtLeast(
   family: "opus" | "sonnet",
   minimumMinor: number,
 ) {
-  const match = normalizedModelId.match(
-    new RegExp(`${family}[-.]4[-.](\\d+)`),
-  );
+  const match = normalizedModelId.match(new RegExp(`${family}[-.]4[-.](\\d+)`));
   if (!match) return false;
   const minor = Number(match[1]);
   return Number.isFinite(minor) && minor >= minimumMinor;
@@ -194,10 +182,7 @@ function supportsMaxAnthropicEffort(modelId: string) {
   );
 }
 
-const ANTHROPIC_THINKING_BUDGETS: Record<
-  NonNullable<SimpleStreamOptions["reasoning"]>,
-  number
-> = {
+const ANTHROPIC_THINKING_BUDGETS: Record<NonNullable<SimpleStreamOptions["reasoning"]>, number> = {
   minimal: 1_024,
   low: 2_048,
   medium: 8_192,
@@ -314,10 +299,7 @@ function hasEnabledAnthropicThinkingPayload(payload: Record<string, unknown>) {
   return thinking.type === "enabled" || thinking.type === "adaptive";
 }
 
-function isSameAnthropicReplayAssistant(
-  assistant: AssistantMessage,
-  model: Model<any>,
-) {
+function isSameAnthropicReplayAssistant(assistant: AssistantMessage, model: Model<any>) {
   return (
     assistant.provider === model.provider &&
     assistant.api === model.api &&
@@ -332,9 +314,7 @@ function getDeepSeekReplayThinkingBlocks(
   const existingSignatures = new Set(
     payloadBlocks.flatMap((block) => {
       if (!isRecord(block) || block.type !== "thinking") return [];
-      return typeof block.signature === "string" && block.signature.trim()
-        ? [block.signature]
-        : [];
+      return typeof block.signature === "string" && block.signature.trim() ? [block.signature] : [];
     }),
   );
 
@@ -342,11 +322,13 @@ function getDeepSeekReplayThinkingBlocks(
     if (block.type !== "thinking") return [];
     const signature = block.thinkingSignature?.trim();
     if (!signature || existingSignatures.has(signature)) return [];
-    return [{
-      type: "thinking",
-      thinking: block.thinking,
-      signature,
-    }];
+    return [
+      {
+        type: "thinking",
+        thinking: block.thinking,
+        signature,
+      },
+    ];
   });
 }
 
@@ -401,19 +383,13 @@ export function repairDeepSeekAnthropicThinkingReplayPayload(
     );
     if (!hasToolUse || hasThinking) return message;
 
-    const replayThinkingBlocks = getDeepSeekReplayThinkingBlocks(
-      sourceAssistant,
-      message.content,
-    );
+    const replayThinkingBlocks = getDeepSeekReplayThinkingBlocks(sourceAssistant, message.content);
     if (replayThinkingBlocks.length === 0) return message;
 
     changed = true;
     return {
       ...message,
-      content: insertThinkingBeforeFirstToolUse(
-        message.content,
-        replayThinkingBlocks,
-      ),
+      content: insertThinkingBeforeFirstToolUse(message.content, replayThinkingBlocks),
     };
   });
 
@@ -434,11 +410,7 @@ function attachDeepSeekAnthropicThinkingReplayRepair(
   return {
     ...options,
     onPayload: async (payload, streamModel) => {
-      let nextPayload = repairDeepSeekAnthropicThinkingReplayPayload(
-        payload,
-        context,
-        streamModel,
-      );
+      let nextPayload = repairDeepSeekAnthropicThinkingReplayPayload(payload, context, streamModel);
       if (previousOnPayload) {
         const overridden = await previousOnPayload(nextPayload, streamModel);
         if (overridden !== undefined) {
@@ -560,10 +532,7 @@ function mapToolChoiceToGoogle(
   return "auto";
 }
 
-function buildOpenAIBaseOptions(
-  model: Model<any>,
-  options: StreamOptionsEx,
-) {
+function buildOpenAIBaseOptions(model: Model<any>, options: StreamOptionsEx) {
   return {
     temperature: options.temperature,
     maxTokens: resolveMaxTokens(options.maxTokens, model.maxTokens),
@@ -578,10 +547,7 @@ function buildOpenAIBaseOptions(
   };
 }
 
-function resolveMaxTokens(
-  requestedMaxTokens: number | undefined,
-  modelMaxTokens: number,
-) {
+function resolveMaxTokens(requestedMaxTokens: number | undefined, modelMaxTokens: number) {
   if (!requestedMaxTokens || requestedMaxTokens <= 0) return modelMaxTokens;
   return Math.min(requestedMaxTokens, modelMaxTokens);
 }
@@ -603,9 +569,7 @@ function buildAnthropicAutomaticCacheControl(
 
   return {
     type: "ephemeral",
-    ...(cacheRetention === "long" && baseUrl.includes("api.anthropic.com")
-      ? { ttl: "1h" }
-      : {}),
+    ...(cacheRetention === "long" && baseUrl.includes("api.anthropic.com") ? { ttl: "1h" } : {}),
   };
 }
 
@@ -650,10 +614,12 @@ function normalizeAnthropicMessagesForCaching(messages: unknown): unknown {
     changed = true;
     return {
       ...message,
-      content: [{
-        type: "text",
-        text: message.content,
-      }],
+      content: [
+        {
+          type: "text",
+          text: message.content,
+        },
+      ],
     };
   });
 
@@ -757,10 +723,7 @@ export function attachAnthropicAutomaticCaching(
   baseUrl: string,
   options: StreamOptionsEx,
 ): StreamOptionsEx {
-  const cacheControl = buildAnthropicAutomaticCacheControl(
-    baseUrl,
-    options.cacheRetention,
-  );
+  const cacheControl = buildAnthropicAutomaticCacheControl(baseUrl, options.cacheRetention);
   const previousOnPayload = options.onPayload;
 
   if (providerId !== "claude_code" || !cacheControl) {
@@ -776,7 +739,10 @@ export function attachAnthropicAutomaticCaching(
         // Keep Anthropic payloads in a stable shape for exact-prefix matching.
         // For Anthropic-compatible proxies that ignore top-level automatic caching,
         // fall back to an explicit breakpoint on the last cacheable block.
-        const sanitizedPayload = stripNestedAnthropicCacheControl(nextPayload) as Record<string, unknown>;
+        const sanitizedPayload = stripNestedAnthropicCacheControl(nextPayload) as Record<
+          string,
+          unknown
+        >;
         nextPayload = supportsAnthropicTopLevelAutomaticCaching(baseUrl)
           ? {
               ...normalizeAnthropicPayloadMessages(sanitizedPayload),
@@ -837,11 +803,7 @@ function hasAnthropicWebSearchTool(tool: unknown) {
   if (!isRecord(tool)) return false;
   const type = tool.type;
   const name = tool.name;
-  return (
-    name === "web_search" ||
-    type === "web_search_20260209" ||
-    type === "web_search_20250305"
-  );
+  return name === "web_search" || type === "web_search_20260209" || type === "web_search_20250305";
 }
 
 function hasGeminiGoogleSearchTool(tool: unknown) {
@@ -871,10 +833,7 @@ function appendGeminiGoogleSearchTool(payload: Record<string, unknown>) {
     ...payload,
     config: {
       ...config,
-      tools: [
-        ...tools,
-        { googleSearch: {} },
-      ],
+      tools: [...tools, { googleSearch: {} }],
     },
   };
 }
@@ -897,8 +856,9 @@ function hasOpenAIChatCompletionsWebSearchFunctionTool(tool: unknown) {
 }
 
 function hasOpenAIChatCompletionsNativeWebSearchTool(tool: unknown) {
-  return hasOpenAIResponsesWebSearchTool(tool) ||
-    hasOpenAIChatCompletionsWebSearchFunctionTool(tool);
+  return (
+    hasOpenAIResponsesWebSearchTool(tool) || hasOpenAIChatCompletionsWebSearchFunctionTool(tool)
+  );
 }
 
 function buildOpenAIChatCompletionsWebSearchFunctionTool() {
@@ -906,7 +866,8 @@ function buildOpenAIChatCompletionsWebSearchFunctionTool() {
     type: "function",
     function: {
       name: "web_search",
-      description: "Search the web for current information when the answer needs recent or external context.",
+      description:
+        "Search the web for current information when the answer needs recent or external context.",
       parameters: {
         type: "object",
         properties: {
@@ -960,10 +921,7 @@ function isOpenAIWebSearchMinimalReasoningUnsupportedModel(modelId: string) {
   return normalized === "gpt-5" || normalized.startsWith("gpt-5-");
 }
 
-function normalizeOpenAIWebSearchReasoning(
-  payload: Record<string, unknown>,
-  model: Model<any>,
-) {
+function normalizeOpenAIWebSearchReasoning(payload: Record<string, unknown>, model: Model<any>) {
   if (!isOpenAIWebSearchMinimalReasoningUnsupportedModel(model.id)) return payload;
   if (!isRecord(payload.reasoning) || payload.reasoning.effort !== "minimal") return payload;
   return {
@@ -1126,11 +1084,7 @@ export function finalizeProviderStreamOptions(params: {
     sessionId?: string;
   };
 }): StreamOptionsEx {
-  let options = attachAnthropicAutomaticCaching(
-    params.providerId,
-    params.baseUrl,
-    params.options,
-  );
+  let options = attachAnthropicAutomaticCaching(params.providerId, params.baseUrl, params.options);
   options = attachCodexResponsesStorage(params.providerId, options);
   options = attachProviderNativeWebSearch(params.providerId, options, params.nativeWebSearch, {
     baseUrl: params.baseUrl,
@@ -1359,8 +1313,7 @@ function resolveCodexOpenAICompletionsCompat(params: {
   const isGroq = compatBaseUrl.includes("groq.com");
   const isChutes = compatBaseUrl.includes("chutes.ai");
   const isDeepSeek =
-    compatBaseUrl.includes("deepseek.com") ||
-    normalizedModelId.includes("deepseek");
+    compatBaseUrl.includes("deepseek.com") || normalizedModelId.includes("deepseek");
   const isKnownNonOpenAIModel =
     isDeepSeek ||
     normalizedModelId.includes("qwen") ||
@@ -1435,10 +1388,7 @@ function normalizeCodexBaseUrl(baseUrl: string): {
   };
 }
 
-function inferCodexApi(
-  requestFormat?: CodexRequestFormat,
-  preferredApi?: CodexApi,
-): CodexApi {
+function inferCodexApi(requestFormat?: CodexRequestFormat, preferredApi?: CodexApi): CodexApi {
   return requestFormat ?? preferredApi ?? "openai-responses";
 }
 
@@ -1481,10 +1431,7 @@ function mapGeminiThinkingLevel(
   }
 }
 
-function mapGeminiThinkingBudget(
-  modelId: string,
-  reasoning: GeminiReasoningLevel,
-) {
+function mapGeminiThinkingBudget(modelId: string, reasoning: GeminiReasoningLevel) {
   const normalizedModelId = modelId.toLowerCase();
   if (normalizedModelId.includes("2.5-pro")) {
     return {
@@ -1540,10 +1487,7 @@ export function createModelFromConfig(
   const maxTokens = modelConfig?.maxOutputToken ?? defaults.maxOutputToken;
 
   if (providerId === "codex") {
-    const {
-      baseUrl: normalizedBaseUrl,
-      preferredApi,
-    } = normalizeCodexBaseUrl(baseUrl);
+    const { baseUrl: normalizedBaseUrl, preferredApi } = normalizeCodexBaseUrl(baseUrl);
     const api = inferCodexApi(requestFormat, preferredApi);
     const known = resolveKnownModel("openai", modelId, normalizedBaseUrl);
     if (known && known.api === api) {
@@ -1632,13 +1576,9 @@ export function createModelFromConfig(
   return custom;
 }
 
-export function streamSimpleByApi(
-  model: Model<any>,
-  context: Context,
-  options: StreamOptionsEx,
-) {
+export function streamSimpleByApi(model: Model<any>, context: Context, options: StreamOptionsEx) {
   switch (model.api) {
-    case "anthropic-messages":
+    case "anthropic-messages": {
       // Anthropic：需要我们自己调用 streamAnthropic()，以便显式传 toolChoice（以及启用/禁用 thinking）。
       const anthropicThinking = resolveAnthropicThinkingRuntime(model, options);
       let anthropicOptions = attachDeepSeekAnthropicThinkingReplayRepair(
@@ -1669,6 +1609,7 @@ export function streamSimpleByApi(
           : {}),
         toolChoice: anthropicOptions.toolChoice ?? "none",
       });
+    }
     case "openai-completions": {
       const openAIOptions: OpenAICompletionsOptions = {
         ...buildOpenAIBaseOptions(model, options),
@@ -1732,19 +1673,14 @@ function buildTextOnlyStreamOptions(params: {
   debugLogger?: StreamDebugLogger;
 }): StreamOptionsEx {
   const sessionId = normalizeSessionId(params.sessionId);
-  const nativeWebSearch = providerSupportsNativeWebSearch(
-    params.providerId,
-    params.model.api,
-    {
+  const nativeWebSearch =
+    providerSupportsNativeWebSearch(params.providerId, params.model.api, {
       baseUrl: params.runtime.baseUrl,
       modelId: params.model.id,
-    },
-  ) && params.nativeWebSearch;
+    }) && params.nativeWebSearch;
   const usesOpenAIChatNativeWebSearch =
-    nativeWebSearch &&
-    params.providerId === "codex" &&
-    params.model.api === "openai-completions";
-  let options: StreamOptionsEx = {
+    nativeWebSearch && params.providerId === "codex" && params.model.api === "openai-completions";
+  const options: StreamOptionsEx = {
     apiKey: params.runtime.apiKey,
     headers: withHostedSearchProbeHeader(params.headers, params.hostedSearchProbeId),
     signal: params.signal,
@@ -1757,19 +1693,14 @@ function buildTextOnlyStreamOptions(params: {
     metadata: buildProviderRequestMetadata(params.providerId, sessionId),
     reasoning:
       (params.providerId === "codex" &&
-        (params.model.api === "openai-responses" ||
-          params.model.api === "openai-completions")) ||
+        (params.model.api === "openai-responses" || params.model.api === "openai-completions")) ||
       (params.providerId === "claude_code" && params.model.api === "anthropic-messages") ||
       (params.providerId === "gemini" && params.model.api === "google-generative-ai")
         ? toSimpleStreamReasoning(params.runtime.reasoning)
         : undefined,
     // Text-only mode cannot execute local tools. Provider-native web search is
     // hosted by the upstream provider, so it can stay on auto when explicitly enabled.
-    toolChoice: usesOpenAIChatNativeWebSearch
-      ? undefined
-      : nativeWebSearch
-        ? "auto"
-        : "none",
+    toolChoice: usesOpenAIChatNativeWebSearch ? undefined : nativeWebSearch ? "auto" : "none",
   };
   return finalizeProviderStreamOptions({
     providerId: params.providerId,
diff --git a/crates/agent-gui/src/lib/providers/nativeResponsesAttachments.ts b/crates/agent-gui/src/lib/providers/nativeResponsesAttachments.ts
index bff37f3f1..dc098b2e4 100644
--- a/crates/agent-gui/src/lib/providers/nativeResponsesAttachments.ts
+++ b/crates/agent-gui/src/lib/providers/nativeResponsesAttachments.ts
@@ -106,12 +106,7 @@ const GEMINI_INLINE_NATIVE_ATTACHMENT_DATA_BUDGET_BYTES =
   GEMINI_INLINE_NATIVE_ATTACHMENT_MAX_REQUEST_BYTES -
   GEMINI_INLINE_NATIVE_ATTACHMENT_REQUEST_RESERVE_BYTES;
 
-const NATIVE_IMAGE_MIME_TYPES = new Set([
-  "image/png",
-  "image/jpeg",
-  "image/gif",
-  "image/webp",
-]);
+const NATIVE_IMAGE_MIME_TYPES = new Set(["image/png", "image/jpeg", "image/gif", "image/webp"]);
 
 const NATIVE_INPUT_FILE_KINDS = new Set<PendingUploadedFile["kind"]>([
   "text",
@@ -128,10 +123,7 @@ const ANTHROPIC_NATIVE_IMAGE_MIME_TYPES = new Set([
   "image/webp",
 ]);
 
-const ANTHROPIC_NATIVE_DOCUMENT_MIME_TYPES = new Set([
-  "application/pdf",
-  "text/plain",
-]);
+const ANTHROPIC_NATIVE_DOCUMENT_MIME_TYPES = new Set(["application/pdf", "text/plain"]);
 
 const GEMINI_NATIVE_IMAGE_MIME_TYPES = new Set([
   "image/png",
@@ -585,10 +577,7 @@ async function buildGeminiNativeContentParts(params: {
         file,
       });
       if (!candidate) continue;
-      if (
-        usedRequestBytes + candidate.requestBytes >
-        params.availableRequestBytes
-      ) {
+      if (usedRequestBytes + candidate.requestBytes > params.availableRequestBytes) {
         continue;
       }
       parts.push(candidate.part);
@@ -847,7 +836,9 @@ async function applyNativeAttachmentsToGeminiPayload(params: {
   return changed ? { ...payload, contents: nextContents } : payload;
 }
 
-export function attachOpenAIResponsesNativeAttachments<TOptions extends StreamOptionsWithPayloadHook>(
+export function attachOpenAIResponsesNativeAttachments<
+  TOptions extends StreamOptionsWithPayloadHook,
+>(
   options: TOptions,
   params: {
     context?: Context;
@@ -886,7 +877,9 @@ export function attachOpenAIResponsesNativeAttachments<TOptions extends StreamOp
   };
 }
 
-export function attachOpenAICompletionsNativeAttachments<TOptions extends StreamOptionsWithPayloadHook>(
+export function attachOpenAICompletionsNativeAttachments<
+  TOptions extends StreamOptionsWithPayloadHook,
+>(
   options: TOptions,
   params: {
     context?: Context;
@@ -925,7 +918,9 @@ export function attachOpenAICompletionsNativeAttachments<TOptions extends Stream
   };
 }
 
-export function attachAnthropicMessagesNativeAttachments<TOptions extends StreamOptionsWithPayloadHook>(
+export function attachAnthropicMessagesNativeAttachments<
+  TOptions extends StreamOptionsWithPayloadHook,
+>(
   options: TOptions,
   params: {
     context?: Context;
@@ -964,7 +959,9 @@ export function attachAnthropicMessagesNativeAttachments<TOptions extends Stream
   };
 }
 
-export function attachGeminiGenerativeAINativeAttachments<TOptions extends StreamOptionsWithPayloadHook>(
+export function attachGeminiGenerativeAINativeAttachments<
+  TOptions extends StreamOptionsWithPayloadHook,
+>(
   options: TOptions,
   params: {
     context?: Context;
diff --git a/crates/agent-gui/src/lib/providers/proxy.ts b/crates/agent-gui/src/lib/providers/proxy.ts
index 424eb7bf7..ceb0518fc 100644
--- a/crates/agent-gui/src/lib/providers/proxy.ts
+++ b/crates/agent-gui/src/lib/providers/proxy.ts
@@ -18,7 +18,9 @@ export type PreparedProxyRequest = {
 let proxyServerInfoPromise: Promise<ProxyServerInfo> | null = null;
 
 function normalizeProxyServerInfo(info: ProxyServerInfo): ProxyServerInfo {
-  const baseUrl = String(info.baseUrl ?? "").trim().replace(/\/+$/, "");
+  const baseUrl = String(info.baseUrl ?? "")
+    .trim()
+    .replace(/\/+$/, "");
   const token = String(info.token ?? "").trim();
 
   if (!baseUrl) {
diff --git a/crates/agent-gui/src/lib/settings/index.ts b/crates/agent-gui/src/lib/settings/index.ts
index f056a9ca2..fe34bfb60 100644
--- a/crates/agent-gui/src/lib/settings/index.ts
+++ b/crates/agent-gui/src/lib/settings/index.ts
@@ -1,10 +1,8 @@
-import { DEFAULT_LOCALE, normalizeLocale, type Locale } from "../../i18n/config";
+import { DEFAULT_LOCALE, type Locale, normalizeLocale } from "../../i18n/config";
 import { mergeAlwaysEnabledSkillNames } from "../skills/builtin";
+import { CUSTOM_SYSTEM_TOOL_OPTIONS, type SystemToolId } from "../tools/customSystemTools";
 import { normalizeApiKey, normalizeBaseUrl, normalizeModels } from "./normalize";
-import {
-  CUSTOM_SYSTEM_TOOL_OPTIONS,
-  type SystemToolId,
-} from "../tools/customSystemTools";
+
 export type { SystemToolId } from "../tools/customSystemTools";
 
 export type ProviderId = "codex" | "claude_code" | "gemini";
@@ -13,13 +11,7 @@ export type ExecutionMode = "text" | "tools" | "agent-dev";
 
 export type CodexRequestFormat = "openai-completions" | "openai-responses";
 
-export type ReasoningLevel =
-  | "off"
-  | "minimal"
-  | "low"
-  | "medium"
-  | "high"
-  | "xhigh";
+export type ReasoningLevel = "off" | "minimal" | "low" | "medium" | "high" | "xhigh";
 
 export type McpTransport = "stdio" | "http" | "sse";
 
@@ -37,14 +29,7 @@ export type HookLifecycleEventType =
 
 export type ConversationHookType = "command" | "http";
 
-export type HookHttpMethod =
-  | "GET"
-  | "POST"
-  | "PUT"
-  | "PATCH"
-  | "DELETE"
-  | "HEAD"
-  | "OPTIONS";
+export type HookHttpMethod = "GET" | "POST" | "PUT" | "PATCH" | "DELETE" | "HEAD" | "OPTIONS";
 
 export type HookHttpRequest = {
   id: string;
@@ -495,7 +480,7 @@ function normalizeChatRuntimeReasoningByProvider(
   CHAT_RUNTIME_REASONING_PROVIDER_KEYS.forEach((key) => {
     const levels = getChatRuntimeReasoningLevelsForProviderKey(key);
     normalized[key] = normalizeChatRuntimeReasoningForLevels(
-      Object.prototype.hasOwnProperty.call(obj, key) ? obj[key] : fallbackReasoning,
+      Object.hasOwn(obj, key) ? obj[key] : fallbackReasoning,
       levels,
     );
   });
@@ -520,9 +505,7 @@ export function getChatRuntimeReasoningLevelsForProvider(params: {
   providerId?: ProviderId;
   requestFormat?: CodexRequestFormat;
 }): ReasoningLevel[] {
-  return getChatRuntimeReasoningLevelsForProviderKey(
-    getChatRuntimeReasoningProviderKey(params),
-  );
+  return getChatRuntimeReasoningLevelsForProviderKey(getChatRuntimeReasoningProviderKey(params));
 }
 
 export function normalizeChatRuntimeControlsForProvider(
@@ -607,7 +590,8 @@ function normalizeOptionalText(input: unknown): string {
 function normalizeCronRemainingExecutions(input: unknown): number | undefined {
   if (input == null) return undefined;
   if (typeof input === "string" && input.trim() === "") return undefined;
-  const numeric = typeof input === "number" ? input : typeof input === "string" ? Number(input) : NaN;
+  const numeric =
+    typeof input === "number" ? input : typeof input === "string" ? Number(input) : NaN;
   if (!Number.isFinite(numeric) || !Number.isInteger(numeric) || numeric < 0) {
     return undefined;
   }
@@ -636,9 +620,7 @@ function normalizeCronTaskType(input: unknown): CronTaskType {
 
 function normalizeHookHttpMethod(input: unknown): HookHttpMethod {
   const value = typeof input === "string" ? input.trim().toUpperCase() : "";
-  return HOOK_HTTP_METHODS.includes(value as HookHttpMethod)
-    ? (value as HookHttpMethod)
-    : "POST";
+  return HOOK_HTTP_METHODS.includes(value as HookHttpMethod) ? (value as HookHttpMethod) : "POST";
 }
 
 export function canHookHttpMethodHaveBody(method: HookHttpMethod): boolean {
@@ -648,9 +630,8 @@ export function canHookHttpMethodHaveBody(method: HookHttpMethod): boolean {
 function normalizeHookHttpRequest(input: unknown): HookHttpRequest {
   const obj = (input && typeof input === "object" ? input : {}) as Record<string, unknown>;
   const method = normalizeHookHttpMethod(obj.method);
-  const body = canHookHttpMethodHaveBody(method) && Object.prototype.hasOwnProperty.call(obj, "body")
-    ? obj.body
-    : undefined;
+  const body =
+    canHookHttpMethodHaveBody(method) && Object.hasOwn(obj, "body") ? obj.body : undefined;
 
   return {
     id: typeof obj.id === "string" && obj.id.trim() ? obj.id.trim() : crypto.randomUUID(),
@@ -719,8 +700,7 @@ function normalizeRecordStringString(input: unknown): Record<string, string> | u
   const out: Record<string, string> = {};
   for (const [rawKey, rawValue] of Object.entries(input as Record<string, unknown>)) {
     const key = String(rawKey).trim();
-    const value =
-      typeof rawValue === "string" ? rawValue.trim() : String(rawValue ?? "").trim();
+    const value = typeof rawValue === "string" ? rawValue.trim() : String(rawValue ?? "").trim();
     if (!key || !value) continue;
     out[key] = value;
   }
@@ -763,9 +743,7 @@ function normalizeMcpSelection(input: unknown, servers: McpServerConfig[]): stri
 function normalizeTimeoutMs(input: unknown): number {
   const numeric =
     typeof input === "number" ? input : typeof input === "string" ? Number(input) : NaN;
-  const timeoutMs = Number.isFinite(numeric)
-    ? Math.floor(numeric)
-    : DEFAULT_MCP_TIMEOUT_MS;
+  const timeoutMs = Number.isFinite(numeric) ? Math.floor(numeric) : DEFAULT_MCP_TIMEOUT_MS;
   return timeoutMs > 0 ? timeoutMs : DEFAULT_MCP_TIMEOUT_MS;
 }
 
@@ -932,8 +910,7 @@ export function normalizeCustomProvider(input: unknown): CustomProvider {
     ),
     requestFormat: codexRouting?.requestFormat,
     reasoning: normalizeReasoningLevel(obj.reasoning),
-    promptCachingEnabled:
-      type === "claude_code" ? obj.promptCachingEnabled !== false : false,
+    promptCachingEnabled: type === "claude_code" ? obj.promptCachingEnabled !== false : false,
     nativeWebSearchEnabled: obj.nativeWebSearchEnabled !== false,
   };
 }
@@ -1070,9 +1047,10 @@ function normalizeMemoryOrganizerSchedule(input: unknown): MemoryOrganizerSchedu
     frequency: normalizeMemoryOrganizerFrequency(obj.frequency),
     timeLocal: normalizeMemoryOrganizerTime(obj.timeLocal),
     weekday: normalizeMemoryOrganizerWeekday(obj.weekday),
-    timezone: typeof obj.timezone === "string" && obj.timezone.trim()
-      ? obj.timezone.trim()
-      : defaults.timezone,
+    timezone:
+      typeof obj.timezone === "string" && obj.timezone.trim()
+        ? obj.timezone.trim()
+        : defaults.timezone,
   };
 }
 
@@ -1171,9 +1149,9 @@ export function normalizeMemorySettings(
     Boolean(organizerModel) &&
     organizerSchedule.frequency !== "none";
   const organizerNextRunAt = organizerEnabled
-    ? normalizeOptionalTimestamp(obj.organizerNextRunAt) ??
+    ? (normalizeOptionalTimestamp(obj.organizerNextRunAt) ??
       computeNextMemoryOrganizerRunAt(organizerSchedule) ??
-      undefined
+      undefined)
     : undefined;
   return {
     organizerModel,
@@ -1285,10 +1263,7 @@ export function normalizeSettings(input?: Partial<AppSettings> | null): AppSetti
   };
 }
 
-export function updateSystem(
-  prev: AppSettings,
-  patch: Partial<SystemSettings>,
-): AppSettings {
+export function updateSystem(prev: AppSettings, patch: Partial<SystemSettings>): AppSettings {
   return normalizeSettings({
     ...prev,
     system: {
@@ -1308,10 +1283,7 @@ export function updateMcp(prev: AppSettings, patch: Partial<McpSettings>): AppSe
   });
 }
 
-export function updateAgents(
-  prev: AppSettings,
-  agents: AgentPromptTemplate[],
-): AppSettings {
+export function updateAgents(prev: AppSettings, agents: AgentPromptTemplate[]): AppSettings {
   return normalizeSettings({
     ...prev,
     agents,
@@ -1332,10 +1304,7 @@ export function updateCronTasks(prev: AppSettings, cron: CronTask[]): AppSetting
   });
 }
 
-export function updateSkills(
-  prev: AppSettings,
-  patch: Partial<SkillsSettings>,
-): AppSettings {
+export function updateSkills(prev: AppSettings, patch: Partial<SkillsSettings>): AppSettings {
   return normalizeSettings({
     ...prev,
     skills: {
diff --git a/crates/agent-gui/src/lib/settings/storage.ts b/crates/agent-gui/src/lib/settings/storage.ts
index d98761c79..6337556c0 100644
--- a/crates/agent-gui/src/lib/settings/storage.ts
+++ b/crates/agent-gui/src/lib/settings/storage.ts
@@ -1,16 +1,16 @@
 import { invoke } from "@tauri-apps/api/core";
-import { normalizeLocale, type Locale } from "../../i18n/config";
+import { type Locale, normalizeLocale } from "../../i18n/config";
 
 import {
+  type AppSettings,
+  type ChatRuntimeControls,
   getDefaultSettings,
+  normalizeChatRuntimeControls,
   normalizeSelectedModel,
   normalizeSettings,
-  normalizeChatRuntimeControls,
-  type ChatRuntimeControls,
   normalizeSkillsSettings,
-  normalizeUpdateSettings,
   normalizeTheme,
-  type AppSettings,
+  normalizeUpdateSettings,
   type SelectedModel,
   type SkillsSettings,
   type Theme,
@@ -106,7 +106,18 @@ function readLocalUiSettings(): {
   }
 }
 
-function writeLocalUiSettings(settings: Pick<AppSettings, "skills" | "chatRuntimeControls" | "customSettings" | "updates" | "selectedModel" | "theme" | "locale">) {
+function writeLocalUiSettings(
+  settings: Pick<
+    AppSettings,
+    | "skills"
+    | "chatRuntimeControls"
+    | "customSettings"
+    | "updates"
+    | "selectedModel"
+    | "theme"
+    | "locale"
+  >,
+) {
   const payload = {
     skills: settings.skills,
     chatRuntimeControls: settings.chatRuntimeControls,
@@ -160,7 +171,8 @@ export async function loadPersistedSettingsWithDefaults(): Promise<PersistedSett
       persisted?.system ?? defaults.system,
       defaultWorkdir,
     ) as AppSettings["system"],
-    customProviders: (persisted?.providers ?? defaults.customProviders) as AppSettings["customProviders"],
+    customProviders: (persisted?.providers ??
+      defaults.customProviders) as AppSettings["customProviders"],
     mcp: (persisted?.mcp ?? defaults.mcp) as AppSettings["mcp"],
     agents: (persisted?.agents ?? defaults.agents) as AppSettings["agents"],
     hooks: (persisted?.hooks ?? defaults.hooks) as AppSettings["hooks"],
diff --git a/crates/agent-gui/src/lib/settings/sync.ts b/crates/agent-gui/src/lib/settings/sync.ts
index 015cda67c..53671eeee 100644
--- a/crates/agent-gui/src/lib/settings/sync.ts
+++ b/crates/agent-gui/src/lib/settings/sync.ts
@@ -1,14 +1,7 @@
-import {
-  normalizeChatRuntimeControls,
-  normalizeSettings,
-  type AppSettings,
-} from "./index";
+import { type AppSettings, normalizeChatRuntimeControls, normalizeSettings } from "./index";
 
 export type GatewayProviderApiKeyUpdates = Record<string, string>;
-export type GatewaySettingsSyncProvider = Omit<
-  AppSettings["customProviders"][number],
-  "apiKey"
-> & {
+export type GatewaySettingsSyncProvider = Omit<AppSettings["customProviders"][number], "apiKey"> & {
   apiKeyConfigured?: boolean;
 };
 
@@ -111,10 +104,7 @@ function mergeSyncedCustomProviders(
     const apiKeyUpdate = id ? apiKeyUpdates[id] : undefined;
     const sourceApiKey = typeof source.apiKey === "string" ? source.apiKey.trim() : "";
     const apiKey = (apiKeyUpdate ?? sourceApiKey) || currentProvider?.apiKey || "";
-    const sourceHasConfiguredFlag = Object.prototype.hasOwnProperty.call(
-      source,
-      "apiKeyConfigured",
-    );
+    const sourceHasConfiguredFlag = Object.hasOwn(source, "apiKeyConfigured");
 
     return {
       ...source,
@@ -164,13 +154,13 @@ export function applyGatewaySettingsSyncPayload(
   const selectedModel =
     source.selectedModel === null
       ? undefined
-      : (source.selectedModel as AppSettings["selectedModel"] | undefined) ??
-        current.selectedModel;
-  const memory = Object.prototype.hasOwnProperty.call(source, "memory")
-    ? (source.memory as AppSettings["memory"] | null | undefined) ?? {}
+      : ((source.selectedModel as AppSettings["selectedModel"] | undefined) ??
+        current.selectedModel);
+  const memory = Object.hasOwn(source, "memory")
+    ? ((source.memory as AppSettings["memory"] | null | undefined) ?? {})
     : current.memory;
-  const customSettings = Object.prototype.hasOwnProperty.call(source, "customSettings")
-    ? (source.customSettings as AppSettings["customSettings"] | null | undefined) ?? {}
+  const customSettings = Object.hasOwn(source, "customSettings")
+    ? ((source.customSettings as AppSettings["customSettings"] | null | undefined) ?? {})
     : current.customSettings;
 
   return normalizeSettings({
@@ -188,7 +178,7 @@ export function applyGatewaySettingsSyncPayload(
     memory: memory as AppSettings["memory"],
     customSettings: customSettings as AppSettings["customSettings"],
     skills: (source.skills as AppSettings["skills"] | undefined) ?? current.skills,
-    chatRuntimeControls: Object.prototype.hasOwnProperty.call(source, "chatRuntimeControls")
+    chatRuntimeControls: Object.hasOwn(source, "chatRuntimeControls")
       ? normalizeChatRuntimeControls(source.chatRuntimeControls)
       : current.chatRuntimeControls,
     selectedModel,
diff --git a/crates/agent-gui/src/lib/shared/utils.ts b/crates/agent-gui/src/lib/shared/utils.ts
index a5ef19350..365058ceb 100644
--- a/crates/agent-gui/src/lib/shared/utils.ts
+++ b/crates/agent-gui/src/lib/shared/utils.ts
@@ -1,4 +1,4 @@
-import { clsx, type ClassValue } from "clsx";
+import { type ClassValue, clsx } from "clsx";
 import { twMerge } from "tailwind-merge";
 
 export function cn(...inputs: ClassValue[]) {
diff --git a/crates/agent-gui/src/lib/skills/builtin.ts b/crates/agent-gui/src/lib/skills/builtin.ts
index 847f9a59e..64be1dc1e 100644
--- a/crates/agent-gui/src/lib/skills/builtin.ts
+++ b/crates/agent-gui/src/lib/skills/builtin.ts
@@ -31,7 +31,9 @@ export function mergeAlwaysEnabledSkillNames(selected: readonly string[]) {
 }
 
 function alwaysEnabledSkillRank(name: string) {
-  const rank = ALWAYS_ENABLED_SKILL_NAMES.indexOf(name as (typeof ALWAYS_ENABLED_SKILL_NAMES)[number]);
+  const rank = ALWAYS_ENABLED_SKILL_NAMES.indexOf(
+    name as (typeof ALWAYS_ENABLED_SKILL_NAMES)[number],
+  );
   return rank === -1 ? Number.POSITIVE_INFINITY : rank;
 }
 
diff --git a/crates/agent-gui/src/lib/skills/clawHub.ts b/crates/agent-gui/src/lib/skills/clawHub.ts
index 460a34fbf..53b93f2a9 100644
--- a/crates/agent-gui/src/lib/skills/clawHub.ts
+++ b/crates/agent-gui/src/lib/skills/clawHub.ts
@@ -35,7 +35,7 @@ const CLAWHUB_API_BASE = "https://clawhub.ai";
 
 function asRecord(value: unknown): Record<string, unknown> {
   return value && typeof value === "object" && !Array.isArray(value)
-    ? value as Record<string, unknown>
+    ? (value as Record<string, unknown>)
     : {};
 }
 
@@ -53,9 +53,7 @@ function asNullableNumber(value: unknown): number | null {
 
 function asStringArray(value: unknown): string[] {
   return Array.isArray(value)
-    ? value
-        .map((item) => asString(item))
-        .filter((item): item is string => Boolean(item))
+    ? value.map((item) => asString(item)).filter((item): item is string => Boolean(item))
     : [];
 }
 
@@ -79,9 +77,7 @@ function normalizeSkillCard(raw: unknown): ClawHubSkillCard | null {
     displayName: asString(item.displayName) ?? slug,
     summary: asString(item.summary) ?? "",
     latestVersion:
-      asString(latestVersion.version) ??
-      asString(tags.latest) ??
-      asString(item.version),
+      asString(latestVersion.version) ?? asString(tags.latest) ?? asString(item.version),
     downloads: asNumber(stats.downloads),
     stars: asNumber(stats.stars),
     installsCurrent: asNumber(stats.installsCurrent),
@@ -118,9 +114,7 @@ function normalizeSkillDetail(raw: unknown): ClawHubSkillDetail | null {
     supportedOs: asStringArray(metadata.os),
     supportedSystems: asStringArray(metadata.systems),
     moderationStatus:
-      asString(moderation.status) ??
-      asString(moderation.result) ??
-      asString(moderation.state),
+      asString(moderation.status) ?? asString(moderation.result) ?? asString(moderation.state),
   };
 }
 
diff --git a/crates/agent-gui/src/lib/skills/index.ts b/crates/agent-gui/src/lib/skills/index.ts
index 35b570c39..0862ff4da 100644
--- a/crates/agent-gui/src/lib/skills/index.ts
+++ b/crates/agent-gui/src/lib/skills/index.ts
@@ -62,8 +62,10 @@ const COMMON_SKILL_MENTION_ENV_VARS = new Set([
 
 function isCommonSkillMentionEnvVar(name: string) {
   const upper = name.toUpperCase();
-  return COMMON_SKILL_MENTION_ENV_VARS.has(upper) ||
-    (upper.endsWith(":") && COMMON_SKILL_MENTION_ENV_VARS.has(upper.slice(0, -1)));
+  return (
+    COMMON_SKILL_MENTION_ENV_VARS.has(upper) ||
+    (upper.endsWith(":") && COMMON_SKILL_MENTION_ENV_VARS.has(upper.slice(0, -1)))
+  );
 }
 
 type SystemListSkillFilesResponse = {
@@ -325,21 +327,25 @@ function getSkillBaseDir(path: string) {
 }
 
 function normalizeSkillNameFromBaseDir(baseDir: string) {
-  const segments = normalizeRelPath(baseDir)
-    .split("/")
-    .filter(Boolean);
+  const segments = normalizeRelPath(baseDir).split("/").filter(Boolean);
   const segment = segments.length > 0 ? segments[segments.length - 1] : "readme-skill";
-  return segment
-    .trim()
-    .toLowerCase()
-    .replace(/[^a-z0-9]+/g, "-")
-    .replace(/^-+|-+$/g, "")
-    .replace(/-+/g, "-") || "readme-skill";
+  return (
+    segment
+      .trim()
+      .toLowerCase()
+      .replace(/[^a-z0-9]+/g, "-")
+      .replace(/^-+|-+$/g, "")
+      .replace(/-+/g, "-") || "readme-skill"
+  );
 }
 
 function firstReadmeDescriptionLine(content: string) {
   for (const rawLine of content.replace(/^\uFEFF/, "").split(/\r?\n/)) {
-    const line = rawLine.trim().replace(/^#+\s*/, "").replace(/^[*_`]+|[*_`]+$/g, "").trim();
+    const line = rawLine
+      .trim()
+      .replace(/^#+\s*/, "")
+      .replace(/^[*_`]+|[*_`]+$/g, "")
+      .trim();
     if (line === "---") continue;
     if (line) return line.slice(0, 280);
   }
@@ -356,8 +362,7 @@ async function buildReadmeFallbackSkill(params: {
   });
   const name = normalizeSkillNameFromBaseDir(params.baseDir);
   const description =
-    firstReadmeDescriptionLine(readme.content) ||
-    `README.md skill instructions for ${name}`;
+    firstReadmeDescriptionLine(readme.content) || `README.md skill instructions for ${name}`;
   return {
     name,
     description,
@@ -536,9 +541,8 @@ async function discoverSkillsViaLegacyFileScan(): Promise<SkillDiscovery> {
       } as any);
 
       const name = typeof metadata.name === "string" ? metadata.name.trim() : "";
-      const description = typeof metadata.description === "string"
-        ? metadata.description.trim()
-        : "";
+      const description =
+        typeof metadata.description === "string" ? metadata.description.trim() : "";
       if (!name || !description) {
         if (
           !name &&
@@ -546,10 +550,12 @@ async function discoverSkillsViaLegacyFileScan(): Promise<SkillDiscovery> {
           metadataFile === group.readmeFile &&
           skillFile === group.readmeFile
         ) {
-          skills.push(await buildReadmeFallbackSkill({
-            baseDir: group.baseDir,
-            skillFile,
-          }));
+          skills.push(
+            await buildReadmeFallbackSkill({
+              baseDir: group.baseDir,
+              skillFile,
+            }),
+          );
           continue;
         }
         invalidMetadata.push(metadataFile);
@@ -583,9 +589,7 @@ async function discoverSkillsViaLegacyFileScan(): Promise<SkillDiscovery> {
       throw new Error(`发现 Skill 文件但读取失败：${readErrors[0]}`);
     }
     if (invalidMetadata.length > 0) {
-      throw new Error(
-        `发现 Skill 元数据无效：${invalidMetadata[0]}（需要 name + description）`,
-      );
+      throw new Error(`发现 Skill 元数据无效：${invalidMetadata[0]}（需要 name + description）`);
     }
   }
 
@@ -599,9 +603,7 @@ async function loadSkillsDiscovery(): Promise<SkillDiscovery> {
   return discoverSkillsViaLegacyFileScan();
 }
 
-export async function discoverSkills(
-  options: DiscoverSkillsOptions = {},
-): Promise<SkillDiscovery> {
+export async function discoverSkills(options: DiscoverSkillsOptions = {}): Promise<SkillDiscovery> {
   if (options.force) {
     invalidateSkillsDiscoveryCache();
   }
@@ -641,7 +643,9 @@ export async function readSkillText(params: {
   } as any);
 }
 
-export async function manageSkill(params: Record<string, unknown>): Promise<SystemManageSkillResponse> {
+export async function manageSkill(
+  params: Record<string, unknown>,
+): Promise<SystemManageSkillResponse> {
   const response = await invoke<SystemManageSkillResponse>("system_manage_skill", {
     payload: params,
   } as any);
@@ -668,9 +672,7 @@ export async function startSkillInstallJob(
   return response.installJob;
 }
 
-export async function getSkillInstallJobStatus(
-  jobId: string,
-): Promise<SkillInstallJobSnapshot> {
+export async function getSkillInstallJobStatus(jobId: string): Promise<SkillInstallJobSnapshot> {
   const response = await manageSkill({ action: "install_status", jobId });
   if (!response.installJob) {
     throw new Error("SkillsManager install_status did not return an install job");
@@ -705,8 +707,8 @@ export function buildSkillsSystemPrompt(params: {
     "- SkillsManager.path uses the skillFile below. It is relative to the fixed Skills root directory and may point to SKILL.md, skill.md, skill.json, or README.md.",
     '- For files referenced inside an enabled Skill, use file tools with root="skills" and a path relative to the fixed Skills root, for example Read(root="skills", path="<baseDir>/references/guide.md"), List, Glob, Grep, Write, Edit, or Delete.',
     "- You may update files inside enabled Skills when the user asks you to optimize or maintain them. Create, install, search/install from ClawHub, validate, package, or delete user Skills through SkillsManager actions.",
-    "- Never expand the fixed Skills root into an absolute local path in any tool call. If a path belongs to a Skill, keep it root-relative and set root=\"skills\".",
-    "- If Skill content contains absolute local paths, home-directory paths, drive-letter paths, or shell snippets that read Skill files with cat/ls/find/grep, treat those path fragments as non-portable examples and convert them to root=\"skills\" file-tool calls.",
+    '- Never expand the fixed Skills root into an absolute local path in any tool call. If a path belongs to a Skill, keep it root-relative and set root="skills".',
+    '- If Skill content contains absolute local paths, home-directory paths, drive-letter paths, or shell snippets that read Skill files with cat/ls/find/grep, treat those path fragments as non-portable examples and convert them to root="skills" file-tool calls.',
     "- Do not guess a Skill's exact instructions or script paths before reading the Skill file.",
     "- Relative paths inside a Skill (scripts/, references/, assets/, and so on) are resolved relative to baseDir.",
     "- If a Skill contains the {baseDir} placeholder, interpret it as the baseDir value in the metadata below (relative to the Skills root directory).",
@@ -717,7 +719,9 @@ export function buildSkillsSystemPrompt(params: {
           "- The user explicitly mentioned the following enabled Skills with `$skill-name` in this turn.",
           "- Treat these mentions as user intent to prioritize those Skills. Read and follow the mentioned Skill instructions before acting when they are relevant.",
           "- `$` mentions never grant access to disabled Skills; only the enabled Skills listed in this prompt are available.",
-          ...explicit.map((skill) => `- ${skill.name} (skillFile: ${skill.skillFile}, baseDir: ${skill.baseDir})`),
+          ...explicit.map(
+            (skill) => `- ${skill.name} (skillFile: ${skill.skillFile}, baseDir: ${skill.baseDir})`,
+          ),
         ].join("\n")
       : "",
     "",
diff --git a/crates/agent-gui/src/lib/tools/bashTimeoutPolicy.ts b/crates/agent-gui/src/lib/tools/bashTimeoutPolicy.ts
index 8ec19d704..aa222c15b 100644
--- a/crates/agent-gui/src/lib/tools/bashTimeoutPolicy.ts
+++ b/crates/agent-gui/src/lib/tools/bashTimeoutPolicy.ts
@@ -39,15 +39,9 @@ export function resolveBashTimeoutPolicy(providerId: ProviderId): BashTimeoutPol
   return BASH_TIMEOUT_POLICIES[providerId];
 }
 
-export function normalizeBashTimeoutMs(
-  value: unknown,
-  policy: BashTimeoutPolicy,
-) {
+export function normalizeBashTimeoutMs(value: unknown, policy: BashTimeoutPolicy) {
   if (typeof value !== "number" || !Number.isFinite(value)) {
     return policy.defaultTimeoutMs;
   }
-  return Math.min(
-    policy.maxTimeoutMs,
-    Math.max(MIN_BASH_TIMEOUT_MS, Math.floor(value)),
-  );
+  return Math.min(policy.maxTimeoutMs, Math.max(MIN_BASH_TIMEOUT_MS, Math.floor(value)));
 }
diff --git a/crates/agent-gui/src/lib/tools/builtinRegistry.ts b/crates/agent-gui/src/lib/tools/builtinRegistry.ts
index d645cc978..9b39a88b2 100644
--- a/crates/agent-gui/src/lib/tools/builtinRegistry.ts
+++ b/crates/agent-gui/src/lib/tools/builtinRegistry.ts
@@ -1,39 +1,38 @@
 import type { ToolCall, ToolResultMessage } from "@mariozechner/pi-ai";
-
-import type { McpServerConfig } from "../settings";
 import {
   listSubagentIdentities,
   listSubagentRuns,
   type SubagentIdentityRecord,
   type SubagentRunSummary,
 } from "../chat/subagent/subagentHistory";
+import type { SubagentRuntimeManager } from "../chat/subagent/subagentRuntimeManager";
+import type { SubagentScheduler } from "../chat/subagent/subagentScheduler";
 import type {
   AgentPromptTemplate,
   CodexRequestFormat,
+  McpServerConfig,
   ProviderId,
   ProviderModelConfig,
   ReasoningLevel,
 } from "../settings";
-import type { SubagentScheduler } from "../chat/subagent/subagentScheduler";
-import type { SubagentRuntimeManager } from "../chat/subagent/subagentRuntimeManager";
-import type { SystemToolId, SystemToolRuntimeScope } from "./customSystemTools";
+import type {
+  BuiltinToolBundle,
+  BuiltinToolExecutionContext,
+  BuiltinToolMetadata,
+} from "./builtinTypes";
 import { createCronTools } from "./cronTools";
+import type { SystemToolId, SystemToolRuntimeScope } from "./customSystemTools";
 import { createCustomSystemTools } from "./customSystemTools";
 import { createSubagentMessageTools } from "./delegate/messageTools";
 import { createDelegateTools } from "./delegateTools";
-import { createFsTools } from "./fsTools";
 import { createFileToolState, type FileToolState } from "./fileToolState";
-import { createMcpTools } from "./mcpTools";
+import { createFsTools } from "./fsTools";
 import { createMcpManagerTools } from "./mcpManagerTools";
+import { createMcpTools } from "./mcpTools";
 import { createMemoryTools } from "./memoryTools";
 import { createShellTools } from "./shellTools";
-import { createSkillTools } from "./skillTools";
 import type { SkillAccessPolicy } from "./skillAccessPolicy";
-import type {
-  BuiltinToolBundle,
-  BuiltinToolExecutionContext,
-  BuiltinToolMetadata,
-} from "./builtinTypes";
+import { createSkillTools } from "./skillTools";
 
 export type BuiltinToolRegistry = {
   tools: BuiltinToolBundle["tools"];
@@ -67,9 +66,7 @@ export type DelegateToolRuntimeConfig = {
   subagentScheduler?: SubagentScheduler;
 };
 
-async function loadExistingSubagentRuns(
-  conversationId?: string,
-): Promise<SubagentRunSummary[]> {
+async function loadExistingSubagentRuns(conversationId?: string): Promise<SubagentRunSummary[]> {
   const parentConversationId = conversationId?.trim();
   if (!parentConversationId) return [];
   try {
@@ -102,10 +99,7 @@ async function loadExistingSubagentIdentities(
 function createBuiltinToolRegistry(bundles: BuiltinToolBundle[]): BuiltinToolRegistry {
   const tools: BuiltinToolBundle["tools"] = [];
   const metadataByName = new Map<string, BuiltinToolMetadata>();
-  const executorsByName = new Map<
-    string,
-    BuiltinToolBundle["executeToolCall"]
-  >();
+  const executorsByName = new Map<string, BuiltinToolBundle["executeToolCall"]>();
 
   for (const bundle of bundles) {
     for (const tool of bundle.tools) {
@@ -241,9 +235,11 @@ async function buildBaseBuiltinToolBundles(params: BuildBuiltinBaseToolRegistryP
   return baseBundles;
 }
 
-export async function buildBuiltinToolRegistry(params: BuildBuiltinBaseToolRegistryParams & {
-  delegateRuntime?: DelegateToolRuntimeConfig;
-}) {
+export async function buildBuiltinToolRegistry(
+  params: BuildBuiltinBaseToolRegistryParams & {
+    delegateRuntime?: DelegateToolRuntimeConfig;
+  },
+) {
   const baseBundles = await buildBaseBuiltinToolBundles(params);
 
   if (!params.delegateRuntime) {
@@ -258,9 +254,7 @@ export async function buildBuiltinToolRegistry(params: BuildBuiltinBaseToolRegis
         currentAgentName: "Parent Agent",
       })
     : null;
-  const parentBundles = parentMessageBundle
-    ? [...baseBundles, parentMessageBundle]
-    : baseBundles;
+  const parentBundles = parentMessageBundle ? [...baseBundles, parentMessageBundle] : baseBundles;
   const storedSubagentRuns = Array.isArray(params.delegateRuntime.conversationSubagentRuns)
     ? []
     : await loadExistingSubagentRuns(params.delegateRuntime.conversationId);
diff --git a/crates/agent-gui/src/lib/tools/builtinTypes.ts b/crates/agent-gui/src/lib/tools/builtinTypes.ts
index 2556c0229..203a6eff4 100644
--- a/crates/agent-gui/src/lib/tools/builtinTypes.ts
+++ b/crates/agent-gui/src/lib/tools/builtinTypes.ts
@@ -49,9 +49,14 @@ export type BuiltinToolBundle<TExtra extends object = {}> = TExtra & {
 };
 
 export function createBuiltinMetadataMap(
-  entries: Array<[toolName: string, metadata: Omit<BuiltinToolMetadata, "groupId"> & {
-    groupId: BuiltinToolGroupId;
-  }]>,
+  entries: Array<
+    [
+      toolName: string,
+      metadata: Omit<BuiltinToolMetadata, "groupId"> & {
+        groupId: BuiltinToolGroupId;
+      },
+    ]
+  >,
 ) {
   return new Map<string, BuiltinToolMetadata>(entries);
 }
diff --git a/crates/agent-gui/src/lib/tools/cronTools.ts b/crates/agent-gui/src/lib/tools/cronTools.ts
index 067d100de..97c52ced0 100644
--- a/crates/agent-gui/src/lib/tools/cronTools.ts
+++ b/crates/agent-gui/src/lib/tools/cronTools.ts
@@ -1,12 +1,8 @@
+import type { Tool, ToolCall, ToolResultMessage } from "@mariozechner/pi-ai";
 import { Type } from "@sinclair/typebox";
 import { invoke } from "@tauri-apps/api/core";
 
-import type { Tool, ToolCall, ToolResultMessage } from "@mariozechner/pi-ai";
-
-import {
-  createBuiltinMetadataMap,
-  type BuiltinToolBundle,
-} from "./builtinTypes";
+import { type BuiltinToolBundle, createBuiltinMetadataMap } from "./builtinTypes";
 
 type SelectedModelInput = {
   customProviderId: string;
@@ -127,17 +123,10 @@ const MANAGE_CRON_TASK_PARAMETERS = Type.Object({
     }),
   ),
   type: Type.Optional(
-    Type.Union(
-      [
-        Type.Literal("bash"),
-        Type.Literal("http"),
-        Type.Literal("prompt"),
-      ],
-      {
-        description:
-          "Cron task implementation type. Required for create. Optional for update when switching the task kind.",
-      },
-    ),
+    Type.Union([Type.Literal("bash"), Type.Literal("http"), Type.Literal("prompt")], {
+      description:
+        "Cron task implementation type. Required for create. Optional for update when switching the task kind.",
+    }),
   ),
   enabled: Type.Optional(
     Type.Boolean({
@@ -146,28 +135,16 @@ const MANAGE_CRON_TASK_PARAMETERS = Type.Object({
     }),
   ),
   remaining_executions: Type.Optional(
-    Type.Union(
-      [
-        Type.Integer({ minimum: 0 }),
-        Type.Null(),
-      ],
-      {
-        description:
-          "Remaining run count for this cron task. Omit or pass null for unlimited runs. Pass 0 only when the task should be exhausted and disabled.",
-      },
-    ),
+    Type.Union([Type.Integer({ minimum: 0 }), Type.Null()], {
+      description:
+        "Remaining run count for this cron task. Omit or pass null for unlimited runs. Pass 0 only when the task should be exhausted and disabled.",
+    }),
   ),
   remainingExecutions: Type.Optional(
-    Type.Union(
-      [
-        Type.Integer({ minimum: 0 }),
-        Type.Null(),
-      ],
-      {
-        description:
-          "Camel-case alias for remaining_executions. Prefer remaining_executions unless the caller already uses camelCase.",
-      },
-    ),
+    Type.Union([Type.Integer({ minimum: 0 }), Type.Null()], {
+      description:
+        "Camel-case alias for remaining_executions. Prefer remaining_executions unless the caller already uses camelCase.",
+    }),
   ),
   script: Type.Optional(
     Type.String({
@@ -185,16 +162,13 @@ const MANAGE_CRON_TASK_PARAMETERS = Type.Object({
         }),
         method: Type.Optional(
           Type.String({
-            description:
-              "HTTP method for the scheduled request. Defaults to POST when omitted.",
+            description: "HTTP method for the scheduled request. Defaults to POST when omitted.",
           }),
         ),
         headers: Type.Optional(
-          Type.Record(
-            Type.String(),
-            Type.String(),
-            { description: "Optional HTTP headers for the scheduled request." },
-          ),
+          Type.Record(Type.String(), Type.String(), {
+            description: "Optional HTTP headers for the scheduled request.",
+          }),
         ),
         body: Type.Optional(
           Type.Any({
@@ -219,13 +193,11 @@ const MANAGE_CRON_TASK_PARAMETERS = Type.Object({
       {
         custom_provider_id: Type.String({
           minLength: 1,
-          description:
-            "Provider id from Settings -> Providers for a prompt cron task.",
+          description: "Provider id from Settings -> Providers for a prompt cron task.",
         }),
         model: Type.String({
           minLength: 1,
-          description:
-            "Model id used by the prompt cron task.",
+          description: "Model id used by the prompt cron task.",
         }),
       },
       {
@@ -246,13 +218,10 @@ function asRecord(value: unknown): Record<string, unknown> | null {
 }
 
 function hasOwnKey(value: Record<string, unknown>, key: string) {
-  return Object.prototype.hasOwnProperty.call(value, key);
+  return Object.hasOwn(value, key);
 }
 
-function pickOwnValue(
-  value: Record<string, unknown>,
-  keys: readonly string[],
-): unknown {
+function pickOwnValue(value: Record<string, unknown>, keys: readonly string[]): unknown {
   for (const key of keys) {
     if (hasOwnKey(value, key)) {
       return value[key];
@@ -261,10 +230,7 @@ function pickOwnValue(
   return undefined;
 }
 
-function hasAnyOwnKey(
-  value: Record<string, unknown>,
-  keys: readonly string[],
-) {
+function hasAnyOwnKey(value: Record<string, unknown>, keys: readonly string[]) {
   return keys.some((key) => hasOwnKey(value, key));
 }
 
@@ -337,9 +303,7 @@ function parseSelectedModelInput(
   if (!obj) {
     throw new Error(`CronTaskManager ${fieldLabel} must be an object.`);
   }
-  const customProviderId = normalizeText(
-    obj.custom_provider_id ?? obj.customProviderId,
-  );
+  const customProviderId = normalizeText(obj.custom_provider_id ?? obj.customProviderId);
   const model = normalizeText(obj.model);
   if (!customProviderId || !model) {
     throw new Error(
@@ -368,10 +332,7 @@ function canHttpMethodHaveBody(method: string): boolean {
   return method === "POST" || method === "PUT" || method === "PATCH" || method === "DELETE";
 }
 
-function parseHeaderMap(
-  value: unknown,
-  fieldLabel: string,
-): Record<string, string> | undefined {
+function parseHeaderMap(value: unknown, fieldLabel: string): Record<string, string> | undefined {
   if (value == null) return undefined;
   const obj = asRecord(value);
   if (!obj) {
@@ -380,8 +341,7 @@ function parseHeaderMap(
   const headers: Record<string, string> = {};
   for (const [rawKey, rawValue] of Object.entries(obj)) {
     const key = rawKey.trim();
-    const text =
-      typeof rawValue === "string" ? rawValue.trim() : String(rawValue ?? "").trim();
+    const text = typeof rawValue === "string" ? rawValue.trim() : String(rawValue ?? "").trim();
     if (!key || !text) continue;
     headers[key] = text;
   }
@@ -656,8 +616,7 @@ function formatCronLogTimestamp(value: number) {
 
 function buildCronLogLines(log: CronExecutionLogResponse, index: number) {
   const status = log.success ? "success" : "failed";
-  const exitCode =
-    typeof log.exitCode === "number" ? ` | exit_code=${log.exitCode}` : "";
+  const exitCode = typeof log.exitCode === "number" ? ` | exit_code=${log.exitCode}` : "";
   const output = log.output.trim();
   return [
     `${index + 1}. log_id=${log.id} | started_at=${formatCronLogTimestamp(log.startedAt)} | status=${status} | duration_ms=${log.durationMs}${exitCode}`,
@@ -694,7 +653,7 @@ function buildCronTaskManagerResultText(result: SystemCronTaskManagerResponse) {
     case "list_logs":
       return buildCronLogsResultText(result.logs ?? []);
     case "read":
-    default:
+    default: {
       if (result.task) {
         return ["Cron task details:", ...buildCronTaskDetailLines(result.task)].join("\n");
       }
@@ -711,6 +670,7 @@ function buildCronTaskManagerResultText(result: SystemCronTaskManagerResponse) {
         ),
         "Use action=read with task_id to inspect one task before action=update, action=delete, or action=list_logs.",
       ].join("\n");
+    }
   }
 }
 
diff --git a/crates/agent-gui/src/lib/tools/customSystemTools.ts b/crates/agent-gui/src/lib/tools/customSystemTools.ts
index a4ee2c29a..583e1abab 100644
--- a/crates/agent-gui/src/lib/tools/customSystemTools.ts
+++ b/crates/agent-gui/src/lib/tools/customSystemTools.ts
@@ -1,12 +1,8 @@
+import type { Tool, ToolCall, ToolResultMessage } from "@mariozechner/pi-ai";
 import { Type } from "@sinclair/typebox";
 import { invoke } from "@tauri-apps/api/core";
 
-import type { Tool, ToolCall, ToolResultMessage } from "@mariozechner/pi-ai";
-
-import {
-  createBuiltinMetadataMap,
-  type BuiltinToolBundle,
-} from "./builtinTypes";
+import { type BuiltinToolBundle, createBuiltinMetadataMap } from "./builtinTypes";
 
 type SystemHttpGetResponse = {
   url: string;
@@ -26,10 +22,7 @@ type SystemToolDefinition = {
   parameters: Tool["parameters"];
   isReadOnly: boolean;
   runtimeScopes: readonly SystemToolRuntimeScope[];
-  execute: (
-    toolCall: ToolCall,
-    signal?: AbortSignal,
-  ) => Promise<ToolResultMessage>;
+  execute: (toolCall: ToolCall, signal?: AbortSignal) => Promise<ToolResultMessage>;
 };
 
 function asErrorMessage(err: unknown) {
diff --git a/crates/agent-gui/src/lib/tools/delegate/createDelegateTools.ts b/crates/agent-gui/src/lib/tools/delegate/createDelegateTools.ts
index a7b7d1137..35a6dee6e 100644
--- a/crates/agent-gui/src/lib/tools/delegate/createDelegateTools.ts
+++ b/crates/agent-gui/src/lib/tools/delegate/createDelegateTools.ts
@@ -1,12 +1,4 @@
 import type { Tool, ToolCall, ToolResultMessage } from "@mariozechner/pi-ai";
-
-import { runAssistantWithTools } from "../../chat/runner/agentRunner";
-import {
-  appendMessagesToConversation,
-  buildRequestContext,
-  createConversationStateFromContext,
-  type ConversationViewState,
-} from "../../chat/conversation/conversationState";
 import {
   createCompactionThrottleState,
   noteCompactionApplied,
@@ -14,6 +6,13 @@ import {
   runMidTurnCompaction,
   runPreCompactConversation,
 } from "../../chat/compaction/contextCompaction";
+import {
+  appendMessagesToConversation,
+  buildRequestContext,
+  type ConversationViewState,
+  createConversationStateFromContext,
+} from "../../chat/conversation/conversationState";
+import { runAssistantWithTools } from "../../chat/runner/agentRunner";
 import {
   defaultSubagentHistoryRecorder,
   listSubagentMessages,
@@ -26,13 +25,16 @@ import {
 } from "../../chat/subagent/subagentHistory";
 import { renderSubagentMessageBusSnapshot } from "../../chat/subagent/subagentMessageBus";
 import type { SubagentRuntimeManager } from "../../chat/subagent/subagentRuntimeManager";
-import { createSubagentScheduler, type SubagentScheduler } from "../../chat/subagent/subagentScheduler";
+import {
+  createSubagentScheduler,
+  type SubagentScheduler,
+} from "../../chat/subagent/subagentScheduler";
 import type { ProviderId } from "../../settings";
 import {
-  createBuiltinMetadataMap,
   type BuiltinToolBundle,
   type BuiltinToolExecutionContext,
   type BuiltinToolMetadata,
+  createBuiltinMetadataMap,
   type DelegateAgentItemResultDetails,
   type DelegateAgentResultDetails,
 } from "../builtinTypes";
@@ -44,6 +46,12 @@ import {
   TEXT_DELTA_EVENT_CHUNK_CHARS,
   THINKING_DELTA_EVENT_CHUNK_CHARS,
 } from "./constants";
+import {
+  buildSubagentRunId,
+  normalizeHistoryError,
+  parseSubagentRunState,
+  rememberSubagentRun,
+} from "./history";
 import {
   createAgentTemplateLookup,
   createSubagentIdentity,
@@ -60,12 +68,12 @@ import {
   normalizeSubagentRunMode,
   resolveResumedAgentExecutionMode,
 } from "./input";
+import { createSubagentMessageTools } from "./messageTools";
 import {
   buildSubagentContext,
   buildSubagentContinuationMessage,
   buildSubagentMessageBusUpdateMessage,
 } from "./prompts";
-import { createSubagentMessageTools } from "./messageTools";
 import {
   buildDelegateAgentCardResult,
   buildDelegateAgentCardToolCall,
@@ -95,12 +103,6 @@ import {
   sanitizeLabelPart,
   truncateText,
 } from "./utils";
-import {
-  buildSubagentRunId,
-  normalizeHistoryError,
-  parseSubagentRunState,
-  rememberSubagentRun,
-} from "./history";
 import {
   buildWorktreeLabel,
   decideWorktreeApply,
@@ -147,15 +149,13 @@ export function createDelegateTools(params: {
   const readOnlyToolNames = new Set(readOnlyTools.map((tool) => tool.name));
   const createWorktree = params.createWorktree ?? defaultCreateWorktree;
   const getWorktreeStatus = params.getWorktreeStatus ?? defaultGetWorktreeStatus;
-  const applyWorktreeChanges =
-    params.applyWorktreeChanges ?? defaultApplyWorktreeChanges;
+  const applyWorktreeChanges = params.applyWorktreeChanges ?? defaultApplyWorktreeChanges;
   const cleanupWorktree = params.cleanupWorktree ?? defaultCleanupWorktree;
   const enqueueApplyWorktreeChanges = createSequentialQueue();
   const subagentHistory = params.subagentHistory ?? defaultSubagentHistoryRecorder;
   const messageBusEnabled = Boolean(params.parentConversationId?.trim());
   const subagentRuntimeManager = params.subagentRuntimeManager;
-  const fallbackSubagentScheduler =
-    params.subagentScheduler ?? createSubagentScheduler();
+  const fallbackSubagentScheduler = params.subagentScheduler ?? createSubagentScheduler();
   const loadMessageBusRecords = async (
     recipientAgentId?: string,
   ): Promise<SubagentMessageRecord[]> => {
@@ -175,10 +175,7 @@ export function createDelegateTools(params: {
       return [];
     }
   };
-  const renderMessageBusSnapshot = async (agent: {
-    id: string;
-    name?: string;
-  }) => {
+  const renderMessageBusSnapshot = async (agent: { id: string; name?: string }) => {
     const messages = await loadMessageBusRecords(agent.id);
     return renderSubagentMessageBusSnapshot({
       messages,
@@ -186,14 +183,8 @@ export function createDelegateTools(params: {
       currentAgentName: agent.name,
     });
   };
-  const enqueueByLogicalAgent = new Map<
-    string,
-    ReturnType<typeof createSequentialQueue>
-  >();
-  const enqueueLogicalAgentRun = <T>(
-    logicalAgentId: string,
-    run: () => Promise<T>,
-  ) => {
+  const enqueueByLogicalAgent = new Map<string, ReturnType<typeof createSequentialQueue>>();
+  const enqueueLogicalAgentRun = <T>(logicalAgentId: string, run: () => Promise<T>) => {
     const conversationKey =
       params.parentConversationId?.trim() || params.sessionId?.trim() || "conversation";
     const key = `${conversationKey}\0${logicalAgentId}`;
@@ -223,10 +214,7 @@ export function createDelegateTools(params: {
       "Include the new user request and any parent-conversation context each subagent needs in that agent's prompt. The full parent conversation is not automatically copied into subagents.",
       "Create a delegated agent once with stable id, name, role, and identity. For later calls to the same agent, pass the same id and only the new prompt for the current task; LiveAgent will reuse the stored identity and ignore attempts to rename or redefine that agent.",
       "Existing delegated agents that may be resumed by id:",
-      formatKnownSubagentRoster(
-        existingIdentitiesByLogicalAgent,
-        existingRunsByLogicalAgent,
-      ),
+      formatKnownSubagentRoster(existingIdentitiesByLogicalAgent, existingRunsByLogicalAgent),
       "Configured AGENTS templates that may be referenced by agent_id:",
       formatConfiguredAgents(templates),
     ].join("\n"),
@@ -267,10 +255,7 @@ export function createDelegateTools(params: {
     const agents: DelegateAgentInput[] = [];
     const canonicalizationNotes: string[] = [];
     for (const rawTask of rawAgents) {
-      const matchedIdentity = findKnownIdentityForTask(
-        rawTask,
-        existingIdentitiesByLogicalAgent,
-      );
+      const matchedIdentity = findKnownIdentityForTask(rawTask, existingIdentitiesByLogicalAgent);
       if (matchedIdentity && matchedIdentity.logicalAgentId !== rawTask.id) {
         canonicalizationNotes.push(
           `- requested id=${rawTask.id} name=${rawTask.name ?? "(none)"} -> id=${matchedIdentity.logicalAgentId} name=${matchedIdentity.displayName}`,
@@ -368,13 +353,10 @@ export function createDelegateTools(params: {
       agents.length,
       clampInteger(args.concurrency, DEFAULT_CONCURRENCY, 1, MAX_CONCURRENCY),
     );
-    const subagentScheduler =
-      context?.subagentScheduler ?? fallbackSubagentScheduler;
+    const subagentScheduler = context?.subagentScheduler ?? fallbackSubagentScheduler;
     const startedAt = Date.now();
     const runStableSubagent = <T>(logicalAgentId: string, run: () => Promise<T>) =>
-      enqueueLogicalAgentRun(logicalAgentId, () =>
-        subagentScheduler.runSubagent(run, signal),
-      );
+      enqueueLogicalAgentRun(logicalAgentId, () => subagentScheduler.runSubagent(run, signal));
 
     const taskResults = await runWithConcurrency(
       agents,
@@ -450,15 +432,12 @@ export function createDelegateTools(params: {
             index,
           });
           const subagentSessionId = params.sessionId
-            ? existingRunSummary?.sessionId ??
+            ? (existingRunSummary?.sessionId ??
               (rawTask.resume
                 ? `${params.sessionId}:subagent:${sanitizeLabelPart(task.id, `agent-${index + 1}`)}`
-                : `${params.sessionId}:subagent:${sanitizeLabelPart(task.id, `agent-${index + 1}`)}:fresh:${sanitizeLabelPart(runId, "run")}`)
+                : `${params.sessionId}:subagent:${sanitizeLabelPart(task.id, `agent-${index + 1}`)}:fresh:${sanitizeLabelPart(runId, "run")}`))
             : undefined;
-          const rememberResult = (
-            result: DelegateAgentItemResultDetails,
-            endedAt?: number,
-          ) => {
+          const rememberResult = (result: DelegateAgentItemResultDetails, endedAt?: number) => {
             rememberSubagentRun(existingRunsByLogicalAgent, {
               runId,
               task,
@@ -530,10 +509,7 @@ export function createDelegateTools(params: {
             };
           };
           {
-            const childRuntime = withSubagentMessageTools(
-              readOnlyTools,
-              params.executeToolCall,
-            );
+            const childRuntime = withSubagentMessageTools(readOnlyTools, params.executeToolCall);
             childTools = childRuntime.tools;
             childExecuteToolCall = childRuntime.executeToolCall;
             childToolNames = new Set(childTools.map((tool) => tool.name));
@@ -859,9 +835,7 @@ export function createDelegateTools(params: {
                 payload: {
                   source: resumeSource,
                   error: normalizeErrorMessage(
-                    compactionErr instanceof Error
-                      ? compactionErr.message
-                      : String(compactionErr),
+                    compactionErr instanceof Error ? compactionErr.message : String(compactionErr),
                     "Subagent pre-compaction failed",
                   ),
                 },
@@ -1075,10 +1049,7 @@ export function createDelegateTools(params: {
                   roundIndex: round,
                   toolCallId: childToolCall.id,
                   toolName: childToolCall.name,
-                  isError:
-                    toolResult.role === "toolResult"
-                      ? Boolean(toolResult.isError)
-                      : false,
+                  isError: toolResult.role === "toolResult" ? Boolean(toolResult.isError) : false,
                   payload: { toolCall: childToolCall, toolResult },
                 });
               },
@@ -1095,10 +1066,7 @@ export function createDelegateTools(params: {
                 flushTextDeltaBuffer();
                 flushThinkingDeltaBuffer();
                 noteCompactionRound(compactionThrottleState);
-                const tempState = appendMessagesToConversation(
-                  subagentState,
-                  emittedMessages,
-                );
+                const tempState = appendMessagesToConversation(subagentState, emittedMessages);
                 const requestContext = buildRequestContext(tempState);
                 const busSnapshot = await renderMessageBusSnapshot({
                   id: task.id,
@@ -1196,10 +1164,7 @@ export function createDelegateTools(params: {
               signal,
             });
 
-            subagentState = appendMessagesToConversation(
-              subagentState,
-              result.emittedMessages,
-            );
+            subagentState = appendMessagesToConversation(subagentState, result.emittedMessages);
 
             if (worktree) {
               try {
@@ -1273,7 +1238,7 @@ export function createDelegateTools(params: {
               applyPatchBytes = 0;
               applySkippedReason = worktreeStatusError
                 ? "status_unavailable"
-                : applyDecision?.skippedReason ?? "no_changes";
+                : (applyDecision?.skippedReason ?? "no_changes");
               recordEvent({
                 eventType: "worktree_apply_skipped",
                 payload: {
@@ -1318,8 +1283,7 @@ export function createDelegateTools(params: {
                     });
                   } else {
                     worktreeCleanupStatus = "skipped";
-                    worktreeCleanupReason =
-                      cleanupResult.skippedReason ?? worktreeCleanupReason;
+                    worktreeCleanupReason = cleanupResult.skippedReason ?? worktreeCleanupReason;
                     recordEvent({
                       eventType: "worktree_cleanup_skipped",
                       payload: cleanupResult,
@@ -1359,51 +1323,54 @@ export function createDelegateTools(params: {
             });
             await flushHistory();
             const completedAt = Date.now();
-            const completedAgent = rememberResult({
-              id: task.id,
-              runId,
-              name: displayName,
-              role: identity.role,
-              prompt: task.prompt,
-              agentId: task.agentId,
-              agentName: template?.name,
-              mode: task.mode,
-              taskIntent: task.taskIntent,
-              applyPolicy: task.applyPolicy,
-              allowedOutputPaths: task.allowedOutputPaths,
-              status: "completed",
-              summary: summary || "(subagent returned an empty report)",
-              durationMs: Date.now() - taskStartedAt,
-              rounds,
-              toolCalls,
-              worktreeRoot: worktree?.worktree_root,
-              workdir: worktree?.workdir,
-              branchName: worktree?.branch_name,
-              changed: worktreeStatus?.changed,
-              statusText: worktreeStatus?.status,
-              diffStat: worktreeStatus?.diff_stat,
-              diff: worktreeStatus?.diff,
-              diffTruncated: worktreeStatus?.diff_truncated,
-              untrackedFiles: worktreeStatus?.untracked_files,
-              worktreeStatusError,
-              applyStatus,
-              applyMethod,
-              applyChanged,
-              applyPatchBytes,
-              applySkippedReason,
-              applyFallbackReason,
-              applyCopiedFiles,
-              applyDeletedFiles,
-              applyConflictFiles,
-              applyError,
-              appliedToWorkdir,
-              worktreeCleanupStatus,
-              worktreeCleanupReason,
-              worktreeCleanupError,
-              worktreeBranchDeleted,
-              candidateArtifacts,
-              changedPaths,
-            }, completedAt);
+            const completedAgent = rememberResult(
+              {
+                id: task.id,
+                runId,
+                name: displayName,
+                role: identity.role,
+                prompt: task.prompt,
+                agentId: task.agentId,
+                agentName: template?.name,
+                mode: task.mode,
+                taskIntent: task.taskIntent,
+                applyPolicy: task.applyPolicy,
+                allowedOutputPaths: task.allowedOutputPaths,
+                status: "completed",
+                summary: summary || "(subagent returned an empty report)",
+                durationMs: Date.now() - taskStartedAt,
+                rounds,
+                toolCalls,
+                worktreeRoot: worktree?.worktree_root,
+                workdir: worktree?.workdir,
+                branchName: worktree?.branch_name,
+                changed: worktreeStatus?.changed,
+                statusText: worktreeStatus?.status,
+                diffStat: worktreeStatus?.diff_stat,
+                diff: worktreeStatus?.diff,
+                diffTruncated: worktreeStatus?.diff_truncated,
+                untrackedFiles: worktreeStatus?.untracked_files,
+                worktreeStatusError,
+                applyStatus,
+                applyMethod,
+                applyChanged,
+                applyPatchBytes,
+                applySkippedReason,
+                applyFallbackReason,
+                applyCopiedFiles,
+                applyDeletedFiles,
+                applyConflictFiles,
+                applyError,
+                appliedToWorkdir,
+                worktreeCleanupStatus,
+                worktreeCleanupReason,
+                worktreeCleanupError,
+                worktreeBranchDeleted,
+                candidateArtifacts,
+                changedPaths,
+              },
+              completedAt,
+            );
             return finishAgent(completedAgent);
           } catch (err) {
             if (worktree) {
@@ -1445,43 +1412,46 @@ export function createDelegateTools(params: {
             });
             await flushHistory();
             const failedAt = Date.now();
-            const failedAgent = rememberResult({
-              id: task.id,
-              runId,
-              name: displayName,
-              role: identity.role,
-              prompt: task.prompt,
-              agentId: task.agentId,
-              agentName: template?.name,
-              mode: task.mode,
-              taskIntent: task.taskIntent,
-              applyPolicy: task.applyPolicy,
-              allowedOutputPaths: task.allowedOutputPaths,
-              status: "failed",
-              summary: "",
-              durationMs: Date.now() - taskStartedAt,
-              rounds,
-              toolCalls,
-              error: message,
-              worktreeRoot: worktree?.worktree_root,
-              workdir: worktree?.workdir,
-              branchName: worktree?.branch_name,
-              changed: worktreeStatus?.changed,
-              statusText: worktreeStatus?.status,
-              diffStat: worktreeStatus?.diff_stat,
-              diff: worktreeStatus?.diff,
-              diffTruncated: worktreeStatus?.diff_truncated,
-              untrackedFiles: worktreeStatus?.untracked_files,
-              worktreeStatusError,
-              applyStatus: worktree ? "skipped" : undefined,
-              applyChanged: worktree ? false : undefined,
-              applyPatchBytes: worktree ? 0 : undefined,
-              applySkippedReason: worktree ? "agent_failed" : undefined,
-              worktreeCleanupStatus: worktree ? "retained" : undefined,
-              worktreeCleanupReason: worktree ? "agent_failed" : undefined,
-              candidateArtifacts,
-              changedPaths,
-            }, failedAt);
+            const failedAgent = rememberResult(
+              {
+                id: task.id,
+                runId,
+                name: displayName,
+                role: identity.role,
+                prompt: task.prompt,
+                agentId: task.agentId,
+                agentName: template?.name,
+                mode: task.mode,
+                taskIntent: task.taskIntent,
+                applyPolicy: task.applyPolicy,
+                allowedOutputPaths: task.allowedOutputPaths,
+                status: "failed",
+                summary: "",
+                durationMs: Date.now() - taskStartedAt,
+                rounds,
+                toolCalls,
+                error: message,
+                worktreeRoot: worktree?.worktree_root,
+                workdir: worktree?.workdir,
+                branchName: worktree?.branch_name,
+                changed: worktreeStatus?.changed,
+                statusText: worktreeStatus?.status,
+                diffStat: worktreeStatus?.diff_stat,
+                diff: worktreeStatus?.diff,
+                diffTruncated: worktreeStatus?.diff_truncated,
+                untrackedFiles: worktreeStatus?.untracked_files,
+                worktreeStatusError,
+                applyStatus: worktree ? "skipped" : undefined,
+                applyChanged: worktree ? false : undefined,
+                applyPatchBytes: worktree ? 0 : undefined,
+                applySkippedReason: worktree ? "agent_failed" : undefined,
+                worktreeCleanupStatus: worktree ? "retained" : undefined,
+                worktreeCleanupReason: worktree ? "agent_failed" : undefined,
+                candidateArtifacts,
+                changedPaths,
+              },
+              failedAt,
+            );
             return finishAgent(failedAgent);
           }
         });
diff --git a/crates/agent-gui/src/lib/tools/delegate/history.ts b/crates/agent-gui/src/lib/tools/delegate/history.ts
index cbd2d48c9..035ab338c 100644
--- a/crates/agent-gui/src/lib/tools/delegate/history.ts
+++ b/crates/agent-gui/src/lib/tools/delegate/history.ts
@@ -1,8 +1,15 @@
 import type { Tool, ToolCall } from "@mariozechner/pi-ai";
 
-import type { ConversationViewState, StoredContextSegment } from "../../chat/conversation/conversationState";
+import type {
+  ConversationViewState,
+  StoredContextSegment,
+} from "../../chat/conversation/conversationState";
 import { normalizeConversationState } from "../../chat/conversation/conversationState";
-import type { SubagentIdentityRecord, SubagentRunRecord, SubagentRunSummary } from "../../chat/subagent/subagentHistory";
+import type {
+  SubagentIdentityRecord,
+  SubagentRunRecord,
+  SubagentRunSummary,
+} from "../../chat/subagent/subagentHistory";
 import type { ProviderId } from "../../settings";
 import type { DelegateAgentItemResultDetails } from "../builtinTypes";
 import { buildSubagentSystemPrompt } from "./prompts";
diff --git a/crates/agent-gui/src/lib/tools/delegate/identity.ts b/crates/agent-gui/src/lib/tools/delegate/identity.ts
index 320548373..3af2db463 100644
--- a/crates/agent-gui/src/lib/tools/delegate/identity.ts
+++ b/crates/agent-gui/src/lib/tools/delegate/identity.ts
@@ -1,4 +1,8 @@
-import type { SubagentIdentityRecord, SubagentRunStatus, SubagentRunSummary } from "../../chat/subagent/subagentHistory";
+import type {
+  SubagentIdentityRecord,
+  SubagentRunStatus,
+  SubagentRunSummary,
+} from "../../chat/subagent/subagentHistory";
 import type { DelegateAgentInput, DelegateAgentTemplate } from "./types";
 import { truncateText } from "./utils";
 
@@ -66,9 +70,7 @@ function isSyntheticSubagentIdentity(value: string | undefined) {
   const text = value?.trim();
   if (!text) return true;
   return (
-    /^(?:agent\s*-?\s*\d+|day\s*\d+|night\s*\d+|round\s*\d+|vote|pk|final)\b/i.test(
-      text,
-    ) ||
+    /^(?:agent\s*-?\s*\d+|day\s*\d+|night\s*\d+|round\s*\d+|vote|pk|final)\b/i.test(text) ||
     /(?:会议|辩论|投票|行动|查验|最终|决定|揭晓|总结|法官|生死局|修正|round|night|day|vote|pk)/i.test(
       text,
     )
@@ -97,9 +99,7 @@ function textAddressesKnownName(text: string, knownName: string) {
   const name = knownName.trim();
   if (!name) return false;
   const escaped = escapeRegExp(name);
-  const asciiTailGuard = isAsciiWordChar(name[name.length - 1])
-    ? "(?![a-zA-Z0-9_])"
-    : "";
+  const asciiTailGuard = isAsciiWordChar(name[name.length - 1]) ? "(?![a-zA-Z0-9_])" : "";
   return new RegExp(
     `(?:你是|我是|作为|扮演|以|请用|用)\\s*(?:【|\\(|（|「|『|“|")?${escaped}${asciiTailGuard}(?:】|\\)|）|」|』|”|")?`,
     "i",
@@ -128,9 +128,7 @@ export function formatConfiguredAgents(templates: DelegateAgentTemplate[]) {
 }
 
 function normalizeSubagentRunStatus(value: string): SubagentRunStatus {
-  return value === "completed" || value === "failed" || value === "cancelled"
-    ? value
-    : "running";
+  return value === "completed" || value === "failed" || value === "cancelled" ? value : "running";
 }
 
 function titleizeStableId(value: string) {
@@ -139,9 +137,7 @@ function titleizeStableId(value: string) {
     .split(/[^a-zA-Z0-9]+/g)
     .filter(Boolean);
   if (words.length === 0) return "";
-  return words
-    .map((word) => `${word.slice(0, 1).toUpperCase()}${word.slice(1)}`)
-    .join(" ");
+  return words.map((word) => `${word.slice(0, 1).toUpperCase()}${word.slice(1)}`).join(" ");
 }
 
 export function latestRunsByLogicalAgent(runs: SubagentRunSummary[]) {
@@ -248,10 +244,7 @@ export function shouldRejectLikelyExistingAgentFork(params: {
   if (params.identitiesByLogicalAgent.size === 0) return null;
   if (params.identitiesByLogicalAgent.has(params.task.id)) return null;
   if (params.task.taskIntent !== "communication") return null;
-  const referenced = referencedKnownIdentities(
-    params.task,
-    params.identitiesByLogicalAgent,
-  );
+  const referenced = referencedKnownIdentities(params.task, params.identitiesByLogicalAgent);
   if (referenced.length === 0) return null;
   const looksLikePhaseOrAggregate =
     isSyntheticSubagentIdentity(params.task.id) ||
@@ -328,9 +321,7 @@ function buildIdentityPrompt(params: {
     params.template?.prompt.trim()
       ? `Configured template instructions:\n${params.template.prompt.trim()}`
       : "",
-    params.task.prompt.trim()
-      ? `Initial identity/task context:\n${params.task.prompt.trim()}`
-      : "",
+    params.task.prompt.trim() ? `Initial identity/task context:\n${params.task.prompt.trim()}` : "",
     `Identity summary: ${params.displayName} - ${params.role}`,
   ].filter(Boolean);
   return lines.join("\n\n");
diff --git a/crates/agent-gui/src/lib/tools/delegate/input.ts b/crates/agent-gui/src/lib/tools/delegate/input.ts
index 704cb92f8..d2782de1a 100644
--- a/crates/agent-gui/src/lib/tools/delegate/input.ts
+++ b/crates/agent-gui/src/lib/tools/delegate/input.ts
@@ -1,5 +1,10 @@
 import { MAX_AGENTS } from "./constants";
-import type { DelegateAgentInput, DelegateApplyPolicy, DelegateExecutionMode, DelegateTaskIntent } from "./types";
+import type {
+  DelegateAgentInput,
+  DelegateApplyPolicy,
+  DelegateExecutionMode,
+  DelegateTaskIntent,
+} from "./types";
 import { optionalString } from "./utils";
 
 function normalizeExecutionModeOpt(value: unknown): DelegateExecutionMode | undefined {
@@ -62,18 +67,14 @@ function normalizePathList(value: unknown): string[] {
 }
 
 function maybeOutputPath(value: string) {
-  const text = value
-    .trim()
-    .replace(/^[`"'“”‘’]+|[`"'“”‘’，,。.；;:：)）\]]+$/g, "");
-  if (!text || /[*?\[\]]/.test(text) || /^https?:\/\//i.test(text)) return "";
+  const text = value.trim().replace(/^[`"'“”‘’]+|[`"'“”‘’，,。.；;:：)）\]]+$/g, "");
+  if (!text || /[*?[\]]/.test(text) || /^https?:\/\//i.test(text)) return "";
   if (/\s/.test(text)) return "";
   if (!/\.[a-z0-9]{1,12}$/i.test(text)) return "";
   return normalizeRelativePath(text);
 }
 
-function inferAllowedOutputPaths(params: {
-  prompt?: string;
-}): string[] {
+function inferAllowedOutputPaths(params: { prompt?: string }): string[] {
   const text = params.prompt ?? "";
   const out: string[] = [];
   const pushPath = (value: string) => {
@@ -100,9 +101,7 @@ function textMatches(text: string, pattern: RegExp) {
   return pattern.test(text);
 }
 
-function inferTaskIntent(params: {
-  prompt?: string;
-}): DelegateTaskIntent {
+function inferTaskIntent(params: { prompt?: string }): DelegateTaskIntent {
   const text = (params.prompt ?? "").toLowerCase();
   if (
     textMatches(
@@ -123,7 +122,12 @@ function inferTaskIntent(params: {
   if (textMatches(text, /(review|audit|inspect|verify|check|评审|审查|审核|复核|验证|检查)/i)) {
     return "review";
   }
-  if (textMatches(text, /(research|investigate|analy[sz]e|analysis|look up|调研|调查|分析|研究|查找)/i)) {
+  if (
+    textMatches(
+      text,
+      /(research|investigate|analy[sz]e|analysis|look up|调研|调查|分析|研究|查找)/i,
+    )
+  ) {
     return "research";
   }
   if (
@@ -182,7 +186,10 @@ export function resolveResumedAgentExecutionMode(params: {
 }
 
 function normalizeAgentSpecKey(value: string) {
-  const key = value.trim().toLowerCase().replace(/[\s-]+/g, "_");
+  const key = value
+    .trim()
+    .toLowerCase()
+    .replace(/[\s-]+/g, "_");
   if (key === "id" || key === "agent" || key === "agent_id_for_resume") return "id";
   if (key === "name" || key === "agent_name") return "name";
   if (key === "agent_id" || key === "template" || key === "template_id") return "agent_id";
@@ -198,20 +205,11 @@ function normalizeAgentSpecKey(value: string) {
     return "allowed_output_paths";
   }
   if (key === "resume") return "resume";
-  if (
-    key === "retain_worktree" ||
-    key === "keep_worktree" ||
-    key === "preserve_worktree"
-  ) {
+  if (key === "retain_worktree" || key === "keep_worktree" || key === "preserve_worktree") {
     return "retain_worktree";
   }
   if (key === "role" || key === "persona") return "role";
-  if (
-    key === "identity" ||
-    key === "system_prompt" ||
-    key === "system" ||
-    key === "profile"
-  ) {
+  if (key === "identity" || key === "system_prompt" || key === "system" || key === "profile") {
     return "identity";
   }
   if (
@@ -229,7 +227,7 @@ function normalizeAgentSpecKey(value: string) {
 function unquoteAgentSpecValue(value: string) {
   const text = value.trim();
   if (
-    (text.startsWith("\"") && text.endsWith("\"")) ||
+    (text.startsWith('"') && text.endsWith('"')) ||
     (text.startsWith("'") && text.endsWith("'"))
   ) {
     return text.slice(1, -1);
@@ -255,11 +253,7 @@ function parseAgentSpecScalar(value: string): unknown {
   return text;
 }
 
-function appendAgentSpecField(
-  record: Record<string, unknown>,
-  key: string,
-  value: string,
-) {
+function appendAgentSpecField(record: Record<string, unknown>, key: string, value: string) {
   const normalizedKey = normalizeAgentSpecKey(key);
   if (!normalizedKey) return "";
   if (normalizedKey === "resume" || normalizedKey === "retain_worktree") {
@@ -326,9 +320,7 @@ function parseAgentSpecBlock(lines: string[]) {
     }
 
     const fieldMatch = /^([a-zA-Z_][\w\s-]{0,40})\s*[:=]\s*(.*)$/.exec(trimmed);
-    const normalizedField = fieldMatch
-      ? normalizeAgentSpecKey(fieldMatch[1] ?? "")
-      : "";
+    const normalizedField = fieldMatch ? normalizeAgentSpecKey(fieldMatch[1] ?? "") : "";
     if (fieldMatch && normalizedField) {
       const rawValue = (fieldMatch[2] ?? "").trim();
       activeKey = normalizedField;
@@ -366,8 +358,7 @@ function shouldTreatTextAsAgentSpec(value: unknown) {
   if (!text) return false;
   if (/^\s*@agent\b/im.test(text)) return true;
   return (
-    /^\s*agent\s+\d+\s*:/im.test(text) &&
-    /^\s*(name|role|identity|prompt|task)\s*[:=]/im.test(text)
+    /^\s*agent\s+\d+\s*:/im.test(text) && /^\s*(name|role|identity|prompt|task)\s*[:=]/im.test(text)
   );
 }
 
@@ -389,9 +380,7 @@ function normalizeAgentInput(
   }
   const id = optionalString(rawAgent.id) ?? `agent-${index + 1}`;
   const taskIntent =
-    normalizeTaskIntent(rawAgent.task_intent) ??
-    inheritedTaskIntent ??
-    inferTaskIntent({ prompt });
+    normalizeTaskIntent(rawAgent.task_intent) ?? inheritedTaskIntent ?? inferTaskIntent({ prompt });
   const taskIntentSpecified =
     normalizeTaskIntent(rawAgent.task_intent) !== undefined || inheritedTaskIntentSpecified;
   const rawMode = normalizeExecutionModeOpt(rawAgent.mode);
@@ -451,9 +440,7 @@ export function normalizeDelegateAgents(args: Record<string, unknown>): Delegate
       : undefined;
   const agentSpec = explicitAgentSpec ?? promptAgentSpec;
   if (agentSpec) {
-    const specItems = parseAgentSpec(agentSpec).filter(
-      (item) => optionalString(item.prompt),
-    );
+    const specItems = parseAgentSpec(agentSpec).filter((item) => optionalString(item.prompt));
     if (specItems.length === 0) {
       throw new Error("Agent.agent_spec must include at least one agent with prompt.");
     }
diff --git a/crates/agent-gui/src/lib/tools/delegate/messageTools.ts b/crates/agent-gui/src/lib/tools/delegate/messageTools.ts
index cca00d4a8..7a6564002 100644
--- a/crates/agent-gui/src/lib/tools/delegate/messageTools.ts
+++ b/crates/agent-gui/src/lib/tools/delegate/messageTools.ts
@@ -1,10 +1,5 @@
 import type { Tool, ToolCall, ToolResultMessage } from "@mariozechner/pi-ai";
 import { Type } from "@sinclair/typebox";
-
-import {
-  SUBAGENT_BROADCAST_RECIPIENT,
-  SUBAGENT_PARENT_AGENT_ID,
-} from "../../chat/subagent/subagentMessageBus";
 import {
   appendSubagentMessage,
   type SubagentHistoryRecorder,
@@ -12,18 +7,14 @@ import {
   type SubagentMessageRecord,
 } from "../../chat/subagent/subagentHistory";
 import {
-  createBuiltinMetadataMap,
-  type BuiltinToolBundle,
-} from "../builtinTypes";
+  SUBAGENT_BROADCAST_RECIPIENT,
+  SUBAGENT_PARENT_AGENT_ID,
+} from "../../chat/subagent/subagentMessageBus";
+import { type BuiltinToolBundle, createBuiltinMetadataMap } from "../builtinTypes";
 
 export const SEND_MESSAGE_TOOL_NAME = "SendMessage";
 
-const CHANNELS = new Set<SubagentMessageChannel>([
-  "direct",
-  "shared",
-  "decision",
-  "question",
-]);
+const CHANNELS = new Set<SubagentMessageChannel>(["direct", "shared", "decision", "question"]);
 
 function asRecord(value: unknown): Record<string, unknown> {
   return value && typeof value === "object" && !Array.isArray(value)
@@ -125,8 +116,7 @@ export function createSubagentMessageTools(params: {
               Type.Literal("question"),
             ],
             {
-              description:
-                "Optional bus channel. Defaults to direct, or shared when to=*.",
+              description: "Optional bus channel. Defaults to direct, or shared when to=*.",
             },
           ),
         ),
@@ -195,8 +185,7 @@ export function createSubagentMessageTools(params: {
     const args = asRecord(toolCall.arguments);
     const rawChannel = asString(args.channel).toLowerCase();
     const recipientAgentId =
-      normalizeRecipient(args.to) ||
-      (rawChannel === "shared" ? SUBAGENT_BROADCAST_RECIPIENT : "");
+      normalizeRecipient(args.to) || (rawChannel === "shared" ? SUBAGENT_BROADCAST_RECIPIENT : "");
     const bodyMarkdown = asString(args.message);
     if (!recipientAgentId || !bodyMarkdown) {
       return {
diff --git a/crates/agent-gui/src/lib/tools/delegate/prompts.ts b/crates/agent-gui/src/lib/tools/delegate/prompts.ts
index 1d45b4958..8b560468c 100644
--- a/crates/agent-gui/src/lib/tools/delegate/prompts.ts
+++ b/crates/agent-gui/src/lib/tools/delegate/prompts.ts
@@ -1,6 +1,9 @@
 import type { Context, Message, Tool } from "@mariozechner/pi-ai";
 
-import type { SubagentIdentityRecord, SubagentRunSummary } from "../../chat/subagent/subagentHistory";
+import type {
+  SubagentIdentityRecord,
+  SubagentRunSummary,
+} from "../../chat/subagent/subagentHistory";
 import type { DelegateAgentInput, DelegateAgentTemplate, DelegateWorktreeInfo } from "./types";
 
 export function buildSubagentSystemPrompt(params: {
@@ -107,9 +110,7 @@ function buildSubagentUserPrompt(params: {
     "",
     "Current task:",
     params.task.prompt,
-    params.messageBusSnapshot
-      ? ["", params.messageBusSnapshot].join("\n")
-      : "",
+    params.messageBusSnapshot ? ["", params.messageBusSnapshot].join("\n") : "",
     "",
     params.task.applyPolicy === "none"
       ? params.messageBusEnabled
@@ -117,7 +118,9 @@ function buildSubagentUserPrompt(params: {
         : "Do not create or modify workspace files for communication. Return your answer in the final report."
       : "",
     "Return only the final report for the parent agent.",
-  ].filter((line) => line !== "").join("\n");
+  ]
+    .filter((line) => line !== "")
+    .join("\n");
 }
 
 export function buildSubagentContext(params: {
@@ -205,11 +208,7 @@ export function buildSubagentMessageBusUpdateMessage(snapshot: string): Message
     content: [
       {
         type: "text",
-        text: [
-          "LiveAgent Message Bus snapshot refreshed for this turn.",
-          "",
-          text,
-        ].join("\n"),
+        text: ["LiveAgent Message Bus snapshot refreshed for this turn.", "", text].join("\n"),
       },
     ],
     timestamp: Date.now(),
diff --git a/crates/agent-gui/src/lib/tools/delegate/results.ts b/crates/agent-gui/src/lib/tools/delegate/results.ts
index 6d1e24e30..890442763 100644
--- a/crates/agent-gui/src/lib/tools/delegate/results.ts
+++ b/crates/agent-gui/src/lib/tools/delegate/results.ts
@@ -1,7 +1,11 @@
 import type { ToolCall, ToolResultMessage } from "@mariozechner/pi-ai";
 
 import type { SubagentIdentityRecord } from "../../chat/subagent/subagentHistory";
-import type { DelegateAgentCardResultDetails, DelegateAgentItemResultDetails, DelegateAgentResultDetails } from "../builtinTypes";
+import type {
+  DelegateAgentCardResultDetails,
+  DelegateAgentItemResultDetails,
+  DelegateAgentResultDetails,
+} from "../builtinTypes";
 import { DELEGATE_TOOL_NAME } from "./constants";
 import type { DelegateAgentInput } from "./types";
 
@@ -19,7 +23,11 @@ export function buildDelegateResultText(details: DelegateAgentResultDetails) {
       `mode=${task.mode}`,
       task.taskIntent ? `intent=${task.taskIntent}` : "",
       task.applyPolicy ? `apply_policy=${task.applyPolicy}` : "",
-      task.agentName ? `template=${task.agentName}` : task.agentId ? `template=${task.agentId}` : "template=generic",
+      task.agentName
+        ? `template=${task.agentName}`
+        : task.agentId
+          ? `template=${task.agentId}`
+          : "template=generic",
       `duration_ms=${task.durationMs} rounds=${task.rounds} tool_calls=${task.toolCalls}`,
       task.worktreeRoot ? `worktree=${task.worktreeRoot}` : "",
       task.branchName ? `branch=${task.branchName}` : "",
diff --git a/crates/agent-gui/src/lib/tools/delegate/schema.ts b/crates/agent-gui/src/lib/tools/delegate/schema.ts
index 8e626726a..8ccf9b0b6 100644
--- a/crates/agent-gui/src/lib/tools/delegate/schema.ts
+++ b/crates/agent-gui/src/lib/tools/delegate/schema.ts
@@ -5,8 +5,7 @@ import { DEFAULT_CONCURRENCY, MAX_CONCURRENCY } from "./constants";
 const DELEGATE_EXECUTION_MODE_SCHEMA = Type.Union(
   [Type.Literal("worktree"), Type.Literal("readonly")],
   {
-    description:
-      "readonly for message/research/review agents; worktree for isolated file changes.",
+    description: "readonly for message/research/review agents; worktree for isolated file changes.",
   },
 );
 
@@ -32,75 +31,75 @@ const DELEGATE_APPLY_POLICY_SCHEMA = Type.Union(
   },
 );
 
-export const DELEGATE_AGENT_PARAMETERS = Type.Object({
-  agent_spec: Type.Optional(
-    Type.String({
-      description:
-        "Plain-text manifest for two or more agents, or any long identity/persona. Do not write JSON arrays here. Use blocks like: @agent id=player1 mode=readonly, then one field per line: name=Player 1, role=..., identity=..., prompt=..., and --- between agents. name:/role:/identity:/prompt: are also accepted.",
-    }),
-  ),
-  id: Type.Optional(
-    Type.String({
-      description:
-        "Stable id for one agent. Reuse the same id to resume that agent.",
-    }),
-  ),
-  name: Type.Optional(
-    Type.String({
-      description:
-        "Short display name for a newly created single agent. Ignored when id already exists.",
-    }),
-  ),
-  role: Type.Optional(
-    Type.String({
-      description:
-        "Short stable role for a newly created single agent. Use agent_spec for long personas.",
-    }),
-  ),
-  identity: Type.Optional(
-    Type.String({
-      description:
-        "Stable identity for a newly created single agent. Use agent_spec for long identity text.",
-    }),
-  ),
-  agent_id: Type.Optional(
-    Type.String({
-      description:
-        "Optional configured AGENTS template id or name for one agent.",
-    }),
-  ),
-  prompt: Type.Optional(
-    Type.String({
-      description:
-        "Current task prompt for one agent. For an existing id, this is normally the only prompt-like field needed. If this contains @agent blocks, LiveAgent parses it as a plain-text manifest. Do not restate stable identity for an existing id.",
-    }),
-  ),
-  mode: Type.Optional(DELEGATE_EXECUTION_MODE_SCHEMA),
-  task_intent: Type.Optional(DELEGATE_TASK_INTENT_SCHEMA),
-  apply_policy: Type.Optional(DELEGATE_APPLY_POLICY_SCHEMA),
-  allowed_output_paths: Type.Optional(
-    Type.Array(Type.String(), {
-      description:
-        "Relative files/directories allowed when apply_policy=explicit.",
-    }),
-  ),
-  resume: Type.Optional(
-    Type.Boolean({
-      description:
-        "Defaults to true. Set false to start a fresh private context for the same stable id; existing identity/name/role are still reused and cannot be redefined. Use a new stable id for a genuinely new persona.",
-    }),
-  ),
-  retain_worktree: Type.Optional(
-    Type.Boolean({
-      description:
-        "For worktree mode only. Set true to keep the isolated worktree after a successful run even when LiveAgent could safely clean it up. Worktrees with unapplied changes or failed agents are retained automatically.",
-    }),
-  ),
-  concurrency: Type.Optional(
-    Type.Integer({
-      minimum: 1,
-      maximum: MAX_CONCURRENCY,
-      description: `Maximum number of delegated subagents to run concurrently. Defaults to ${DEFAULT_CONCURRENCY}, so one Agent call runs a whole independent batch in parallel unless you intentionally lower it.`,
-    }),
-  ),
-}, { additionalProperties: false });
+export const DELEGATE_AGENT_PARAMETERS = Type.Object(
+  {
+    agent_spec: Type.Optional(
+      Type.String({
+        description:
+          "Plain-text manifest for two or more agents, or any long identity/persona. Do not write JSON arrays here. Use blocks like: @agent id=player1 mode=readonly, then one field per line: name=Player 1, role=..., identity=..., prompt=..., and --- between agents. name:/role:/identity:/prompt: are also accepted.",
+      }),
+    ),
+    id: Type.Optional(
+      Type.String({
+        description: "Stable id for one agent. Reuse the same id to resume that agent.",
+      }),
+    ),
+    name: Type.Optional(
+      Type.String({
+        description:
+          "Short display name for a newly created single agent. Ignored when id already exists.",
+      }),
+    ),
+    role: Type.Optional(
+      Type.String({
+        description:
+          "Short stable role for a newly created single agent. Use agent_spec for long personas.",
+      }),
+    ),
+    identity: Type.Optional(
+      Type.String({
+        description:
+          "Stable identity for a newly created single agent. Use agent_spec for long identity text.",
+      }),
+    ),
+    agent_id: Type.Optional(
+      Type.String({
+        description: "Optional configured AGENTS template id or name for one agent.",
+      }),
+    ),
+    prompt: Type.Optional(
+      Type.String({
+        description:
+          "Current task prompt for one agent. For an existing id, this is normally the only prompt-like field needed. If this contains @agent blocks, LiveAgent parses it as a plain-text manifest. Do not restate stable identity for an existing id.",
+      }),
+    ),
+    mode: Type.Optional(DELEGATE_EXECUTION_MODE_SCHEMA),
+    task_intent: Type.Optional(DELEGATE_TASK_INTENT_SCHEMA),
+    apply_policy: Type.Optional(DELEGATE_APPLY_POLICY_SCHEMA),
+    allowed_output_paths: Type.Optional(
+      Type.Array(Type.String(), {
+        description: "Relative files/directories allowed when apply_policy=explicit.",
+      }),
+    ),
+    resume: Type.Optional(
+      Type.Boolean({
+        description:
+          "Defaults to true. Set false to start a fresh private context for the same stable id; existing identity/name/role are still reused and cannot be redefined. Use a new stable id for a genuinely new persona.",
+      }),
+    ),
+    retain_worktree: Type.Optional(
+      Type.Boolean({
+        description:
+          "For worktree mode only. Set true to keep the isolated worktree after a successful run even when LiveAgent could safely clean it up. Worktrees with unapplied changes or failed agents are retained automatically.",
+      }),
+    ),
+    concurrency: Type.Optional(
+      Type.Integer({
+        minimum: 1,
+        maximum: MAX_CONCURRENCY,
+        description: `Maximum number of delegated subagents to run concurrently. Defaults to ${DEFAULT_CONCURRENCY}, so one Agent call runs a whole independent batch in parallel unless you intentionally lower it.`,
+      }),
+    ),
+  },
+  { additionalProperties: false },
+);
diff --git a/crates/agent-gui/src/lib/tools/delegate/toolSelection.ts b/crates/agent-gui/src/lib/tools/delegate/toolSelection.ts
index 3275154dc..4597b8eb3 100644
--- a/crates/agent-gui/src/lib/tools/delegate/toolSelection.ts
+++ b/crates/agent-gui/src/lib/tools/delegate/toolSelection.ts
@@ -13,8 +13,7 @@ export function selectReadOnlyTools(params: {
     if (tool.name === SEND_MESSAGE_TOOL_NAME) return true;
     const metadata = params.metadataByName.get(tool.name);
     return (
-      metadata?.isReadOnly === true ||
-      (metadata?.groupId === "mcp" && metadata.kind === "mcp")
+      metadata?.isReadOnly === true || (metadata?.groupId === "mcp" && metadata.kind === "mcp")
     );
   });
 }
diff --git a/crates/agent-gui/src/lib/tools/delegate/types.ts b/crates/agent-gui/src/lib/tools/delegate/types.ts
index 10b518292..a541aafc3 100644
--- a/crates/agent-gui/src/lib/tools/delegate/types.ts
+++ b/crates/agent-gui/src/lib/tools/delegate/types.ts
@@ -1,6 +1,11 @@
 import type { Tool, ToolCall, ToolResultMessage } from "@mariozechner/pi-ai";
 
-import type { AgentPromptTemplate, CodexRequestFormat, ProviderModelConfig, ReasoningLevel } from "../../settings";
+import type {
+  AgentPromptTemplate,
+  CodexRequestFormat,
+  ProviderModelConfig,
+  ReasoningLevel,
+} from "../../settings";
 import type { BuiltinToolMetadata } from "../builtinTypes";
 
 export type DelegateRuntime = {
diff --git a/crates/agent-gui/src/lib/tools/delegate/utils.ts b/crates/agent-gui/src/lib/tools/delegate/utils.ts
index 49dcb747a..3b8fbe2e7 100644
--- a/crates/agent-gui/src/lib/tools/delegate/utils.ts
+++ b/crates/agent-gui/src/lib/tools/delegate/utils.ts
@@ -83,9 +83,7 @@ export async function runWithConcurrency<T, R>(
   }
 
   await Promise.all(
-    new Array(Math.min(items.length, Math.max(1, concurrency)))
-      .fill(0)
-      .map(() => runLoop()),
+    new Array(Math.min(items.length, Math.max(1, concurrency))).fill(0).map(() => runLoop()),
   );
   return results;
 }
diff --git a/crates/agent-gui/src/lib/tools/delegate/worktree.ts b/crates/agent-gui/src/lib/tools/delegate/worktree.ts
index a3774a623..64759a45e 100644
--- a/crates/agent-gui/src/lib/tools/delegate/worktree.ts
+++ b/crates/agent-gui/src/lib/tools/delegate/worktree.ts
@@ -50,7 +50,7 @@ function globAllowedOutputPathToRegExp(pattern: string) {
 
 function decodeGitQuotedPath(value: string) {
   const text = value.trim();
-  if (!(text.startsWith("\"") && text.endsWith("\""))) return text;
+  if (!(text.startsWith('"') && text.endsWith('"'))) return text;
   const body = text.slice(1, -1);
   const decoder = new TextDecoder();
   let output = "";
@@ -80,7 +80,7 @@ function decodeGitQuotedPath(value: string) {
     const escaped = body[index + 1] ?? "";
     const replacements: Record<string, string> = {
       "\\": "\\",
-      "\"": "\"",
+      '"': '"',
       n: "\n",
       r: "\r",
       t: "\t",
@@ -101,7 +101,7 @@ function parseWorktreeStatusPath(line: string) {
     return normalizeRelativePath(decodeGitQuotedPath(trimmed.slice(3)));
   }
   const body = line.length > 3 ? line.slice(3).trim() : trimmed.slice(2).trim();
-  const renamedPath = body.includes(" -> ") ? body.split(" -> ").pop() ?? body : body;
+  const renamedPath = body.includes(" -> ") ? (body.split(" -> ").pop() ?? body) : body;
   return normalizeRelativePath(decodeGitQuotedPath(renamedPath));
 }
 
@@ -175,7 +175,9 @@ export function decideWorktreeApply(params: {
       return {
         shouldApply: false,
         skippedReason:
-          candidateArtifacts.length > 0 ? "artifact_explicit_apply_required" : "explicit_apply_required",
+          candidateArtifacts.length > 0
+            ? "artifact_explicit_apply_required"
+            : "explicit_apply_required",
         changedPaths,
         candidateArtifacts: candidateArtifacts.length > 0 ? candidateArtifacts : changedPaths,
       };
diff --git a/crates/agent-gui/src/lib/tools/fileToolState.ts b/crates/agent-gui/src/lib/tools/fileToolState.ts
index c7471f6be..48d680edf 100644
--- a/crates/agent-gui/src/lib/tools/fileToolState.ts
+++ b/crates/agent-gui/src/lib/tools/fileToolState.ts
@@ -199,72 +199,78 @@ export function createFileToolState() {
     return buckets.get(buildBucketKey(root, path))?.latestFullText;
   }
 
-  function getExactTextRead(path: string, params: {
-    startLine: number;
-    numLines: number;
-    totalLines: number;
-  }, root?: FileToolRoot) {
-    return buckets
-      .get(buildBucketKey(root, path))
-      ?.byRangeKey.get(
-        buildTextRangeKey({
-          root: normalizeRoot(root),
-          path,
-          kind: "text",
-          mtimeMs: 0,
-          contentHash: "",
-          startLine: params.startLine,
-          numLines: params.numLines,
-          totalLines: params.totalLines,
-          isPartialView: params.startLine > 1 || params.numLines < params.totalLines,
-        }),
-      );
+  function getExactTextRead(
+    path: string,
+    params: {
+      startLine: number;
+      numLines: number;
+      totalLines: number;
+    },
+    root?: FileToolRoot,
+  ) {
+    return buckets.get(buildBucketKey(root, path))?.byRangeKey.get(
+      buildTextRangeKey({
+        root: normalizeRoot(root),
+        path,
+        kind: "text",
+        mtimeMs: 0,
+        contentHash: "",
+        startLine: params.startLine,
+        numLines: params.numLines,
+        totalLines: params.totalLines,
+        isPartialView: params.startLine > 1 || params.numLines < params.totalLines,
+      }),
+    );
   }
 
   function getExactImageRead(path: string, root?: FileToolRoot) {
     return buckets.get(buildBucketKey(root, path))?.byRangeKey.get(buildImageRangeKey());
   }
 
-  function getExactPdfRead(path: string, params: {
-    pageStart: number;
-    numPages: number;
-    totalPages: number;
-  }, root?: FileToolRoot) {
-    return buckets
-      .get(buildBucketKey(root, path))
-      ?.byRangeKey.get(
-        buildPdfRangeKey({
-          root: normalizeRoot(root),
-          path,
-          kind: "pdf",
-          mtimeMs: 0,
-          contentHash: "",
-          pageStart: params.pageStart,
-          numPages: params.numPages,
-          totalPages: params.totalPages,
-        }),
-      );
+  function getExactPdfRead(
+    path: string,
+    params: {
+      pageStart: number;
+      numPages: number;
+      totalPages: number;
+    },
+    root?: FileToolRoot,
+  ) {
+    return buckets.get(buildBucketKey(root, path))?.byRangeKey.get(
+      buildPdfRangeKey({
+        root: normalizeRoot(root),
+        path,
+        kind: "pdf",
+        mtimeMs: 0,
+        contentHash: "",
+        pageStart: params.pageStart,
+        numPages: params.numPages,
+        totalPages: params.totalPages,
+      }),
+    );
   }
 
-  function getExactNotebookRead(path: string, params: {
-    cellStart: number;
-    numCells: number;
-    totalCells: number;
-  }, root?: FileToolRoot) {
-    return buckets
-      .get(buildBucketKey(root, path))
-      ?.byRangeKey.get(
-        buildNotebookRangeKey({
-          root: normalizeRoot(root),
-          path,
-          kind: "notebook",
-          mtimeMs: 0,
-          contentHash: "",
-          cellStart: params.cellStart,
-          numCells: params.numCells,
-          totalCells: params.totalCells,
-        }),
-      );
+  function getExactNotebookRead(
+    path: string,
+    params: {
+      cellStart: number;
+      numCells: number;
+      totalCells: number;
+    },
+    root?: FileToolRoot,
+  ) {
+    return buckets.get(buildBucketKey(root, path))?.byRangeKey.get(
+      buildNotebookRangeKey({
+        root: normalizeRoot(root),
+        path,
+        kind: "notebook",
+        mtimeMs: 0,
+        contentHash: "",
+        cellStart: params.cellStart,
+        numCells: params.numCells,
+        totalCells: params.totalCells,
+      }),
+    );
   }
 
   function clear(path: string, root?: FileToolRoot) {
diff --git a/crates/agent-gui/src/lib/tools/fsTools.ts b/crates/agent-gui/src/lib/tools/fsTools.ts
index 9375c23db..938fd3082 100644
--- a/crates/agent-gui/src/lib/tools/fsTools.ts
+++ b/crates/agent-gui/src/lib/tools/fsTools.ts
@@ -1,6 +1,3 @@
-import { Type, type TSchema } from "@sinclair/typebox";
-import { invoke } from "@tauri-apps/api/core";
-
 import type {
   ImageContent,
   TextContent,
@@ -8,12 +5,12 @@ import type {
   ToolCall,
   ToolResultMessage,
 } from "@mariozechner/pi-ai";
-
-import type { FileToolState } from "./fileToolState";
+import { type TSchema, Type } from "@sinclair/typebox";
+import { invoke } from "@tauri-apps/api/core";
 import {
-  createBuiltinMetadataMap,
   type BuiltinToolBundle,
   type BuiltinToolResultDetails,
+  createBuiltinMetadataMap,
   type DeleteResultDetails,
   type DisplayImageItemDetails,
   type DisplayImageResultDetails,
@@ -29,6 +26,7 @@ import {
   type ReadTextResultDetails,
   type WriteResultDetails,
 } from "./builtinTypes";
+import type { FileToolState } from "./fileToolState";
 import {
   buildScopedPathError,
   formatScopedTarget,
@@ -39,8 +37,8 @@ import {
   relativePathFromAbsolute,
 } from "./pathUtils";
 import {
-  assertSkillPathAllowedByPolicy,
   assertSkillMutationAllowed,
+  assertSkillPathAllowedByPolicy,
   buildSkillAccessDeniedMessage,
   isSkillAccessPolicyRestrictive,
   type SkillAccessPolicy,
@@ -309,24 +307,30 @@ export function createFsTools(params: {
     assertSkillMutationAllowed(skillAccessPolicy, operation, path);
   }
 
-  function assertOptionalSkillsPathAccess(root: FileToolRoot, path: string | undefined, operation: string) {
+  function assertOptionalSkillsPathAccess(
+    root: FileToolRoot,
+    path: string | undefined,
+    operation: string,
+  ) {
     if (root !== "skills") return;
     if (path) {
       assertSkillPathAllowedByPolicy(skillAccessPolicy, path, operation);
       return;
     }
     if (isSkillAccessPolicyRestrictive(skillAccessPolicy)) {
-      throw new Error(buildSkillAccessDeniedMessage({
-        operation,
-        allowedSkillNames: skillAccessPolicy?.allowedSkillNames,
-      }));
+      throw new Error(
+        buildSkillAccessDeniedMessage({
+          operation,
+          allowedSkillNames: skillAccessPolicy?.allowedSkillNames,
+        }),
+      );
     }
   }
 
   const toolRead: Tool = {
     name: "Read",
     description:
-      'Read a text, image, PDF, notebook, Word, Excel/spreadsheet, or archive file from the workspace or an enabled Skill. For text files, use start_line (1-based) and limit for pagination. For PDFs, use page_start and page_limit. For notebooks (.ipynb), use cell_start and cell_limit. Word/Excel/archive files return a best-effort text preview or entry listing. Returns version metadata and may return an `unchanged` stub when content has not changed since the previous read. Use Image instead when the user asks to show, view, render, or display an image in the chat UI. Do not use Markdown image syntax or HTML img tags to display files.',
+      "Read a text, image, PDF, notebook, Word, Excel/spreadsheet, or archive file from the workspace or an enabled Skill. For text files, use start_line (1-based) and limit for pagination. For PDFs, use page_start and page_limit. For notebooks (.ipynb), use cell_start and cell_limit. Word/Excel/archive files return a best-effort text preview or entry listing. Returns version metadata and may return an `unchanged` stub when content has not changed since the previous read. Use Image instead when the user asks to show, view, render, or display an image in the chat UI. Do not use Markdown image syntax or HTML img tags to display files.",
     parameters: withFileRootParameters({
       path: Type.String({
         description:
@@ -386,7 +390,7 @@ export function createFsTools(params: {
         Type.Array(
           Type.String({
             description:
-              'Local image path. Same rules as `path`: RELATIVE to the selected `root` when the image is inside the workspace or a Skill; an external ABSOLUTE path only when it lives outside both roots.',
+              "Local image path. Same rules as `path`: RELATIVE to the selected `root` when the image is inside the workspace or a Skill; an external ABSOLUTE path only when it lives outside both roots.",
           }),
           {
             minItems: 1,
@@ -397,7 +401,8 @@ export function createFsTools(params: {
       ),
       url: Type.Optional(
         Type.String({
-          description: "Single http/https image URL. Use this directly for remote images that only need to be displayed.",
+          description:
+            "Single http/https image URL. Use this directly for remote images that only need to be displayed.",
         }),
       ),
       urls: Type.Optional(
@@ -408,13 +413,15 @@ export function createFsTools(params: {
           {
             minItems: 1,
             maxItems: MAX_DISPLAY_IMAGE_PATHS,
-            description: "Multiple remote image URLs to display in order without pre-downloading them.",
+            description:
+              "Multiple remote image URLs to display in order without pre-downloading them.",
           },
         ),
       ),
       base64: Type.Optional(
         Type.String({
-          description: "Single image as a data URL or raw base64. For raw base64, provide mimeType when possible.",
+          description:
+            "Single image as a data URL or raw base64. For raw base64, provide mimeType when possible.",
         }),
       ),
       base64s: Type.Optional(
@@ -425,31 +432,34 @@ export function createFsTools(params: {
           {
             minItems: 1,
             maxItems: MAX_DISPLAY_IMAGE_PATHS,
-            description: "Multiple base64 images to display in order. Prefer data URLs so the MIME type is explicit.",
+            description:
+              "Multiple base64 images to display in order. Prefer data URLs so the MIME type is explicit.",
           },
         ),
       ),
       mimeType: Type.Optional(
         Type.String({
-          description: "MIME type for raw base64 input, for example image/png, image/jpeg, or image/svg+xml.",
+          description:
+            "MIME type for raw base64 input, for example image/png, image/jpeg, or image/svg+xml.",
         }),
       ),
       source: Type.Optional(
         Type.String({
           description:
-            'Single generic image source. Accepted forms: workspace- or Skills-relative path (matching `root`), external absolute path OUTSIDE both roots, http/https URL, data URL, raw base64, or raw SVG XML. Prefer this for mixed or unknown source types. Same relative-path rule as `path`: never pass an absolute path that points into the workspace or a Skill — strip the root prefix instead.',
+            "Single generic image source. Accepted forms: workspace- or Skills-relative path (matching `root`), external absolute path OUTSIDE both roots, http/https URL, data URL, raw base64, or raw SVG XML. Prefer this for mixed or unknown source types. Same relative-path rule as `path`: never pass an absolute path that points into the workspace or a Skill — strip the root prefix instead.",
         }),
       ),
       sources: Type.Optional(
         Type.Array(
           Type.String({
             description:
-              'Generic image source. Same accepted forms and same relative-path rule as `source` — never an absolute path that points into the workspace or a Skill.',
+              "Generic image source. Same accepted forms and same relative-path rule as `source` — never an absolute path that points into the workspace or a Skill.",
           }),
           {
             minItems: 1,
             maxItems: MAX_DISPLAY_IMAGE_PATHS,
-            description: "Multiple mixed image sources to display in order. Use this for mixed path + URL + base64 galleries.",
+            description:
+              "Multiple mixed image sources to display in order. Use this for mixed path + URL + base64 galleries.",
           },
         ),
       ),
@@ -459,7 +469,7 @@ export function createFsTools(params: {
   const toolWrite: Tool = {
     name: "Write",
     description:
-      'Create a new text file or fully rewrite an existing text file. There is no append mode — to add content, Read the file first, then either Write the full new content or use Edit to insert. Existing files must have been Read first (under the same root) so the tool can validate version metadata and reject stale rewrites.',
+      "Create a new text file or fully rewrite an existing text file. There is no append mode — to add content, Read the file first, then either Write the full new content or use Edit to insert. Existing files must have been Read first (under the same root) so the tool can validate version metadata and reject stale rewrites.",
     parameters: withFileRootParameters({
       path: Type.String({
         description:
@@ -477,7 +487,7 @@ export function createFsTools(params: {
   const toolEdit: Tool = {
     name: "Edit",
     description:
-      'Perform an exact-string replacement in a file you have already Read under the same root. Validates version metadata before writing and rejects stale edits — if the file changed after the last Read, Read it again before retrying. If `old_string` matches multiple places, either narrow it until unique or set `replace_all=true` explicitly.',
+      "Perform an exact-string replacement in a file you have already Read under the same root. Validates version metadata before writing and rejects stale edits — if the file changed after the last Read, Read it again before retrying. If `old_string` matches multiple places, either narrow it until unique or set `replace_all=true` explicitly.",
     parameters: withFileRootParameters({
       path: Type.String({
         description:
@@ -494,7 +504,8 @@ export function createFsTools(params: {
       ),
       replace_all: Type.Optional(
         Type.Boolean({
-          description: "Replace every exact match when true; otherwise only a single unambiguous match is allowed",
+          description:
+            "Replace every exact match when true; otherwise only a single unambiguous match is allowed",
         }),
       ),
     }),
@@ -503,7 +514,7 @@ export function createFsTools(params: {
   const toolDelete: Tool = {
     name: "Delete",
     description:
-      'Delete a file or directory under the selected root. Directories are removed recursively. Use this instead of Bash rm, rmdir, unlink, or find -delete for workspace or Skill files. Use this instead of Bash `rm` / `rmdir` / `unlink` / `find -delete` for any workspace or Skill file.',
+      "Delete a file or directory under the selected root. Directories are removed recursively. Use this instead of Bash rm, rmdir, unlink, or find -delete for workspace or Skill files. Use this instead of Bash `rm` / `rmdir` / `unlink` / `find -delete` for any workspace or Skill file.",
     parameters: withFileRootParameters({
       path: Type.String({
         description:
@@ -515,7 +526,7 @@ export function createFsTools(params: {
   const toolList: Tool = {
     name: "List",
     description:
-      'List files and directories under the selected root using ignore-aware traversal. Supports depth-limited traversal and paginated results. Prefer this over `Bash ls` / `find` for workspace or Skill content.',
+      "List files and directories under the selected root using ignore-aware traversal. Supports depth-limited traversal and paginated results. Prefer this over `Bash ls` / `find` for workspace or Skill content.",
     parameters: withFileRootParameters({
       path: Type.Optional(
         Type.String({
@@ -541,10 +552,11 @@ export function createFsTools(params: {
   const toolGlob: Tool = {
     name: "Glob",
     description:
-      'Find files by glob pattern using ignore-aware traversal. Results are paginated and sorted by path. Prefer this over `Bash find` for workspace or Skill content.',
+      "Find files by glob pattern using ignore-aware traversal. Results are paginated and sorted by path. Prefer this over `Bash find` for workspace or Skill content.",
     parameters: withFileRootParameters({
       pattern: Type.String({
-        description: 'Glob pattern relative to the search root, for example "**/*.tsx" or "src/**/Chat*.ts". Use `/` as the separator (Windows `\\` is auto-normalized).',
+        description:
+          'Glob pattern relative to the search root, for example "**/*.tsx" or "src/**/Chat*.ts". Use `/` as the separator (Windows `\\` is auto-normalized).',
       }),
       path: Type.Optional(
         Type.String({
@@ -572,7 +584,7 @@ export function createFsTools(params: {
   const toolGrep: Tool = {
     name: "Grep",
     description:
-      'Search file contents using a regular expression with ignore-aware traversal. Supports output_mode=content|files|count, pagination, optional surrounding context, and multiline matching. Prefer this over `Bash grep` / `rg` for any workspace or Skill content.',
+      "Search file contents using a regular expression with ignore-aware traversal. Supports output_mode=content|files|count, pagination, optional surrounding context, and multiline matching. Prefer this over `Bash grep` / `rg` for any workspace or Skill content.",
     parameters: withFileRootParameters({
       pattern: Type.String({ description: "Regular expression to search for in file contents." }),
       path: Type.Optional(
@@ -590,16 +602,13 @@ export function createFsTools(params: {
         Type.Boolean({ description: "Case-insensitive when true (default: true)" }),
       ),
       output_mode: Type.Optional(
-        Type.Union([
-          Type.Literal("content"),
-          Type.Literal("files"),
-          Type.Literal("count"),
-        ]),
+        Type.Union([Type.Literal("content"), Type.Literal("files"), Type.Literal("count")]),
       ),
       head_limit: Type.Optional(
         Type.Number({
           minimum: 1,
-          description: "Maximum number of rows to return for the selected output mode (default: 200)",
+          description:
+            "Maximum number of rows to return for the selected output mode (default: 200)",
         }),
       ),
       offset: Type.Optional(
@@ -642,18 +651,13 @@ export function createFsTools(params: {
       workdir,
       skillsRootDir: cachedSkillsRootDir,
     });
-    assertSkillsPathAccess(root, path, "Read(root=\"skills\")");
-    const start_line =
-      typeof args?.start_line === "number" ? args.start_line : undefined;
+    assertSkillsPathAccess(root, path, 'Read(root="skills")');
+    const start_line = typeof args?.start_line === "number" ? args.start_line : undefined;
     const limit = typeof args?.limit === "number" ? args.limit : undefined;
-    const page_start =
-      typeof args?.page_start === "number" ? args.page_start : undefined;
-    const page_limit =
-      typeof args?.page_limit === "number" ? args.page_limit : undefined;
-    const cell_start =
-      typeof args?.cell_start === "number" ? args.cell_start : undefined;
-    const cell_limit =
-      typeof args?.cell_limit === "number" ? args.cell_limit : undefined;
+    const page_start = typeof args?.page_start === "number" ? args.page_start : undefined;
+    const page_limit = typeof args?.page_limit === "number" ? args.page_limit : undefined;
+    const cell_start = typeof args?.cell_start === "number" ? args.cell_start : undefined;
+    const cell_limit = typeof args?.cell_limit === "number" ? args.cell_limit : undefined;
 
     const res = await invokeScopedFileCommand<ReadCommandResponse>({
       toolName: "Read",
@@ -742,11 +746,15 @@ export function createFsTools(params: {
         contentHash: res.contentHash,
         reusedExisting: false,
       };
-      const previous = fileState.getExactPdfRead(path, {
-        pageStart,
-        numPages,
-        totalPages,
-      }, root);
+      const previous = fileState.getExactPdfRead(
+        path,
+        {
+          pageStart,
+          numPages,
+          totalPages,
+        },
+        root,
+      );
       const reusedExisting =
         previous?.kind === "pdf" &&
         previous.mtimeMs === baseDetails.mtimeMs &&
@@ -802,11 +810,15 @@ export function createFsTools(params: {
         contentHash: res.contentHash,
         reusedExisting: false,
       };
-      const previous = fileState.getExactNotebookRead(path, {
-        cellStart,
-        numCells,
-        totalCells,
-      }, root);
+      const previous = fileState.getExactNotebookRead(
+        path,
+        {
+          cellStart,
+          numCells,
+          totalCells,
+        },
+        root,
+      );
       const reusedExisting =
         previous?.kind === "notebook" &&
         previous.mtimeMs === baseDetails.mtimeMs &&
@@ -907,11 +919,15 @@ export function createFsTools(params: {
       contentHash: res.contentHash,
       reusedExisting: false,
     };
-    const previous = fileState.getExactTextRead(path, {
-      startLine,
-      numLines,
-      totalLines,
-    }, root);
+    const previous = fileState.getExactTextRead(
+      path,
+      {
+        startLine,
+        numLines,
+        totalLines,
+      },
+      root,
+    );
     const reusedExisting =
       previous?.kind === "text" &&
       previous.mtimeMs === baseDetails.mtimeMs &&
@@ -972,11 +988,14 @@ export function createFsTools(params: {
       readLimit = latest.totalLines;
     }
 
-    await execRead({
-      root: params.root,
-      path: params.path,
-      limit: readLimit,
-    }, params.signal);
+    await execRead(
+      {
+        root: params.root,
+        path: params.path,
+        limit: readLimit,
+      },
+      params.signal,
+    );
 
     const snapshot = fileState.getLatestFullText(params.path, params.root);
     if (snapshot) {
@@ -1004,11 +1023,12 @@ export function createFsTools(params: {
   }
 
   function getOptionalMimeType(args: any) {
-    const value = typeof args?.mimeType === "string"
-      ? args.mimeType
-      : typeof args?.mime_type === "string"
-        ? args.mime_type
-        : "";
+    const value =
+      typeof args?.mimeType === "string"
+        ? args.mimeType
+        : typeof args?.mime_type === "string"
+          ? args.mime_type
+          : "";
     return value.trim() || undefined;
   }
 
@@ -1024,20 +1044,15 @@ export function createFsTools(params: {
   ) {
     rawItems.forEach((item, index) => {
       const itemLabel = rawItems.length > 1 ? `${label}[${index}]` : label;
-      const normalized = sourceType === "path"
-        ? normalizeImageLocalPathSource(
-            item,
-            itemLabel,
-            root,
-            scopedWorkdir,
-            rootExplicit,
-          )
-        : {
-            source: normalizeRequiredImageSource(item, itemLabel),
-            root: undefined,
-            workdir: undefined,
-            scopedPath: undefined,
-          };
+      const normalized =
+        sourceType === "path"
+          ? normalizeImageLocalPathSource(item, itemLabel, root, scopedWorkdir, rootExplicit)
+          : {
+              source: normalizeRequiredImageSource(item, itemLabel),
+              root: undefined,
+              workdir: undefined,
+              scopedPath: undefined,
+            };
       sources.push({
         source: normalized.source,
         sourceType,
@@ -1053,9 +1068,7 @@ export function createFsTools(params: {
     if (/^data:image\//i.test(source)) return "base64";
     if (/^https?:\/\//i.test(source)) return "url";
     const compact = source.replace(/\s/g, "");
-    if (
-      /^(iVBORw0KGgo|\/9j\/|R0lGOD|UklGR|Qk|AAABAA|PHN2Z|PD94bWwg)/.test(compact)
-    ) {
+    if (/^(iVBORw0KGgo|\/9j\/|R0lGOD|UklGR|Qk|AAABAA|PHN2Z|PD94bWwg)/.test(compact)) {
       return "base64";
     }
     return "auto";
@@ -1087,10 +1100,7 @@ export function createFsTools(params: {
     for (const home of homes) {
       const expanded = `${home}${suffix}`;
       if (relativePathFromAbsolute(expanded, workdir) !== null) return expanded;
-      if (
-        cachedSkillsRootDir &&
-        relativePathFromAbsolute(expanded, cachedSkillsRootDir) !== null
-      ) {
+      if (cachedSkillsRootDir && relativePathFromAbsolute(expanded, cachedSkillsRootDir) !== null) {
         return expanded;
       }
     }
@@ -1154,10 +1164,7 @@ export function createFsTools(params: {
         required: true,
       });
     }
-    if (
-      cachedSkillsRootDir &&
-      relativePathFromAbsolute(localPath, cachedSkillsRootDir) !== null
-    ) {
+    if (cachedSkillsRootDir && relativePathFromAbsolute(localPath, cachedSkillsRootDir) !== null) {
       return buildScopedPathError({
         label,
         rawPath: localPath,
@@ -1189,7 +1196,7 @@ export function createFsTools(params: {
         workdir,
         skillsRootDir: cachedSkillsRootDir,
       });
-      assertSkillsPathAccess(root ?? "workspace", scopedPath, "Image(root=\"skills\")");
+      assertSkillsPathAccess(root ?? "workspace", scopedPath, 'Image(root="skills")');
       return {
         source: scopedPath,
         root,
@@ -1243,8 +1250,7 @@ export function createFsTools(params: {
         rawItems.length > 1 ? `${label}[${index}]` : label,
       );
       const sourceType = inferGenericImageSourceType(source);
-      const shouldNormalizeAsLocalPath =
-        sourceType === "auto" && !isInlineSvgSource(source);
+      const shouldNormalizeAsLocalPath = sourceType === "auto" && !isInlineSvgSource(source);
       const normalized = shouldNormalizeAsLocalPath
         ? normalizeImageLocalPathSource(
             source,
@@ -1395,12 +1401,14 @@ export function createFsTools(params: {
           ].join(" "),
         );
       }
-      throw new Error(buildScopedToolRuntimeError({
-        toolName: "Image",
-        root: input.root,
-        path: input.scopedPath ?? (input.sourceType === "path" ? input.source : undefined),
-        error,
-      }));
+      throw new Error(
+        buildScopedToolRuntimeError({
+          toolName: "Image",
+          root: input.root,
+          path: input.scopedPath ?? (input.sourceType === "path" ? input.source : undefined),
+          error,
+        }),
+      );
     }
 
     if (res.kind !== "image") {
@@ -1432,7 +1440,10 @@ export function createFsTools(params: {
     };
   }
 
-  async function execImage(args: any, signal?: AbortSignal): Promise<ToolOk<DisplayImageResultDetails>> {
+  async function execImage(
+    args: any,
+    signal?: AbortSignal,
+  ): Promise<ToolOk<DisplayImageResultDetails>> {
     if (signal?.aborted) throw new Error("Cancelled");
 
     const root = normalizeRoot(args, "Image");
@@ -1469,27 +1480,31 @@ export function createFsTools(params: {
       image.root && image.root !== "workspace"
         ? `root=${image.root} path=${image.path}`
         : image.path;
-    const textSummary = imageDetails.length === 1
-      ? [
-          `Display image: ${formatImagePath(firstImage)}`,
-          `sourceType=${firstImage.sourceType ?? "unknown"}`,
-          `renderMode=${firstImage.renderMode ?? "inline"}`,
-          firstImage.mimeType ? `mime=${firstImage.mimeType}` : null,
-          typeof firstImage.sizeBytes === "number" ? `sizeBytes=${firstImage.sizeBytes}` : null,
-        ].filter(Boolean).join("\n")
-      : [
-          `Display images: ${imageDetails.length}`,
-          ...imageDetails.map(
-            (image, index) =>
+    const textSummary =
+      imageDetails.length === 1
+        ? [
+            `Display image: ${formatImagePath(firstImage)}`,
+            `sourceType=${firstImage.sourceType ?? "unknown"}`,
+            `renderMode=${firstImage.renderMode ?? "inline"}`,
+            firstImage.mimeType ? `mime=${firstImage.mimeType}` : null,
+            typeof firstImage.sizeBytes === "number" ? `sizeBytes=${firstImage.sizeBytes}` : null,
+          ]
+            .filter(Boolean)
+            .join("\n")
+        : [
+            `Display images: ${imageDetails.length}`,
+            ...imageDetails.map((image, index) =>
               [
                 `${index + 1}. ${formatImagePath(image)}`,
                 `sourceType=${image.sourceType ?? "unknown"}`,
                 `renderMode=${image.renderMode ?? "inline"}`,
                 image.mimeType ? `mime=${image.mimeType}` : null,
                 typeof image.sizeBytes === "number" ? `sizeBytes=${image.sizeBytes}` : null,
-              ].filter(Boolean).join("\n"),
-          ),
-        ].join("\n");
+              ]
+                .filter(Boolean)
+                .join("\n"),
+            ),
+          ].join("\n");
 
     return {
       content: [
@@ -1497,7 +1512,7 @@ export function createFsTools(params: {
           type: "text",
           text: textSummary,
         },
-        ...entries.flatMap((entry) => entry.content ? [entry.content] : []),
+        ...entries.flatMap((entry) => (entry.content ? [entry.content] : [])),
       ],
       details,
     };
@@ -1515,7 +1530,7 @@ export function createFsTools(params: {
       workdir,
       skillsRootDir: cachedSkillsRootDir,
     });
-    assertSkillsPathMutationAccess(root, path, "Write(root=\"skills\")");
+    assertSkillsPathMutationAccess(root, path, 'Write(root="skills")');
     const content = typeof args?.content === "string" ? args.content : "";
     const mode = typeof args?.mode === "string" ? args.mode : "rewrite";
     if (mode !== "rewrite") {
@@ -1524,7 +1539,9 @@ export function createFsTools(params: {
 
     const latest = fileState.getLatest(path, root);
     if (latest?.kind === "text" && latest.isPartialView) {
-      throw new Error(`Write requires a full-file Read first for existing files: ${formatScopedTarget(root, path)}. Retry with Read using the same root and path before rewriting. Do not use Bash for workspace or Skills file operations.`);
+      throw new Error(
+        `Write requires a full-file Read first for existing files: ${formatScopedTarget(root, path)}. Retry with Read using the same root and path before rewriting. Do not use Bash for workspace or Skills file operations.`,
+      );
     }
     const fullSnapshot = fileState.getLatestFullText(path, root);
 
@@ -1590,13 +1607,11 @@ export function createFsTools(params: {
       workdir,
       skillsRootDir: cachedSkillsRootDir,
     });
-    assertSkillsPathMutationAccess(root, path, "Edit(root=\"skills\")");
+    assertSkillsPathMutationAccess(root, path, 'Edit(root="skills")');
     const old_string = typeof args?.old_string === "string" ? args.old_string : "";
     const new_string = typeof args?.new_string === "string" ? args.new_string : "";
     const expected_replacements =
-      typeof args?.expected_replacements === "number"
-        ? args.expected_replacements
-        : undefined;
+      typeof args?.expected_replacements === "number" ? args.expected_replacements : undefined;
     const replace_all = args?.replace_all === true;
 
     if (!old_string) {
@@ -1674,7 +1689,7 @@ export function createFsTools(params: {
       workdir,
       skillsRootDir: cachedSkillsRootDir,
     });
-    assertSkillsPathMutationAccess(root, path, "Delete(root=\"skills\")");
+    assertSkillsPathMutationAccess(root, path, 'Delete(root="skills")');
     const res = await invokeScopedFileCommand<DeleteCommandResponse>({
       toolName: "Delete",
       root,
@@ -1719,11 +1734,10 @@ export function createFsTools(params: {
             skillsRootDir: cachedSkillsRootDir,
           })
         : undefined;
-    assertOptionalSkillsPathAccess(root, path, "List(root=\"skills\")");
+    assertOptionalSkillsPathAccess(root, path, 'List(root="skills")');
     const depth = typeof args?.depth === "number" ? args.depth : undefined;
     const offset = typeof args?.offset === "number" ? args.offset : undefined;
-    const max_results =
-      typeof args?.max_results === "number" ? args.max_results : undefined;
+    const max_results = typeof args?.max_results === "number" ? args.max_results : undefined;
 
     const res = await invokeScopedFileCommand<ListCommandResponse>({
       toolName: "List",
@@ -1751,8 +1765,8 @@ export function createFsTools(params: {
       entries: res.entries,
     };
 
-    const lines = res.entries.map((entry) =>
-      `${entry.kind === "dir" ? "[DIR]" : "[FILE]"} ${entry.path}`,
+    const lines = res.entries.map(
+      (entry) => `${entry.kind === "dir" ? "[DIR]" : "[FILE]"} ${entry.path}`,
     );
     const suffix = res.hasMore ? "\n...more entries omitted...\n" : "";
 
@@ -1791,14 +1805,13 @@ export function createFsTools(params: {
         : undefined;
     if (root === "skills") {
       if (path) {
-        assertSkillPathAllowedByPolicy(skillAccessPolicy, path, "Glob(root=\"skills\")");
+        assertSkillPathAllowedByPolicy(skillAccessPolicy, path, 'Glob(root="skills")');
       } else {
-        assertSkillPathAllowedByPolicy(skillAccessPolicy, pattern, "Glob(root=\"skills\")");
+        assertSkillPathAllowedByPolicy(skillAccessPolicy, pattern, 'Glob(root="skills")');
       }
     }
     const offset = typeof args?.offset === "number" ? args.offset : undefined;
-    const max_results =
-      typeof args?.max_results === "number" ? args.max_results : undefined;
+    const max_results = typeof args?.max_results === "number" ? args.max_results : undefined;
     const sort_by = typeof args?.sort_by === "string" ? args.sort_by : undefined;
     if (sort_by && sort_by !== "path") {
       throw new Error("Glob.sort_by only supports path");
@@ -1866,16 +1879,13 @@ export function createFsTools(params: {
             skillsRootDir: cachedSkillsRootDir,
           })
         : undefined;
-    assertOptionalSkillsPathAccess(root, path, "Grep(root=\"skills\")");
+    assertOptionalSkillsPathAccess(root, path, 'Grep(root="skills")');
     const file_pattern =
       typeof args?.file_pattern === "string" ? args.file_pattern.trim() : undefined;
     const ignore_case = typeof args?.ignore_case === "boolean" ? args.ignore_case : true;
     const output_mode =
-      args?.output_mode === "files" || args?.output_mode === "count"
-        ? args.output_mode
-        : "content";
-    const head_limit =
-      typeof args?.head_limit === "number" ? args.head_limit : undefined;
+      args?.output_mode === "files" || args?.output_mode === "count" ? args.output_mode : "content";
+    const head_limit = typeof args?.head_limit === "number" ? args.head_limit : undefined;
     const offset = typeof args?.offset === "number" ? args.offset : undefined;
     const context = typeof args?.context === "number" ? args.context : undefined;
     const multiline = args?.multiline === true;
@@ -1913,7 +1923,7 @@ export function createFsTools(params: {
       correctedFilePath = path;
       path = split.parentPath;
       effectiveFilePattern = split.fileName;
-      assertOptionalSkillsPathAccess(root, path, "Grep(root=\"skills\")");
+      assertOptionalSkillsPathAccess(root, path, 'Grep(root="skills")');
       res = await invokeScopedFileCommand<GrepCommandResponse>({
         toolName: "Grep",
         root,
@@ -1953,8 +1963,7 @@ export function createFsTools(params: {
       files: res.files.map((file) => ({
         path: file.path,
         count: file.count,
-        firstLine:
-          typeof file.firstLine === "number" ? file.firstLine : undefined,
+        firstLine: typeof file.firstLine === "number" ? file.firstLine : undefined,
       })),
     };
 
@@ -1963,8 +1972,9 @@ export function createFsTools(params: {
         ? `matches=${res.matchCount}\nfiles=${res.fileCount}`
         : res.outputMode === "files"
           ? res.files
-              .map((file) =>
-                `${file.path} (${file.count}${typeof file.firstLine === "number" ? `, firstLine=${file.firstLine}` : ""})`,
+              .map(
+                (file) =>
+                  `${file.path} (${file.count}${typeof file.firstLine === "number" ? `, firstLine=${file.firstLine}` : ""})`,
               )
               .join("\n")
           : res.matches.map((match) => `${match.path}:${match.line}: ${match.text}`).join("\n");
diff --git a/crates/agent-gui/src/lib/tools/mcpManagerTools.ts b/crates/agent-gui/src/lib/tools/mcpManagerTools.ts
index 0c0aa2dae..ea8c8169f 100644
--- a/crates/agent-gui/src/lib/tools/mcpManagerTools.ts
+++ b/crates/agent-gui/src/lib/tools/mcpManagerTools.ts
@@ -1,17 +1,16 @@
-import { invoke } from "@tauri-apps/api/core";
-import { Type } from "@sinclair/typebox";
-
 import type { Tool, ToolCall, ToolResultMessage } from "@mariozechner/pi-ai";
+import { Type } from "@sinclair/typebox";
+import { invoke } from "@tauri-apps/api/core";
 
 import {
-  normalizeMcpServerConfig,
-  normalizeMcpSettings,
   type McpServerConfig,
   type McpSettings,
+  normalizeMcpServerConfig,
+  normalizeMcpSettings,
 } from "../settings";
 import {
-  createBuiltinMetadataMap,
   type BuiltinToolBundle,
+  createBuiltinMetadataMap,
   type McpManagerResultDetails,
 } from "./builtinTypes";
 import type { SystemToolRuntimeScope } from "./customSystemTools";
@@ -263,30 +262,31 @@ function normalizeInlineServer(input: unknown): McpServerConfig {
 }
 
 function validateRawServerShape(raw: Record<string, unknown>, label: string) {
-  if (Object.prototype.hasOwnProperty.call(raw, "args")) {
+  if (Object.hasOwn(raw, "args")) {
     const value = raw.args;
     if (!Array.isArray(value) || value.some((item) => typeof item !== "string")) {
       throw new Error(`${label}.args must be a string array.`);
     }
   }
-  if (Object.prototype.hasOwnProperty.call(raw, "env")) {
+  if (Object.hasOwn(raw, "env")) {
     normalizeStringMap(raw.env, `${label}.env`);
   }
-  if (Object.prototype.hasOwnProperty.call(raw, "headers")) {
+  if (Object.hasOwn(raw, "headers")) {
     normalizeStringMap(raw.headers, `${label}.headers`);
   }
 }
 
 function normalizePatch(input: unknown): Partial<McpServerConfig> {
   const raw = asObject(input, "McpManager.patch");
-  if (Object.prototype.hasOwnProperty.call(raw, "id")) {
+  if (Object.hasOwn(raw, "id")) {
     throw new Error("McpManager.update does not allow changing server id.");
   }
   const patch: Partial<McpServerConfig> = {};
   for (const [key, value] of Object.entries(raw)) {
     switch (key) {
       case "enabled":
-        if (typeof value !== "boolean") throw new Error("McpManager.patch.enabled must be a boolean.");
+        if (typeof value !== "boolean")
+          throw new Error("McpManager.patch.enabled must be a boolean.");
         patch.enabled = value;
         break;
       case "transport":
@@ -300,9 +300,8 @@ function normalizePatch(input: unknown): Partial<McpServerConfig> {
       case "cwd":
       case "messageUrl":
         if (typeof value !== "string") throw new Error(`McpManager.patch.${key} must be a string.`);
-        (patch as Record<string, unknown>)[key] = key === "cwd" || key === "messageUrl"
-          ? value.trim() || undefined
-          : value.trim();
+        (patch as Record<string, unknown>)[key] =
+          key === "cwd" || key === "messageUrl" ? value.trim() || undefined : value.trim();
         break;
       case "args":
         if (!Array.isArray(value) || value.some((item) => typeof item !== "string")) {
@@ -312,7 +311,10 @@ function normalizePatch(input: unknown): Partial<McpServerConfig> {
         break;
       case "env":
       case "headers":
-        (patch as Record<string, unknown>)[key] = normalizeStringMap(value, `McpManager.patch.${key}`);
+        (patch as Record<string, unknown>)[key] = normalizeStringMap(
+          value,
+          `McpManager.patch.${key}`,
+        );
         break;
       case "timeoutMs": {
         const numeric = typeof value === "number" ? value : Number(value);
@@ -435,7 +437,9 @@ function summarizeTool(tool: McpDiagnosticToolInfo, includeSchema: boolean): Mcp
 
 async function stopRuntime(serverId: string, warnings: string[]) {
   try {
-    const stopped = await invoke<McpStopServerResponse>("mcp_stop_server", { server_id: serverId } as any);
+    const stopped = await invoke<McpStopServerResponse>("mcp_stop_server", {
+      server_id: serverId,
+    } as any);
     return stopped.stopped;
   } catch (err) {
     warnings.push(`failed to stop runtime for ${serverId}: ${asErrorMessage(err)}`);
@@ -487,7 +491,9 @@ function buildSuggestions(result: {
     suggestions.push("Check that the stdio command exists in PATH or set cwd/env explicitly.");
   }
   if (/timed out|timeout/i.test(message)) {
-    suggestions.push("Increase timeoutMs or check whether the MCP server is hanging during initialize/tools/list.");
+    suggestions.push(
+      "Increase timeoutMs or check whether the MCP server is hanging during initialize/tools/list.",
+    );
   }
   if (/401|403|Unauthorized|Forbidden/i.test(message)) {
     suggestions.push("Check headers/env credentials for this MCP server.");
@@ -510,8 +516,10 @@ function formatMcpManagerResult(result: McpManagerExecutionResult) {
   const lines = [`McpManager action=${result.action}`];
   if (result.serverId) lines.push(`server=${result.serverId}`);
   if (result.serverIds?.length) lines.push(`servers=${result.serverIds.join(",")}`);
-  if (typeof result.changed === "boolean") lines.push(`changed=${result.changed ? "true" : "false"}`);
-  if (typeof result.stopped === "boolean") lines.push(`stopped=${result.stopped ? "true" : "false"}`);
+  if (typeof result.changed === "boolean")
+    lines.push(`changed=${result.changed ? "true" : "false"}`);
+  if (typeof result.stopped === "boolean")
+    lines.push(`stopped=${result.stopped ? "true" : "false"}`);
   if (result.validation) {
     lines.push(`validation=${result.validation.ok ? "ok" : "failed"}`);
     for (const error of result.validation.errors) lines.push(`- error: ${error}`);
@@ -524,7 +532,9 @@ function formatMcpManagerResult(result: McpManagerExecutionResult) {
     if (result.runtime.lastError) lines.push(`runtimeError=${result.runtime.lastError}`);
   }
   if (result.test) {
-    lines.push(`test=${result.test.ok ? "ok" : "failed"} phase=${result.test.phase} durationMs=${result.test.durationMs}`);
+    lines.push(
+      `test=${result.test.ok ? "ok" : "failed"} phase=${result.test.phase} durationMs=${result.test.durationMs}`,
+    );
     lines.push(`tools=${result.test.toolsCount}`);
     if (result.test.error) lines.push(`error=${result.test.error}`);
     if (result.test.stderrTail) lines.push(result.test.stderrTail);
@@ -576,12 +586,13 @@ function detailsForResult(result: McpManagerExecutionResult): McpManagerResultDe
         : true,
     phase: result.test?.phase,
     serverCount: result.servers?.length,
-    enabledCount:
-      result.servers
-        ? result.servers.filter((server) => server.enabled).length
-        : result.server
-          ? (result.server.enabled ? 1 : 0)
-          : undefined,
+    enabledCount: result.servers
+      ? result.servers.filter((server) => server.enabled).length
+      : result.server
+        ? result.server.enabled
+          ? 1
+          : 0
+        : undefined,
     toolsCount: result.test?.toolsCount ?? result.tools?.length,
     changed: result.changed,
     stopped: result.stopped,
@@ -619,7 +630,7 @@ export function createMcpManagerTools(params: {
 
     const settings = currentSettings();
     const includeSchema = args.include_schema === true;
-    const includeStderr = Object.prototype.hasOwnProperty.call(args, "include_stderr")
+    const includeStderr = Object.hasOwn(args, "include_stderr")
       ? args.include_stderr === true
       : false;
 
@@ -647,7 +658,14 @@ export function createMcpManagerTools(params: {
     if (action === "create") {
       const server = normalizeServerForCreate(args.server);
       const validation = validateServer(server);
-      if (!validation.ok) return { action, serverId: server.id, server: redactMcpServerConfig(server), validation, changed: false };
+      if (!validation.ok)
+        return {
+          action,
+          serverId: server.id,
+          server: redactMcpServerConfig(server),
+          validation,
+          changed: false,
+        };
 
       const conflict = args.conflict === "overwrite" ? "overwrite" : "fail";
       const existingIndex = settings.servers.findIndex((item) => item.id === server.id);
@@ -682,7 +700,14 @@ export function createMcpManagerTools(params: {
       const patch = normalizePatch(args.patch);
       const updated = normalizeMcpServerConfig({ ...existing, ...patch, id: existing.id });
       const validation = validateServer(updated);
-      if (!validation.ok) return { action, serverId, server: redactMcpServerConfig(updated), validation, changed: false };
+      if (!validation.ok)
+        return {
+          action,
+          serverId,
+          server: redactMcpServerConfig(updated),
+          validation,
+          changed: false,
+        };
       const servers = settings.servers.map((server) => (server.id === serverId ? updated : server));
       commitSettings({ servers, selected: settings.selected });
       const runtimeWarnings: string[] = [];
@@ -744,7 +769,9 @@ export function createMcpManagerTools(params: {
 
     if (action === "stop") {
       const serverId = requireServerId(args.server_id);
-      const stopped = await invoke<McpStopServerResponse>("mcp_stop_server", { server_id: serverId } as any);
+      const stopped = await invoke<McpStopServerResponse>("mcp_stop_server", {
+        server_id: serverId,
+      } as any);
       return { action, serverId, stopped: stopped.stopped, changed: false };
     }
 
@@ -776,7 +803,7 @@ export function createMcpManagerTools(params: {
           suggestions,
         };
       }
-      const shouldIncludeStderr = Object.prototype.hasOwnProperty.call(args, "include_stderr")
+      const shouldIncludeStderr = Object.hasOwn(args, "include_stderr")
         ? includeStderr
         : action === "diagnose";
       const test = applyRuntimeTestOutputOptions(
@@ -791,7 +818,10 @@ export function createMcpManagerTools(params: {
         validation,
         runtime,
         test,
-        tools: action === "tools" || args.include_tools === true || action === "diagnose" ? tools : undefined,
+        tools:
+          action === "tools" || args.include_tools === true || action === "diagnose"
+            ? tools
+            : undefined,
         changed: false,
         suggestions: buildSuggestions({ validation, test, server }),
       };
@@ -807,7 +837,10 @@ export function createMcpManagerTools(params: {
     parameters: MCP_MANAGER_PARAMETERS,
   };
 
-  async function executeToolCall(toolCall: ToolCall, signal?: AbortSignal): Promise<ToolResultMessage> {
+  async function executeToolCall(
+    toolCall: ToolCall,
+    signal?: AbortSignal,
+  ): Promise<ToolResultMessage> {
     const now = Date.now();
     if (signal?.aborted) {
       return {
@@ -849,7 +882,12 @@ export function createMcpManagerTools(params: {
         toolCallId: toolCall.id,
         toolName: toolCall.name,
         content: [{ type: "text", text: `McpManager failed: ${asErrorMessage(err)}` }],
-        details: { kind: "manage_mcp", action: "unknown", ok: false, errors: [asErrorMessage(err)] },
+        details: {
+          kind: "manage_mcp",
+          action: "unknown",
+          ok: false,
+          errors: [asErrorMessage(err)],
+        },
         isError: true,
         timestamp: now,
       };
diff --git a/crates/agent-gui/src/lib/tools/mcpTools.ts b/crates/agent-gui/src/lib/tools/mcpTools.ts
index 54719e273..0ec866715 100644
--- a/crates/agent-gui/src/lib/tools/mcpTools.ts
+++ b/crates/agent-gui/src/lib/tools/mcpTools.ts
@@ -1,5 +1,3 @@
-import { invoke } from "@tauri-apps/api/core";
-
 import type {
   ImageContent,
   TextContent,
@@ -7,12 +5,10 @@ import type {
   ToolCall,
   ToolResultMessage,
 } from "@mariozechner/pi-ai";
+import { invoke } from "@tauri-apps/api/core";
 
 import type { McpServerConfig } from "../settings";
-import {
-  createBuiltinMetadataMap,
-  type BuiltinToolBundle,
-} from "./builtinTypes";
+import { type BuiltinToolBundle, createBuiltinMetadataMap } from "./builtinTypes";
 
 type McpToolInfo = {
   serverId: string;
@@ -82,10 +78,12 @@ export async function createMcpTools(params: {
   servers: McpServerConfig[];
   onLoadError?: (message: string) => void;
   loadFailureMode?: "continue" | "throw";
-}): Promise<BuiltinToolBundle<{
-  /** Maps the safe tool name (used by LLM) to the underlying MCP server/tool. */
-  toolNameMap: Map<string, { serverId: string; toolName: string; serverLabel: string }>;
-}>> {
+}): Promise<
+  BuiltinToolBundle<{
+    /** Maps the safe tool name (used by LLM) to the underlying MCP server/tool. */
+    toolNameMap: Map<string, { serverId: string; toolName: string; serverLabel: string }>;
+  }>
+> {
   const servers = params.servers ?? [];
   const enabledServers = servers.filter((s) => s.enabled);
 
@@ -164,7 +162,10 @@ export async function createMcpTools(params: {
     console.warn("[MCP] tools list failed, continuing without MCP tools", err);
   }
 
-  const toolNameMap = new Map<string, { serverId: string; toolName: string; serverLabel: string }>();
+  const toolNameMap = new Map<
+    string,
+    { serverId: string; toolName: string; serverLabel: string }
+  >();
   const tools: Tool[] = [];
   const metadataEntries: Array<
     [
diff --git a/crates/agent-gui/src/lib/tools/memoryTools.ts b/crates/agent-gui/src/lib/tools/memoryTools.ts
index 11b836f8c..17d6c743e 100644
--- a/crates/agent-gui/src/lib/tools/memoryTools.ts
+++ b/crates/agent-gui/src/lib/tools/memoryTools.ts
@@ -1,8 +1,22 @@
-import { Type } from "@sinclair/typebox";
 import type { Tool, ToolCall, ToolResultMessage } from "@mariozechner/pi-ai";
-
+import { Type } from "@sinclair/typebox";
+import {
+  MEMORY_MANAGER_ACTION_DESCRIPTION_RO,
+  MEMORY_MANAGER_ACTION_DESCRIPTION_RW,
+  MEMORY_MANAGER_FIELD_DESCRIPTIONS,
+  MEMORY_MANAGER_TOOL_DESCRIPTION,
+} from "../chat/memory/memoryPolicy";
 import {
   formatMemoryError,
+  type MemoryHistoryTimeMode,
+  type MemoryListResponse,
+  type MemoryMeta,
+  type MemoryMutationResponse,
+  type MemoryReadResponse,
+  type MemoryScope,
+  type MemorySearchResponse,
+  type MemorySearchType,
+  type MemoryType,
   memoryAccept,
   memoryDelete,
   memoryList,
@@ -10,26 +24,8 @@ import {
   memorySearch,
   memoryUpdate,
   memoryWrite,
-  type MemoryMeta,
-  type MemoryListResponse,
-  type MemoryMutationResponse,
-  type MemoryHistoryTimeMode,
-  type MemoryReadResponse,
-  type MemorySearchResponse,
-  type MemoryScope,
-  type MemorySearchType,
-  type MemoryType,
 } from "../memory/api";
-import {
-  createBuiltinMetadataMap,
-  type BuiltinToolBundle,
-} from "./builtinTypes";
-import {
-  MEMORY_MANAGER_ACTION_DESCRIPTION_RO,
-  MEMORY_MANAGER_ACTION_DESCRIPTION_RW,
-  MEMORY_MANAGER_FIELD_DESCRIPTIONS,
-  MEMORY_MANAGER_TOOL_DESCRIPTION,
-} from "../chat/memory/memoryPolicy";
+import { type BuiltinToolBundle, createBuiltinMetadataMap } from "./builtinTypes";
 
 type MemoryToolMode = "rw" | "ro";
 
@@ -50,9 +46,7 @@ function createMemoryManagerParameters(mode: MemoryToolMode) {
   return Type.Object({
     action: Type.Union(actionLiterals, {
       description:
-        mode === "ro"
-          ? MEMORY_MANAGER_ACTION_DESCRIPTION_RO
-          : MEMORY_MANAGER_ACTION_DESCRIPTION_RW,
+        mode === "ro" ? MEMORY_MANAGER_ACTION_DESCRIPTION_RO : MEMORY_MANAGER_ACTION_DESCRIPTION_RW,
     }),
     slug: Type.Optional(
       Type.String({
@@ -186,12 +180,15 @@ function createMemoryManagerParameters(mode: MemoryToolMode) {
       }),
     ),
     aliases: Type.Optional(
-      Type.Union([
-        Type.String({ maxLength: 200 }),
-        Type.Array(Type.String({ maxLength: 24 }), { maxItems: 8 }),
-      ], {
-        description: MEMORY_MANAGER_FIELD_DESCRIPTIONS.aliases,
-      }),
+      Type.Union(
+        [
+          Type.String({ maxLength: 200 }),
+          Type.Array(Type.String({ maxLength: 24 }), { maxItems: 8 }),
+        ],
+        {
+          description: MEMORY_MANAGER_FIELD_DESCRIPTIONS.aliases,
+        },
+      ),
     ),
     supersedes: Type.Optional(
       Type.String({
@@ -256,7 +253,9 @@ function requireQuery(args: Record<string, unknown>) {
 function requireWriteType(value: unknown): MemoryType {
   const type = optionalMemoryType(value);
   if (!type || type === "daily") {
-    throw new Error("MemoryManager write/update type must be user, feedback, project, or reference.");
+    throw new Error(
+      "MemoryManager write/update type must be user, feedback, project, or reference.",
+    );
   }
   return type;
 }
@@ -290,11 +289,7 @@ function optionalStringList(value: unknown) {
 }
 
 function frontmatterString(value: string) {
-  return value
-    .replace(/\\/g, "\\\\")
-    .replace(/"/g, '\\"')
-    .replace(/\r?\n/g, " ")
-    .slice(0, 240);
+  return value.replace(/\\/g, "\\\\").replace(/"/g, '\\"').replace(/\r?\n/g, " ").slice(0, 240);
 }
 
 function frontmatterArray(values: string[]) {
@@ -381,7 +376,10 @@ function buildListResultText(result: MemoryListResponse) {
   const scopeQuotaText =
     result.quota.scopeQuotas && result.quota.scopeQuotas.length > 0
       ? ` scopes=${result.quota.scopeQuotas
-          .map((quota) => `${quota.scope}${quota.workdirHash ? `:${quota.workdirHash}` : ""}=${quota.used}/${quota.limit}`)
+          .map(
+            (quota) =>
+              `${quota.scope}${quota.workdirHash ? `:${quota.workdirHash}` : ""}=${quota.used}/${quota.limit}`,
+          )
           .join(",")}`
       : "";
   if (result.entries.length === 0) {
@@ -391,12 +389,10 @@ function buildListResultText(result: MemoryListResponse) {
     entry.dateLocal || entry.slug.replace(/^daily-/, "") || entry.slug;
   return [
     `Found ${result.entries.length} memory entries. quota=${result.quota.used}/${result.quota.limit}${scopeQuotaText}${result.truncated ? " truncated=true" : ""}`,
-    ...result.entries.map(
-      (entry, index) => {
-        const label = entry.memoryType === "daily" ? dailyTitle(entry) : entry.description;
-        return `${index + 1}. [${entry.slug}] scope=${entry.scope} type=${entry.memoryType}${entry.unreviewed ? " unreviewed=true" : ""} confidence=${entry.confidence ?? "unknown"} — ${label}`;
-      },
-    ),
+    ...result.entries.map((entry, index) => {
+      const label = entry.memoryType === "daily" ? dailyTitle(entry) : entry.description;
+      return `${index + 1}. [${entry.slug}] scope=${entry.scope} type=${entry.memoryType}${entry.unreviewed ? " unreviewed=true" : ""} confidence=${entry.confidence ?? "unknown"} — ${label}`;
+    }),
   ].join("\n");
 }
 
@@ -422,13 +418,8 @@ function buildSearchResultText(result: MemorySearchResponse) {
     `Found ${result.matches.length} memory match(es) and ${historyMatches.length} chat-history match(es). usedFallback=${result.usedFallback}`,
     ...result.matches.map((match, index) => {
       const raw =
-        typeof match.rawScore === "number"
-          ? ` rawScore=${match.rawScore.toFixed(3)}`
-          : "";
-      const age =
-        typeof match.ageDays === "number"
-        ? ` ageDays=${match.ageDays.toFixed(1)}`
-        : "";
+        typeof match.rawScore === "number" ? ` rawScore=${match.rawScore.toFixed(3)}` : "";
+      const age = typeof match.ageDays === "number" ? ` ageDays=${match.ageDays.toFixed(1)}` : "";
       return `${index + 1}. [${match.slug}] scope=${match.scope} type=${match.memoryType} score=${match.score.toFixed(3)}${raw}${age}${match.unreviewed ? " unreviewed=true" : ""} confidence=${match.confidence ?? "unknown"}\n${match.snippet}`;
     }),
     ...(historyMatches.length > 0
@@ -437,9 +428,7 @@ function buildSearchResultText(result: MemorySearchResponse) {
           ...historyMatches.map((match, index) => {
             const role = match.role ? ` role=${match.role}` : "";
             const message =
-              typeof match.messageIndex === "number"
-                ? ` message=${match.messageIndex}`
-                : "";
+              typeof match.messageIndex === "number" ? ` message=${match.messageIndex}` : "";
             const cwd = match.cwd ? ` cwd=${match.cwd}` : "";
             return `${index + 1}. [history:${match.source}] conversation=${match.conversationId} title=${match.title} segment=${match.segmentIndex}${message}${role} score=${match.score.toFixed(3)} updatedAt=${match.updatedAt}${cwd}\n${match.snippet}`;
           }),
@@ -691,7 +680,9 @@ export function createMemoryTools(params: {
           timestamp: now,
         };
       }
-      throw new Error("MemoryManager action must be list, read, search, write, update, delete, or accept.");
+      throw new Error(
+        "MemoryManager action must be list, read, search, write, update, delete, or accept.",
+      );
     } catch (error) {
       return {
         role: "toolResult",
diff --git a/crates/agent-gui/src/lib/tools/pathUtils.ts b/crates/agent-gui/src/lib/tools/pathUtils.ts
index d4ddf1359..5f1b5520c 100644
--- a/crates/agent-gui/src/lib/tools/pathUtils.ts
+++ b/crates/agent-gui/src/lib/tools/pathUtils.ts
@@ -131,8 +131,7 @@ function tryRecoverScopedRelPath(params: {
 }): string | null {
   const raw = typeof params.input === "string" ? params.input.trim() : "";
   if (!raw) return null;
-  const rootDir =
-    params.expectedRoot === "skills" ? params.skillsRootDir : params.workdir;
+  const rootDir = params.expectedRoot === "skills" ? params.skillsRootDir : params.workdir;
   if (!rootDir?.trim()) return null;
   return relativePathFromAbsolute(raw, rootDir);
 }
diff --git a/crates/agent-gui/src/lib/tools/shellTools.ts b/crates/agent-gui/src/lib/tools/shellTools.ts
index 2a628919a..32476859d 100644
--- a/crates/agent-gui/src/lib/tools/shellTools.ts
+++ b/crates/agent-gui/src/lib/tools/shellTools.ts
@@ -1,20 +1,19 @@
+import type { Tool, ToolCall, ToolResultMessage } from "@mariozechner/pi-ai";
 import { Type } from "@sinclair/typebox";
 import { invoke } from "@tauri-apps/api/core";
-
-import type { Tool, ToolCall, ToolResultMessage } from "@mariozechner/pi-ai";
-
-import {
-  createBuiltinMetadataMap,
-  type BuiltinToolBundle,
-  type FileToolRoot,
-} from "./builtinTypes";
+import type { ProviderId } from "../settings";
 import {
+  type BashTimeoutPolicy,
   GLOBAL_BASH_MAX_TIMEOUT_MS,
   MIN_BASH_TIMEOUT_MS,
   normalizeBashTimeoutMs,
   resolveBashTimeoutPolicy,
-  type BashTimeoutPolicy,
 } from "./bashTimeoutPolicy";
+import {
+  type BuiltinToolBundle,
+  createBuiltinMetadataMap,
+  type FileToolRoot,
+} from "./builtinTypes";
 import { normalizeOptionalScopedRelPath, normalizeToolFileRoot } from "./pathUtils";
 import {
   assertSkillPathAllowedByPolicy,
@@ -22,7 +21,6 @@ import {
   isSkillAccessPolicyRestrictive,
   type SkillAccessPolicy,
 } from "./skillAccessPolicy";
-import type { ProviderId } from "../settings";
 
 type ShellRunResponse = {
   exit_code: number;
@@ -253,15 +251,10 @@ function validateBashBackgroundStdio(command: string) {
 
 function normalizeProcessAction(input: unknown) {
   const action = typeof input === "string" ? input.trim().toLowerCase() : "";
-  if (
-    action === "start" ||
-    action === "status" ||
-    action === "read_log" ||
-    action === "stop"
-  ) {
+  if (action === "start" || action === "status" || action === "read_log" || action === "stop") {
     return action;
   }
-  throw new Error('ManagedProcess.action must be one of: start, status, read_log, stop');
+  throw new Error("ManagedProcess.action must be one of: start, status, read_log, stop");
 }
 
 function formatManagedProcessRecord(process: ManagedProcessRecord) {
@@ -277,7 +270,9 @@ function formatManagedProcessRecord(process: ManagedProcessRecord) {
       ? `exit_code=${process.exit_code}`
       : null,
     `command=${process.command}`,
-  ].filter(Boolean).join("\n");
+  ]
+    .filter(Boolean)
+    .join("\n");
 }
 
 function buildManagedProcessToolResult(params: {
@@ -404,9 +399,7 @@ export function createShellTools(params: {
     const value = normalizeCommandForPolicy(command);
     if (!commandReferencesFixedSkillsRoot(value)) return false;
     const root = cachedSkillsRootDir.trim().replace(/\\/g, "/");
-    const escapedRoot = root
-      ? root.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")
-      : null;
+    const escapedRoot = root ? root.replace(/[.*+?^${}()|[\]\\]/g, "\\$&") : null;
     const skillPathPrefix = escapedRoot
       ? `(?:~/\\.liveagent/skills|/\\.liveagent/skills|${escapedRoot})`
       : "(?:~/\\.liveagent/skills|/\\.liveagent/skills)";
@@ -421,9 +414,7 @@ export function createShellTools(params: {
     const value = normalizeCommandForPolicy(command);
     if (!commandReferencesFixedSkillsRoot(value)) return false;
     const root = cachedSkillsRootDir.trim().replace(/\\/g, "/");
-    const escapedRoot = root
-      ? root.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")
-      : null;
+    const escapedRoot = root ? root.replace(/[.*+?^${}()|[\]\\]/g, "\\$&") : null;
     const skillPathPrefix = escapedRoot
       ? `(?:~/\\.liveagent/skills|/\\.liveagent/skills|${escapedRoot})`
       : "(?:~/\\.liveagent/skills|/\\.liveagent/skills)";
@@ -474,24 +465,18 @@ export function createShellTools(params: {
     );
   }
 
-  function validateBashSkillAccess(params: {
-    root: FileToolRoot;
-    cwd?: string;
-    command: string;
-  }) {
+  function validateBashSkillAccess(params: { root: FileToolRoot; cwd?: string; command: string }) {
     if (params.root === "skills") {
       if (!params.cwd && isSkillAccessPolicyRestrictive(skillAccessPolicy)) {
-        throw new Error(buildSkillAccessDeniedMessage({
-          operation: 'Bash(root="skills")',
-          allowedSkillNames: skillAccessPolicy?.allowedSkillNames,
-        }));
+        throw new Error(
+          buildSkillAccessDeniedMessage({
+            operation: 'Bash(root="skills")',
+            allowedSkillNames: skillAccessPolicy?.allowedSkillNames,
+          }),
+        );
       }
       if (params.cwd) {
-        assertSkillPathAllowedByPolicy(
-          skillAccessPolicy,
-          params.cwd,
-          'Bash(root="skills")',
-        );
+        assertSkillPathAllowedByPolicy(skillAccessPolicy, params.cwd, 'Bash(root="skills")');
       }
       if (commandReferencesFixedSkillsRoot(params.command)) {
         throw new Error(
@@ -536,7 +521,7 @@ export function createShellTools(params: {
         );
       }
       for (const baseDir of referencedSkills) {
-        assertSkillPathAllowedByPolicy(skillAccessPolicy, `${baseDir}/`, 'Bash');
+        assertSkillPathAllowedByPolicy(skillAccessPolicy, `${baseDir}/`, "Bash");
       }
       // All referenced Skills are enabled — allow the absolute path through.
     }
@@ -547,7 +532,7 @@ export function createShellTools(params: {
     }
     if (commandSearchesFilesystemForSkills(params.command)) {
       throw new Error(
-        'Bash cannot run find / to discover installed Skills. Use enabled Skills via SkillsManager and scoped file tools instead.',
+        "Bash cannot run find / to discover installed Skills. Use enabled Skills via SkillsManager and scoped file tools instead.",
       );
     }
   }
@@ -581,7 +566,9 @@ export function createShellTools(params: {
 
     if (
       params.root === "skills" &&
-      /No such file or directory|can't open file|not found|没有那个文件|无法打开文件/i.test(combined)
+      /No such file or directory|can't open file|not found|没有那个文件|无法打开文件/i.test(
+        combined,
+      )
     ) {
       hints.push(
         'Hint: Use List/Glob with root="skills" and the same skill directory to locate the script or file, then retry Bash with root="skills" and a relative cwd.',
@@ -589,7 +576,9 @@ export function createShellTools(params: {
     }
 
     if (
-      /(no such table|unable to open database file|ModuleNotFoundError|ImportError|Missing content|ValueError)/i.test(combined)
+      /(no such table|unable to open database file|ModuleNotFoundError|ImportError|Missing content|ValueError)/i.test(
+        combined,
+      )
     ) {
       hints.push(
         'Hint: This is an application or script error rather than a path normalization error. Inspect the script help or source with Read(root="skills", ...), then retry with the required arguments or dependency setup.',
@@ -601,8 +590,7 @@ export function createShellTools(params: {
 
   const toolBash: Tool = {
     name: "Bash",
-    description:
-      `Execute a non-interactive shell command on the local machine for builds, tests, package managers, external CLIs, curl/API calls, running Skill scripts, or explicitly requested shell work. Reserve it for commands that truly require a shell — do NOT use Bash for file operations the dedicated tools handle: use Read/List/Glob/Grep instead of cat/ls/find/grep/rg for any workspace or Skill content; use Delete instead of rm/rmdir/unlink/find -delete; use Image instead of open/xdg-open/file paths to show pictures. Use curl with an explicit timeout such as \`--max-time 30\` for endpoint tests. Background commands using \`&\` must detach stdout and stderr first, for example \`nohup command > /tmp/liveagent-task.log 2>&1 < /dev/null &\`; otherwise the tool rejects them because inherited pipes can keep Bash running forever. Running a Skill script: two forms are both supported — (a) preferred, canonical: root="skills" with cwd="<skill-name>/scripts" and a command relative to that cwd; (b) direct absolute script path in command, e.g. \`python ~/.liveagent/skills/<skill-name>/scripts/foo.py\`, without cd into the fixed Skills root — the referenced Skill must be enabled in this conversation. Use / as the path separator; Windows \\ is auto-normalized. ${windowsShellPolicy} macOS prefers zsh, then Bash/sh; Linux prefers Bash. Returns stdout, stderr, and exit_code. For ${timeoutPolicy.providerLabel}, timeout defaults to ${timeoutPolicy.defaultTimeoutMs}ms and is capped at ${timeoutPolicy.maxTimeoutMs}ms; larger timeout_ms values are accepted by the schema but clamped before execution. High risk: use carefully.`,
+    description: `Execute a non-interactive shell command on the local machine for builds, tests, package managers, external CLIs, curl/API calls, running Skill scripts, or explicitly requested shell work. Reserve it for commands that truly require a shell — do NOT use Bash for file operations the dedicated tools handle: use Read/List/Glob/Grep instead of cat/ls/find/grep/rg for any workspace or Skill content; use Delete instead of rm/rmdir/unlink/find -delete; use Image instead of open/xdg-open/file paths to show pictures. Use curl with an explicit timeout such as \`--max-time 30\` for endpoint tests. Background commands using \`&\` must detach stdout and stderr first, for example \`nohup command > /tmp/liveagent-task.log 2>&1 < /dev/null &\`; otherwise the tool rejects them because inherited pipes can keep Bash running forever. Running a Skill script: two forms are both supported — (a) preferred, canonical: root="skills" with cwd="<skill-name>/scripts" and a command relative to that cwd; (b) direct absolute script path in command, e.g. \`python ~/.liveagent/skills/<skill-name>/scripts/foo.py\`, without cd into the fixed Skills root — the referenced Skill must be enabled in this conversation. Use / as the path separator; Windows \\ is auto-normalized. ${windowsShellPolicy} macOS prefers zsh, then Bash/sh; Linux prefers Bash. Returns stdout, stderr, and exit_code. For ${timeoutPolicy.providerLabel}, timeout defaults to ${timeoutPolicy.defaultTimeoutMs}ms and is capped at ${timeoutPolicy.maxTimeoutMs}ms; larger timeout_ms values are accepted by the schema but clamped before execution. High risk: use carefully.`,
     parameters: Type.Object({
       ...(allowSkillsRoot
         ? {
@@ -614,7 +602,9 @@ export function createShellTools(params: {
             ),
           }
         : {}),
-      command: Type.String({ description: "Shell command to execute (prefer non-interactive, idempotent commands)." }),
+      command: Type.String({
+        description: "Shell command to execute (prefer non-interactive, idempotent commands).",
+      }),
       cwd: Type.Optional(
         Type.String({
           description:
@@ -636,33 +626,49 @@ export function createShellTools(params: {
     description:
       'Start, inspect, read logs for, or stop a long-running local process such as a dev server, watcher, or preview server. Use this instead of `Bash ... &`. action="start" runs a foreground command under LiveAgent process management, redirects stdout/stderr to a log file, and returns immediately with process_id, pid, and log_path. Use action="status" to list or inspect processes, action="read_log" to read recent log output, and action="stop" to terminate the process tree.',
     parameters: Type.Object({
-      action: Type.Union([
-        Type.Literal("start"),
-        Type.Literal("status"),
-        Type.Literal("read_log"),
-        Type.Literal("stop"),
-      ], {
-        description: "Process action to run.",
-      }),
-      command: Type.Optional(Type.String({
-        description:
-          'Required for action="start". Foreground command to run. Do not append `&`; ManagedProcess handles background lifecycle and log redirection.',
-      })),
-      cwd: Type.Optional(Type.String({
-        description:
-          'Optional working directory relative to the workspace root for action="start". Omit to use the workspace root.',
-      })),
-      label: Type.Optional(Type.String({
-        description: 'Optional human-readable label for action="start", such as "survival-agent dev server".',
-      })),
-      process_id: Type.Optional(Type.String({
-        description: 'Required for action="read_log" and action="stop"; optional filter for action="status".',
-      })),
-      max_bytes: Type.Optional(Type.Number({
-        minimum: 1,
-        maximum: 512 * 1024,
-        description: 'Maximum recent log bytes to return for action="read_log" (default 65536, maximum 524288).',
-      })),
+      action: Type.Union(
+        [
+          Type.Literal("start"),
+          Type.Literal("status"),
+          Type.Literal("read_log"),
+          Type.Literal("stop"),
+        ],
+        {
+          description: "Process action to run.",
+        },
+      ),
+      command: Type.Optional(
+        Type.String({
+          description:
+            'Required for action="start". Foreground command to run. Do not append `&`; ManagedProcess handles background lifecycle and log redirection.',
+        }),
+      ),
+      cwd: Type.Optional(
+        Type.String({
+          description:
+            'Optional working directory relative to the workspace root for action="start". Omit to use the workspace root.',
+        }),
+      ),
+      label: Type.Optional(
+        Type.String({
+          description:
+            'Optional human-readable label for action="start", such as "survival-agent dev server".',
+        }),
+      ),
+      process_id: Type.Optional(
+        Type.String({
+          description:
+            'Required for action="read_log" and action="stop"; optional filter for action="status".',
+        }),
+      ),
+      max_bytes: Type.Optional(
+        Type.Number({
+          minimum: 1,
+          maximum: 512 * 1024,
+          description:
+            'Maximum recent log bytes to return for action="read_log" (default 65536, maximum 524288).',
+        }),
+      ),
     }),
   };
 
@@ -689,7 +695,9 @@ export function createShellTools(params: {
         role: "toolResult",
         toolCallId: toolCall.id,
         toolName: toolCall.name,
-        content: [{ type: "text", text: "Working directory is not configured; cannot manage processes." }],
+        content: [
+          { type: "text", text: "Working directory is not configured; cannot manage processes." },
+        ],
         details: {},
         isError: true,
         timestamp: now,
@@ -698,17 +706,19 @@ export function createShellTools(params: {
 
     try {
       const action = normalizeProcessAction(toolCall.arguments?.action);
-      const processId = typeof toolCall.arguments?.process_id === "string"
-        ? toolCall.arguments.process_id.trim()
-        : "";
+      const processId =
+        typeof toolCall.arguments?.process_id === "string"
+          ? toolCall.arguments.process_id.trim()
+          : "";
 
       if (action === "start") {
-        const command = typeof toolCall.arguments?.command === "string"
-          ? toolCall.arguments.command.trim()
-          : "";
+        const command =
+          typeof toolCall.arguments?.command === "string" ? toolCall.arguments.command.trim() : "";
         if (!command) throw new Error('ManagedProcess.command is required for action="start"');
         if (scanShellSyntax(command).background) {
-          throw new Error("ManagedProcess.command must be a foreground command. Remove `&`; ManagedProcess starts it in the background and captures logs automatically.");
+          throw new Error(
+            "ManagedProcess.command must be a foreground command. Remove `&`; ManagedProcess starts it in the background and captures logs automatically.",
+          );
         }
         const cwdRaw = toolCall.arguments?.cwd;
         const cwd =
@@ -720,9 +730,10 @@ export function createShellTools(params: {
                 workdir,
               })
             : undefined;
-        const label = typeof toolCall.arguments?.label === "string"
-          ? toolCall.arguments.label.trim()
-          : undefined;
+        const label =
+          typeof toolCall.arguments?.label === "string"
+            ? toolCall.arguments.label.trim()
+            : undefined;
         const response = await invoke<ManagedProcessStartResponse>("managed_process_start", {
           workdir,
           command,
@@ -758,13 +769,16 @@ export function createShellTools(params: {
       }
 
       if (!processId) {
-        throw new Error(`ManagedProcess.process_id is required for action=${JSON.stringify(action)}`);
+        throw new Error(
+          `ManagedProcess.process_id is required for action=${JSON.stringify(action)}`,
+        );
       }
 
       if (action === "read_log") {
-        const maxBytes = typeof toolCall.arguments?.max_bytes === "number"
-          ? Math.floor(toolCall.arguments.max_bytes)
-          : undefined;
+        const maxBytes =
+          typeof toolCall.arguments?.max_bytes === "number"
+            ? Math.floor(toolCall.arguments.max_bytes)
+            : undefined;
         const response = await invoke<ManagedProcessLogResponse>("managed_process_read_log", {
           process_id: processId,
           max_bytes: maxBytes,
@@ -836,16 +850,17 @@ export function createShellTools(params: {
         role: "toolResult",
         toolCallId: toolCall.id,
         toolName: toolCall.name,
-        content: [{ type: "text", text: "Working directory is not configured; cannot run the shell tool." }],
+        content: [
+          { type: "text", text: "Working directory is not configured; cannot run the shell tool." },
+        ],
         details: {},
         isError: true,
         timestamp: now,
       };
     }
 
-    const command = typeof toolCall.arguments?.command === "string"
-      ? toolCall.arguments.command.trim()
-      : "";
+    const command =
+      typeof toolCall.arguments?.command === "string" ? toolCall.arguments.command.trim() : "";
 
     if (signal?.aborted) {
       return buildCancelledResult({
@@ -1001,14 +1016,15 @@ export function createShellTools(params: {
         `${stderrLabel}:`,
         res.stderr || "",
       ].join("\n");
-      const hint = res.exit_code !== 0 || Boolean(res.timed_out) || Boolean(res.cancelled)
-        ? buildShellFailureHint({
-            root,
-            command,
-            stdout: res.stdout || "",
-            stderr: res.stderr || "",
-          })
-        : "";
+      const hint =
+        res.exit_code !== 0 || res.timed_out || res.cancelled
+          ? buildShellFailureHint({
+              root,
+              command,
+              stdout: res.stdout || "",
+              stderr: res.stderr || "",
+            })
+          : "";
 
       return {
         role: "toolResult",
diff --git a/crates/agent-gui/src/lib/tools/skillAccessPolicy.ts b/crates/agent-gui/src/lib/tools/skillAccessPolicy.ts
index 672286bfa..071abaa97 100644
--- a/crates/agent-gui/src/lib/tools/skillAccessPolicy.ts
+++ b/crates/agent-gui/src/lib/tools/skillAccessPolicy.ts
@@ -17,7 +17,11 @@ type SkillLike = {
 };
 
 function normalizeRelPath(path: string) {
-  return path.trim().replace(/\\/g, "/").replace(/^\.\/+/, "").replace(/\/+$/g, "");
+  return path
+    .trim()
+    .replace(/\\/g, "/")
+    .replace(/^\.\/+/, "")
+    .replace(/\/+$/g, "");
 }
 
 function normalizeName(name: string) {
@@ -41,9 +45,7 @@ function normalizePolicyBaseDirs(policy?: SkillAccessPolicy) {
 function normalizePolicyNames(policy?: SkillAccessPolicy) {
   if (!Array.isArray(policy?.allowedSkillNames)) return null;
   return new Set(
-    policy.allowedSkillNames
-      .map((name) => normalizeName(String(name)))
-      .filter(Boolean),
+    policy.allowedSkillNames.map((name) => normalizeName(String(name))).filter(Boolean),
   );
 }
 
@@ -115,14 +117,15 @@ export function buildSkillAccessDeniedMessage(params: {
   const allowed = Array.from(params.allowedSkillNames ?? [])
     .map((name) => String(name).trim())
     .filter(Boolean);
-  const allowedText = allowed.length > 0
-    ? `Allowed Skills in this conversation: ${allowed.join(", ")}.`
-    : "No Skills are enabled for file access in this conversation.";
+  const allowedText =
+    allowed.length > 0
+      ? `Allowed Skills in this conversation: ${allowed.join(", ")}.`
+      : "No Skills are enabled for file access in this conversation.";
   return [
     `${params.operation} is blocked: ${target} is not enabled for this conversation.`,
     allowedText,
     "Enable the Skill in the chat Skills selector before reading, searching, or running files from it.",
-    'Do not bypass this with Bash, absolute paths, find /, or ~/.liveagent/skills.',
+    "Do not bypass this with Bash, absolute paths, find /, or ~/.liveagent/skills.",
   ].join(" ");
 }
 
@@ -132,11 +135,13 @@ export function assertSkillPathAllowedByPolicy(
   operation: string,
 ) {
   if (isSkillPathAllowedByPolicy(policy, path)) return;
-  throw new Error(buildSkillAccessDeniedMessage({
-    operation,
-    path,
-    allowedSkillNames: policy?.allowedSkillNames,
-  }));
+  throw new Error(
+    buildSkillAccessDeniedMessage({
+      operation,
+      path,
+      allowedSkillNames: policy?.allowedSkillNames,
+    }),
+  );
 }
 
 export function assertSkillNameAllowedByPolicy(
@@ -145,11 +150,13 @@ export function assertSkillNameAllowedByPolicy(
   operation: string,
 ) {
   if (isSkillNameAllowedByPolicy(policy, name)) return;
-  throw new Error(buildSkillAccessDeniedMessage({
-    operation,
-    name,
-    allowedSkillNames: policy?.allowedSkillNames,
-  }));
+  throw new Error(
+    buildSkillAccessDeniedMessage({
+      operation,
+      name,
+      allowedSkillNames: policy?.allowedSkillNames,
+    }),
+  );
 }
 
 export function filterSkillsByAccessPolicy<T extends SkillLike>(
@@ -171,10 +178,12 @@ export function filterSkillsByAccessPolicy<T extends SkillLike>(
 
 export function assertSkillInventoryAllowed(policy: SkillAccessPolicy | undefined) {
   if (!isSkillAccessPolicyRestrictive(policy) || policy?.allowSkillInventory === true) return;
-  throw new Error(buildSkillAccessDeniedMessage({
-    operation: "SkillsManager(action=list)",
-    allowedSkillNames: policy?.allowedSkillNames,
-  }));
+  throw new Error(
+    buildSkillAccessDeniedMessage({
+      operation: "SkillsManager(action=list)",
+      allowedSkillNames: policy?.allowedSkillNames,
+    }),
+  );
 }
 
 export function assertSkillManagementAllowed(
diff --git a/crates/agent-gui/src/lib/tools/skillTools.ts b/crates/agent-gui/src/lib/tools/skillTools.ts
index ed853c79e..a2e26cc0d 100644
--- a/crates/agent-gui/src/lib/tools/skillTools.ts
+++ b/crates/agent-gui/src/lib/tools/skillTools.ts
@@ -1,11 +1,11 @@
-import { Type } from "@sinclair/typebox";
-
 import type { Tool, ToolCall, ToolResultMessage } from "@mariozechner/pi-ai";
+import { Type } from "@sinclair/typebox";
 
 import { manageSkill, notifySkillsDiscoveryUpdated } from "../skills";
+import { isAlwaysEnabledSkillName } from "../skills/builtin";
 import {
-  createBuiltinMetadataMap,
   type BuiltinToolBundle,
+  createBuiltinMetadataMap,
   type SkillsManagerActionResultDetails,
   type SkillsManagerResultDetails,
 } from "./builtinTypes";
@@ -20,7 +20,6 @@ import {
   normalizeSkillBaseDir,
   type SkillAccessPolicy,
 } from "./skillAccessPolicy";
-import { isAlwaysEnabledSkillName } from "../skills/builtin";
 
 function asErrorMessage(err: unknown) {
   return err instanceof Error ? err.message : String(err);
@@ -73,8 +72,12 @@ const SKILL_MANAGER_PARAMETERS = Type.Object({
         "Relative Skill file path for action=read, for example my-skill/SKILL.md, my-skill/skill.json, or my-skill/README.md.",
     }),
   ),
-  offset: Type.Optional(Type.Number({ minimum: 0, description: "Starting line for read (0-based)." })),
-  length: Type.Optional(Type.Number({ minimum: 0, description: "Number of lines to read (default: 200)." })),
+  offset: Type.Optional(
+    Type.Number({ minimum: 0, description: "Starting line for read (0-based)." }),
+  ),
+  length: Type.Optional(
+    Type.Number({ minimum: 0, description: "Number of lines to read (default: 200)." }),
+  ),
   source: Type.Optional(
     Type.String({
       description:
@@ -96,7 +99,8 @@ const SKILL_MANAGER_PARAMETERS = Type.Object({
         Type.Literal("newest"),
       ],
       {
-        description: "Browse sort for action=clawhub_search when query is omitted. Defaults to downloads.",
+        description:
+          "Browse sort for action=clawhub_search when query is omitted. Defaults to downloads.",
       },
     ),
   ),
@@ -114,7 +118,8 @@ const SKILL_MANAGER_PARAMETERS = Type.Object({
   ),
   slug: Type.Optional(
     Type.String({
-      description: "ClawHub skill slug for action=clawhub_install, as returned by action=clawhub_search.",
+      description:
+        "ClawHub skill slug for action=clawhub_install, as returned by action=clawhub_search.",
     }),
   ),
   version: Type.Optional(
@@ -135,7 +140,8 @@ const SKILL_MANAGER_PARAMETERS = Type.Object({
   ),
   body: Type.Optional(
     Type.String({
-      description: "Markdown body for action=create. Frontmatter is generated from name and description.",
+      description:
+        "Markdown body for action=create. Frontmatter is generated from name and description.",
     }),
   ),
   files: Type.Optional(
@@ -245,7 +251,9 @@ function appendUnique(out: string[], value: string) {
 function collectManagedSkillAccess(result: Awaited<ReturnType<typeof manageSkill>>) {
   const names: string[] = [];
   const baseDirs: string[] = [];
-  const collect = (item: { name?: string | null; skillFile?: string | null } | null | undefined) => {
+  const collect = (
+    item: { name?: string | null; skillFile?: string | null } | null | undefined,
+  ) => {
     if (!item) return;
     if (typeof item.name === "string") {
       appendUnique(names, item.name);
@@ -312,9 +320,12 @@ function buildSkillManagerErrorText(args: Record<string, unknown>, error: unknow
   return lines.join(" ");
 }
 
-function normalizeSkillManagerPayload(args: Record<string, unknown>, options: {
-  workdir?: string;
-} = {}) {
+function normalizeSkillManagerPayload(
+  args: Record<string, unknown>,
+  options: {
+    workdir?: string;
+  } = {},
+) {
   const action = normalizeAction(args);
   const payload: Record<string, unknown> = { action };
 
@@ -367,7 +378,8 @@ function normalizeSkillManagerPayload(args: Record<string, unknown>, options: {
       if (value) payload[key] = value;
     }
     if (!payload.name) throw new Error("SkillsManager.name is required for action=create");
-    if (!payload.description) throw new Error("SkillsManager.description is required for action=create");
+    if (!payload.description)
+      throw new Error("SkillsManager.description is required for action=create");
     if (Array.isArray(args.files)) payload.files = args.files;
     return payload;
   }
@@ -381,7 +393,9 @@ function normalizeSkillManagerPayload(args: Record<string, unknown>, options: {
 
   if (action === "list") return payload;
 
-  throw new Error(`SkillsManager.action must be one of: read, list, install, create, validate, package, delete, clawhub_search, clawhub_install. Received: ${JSON.stringify(action)}`);
+  throw new Error(
+    `SkillsManager.action must be one of: read, list, install, create, validate, package, delete, clawhub_search, clawhub_install. Received: ${JSON.stringify(action)}`,
+  );
 }
 
 function filterManageSkillResult(
@@ -402,7 +416,11 @@ function enforceSkillManagerAccessPolicy(
 ) {
   const action = typeof payload.action === "string" ? payload.action : "";
   if (action === "read") {
-    assertSkillPathAllowedByPolicy(policy, String(payload.path ?? ""), "SkillsManager(action=\"read\")");
+    assertSkillPathAllowedByPolicy(
+      policy,
+      String(payload.path ?? ""),
+      'SkillsManager(action="read")',
+    );
     return;
   }
   if (action === "list") {
@@ -471,12 +489,16 @@ function formatManageSkillResultText(
         `stars=${item.stars}`,
         `installs=${item.installsCurrent}`,
       ].join(" ");
-      lines.push(`- ${item.slug} | ${item.displayName} | version=${item.latestVersion ?? "latest"} | ${stats}`);
+      lines.push(
+        `- ${item.slug} | ${item.displayName} | version=${item.latestVersion ?? "latest"} | ${stats}`,
+      );
       if (item.summary) lines.push(`  summary=${item.summary}`);
       if (item.ownerHandle) lines.push(`  owner=${item.ownerHandle}`);
       if (item.downloadUrl) lines.push(`  downloadUrl=${item.downloadUrl}`);
       const versionArg = item.latestVersion ? `, version="${item.latestVersion}"` : "";
-      lines.push(`  install=SkillsManager(action="clawhub_install", slug="${item.slug}"${versionArg}, conflict="backup")`);
+      lines.push(
+        `  install=SkillsManager(action="clawhub_install", slug="${item.slug}"${versionArg}, conflict="backup")`,
+      );
     }
   } else if (result.action === "install" || result.action === "clawhub_install") {
     const installed = result.installed ?? [];
@@ -517,7 +539,9 @@ function formatManageSkillResultText(
   return lines.join("\n");
 }
 
-function buildActionDetails(result: Awaited<ReturnType<typeof manageSkill>>): SkillsManagerActionResultDetails {
+function buildActionDetails(
+  result: Awaited<ReturnType<typeof manageSkill>>,
+): SkillsManagerActionResultDetails {
   const validationErrors = result.validation?.errors ?? [];
   const installedBackup = result.installed?.find(
     (item) => typeof item.backup === "string" && item.backup.length > 0,
@@ -540,25 +564,33 @@ function buildActionDetails(result: Awaited<ReturnType<typeof manageSkill>>): Sk
     deletedName: result.deleted?.name,
     validationOk: result.validation?.ok,
     packageArchive: result.package?.archive,
-    target: result.created?.target ?? result.installed?.[0]?.target ?? result.validation?.target ?? result.package?.target ?? result.deleted?.target,
+    target:
+      result.created?.target ??
+      result.installed?.[0]?.target ??
+      result.validation?.target ??
+      result.package?.target ??
+      result.deleted?.target,
     backup,
     clawhubResultCount: result.clawhubResults?.length,
     clawhubNextCursor: result.clawhubNextCursor ?? undefined,
     clawhubSlug: result.clawhubSlug ?? result.clawhubResults?.[0]?.slug,
-    clawhubDownloadUrl: result.clawhubDownloadUrl ?? result.clawhubResults?.[0]?.downloadUrl ?? undefined,
+    clawhubDownloadUrl:
+      result.clawhubDownloadUrl ?? result.clawhubResults?.[0]?.downloadUrl ?? undefined,
     errors: validationErrors.length > 0 ? validationErrors : undefined,
   };
 }
 
-export function createSkillTools(params: {
-  workdir?: string;
-  skillAccessPolicy?: SkillAccessPolicy;
-  onManagedSkillsChanged?: (change: {
-    action: "install" | "create";
-    names: string[];
-    baseDirs: string[];
-  }) => void | Promise<void>;
-} = {}): BuiltinToolBundle {
+export function createSkillTools(
+  params: {
+    workdir?: string;
+    skillAccessPolicy?: SkillAccessPolicy;
+    onManagedSkillsChanged?: (change: {
+      action: "install" | "create";
+      names: string[];
+      baseDirs: string[];
+    }) => void | Promise<void>;
+  } = {},
+): BuiltinToolBundle {
   const skillAccessPolicy = params.skillAccessPolicy;
   const toolSkillsManager: Tool = {
     name: "SkillsManager",
@@ -604,7 +636,11 @@ export function createSkillTools(params: {
       enforceSkillManagerAccessPolicy(payload, skillAccessPolicy);
       const result = await manageSkill(payload);
       const visibleResult = filterManageSkillResult(result, skillAccessPolicy);
-      if (result.action === "install" || result.action === "create" || result.action === "clawhub_install") {
+      if (
+        result.action === "install" ||
+        result.action === "create" ||
+        result.action === "clawhub_install"
+      ) {
         const access = collectManagedSkillAccess(result);
         grantSkillsToAccessPolicy(skillAccessPolicy, access);
         if (access.names.length > 0 || access.baseDirs.length > 0) {
@@ -625,14 +661,17 @@ export function createSkillTools(params: {
       }
 
       if (visibleResult.action === "read") {
-        const path = typeof visibleResult.path === "string" ? visibleResult.path : String(payload.path ?? "");
+        const path =
+          typeof visibleResult.path === "string" ? visibleResult.path : String(payload.path ?? "");
         const content = typeof visibleResult.content === "string" ? visibleResult.content : "";
-        const startLine = typeof visibleResult.startLine === "number"
-          ? visibleResult.startLine
-          : (typeof payload.offset === "number" ? payload.offset : 0) + 1;
-        const numLines = typeof visibleResult.numLines === "number"
-          ? visibleResult.numLines
-          : countSkillTextLines(content);
+        const startLine =
+          typeof visibleResult.startLine === "number"
+            ? visibleResult.startLine
+            : (typeof payload.offset === "number" ? payload.offset : 0) + 1;
+        const numLines =
+          typeof visibleResult.numLines === "number"
+            ? visibleResult.numLines
+            : countSkillTextLines(content);
         const details: SkillsManagerResultDetails = {
           kind: "read_skill",
           path,
@@ -663,7 +702,9 @@ export function createSkillTools(params: {
         role: "toolResult",
         toolCallId: toolCall.id,
         toolName: toolCall.name,
-        content: [{ type: "text", text: formatManageSkillResultText(visibleResult, skillAccessPolicy) }],
+        content: [
+          { type: "text", text: formatManageSkillResultText(visibleResult, skillAccessPolicy) },
+        ],
         details,
         isError: false,
         timestamp: now,
diff --git a/crates/agent-gui/src/pages/ChatPage.tsx b/crates/agent-gui/src/pages/ChatPage.tsx
index 8d8f11821..2bab93645 100644
--- a/crates/agent-gui/src/pages/ChatPage.tsx
+++ b/crates/agent-gui/src/pages/ChatPage.tsx
@@ -1,57 +1,71 @@
-import { useCallback, useEffect, useMemo, useRef, useState, type SetStateAction } from "react";
+import type { Context, UserMessage } from "@mariozechner/pi-ai";
 import { invoke } from "@tauri-apps/api/core";
 import { listen } from "@tauri-apps/api/event";
 import { getCurrentWebview } from "@tauri-apps/api/webview";
-import type {
-  Context,
-  UserMessage,
-} from "@mariozechner/pi-ai";
-import { Ban, Upload } from "../components/icons";
-
+import { type SetStateAction, useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { ChatHistorySidebar } from "../components/chat/ChatHistorySidebar";
 import { HistoryShareModal } from "../components/chat/HistoryShareModal";
-import { SharedHistoryManagerModal } from "../components/chat/SharedHistoryManagerModal";
 import type {
   MentionComposerDraft,
   MentionComposerHandle,
   MentionComposerLargePaste,
 } from "../components/chat/MentionComposer";
+import { type NotifyItem, NotifyToast } from "../components/chat/NotifyToast";
+import { SharedHistoryManagerModal } from "../components/chat/SharedHistoryManagerModal";
+import { Ban, Upload } from "../components/icons";
 import { useLocale } from "../i18n";
 import {
-  createModelFromConfig,
-  toModelValue,
-} from "../lib/providers/llm";
+  type CompactionStatus,
+  noteCompactionApplied,
+  pruneConversationState,
+  runMidTurnCompaction,
+  runPreCompactConversation,
+  shouldPreCompactConversation,
+} from "../lib/chat/compaction/contextCompaction";
+import { buildPersistableMessagesFromSnapshot } from "../lib/chat/conversation/chatAbort";
+import {
+  appendMessagesToConversation,
+  buildRequestContext,
+  type ConversationViewState,
+  createConversationStateFromContext,
+  type RenderTimelineItem,
+} from "../lib/chat/conversation/conversationState";
 import {
-  buildPersistableMessagesFromSnapshot,
-} from "../lib/chat/conversation/chatAbort";
+  createConversationHookLifecycle,
+  createGatewayBridgeEventController,
+} from "../lib/chat/conversation/run";
 import {
+  type ChatHistoryShareStatus,
+  type ChatHistorySummary,
   getChatHistory,
   getChatHistoryShare,
   listSharedChatHistory,
   setChatHistoryShare,
-  type ChatHistoryShareStatus,
-  type ChatHistorySummary,
 } from "../lib/chat/history/chatHistory";
+import { clearSilentMemoryDecisions } from "../lib/chat/memory/memoryDecisionLog";
+import { clearMemoryExtractorState } from "../lib/chat/memory/memoryExtractor";
+import { buildMemoryOverviewSection } from "../lib/chat/memory/memoryPrompt";
 import {
-  appendMessagesToConversation,
-  buildRequestContext,
-  createConversationStateFromContext,
-  type ConversationViewState,
-  type RenderTimelineItem,
-} from "../lib/chat/conversation/conversationState";
-import {
-  noteCompactionApplied,
-  pruneConversationState,
-  runMidTurnCompaction,
-  runPreCompactConversation,
-  shouldPreCompactConversation,
-  type CompactionStatus,
-} from "../lib/chat/compaction/contextCompaction";
+  createUserMessageWithUploads,
+  mergePendingUploadedFiles,
+  type PendingUploadedFile,
+  withPastedTextDisplayMetadata,
+} from "../lib/chat/messages/uploadedFiles";
 import {
-  buildSkillsSystemPrompt,
-  mergeAlwaysEnabledSkillNames,
-  resolveExplicitSkillMentions,
-} from "../lib/skills";
+  buildFallbackConversationTitle,
+  buildModelOptions,
+  createConversationIdentity,
+  createPendingHistoryItem,
+  getFirstUserMessageText,
+  isAbortLikeError,
+  mergeHistoryItem,
+  PENDING_CONVERSATION_TITLE,
+  sortHistoryItems,
+} from "../lib/chat/page/chatPageHelpers";
+import { createSubagentRuntimeManager } from "../lib/chat/subagent/subagentRuntimeManager";
+import { createStreamDebugLogger } from "../lib/debug/agentDebug";
+import { createConversationHookDispatcher } from "../lib/hooks/conversationHooks";
+import { createModelFromConfig, toModelValue } from "../lib/providers/llm";
 import {
   type AppSettings,
   type ChatRuntimeControls,
@@ -65,40 +79,19 @@ import {
   type SelectedModel,
   type SystemToolId,
   updateChatRuntimeControlsForProvider,
-  updateMemorySettings,
   updateMcp,
+  updateMemorySettings,
   updateSkills,
 } from "../lib/settings";
-import { createConversationHookDispatcher } from "../lib/hooks/conversationHooks";
-import { createStreamDebugLogger } from "../lib/debug/agentDebug";
-import { createSubagentRuntimeManager } from "../lib/chat/subagent/subagentRuntimeManager";
-import { buildMemoryOverviewSection } from "../lib/chat/memory/memoryPrompt";
-import { clearMemoryExtractorState } from "../lib/chat/memory/memoryExtractor";
-import { clearSilentMemoryDecisions } from "../lib/chat/memory/memoryDecisionLog";
 import {
-  buildModelOptions,
-  buildFallbackConversationTitle,
-  getFirstUserMessageText,
-  isAbortLikeError,
-  mergeHistoryItem,
-  createPendingHistoryItem,
-  createConversationIdentity,
-  PENDING_CONVERSATION_TITLE,
-  sortHistoryItems,
-} from "../lib/chat/page/chatPageHelpers";
-import {
-  createUserMessageWithUploads,
-  mergePendingUploadedFiles,
-  withPastedTextDisplayMetadata,
-  type PendingUploadedFile,
-} from "../lib/chat/messages/uploadedFiles";
-import { NotifyToast, type NotifyItem } from "../components/chat/NotifyToast";
+  buildSkillsSystemPrompt,
+  mergeAlwaysEnabledSkillNames,
+  resolveExplicitSkillMentions,
+} from "../lib/skills";
+import type { SkillAccessPolicy } from "../lib/tools/skillAccessPolicy";
+import { ChatComposerBar } from "./chat/ChatComposerBar";
 import { ChatHeader } from "./chat/ChatHeader";
 import { ChatTranscript } from "./chat/ChatTranscript";
-import type { SectionId } from "./settings/types";
-import { ChatComposerBar } from "./chat/ChatComposerBar";
-import { SkillsHubPage } from "./skills-hub/SkillsHubPage";
-import { McpHubPage } from "./mcp-hub/McpHubPage";
 import {
   buildErrorAssistantMessage,
   createConversationRuntimeEntry,
@@ -106,37 +99,35 @@ import {
   pruneIdleConversationRuntimeCaches,
   setConversationRuntimeCacheEntry,
 } from "./chat/chatPageRuntime";
+import { buildPreCompactionStatus } from "./chat/compactionStatusText";
 import {
   buildCompactionContext,
   buildPreparedContext as buildPreparedConversationContext,
   buildResumeContext as buildResumeConversationContext,
 } from "./chat/conversationContextBuilders";
-import { useChatHistoryList } from "./chat/useChatHistoryList";
-import { useChatSkills } from "./chat/useChatSkills";
-import { useChatPageRuntimeStore } from "./chat/useChatPageRuntimeStore";
-import { useConversationHistoryActions } from "./chat/useConversationHistoryActions";
-import { useEditResend } from "./chat/useEditResend";
-import { useGatewayBridgeBatcher } from "./chat/useGatewayBridgeBatcher";
-import { useGatewayBridgeListeners } from "./chat/useGatewayBridgeListeners";
-import { useLiveTranscriptController } from "./chat/useLiveTranscriptController";
-import { MAX_UPLOAD_FILES, usePendingUploads } from "./chat/usePendingUploads";
+import { startConversationTitleJob } from "./chat/conversationTitleJob";
 import {
-  normalizeGatewayProviderType,
   type ActiveGatewayBridgeRequest,
   type EnsureGatewayBridgeConversationReadyOptions,
   type GatewaySelectedModelEvent,
+  normalizeGatewayProviderType,
   type SendChatAction,
 } from "./chat/gatewayBridgeTypes";
-import { startConversationTitleJob } from "./chat/conversationTitleJob";
-import { buildPreCompactionStatus } from "./chat/compactionStatusText";
 import { runAgentConversationTurn } from "./chat/runAgentConversationTurn";
 import { runTextConversationTurn } from "./chat/runTextConversationTurn";
 import { clearSilentMemoryExtractionState } from "./chat/silentMemoryExtraction";
-import type { SkillAccessPolicy } from "../lib/tools/skillAccessPolicy";
-import {
-  createConversationHookLifecycle,
-  createGatewayBridgeEventController,
-} from "../lib/chat/conversation/run";
+import { useChatHistoryList } from "./chat/useChatHistoryList";
+import { useChatPageRuntimeStore } from "./chat/useChatPageRuntimeStore";
+import { useChatSkills } from "./chat/useChatSkills";
+import { useConversationHistoryActions } from "./chat/useConversationHistoryActions";
+import { useEditResend } from "./chat/useEditResend";
+import { useGatewayBridgeBatcher } from "./chat/useGatewayBridgeBatcher";
+import { useGatewayBridgeListeners } from "./chat/useGatewayBridgeListeners";
+import { useLiveTranscriptController } from "./chat/useLiveTranscriptController";
+import { MAX_UPLOAD_FILES, usePendingUploads } from "./chat/usePendingUploads";
+import { McpHubPage } from "./mcp-hub/McpHubPage";
+import type { SectionId } from "./settings/types";
+import { SkillsHubPage } from "./skills-hub/SkillsHubPage";
 
 type ChatPageProps = {
   settings: AppSettings;
@@ -243,10 +234,7 @@ function buildTextFromComposerDraft(
     .replace(/\u00A0/g, " ");
 }
 
-async function importPastedTextsAsFiles(
-  workdir: string,
-  pastes: MentionComposerLargePaste[],
-) {
+async function importPastedTextsAsFiles(workdir: string, pastes: MentionComposerLargePaste[]) {
   const normalizedWorkdir = workdir.trim();
   if (!normalizedWorkdir) {
     throw new Error("请先在设置 -> 系统中配置工作目录后再发送大段粘贴内容。");
@@ -258,16 +246,13 @@ async function importPastedTextsAsFiles(
     };
   }
 
-  const response = await invoke<SystemImportPastedTextsResponse>(
-    "system_import_pasted_texts",
-    {
-      workdir: normalizedWorkdir,
-      texts: pastes.map((paste, index) => ({
-        fileName: buildPastedTextFileName(paste, index),
-        content: paste.text,
-      })),
-    },
-  );
+  const response = await invoke<SystemImportPastedTextsResponse>("system_import_pasted_texts", {
+    workdir: normalizedWorkdir,
+    texts: pastes.map((paste, index) => ({
+      fileName: buildPastedTextFileName(paste, index),
+      content: paste.text,
+    })),
+  });
 
   if (response.files.length !== pastes.length) {
     const skipped = response.skipped.length > 0 ? `\n${response.skipped.join("\n")}` : "";
@@ -328,8 +313,7 @@ function resolveEffectiveChatModelSelection(
 
   const exactProvider = settings.customProviders.find((item) => item.id === customProviderId);
   const provider =
-    exactProvider ??
-    settings.customProviders.find((item) => item.type === providerType);
+    exactProvider ?? settings.customProviders.find((item) => item.type === providerType);
   if (!provider) {
     throw new Error("远程请求所选模型对应的供应商不存在，请先在桌面端配置该类型供应商。");
   }
@@ -377,9 +361,7 @@ function resolveConversationTitleModelSelection(
     return fallback;
   }
 
-  const provider = settings.customProviders.find(
-    (item) => item.id === titleModel.customProviderId,
-  );
+  const provider = settings.customProviders.find((item) => item.id === titleModel.customProviderId);
   if (!provider || !provider.activeModels.includes(titleModel.model)) {
     return fallback;
   }
@@ -421,10 +403,7 @@ function buildProviderRuntimeConfig(
   };
 }
 
-function selectedModelsMatch(
-  left: SelectedModel | undefined,
-  right: SelectedModel | undefined,
-) {
+function selectedModelsMatch(left: SelectedModel | undefined, right: SelectedModel | undefined) {
   return (
     Boolean(left) &&
     Boolean(right) &&
@@ -439,8 +418,8 @@ export function ChatPage(props: ChatPageProps) {
   const initialConversationRef = useRef(createConversationIdentity());
   const initialConversationStateRef = useRef(createConversationStateFromContext(context));
 
-  const [conversationState, setConversationState] = useState<ConversationViewState>(() =>
-    initialConversationStateRef.current,
+  const [conversationState, setConversationState] = useState<ConversationViewState>(
+    () => initialConversationStateRef.current,
   );
   const [compactionStatus, setCompactionStatus] = useState<CompactionStatus>({ phase: "idle" });
   const [isSending, setIsSending] = useState(false);
@@ -452,10 +431,9 @@ export function ChatPage(props: ChatPageProps) {
   const notifyIdCounter = useRef(0);
   const [copiedMessageKey, setCopiedMessageKey] = useState<string | null>(null);
   const [hydratingConversationId, setHydratingConversationIdState] = useState<string | null>(null);
-  const [
-    hydrationFailedConversationId,
-    setHydrationFailedConversationIdState,
-  ] = useState<string | null>(null);
+  const [hydrationFailedConversationId, setHydrationFailedConversationIdState] = useState<
+    string | null
+  >(null);
   const [currentConversationId, setCurrentConversationId] = useState<string>(
     () => initialConversationRef.current.conversationId,
   );
@@ -486,7 +464,7 @@ export function ChatPage(props: ChatPageProps) {
     return activeTemplate?.prompt.trim() ?? "";
   }, [settings.agents]);
   const selectedSkillNames = useMemo(
-    () => skillsEnabled ? mergeAlwaysEnabledSkillNames(settings.skills.selected) : [],
+    () => (skillsEnabled ? mergeAlwaysEnabledSkillNames(settings.skills.selected) : []),
     [skillsEnabled, settings.skills.selected],
   );
   const workdir = settings.system.workdir.trim();
@@ -618,11 +596,7 @@ export function ChatPage(props: ChatPageProps) {
     settings.remote.token,
   ]);
 
-  const {
-    availableSkills,
-    skillsRootDir,
-    refreshSkills,
-  } = useChatSkills({
+  const { availableSkills, skillsRootDir, refreshSkills } = useChatSkills({
     skillsEnabled,
     selectedSkillNames,
     setSettings,
@@ -669,16 +643,12 @@ export function ChatPage(props: ChatPageProps) {
   const currentConversationHistoryUpdatedAtRef = useRef<number | null>(null);
   const locallySyncedHistoryUpdatedAtRef = useRef(new Map<string, number>());
   const startNewConversationActionRef = useRef<() => void>(() => undefined);
-  const loadConversationActionRef = useRef<(id: string) => Promise<void>>(
-    async () => undefined,
-  );
+  const loadConversationActionRef = useRef<(id: string) => Promise<void>>(async () => undefined);
   const commitRenameActionRef = useRef<() => Promise<void>>(async () => undefined);
   const setPinnedActionRef = useRef<(id: string, isPinned: boolean) => Promise<void>>(
     async () => undefined,
   );
-  const deleteConversationActionRef = useRef<(id: string) => Promise<void>>(
-    async () => undefined,
-  );
+  const deleteConversationActionRef = useRef<(id: string) => Promise<void>>(async () => undefined);
   const sendActionRef = useRef<SendChatAction>(async () => undefined);
   const ensureGatewayBridgeConversationReadyRef = useRef<
     (id: string, options?: EnsureGatewayBridgeConversationReadyOptions) => Promise<string>
@@ -686,27 +656,19 @@ export function ChatPage(props: ChatPageProps) {
   const appliedGatewayHistoryTruncationsRef = useRef(new Map<string, string>());
   const stopSendingActionRef = useRef<() => void>(() => undefined);
   const hydratingConversationIdRef = useRef<string | null>(hydratingConversationId);
-  const hydrationFailedConversationIdRef = useRef<string | null>(
-    hydrationFailedConversationId,
-  );
-  const setHydratingConversationId = useCallback(
-    (next: SetStateAction<string | null>) => {
-      const current = hydratingConversationIdRef.current;
-      const resolved = typeof next === "function" ? next(current) : next;
-      hydratingConversationIdRef.current = resolved;
-      setHydratingConversationIdState(resolved);
-    },
-    [],
-  );
-  const setHydrationFailedConversationId = useCallback(
-    (next: SetStateAction<string | null>) => {
-      const current = hydrationFailedConversationIdRef.current;
-      const resolved = typeof next === "function" ? next(current) : next;
-      hydrationFailedConversationIdRef.current = resolved;
-      setHydrationFailedConversationIdState(resolved);
-    },
-    [],
-  );
+  const hydrationFailedConversationIdRef = useRef<string | null>(hydrationFailedConversationId);
+  const setHydratingConversationId = useCallback((next: SetStateAction<string | null>) => {
+    const current = hydratingConversationIdRef.current;
+    const resolved = typeof next === "function" ? next(current) : next;
+    hydratingConversationIdRef.current = resolved;
+    setHydratingConversationIdState(resolved);
+  }, []);
+  const setHydrationFailedConversationId = useCallback((next: SetStateAction<string | null>) => {
+    const current = hydrationFailedConversationIdRef.current;
+    const resolved = typeof next === "function" ? next(current) : next;
+    hydrationFailedConversationIdRef.current = resolved;
+    setHydrationFailedConversationIdState(resolved);
+  }, []);
   const {
     liveTranscriptStore,
     getConversationLiveTranscriptStore,
@@ -766,9 +728,7 @@ export function ChatPage(props: ChatPageProps) {
     setHydrationFailedConversationId(null);
   }
 
-  const isDraftConversation = !historyItems.some(
-    (item) => item.id === currentConversationId,
-  );
+  const isDraftConversation = !historyItems.some((item) => item.id === currentConversationId);
 
   const addNotify = useCallback((type: NotifyItem["type"], message: string) => {
     const id = `notify-${++notifyIdCounter.current}`;
@@ -991,18 +951,13 @@ export function ChatPage(props: ChatPageProps) {
         return;
       }
       const previous = locallySyncedHistoryUpdatedAtRef.current.get(key);
-      if (
-        previous === undefined ||
-        previous === Number.MAX_SAFE_INTEGER ||
-        updatedAt > previous
-      ) {
+      if (previous === undefined || previous === Number.MAX_SAFE_INTEGER || updatedAt > previous) {
         locallySyncedHistoryUpdatedAtRef.current.set(key, updatedAt);
       }
       if (currentConversationIdRef.current === key) {
         const currentSyncedAt = currentConversationHistoryUpdatedAtRef.current ?? 0;
         currentConversationHistoryUpdatedAtRef.current =
-          currentSyncedAt === Number.MAX_SAFE_INTEGER ||
-          updatedAt === Number.MAX_SAFE_INTEGER
+          currentSyncedAt === Number.MAX_SAFE_INTEGER || updatedAt === Number.MAX_SAFE_INTEGER
             ? updatedAt
             : Math.max(currentSyncedAt, updatedAt);
       }
@@ -1101,10 +1056,7 @@ export function ChatPage(props: ChatPageProps) {
     return persistConversation(params);
   }
 
-  async function publishGatewayConversationActivity(
-    conversationId: string,
-    running: boolean,
-  ) {
+  async function publishGatewayConversationActivity(conversationId: string, running: boolean) {
     const targetConversationId = conversationId.trim();
     if (!targetConversationId) {
       return;
@@ -1223,10 +1175,7 @@ export function ChatPage(props: ChatPageProps) {
       return;
     }
 
-    if (
-      !currentConversationId ||
-      (!isSending && !isConversationRunning(currentConversationId))
-    ) {
+    if (!currentConversationId || (!isSending && !isConversationRunning(currentConversationId))) {
       return;
     }
 
@@ -1408,17 +1357,18 @@ export function ChatPage(props: ChatPageProps) {
     },
   });
 
-  const enableManagedSkills = useCallback((names: readonly string[]) => {
-    const normalizedNames = names
-      .map((name) => String(name).trim())
-      .filter(Boolean);
-    if (normalizedNames.length === 0) return;
-    setSettings((prev) => {
-      const selected = appendManagedSkillSelections(prev.skills.selected, normalizedNames);
-      if (selected.join("\n") === prev.skills.selected.join("\n")) return prev;
-      return updateSkills(prev, { selected });
-    });
-  }, [setSettings]);
+  const enableManagedSkills = useCallback(
+    (names: readonly string[]) => {
+      const normalizedNames = names.map((name) => String(name).trim()).filter(Boolean);
+      if (normalizedNames.length === 0) return;
+      setSettings((prev) => {
+        const selected = appendManagedSkillSelections(prev.skills.selected, normalizedNames);
+        if (selected.join("\n") === prev.skills.selected.join("\n")) return prev;
+        return updateSkills(prev, { selected });
+      });
+    },
+    [setSettings],
+  );
 
   async function send(overrides?: {
     textOverride?: string;
@@ -1572,13 +1522,12 @@ export function ChatPage(props: ChatPageProps) {
     let text =
       typeof overrides?.textOverride === "string"
         ? overrides.textOverride.trim()
-        : (composerDraft
-            ? (
-                effectiveIsAgentMode && composerDraft.largePastes.length > 0
-                  ? composerDraft.textWithoutLargePastes
-                  : buildTextFromComposerDraft(composerDraft)
-              ).trim()
-            : "");
+        : composerDraft
+          ? (effectiveIsAgentMode && composerDraft.largePastes.length > 0
+              ? composerDraft.textWithoutLargePastes
+              : buildTextFromComposerDraft(composerDraft)
+            ).trim()
+          : "";
     let uploadedFiles = overrides?.uploadedFilesOverride ?? pendingUploadedFiles;
 
     if (
@@ -1613,12 +1562,9 @@ export function ChatPage(props: ChatPageProps) {
     if (!userMessage) return;
     const pendingUserMessage = userMessage;
     const content =
-      typeof pendingUserMessage.content === "string"
-        ? pendingUserMessage.content
-        : "";
+      typeof pendingUserMessage.content === "string" ? pendingUserMessage.content : "";
 
-    const titleSourceText =
-      text || uploadedFiles.map((file) => file.fileName).join(", ");
+    const titleSourceText = text || uploadedFiles.map((file) => file.fileName).join(", ");
 
     const sessionId = runtimeEntry.sessionId;
     const createdAt = runtimeEntry.createdAt;
@@ -1653,9 +1599,7 @@ export function ChatPage(props: ChatPageProps) {
     });
     const baseConversationState = runtimeEntry.state;
     const isFirstTurn = baseConversationState.meta.totalMessageCount === 0;
-    const existingHistoryItem = historyItemsRef.current.find(
-      (item) => item.id === conversationId,
-    );
+    const existingHistoryItem = historyItemsRef.current.find((item) => item.id === conversationId);
     const shouldCreatePendingHistoryItem = isFirstTurn && !existingHistoryItem;
     const fallbackTitle =
       existingHistoryItem &&
@@ -1717,7 +1661,9 @@ export function ChatPage(props: ChatPageProps) {
 
     clearAbortSnapshot(transcriptStore);
 
-    let nextConversationState = appendMessagesToConversation(baseConversationState, [pendingUserMessage]);
+    let nextConversationState = appendMessagesToConversation(baseConversationState, [
+      pendingUserMessage,
+    ]);
     let conversationRunStarted = false;
     let gatewayActivityPublishChain: Promise<void> = Promise.resolve();
     function queueGatewayConversationActivity(running: boolean) {
@@ -1794,14 +1740,12 @@ export function ChatPage(props: ChatPageProps) {
         void initialPersist;
       }
     }
-    let activeCompactionRollback:
-      | {
-          state: ConversationViewState;
-          composerText?: string;
-          uploadedFiles?: PendingUploadedFile[];
-          persistOnRollback?: boolean;
-        }
-      | null = null;
+    let activeCompactionRollback: {
+      state: ConversationViewState;
+      composerText?: string;
+      uploadedFiles?: PendingUploadedFile[];
+      persistOnRollback?: boolean;
+    } | null = null;
     let skillsPrompt = "";
     let memoryPrompt = "";
     let skillsRootDirForTools = skillsRootDir;
@@ -1951,9 +1895,7 @@ export function ChatPage(props: ChatPageProps) {
         return;
       }
 
-      const selectedSkills = selectedSkillNames
-        .map((n) => byName.get(n)!)
-        .filter(Boolean);
+      const selectedSkills = selectedSkillNames.map((n) => byName.get(n)!).filter(Boolean);
       const allowBuiltinSkillManagement = selectedSkills.some(
         (skill) => skill.name === "skills-creator" || skill.name === "skills-installer",
       );
@@ -2115,20 +2057,18 @@ export function ChatPage(props: ChatPageProps) {
           workingState = prePruned.state;
         }
       }
-      const workingRequestContext =
-        prePruned?.applied
-          ? buildCompactionContext(prePruned.state, params.tools, {
-              includeAbortedMessages: params.includeAbortedMessages,
-              includeUploadedFilesMetadata: params.includeUploadedFilesMetadata,
-            })
-          : params.requestContext;
-      const workingBudgetContext =
-        prePruned?.applied
-          ? buildPreparedContext(prePruned.state, params.tools, {
-              includeAbortedMessages: params.includeAbortedMessages,
-              includeUploadedFilesMetadata: params.includeUploadedFilesMetadata,
-            })
-          : params.budgetContext;
+      const workingRequestContext = prePruned?.applied
+        ? buildCompactionContext(prePruned.state, params.tools, {
+            includeAbortedMessages: params.includeAbortedMessages,
+            includeUploadedFilesMetadata: params.includeUploadedFilesMetadata,
+          })
+        : params.requestContext;
+      const workingBudgetContext = prePruned?.applied
+        ? buildPreparedContext(prePruned.state, params.tools, {
+            includeAbortedMessages: params.includeAbortedMessages,
+            includeUploadedFilesMetadata: params.includeUploadedFilesMetadata,
+          })
+        : params.budgetContext;
 
       armCompactionRollback({
         state: params.state,
@@ -2230,18 +2170,16 @@ export function ChatPage(props: ChatPageProps) {
         }
       }
 
-      const workingRequestContext =
-        prePruned?.applied
-          ? buildCompactionContext(workingState, params.tools ?? params.requestContext.tools, {
-              includeUploadedFilesMetadata: params.includeUploadedFilesMetadata,
-            })
-          : params.requestContext;
-      const workingBudgetContext =
-        prePruned?.applied
-          ? buildPreparedContext(workingState, params.tools ?? params.budgetContext.tools, {
-              includeUploadedFilesMetadata: params.includeUploadedFilesMetadata,
-            })
-          : params.budgetContext;
+      const workingRequestContext = prePruned?.applied
+        ? buildCompactionContext(workingState, params.tools ?? params.requestContext.tools, {
+            includeUploadedFilesMetadata: params.includeUploadedFilesMetadata,
+          })
+        : params.requestContext;
+      const workingBudgetContext = prePruned?.applied
+        ? buildPreparedContext(workingState, params.tools ?? params.budgetContext.tools, {
+            includeUploadedFilesMetadata: params.includeUploadedFilesMetadata,
+          })
+        : params.budgetContext;
       const decision = shouldPreCompactConversation({
         providerId,
         state: workingState,
@@ -2324,9 +2262,7 @@ export function ChatPage(props: ChatPageProps) {
 
         await persistCheckpointState(compacted.state);
         clearCompactionRollback();
-        applyConversationState(
-          appendMessagesToConversation(compacted.state, [pendingUserMessage]),
-        );
+        applyConversationState(appendMessagesToConversation(compacted.state, [pendingUserMessage]));
         markCompactionCompleted(conversationId, "pre-send", compacted.state.activeSegmentIndex);
         gatewayBridgeEvents.queueCheckpoint(compacted.state);
         return true;
@@ -2335,12 +2271,11 @@ export function ChatPage(props: ChatPageProps) {
           throw error;
         }
         clearCompactionRollback();
-        const pruned =
-          prePruned?.applied ? prePruned : pruneConversationState(baseConversationState);
+        const pruned = prePruned?.applied
+          ? prePruned
+          : pruneConversationState(baseConversationState);
         if (pruned.applied) {
-          applyConversationState(
-            appendMessagesToConversation(pruned.state, [pendingUserMessage]),
-          );
+          applyConversationState(appendMessagesToConversation(pruned.state, [pendingUserMessage]));
           markCompactionFailed(conversationId, "pre-send", "压缩失败，已回退到 prune 降级");
           updateGatewayBridgeToolStatus(
             `上下文压缩失败，已裁剪 ${pruned.prunedMessageCount} 个旧工具输出后继续...`,
@@ -2561,23 +2496,22 @@ export function ChatPage(props: ChatPageProps) {
   }, []);
 
   const setSharedHistoryItemsState = useCallback((items: ChatHistorySummary[]) => {
-    const nextItems = sortHistoryItems(
-      items.map((item) => ({ ...item, isShared: true })),
-    );
+    const nextItems = sortHistoryItems(items.map((item) => ({ ...item, isShared: true })));
     sharedHistoryItemsRef.current = nextItems;
     setSharedHistoryItems(nextItems);
   }, []);
 
-  const handleDeleteConversation = useCallback((id: string) => {
-    void deleteConversationActionRef.current(id).then(() => {
-      if (historyItemsRef.current.some((item) => item.id === id)) {
-        return;
-      }
-      setSharedHistoryItemsState(
-        sharedHistoryItemsRef.current.filter((item) => item.id !== id),
-      );
-    });
-  }, [historyItemsRef, setSharedHistoryItemsState]);
+  const handleDeleteConversation = useCallback(
+    (id: string) => {
+      void deleteConversationActionRef.current(id).then(() => {
+        if (historyItemsRef.current.some((item) => item.id === id)) {
+          return;
+        }
+        setSharedHistoryItemsState(sharedHistoryItemsRef.current.filter((item) => item.id !== id));
+      });
+    },
+    [historyItemsRef, setSharedHistoryItemsState],
+  );
 
   const updateSharedManagerIdSet = useCallback(
     (
@@ -2657,9 +2591,7 @@ export function ChatPage(props: ChatPageProps) {
         current.map((item) => (item.id === id ? { ...item, isShared } : item)),
       );
       if (!isShared) {
-        setSharedHistoryItemsState(
-          sharedHistoryItemsRef.current.filter((item) => item.id !== id),
-        );
+        setSharedHistoryItemsState(sharedHistoryItemsRef.current.filter((item) => item.id !== id));
         return;
       }
 
@@ -2846,11 +2778,7 @@ export function ChatPage(props: ChatPageProps) {
     void refreshSharedHistoryItems().then((items) => {
       items.forEach(handleLoadSharedHistoryStatus);
     });
-  }, [
-    handleLoadSharedHistoryStatus,
-    refreshSharedHistoryItems,
-    refreshSharedManagerGatewayUrl,
-  ]);
+  }, [handleLoadSharedHistoryStatus, refreshSharedHistoryItems, refreshSharedManagerGatewayUrl]);
 
   const handleOpenSharedHistoryManager = useCallback(() => {
     setSharedManagerGatewayUrl(settings.remote.gatewayUrl.trim());
@@ -2951,9 +2879,7 @@ export function ChatPage(props: ChatPageProps) {
     return findProviderModelConfig(provider, settings.selectedModel.model).contextWindow;
   })();
   const currentChatProvider = settings.selectedModel
-    ? settings.customProviders.find(
-        (item) => item.id === settings.selectedModel?.customProviderId,
-      )
+    ? settings.customProviders.find((item) => item.id === settings.selectedModel?.customProviderId)
     : undefined;
   const chatRuntimeReasoningOptions = useMemo(
     () =>
@@ -2969,24 +2895,16 @@ export function ChatPage(props: ChatPageProps) {
         providerId: currentChatProvider?.type,
         requestFormat: currentChatProvider?.requestFormat,
       }),
-    [
-      currentChatProvider?.requestFormat,
-      currentChatProvider?.type,
-      settings.chatRuntimeControls,
-    ],
+    [currentChatProvider?.requestFormat, currentChatProvider?.type, settings.chatRuntimeControls],
   );
   const handleChatRuntimeControlsChange = useCallback(
     (patch: Partial<ChatRuntimeControls>) => {
       setSettings((prev) => ({
         ...prev,
-        chatRuntimeControls: updateChatRuntimeControlsForProvider(
-          prev.chatRuntimeControls,
-          patch,
-          {
-            providerId: currentChatProvider?.type,
-            requestFormat: currentChatProvider?.requestFormat,
-          },
-        ),
+        chatRuntimeControls: updateChatRuntimeControlsForProvider(prev.chatRuntimeControls, patch, {
+          providerId: currentChatProvider?.type,
+          requestFormat: currentChatProvider?.requestFormat,
+        }),
       }));
     },
     [currentChatProvider?.requestFormat, currentChatProvider?.type, setSettings],
@@ -3027,10 +2945,7 @@ export function ChatPage(props: ChatPageProps) {
   const fileDropDescription = canDropUpload
     ? t("chat.upload.dropHint")
     : t("chat.upload.dropDisabledHint");
-  const fileDropLimitHint = t("chat.upload.dropLimit").replace(
-    "{max}",
-    String(MAX_UPLOAD_FILES),
-  );
+  const fileDropLimitHint = t("chat.upload.dropLimit").replace("{max}", String(MAX_UPLOAD_FILES));
 
   useEffect(() => {
     let cancelled = false;
@@ -3195,129 +3110,124 @@ export function ChatPage(props: ChatPageProps) {
           />
         ) : (
           <>
-        <div className="relative z-20">
-          <ChatHeader
-            settings={settings}
-            hasModels={hasModels}
-            currentModelLabel={currentModelLabel}
-            modelOptions={modelOptions}
-            selectedValue={selectedValue}
-            sidebarOpen={sidebarOpen}
-            setSettings={setSettings}
-            onOpenSettings={onOpenSettings}
-            onToggleTheme={onToggleTheme}
-            onOpenSidebar={handleOpenSidebar}
-          />
-          <NotifyToast items={notifyItems} onDismiss={dismissNotify} />
-        </div>
-
-        <ChatTranscript
-          conversationId={currentConversationId}
-          workspaceRoot={currentConversationWorkspaceRoot}
-          scrollAreaRef={scrollAreaRef}
-          bottomRef={bottomRef}
-          hasModels={hasModels}
-          historyItems={historyRenderItems}
-          isHistorySwitching={Boolean(historySwitchOverlay)}
-          isSending={isSending}
-          isAgentMode={isAgentMode}
-          showUsage={isAgentDevExecutionMode}
-          usageContextWindow={currentModelContextWindow}
-          liveTranscriptStore={liveTranscriptStore}
-          isCompactionRunning={isCompactionRunning}
-          copiedMessageKey={copiedMessageKey}
-          setCopiedMessageKey={setCopiedMessageKey}
-          onResendFromEdit={handleResendFromEdit}
-          onOpenSettings={onOpenSettings}
-        />
+            <div className="relative z-20">
+              <ChatHeader
+                settings={settings}
+                hasModels={hasModels}
+                currentModelLabel={currentModelLabel}
+                modelOptions={modelOptions}
+                selectedValue={selectedValue}
+                sidebarOpen={sidebarOpen}
+                setSettings={setSettings}
+                onOpenSettings={onOpenSettings}
+                onToggleTheme={onToggleTheme}
+                onOpenSidebar={handleOpenSidebar}
+              />
+              <NotifyToast items={notifyItems} onDismiss={dismissNotify} />
+            </div>
 
-        <ChatComposerBar
-          composerRef={composerRef}
-          isSending={isSending}
-          isUploadingFiles={isUploadingFiles}
-          isInputDisabled={isComposerInputDisabled}
-          inputPlaceholder={composerPlaceholder}
-          workdir={workdir}
-          enabledSkills={enabledComposerSkills}
-          isAgentMode={isAgentMode}
-          chatRuntimeControls={chatRuntimeControlsForCurrentProvider}
-          reasoningOptions={chatRuntimeReasoningOptions}
-          onSend={handleSend}
-          onStop={handleStopSending}
-          onComposerBusyChange={handleComposerBusyChange}
-          onChatRuntimeControlsChange={handleChatRuntimeControlsChange}
-          onPickReadableFiles={pickReadableFiles}
-          onPasteFiles={importReadableFiles}
-          pendingUploadedFiles={pendingUploadedFiles}
-          onRemovePendingUpload={removePendingUpload}
-        />
-        {isFileDropActive ? (
-          <div
-            className="file-drop-overlay pointer-events-none absolute inset-0 z-30 flex items-center justify-center p-4 sm:p-6 bg-white/30 backdrop-blur-md dark:bg-black/30"
-            aria-hidden="true"
-          >
-            <div
-              className={`file-drop-overlay-zone absolute inset-3 sm:inset-4 rounded-2xl border border-dashed ${
-                canDropUpload
-                  ? "border-foreground/20 bg-foreground/[0.015] dark:border-white/15 dark:bg-white/[0.015]"
-                  : "border-destructive/35 bg-destructive/[0.03]"
-              }`}
+            <ChatTranscript
+              conversationId={currentConversationId}
+              workspaceRoot={currentConversationWorkspaceRoot}
+              scrollAreaRef={scrollAreaRef}
+              bottomRef={bottomRef}
+              hasModels={hasModels}
+              historyItems={historyRenderItems}
+              isHistorySwitching={Boolean(historySwitchOverlay)}
+              isSending={isSending}
+              isAgentMode={isAgentMode}
+              showUsage={isAgentDevExecutionMode}
+              usageContextWindow={currentModelContextWindow}
+              liveTranscriptStore={liveTranscriptStore}
+              isCompactionRunning={isCompactionRunning}
+              copiedMessageKey={copiedMessageKey}
+              setCopiedMessageKey={setCopiedMessageKey}
+              onResendFromEdit={handleResendFromEdit}
+              onOpenSettings={onOpenSettings}
             />
-            <div
-              className={`file-drop-overlay-card relative flex w-full max-w-[380px] flex-col items-center gap-5 rounded-2xl border bg-white/70 px-8 py-7 text-center shadow-[0_24px_60px_-20px_rgba(0,0,0,0.25),0_8px_20px_-12px_rgba(0,0,0,0.15)] backdrop-blur-2xl dark:bg-zinc-900/70 dark:shadow-[0_24px_60px_-20px_rgba(0,0,0,0.7),0_8px_20px_-12px_rgba(0,0,0,0.5)] ${
-                canDropUpload
-                  ? "border-black/[0.06] ring-1 ring-inset ring-white/40 dark:border-white/10 dark:ring-white/[0.04]"
-                  : "border-destructive/20 ring-1 ring-inset ring-destructive/10 dark:border-destructive/30"
-              }`}
-            >
-              <div
-                className={`flex h-14 w-14 items-center justify-center rounded-2xl ring-1 ring-inset ${
-                  canDropUpload
-                    ? "bg-foreground/[0.04] text-foreground/85 ring-foreground/10 dark:bg-white/[0.06] dark:text-white/90 dark:ring-white/10"
-                    : "bg-destructive/[0.08] text-destructive/90 ring-destructive/15"
-                }`}
-              >
-                {canDropUpload ? (
-                  <Upload className="h-6 w-6" strokeWidth={1.75} />
-                ) : (
-                  <Ban className="h-6 w-6" strokeWidth={1.75} />
-                )}
-              </div>
-
-              <div className="flex flex-col items-center gap-1.5">
-                <div className="text-[15px] font-semibold leading-tight tracking-tight text-foreground">
-                  {fileDropTitle}
-                </div>
-                <div className="max-w-[280px] text-xs leading-5 text-muted-foreground">
-                  {fileDropDescription}
-                </div>
-              </div>
 
+            <ChatComposerBar
+              composerRef={composerRef}
+              isSending={isSending}
+              isUploadingFiles={isUploadingFiles}
+              isInputDisabled={isComposerInputDisabled}
+              inputPlaceholder={composerPlaceholder}
+              workdir={workdir}
+              enabledSkills={enabledComposerSkills}
+              isAgentMode={isAgentMode}
+              chatRuntimeControls={chatRuntimeControlsForCurrentProvider}
+              reasoningOptions={chatRuntimeReasoningOptions}
+              onSend={handleSend}
+              onStop={handleStopSending}
+              onComposerBusyChange={handleComposerBusyChange}
+              onChatRuntimeControlsChange={handleChatRuntimeControlsChange}
+              onPickReadableFiles={pickReadableFiles}
+              onPasteFiles={importReadableFiles}
+              pendingUploadedFiles={pendingUploadedFiles}
+              onRemovePendingUpload={removePendingUpload}
+            />
+            {isFileDropActive ? (
               <div
-                className="h-px w-12 bg-foreground/10 dark:bg-white/10"
+                className="file-drop-overlay pointer-events-none absolute inset-0 z-30 flex items-center justify-center p-4 sm:p-6 bg-white/30 backdrop-blur-md dark:bg-black/30"
                 aria-hidden="true"
-              />
-
-              <div
-                className={`inline-flex items-center gap-1.5 rounded-full border px-2.5 py-1 text-[11px] font-medium ${
-                  canDropUpload
-                    ? "border-foreground/[0.08] bg-foreground/[0.03] text-muted-foreground dark:border-white/10 dark:bg-white/[0.04]"
-                    : "border-destructive/20 bg-destructive/[0.05] text-destructive/80"
-                }`}
               >
-                <span
-                  aria-hidden="true"
-                  className={`inline-flex h-1.5 w-1.5 rounded-full ${
+                <div
+                  className={`file-drop-overlay-zone absolute inset-3 sm:inset-4 rounded-2xl border border-dashed ${
                     canDropUpload
-                      ? "bg-foreground/35 dark:bg-white/50"
-                      : "bg-destructive/55"
+                      ? "border-foreground/20 bg-foreground/[0.015] dark:border-white/15 dark:bg-white/[0.015]"
+                      : "border-destructive/35 bg-destructive/[0.03]"
                   }`}
                 />
-                {fileDropLimitHint}
+                <div
+                  className={`file-drop-overlay-card relative flex w-full max-w-[380px] flex-col items-center gap-5 rounded-2xl border bg-white/70 px-8 py-7 text-center shadow-[0_24px_60px_-20px_rgba(0,0,0,0.25),0_8px_20px_-12px_rgba(0,0,0,0.15)] backdrop-blur-2xl dark:bg-zinc-900/70 dark:shadow-[0_24px_60px_-20px_rgba(0,0,0,0.7),0_8px_20px_-12px_rgba(0,0,0,0.5)] ${
+                    canDropUpload
+                      ? "border-black/[0.06] ring-1 ring-inset ring-white/40 dark:border-white/10 dark:ring-white/[0.04]"
+                      : "border-destructive/20 ring-1 ring-inset ring-destructive/10 dark:border-destructive/30"
+                  }`}
+                >
+                  <div
+                    className={`flex h-14 w-14 items-center justify-center rounded-2xl ring-1 ring-inset ${
+                      canDropUpload
+                        ? "bg-foreground/[0.04] text-foreground/85 ring-foreground/10 dark:bg-white/[0.06] dark:text-white/90 dark:ring-white/10"
+                        : "bg-destructive/[0.08] text-destructive/90 ring-destructive/15"
+                    }`}
+                  >
+                    {canDropUpload ? (
+                      <Upload className="h-6 w-6" strokeWidth={1.75} />
+                    ) : (
+                      <Ban className="h-6 w-6" strokeWidth={1.75} />
+                    )}
+                  </div>
+
+                  <div className="flex flex-col items-center gap-1.5">
+                    <div className="text-[15px] font-semibold leading-tight tracking-tight text-foreground">
+                      {fileDropTitle}
+                    </div>
+                    <div className="max-w-[280px] text-xs leading-5 text-muted-foreground">
+                      {fileDropDescription}
+                    </div>
+                  </div>
+
+                  <div className="h-px w-12 bg-foreground/10 dark:bg-white/10" aria-hidden="true" />
+
+                  <div
+                    className={`inline-flex items-center gap-1.5 rounded-full border px-2.5 py-1 text-[11px] font-medium ${
+                      canDropUpload
+                        ? "border-foreground/[0.08] bg-foreground/[0.03] text-muted-foreground dark:border-white/10 dark:bg-white/[0.04]"
+                        : "border-destructive/20 bg-destructive/[0.05] text-destructive/80"
+                    }`}
+                  >
+                    <span
+                      aria-hidden="true"
+                      className={`inline-flex h-1.5 w-1.5 rounded-full ${
+                        canDropUpload ? "bg-foreground/35 dark:bg-white/50" : "bg-destructive/55"
+                      }`}
+                    />
+                    {fileDropLimitHint}
+                  </div>
+                </div>
               </div>
-            </div>
-          </div>
-        ) : null}
+            ) : null}
           </>
         )}
       </div>
diff --git a/crates/agent-gui/src/pages/SettingsPage.tsx b/crates/agent-gui/src/pages/SettingsPage.tsx
index 89f597e3a..9b1ac38d1 100644
--- a/crates/agent-gui/src/pages/SettingsPage.tsx
+++ b/crates/agent-gui/src/pages/SettingsPage.tsx
@@ -1,9 +1,19 @@
-import { useEffect, useMemo, useState, type ReactNode } from "react";
-import { ArrowLeft, BookOpen, Brain, Clock3, Cloud, Cpu, Info, Settings2, Zap } from "../components/icons";
+import { type ReactNode, useEffect, useMemo, useState } from "react";
+import {
+  ArrowLeft,
+  BookOpen,
+  Brain,
+  Clock3,
+  Cloud,
+  Cpu,
+  Info,
+  Settings2,
+  Zap,
+} from "../components/icons";
 
 import { useLocale } from "../i18n";
-import { AgentsSection } from "./settings/AgentsSection";
 import { AboutSection } from "./settings/AboutSection";
+import { AgentsSection } from "./settings/AgentsSection";
 import { CronSection } from "./settings/CronSection";
 import { HooksSection } from "./settings/HooksSection";
 import { MemoryPanel } from "./settings/MemoryPanel";
@@ -12,10 +22,7 @@ import { RemoteSection } from "./settings/RemoteSection";
 import { SystemSettingsForm } from "./settings/SystemSettingsForm";
 import type { SectionId, SettingsPageProps } from "./settings/types";
 
-function getSaveIndicator(
-  state: SettingsPageProps["saveState"],
-  t: (key: string) => string,
-) {
+function getSaveIndicator(state: SettingsPageProps["saveState"], t: (key: string) => string) {
   switch (state.status) {
     case "saving":
       return {
@@ -248,7 +255,7 @@ export function SettingsPage(props: SettingsPageProps) {
         >
           <div
             className={`settings-section-shell ${
-                section === "hooks" || section === "providers" || section === "memory"
+              section === "hooks" || section === "providers" || section === "memory"
                 ? "flex min-h-0 flex-1 flex-col"
                 : "min-h-full"
             }`}
diff --git a/crates/agent-gui/src/pages/chat/AssistantBubble.tsx b/crates/agent-gui/src/pages/chat/AssistantBubble.tsx
index 466f71520..f8d0eaf6c 100644
--- a/crates/agent-gui/src/pages/chat/AssistantBubble.tsx
+++ b/crates/agent-gui/src/pages/chat/AssistantBubble.tsx
@@ -1,16 +1,19 @@
-import { memo, useEffect, useMemo, useRef, useState, type ReactNode } from "react";
+import { generateDiffFile } from "@git-diff-view/file";
+import { DiffModeEnum, DiffView } from "@git-diff-view/react";
 import type { ImageContent, ToolResultMessage, Usage } from "@mariozechner/pi-ai";
+import { memo, type ReactNode, useEffect, useMemo, useRef, useState } from "react";
 import iconSimpleUrl from "../../../src-tauri/icons/icon-simple.png";
+import type { IconComponent } from "../../components/icons";
 import {
   Bot,
   Brain,
   ChevronRight,
   Eye,
-  ImageIcon,
-  ImageOff,
-  FileText,
   FilePenLine,
+  FileText,
   FolderTree,
+  ImageIcon,
+  ImageOff,
   Loader2,
   Plug,
   Search,
@@ -19,30 +22,27 @@ import {
   Trash2,
   Wrench,
 } from "../../components/icons";
-import type { IconComponent } from "../../components/icons";
-import { DiffView, DiffModeEnum } from "@git-diff-view/react";
-import { generateDiffFile } from "@git-diff-view/file";
 import "@git-diff-view/react/styles/diff-view.css";
 
-import { LiveMarkdown, Markdown } from "../../components/Markdown";
 import { ImagePreview, type ImagePreviewSlide } from "../../components/chat/ImagePreview";
+import { LiveMarkdown, Markdown } from "../../components/Markdown";
 import { useLocale } from "../../i18n";
-import { cn } from "../../lib/shared/utils";
+import type { HostedSearchBlock } from "../../lib/chat/messages/hostedSearch";
 import {
   previewText,
   safeStringify,
-  toolCallArgsForDisplay,
-  toolResultMessageToText,
   summarizeToolCall,
   type ToolTraceItem,
+  toolCallArgsForDisplay,
+  toolResultMessageToText,
   type UiRound,
 } from "../../lib/chat/messages/uiMessages";
-import type { HostedSearchBlock } from "../../lib/chat/messages/hostedSearch";
 import { normalizeLiveToolStatus, VIBING_STATUS } from "../../lib/chat/page/chatPageHelpers";
 import { prepareImageProxyUrl } from "../../lib/providers/proxy";
+import { cn } from "../../lib/shared/utils";
 import type {
-  DeleteResultDetails,
   DelegateAgentCardResultDetails,
+  DeleteResultDetails,
   DisplayImageItemDetails,
   DisplayImageResultDetails,
   EditResultDetails,
@@ -54,8 +54,8 @@ import type {
   ReadImageResultDetails,
   ReadNotebookResultDetails,
   ReadPdfResultDetails,
-  SkillsManagerResultDetails,
   ReadTextResultDetails,
+  SkillsManagerResultDetails,
   SubagentMessageResultDetails,
   WriteResultDetails,
 } from "../../lib/tools/builtinTypes";
@@ -319,10 +319,7 @@ function getLatestHostedSearchTitle(
   return t("chat.search.noQuery");
 }
 
-function getHostedSearchCountLabel(
-  count: number,
-  t: (key: string) => string,
-) {
+function getHostedSearchCountLabel(count: number, t: (key: string) => string) {
   return count <= 1 ? t("chat.search.oneSearch") : `${count} ${t("chat.search.searches")}`;
 }
 
@@ -362,7 +359,8 @@ function HostedSearchGroupView({ items }: { items: HostedSearchBlock[] }) {
         <div
           className="relative mt-0.5 flex h-[24px] w-[24px] shrink-0 items-center justify-center rounded-[7px] sm:mt-0"
           style={{
-            background: "linear-gradient(135deg, hsl(var(--tool-search-accent) / 0.13), hsl(var(--tool-search-accent) / 0.06))",
+            background:
+              "linear-gradient(135deg, hsl(var(--tool-search-accent) / 0.13), hsl(var(--tool-search-accent) / 0.06))",
           }}
         >
           {isSearching ? (
@@ -444,9 +442,7 @@ function HostedSearchGroupView({ items }: { items: HostedSearchBlock[] }) {
                       className="block min-w-0 max-w-full rounded-[6px] border border-transparent px-2 py-1 text-[12px] transition-colors hover:border-border/45 hover:bg-background/60"
                       title={source.url}
                     >
-                      <span className="block truncate font-medium text-foreground/85">
-                        {label}
-                      </span>
+                      <span className="block truncate font-medium text-foreground/85">{label}</span>
                       <span className="block truncate text-muted-foreground">
                         {getSourceHost(source.url)}
                       </span>
@@ -465,21 +461,36 @@ function HostedSearchGroupView({ items }: { items: HostedSearchBlock[] }) {
 function getToolMeta(name: string): { Icon: IconComponent; accent: string; category: string } {
   switch (name) {
     case "Bash":
-    case "ManagedProcess": return { Icon: Terminal, accent: "var(--tool-bash-accent)", category: "terminal" };
-    case "Read":   return { Icon: Eye,         accent: "var(--tool-file-accent)",   category: "file" };
-    case "Image":  return { Icon: ImageIcon,   accent: "var(--tool-file-accent)",   category: "file" };
-    case "SkillsManager": return { Icon: Eye,  accent: "var(--tool-file-accent)",   category: "file" };
-    case "MemoryManager": return { Icon: Brain, accent: "var(--tool-list-accent)",   category: "system" };
-    case "McpManager": return { Icon: Plug,     accent: "var(--tool-list-accent)",   category: "mcp" };
-    case "Agent":  return { Icon: Bot,         accent: "var(--tool-list-accent)",   category: "system" };
-    case "SendMessage": return { Icon: Bot,     accent: "var(--tool-list-accent)",   category: "system" };
-    case "Write":  return { Icon: FileText,    accent: "var(--tool-file-accent)",   category: "file" };
-    case "Edit":   return { Icon: FilePenLine, accent: "var(--tool-file-accent)",   category: "file" };
-    case "Delete": return { Icon: Trash2,      accent: "var(--tool-file-accent)",   category: "file" };
-    case "Glob":   return { Icon: Search,      accent: "var(--tool-search-accent)", category: "search" };
-    case "Grep":   return { Icon: Search,      accent: "var(--tool-search-accent)", category: "search" };
-    case "List":   return { Icon: FolderTree,  accent: "var(--tool-list-accent)",   category: "list" };
-    default:       return { Icon: Wrench,      accent: "var(--tool-file-accent)",   category: "other" };
+    case "ManagedProcess":
+      return { Icon: Terminal, accent: "var(--tool-bash-accent)", category: "terminal" };
+    case "Read":
+      return { Icon: Eye, accent: "var(--tool-file-accent)", category: "file" };
+    case "Image":
+      return { Icon: ImageIcon, accent: "var(--tool-file-accent)", category: "file" };
+    case "SkillsManager":
+      return { Icon: Eye, accent: "var(--tool-file-accent)", category: "file" };
+    case "MemoryManager":
+      return { Icon: Brain, accent: "var(--tool-list-accent)", category: "system" };
+    case "McpManager":
+      return { Icon: Plug, accent: "var(--tool-list-accent)", category: "mcp" };
+    case "Agent":
+      return { Icon: Bot, accent: "var(--tool-list-accent)", category: "system" };
+    case "SendMessage":
+      return { Icon: Bot, accent: "var(--tool-list-accent)", category: "system" };
+    case "Write":
+      return { Icon: FileText, accent: "var(--tool-file-accent)", category: "file" };
+    case "Edit":
+      return { Icon: FilePenLine, accent: "var(--tool-file-accent)", category: "file" };
+    case "Delete":
+      return { Icon: Trash2, accent: "var(--tool-file-accent)", category: "file" };
+    case "Glob":
+      return { Icon: Search, accent: "var(--tool-search-accent)", category: "search" };
+    case "Grep":
+      return { Icon: Search, accent: "var(--tool-search-accent)", category: "search" };
+    case "List":
+      return { Icon: FolderTree, accent: "var(--tool-list-accent)", category: "list" };
+    default:
+      return { Icon: Wrench, accent: "var(--tool-file-accent)", category: "other" };
   }
 }
 
@@ -516,7 +527,9 @@ function getDelegateAgentInlineSummary(item: ToolTraceItem) {
     displayString(args.name) ||
     displayString(args.agent_id) ||
     displayString(args.id);
-  const task = agent ? getDelegateAgentTask(agent) : displayString(args.prompt) || displayString(args.description);
+  const task = agent
+    ? getDelegateAgentTask(agent)
+    : displayString(args.prompt) || displayString(args.description);
 
   if (name && task) return `${name} - ${compactInlineText(task, 96)}`;
   return name || compactInlineText(task, 120);
@@ -577,7 +590,6 @@ type GroupedRoundBlock =
       items: ToolTraceItem[];
     };
 
-
 type ShellResultDetails = {
   exit_code: number;
   shell: string;
@@ -771,11 +783,7 @@ function getDominantToolName(items: ToolTraceItem[]) {
   return [...counts.entries()].sort((a, b) => b[1] - a[1])[0]?.[0] ?? "Tool";
 }
 
-function ToolSection(props: {
-  label: string;
-  trailing?: ReactNode;
-  children: ReactNode;
-}) {
+function ToolSection(props: { label: string; trailing?: ReactNode; children: ReactNode }) {
   const { label, trailing, children } = props;
   return (
     <section className="space-y-2">
@@ -892,64 +900,94 @@ function getToolDisplay(toolCall: { name: string; arguments?: Record<string, unk
 
   switch (name) {
     case "Read":
-      if (typeof args.start_line === "number") tags.push({ label: "start", value: String(args.start_line) });
+      if (typeof args.start_line === "number")
+        tags.push({ label: "start", value: String(args.start_line) });
       if (typeof args.limit === "number") tags.push({ label: "limit", value: String(args.limit) });
-      if (typeof args.page_start === "number") tags.push({ label: "page", value: String(args.page_start) });
-      if (typeof args.page_limit === "number") tags.push({ label: "pages", value: String(args.page_limit) });
-      if (typeof args.cell_start === "number") tags.push({ label: "cell", value: String(args.cell_start) });
-      if (typeof args.cell_limit === "number") tags.push({ label: "cells", value: String(args.cell_limit) });
+      if (typeof args.page_start === "number")
+        tags.push({ label: "page", value: String(args.page_start) });
+      if (typeof args.page_limit === "number")
+        tags.push({ label: "pages", value: String(args.page_limit) });
+      if (typeof args.cell_start === "number")
+        tags.push({ label: "cell", value: String(args.cell_start) });
+      if (typeof args.cell_limit === "number")
+        tags.push({ label: "cells", value: String(args.cell_limit) });
       return { type: "file" as const, path, tags };
     case "SkillsManager":
-      if (typeof args.offset === "number") tags.push({ label: "start", value: String(args.offset + 1) });
-      if (typeof args.length === "number") tags.push({ label: "limit", value: String(args.length) });
+      if (typeof args.offset === "number")
+        tags.push({ label: "start", value: String(args.offset + 1) });
+      if (typeof args.length === "number")
+        tags.push({ label: "limit", value: String(args.length) });
       return { type: "file" as const, path, tags };
     case "MemoryManager":
-      if (typeof args.action === "string") tags.push({ label: "action", value: args.action as string });
+      if (typeof args.action === "string")
+        tags.push({ label: "action", value: args.action as string });
       if (typeof args.slug === "string") tags.push({ label: "slug", value: args.slug as string });
-      if (typeof args.scope === "string") tags.push({ label: "scope", value: args.scope as string });
+      if (typeof args.scope === "string")
+        tags.push({ label: "scope", value: args.scope as string });
       if (typeof args.type === "string") tags.push({ label: "type", value: args.type as string });
       return { type: "generic" as const, path: null, pattern: null, tags };
     case "McpManager":
-      if (typeof args.action === "string") tags.push({ label: "action", value: args.action as string });
-      if (typeof args.server_id === "string") tags.push({ label: "server", value: args.server_id as string });
-      if (Array.isArray(args.server_ids)) tags.push({ label: "servers", value: String(args.server_ids.length) });
-      if (typeof args.conflict === "string") tags.push({ label: "conflict", value: args.conflict as string });
+      if (typeof args.action === "string")
+        tags.push({ label: "action", value: args.action as string });
+      if (typeof args.server_id === "string")
+        tags.push({ label: "server", value: args.server_id as string });
+      if (Array.isArray(args.server_ids))
+        tags.push({ label: "servers", value: String(args.server_ids.length) });
+      if (typeof args.conflict === "string")
+        tags.push({ label: "conflict", value: args.conflict as string });
       if (args.include_schema === true) tags.push({ label: "schema", value: "true" });
       return { type: "generic" as const, path: null, pattern: null, tags };
     case "SendMessage":
       if (typeof args.to === "string") tags.push({ label: "to", value: args.to as string });
-      if (typeof args.channel === "string") tags.push({ label: "channel", value: args.channel as string });
-      if (typeof args.subject === "string") tags.push({ label: "subject", value: args.subject as string });
-      if (typeof args.summary === "string" && typeof args.subject !== "string") tags.push({ label: "subject", value: args.summary as string });
-      if (typeof args.message === "string") tags.push({ label: "message", value: `${(args.message as string).length} chars` });
+      if (typeof args.channel === "string")
+        tags.push({ label: "channel", value: args.channel as string });
+      if (typeof args.subject === "string")
+        tags.push({ label: "subject", value: args.subject as string });
+      if (typeof args.summary === "string" && typeof args.subject !== "string")
+        tags.push({ label: "subject", value: args.summary as string });
+      if (typeof args.message === "string")
+        tags.push({ label: "message", value: `${(args.message as string).length} chars` });
       return { type: "generic" as const, path: null, pattern: null, tags };
     case "Write":
       tags.push({ label: "mode", value: "rewrite" });
-      if (typeof args.content === "string") tags.push({ label: "content", value: `${(args.content as string).length} chars` });
+      if (typeof args.content === "string")
+        tags.push({ label: "content", value: `${(args.content as string).length} chars` });
       return { type: "file" as const, path, tags };
     case "Edit":
-      if (typeof args.old_string === "string") tags.push({ label: "old", value: `${(args.old_string as string).length}c` });
-      if (typeof args.new_string === "string") tags.push({ label: "new", value: `${(args.new_string as string).length}c` });
-      if (typeof args.expected_replacements === "number") tags.push({ label: "×", value: String(args.expected_replacements) });
+      if (typeof args.old_string === "string")
+        tags.push({ label: "old", value: `${(args.old_string as string).length}c` });
+      if (typeof args.new_string === "string")
+        tags.push({ label: "new", value: `${(args.new_string as string).length}c` });
+      if (typeof args.expected_replacements === "number")
+        tags.push({ label: "×", value: String(args.expected_replacements) });
       if (args.replace_all === true) tags.push({ label: "all", value: "true" });
       return { type: "file" as const, path, tags };
     case "Delete":
       return { type: "file" as const, path, tags };
     case "List":
       if (typeof args.depth === "number") tags.push({ label: "depth", value: String(args.depth) });
-      if (typeof args.offset === "number") tags.push({ label: "offset", value: String(args.offset) });
-      if (typeof args.max_results === "number") tags.push({ label: "max", value: String(args.max_results) });
+      if (typeof args.offset === "number")
+        tags.push({ label: "offset", value: String(args.offset) });
+      if (typeof args.max_results === "number")
+        tags.push({ label: "max", value: String(args.max_results) });
       return { type: "file" as const, path: path || "/", tags };
     case "Glob":
-      if (typeof args.offset === "number") tags.push({ label: "offset", value: String(args.offset) });
-      if (typeof args.max_results === "number") tags.push({ label: "max", value: String(args.max_results) });
+      if (typeof args.offset === "number")
+        tags.push({ label: "offset", value: String(args.offset) });
+      if (typeof args.max_results === "number")
+        tags.push({ label: "max", value: String(args.max_results) });
       return { type: "search" as const, path, pattern, tags };
     case "Grep":
-      if (typeof args.file_pattern === "string") tags.push({ label: "filter", value: args.file_pattern as string });
-      if (typeof args.output_mode === "string") tags.push({ label: "mode", value: args.output_mode as string });
-      if (typeof args.ignore_case === "boolean" && args.ignore_case) tags.push({ label: "flag", value: "-i" });
-      if (typeof args.context === "number" && args.context > 0) tags.push({ label: "ctx", value: String(args.context) });
-      if (typeof args.head_limit === "number") tags.push({ label: "head", value: String(args.head_limit) });
+      if (typeof args.file_pattern === "string")
+        tags.push({ label: "filter", value: args.file_pattern as string });
+      if (typeof args.output_mode === "string")
+        tags.push({ label: "mode", value: args.output_mode as string });
+      if (typeof args.ignore_case === "boolean" && args.ignore_case)
+        tags.push({ label: "flag", value: "-i" });
+      if (typeof args.context === "number" && args.context > 0)
+        tags.push({ label: "ctx", value: String(args.context) });
+      if (typeof args.head_limit === "number")
+        tags.push({ label: "head", value: String(args.head_limit) });
       if (args.multiline === true) tags.push({ label: "multi", value: "true" });
       return { type: "search" as const, path, pattern, tags };
     case "Bash":
@@ -958,8 +996,10 @@ function getToolDisplay(toolCall: { name: string; arguments?: Record<string, unk
       // Generic: collect all string/number/boolean args
       const entries: MetaTag[] = [];
       for (const [k, v] of Object.entries(args)) {
-        if (typeof v === "string") entries.push({ label: k, value: v.length > 60 ? `${v.slice(0, 60)}…` : v });
-        else if (typeof v === "number" || typeof v === "boolean") entries.push({ label: k, value: String(v) });
+        if (typeof v === "string")
+          entries.push({ label: k, value: v.length > 60 ? `${v.slice(0, 60)}…` : v });
+        else if (typeof v === "number" || typeof v === "boolean")
+          entries.push({ label: k, value: String(v) });
       }
       return { type: "generic" as const, path: null, pattern: null, tags: entries };
     }
@@ -994,10 +1034,7 @@ function ToolArgsDisplay({ item }: { item: ToolTraceItem }) {
 
   if (isDelegateAgentCardToolCall(toolCall)) {
     const args = toolCall.arguments || {};
-    const name =
-      displayString(args.name) ||
-      displayString(args.agent_id) ||
-      displayString(args.id);
+    const name = displayString(args.name) || displayString(args.agent_id) || displayString(args.id);
     const role = displayString(args.role);
     const task = displayString(args.prompt) || displayString(args.description);
 
@@ -1022,9 +1059,7 @@ function ToolArgsDisplay({ item }: { item: ToolTraceItem }) {
         {task ? (
           <ToolSurface>
             <ToolSurfaceLabel label="task" />
-            <div className="break-words text-[11.5px] leading-[1.6] text-foreground/82">
-              {task}
-            </div>
+            <div className="break-words text-[11.5px] leading-[1.6] text-foreground/82">{task}</div>
           </ToolSurface>
         ) : null}
       </div>
@@ -1033,12 +1068,16 @@ function ToolArgsDisplay({ item }: { item: ToolTraceItem }) {
 
   // Bash: terminal block
   if (display.type === "bash") {
-    const cmd = typeof toolCall.arguments?.command === "string" ? (toolCall.arguments.command as string).trim() : "";
+    const cmd =
+      typeof toolCall.arguments?.command === "string"
+        ? (toolCall.arguments.command as string).trim()
+        : "";
     if (!cmd) return null;
     return (
       <ToolSurface className="overflow-hidden border-emerald-500/15 bg-zinc-950/90 px-0 py-0 shadow-[inset_0_1px_0_rgba(255,255,255,0.04)] dark:border-white/[0.08] dark:bg-zinc-950/90">
         <ToolScrollablePre className="max-h-44 rounded-none text-emerald-300/90">
-          <span className="mr-1 select-none text-emerald-500/30">$</span>{cmd}
+          <span className="mr-1 select-none text-emerald-500/30">$</span>
+          {cmd}
         </ToolScrollablePre>
       </ToolSurface>
     );
@@ -1139,7 +1178,11 @@ function getImageDataUrl(image: ImageContent) {
 }
 
 function isDisplayImageItemDetails(value: unknown): value is DisplayImageItemDetails {
-  return Boolean(value) && typeof value === "object" && typeof (value as { path?: unknown }).path === "string";
+  return (
+    Boolean(value) &&
+    typeof value === "object" &&
+    typeof (value as { path?: unknown }).path === "string"
+  );
 }
 
 function getDisplayImageDetails(result: ToolResultMessage): DisplayImageItemDetails[] {
@@ -1220,7 +1263,9 @@ function parseNativeDisplayImageProxyKey(proxyKey: string): NativeDisplayImagePr
 
 function useNativeDisplayImageSources(entries: NativeDisplayImageEntry[]) {
   const proxyKey = getNativeDisplayImageProxyKey(entries);
-  const [proxySources, setProxySources] = useState<Record<number, NativeDisplayImageSourceState>>({});
+  const [proxySources, setProxySources] = useState<Record<number, NativeDisplayImageSourceState>>(
+    {},
+  );
 
   useEffect(() => {
     let cancelled = false;
@@ -1398,13 +1443,17 @@ function ToolResultImagePreview(props: {
           if (canPreview) setPreviewOpen(true);
         }}
         title={alt}
-        aria-label={canPreview ? `${t("chat.image.preview")} ${alt}` : `${t("chat.image.loading")} ${alt}`}
+        aria-label={
+          canPreview ? `${t("chat.image.preview")} ${alt}` : `${t("chat.image.loading")} ${alt}`
+        }
       >
         <div className={cn("relative w-full", imageStatus !== "loaded" && "min-h-32")}>
           {imageStatus !== "loaded" ? (
             <ToolImageStatusCard
               status={imageStatus === "error" ? "error" : "loading"}
-              title={imageStatus === "error" ? t("chat.image.unavailable") : t("chat.image.loading")}
+              title={
+                imageStatus === "error" ? t("chat.image.unavailable") : t("chat.image.loading")
+              }
               detail={imageStatus === "error" ? t("chat.image.checkGenerated") : imageDetail}
               className="absolute inset-0 min-h-32"
             />
@@ -1429,11 +1478,7 @@ function ToolResultImagePreview(props: {
         </div>
       </button>
       {previewOpen ? (
-        <ImagePreview
-          open={previewOpen}
-          slides={slides}
-          onClose={() => setPreviewOpen(false)}
-        />
+        <ImagePreview open={previewOpen} slides={slides} onClose={() => setPreviewOpen(false)} />
       ) : null}
     </>
   );
@@ -1516,7 +1561,9 @@ function NativeDisplayImageTile(props: {
       type="button"
       className={cn(
         "relative flex max-w-full items-center justify-center overflow-hidden rounded-[10px] text-left shadow-sm transition-[filter,transform] focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary/45 disabled:opacity-100",
-        canPreview ? "cursor-zoom-in hover:brightness-[0.98]" : "cursor-default hover:brightness-100",
+        canPreview
+          ? "cursor-zoom-in hover:brightness-[0.98]"
+          : "cursor-default hover:brightness-100",
         isGallery && "aspect-square w-full bg-muted/30",
         !isGallery && (isSvgImage || isWaiting) && "min-h-28 w-full max-w-3xl bg-muted/30",
         imageStatus === "error" && "shadow-none",
@@ -1649,21 +1696,46 @@ function guessLangFromPath(filePath?: string): string {
   if (!filePath) return "txt";
   const ext = filePath.split(".").pop()?.toLowerCase();
   const map: Record<string, string> = {
-    ts: "typescript", tsx: "typescript", js: "javascript", jsx: "javascript",
-    py: "python", rs: "rust", go: "go", java: "java", kt: "kotlin",
-    rb: "ruby", swift: "swift", c: "c", cpp: "cpp", h: "c", hpp: "cpp",
-    cs: "csharp", css: "css", scss: "scss", html: "html", vue: "vue",
-    json: "json", yaml: "yaml", yml: "yaml", toml: "toml", xml: "xml",
-    md: "markdown", sql: "sql", sh: "bash", zsh: "bash", bash: "bash",
-    dockerfile: "dockerfile", lua: "lua", php: "php", dart: "dart",
+    ts: "typescript",
+    tsx: "typescript",
+    js: "javascript",
+    jsx: "javascript",
+    py: "python",
+    rs: "rust",
+    go: "go",
+    java: "java",
+    kt: "kotlin",
+    rb: "ruby",
+    swift: "swift",
+    c: "c",
+    cpp: "cpp",
+    h: "c",
+    hpp: "cpp",
+    cs: "csharp",
+    css: "css",
+    scss: "scss",
+    html: "html",
+    vue: "vue",
+    json: "json",
+    yaml: "yaml",
+    yml: "yaml",
+    toml: "toml",
+    xml: "xml",
+    md: "markdown",
+    sql: "sql",
+    sh: "bash",
+    zsh: "bash",
+    bash: "bash",
+    dockerfile: "dockerfile",
+    lua: "lua",
+    php: "php",
+    dart: "dart",
   };
   return (ext && map[ext]) || "txt";
 }
 
 function useIsDark() {
-  const [isDark, setIsDark] = useState(() =>
-    document.documentElement.classList.contains("dark"),
-  );
+  const [isDark, setIsDark] = useState(() => document.documentElement.classList.contains("dark"));
   useEffect(() => {
     const observer = new MutationObserver(() => {
       setIsDark(document.documentElement.classList.contains("dark"));
@@ -1682,9 +1754,12 @@ function EditDiffView(props: { beforeText: string; afterText: string; filePath?:
   const diffFile = useMemo(() => {
     if (!beforeText && !afterText) return undefined;
     const instance = generateDiffFile(
-      filePath ?? "old", beforeText,
-      filePath ?? "new", afterText,
-      lang, lang,
+      filePath ?? "old",
+      beforeText,
+      filePath ?? "new",
+      afterText,
+      lang,
+      lang,
     );
     instance.init();
     instance.buildSplitDiffLines();
@@ -1726,8 +1801,14 @@ function ToolResultDisplay({ item, result }: { item: ToolTraceItem; result: Tool
             ...(typeof shellDetails.effective_timeout_ms === "number"
               ? [{ label: "timeout_ms", value: `${shellDetails.effective_timeout_ms}` }]
               : []),
-            { label: "stdout", value: summarizeShellStream(shellDetails.stdout, shellDetails.stdout_truncated) },
-            { label: "stderr", value: summarizeShellStream(shellDetails.stderr, shellDetails.stderr_truncated) },
+            {
+              label: "stdout",
+              value: summarizeShellStream(shellDetails.stdout, shellDetails.stdout_truncated),
+            },
+            {
+              label: "stderr",
+              value: summarizeShellStream(shellDetails.stderr, shellDetails.stderr_truncated),
+            },
             ...(shellDetails.timed_out ? [{ label: "timeout", value: "true" }] : []),
             ...(shellDetails.cancelled ? [{ label: "cancelled", value: "true" }] : []),
           ]}
@@ -1744,14 +1825,22 @@ function ToolResultDisplay({ item, result }: { item: ToolTraceItem; result: Tool
           <MetaTags
             tags={[
               ...fileRootTags(details.root),
-              { label: "lines", value: details.numLines > 0 ? `${details.startLine}-${details.startLine + details.numLines - 1}/${details.totalLines}` : `empty/${details.totalLines}` },
+              {
+                label: "lines",
+                value:
+                  details.numLines > 0
+                    ? `${details.startLine}-${details.startLine + details.numLines - 1}/${details.totalLines}`
+                    : `empty/${details.totalLines}`,
+              },
               { label: "view", value: details.isPartialView ? "partial" : "full" },
               ...(details.truncated ? [{ label: "truncated", value: "true" }] : []),
               ...(details.reusedExisting ? [{ label: "cache", value: "unchanged" }] : []),
             ]}
           />
         </ToolSurface>
-        {!details.reusedExisting ? <CodePreview text={extractReadBody(text)} maxChars={8000} /> : null}
+        {!details.reusedExisting ? (
+          <CodePreview text={extractReadBody(text)} maxChars={8000} />
+        ) : null}
       </div>
     );
   }
@@ -1789,15 +1878,29 @@ function ToolResultDisplay({ item, result }: { item: ToolTraceItem; result: Tool
             tags={[
               { label: "action", value: details.action },
               { label: "root", value: details.rootDir },
-              ...(typeof details.skillsCount === "number" ? [{ label: "skills", value: String(details.skillsCount) }] : []),
-              ...(typeof details.installedCount === "number" ? [{ label: "installed", value: String(details.installedCount) }] : []),
+              ...(typeof details.skillsCount === "number"
+                ? [{ label: "skills", value: String(details.skillsCount) }]
+                : []),
+              ...(typeof details.installedCount === "number"
+                ? [{ label: "installed", value: String(details.installedCount) }]
+                : []),
               ...(details.createdName ? [{ label: "created", value: details.createdName }] : []),
-              ...(typeof details.clawhubResultCount === "number" ? [{ label: "clawhub", value: String(details.clawhubResultCount) }] : []),
+              ...(typeof details.clawhubResultCount === "number"
+                ? [{ label: "clawhub", value: String(details.clawhubResultCount) }]
+                : []),
               ...(details.clawhubSlug ? [{ label: "slug", value: details.clawhubSlug }] : []),
-              ...(typeof details.validationOk === "boolean" ? [{ label: "valid", value: details.validationOk ? "true" : "false" }] : []),
-              ...(details.packageArchive ? [{ label: "archive", value: details.packageArchive }] : []),
-              ...(details.clawhubNextCursor ? [{ label: "cursor", value: details.clawhubNextCursor }] : []),
-              ...(typeof details.invalidCount === "number" && details.invalidCount > 0 ? [{ label: "invalid", value: String(details.invalidCount) }] : []),
+              ...(typeof details.validationOk === "boolean"
+                ? [{ label: "valid", value: details.validationOk ? "true" : "false" }]
+                : []),
+              ...(details.packageArchive
+                ? [{ label: "archive", value: details.packageArchive }]
+                : []),
+              ...(details.clawhubNextCursor
+                ? [{ label: "cursor", value: details.clawhubNextCursor }]
+                : []),
+              ...(typeof details.invalidCount === "number" && details.invalidCount > 0
+                ? [{ label: "invalid", value: String(details.invalidCount) }]
+                : []),
               ...(details.backup ? [{ label: "backup", value: details.backup }] : []),
             ]}
           />
@@ -1817,13 +1920,25 @@ function ToolResultDisplay({ item, result }: { item: ToolTraceItem; result: Tool
               { label: "action", value: details.action },
               ...(details.serverId ? [{ label: "server", value: details.serverId }] : []),
               ...(details.transport ? [{ label: "transport", value: details.transport }] : []),
-              ...(typeof details.ok === "boolean" ? [{ label: "ok", value: details.ok ? "true" : "false" }] : []),
+              ...(typeof details.ok === "boolean"
+                ? [{ label: "ok", value: details.ok ? "true" : "false" }]
+                : []),
               ...(details.phase ? [{ label: "phase", value: details.phase }] : []),
-              ...(typeof details.serverCount === "number" ? [{ label: "servers", value: String(details.serverCount) }] : []),
-              ...(typeof details.enabledCount === "number" ? [{ label: "enabled", value: String(details.enabledCount) }] : []),
-              ...(typeof details.toolsCount === "number" ? [{ label: "tools", value: String(details.toolsCount) }] : []),
-              ...(typeof details.changed === "boolean" ? [{ label: "changed", value: details.changed ? "true" : "false" }] : []),
-              ...(typeof details.stopped === "boolean" ? [{ label: "stopped", value: details.stopped ? "true" : "false" }] : []),
+              ...(typeof details.serverCount === "number"
+                ? [{ label: "servers", value: String(details.serverCount) }]
+                : []),
+              ...(typeof details.enabledCount === "number"
+                ? [{ label: "enabled", value: String(details.enabledCount) }]
+                : []),
+              ...(typeof details.toolsCount === "number"
+                ? [{ label: "tools", value: String(details.toolsCount) }]
+                : []),
+              ...(typeof details.changed === "boolean"
+                ? [{ label: "changed", value: details.changed ? "true" : "false" }]
+                : []),
+              ...(typeof details.stopped === "boolean"
+                ? [{ label: "stopped", value: details.stopped ? "true" : "false" }]
+                : []),
             ]}
           />
         </ToolSurface>
@@ -1883,7 +1998,9 @@ function ToolResultDisplay({ item, result }: { item: ToolTraceItem; result: Tool
             ]}
           />
         </ToolSurface>
-        {!details.reusedExisting ? <CodePreview text={extractReadBody(text)} maxChars={8000} /> : null}
+        {!details.reusedExisting ? (
+          <CodePreview text={extractReadBody(text)} maxChars={8000} />
+        ) : null}
       </div>
     );
   }
@@ -1908,7 +2025,9 @@ function ToolResultDisplay({ item, result }: { item: ToolTraceItem; result: Tool
             ]}
           />
         </ToolSurface>
-        {!details.reusedExisting ? <CodePreview text={extractReadBody(text)} maxChars={8000} /> : null}
+        {!details.reusedExisting ? (
+          <CodePreview text={extractReadBody(text)} maxChars={8000} />
+        ) : null}
       </div>
     );
   }
@@ -1930,7 +2049,9 @@ function ToolResultDisplay({ item, result }: { item: ToolTraceItem; result: Tool
             ]}
           />
         </ToolSurface>
-        {!details.reusedExisting ? <CodePreview text={extractReadBody(text)} maxChars={8000} /> : null}
+        {!details.reusedExisting ? (
+          <CodePreview text={extractReadBody(text)} maxChars={8000} />
+        ) : null}
       </div>
     );
   }
@@ -1969,7 +2090,9 @@ function ToolResultDisplay({ item, result }: { item: ToolTraceItem; result: Tool
     const details = result.details as DeleteResultDetails;
     return (
       <ToolSurface>
-        <MetaTags tags={[...fileRootTags(details.root), { label: "kind", value: details.targetKind }]} />
+        <MetaTags
+          tags={[...fileRootTags(details.root), { label: "kind", value: details.targetKind }]}
+        />
       </ToolSurface>
     );
   }
@@ -1996,8 +2119,13 @@ function ToolResultDisplay({ item, result }: { item: ToolTraceItem; result: Tool
                 key={`${entry.kind}-${entry.path}`}
                 className="flex items-start gap-2 rounded-[8px] px-1.5 py-1 text-[11px] leading-[1.5] even:bg-black/[0.02] dark:even:bg-white/[0.03]"
               >
-                <span className="mt-[1px] shrink-0 text-[10px] font-semibold uppercase text-muted-foreground/35">{entry.kind}</span>
-                <PathDisplay path={entry.path} className="min-w-0 break-all font-mono text-[11px]" />
+                <span className="mt-[1px] shrink-0 text-[10px] font-semibold uppercase text-muted-foreground/35">
+                  {entry.kind}
+                </span>
+                <PathDisplay
+                  path={entry.path}
+                  className="min-w-0 break-all font-mono text-[11px]"
+                />
               </div>
             ))}
           </div>
@@ -2060,7 +2188,10 @@ function ToolResultDisplay({ item, result }: { item: ToolTraceItem; result: Tool
                   key={file.path}
                   className="space-y-1 rounded-[8px] px-1.5 py-1 even:bg-black/[0.02] dark:even:bg-white/[0.03]"
                 >
-                  <PathDisplay path={file.path} className="block break-all font-mono text-[11px] leading-[1.5]" />
+                  <PathDisplay
+                    path={file.path}
+                    className="block break-all font-mono text-[11px] leading-[1.5]"
+                  />
                   <MetaTags
                     tags={[
                       { label: "count", value: String(file.count) },
@@ -2076,16 +2207,26 @@ function ToolResultDisplay({ item, result }: { item: ToolTraceItem; result: Tool
         ) : (
           <ToolSurface className="max-h-64 overflow-auto space-y-2">
             {details.matches.map((match, index) => (
-              <div key={`${match.path}:${match.line}:${index}`} className="rounded-[8px] border border-black/[0.05] bg-white/[0.55] p-2 dark:border-white/[0.06] dark:bg-white/[0.03]">
+              <div
+                key={`${match.path}:${match.line}:${index}`}
+                className="rounded-[8px] border border-black/[0.05] bg-white/[0.55] p-2 dark:border-white/[0.06] dark:bg-white/[0.03]"
+              >
                 <div className="flex items-start gap-2">
-                  <PathDisplay path={match.path} className="min-w-0 break-all font-mono text-[11px] leading-[1.5]" />
+                  <PathDisplay
+                    path={match.path}
+                    className="min-w-0 break-all font-mono text-[11px] leading-[1.5]"
+                  />
                   <span className="shrink-0 rounded bg-black/[0.04] px-1.5 py-[1px] text-[10px] font-semibold text-muted-foreground/60 dark:bg-white/[0.05]">
                     line {match.line}
                   </span>
                 </div>
-                {match.before.length > 0 ? <CodePreview text={match.before.join("\n")} maxChars={1500} /> : null}
+                {match.before.length > 0 ? (
+                  <CodePreview text={match.before.join("\n")} maxChars={1500} />
+                ) : null}
                 <CodePreview text={match.text} maxChars={1500} />
-                {match.after.length > 0 ? <CodePreview text={match.after.join("\n")} maxChars={1500} /> : null}
+                {match.after.length > 0 ? (
+                  <CodePreview text={match.after.join("\n")} maxChars={1500} />
+                ) : null}
               </div>
             ))}
           </ToolSurface>
@@ -2145,14 +2286,16 @@ function ToolResultDisplay({ item, result }: { item: ToolTraceItem; result: Tool
           ) : null}
           {shouldShowDelegateWorktreeLocation(agent) ? (
             <div className="break-all text-[10px] text-muted-foreground/70">
-              {agent.branchName ? `${agent.branchName} | ` : ""}{agent.worktreeRoot}
+              {agent.branchName ? `${agent.branchName} | ` : ""}
+              {agent.worktreeRoot}
             </div>
           ) : null}
-          {agent.diffStat ? (
-            <CodePreview text={agent.diffStat} maxChars={1200} />
-          ) : null}
+          {agent.diffStat ? <CodePreview text={agent.diffStat} maxChars={1200} /> : null}
           {showUntrackedFiles ? (
-            <CodePreview text={`untracked:\n${untrackedFiles.map((file) => `- ${file}`).join("\n")}`} maxChars={1200} />
+            <CodePreview
+              text={`untracked:\n${untrackedFiles.map((file) => `- ${file}`).join("\n")}`}
+              maxChars={1200}
+            />
           ) : null}
           {agent.worktreeStatusError ? (
             <CodePreview text={agent.worktreeStatusError} maxChars={1200} />
@@ -2166,21 +2309,39 @@ function ToolResultDisplay({ item, result }: { item: ToolTraceItem; result: Tool
             <CodePreview text={`fallback reason:\n${agent.applyFallbackReason}`} maxChars={1200} />
           ) : null}
           {agent.applyCopiedFiles && agent.applyCopiedFiles.length > 0 ? (
-            <CodePreview text={`copied:\n${agent.applyCopiedFiles.map((file) => `- ${file}`).join("\n")}`} maxChars={1200} />
+            <CodePreview
+              text={`copied:\n${agent.applyCopiedFiles.map((file) => `- ${file}`).join("\n")}`}
+              maxChars={1200}
+            />
           ) : null}
           {agent.applyDeletedFiles && agent.applyDeletedFiles.length > 0 ? (
-            <CodePreview text={`deleted:\n${agent.applyDeletedFiles.map((file) => `- ${file}`).join("\n")}`} maxChars={1200} />
+            <CodePreview
+              text={`deleted:\n${agent.applyDeletedFiles.map((file) => `- ${file}`).join("\n")}`}
+              maxChars={1200}
+            />
           ) : null}
           {agent.applyConflictFiles && agent.applyConflictFiles.length > 0 ? (
-            <CodePreview text={`apply conflicts:\n${agent.applyConflictFiles.map((file) => `- ${file}`).join("\n")}`} maxChars={1200} />
+            <CodePreview
+              text={`apply conflicts:\n${agent.applyConflictFiles.map((file) => `- ${file}`).join("\n")}`}
+              maxChars={1200}
+            />
           ) : null}
           {agent.worktreeCleanupError ? (
-            <CodePreview text={`worktree cleanup failed:\n${agent.worktreeCleanupError}`} maxChars={1200} />
+            <CodePreview
+              text={`worktree cleanup failed:\n${agent.worktreeCleanupError}`}
+              maxChars={1200}
+            />
           ) : agent.worktreeCleanupReason && agent.worktreeCleanupStatus === "retained" ? (
-            <CodePreview text={`worktree retained: ${agent.worktreeCleanupReason}`} maxChars={1200} />
+            <CodePreview
+              text={`worktree retained: ${agent.worktreeCleanupReason}`}
+              maxChars={1200}
+            />
           ) : null}
           {showCandidateArtifacts ? (
-            <CodePreview text={`candidate artifacts:\n${candidateArtifacts.map((file) => `- ${file}`).join("\n")}`} maxChars={1200} />
+            <CodePreview
+              text={`candidate artifacts:\n${candidateArtifacts.map((file) => `- ${file}`).join("\n")}`}
+              maxChars={1200}
+            />
           ) : null}
           {agent.error ? (
             <CodePreview text={agent.error} maxChars={1200} />
@@ -2263,9 +2424,7 @@ function ToolCallItem({
   const { t } = useLocale();
   const result = item.toolResult;
   const builtinResultKind = getBuiltinResultKind(result);
-  const shouldAutoOpen =
-    item.toolCall.name === "Image" ||
-    builtinResultKind === "display_image";
+  const shouldAutoOpen = item.toolCall.name === "Image" || builtinResultKind === "display_image";
   const [open, setOpen] = useState(shouldAutoOpen);
   const isDelegateAgentCard = isDelegateAgentCardToolCall(item.toolCall);
   const hasArgs = Object.keys(item.toolCall.arguments || {}).length > 0;
@@ -2319,7 +2478,9 @@ function ToolCallItem({
       open={open}
       className={cn(
         "group/tool overflow-hidden",
-        variant === "grouped" ? "tool-card-grouped rounded-[10px]" : "tool-card-enter rounded-[12px]",
+        variant === "grouped"
+          ? "tool-card-grouped rounded-[10px]"
+          : "tool-card-enter rounded-[12px]",
         // Frosted glass with saturate
         "border border-black/[0.06] bg-white/[0.72] backdrop-blur-xl backdrop-saturate-[1.8]",
         variant === "grouped"
@@ -2368,11 +2529,14 @@ function ToolCallItem({
           {/* Inline summary — truncated */}
           {isBash && firstLine ? (
             <span className="min-w-0 truncate font-mono text-[11px] text-muted-foreground/55">
-              <span className="text-muted-foreground/30">$</span>
-              {" "}{firstLine.length > 48 ? `${firstLine.slice(0, 48)}…` : firstLine}
+              <span className="text-muted-foreground/30">$</span>{" "}
+              {firstLine.length > 48 ? `${firstLine.slice(0, 48)}…` : firstLine}
             </span>
           ) : toolArgsSummary ? (
-            <span className="min-w-0 truncate font-mono text-[11px] text-muted-foreground/55" title={toolArgsSummary}>
+            <span
+              className="min-w-0 truncate font-mono text-[11px] text-muted-foreground/55"
+              title={toolArgsSummary}
+            >
               {toolArgsSummary}
             </span>
           ) : null}
@@ -2422,9 +2586,7 @@ function ToolCallItem({
 
                   if (isBash) {
                     return (
-                      <ToolScrollablePre
-                        className="max-h-56 bg-zinc-950/85 text-zinc-300/90 shadow-[inset_0_1px_2px_rgba(0,0,0,0.25)] dark:bg-zinc-900/80"
-                      >
+                      <ToolScrollablePre className="max-h-56 bg-zinc-950/85 text-zinc-300/90 shadow-[inset_0_1px_2px_rgba(0,0,0,0.25)] dark:bg-zinc-900/80">
                         {previewText(resultText, 6000)}
                       </ToolScrollablePre>
                     );
@@ -2492,10 +2654,7 @@ const MemoToolCallItem = memo(
     areToolTraceItemsEqual(previousProps.item, nextProps.item),
 );
 
-function ToolTraceGroup(props: {
-  items: ToolTraceItem[];
-  runningToolCallIds?: string[];
-}) {
+function ToolTraceGroup(props: { items: ToolTraceItem[]; runningToolCallIds?: string[] }) {
   const { items, runningToolCallIds = [] } = props;
   const { t } = useLocale();
   const counts = useMemo(
@@ -2504,10 +2663,7 @@ function ToolTraceGroup(props: {
   );
   const composition = useMemo(() => getToolGroupComposition(items), [items]);
   const dominantToolName = useMemo(() => getDominantToolName(items), [items]);
-  const allBash = useMemo(
-    () => items.every((item) => item.toolCall.name === "Bash"),
-    [items],
-  );
+  const allBash = useMemo(() => items.every((item) => item.toolCall.name === "Bash"), [items]);
   const meta = useMemo(
     () => (allBash ? getToolMeta("Bash") : getToolMeta(dominantToolName)),
     [allBash, dominantToolName],
@@ -2614,9 +2770,7 @@ function ToolTraceGroup(props: {
               key={getToolTraceKey(item, index)}
               item={item}
               variant="grouped"
-              isRunning={Boolean(
-                item.toolCall.id && runningToolCallIds.includes(item.toolCall.id),
-              )}
+              isRunning={Boolean(item.toolCall.id && runningToolCallIds.includes(item.toolCall.id))}
             />
           ))}
         </div>
@@ -2648,13 +2802,13 @@ function RoundContent(props: {
     toolStatusVariant,
     runningToolCallIds,
     thinkingOpen,
-  } =
-    props;
+  } = props;
   const hasContent =
     round.blocks.some((block) => {
       if (block.kind === "tool" || block.kind === "hostedSearch") return true;
       return block.text.trim().length > 0;
-    }) || (isActive && isLive);
+    }) ||
+    (isActive && isLive);
   const normalizedToolStatus =
     isActive && isLive ? normalizeLiveToolStatus(toolStatus ?? null) : null;
   const isCompactionStatus = toolStatusVariant === "compaction";
@@ -2702,12 +2856,7 @@ function RoundContent(props: {
         if (block.kind === "tool") {
           const displayImagePayload = getNativeDisplayImagePayload(block.item);
           if (displayImagePayload) {
-            return (
-              <NativeDisplayImageBlock
-                key={block.key}
-                payload={displayImagePayload}
-              />
-            );
+            return <NativeDisplayImageBlock key={block.key} payload={displayImagePayload} />;
           }
 
           if (block.item.toolCall.name === "Image" && !block.item.toolResult?.isError) {
@@ -2732,7 +2881,7 @@ function RoundContent(props: {
             <ToolTraceGroup
               key={block.key}
               items={block.items}
-              runningToolCallIds={isLive ? runningToolCallIds ?? [] : []}
+              runningToolCallIds={isLive ? (runningToolCallIds ?? []) : []}
             />
           );
         }
@@ -2756,15 +2905,13 @@ function RoundContent(props: {
             isAnimating
           />
         ) : (
-          <Markdown
-            key={block.key}
-            content={block.text}
-            className="font-openai-chat"
-          />
+          <Markdown key={block.key} content={block.text} className="font-openai-chat" />
         );
       })}
 
-      {showUsage ? <UsagePanel usage={round.meta?.usage} contextWindow={usageContextWindow} /> : null}
+      {showUsage ? (
+        <UsagePanel usage={round.meta?.usage} contextWindow={usageContextWindow} />
+      ) : null}
     </div>
   );
 }
diff --git a/crates/agent-gui/src/pages/chat/ChatHeader.tsx b/crates/agent-gui/src/pages/chat/ChatHeader.tsx
index 09fbccb14..aed0314e7 100644
--- a/crates/agent-gui/src/pages/chat/ChatHeader.tsx
+++ b/crates/agent-gui/src/pages/chat/ChatHeader.tsx
@@ -1,4 +1,4 @@
-import { memo, useEffect, useRef, type ReactNode, useState } from "react";
+import { memo, type ReactNode, useEffect, useRef, useState } from "react";
 import {
   Check,
   ChevronDown,
diff --git a/crates/agent-gui/src/pages/chat/chatPageRuntime.ts b/crates/agent-gui/src/pages/chat/chatPageRuntime.ts
index c97289d7a..7f1d2c052 100644
--- a/crates/agent-gui/src/pages/chat/chatPageRuntime.ts
+++ b/crates/agent-gui/src/pages/chat/chatPageRuntime.ts
@@ -1,10 +1,9 @@
 import type { AssistantMessage } from "@mariozechner/pi-ai";
-
-import type { ConversationHookWarning } from "../../lib/hooks/conversationHooks";
-import type { ConversationViewState } from "../../lib/chat/conversation/conversationState";
 import type { CompactionStatus } from "../../lib/chat/compaction/contextCompaction";
+import type { ConversationViewState } from "../../lib/chat/conversation/conversationState";
+import type { ConversationHookWarning } from "../../lib/hooks/conversationHooks";
 import { normalizeErrorMessage } from "../../lib/providers/llm";
-import { HOOK_EVENT_TRANSLATION_KEYS, type AppSettings } from "../../lib/settings";
+import { type AppSettings, HOOK_EVENT_TRANSLATION_KEYS } from "../../lib/settings";
 
 export const MAX_IDLE_CONVERSATION_RUNTIME_CACHE_ENTRIES = 12;
 
diff --git a/crates/agent-gui/src/pages/chat/conversationTitleJob.ts b/crates/agent-gui/src/pages/chat/conversationTitleJob.ts
index 357c789dd..faf445d9b 100644
--- a/crates/agent-gui/src/pages/chat/conversationTitleJob.ts
+++ b/crates/agent-gui/src/pages/chat/conversationTitleJob.ts
@@ -1,14 +1,13 @@
 import type { Dispatch, MutableRefObject, SetStateAction } from "react";
-
-import { assistantMessageToText, streamAssistantMessage } from "../../lib/providers/llm";
+import type { GatewayBridgeEventController } from "../../lib/chat/conversation/run";
+import type { ChatHistorySummary } from "../../lib/chat/history/chatHistory";
 import {
   buildConversationTitlePrompt,
   mergeHistoryItem,
   normalizeConversationTitle,
 } from "../../lib/chat/page/chatPageHelpers";
-import type { ChatHistorySummary } from "../../lib/chat/history/chatHistory";
+import { assistantMessageToText, streamAssistantMessage } from "../../lib/providers/llm";
 import type { ProviderId } from "../../lib/settings";
-import type { GatewayBridgeEventController } from "../../lib/chat/conversation/run";
 
 type TitleJobRefValue = {
   conversationId: string;
@@ -82,7 +81,8 @@ export function startConversationTitleJob(params: StartConversationTitleJobParam
     cacheRetention: "none",
     nativeWebSearch: false,
     context: {
-      systemPrompt: "You generate concise conversation titles. Output the title only, with no extra explanation.",
+      systemPrompt:
+        "You generate concise conversation titles. Output the title only, with no extra explanation.",
       messages: [
         {
           role: "user",
diff --git a/crates/agent-gui/src/pages/chat/gatewayBridgeTypes.ts b/crates/agent-gui/src/pages/chat/gatewayBridgeTypes.ts
index 7cff5bfe8..1a8cc4432 100644
--- a/crates/agent-gui/src/pages/chat/gatewayBridgeTypes.ts
+++ b/crates/agent-gui/src/pages/chat/gatewayBridgeTypes.ts
@@ -1,14 +1,13 @@
 import type { MutableRefObject } from "react";
-
-import type { ChatHistorySummary } from "../../lib/chat/history/chatHistory";
 import type { ConversationViewState } from "../../lib/chat/conversation/conversationState";
+import type { ChatHistorySummary } from "../../lib/chat/history/chatHistory";
+import type { PendingUploadedFile } from "../../lib/chat/messages/uploadedFiles";
 import type {
   ChatRuntimeControls,
   ExecutionMode,
   ProviderId,
   SystemToolId,
 } from "../../lib/settings";
-import type { PendingUploadedFile } from "../../lib/chat/messages/uploadedFiles";
 import type { ConversationRuntimeEntry } from "./chatPageRuntime";
 
 export type GatewaySelectedModelEvent = {
@@ -84,10 +83,7 @@ export type GatewayBridgeRuntimeRefs = {
   appliedHistoryTruncationsRef: MutableRefObject<Map<string, string>>;
   historyItemsRef: MutableRefObject<ChatHistorySummary[]>;
   ensureGatewayBridgeConversationReadyRef: MutableRefObject<
-    (
-      id: string,
-      options?: EnsureGatewayBridgeConversationReadyOptions,
-    ) => Promise<string>
+    (id: string, options?: EnsureGatewayBridgeConversationReadyOptions) => Promise<string>
   >;
   sendActionRef: MutableRefObject<SendChatAction>;
 };
diff --git a/crates/agent-gui/src/pages/chat/runAgentConversationTurn.ts b/crates/agent-gui/src/pages/chat/runAgentConversationTurn.ts
index c21d93390..88c96de00 100644
--- a/crates/agent-gui/src/pages/chat/runAgentConversationTurn.ts
+++ b/crates/agent-gui/src/pages/chat/runAgentConversationTurn.ts
@@ -5,43 +5,35 @@ import type {
   ToolCall,
   ToolResultMessage,
 } from "@mariozechner/pi-ai";
-
-import { assistantMessageToText } from "../../lib/providers/llm";
-import { runAssistantWithTools } from "../../lib/chat/runner/agentRunner";
-import {
-  appendMessagesToConversation,
-  appendRenderOnlyMessagesToConversation,
-  type ConversationViewState,
-} from "../../lib/chat/conversation/conversationState";
 import {
-  noteCompactionRound,
-  shouldProtectionCompactConversation,
   type CompactionThrottleState,
+  noteCompactionRound,
   type ProviderRuntimeConfig,
+  shouldProtectionCompactConversation,
 } from "../../lib/chat/compaction/contextCompaction";
 import { isAbortedAssistantMessage } from "../../lib/chat/conversation/chatAbort";
-import type { StreamDebugLogger } from "../../lib/debug/agentDebug";
-import type { ProviderId, SystemToolId, AppSettings } from "../../lib/settings";
+import {
+  appendMessagesToConversation,
+  appendRenderOnlyMessagesToConversation,
+  type ConversationViewState,
+} from "../../lib/chat/conversation/conversationState";
+import type { LiveTranscriptStore } from "../../lib/chat/conversation/liveTranscriptStore";
 import type {
   ConversationHookLifecycle,
   GatewayBridgeEventController,
 } from "../../lib/chat/conversation/run";
-import type { LiveTranscriptStore } from "../../lib/chat/conversation/liveTranscriptStore";
+import type { HostedSearchBlock } from "../../lib/chat/messages/hostedSearch";
 import {
   appendTextDeltaToRound,
   appendThinkingDeltaToRound,
   attachToolResultToRound,
   collapseThinking,
+  type LiveRound,
+  updateLiveRound,
   upsertHostedSearchToRound,
   upsertToolCallToRound,
-  updateLiveRound,
-  type LiveRound,
 } from "../../lib/chat/messages/uiMessages";
-import type { HostedSearchBlock } from "../../lib/chat/messages/hostedSearch";
-import {
-  buildExistingSubagentsReminder,
-} from "../../lib/chat/subagent/subagentReminders";
-import { createSubagentScheduler } from "../../lib/chat/subagent/subagentScheduler";
+import { runAssistantWithTools } from "../../lib/chat/runner/agentRunner";
 import {
   listSubagentIdentities,
   listSubagentMessages,
@@ -53,7 +45,12 @@ import {
   renderSubagentMessageBusSnapshot,
   SUBAGENT_PARENT_AGENT_ID,
 } from "../../lib/chat/subagent/subagentMessageBus";
+import { buildExistingSubagentsReminder } from "../../lib/chat/subagent/subagentReminders";
 import type { SubagentRuntimeManager } from "../../lib/chat/subagent/subagentRuntimeManager";
+import { createSubagentScheduler } from "../../lib/chat/subagent/subagentScheduler";
+import type { StreamDebugLogger } from "../../lib/debug/agentDebug";
+import { assistantMessageToText } from "../../lib/providers/llm";
+import type { AppSettings, ProviderId, SystemToolId } from "../../lib/settings";
 import { buildBuiltinToolRegistry } from "../../lib/tools/builtinRegistry";
 import type { BuiltinToolExecutionContext } from "../../lib/tools/builtinTypes";
 import { createFileToolState } from "../../lib/tools/fileToolState";
@@ -66,7 +63,7 @@ import {
 import { buildProtectionCompactionStatus } from "./compactionStatusText";
 import {
   recordSilentMemoryTurnBoundary,
-  runSilentMemoryExtraction,
+  type runSilentMemoryExtraction,
   type SilentMemoryExtractionModelConfig,
 } from "./silentMemoryExtraction";
 import { runSilentMemoryExtractionWithFallback } from "./silentMemoryExtractionFallback";
@@ -132,17 +129,11 @@ function finishAgentPerfSpan(
 }
 
 function shouldShowToolEvent(toolCall: ToolCall) {
-  return (
-    toolCall.name !== "Agent" ||
-    toolCall.arguments?.delegate_agent_card === true
-  );
+  return toolCall.name !== "Agent" || toolCall.arguments?.delegate_agent_card === true;
 }
 
 function isDelegateAgentCardToolCall(toolCall: ToolCall) {
-  return (
-    toolCall.name === "Agent" &&
-    toolCall.arguments?.delegate_agent_card === true
-  );
+  return toolCall.name === "Agent" && toolCall.arguments?.delegate_agent_card === true;
 }
 
 function asRecord(value: unknown): Record<string, unknown> {
@@ -199,8 +190,7 @@ function extractConversationSubagentRuns(params: {
           providerId: params.providerId,
           model: params.model,
           sessionId:
-            optionalString(agent.sessionId) ??
-            `${params.sessionId}:subagent:${logicalAgentId}`,
+            optionalString(agent.sessionId) ?? `${params.sessionId}:subagent:${logicalAgentId}`,
           workdir: optionalString(agent.workdir),
           worktreeRoot: optionalString(agent.worktreeRoot),
           branchName: optionalString(agent.branchName),
@@ -331,11 +321,7 @@ type RunAgentConversationTurnParams = {
     store: LiveTranscriptStore,
     shouldAutoScroll?: boolean,
   ) => void;
-  updateToolStatus: (
-    status: string | null,
-    store: LiveTranscriptStore,
-    visible: boolean,
-  ) => void;
+  updateToolStatus: (status: string | null, store: LiveTranscriptStore, visible: boolean) => void;
   updateGatewayBridgeToolStatus: (
     status: string | null,
     visible: boolean,
@@ -406,9 +392,7 @@ export async function runAgentConversationTurn(params: RunAgentConversationTurnP
   } = params;
 
   if (!effectiveWorkdir) {
-    throw new Error(
-      "Tool mode requires a working directory configured in Settings -> System.",
-    );
+    throw new Error("Tool mode requires a working directory configured in Settings -> System.");
   }
 
   // Clear the per-conversation slug tracker before a fresh user turn so the
@@ -423,25 +407,23 @@ export async function runAgentConversationTurn(params: RunAgentConversationTurnP
     model,
   });
   const loadStoredRunsStartedAt = perfNowMs();
-  const [
-    storedSubagentRuns,
-    storedSubagentIdentities,
-    storedSubagentMessages,
-  ] = await Promise.all([
+  const [storedSubagentRuns, storedSubagentIdentities, storedSubagentMessages] = await Promise.all([
     loadStoredSubagentRuns(conversationId),
     loadStoredSubagentIdentities(conversationId),
     loadStoredSubagentMessages(conversationId),
   ]);
-  finishAgentPerfSpan(conversationDebugLogger, "subagent_runs.load_stored", loadStoredRunsStartedAt, {
-    conversationId,
-    count: storedSubagentRuns.length,
-    identityCount: storedSubagentIdentities.length,
-    messageCount: storedSubagentMessages.length,
-  });
-  const conversationSubagentRuns = [
-    ...transcriptSubagentRuns,
-    ...storedSubagentRuns,
-  ];
+  finishAgentPerfSpan(
+    conversationDebugLogger,
+    "subagent_runs.load_stored",
+    loadStoredRunsStartedAt,
+    {
+      conversationId,
+      count: storedSubagentRuns.length,
+      identityCount: storedSubagentIdentities.length,
+      messageCount: storedSubagentMessages.length,
+    },
+  );
+  const conversationSubagentRuns = [...transcriptSubagentRuns, ...storedSubagentRuns];
   const subagentReminder = buildExistingSubagentsReminder(
     storedSubagentIdentities,
     conversationSubagentRuns,
@@ -530,9 +512,14 @@ export async function runAgentConversationTurn(params: RunAgentConversationTurnP
     tools: combinedTools,
     includeUploadedFilesMetadata: true,
   });
-  finishAgentPerfSpan(conversationDebugLogger, "conversation.pre_compaction", preCompactionStartedAt, {
-    toolCount: combinedTools.length,
-  });
+  finishAgentPerfSpan(
+    conversationDebugLogger,
+    "conversation.pre_compaction",
+    preCompactionStartedAt,
+    {
+      toolCount: combinedTools.length,
+    },
+  );
 
   const combinedExecutor: (
     toolCall: ToolCall,
@@ -607,7 +594,7 @@ export async function runAgentConversationTurn(params: RunAgentConversationTurnP
                 runningToolCallIds: [],
                 thinkingOpen: false,
               },
-        ];
+            ];
         return updateLiveRound(withRound, round, (target) =>
           upsertHostedSearchToRound(collapseThinking(target), hostedSearch),
         );
@@ -681,11 +668,7 @@ export async function runAgentConversationTurn(params: RunAgentConversationTurnP
           );
 
           protectionCheckChars += delta.length;
-          if (
-            midStreamCompactionRequested ||
-            sawToolCallInRound ||
-            protectionCheckChars < 160
-          ) {
+          if (midStreamCompactionRequested || sawToolCallInRound || protectionCheckChars < 160) {
             return;
           }
 
@@ -786,10 +769,7 @@ export async function runAgentConversationTurn(params: RunAgentConversationTurnP
           batchLiveRoundsUpdate(
             (prev) =>
               updateLiveRound(prev, round, (target) => {
-                const withToolCall = upsertToolCallToRound(
-                  collapseThinking(target),
-                  toolCall,
-                );
+                const withToolCall = upsertToolCallToRound(collapseThinking(target), toolCall);
                 const runningIds = withToolCall.runningToolCallIds || [];
                 const nextRunning = runningIds.includes(toolCall.id)
                   ? runningIds
@@ -824,11 +804,7 @@ export async function runAgentConversationTurn(params: RunAgentConversationTurnP
             (prev) =>
               updateLiveRound(prev, round, (target) => {
                 const tr: ToolResultMessage = toolResult as ToolResultMessage;
-                const nextTarget = attachToolResultToRound(
-                  collapseThinking(target),
-                  toolCall,
-                  tr,
-                );
+                const nextTarget = attachToolResultToRound(collapseThinking(target), toolCall, tr);
 
                 return {
                   ...nextTarget,
@@ -912,10 +888,15 @@ export async function runAgentConversationTurn(params: RunAgentConversationTurnP
         signal: getRequestController().signal,
         debugLogger: conversationDebugLogger,
       });
-      finishAgentPerfSpan(conversationDebugLogger, "assistant.run_with_tools", assistantRunStartedAt, {
-        emittedMessageCount: result.emittedMessages.length,
-        messageCount: result.messages.length,
-      });
+      finishAgentPerfSpan(
+        conversationDebugLogger,
+        "assistant.run_with_tools",
+        assistantRunStartedAt,
+        {
+          emittedMessageCount: result.emittedMessages.length,
+          messageCount: result.messages.length,
+        },
+      );
     } catch (error) {
       if (!midStreamCompactionRequested) {
         throw error;
@@ -964,7 +945,6 @@ export async function runAgentConversationTurn(params: RunAgentConversationTurnP
       }
 
       pendingAgentContext = compactedContext;
-      continue;
     }
   }
 
@@ -992,8 +972,7 @@ export async function runAgentConversationTurn(params: RunAgentConversationTurnP
   }
   noteCompactionRound(conversationThrottleState);
   const shouldRunMemoryExtraction =
-    assistantStopReason !== "error" &&
-    assistantStopReason !== "aborted";
+    assistantStopReason !== "error" && assistantStopReason !== "aborted";
   const memoryRoundOffset = Math.max(
     activeAgentRound || pendingTerminalAssistantMetaRef.current?.round || 1,
     1,
@@ -1011,9 +990,7 @@ export async function runAgentConversationTurn(params: RunAgentConversationTurnP
     return runSilentMemoryExtractionWithFallback({
       primary: memoryExtractionModel ?? currentMemoryExtractionModel,
       fallback: memoryExtractionModel ? currentMemoryExtractionModel : undefined,
-      onPrimaryFailure: memoryExtractionModel
-        ? onMemoryExtractionModelFailure
-        : undefined,
+      onPrimaryFailure: memoryExtractionModel ? onMemoryExtractionModelFailure : undefined,
       sessionId,
       conversationId,
       workdir: conversationCwd ?? effectiveWorkdir,
@@ -1103,10 +1080,7 @@ export async function runAgentConversationTurn(params: RunAgentConversationTurnP
         batchLiveRoundsUpdate(
           (prev) =>
             updateLiveRound(prev, round, (target) => {
-              const withToolCall = upsertToolCallToRound(
-                collapseThinking(target),
-                toolCall,
-              );
+              const withToolCall = upsertToolCallToRound(collapseThinking(target), toolCall);
               const runningIds = withToolCall.runningToolCallIds || [];
               return {
                 ...withToolCall,
diff --git a/crates/agent-gui/src/pages/chat/runTextConversationTurn.ts b/crates/agent-gui/src/pages/chat/runTextConversationTurn.ts
index b155cbee3..0002719b0 100644
--- a/crates/agent-gui/src/pages/chat/runTextConversationTurn.ts
+++ b/crates/agent-gui/src/pages/chat/runTextConversationTurn.ts
@@ -1,34 +1,35 @@
 import type { AssistantMessage, Context } from "@mariozechner/pi-ai";
-
-import { streamAssistantMessage, assistantMessageToText } from "../../lib/providers/llm";
-import {
-  appendMessagesToConversation,
-  type ConversationViewState,
-} from "../../lib/chat/conversation/conversationState";
 import {
-  noteCompactionRound,
-  shouldProtectionCompactConversation,
   type CompactionThrottleState,
+  noteCompactionRound,
   type ProviderRuntimeConfig,
+  shouldProtectionCompactConversation,
 } from "../../lib/chat/compaction/contextCompaction";
-import type { StreamDebugLogger } from "../../lib/debug/agentDebug";
-import type { ProviderId } from "../../lib/settings";
-import type { GatewayBridgeEventController } from "../../lib/chat/conversation/run";
-import type { ConversationHookLifecycle } from "../../lib/chat/conversation/run";
-import type { LiveTranscriptStore } from "../../lib/chat/conversation/liveTranscriptStore";
-import { isAbortLikeError } from "../../lib/chat/page/chatPageHelpers";
 import {
-  createDeferredProviderNativeWebSearchStatus,
-  resolveProviderNativeWebSearchStatus,
-} from "../../lib/chat/search/providerNativeSearchStatus";
+  appendMessagesToConversation,
+  type ConversationViewState,
+} from "../../lib/chat/conversation/conversationState";
+import type { LiveTranscriptStore } from "../../lib/chat/conversation/liveTranscriptStore";
+import type {
+  ConversationHookLifecycle,
+  GatewayBridgeEventController,
+} from "../../lib/chat/conversation/run";
+import type { HostedSearchBlock } from "../../lib/chat/messages/hostedSearch";
 import {
   appendTextDeltaToRound,
   collapseThinking,
+  type LiveRound,
   updateLiveRound,
   upsertHostedSearchToRound,
-  type LiveRound,
 } from "../../lib/chat/messages/uiMessages";
-import type { HostedSearchBlock } from "../../lib/chat/messages/hostedSearch";
+import { isAbortLikeError } from "../../lib/chat/page/chatPageHelpers";
+import {
+  createDeferredProviderNativeWebSearchStatus,
+  resolveProviderNativeWebSearchStatus,
+} from "../../lib/chat/search/providerNativeSearchStatus";
+import type { StreamDebugLogger } from "../../lib/debug/agentDebug";
+import { assistantMessageToText, streamAssistantMessage } from "../../lib/providers/llm";
+import type { ProviderId } from "../../lib/settings";
 import { buildPartialAssistantMessage, type ConversationRuntimeEntry } from "./chatPageRuntime";
 import { buildProtectionCompactionStatus } from "./compactionStatusText";
 import {
@@ -236,11 +237,7 @@ export async function runTextConversationTurn(params: RunTextConversationTurnPar
     );
   }
 
-  function updateHostedSearch(
-    hostedSearch: HostedSearchBlock,
-    round: number,
-    existingText = "",
-  ) {
+  function updateHostedSearch(hostedSearch: HostedSearchBlock, round: number, existingText = "") {
     const shouldSeedExistingText = !textModeUsesLiveRounds && existingText.length > 0;
     ensureTextLiveRound(round);
     gatewayBridgeEvents.queueEvent({
@@ -280,8 +277,7 @@ export async function runTextConversationTurn(params: RunTextConversationTurnPar
   });
   hookLifecycle.startAgent();
 
-  textResponseLoop:
-  while (!finalAssistant) {
+  textResponseLoop: while (!finalAssistant) {
     contextWithSkills =
       pendingTextContext ??
       buildPreparedContext(getNextConversationState(), undefined, {
@@ -308,8 +304,7 @@ export async function runTextConversationTurn(params: RunTextConversationTurnPar
     while (!finalAssistant) {
       const nativeWebSearchStatusController = createDeferredProviderNativeWebSearchStatus({
         status: nativeWebSearchStatus,
-        onStatus: (status) =>
-          updateGatewayBridgeToolStatus(status, isConversationVisible()),
+        onStatus: (status) => updateGatewayBridgeToolStatus(status, isConversationVisible()),
       });
       try {
         finalAssistant = await streamAssistantMessage({
@@ -469,8 +464,7 @@ export async function runTextConversationTurn(params: RunTextConversationTurnPar
   const finalState = appendMessagesToConversation(getNextConversationState(), [finalAssistant]);
   noteCompactionRound(conversationThrottleState);
   const shouldRunMemoryExtraction =
-    finalAssistant.stopReason !== "error" &&
-    finalAssistant.stopReason !== "aborted";
+    finalAssistant.stopReason !== "error" && finalAssistant.stopReason !== "aborted";
   commitAssistantRoundMeta(finalAssistant, textRound);
   resetLiveTranscript(transcriptStore);
   updateConversationRuntimeEntry(conversationId, (prev) => ({
@@ -505,9 +499,7 @@ export async function runTextConversationTurn(params: RunTextConversationTurnPar
     void runSilentMemoryExtractionWithFallback({
       primary: memoryExtractionModel ?? currentMemoryExtractionModel,
       fallback: memoryExtractionModel ? currentMemoryExtractionModel : undefined,
-      onPrimaryFailure: memoryExtractionModel
-        ? onMemoryExtractionModelFailure
-        : undefined,
+      onPrimaryFailure: memoryExtractionModel ? onMemoryExtractionModelFailure : undefined,
       sessionId,
       conversationId,
       workdir: conversationCwd,
diff --git a/crates/agent-gui/src/pages/chat/silentMemoryExtraction.ts b/crates/agent-gui/src/pages/chat/silentMemoryExtraction.ts
index c0fd163c4..d79003224 100644
--- a/crates/agent-gui/src/pages/chat/silentMemoryExtraction.ts
+++ b/crates/agent-gui/src/pages/chat/silentMemoryExtraction.ts
@@ -6,9 +6,6 @@ import type {
   ToolResultMessage,
   UserMessage,
 } from "@mariozechner/pi-ai";
-
-import { runAssistantWithTools } from "../../lib/chat/runner/agentRunner";
-import { isAbortLikeError } from "../../lib/chat/page/chatPageHelpers";
 import {
   recordSilentMemoryDecision,
   recordSilentMemorySkip,
@@ -21,10 +18,10 @@ import {
   buildRecentRejectionsBlock,
   buildSilentMemoryExtractionPrompt,
   DEFAULT_MEMORY_REVIEWER_MODE,
+  type MemoryReviewerMode,
   SILENT_MEMORY_DONE_TEXT,
   SILENT_MEMORY_NOOP_TEXT,
   SILENT_MEMORY_SYSTEM_PROMPT,
-  type MemoryReviewerMode,
   type SilentMemoryCandidateEntry,
   type SilentMemoryRejectionEntry,
 } from "../../lib/chat/memory/memoryPolicy";
@@ -33,12 +30,14 @@ import {
   type SilentMemoryBlockPlanItem,
   type SilentMemoryParseResult,
 } from "../../lib/chat/memory/memoryProtocol";
+import { isAbortLikeError } from "../../lib/chat/page/chatPageHelpers";
+import { runAssistantWithTools } from "../../lib/chat/runner/agentRunner";
 import type { StreamDebugLogger } from "../../lib/debug/agentDebug";
 import {
+  type MemoryMeta,
   memoryList,
   memoryRecentRejections,
   memoryTodayLocalDate,
-  type MemoryMeta,
 } from "../../lib/memory/api";
 import type {
   CodexRequestFormat,
@@ -81,9 +80,7 @@ function toCandidateEntry(entry: MemoryMeta): SilentMemoryCandidateEntry {
   };
 }
 
-function collectCandidateEntries(
-  entries: readonly MemoryMeta[],
-): SilentMemoryCandidateEntry[] {
+function collectCandidateEntries(entries: readonly MemoryMeta[]): SilentMemoryCandidateEntry[] {
   const seen = new Set<string>();
   const all: SilentMemoryCandidateEntry[] = [];
   for (const entry of entries) {
@@ -104,11 +101,7 @@ export type SilentMemoryExtractionVisibleEvents = {
   onThinkingDelta?: (delta: string, round: number) => void;
   onToolCall?: (toolCall: ToolCall, round: number) => void;
   onToolExecutionStart?: (toolCall: ToolCall, round: number) => void;
-  onToolResult?: (
-    toolCall: ToolCall,
-    toolResult: ToolResultMessage,
-    round: number,
-  ) => void;
+  onToolResult?: (toolCall: ToolCall, toolResult: ToolResultMessage, round: number) => void;
   onAssistantMessage?: (assistant: AssistantMessage, round: number) => void;
   onToolStatus?: (status: string | null) => void;
 };
@@ -141,8 +134,8 @@ export type SilentMemoryExtractionBaseParams = {
   visibleEvents?: SilentMemoryExtractionVisibleEvents;
 };
 
-export type SilentMemoryExtractionParams =
-  SilentMemoryExtractionModelConfig & SilentMemoryExtractionBaseParams;
+export type SilentMemoryExtractionParams = SilentMemoryExtractionModelConfig &
+  SilentMemoryExtractionBaseParams;
 
 export type SilentMemoryExtractionResult = {
   ok: boolean;
@@ -196,8 +189,7 @@ function pruneSilentMemoryConversationState() {
   if (conversationIds.size <= SILENT_MEMORY_CONVERSATION_STATE_LIMIT) return;
 
   const sortedIds = Array.from(conversationIds).sort(
-    (a, b) =>
-      (silentMemoryLastRunAt.get(a) ?? 0) - (silentMemoryLastRunAt.get(b) ?? 0),
+    (a, b) => (silentMemoryLastRunAt.get(a) ?? 0) - (silentMemoryLastRunAt.get(b) ?? 0),
   );
   for (const conversationId of sortedIds.slice(
     0,
@@ -273,9 +265,7 @@ function extractLatestUserText(messages: readonly Message[]): string {
     if (typeof message.content === "string") return message.content;
     if (Array.isArray(message.content)) {
       const text = message.content
-        .map((part) =>
-          part && typeof part === "object" && part.type === "text" ? part.text : "",
-        )
+        .map((part) => (part && typeof part === "object" && part.type === "text" ? part.text : ""))
         .filter((segment): segment is string => typeof segment === "string")
         .join("\n");
       if (text.trim().length > 0) return text;
@@ -310,9 +300,7 @@ async function loadSilentMemoryCandidates(workdir: string) {
   }
 }
 
-async function loadSilentMemoryRejections(
-  workdir: string,
-): Promise<SilentMemoryRejectionEntry[]> {
+async function loadSilentMemoryRejections(workdir: string): Promise<SilentMemoryRejectionEntry[]> {
   try {
     const response = await memoryRecentRejections({
       sinceDays: 7,
@@ -696,10 +684,7 @@ export async function runSilentMemoryExtraction(
     systemPrompt: appendSystemPrompt(baseContext.systemPrompt, SILENT_MEMORY_SYSTEM_PROMPT),
     messages: [...baseContext.messages, hiddenPrompt],
   };
-  const timeoutSignal = createTimeoutSignal(
-    params.signal,
-    SILENT_MEMORY_EXTRACTION_TIMEOUT_MS,
-  );
+  const timeoutSignal = createTimeoutSignal(params.signal, SILENT_MEMORY_EXTRACTION_TIMEOUT_MS);
   const visibleEvents = params.visibleEvents;
   const mapRound = (round: number) => (visibleEvents?.roundOffset ?? 0) + round;
   const forwardedTurnRounds = new Set<number>();
@@ -724,8 +709,7 @@ export async function runSilentMemoryExtraction(
       // stream it to chat; after parsing, emit only block-4's concise status.
       onTextDelta: () => {},
       onThinkingDelta: () => {},
-      onToolCall: (toolCall, round) =>
-        visibleEvents?.onToolCall?.(toolCall, mapRound(round)),
+      onToolCall: (toolCall, round) => visibleEvents?.onToolCall?.(toolCall, mapRound(round)),
       onToolExecutionStart: (toolCall, round) =>
         visibleEvents?.onToolExecutionStart?.(toolCall, mapRound(round)),
       onToolResult: (toolCall, toolResult, round) => {
@@ -764,27 +748,19 @@ export async function runSilentMemoryExtraction(
       finalAssistantIndex >= 0
         ? (result.emittedMessages[finalAssistantIndex] as AssistantMessage)
         : undefined;
-    const finalAssistantText = extractFinalAssistantTextForProtocol(
-      result.emittedMessages,
-    );
+    const finalAssistantText = extractFinalAssistantTextForProtocol(result.emittedMessages);
     if (finalAssistantText) {
       const parseResult = parseSilentMemoryProtocol(finalAssistantText);
       recordSilentMemoryDecision(params.conversationId, parseResult);
       if (parseResult.parseFailed) {
-        console.warn(
-          "Silent memory four-block protocol parse failed:",
-          parseResult.reason,
-        );
+        console.warn("Silent memory four-block protocol parse failed:", parseResult.reason);
       }
       const statusAssistant = createSilentMemoryStatusAssistant({
         template: finalAssistant,
         model: params.model,
         text: statusTextForParseResult(parseResult, finalAssistantText),
       });
-      emittedMessages = replaceFinalAssistantWithStatus(
-        result.emittedMessages,
-        statusAssistant,
-      );
+      emittedMessages = replaceFinalAssistantWithStatus(result.emittedMessages, statusAssistant);
       emitSilentMemoryStatus({
         visibleEvents,
         statusAssistant,
@@ -826,8 +802,7 @@ export async function runSilentMemoryExtraction(
       ok: false,
       emittedMessages: [] as Message[],
       aborted:
-        params.signal?.aborted === true ||
-        (!timeoutSignal.timedOut() && isAbortLikeError(error)),
+        params.signal?.aborted === true || (!timeoutSignal.timedOut() && isAbortLikeError(error)),
     };
   } finally {
     timeoutSignal.cleanup();
diff --git a/crates/agent-gui/src/pages/chat/useChatHistoryList.ts b/crates/agent-gui/src/pages/chat/useChatHistoryList.ts
index 6fcbd5c0e..ce9bef563 100644
--- a/crates/agent-gui/src/pages/chat/useChatHistoryList.ts
+++ b/crates/agent-gui/src/pages/chat/useChatHistoryList.ts
@@ -1,21 +1,21 @@
+import { listen } from "@tauri-apps/api/event";
 import {
+  type Dispatch,
+  type SetStateAction,
   useCallback,
   useEffect,
   useRef,
   useState,
-  type Dispatch,
-  type SetStateAction,
 } from "react";
-import { listen } from "@tauri-apps/api/event";
 
 import type { ChatHistorySummary } from "../../lib/chat/history/chatHistory";
 import { listChatHistory } from "../../lib/chat/history/chatHistory";
-import { sortHistoryItems } from "../../lib/chat/page/chatPageHelpers";
 import {
   applyChatHistorySyncEvent,
   CHAT_HISTORY_SYNC_EVENT,
   type ChatHistorySyncEvent,
 } from "../../lib/chat/history/chatHistorySync";
+import { sortHistoryItems } from "../../lib/chat/page/chatPageHelpers";
 
 const HISTORY_LIST_RECONCILE_INTERVAL_MS = 60_000;
 const HISTORY_LIST_PAGE_SIZE = 80;
@@ -35,10 +35,7 @@ function persistedHistoryCount(items: ChatHistorySummary[]) {
   return items.reduce((count, item) => count + (item.isPending ? 0 : 1), 0);
 }
 
-function mergeHistoryPage(
-  current: ChatHistorySummary[],
-  nextPage: ChatHistorySummary[],
-) {
+function mergeHistoryPage(current: ChatHistorySummary[], nextPage: ChatHistorySummary[]) {
   const byId = new Map(current.map((item) => [item.id, item]));
   for (const item of nextPage) {
     byId.set(item.id, item);
@@ -63,12 +60,7 @@ export function useChatHistoryList() {
   const queuedRefreshRef = useRef<{ silent: boolean } | null>(null);
 
   const commitHistoryItems = useCallback(
-    (
-      items: ChatHistorySummary[],
-      total: number,
-      nextPage: number,
-      hasMore?: boolean,
-    ) => {
+    (items: ChatHistorySummary[], total: number, nextPage: number, hasMore?: boolean) => {
       const nextTotal = Math.max(0, total);
       const loadedPersistedCount = persistedHistoryCount(items);
       const nextHasMore = hasMore ?? loadedPersistedCount < nextTotal;
@@ -211,17 +203,14 @@ export function useChatHistoryList() {
   useEffect(() => {
     disposedRef.current = false;
     let cancelled = false;
-    const unlistenPromise = listen<ChatHistorySyncEvent>(
-      CHAT_HISTORY_SYNC_EVENT,
-      (event) => {
-        if (disposedRef.current) {
-          return;
-        }
+    const unlistenPromise = listen<ChatHistorySyncEvent>(CHAT_HISTORY_SYNC_EVENT, (event) => {
+      if (disposedRef.current) {
+        return;
+      }
 
-        setHistoryItems((current) => applyChatHistorySyncEvent(current, event.payload));
-        setHistoryError(null);
-      },
-    );
+      setHistoryItems((current) => applyChatHistorySyncEvent(current, event.payload));
+      setHistoryError(null);
+    });
 
     async function runRefresh(options?: { silent?: boolean }) {
       try {
diff --git a/crates/agent-gui/src/pages/chat/useChatPageRuntimeStore.ts b/crates/agent-gui/src/pages/chat/useChatPageRuntimeStore.ts
index f4244183e..d3cf4162c 100644
--- a/crates/agent-gui/src/pages/chat/useChatPageRuntimeStore.ts
+++ b/crates/agent-gui/src/pages/chat/useChatPageRuntimeStore.ts
@@ -1,20 +1,13 @@
+import { type Dispatch, type SetStateAction, useCallback, useEffect, useRef } from "react";
+import type { CompactionStatus } from "../../lib/chat/compaction/contextCompaction";
 import {
-  useCallback,
-  useEffect,
-  useRef,
-  type Dispatch,
-  type SetStateAction,
-} from "react";
-
-import {
-  createConversationStateFromContext,
   type ConversationViewState,
+  createConversationStateFromContext,
 } from "../../lib/chat/conversation/conversationState";
-import type { CompactionStatus } from "../../lib/chat/compaction/contextCompaction";
 import {
+  type ConversationRuntimeEntry,
   createConversationRuntimeEntry,
   setConversationRuntimeCacheEntry,
-  type ConversationRuntimeEntry,
 } from "./chatPageRuntime";
 
 type ConversationIdentity = {
diff --git a/crates/agent-gui/src/pages/chat/useChatSkills.ts b/crates/agent-gui/src/pages/chat/useChatSkills.ts
index c3bb9a3fd..b23cf829d 100644
--- a/crates/agent-gui/src/pages/chat/useChatSkills.ts
+++ b/crates/agent-gui/src/pages/chat/useChatSkills.ts
@@ -1,13 +1,12 @@
 import { useCallback, useEffect, useRef, useState } from "react";
-
+import { type AppSettings, updateSkills } from "../../lib/settings";
 import {
   discoverSkills,
   isAlwaysEnabledSkillName,
   mergeAlwaysEnabledSkillNames,
-  subscribeSkillsDiscoveryUpdated,
   type SkillSummary,
+  subscribeSkillsDiscoveryUpdated,
 } from "../../lib/skills";
-import { updateSkills, type AppSettings } from "../../lib/settings";
 
 type UseChatSkillsParams = {
   skillsEnabled: boolean;
@@ -64,48 +63,51 @@ export function useChatSkills(params: UseChatSkillsParams) {
     setSkillsLoading(false);
   }, []);
 
-  const runDiscovery = useCallback(async (options?: { force?: boolean }) => {
-    if (!skillsEnabled) {
-      requestSequenceRef.current += 1;
-      applyDisabledState();
-      return null;
-    }
-
-    const requestId = requestSequenceRef.current + 1;
-    requestSequenceRef.current = requestId;
-    if (mountedRef.current) {
-      setSkillsLoading(true);
-      setSkillsLoadError(null);
-    }
-
-    try {
-      const discovery = await discoverSkills({ force: options?.force });
-      if (!mountedRef.current || requestSequenceRef.current !== requestId) {
+  const runDiscovery = useCallback(
+    async (options?: { force?: boolean }) => {
+      if (!skillsEnabled) {
+        requestSequenceRef.current += 1;
+        applyDisabledState();
         return null;
       }
-      setSkillsRootDir(discovery.rootDir);
-      setAvailableSkills(discovery.skills);
-      reconcileSelectedSkills({
-        skills: discovery.skills,
-        selectedSkillNames: selectedSkillNamesRef.current,
-        setSettings,
-      });
-      return discovery;
-    } catch (err) {
-      if (!mountedRef.current || requestSequenceRef.current !== requestId) {
-        return null;
+
+      const requestId = requestSequenceRef.current + 1;
+      requestSequenceRef.current = requestId;
+      if (mountedRef.current) {
+        setSkillsLoading(true);
+        setSkillsLoadError(null);
       }
-      const msg = err instanceof Error ? err.message : String(err);
-      setSkillsRootDir("");
-      setAvailableSkills([]);
-      setSkillsLoadError(msg || "加载 skills 失败");
-      return null;
-    } finally {
-      if (mountedRef.current && requestSequenceRef.current === requestId) {
-        setSkillsLoading(false);
+
+      try {
+        const discovery = await discoverSkills({ force: options?.force });
+        if (!mountedRef.current || requestSequenceRef.current !== requestId) {
+          return null;
+        }
+        setSkillsRootDir(discovery.rootDir);
+        setAvailableSkills(discovery.skills);
+        reconcileSelectedSkills({
+          skills: discovery.skills,
+          selectedSkillNames: selectedSkillNamesRef.current,
+          setSettings,
+        });
+        return discovery;
+      } catch (err) {
+        if (!mountedRef.current || requestSequenceRef.current !== requestId) {
+          return null;
+        }
+        const msg = err instanceof Error ? err.message : String(err);
+        setSkillsRootDir("");
+        setAvailableSkills([]);
+        setSkillsLoadError(msg || "加载 skills 失败");
+        return null;
+      } finally {
+        if (mountedRef.current && requestSequenceRef.current === requestId) {
+          setSkillsLoading(false);
+        }
       }
-    }
-  }, [applyDisabledState, setSettings, skillsEnabled]);
+    },
+    [applyDisabledState, setSettings, skillsEnabled],
+  );
 
   const refreshSkills = useCallback(async () => {
     return runDiscovery({ force: true });
diff --git a/crates/agent-gui/src/pages/chat/useConversationHistoryActions.ts b/crates/agent-gui/src/pages/chat/useConversationHistoryActions.ts
index 8c5844149..5e2052e65 100644
--- a/crates/agent-gui/src/pages/chat/useConversationHistoryActions.ts
+++ b/crates/agent-gui/src/pages/chat/useConversationHistoryActions.ts
@@ -1,31 +1,30 @@
 import type { Dispatch, MutableRefObject, SetStateAction } from "react";
-
 import {
+  type ConversationViewState,
+  createConversationStateFromContext,
+  normalizeConversationState,
+} from "../../lib/chat/conversation/conversationState";
+import {
+  type ChatHistorySummary,
+  deleteChatHistory,
   getChatHistory,
   getChatHistoryActiveSegment,
   persistConversationState,
   renameChatHistory,
   setChatHistoryPinned,
-  deleteChatHistory,
-  type ChatHistorySummary,
 } from "../../lib/chat/history/chatHistory";
 import {
-  createConversationStateFromContext,
-  normalizeConversationState,
-  type ConversationViewState,
-} from "../../lib/chat/conversation/conversationState";
-import {
+  createConversationIdentity,
   mergeHistoryItem,
   normalizeConversationTitle,
-  waitForTitleLookahead,
-  createConversationIdentity,
   PENDING_CONVERSATION_TITLE,
+  waitForTitleLookahead,
 } from "../../lib/chat/page/chatPageHelpers";
 import {
+  type ConversationRuntimeEntry,
   createConversationRuntimeEntry,
   pruneIdleConversationRuntimeCaches,
   setConversationRuntimeCacheEntry,
-  type ConversationRuntimeEntry,
 } from "./chatPageRuntime";
 
 type TitleJobRefValue = {
@@ -47,10 +46,7 @@ type PersistConversationParams = {
 };
 
 type IdleSchedulerWindow = Window & {
-  requestIdleCallback?: (
-    callback: IdleRequestCallback,
-    options?: IdleRequestOptions,
-  ) => number;
+  requestIdleCallback?: (callback: IdleRequestCallback, options?: IdleRequestOptions) => number;
   cancelIdleCallback?: (handle: number) => void;
 };
 
@@ -70,10 +66,7 @@ type UseConversationHistoryActionsParams = {
   renamingId: string | null;
   renameDraft: string;
   buildRuntimeEntryFromVisibleState: () => ConversationRuntimeEntry;
-  syncVisibleConversationRuntime: (
-    conversationId: string,
-    entry: ConversationRuntimeEntry,
-  ) => void;
+  syncVisibleConversationRuntime: (conversationId: string, entry: ConversationRuntimeEntry) => void;
   updateConversationRuntimeEntry: (
     conversationId: string,
     updater: (prev: ConversationRuntimeEntry) => ConversationRuntimeEntry,
@@ -426,8 +419,7 @@ export function useConversationHistoryActions(params: UseConversationHistoryActi
 
     const currentItem = historyItemsRef.current.find((item) => item.id === conversationId);
     let titleToStore =
-      currentItem &&
-      (!currentItem.isPending || currentItem.title !== PENDING_CONVERSATION_TITLE)
+      currentItem && (!currentItem.isPending || currentItem.title !== PENDING_CONVERSATION_TITLE)
         ? currentItem.title
         : fallbackTitle;
     if (titlePromise && titleLookahead) {
diff --git a/crates/agent-gui/src/pages/chat/useEditResend.ts b/crates/agent-gui/src/pages/chat/useEditResend.ts
index 0a271e246..2de524f78 100644
--- a/crates/agent-gui/src/pages/chat/useEditResend.ts
+++ b/crates/agent-gui/src/pages/chat/useEditResend.ts
@@ -1,16 +1,15 @@
-import { useCallback, useEffect, useRef, type MutableRefObject } from "react";
-
+import { type MutableRefObject, useCallback, useEffect, useRef } from "react";
+import type { MentionComposerHandle } from "../../components/chat/MentionComposer";
 import {
-  truncateConversationFromMessage,
   type ConversationViewState,
   type HistoryMessageRef,
+  truncateConversationFromMessage,
 } from "../../lib/chat/conversation/conversationState";
+import type { PendingUploadedFile } from "../../lib/chat/messages/uploadedFiles";
 import {
   collectRetainedSubagentParentToolCallIds,
   pruneSubagentRunsForConversation,
 } from "../../lib/chat/subagent/subagentHistory";
-import type { PendingUploadedFile } from "../../lib/chat/messages/uploadedFiles";
-import type { MentionComposerHandle } from "../../components/chat/MentionComposer";
 import type { ConversationRuntimeEntry } from "./chatPageRuntime";
 import type { SendChatAction } from "./gatewayBridgeTypes";
 
@@ -55,16 +54,8 @@ export function useEditResend(params: UseEditResendParams) {
   const pendingEditResendRef = useRef<PendingEditResend | null>(null);
 
   const handleResendFromEdit = useCallback(
-    (
-      messageRef: HistoryMessageRef,
-      text: string,
-      uploadedFiles: PendingUploadedFile[],
-    ) => {
-      if (
-        isSending ||
-        isConversationHydrating ||
-        isConversationHydrationFailed
-      ) {
+    (messageRef: HistoryMessageRef, text: string, uploadedFiles: PendingUploadedFile[]) => {
+      if (isSending || isConversationHydrating || isConversationHydrationFailed) {
         return;
       }
       const normalized = text.trim();
diff --git a/crates/agent-gui/src/pages/chat/useGatewayBridgeBatcher.ts b/crates/agent-gui/src/pages/chat/useGatewayBridgeBatcher.ts
index a0229bcd2..03fb23797 100644
--- a/crates/agent-gui/src/pages/chat/useGatewayBridgeBatcher.ts
+++ b/crates/agent-gui/src/pages/chat/useGatewayBridgeBatcher.ts
@@ -1,5 +1,5 @@
-import { useCallback, useEffect, useRef } from "react";
 import { invoke } from "@tauri-apps/api/core";
+import { useCallback, useEffect, useRef } from "react";
 
 type BatchableGatewayBridgeEvent = {
   type: "token" | "thinking";
diff --git a/crates/agent-gui/src/pages/chat/useGatewayBridgeListeners.ts b/crates/agent-gui/src/pages/chat/useGatewayBridgeListeners.ts
index 01481ce7c..4f1235459 100644
--- a/crates/agent-gui/src/pages/chat/useGatewayBridgeListeners.ts
+++ b/crates/agent-gui/src/pages/chat/useGatewayBridgeListeners.ts
@@ -1,18 +1,15 @@
-import { useEffect } from "react";
 import { listen } from "@tauri-apps/api/event";
+import { useEffect } from "react";
 
 import {
-  truncateConversationFromMessage,
   type ConversationViewState,
+  truncateConversationFromMessage,
 } from "../../lib/chat/conversation/conversationState";
+import { normalizeChatRuntimeControls, normalizeSystemToolSelection } from "../../lib/settings";
 import {
-  normalizeChatRuntimeControls,
-  normalizeSystemToolSelection,
-} from "../../lib/settings";
-import {
+  type ConversationRuntimeEntry,
   createConversationRuntimeEntry,
   setConversationRuntimeCacheEntry,
-  type ConversationRuntimeEntry,
 } from "./chatPageRuntime";
 import {
   type ActiveGatewayBridgeRequest,
@@ -25,16 +22,10 @@ import {
 } from "./gatewayBridgeTypes";
 
 type UseGatewayBridgeListenersParams = GatewayBridgeRuntimeRefs & {
-  queueGatewayBridgeEventForRequest: (
-    requestId: string,
-    event: Record<string, unknown>,
-  ) => void;
+  queueGatewayBridgeEventForRequest: (requestId: string, event: Record<string, unknown>) => void;
   isConversationRunning: (conversationId: string) => boolean;
   getConversationAbortController: (conversationId: string) => AbortController | null;
-  syncVisibleConversationRuntime: (
-    conversationId: string,
-    entry: ConversationRuntimeEntry,
-  ) => void;
+  syncVisibleConversationRuntime: (conversationId: string, entry: ConversationRuntimeEntry) => void;
   invalidateSubagentsForConversation?: (conversationId: string) => void;
 };
 
@@ -198,11 +189,13 @@ export function useGatewayBridgeListeners(params: UseGatewayBridgeListenersParam
         claimedRequest = true;
 
         try {
-          resolvedConversationId =
-            await ensureGatewayBridgeConversationReadyRef.current(targetConversationId, {
+          resolvedConversationId = await ensureGatewayBridgeConversationReadyRef.current(
+            targetConversationId,
+            {
               forceHydrate: event.payload.forceHydrate === true,
               historyTruncationKey: event.payload.historyTruncationKey,
-            });
+            },
+          );
 
           const runningRequest =
             getActiveGatewayBridgeRequestByConversationId(resolvedConversationId) ||
@@ -243,8 +236,7 @@ export function useGatewayBridgeListeners(params: UseGatewayBridgeListenersParam
             conversationIdOverride: resolvedConversationId,
             executionModeOverride: gatewayBridgeRequest.executionModeOverride,
             workdirOverride: gatewayBridgeRequest.workdirOverride,
-            selectedSystemToolIdsOverride:
-              gatewayBridgeRequest.selectedSystemToolIdsOverride,
+            selectedSystemToolIdsOverride: gatewayBridgeRequest.selectedSystemToolIdsOverride,
             runtimeControlsOverride: gatewayBridgeRequest.runtimeControlsOverride,
             gatewayBridgeRequestOverride: gatewayBridgeRequest,
           });
@@ -257,11 +249,7 @@ export function useGatewayBridgeListeners(params: UseGatewayBridgeListenersParam
           });
         } finally {
           if (claimedRequest) {
-            releaseGatewayBridgeRequestClaim(
-              requestId,
-              clientRequestId,
-              gatewayBridgeRequest,
-            );
+            releaseGatewayBridgeRequestClaim(requestId, clientRequestId, gatewayBridgeRequest);
           }
         }
       })();
@@ -338,10 +326,7 @@ export function useGatewayBridgeListeners(params: UseGatewayBridgeListenersParam
         nextEntry,
       );
       persistedConversationStateRef.current.set(conversationId, nextState);
-      appliedHistoryTruncationsRef.current.set(
-        conversationId,
-        `${segmentIndex}:${messageIndex}`,
-      );
+      appliedHistoryTruncationsRef.current.set(conversationId, `${segmentIndex}:${messageIndex}`);
 
       if (currentConversationIdRef.current === conversationId) {
         syncVisibleConversationRuntime(conversationId, nextEntry);
diff --git a/crates/agent-gui/src/pages/chat/useLiveTranscriptController.ts b/crates/agent-gui/src/pages/chat/useLiveTranscriptController.ts
index 24bb6e61d..ce9ff9715 100644
--- a/crates/agent-gui/src/pages/chat/useLiveTranscriptController.ts
+++ b/crates/agent-gui/src/pages/chat/useLiveTranscriptController.ts
@@ -1,17 +1,16 @@
 import {
+  type MutableRefObject,
+  type RefObject,
   useCallback,
   useEffect,
   useMemo,
   useRef,
-  type MutableRefObject,
-  type RefObject,
 } from "react";
-
+import { createCompactionThrottleState } from "../../lib/chat/compaction/contextCompaction";
 import {
   cloneLiveRoundSnapshots,
   type LiveRoundSnapshot,
 } from "../../lib/chat/conversation/chatAbort";
-import { createCompactionThrottleState } from "../../lib/chat/compaction/contextCompaction";
 import {
   createLiveTranscriptStore,
   type LiveTranscriptStore,
@@ -185,10 +184,7 @@ export function useLiveTranscriptController(params: UseLiveTranscriptControllerP
     [],
   );
 
-  const hasActiveBottomLock = useCallback(
-    () => Date.now() <= bottomLockUntilRef.current,
-    [],
-  );
+  const hasActiveBottomLock = useCallback(() => Date.now() <= bottomLockUntilRef.current, []);
 
   const attachAutoScroll = useCallback(() => {
     shouldAutoScrollRef.current = true;
@@ -232,12 +228,7 @@ export function useLiveTranscriptController(params: UseLiveTranscriptControllerP
         autoScrollRafIdRef.current = requestAnimationFrame(tick);
       }
     });
-  }, [
-    attachAutoScroll,
-    getAdaptiveStreamInterval,
-    hasActiveBottomLock,
-    scrollAreaRef,
-  ]);
+  }, [attachAutoScroll, getAdaptiveStreamInterval, hasActiveBottomLock, scrollAreaRef]);
 
   const scrollToBottomNow = useCallback(() => {
     const viewport = viewportRef.current ?? resolveScrollViewport(scrollAreaRef.current);
@@ -271,10 +262,7 @@ export function useLiveTranscriptController(params: UseLiveTranscriptControllerP
   }, []);
 
   const flushPendingLiveUpdates = useCallback(
-    (
-      targetStore: LiveTranscriptStore = liveTranscriptStore,
-      shouldAutoScroll = false,
-    ) => {
+    (targetStore: LiveTranscriptStore = liveTranscriptStore, shouldAutoScroll = false) => {
       const artifacts = resolveLiveTranscriptArtifacts(targetStore);
       if (!artifacts) return;
 
@@ -436,11 +424,7 @@ export function useLiveTranscriptController(params: UseLiveTranscriptControllerP
         }
       });
     },
-    [
-      liveTranscriptStore,
-      requestAutoScroll,
-      resolveLiveTranscriptArtifacts,
-    ],
+    [liveTranscriptStore, requestAutoScroll, resolveLiveTranscriptArtifacts],
   );
 
   const batchLiveRoundsUpdate = useCallback(
@@ -463,8 +447,7 @@ export function useLiveTranscriptController(params: UseLiveTranscriptControllerP
       const shouldApplyImmediately =
         artifacts.pendingLRUpdates.length === 0 &&
         artifacts.lrRafId === null &&
-        (snapshot.liveRounds.length === 0 ||
-          (lastRound?.blocks.length ?? 0) === 0);
+        (snapshot.liveRounds.length === 0 || (lastRound?.blocks.length ?? 0) === 0);
       if (shouldApplyImmediately) {
         targetStore.updateLiveRounds(updater);
         if (shouldAutoScroll) {
@@ -496,11 +479,7 @@ export function useLiveTranscriptController(params: UseLiveTranscriptControllerP
         }
       });
     },
-    [
-      liveTranscriptStore,
-      requestAutoScroll,
-      resolveLiveTranscriptArtifacts,
-    ],
+    [liveTranscriptStore, requestAutoScroll, resolveLiveTranscriptArtifacts],
   );
 
   const updateToolStatus = useCallback(
diff --git a/crates/agent-gui/src/pages/chat/usePendingUploads.ts b/crates/agent-gui/src/pages/chat/usePendingUploads.ts
index a1f47452c..9cb596c98 100644
--- a/crates/agent-gui/src/pages/chat/usePendingUploads.ts
+++ b/crates/agent-gui/src/pages/chat/usePendingUploads.ts
@@ -1,18 +1,12 @@
-import {
-  useCallback,
-  useEffect,
-  useRef,
-  useState,
-  type MutableRefObject,
-} from "react";
 import { invoke } from "@tauri-apps/api/core";
+import { type MutableRefObject, useCallback, useEffect, useRef, useState } from "react";
 
 import type { MentionComposerHandle } from "../../components/chat/MentionComposer";
+import type { NotifyItem } from "../../components/chat/NotifyToast";
 import {
   mergePendingUploadedFiles,
   type PendingUploadedFile,
 } from "../../lib/chat/messages/uploadedFiles";
-import type { NotifyItem } from "../../components/chat/NotifyToast";
 
 type SystemPickReadableFilesResponse = {
   files: PendingUploadedFile[];
@@ -68,9 +62,7 @@ export function usePendingUploads(params: UsePendingUploadsParams) {
   const [isUploadingFiles, setIsUploadingFiles] = useState(false);
   const activeUploadTasksRef = useRef(0);
   const uploadContextRef = useRef<{ isAgentMode: boolean; workdir: string } | null>(null);
-  const pendingUploadsByConversationRef = useRef(
-    new Map<string, PendingUploadedFile[]>(),
-  );
+  const pendingUploadsByConversationRef = useRef(new Map<string, PendingUploadedFile[]>());
 
   const beginUploadTask = useCallback(() => {
     activeUploadTasksRef.current += 1;
@@ -92,33 +84,33 @@ export function usePendingUploads(params: UsePendingUploadsParams) {
     setPendingUploadedFiles([]);
   }, [isAgentMode, workdir]);
 
-  const appendImportedFiles = useCallback((
-    result: SystemPickReadableFilesResponse,
-    emptySelectionMessage: string,
-  ) => {
-    if (result.files.length === 0 && result.skipped.length === 0) {
-      return;
-    }
-    if (result.files.length > 0) {
-      setPendingUploadedFiles((prev) => {
-        const merged = mergePendingUploadedFiles(prev, result.files);
-        if (merged.length > MAX_UPLOAD_FILES) {
-          addNotify("warning", `最多上传 ${MAX_UPLOAD_FILES} 个文件，已忽略多余文件`);
-        }
-        const next = merged.slice(0, MAX_UPLOAD_FILES);
-        pendingUploadsByConversationRef.current.set(currentConversationIdRef.current, next);
-        return next;
-      });
-      composerRef.current?.focus();
-    }
-    if (result.files.length === 0 && result.skipped.length > 0) {
-      setErrorMessage(`${emptySelectionMessage}：\n${result.skipped.join("\n")}`);
-      return;
-    }
-    if (result.skipped.length > 0) {
-      addNotify("warning", `以下文件已跳过：\n${result.skipped.join("\n")}`);
-    }
-  }, [addNotify, composerRef, currentConversationIdRef, setErrorMessage]);
+  const appendImportedFiles = useCallback(
+    (result: SystemPickReadableFilesResponse, emptySelectionMessage: string) => {
+      if (result.files.length === 0 && result.skipped.length === 0) {
+        return;
+      }
+      if (result.files.length > 0) {
+        setPendingUploadedFiles((prev) => {
+          const merged = mergePendingUploadedFiles(prev, result.files);
+          if (merged.length > MAX_UPLOAD_FILES) {
+            addNotify("warning", `最多上传 ${MAX_UPLOAD_FILES} 个文件，已忽略多余文件`);
+          }
+          const next = merged.slice(0, MAX_UPLOAD_FILES);
+          pendingUploadsByConversationRef.current.set(currentConversationIdRef.current, next);
+          return next;
+        });
+        composerRef.current?.focus();
+      }
+      if (result.files.length === 0 && result.skipped.length > 0) {
+        setErrorMessage(`${emptySelectionMessage}：\n${result.skipped.join("\n")}`);
+        return;
+      }
+      if (result.skipped.length > 0) {
+        addNotify("warning", `以下文件已跳过：\n${result.skipped.join("\n")}`);
+      }
+    },
+    [addNotify, composerRef, currentConversationIdRef, setErrorMessage],
+  );
 
   const pickReadableFiles = useCallback(async () => {
     if (activeUploadTasksRef.current > 0) {
@@ -142,10 +134,10 @@ export function usePendingUploads(params: UsePendingUploadsParams) {
 
     const finishUploadTask = beginUploadTask();
     try {
-      const result = await invoke<SystemPickReadableFilesResponse>(
-        "system_pick_readable_files",
-        { workdir, maxFiles: remainingFileSlots },
-      );
+      const result = await invoke<SystemPickReadableFilesResponse>("system_pick_readable_files", {
+        workdir,
+        maxFiles: remainingFileSlots,
+      });
       appendImportedFiles(result, "所选文件均不受当前 Read 支持");
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
@@ -163,114 +155,123 @@ export function usePendingUploads(params: UsePendingUploadsParams) {
     workdir,
   ]);
 
-  const importReadableFilePaths = useCallback(async (paths: string[]) => {
-    if (paths.length === 0) return;
-    if (activeUploadTasksRef.current > 0) {
-      addNotify("warning", "当前正在上传文件，请稍候");
-      return;
-    }
-    if (!isAgentMode) {
-      setErrorMessage("文件上传仅在 tools 模式可用。");
-      return;
-    }
-    if (!workdir) {
-      setErrorMessage("请先在设置 -> 系统中配置工作目录后再上传文件。");
-      return;
-    }
+  const importReadableFilePaths = useCallback(
+    async (paths: string[]) => {
+      if (paths.length === 0) return;
+      if (activeUploadTasksRef.current > 0) {
+        addNotify("warning", "当前正在上传文件，请稍候");
+        return;
+      }
+      if (!isAgentMode) {
+        setErrorMessage("文件上传仅在 tools 模式可用。");
+        return;
+      }
+      if (!workdir) {
+        setErrorMessage("请先在设置 -> 系统中配置工作目录后再上传文件。");
+        return;
+      }
 
-    const remainingFileSlots = Math.max(0, MAX_UPLOAD_FILES - pendingUploadedFiles.length);
-    if (remainingFileSlots === 0) {
-      addNotify("warning", `最多上传 ${MAX_UPLOAD_FILES} 个文件，已忽略多余文件`);
-      return;
-    }
+      const remainingFileSlots = Math.max(0, MAX_UPLOAD_FILES - pendingUploadedFiles.length);
+      if (remainingFileSlots === 0) {
+        addNotify("warning", `最多上传 ${MAX_UPLOAD_FILES} 个文件，已忽略多余文件`);
+        return;
+      }
 
-    const finishUploadTask = beginUploadTask();
-    try {
-      const result = await invoke<SystemPickReadableFilesResponse>(
-        "system_import_readable_file_paths",
-        { workdir, paths, maxFiles: remainingFileSlots },
-      );
-      appendImportedFiles(result, "拖入文件均不受当前 Read 支持");
-    } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      setErrorMessage(message || "导入文件失败");
-    } finally {
-      finishUploadTask();
-    }
-  }, [
-    addNotify,
-    appendImportedFiles,
-    beginUploadTask,
-    isAgentMode,
-    pendingUploadedFiles.length,
-    setErrorMessage,
-    workdir,
-  ]);
+      const finishUploadTask = beginUploadTask();
+      try {
+        const result = await invoke<SystemPickReadableFilesResponse>(
+          "system_import_readable_file_paths",
+          { workdir, paths, maxFiles: remainingFileSlots },
+        );
+        appendImportedFiles(result, "拖入文件均不受当前 Read 支持");
+      } catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        setErrorMessage(message || "导入文件失败");
+      } finally {
+        finishUploadTask();
+      }
+    },
+    [
+      addNotify,
+      appendImportedFiles,
+      beginUploadTask,
+      isAgentMode,
+      pendingUploadedFiles.length,
+      setErrorMessage,
+      workdir,
+    ],
+  );
 
-  const importReadableFiles = useCallback(async (files: File[]) => {
-    if (files.length === 0) return;
-    if (activeUploadTasksRef.current > 0) {
-      addNotify("warning", "当前正在上传文件，请稍候");
-      return;
-    }
-    if (!isAgentMode) {
-      setErrorMessage("文件上传仅在 tools 模式可用。");
-      return;
-    }
-    if (!workdir) {
-      setErrorMessage("请先在设置 -> 系统中配置工作目录后再上传文件。");
-      return;
-    }
+  const importReadableFiles = useCallback(
+    async (files: File[]) => {
+      if (files.length === 0) return;
+      if (activeUploadTasksRef.current > 0) {
+        addNotify("warning", "当前正在上传文件，请稍候");
+        return;
+      }
+      if (!isAgentMode) {
+        setErrorMessage("文件上传仅在 tools 模式可用。");
+        return;
+      }
+      if (!workdir) {
+        setErrorMessage("请先在设置 -> 系统中配置工作目录后再上传文件。");
+        return;
+      }
 
-    const remainingFileSlots = Math.max(0, MAX_UPLOAD_FILES - pendingUploadedFiles.length);
-    if (remainingFileSlots === 0) {
-      addNotify("warning", `最多上传 ${MAX_UPLOAD_FILES} 个文件，已忽略多余文件`);
-      return;
-    }
+      const remainingFileSlots = Math.max(0, MAX_UPLOAD_FILES - pendingUploadedFiles.length);
+      if (remainingFileSlots === 0) {
+        addNotify("warning", `最多上传 ${MAX_UPLOAD_FILES} 个文件，已忽略多余文件`);
+        return;
+      }
 
-    const importBatch = files.slice(0, remainingFileSlots);
-    const ignoredForLimit = files.length - importBatch.length;
-    const finishUploadTask = beginUploadTask();
-    try {
-      const uploadFiles = await Promise.all(importBatch.map(fileToUploadInput));
-      const result = await invoke<SystemPickReadableFilesResponse>(
-        "system_import_uploaded_readable_files",
-        { workdir, files: uploadFiles, maxFiles: remainingFileSlots },
-      );
-      appendImportedFiles(result, "剪贴板文件均不受当前 Read 支持");
-      if (ignoredForLimit > 0) {
-        addNotify(
-          "warning",
-          `最多上传 ${MAX_UPLOAD_FILES} 个文件，已忽略 ${ignoredForLimit} 个额外文件`,
+      const importBatch = files.slice(0, remainingFileSlots);
+      const ignoredForLimit = files.length - importBatch.length;
+      const finishUploadTask = beginUploadTask();
+      try {
+        const uploadFiles = await Promise.all(importBatch.map(fileToUploadInput));
+        const result = await invoke<SystemPickReadableFilesResponse>(
+          "system_import_uploaded_readable_files",
+          { workdir, files: uploadFiles, maxFiles: remainingFileSlots },
         );
+        appendImportedFiles(result, "剪贴板文件均不受当前 Read 支持");
+        if (ignoredForLimit > 0) {
+          addNotify(
+            "warning",
+            `最多上传 ${MAX_UPLOAD_FILES} 个文件，已忽略 ${ignoredForLimit} 个额外文件`,
+          );
+        }
+      } catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        setErrorMessage(message || "导入剪贴板文件失败");
+      } finally {
+        finishUploadTask();
       }
-    } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      setErrorMessage(message || "导入剪贴板文件失败");
-    } finally {
-      finishUploadTask();
-    }
-  }, [
-    addNotify,
-    appendImportedFiles,
-    beginUploadTask,
-    isAgentMode,
-    pendingUploadedFiles.length,
-    setErrorMessage,
-    workdir,
-  ]);
+    },
+    [
+      addNotify,
+      appendImportedFiles,
+      beginUploadTask,
+      isAgentMode,
+      pendingUploadedFiles.length,
+      setErrorMessage,
+      workdir,
+    ],
+  );
 
-  const removePendingUpload = useCallback((relativePath: string) => {
-    setPendingUploadedFiles((prev) => {
-      const next = prev.filter((file) => file.relativePath !== relativePath);
-      if (next.length > 0) {
-        pendingUploadsByConversationRef.current.set(currentConversationIdRef.current, next);
-      } else {
-        pendingUploadsByConversationRef.current.delete(currentConversationIdRef.current);
-      }
-      return next;
-    });
-  }, [currentConversationIdRef]);
+  const removePendingUpload = useCallback(
+    (relativePath: string) => {
+      setPendingUploadedFiles((prev) => {
+        const next = prev.filter((file) => file.relativePath !== relativePath);
+        if (next.length > 0) {
+          pendingUploadsByConversationRef.current.set(currentConversationIdRef.current, next);
+        } else {
+          pendingUploadsByConversationRef.current.delete(currentConversationIdRef.current);
+        }
+        return next;
+      });
+    },
+    [currentConversationIdRef],
+  );
 
   return {
     isUploadingFiles,
diff --git a/crates/agent-gui/src/pages/mcp-hub/McpHubPage.tsx b/crates/agent-gui/src/pages/mcp-hub/McpHubPage.tsx
index 6856e1d19..9bbef096d 100644
--- a/crates/agent-gui/src/pages/mcp-hub/McpHubPage.tsx
+++ b/crates/agent-gui/src/pages/mcp-hub/McpHubPage.tsx
@@ -1,13 +1,12 @@
 import { useState } from "react";
-
+import { HubBackdrop, HubHeader } from "../../components/hub/HubChrome";
 import { Cloud, Plug, Plus, Server, Sparkles } from "../../components/icons";
 import { Button } from "../../components/ui/button";
 import { useLocale } from "../../i18n";
-import { McpRegistryBrowser } from "./McpRegistryBrowser";
-import { McpServerEditModal, McpServersForm } from "./McpServersForm";
 import { type AppSettings, type McpServerConfig, updateMcp } from "../../lib/settings";
-import { HubBackdrop, HubHeader } from "../../components/hub/HubChrome";
 import { cn } from "../../lib/shared/utils";
+import { McpRegistryBrowser } from "./McpRegistryBrowser";
+import { McpServerEditModal, McpServersForm } from "./McpServersForm";
 
 type McpHubPageProps = {
   settings: AppSettings;
@@ -19,9 +18,7 @@ type McpHubPageProps = {
 
 type McpHubView = "installed" | "store";
 
-type EditingState =
-  | { mode: "add" }
-  | { mode: "edit"; idx: number; server: McpServerConfig };
+type EditingState = { mode: "add" } | { mode: "edit"; idx: number; server: McpServerConfig };
 
 export function McpHubPage(props: McpHubPageProps) {
   const { settings, setSettings, sidebarOpen, onOpenSidebar } = props;
@@ -47,9 +44,7 @@ export function McpHubPage(props: McpHubPageProps) {
       if (editing?.mode === "edit") {
         const targetIdx = editing.idx;
         return updateMcp(prev, {
-          servers: prev.mcp.servers.map((item, index) =>
-            index === targetIdx ? server : item,
-          ),
+          servers: prev.mcp.servers.map((item, index) => (index === targetIdx ? server : item)),
         });
       }
       return updateMcp(prev, {
diff --git a/crates/agent-gui/src/pages/mcp-hub/McpRegistryBrowser.tsx b/crates/agent-gui/src/pages/mcp-hub/McpRegistryBrowser.tsx
index 6e07561cb..add83ed8f 100644
--- a/crates/agent-gui/src/pages/mcp-hub/McpRegistryBrowser.tsx
+++ b/crates/agent-gui/src/pages/mcp-hub/McpRegistryBrowser.tsx
@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useMemo, useRef, useState, type FormEvent } from "react";
+import { type FormEvent, useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { createPortal } from "react-dom";
 
 import {
@@ -33,14 +33,14 @@ import {
   applyMcpRegistryInstallConfig,
   createUniqueMcpServerId,
   MCP_REGISTRY_SOURCE_OPTIONS,
-  mcpRegistryConfigInputKey,
-  resolveMcpRegistryInstallDraft,
-  searchMcpRegistry,
-  withUniqueMcpServerId,
   type McpRegistryCard,
   type McpRegistryConfigInput,
   type McpRegistryInstallDraft,
   type McpRegistrySource,
+  mcpRegistryConfigInputKey,
+  resolveMcpRegistryInstallDraft,
+  searchMcpRegistry,
+  withUniqueMcpServerId,
 } from "../../lib/mcpRegistry";
 import { type AppSettings, type McpServerConfig, updateMcp } from "../../lib/settings";
 import { useModalMotion } from "../../lib/shared/modalMotion";
@@ -210,18 +210,22 @@ function valueFromServerConfig(input: McpRegistryConfigInput, server: McpServerC
   if (input.target === "config") {
     for (let index = 0; index < (server.args ?? []).length; index += 1) {
       const arg = server.args[index];
-      const rawConfig = arg === "--config"
-        ? server.args[index + 1]
-        : arg.startsWith("--config=")
-          ? arg.slice("--config=".length)
-          : undefined;
+      const rawConfig =
+        arg === "--config"
+          ? server.args[index + 1]
+          : arg.startsWith("--config=")
+            ? arg.slice("--config=".length)
+            : undefined;
       if (!rawConfig) continue;
       try {
         const parsed = JSON.parse(rawConfig);
         if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) continue;
-        const value = (parsed as Record<string, unknown>)[targetName]
-          ?? (parsed as Record<string, unknown>)[input.name];
-        return cleanConfigValue(typeof value === "string" ? value : value === undefined ? undefined : String(value));
+        const value =
+          (parsed as Record<string, unknown>)[targetName] ??
+          (parsed as Record<string, unknown>)[input.name];
+        return cleanConfigValue(
+          typeof value === "string" ? value : value === undefined ? undefined : String(value),
+        );
       } catch {
         return "";
       }
@@ -389,9 +393,10 @@ function McpConfigureModal(props: {
         warnings: configureDraft?.warnings ?? [],
         commandPreview: "",
       };
-      const finalDraft = requiredConfig.length > 0
-        ? applyMcpRegistryInstallConfig(configuredDraft, draft.configValues)
-        : configuredDraft;
+      const finalDraft =
+        requiredConfig.length > 0
+          ? applyMcpRegistryInstallConfig(configuredDraft, draft.configValues)
+          : configuredDraft;
       onSave(finalDraft.server);
       requestClose();
     } catch (error) {
@@ -450,14 +455,16 @@ function McpConfigureModal(props: {
                 />
               </div>
               <div className="space-y-1.5">
-                <Label htmlFor="mcp-store-config-transport" className="text-xs text-muted-foreground">
+                <Label
+                  htmlFor="mcp-store-config-transport"
+                  className="text-xs text-muted-foreground"
+                >
                   {t("mcpHub.transport")}
                 </Label>
                 <Select
                   value={draft.transport}
                   onValueChange={(value) => {
-                    const transport =
-                      value === "http" ? "http" : value === "sse" ? "sse" : "stdio";
+                    const transport = value === "http" ? "http" : value === "sse" ? "sse" : "stdio";
                     updateDraft({ transport });
                   }}
                 >
@@ -489,7 +496,10 @@ function McpConfigureModal(props: {
               <div className="space-y-3 rounded-xl border border-border/45 bg-muted/20 p-4">
                 <div className="grid gap-3 sm:grid-cols-2">
                   <div className="space-y-1.5">
-                    <Label htmlFor="mcp-store-config-command" className="text-xs text-muted-foreground">
+                    <Label
+                      htmlFor="mcp-store-config-command"
+                      className="text-xs text-muted-foreground"
+                    >
                       {t("mcpHub.command")}
                     </Label>
                     <Input
@@ -558,7 +568,10 @@ function McpConfigureModal(props: {
                 </div>
                 {isSse ? (
                   <div className="space-y-1.5">
-                    <Label htmlFor="mcp-store-config-message-url" className="text-xs text-muted-foreground">
+                    <Label
+                      htmlFor="mcp-store-config-message-url"
+                      className="text-xs text-muted-foreground"
+                    >
                       {t("mcpHub.messageUrl")}
                     </Label>
                     <Input
@@ -571,7 +584,10 @@ function McpConfigureModal(props: {
                   </div>
                 ) : null}
                 <div className="space-y-1.5">
-                  <Label htmlFor="mcp-store-config-headers" className="text-xs text-muted-foreground">
+                  <Label
+                    htmlFor="mcp-store-config-headers"
+                    className="text-xs text-muted-foreground"
+                  >
                     {t("mcpHub.headers")}
                   </Label>
                   <Textarea
@@ -588,7 +604,9 @@ function McpConfigureModal(props: {
             {requiredConfig.length > 0 ? (
               <div className="space-y-3 rounded-xl border border-border/50 bg-background/65 p-4 backdrop-blur-md">
                 <div>
-                  <div className="text-sm font-semibold">{t("mcpHub.storeConfigureRequiredTitle")}</div>
+                  <div className="text-sm font-semibold">
+                    {t("mcpHub.storeConfigureRequiredTitle")}
+                  </div>
                   <p className="mt-1 text-xs text-muted-foreground">
                     {t("mcpHub.storeConfigureRequiredDesc")}
                   </p>
@@ -598,7 +616,10 @@ function McpConfigureModal(props: {
                     const key = mcpRegistryConfigInputKey(input);
                     return (
                       <div key={key} className="space-y-1.5">
-                        <Label htmlFor={`mcp-store-config-${key}`} className="text-xs text-muted-foreground">
+                        <Label
+                          htmlFor={`mcp-store-config-${key}`}
+                          className="text-xs text-muted-foreground"
+                        >
                           {input.label ?? input.name}
                         </Label>
                         <Input
@@ -693,22 +714,14 @@ function RegistryCard(props: {
   const installing = installingId === card.id;
   const done = Boolean(installedId);
   const configureDraft = configureDraftForCard(card);
-  const transports = configureDraft
-    ? [configureDraft.server.transport]
-    : card.transportHints;
+  const transports = configureDraft ? [configureDraft.server.transport] : card.transportHints;
   const link = primaryRegistryLink(card);
   const versionOptions = group.cards.map((item) => ({
     id: item.id,
     label: versionLabelForCard(item) ?? t("mcpHub.storeVersionLatest"),
   }));
   const hasVersionSelector = versionOptions.length > 1;
-  const headerPadding = hasVersionSelector
-    ? link
-      ? "pr-36"
-      : "pr-28"
-    : link
-      ? "pr-8"
-      : undefined;
+  const headerPadding = hasVersionSelector ? (link ? "pr-36" : "pr-28") : link ? "pr-8" : undefined;
 
   return (
     <div
@@ -776,16 +789,18 @@ function RegistryCard(props: {
               : "border-border/30 bg-muted/50 text-muted-foreground group-hover:border-border/50 group-hover:bg-background/70 group-hover:text-foreground/85",
           )}
         >
-          {card.remote ? <Globe2 className="h-[18px] w-[18px]" /> : <Server className="h-[18px] w-[18px]" />}
+          {card.remote ? (
+            <Globe2 className="h-[18px] w-[18px]" />
+          ) : (
+            <Server className="h-[18px] w-[18px]" />
+          )}
         </div>
         <div className="min-w-0 flex-1">
           <div className="flex min-w-0 items-start gap-1.5">
             <span className="truncate text-[13px] font-semibold leading-tight text-foreground">
               {card.displayName}
             </span>
-            {card.verified ? (
-              <Shield className="h-3.5 w-3.5 shrink-0 text-foreground/65" />
-            ) : null}
+            {card.verified ? <Shield className="h-3.5 w-3.5 shrink-0 text-foreground/65" /> : null}
           </div>
           <div className="mt-1.5 flex flex-wrap items-center gap-1.5">
             <span
@@ -982,7 +997,9 @@ function McpRegistryPreviewDrawer(props: {
             </button>
           </div>
           <div className="flex min-w-0 flex-wrap items-center gap-1.5 text-[11px] text-muted-foreground">
-            <span className={cn("inline-flex rounded-md border px-1.5 py-0.5", sourceTone(data.source))}>
+            <span
+              className={cn("inline-flex rounded-md border px-1.5 py-0.5", sourceTone(data.source))}
+            >
               {data.source}
             </span>
             {transports.map((transport) => (
@@ -1073,7 +1090,11 @@ function McpRegistryPreviewDrawer(props: {
                 </div>
               )}
               <div className="divide-y divide-border/30">
-                <McpPreviewField label={t("mcpHub.serverName")} value={server?.id ?? data.name} mono />
+                <McpPreviewField
+                  label={t("mcpHub.serverName")}
+                  value={server?.id ?? data.name}
+                  mono
+                />
                 <McpPreviewField
                   label={t("mcpHub.transport")}
                   value={transports.length > 0 ? transports.join(", ") : null}
@@ -1115,7 +1136,9 @@ function McpRegistryPreviewDrawer(props: {
                       className="rounded-xl border border-border/35 bg-muted/25 px-3 py-2"
                     >
                       <div className="flex min-w-0 items-center gap-2">
-                        {input.secret ? <Key className="h-3.5 w-3.5 shrink-0 text-foreground/65" /> : null}
+                        {input.secret ? (
+                          <Key className="h-3.5 w-3.5 shrink-0 text-foreground/65" />
+                        ) : null}
                         <span className="min-w-0 flex-1 truncate text-[12px] font-medium text-foreground">
                           {input.label ?? input.name}
                         </span>
@@ -1197,8 +1220,7 @@ function McpRegistryPreviewDrawer(props: {
             size="sm"
             className={cn(
               "h-9 flex-1 gap-1.5 rounded-xl",
-              installed &&
-                "border-border/55 bg-background/75 text-foreground/85 backdrop-blur-md",
+              installed && "border-border/55 bg-background/75 text-foreground/85 backdrop-blur-md",
             )}
             disabled={installed || installing}
             onClick={() => onInstall(data)}
@@ -1288,7 +1310,7 @@ export function McpRegistryBrowser(props: McpRegistryBrowserProps) {
       .then((resolved) => {
         if (cancelled) return;
         setPreviewDetail(resolved);
-        setItems((prev) => prev.map((item) => item.id === resolved.id ? resolved : item));
+        setItems((prev) => prev.map((item) => (item.id === resolved.id ? resolved : item)));
       })
       .catch((err) => {
         if (cancelled) return;
@@ -1306,36 +1328,39 @@ export function McpRegistryBrowser(props: McpRegistryBrowserProps) {
     };
   }, [previewCard, t]);
 
-  const runSearch = useCallback(async (mode: "replace" | "append" = "replace") => {
-    const cursor = mode === "append" ? nextCursor : undefined;
-    if (mode === "append" && !cursor) return;
-    if (mode === "append") {
-      setLoadingMore(true);
-    } else {
-      setLoading(true);
-    }
-    setError(null);
-    try {
-      const result = await searchMcpRegistry({
-        source,
-        query,
-        cursor,
-        limit: STORE_PAGE_LIMIT,
-      });
-      setItems((prev) => mode === "append" ? [...prev, ...result.items] : result.items);
-      setNextCursor(result.nextCursor);
-    } catch (err) {
-      const message = err instanceof Error ? err.message : String(err);
-      setError(message || t("mcpHub.storeLoadFailed"));
-      if (mode === "replace") {
-        setItems([]);
-        setNextCursor(undefined);
+  const runSearch = useCallback(
+    async (mode: "replace" | "append" = "replace") => {
+      const cursor = mode === "append" ? nextCursor : undefined;
+      if (mode === "append" && !cursor) return;
+      if (mode === "append") {
+        setLoadingMore(true);
+      } else {
+        setLoading(true);
       }
-    } finally {
-      setLoading(false);
-      setLoadingMore(false);
-    }
-  }, [nextCursor, query, source, t]);
+      setError(null);
+      try {
+        const result = await searchMcpRegistry({
+          source,
+          query,
+          cursor,
+          limit: STORE_PAGE_LIMIT,
+        });
+        setItems((prev) => (mode === "append" ? [...prev, ...result.items] : result.items));
+        setNextCursor(result.nextCursor);
+      } catch (err) {
+        const message = err instanceof Error ? err.message : String(err);
+        setError(message || t("mcpHub.storeLoadFailed"));
+        if (mode === "replace") {
+          setItems([]);
+          setNextCursor(undefined);
+        }
+      } finally {
+        setLoading(false);
+        setLoadingMore(false);
+      }
+    },
+    [nextCursor, query, source, t],
+  );
 
   useEffect(() => {
     // Clear immediately on source switch so the skeleton + hero render right away.
@@ -1350,7 +1375,9 @@ export function McpRegistryBrowser(props: McpRegistryBrowserProps) {
   function installedIdForCard(card: McpRegistryCard) {
     const draft = configureDraftForCard(card);
     const draftId = draft?.server.id ?? "";
-    return installedByCardId[card.id] ?? (draftId && existingIds.has(draftId) ? draftId : undefined);
+    return (
+      installedByCardId[card.id] ?? (draftId && existingIds.has(draftId) ? draftId : undefined)
+    );
   }
 
   function addServerFromStore(card: McpRegistryCard, server: McpServerConfig) {
@@ -1368,7 +1395,7 @@ export function McpRegistryBrowser(props: McpRegistryBrowserProps) {
     setError(null);
     try {
       const resolved = await resolveMcpRegistryInstallDraft(card);
-      setItems((prev) => prev.map((item) => item.id === card.id ? resolved : item));
+      setItems((prev) => prev.map((item) => (item.id === card.id ? resolved : item)));
       if (previewCard?.id === card.id) {
         setPreviewDetail(resolved);
       }
@@ -1491,10 +1518,7 @@ export function McpRegistryBrowser(props: McpRegistryBrowserProps) {
 
               <div key={`${source}-skeleton`} className="grid gap-3 sm:grid-cols-2 xl:grid-cols-3">
                 {Array.from({ length: 6 }).map((_, index) => (
-                  <div
-                    key={index}
-                    className="hub-frost-skeleton skill-card-enter h-[228px] p-3.5"
-                  >
+                  <div key={index} className="hub-frost-skeleton skill-card-enter h-[228px] p-3.5">
                     <div className="flex items-center gap-3">
                       <div className="skills-skeleton-shimmer h-10 w-10 shrink-0 rounded-xl" />
                       <div className="flex-1 space-y-2">
@@ -1532,9 +1556,7 @@ export function McpRegistryBrowser(props: McpRegistryBrowserProps) {
               <p className="mt-4 text-sm font-medium text-foreground">
                 {t("mcpHub.storeEmptyTitle")}
               </p>
-              <p className="mt-1 text-xs text-muted-foreground/80">
-                {t("mcpHub.storeEmptyDesc")}
-              </p>
+              <p className="mt-1 text-xs text-muted-foreground/80">{t("mcpHub.storeEmptyDesc")}</p>
             </div>
           )}
 
diff --git a/crates/agent-gui/src/pages/mcp-hub/McpServersForm.tsx b/crates/agent-gui/src/pages/mcp-hub/McpServersForm.tsx
index 5c46225ad..f107bac6e 100644
--- a/crates/agent-gui/src/pages/mcp-hub/McpServersForm.tsx
+++ b/crates/agent-gui/src/pages/mcp-hub/McpServersForm.tsx
@@ -1,4 +1,4 @@
-import { memo, useEffect, useMemo, useState, type FormEvent } from "react";
+import { type FormEvent, memo, useEffect, useMemo, useState } from "react";
 import { createPortal } from "react-dom";
 
 import {
@@ -16,6 +16,7 @@ import {
 } from "../../components/icons";
 
 import { Button } from "../../components/ui/button";
+import { ConfirmDeletePopover } from "../../components/ui/confirm-action-popover";
 import { Input } from "../../components/ui/input";
 import { Label } from "../../components/ui/label";
 import {
@@ -28,7 +29,6 @@ import {
 import { Textarea } from "../../components/ui/textarea";
 import { useLocale } from "../../i18n";
 import { type AppSettings, type McpServerConfig, updateMcp } from "../../lib/settings";
-import { ConfirmDeletePopover } from "../../components/ui/confirm-action-popover";
 import { useModalMotion } from "../../lib/shared/modalMotion";
 import { cn } from "../../lib/shared/utils";
 
@@ -146,9 +146,7 @@ function buildServerFromDraft(
 
   const parsedTimeout = Number(draft.timeoutMs);
   const timeoutMs =
-    Number.isFinite(parsedTimeout) && parsedTimeout > 0
-      ? Math.floor(parsedTimeout)
-      : 60_000;
+    Number.isFinite(parsedTimeout) && parsedTimeout > 0 ? Math.floor(parsedTimeout) : 60_000;
 
   if (draft.transport === "stdio") {
     const command = draft.command.trim();
@@ -328,10 +326,7 @@ const McpServerCard = memo(function McpServerCard(props: {
               </span>
             </div>
             {previewLine ? (
-              <div
-                className="truncate text-[11px] text-muted-foreground/85"
-                title={previewLine}
-              >
+              <div className="truncate text-[11px] text-muted-foreground/85" title={previewLine}>
                 <span className="text-muted-foreground/55">{previewLabel}:</span>{" "}
                 <span className="font-mono">{previewLine}</span>
               </div>
@@ -346,7 +341,9 @@ const McpServerCard = memo(function McpServerCard(props: {
         {/* Counters (≥md) */}
         {argsCount > 0 || envCount > 0 || headerCount > 0 ? (
           <div className="hidden shrink-0 items-center gap-1 md:flex">
-            {argsCount > 0 ? <CounterPill label={t("mcpHub.previewArgs")} count={argsCount} /> : null}
+            {argsCount > 0 ? (
+              <CounterPill label={t("mcpHub.previewArgs")} count={argsCount} />
+            ) : null}
             {envCount > 0 ? <CounterPill label={t("mcpHub.previewEnv")} count={envCount} /> : null}
             {headerCount > 0 ? (
               <CounterPill label={t("mcpHub.previewHeaders")} count={headerCount} />
@@ -428,12 +425,7 @@ export function McpServerEditModal(props: {
   function handleSubmit(event: FormEvent<HTMLFormElement>) {
     event.preventDefault();
     try {
-      const server = buildServerFromDraft(
-        draft,
-        initialServer,
-        existingIdsExcludingCurrent,
-        t,
-      );
+      const server = buildServerFromDraft(draft, initialServer, existingIdsExcludingCurrent, t);
       onSave(server);
       requestClose();
     } catch (error) {
@@ -507,8 +499,7 @@ export function McpServerEditModal(props: {
                 <Select
                   value={draft.transport}
                   onValueChange={(value) => {
-                    const transport =
-                      value === "http" ? "http" : value === "sse" ? "sse" : "stdio";
+                    const transport = value === "http" ? "http" : value === "sse" ? "sse" : "stdio";
                     updateDraft({ transport });
                   }}
                 >
@@ -674,12 +665,7 @@ export function McpServersForm(props: McpServersFormProps) {
     return servers
       .map((server, idx) => ({ server, idx }))
       .filter(({ server }) => {
-        const haystack = [
-          server.id,
-          server.command,
-          server.url,
-          server.transport ?? "",
-        ]
+        const haystack = [server.id, server.command, server.url, server.transport ?? ""]
           .join("\n")
           .toLowerCase();
         return haystack.includes(text);
@@ -709,12 +695,8 @@ export function McpServersForm(props: McpServersFormProps) {
             <div className="mx-auto flex h-14 w-14 items-center justify-center rounded-2xl border border-border/55 bg-background/80 text-foreground/85 shadow-[0_1px_0_rgba(255,255,255,0.55)_inset]">
               <Server className="h-6 w-6" />
             </div>
-            <p className="mt-4 text-sm font-medium text-foreground">
-              {t("mcpHub.noServers")}
-            </p>
-            <p className="mt-1 text-xs text-muted-foreground/80">
-              {t("mcpHub.noServersHint")}
-            </p>
+            <p className="mt-4 text-sm font-medium text-foreground">{t("mcpHub.noServers")}</p>
+            <p className="mt-1 text-xs text-muted-foreground/80">{t("mcpHub.noServersHint")}</p>
             {onAddServer ? (
               <Button
                 variant="outline"
@@ -732,9 +714,7 @@ export function McpServersForm(props: McpServersFormProps) {
         {filter.trim() && filtered.length === 0 && serverCount > 0 ? (
           <div className="hub-panel-enter rounded-2xl border border-border/40 bg-background/55 px-6 py-8 text-center backdrop-blur-xl">
             <Plug className="mx-auto h-5 w-5 text-muted-foreground" />
-            <p className="mt-3 text-sm text-muted-foreground">
-              {t("mcpHub.noMatchInstalled")}
-            </p>
+            <p className="mt-3 text-sm text-muted-foreground">{t("mcpHub.noMatchInstalled")}</p>
           </div>
         ) : null}
 
diff --git a/crates/agent-gui/src/pages/settings/AboutSection.tsx b/crates/agent-gui/src/pages/settings/AboutSection.tsx
index 29dba3871..52bc4b1fc 100644
--- a/crates/agent-gui/src/pages/settings/AboutSection.tsx
+++ b/crates/agent-gui/src/pages/settings/AboutSection.tsx
@@ -134,9 +134,7 @@ export function AboutSection(props: SettingsSectionProps) {
   const installed = checkState.status === "installed";
   const restarting = checkState.status === "restarting";
   const canInstall =
-    checkState.status === "ready" &&
-    checkState.result.configured &&
-    checkState.result.available;
+    checkState.status === "ready" && checkState.result.configured && checkState.result.available;
   const statusTitle =
     checkState.status === "error"
       ? t("settings.aboutUpdateError")
@@ -261,9 +259,7 @@ export function AboutSection(props: SettingsSectionProps) {
                       <div className="mt-0.5 font-medium tabular-nums">v{nextVersion}</div>
                     </div>
                     <div className="rounded-lg bg-muted/45 px-3 py-2">
-                      <div className="text-muted-foreground">
-                        {t("settings.aboutReleaseDate")}
-                      </div>
+                      <div className="text-muted-foreground">{t("settings.aboutReleaseDate")}</div>
                       <div className="mt-0.5 truncate font-medium">{releaseDate || "N/A"}</div>
                     </div>
                   </div>
diff --git a/crates/agent-gui/src/pages/settings/AgentPromptTemplateModal.tsx b/crates/agent-gui/src/pages/settings/AgentPromptTemplateModal.tsx
index 4dcc764f3..f0d7135cb 100644
--- a/crates/agent-gui/src/pages/settings/AgentPromptTemplateModal.tsx
+++ b/crates/agent-gui/src/pages/settings/AgentPromptTemplateModal.tsx
@@ -8,7 +8,7 @@ import { Label } from "../../components/ui/label";
 import { Textarea } from "../../components/ui/textarea";
 import { useLocale } from "../../i18n";
 import type { AgentPromptTemplate } from "../../lib/settings";
-import { parseAgentTagsInput, PromptTag, stringifyAgentTags } from "./shared";
+import { PromptTag, parseAgentTagsInput, stringifyAgentTags } from "./shared";
 
 type AgentPromptTemplateModalProps = {
   initialData?: AgentPromptTemplate;
diff --git a/crates/agent-gui/src/pages/settings/AgentsSection.tsx b/crates/agent-gui/src/pages/settings/AgentsSection.tsx
index b8f824221..d511c7636 100644
--- a/crates/agent-gui/src/pages/settings/AgentsSection.tsx
+++ b/crates/agent-gui/src/pages/settings/AgentsSection.tsx
@@ -5,11 +5,7 @@ import { Button } from "../../components/ui/button";
 import { useLocale } from "../../i18n";
 import { type AgentPromptTemplate, updateAgents } from "../../lib/settings";
 import { AgentPromptTemplateModal } from "./AgentPromptTemplateModal";
-import {
-  AgentActivationSwitch,
-  ConfirmDeletePopover,
-  PromptTag,
-} from "./shared";
+import { AgentActivationSwitch, ConfirmDeletePopover, PromptTag } from "./shared";
 import type { SettingsSectionProps } from "./types";
 
 export function AgentsSection(props: SettingsSectionProps) {
@@ -57,7 +53,10 @@ export function AgentsSection(props: SettingsSectionProps) {
 
   function handleDelete(id: string) {
     setSettings((prev) =>
-      updateAgents(prev, prev.agents.filter((template) => template.id !== id)),
+      updateAgents(
+        prev,
+        prev.agents.filter((template) => template.id !== id),
+      ),
     );
   }
 
@@ -95,9 +94,7 @@ export function AgentsSection(props: SettingsSectionProps) {
           <div className="flex items-center gap-2">
             {templates.length > 0 ? (
               <div className="flex items-center gap-2 rounded-lg bg-muted/50 px-2.5 py-1.5 text-xs text-muted-foreground">
-                <span className="tabular-nums font-medium text-foreground">
-                  {templates.length}
-                </span>
+                <span className="tabular-nums font-medium text-foreground">{templates.length}</span>
                 {t("settings.agentsCount")}
                 {enabledCount > 0 ? (
                   <>
@@ -242,9 +239,7 @@ export function AgentsSection(props: SettingsSectionProps) {
                     ) : null}
                     {isExpanded ? (
                       <div className="mt-2 max-h-48 overflow-y-auto rounded-lg bg-muted/50 p-3 font-mono text-xs leading-relaxed text-foreground/80">
-                        <pre className="whitespace-pre-wrap break-words">
-                          {template.prompt}
-                        </pre>
+                        <pre className="whitespace-pre-wrap break-words">{template.prompt}</pre>
                       </div>
                     ) : null}
                   </div>
diff --git a/crates/agent-gui/src/pages/settings/CronSection.tsx b/crates/agent-gui/src/pages/settings/CronSection.tsx
index 049f43509..8ca0eb9a6 100644
--- a/crates/agent-gui/src/pages/settings/CronSection.tsx
+++ b/crates/agent-gui/src/pages/settings/CronSection.tsx
@@ -12,11 +12,11 @@ import {
 
 import { Button } from "../../components/ui/button";
 import { useLocale } from "../../i18n";
-import { isAgentExecutionMode, updateCronTasks } from "../../lib/settings";
 import { buildModelOptions } from "../../lib/chat/page/chatPageHelpers";
-import { AgentActivationSwitch, ConfirmDeletePopover } from "./shared";
-import { CronTaskModal, type CronTask, type CronTaskType } from "./CronTaskModal";
+import { isAgentExecutionMode, updateCronTasks } from "../../lib/settings";
+import { type CronTask, CronTaskModal, type CronTaskType } from "./CronTaskModal";
 import { CronTaskViewModal } from "./CronTaskViewModal";
+import { AgentActivationSwitch, ConfirmDeletePopover } from "./shared";
 import type { SettingsSectionProps } from "./types";
 
 const TASK_TYPE_ICON: Record<CronTaskType, typeof Terminal> = {
@@ -93,7 +93,12 @@ export function CronSection(props: SettingsSectionProps) {
   }
 
   function handleDelete(id: string) {
-    setSettings((prev) => updateCronTasks(prev, prev.cron.filter((task) => task.id !== id)));
+    setSettings((prev) =>
+      updateCronTasks(
+        prev,
+        prev.cron.filter((task) => task.id !== id),
+      ),
+    );
   }
 
   function handleToggle(id: string) {
@@ -101,9 +106,7 @@ export function CronSection(props: SettingsSectionProps) {
       updateCronTasks(
         prev,
         prev.cron.map((task) =>
-          task.id === id && !isCronTaskExhausted(task)
-            ? { ...task, enabled: !task.enabled }
-            : task,
+          task.id === id && !isCronTaskExhausted(task) ? { ...task, enabled: !task.enabled } : task,
         ),
       ),
     );
@@ -163,9 +166,7 @@ export function CronSection(props: SettingsSectionProps) {
           <p className="mt-3 text-sm font-medium text-muted-foreground">
             {t("settings.cronEmpty")}
           </p>
-          <p className="mt-1 text-xs text-muted-foreground/70">
-            {t("settings.cronEmptyDesc")}
-          </p>
+          <p className="mt-1 text-xs text-muted-foreground/70">{t("settings.cronEmptyDesc")}</p>
         </div>
       ) : (
         <div className="space-y-2">
@@ -190,7 +191,9 @@ export function CronSection(props: SettingsSectionProps) {
               >
                 <div className="flex items-center gap-3 px-4 py-3">
                   {/* Icon */}
-                  <div className={`flex h-9 w-9 shrink-0 items-center justify-center rounded-lg ${tone.bg} ${tone.text}`}>
+                  <div
+                    className={`flex h-9 w-9 shrink-0 items-center justify-center rounded-lg ${tone.bg} ${tone.text}`}
+                  >
                     <Icon className="h-4 w-4" />
                   </div>
 
@@ -200,7 +203,9 @@ export function CronSection(props: SettingsSectionProps) {
                       <span className="truncate text-sm font-medium text-foreground">
                         {task.name}
                       </span>
-                      <span className={`shrink-0 rounded-full px-1.5 py-0.5 text-[10px] font-medium leading-none ${tone.bg} ${tone.text}`}>
+                      <span
+                        className={`shrink-0 rounded-full px-1.5 py-0.5 text-[10px] font-medium leading-none ${tone.bg} ${tone.text}`}
+                      >
                         {t(tone.label)}
                       </span>
                     </div>
@@ -250,10 +255,7 @@ export function CronSection(props: SettingsSectionProps) {
                     >
                       <Pencil className="h-3.5 w-3.5" />
                     </button>
-                    <ConfirmDeletePopover
-                      name={task.name}
-                      onConfirm={() => handleDelete(task.id)}
-                    >
+                    <ConfirmDeletePopover name={task.name} onConfirm={() => handleDelete(task.id)}>
                       {(open) => (
                         <button
                           type="button"
@@ -297,10 +299,7 @@ export function CronSection(props: SettingsSectionProps) {
 
       {/* View Modal */}
       {modal.open && modal.mode === "view" ? (
-        <CronTaskViewModal
-          task={modal.task}
-          onClose={() => setModal({ open: false })}
-        />
+        <CronTaskViewModal task={modal.task} onClose={() => setModal({ open: false })} />
       ) : null}
     </div>
   );
diff --git a/crates/agent-gui/src/pages/settings/CronTaskModal.tsx b/crates/agent-gui/src/pages/settings/CronTaskModal.tsx
index 1af06a609..87d95b3fe 100644
--- a/crates/agent-gui/src/pages/settings/CronTaskModal.tsx
+++ b/crates/agent-gui/src/pages/settings/CronTaskModal.tsx
@@ -1,6 +1,6 @@
+import { invoke } from "@tauri-apps/api/core";
 import { useState } from "react";
 import { createPortal } from "react-dom";
-import { invoke } from "@tauri-apps/api/core";
 import {
   AlertTriangle,
   Check,
@@ -18,7 +18,6 @@ import {
 import { Button } from "../../components/ui/button";
 import { Input } from "../../components/ui/input";
 import { Label } from "../../components/ui/label";
-import { parseModelValue, toModelValue } from "../../lib/providers/llm";
 import {
   Select,
   SelectContent,
@@ -28,20 +27,21 @@ import {
 } from "../../components/ui/select";
 import { Textarea } from "../../components/ui/textarea";
 import { useLocale } from "../../i18n";
+import { parseModelValue, toModelValue } from "../../lib/providers/llm";
 import {
-  canHookHttpMethodHaveBody,
-  HOOK_HTTP_METHODS,
   type CronTask,
   type CronTaskType,
+  canHookHttpMethodHaveBody,
   type ExecutionMode,
+  HOOK_HTTP_METHODS,
   type HookHttpMethod,
   isAgentExecutionMode,
 } from "../../lib/settings";
 import {
   createEmptyTaskRequestDraft,
   parseHttpRequests,
-  taskRequestToDraft,
   type TaskHttpRequestDraft,
+  taskRequestToDraft,
 } from "./taskConfigUtils";
 
 export type { CronTask, CronTaskType } from "../../lib/settings";
@@ -94,36 +94,32 @@ export function CronTaskModal({
   const [prompt, setPrompt] = useState(initialData?.prompt ?? "");
   const [selectedModelValue, setSelectedModelValue] = useState(() =>
     initialData?.selectedModel
-      ? toModelValue(
-          initialData.selectedModel.customProviderId,
-          initialData.selectedModel.model,
-        )
+      ? toModelValue(initialData.selectedModel.customProviderId, initialData.selectedModel.model)
       : "",
   );
   const [formError, setFormError] = useState<string | null>(null);
   const [expandedRequest, setExpandedRequest] = useState<string | null>(null);
   const [isSaving, setIsSaving] = useState(false);
 
-  const promptModelOptions = selectedModelValue &&
+  const promptModelOptions =
+    selectedModelValue &&
     !modelOptions.some((option) => option.value === selectedModelValue) &&
     initialData?.selectedModel
-    ? [
-        ...modelOptions,
-        {
-          value: selectedModelValue,
-          label: initialData.selectedModel.model,
-          providerName: initialData.selectedModel.customProviderId,
-        },
-      ]
-    : modelOptions;
+      ? [
+          ...modelOptions,
+          {
+            value: selectedModelValue,
+            label: initialData.selectedModel.model,
+            providerName: initialData.selectedModel.customProviderId,
+          },
+        ]
+      : modelOptions;
 
   const selectedPromptModel =
     promptModelOptions.find((option) => option.value === selectedModelValue) ?? null;
 
   function updateRequest(id: string, patch: Partial<CronHttpRequestDraft>) {
-    setRequests((prev) =>
-      prev.map((req) => (req.id === id ? { ...req, ...patch } : req)),
-    );
+    setRequests((prev) => prev.map((req) => (req.id === id ? { ...req, ...patch } : req)));
   }
 
   async function handleSave() {
@@ -149,8 +145,7 @@ export function CronTaskModal({
 
       const trimmedPrompt = prompt.trim();
       const trimmedScript = scriptText.trim();
-      const parsedSelectedModel =
-        type === "prompt" ? parseModelValue(selectedModelValue) : null;
+      const parsedSelectedModel = type === "prompt" ? parseModelValue(selectedModelValue) : null;
       if (type === "bash" && !trimmedScript) {
         throw new Error(t("settings.cronCommandRequired"));
       }
@@ -189,7 +184,7 @@ export function CronTaskModal({
               })
             : undefined,
         prompt: type === "prompt" ? trimmedPrompt : undefined,
-        selectedModel: type === "prompt" ? parsedSelectedModel ?? undefined : undefined,
+        selectedModel: type === "prompt" ? (parsedSelectedModel ?? undefined) : undefined,
       };
 
       await onSave(data);
@@ -202,9 +197,7 @@ export function CronTaskModal({
 
   const scriptLineCount = scriptText.split(/\r?\n/).filter((l) => l.trim()).length;
 
-  const modalTitle = mode === "add"
-    ? t("settings.cronModalAdd")
-    : t("settings.cronModalEdit");
+  const modalTitle = mode === "add" ? t("settings.cronModalAdd") : t("settings.cronModalEdit");
 
   return createPortal(
     <div className="fixed inset-0 z-50 flex items-center justify-center p-4">
@@ -319,20 +312,29 @@ export function CronTaskModal({
               {/* Bash */}
               <button
                 type="button"
-                onClick={() => { setFormError(null); setType("bash"); }}
+                onClick={() => {
+                  setFormError(null);
+                  setType("bash");
+                }}
                 className={`group relative flex items-start gap-3 rounded-xl border-2 p-4 text-left transition-all ${
                   type === "bash"
                     ? "border-blue-500/50 bg-blue-500/5 shadow-sm shadow-blue-500/10"
                     : "border-border/60 bg-background hover:border-border hover:bg-muted/20"
                 }`}
               >
-                <div className={`flex h-10 w-10 shrink-0 items-center justify-center rounded-xl transition-colors ${
-                  type === "bash" ? "bg-blue-500/15 text-blue-500" : "bg-muted/60 text-muted-foreground"
-                }`}>
+                <div
+                  className={`flex h-10 w-10 shrink-0 items-center justify-center rounded-xl transition-colors ${
+                    type === "bash"
+                      ? "bg-blue-500/15 text-blue-500"
+                      : "bg-muted/60 text-muted-foreground"
+                  }`}
+                >
                   <Terminal className="h-5 w-5" />
                 </div>
                 <div className="min-w-0 flex-1">
-                  <div className={`text-sm font-semibold ${type === "bash" ? "text-blue-600 dark:text-blue-400" : "text-foreground"}`}>
+                  <div
+                    className={`text-sm font-semibold ${type === "bash" ? "text-blue-600 dark:text-blue-400" : "text-foreground"}`}
+                  >
                     {t("settings.cronTypeBash")}
                   </div>
                   <p className="mt-0.5 text-xs leading-relaxed text-muted-foreground">
@@ -349,20 +351,29 @@ export function CronTaskModal({
               {/* HTTP */}
               <button
                 type="button"
-                onClick={() => { setFormError(null); setType("http"); }}
+                onClick={() => {
+                  setFormError(null);
+                  setType("http");
+                }}
                 className={`group relative flex items-start gap-3 rounded-xl border-2 p-4 text-left transition-all ${
                   type === "http"
                     ? "border-emerald-500/50 bg-emerald-500/5 shadow-sm shadow-emerald-500/10"
                     : "border-border/60 bg-background hover:border-border hover:bg-muted/20"
                 }`}
               >
-                <div className={`flex h-10 w-10 shrink-0 items-center justify-center rounded-xl transition-colors ${
-                  type === "http" ? "bg-emerald-500/15 text-emerald-500" : "bg-muted/60 text-muted-foreground"
-                }`}>
+                <div
+                  className={`flex h-10 w-10 shrink-0 items-center justify-center rounded-xl transition-colors ${
+                    type === "http"
+                      ? "bg-emerald-500/15 text-emerald-500"
+                      : "bg-muted/60 text-muted-foreground"
+                  }`}
+                >
                   <Globe className="h-5 w-5" />
                 </div>
                 <div className="min-w-0 flex-1">
-                  <div className={`text-sm font-semibold ${type === "http" ? "text-emerald-600 dark:text-emerald-400" : "text-foreground"}`}>
+                  <div
+                    className={`text-sm font-semibold ${type === "http" ? "text-emerald-600 dark:text-emerald-400" : "text-foreground"}`}
+                  >
                     {t("settings.cronTypeHttp")}
                   </div>
                   <p className="mt-0.5 text-xs leading-relaxed text-muted-foreground">
@@ -379,20 +390,29 @@ export function CronTaskModal({
               {/* Prompt */}
               <button
                 type="button"
-                onClick={() => { setFormError(null); setType("prompt"); }}
+                onClick={() => {
+                  setFormError(null);
+                  setType("prompt");
+                }}
                 className={`group relative flex items-start gap-3 rounded-xl border-2 p-4 text-left transition-all ${
                   type === "prompt"
                     ? "border-violet-500/50 bg-violet-500/5 shadow-sm shadow-violet-500/10"
                     : "border-border/60 bg-background hover:border-border hover:bg-muted/20"
                 }`}
               >
-                <div className={`flex h-10 w-10 shrink-0 items-center justify-center rounded-xl transition-colors ${
-                  type === "prompt" ? "bg-violet-500/15 text-violet-500" : "bg-muted/60 text-muted-foreground"
-                }`}>
+                <div
+                  className={`flex h-10 w-10 shrink-0 items-center justify-center rounded-xl transition-colors ${
+                    type === "prompt"
+                      ? "bg-violet-500/15 text-violet-500"
+                      : "bg-muted/60 text-muted-foreground"
+                  }`}
+                >
                   <MessageSquare className="h-5 w-5" />
                 </div>
                 <div className="min-w-0 flex-1">
-                  <div className={`text-sm font-semibold ${type === "prompt" ? "text-violet-600 dark:text-violet-400" : "text-foreground"}`}>
+                  <div
+                    className={`text-sm font-semibold ${type === "prompt" ? "text-violet-600 dark:text-violet-400" : "text-foreground"}`}
+                  >
                     {t("settings.cronTypePrompt")}
                   </div>
                   <p className="mt-0.5 text-xs leading-relaxed text-muted-foreground">
@@ -529,7 +549,9 @@ export function CronTaskModal({
                               isExpanded ? "text-primary" : "text-muted-foreground"
                             }`}
                           >
-                            <ChevronDown className={`h-3.5 w-3.5 transition-transform ${isExpanded ? "" : "-rotate-90"}`} />
+                            <ChevronDown
+                              className={`h-3.5 w-3.5 transition-transform ${isExpanded ? "" : "-rotate-90"}`}
+                            />
                           </button>
                           <button
                             type="button"
@@ -677,7 +699,8 @@ export function CronTaskModal({
               </div>
             ) : name.trim() &&
               cron.trim() &&
-              (type !== "prompt" || (prompt.trim() && Boolean(parseModelValue(selectedModelValue)))) ? (
+              (type !== "prompt" ||
+                (prompt.trim() && Boolean(parseModelValue(selectedModelValue)))) ? (
               <div className="flex items-center gap-1.5 text-xs text-emerald-600 dark:text-emerald-400">
                 <Check className="h-3.5 w-3.5" />
                 <span>{t("settings.agentsReady")}</span>
diff --git a/crates/agent-gui/src/pages/settings/CronTaskViewModal.tsx b/crates/agent-gui/src/pages/settings/CronTaskViewModal.tsx
index 3763d419a..bb388c07c 100644
--- a/crates/agent-gui/src/pages/settings/CronTaskViewModal.tsx
+++ b/crates/agent-gui/src/pages/settings/CronTaskViewModal.tsx
@@ -1,6 +1,6 @@
+import { invoke } from "@tauri-apps/api/core";
 import { useEffect, useState } from "react";
 import { createPortal } from "react-dom";
-import { invoke } from "@tauri-apps/api/core";
 import {
   BrushCleaning,
   CheckCircle2,
@@ -55,7 +55,7 @@ const TYPE_CONFIG: Record<
     accentBg: "bg-violet-500/10",
     accentBorder: "border-violet-500/20",
   },
-}
+};
 
 function formatDuration(ms: number): string {
   if (ms < 1000) return `${ms}ms`;
@@ -114,9 +114,7 @@ function LeftPanel({
           </div>
 
           {/* Name */}
-          <h2 className="mt-3 text-base font-bold leading-tight text-foreground">
-            {task.name}
-          </h2>
+          <h2 className="mt-3 text-base font-bold leading-tight text-foreground">{task.name}</h2>
 
           {/* Description */}
           <p className="mt-1 text-[13px] leading-relaxed text-muted-foreground">
@@ -299,7 +297,15 @@ function LeftPanel({
 
 /* ─────────────────────── Right panel ─────────────────────── */
 
-function RightPanel({ task, t, onClose }: { task: CronTask; t: (key: string) => string; onClose: () => void }) {
+function RightPanel({
+  task,
+  t,
+  onClose,
+}: {
+  task: CronTask;
+  t: (key: string) => string;
+  onClose: () => void;
+}) {
   const [expandedLogId, setExpandedLogId] = useState<string | null>(null);
   const [logs, setLogs] = useState<CronExecutionLog[]>([]);
   const [isClearing, setIsClearing] = useState(false);
@@ -364,9 +370,7 @@ function RightPanel({ task, t, onClose }: { task: CronTask; t: (key: string) =>
       {/* ── Fixed header ── */}
       <div className="flex shrink-0 items-center gap-2 border-b border-border/30 px-5 py-3.5">
         <ScrollText className="h-4 w-4 text-muted-foreground/50" />
-        <span className="text-sm font-semibold text-foreground">
-          {t("settings.cronViewLogs")}
-        </span>
+        <span className="text-sm font-semibold text-foreground">{t("settings.cronViewLogs")}</span>
         <div className="ml-auto flex items-center gap-2">
           <ConfirmActionPopover
             title={t("settings.cronViewClearLogsConfirm")}
@@ -388,14 +392,10 @@ function RightPanel({ task, t, onClose }: { task: CronTask; t: (key: string) =>
                 onClick={open}
                 disabled={logs.length === 0 || isClearing}
                 title={
-                  isClearing
-                    ? t("settings.cronViewClearingLogs")
-                    : t("settings.cronViewClearLogs")
+                  isClearing ? t("settings.cronViewClearingLogs") : t("settings.cronViewClearLogs")
                 }
                 aria-label={
-                  isClearing
-                    ? t("settings.cronViewClearingLogs")
-                    : t("settings.cronViewClearLogs")
+                  isClearing ? t("settings.cronViewClearingLogs") : t("settings.cronViewClearLogs")
                 }
                 className="flex h-7 w-7 shrink-0 items-center justify-center rounded-lg text-muted-foreground transition-colors hover:bg-muted/60 hover:text-foreground disabled:cursor-not-allowed disabled:opacity-40"
               >
@@ -452,9 +452,7 @@ function RightPanel({ task, t, onClose }: { task: CronTask; t: (key: string) =>
                   {/* Summary — fixed-width columns for vertical alignment */}
                   <button
                     type="button"
-                    onClick={() =>
-                      setExpandedLogId(isExpanded ? null : log.id)
-                    }
+                    onClick={() => setExpandedLogId(isExpanded ? null : log.id)}
                     className="flex w-full items-center gap-2 px-3 py-2.5 text-left"
                   >
                     {/* Status icon */}
diff --git a/crates/agent-gui/src/pages/settings/HookModal.tsx b/crates/agent-gui/src/pages/settings/HookModal.tsx
index 66c8377ec..138cd56b4 100644
--- a/crates/agent-gui/src/pages/settings/HookModal.tsx
+++ b/crates/agent-gui/src/pages/settings/HookModal.tsx
@@ -26,18 +26,18 @@ import {
 import { Textarea } from "../../components/ui/textarea";
 import { useLocale } from "../../i18n";
 import {
-  canHookHttpMethodHaveBody,
-  HOOK_HTTP_METHODS,
   type ConversationHook,
   type ConversationHookType,
+  canHookHttpMethodHaveBody,
+  HOOK_HTTP_METHODS,
   type HookHttpMethod,
   type HookLifecycleEventType,
 } from "../../lib/settings";
 import {
   createEmptyHookRequestDraft,
   getHookEventLabel,
-  hookRequestToDraft,
   type HookHttpRequestDraft,
+  hookRequestToDraft,
 } from "./hookUtils";
 import { parseHttpRequests } from "./taskConfigUtils";
 
@@ -124,9 +124,7 @@ export function HookModal({ event, initialData, onSave, onClose }: HookModalProp
               <span className="rounded-md bg-muted/60 px-2 py-0.5 font-mono text-[11px] text-muted-foreground">
                 {event}
               </span>
-              <span className="text-xs text-muted-foreground">
-                {getHookEventLabel(t, event)}
-              </span>
+              <span className="text-xs text-muted-foreground">{getHookEventLabel(t, event)}</span>
             </div>
           </div>
           <button
@@ -219,9 +217,7 @@ export function HookModal({ event, initialData, onSave, onClose }: HookModalProp
                 <div className="min-w-0 flex-1">
                   <div
                     className={`text-sm font-semibold ${
-                      type === "command"
-                        ? "text-blue-600 dark:text-blue-400"
-                        : "text-foreground"
+                      type === "command" ? "text-blue-600 dark:text-blue-400" : "text-foreground"
                     }`}
                   >
                     {t("settings.hooksTypeCommand")}
@@ -261,9 +257,7 @@ export function HookModal({ event, initialData, onSave, onClose }: HookModalProp
                 <div className="min-w-0 flex-1">
                   <div
                     className={`text-sm font-semibold ${
-                      type === "http"
-                        ? "text-emerald-600 dark:text-emerald-400"
-                        : "text-foreground"
+                      type === "http" ? "text-emerald-600 dark:text-emerald-400" : "text-foreground"
                     }`}
                   >
                     {t("settings.hooksTypeHttp")}
@@ -369,9 +363,7 @@ export function HookModal({ event, initialData, onSave, onClose }: HookModalProp
                             setFormError(null);
                             updateRequest(request.id, {
                               method: value as HookHttpMethod,
-                              bodyText: canHookHttpMethodHaveBody(
-                                value as HookHttpMethod,
-                              )
+                              bodyText: canHookHttpMethodHaveBody(value as HookHttpMethod)
                                 ? request.bodyText
                                 : "",
                             });
@@ -418,9 +410,7 @@ export function HookModal({ event, initialData, onSave, onClose }: HookModalProp
                             type="button"
                             onClick={() => {
                               setFormError(null);
-                              setRequests((prev) =>
-                                prev.filter((item) => item.id !== request.id),
-                              );
+                              setRequests((prev) => prev.filter((item) => item.id !== request.id));
                               if (expandedRequest === request.id) {
                                 setExpandedRequest(null);
                               }
diff --git a/crates/agent-gui/src/pages/settings/HooksSection.tsx b/crates/agent-gui/src/pages/settings/HooksSection.tsx
index 2f5dda2e4..0dc450c35 100644
--- a/crates/agent-gui/src/pages/settings/HooksSection.tsx
+++ b/crates/agent-gui/src/pages/settings/HooksSection.tsx
@@ -1,4 +1,4 @@
-import { useState, type ReactNode } from "react";
+import { type ReactNode, useState } from "react";
 import {
   Bot,
   CheckCircle2,
@@ -19,21 +19,14 @@ import {
 import { Button } from "../../components/ui/button";
 import { useLocale } from "../../i18n";
 import {
-  HOOK_LIFECYCLE_EVENTS,
   type ConversationHook,
+  HOOK_LIFECYCLE_EVENTS,
   type HookLifecycleEventType,
   updateHooks,
 } from "../../lib/settings";
 import { HookModal } from "./HookModal";
-import {
-  AgentActivationSwitch,
-  ConfirmDeletePopover,
-} from "./shared";
-import {
-  getHookEventDescription,
-  getHookEventLabel,
-  getHookTypeTone,
-} from "./hookUtils";
+import { getHookEventDescription, getHookEventLabel, getHookTypeTone } from "./hookUtils";
+import { AgentActivationSwitch, ConfirmDeletePopover } from "./shared";
 import type { SettingsSectionProps } from "./types";
 
 type LifecyclePhase = {
@@ -56,9 +49,7 @@ type PhaseGroup = {
 export function HooksSection(props: SettingsSectionProps) {
   const { settings, setSettings } = props;
   const { t } = useLocale();
-  const [activeEvent, setActiveEvent] = useState<HookLifecycleEventType>(
-    HOOK_LIFECYCLE_EVENTS[0],
-  );
+  const [activeEvent, setActiveEvent] = useState<HookLifecycleEventType>(HOOK_LIFECYCLE_EVENTS[0]);
   const [modalOpen, setModalOpen] = useState(false);
   const [editingHook, setEditingHook] = useState<ConversationHook | null>(null);
   const [collapsedPhases, setCollapsedPhases] = useState<Set<string>>(new Set());
@@ -169,10 +160,7 @@ export function HooksSection(props: SettingsSectionProps) {
     closeModal();
   }
 
-  function updateHookState(
-    hookId: string,
-    updater: (hook: ConversationHook) => ConversationHook,
-  ) {
+  function updateHookState(hookId: string, updater: (hook: ConversationHook) => ConversationHook) {
     setSettings((prev) =>
       updateHooks(
         prev,
@@ -183,7 +171,10 @@ export function HooksSection(props: SettingsSectionProps) {
 
   function deleteHook(hookId: string) {
     setSettings((prev) =>
-      updateHooks(prev, prev.hooks.filter((hook) => hook.id !== hookId)),
+      updateHooks(
+        prev,
+        prev.hooks.filter((hook) => hook.id !== hookId),
+      ),
     );
   }
 
@@ -360,7 +351,6 @@ export function HooksSection(props: SettingsSectionProps) {
                                     ) : null}
                                   </div>
                                 </div>
-
                               </button>
                             </li>
                           );
@@ -391,9 +381,7 @@ export function HooksSection(props: SettingsSectionProps) {
                 })()}
                 <div>
                   <div className="flex items-center gap-2">
-                    <h3 className="text-base font-semibold">
-                      {getHookEventLabel(t, activeEvent)}
-                    </h3>
+                    <h3 className="text-base font-semibold">{getHookEventLabel(t, activeEvent)}</h3>
                   </div>
                   <p className="mt-0.5 text-sm text-muted-foreground">
                     {getHookEventDescription(t, activeEvent)}
@@ -428,7 +416,7 @@ export function HooksSection(props: SettingsSectionProps) {
                   const stepCount =
                     hook.type === "command"
                       ? (hook.script ?? "").split(/\r?\n/).filter((line) => line.trim()).length
-                      : hook.requests?.length ?? 0;
+                      : (hook.requests?.length ?? 0);
                   return (
                     <div
                       key={hook.id}
diff --git a/crates/agent-gui/src/pages/settings/ProvidersSection.tsx b/crates/agent-gui/src/pages/settings/ProvidersSection.tsx
index 143125e34..e25a2b05f 100644
--- a/crates/agent-gui/src/pages/settings/ProvidersSection.tsx
+++ b/crates/agent-gui/src/pages/settings/ProvidersSection.tsx
@@ -201,8 +201,7 @@ function ProviderModal({ providerType, initialData, onSave, onClose }: ModalProp
 
   const debounceRef = useRef<ReturnType<typeof setTimeout> | null>(null);
   const prevFetchKey = useRef("");
-  const apiKeyIsRedactedDisplay =
-    initialUsesRedactedApiKey && apiKey === REDACTED_API_KEY_DISPLAY;
+  const apiKeyIsRedactedDisplay = initialUsesRedactedApiKey && apiKey === REDACTED_API_KEY_DISPLAY;
   const apiKeyForRequest = apiKeyIsRedactedDisplay ? "" : apiKey.trim();
   const canFetchModels = baseUrl.trim().length > 0 && apiKeyForRequest.length > 0;
 
@@ -296,9 +295,7 @@ function ProviderModal({ providerType, initialData, onSave, onClose }: ModalProp
   }
 
   function saveModelSettings(nextModel: ProviderModelConfig) {
-    setModels((prev) =>
-      prev.map((item) => (item.id === nextModel.id ? nextModel : item)),
-    );
+    setModels((prev) => prev.map((item) => (item.id === nextModel.id ? nextModel : item)));
     setEditingModel(null);
   }
 
@@ -320,7 +317,7 @@ function ProviderModal({ providerType, initialData, onSave, onClose }: ModalProp
       reasoning:
         providerType === "gemini" && initialData?.reasoning === "xhigh"
           ? "high"
-          : initialData?.reasoning ?? "off",
+          : (initialData?.reasoning ?? "off"),
       promptCachingEnabled: initialData?.promptCachingEnabled ?? providerType === "claude_code",
       nativeWebSearchEnabled: initialData?.nativeWebSearchEnabled ?? true,
     });
@@ -357,11 +354,7 @@ function ProviderModal({ providerType, initialData, onSave, onClose }: ModalProp
         <div className="flex-1 space-y-4 overflow-y-auto px-6 py-5">
           <div className="space-y-1.5">
             <Label htmlFor="modal-name">{t("settings.providerName")}</Label>
-            <Input
-              id="modal-name"
-              value={name}
-              onChange={(e) => setName(e.currentTarget.value)}
-            />
+            <Input id="modal-name" value={name} onChange={(e) => setName(e.currentTarget.value)} />
           </div>
 
           <div className="space-y-1.5">
@@ -437,9 +430,7 @@ function ProviderModal({ providerType, initialData, onSave, onClose }: ModalProp
                   onClick={() => setVisibleModelsSelected(!allVisibleModelsSelected)}
                   disabled={models.length === 0}
                 >
-                  {allVisibleModelsSelected
-                    ? t("settings.deselectAll")
-                    : t("settings.selectAll")}
+                  {allVisibleModelsSelected ? t("settings.deselectAll") : t("settings.selectAll")}
                 </Button>
                 <Button
                   variant="ghost"
@@ -449,9 +440,7 @@ function ProviderModal({ providerType, initialData, onSave, onClose }: ModalProp
                   disabled={fetchingModels || (isGatewayWebui && !canFetchModels)}
                   title={t("settings.refreshModels")}
                 >
-                  <RefreshCw
-                    className={`h-3.5 w-3.5 ${fetchingModels ? "animate-spin" : ""}`}
-                  />
+                  <RefreshCw className={`h-3.5 w-3.5 ${fetchingModels ? "animate-spin" : ""}`} />
                 </Button>
                 <Button
                   variant="ghost"
@@ -606,7 +595,7 @@ function CustomSettingsDrawer(props: SettingsSectionProps & { onClose: () => voi
         conversationTitleModel:
           value === TITLE_MODEL_FOLLOW_CURRENT_VALUE
             ? undefined
-            : parseModelValue(value) ?? undefined,
+            : (parseModelValue(value) ?? undefined),
       }),
     );
   }
@@ -852,7 +841,9 @@ export function ProvidersSection(props: SettingsSectionProps) {
               type="button"
               onClick={() => setActiveTab(tab)}
               className={`inline-flex items-center justify-center gap-1.5 whitespace-nowrap rounded-md px-3 py-1 text-sm font-medium transition-all ${
-                activeTab === tab ? "bg-background text-foreground shadow" : "hover:text-foreground/80"
+                activeTab === tab
+                  ? "bg-background text-foreground shadow"
+                  : "hover:text-foreground/80"
               }`}
             >
               <ProviderBrandIcon type={tab} />
diff --git a/crates/agent-gui/src/pages/settings/RemoteSection.tsx b/crates/agent-gui/src/pages/settings/RemoteSection.tsx
index 53e2902e7..71d85e762 100644
--- a/crates/agent-gui/src/pages/settings/RemoteSection.tsx
+++ b/crates/agent-gui/src/pages/settings/RemoteSection.tsx
@@ -2,9 +2,9 @@ import { invoke } from "@tauri-apps/api/core";
 import { listen } from "@tauri-apps/api/event";
 import { useEffect, useMemo, useState } from "react";
 import {
+  Check,
   Cloud,
   Copy,
-  Check,
   Eye,
   EyeOff,
   Globe,
@@ -40,7 +40,11 @@ function CopyButton({ value }: { value: string }) {
       onClick={handleCopy}
       className="flex h-8 w-8 shrink-0 items-center justify-center rounded-lg text-muted-foreground transition-colors hover:bg-muted/60 hover:text-foreground"
     >
-      {copied ? <Check className="h-3.5 w-3.5 text-emerald-500" /> : <Copy className="h-3.5 w-3.5" />}
+      {copied ? (
+        <Check className="h-3.5 w-3.5 text-emerald-500" />
+      ) : (
+        <Copy className="h-3.5 w-3.5" />
+      )}
     </button>
   );
 }
@@ -243,9 +247,7 @@ export function RemoteSection(props: SettingsSectionProps) {
           <AgentActivationSwitch
             checked={settings.remote.enabled}
             title={
-              settings.remote.enabled
-                ? t("settings.remoteDisable")
-                : t("settings.remoteEnable")
+              settings.remote.enabled ? t("settings.remoteDisable") : t("settings.remoteEnable")
             }
             onToggle={() =>
               updateRemoteSettings(setSettings, {
@@ -440,7 +442,6 @@ export function RemoteSection(props: SettingsSectionProps) {
           <div className="mt-1 text-sm font-medium">{formatTimestamp(status.lastHeartbeat)}</div>
         </div>
       </div>
-
     </div>
   );
 }
diff --git a/crates/agent-gui/src/pages/settings/SkillsSettingsForm.tsx b/crates/agent-gui/src/pages/settings/SkillsSettingsForm.tsx
index 639072020..98b567280 100644
--- a/crates/agent-gui/src/pages/settings/SkillsSettingsForm.tsx
+++ b/crates/agent-gui/src/pages/settings/SkillsSettingsForm.tsx
@@ -13,6 +13,7 @@ import {
 
 import { Button } from "../../components/ui/button";
 import { useLocale } from "../../i18n";
+import { updateSkills } from "../../lib/settings";
 import {
   discoverSkills,
   isAlwaysEnabledSkillName,
@@ -21,7 +22,6 @@ import {
   notifySkillsDiscoveryUpdated,
   type SkillSummary,
 } from "../../lib/skills";
-import { updateSkills } from "../../lib/settings";
 import type { SettingsSectionProps } from "./types";
 
 export function SkillsSettingsForm(props: SettingsSectionProps) {
@@ -142,7 +142,9 @@ export function SkillsSettingsForm(props: SettingsSectionProps) {
             onClick={() => void refresh()}
             disabled={loading || skillsLockedByChatMode}
           >
-            <RefreshCw className={`h-3.5 w-3.5 transition-transform ${loading ? "animate-spin" : ""}`} />
+            <RefreshCw
+              className={`h-3.5 w-3.5 transition-transform ${loading ? "animate-spin" : ""}`}
+            />
             {loading ? t("settings.skillsScanning") : t("settings.skillsScan")}
             {loading && (
               <span className="ml-0.5 inline-flex gap-[2px]">
@@ -208,10 +210,7 @@ export function SkillsSettingsForm(props: SettingsSectionProps) {
           {loading && skills.length === 0 ? (
             <div className="space-y-3">
               {[1, 2, 3, 4].map((item) => (
-                <div
-                  key={item}
-                  className="skill-card-enter rounded-xl border border-border/40 p-4"
-                >
+                <div key={item} className="skill-card-enter rounded-xl border border-border/40 p-4">
                   <div className="flex items-center gap-3">
                     <div className="skills-skeleton-shimmer h-9 w-9 shrink-0 rounded-lg" />
                     <div className="flex-1 space-y-2">
@@ -257,9 +256,7 @@ export function SkillsSettingsForm(props: SettingsSectionProps) {
 
                     <div className="min-w-0 flex-1">
                       <div className="flex items-center gap-2">
-                        <span className="text-sm font-medium leading-none">
-                          {skill.name}
-                        </span>
+                        <span className="text-sm font-medium leading-none">{skill.name}</span>
                       </div>
                       {skill.description ? (
                         <p className="mt-1 truncate text-xs text-muted-foreground">
diff --git a/crates/agent-gui/src/pages/settings/SystemSettingsForm.tsx b/crates/agent-gui/src/pages/settings/SystemSettingsForm.tsx
index 88bbb5882..b4811f8df 100644
--- a/crates/agent-gui/src/pages/settings/SystemSettingsForm.tsx
+++ b/crates/agent-gui/src/pages/settings/SystemSettingsForm.tsx
@@ -1,5 +1,5 @@
-import { useState } from "react";
 import { invoke } from "@tauri-apps/api/core";
+import { useState } from "react";
 import {
   CheckCircle2,
   ChevronRight,
@@ -17,8 +17,8 @@ import { Input } from "../../components/ui/input";
 import { SUPPORTED_LOCALES, useLocale } from "../../i18n";
 import {
   type ExecutionMode,
-  type Theme,
   isAgentExecutionMode,
+  type Theme,
   updateSystem,
 } from "../../lib/settings";
 import { CUSTOM_SYSTEM_TOOL_OPTIONS } from "../../lib/tools/customSystemTools";
@@ -71,9 +71,7 @@ export function SystemSettingsForm(props: SettingsSectionProps) {
           <button
             type="button"
             onClick={() =>
-              setSettings((prev) =>
-                updateSystem(prev, { executionMode: "text" as ExecutionMode }),
-              )
+              setSettings((prev) => updateSystem(prev, { executionMode: "text" as ExecutionMode }))
             }
             className={`group relative flex flex-col items-start gap-3 rounded-xl border-2 p-4 text-left transition-all ${
               executionMode === "text"
@@ -106,9 +104,7 @@ export function SystemSettingsForm(props: SettingsSectionProps) {
           <button
             type="button"
             onClick={() =>
-              setSettings((prev) =>
-                updateSystem(prev, { executionMode: "tools" as ExecutionMode }),
-              )
+              setSettings((prev) => updateSystem(prev, { executionMode: "tools" as ExecutionMode }))
             }
             className={`group relative flex flex-col items-start gap-3 rounded-xl border-2 p-4 text-left transition-all ${
               isClassicAgentMode
@@ -265,9 +261,7 @@ export function SystemSettingsForm(props: SettingsSectionProps) {
                       : "border-border/60 bg-background/80 hover:border-border hover:bg-muted/35"
                   }`}
                 >
-                  <span className="text-base leading-none">
-                    {locale === "zh-CN" ? "🇨🇳" : "🇺🇸"}
-                  </span>
+                  <span className="text-base leading-none">{locale === "zh-CN" ? "🇨🇳" : "🇺🇸"}</span>
                   <div className="min-w-0 flex-1 pr-5">
                     <div className="truncate text-sm font-semibold">{localeLabel}</div>
                     <div className="mt-0.5 text-[11px] uppercase tracking-[0.14em] text-muted-foreground">
@@ -298,9 +292,7 @@ export function SystemSettingsForm(props: SettingsSectionProps) {
             </span>
           ) : null}
         </div>
-        <p className="text-xs leading-relaxed text-muted-foreground">
-          {t("settings.workdirDesc")}
-        </p>
+        <p className="text-xs leading-relaxed text-muted-foreground">{t("settings.workdirDesc")}</p>
 
         <div className="flex items-center gap-2">
           <div className="relative flex-1">
@@ -387,9 +379,7 @@ export function SystemSettingsForm(props: SettingsSectionProps) {
                       const next = e.currentTarget.checked
                         ? [...selectedSystemTools, tool.id]
                         : selectedSystemTools.filter((id) => id !== tool.id);
-                      setSettings((prev) =>
-                        updateSystem(prev, { selectedSystemTools: next }),
-                      );
+                      setSettings((prev) => updateSystem(prev, { selectedSystemTools: next }));
                     }}
                   />
                 </div>
diff --git a/crates/agent-gui/src/pages/settings/hookUtils.ts b/crates/agent-gui/src/pages/settings/hookUtils.ts
index 147129f89..08943a560 100644
--- a/crates/agent-gui/src/pages/settings/hookUtils.ts
+++ b/crates/agent-gui/src/pages/settings/hookUtils.ts
@@ -1,14 +1,14 @@
 import {
+  type ConversationHookType,
   HOOK_EVENT_DESCRIPTION_TRANSLATION_KEYS,
   HOOK_EVENT_TRANSLATION_KEYS,
-  type ConversationHookType,
   type HookHttpRequest,
   type HookLifecycleEventType,
 } from "../../lib/settings";
 import {
   createEmptyTaskRequestDraft,
-  taskRequestToDraft,
   type TaskHttpRequestDraft,
+  taskRequestToDraft,
 } from "./taskConfigUtils";
 
 export type HookHttpRequestDraft = TaskHttpRequestDraft;
@@ -27,16 +27,10 @@ export function getHookTypeTone(type: ConversationHookType) {
     : "bg-emerald-500/10 text-emerald-600 dark:text-emerald-300";
 }
 
-export function getHookEventLabel(
-  t: (key: string) => string,
-  event: HookLifecycleEventType,
-) {
+export function getHookEventLabel(t: (key: string) => string, event: HookLifecycleEventType) {
   return t(HOOK_EVENT_TRANSLATION_KEYS[event]);
 }
 
-export function getHookEventDescription(
-  t: (key: string) => string,
-  event: HookLifecycleEventType,
-) {
+export function getHookEventDescription(t: (key: string) => string, event: HookLifecycleEventType) {
   return t(HOOK_EVENT_DESCRIPTION_TRANSLATION_KEYS[event]);
 }
diff --git a/crates/agent-gui/src/pages/settings/shared.tsx b/crates/agent-gui/src/pages/settings/shared.tsx
index 98ad9ded4..249e1352f 100644
--- a/crates/agent-gui/src/pages/settings/shared.tsx
+++ b/crates/agent-gui/src/pages/settings/shared.tsx
@@ -1,4 +1,7 @@
-export { ConfirmActionPopover, ConfirmDeletePopover } from "../../components/ui/confirm-action-popover";
+export {
+  ConfirmActionPopover,
+  ConfirmDeletePopover,
+} from "../../components/ui/confirm-action-popover";
 
 export function parseAgentTagsInput(input: string): string[] {
   const out: string[] = [];
diff --git a/crates/agent-gui/src/pages/settings/taskConfigUtils.ts b/crates/agent-gui/src/pages/settings/taskConfigUtils.ts
index d21d1dc83..dea700826 100644
--- a/crates/agent-gui/src/pages/settings/taskConfigUtils.ts
+++ b/crates/agent-gui/src/pages/settings/taskConfigUtils.ts
@@ -67,8 +67,7 @@ function parseRequestHeaders(input: string, invalidMessage: string) {
   const headers: Record<string, string> = {};
   for (const [rawKey, rawValue] of Object.entries(parsed as Record<string, unknown>)) {
     const key = String(rawKey).trim();
-    const value =
-      typeof rawValue === "string" ? rawValue.trim() : String(rawValue ?? "").trim();
+    const value = typeof rawValue === "string" ? rawValue.trim() : String(rawValue ?? "").trim();
     if (!key || !value) continue;
     headers[key] = value;
   }
@@ -76,11 +75,7 @@ function parseRequestHeaders(input: string, invalidMessage: string) {
   return Object.keys(headers).length > 0 ? headers : undefined;
 }
 
-function parseRequestBody(
-  method: HookHttpMethod,
-  input: string,
-  invalidMessage: string,
-) {
+function parseRequestBody(method: HookHttpMethod, input: string, invalidMessage: string) {
   if (!canHookHttpMethodHaveBody(method)) return undefined;
   if (!input.trim()) return undefined;
   try {
diff --git a/crates/agent-gui/src/pages/skills-hub/SkillsHubPage.tsx b/crates/agent-gui/src/pages/skills-hub/SkillsHubPage.tsx
index 3f462cc5b..8543ac8da 100644
--- a/crates/agent-gui/src/pages/skills-hub/SkillsHubPage.tsx
+++ b/crates/agent-gui/src/pages/skills-hub/SkillsHubPage.tsx
@@ -1,6 +1,6 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { createPortal } from "react-dom";
-
+import { GlassPanel, HubBackdrop, HubHeader } from "../../components/hub/HubChrome";
 import {
   AlertTriangle,
   BookOpen,
@@ -17,10 +17,11 @@ import {
   Trash2,
   X,
 } from "../../components/icons";
-import { GlassPanel, HubBackdrop, HubHeader } from "../../components/hub/HubChrome";
 import { Button } from "../../components/ui/button";
 import { ConfirmDeletePopover } from "../../components/ui/confirm-action-popover";
 import { useLocale } from "../../i18n";
+import { type AppSettings, updateSkills } from "../../lib/settings";
+import { cn } from "../../lib/shared/utils";
 import {
   discoverSkills,
   getSkillInstallJobStatus,
@@ -29,21 +30,19 @@ import {
   manageSkill,
   mergeAlwaysEnabledSkillNames,
   notifySkillsDiscoveryUpdated,
-  startSkillInstallJob,
   type SkillInstallJobSnapshot,
   type SkillSummary,
+  startSkillInstallJob,
 } from "../../lib/skills";
 import {
   buildClawHubDownloadUrl,
-  getClawHubSkillDetail,
-  listClawHubSkills,
-  searchClawHubSkills,
   type ClawHubSkillCard,
   type ClawHubSkillDetail,
   type ClawHubSort,
+  getClawHubSkillDetail,
+  listClawHubSkills,
+  searchClawHubSkills,
 } from "../../lib/skills/clawHub";
-import { updateSkills, type AppSettings } from "../../lib/settings";
-import { cn } from "../../lib/shared/utils";
 
 type SkillsHubView = "installed" | "store";
 
@@ -146,40 +145,43 @@ export function SkillsHubPage(props: SkillsHubPageProps) {
     buildSkillDiscoverySignature(initialRootDir ?? "", initialSkills ?? []),
   );
 
-  const refresh = useCallback(async (options?: { silent?: boolean }) => {
-    if (lockedByChatMode) {
-      setSkills([]);
-      setRootDir("");
-      setLoadError(null);
-      setLoading(false);
-      discoverySignatureRef.current = buildSkillDiscoverySignature("", []);
-      return;
-    }
-    const silent = options?.silent === true;
-    if (!silent) {
-      setLoading(true);
-    }
-    setLoadError(null);
-    try {
-      const discovery = await discoverSkills({ force: true });
-      const signature = buildSkillDiscoverySignature(discovery.rootDir, discovery.skills);
-      const changed = discoverySignatureRef.current !== signature;
-      discoverySignatureRef.current = signature;
-      setSkills(discovery.skills);
-      setRootDir(discovery.rootDir);
-      if (changed) {
-        notifySkillsDiscoveryUpdated();
+  const refresh = useCallback(
+    async (options?: { silent?: boolean }) => {
+      if (lockedByChatMode) {
+        setSkills([]);
+        setRootDir("");
+        setLoadError(null);
+        setLoading(false);
+        discoverySignatureRef.current = buildSkillDiscoverySignature("", []);
+        return;
       }
-    } catch (err) {
-      const msg = err instanceof Error ? err.message : String(err);
-      setSkills([]);
-      setLoadError(msg || "Failed to load skills");
-    } finally {
+      const silent = options?.silent === true;
       if (!silent) {
-        setLoading(false);
+        setLoading(true);
       }
-    }
-  }, [lockedByChatMode]);
+      setLoadError(null);
+      try {
+        const discovery = await discoverSkills({ force: true });
+        const signature = buildSkillDiscoverySignature(discovery.rootDir, discovery.skills);
+        const changed = discoverySignatureRef.current !== signature;
+        discoverySignatureRef.current = signature;
+        setSkills(discovery.skills);
+        setRootDir(discovery.rootDir);
+        if (changed) {
+          notifySkillsDiscoveryUpdated();
+        }
+      } catch (err) {
+        const msg = err instanceof Error ? err.message : String(err);
+        setSkills([]);
+        setLoadError(msg || "Failed to load skills");
+      } finally {
+        if (!silent) {
+          setLoading(false);
+        }
+      }
+    },
+    [lockedByChatMode],
+  );
 
   useEffect(() => {
     if (initialSkills && initialSkills.length > 0) {
@@ -211,8 +213,7 @@ export function SkillsHubPage(props: SkillsHubPageProps) {
     if (!text) return skills;
     return skills.filter(
       (skill) =>
-        skill.name.toLowerCase().includes(text) ||
-        skill.description.toLowerCase().includes(text),
+        skill.name.toLowerCase().includes(text) || skill.description.toLowerCase().includes(text),
     );
   }, [filter, skills]);
 
@@ -312,28 +313,31 @@ export function SkillsHubPage(props: SkillsHubPageProps) {
     };
   }, [lockedByChatMode, refresh, view]);
 
-  const enableInstalledSkillsFromJob = useCallback((job: SkillInstallJobSnapshot) => {
-    const installedNames = (job.installed ?? [])
-      .map((item) => item.name?.trim())
-      .filter((name): name is string => Boolean(name) && !isAlwaysEnabledSkillName(name));
-    if (installedNames.length === 0) return;
-
-    setSettings((prev) => {
-      const next = new Set(prev.skills.selected);
-      let changed = prev.skills.enabled !== true;
-      for (const name of installedNames) {
-        if (!next.has(name)) {
-          next.add(name);
-          changed = true;
+  const enableInstalledSkillsFromJob = useCallback(
+    (job: SkillInstallJobSnapshot) => {
+      const installedNames = (job.installed ?? [])
+        .map((item) => item.name?.trim())
+        .filter((name): name is string => Boolean(name) && !isAlwaysEnabledSkillName(name));
+      if (installedNames.length === 0) return;
+
+      setSettings((prev) => {
+        const next = new Set(prev.skills.selected);
+        let changed = prev.skills.enabled !== true;
+        for (const name of installedNames) {
+          if (!next.has(name)) {
+            next.add(name);
+            changed = true;
+          }
         }
-      }
-      if (!changed) return prev;
-      return updateSkills(prev, {
-        enabled: true,
-        selected: Array.from(next),
+        if (!changed) return prev;
+        return updateSkills(prev, {
+          enabled: true,
+          selected: Array.from(next),
+        });
       });
-    });
-  }, [setSettings]);
+    },
+    [setSettings],
+  );
 
   useEffect(() => {
     const activeJobs = Object.values(installJobs).filter(
@@ -426,8 +430,7 @@ export function SkillsHubPage(props: SkillsHubPageProps) {
   async function deleteSkill(skill: SkillSummary) {
     if (lockedByChatMode || isAlwaysEnabledSkillName(skill.name) || deletingSkillName) return;
     const skillName = skill.name;
-    const sourceSlug =
-      skill.source?.registry === "clawhub" ? skill.source.slug?.trim() || "" : "";
+    const sourceSlug = skill.source?.registry === "clawhub" ? skill.source.slug?.trim() || "" : "";
     setLoadError(null);
     setDeletingSkillName(skillName);
     try {
@@ -667,263 +670,266 @@ export function SkillsHubPage(props: SkillsHubPageProps) {
                   </GlassPanel>
                 </div>
               ) : (
-              <>
-                {view === "installed" ? (
-                  <div className="h-full min-h-0 overflow-y-auto px-0.5 pb-4 pr-1 pt-1.5">
-                    <div className="flex flex-col gap-5">
-                    {loadError ? (
-                      <GlassPanel tone="error" className="hub-panel-enter">
-                        <div className="flex items-center gap-2">
-                          <AlertTriangle className="h-4 w-4 shrink-0 text-destructive" />
-                          <span className="text-xs text-destructive">{loadError}</span>
-                        </div>
-                      </GlassPanel>
-                    ) : null}
-
-                {!skillsEnabled ? (
-                  <GlassPanel tone="muted" className="hub-panel-enter">
-                    <div className="flex items-center gap-2">
-                      <BookOpen className="h-4 w-4 shrink-0 text-muted-foreground" />
-                      <span className="text-xs text-muted-foreground">
-                        {t("settings.skillsDisabledHint")}
-                      </span>
-                    </div>
-                  </GlassPanel>
-                ) : null}
-
-                {skills.length > 4 ? (
-                  <div className="hub-panel-enter relative max-w-md">
-                    <Search className="absolute left-3.5 top-1/2 h-3.5 w-3.5 -translate-y-1/2 text-muted-foreground" />
-                    <input
-                      type="text"
-                      value={filter}
-                      onChange={(e) => setFilter(e.currentTarget.value)}
-                      placeholder={t("settings.skillsSearch")}
-                      className="h-10 w-full rounded-xl border border-border/40 bg-background/60 pl-10 pr-3 text-[13px] outline-hidden backdrop-blur-xl transition-all placeholder:text-muted-foreground/60 focus:border-border/60 focus:bg-background/85 focus:ring-2 focus:ring-foreground/10"
-                    />
-                  </div>
-                ) : null}
+                <>
+                  {view === "installed" ? (
+                    <div className="h-full min-h-0 overflow-y-auto px-0.5 pb-4 pr-1 pt-1.5">
+                      <div className="flex flex-col gap-5">
+                        {loadError ? (
+                          <GlassPanel tone="error" className="hub-panel-enter">
+                            <div className="flex items-center gap-2">
+                              <AlertTriangle className="h-4 w-4 shrink-0 text-destructive" />
+                              <span className="text-xs text-destructive">{loadError}</span>
+                            </div>
+                          </GlassPanel>
+                        ) : null}
 
-                {!loading && skills.length === 0 && !loadError ? (
-                  <GlassPanel className="hub-panel-enter">
-                    <div className="flex flex-col items-center gap-3 py-8 text-center">
-                      <div className="flex h-12 w-12 items-center justify-center rounded-full bg-muted/60">
-                        <BookOpen className="h-5 w-5 text-muted-foreground" />
-                      </div>
-                      <div className="space-y-1">
-                        <p className="text-sm font-medium text-muted-foreground">
-                          {t("settings.skillsNotFound")}
-                        </p>
-                        <p className="text-xs text-muted-foreground/70">
-                          {t("settings.skillsNotFoundHint")}
-                        </p>
-                      </div>
-                      <Button
-                        variant="outline"
-                        size="sm"
-                        className="mt-1 gap-1.5 rounded-full"
-                        onClick={() => void refresh()}
-                      >
-                        <RefreshCw className="h-3.5 w-3.5" />
-                        {t("settings.skillsRescan")}
-                      </Button>
-                    </div>
-                  </GlassPanel>
-                ) : null}
+                        {!skillsEnabled ? (
+                          <GlassPanel tone="muted" className="hub-panel-enter">
+                            <div className="flex items-center gap-2">
+                              <BookOpen className="h-4 w-4 shrink-0 text-muted-foreground" />
+                              <span className="text-xs text-muted-foreground">
+                                {t("settings.skillsDisabledHint")}
+                              </span>
+                            </div>
+                          </GlassPanel>
+                        ) : null}
 
-                {loading && skills.length === 0 ? (
-                  <>
-                    <div className="hub-frost-hero hub-panel-enter px-4 py-3.5">
-                      <div className="flex items-center gap-3.5">
-                        <FrostSpinner />
-                        <div className="min-w-0 flex-1">
-                          <div className="text-[13px] font-medium tracking-tight text-foreground">
-                            {t("settings.skillsScanning")}
-                          </div>
-                          <div className="mt-0.5 truncate text-[11px] text-muted-foreground/80">
-                            正在读取固定 Skills 目录并同步会话可用能力
+                        {skills.length > 4 ? (
+                          <div className="hub-panel-enter relative max-w-md">
+                            <Search className="absolute left-3.5 top-1/2 h-3.5 w-3.5 -translate-y-1/2 text-muted-foreground" />
+                            <input
+                              type="text"
+                              value={filter}
+                              onChange={(e) => setFilter(e.currentTarget.value)}
+                              placeholder={t("settings.skillsSearch")}
+                              className="h-10 w-full rounded-xl border border-border/40 bg-background/60 pl-10 pr-3 text-[13px] outline-hidden backdrop-blur-xl transition-all placeholder:text-muted-foreground/60 focus:border-border/60 focus:bg-background/85 focus:ring-2 focus:ring-foreground/10"
+                            />
                           </div>
-                        </div>
-                      </div>
-                      <div className="hub-frost-track mt-3.5" />
-                    </div>
+                        ) : null}
 
-                    <div className="grid gap-3 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4">
-                      {[1, 2, 3, 4, 5, 6].map((item) => (
-                        <div key={item} className="hub-frost-skeleton skill-card-enter p-3.5">
-                          <div className="flex items-center gap-3">
-                            <div className="skills-skeleton-shimmer h-9 w-9 shrink-0 rounded-lg" />
-                            <div className="flex-1 space-y-2">
-                              <div className="skills-skeleton-shimmer h-3.5 w-28 rounded" />
-                              <div className="skills-skeleton-shimmer h-3 w-full max-w-[12rem] rounded" />
+                        {!loading && skills.length === 0 && !loadError ? (
+                          <GlassPanel className="hub-panel-enter">
+                            <div className="flex flex-col items-center gap-3 py-8 text-center">
+                              <div className="flex h-12 w-12 items-center justify-center rounded-full bg-muted/60">
+                                <BookOpen className="h-5 w-5 text-muted-foreground" />
+                              </div>
+                              <div className="space-y-1">
+                                <p className="text-sm font-medium text-muted-foreground">
+                                  {t("settings.skillsNotFound")}
+                                </p>
+                                <p className="text-xs text-muted-foreground/70">
+                                  {t("settings.skillsNotFoundHint")}
+                                </p>
+                              </div>
+                              <Button
+                                variant="outline"
+                                size="sm"
+                                className="mt-1 gap-1.5 rounded-full"
+                                onClick={() => void refresh()}
+                              >
+                                <RefreshCw className="h-3.5 w-3.5" />
+                                {t("settings.skillsRescan")}
+                              </Button>
                             </div>
-                          </div>
-                        </div>
-                      ))}
-                    </div>
-                  </>
-                ) : null}
+                          </GlassPanel>
+                        ) : null}
 
-                {filtered.length > 0 ? (
-                  <div className="grid gap-3 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4">
-                    {filtered.map((skill) => {
-                      const alwaysEnabled = isAlwaysEnabledSkillName(skill.name);
-                      const checked = alwaysEnabled || selected.has(skill.name);
-                      const deleting = deletingSkillName === skill.name;
-                      const deleteDisabled = deletingSkillName !== null;
-                      const card = (
-                        <>
-                          <div className="flex items-start justify-between gap-2">
-                            <div
-                              className={cn(
-                                "flex h-10 w-10 shrink-0 items-center justify-center rounded-xl border transition-all",
-                                checked
-                                  ? "border-border/55 bg-background/80 text-foreground/85 shadow-[0_1px_0_rgba(255,255,255,0.55)_inset]"
-                                  : "border-border/30 bg-muted/50 text-muted-foreground group-hover:border-border/50 group-hover:bg-background/70 group-hover:text-foreground/85",
-                              )}
-                            >
-                              <Sparkles className="h-[18px] w-[18px]" />
+                        {loading && skills.length === 0 ? (
+                          <>
+                            <div className="hub-frost-hero hub-panel-enter px-4 py-3.5">
+                              <div className="flex items-center gap-3.5">
+                                <FrostSpinner />
+                                <div className="min-w-0 flex-1">
+                                  <div className="text-[13px] font-medium tracking-tight text-foreground">
+                                    {t("settings.skillsScanning")}
+                                  </div>
+                                  <div className="mt-0.5 truncate text-[11px] text-muted-foreground/80">
+                                    正在读取固定 Skills 目录并同步会话可用能力
+                                  </div>
+                                </div>
+                              </div>
+                              <div className="hub-frost-track mt-3.5" />
                             </div>
 
-                            {alwaysEnabled ? (
-                              <div
-                                className="inline-flex shrink-0 items-center gap-1 rounded-full bg-foreground/[0.06] px-2 py-0.5 text-[10px] font-medium text-foreground/75 ring-1 ring-border/45"
-                                title={t("settings.skillsAlwaysOn")}
-                              >
-                                <Lock className="h-2.5 w-2.5" />
-                                <span>{t("settings.skillsAlwaysOn")}</span>
-                              </div>
-                            ) : (
-                              <div
-                                className="flex shrink-0 items-center gap-1.5"
-                                onClick={(event) => event.stopPropagation()}
-                                onKeyDown={(event) => event.stopPropagation()}
-                              >
-                                <ConfirmDeletePopover
-                                  name={skill.name}
-                                  onConfirm={() => void deleteSkill(skill)}
+                            <div className="grid gap-3 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4">
+                              {[1, 2, 3, 4, 5, 6].map((item) => (
+                                <div
+                                  key={item}
+                                  className="hub-frost-skeleton skill-card-enter p-3.5"
                                 >
-                                  {(open) => (
-                                    <button
-                                      type="button"
-                                      disabled={deleteDisabled}
-                                      onClick={(event) => {
-                                        event.stopPropagation();
-                                        open();
-                                      }}
+                                  <div className="flex items-center gap-3">
+                                    <div className="skills-skeleton-shimmer h-9 w-9 shrink-0 rounded-lg" />
+                                    <div className="flex-1 space-y-2">
+                                      <div className="skills-skeleton-shimmer h-3.5 w-28 rounded" />
+                                      <div className="skills-skeleton-shimmer h-3 w-full max-w-[12rem] rounded" />
+                                    </div>
+                                  </div>
+                                </div>
+                              ))}
+                            </div>
+                          </>
+                        ) : null}
+
+                        {filtered.length > 0 ? (
+                          <div className="grid gap-3 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4">
+                            {filtered.map((skill) => {
+                              const alwaysEnabled = isAlwaysEnabledSkillName(skill.name);
+                              const checked = alwaysEnabled || selected.has(skill.name);
+                              const deleting = deletingSkillName === skill.name;
+                              const deleteDisabled = deletingSkillName !== null;
+                              const card = (
+                                <>
+                                  <div className="flex items-start justify-between gap-2">
+                                    <div
                                       className={cn(
-                                        "flex h-6 w-6 items-center justify-center rounded-md border border-border/35 bg-background/65 text-muted-foreground transition-all",
-                                        "hover:border-destructive/40 hover:bg-destructive/10 hover:text-destructive",
-                                        "disabled:cursor-not-allowed disabled:opacity-60",
+                                        "flex h-10 w-10 shrink-0 items-center justify-center rounded-xl border transition-all",
+                                        checked
+                                          ? "border-border/55 bg-background/80 text-foreground/85 shadow-[0_1px_0_rgba(255,255,255,0.55)_inset]"
+                                          : "border-border/30 bg-muted/50 text-muted-foreground group-hover:border-border/50 group-hover:bg-background/70 group-hover:text-foreground/85",
                                       )}
-                                      title="删除 Skill"
                                     >
-                                      {deleting ? (
-                                        <Loader2 className="h-3.5 w-3.5 animate-spin" />
-                                      ) : (
-                                        <Trash2 className="h-3.5 w-3.5" />
-                                      )}
-                                    </button>
-                                  )}
-                                </ConfirmDeletePopover>
+                                      <Sparkles className="h-[18px] w-[18px]" />
+                                    </div>
+
+                                    {alwaysEnabled ? (
+                                      <div
+                                        className="inline-flex shrink-0 items-center gap-1 rounded-full bg-foreground/[0.06] px-2 py-0.5 text-[10px] font-medium text-foreground/75 ring-1 ring-border/45"
+                                        title={t("settings.skillsAlwaysOn")}
+                                      >
+                                        <Lock className="h-2.5 w-2.5" />
+                                        <span>{t("settings.skillsAlwaysOn")}</span>
+                                      </div>
+                                    ) : (
+                                      <div
+                                        className="flex shrink-0 items-center gap-1.5"
+                                        onClick={(event) => event.stopPropagation()}
+                                        onKeyDown={(event) => event.stopPropagation()}
+                                      >
+                                        <ConfirmDeletePopover
+                                          name={skill.name}
+                                          onConfirm={() => void deleteSkill(skill)}
+                                        >
+                                          {(open) => (
+                                            <button
+                                              type="button"
+                                              disabled={deleteDisabled}
+                                              onClick={(event) => {
+                                                event.stopPropagation();
+                                                open();
+                                              }}
+                                              className={cn(
+                                                "flex h-6 w-6 items-center justify-center rounded-md border border-border/35 bg-background/65 text-muted-foreground transition-all",
+                                                "hover:border-destructive/40 hover:bg-destructive/10 hover:text-destructive",
+                                                "disabled:cursor-not-allowed disabled:opacity-60",
+                                              )}
+                                              title="删除 Skill"
+                                            >
+                                              {deleting ? (
+                                                <Loader2 className="h-3.5 w-3.5 animate-spin" />
+                                              ) : (
+                                                <Trash2 className="h-3.5 w-3.5" />
+                                              )}
+                                            </button>
+                                          )}
+                                        </ConfirmDeletePopover>
+                                        <div
+                                          className={cn(
+                                            "flex h-5 w-5 items-center justify-center rounded-md border transition-all",
+                                            checked
+                                              ? "border-foreground/80 bg-foreground/85 text-background shadow-[0_2px_6px_-2px_rgba(15,23,42,0.35)]"
+                                              : "border-border bg-background group-hover:border-foreground/40",
+                                          )}
+                                        >
+                                          {checked ? <Check className="h-3 w-3" /> : null}
+                                        </div>
+                                      </div>
+                                    )}
+                                  </div>
+
+                                  <div className="mt-2.5 min-w-0 flex-1">
+                                    <div className="truncate text-[13px] font-semibold leading-tight text-foreground">
+                                      {skill.name}
+                                    </div>
+                                    {skill.description ? (
+                                      <p className="mt-1 line-clamp-2 text-[11.5px] leading-[1.4] text-muted-foreground">
+                                        {skill.description}
+                                      </p>
+                                    ) : null}
+                                  </div>
+
+                                  <div className="mt-2.5 flex items-center gap-1 border-t border-border/30 pt-2 text-[10.5px] text-muted-foreground/70">
+                                    <FileText className="h-3 w-3 shrink-0" />
+                                    <span className="truncate">{skill.skillFile}</span>
+                                  </div>
+                                </>
+                              );
+
+                              const key = `${skill.name}-${rootDir}`;
+                              if (alwaysEnabled) {
+                                return (
+                                  <div
+                                    key={key}
+                                    className="skill-card-enter group flex h-full flex-col rounded-2xl border border-border/50 bg-background/75 p-3.5 backdrop-blur-xl shadow-[0_1px_0_rgba(255,255,255,0.55)_inset,0_4px_18px_-12px_rgba(15,23,42,0.16)]"
+                                  >
+                                    {card}
+                                  </div>
+                                );
+                              }
+
+                              return (
                                 <div
+                                  key={key}
+                                  role="button"
+                                  tabIndex={0}
+                                  onClick={() => toggleSkill(skill.name, !checked)}
+                                  onKeyDown={(event) => {
+                                    if (event.key !== "Enter" && event.key !== " ") return;
+                                    event.preventDefault();
+                                    toggleSkill(skill.name, !checked);
+                                  }}
                                   className={cn(
-                                    "flex h-5 w-5 items-center justify-center rounded-md border transition-all",
+                                    "hub-skill-card skill-card-enter group flex h-full w-full flex-col rounded-2xl border p-3.5 text-left transition-all",
+                                    "cursor-pointer backdrop-blur-xl focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-foreground/15",
                                     checked
-                                      ? "border-foreground/80 bg-foreground/85 text-background shadow-[0_2px_6px_-2px_rgba(15,23,42,0.35)]"
-                                      : "border-border bg-background group-hover:border-foreground/40",
+                                      ? "border-border/55 bg-background/80 shadow-[0_1px_0_rgba(255,255,255,0.6)_inset,0_4px_18px_-12px_rgba(15,23,42,0.18)]"
+                                      : "border-border/35 bg-background/55 hover:-translate-y-0.5 hover:border-border/55 hover:bg-background/70 hover:shadow-[0_4px_16px_-10px_rgba(15,23,42,0.18)]",
                                   )}
                                 >
-                                  {checked ? <Check className="h-3 w-3" /> : null}
+                                  {card}
                                 </div>
-                              </div>
-                            )}
+                              );
+                            })}
                           </div>
+                        ) : null}
 
-                          <div className="mt-2.5 min-w-0 flex-1">
-                            <div className="truncate text-[13px] font-semibold leading-tight text-foreground">
-                              {skill.name}
-                            </div>
-                            {skill.description ? (
-                              <p className="mt-1 line-clamp-2 text-[11.5px] leading-[1.4] text-muted-foreground">
-                                {skill.description}
-                              </p>
-                            ) : null}
-                          </div>
-
-                          <div className="mt-2.5 flex items-center gap-1 border-t border-border/30 pt-2 text-[10.5px] text-muted-foreground/70">
-                            <FileText className="h-3 w-3 shrink-0" />
-                            <span className="truncate">{skill.skillFile}</span>
-                          </div>
-                        </>
-                      );
-
-                      const key = `${skill.name}-${rootDir}`;
-                      if (alwaysEnabled) {
-                        return (
-                          <div
-                            key={key}
-                            className="skill-card-enter group flex h-full flex-col rounded-2xl border border-border/50 bg-background/75 p-3.5 backdrop-blur-xl shadow-[0_1px_0_rgba(255,255,255,0.55)_inset,0_4px_18px_-12px_rgba(15,23,42,0.16)]"
-                          >
-                            {card}
-                          </div>
-                        );
-                      }
-
-                      return (
-                        <div
-                          key={key}
-                          role="button"
-                          tabIndex={0}
-                          onClick={() => toggleSkill(skill.name, !checked)}
-                          onKeyDown={(event) => {
-                            if (event.key !== "Enter" && event.key !== " ") return;
-                            event.preventDefault();
-                            toggleSkill(skill.name, !checked);
-                          }}
-                          className={cn(
-                            "hub-skill-card skill-card-enter group flex h-full w-full flex-col rounded-2xl border p-3.5 text-left transition-all",
-                            "cursor-pointer backdrop-blur-xl focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-foreground/15",
-                            checked
-                              ? "border-border/55 bg-background/80 shadow-[0_1px_0_rgba(255,255,255,0.6)_inset,0_4px_18px_-12px_rgba(15,23,42,0.18)]"
-                              : "border-border/35 bg-background/55 hover:-translate-y-0.5 hover:border-border/55 hover:bg-background/70 hover:shadow-[0_4px_16px_-10px_rgba(15,23,42,0.18)]",
-                          )}
-                        >
-                          {card}
-                        </div>
-                      );
-                    })}
-                  </div>
-                ) : null}
-
-                {filter.trim() && filtered.length === 0 && skills.length > 0 ? (
-                  <GlassPanel tone="muted" className="hub-panel-enter">
-                    <p className="py-2 text-center text-sm text-muted-foreground">
-                      {t("settings.skillsNoMatch").replace("{filter}", filter)}
-                    </p>
-                  </GlassPanel>
-                ) : null}
+                        {filter.trim() && filtered.length === 0 && skills.length > 0 ? (
+                          <GlassPanel tone="muted" className="hub-panel-enter">
+                            <p className="py-2 text-center text-sm text-muted-foreground">
+                              {t("settings.skillsNoMatch").replace("{filter}", filter)}
+                            </p>
+                          </GlassPanel>
+                        ) : null}
+                      </div>
                     </div>
-                  </div>
-                ) : (
-                  <SkillsStoreView
-                    items={storeItems}
-                    query={storeQuery}
-                    sort={storeSort}
-                    loading={storeLoading}
-                    loadingMore={storeLoadingMore}
-                    error={storeError}
-                    cursor={storeCursor}
-                    installedSlugs={installedStoreSlugs}
-                    installingBySlug={installingBySlug}
-                    installJobs={installJobs}
-                    onQueryChange={setStoreQuery}
-                    onSortChange={setStoreSort}
-                    onLoadMore={() => void loadMoreStore()}
-                    onInstall={(skill) => void installStoreSkill(skill)}
-                  />
-                )}
-              </>
+                  ) : (
+                    <SkillsStoreView
+                      items={storeItems}
+                      query={storeQuery}
+                      sort={storeSort}
+                      loading={storeLoading}
+                      loadingMore={storeLoadingMore}
+                      error={storeError}
+                      cursor={storeCursor}
+                      installedSlugs={installedStoreSlugs}
+                      installingBySlug={installingBySlug}
+                      installJobs={installJobs}
+                      onQueryChange={setStoreQuery}
+                      onSortChange={setStoreSort}
+                      onLoadMore={() => void loadMoreStore()}
+                      onInstall={(skill) => void installStoreSkill(skill)}
+                    />
+                  )}
+                </>
               )}
             </div>
           </div>
@@ -1471,8 +1477,14 @@ function SkillsStorePreviewDrawer(props: {
                   </div>
                   <div className="divide-y divide-border/30">
                     <StorePreviewField label="Slug" value={data.slug} />
-                    <StorePreviewField label={t("settings.skillsStorePreviewOwner")} value={owner} />
-                    <StorePreviewField label={t("settings.skillsStorePreviewVersion")} value={version} />
+                    <StorePreviewField
+                      label={t("settings.skillsStorePreviewOwner")}
+                      value={owner}
+                    />
+                    <StorePreviewField
+                      label={t("settings.skillsStorePreviewVersion")}
+                      value={version}
+                    />
                     <StorePreviewField
                       label={t("settings.skillsStorePreviewUpdated")}
                       value={data.updatedAt ? formatFullStoreDate(data.updatedAt) : null}